gentoo resync : 29.10.2017

4730 files changed, 54183 insertions, 43843 deletions

diff --git a/app-accessibility/espeak/Manifest b/app-accessibility/espeak/Manifest
index d4bc06260a5b..ba33316fa53e 100644
--- a/app-accessibility/espeak/Manifest
+++ b/app-accessibility/espeak/Manifest
@@ -2,7 +2,7 @@ AUX espeak-1.48.04-gcc-6-fix.patch 531 SHA256 ba852d369d5be00b592ea5a676a5573a27
 DIST espeak-1.47.11-source.zip 2813649 SHA256 9bd4d0569af48a2cb13fa76704dec3124d27025a3f21c87598457976472b360c SHA512 77c3989fbd0e4aadae0da2d7f1c587854895ae103633704ee5b4042b0618897d01edffa80b1f13e6cbf356f2f31beaf4fdb7e90e4ab641d5286d559aaefe932b WHIRLPOOL c26f481d4c3c485ba0eb3fe7ae3bcf36e7001d49e0e27a6f0934fdb9c91cfef4974c1d34daebd0286694346a44c647cfb96769da54536e0b4380778af755673c
 DIST espeak-1.48.04-source.zip 3019245 SHA256 bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659 SHA512 f0759e6ace2604c8cbb19e8c3fd4b106edf4dcece247a6677f6b734af7746c35a367126edfbe585396c98f6c54f07e25d64bfab35e258e64f09bd2c0833247fa WHIRLPOOL 259fe408a2d3808f4b1ecec6850262f3b7c0e9a4511fa1bcca414da7d6608e2a0b847a3abb19687ea1cb4e21ca8334fdf0b66b6a78bd363882891b3ebdfb06fc
 EBUILD espeak-1.47.11-r1.ebuild 2168 SHA256 c708ecbbd8ba2c6b91554f47b1107f7144078f2c48d10cc407667113ec3f08ee SHA512 2a568eecb2de15d85a53718ea909a11f1f496717c1a05c6bdccafb26258e21c3d45e8f170d802b6be5a77e9add59991c17f34fcf28505fe14a8a23c4d1fd5df7 WHIRLPOOL 36e0525f80c6c9aa895756a2056896e70b83548c286d605c88d326247738680a57e5656b725e5a2a5f867455facb524ebb58520d3effb8302a3946ea24b4b22c
-EBUILD espeak-1.48.04-r1.ebuild 2241 SHA256 73976ff266dba04a14ca10c87de9ee0cf9c60b1ea50e9b45b02e88eb7d5a22f6 SHA512 6ec8988743584d8d95395626649a58e056489f3acf5201ca8785e2047e08cacdb5ba23064bd5eabeee1baa6d1b46258196a9bdd6b4ccbb7d2a6ad514e10f1e46 WHIRLPOOL 374a9317539bbc16db333116443df7981016b34a987fa39cab87aa8e231a5c33da1fa970b50deb8fd6ae439c690412cacf61dc6205884184838940c83b30317e
+EBUILD espeak-1.48.04-r1.ebuild 2236 SHA256 a06f9a6414930cd1ec9e6870052b5840fb62af6b7ddeca3fd0cddb3e93308b0c SHA512 1052097b1d00d3debc2bc37c12048136a720471dcbdd622e179ece2a992b4449ebc9e843c5c8057b72944ef827029279e5384e880413c8d4fc538f4192553e72 WHIRLPOOL c34fe66fce0885aba4525f4aa15d8d3534b6d62ee3b14945e4fad200eaa86af9ef554287509a83c27e2338815b60e12a360c6cf3ec7c45c4258b4d21b74b011d
 EBUILD espeak-1.48.04.ebuild 2184 SHA256 c5722e86e522cea0490c8b2daaea8373b0bd69b83db0965f5b8116f5a3b63645 SHA512 25f0d32cc339ffe486127cc65e455cb5c5d757f3bd919c1a070af17645b09982fe70b5ab6932433701e040096f3adcc65d3ed93c65dcb80ba5c8e52b5d437659 WHIRLPOOL 935d429c80c5ad25a54ec24662a81482463a92df8a9ea23c62b5ff67211b15af1914d665703f6c4f8f4fed1c5a19ccf46d24bfde82433d2ec2737f52c44ea84f
 MISC ChangeLog 2497 SHA256 d08d99e013300603e19f272755145c9e26f5076437f7e2e5dc68678d3f3a15ca SHA512 a80085e6667ba37089b6642d2a23500e97f60e6d439a20da6411d50c9cd66107457de90ed68486accfe02749ca13425dce33f7891317344220bd4acaf91c934c WHIRLPOOL 178f2002e4de5f5541bdad6688c75dd1ae2d91cdb56d14e59db962886399802b73c7fc34a0deef12e4ae14144d9194b2c3d2e52a1ff232da9c83d3c6d0d5a45a
 MISC ChangeLog-2015 17394 SHA256 a6d62b51ece1404172514142a53e960cc0d32fe9705cb33ab9d5605f257d92a7 SHA512 4075d0c4cca778bf4a637d117afc6ed8f4bfb2a46b5b40c8a79b979d120fed5080c8302785def45754397393c9ce357cbb8f722641dc124fd077313505c94482 WHIRLPOOL ae7a38a13e93eb4166f1dc328204b18ffce0b43ee28f1c72ac335d9bcef9cb9f522d806c2235ebb45e30f85dbedfa2ca209a627126b1ae7b4cabfde6f4efead9
diff --git a/app-accessibility/espeak/espeak-1.48.04-r1.ebuild b/app-accessibility/espeak/espeak-1.48.04-r1.ebuild
index 2559bb14743d..fca27bd12637 100644
--- a/app-accessibility/espeak/espeak-1.48.04-r1.ebuild
+++ b/app-accessibility/espeak/espeak-1.48.04-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Speech synthesizer for English and other languages"
 HOMEPAGE="http://espeak.sourceforge.net/"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="portaudio pulseaudio"
 
 COMMON_DEPEND="portaudio? ( >=media-libs/portaudio-19_pre20071207 )
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 0564d19ff1ac..3c34334ce5d2 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -2,8 +2,10 @@ AUX ansible-2.3.2.0-fix_key_error.patch 2733 SHA256 de439ac7f94ec49747ebf9531bab
 DIST ansible-2.3.2.0-pycryptodome.patch 32472 SHA256 0e204895f8e16e030517dcda40c95c40b20cfe1641e077c15d80ff8fc4b0579a SHA512 cf2b1528176a12e8e48001155d8f2351e1c4914df56ae8b8542a48ccee4158c23ed1eda537ac500f1b71553aa84c574b8297398a82c4c0721ed6f9d08ad5257d WHIRLPOOL 24c9971b643da1cc5321ffe13f1b1ce27f42ab4c273b51ea532746564c0112ce5884072245e282d1525057c2d4117a5fe67d0d305f1a23d1feb9d3d464f1ec11
 DIST ansible-2.3.2.0.tar.gz 4319664 SHA256 0563b425279422487f12616ef719f6e558373b258dcf47e548d119be8d3168eb SHA512 458506da8ae65a80b442834c6047f02eb92acf9f7dd4465c63b4360c4c4817a0f7c48c92a614b91760a54d036ed13f417edf3524bb8a34a8a53ceb11efc928ac WHIRLPOOL 3ce907ba1a08e4d7cbca3c49429f4315f7cfea828806cb4710e2cce6d681a60514f9ca65e702da08a3ae6fc96cc969af73a17d3224e57996ec947438642693c6
 DIST ansible-2.4.0.0.tar.gz 6623856 SHA256 1a276fee7f72d4e6601a7994879e8467edb763dacc3e215258cfe71350b77c76 SHA512 78717b19599bdd46a7285b0b2a4c9d0d5b4cb86fd41dcf0b3340cf65945a55fae4508097058098fbeab871422c31d4f37ab4cd149abfd0af5add6004f65a207b WHIRLPOOL ef957f6b03558f3fd2f711b0551405b1991ec9f404e033e4d9ee074dad07735a651a01d8191d3d111f5e65017621f18711955465547966235048214b3b7bbe85
+DIST ansible-2.4.1.0.tar.gz 6675552 SHA256 da61afb29cc5bd6bc4737a2da06e673fb6fccc3ae2685130d19ab3a8e404fb6a SHA512 86bda43d912fc6b9cbf662e7e9e3ca3178ac577bc7857c5dfc0e68a7083d76ad405b0ca9b34f680a0d635b87e0bf5dc8cbdeefb93174242e1942eabb74b07f1d WHIRLPOOL 47fafd256e4d4a74ff6619406b595168ff7ecdf6c0ee0a48d67047d1e29707f46ec6bbd0200fa59f09f8e111c470a597f0533e63a63ca17264511fda77f4a306
 EBUILD ansible-2.3.2.0-r2.ebuild 1675 SHA256 c95a67e676514236d5fb25b6a89f1b16c2b13bd6556b860b0c5dbbcbd3989204 SHA512 7f6c8f28056800aeaf82403de41ef5971b8ea4977b2642f6531132b58e22aa7ff81d49b18f2d57261dbfebaf68e1ed625fa7331ac4cc5f489d2e68de274fe81c WHIRLPOOL 18a3ecd6b0be621ff0083ae94e3dab09191476713a93b932b8d84720ca2b8eb5cdd9b3d4834fe34984e6f786d1c34358d946c79a8ea8a182c1dce8edf1f0414b
 EBUILD ansible-2.4.0.0.ebuild 1422 SHA256 b2dcb4888b3b80c08d1dea667f1d42b07e064ae6e5f446c1431e29fd4358e676 SHA512 227aabc8dfff8bdd0322ee083627daa823a2ffc1897b9abf15d725eda1de89348faa95749f7a0ba77a8f81dcd07c098c7f154508a8426c46a714aa067229ac86 WHIRLPOOL 8881836a053741e3ff838bbd8be534a64cd62ea06ef41b2567bf96399322020e642ee06006acb2643a4435edab54797492a1cfc72c5da48628740a4dfe8c1684
+EBUILD ansible-2.4.1.0.ebuild 1424 SHA256 554bb873f35f07ba8d1f5b95c910e6396637fdbcf71c41d86e90fc1736ae7b40 SHA512 c5e793a5519429e77994af31a65583b010a12b9959a59c835e2c6131a9d2453257ba82c9199f8ee29284042590dca81bc1f5be9dc9c725769ae4958bfc7a8941 WHIRLPOOL f9c4c7f2cc5390aa98493ea364855948f26338c14dda788a53cdd24a00378bb7ff1e23760f4f945beb18ea98100d3de6b1e355ac59e0ac1c68229fedc721b93b
 EBUILD ansible-9999.ebuild 1696 SHA256 08c84153e567af00758970889bf449dc3c4a06aea6d8123c419a8fff88875ab4 SHA512 cdcae2ecd1f9257c88aa3545cb874d1992a48d0dfbfe25a599fc5cd1d60b48abf3d1f17cb992fdc750625b6916f8e264ac79776e474945ff6f6a1dec3598b372 WHIRLPOOL 9dfb579a17443a0b2ab1c4ac987da55d03ed9c58cd0d72bc2e4bc56459479ac375768c129583ed2720be5d6ac1145fbbe0a7df6366ace40ccbf60b350af9bc73
 MISC ChangeLog 9769 SHA256 199baf005e4d3f8d68566cea3ff4b6410b202cce107ab90504981dac00dd34b5 SHA512 d0f84e1dcbd3628c26e0df2d80ff829cf146f3ab8e6f355c8dc187b2ad5e4be9a1e60f22176e669548f2d355c9659dbeccafcf096de47d52c50842d1b65afac4 WHIRLPOOL b6dba8621dc6d3da894e717f48d9c5ec844c885d594976ef2a759898ba1a9e49db0172b358c0e161e615ee71ab42bc7ddf51a7b77db29e41eed6f5e768d4f5ac
 MISC ChangeLog-2015 11597 SHA256 88b37db76a87a55c7ac0afd355e215dcb788a0217a70561d8a5bdac8af71415c SHA512 25b912511f5763eb335b67a5adf194800b131440c0170b7cb37772e07ee926a2df530586ab77f8963f95b1176e5309de3f5597e7bb57df80f5e025afe83969c4 WHIRLPOOL bee785f57512f313a52908c3e93984138fde5b67ed2f800e6fa7438d6a4fa9517c05aed9326f2b922e6eb89fe4e2ea2f98f4e5a44b5a55747b6ef8fbe4ed0540
diff --git a/app-admin/ansible/ansible-2.4.1.0.ebuild b/app-admin/ansible/ansible-2.4.1.0.ebuild
new file mode 100644
index 000000000000..bc2eb3c1c4fc
--- /dev/null
+++ b/app-admin/ansible/ansible-2.4.1.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_5 )
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="http://ansible.com/"
+SRC_URI="http://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		<dev-python/mock-1.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+}
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 4eca733b9d17..3e5c07ee2669 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,13 +1,13 @@
 AUX apache-tools-2.2.20-Makefile.patch 1573 SHA256 a523a76bcd87059e401b89d341c691423ab4cb4752b8d8871f7d499715335ef8 SHA512 85120f1b57cd14baf3482dc21d4175447e135700a1f8e6455970c14e576cb0c510815681a9906de4c7eb68743de7e41bbb2d86e83dcb62cd57eb0c9f638f6892 WHIRLPOOL 45f4572d51ba4de804ea7be467c19720010a5e5dba9b1904b28f6666a5d0986fafe5a93737e4a38cc86dea32c6ce0ca816358744f240bd84ece0bbbf6e87d508
 AUX apache-tools-2.4.7-Makefile.patch 1695 SHA256 69e1d6f232cb887d516b36a38c4bff1e10d36ed91fd1776cb7029b798525f2f7 SHA512 f597ce5503e590ed5b2621c04dcf0a571a73b70f144df7fe4e5fb7329a4f1558a5eb16913fe3d7c58ac1030f46cd2b1882e08d0f62106fbf8d40a8677c6b9448 WHIRLPOOL 6962efc88b83d7a42029440c0abbdbda92c71a6c7ffda98072756e25ed54060050bdec1115550de76cf5fd1802cf3a7fd156796ccdb8c1c4139f375be8ade7c1
-DIST httpd-2.2.31.tar.bz2 5610489 SHA256 f32f9d19f535dac63b06cb55dfc023b40dcd28196b785f79f9346779e22f26ac SHA512 5aa47d4b76f692bbd8b309135ff99152df98cf69b505b9daf3f13f7f2a31443eaf4995161adfbc47a133b4d0e091fda2d95fc6b87a956f0ada18d7466ee28e74 WHIRLPOOL a2e3e53c51719cb6f7e641b41788cd89ce7b4d2ea105b403bfa3b3d4479b69c5604228269062f66722594e105e91121d05b1c9f27ca7dc4ecfcf339da8b8375c
 DIST httpd-2.2.34.tar.bz2 5779739 SHA256 e53183d5dfac5740d768b4c9bea193b1099f4b06b57e5f28d7caaf9ea7498160 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240 WHIRLPOOL 0bd86b3644fae79c74928c0cd8bc3e4b7d821544a760dbe6459df43210f690d3c4dc74168e029b0b5bbaba6fcd0433aeb4312794455d91b00b7c36c537dfdefd
 DIST httpd-2.4.27.tar.bz2 6527394 SHA256 71fcc128238a690515bd8174d5330a5309161ef314a326ae45c7c15ed139c13a SHA512 7e7e8070715b74cb6890096a74e194f4c6a49c14bda685b1ad832e84312f1ac4316ea03a430e679502bfd8e1853aefa544ee002a20d0f7e994b9a590c74bc42c WHIRLPOOL 35aeaa01b2bf5772ad21d1011e619befd75fdaade5aa0ca7c61367e7b7a66af28dccf8729a53418f2598199721b68aac7d8c575797ed218150d00af4e8dd4dba
 DIST httpd-2.4.28.tar.bz2 6553163 SHA256 c1197a3a62a4ab5c584ab89b249af38cf28b4adee9c0106b62999fd29f920666 SHA512 8de8e32b87e6de220e492e74db9df0882fae11c3b9732f3d3316da048c04767ac4429c0433c36f87d8705263e3376f97a7e1f66a9d7a518632a67b6fe617590a WHIRLPOOL a4c8be522d5e900e01cefc0fc6d196e3e49e45e2daffa9ec22b2dc44deace506da5a4cf68afd04b0062b87ffcd27b6e59d0b8ae71cc2304d5080d066174e95ed
-EBUILD apache-tools-2.2.31.ebuild 2154 SHA256 3a0897803e8e7751d12ba5796d1446204b8cfc262f339caf5df103d03090c181 SHA512 ee6d208a81d42676e847f6502ab55361a4212a9a0eedb12eb8fc1039bf18af84bd969b04526db0adaf05ab8c50f1d99a9425155eb34aed00f5f8272feb1e13a9 WHIRLPOOL 185d4500e1f73ebfb34bb773e52c1ca38291a2f1f1a10111a8807e0a8201b3e2cf2e68fb6cd9a8f6a626048f6dd67af63ec19366030f5e45378748e7fdfcdc3f
-EBUILD apache-tools-2.2.34.ebuild 1990 SHA256 2d38b93c76cc3d8bd45196bf63b86091becc277cabefa4e515abfd21f06e5f03 SHA512 361e835bfd379bd5edf02844f72510c6089ad3e2a311db9d042aaf1cdcbed1f70986e28173d958497b01f787a06cfac4f4969137b1e5e9b56cb43ff27eb7fad6 WHIRLPOOL e3602a6c628240961281612921a269b2c40315fae9350a73fa86c0ca3ea6946d3553624bd19a9a39200ec39959049bd2b0aae37172afe5cf7feba85f24feea48
+DIST httpd-2.4.29.tar.bz2 6567926 SHA256 777753a5a25568a2a27428b2214980564bc1c38c1abf9ccc7630b639991f7f00 SHA512 840982fd3d21463bc5c1747f211dfacf3abdf634d149e49bb49fd2e5deda140de602dbdf31e1bbe5337a48f718ab2261c408e83a8dd39a9291ee7b6b7a85639a WHIRLPOOL bd91e3baa3c2b25cb6a4e48062c38a97f9c941884be2e44805a3a08e1fdfb13bf18b37b6c7ab9e7656934f2d3b8c2893e79480ee119f073bfbb376b6c3e32a74
+EBUILD apache-tools-2.2.34.ebuild 1989 SHA256 4d01baae38b96247523ff6220f71908ca5e9c04c06084420841b0c1cea40217d SHA512 1041e7e11bb9fab007fc2e013d23b35732be287e67513fcbbb318988b224260993654e272d4ec9d76075e1dd449140c28a28c0009a49407fe880e33114743dc7 WHIRLPOOL f607531b302bcc91aeed2923d07c35b7e279496284870a5c8f8f44a4d72c78cc6223e5fe108e552906b4f4faca3fe04c03befd4f7fcf479269621e75cdad520a
 EBUILD apache-tools-2.4.27.ebuild 2665 SHA256 a4a00940d981ba9e1fce7d0b9737fb044e63c7f588ba2f0212d1776f615f97d4 SHA512 a6fb3773dddad5cc2f9ef78dd84b716c18194a77b25c4f096d7b3fbb8feac40d6c48ab1dabad7fdf065e4a25624a6ea9d8e2c092b05a711e8a1b980503863435 WHIRLPOOL 02f1c15b64dd5ca3a6f3ae963e9a3a2753887d2791a3ddda161622d6691380ea5bd439cfb851d9d3f1bf227e4af8d962aa4ddf6607ce6b87a4e0e3c4adca2c6c
 EBUILD apache-tools-2.4.28.ebuild 2674 SHA256 e1192010d093e007643ba1d6f43e62590969e8b6e72351fd256e2853b4bde00f SHA512 0c389a3b8f5edb9b63b2248ab05e9441478cfd7f801bd9e389845c4ffbe7521d09f21b78f91d681935ac8ce8615f55782ed8bfe1f79fb5756f718f095b2fe89f WHIRLPOOL e27f202caed6995f9c0911e6a75d02d84bbc4cf5f5758400c2cbfb83143f3fdff0685ce7ee95194a7fa8f1a86bb4e153e98eda1c0aeae1bdc559e7b850ed8c45
+EBUILD apache-tools-2.4.29.ebuild 2674 SHA256 e1192010d093e007643ba1d6f43e62590969e8b6e72351fd256e2853b4bde00f SHA512 0c389a3b8f5edb9b63b2248ab05e9441478cfd7f801bd9e389845c4ffbe7521d09f21b78f91d681935ac8ce8615f55782ed8bfe1f79fb5756f718f095b2fe89f WHIRLPOOL e27f202caed6995f9c0911e6a75d02d84bbc4cf5f5758400c2cbfb83143f3fdff0685ce7ee95194a7fa8f1a86bb4e153e98eda1c0aeae1bdc559e7b850ed8c45
 MISC ChangeLog 10183 SHA256 4160609514d162d5b28196a6b3a90b27cbb38ca71e9f4a8abdbae628d76a8e66 SHA512 b53f5eae871b1183b7230969cca04477a09cb263e5f6a95744831247d8c65aa95fbe5d639a184a4136de537223745500e43f36982c77d3bb0243158bd74ef664 WHIRLPOOL 8c9a2298544d2c4a91470ef3147e34e750a0cc687882511a8f6273c3073ec878a5e60536af3edab0d16d664daa57c6ce233016ca07536ae5784e2f332bed0c9a
 MISC ChangeLog-2015 27945 SHA256 5d6bee2eac0905e873ea8986ec7bc3d4bee37581d931c09e55e6ab8c414b2d83 SHA512 f2f602931d36aaec1068c643729dabc4cc30c2a936cd418f48cef14dcc25d0e6eebb79cd003667a38e82e0eddbc2c5f6b35801314c1d0fce08643713ceeb00e4 WHIRLPOOL 01ed580519a15a2b7d4b89a1ed5f7bd223eefbd6e4d3804802ae5970f08125c02b64db936c6f401075844f2a5e608499cad29963cc21d97bb3a625d58671146c
 MISC metadata.xml 508 SHA256 6278b055b895401969703dc8f7a8d49244543e693e77bf57be03485a76f518b2 SHA512 0837c71bf2c7d2c54b7f6e3fcc4f5f1f42b36d6e14a981e38d77089551318db72c731a5d0eef0fd95ca55e69629a790f2e6719ecb59368cd7dd935ebafaa89aa WHIRLPOOL e07c6e0a11487f30d482e847cef17aa6f6c9365f469e5f9debf057a93701d91ca82d014b1d89799abdbbf0203d3ff3713c502bc605c7b74a1179c3330dca256f
diff --git a/app-admin/apache-tools/apache-tools-2.2.31.ebuild b/app-admin/apache-tools/apache-tools-2.2.31.ebuild
deleted file mode 100644
index 164fa3333408..000000000000
--- a/app-admin/apache-tools/apache-tools-2.2.31.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-inherit flag-o-matic eutils
-
-DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="https://httpd.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="ssl"
-RESTRICT="test"
-
-RDEPEND="=dev-libs/apr-1*
-	=dev-libs/apr-util-1*
-	dev-libs/expat
-	dev-libs/libpcre
-	kernel_linux? ( sys-apps/util-linux )
-	ssl? ( dev-libs/openssl )
-	!<www-servers/apache-2.2.4"
-
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-S="${WORKDIR}/httpd-${PV}"
-
-src_prepare() {
-	# Apply these patches:
-	# (1)	apache-tools-2.2.20-Makefile.patch:
-	#		- fix up the `make install' for support/
-	#		- remove envvars from `make install'
-	epatch "${FILESDIR}"/${PN}-2.2.20-Makefile.patch
-}
-
-src_configure() {
-	# Brain dead check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
-	append-ldflags $(no-as-needed)
-
-	# econf overwrites the stuff from config.layout.
-	econf \
-		--sbindir=/usr/sbin \
-		--with-z=/usr \
-		--with-apr=/usr \
-		--with-apr-util=/usr \
-		--with-pcre=/usr \
-		$(use_enable ssl) \
-		$(usex ssl '--with-ssl=/usr' '')
-}
-
-src_compile() {
-	cd support || die
-	emake
-}
-
-src_install () {
-	cd support || die
-
-	make DESTDIR="${D}" install || die
-
-	# install manpages
-	doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm}.1 \
-		"${S}"/docs/man/{htcacheclean,rotatelogs,ab,logresolve}.8
-
-	# Providing compatiblity symlinks for #177697 (which we'll stop to install
-	# at some point).
-	pushd "${D}"/usr/sbin/ >/dev/null || die
-	for i in *; do
-		dosym /usr/sbin/${i} /usr/sbin/${i}2
-	done
-	popd >/dev/null || die
-
-	# Provide a symlink for ab-ssl
-	if use ssl; then
-		dosym /usr/sbin/ab /usr/sbin/ab-ssl
-		dosym /usr/sbin/ab /usr/sbin/ab2-ssl
-	fi
-
-	# make htpasswd accessible for non-root users
-	dosym /usr/sbin/htpasswd /usr/bin/htpasswd
-	dosym /usr/sbin/htdigest /usr/bin/htdigest
-
-	dodoc "${S}"/CHANGES
-}
diff --git a/app-admin/apache-tools/apache-tools-2.2.34.ebuild b/app-admin/apache-tools/apache-tools-2.2.34.ebuild
index 52873291bcea..2b4760c96f25 100644
--- a/app-admin/apache-tools/apache-tools-2.2.34.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.2.34.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="ssl"
 RESTRICT="test"
 
diff --git a/app-admin/apache-tools/apache-tools-2.4.29.ebuild b/app-admin/apache-tools/apache-tools-2.4.29.ebuild
new file mode 100644
index 000000000000..efe38de48918
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.29.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic eutils multilib toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/"
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+IUSE="libressl ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1
+	dev-libs/apr-util:1
+	dev-libs/expat
+	dev-libs/libpcre
+	kernel_linux? ( sys-apps/util-linux )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
+)
+
+src_prepare() {
+	default
+
+	# This package really should upgrade to using pcre's .pc file.
+	cat <<-\EOF >"${T}"/pcre-config
+	#!/bin/bash
+	flags=()
+	for flag; do
+		if [[ ${flag} == "--version" ]]; then
+			flags+=( --modversion )
+		else
+			flags+=( "${flag}" )
+		fi
+	done
+	exec ${PKG_CONFIG} libpcre "${flags[@]}"
+	EOF
+	chmod a+x "${T}"/pcre-config
+}
+
+src_configure() {
+	# Brain dead check.
+	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+	tc-export PKG_CONFIG
+
+	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
+	#append-ldflags $(no-as-needed)
+
+	# econf overwrites the stuff from config.layout.
+	ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
+	econf \
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules \
+		--sbindir="${EPREFIX}"/usr/sbin \
+		--with-perl="${EPREFIX}"/usr/bin/perl \
+		--with-expat="${EPREFIX}"/usr \
+		--with-z="${EPREFIX}"/usr \
+		--with-apr="${SYSROOT}${EPREFIX}"/usr \
+		--with-apr-util="${SYSROOT}${EPREFIX}"/usr \
+		--with-pcre="${T}"/pcre-config \
+		$(use_enable ssl) \
+		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+	sed -i \
+		-e '/^LTFLAGS/s:--silent::' \
+		build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+	emake -C support
+}
+
+src_install() {
+	emake -C support DESTDIR="${D}" install
+	dodoc CHANGES
+	doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+		docs/man/{htcacheclean,rotatelogs}.8
+
+	# Providing compatiblity symlinks for #177697 (which we'll stop to install
+	# at some point).
+	pushd "${ED}"/usr/sbin >/dev/null || die
+	local i
+	for i in *; do
+		dosym ${i} /usr/sbin/${i}2
+	done
+	popd >/dev/null || die
+
+	# Provide a symlink for ab-ssl
+	if use ssl; then
+		dosym ab /usr/bin/ab-ssl
+		dosym ab /usr/bin/ab2-ssl
+	fi
+}
diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index b5546349f237..ec8b9390cf13 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,8 +1,8 @@
 AUX calamares-pkexec 43 SHA256 1a9c278c085bcb7cb3b1027bf6ad19d153492667730afd2b94c8736387355168 SHA512 768148cd58cdfb5c6791b76ec60c21a4ca852120f53ed31a83bc7a2e0a26aa77b10bd3756182d3dff03208e820def4b83c45edba0484fa2f5a33c93880c3f4bb WHIRLPOOL bda196e8adb3b9207e9f98677dff5a4664504c114ab72bd0879d8518b74b95b558a2c90bcc612dd6f570b04c9f21fd5b46a51d55dd0f73b4fa288b3482d61f4d
-DIST calamares-3.1.5.tar.gz 2266110 SHA256 02bd3c10e06ac207cdee0ee29f8d20bfe48eba491800e3eab704e1d294736260 SHA512 92e29668ddab880b76319fbf4eeffea21bfa0bd5b8807cb5a2c2786eafe4921f442a9a5773243fafe5942a346d46b89285e9472d4c8da70b70979a049923df06 WHIRLPOOL 74b396551aee5c7831b05a0c40df56f047bf6bd1fb0c9e3e51b2791696b9e19eb1db78128c1167a668d0d4e412cddbb819c807dfb52cc8bea667307921752a80
 DIST calamares-3.1.6.tar.gz 2266993 SHA256 d18d50aca6dc8b8d4d4933b507fdaabeb607adc9c9c14646f1031c005aeaaf98 SHA512 d6e7fa5a040e507141bbd6b3863f5743b9646e503cfec26ed710718835a782b0acf582f24959eb52d906eeca60061d39e01b4a542c3d83535efa17eb4a5b0b85 WHIRLPOOL 3fc71da001282cbe7c670b192335ddac460f3fb053849a51d95d9113b6c31a27ff65ce64811ca26c456ec01911ce8685d73c793183e71bc696cd896f9bf38507
-EBUILD calamares-3.1.5.ebuild 1974 SHA256 e085c918ef2eabc105c18edd8ccc071e76b71a48f384a969cb185def6ccbc754 SHA512 e6b308f8fe540fc520d4f071e6276e924dfbff7c0176a3b27bd0ca9ebf400ffdcbf54483cbcdcc2eaca11bf72463ceb80505262f5dfa06c4c02f519d645c8b38 WHIRLPOOL c7a51d470b9c62172866746df925699bdc96323f07a2e85d291d5eeb37d36f7b253e8dde2aeebb1d676efde79c71467731507f7198a10b82323637fc0b768d5f
+DIST calamares-3.1.7.tar.gz 2275893 SHA256 91ffee72df1d222c50db81c3f48d44e617019db95d1f58ab16a962b1fb47d749 SHA512 eaf516db4d97b89a5854c5dac5fd556a2deb47bebb88e7c55e2bb7d4ce050e913afbf08c6536503f5c3af7427a43b75f67bfa317e1601bb5a6f05f17c5bf6760 WHIRLPOOL 71e248e3dd8a9e05b5a0d25807607c3d026ba896835edd559ce716c9edf5ae8b840570ae453772558cd05757d99acc09c90f23423045f1754cd56b8693b99a4d
 EBUILD calamares-3.1.6.ebuild 1974 SHA256 e085c918ef2eabc105c18edd8ccc071e76b71a48f384a969cb185def6ccbc754 SHA512 e6b308f8fe540fc520d4f071e6276e924dfbff7c0176a3b27bd0ca9ebf400ffdcbf54483cbcdcc2eaca11bf72463ceb80505262f5dfa06c4c02f519d645c8b38 WHIRLPOOL c7a51d470b9c62172866746df925699bdc96323f07a2e85d291d5eeb37d36f7b253e8dde2aeebb1d676efde79c71467731507f7198a10b82323637fc0b768d5f
+EBUILD calamares-3.1.7.ebuild 1974 SHA256 e085c918ef2eabc105c18edd8ccc071e76b71a48f384a969cb185def6ccbc754 SHA512 e6b308f8fe540fc520d4f071e6276e924dfbff7c0176a3b27bd0ca9ebf400ffdcbf54483cbcdcc2eaca11bf72463ceb80505262f5dfa06c4c02f519d645c8b38 WHIRLPOOL c7a51d470b9c62172866746df925699bdc96323f07a2e85d291d5eeb37d36f7b253e8dde2aeebb1d676efde79c71467731507f7198a10b82323637fc0b768d5f
 MISC ChangeLog 7327 SHA256 06876264cef6e8962030c803f3add9300544f649cd1b76266580629be569e897 SHA512 66c97585da7e7083117bd87828614f7f003e87ef90fd5f232153b7de58bb44573dacb648ebd697b92765ac081b84667601c636c3d33b33c5293a8e5887e5a5b7 WHIRLPOOL 6a131253a3cd20cd043be6c32be5acd737c7e74760efca0237a06f514e9a58c92e18703fd20ad47ccf5d8b5137eea7cdf1f05b72087f7ff485114ee2e57c7182
 MISC ChangeLog-2015 671 SHA256 0e30b76881788f8c37df34e842750d456934309aa7e72026870766986f94f978 SHA512 707ea2c09d816d98ffce58fe26b62d85cfdabe4b8967208fc4e870cc12162381a335646be30a9bdfb16f17a90f359f3168dd9bf0d85513368f8707de06a935d2 WHIRLPOOL ccef8a153f1546f1ffc2f5a4433f87703715e86555445add9d75542550ecf62b9074117977fc3761c85b5205bbef3b168a8032069826b4335d756694fdd26faa
 MISC metadata.xml 1055 SHA256 8fb8c7c1b36c5350743885f9e922cbfdc8e2396f5b955abc5651c7a140da08ed SHA512 0269dad0b0a05e7c729ad5b9f1f7d6790c117b0d76b904dc909b868b1c298ff3352faafe91104b39cfc3c2e4f5e1a20244d3f5321c937d2334bd15bd910dc89f WHIRLPOOL 30ffb01457383c8d69cfea217c66d93123cf17a15a9553101013d64b6328f1f9b51ec42e3e5215aa0b71241355364bbccace3ea32baa23b072c32a76d7c6113d
diff --git a/app-admin/calamares/calamares-3.1.5.ebuild b/app-admin/calamares/calamares-3.1.7.ebuild
index 780fcfe4fd0f..780fcfe4fd0f 100644
--- a/app-admin/calamares/calamares-3.1.5.ebuild
+++ b/app-admin/calamares/calamares-3.1.7.ebuild
diff --git a/app-admin/cgmanager/Manifest b/app-admin/cgmanager/Manifest
index 4743ddc4adee..a55d86831f94 100644
--- a/app-admin/cgmanager/Manifest
+++ b/app-admin/cgmanager/Manifest
@@ -1,9 +1,7 @@
 AUX cgmanager-0.39-make-pam-conditional.patch 1068 SHA256 ed638b63b6e893a664378f7ab22083410225639c8bda431c283c8c728cd8b745 SHA512 d7673d3189af0279f9b34a94f8fd7631ab3dea68df5df11cdaaa541e4978ebeaae8d0fc91f9cf331853cd96dab6d9b284adb469d409fb58f5bda262bf96fbfa2 WHIRLPOOL 3f00abbf764411860250471fa418c1d5e30419e3f4e58f76f25aa54d91587713163fa7e5bfbe2d1b3ae89f29cd2fa8fda6f8a16e816b315739a53e504af61440
 AUX cgmanager.initd-r1 331 SHA256 f162685428a6593630daf5d636c198caf4992843ced977dc6d7288b7559a062c SHA512 f50afaf471f9e9d500cbc909da1185c1342481699eb1887f694ef91bd49c7cd727d21871ff5d6c0b6046601cfa72a4ac167926c62920b2f3a4902ec817401948 WHIRLPOOL 769e94196151bf11b9ca0ec5a190b85b47860e75d65a4bb13f624fd80794ad656b60d99cc6b28a56273b79d89431cd3c625ad3386d3c861f3bf252ec7b182d11
 AUX cgproxy.initd-r1 661 SHA256 97220fa0af6dcaa9d2cb726620ee3de8e216e55bab37cea40e5ed010ed637e35 SHA512 7f43ea6369428d71d122a191c6a1718987ed09eafe2217ae326606ddf2a50f0500d0de0520fe21e5d2edefb8ddd4c3a85623d2aac1212e821ea922cb8256fffc WHIRLPOOL 46931abeeb41bc572f195e0848d42d189df6e001b86b244c9dac5a9f1615f52491c81c3823b9d03ad97e13b4f3ec578174b84ecac5e31d2e95dfd3414cb64993
-DIST cgmanager-0.39.tar.gz 437683 SHA256 9e65487fb4e4aa0a6acd87ba7f8f00b8007d8c52608aa6d411e72e6fe9445b7b SHA512 2adf2c639191fb681ffed083629d6ba93f6d5a3534d4dc00b2cff1917c3273febcb30ec7d524ee95ce4a1b8811d902a2ff1cdffe911a66850fb9f10750ef1801 WHIRLPOOL b57c0feb75543af7e7eadccd5287962034fa2c54883289822b54ed184873fb1b6e1eb6d9dcc952fcda2f3027d84fa517c2bfed22a855ede8e700c2298d5d210a
 DIST cgmanager-0.41.tar.gz 461805 SHA256 29b155befb3ac233d5d29dbca7c791c8138bab01bfa78ea4757ebb88ce23b458 SHA512 e8ba64665a21d987cd835580c2b6bafbcb05e22ce7f6216762d04840957c2cd21fb571360e0206ae9143656beed88ff3396eb1f644052c05189093a665a705fd WHIRLPOOL 4571c88415f24dbd3aae240e2427e27786538653602b4b6ba862eff1abd7fc8b2f97784ca5bced4481f738638030a5777f3d687ee5d115492d7a91ebf4985ab1
-EBUILD cgmanager-0.39.ebuild 1333 SHA256 f7c29d99bd193495480d437278b836dd78ebaee29fd19902299b0d3c80a40be6 SHA512 94bee732d5068fc8a7063f5a6dae65eb45a4d2d7e054e33554d756e8a2515bb660caf1effdd7feff8aefdac3efcefc0c4264e81d3fa03fee5c565e995eda693a WHIRLPOOL 4e0595eef76c5861a4d1d0dca834e2f11c2a6d7ed66a5bcac6b67f9e78a71dac9c526f00a2422c15b26cc00fd29d9d2d68a8f3e18fc6e4d8c8cbf859c2b6b46d
 EBUILD cgmanager-0.41.ebuild 1234 SHA256 ba7aba502daf07b38651a67fed5d75f17cb8f2752888e937cac59ebc48e678c6 SHA512 b5236eeb934b5a8679a965783ef187b4b3f603b69d37d1a572ea1c8a0f22bbd78c7339cad4aba8f4ffdf3970dc647cf46c1b132e18f19c4fd7057031fd06ba41 WHIRLPOOL 80e26f9e4c718abd959a01a2f3e457486c95aa3830f0b7853a21560fd292376765b164112dd086e32701f55a95bf94367203653bf194bfa4e7c3ef90f7b565a4
 MISC ChangeLog 5834 SHA256 dec321c1c0ef10f9f7a0528aa31395ae91a1dde36d9edabf412010308bf27c5a SHA512 480524d8362e6adf849c8206c4c9fb31a58140bde59a8ccc21062c2859b5aa0b50800ac867254039a0f0586cac8a0da62e1b16d4f1287002a9386d5dd452be5b WHIRLPOOL 00c753a142763c2a6bfa73d200c40c0060c784333817ef0dd063de6e8cb7c31e26799df4655c25b520f7eb62f39bff689fd85f6a24c1611f983f65387d6e51ad
 MISC ChangeLog-2015 1411 SHA256 98ad80d5d71eeae2e4b1a74749e10ef94073e6cf3d2af6b3380c94cfcdec34aa SHA512 30ea6c095bc2d429288c1137b45acd298458c56f3669fbe580521c4ea11c8747697546fddf80efb7924e3d5cb5d038a60ae71718352f1b3ba748a4b6272041a0 WHIRLPOOL 7e63e060b71050272a5067e82e5a346013657b11ef507f94f1488fceddd499210a798e61133d8fd0b40a213151f6cb0d2e905eff9c49408afce57dc9936ce5ee
diff --git a/app-admin/cgmanager/cgmanager-0.39.ebuild b/app-admin/cgmanager/cgmanager-0.39.ebuild
deleted file mode 100644
index 95c7b5cdff4f..000000000000
--- a/app-admin/cgmanager/cgmanager-0.39.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools pam
-
-DESCRIPTION="Control Group manager daemon"
-HOMEPAGE="https://linuxcontainers.org/cgmanager/introduction/"
-SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ppc64 x86"
-IUSE="pam selinux"
-
-RDEPEND="sys-libs/libnih[dbus]
-	sys-apps/dbus
-	selinux? ( sec-policy/selinux-cgmanager )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch_user
-
-	# systemd expects files in /sbin but we will have them in /usr/sbin
-	pushd config/init/systemd > /dev/null || die
-	sed -i -e "s@sbin@usr/&@" {${PN},cgproxy}.service || \
-		die "Failed to fix paths in systemd service files"
-	popd > /dev/null || die
-
-	# there is an automagic dep on pam
-	epatch "${FILESDIR}/${PN}-0.39-make-pam-conditional.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-distro=gentoo \
-		$(use_enable pam pam-module) \
-		--with-pamdir="$(getpam_mod_dir)" \
-		--with-init-script=systemd
-}
-
-src_install () {
-	default
-
-	# I see no reason to have the tests in the filesystem. Drop them
-	rm -r "${D}"/usr/share/${PN}/tests || die "Failed to remove ${PN} tests"
-
-	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
-	newinitd "${FILESDIR}"/cgproxy.initd-r1 cgproxy
-}
diff --git a/app-admin/cli53/Manifest b/app-admin/cli53/Manifest
index df8399b90a10..a8a2ed51af8a 100644
--- a/app-admin/cli53/Manifest
+++ b/app-admin/cli53/Manifest
@@ -1,4 +1,6 @@
+DIST cli53-0.8.12.tar.gz 973966 SHA256 cf8511bd283fe9fdc7fdf493706e9f8b4902f27b9d51e6a6dc601e16472cd129 SHA512 abe5e092fb570336b2d50099934d1cc5e722e394155b86de2dc2315df70eb1a89bb57f131913ec2dd588b6476c900c9d07daab0e8396e8364548f92651377fea WHIRLPOOL ccaf6e670613e74c6087408483fcb2fed6562a042abc7e61ebe995ce7f76b2122cb4d5baef45688896991954f326191a9c80ad33dc4b6fb6848dbed0262f58ca
 DIST cli53-0.8.9.tar.gz 4372517 SHA256 c3b17d5b445d9bbfe3caf9552d4c0bbec649fd630e8eb13cbb5bc49522b02d73 SHA512 14db2d69feaa5af9e82c77b6c837be55a5d97e438eb6efbb71857fa1630ec1aa5ec77648d0979ce69ca8fcf72478b55c55c12a5e5dbac20415e656fd9c8d0beb WHIRLPOOL 2606a227142211e06096467143106e5657ecc5f2072a3450dbf41af440bfe3dbdf1d385a55accb38c625e42501e3077926e2bee0265affac66b7c0d6f7413b76
+EBUILD cli53-0.8.12.ebuild 673 SHA256 e98676dd1e446cbd73204600450b89cf69331a57b70cff7afc7b142f0f81e3aa SHA512 d4935cf863dd45b05d1c099af76943c6b79bb5ce6830d7c9b730e49cc0ed4e0169037291e9f193b445f4b5d58bd86f0b0441a6ea92bbe1d150ac3b2d01a03590 WHIRLPOOL 27081b5da3e557c7148d9f3d7034e70ff5f288cf5ae1beeb71c113648ff43183823b6a53b6771f5e692df6c8e7b49beffa38847ebd9fb637fca52aa876a591ef
 EBUILD cli53-0.8.9.ebuild 673 SHA256 e98676dd1e446cbd73204600450b89cf69331a57b70cff7afc7b142f0f81e3aa SHA512 d4935cf863dd45b05d1c099af76943c6b79bb5ce6830d7c9b730e49cc0ed4e0169037291e9f193b445f4b5d58bd86f0b0441a6ea92bbe1d150ac3b2d01a03590 WHIRLPOOL 27081b5da3e557c7148d9f3d7034e70ff5f288cf5ae1beeb71c113648ff43183823b6a53b6771f5e692df6c8e7b49beffa38847ebd9fb637fca52aa876a591ef
 EBUILD cli53-9999.ebuild 673 SHA256 aeda60a22da719c5c5083c16d23f93c3fc19110354fe32bb0d8793d51eb33111 SHA512 0fe48f48ede9500a63bbeb03f4da47aaa4235fb0fa2c29519b3860adda4c37a5a0e97587d5825ae75d97fedcef4fce5837662c7ccd88b2f6be9c3011cd73b201 WHIRLPOOL cdaec886a9b050dcf760c3d92a07bf21aa9fb24102d9a5aaebda7c7ec369440f30dc5d64f3b7dcaa775a7ad23baabeddaaad94cf90e372f5b8585d40cc34b457
 MISC ChangeLog 2842 SHA256 d57c8f789553012233b74a4849cddb3699b7de309f8ce322f4ebfd8ef8b3841f SHA512 89f809f5927c29eab9a47d1d3d839e3d82064271997d027408e8c088aa20fae69496a7f72ae8c54d3b24afdb2f5a2ab46a91747ee5b6b200568938403cd3b80c WHIRLPOOL d13ecabc30fbc2cb6aabfd6de05c370ddcebcb14e92ea15dcb8896da4647845f3ae5b107a59ad0d004f09a4f25a33965f5f1c24b77d3a3cfe740ad188935ae73
diff --git a/app-admin/cli53/cli53-0.8.12.ebuild b/app-admin/cli53/cli53-0.8.12.ebuild
new file mode 100644
index 000000000000..c2d625e1fc6d
--- /dev/null
+++ b/app-admin/cli53/cli53-0.8.12.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+	inherit golang-vcs
+else
+	inherit golang-vcs-snapshot
+	SRC_URI="https://github.com/barnybug/cli53/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Command line tool for Amazon Route 53"
+HOMEPAGE="https://github.com/barnybug/cli53"
+
+LICENSE="MIT"
+SLOT="0"
+
+EGO_PN="github.com/barnybug/cli53"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}" emake build
+}
+
+src_test() {
+	GOPATH="${WORKDIR}/${P}" go test -v || die
+}
+
+src_install() {
+	dobin cli53
+	dodoc CHANGELOG.md README.md
+}
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 11fe28cadf16..bf14ffa55870 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -5,12 +5,10 @@ AUX consul.logrotated 85 SHA256 9c69976b13ea56155e8cc9fc70327d8b7a24a0dd01f67c5f
 AUX consul.service 354 SHA256 e36670c1d1189403996ed74704c1751666d4bb2340d5c62f0bbedcfdd48ac539 SHA512 537d35e5a79d40dc62f6eb04f4631251d1e6dd62f2bd7d5483274903996052705db5fb4026000ef6e768e3dafb02f155c5bc1fd15a32813ecca8b1348a95e92d WHIRLPOOL 263352c1372f76f4676e69e7f66362eea69df71ef26d097928c6b02b7a464ce747a7f0d6acd2b01eaa2b62f88ba54bf96879ea3c1f9fb10c42dbf6eaf403ef8d
 AUX data-dir.json.example 36 SHA256 1f1f24ac4b37df816974fbe3e3ba3d7ed1c8d15cb2425ba29b196329473bf38c SHA512 cca94745ddfdcfedcc612da4a14965d4f51f0eaf519d8395e95b8b6cbe7bcb9987b8fdbffd66fb13edda7164a7b0f26e93e5aeab9e631cbf5e0a3a5c05b84b0b WHIRLPOOL a866a28ae0160a138b19c2f8bde315f175932d1bc5ac9b77823cf8e5553644520b5ab2f7206404522e25f3188d83a18001d3631a681e27ae0252c472d231c03f
 AUX ui.json.example 17 SHA256 a90eb6376a8d69443c5f72b434c84ba51280a64d9831adf3882fe548f65c391b SHA512 9aebf80a0dd2bc5345285b63c894af8c0d5864f352d97fc3ba7cd6bf22b905ace3bd221cf23092080e9f7d60832384632c2f069d580eef789eb3f81011e9869d WHIRLPOOL 40ec22ab7c14627f6fa2352b663a3f1545f259e813d14177e591dc52d50de2612d08f53976ddc581e2bef384a11caf22cad41feed521154245eef88537ee6e84
-DIST consul-0.8.4.tar.gz 6614287 SHA256 d5573d6e70d490c8b8109722c2019b5a2b35eff703b92d6276997846361cff1b SHA512 4bbb167a603f1d20940330bd9615ba0f50e0113e1d96ce47773f5d2813635f76dd1aec8f43dae4c8c547cec8a891eb0726eeeda7bd7c5b1d495029b359378e68 WHIRLPOOL e270367c69fe74f25c89ef9e8c7f71307d3b8e48b4210e43e48907f1f5a73f11f45aa2b212f70c24463e35d800b861ccd34e2c82de863fc6e7da9cd3eda5214c
 DIST consul-0.9.3.tar.gz 7278357 SHA256 69b76432203e046a8025ce13f7cc041b2308d72f07f240a57f2ba5d580fcff70 SHA512 a1c9cdd3e197afbf088bd1866af15c1864cb8d042dc65d2fcc0d9070b8bf2f9380cf2ceadaff6d5bba7ecd379d53f4b8191e1ae6832f1b2c82f21c62f07d8b0f WHIRLPOOL 9e5ac311761bc786c986d4b0cdb4ba541a46f57cffd8cac4de96292293518cd8e8f3743bcb0740b245ae5a30f9f157987078874503bd6b0685a9f3c88c92ffba
 DIST consul-1.0.0.tar.gz 7354292 SHA256 60e86cf77c3287edc98f8381c046bc876f969dd97dea7adc68019bff2207af7a SHA512 8223f79aa1b7bfc5693168b56fbe9a506ca504771c92328afeb99e78dce8699c7532582749a372dfed10dd4b7c440ace0dd248f1ae27247059da3e2f88293a88 WHIRLPOOL b40a450efc9587475ccf0f0080c0fb03769557487b3f9a29df9454551149a8235e240aacd82849736f9160d10aee1e04a76035b9bab716b244f7cb13791ff43c
-EBUILD consul-0.8.4-r1.ebuild 1524 SHA256 54f280e236dda24eda7da07f1feed8790b6f493d289b2d3455465f969172454d SHA512 a262f9fcffdff04f28a6e5be42a0037ab15a774675ab32b0d6cdfb1a7c695b9f859e2c189736157c558bef98d21a2cefe48c4556c823667b64ef4578c9541b84 WHIRLPOOL f6fa7c0857d7a470f5ff6ede65ecae00e77a504581b8a04048b314f58e82f950ab84fe4ae0b011c43cbede96ef6e811c57c77f238d870d4c59906c65a0447787
-EBUILD consul-0.9.3.ebuild 1560 SHA256 abff01f71390db4c05ec895508e7f81b9ba4f59514f4e839dc8b5b13407a4a40 SHA512 0b04e487febd8e65b0a24df723fd20532a04506140217a0b4fa671038bcbebd9f7f3d6014b4937871cd05ca1a037ec2ab66a6c3cc045d8b02caed0f61ff90061 WHIRLPOOL dea3ba50f56ab4db18036f04c1bca501e2490aadf99e2de2a0812e4ae9340817b67617f7afec890a9821285162642c786c9500029bbdad7043d8b1e66b3d5dea
-EBUILD consul-1.0.0.ebuild 1560 SHA256 abff01f71390db4c05ec895508e7f81b9ba4f59514f4e839dc8b5b13407a4a40 SHA512 0b04e487febd8e65b0a24df723fd20532a04506140217a0b4fa671038bcbebd9f7f3d6014b4937871cd05ca1a037ec2ab66a6c3cc045d8b02caed0f61ff90061 WHIRLPOOL dea3ba50f56ab4db18036f04c1bca501e2490aadf99e2de2a0812e4ae9340817b67617f7afec890a9821285162642c786c9500029bbdad7043d8b1e66b3d5dea
+EBUILD consul-0.9.3.ebuild 1577 SHA256 f75f253a354b47f0c8a82904807af3bb5ba9e4d408c68b31f3e3e934ec84ca45 SHA512 df46eaa2a8dfd4810ca069458854bd930d478f017c9c76e66bcd48d093825b3698738754a65608e3f10a7ba948bdcf55c51e109f10d44bc0405c678440c1aa7e WHIRLPOOL 7d95fb8915197d558831ea11b4ae900a19506eed8052161a589d8d7fdf55d02b2c59013b00b9de48215b388d7b6b804f924a7f32894586ec4e1ce53f9229ece2
+EBUILD consul-1.0.0.ebuild 1577 SHA256 f75f253a354b47f0c8a82904807af3bb5ba9e4d408c68b31f3e3e934ec84ca45 SHA512 df46eaa2a8dfd4810ca069458854bd930d478f017c9c76e66bcd48d093825b3698738754a65608e3f10a7ba948bdcf55c51e109f10d44bc0405c678440c1aa7e WHIRLPOOL 7d95fb8915197d558831ea11b4ae900a19506eed8052161a589d8d7fdf55d02b2c59013b00b9de48215b388d7b6b804f924a7f32894586ec4e1ce53f9229ece2
 MISC ChangeLog 6414 SHA256 b6c3345f18332d9c9965b335a0b7c4246d852886f0c089f166d2c255d6e0af4d SHA512 664491d4dcef4abda009070a482c80a681f39a564ba7d983b8cf7a680db972550233e808bbaadecfef895c9990bb263f95c6273bf6b24c2f5523b660bb68e7d3 WHIRLPOOL 215e15b6c6379fb4e02ca41848e610ebec31946d24cb8f92adc4ac9b7f7675ef6d12679cf509e50cad04ac01587e335063c19f353f2880748dd1cd13928cf04b
 MISC ChangeLog-2015 1260 SHA256 e346cb99b0d823a6e4052d51aed1e13684aa9c7feeeb8a4b3027b74073e172a7 SHA512 9bcc7db86198b81da562dc68a3ebaa3505be6febaba7c21779580493a226fe7ec37e13ce1a3503ab4b17dfe0fc4e6e8b057908c2855c2b897318460ddc67d068 WHIRLPOOL 684c125f9d249b808024e89ad593c7c4219bcf59e4842d850118b728ef28219169fa6ae05e426fdb25b2cbe94c04b41c02748adc971df47374f57b4f6950cf0e
 MISC metadata.xml 391 SHA256 6b88704531e2782296e0491cf2b57c8bef914045a088c8c68c42b6cf0a655eda SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb WHIRLPOOL 344059242683458d3619a02327cf7e2919c43b940346d351c3d30a4dc91d5089491305ddd2193aad97c593a94151dd263bb7e3482447b3d7f914fa6c20199f4a
diff --git a/app-admin/consul/consul-0.8.4-r1.ebuild b/app-admin/consul/consul-0.8.4-r1.ebuild
deleted file mode 100644
index e12beae0d6c9..000000000000
--- a/app-admin/consul/consul-0.8.4-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-vcs-snapshot systemd user
-
-KEYWORDS="~amd64"
-EGO_PN="github.com/hashicorp/consul"
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="http://www.consul.io"
-SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MPL-2.0"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND="dev-go/gox
-	>=dev-lang/go-1.7.5:=
-	>=dev-go/go-tools-0_pre20160121"
-RDEPEND=""
-
-pkg_setup() {
-	enewgroup consul
-	enewuser consul -1 -1 /var/lib/${PN} consul
-}
-
-src_prepare() {
-	eapply_user
-
-	sed -e 's:^\(GIT_DESCRIBE=\).*:\1v'${PV}':' \
-		-e 's:^\(GIT_COMMIT=\).*:\1:' \
-		-e 's:^\(GIT_DIRTY=\).*:\1:' \
-		-e 's:go get -u -v $(GOTOOLS)::' \
-		-i "${S}/src/${EGO_PN}/GNUmakefile" || die
-}
-
-src_compile() {
-	# The dev target sets causes build.sh to set appropriate XC_OS
-	# and XC_ARCH, and skips generation of an unused zip file,
-	# avoiding a dependency on app-arch/zip.
-	GOPATH="${S}" \
-		emake -C "${S}/src/${EGO_PN}" dev
-}
-
-src_install() {
-	local x
-
-	dobin "${S}/bin/${PN}"
-
-	keepdir /etc/consul.d
-	insinto /etc/consul.d
-	doins "${FILESDIR}/"*.json.example
-
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners consul:consul "${x}"
-	done
-
-	newinitd "${FILESDIR}/consul.initd" "${PN}"
-	newconfd "${FILESDIR}/consul.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/consul.service"
-}
diff --git a/app-admin/consul/consul-0.9.3.ebuild b/app-admin/consul/consul-0.9.3.ebuild
index 1eae049ea45d..73999db91a27 100644
--- a/app-admin/consul/consul-0.9.3.ebuild
+++ b/app-admin/consul/consul-0.9.3.ebuild
@@ -42,7 +42,7 @@ src_compile() {
 	# The dev target sets causes build.sh to set appropriate XC_OS
 	# and XC_ARCH, and skips generation of an unused zip file,
 	# avoiding a dependency on app-arch/zip.
-	GOPATH="${S}" \
+	GOPATH="${S}" GOBIN="${S}/bin" \
 		emake -C "${S}/src/${EGO_PN}" dev
 }
 
diff --git a/app-admin/consul/consul-1.0.0.ebuild b/app-admin/consul/consul-1.0.0.ebuild
index 1eae049ea45d..73999db91a27 100644
--- a/app-admin/consul/consul-1.0.0.ebuild
+++ b/app-admin/consul/consul-1.0.0.ebuild
@@ -42,7 +42,7 @@ src_compile() {
 	# The dev target sets causes build.sh to set appropriate XC_OS
 	# and XC_ARCH, and skips generation of an unused zip file,
 	# avoiding a dependency on app-arch/zip.
-	GOPATH="${S}" \
+	GOPATH="${S}" GOBIN="${S}/bin" \
 		emake -C "${S}/src/${EGO_PN}" dev
 }
 
diff --git a/app-admin/dxf/Manifest b/app-admin/dxf/Manifest
index cb8356955743..d017bada09e6 100644
--- a/app-admin/dxf/Manifest
+++ b/app-admin/dxf/Manifest
@@ -1,5 +1,7 @@
 DIST dxf-6.1.0.tar.gz 281228 SHA256 e5e3bff461ed83fdcbb885f4022db07a336a9992b8257e651b9ab4fac13ebe5f SHA512 ebe0757e311a39bffa86728cbf875c0386e2d7e476c2cc1faf23d578f0d0f504658f9c256a9f6465c2fde351876a40a8c4fc1c5ae6308db8c93a9319e9732eb7 WHIRLPOOL f108b1f230f24cbd1990008c65c5c8bcd8afe033fe79b963412441a6cd1c69115ca4693c4db254681f08b4f9572266324bb82dad14a3f89c6382f1dc22c4063c
+DIST dxf-6.2.0.tar.gz 284243 SHA256 c3c927dd3c397683707ade3a909bb41e887d9a0b07f7f6efdd69c7b0f4793218 SHA512 b3498e6a05401be784aeb086be3db21199bc6f0fc206bbb31344b29b84289f56dc4001020597f77b6867dff9d5b14f6ab41c921df5dabc094520af5dd6fdea0b WHIRLPOOL f4a9a8981dc1abe2d12ad4fe48de1ec6d86ef2d4cb93c110ece9c9127c10dc79986237b340f14983080aea0fbea61e422555e18864966bb57830ddb27c8d7ca8
 DIST python-dxf-6.0.0.tar.gz 18059 SHA256 9f3b60f87be1f47bf03f26f4fcfa8176dccdcfa7ea0533a0a6bb89b05f96a1bf SHA512 fb502aac73f7e4ff6c2ef8e11887ec71093c9387857da4eeca222fba23bd669d06e0f085660637ad9774decb310b56ed36c14e29014de3e15108d77417309d41 WHIRLPOOL 2ceb04804a358c2f09b7c1cff15b15c5b0d249639a3909eb0401c06e523ca0f655d740fa3929009c0cef23932e3ce65e1b52a05e59c2bb127c25947e1c528f5b
 EBUILD dxf-6.0.0.ebuild 745 SHA256 22fa6c31b3df3ac652c1566563cad959f58225b221766b345a07bdf39f68120c SHA512 81c230987456bdddb83a59e01a511dc03a956732e1b7a4acc6d2bf711579705c7d4176c84c1f0267e6cdbe857572a55c5a52f143efa0a882671860e45a5b83a9 WHIRLPOOL c537cc3b7b29e6e80d954855c2f7531acb1a0ae7ec2a91272c4ee3315e5d1a0f1c7278f547c5e293acf18e67fd6f11aecbe10faf6d1d5f04f9ee2137126bf583
 EBUILD dxf-6.1.0.ebuild 728 SHA256 1b093ea69c871fbab335159ed5f2e20641446db8b82389430228f4b310b57f68 SHA512 41d2a28c394598f1fc78f1e335cf73e676ce55ab3fa95dcdfc67035206f5d47fdf7ff45421e969aa214d8a50fb7f850be92fa03df122e4f4c1d6b92675aad867 WHIRLPOOL 00e7e163d1cf5eaf7675adec1fb5d89fa2aafe74ebc3e1f35d8e5dff67b707ffba6f38f7de496db402a2914343e4f1949b9edc3dd5b4d4a88dffe3f09e3ed67c
+EBUILD dxf-6.2.0.ebuild 728 SHA256 1b093ea69c871fbab335159ed5f2e20641446db8b82389430228f4b310b57f68 SHA512 41d2a28c394598f1fc78f1e335cf73e676ce55ab3fa95dcdfc67035206f5d47fdf7ff45421e969aa214d8a50fb7f850be92fa03df122e4f4c1d6b92675aad867 WHIRLPOOL 00e7e163d1cf5eaf7675adec1fb5d89fa2aafe74ebc3e1f35d8e5dff67b707ffba6f38f7de496db402a2914343e4f1949b9edc3dd5b4d4a88dffe3f09e3ed67c
 MISC metadata.xml 373 SHA256 32f2fe0a92f4fa339312f0cfe976a28f886c7a9f3f66b73811704fb78ae832e4 SHA512 85d9b0ab4896713d2e796fede5635fc4bb80e402b2a6a7404fa1b7ba52e139a0ef27876dae39081c58a5ea8a5a78749b7fcc13c038b85c90c4286721931cb63c WHIRLPOOL f6466623dcc7dbe0925f7ccc0d2794bc59229812e6ba8196a8c46535e876fdcdb6cea6e22eb3246c347b144b9df75f882aba74b32357505867945da4846a11ee
diff --git a/app-admin/dxf/dxf-6.2.0.ebuild b/app-admin/dxf/dxf-6.2.0.ebuild
new file mode 100644
index 000000000000..4c3842e34cc1
--- /dev/null
+++ b/app-admin/dxf/dxf-6.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Docker registry v2 client in Python"
+HOMEPAGE="https://github.com/davedoesdev/dxf"
+SRC_URI="https://github.com/davedoesdev/dxf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=dev-python/jwcrypto-0.4.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.9.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/tqdm-4.10.0[${PYTHON_USEDEP}]
+	>=dev-python/www-authenticate-0.9.2[${PYTHON_USEDEP}]"
+
+RESTRICT="test"
+# Require dockerd running
+
+python_test() {
+	emake test
+}
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 99a53d690356..3b16e9921fe6 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,6 +1,8 @@
 DIST keepassxc-2.1.4.tar.gz 3345520 SHA256 40a990dbcf442eb3cad99452b58ffd36e5855b39e78f213ea20e99fbc7876701 SHA512 48030eb6df595c73644f43d6222654c5f76962ae5aa2f44ca4dc9c8e45726380c6be4300af7a8279b07c06b70912da444f2b17c5b6c37a91cb239d695e7518d8 WHIRLPOOL da2bdac3e334b48903c6b20532ea4a0af0fe057e10e702ba6a4221e828b8f416d666ff67407b434d38b4cbbe5119d3c8a49927e4d5092f4f62ab49e30981017c
 DIST keepassxc-2.2.1.tar.gz 3880551 SHA256 184663e8b08e081dedf4c9dbdd68bf86ed0f5e32388b4781b7afcf89ef5c8e4d SHA512 bce2a0d6d3ad32bb507afac22670b34c37f5e36de6a30bb7c9b5a523c12bad59d95a414b90608451660fb9ce224279c7658e1892f2b99c673908449cc86e5595 WHIRLPOOL 32a0ede5c150bc4fc54c1b0a8f3c46110a19349d732913bdc9f3bc6492c1998569b2cd7a178ec9bb11e5b8dc9698138d8a7f26000211377a0c90f505605fe54c
+DIST keepassxc-2.2.2.tar.gz 3885990 SHA256 d36b21415f666d68eb130d739302759a0746b8df9315f828b44b7c1333c2d6a3 SHA512 73a167a79af56d4b6dbef7ce4050ca599f2c107a5c8af3b9e28241504572988b2d8b258135b7a34dfceae5a18cbda26b97ed513bbde14fe3d38e3f41b882d34b WHIRLPOOL 8dd6bf0e02d251f7a2b0dc2850d219257d9de6c856b03f7d867d1606cfed67d07c7126b1c9ccb1b843e26db8d15f9a8e76ce0514f42df12199418b71e2969913
 EBUILD keepassxc-2.1.4-r1.ebuild 1540 SHA256 3278a66dd4bc71729f00ab33e6748d467e6f1df0cad860057b8caec0ffedbe7d SHA512 7dcda961fda3b3166b2e38a878e2b2782e604c3373b67c358347746fccfa781082ce1c3417aeb8c1b76b8fc5ae94b38bff1442fc2477267b4a5096afdf1803ea WHIRLPOOL e4c0f0445cb2bed3c0c9b1c91e586ef83be009b608a6ac9850ab89dcdabea388ac862e8dea8afa8097028c649b1a90346ff8b376fdf8366c728bfbb349797ab0
 EBUILD keepassxc-2.2.1-r1.ebuild 1544 SHA256 fe045462fbd25433b4734c1b5aef97c0841f18412ecbf7182afadfb199ca4b0a SHA512 5695e22f30dc7e60c463ea4a0703111839345facb251e896526e4d5cb5d566516b939bc440c94e0a1b68272eeb458f47b8ddf1e529e5eb7037dca4b6698517a8 WHIRLPOOL b950f8b76eada1d6e6199a0e726083cff09fc7e0dfa449fc8ca61176ab631e41b520bc65960c13ce0b82acc6a9f0a68a13f8f94ff334a621637756cea5eb898f
+EBUILD keepassxc-2.2.2.ebuild 1544 SHA256 fe045462fbd25433b4734c1b5aef97c0841f18412ecbf7182afadfb199ca4b0a SHA512 5695e22f30dc7e60c463ea4a0703111839345facb251e896526e4d5cb5d566516b939bc440c94e0a1b68272eeb458f47b8ddf1e529e5eb7037dca4b6698517a8 WHIRLPOOL b950f8b76eada1d6e6199a0e726083cff09fc7e0dfa449fc8ca61176ab631e41b520bc65960c13ce0b82acc6a9f0a68a13f8f94ff334a621637756cea5eb898f
 EBUILD keepassxc-9999.ebuild 1544 SHA256 fe045462fbd25433b4734c1b5aef97c0841f18412ecbf7182afadfb199ca4b0a SHA512 5695e22f30dc7e60c463ea4a0703111839345facb251e896526e4d5cb5d566516b939bc440c94e0a1b68272eeb458f47b8ddf1e529e5eb7037dca4b6698517a8 WHIRLPOOL b950f8b76eada1d6e6199a0e726083cff09fc7e0dfa449fc8ca61176ab631e41b520bc65960c13ce0b82acc6a9f0a68a13f8f94ff334a621637756cea5eb898f
 MISC metadata.xml 819 SHA256 eef8083b85f448c94b9b84f542ac6894cb0d16e91f03a22e27d31cc744667d7d SHA512 b0607500bf25e7d4b504dd7fe0c03cf25f21cc32b79a0fe3a58d847f7ad2647c0452077ad8e16e1b2c63987ef68842b8d673fa0ebe657d918f27e0b163c8957d WHIRLPOOL aa80bba4cfa8cb4e5fadb8e36eced51596072c5a01a20b723742940dd1e7ec12a9ccd908fdf0ec04b8c703b81d6fe520a2f8aea4cae248afa9eafe12076e9914
diff --git a/app-admin/keepassxc/keepassxc-2.2.2.ebuild b/app-admin/keepassxc/keepassxc-2.2.2.ebuild
new file mode 100644
index 000000000000..15016b6c462e
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.2.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SCM=""
+[[ "${PV}" == 9999 ]] && SCM="git-r3"
+inherit cmake-utils gnome2-utils xdg-utils ${SCM}
+unset SCM
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://keepassxc.org"
+
+if [[ "${PV}" != 9999 ]] ; then
+	SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+else
+	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="autotype debug http test yubikey"
+
+RDEPEND="
+	dev-libs/libgcrypt:=
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
+	autotype? (
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXtst
+	)
+	yubikey? ( sys-auth/ykpers )
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-qt/linguist-tools:5
+	dev-qt/qtconcurrent:5
+	test? ( dev-qt/qttest:5 )
+"
+
+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_HTTP="$(usex http)"
+		-DWITH_XC_YUBIKEY="$(usex yubikey)"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-admin/lastpass-cli/Manifest b/app-admin/lastpass-cli/Manifest
index da69844af8ef..38ea6162a693 100644
--- a/app-admin/lastpass-cli/Manifest
+++ b/app-admin/lastpass-cli/Manifest
@@ -1,9 +1,11 @@
 DIST lastpass-cli-1.0.0.tar.gz 92311 SHA256 42096c0bd3972b0e9cc9cef32fbf141e47b04b9e2387fb3abe8b105e135fb41e SHA512 4709b3e4d6064c8c5cb593344e6417355d7df570240dce8eb77a19f3377ea38585280a9602cf8ab926c55c6afd84b297f261b0c8a40d355734d5cc542d46f610 WHIRLPOOL 394bfb597f5262dd1e47c7a3c48ef093b398f90c6dcacac6b172bb008891c76faf448ecf6be0ebfa277d18d335b166b7efadc063acc57ce88274004d1734bf21
 DIST lastpass-cli-1.1.2.tar.gz 102796 SHA256 bc737d8e6d713c8aecdfb7f34b29aa9a8ae9b1e9ba80b31059686b18591a8c39 SHA512 8115cb07cfca15ef402bdbd8ce943352e1534ddb781274e21cb0fafa4bcd9ab7abe4ddba57c4ebbce326f09cc9249f244607d16cac5597e61cf21c73417e7d9c WHIRLPOOL c7e6a4d5ac9b8c52f53e081b367289b390704fa4dfbf13a9ea0086e4ca0d49f9ef5a39f9ea854387ffb66fbd18f9b5263d17ae6573c4286fb7a36ebdce724d7f
 DIST lastpass-cli-1.2.1.tar.gz 108780 SHA256 1a49a37a67a973296e218306e6d36c9383347b1833e5a878ebc08355b1c77456 SHA512 c7c9f20dbc083873b815834320828a30a1c488571efbfc5aea47c3bd2073819d713810c785855d4c0c208e1b95aa0e5fc550a0b6b5c0f787eca1f54589e18e62 WHIRLPOOL c74988f37c96d065c0fea58c946c3aa3f4925d889247247b89ffe25012077d8eb3c694a3d539a40cf3f2be1fdd195b6ef6c1ef2d429587cc18fb8a8db8fb8a93
+DIST lastpass-cli-1.2.2.tar.gz 110045 SHA256 26c93ae610932139dacaff2e0f916c5628def48bb4129b4099101cf4e6c7c499 SHA512 7d211c7669fe2de3e3f34cf00025376fd39a7f96c8573a0eaff64f322daab03de21e25d5875d3286a794580ac75d330c7bfe1005b377afc2b13e4ded9d78012c WHIRLPOOL 0b3060e180b590999d3b3265140e8b060e017ae453fed74fe91c2f8d728a71ffcfac05e94b1eddb8575e9c6949b53364d0bfe037a9ae256a2a1c1e971ba1d12e
 EBUILD lastpass-cli-1.0.0.ebuild 1012 SHA256 181d3b59b7733521798cd2cf98dbf35aa13c6706708b6e8131faa3c3b91fb8cf SHA512 d319bd79f9281f4ef9c6dce9ae68e58ac628addf7218b1bce38d983731a8e21cb9f4e112bb74fe2a0a598767c3381917c27191fc91834f5c1bd15fc22c92564f WHIRLPOOL 301454d57323c010210efedb18a3e89471774cb1fcdaad56dbb2d1f77148259d17378416e450174625bd06c702681ad27f1f0dc15b28e1c950e2508d51c9625d
 EBUILD lastpass-cli-1.1.2.ebuild 937 SHA256 d51bc2955e555db6cf251c5f55425c4252d5913cfb01362c90999f4c17032cb1 SHA512 f25a76711dbb73d592a3d2b325f3de0eae899ce2db7f21948624c7a846de88bfd5ee2b6bc46a4f973674df043eb0ab22817774c724145bec4975650d55f645be WHIRLPOOL c35423cc750934178522f26c7ea484343d5fb19812a4e6d7d3ba0b98f68994997d935bfd2d216fef1a0f1913bede373050315b035bc53b4c370b9eb9d7ac1e41
 EBUILD lastpass-cli-1.2.1.ebuild 1273 SHA256 769fbc6bba7cd192b602c7fec8a51d4c15f738ce03ceddabd6e6142677333f55 SHA512 7da1fb209fec0057d70cc2eff410cfcd410be6b6fba183bab5ccb8279e729df3a8acc3e1cfe2b339e6bbfd346c4d2eecee924a2c8fe15a6ebf5a502efc7fc16c WHIRLPOOL d557b8b146d8adbd20afc1e1d4149e24aa49b4dd95aa3f2e29a35c06de122e13d9d95b9e5541f21ae48883f753add824a15d2cadd46dd5378d044c9e6ff5b172
+EBUILD lastpass-cli-1.2.2.ebuild 1280 SHA256 9e5abd6a35621bdd426cbd3709d2579c8eda9a46eb85cd59894dff605509a1e5 SHA512 a2455060f8ba03105c704217d23086c2f04380a63dfb6b02bdac1065cfc0559e83fd0eee2a6e3a1ea6ca9b64c9f477b4dd857b62058a49eb5fa0df997d825fd1 WHIRLPOOL f9640295341e0dc9902d44aafbcc0e29c1ba2f78ba511b9605afa050303fe6ee268daf3442dd38f2a66d472bd3f12b010b73d43965b94fcaa48a66f6ced578cf
 MISC ChangeLog 8685 SHA256 c5c191dd0b7af5ee8f6c7527afabf1728671c379b50a3743a0aae7dd1ec091c4 SHA512 425f91ed3a9003094527192da9d6d5ad1701ce0fd524d37ffda1550b74f733af0eb3cc5332c7da491a3a5188c0047f02caa36023de1a7ca852926043adec9724 WHIRLPOOL b34ff580eefe5a5b3159b971cc419b2c45ea8e9cf884783eb0e3f6f45c28ed6e8ebf12093781ae0b816b6c88daf5f77489e98c88a719af8e4e0ab379476e1ad6
 MISC ChangeLog-2015 1046 SHA256 84a7da020cc2fdf4df41673d0a8475580995a7e159490cfeb2a29b360558bb81 SHA512 b4759454a0a8113f55caff2ff736903ec4c335730545cac178311ea8b076cd8c522a8104ff9a117bccf2b57b2b37593666e55922c8a46f638a5cadb0dee5149e WHIRLPOOL b3c1ff878c10744bd6f7f54a344f2858ac625d5b5fbb306d0d026b131878271542a9bc7f2b821a89e15073933ef85da2a114c39305d0932b0e60acf77b3bcab9
 MISC metadata.xml 643 SHA256 7b04ceab7153ce462669fca6ee8dd72e37c4c6e9e6f2b9de866c97b03af4d036 SHA512 6b1a7f6566687384d328260576dad306dd07add06001b3746b4f37f05ff91b6ee72e1e2ecfd35463a5b78b4ba8dd1a7757503bdf992372dbd474967e4bf0e9f3 WHIRLPOOL 3215f5055176a55e1e0489f560061f242fb2887d4e68ebe0655925aa751a88333de8fd8513cd065e8a74cbdf96df686adbd8fd34021e8a600f4181050786e241
diff --git a/app-admin/lastpass-cli/lastpass-cli-1.2.2.ebuild b/app-admin/lastpass-cli/lastpass-cli-1.2.2.ebuild
new file mode 100644
index 000000000000..2822408086a3
--- /dev/null
+++ b/app-admin/lastpass-cli/lastpass-cli-1.2.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils bash-completion-r1
+
+DESCRIPTION="Interfaces with LastPass.com from the command line."
+HOMEPAGE="https://github.com/lastpass/lastpass-cli"
+SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl X +pinentry test"
+
+RDEPEND="
+	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-misc/curl
+	dev-libs/libxml2
+	pinentry? ( app-crypt/pinentry )
+"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBASH_COMPLETION_COMPLETIONSDIR="$(get_bashcompdir)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile all doc-man $(usex test lpass-test '')
+}
+
+src_install() {
+	cmake-utils_src_install install install-doc
+}
+
+src_test() {
+	local myctestargs=(
+		-j1 # Parallel tests fail
+	)
+
+	# The path to lpass-test is hardcoded to "${S}"/build/lpass-test
+	# which is incorrect for our out-of-source build
+	sed -e "s|TEST_LPASS=.*|TEST_LPASS=\"${BUILD_DIR}/lpass-test\"|" \
+		-i "${S}"/test/include.sh || die
+
+	cmake-utils_src_test
+}
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 7d8cf83e1934..d480f7ac8123 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -1,10 +1,3 @@
-AUX logrotate-3.11.0-Werror.patch 468 SHA256 633ec5e7d0d44e490d4fc2f71ccb7742ee44087143f2a175077c5ea71c3bf3e8 SHA512 a846e9d3778a33622d7daccbd5880cadf2201ec3914c9f47c0c67c1786edd720a33c140f18f7259024e13e1f5cedcd447deb9cfb0d70882fb52332bfffe3c42e WHIRLPOOL ed64892d93334eeaee8ad244227f396a23c8d005177d32952b2575cef5efc6c52ef23d6e0d3ce889c5a652e4b511df11857a7fd717efb54ee9240da117b6c6e6
-AUX logrotate-3.11.0-fbsd.patch 1421 SHA256 04bd0e7a2fd75d41a424d35b31dbbcc3e25ed44c3cac7bc5b2ae5db643a06b27 SHA512 dd552c5879cc9cc120a7ff953d1934278a9976a46e84c010bb135e1988dd12cadfe7cb5e2f5067d5b882dc521713fb2a024cb61ad0216cdb33297f356bc0307e WHIRLPOOL 4d6556b6f72e7843e910ba8519c6e8f0986fbb516e8d7700e4feac337cc6e8cb1f802302e0bb228c5597aaefd41a752174871cc027da740bc775f51d5339c1c0
-AUX logrotate-3.11.0-ignore-hidden.patch 548 SHA256 56fca1f490e9a9f13f110297a8988e59800b10b9d06b4f284f76dbaba4ad717e SHA512 a86caa30b787abc1328652e590dd73633a38830739ff6c6c9f5d43fb2919e53383ec8091f5e0d6af475d13fd68bd1e636cd43cd5adf377c22ff2ea694ba32cf1 WHIRLPOOL 5164d9048e9f147197077e73933a219d8074bd57bd2835e997cba12ba7e815f87495d46bc6c6bf9f54957f4f501fb24284a75aef9bac0d1c84cee9c94e5beb1e
-AUX logrotate-3.11.0-lfs.patch 346 SHA256 ad8cfab537560d663afa954e654592c9f139aefc9848f08619212ee46ab074f4 SHA512 cdffb9f1481bb8777319423c9617898b50712129a80d721fef8c243a030248a70540d2db0d421e8e974bc6623d8739d1a50da8b65894cdc385dd8d741c2710e1 WHIRLPOOL 82fec61a2bd484cbcc18cea898197923ea8cfea86039bdb2bef7effa9635f6287d06e879bccf11b22f770cb1b93542756e2f11d9f8564f35966f69e6fea9f3d4
-AUX logrotate-3.11.0-noasprintf.patch 1274 SHA256 8a84f7c46b117f0c9705333e50c9a2c3173b62b6fb2a86b3752d9cb597a84c8d SHA512 d673aa820cd95b744deb24b1c5ccbc82f22d5f6220028a0b96c7abc3190cfc5f85fed1f8bba7fd98b8b3ff458fccb08c2adb80046151088bc0797f814de2a9f5 WHIRLPOOL 573505eea80a433d47d83cde1e252d704a1e543b149816a75854de7042dd417af31d2848c04e0a225e16b6d00cae3d6b673a336cf018ee2438bb3102a1244705
-AUX logrotate-3.12.2-fbsd.patch 855 SHA256 127c90627ba4dc79d0120d3a86b8e7696b89546cb164230f12466113d874141b SHA512 3e54314ce32735bd70fe46792c073fd5eb345a77e40eae4b9c899671cc8b7dd8d6f1042a28f05364431fc730a3dbe924d19d6eacbb387c6384268a397dd9ac85 WHIRLPOOL b734147fad23c8a0d16aaee33910995ce11310497616a390c74415d66e74ab6508b65e144e5c692fba635f5c0882106d8dd72b99ec941439e589e2712efdf155
-AUX logrotate-3.12.2-ignore-hidden.patch 542 SHA256 35488583344d963ea1c19a798bc9f8d9c174395f299d1a81a65680e47c36362b SHA512 86d7335dda9b913928eb14dc39a120e14f3796fc30516fbfb5424c575520802edb84224bf5673084be7e983f9e2d856d80d58fa4200a0a43a9624d41dc20a206 WHIRLPOOL a711fbb2fe8ee74123ecbca4202ff8cac60bdb8c0fc197aa8dc96e101cad32d8e1b85bc378bfd8d0fd831753e39f7c9a177db194d9d2450bee2e29f09af37f86
 AUX logrotate-3.12.3-fbsd.patch 855 SHA256 127c90627ba4dc79d0120d3a86b8e7696b89546cb164230f12466113d874141b SHA512 3e54314ce32735bd70fe46792c073fd5eb345a77e40eae4b9c899671cc8b7dd8d6f1042a28f05364431fc730a3dbe924d19d6eacbb387c6384268a397dd9ac85 WHIRLPOOL b734147fad23c8a0d16aaee33910995ce11310497616a390c74415d66e74ab6508b65e144e5c692fba635f5c0882106d8dd72b99ec941439e589e2712efdf155
 AUX logrotate-3.12.3-ignore-hidden.patch 542 SHA256 35488583344d963ea1c19a798bc9f8d9c174395f299d1a81a65680e47c36362b SHA512 86d7335dda9b913928eb14dc39a120e14f3796fc30516fbfb5424c575520802edb84224bf5673084be7e983f9e2d856d80d58fa4200a0a43a9624d41dc20a206 WHIRLPOOL a711fbb2fe8ee74123ecbca4202ff8cac60bdb8c0fc197aa8dc96e101cad32d8e1b85bc378bfd8d0fd831753e39f7c9a177db194d9d2450bee2e29f09af37f86
 AUX logrotate-3.13.0-fbsd.patch 855 SHA256 22618ce2fcf3555f4922ea98e90bac7846a840fe4da76d1c14d66614b13b21b0 SHA512 5343814545554392f1ee1be5b35866ebce0d8f2f580cb7807940e3a5b2092025f1b9619fa0ff3bdf4b99aada4c46a602d6c34c6e3c1e42b15ce51cf9d879a3ed WHIRLPOOL e78ea306458781dd88f3efbea57bc1d42f761aa5b98a286608be661a2904d91fbf53475740304e5a5f9f47bb361d87588c829900f90c2b7764fad2b066dac0ad
@@ -16,16 +9,11 @@ AUX logrotate-3.9.1-ignore-hidden.patch 551 SHA256 3f04aa2ff9ff85cf0486c40f6a81c
 AUX logrotate-3.9.1-noasprintf.patch 1263 SHA256 edc5f3db12c27c3353cfe1764c10d3b97581f249096e61f875440e429afc778a SHA512 c84be7ef011fe09a2fae67fa918080c1b0c098f0000e6cacdfcc34311f17c0131e68bc1e337559391ae7272fd326ac7ba6ba1cca20f99a9cc51367ac35a924e6 WHIRLPOOL 0d702f6c92483791e9fe2b5128e324fcda7c5ee825c46fab4405b5752f836bce00aaaf8ec9a284a5214aa2e10a4818bfb2e8cd9a4e2bce6f0836ec1c543dd3ea
 AUX logrotate.conf 743 SHA256 9144148139ab9aaaaa5b02d3f88e44b6dfd23b8ddd6c86d2f543eb5ad566f775 SHA512 c0357a432a4619392895d8180db3c593239a96f62aba7cfd981c76e9d1dfd9d93d63860655025b1e9473374c2a51068028c3a3f316cb5cbb71562ca4a61d8d24 WHIRLPOOL b2cd43773242adc78b2b322679db16946a5db95d56591a6e53316660937f7696f51b66fb8c106f7e2b98fc119070397f986ecfd1563409749801a5331c058357
 AUX logrotate.tmpfiles 16 SHA256 5624b71671928b2d5a076c32172b65b679b8502aae66b2840fc252fb09504209 SHA512 f51852b1d5708a8fc48c6fcfd2fc4f34f3cd88d9119c607c0cb47f0cc0dc7370bd3399a9ebf781943cdd16a25bb4db0d81337140fc179faa72e18a848f3d8c36 WHIRLPOOL 6fc46fb539199e992112081a3d8d24bd6bf50597b268a08b36eb86158f513ead488cdcec23eec88750c79767f6a7f8024d17909e5d14888f9b1634eaaece00b7
-DIST logrotate-3.11.0.tar.gz 176488 SHA256 7dcb440ed2f1937459e1e06f841c6af1e564b77b2df8009147b56c8649197910 SHA512 67ceb2e18c175a5935c81e7699af7a5e6625cef50a3f52e993d49d6c10d9c433f6c7354a8dd05cb35ab28e4393d1db198f2e46e5f6eafd3e6f040b6518438cc1 WHIRLPOOL 0a581aa5922386b84a7c40a9490364287f4e162f7180fd0e15bf191694294168b663947c7081e92755406fe4f0b3b8792b6f0c5f0e646afa5505a17995a86858
-DIST logrotate-3.12.2.tar.gz 202700 SHA256 754777ada2ef2f34378e8f6025cdb0c0725e212f12195d59971c42df0ae0597f SHA512 ba8c3d7c7134b9ab5968c0dc8a1c5d24d7287a3204e1c6eed080b537d6a0ed7765a47c69b3067493304994e3f4238dc0173b593e4628316bfadf3decd002da16 WHIRLPOOL a299bc2bd50ab36acdd4ab747a479c5b94e84ac92bf55b71a8a8a7d4e1b55eb909dce94c22a5fdadda946dc783376923de5f46729084e21b54811489ce97c482
 DIST logrotate-3.12.3.tar.gz 202991 SHA256 435a3f9a534a37e11657532a090f6bf521d8696bdf9cb799a360c1750ba3aea9 SHA512 ab700a50736c7ce8a6e5b9dc2504919c6d3e6ae48a7f112f6980253df5c6bab7fc507c82a0cd961d73ed1312c930da46d96d9f27046996644e0759c84c6a1ae9 WHIRLPOOL ceadd2a748850f0035702156b9a566bf3a38749edf823062f1c867e60cac1c7b40d770d6c923eed79972ce58394b3220e16e40e97e192a6a7046cf09c5fcbf77
 DIST logrotate-3.13.0.tar.gz 213726 SHA256 2ea33f69176dd2668fb85307210d7ed0411ff2a0429e4a0a2d881e740160e4b0 SHA512 3dec2fcdd674d3337b71fd70339cb5e3dd06b4bc24bee191356a30c2a211a290ae7747e63b90581e32a6d6d1f73cf62d5b0ee5a91aa05bad4d6ee403a35d9e76 WHIRLPOOL 952c5eda18870876ea5109d4c5ae7ac1048d3ea07c89b4a0320a48baa8170fbc200f5b4a1cc193da0f6b0e1ef8dbdcdb82f74f23d4f12e5a19bb98650c1e7d5a
 DIST logrotate-3.9.1.tar.gz 79061 SHA256 022769e3288c80981559a8421703c88e8438b447235e36dd3c8e97cd94c52545 SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28 WHIRLPOOL 9b3558bb03c6c95f8f386ea75ca09bfda802ae4c45b9ef8408692e3aa7a2ee57447cf15ce04d0289946b9cae2266acb5509d8151d15ac6ea0ad9113aeb32dc17
-EBUILD logrotate-3.11.0.ebuild 2005 SHA256 101653a12e2243dd4253abbc24becfeef0d2bae5037ae848a1f4848bec4a163e SHA512 eb0392730a076565c459a2645b6497b86d3a86d0096661eb468b00cbb909ffbed7db762adb866a9cbfca40ff339d90ce0c970404b718b8f8a4d084dbf51a1ddf WHIRLPOOL 0317478d7fc84c7d1716d2b449298b382a2349a5ed746c458a9e47a129fdbe9d4e7ec330bc36c07e9be0ae2ca041518424f1ce7ef3333e547667947eec5f6c12
-EBUILD logrotate-3.12.2.ebuild 1903 SHA256 d909fdef412279a0147a2f9d02986cafea2c4bd63936ab0fa0538ecad797483e SHA512 78ae7250c4c26ff7f702746535bace0f34b68d2ceb9d6cc3744975d1842781bb2037fa520b873806659db2e5acb8b58ec14996865be82e62d1d892acdae3b134 WHIRLPOOL 728c71c61e3ac0830ea100d891bcaf7fa8c9cf75e7c8f455862442d31a0f83b459d50ef54101a31745c84d6f491473404ded5c9372cf551a8499eff60893a49a
-EBUILD logrotate-3.12.3-r1.ebuild 2487 SHA256 e1871fe019ac5de8ef40c4e4b33e6e2a2b14ff52f39fd7969b3e547551dba63c SHA512 b085e9bbc3a21814f7d12bdbd37b38094527e04253bd64e5a90ecf366b58b1a9aae98752508f0f59a2fcf09f548bfa5c7e65436c4ce80918eee78df978ad34cc WHIRLPOOL 90c109fdf4396b723ecee00ebb676b0d8718d7fe9f72bdb5a87782355c411cfe72af86994c7564cd16c6f26397f2724eb63bcd04e3f767c5e318e59340681416
+EBUILD logrotate-3.12.3-r1.ebuild 2485 SHA256 2863ca598d152971453f9d3b47c64c9859e7427afab3602f9a3a7dcb40238df0 SHA512 46b79b611ba2e3533e1c068b3422b3507e2f505d5562810f91699f936be43b99a4456603e5c9298f30dc2eae5633e391319516babfd038520a0de58e03513ab4 WHIRLPOOL 3c4e9ccf4da2ae3e2d468a178cd9370be0c570edfc3473d8ff00c09973f17afe46f447826f5f51de10dd67a8820ad996be97a8d8bbcaaaea51762be87b4a62c6
 EBUILD logrotate-3.12.3-r2.ebuild 2552 SHA256 55c7d7cd58624e29f040d575fe0d695bf66af60dfa735efd24416e2306e07140 SHA512 b3f3b5d0264bb75c717608be706eccf33d97996f38c5ca152e1797f9dfbdfc40add7065fa614a715d0a30d431dd484e34a8b48138b80d99bcdd546b597264436 WHIRLPOOL db532413f8a7aa375b952c7451a482f362ff2aa93316f62dacbc75274e692e6be19088b28305973b610eaed3bae4578998720213c8e33bd252f529cdbc02c754
-EBUILD logrotate-3.12.3.ebuild 2479 SHA256 f5bc883c099160493f924e3b72aa304eac5d23248f21137876b1f774a24539e8 SHA512 4e0b4b99277ee692318a6d6f4358a5463f11c339cc1e610040a9a436b412d5f8ba22ededee3453a4dc6dccd66067ee04931a39d3b27f08189592c2366f0c0365 WHIRLPOOL 9d71a14ec8ba93fa742d20d1275e757236b37413947248614fdbcf723a49dbaf700e20145e6523ac759d637a795355af1f636227db0803b04f994bbbedaafaf3
 EBUILD logrotate-3.13.0.ebuild 2552 SHA256 55c7d7cd58624e29f040d575fe0d695bf66af60dfa735efd24416e2306e07140 SHA512 b3f3b5d0264bb75c717608be706eccf33d97996f38c5ca152e1797f9dfbdfc40add7065fa614a715d0a30d431dd484e34a8b48138b80d99bcdd546b597264436 WHIRLPOOL db532413f8a7aa375b952c7451a482f362ff2aa93316f62dacbc75274e692e6be19088b28305973b610eaed3bae4578998720213c8e33bd252f529cdbc02c754
 EBUILD logrotate-3.9.1.ebuild 1767 SHA256 72213fbfa0a0f182e8ac774e29a8763a17b394c1b4e33e7cac664c7bccbcc96a SHA512 ed808392727749efb6d20a410810f6eb9cb364db2e11460f4c2940abd0fb1d7430b75102f2fcabcaf64e8818da39323010d2a5d223df49c705a6171acf541a03 WHIRLPOOL 245d8f38775b0a9296cc41c0af04e6aca66a7722c2eafbe6814b2a865cc4bd1237f5ef1aa146089882112144db8292d1e706323ec63d2b018ba9bac06147cb37
 MISC ChangeLog 11318 SHA256 38d98af46e97c9519c8e99cf7bf71b7c27b1814b35870579057d068c54fc14c7 SHA512 d2992032a405e2c185966f44f50a1a92c0138f8e847b55402a620f144ecedf58a23381c0ae42b12d344cf18eeab833a786ed35401a29c0c45aa2b67664ba8c51 WHIRLPOOL 66cb04fb922ba81fc9bcf4cd200c6d236d5a758f872da2e55bb09981571b914adca5c40e2597b4dea1ef994ce36782aac590adc5d6aa149b1adc08f36b1ea5dc
diff --git a/app-admin/logrotate/files/logrotate-3.11.0-Werror.patch b/app-admin/logrotate/files/logrotate-3.11.0-Werror.patch
deleted file mode 100644
index 43c0ebaeb189..000000000000
--- a/app-admin/logrotate/files/logrotate-3.11.0-Werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar a/Makefile.am b/Makefile.am
---- a/Makefile.am	2016-11-30 13:05:55.000000000 +0100
-+++ b/Makefile.am	2016-12-02 23:46:15.288908073 +0100
-@@ -8,7 +8,7 @@
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- # GNU General Public License for more details.
- #
--AM_CFLAGS = -Wall -Werror
-+AM_CFLAGS = -Wall
- sbin_PROGRAMS = logrotate
- logrotate_SOURCES = basenames.c config.c log.c logrotate.c \
- 		    basenames.h config.h log.h logrotate.h queue.h
diff --git a/app-admin/logrotate/files/logrotate-3.11.0-fbsd.patch b/app-admin/logrotate/files/logrotate-3.11.0-fbsd.patch
deleted file mode 100644
index f5aa65272b88..000000000000
--- a/app-admin/logrotate/files/logrotate-3.11.0-fbsd.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c	2016-12-02 23:33:36.768905615 +0100
-+++ b/config.c	2016-12-02 23:36:15.568906130 +0100
-@@ -1,6 +1,6 @@
- #include "queue.h"
- /* Alloca is defined in stdlib.h in NetBSD */
--#ifndef __NetBSD__
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__)
- #include <alloca.h>
- #endif
- #include <limits.h>
-@@ -24,6 +24,10 @@
- #include <fnmatch.h>
- #include <sys/mman.h>
- 
-+#if !defined(PATH_MAX) && defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
-+
- #include "basenames.h"
- #include "log.h"
- #include "logrotate.h"
-diff -Nuar a/logrotate.c b/logrotate.c
---- a/logrotate.c	2016-11-30 14:07:15.000000000 +0100
-+++ b/logrotate.c	2016-12-02 23:36:44.218906223 +0100
-@@ -1,6 +1,6 @@
- #include "queue.h"
- /* alloca() is defined in stdlib.h in NetBSD */
--#ifndef __NetBSD__
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__)
- #include <alloca.h>
- #endif
- #include <limits.h>
-@@ -26,6 +26,10 @@
- #include <limits.h>
- #endif
- 
-+#if !defined(PATH_MAX) && defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
-+
- #include "basenames.h"
- #include "log.h"
- #include "logrotate.h"
-diff -Nuar a/Makefile.legacy b/Makefile.legacy
---- a/Makefile.legacy	2016-11-30 13:05:55.000000000 +0100
-+++ b/Makefile.legacy	2016-12-02 23:37:33.938906384 +0100
-@@ -22,7 +22,9 @@
- 
- ifeq ($(WITH_ACL),yes)
- CFLAGS += -DWITH_ACL
-+ifneq ($(OS_NAME),FreeBSD)
- LOADLIBES += -lacl
-+endif
- # See pretest
- TEST_ACL=1
- else
diff --git a/app-admin/logrotate/files/logrotate-3.11.0-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.11.0-ignore-hidden.patch
deleted file mode 100644
index 104f202efd27..000000000000
--- a/app-admin/logrotate/files/logrotate-3.11.0-ignore-hidden.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c	2016-11-30 13:05:55.000000000 +0100
-+++ b/config.c	2016-12-02 23:33:36.768905615 +0100
-@@ -383,7 +383,9 @@
- 	int i;
- 
- 	/* Check if fname is '.' or '..'; if so, return false */
--	if (fname[0] == '.' && (!fname[1] || (fname[1] == '.' && !fname[2])))
-+    /* Don't include 'hidden' files either; this breaks Gentoo
-+       portage config file management http://bugs.gentoo.org/87683 */
-+    if (fname[0] == '.')
- 		return 0;
- 
- 	/* Check if fname is ending in a taboo-extension; if so, return false */
diff --git a/app-admin/logrotate/files/logrotate-3.11.0-lfs.patch b/app-admin/logrotate/files/logrotate-3.11.0-lfs.patch
deleted file mode 100644
index 9cd5745e846a..000000000000
--- a/app-admin/logrotate/files/logrotate-3.11.0-lfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nuar a/configure.ac b/configure.ac
---- a/configure.ac	2016-12-02 14:08:40.000000000 +0100
-+++ b/configure.ac	2016-12-02 23:48:03.878908425 +0100
-@@ -12,6 +12,7 @@
- AC_PROG_CC_STDC
- AC_STRUCT_ST_BLKSIZE
- AC_STRUCT_ST_BLOCKS
-+AC_SYS_LARGEFILE
- 
- dnl Use 64-bit file offsets on 32-bit systems (defines C macros if necessary)
- AC_SYS_LARGEFILE
diff --git a/app-admin/logrotate/files/logrotate-3.11.0-noasprintf.patch b/app-admin/logrotate/files/logrotate-3.11.0-noasprintf.patch
deleted file mode 100644
index 36733a25d03b..000000000000
--- a/app-admin/logrotate/files/logrotate-3.11.0-noasprintf.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c	2016-12-02 23:36:15.568906130 +0100
-+++ b/config.c	2016-12-02 23:41:17.438907108 +0100
-@@ -49,39 +49,6 @@
- #include "asprintf.c"
- #endif
- 
--#if !defined(HAVE_ASPRINTF) && !defined(_FORTIFY_SOURCE)
--#include <stdarg.h>
--
--int asprintf(char **string_ptr, const char *format, ...)
--{
--	va_list arg;
--	char *str;
--	int size;
--	int rv;
--
--	va_start(arg, format);
--	size = vsnprintf(NULL, 0, format, arg);
--	size++;
--	va_start(arg, format);
--	str = malloc(size);
--	if (str == NULL) {
--		va_end(arg);
--		/*
--		 * Strictly speaking, GNU asprintf doesn't do this,
--		 * but the caller isn't checking the return value.
--		 */
--		fprintf(stderr, "failed to allocate memory\\n");
--		exit(1);
--	}
--	rv = vsnprintf(str, size, format, arg);
--	va_end(arg);
--
--	*string_ptr = str;
--	return (rv);
--}
--
--#endif
--
- #if !defined(HAVE_STRNDUP)
- char *strndup(const char *s, size_t n)
- {
-diff -Nuar a/logrotate.h b/logrotate.h
---- a/logrotate.h	2016-11-30 13:05:55.000000000 +0100
-+++ b/logrotate.h	2016-12-02 23:40:54.518907034 +0100
-@@ -82,8 +82,5 @@
- extern int debug;
- 
- int readAllConfigPaths(const char **paths);
--#if !defined(asprintf) && !defined(_FORTIFY_SOURCE)
--int asprintf(char **string_ptr, const char *format, ...);
--#endif
- 
- #endif
diff --git a/app-admin/logrotate/files/logrotate-3.12.2-fbsd.patch b/app-admin/logrotate/files/logrotate-3.12.2-fbsd.patch
deleted file mode 100644
index 67a60e3af177..000000000000
--- a/app-admin/logrotate/files/logrotate-3.12.2-fbsd.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c	2017-04-22 23:46:08.201991730 +0200
-+++ b/config.c	2017-04-22 23:49:43.021996055 +0200
-@@ -25,6 +25,10 @@
- #include <sys/mman.h>
- #include <libgen.h>
- 
-+#if !defined(PATH_MAX) && defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
-+
- #include "log.h"
- #include "logrotate.h"
- 
-diff -Nuar a/logrotate.c b/logrotate.c
---- a/logrotate.c	2017-04-21 10:52:10.000000000 +0200
-+++ b/logrotate.c	2017-04-22 23:50:20.691996814 +0200
-@@ -1,6 +1,6 @@
- #include "queue.h"
- /* alloca() is defined in stdlib.h in NetBSD */
--#ifndef __NetBSD__
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__)
- #include <alloca.h>
- #endif
- #include <limits.h>
-@@ -27,6 +27,10 @@
- #include <limits.h>
- #endif
- 
-+#if !defined(PATH_MAX) && defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
-+
- #include "log.h"
- #include "logrotate.h"
- 
diff --git a/app-admin/logrotate/files/logrotate-3.12.2-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.12.2-ignore-hidden.patch
deleted file mode 100644
index 0bbb91dcb4fc..000000000000
--- a/app-admin/logrotate/files/logrotate-3.12.2-ignore-hidden.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c	2017-04-18 14:57:02.000000000 +0200
-+++ b/config.c	2017-04-22 23:46:08.201991730 +0200
-@@ -389,7 +389,9 @@
- 	int i;
- 
- 	/* Check if fname is '.' or '..'; if so, return false */
--	if (fname[0] == '.' && (!fname[1] || (fname[1] == '.' && !fname[2])))
-+  /* Don't include 'hidden' files either; this breaks Gentoo
-+     portage config file management http://bugs.gentoo.org/87683 */
-+  if (fname[0] == '.')
- 		return 0;
- 
- 	/* Check if fname is ending in a taboo-extension; if so, return false */
diff --git a/app-admin/logrotate/logrotate-3.11.0.ebuild b/app-admin/logrotate/logrotate-3.11.0.ebuild
deleted file mode 100644
index 2570ecbb1bf9..000000000000
--- a/app-admin/logrotate/logrotate-3.11.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="Rotates, compresses, and mails system logs"
-HOMEPAGE="https://github.com/logrotate/logrotate"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acl +cron selinux"
-
-CDEPEND="
-	>=dev-libs/popt-1.5
-	selinux? (
-		sys-libs/libselinux
-	)
-	acl? ( virtual/acl )"
-
-DEPEND="${CDEPEND}
-	>=sys-apps/sed-4"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-logrotate )
-	cron? ( virtual/cron )"
-
-install_cron_file() {
-	sed -i 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.cron || die
-	exeinto /etc/cron.daily
-	newexe "${S}"/examples/logrotate.cron "${PN}"
-}
-
-PATCHES=(
-	"${FILESDIR}/${P}-ignore-hidden.patch"
-	"${FILESDIR}/${P}-fbsd.patch"
-	"${FILESDIR}/${P}-noasprintf.patch"
-	"${FILESDIR}/${P}-Werror.patch"
-	"${FILESDIR}/${P}-lfs.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with acl) $(use_with selinux)
-}
-
-src_compile() {
-	emake ${myconf} RPM_OPT_FLAGS="${CFLAGS}"
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	insinto /usr
-	dobin logrotate
-	doman logrotate.8
-	dodoc ChangeLog.md examples/logrotate*
-
-	insinto /etc
-	doins "${FILESDIR}"/logrotate.conf
-
-	use cron && install_cron_file
-
-	keepdir /etc/logrotate.d
-}
-
-pkg_postinst() {
-	elog "The ${PN} binary is now installed under /usr/bin. Please"
-	elog "update your links"
-	elog
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "If you wish to have logrotate e-mail you updates, please"
-		elog "emerge virtual/mailx and configure logrotate in"
-		elog "/etc/logrotate.conf appropriately"
-		elog
-		elog "Additionally, /etc/logrotate.conf may need to be modified"
-		elog "for your particular needs.  See man logrotate for details."
-	fi
-}
diff --git a/app-admin/logrotate/logrotate-3.12.2.ebuild b/app-admin/logrotate/logrotate-3.12.2.ebuild
deleted file mode 100644
index 15b0107f6562..000000000000
--- a/app-admin/logrotate/logrotate-3.12.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="Rotates, compresses, and mails system logs"
-HOMEPAGE="https://github.com/logrotate/logrotate"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acl +cron selinux"
-
-CDEPEND="
-	>=dev-libs/popt-1.5
-	selinux? ( sys-libs/libselinux )
-	acl? ( virtual/acl )"
-
-DEPEND="${CDEPEND}
-	>=sys-apps/sed-4"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-logrotate )
-	cron? ( virtual/cron )"
-
-install_cron_file() {
-	sed -i 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.cron || die
-	exeinto /etc/cron.daily
-	newexe "${S}"/examples/logrotate.cron "${PN}"
-}
-
-PATCHES=(
-	"${FILESDIR}/${P}-ignore-hidden.patch"
-	"${FILESDIR}/${P}-fbsd.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with acl) $(use_with selinux)
-}
-
-src_compile() {
-	emake ${myconf} RPM_OPT_FLAGS="${CFLAGS}"
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	insinto /usr
-	dobin logrotate
-	doman logrotate.8
-	dodoc ChangeLog.md examples/logrotate*
-
-	insinto /etc
-	doins "${FILESDIR}"/logrotate.conf
-
-	use cron && install_cron_file
-
-	keepdir /etc/logrotate.d
-}
-
-pkg_postinst() {
-	elog "The ${PN} binary is now installed under /usr/bin. Please"
-	elog "update your links"
-	elog
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "If you wish to have logrotate e-mail you updates, please"
-		elog "emerge virtual/mailx and configure logrotate in"
-		elog "/etc/logrotate.conf appropriately"
-		elog
-		elog "Additionally, /etc/logrotate.conf may need to be modified"
-		elog "for your particular needs.  See man logrotate for details."
-	fi
-}
diff --git a/app-admin/logrotate/logrotate-3.12.3-r1.ebuild b/app-admin/logrotate/logrotate-3.12.3-r1.ebuild
index b5f5d4e95d90..81b5ffc20c50 100644
--- a/app-admin/logrotate/logrotate-3.12.3-r1.ebuild
+++ b/app-admin/logrotate/logrotate-3.12.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> $
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~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"
 IUSE="acl +cron selinux"
 
 CDEPEND="
diff --git a/app-admin/logrotate/logrotate-3.12.3.ebuild b/app-admin/logrotate/logrotate-3.12.3.ebuild
deleted file mode 100644
index 34807c80e888..000000000000
--- a/app-admin/logrotate/logrotate-3.12.3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd
-
-DESCRIPTION="Rotates, compresses, and mails system logs"
-HOMEPAGE="https://github.com/logrotate/logrotate"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acl +cron selinux bzip2"
-
-CDEPEND="
-	>=dev-libs/popt-1.5
-	selinux? ( sys-libs/libselinux )
-	acl? ( virtual/acl )"
-
-DEPEND="${CDEPEND}
-	>=sys-apps/sed-4"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-logrotate )
-	cron? ( virtual/cron )
-	bzip2? ( app-arch/bzip2 )"
-
-STATEFILE="/var/lib/misc/logrotate.status"
-OLDSTATEFILE="/var/lib/logrotate.status"
-
-move_old_state_file() {
-	elog "logrotate state file is now located at ${STATEFILE}"
-	elog "See bug #357275"
-	if [[ -e "${OLDSTATEFILE}" ]] ; then
-		elog "Moving your current state file to new location: ${STATEFILE}"
-		mv -n "${OLDSTATEFILE}" "${STATEFILE}"
-	fi
-}
-
-install_cron_file() {
-	exeinto /etc/cron.daily
-	newexe "${S}"/examples/logrotate.cron "${PN}"
-}
-
-PATCHES=(
-	"${FILESDIR}/${P}-ignore-hidden.patch"
-	"${FILESDIR}/${P}-fbsd.patch"
-)
-
-src_prepare() {
-	default
-	sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
-}
-
-src_configure() {
-	if use bzip2 ; then
-		compressconf="--with-compress-command=/bin/bzip2 --with-uncompress-command=/bin/bunzip2 --with-compress-extension=.bz2"
-	fi
-	econf $(use_with acl) $(use_with selinux) ${compressconf} --with-state-file-path="${STATEFILE}"
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	insinto /usr
-	dobin logrotate
-	doman logrotate.8
-	dodoc ChangeLog.md examples/logrotate-default
-
-	insinto /etc
-	doins "${FILESDIR}"/logrotate.conf
-
-	use cron && install_cron_file
-
-	systemd_dounit examples/logrotate.{service,timer}
-
-	keepdir /etc/logrotate.d
-}
-
-pkg_postinst() {
-	elog "The ${PN} binary is now installed under /usr/bin. Please"
-	elog "update your links"
-	elog
-	move_old_state_file
-	elog
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "If you wish to have logrotate e-mail you updates, please"
-		elog "emerge virtual/mailx and configure logrotate in"
-		elog "/etc/logrotate.conf appropriately"
-		elog
-		elog "Additionally, /etc/logrotate.conf may need to be modified"
-		elog "for your particular needs. See man logrotate for details."
-	fi
-}
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index fac2cbf6d610..9cc09e84be97 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -3,11 +3,9 @@ AUX mcelog-129-debugflags.patch 416 SHA256 5c94bd92035c24038bd05caf0357e72a3085f
 AUX mcelog.init-r1 349 SHA256 bd2419d3e68a1d79a6f799af8760bb8498f70b4a1cf21227f141b167c8d367f1 SHA512 a43f0efe7eb5007e9422ca2eba43b666d5110696c8b049b74990849e200b89b99e3d22707803e21e4452b0e75bbacdec0526ed933b234301ebbbb19d700df0d4 WHIRLPOOL 1c79b79164fb94cf434353038c8ed2ebd6c0e4b02cb5da25f2ced6b9e2c6d2e9af6c35c4d8036c7beec9579ceb307a3387ba0b21f61f27b28281d11df608d5ee
 AUX mcelog.service 213 SHA256 6c9d5bad415f8ed7c6cb4bb111d7ad2d4f916f5737c2559f4fdc3a04b9fc3ff4 SHA512 8317d9310d58663bb28f2528e0872520e30475439b9ce69ebb2452d7dc3583d2aecab80d9f6ef895ac8a17f666c3229d7cd768026ea16cc5403fb05d8bdc5c75 WHIRLPOOL 2066c70585a5204786983d1139737a584c12b34d03a7373d717a98d1d880993d953cc509de6b5a02a3a5212c42f42bd0e20ae3d9d9b905c4ff20b3365c68589f
 DIST mcelog-149.tar.gz 296943 SHA256 a9313ed45cabaf7ef0a4d986ecf24a3c9ced9a4b1e34032d380af4e70c73512f SHA512 d2cb7cb26d4407dd03a425568a19c96e5f53cc9447c58cd105d74a2f69b645ef6b444c9533186aac6b052f0721959a321a3f8061477d1451a62be36add097aeb WHIRLPOOL ddea0a8efca6e5180d4d3ce663a0366b1a2eb78d8d11690e21aea81d3956838013aec7e83f29f6a745a63d18e95e8c71a2b00be135a5982013462b3911aa7f57
-DIST mcelog-152.tar.gz 297083 SHA256 7a903710a8ae0a031d337cc1e9e01f5353467e7f9aecea44bd50659793163022 SHA512 e89a4d81c87211f345d2f90dfb36bbb6ef4474745ac878285801b6ab4edd1ebc32feaf38b60f5976e7b9f29700495c2325f0e05c8ec432a22d77c1e9207a5e1a WHIRLPOOL 38e9526e2a16e4f25d0c4b218884c871b84cf0c2416ed80069746d0af3b7c2eff9d17b6f350b04f53564a172fb61b61ff8b51038ca639c37dbfbc7e6d3b34cec
-DIST mcelog-153.tar.gz 297099 SHA256 9b827f708855804b6952de6f6cbf2f6523fa1203c621e6050064388f459646f1 SHA512 9a92587c13680e83fd1b89d45c160cec91c6a90cfa32f5858fea444b2013f1a9ec3349edf0f7777908898967b1c1604761f481b91e87fd31b0c5255530b9453d WHIRLPOOL 2572ee54b68fcdab7b83207ef84035cb8096cb30fa225a2d11f823a8b2ecd4d19a728ba7f094e9b67c8f293a4611b2824eb555e6bf646939af47444c101fae14
+DIST mcelog-154.tar.gz 297148 SHA256 dde7aa13c5cc4916a168c2a1f68435a41f2236cf222266425942dfbcb735593f SHA512 8a160aaa8a0ed736cb81082321e199e6a6e4f7f6528915752af545db28918e89dcb6bf321a92472d776c61914d08c613900273b3d265a375684e3212547abe38 WHIRLPOOL 5ae469480520ccae572514fa19847235c362248a25d9c37bc2223dffa17547ed7a6cf7203914f5f7e6850be659d051f10424720d64f754a7ff32915f33f31b06
 EBUILD mcelog-149.ebuild 1216 SHA256 305dd87d7987c249084b01c4ec1bb45711f9a7b3294b28804047d70db22e5a13 SHA512 a0414d1608bfde9177e2f10dcd135f6f1dd8c9f9498a187fce8e3868db02a65f09dd74520b6659aa1424725a15d7a4c58542d505c1ce1ad12ffd48afce1e8b86 WHIRLPOOL 97c7efb4750b001d72a6952584783774bb4173e9041255582616b9ff46d3293d393842554fdf7bcdcdeb5baf836803586f12a6dce0faee28d1c6c1ebc94a84cd
-EBUILD mcelog-152.ebuild 1218 SHA256 962a0ac4c29a822efae0b33abca073a0bdfd6b2992f0a29ae2c56494cc365cf1 SHA512 8ff47aa8e9c52bdcbc0734accd716d514d89c0936c24340ddb7ce1b13e1c3c8992d56bce98378d7a6d5cd74579183049861d97ce67919cffa2650d202ba24364 WHIRLPOOL 3e0c3c00c2196c838f294b00e6ca46ee6e416c5d04cff0ccb28ef191e5a7b10c8899e5ae7661586f3440bf66b905bf3cdd847ded3ef036f2290b8035bff61da6
-EBUILD mcelog-153.ebuild 1372 SHA256 80774217d878f68286e3a14c846b52ae35c3a97e6ef2cc98e89643a1313a4eee SHA512 cf76774ce8ec0634a8a8e8eed22d6048085a4bbbf767e871963d37617bdeb0383590d85d00a7709e76d9a460dfbe90867c4b62e93e829c4081ed14025469b505 WHIRLPOOL 32d365e0bab72e105825dc2de67174be91151f70e7d3c87711fa8793a3fe0808c2c431e33ca13cc6d7f64ac51f55965c5712362b4e8d336f429a680009b5429f
+EBUILD mcelog-154.ebuild 1372 SHA256 80774217d878f68286e3a14c846b52ae35c3a97e6ef2cc98e89643a1313a4eee SHA512 cf76774ce8ec0634a8a8e8eed22d6048085a4bbbf767e871963d37617bdeb0383590d85d00a7709e76d9a460dfbe90867c4b62e93e829c4081ed14025469b505 WHIRLPOOL 32d365e0bab72e105825dc2de67174be91151f70e7d3c87711fa8793a3fe0808c2c431e33ca13cc6d7f64ac51f55965c5712362b4e8d336f429a680009b5429f
 MISC ChangeLog 3878 SHA256 487ad272bd946e20585e24c42fee9904d70395ca9f203b303a63c87e59e3f21a SHA512 729fbff0e43c1424fe279707ffbbd052ed2084b8274ef34307c1ea8984eb33e45b9c9c0724db624e54c863f52d92e1415d090366d94de00a75c56a6ef97193a7 WHIRLPOOL e49a4df2b397508bb73dde74c9abb469e40eb7f367eb3993e224c163edce3c0485dfb8f267865f33218b623dab4d1662aade526d540434ca0f54e989be3809bb
 MISC ChangeLog-2015 6067 SHA256 cd64e94164463a072484250bb9b73182b1e491a600d910710eb565fb4cb86b42 SHA512 f20d1f881f6a77470c629c1c23ced367eefe144ffc1459794d030fd4af428b99cf39ac774caa30853131934bb988dcaf872b9d2d452df9e627f8dde12a562411 WHIRLPOOL a07cb5f6e7e7f165616ff6484b36550a66998ced271e3e6ea8bdd3a2e7f93043f7af0eb648b39ae8173ca6b073600f002ddd463444f15f8cf95c04267571d90f
 MISC metadata.xml 837 SHA256 85fedba2c329867f241e36c6b464a640fa324d39f56e55642289a389791b4dd1 SHA512 f6e69af6afc0de8c5436fbe468a3afbcb96e808c5e21d8a5fa65878bbff0c31ee883c4cda638acfeef1dabd77c85d0fbb3091b180b0cd16df14471e64db8df80 WHIRLPOOL f8c9ac9caf750b21604909620c8435c0c7f7a2f3dbb0f18d93a256acfe81896029a72e88dd0d99eceafe35ad20b8a4dd6244a5b6028583d3b118468a553108dd
diff --git a/app-admin/mcelog/mcelog-152.ebuild b/app-admin/mcelog/mcelog-152.ebuild
deleted file mode 100644
index 4ac0a016c0dd..000000000000
--- a/app-admin/mcelog/mcelog-152.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info systemd toolchain-funcs
-
-DESCRIPTION="A tool to log and decode Machine Check Exceptions"
-HOMEPAGE="http://mcelog.org/"
-SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
-
-CONFIG_CHECK="~X86_MCE"
-
-# TODO: add mce-inject to the tree to support test phase
-RESTRICT="test"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
-		"${FILESDIR}"/${PN}-129-debugflags.patch
-	eapply_user
-	tc-export CC
-}
-
-src_install() {
-	default
-
-	insinto /etc/cron.daily
-	newins ${PN}.cron ${PN}
-
-	insinto /etc/logrotate.d/
-	newins ${PN}.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	dodoc *.pdf
-}
-
-pkg_postinst() {
-	einfo "The default configuration set is now installed in /etc/${PN}"
-	einfo "you might want to edit those files."
-	einfo
-	einfo "A sample cronjob is installed into /etc/cron.daily"
-	einfo "without executable bit (system service is the preferred method now)"
-}
diff --git a/app-admin/mcelog/mcelog-153.ebuild b/app-admin/mcelog/mcelog-154.ebuild
index 1e3b09353f30..1e3b09353f30 100644
--- a/app-admin/mcelog/mcelog-153.ebuild
+++ b/app-admin/mcelog/mcelog-154.ebuild
diff --git a/app-admin/mcollective/Manifest b/app-admin/mcollective/Manifest
index f80122ce125c..51569026f3ad 100644
--- a/app-admin/mcollective/Manifest
+++ b/app-admin/mcollective/Manifest
@@ -1,10 +1,8 @@
 AUX mcollectived.initd 497 SHA256 97de82c744874ad18356eb34b4b9ac411c8fdaa5b54482a68a68939df40aee2c SHA512 dc77a522e3ab6af3e23c559bfcb385033f2200b58b50db59000e7f56b2a789e8fbd83340f8ee494a1a9fdbdd1bd737a2b17ae4743823794264723fdc931ea6b0 WHIRLPOOL 1900da65b5d6f47fe98de411bd60dd88fc4ace9fffad48c38df2797ebe93dc350d38fa8563d2373c803dce5fab89ee55a2c9fe7128e6431c7d6458275641861b
-DIST mcollective-2.11.1.tar.gz 1516922 SHA256 d5e150408e61d51b3844e14c6304cf61f27243c5dc658e689bbaaee91dce6b0b SHA512 88d2511829936a5987c8ddab068f59d17f16230cb339801672238ae54ce2115e93d7271a78001176ccc203a1b70f7ee2f35992e414059f1db9cb05db210463e5 WHIRLPOOL cff40347c46464a18d6d98e3a3e2a7dab4169f5c0e1b60f08f3292cc87adcc123fc423203d664bcee1dac47a1dd44e44726702de5c2ea0ed0c5e55d8dbe0b45a
 DIST mcollective-2.11.2.tar.gz 1516590 SHA256 aa3664d5ba2d4d20e448c374c315c91d55b5bb43918a04092747a4052bc3f969 SHA512 1dc393fa1a09c5151b64b84086ef9af934feeebd2700a00cc4c84696fa2a25d90a410a373b553198f5fda6e1e36808ffb8dc38edcb15bb9e4253998aa7504439 WHIRLPOOL f808d4f9ffbf733842dd29f8e0548b90a4705f8b502dcc62509380b013d69de786204025490d4fb67d657e5c6597fb0d3ffdac2724e8dbca6347511ef50be54a
 DIST mcollective-2.11.3.tar.gz 1516665 SHA256 b9080779fa56c2b77a3f37404b3ac933183e0b0940e6086b0060be2c44aa38d3 SHA512 f5e26dff03f7a671db5de12acba1ce726c8d57fb99831ddbb258da5ba297ade31ea991840fa63cb1ba261281f7f6167a8492c8764a13cc332202ccb9c88d79b8 WHIRLPOOL 69e384489c8138aecc0c404dc9a08e5d92e09deab05a43ab4781b77506f4fe6f3bbd1a9ec9399a59e8a7c89d3462d3062d73a50fae490215628826c2794bd9ff
-EBUILD mcollective-2.11.1.ebuild 1638 SHA256 8b055a142d13d0436d3ef1be2093df2ad0e4d58f38f40681d0166a103fcd27a4 SHA512 59bf34c79a512b0a83807e36658bbabb5dec625ea54a4ee406bc54b9a330b8936f83aa59870b0ac30ca1f00694b71f4a8eefc1a84e60ae5ebd1e8aff43cc836e WHIRLPOOL 3fe6f79a49c1243fa4760622affac8c0320e2b9428ec87750f270e1bf9732bd2852b8bac05dd343af4ba33662384de183dda60a5070c4a1df9dc6ef2ce33df07
 EBUILD mcollective-2.11.2.ebuild 1641 SHA256 324bc04c36bbdcfa98b84a6f61c9182ee41559448e1621a8271cc0e593fdd1db SHA512 a699fb934af4b660c55ffb0d216e29d3b995601c1187e166e878fdbafd46ea7cea4e4951a1052139d115f00de1a38c990495715047f2c0ac13926b2fb613a25a WHIRLPOOL 8b10bedb9bd77b74c73bb80238496c36c1bfab0160dd7aaf589f8916be53a01551e9717c6f8ab1deea4ffdcd88f5caa166e523cc35fbb16037cc3d8f874292e1
-EBUILD mcollective-2.11.3.ebuild 1643 SHA256 d962c900fda8a21403f3ae1b4e9bf1281ff5b73e9e57ae31c2031a37942790b8 SHA512 1b57aebd8141f77295a4fbae23c5a25889373e41752f4eefeeb96a856f0c7b78390687eb38bce1d901e5a348f3e55ed6af4dc648d89a19e0168a1de8f30b55ec WHIRLPOOL 02ece74395a5259517209d333c3a7e32213113f74a5e1f364dc5c404c9ab762eb90a6cdebc8f23c56b358e9a17ca30c82d8e0aef0f18dfc7e96991133a70b868
+EBUILD mcollective-2.11.3.ebuild 1641 SHA256 324bc04c36bbdcfa98b84a6f61c9182ee41559448e1621a8271cc0e593fdd1db SHA512 a699fb934af4b660c55ffb0d216e29d3b995601c1187e166e878fdbafd46ea7cea4e4951a1052139d115f00de1a38c990495715047f2c0ac13926b2fb613a25a WHIRLPOOL 8b10bedb9bd77b74c73bb80238496c36c1bfab0160dd7aaf589f8916be53a01551e9717c6f8ab1deea4ffdcd88f5caa166e523cc35fbb16037cc3d8f874292e1
 MISC ChangeLog 3721 SHA256 312164363f75e97271f70aaec2869307d5d636513297acc7d943f8d3d680adc0 SHA512 01765da77e3c2806cd60d4802a2e57971a627aaec2525363391ba723366382a31a47bc7d6f7c108f2609926ff08a173b36bca5dfd99e6d8e29af84f8cfbccee8 WHIRLPOOL 0a56b19ee5d3558597907e7eea53a1900e694f969875c5514d1a43dcdfcb8be746be7e11c8edc9e3d1b2c42612022094197339b0c6fe860e93c0cc3b8becf1f6
 MISC ChangeLog-2015 4747 SHA256 1555e32b0cce5896f5aa1dc96dbfab9ee18005ca9861412adc257970943236c5 SHA512 588921e55eae4d4e2c5af0bdc1f5dcc1c5fdc75e1afa00505e71dac184015213f613151d82012c781e0206553e8ed24641daf569b3a31280efb3420ea1ad0607 WHIRLPOOL 7ffc8e316e46570275c026a87bc20a53c0e05819d5bb491b6072dc159593806b4bbdef069c48c3ad004cc266f110edf3a5318105961e4955c6ff36979c49b922
 MISC metadata.xml 534 SHA256 a49b8acc987ea0c9e2a42cfc4191bb1b0788d6b344d76483951eadc1fbd3b0c0 SHA512 e94dd85f11b4f8b838e928220cb887eeb70860e6d04f03e904ddd4332baddd3b01221305e7229fb575585235436d0d942c116f821ef37adae636a7d5c6193199 WHIRLPOOL 1b04bb250ec256dd971405639ae14f047ec37862fb56b6eb42c4fd98dc0fdd521ea9342a48139d35d4757a1b8b3592ab80180f55ed4bdb26191df7ca2541a8fd
diff --git a/app-admin/mcollective/mcollective-2.11.1.ebuild b/app-admin/mcollective/mcollective-2.11.1.ebuild
deleted file mode 100644
index 4caa041bf9c9..000000000000
--- a/app-admin/mcollective/mcollective-2.11.1.ebuild
+++ /dev/null
@@ -1,60 +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"
-
-inherit ruby-ng
-
-DESCRIPTION="Framework to build server orchestration or parallel job execution
-systems"
-HOMEPAGE="http://marionette-collective.org/"
-SRC_URI="https://github.com/puppetlabs/marionette-collective/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/all/marionette-collective-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc +client"
-
-DEPEND=""
-RDEPEND="dev-ruby/stomp"
-
-src_compile() {
-	einfo "nothing to compile"
-}
-
-each_ruby_install() {
-	cd "marionette-collective-${PV}"
-	doruby -r lib/*
-	insinto /usr/share/mcollective
-	use client && dosbin bin/mco
-	dosbin bin/mcollectived
-	if use doc ; then
-		dohtml -r doc/*
-		insinto /usr/share/doc/${P}/ext
-		doins -r ext/*
-	fi
-	newinitd "${FILESDIR}"/mcollectived.initd mcollectived
-	insinto /etc/mcollective
-	cd etc
-	for cfg in *.dist ; do
-		newins "${cfg}" "${cfg%%.dist}"
-		sed -i -e "s:^libdir.*:libdir = /usr/share/mcollective/plugins:" \
-			"${D}"/etc/mcollective/${cfg%%.dist} || die "sed failed"
-	done
-	insinto /etc/mcollective/plugin.d
-}
-
-pkg_postinst() {
-	einfo "Mcollective requires a stomp server installed and functioning before"
-	einfo "you can use it. The recommended server to use is ActiveMQ [1] but"
-	einfo "any other stomp compatible server should work."
-	einfo
-	einfo "It is recommended you read the \'getting started\' guide [2] if this"
-	einfo "is a new installation"
-	einfo
-	einfo "[1] https://activemq.apache.org/"
-	einfo "[2] https://code.google.com/p/mcollective/wiki/GettingStarted"
-}
diff --git a/app-admin/mcollective/mcollective-2.11.3.ebuild b/app-admin/mcollective/mcollective-2.11.3.ebuild
index 795e37902641..1e7cca4d5674 100644
--- a/app-admin/mcollective/mcollective-2.11.3.ebuild
+++ b/app-admin/mcollective/mcollective-2.11.3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/all/marionette-collective-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc +client"
 
 DEPEND=""
diff --git a/app-admin/socklog/Manifest b/app-admin/socklog/Manifest
index de4d0e6451d3..456d928f7e99 100644
--- a/app-admin/socklog/Manifest
+++ b/app-admin/socklog/Manifest
@@ -1,6 +1,6 @@
 AUX socklog-2.1.0-headers.patch 925 SHA256 6687d9d7c93c993b99f47948999c03b6b1402cda78d5f854d093ac881171ddf3 SHA512 d522a421a592813992646d9d2679b26c7c70a87645e06705ba212b26decd6f7dd969b4a35f54732b0b383783956c1b9ab2fc3cd402f6f5ff1a941ef1863c1419 WHIRLPOOL 29d971746c61eabd4c4c3d42bb6fb76ca53a69e859d457b0820c2e316a0373e8c60aea62df9b0f210a99469543004f29215f1d6864a46e271abced9ab2ae9702
 DIST socklog-2.1.0.tar.gz 56942 SHA256 aa869a787ee004da4e5509b5a0031bcc17a4ab4ac650c2ce8d4e488123acb455 SHA512 920ce5e661a6a3d970fa77ee3c228d48699ea03530be2b43b7517458b25e31a0a7f352ece2d076c715b6d34dbb26b424b48eb0f55b9bcd0355b74d3e34c77ac7 WHIRLPOOL b0dcf0eeacbd3edb0465ccbd40ec546fe293c3d293fac254e11ca8c07514b01de2a6d45a6ef0ce697e33a5d631810af62955fb66333f2606f36dc51587025806
-EBUILD socklog-2.1.0.ebuild 878 SHA256 aa1b52e185767329a1c5e82a7f1bdd2010b6ccd5cf06f9aa9b7f1acc9330b796 SHA512 a65fb7d7b8f4b7c88fedd2ef6d747abc1aa3381426066ad2ad2f980e5ab418a8ee3b5d43bafc9f8ac7d14f8d9815f8c7232bc54f1a4c278a2f22b6c25173db6d WHIRLPOOL d91150e39541d666f01a064816ddc09bc1a07fc774daf088131681a899cb27ae31b6e3697ee6b76cbd749b61adeee8a7711cfe6c4489dbb58014b51b497d110f
+EBUILD socklog-2.1.0.ebuild 897 SHA256 b8bcc38fd3668bc4a74a2aa16d29427ab1a5cf1b8defb05d76ebbc4ebcc9fff2 SHA512 9bc1780369034e44693e96c63163b31d2e5c308953a4664ad09876b15657962465d029cac8d66f6169fd7e1a845f0c655799ee6780cf6411c2567287a025a0fc WHIRLPOOL 237f4e103a82e553348684d6be626266e8ea18f6853ed14be90cdb4ce08f9994e44966f9a7887c2f116987816e100fcc56ea74ad6bb6efc6188f6f405683f71a
 MISC ChangeLog 2464 SHA256 99b9e80db47207713bc58aa8c58dd30592b57300800bf0b010143081d450a647 SHA512 352535da4552ec2d626e25e357d9843006a9c75a9353ccc05ba217e442675c2f83e8574761aff7ff95f931764ab532e57484f60a983571dee38109cbfae45adc WHIRLPOOL de6c81c08b28972d1b279f468b364384d9b3c5c37e65ba473a21aed0f5ea68f8fbfc76a93eee32fa550868ec8299e353224244b4c57247b55cea9c37e638ac41
 MISC ChangeLog-2015 1882 SHA256 8f4f22c396ce72efb1007ff9cd604b4669ac129a2689d19ced55bf24b3ff28c4 SHA512 a1f4abc4dae09ad86208933499f518e719a46bca4f5c672e5cf3cb06a32777956420befa2daac73abc649c4e36737301fe58b6ff1d36707e3e3b600492fbad6b WHIRLPOOL 2d554936dfbc6e1f648cd44b7a73b2df14b68cf6d6298b8f0398332d805d9489f25cd561dd1796695094b0a646e72b101f17cc6239aa3c5c3e1e8dfcd6c30139
 MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/app-admin/socklog/socklog-2.1.0.ebuild b/app-admin/socklog/socklog-2.1.0.ebuild
index f7853dd9904b..1cfad2788449 100644
--- a/app-admin/socklog/socklog-2.1.0.ebuild
+++ b/app-admin/socklog/socklog-2.1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
+EAPI=6
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -16,20 +16,22 @@ IUSE="static"
 
 RDEPEND=">=sys-process/runit-1.4.0"
 
+PATCHES=( "${FILESDIR}"/${PN}-2.1.0-headers.patch )
+
 S=${WORKDIR}/admin/${P}/src
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1.0-headers.patch
+	default
 	use static && append-ldflags -static
-	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS}" > conf-ld
+	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS}" > conf-cc || die
+	echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS}" > conf-ld || die
 }
 
 src_install() {
-	dobin tryto uncat socklog-check || die
-	dosbin socklog socklog-conf || die
+	dobin tryto uncat socklog-check
+	dosbin socklog socklog-conf
 
-	cd ..
+	cd .. || die
 	dodoc package/CHANGES
 	dohtml doc/*.html
 	doman man/*
diff --git a/app-admin/swatchdog/Manifest b/app-admin/swatchdog/Manifest
index fa7da9d432e0..64055bcd2eb1 100644
--- a/app-admin/swatchdog/Manifest
+++ b/app-admin/swatchdog/Manifest
@@ -2,7 +2,6 @@ AUX swatchdog-confd 678 SHA256 8dfa6bf1768d75cc23555df58d45cb8c52ae467a83e61acb0
 AUX swatchdog-init 1502 SHA256 b48c46f349520bebef1187524856434acc609ec79360230ccf72c41dfc2cd0bd SHA512 30d5451cd871c15d2e50a3d5f32f4ea986971e2aa9a0b06ce5e383643aacd72a29c1574ec03bc3c0c994ebb13287f5870e8987971bcb73821f3ee744c7c574a3 WHIRLPOOL c5e312cac327a6433f9f17195ab64db4d94dd00615c9b392c2658e79d37f1d3409b7127a098558b1455160e3cecd52d12eb173b51445ada1a042aba1700d3a57
 AUX swatchdogrc 299 SHA256 67c35bbd4d0abb51fcf42cb50c1f25bac3ec5d1cc4b1da09e66a08d6cc719c92 SHA512 64dfe179ccab5674742b8198f15b5439c324c7e9648fa0064a36010f7160303abd09c5af4efdb422628827ff8f327a8db312c4fdfbf02aab29c772d82f1d5b44 WHIRLPOOL 2800da2a3960b2edcddd8ffc45c9a03b75adb4b105d53ddc7f15b72dc42b7c847785e540cce2ceb94c5863144d84c795368791771f0d357e168431ce88d6ae2f
 DIST swatchdog-3.2.4.tar.gz 30122 SHA256 5bb644d3750ee89b9aecab797df66b28b9fd174a5f0f96cd62367af8975b4f63 SHA512 4e0a4e3feed00df0f0d04f94cc090e53e71fa9b20d46236ec41d63b98b5733d80a5941b491cffcbb0b655a9c7d2b5c9423ca7ae043346dbe1b05ee6ab24b9489 WHIRLPOOL 1681139e54e5f665c2573983e8488859f907b3083f3ca1106faca137fb0b978cb0b90218899728ae8775334360b28ec4572f78415bca47a6d8a1a72be9f86ef5
-EBUILD swatchdog-3.2.4-r1.ebuild 768 SHA256 514a39cbc8100ccaae9753bf0b828261bf18215c05f6d6040d1718f5c51ca09a SHA512 b61d632d0088e2de4d577889361e9fd4510ad31797fd1583fc3b8df0b2187c53678e4bfc5c8aa776e1d562db2f469d694d2d0fe35d86c968275fd86de95a6f14 WHIRLPOOL e6b1d89a9ea139e05c0c207d50346cb4b8803d586cc6b12d2f1d81edc855deeb7578fab3c3e87e80197b509d26d0a8a0cad5b1583abbca5551aec5f0f8cb0968
-EBUILD swatchdog-3.2.4.ebuild 672 SHA256 3597d1fb44d080886bf5c0f952ca4bce7982cc93bde8bba29c676ebc40591d7c SHA512 706a131392c669be2747ff0a600abda92515e2e2427419df5c28217da9480585a09a137a20ed3536a0e2147e57e9dc3a6c9ed0ec0e0abe2e56cfa62b761ef2e2 WHIRLPOOL 2646079d3b1ba4b57311489a774ca7cb1f225c013cc63d13e6e04c7430540e50c3f2635d126a39bb3fa4e43b6437fc2d2d2655abd46d022334e238eb8dd2b376
+EBUILD swatchdog-3.2.4-r1.ebuild 767 SHA256 b90e5da1647c6c628663f9214c748f727d9220b06f2f6e3aec19f60a9ab104e2 SHA512 6002de4c68848260f282666cf0cf51f9f97acc7466bd71301b80a3d1392ffb2f6c1e94a41bd6c0db3f98f05eb35bd152fc3fe691b09846b41308ed32b0f3e8f8 WHIRLPOOL 905d5f111e71624688ae481ff999e61e988f753a02de696b8a7be06c7419587d94fae4c9cf712cdde8d3a5813cba46aad4a76488f523bf37c0181b7f5d2c4bcc
 MISC ChangeLog 482 SHA256 c57bf04f2abe00401de876ba006cbe6e5806916879070296618b203c8abd881d SHA512 24cefa0bd960cabfeb193e240174ffc59448f64231dc4c5bc1f02b68fb6aa18926ac8318bb9c9e965adfa58d2fe34dfe7153eb08a82af364b313959d5f518265 WHIRLPOOL 5949c24050ede359d85ebf3a9649ee35342ccc051b673c1f7400965d336bbf70d7c97141acdb38bf28aef60e1a463e043c8412e956a0ff415b54b663e954a22b
 MISC metadata.xml 1137 SHA256 f231977c3ac1e7d0c13d1dbf8dafe073a2a58419ab3494e0af3d013d2ca0d2e6 SHA512 3a4efd76ee1a609c59a84ec43482982c27d9cf0ba4e4f42cb162c8dc39acbe89ffb146735d04aa111c404e546311df40cd9da782d76c766ac37e14aedb5f4884 WHIRLPOOL b2b6e317a183fe29c41ddfa53d3ddf462a0437d4f8a2f4e46e2d4b6db15c6d727a82d7675deefb2288c208b67e4281f3604c7e63fcab2d96e89eb0e69b01f774
diff --git a/app-admin/swatchdog/swatchdog-3.2.4-r1.ebuild b/app-admin/swatchdog/swatchdog-3.2.4-r1.ebuild
index 025756396a7c..c572801b8f3a 100644
--- a/app-admin/swatchdog/swatchdog-3.2.4-r1.ebuild
+++ b/app-admin/swatchdog/swatchdog-3.2.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/swatch/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="dev-perl/Date-Manip
diff --git a/app-admin/swatchdog/swatchdog-3.2.4.ebuild b/app-admin/swatchdog/swatchdog-3.2.4.ebuild
deleted file mode 100644
index 0dcfd1b80623..000000000000
--- a/app-admin/swatchdog/swatchdog-3.2.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL_SUBSLOT=yes
-inherit perl-app
-
-DESCRIPTION="Simple log watcher"
-HOMEPAGE="https://sourceforge.net/projects/swatch/"
-SRC_URI="mirror://sourceforge/swatch/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="dev-perl/Date-Manip
-		dev-perl/Date-Calc
-		dev-perl/File-Tail
-		dev-perl/TimeDate
-		>=virtual/perl-Time-HiRes-1.12
-		!app-admin/swatch"
-
-src_install() {
-	emake install
-	newinitd "${FILESDIR}/${PN}-init" "${PN}"
-	newconfd "${FILESDIR}/${PN}-confd" "${PN}"
-	insinto /etc
-	doins "${FILESDIR}/${PN}rc"
-}
diff --git a/app-admin/tmpwatch/Manifest b/app-admin/tmpwatch/Manifest
index 51d94906d6bd..25b5f20ffdde 100644
--- a/app-admin/tmpwatch/Manifest
+++ b/app-admin/tmpwatch/Manifest
@@ -1,8 +1,7 @@
 AUX tmpwatch-2.11-boottime.patch 1034 SHA256 5150b5d350213a6d3d4c5d747520077e5a1d7558c5f7174bacc138e72ec92d0a SHA512 6ad3cfe0dcd1a14d071ac64ca09279aae853c3b5a47604d99c2ff24319145d5c599ed6e780ac7eb9a2e2d185495e9d7e2133c905490b647f6b639a4bcd0def92 WHIRLPOOL 553353bb72b312aaebec9aa04b2211ec1e9340c41b08cde52caeb316861b39dc260bff3548d631e94a3c6c88fd5dff463ef3618994b6dd1c6865c01685daec22
 AUX tmpwatch.cron 1533 SHA256 ece4417d5ce022d647753e2005a11ee3b905d9f25e8f559a361c59a7760057f0 SHA512 9c96eaccc70d6eadac1233b6cd6772c61dbe8fed348fbe45d729bba8d8434f32bb4ba800cf92f151d7576763f7fde7c5c25b55293ecdac5f5254ce387da8b016 WHIRLPOOL 5ec5ef4f7ea2ad491c39656ae6cd84884cf5dab28bc36e5b7e890a818715185307b3a422a840ac35a12056fe6364ad09c336256e860e4ce05cc78c315f4b802b
 DIST tmpwatch-2.11.tar.bz2 145609 SHA256 93168112b2515bc4c7117e8113b8d91e06b79550d2194d62a0c174fe6c2aa8d4 SHA512 9242c5e1812c2ffc756cfc4cdc3023d0c0515e7c180e58ca3a838aa075d09fe4dc08dbc9afbc87ce3382e8aa8cb80a70e406deeab4ce10b39b6845d667989d97 WHIRLPOOL 94d83c4a2b1c1a19ab88632c61de37903b709bc7fa88aff9f8ac4f4b71a26b8e6fbcb1564b3bce08ed5d1d0a78511c3470978a13211356f5fdf10b4d40f2de1c
-EBUILD tmpwatch-2.11-r2.ebuild 722 SHA256 000e6d20aed139b7ac3fcf4663ca45d206dfe8efb323b64d0ade2583fc94239a SHA512 91a43b7cf57e996674560d685b49d7e2fcbdf005782d787e129da6a13d1a784997ba2c0ec030073b73034575a71687e1bc31b1ee4b9e08401d65fa6b51b62973 WHIRLPOOL df164934639bae18f14992619536ee469f1d1304c4b6375159ec039dfa993e011d33a4989d6ee5e6d6f2aa28569d86fb8eaaef67546fdfbb9bf7e1aa71135fd8
-EBUILD tmpwatch-2.11.ebuild 722 SHA256 12e154c3f0197ebf62c68c338273b519d6b213f37c7357e116c2ebc75cc026b5 SHA512 a7543348e40cca314a89a04ab8d1d6e2c226172cd1b819cc26516cc92d81bbe0f71e8ff6673b16ec6e88e57aa34c9e55a69cc33badd1b7844a1c0e4dd14ff11a WHIRLPOOL a71956b225a739226885c667575f44f8a2da4d374c5c840ff301cccadd3742740dbcf7442273311b912ec126fdeac981b8943fccdee4240c2339c3b09f6fd39a
+EBUILD tmpwatch-2.11-r2.ebuild 704 SHA256 b1650aa07d29ef1fa13ab43d58c38eae828b068705aa511d8fb9838da320d6d4 SHA512 297c4f41388e35eae3c1f0a4b13354bdb638b7df16d70e676be67faaead0a76ab71cd90c312cb97eed39bc18be1b06e674856e0afd832084a8cb0677a68b021b WHIRLPOOL 2494421dd6c33cb9cb84ba6b4c1207680a91575fc43711355b8abba36822805db06d094a2ad7ff7bd69160111904308554d03e2e3c390049bb381798879dd26e
 MISC ChangeLog 3011 SHA256 98b53b719c552a79f897a1b602b768a8ead92f8217d62c8b35128c760c3e3cb2 SHA512 cf128f51a822d6f80c36fa89237a13b893d5765f4c7d1bf001935fa784c725f46057bf467408f6be9e520dd1ca81e03580a3831d5e1db7205043c26512b515de WHIRLPOOL c663c0bc940b186591ee5380299a36acc79316ad80841cf1eb0f0aa9107b2b6f58b433401cfe20376bcc27d7b47c27714152777985d4e99e45677dd2ade7d4f6
 MISC ChangeLog-2015 13646 SHA256 241cb43ec00ffaffefbf3c8a0f4c0ffa7cbaa293a0e257bd6f3f7b056d80f653 SHA512 288f1be301627114bbbf8135b7631d715eedc037f99b32b053fc915f123678835deaa59625b3f4a82cf2e98fcfcdd422afb8c28b1bc5dbafeadbfc30fc628a88 WHIRLPOOL e6cb093b566e4de6675d912aaac8b0f4f9581b1d947414487689df0050d0a588a219e42fd716bf94b7c7455966b7d9b14eae19905ae38c667617f88c4516a1d7
 MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild b/app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild
index b1028a59fbb6..d95863cf391c 100644
--- a/app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild
+++ b/app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild
@@ -6,8 +6,8 @@ EAPI=6
 inherit toolchain-funcs eutils
 
 DESCRIPTION="Files which haven't been accessed are removed from specified directories"
-HOMEPAGE="https://fedorahosted.org/tmpwatch/"
-SRC_URI="https://fedorahosted.org/releases/t/m/${PN}/${P}.tar.bz2"
+HOMEPAGE="https://pagure.io/tmpwatch"
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-admin/tmpwatch/tmpwatch-2.11.ebuild b/app-admin/tmpwatch/tmpwatch-2.11.ebuild
deleted file mode 100644
index 5e251f8628b1..000000000000
--- a/app-admin/tmpwatch/tmpwatch-2.11.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="Files which haven't been accessed are removed from specified directories"
-HOMEPAGE="https://fedorahosted.org/tmpwatch/"
-SRC_URI="https://fedorahosted.org/releases/t/m/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-tmpreaper )"
-DEPEND=""
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	dosbin tmpwatch || die
-	doman tmpwatch.8 || die
-	dodoc ChangeLog NEWS README AUTHORS || die
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}/${PN}.cron" "${PN}" || die
-}
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index 710ac8cc01b9..21abb88f6925 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -5,12 +5,12 @@ AUX dpkg-1.18.12-flags.patch 416 SHA256 fb772f46a4aa82a46eb8ea9133db71e9dda5cf26
 AUX dpkg-1.18.12-rsyncable.patch 1245 SHA256 a8ded4f7cc0ce9c2874a93f5838ff2989a3a085458e07e821afbaa76f6669472 SHA512 743f4780b4c93e53924836fae96d59c2f1098dae6ef683b2b30146ab0345109718a507486f86ff96cda5b705aff858da563cdc0d40c965bf964cafe7105994ae WHIRLPOOL ba830eee1892b5a310d2458dca6ea53c8b2db365eb01ed6aa4b8d505bb683f5bba5f3ae2f3e963607cebefcb72827803e0065dce22383e2b929fda74a18da322
 DIST dpkg_1.17.26.tar.xz 4410860 SHA256 aa4e758752cdfd7ecb118d7a7d31139a0c090c92aa494aa2e46603006deb1ec8 SHA512 4d2f2a7691dd34d47b62ec1f602d9bab612b151f05362607ec8e31037c4ba0baf5d609c46352240e9806e5781db8df9781e8a0ee9fd24faf54f8b43244a7e538 WHIRLPOOL 56decf0774f2d4405fb0934415c50749230c06fe9112e0ebb4458a8917538c83644eadb885d24350bbf713a6250dd5687956b70d47e22c06cf39ff87cb2d5a23
 DIST dpkg_1.18.18.tar.xz 4501988 SHA256 c88b61e3d4660500753142689e8ddbeff1c731f29549f3338e6975f655936ff5 SHA512 7682c8ac523ff710acd6742b9a884ed8ec8537e3b38496f871f112fdfd2f874af6d676cfef2d31d2474c5637df043838c814ef4038097b009cf06b3d4e66029c WHIRLPOOL aabdc0df8e07fc5190e3bfa3ee29537b655410f739f5c7930086aba8e30745aceccbe671963b045d74acb2ace704a846b650c83c8fb515abbbccf5d71d70dde8
-DIST dpkg_1.18.23.tar.xz 4516252 SHA256 cc08802a0cea2ccd0c10716bc71531ff9b9234dd454b83a59f71117a37f36923 SHA512 4f9bed1fb0558fa6b003601b7be8d67eb592140b7f9ac4cf0bccb394e14b42a822cdc692c8c6e27ad2929719fe78659f21c128cb17618733d344fd3489f42be7 WHIRLPOOL 711083cdecafe9a54ad4fe13b804730ba56a3bc7e8c396624b6a87a8130d5151e7ecea8b518f8eb3aaba9dc64544f6a766b89500a517dcca8a585f7bc74af7cf
 DIST dpkg_1.18.24.tar.xz 4530444 SHA256 d853081d3e06bfd46a227056e591f094e42e78fa8a5793b0093bad30b710d7b4 SHA512 74df36a49a1b6b2243db14bd7ee0b69e50c2f0e79fc87e86e9b3cba2261fb717e421f7190a3ba54b4680a2f83855e5857dcb2625aa56847133258567392f1d42 WHIRLPOOL 94406a061e39aa755e8bf9a4ec2584a117676b4309b2b94442490571fa1c0a91cc2631083630bf5c701fd9a894891c7658ac70e583ef89be16a2776f941445f0
+DIST dpkg_1.19.0.4.tar.xz 4559160 SHA256 98a66bb19012f9bde848e1e02903fe411dd0b9e61921108ee4323c4167e6990a SHA512 3452889a0b5820372a9dd919becff694d4814f12a77b633f0c5f75f2a3bf6c883894b11dcc93e3be591bec42e15ae9824c2496c470962691759525f6aa42f250 WHIRLPOOL ab55132d23bf96b4447b9e5d5d8a46395625d871b2599a8d24daeec9211d4fffe188764e5014a3baae7452085e1af076dcca5a64ac1fb22fa216fa0c81cf68e9
 EBUILD dpkg-1.17.26.ebuild 2367 SHA256 c0cb845d3de6a978bdd4ed0a7340a5c01368e496db120f4df58d06b71c21a26e SHA512 12eb71a9b9c8922a156b51a415fd49e38b96625743a3afdeece1a309f2fe7b79d5f4db6e5fed5dc1af448364ab91b4cd4b01e03436167f40ed771044f1a3ec98 WHIRLPOOL 8ecaa19988f68c00ecd3fc5e62e0fecb5004f7b44bc22b83bd4696eae768bfc2987b7f4dfe644f4de013317142911a1f871e66a26f9245698651aa996640932e
 EBUILD dpkg-1.18.18.ebuild 1847 SHA256 68201f0a94db5fdd539a812cc83caf44a9fa95d0655a72cda79cf98f1b9a52ac SHA512 ab40891a8f1d15425e587fca9998ef2ee6ad5fce5ab8cf28f1cdc7325e698aee922631f01dbd0c10de124f0223d50fab667eb40a478356d8856d9b09028de1ab WHIRLPOOL 36214977faa140773b1a51d64f8ebb50c2032bc933998a6dfe0b522ac9e26d1e6904f3559e6b80011802aaa7e46b99d89a4bfb2d7e9476ae73bf358bdd6b4669
-EBUILD dpkg-1.18.23.ebuild 1854 SHA256 1e910b30b686d8a3af908abab23263bcb7df695210037c60f1dd6c18737304e4 SHA512 8e33864cf024978a2c1dd44e9e3cdb8ef24d75a0e13e74964737ffc788555f8ad0d51cbeec91be2b2ce1f11c329d7d9355899119133d47e930a5156cd4aa4492 WHIRLPOOL 24fe55d3d6e87cde65a430404fc5b54115e4aabf95fc1d2400dc629381cecc51bcddfc9b64c1d2046a640d3a61840b6ce99aa000bddfbdbf850e9592e956228e
 EBUILD dpkg-1.18.24.ebuild 1854 SHA256 1e910b30b686d8a3af908abab23263bcb7df695210037c60f1dd6c18737304e4 SHA512 8e33864cf024978a2c1dd44e9e3cdb8ef24d75a0e13e74964737ffc788555f8ad0d51cbeec91be2b2ce1f11c329d7d9355899119133d47e930a5156cd4aa4492 WHIRLPOOL 24fe55d3d6e87cde65a430404fc5b54115e4aabf95fc1d2400dc629381cecc51bcddfc9b64c1d2046a640d3a61840b6ce99aa000bddfbdbf850e9592e956228e
+EBUILD dpkg-1.19.0.4.ebuild 1854 SHA256 1e910b30b686d8a3af908abab23263bcb7df695210037c60f1dd6c18737304e4 SHA512 8e33864cf024978a2c1dd44e9e3cdb8ef24d75a0e13e74964737ffc788555f8ad0d51cbeec91be2b2ce1f11c329d7d9355899119133d47e930a5156cd4aa4492 WHIRLPOOL 24fe55d3d6e87cde65a430404fc5b54115e4aabf95fc1d2400dc629381cecc51bcddfc9b64c1d2046a640d3a61840b6ce99aa000bddfbdbf850e9592e956228e
 MISC ChangeLog 7721 SHA256 1e1c36cfd01473e82c9cc67664f45558e45b8c319f517890e9436b63d9c39d92 SHA512 2683ce4a540924cef2c096b3793bc0f453494aff39d52ab4a080d43a994e1215e546bc761be915af1fe9331c468f192e65a75d728fea298ac8fa7db83b28119e WHIRLPOOL dd7cf86b9ef389d004008c114af04e7095da91a6e4ab666f031f3b030b599ec606570b32891b6a4600ba4fd3718aa2d9e45e46fc03390a6bc297a91d9184eb59
 MISC ChangeLog-2015 41705 SHA256 f7f0188c3df33ab1fc331c9ca695b1eecd4ec0cf3b9e5b3ed08df7b754ff80ce SHA512 8e1c6d6fec58f5fda0a2b052ab7854b6251032d68e2f594c638d6d7978b248ae387ac1d178bb9e4d9dd2587386c2ecdadac03d0df81b9847dab03f23ec29d1ca WHIRLPOOL ad4693ad3c953fcb20ace7db867b1bd293a51a12ee37a0beab170b93be9503b780b023fd17568e9579cc4ca72bc030f19e044fb8ea09989880cb087e7f0937b3
 MISC metadata.xml 339 SHA256 7e03a6012cee00c3a0b649654cec8a24311ed416b5061f351a2a0af841b43292 SHA512 c3fbabc925c3e99f26c6441cdea9626dc93520f2a8d3c5e45bfa7e51d42095295624f0f82377240f0c11580a9eccc5b5b15bf149ce6cfa36960e52f8c77aa61b WHIRLPOOL aab452f864ee87d0b3477c03b4299b89d61fb0c1d23ba061993f729d9f44b0742611fae0c3d9b0cfe88ed4f4dd0d4d7a8e74b5cf84e71acdfab1c0b696204358
diff --git a/app-arch/dpkg/dpkg-1.18.23.ebuild b/app-arch/dpkg/dpkg-1.19.0.4.ebuild
index 88cfc19ca527..88cfc19ca527 100644
--- a/app-arch/dpkg/dpkg-1.18.23.ebuild
+++ b/app-arch/dpkg/dpkg-1.19.0.4.ebuild
diff --git a/app-arch/pxz/Manifest b/app-arch/pxz/Manifest
index 5dc65a61a3a5..755d6fa15ed6 100644
--- a/app-arch/pxz/Manifest
+++ b/app-arch/pxz/Manifest
@@ -1,6 +1,8 @@
 DIST pxz-5.0_pre20110811.tar.xz 11192 SHA256 0059ce89a35ed9d14634903ba1c7aae0a4af6116a6b0f04e10c4602862690ad7 SHA512 d7a837a1b777aad397752efdb0416778bd7b0da93db40528db384b5573702ff9c387c8223a65d1cdec3261cad07ca51ba8dc3bd8be18871d66f63009e144799d WHIRLPOOL f6b9dee63c2888f360f6298b04fb8d58ff20d57838faefa7e96296a37a98263d42b414380820642c9fc57d8ca4f5ff6d1eb7ddca66d09943c2676bf34b0e3a01
-EBUILD pxz-5.0_pre20110811.ebuild 480 SHA256 53cadf820a035a90862adf776867b0c677a3d4e221d8f62ded874352882b857e SHA512 9bb56111e2934281db524b491917ff6d29a7ca50ba378af15427a18dc8c9950b537ad4a7126eba918385c4e0cb9fe344a3c79bf9e38647747c0aa01a3640000c WHIRLPOOL 551ccaab00e64492f6684410342390231af121a4ff5526e80f3d2724ba0ca0c371e2c0e93d012fb9049d3f750d70f7c7ce031902cea8df117caf6ac347d9ea90
-EBUILD pxz-9999.ebuild 946 SHA256 3a35d916839a95b327e54c7436e9c5df8a95061e4324cd124f89623e475d9766 SHA512 3eea701a0b1c6558567fee886601435074f36ee1ffa805055bb10a6582d3e04ff663ce3e296272f76a4d1ce6b3a3f1d17192bb02c3f98f40a758c00316e156b0 WHIRLPOOL eb71df359cb7fbab48710f561a2d8482b00902c63710be26db6e561a016a7beda0dff91eecaac23403f9b511a0f64d35895277067111193d2474b10ea563faf4
+DIST pxz-5.0_pre20151029.tar.gz 12271 SHA256 080d655f84093ba4dafc22b44c3606ee12bad04d2bf1fd6df8877d94b1710251 SHA512 d26bfdf9b70baf91c575e21824920cb42d0a9bd171254b99147a6e5e322ed3d1f7351a570358213431bdacdcbe6e7b22646a2dd2d7a127e167c8237bc4f3038a WHIRLPOOL 113ad028f3f2e07dda6f8b124df100c51f789bec0ba44919fd14d52ac8d7c72e2a6c4ee38f5d966525f509492a10b805981e2a5d15e77d98cbdb81e8593c19b7
+EBUILD pxz-5.0_pre20110811.ebuild 487 SHA256 79fe7799ed75da7b7e860b44a58080a4355b84f41244584f63f988d19be2e6a1 SHA512 05dee585cf00129a71ab08314095f328623ace14c4d37c17587227412ed2945bc13410d87fe86e34319b012bd519eecf01552b431e1c22577b871be08f62d33f WHIRLPOOL 3069b703833f7937ea13dc5999cd888f2433bf60c299e9ecd786043749d337c7a9c65c04e6a16aaeb61ae6290dc5dd624b390650f5e0d888d05e08685bb30480
+EBUILD pxz-5.0_pre20151029.ebuild 684 SHA256 2a41cdedab6957bb225e2b4dae4ee912fff08b530237e4e011230ab4d17dd410 SHA512 5659d7bac8842ff9eed5313d99d115e332edc46b5d03f5472169c750ae92cc0720347a0c6cfb1edf5b190847c0ef96f206a8f85e6803b9064da2aee1b045efed WHIRLPOOL bb3f431ea61d988cf894bcf5dd7b0a6a02e6dec298ad247a8b53cac458a4d37cedb18c5b99a1249d28b9b790edaa9c5f5ea2a17639e0c1409040254d5b3e11ec
+EBUILD pxz-9999.ebuild 860 SHA256 27420143c4d7a803e814e13efd22ea5d7ca06561dedb40a85093fee12a386c0b SHA512 0ca694e81e650075d38a7f201b82ced3bfe33df2b19f0253ea0cf522f5885435faba8016d362fbc92969a8e2acaa1fc88a931d431a6f3a094c125f37c6fa06b3 WHIRLPOOL a4687cb2119c28d800824153c68f804886062bb8ad1c8402e794211d71921b44558d4d076bf13de14fbfc7910c8ed53bf826091848a111197e4d2c966270c1d0
 MISC ChangeLog 2619 SHA256 f3de9b455ec8061b5b2ff36c1f49ceba821814a4378364bc5bdab4c39d00065f SHA512 2af9eaf157a86a86638e3e30e0cc732e662b8ec8ffc0806c49fc0f5f77418e1458a685dc6ef60b1413aa9529a0a775140970c44870797ce731f48f0970ee8400 WHIRLPOOL dd94df5e595692673efdb2d4175ffde083dcdbb1171f07e3a52d31fa0a7534a2ae66a75a752b4219be89df20b9f3220c12e3fc611dd391c648630644793e068a
 MISC ChangeLog-2015 491 SHA256 c14f247f7cb759d0640faabbb4e4b7754a607e6d05f32476577a92479942ffac SHA512 ba29c72d8f559c0d6a4787c3826a41e3b7bfa4a5ad4e6dbf023c996799f940ca9081215c81dd26d933b59ab6a858fa9fb62e91702c7123bda96a9f1d8b846994 WHIRLPOOL 0197031dd1967c73a910bce019028d76008c5e31a4011d4df88fcbe7003b70a047ce288d0e0a2a3888c4bf1ef5a0a7a250c78f066cf46e810553153ad74da376
 MISC metadata.xml 589 SHA256 3b52f15989995179ccdecbaa859d690100baf29df3915f730ae03bfd8762f882 SHA512 4d345f2f0e3097fef6c502d28abb4ea2f236ec608c4ef0a56d2769513dc3f170e1589f9c14850e365c9914f25868a67352c52e8335a5c9694b69fcb3c27033ac WHIRLPOOL a660a9daf553b75b767e1b593219f905b3b67d071de370c38f12bbce39597eea0b5fd32d437473bba447b09a2c4e9a356899648cd99df18561bee0ffb6f97b00
diff --git a/app-arch/pxz/pxz-5.0_pre20110811.ebuild b/app-arch/pxz/pxz-5.0_pre20110811.ebuild
index e36a6e9f0f65..b9a456cf3789 100644
--- a/app-arch/pxz/pxz-5.0_pre20110811.ebuild
+++ b/app-arch/pxz/pxz-5.0_pre20110811.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND="app-arch/xz-utils"
diff --git a/app-arch/pxz/pxz-5.0_pre20151029.ebuild b/app-arch/pxz/pxz-5.0_pre20151029.ebuild
new file mode 100644
index 000000000000..b530e792a3a6
--- /dev/null
+++ b/app-arch/pxz/pxz-5.0_pre20151029.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs vcs-snapshot
+
+DESCRIPTION="Parallel implementation of the XZ compression utility"
+HOMEPAGE="http://jnovy.fedorapeople.org/pxz/"
+SRC_URI="https://github.com/jnovy/pxz/archive/fcfea93957d96b7661d1439cf4b767ecfd341eed.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux"
+IUSE=""
+
+# needs the library from xz-utils
+# needs the libgomp library from gcc at runtime
+RDEPEND="app-arch/xz-utils
+	sys-devel/gcc:*[openmp]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	tc-check-openmp
+	tc-export CC
+	default_src_prepare
+}
diff --git a/app-arch/pxz/pxz-9999.ebuild b/app-arch/pxz/pxz-9999.ebuild
index a79b3ab628ff..d2ff3b411edd 100644
--- a/app-arch/pxz/pxz-9999.ebuild
+++ b/app-arch/pxz/pxz-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
+EAPI=6
 
 inherit toolchain-funcs flag-o-matic
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/jnovy/pxz.git"
-	inherit git-2
+	inherit git-r3
 else
 	MY_PV=${PV/_}
 	case ${MY_PV} in
@@ -29,15 +29,11 @@ IUSE=""
 # needs the library from xz-utils
 # needs the libgomp library from gcc at runtime
 DEPEND="app-arch/xz-utils
-	sys-devel/gcc[openmp]"
+	sys-devel/gcc:*[openmp]"
 RDEPEND="${DEPEND}"
 
-src_compile() {
-	append-lfs-flags
-	CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-	emake CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
+src_prepare() {
+	tc-check-openmp
+	tc-export CC
+	default_src_prepare
 }
diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest
index cd57d1323854..269ba73bf8e3 100644
--- a/app-arch/snappy/Manifest
+++ b/app-arch/snappy/Manifest
@@ -7,7 +7,7 @@ DIST snappy-1.1.6.tar.gz 1128388 SHA256 6fa92cde5b2caefd0d9a60336991ba42e5a7ddc3
 DIST snappy-1.1.7.tar.gz 1090550 SHA256 3dfa02e873ff51a11ee02b9ca391807f0c8ea0529a4924afa645fbf97163f9d4 SHA512 32046f532606ba545a4e4825c0c66a19be449f2ca2ff760a6fa170a3603731479a7deadb683546e5f8b5033414c50f4a9a29f6d23b7a41f047e566e69eca7caf WHIRLPOOL ed5dacdbdcbfbe88982b23d389d781548bf8780c1ecb9b99c8a09442821a97b6aca2fe5eec86b8db1c8e305e17b381391a595d5abacd24b9ace5048dc64cf232
 EBUILD snappy-1.1.3-r1.ebuild 965 SHA256 e70878882f78c0da0b3aca3a83e54be007e905148d18777919f8126f05555ac4 SHA512 78b96490c77f3a70cd5fb84e54aa50fc05185e064214c02baf9edd6519e236b76bfba64cec67b32f0d1860dfc6e73dd9be143d97d7421be0d93e0db0f2723293 WHIRLPOOL 824be82c9097a0143355e935fd7663f41542138141bbaf4aca1d67e55a83d080786db1f02fddf08a8db90734674b82a62f2a62c1e1bc30abb375ed7ac48b41af
 EBUILD snappy-1.1.6.ebuild 2112 SHA256 82ee0e265e78583c940c7da9e9c2437873d9196858bc2a2882aa3a5e3b85a8ed SHA512 7762d015200dce6310f3a46ff18b0b3f46825592bdb1af053a00386ecf6194586bde76c7ca823fc1b6c6b9ccc7c74c36514c7457d544d33836e26b2ca66722cd WHIRLPOOL 1401aea6196d880803e46586baa2da18467d7d720c9b6b926cfbb6e96f1808111f029eba96127e70d8ace09e066104c864c13b3757d7b36f319f800cd3c628f0
-EBUILD snappy-1.1.7.ebuild 1924 SHA256 3968696c57a01ad34412964d618a72c169b3377c004100aad88da874c2e5cdba SHA512 2605bf66c81c6487e30f7f190255d0797613aa56f575db83892771ff72e0928a893d2aee566bd35269355ac963b2a3039389d0266bded1ca7d746405900b26fd WHIRLPOOL 8541a8399a4d9ed551d440e1beb0fb30265ca5c8d84e3281f78605b0659753bdbd6639171265de13b42ce179462d96a0595eaca8401c495273c2c7f158b2b61d
+EBUILD snappy-1.1.7.ebuild 1930 SHA256 47607a4fe724fc0ff6f4e20e29761363705a264dc735373dee85d5adba628a44 SHA512 2f6578ebf0fe9feeaf518811c4c7fba6fae70d27af0926d98027b61bde1891c0cea41e513f2750d7124a745eaab60968fc74850676db5b4d1d73eaf304154ada WHIRLPOOL 526bb7bac6899ecfc8b884c7c3fac3d222a9506e3140e7726800642ec5c9b905a95ab37f7bac9a108039cc03d47407f4929b55b74f0999f4b224cb4873ef89fa
 MISC ChangeLog 6533 SHA256 d83e8fab2af5d2e43708dc0f4b590875e2f798aac1ede0180e004029721b06ea SHA512 e8935a5c5c262c250e4aea2f8169585df61ab57cf84d7cc2a8e25785d2efd75d3f6634036533b04361decf841f4dc699e794ccaf87a9da8b330680265549d7d0 WHIRLPOOL 59b08a6091134ffe7ad95eaf08dba4cb510745cecb71c1ee99e86ecc89e533460ee67771e3b7716f80ca4f5631c87fabdf9471c458892f3d46854cae0fe471f5
 MISC ChangeLog-2015 3009 SHA256 496f7049cf9169cd876f483f36355d834dae5d53ee5e7d4ea832d94f8a91223b SHA512 16b814e292d70e3d7b8483c2e033810a0c92cdbc2f6916c3804129fbc06b19315dd5fafb0984c1ec34dd269b447465e07e1eb2513a7f2bce2e508f51c3794b38 WHIRLPOOL 89c95a8bf42c4ca793e68599238a4baee414f5537937ac58019410e2740e5aa881cb5a235caf3eecfefec7ca031a1f04d4808c5340bd42edd85547d9d6857664
 MISC metadata.xml 584 SHA256 f04f34c234737a786878b755c50e60c82f305a916e6540d78d64e4e125163da9 SHA512 5897170c6fb84f520d879b5df295608b92376150ed2535b578ff04c5cfb5a0ba334a7aee3ad1ef41a8ed45b3fb36425e1dc0e54c0fb880e0c2bf72803a2da552 WHIRLPOOL ca57c4d5abcd31ffe119bb9a85653c5addc651846cffe9d0196fa91eb1a0b748589962b580b544501b8af52b57fa89347bf7b0d0056792b89233e202abf03232
diff --git a/app-arch/snappy/snappy-1.1.7.ebuild b/app-arch/snappy/snappy-1.1.7.ebuild
index 7eb64d8c0c05..eea333450b70 100644
--- a/app-arch/snappy/snappy-1.1.7.ebuild
+++ b/app-arch/snappy/snappy-1.1.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV%%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
 # upstream killed static lib support with build system update
 # (and we have packages depending on the flag)
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index 4ecf68572add..9a7ae22b9e17 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -5,9 +5,9 @@ DIST zstd-1.2.0.tar.gz 1300584 SHA256 4a7e4593a3638276ca7f2a09dc4f38e674d8317bbe
 DIST zstd-1.3.0.tar.gz 1469911 SHA256 0fdba643b438b7cbce700dcc0e7b3e3da6d829088c63757a5984930e2f70b348 SHA512 5eb9e001e14d3342e76eb57b672c636fd56839ba8fc0ba9a751484ea93389c72c494ad2125dc2f9be1f72481f3af34568477123f7e9d3c7504e061e4c083cb30 WHIRLPOOL 61d20ecb675d95ef972b73e5cec144dde6f8a784423b136f4520f51ff8429aa3a59600a371b9b8eea7b2a1949d85508346f620c3cb1852162b27827ba99a7c73
 DIST zstd-1.3.2.tar.gz 1618939 SHA256 ac5054a3c64e6510bc1ae890d05e3d271cc33ceebc9d06ac9f08105766d2798a SHA512 e2848d08b38d2fe98cd327611044bdac2f948547124321c8d63d5bdc2e6694d623c40c7bcc7d499fa83531f9cb92ddcb8be67614a49f855a9103f0ee6af0985c WHIRLPOOL 138bfc242ffb14a1c0b59fa80eb0971df14056dfe69a6f13e3dd1b42ecdd5ad5b2b7c908f086aff0a965d0497b912588a4b15ebee179e44112b93bd406e015f0
 EBUILD zstd-1.1.0.ebuild 928 SHA256 2b56b5bdb902b1357e37489cce468b36c80c854ba0e0d1016ecba8b8f8f0427c SHA512 46c64fe1cbdbb0d4cc6233517253e7ea9d098b7ae355aa93fd972f9b10fb07fb7ad19b6dd7bb1bcba36c24c3be4fc3ed14d06f96ab547f428d60f5115bc0d971 WHIRLPOOL a48f61f75081c876009fc62e24e572693b66225432b4d26ff1edf71c9948fe69bf31162f626221d2b55f2cd8ed53ae8802b7b776bc5035c879e05918858397ac
-EBUILD zstd-1.1.3.ebuild 894 SHA256 06c4e238d9fb7f736c0a6521f53b40d8ba4324df954932ab002818489de28b16 SHA512 62071e9c75c620b672beef40a56c4873cfa61f86f66839bac4f62412cdda5d692b641f77c1a370f1fc5a2071eec526a440eebad893e1a67b434b2601a29845c2 WHIRLPOOL fdf685afc720d58372e71736652c3798520f0dbc9ba608897873b5436c20ee1ae26d764c718cfb24b12cedb71504dac559bb3bb3fe4a40f07989a857b44573f4
+EBUILD zstd-1.1.3.ebuild 892 SHA256 1457ec0ef48bacb951fbdbb4e7afee038269bb565046da382e49143aa00a8128 SHA512 f343aa7eae91de107dfe862177cbd6685ece2c04839513c4ee9fa7e63cf01a33107febe6dece73e88edebc4ecb68f98269634d857062559fa1561fd143a4d1f2 WHIRLPOOL eeff7cd59d943530c413da047ce8e6864ffb0e52824affdb6e6cec9743afa9ce9aec20490155f9bb1722e53675002f6b5139b7e160cd10c770fff5cfc376cabf
 EBUILD zstd-1.2.0.ebuild 904 SHA256 bf8d6a21977ac1b1083602cf02719cbe2feba9b08a3f6200fc5fed9e2720814b SHA512 f74706f6936df707e5e6999f3c642e7f833a611faed7db59c0c7b85ea553ec886d52365160967f10e4b8be35bdf0afbb8193156d4b11a3f49deca53ce95796e0 WHIRLPOOL 2bc2b7ffaec806e2aab878a172b04070d06ab3d23c9242bd4bc54dec297f62da2d6554529864b499874d3d83b8a6e765dc81ce0ce8231b8633ccb8dca61b6ad6
 EBUILD zstd-1.3.0.ebuild 1239 SHA256 6ea8e8de8ae955ec563aadf78b1ca60c1d8463b64704d6b6858a37ac1be55602 SHA512 07c505650dfd7e475337e2d9b503256b0709f794f9822dbf1947c257493b4c6ea44e9eea1b2abd9b8fd3dad7a569102b823e08167686b8d80eb00222113768d5 WHIRLPOOL 88e235da82e810440fbd560589c1d391d401c06b15102394f73d989c108b09cb304ab369e851ee07f75f1ffb82980d173d5d417b0aed9a7c79af7ad5972f73e7
-EBUILD zstd-1.3.2.ebuild 1252 SHA256 0e38cecd5f0e33b6dda7497dce1519ef5a1fcf68eac401e1a8accf060f3f7b4e SHA512 c9752586de3b28863a9326100a9e1219fa39e552c41b5b4ad7ef4c4928067adeba4df456125e9e1ca763d07bdf4cc28cec31d75a66b3f81be0a8277269aa6be0 WHIRLPOOL 5e0b09ddb81f2a522a747d13a38b3fcafd1fbbc4581246d28785f1a5924d8f0f538cde96fdf0b27234635073a76141733c12abaf691d5c0b1c27a4791b044781
+EBUILD zstd-1.3.2.ebuild 1250 SHA256 e1b7ac73211402bb4ea6fb184d9470047a44ef4a6961ba76e43a3d7e8fa00f89 SHA512 1ac20425213f36b09b8ac8aaf9d2c7d53ccde658579b190f2c0fc6f1883d6141ed29bd87d3ae8f8205a8222d0a8b1d56a29c6d3b82d0e353c38c189b03c84e56 WHIRLPOOL 921b1df8dd587c9e950a60396bf4d0eb475c687635c10fa46e84f9f42d409dca6de9940435deefac8933ff887aa9de594eba9492d3a5094960e55648faa18c41
 MISC ChangeLog 1336 SHA256 0458cf9031095580000f282f751531d4401321a2e71d4ada520f934fa077f150 SHA512 405e90f9065dd8b727d40ccca61b387b046d2d3560bdc07ca56a94001414c7903d63da5540dc44fb460d2dfb8fcadea695bfe64a7354c5eb47a08c529f880b0d WHIRLPOOL a1b7181df2c485254c980cf2f08f38bd2e257b75d2e7e3b266f10ae28fdddcdcbc18222b353d50e19824c6ffa1c9a866044f5ddce6a6fe680d4f0db9c811cffb
 MISC metadata.xml 335 SHA256 f037a36869488c95518aa3577c4ab1c644df5b682bd569ce8fc95433397dcf85 SHA512 9269829ff4dcad03a604ea00c7f9a3bcd937195b711ab52f813d39b8ebb921585293cb3cb97fbea75921df9a673d49c8a8b39dc13b54f9b171c08d6ac0c31bc6 WHIRLPOOL 18f946ccabf43f944251cb5f73eae533221f4a19af5195bbdd11170cb82ea438d9a48ee3ca070c8bf9abc365e7bdcb038e0997261139be0deb062ee635e4e44d
diff --git a/app-arch/zstd/zstd-1.1.3.ebuild b/app-arch/zstd/zstd-1.1.3.ebuild
index 48c30c2adb2c..ae29c4fbab9a 100644
--- a/app-arch/zstd/zstd-1.1.3.ebuild
+++ b/app-arch/zstd/zstd-1.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 x86"
 IUSE="static-libs"
 
 src_compile() {
diff --git a/app-arch/zstd/zstd-1.3.2.ebuild b/app-arch/zstd/zstd-1.3.2.ebuild
index 32107dd78a97..61d5755567fc 100644
--- a/app-arch/zstd/zstd-1.3.2.ebuild
+++ b/app-arch/zstd/zstd-1.3.2.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="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86"
 IUSE="static-libs"
 
 RDEPEND="app-arch/xz-utils"
diff --git a/app-backup/backuppc/Manifest b/app-backup/backuppc/Manifest
index 143c55d7f687..9857b8ce8727 100644
--- a/app-backup/backuppc/Manifest
+++ b/app-backup/backuppc/Manifest
@@ -8,8 +8,7 @@ AUX backuppc-3.3.1-perl522.patch 607 SHA256 39e5b941705920f2a8f2ec73523d920861af
 AUX backuppc-3.3.1-perl526.patch 969 SHA256 c3a9ecbd526268b4610025455467ff594f8a9bc3bc94ea602616253760b1d485 SHA512 da626131a3253bbc6fe46a06f74462a2d356a71ae369e8de88acca2d85376be0d6ad16c8c566f7c80b93e794808f8b1c09a75707d5031dc64b93ab0f698faced WHIRLPOOL bbf89cf615cb0e2db781589e41e27256d0cc4827028fca45423fbc61c625f23f8117011b9928f6f324efcf2a40bd8b48c08d08e1453de3824f9763bcbbd36124
 AUX backuppc.service 231 SHA256 64114b3ba85c4f6fe313734523c5c2f53f269bf69aea71b85d8f2a8fad7f80f8 SHA512 9a7cb7ac7da2851cfaf90fafe082800fbac34a5a40a9f6aed1ea817b6f9aeb5be60cb3cfb35c263997c2ac1d22f3384752a23f44158572a9efc8f2c48e99c969 WHIRLPOOL 73d966f11ee9070c73016a77373bc80cf90b746fe67f53a178f439767c72b6d2efcfc16b66d4771e11a5862006e26bcff433da1dc4668635ea3e8f1254b28ef9
 DIST BackupPC-3.3.1.tar.gz 556461 SHA256 c9cc4aec28a7474a68d40f4bc460ff15140e05c96900c7f98ff3ef06c4f6ae4c SHA512 b6bb9de3103c5062098d80755055b7461ae9133a4a46a66b3d0af89d081086571694db1898e7d85880defa15b030bad522812116ae5361c0fbde90b877d139c6 WHIRLPOOL 1d895f530932fc1287cde9db584befc6ca0850b5841cc4e60927442d0db662ec092bda4efa4953650d3bfa13deb6e9fafa25c10f82e19b39c67969bb4e143bac
-EBUILD backuppc-3.3.1-r4.ebuild 5477 SHA256 6a38cb3548b056d35fa06112f1b4a90144db7276dfb48145f3d71f9cc0656396 SHA512 baaa06ec3fad3743f213def8dada6ada60973068f9629d9508e561570567189736190aa7be557c6b3a917f238b331ce4ea79c1160e9e916e6c233ffe455f8e82 WHIRLPOOL 38361bed12d687eb8f7595afd3d33ff5d425146add36998d30c47f825a4076a23b70348b4ade37120b01bce396cacaf5bb7e9c4f47751926c1653529cb221e8a
-EBUILD backuppc-3.3.1-r5.ebuild 5527 SHA256 c11b158eeaf4533f47501332979c77c6deea69f94ba900467970cffe36f9035c SHA512 62674f0cbf192ccabcdf07c638949e97138229d63bf20fd785513a19f2612b3d2fc78a92010125bb509c23ca1f7aee4d68ff776af0c985732bf2db2d8ed34998 WHIRLPOOL 925f19a4572a28fe3f01a0b3ed9259cf79e6f172d06c06021627bd3044dd5eb908bb2860f7a2b4a535d80a3595cc777d348b5c35ac6189424ec550c9f5646746
+EBUILD backuppc-3.3.1-r5.ebuild 5526 SHA256 f8f7751ad652267a766b77327b085703109cf742f6f9507cde2f923c578d0f96 SHA512 c1c16a3cbb91dbd990165719591fd48fc6bdddc54c86e6d977f6e7cc3302b3e5e49ce1992f79b70e5c8edbde0b85919fcf4e8dcb2811af7dd725a5a1ab0d0ff6 WHIRLPOOL 0f8d24ef88f3438a98b73ae52f9a81fefb7e24a9e09e01d22597a049a00fb75327ded706dacdc5a9c5a0df15954efb888af09c2c90ac3946799867ca0aa92980
 MISC ChangeLog 5475 SHA256 3314e604fac7c9aa6f2aaeac3455267155348c8098410ab78036de0c9e1c9481 SHA512 9489dd75dd8d3a4293dfacca4e87cf8950caeb12bc1ffab6799e760595d11baededaa1ee539c5162284a1aeee727fefafb69761a3f6cc23073d877434cf6d0a7 WHIRLPOOL 38b1bd5d921381f44c3c5e5d32dccc4821075b963673efed1953210b0d59b5e72fe476d5a27601777bfe8b76b3569e9f0907ff4e38e6884f34401f08e8694eef
 MISC ChangeLog-2015 4969 SHA256 ff971ce4f576305d8716057a045d3e03ce91c11b911d53b654e818afeda89b28 SHA512 94f00aa13f98e63dc1ab372fd44430afd868d9e5c3353782ece3aa6d88d20677afa560d4cf9d0b741342f97d24253185913107b30773cba1a21e0bf36f24140e WHIRLPOOL 556015ae5a37c510febd7926ec277a1839bf6162e70ce246c1f966b79f82d67d6d797bcea4540650a2b80a19350bafa3aab3f37a36b14edd96ddc00820dbc700
 MISC metadata.xml 245 SHA256 2ed31d145dc2ab60b1831fb2907b6345be8646b5200997e2d2f8e2b3ef8cf6dc SHA512 4129c00f4fd37b4c2e051df35c98105ee97b74bc2a8af78e97f2cbc4c97d14740456fc01ed2ab5c6df3bab10a17ce1728de9e4b83cfee393a8841e8933232877 WHIRLPOOL 757f6848afff294f8f748273dc054a16758d724a506b103b87a5bdf0f0a2a4200637b456eb3d94b3b42e2439633c15387b2035a32d7fe4cef1f2b23cd17d2c87
diff --git a/app-backup/backuppc/backuppc-3.3.1-r4.ebuild b/app-backup/backuppc/backuppc-3.3.1-r4.ebuild
deleted file mode 100644
index 62d816fa2e8a..000000000000
--- a/app-backup/backuppc/backuppc-3.3.1-r4.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit depend.apache eutils user systemd
-
-MY_P="BackupPC-${PV}"
-
-DESCRIPTION="High-performance backups to a server's disk"
-HOMEPAGE="http://backuppc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-IUSE="rss samba"
-
-# The CGI modules are handled in $RDEPEND.
-APACHE_MODULES="apache2_modules_alias," # RedirectMatch
-APACHE_MODULES+="apache2_modules_authn_core," # AuthType
-APACHE_MODULES+="apache2_modules_authz_core," # Require
-APACHE_MODULES+="apache2_modules_authz_host," # Require host
-APACHE_MODULES+="apache2_modules_authz_user" # Require valid-user
-
-DEPEND="dev-lang/perl
-	app-admin/apache-tools
-	app-admin/makepasswd"
-
-# Older versions of mod_perl think they're compatibile with apache-2.4,
-# so we require the new one explicitly.
-RDEPEND="${DEPEND}
-	virtual/perl-IO-Compress
-	dev-perl/Archive-Zip
-	dev-perl/CGI
-	dev-perl/libwww-perl
-	app-arch/tar
-	app-arch/par2cmdline
-	app-arch/gzip
-	app-arch/bzip2
-	virtual/mta
-	>=www-apache/mod_perl-2.0.9
-	www-apache/mpm_itk
-	|| ( >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgi]
-		 >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgid]
-		 >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_fcgid] )
-	net-misc/rsync
-	dev-perl/File-RsyncP
-	rss? ( dev-perl/XML-RSS )
-	samba? ( net-fs/samba )"
-
-need_apache2_4
-
-SLOT="0"
-
-S="${WORKDIR}/${MY_P}"
-
-CGIDIR="/usr/lib/backuppc/htdocs"
-CONFDIR="/etc/BackupPC"
-DATADIR="/var/lib/backuppc"
-DOCDIR="/usr/share/doc/${PF}"
-LOGDIR="/var/log/BackupPC"
-
-pkg_setup() {
-	enewgroup backuppc
-	enewuser backuppc -1 /bin/bash /var/lib/backuppc backuppc
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/3.3.0/01-fix-configure.pl.patch"
-	epatch "${FILESDIR}/3.3.0/02-fix-config.pl-formatting.patch"
-	epatch "${FILESDIR}/3.3.0/03-reasonable-config.pl-defaults.patch"
-
-	epatch "${FILESDIR}/3.2.0/04-add-docdir-marker.patch"
-	epatch "${FILESDIR}/3.2.0/05-nicelevel.patch"
-
-	epatch "${FILESDIR}"/${P}-perl522.patch #580254
-
-	# Fix docs location using the marker that we've patched in.
-	sed -i "s+__DOCDIR__+${DOCDIR}+" "lib/BackupPC/CGI/View.pm" \
-		|| die "failed to sed the documentation location"
-}
-
-src_install() {
-	local myconf
-	myconf=""
-	if use samba ; then
-		myconf="--bin-path smbclient=$(type -p smbclient)"
-		myconf="${myconf} --bin-path nmblookup=$(type -p nmblookup)"
-	fi
-
-	/usr/bin/env perl ./configure.pl \
-		--batch \
-		--bin-path perl=$(type -p perl) \
-		--bin-path tar=$(type -p tar) \
-		--bin-path rsync=$(type -p rsync) \
-		--bin-path ping=$(type -p ping) \
-		--bin-path df=$(type -p df) \
-		--bin-path ssh=$(type -p ssh) \
-		--bin-path sendmail=$(type -p sendmail) \
-		--bin-path hostname=$(type -p hostname) \
-		--bin-path gzip=$(type -p gzip) \
-		--bin-path bzip2=$(type -p bzip2) \
-		--config-dir "${CONFDIR}" \
-		--install-dir /usr \
-		--data-dir "${DATADIR}" \
-		--hostname 127.0.0.1 \
-		--uid-ignore \
-		--dest-dir "${D%/}" \
-		--html-dir "${CGIDIR}"/image \
-		--html-dir-url /image \
-		--cgi-dir "${CGIDIR}" \
-		--fhs \
-		${myconf} || die "failed the configure.pl script"
-
-	ebegin "Installing documentation"
-
-	pod2man \
-		-errors=none \
-		--section=8 \
-		--center="BackupPC manual" \
-		"${S}"/doc/BackupPC.pod backuppc.8 \
-		|| die "failed to generate man page"
-
-	doman backuppc.8
-
-	# Place the documentation in the correct location
-	dodoc "${D}/usr/doc/BackupPC.html"
-	dodoc "${D}/usr/doc/BackupPC.pod"
-	rm -rf "${D}/usr/doc" || die
-
-	eend 0
-
-	# Setup directories
-	dodir "${CONFDIR}/pc"
-
-	keepdir "${CONFDIR}"
-	keepdir "${CONFDIR}/pc"
-	keepdir "${DATADIR}"/{trash,pool,pc,cpool}
-	keepdir "${LOGDIR}"
-
-	ebegin "Setting up init.d/conf.d/systemd scripts"
-	newinitd "${S}"/init.d/gentoo-backuppc backuppc
-	newconfd "${S}"/init.d/gentoo-backuppc.conf backuppc
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	insinto "${APACHE_MODULES_CONFDIR}"
-	doins "${FILESDIR}"/99_backuppc.conf
-
-	# Make sure that the ownership is correct
-	chown -R backuppc:backuppc "${D}${CONFDIR}" || die
-	chown -R backuppc:backuppc "${D}${DATADIR}" || die
-	chown -R backuppc:backuppc "${D}${LOGDIR}"  || die
-}
-
-pkg_postinst() {
-	elog "Installation finished, you may now start using BackupPC."
-	elog
-	elog "- Read the documentation in /usr/share/doc/${PF}/BackupPC.html"
-	elog "  Please pay special attention to the security section."
-	elog
-	elog "- You can launch backuppc by running:"
-	elog
-	elog "    # /etc/init.d/backuppc start"
-	elog
-	elog "- To enable the GUI, first edit ${ROOT}etc/conf.d/apache2 and add,"
-	elog
-	elog "    \"-D BACKUPPC -D PERL -D MPM_ITK\""
-	elog
-	elog "  to the APACHE2_OPTS line."
-	elog
-	elog "  Then you must edit ${ROOT}etc/apache2/modules.d/00_mpm_itk.conf"
-	elog "  and adjust the values of LimitUIDRange/LimitGIDRange to include"
-	elog "  the UID and GID of the backuppc user."
-	elog
-	elog "  Finally, start apache:"
-	elog
-	elog "    # /etc/init.d/apache2 start"
-	elog
-	elog "  The web interface should now be running on,"
-	elog
-	elog "    http://127.0.0.1:8080/"
-	elog
-
-	# Generate a new password if there's no auth file
-	if [[ ! -f "${CONFDIR}/users.htpasswd" ]]; then
-		adminuser="backuppc"
-		adminpass=$( makepasswd --chars=12 )
-		htpasswd -bc "${CONFDIR}/users.htpasswd" $adminuser $adminpass
-
-		elog ""
-		elog "- Created admin user $adminuser with password $adminpass"
-		elog "  To add new users, run: "
-		elog ""
-		elog "  # htpasswd ${CONFDIR}/users.htpasswd newUser"
-	fi
-}
diff --git a/app-backup/backuppc/backuppc-3.3.1-r5.ebuild b/app-backup/backuppc/backuppc-3.3.1-r5.ebuild
index 879139e9d5e9..932f8a9640d5 100644
--- a/app-backup/backuppc/backuppc-3.3.1-r5.ebuild
+++ b/app-backup/backuppc/backuppc-3.3.1-r5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://backuppc.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="rss samba"
 
diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
index 93f3fea02203..bd50d7c16815 100644
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@@ -2,10 +2,12 @@ DIST borgbackup-1.0.10.tar.gz 563363 SHA256 978f28f144924005219da989b1b436a32b27
 DIST borgbackup-1.0.11.tar.gz 603381 SHA256 fc6efd2d19454625532e0defac90cd8e8737665e10ae59edb15356ee5a99d291 SHA512 438d39557a4ebc936f606a880b7f1c915fd5497b11663f03b8a767af7cca522a1b235be0f81c4310d8f12e19d147b438481b7ac82e7371588237de8f1e229525 WHIRLPOOL b998593db3487c0d533820054ff63ca30f0975481fa33f8aacf0d0552c21d37e26879c8a01ca611792b09946d09f82d602685fe2317f701faa015c96ea916f3d
 DIST borgbackup-1.0.9.tar.gz 541796 SHA256 35860840e0429d4bb3acc8b9dd33aa5996a42fb2b678813a982b321a7dba3cb2 SHA512 5623916b143a3d39cab41bc5cca82589a612035d9be0bfd0d211656a975b986bc0c04133bdd1ba44b628fffd84f2c4294530a7c37b9c874e878b77d6105ff0ad WHIRLPOOL 76d740c07bc9767c80e3a725cdbba3f0c990d0e67643089e38f020aa611248f3d3694b07605c12d17645e7af5c1ba7ce7b86a458496350c8c798ab6b97cd0cde
 DIST borgbackup-1.1.0.tar.gz 2912847 SHA256 b40c1120c480a8235ce403b8e6e7abf1377458896f438eafce60f54916789e6f SHA512 052c9780ede503d0ace18ceea2f7d323027c553418c09e7c2202bb3a72d9ff7d34cfd35e2beab42e5cc65d9c28748d469060799c8dd87dcc3fdd9bfa9ba8e9f2 WHIRLPOOL b12bf0086256dd73a30c904fb9883787eef9cd5c4ace1fb2a5791ad8eb37ecd8bf0738b44c793db799f90fffb1e9f23f26d1270dbb80c7eb3265325e079c1a2d
+DIST borgbackup-1.1.1.tar.gz 2988023 SHA256 a5092cfdc57b7f85ce192d64642f94dc0c09ee152a735ae341942532302d3346 SHA512 07e716556fd3edd6d7cdca6045a6eb49a92cdc6d6e37a6999bbd1bc09e00134862081df0d9046c46f867cb4b45ab6ed98f3783eb4e27e4330fc48f0e4dd53272 WHIRLPOOL 8e40b111463e7e338f3c7974fcb8896586b4d640b9bde216fec2e64a8cdd41c89bda6081cc9b2a8819a384a69507b139e4101faa6f917d87155c983d12fecc29
 EBUILD borgbackup-1.0.10.ebuild 920 SHA256 bdf054eec73a0bced4ca0d973cef01a08e8008802f26267bcb4d350f3f5ac6a2 SHA512 7422ea0b80900d17c15c785aecced12742a1725a5133b71a2db5cf904a31fcdb0a519f9b53b7bed20a9095077237b0e91ae3609c1f778eb148b509097907c9f5 WHIRLPOOL f2ecd3f3eb07bdb6981f50db079e112f52b6ac053ccb1f4b220631dbcae82e6a8108f67b24433293ce0cb5a34fc4d694a40edd778b7c799a95ad4b91b9435fc6
 EBUILD borgbackup-1.0.11.ebuild 920 SHA256 bdf054eec73a0bced4ca0d973cef01a08e8008802f26267bcb4d350f3f5ac6a2 SHA512 7422ea0b80900d17c15c785aecced12742a1725a5133b71a2db5cf904a31fcdb0a519f9b53b7bed20a9095077237b0e91ae3609c1f778eb148b509097907c9f5 WHIRLPOOL f2ecd3f3eb07bdb6981f50db079e112f52b6ac053ccb1f4b220631dbcae82e6a8108f67b24433293ce0cb5a34fc4d694a40edd778b7c799a95ad4b91b9435fc6
 EBUILD borgbackup-1.0.9.ebuild 920 SHA256 5b1df0422af525c1056ba16768302b9bbe255ba75608beed1f5a14c404f6bfc6 SHA512 c13be8e551540b87792d2d76a8358f2bbdb5a608eed565f6df312dfa16b0bd19bded17007feb1e43746a35b8adb99f302f1e58000f8ce59383b63cc339dd1373 WHIRLPOOL ebf54c3eac6253e5bbd3ac1169a3770863c0a6303d5c0529b4df1991d7ddd28eeaf318442367e99a4b4747a25d285b280b59c44b69ba36a1a1a0886716e809ae
 EBUILD borgbackup-1.1.0.ebuild 942 SHA256 cefc723a05dc65c970fadc9d9cf74feb910866cf8c8ac424dbbdba2af634da8a SHA512 1891afff5a9e5b87cb05fce1d1c5fc5a3b7b28ff30da260ceb3de5086b4bf7e8a9c26db6c7227edae4a024ed561dad0ece87365ffd034641e6ad5516cd2a4a09 WHIRLPOOL 8499057f385bb797c7992f995f9650b2222c9632a6d30f7fe53c7f11a18b1b88286683cd10ffcd419612b274d8ee23a437f6897c0938315d829b83eea063ce3d
+EBUILD borgbackup-1.1.1.ebuild 942 SHA256 cefc723a05dc65c970fadc9d9cf74feb910866cf8c8ac424dbbdba2af634da8a SHA512 1891afff5a9e5b87cb05fce1d1c5fc5a3b7b28ff30da260ceb3de5086b4bf7e8a9c26db6c7227edae4a024ed561dad0ece87365ffd034641e6ad5516cd2a4a09 WHIRLPOOL 8499057f385bb797c7992f995f9650b2222c9632a6d30f7fe53c7f11a18b1b88286683cd10ffcd419612b274d8ee23a437f6897c0938315d829b83eea063ce3d
 EBUILD borgbackup-9999.ebuild 942 SHA256 cefc723a05dc65c970fadc9d9cf74feb910866cf8c8ac424dbbdba2af634da8a SHA512 1891afff5a9e5b87cb05fce1d1c5fc5a3b7b28ff30da260ceb3de5086b4bf7e8a9c26db6c7227edae4a024ed561dad0ece87365ffd034641e6ad5516cd2a4a09 WHIRLPOOL 8499057f385bb797c7992f995f9650b2222c9632a6d30f7fe53c7f11a18b1b88286683cd10ffcd419612b274d8ee23a437f6897c0938315d829b83eea063ce3d
 MISC ChangeLog 2481 SHA256 f10f2f0cc9530bbc7e7c787c3cc64a12943eea4f0e264cfe4b48fb3578e5d4e1 SHA512 c32e758e363ee4dd55e40c46d0a7de447db6f038419a2f5d2b2d99d581644c0b01a54dabd6bc66f766891aa0478adbe5d1114de601f7c0a3912c2762ec8c8984 WHIRLPOOL eb0927e130dd2a1ae019e73413086d88bb5a5dd5993c68a61fd2b2c9845b4c5a3893771b62fc0bc24b4443e5506a87714f49b9769e49f9f4c6451b132e0aff6f
 MISC metadata.xml 458 SHA256 9ab202d2b1824b39716842005cebb62da19fdee18672ddfde42109bee74a10bc SHA512 46eb78c0bb1233efee20254c9424a62dff31aa258273044342623da9af407a6b667e3d36bf3d1cc10f032766ec808c3afee59171f6c5b1eaeae006d77fd132be WHIRLPOOL 576b41837319050ed4dcd232ac9625b19bbcf55368bf94d62f8afdd3043564d262fe5cbad929e1e8d216c70da20a77c88a2ae57da72a83450357974a5f624ab7
diff --git a/app-backup/borgbackup/borgbackup-1.1.1.ebuild b/app-backup/borgbackup/borgbackup-1.1.1.ebuild
new file mode 100644
index 000000000000..664c1f81223c
--- /dev/null
+++ b/app-backup/borgbackup/borgbackup-1.1.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/borg.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
+HOMEPAGE="https://borgbackup.readthedocs.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="libressl"
+
+# Unfortunately we have a file conflict with app-office/borg, bug #580402
+RDEPEND="
+	!!app-office/borg
+	app-arch/lz4
+	dev-python/llfuse[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+
+DEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	${RDEPEND}
+"
diff --git a/app-backup/flexbackup/Manifest b/app-backup/flexbackup/Manifest
index 28e42125b8ad..d93080f41730 100644
--- a/app-backup/flexbackup/Manifest
+++ b/app-backup/flexbackup/Manifest
@@ -12,7 +12,7 @@ AUX flexbackup-1.2.1-spaces-in-filenames.patch 11037 SHA256 4dde33d92ff0e97a6148
 AUX flexbackup-1.2.1-tar-1.29.patch 514 SHA256 f52a1593e97c8355a3e876a217846c42c17c89df2b5baf39de49732032d1ebb4 SHA512 b8a28c93db2b8f04bcf7c56406fd0457b837e9afea30a5a1cf37bdd64554bbb4ee665b5c15af24701eeab10a1b1c2d31371b7c0ce32cbfb29223ac34956cc962 WHIRLPOOL 1c5e109905617eadb564bcc0ec213b78f0d512b9a0b9083c3ea2139a021011d2d09ad387aedb61fde0b8b23b4d7b93766ee9dc77a0b25dbd9c4fc2b83990012b
 DIST flexbackup-1.2.1.tar.gz 80158 SHA256 58282b21985be75f1219c5ff4906d217055ed8627ea3e2ffdfe7a2393bc9d2c3 SHA512 17630bc46657becdf5d5bde4852fd6cebe189fe54d381bda6471aa2e1db1ff082ba24461e2c22ba5805c2d93ac7f9805ffbdc4904da017f1b163cc21b5a3974b WHIRLPOOL 0beb123986579b5f5c9add2e1ccc02b11e687dfce7a093d550239aec50cf5a35cf15da066a6b0f23819a001dce222d5167874527411bb31bca405b55c8f2d171
 EBUILD flexbackup-1.2.1-r12.ebuild 2606 SHA256 f3e543097e8fc465635b57a83a41077760532bd7bf5f8f85c4853b10c0ef2a40 SHA512 2ca29183f1305b765bf78d2c626f5d645769fdb8a8bf532d85bb24a78c5e8873bbb539b7ebd2deeb7dfc8bc18e57389c628b7f7c5abfab06a7a49951d8eb68e9 WHIRLPOOL 90c4fddbb5ba2d139f79f3925974b36480e806a443f8ff29fe759b9687378b5938f061eda02099850eff701c16715049b0c52ad1774540827f5ec47dcaf2301b
-EBUILD flexbackup-1.2.1-r13.ebuild 2795 SHA256 db5c55ad89d286dfc846e527e61f5cd016939b30f2946151ba49627e3e3d1df5 SHA512 f60b9a5bd354633c94158b593fbf3e40ee32b579764d053ee13f138bf9f3ea61bf47481e4945a1e2d770b5930cdbd8a91a789a209a94043b64c85a759349fed2 WHIRLPOOL 4ef3cb4dfc5e6c932494fd2dc4d675c7c46c3a05d861a6680e767974f24fec3af1cadf0a43ba48211ccc607bbe6f362853dfd97b035413245537021130a89822
+EBUILD flexbackup-1.2.1-r13.ebuild 2792 SHA256 104c530aac19bc60842edb7b79dd4aae0b154e32a97ea05c9e7a8981e7402e3a SHA512 285832cc7ce730b942f21297c1b804edefabf4c2bc59de076f08355c20d258585665e9c9fdbeb7aa95921bbe0ab8c2f47a7bed8081d04427b6703fc77f6276ff WHIRLPOOL 8a398354173e7e22149472dce81a23ff1de5af4612ff902ad3b0a47d2a9f2232cd461b18631869f901e27860e33ab3415a8a22a3b6842c8256df041dd4fa137d
 MISC ChangeLog 3284 SHA256 fdbf252c8f5ed7fd57c076f11b4894818fa9609596de7a5400226bf39993a416 SHA512 50d45872acfd1fc90dd8c932011c9df8d83ec0026a2f096348cbf8a74123ca798a8f5ba83159d410ab1db6e52c8d1cc1c5b2f64f64b425228154acc664231601 WHIRLPOOL 9c9ab3a38b7f177e9359502047e02dd2f0dbe0299b3ae6c7c5d75e6754f05b26c77b1d0941b077c946adae25143c651a0b55aacabb7138f49ff6c4d7860f476e
 MISC ChangeLog-2015 10208 SHA256 1305eacdc53c71c785e4a4fd3dc0b345b75a829b32c6b1bdc9ed6c6d24bbd44e SHA512 f8ae697645bdf546be4dbbc9e846b268e397aaa09ffe13a2b6eca0fbf46c9e9bf1e7d6cadc6f1ce41b099f7ba2c1d0f646367fb6fa1d71dfc1b0321aedfa54a4 WHIRLPOOL 5a0f2caf5d765acd764dbddd4b387a1c6cf4526436728128f29a312c0575f765bf39537de630c8fde59ceddfdb93990084b7147146c79056b148270168ffd04f
 MISC metadata.xml 297 SHA256 3ce3e95d0bea1cc0143e47f0e392ace0d523b426f7ba1b79a992a6ad13a3f82e SHA512 a2fd29aba380cb3b9322131f97beed0d432569ab612118bf1a9a428a93602c859014face05fc8582c8dfdf6858296a36ae6754fdc45a78715058d779df3f7e0a WHIRLPOOL 9cdd49618cd91688347db268b6da4a62f784efd9a89ba5d7dc8604e1ece6d12c22769f805632cbfde830f8935f4face3c677aeec9d4762c18e38049c15c1d1fa
diff --git a/app-backup/flexbackup/flexbackup-1.2.1-r13.ebuild b/app-backup/flexbackup/flexbackup-1.2.1-r13.ebuild
index 8aff19cd8b55..464ac95033b1 100644
--- a/app-backup/flexbackup/flexbackup-1.2.1-r13.ebuild
+++ b/app-backup/flexbackup/flexbackup-1.2.1-r13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ppc x86"
 IUSE=""
 
 RDEPEND="app-arch/mt-st"
diff --git a/app-backup/untangle-https-backup/Manifest b/app-backup/untangle-https-backup/Manifest
index ec363bcdedf3..ebf02318fb1d 100644
--- a/app-backup/untangle-https-backup/Manifest
+++ b/app-backup/untangle-https-backup/Manifest
@@ -1,4 +1,4 @@
-DIST untangle-https-backup-0.0.6.tar.gz 15730 SHA256 91f5a308557d89de50d4f741c623b3b2073878bae44d2efa64b9237b06d18baa SHA512 a7854fe23faba88ee21e3bc9aaaedc54aefc58d8cd844d200d184ddffcff3cc5c90ff429464914e89cbfc4651057007ad328a665ed706d65ba3e1bda87965da1 WHIRLPOOL 913bec9d3bd291798688aa9a1cda9af8fbd746574401d3387f42e7f32bcd817e34702e498594012db19b06ff214b997bd06b0a0712e4690d9549cb5df5a06770
-EBUILD untangle-https-backup-0.0.6.ebuild 579 SHA256 ce5ffab417bd50f5d0a4777a29ed2f8458d2bb1816dca12a403ebfa3cc689cd6 SHA512 1605b1593d8fad6a25c8a424a2ef31a1365f7797c18b5d63499b718c198aea4ab38b306596e31f12b8ffcc804f5cd9d065d05982003df6b31debeb619f80b6dc WHIRLPOOL ad01f1902f22bb09027cc8b594edb580003b1c285e24f25d12ae1516814b7ec606dac9f6875f5f6a77d2e6164602ca1dbff0301068a85ca4b6e40e657b14e8ac
+DIST untangle-https-backup-0.0.7.tar.gz 15846 SHA256 c12d0735a60fa147b1943514af4e4627cb1766e7ac9598a0073944db423c62be SHA512 0b5cd7962340492ea8dd3d63b4d4bf38906c3b0de73456f80c8fd678708777d159b60cb1d58ef13f0e51b6dc97b16823ddaf8de60d21373160df0e735b54420a WHIRLPOOL 4ef4f9148f59921d663e553261badcf0bc53370d022cb4a8f4b8cdc8c173bb3d4704b24f1e094a7a96fb31e19433f31b67ffa39d606c8d80fd9180fcebe33278
+EBUILD untangle-https-backup-0.0.7.ebuild 579 SHA256 ce5ffab417bd50f5d0a4777a29ed2f8458d2bb1816dca12a403ebfa3cc689cd6 SHA512 1605b1593d8fad6a25c8a424a2ef31a1365f7797c18b5d63499b718c198aea4ab38b306596e31f12b8ffcc804f5cd9d065d05982003df6b31debeb619f80b6dc WHIRLPOOL ad01f1902f22bb09027cc8b594edb580003b1c285e24f25d12ae1516814b7ec606dac9f6875f5f6a77d2e6164602ca1dbff0301068a85ca4b6e40e657b14e8ac
 MISC ChangeLog 522 SHA256 6958a7b7582f4780b4d95bc5b272ee1158bd07b930fc75a17f66fc1bf2431347 SHA512 345c9998fc97b3dbe9121f882ac434e773fb06b1ca6e44d7a1669392487ac0f0e909a38cfb4c7db8205d2ac3feba8248b87f87f1548bc629b43d7dcb0cb27e8f WHIRLPOOL 60c88b2fbc51ac7977c4878e274e28c31472ff5f4582ede85592c7624fc56c51608ec80f5dc980f2ac41913b0f2b9ca1dd9df22492b4de6bc5dd218567d41178
 MISC metadata.xml 252 SHA256 f12a15b7cc3ce0ff76c3dbbeba9d162cac9771fb6ecc0f965a34e93f73e67d52 SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742 WHIRLPOOL b7954a2a1cbccce0641aaf3dd273bf6dc64e7b5d39097eefe4d0c06eacc0b5f310db23e93a0a2fff7c8c735193acb1c5c8d4210bf77e78d457d50d05412796e0
diff --git a/app-backup/untangle-https-backup/untangle-https-backup-0.0.6.ebuild b/app-backup/untangle-https-backup/untangle-https-backup-0.0.7.ebuild
index 5c11e34be8d4..5c11e34be8d4 100644
--- a/app-backup/untangle-https-backup/untangle-https-backup-0.0.6.ebuild
+++ b/app-backup/untangle-https-backup/untangle-https-backup-0.0.7.ebuild
diff --git a/app-benchmarks/bonnie++/Manifest b/app-benchmarks/bonnie++/Manifest
index dd753d5a5357..7bf31481bf99 100644
--- a/app-benchmarks/bonnie++/Manifest
+++ b/app-benchmarks/bonnie++/Manifest
@@ -3,7 +3,7 @@ AUX bonnie++-1.97-zcav-array-indexing-fix.patch 1474 SHA256 8a50c7121cf3726f1c7c
 DIST bonnie++-1.97.2.tgz 102533 SHA256 3f34a4c52ae9b2c3d493af8f794ba18cbf6732e9b76c3a4fa64549d95d914ce3 SHA512 e8303720be9a4ebcc454dbc8906a6843d63909c5101d66524a126ce0db3db7113d01edb7ed2f292bf9d08a6799579c4960f0ee4595019fbacda1601eba52a170 WHIRLPOOL 1f66eef8a583ce9cb851a6c301019ba76d104bf3a6322d504cd7c8d1eb073c48235efcff6fec2b2f49207aa696db1071c55c94a3943a01917b2a7aa7349b0b73
 DIST bonnie++-1.97.3.tgz 100166 SHA256 e27b386ae0dc054fa7b530aab6bdead7aea6337a864d1f982bc9ebacb320746e SHA512 44de20b5e46aeaf7f7214766b3c555b8799138f6fd92f87fe9b7dfa6f19815c629d6122c2ef4e4d98a5528dbfcd4c70b3b850eeba05739f6dd20251bf8d7c893 WHIRLPOOL d889c059b0bd5fb77948fd60aee3d1926f2967464a72e4c287cd14d2946e8dc73059d775bb4cfe1c0065ecbe159543dfdd519d880207974e50ec978a666721af
 EBUILD bonnie++-1.97.2.ebuild 965 SHA256 cbd601f54d0240aa3c9635613cb846c34508e5ec5858e56b0ad994f02386c387 SHA512 e8de81bf2a36c84a479c9632792b830ad589cc22a758b0f05ee650a6c62a5b998b283489219b4e3deadf7ad9baf1ef8edebbfa9e4bf1514cda80949c241afe8b WHIRLPOOL efc2fcce1b58ac383ffbbc81e4cd2523af222249fae9b523bb70b19aafe8f71d9e1ec4a9a4c82bed9e7b606a68c735ca56627587e2530b7fdfe602315340804e
-EBUILD bonnie++-1.97.3.ebuild 968 SHA256 d07254ff8b94196e7b3f4ca800cdbedb34e980c04a4413cb6743e451ad925fbd SHA512 a889f091f76c8e26c07ac843699675f15cc0d1293f0da2a6d05cbcf064bf2c8b66293986a0bb30226c2f0c36ed1a79233cf938e261847e02074b08ad71fa3285 WHIRLPOOL 1f5792c0c07f17025068645fd356642033a4bc2dd7430a53ab76164572dcc4e65ceaac63edf316de2af4a8b0a3e7b0427685f87b1526bc36a1a42ce54ace2ff0
+EBUILD bonnie++-1.97.3.ebuild 966 SHA256 05f911a6215afa3d8cf8e90cb23538b6750f351918b43ee699f9f3afbd75047d SHA512 5313f2d72f9e844f6c453f691b50c35e3e83f6ba839b20e13cce98276b63f3509e6f82085ede41f730421f6963169c5ff2d756c355894be7f698f00fbd2bdbbd WHIRLPOOL 68f0995ec9fb4f9f03e95ccf0d270ec74bbe61d717148b5ff0bdfdc99c55d60371669b23137b801e6b1aca488fafbe8938b437132d00e2ab516ad1121ae65091
 MISC ChangeLog 6219 SHA256 41ad592e7d116226be01f0403f48189d31f87ec05c1de5d946d999d4486bb751 SHA512 02049d84691fc92247610d85c8b6b759fcd3a9ae2b3c59682a573485458a2b43cbda488f83d415dd6f145a70d6697d24c8021b7129cd60839206c6487c7960bb WHIRLPOOL 43ba359fe20064cb547e61c6a5d9ac417bb70b0cfaa6704c525bd61a954503e707ff939d8293cf5220ce8d17696b60e730994fb0a4eace37c109ad587e58e21b
 MISC ChangeLog-2015 6391 SHA256 3104a69df62423f66f37cd45aa8ce2828d774c3203372b07990eb5c463433aa9 SHA512 a589ebc39e14adbe8729ff33ac1612be6c63ccad132d290c5bc13f9b2a0992f058c3476f155a91d45b85c262b2dc065d56ddaf1baa78055c78c284d9c93e4927 WHIRLPOOL 4859d840cb4cf05c520cfba33bf2a31bfdd79fe3a074e971173aab6f3da535e6730ef226ee67663e4c1a60f67fc8a613e56e0090ca6fc006f89146a97dde4b7c
 MISC metadata.xml 610 SHA256 2f50dc1eff0c268e3d911156e41e22a799b6025465feb73e0d8cb220cff16bd9 SHA512 2914ce1d553546237acfec2ef0ba8689a81105fc9414f543cd9080f56090027107e698c1ac0f98f26e5b9658ea16ed27123f23b518fd91ddd0b4a858f6ac98bc WHIRLPOOL 5afaff884e68e762cbb29dbe3d15900d9000e4f33cba0011bbee8299d7fa92199cd985a50d712920affbdd31faaf5ba79355ebe79dab5744db9faedc3706645e
diff --git a/app-benchmarks/bonnie++/bonnie++-1.97.3.ebuild b/app-benchmarks/bonnie++/bonnie++-1.97.3.ebuild
index 30084890cf15..954fac012c06 100644
--- a/app-benchmarks/bonnie++/bonnie++-1.97.3.ebuild
+++ b/app-benchmarks/bonnie++/bonnie++-1.97.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.coker.com.au/bonnie++/experimental/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="debug"
 
 S="${WORKDIR}/${P}"
diff --git a/app-benchmarks/dbench/Manifest b/app-benchmarks/dbench/Manifest
index 86c0a7a2f051..3f5423cdfecb 100644
--- a/app-benchmarks/dbench/Manifest
+++ b/app-benchmarks/dbench/Manifest
@@ -1,5 +1,5 @@
 DIST dbench-4.0.tar.gz 2055359 SHA256 6001893f34e68a3cfeb5d424e1f2bfef005df96a22d86f35dc770c5bccf3aa8a SHA512 70c65c5b079edf745c267be753919c780153c9064dbda95c270b3c2c1d8c16e84fab4e743eb777436813678ecff13ec2b55d011e8acc4bd83e58f0dda7438e7f WHIRLPOOL f39d17ec5ec6e8618045337c408f7c7dc722a8c54c68872ca5a03c8affd35de1f6e6d5e842e90dcb889816fc7891f31b9217d2591ec2e90c056d92fdca90da89
-EBUILD dbench-4.0.ebuild 835 SHA256 40e583df16b41e018c33a7f9c43ca1834b01c55e511cd7327b7c758c920ba08c SHA512 ee4d0f96706a23019c9d2308f5fd085972e207ffed82e595bd2dca443e8040a24d74a50a54e5a5340b87f99e3dcb0dff8bd7754bd182c7052d90ebbcba3d6c77 WHIRLPOOL af2f5505538e2f5eb0b7b9a64738aab5d3c2f68a03cec3d26b97146ffca6a402414a778bfc46fcfce61110a8e302c10a91657abe041d2a0018246c1703e028b7
+EBUILD dbench-4.0.ebuild 840 SHA256 5e62caacd9c60b17046d1df0984f84cf19472e19167455feb82fb63301ceeb94 SHA512 82f054754e8062da69169e0b8bb6908b5a3236498b21c48d9a767f831f2adf273b71aea769cb6773f9b7994aaced3f807cb84c961e0638d62ca4a318e6ac4802 WHIRLPOOL 7a3c9e2c04c5ebf2c230a079553140dd756587e93a8743a06c997871fe2c5e0eed8de96b5246bfd669a7ba46e57f5bf75aff0c543b0428a82ddabfaf8a0fb20a
 MISC ChangeLog 2426 SHA256 10aca6e5717470711cc84501b3456df9185301c7aa5a0151cd30e1a861039a67 SHA512 f2e1b20b203248ddb557622051ef66cc25f5595e99c023dd3ec50978d59448585faa3c5e6a1b84088368a85362c13b5e9fe9d4b1b55c2900026c118e188d2109 WHIRLPOOL d1e685e354d75651297006f50bc33df16b231bb0f9c5a371f60a7a32cf0d8f8dd62e8c0c616385411f5541138dde52ff2f9455ead676099ca590916be9147889
 MISC ChangeLog-2015 4116 SHA256 9b209b3c7633ad2100c477fd5ec541dbd0115e08c4f5df08ead2bb926cc7be8f SHA512 4b5340ba57de8689b63e202d1849e4d8e0619263c0e41a7aa68347078d2e35610f17f4ea9edd0604ce7997914d219d5c544ab866911c538f8725fda1e33f5240 WHIRLPOOL 38158ecf6413eae2bce30909889979820230e1c1afaa529bcab0e4121140eca21a9f1bbafa4de705b52524d31954580d7a9f7b13ea8f3e5beee9aa4131ccdc3d
 MISC metadata.xml 247 SHA256 0deec0776f26fb762fdf7711f4589b14f52a2456436ef557eec62a2cf2fb2bb7 SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7 WHIRLPOOL a135fa622e99d3dcdb432bc6b3c366076b3d86b4bfd9a76c852d781b8e9152541c7e7a2c7c6d6a3c4d2200dce792847a08166aaf7c17c22b6299dfe868234dec
diff --git a/app-benchmarks/dbench/dbench-4.0.ebuild b/app-benchmarks/dbench/dbench-4.0.ebuild
index 9b96984d3e1f..ac11bc17b496 100644
--- a/app-benchmarks/dbench/dbench-4.0.ebuild
+++ b/app-benchmarks/dbench/dbench-4.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.samba.org/pub/tridge/dbench/${P}.tar.gz"
 HOMEPAGE="http://samba.org/ftp/tridge/dbench/"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-libs/popt"
diff --git a/app-benchmarks/wrk/Manifest b/app-benchmarks/wrk/Manifest
index 200a5141153c..94dc5a5b8675 100644
--- a/app-benchmarks/wrk/Manifest
+++ b/app-benchmarks/wrk/Manifest
@@ -1,6 +1,8 @@
 AUX wrk-3.1.1-makefile.patch 1338 SHA256 deb6a89add9bc93c159b2cbc40d5f8b89d9d1147cb7463a01932689e63616f8a SHA512 7f2e3e1b9ebac680f5c5df73114181960c41030d66c63ca7ec625caa3e748e566e0068766b2c350923d11d0f0de63a1bfbb4d5fbfa7447f303b190ef9adcd643 WHIRLPOOL affaf23958f5925060e41905fa272cdc7f403012ab44b423a2b21d9127a1973f9b02b920fa0abd2a743ed987fbcce8e95fecfd31f4c73b1e9b55be9c505a3983
 DIST wrk-3.1.2.tar.gz 902868 SHA256 da88a25f0eeb9e1fd6a9dcf4a96859e9e758f9446f0787cf7c95e4ccde14eefc SHA512 399f33c2c008c21ac8fae1b561fe16ebcca324b5171340ffa706e84c256bf13a9983b5c18d258be6f87cb9fe8e38a434f9bfa7059395a01cb783f77faf952b15 WHIRLPOOL 3460aadf5f3e54cf64d0779b45efba291200f0344a55b3a8c35a603d9fbb917c006ff2035fb91bfdce7652b7e4231fc43c558115cab4ff73b91087163655fe85
+DIST wrk-4.0.2.tar.gz 6146798 SHA256 a4a6ad6727733023771163e7250189a9a23e6253b5e5025191baa6092d5a26fb SHA512 4279cf7136e2919779be3f61f462136a7a5288eac481104b844193682a8fc554581fd3942624d0be9317a3e82c82497927a124b9b4dbdf455e30d3f0cad1fdea WHIRLPOOL 123e3233b211b06d4542f504db2cd5bded5eb4405fc647a1f4edd1ee2eed8ccb7757b77d2baa7867fac02bf73114de9221cefbf347425498d656fdd2fd9ca000
 EBUILD wrk-3.1.2.ebuild 749 SHA256 a4a78a895cb2aa105a735cd2eb62aeacd52c81fbd5e30d371edb37ec40f67729 SHA512 3621a749c2b9c4b3768332f2eb3c95a3979b6d9aed8cdbb1ca3267fcdeec8cb288bcbb2f31c8eb7070d6b86ae9c0e647ee087bc959831bc26047055a2c8e2432 WHIRLPOOL d4561304b66b18c0b0134901578c9768ee518c3fc189a950e81278f9d80b870f0b160b161da79c764b6e2ba000b5c67583954ff88a35e13a93b57c53143a1a22
+EBUILD wrk-4.0.2.ebuild 693 SHA256 f9dd30a1c0621775f0bba8cb85264e3f4acdf00457688209ed8375d9426a1bd9 SHA512 07431134cff46cbfff1971d7dc82bf59c2d6b326bb7dac4df413bd2c819713229808927c0277c95756952ecbb743c35a8111f59b478c64ffa5c1608039642f95 WHIRLPOOL a6a30bc9c88145de4df98604d83e349ae5e3b1efb12570635c965b92799f91ec1387a7664585a214c04dd5acff7620320f69590cb2551312bac81727ffa32e41
 MISC ChangeLog 2656 SHA256 0e2fb42ad64b037dbbc84e5193ecc74900239f7a12f7a1e5ba5d849d609bbbea SHA512 8d37fd1c2e26557540b96c88e4b5f8c7df5ea34880f1cbb5f055720747a9b8a0f97455997b8b26b805ea77f49ef0147e14ddd8ab812d1bb886b606522474569f WHIRLPOOL ec83cdf128bb20e55154837b83c512ed9a9aa9d2eaa77a1fac3a721a5c0ae8d0d45931a0278850be8d26e7bac5760788cc8a7cecbb6b6355706bd9bc6dd6f9f7
 MISC ChangeLog-2015 720 SHA256 6e30aa92f7f5af730ac3a6019f71047f7834f030500d2b661ce48d85cd5a37ae SHA512 f5fba76f0a2b5ce72a9764228b75f1f0347fb8bad32b6227b3e68135b0c2b10627910e58c1c2798f9eee971f170002cc47679be630cb08a12cf11613c3608d8f WHIRLPOOL 642155819a22b889016b27d78b4540ea7358828d9a17ba101409e5350bfe130090d22e18dbf0ad6f6d3a3f42763d80912714ca9e21a8ffdefb2cc1b071ae9b73
 MISC metadata.xml 729 SHA256 6dcf73bb2b35fcbe91dffeada056c7b7ee3a1f15b7114c42bd15d14a4fe8a900 SHA512 2c6513f32e7f7b67aed0021d6cae23f59aaf8f57ab88cd57fbe346422997617813f8a92208535397cd391935028174fce5cd88364eeff038481fd0362513d89f WHIRLPOOL 18d586d38d9808dddf9b01787f34db7ff8f753125df7b84682e013039ef29c861c3417dae90646f4589eda7834fc8d0c2f9eb3446c93be11736ef13b3bc38d78
diff --git a/app-benchmarks/wrk/wrk-4.0.2.ebuild b/app-benchmarks/wrk/wrk-4.0.2.ebuild
new file mode 100644
index 000000000000..990d52d0c66d
--- /dev/null
+++ b/app-benchmarks/wrk/wrk-4.0.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A modern HTTP benchmarking tool"
+HOMEPAGE="https://github.com/wg/wrk"
+SRC_URI="https://github.com/wg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="libressl"
+
+DEPEND=">=dev-lang/luajit-2.0.2
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	tc-export CC
+	emake VER="${PV}" WITH_LUAJIT="${EPREFIX}"/usr WITH_OPENSSL="${EPREFIX}"/usr
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc README NOTICE
+	insinto /usr/share/${PN}
+	doins -r scripts
+}
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 02d94ab82dad..8966874f91f5 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -5,7 +5,7 @@ DIST certbot-0.19.0.tar.gz 1061557 SHA256 164b496cc111f19619da1eac9e3fe03baac5ad
 EBUILD certbot-apache-0.15.0.ebuild 1067 SHA256 e3301e6f2373be348fe85068bd1091a0c97be050aa8cee3fc13b5dc4ac60efec SHA512 023397617e302a728a4da177fafc3c745a7d3ad90d27f5f98adf222da8c8b4dbf898f7e828eb773b5e558f5fdf1a526f7320cc383ae37f6404941fd9e220dbf9 WHIRLPOOL a5a291f001a6654114dcb96aef3bf58c68dccad5121b2cb3219fb6a41e69e2b9e0c7821f542de212c9b7befd8eab90a57936c37787832b85c48e0cd192aac5f0
 EBUILD certbot-apache-0.17.0.ebuild 1067 SHA256 e3301e6f2373be348fe85068bd1091a0c97be050aa8cee3fc13b5dc4ac60efec SHA512 023397617e302a728a4da177fafc3c745a7d3ad90d27f5f98adf222da8c8b4dbf898f7e828eb773b5e558f5fdf1a526f7320cc383ae37f6404941fd9e220dbf9 WHIRLPOOL a5a291f001a6654114dcb96aef3bf58c68dccad5121b2cb3219fb6a41e69e2b9e0c7821f542de212c9b7befd8eab90a57936c37787832b85c48e0cd192aac5f0
 EBUILD certbot-apache-0.18.2.ebuild 1067 SHA256 e3301e6f2373be348fe85068bd1091a0c97be050aa8cee3fc13b5dc4ac60efec SHA512 023397617e302a728a4da177fafc3c745a7d3ad90d27f5f98adf222da8c8b4dbf898f7e828eb773b5e558f5fdf1a526f7320cc383ae37f6404941fd9e220dbf9 WHIRLPOOL a5a291f001a6654114dcb96aef3bf58c68dccad5121b2cb3219fb6a41e69e2b9e0c7821f542de212c9b7befd8eab90a57936c37787832b85c48e0cd192aac5f0
-EBUILD certbot-apache-0.19.0.ebuild 1067 SHA256 e3301e6f2373be348fe85068bd1091a0c97be050aa8cee3fc13b5dc4ac60efec SHA512 023397617e302a728a4da177fafc3c745a7d3ad90d27f5f98adf222da8c8b4dbf898f7e828eb773b5e558f5fdf1a526f7320cc383ae37f6404941fd9e220dbf9 WHIRLPOOL a5a291f001a6654114dcb96aef3bf58c68dccad5121b2cb3219fb6a41e69e2b9e0c7821f542de212c9b7befd8eab90a57936c37787832b85c48e0cd192aac5f0
-EBUILD certbot-apache-9999.ebuild 1067 SHA256 e3301e6f2373be348fe85068bd1091a0c97be050aa8cee3fc13b5dc4ac60efec SHA512 023397617e302a728a4da177fafc3c745a7d3ad90d27f5f98adf222da8c8b4dbf898f7e828eb773b5e558f5fdf1a526f7320cc383ae37f6404941fd9e220dbf9 WHIRLPOOL a5a291f001a6654114dcb96aef3bf58c68dccad5121b2cb3219fb6a41e69e2b9e0c7821f542de212c9b7befd8eab90a57936c37787832b85c48e0cd192aac5f0
+EBUILD certbot-apache-0.19.0.ebuild 1072 SHA256 45e3b66baa7f79ec27b58391edcb1791e0611985c43253772e98818bccd47a3b SHA512 bd39dfef6a1993ecd2d26fadbfddaf1794dcc93a4ea030bd162b51b1125fa1f32c6c4d605a93e0ad9e3825cdf11feb0f37997312e63ad1d593222af8000e6852 WHIRLPOOL 0566a894f3381c2f90f86f8273164f3ae40484efe02d098fd84b893f22c78eaec83f6198fe252fa8eabb3ab085b87af1b50d4ccf0fee9b2151cd3d7f89d86bd5
+EBUILD certbot-apache-9999.ebuild 1072 SHA256 45e3b66baa7f79ec27b58391edcb1791e0611985c43253772e98818bccd47a3b SHA512 bd39dfef6a1993ecd2d26fadbfddaf1794dcc93a4ea030bd162b51b1125fa1f32c6c4d605a93e0ad9e3825cdf11feb0f37997312e63ad1d593222af8000e6852 WHIRLPOOL 0566a894f3381c2f90f86f8273164f3ae40484efe02d098fd84b893f22c78eaec83f6198fe252fa8eabb3ab085b87af1b50d4ccf0fee9b2151cd3d7f89d86bd5
 MISC ChangeLog 650 SHA256 0ceb4da791e6e05a4380d4db4297da391135e1ce24d0658b3697a0598bffbf75 SHA512 c841c9a2340dbb950dd8fa0861a84c18744cce90c4c6bc0fcb5a1a4caa087c9ad69ce0e5b4d344107f3eff6fa579a60ec054fc3c159318e872413fd968b6a85d WHIRLPOOL 2bea921c94946c02aaccfa5b1be5d05e3103a3927d71425b68acf46762a6e20a8a023789b920136d30bede21359deee5c3746306d0ad7e1022db8dbe3e3a82b3
 MISC metadata.xml 334 SHA256 e1059ce7794fc4edc2c39a6a55932cfaa9e6d4b6de59d4b9dafdfa8f6f790084 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f WHIRLPOOL 8a5d0b99f05b3f8097607db4c03ceedea11dacf064a1acdbc9b97f8ec3a7379e487e9470977cf61ef2cb21ccc29959b371f3f7caec322648091d84f95d7db5d8
diff --git a/app-crypt/certbot-apache/certbot-apache-0.19.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.19.0.ebuild
index 93bc95551953..6dd43da7e5b4 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.19.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.19.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-apache/certbot-apache-9999.ebuild b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
index 93bc95551953..6dd43da7e5b4 100644
--- a/app-crypt/certbot-apache/certbot-apache-9999.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/gentoo-keys/Manifest b/app-crypt/gentoo-keys/Manifest
index 4394c7144229..21f2478adc54 100644
--- a/app-crypt/gentoo-keys/Manifest
+++ b/app-crypt/gentoo-keys/Manifest
@@ -1,4 +1,5 @@
 DIST gentoo-keys-201607021514.tar.xz 32324 SHA256 5c9b3f47c00967534368e4a4e6e9cafa8ceee7c1b7bddf1a619bdf08a1c6b3da SHA512 0d41270ce04a5ecccc059112bbf16aeaa083fa18c921e1fd0412fee1189863cb2fe416105fd0952d30151935651c1cfa24c650b9201a0e231563efb0a0c55f89 WHIRLPOOL 811f6dd86ddd077bde823c172695248c64f1231b6c65a7562f3bc55bc397bc2449f55cc59863fde9918e7264d0a4faa7f159493d74f1f30a13d581fa8d199f5b
+EBUILD gentoo-keys-201607021514-r2.ebuild 563 SHA256 4e5e397898ba6e1ac445c1ab712ffc4b8c508dda3c44d28675850b022e559b90 SHA512 bb288c9af52562212e45ac922b6ed67ae4c994d616d0570a125a59b9cb9f86357cae54fe94707c6c5a12d308e00e2460c58d12a111955ecffe7b61e9f92a9547 WHIRLPOOL 486fe9b3dd58801f2b32e0c76611bd84615dc580e1f4b5870b89bae9d56da776092e390d0c01fb4d92e48b51a200f2c04d38c25b3c92676bf41a1b9abe344eaa
 EBUILD gentoo-keys-201607021514.ebuild 607 SHA256 1f93b48182e4e113772b1fc47c9f23cb38f327113f3a9ad5c9c088b32946edfb SHA512 18e5b969c4859d36b1deb694486c400d09433739d95d43595e625ced45c12ab3005621b70425c06a92fb5a691f8686aa7faaaedcbb9da647d21db7053228713c WHIRLPOOL b18d2563980c03f83fe319a37307c6e20b62151186093a7d67ea13ece169b92f8b0372dd8cbb3d9e6bd5e3960736885df250af5182734d4a06ca6da90d8bf01d
 MISC ChangeLog 2698 SHA256 61d2762434ff2001546293a5395a427f0db7e2c81456cd81f28991fd790fbf25 SHA512 dc9d70e7334d245180ba6a059739c1c3948716a0656fa973bb8dcb37befb163be0081b067c8c944c4601ab76625009e0d4b7fa5f3928bd3520204a2b38a2638a WHIRLPOOL 1d82fc745484170984486f94787ec032e036e81263a9524292306b04873399aef289e4bdfe8247626affd4ebddeeea5ce82333ea26ab8729bf6a4c9c9d2e3daf
 MISC ChangeLog-2015 874 SHA256 f04ade72c200e76ada4a57ad8a5a4332982047c8d6a5b69e62afa172d279016d SHA512 4cbb28306182954294d0b94aa4abe2c503f3239d8b9bfe2318d2f9854643eb5d86a95e783a162f0c704e701bfaf5c128be4508dfa9b5c793f56e1a0cde5c88a0 WHIRLPOOL 64351f549aa264313f8a6f3c363d26814ede8d25c6c0e241269c5b441253e30490311656208e7c05136d890c27160284b0d0ff0c9b2252c31d18e4c1843469b9
diff --git a/app-crypt/gentoo-keys/gentoo-keys-201607021514-r2.ebuild b/app-crypt/gentoo-keys/gentoo-keys-201607021514-r2.ebuild
new file mode 100644
index 000000000000..faacb71d079b
--- /dev/null
+++ b/app-crypt/gentoo-keys/gentoo-keys-201607021514-r2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2014-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="A OpenPGP/GPG keyring of official Gentoo release media GPG keys"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Gentoo-keys"
+SRC_URI="https://dev.gentoo.org/~dolsen/releases/keyrings/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~ppc ~sparc ~x86 ~arm64 ~x86-fbsd ~amd64-fbsd ~m68k ~mips ~s390 ~sh"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /var/lib/gentoo/gkeys/keyrings
+	doins -r gentoo
+}
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 5d74585ffe30..a13c22ec3dba 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -10,7 +10,7 @@ DIST gnupg-2.2.1.tar.bz2 6537959 SHA256 34d70cd65b9c95f3f2f90a9f5c1e0b6a0fe039a8
 EBUILD gnupg-1.4.21.ebuild 3345 SHA256 6b441756eae4e86f212092330acea93ef31e82be0903df125e3060746726eecb SHA512 14a708c00e98c76fa6ef1f2d878f84f63d8e110f85b35b9c40b6da80525af685df09ea83eb1dd1fce1fe3016b9e12a46c02c91f11ea78496c12301acbf04d257 WHIRLPOOL afc261211aa9a4620501359bc7622e61916db6144d70dd3d5e48fe471952c4b865b1fe7911c64bdcdb848120b5620ad445f24aa36b452a02aaafcf21abde998d
 EBUILD gnupg-2.1.15.ebuild 4570 SHA256 8a8a2a347184293403d78eb604f2c520ac716e162cb8acfc21795952abe9b07f SHA512 385f5c40a42559e3b686d16dedc2ca442dd0a075514184e67eef97624cc419bd0bfc7f7ca6fdd3dc549cb4e3beafce656b725adcf201d27b151dab6456346875 WHIRLPOOL be781ec9278f2b9284e139dccbaa986a2c2860f74bd3933a6ce5e325b4ac6cd7b0301c31331955e308d71c754c2a00922a8a2ea8db7178ed73e9135a8d3293a8
 EBUILD gnupg-2.1.20-r1.ebuild 3102 SHA256 1e8c8bdee0c90d9ea51b3ed3e940a4f4e7e67c823816961ca75e02e8b726dc03 SHA512 68eafca6339bab0f118c5ff9119a984ee2b7432942929d429a430c053da568ed7729d13a507d073bebc8a273e74eb40f66585ef84cc9b83181f2ea5d6990d615 WHIRLPOOL 99ee773c6aec668d1e4ebbb9ef65792e26f01088d54443dff0578de61ca9d665ba30e96be80cd7e447abb9fed56f3061aff7c224941de90f31ee2134995a8adc
-EBUILD gnupg-2.2.0.ebuild 3124 SHA256 7605f5d6f19bf50ef51ba29412ac7d2be64bf7412678312f835557ae52ed6bab SHA512 3891728ab252676b298b4f5dd5791856b688f61baaf1f86be387195177331f5a296dad965e248595c1ccf150d15c74e3e8ac30ae74e205a1f45f2a32753ee09f WHIRLPOOL b2002be1e997cdfb3f264385795d5a03a0964cdb28293b7e5de511c97cd9bf6cae7d9b80edced641b99972323adb2b1bfd2fc8eeb4148c5e5bfbf83990f73284
+EBUILD gnupg-2.2.0.ebuild 3121 SHA256 675012bcc07f9bbec483224181dc240bf0fef4d6337160cd9b23efaee485b58c SHA512 d0970104cdb3642518cd986a1328cd06200dd8a472b306d490608aed27f40d83d176731bc62adeb3387505278ed56ce3f16ade2f30a55b4385a9112616aa12cf WHIRLPOOL d88b64ffc222abc32999c8aaeab7fc72e458c30e34c621b32e30ae7d49faa88f8f7712328413719d01070e8d80485438cf3e7f8a1ba4b6c2b2f037bd29f8d6b6
 EBUILD gnupg-2.2.1.ebuild 3224 SHA256 8087d59a0748422d7888180f3e7b4692285cebb9ce7a8ac802bf563558ef9e9d SHA512 ebe3107c7444f4f821760d854da5376a9953b7e6781673cc55b3704ce9accf5306277140648a047f9fe705c7e5ef7922e45c0fceb8508d80edd63b6dab08b579 WHIRLPOOL 1c9745178e0276a11bf73d31705318c40e6a0c2c9191cee90df14fc0e02856f0eb534ef036b6ee3815dc4eb574f31e12cb5b433424b9362e4d1513c7dde55699
 MISC ChangeLog 17653 SHA256 0f85d5aa5e23837a910ad2d14a05a1a3cd8a3bc9f59d4e0fcbc1b6cf30d8f166 SHA512 8e8d0cac1c1c9662d9754e1ee04399bffbd41eaec93d361bb01ac753d9907c60d56f184eb5e265f4817afe681f090b4d796274a2bb33988764e036fdb71dd2f1 WHIRLPOOL 960f2283993b2d007df253abd5a5b0eb0d1441df64262825785793cfd756f6d314c3186948fddfc946ed801e64834ac4909ab9654ceb8e2c45d9df3543ea6812
 MISC ChangeLog-2015 89046 SHA256 295a825284cc7d9b7148c77733782937402db7e07fd7fbf0a9f44861d2018ce7 SHA512 9920db843f9cc1863f3529ac2022f591de8f0b930f82b64ca2859d542af679de3dcc733e5b55b8de060df9bf01ce68cd1828d0c179b1f9f05093cd6566efddc6 WHIRLPOOL d21dbe313d4c1b0e50012e0cc05560d13b712875514dbbea2f56be40ce85c99db8a7693a0f4492dd631119d37cbc796546fe5b62f5d6a6baf598d0a94c0ac0a3
diff --git a/app-crypt/gnupg/gnupg-2.2.0.ebuild b/app-crypt/gnupg/gnupg-2.2.0.ebuild
index ba5fbde5fcc9..d4d043c3d242 100644
--- a/app-crypt/gnupg/gnupg-2.2.0.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
 
 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 ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 doc +gnutls ldap nls readline selinux +smartcard tofu tools usb wks-server"
 
 COMMON_DEPEND_LIBS="
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 54db65477c82..c3afda7f5fb6 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -19,9 +19,9 @@ DIST heimdal-7.1.0.tar.gz 9925587 SHA256 cee58ab3a4ce79f243a3e73f465dac19fe2b93e
 DIST heimdal-7.3.0.tar.gz 9927966 SHA256 351df17c11f723681a4eab832e880af4a28693d1ed6996b02671d676dcb3b7b5 SHA512 2a2a76e073ce429086c6e673d83974ba57c7778500f9b007fba033a0e31aed4c4e060d123c10c6d54eda9cda35faabc3df5fa92b560531e92eb8f3dff4eb9dc2 WHIRLPOOL 2a60146a6ca0edcef6072cdbdb1a7a986da82a14b459062530b390ab5d895b0e671f4e46c9a707ea846bcbc832585b1a2e78a593f065c6929fdd2b4b41f49e95
 DIST heimdal-7.4.0.tar.gz 9928553 SHA256 3de14ecd36ad21c1694a13da347512b047f4010d176fe412820664cb5d1429ad SHA512 3bb83974180e0f6fe2e1b2a11c51cf136c9a64f13f9ed7592f0039ccccd03c1a22081b7d88ae631f94cf46589ed399b79666eb814104f915faa70b53749863a7 WHIRLPOOL 337a6da67bb48e08ecab2119598c19e2ca9b0cdbd7ca163f6ea55ccb0a1290cc2906eee106b625a43243edd7d1677ff36ae318ab82f2d3e439b8f25002f7f001
 EBUILD heimdal-1.5.3-r2.ebuild 5024 SHA256 092d8f1583803c851a41fc2d1729ba0f8ca44a565a27b8eb9259229fab30a98c SHA512 bb82e78a56c619470f245b3cd65f8d8e3bb86bbc41d8217028372f15977603e10f6075aac8c08a7daf1e5b8cf85c50c5b95a344288f81b1dcaae3c0959002a8a WHIRLPOOL c276149edcef305a279dfc0d72e28c1a2e918a817f2ebd75ac084469de22c18b44bfe31ac2d5aa2dc1b4692c6673bbc99bd46df3deb191341a2b78f1451c04c0
-EBUILD heimdal-7.1.0.ebuild 4308 SHA256 66457b3af786a1bf0bc25c29e2ea65dfceb1a536d714ce07f87c133f4e75b386 SHA512 e31b14de2393c0b85042012abb95dcea54206187618d04f4414ecfc1ffeddc9db707cd7d87bd4ee3bbcff4f9d6156a5918e2810eb9da312859ebc97a76a6f5c9 WHIRLPOOL dcc455f8f4eafe97eee6a89f74bdc5b35f9b0beb9797eea4e293f5db1ce1ebaad66d2deaeec3dad05cacb46c8011f15ca8320fe3f4b2c87921fef13a216a9151
-EBUILD heimdal-7.3.0.ebuild 4308 SHA256 0afe18acc33d3b75b2ec2dd15d0da667ea49c8466eccf19d4cc8677092d50b87 SHA512 9ed5513715e4aee7b6ada52ce784cd84f105ddefcf0c2b5a6ee227f0d8c30e25d9eaaf0c8bf9e3038e09ce7cff2ac0eab7d532e61b6a8be1b8e998e33440e597 WHIRLPOOL 47fd1f2dbeb884bbec49404b1e1a73baa184c8eca81d8f1bbb1121f9bc7928a98acc23a3652b13736178289bf9c55a343e73640b3808ec5928c39f31e13e64ad
-EBUILD heimdal-7.4.0.ebuild 4304 SHA256 0b9b14ea382ae65fe378409b31b9ecbe38cf3ffd33b1022f0ce9351dbfb2f724 SHA512 d984b44fd34a60b9e67fb9021ab50e0ebae97487ac6dd4bd319d05616511e11d046f8bb5f29a67ab4f1cbb83b8a1d4624ac81c2e808fe7c510e638252207931d WHIRLPOOL 30baa69b42629fa2830c8be5a224ddbdf77122c31f5c5d9ddba31ed380336d206d39c03504bd9f0401b451750dfb7acfbefa5cd928b45f15a8e5059633c822fe
+EBUILD heimdal-7.1.0.ebuild 4391 SHA256 2a1ce6cb6b0fdef4f00023eb4a57a5f8f1a8cd9fad0924c50cf885a9062e6a32 SHA512 7ba0763e2db5fb26f8f4cdd9d8220caec49f918f7707f4e60499f36a7bc7d5259ce61f688778fbf6daf70ae5eb56b5953f5d8c5cc1c331626071620403f7b8bf WHIRLPOOL 8efbfc69d8dd0473b74162c368b67134da9540bed57b49020edd1372db77a1a1f6ab81e071c5b976c49da782c441dd5bdc2101a97c5efef8b90c2e50f04c41a3
+EBUILD heimdal-7.3.0.ebuild 4391 SHA256 2a1ce6cb6b0fdef4f00023eb4a57a5f8f1a8cd9fad0924c50cf885a9062e6a32 SHA512 7ba0763e2db5fb26f8f4cdd9d8220caec49f918f7707f4e60499f36a7bc7d5259ce61f688778fbf6daf70ae5eb56b5953f5d8c5cc1c331626071620403f7b8bf WHIRLPOOL 8efbfc69d8dd0473b74162c368b67134da9540bed57b49020edd1372db77a1a1f6ab81e071c5b976c49da782c441dd5bdc2101a97c5efef8b90c2e50f04c41a3
+EBUILD heimdal-7.4.0.ebuild 4386 SHA256 2609914870670405bd2f5eeb0a8a9b0812bd897d82f907df989d6d0b1cd5641a SHA512 2c8c11e021d828a4e49142389c6e3dd3d361d33ea889b6e2590043aa71e533e5483de9b3b32e087ed95f76d5a42d84fca22a21043ea414b0760d4fd3f4bff728 WHIRLPOOL 9e9bcd4d8f82f95ed38ab8959b780458beda89de9d3b00ea49d2c13e91ad4d9bb7252358258c0153bc02ab0dc61aae667f133482a4574ece4791632bd29ed0d2
 MISC ChangeLog 4413 SHA256 4c9d94b05877452f2233be9ffea999aba04d4078e63f17341138d0fb831105d4 SHA512 6a4e11a4509c2722a1e6e1bb65c6ea070b849b05aee166bd94dbd1fb831e5eb4af7c927b7735650d407732f11eead38816fd4d8693195df9378cb69d9e6cdfad WHIRLPOOL 13253e869e3da54af008bbf03059f3f9f150390b56f02e048e42fc9547e94d637b98d8579d1f488afe3805e7a38238d64eec87304c5d64d81c31b3b12f372df0
 MISC ChangeLog-2015 36803 SHA256 fe8e5e58312adc75a5d62ccbf1684f06783eb9aed087d8ffad5cd9c9179aac1e SHA512 48b692393c72ed2e98eaf8473bec195ea8645a14c4c7aa8c6318e567c110b3b2fda0fc745ca11487b2cce51fee6cb1d165e9bf6c7fcb60c05e8a2b1dfdf57bdf WHIRLPOOL dfc81a3dfba814ef43a5fc4d9ee965680b24320501f40b7218aa5a84002acb791302dad8718747bcf68a208aec306e65746b5c166b0492341b08c5a0c9f5045e
 MISC metadata.xml 638 SHA256 4abc8c61e0d5f828d838329d247bc6843cba316784ac65c59abd553b94138aca SHA512 1fb671028d7d798c9a6e0be09e77b94a2d7f25598f6d9238f1b7897c9fcd68bed1d3fe84e84d98c1f276979cf782fedb13f1ea44ad876c4658ce1f142aecdf5f WHIRLPOOL a565b94ef0058dc1318db1d141d538d28c93f0bdb3e85765420f1328afc1e350d76cba8ff0b75de0b7ac4bb0b0ca528608373166075e2f89a3108f5862471ed3
diff --git a/app-crypt/heimdal/heimdal-7.1.0.ebuild b/app-crypt/heimdal/heimdal-7.1.0.ebuild
index 416e7858a1c7..5a5572526bbe 100644
--- a/app-crypt/heimdal/heimdal-7.1.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,9 +15,13 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
-IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit selinux ssl static-libs test X"
+IUSE="afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X"
 
-CDEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+CDEPEND="
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+	)
 	berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
 	!berkdb? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
 	caps? ( sys-libs/libcap-ng )
diff --git a/app-crypt/heimdal/heimdal-7.3.0.ebuild b/app-crypt/heimdal/heimdal-7.3.0.ebuild
index 4591ceb4645b..5a5572526bbe 100644
--- a/app-crypt/heimdal/heimdal-7.3.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.3.0.ebuild
@@ -15,9 +15,13 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
-IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit selinux ssl static-libs test X"
+IUSE="afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X"
 
-CDEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+CDEPEND="
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+	)
 	berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
 	!berkdb? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
 	caps? ( sys-libs/libcap-ng )
diff --git a/app-crypt/heimdal/heimdal-7.4.0.ebuild b/app-crypt/heimdal/heimdal-7.4.0.ebuild
index b0582cd41968..b7ae49bd276b 100644
--- a/app-crypt/heimdal/heimdal-7.4.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.4.0.ebuild
@@ -14,10 +14,14 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd"
-IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit selinux ssl static-libs test X"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd"
+IUSE="afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X"
 
-CDEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+CDEPEND="
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+	)
 	berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
 	!berkdb? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
 	caps? ( sys-libs/libcap-ng )
diff --git a/app-crypt/kbfs/Manifest b/app-crypt/kbfs/Manifest
index 467a6790710c..bb87419448e1 100644
--- a/app-crypt/kbfs/Manifest
+++ b/app-crypt/kbfs/Manifest
@@ -1,3 +1,3 @@
-EBUILD kbfs-9999.ebuild 752 SHA256 b5abdbf2a7d44fb06da258e513484fdacb1842b6e0af64d8a4a38391a73ba5a7 SHA512 0b574434c4ddc944b55553233e8ddea35c3e4f9098f65afd97b72ff44c970dd8a0a54536f9a24ce3fa32c56e0a71a9540abc6a7414baa3d9ff527d82e59afd27 WHIRLPOOL 94db70cc1d7b1b79c7e405a1f2740b530b45406b0714f5fd55a613fbb8afba68db983794ab601e71091b18ed3051f6a92a7b1cd8a4b7334aa7239a65214559e7
+EBUILD kbfs-9999.ebuild 967 SHA256 5054322d131caffd30fa0873f7d18adce5c5c68821ea51632b783e3c9b51899e SHA512 99e2c177cfa9f4b9074600425f5587efe19c0341d49e62dd0ef02950c47f298c007ed027bd37ceb21719309241fe3ec1ecf40fa8b3c740c3cb8f1243145955f0 WHIRLPOOL ed749e6565e867811758e4f22a9ffbe1d496784a12151823c11d3cda3fd4f2c1eaae981d3fb8ce40496dfafdcfa23e874e53ae659cb14d63a280cfbfb310b9e7
 MISC ChangeLog 545 SHA256 7c3d6193bd8654db693f401ed27d9cc60dd12ff2a1e744134da2145a6760dca4 SHA512 6c61730b6049b93d8b9022fbd93cb94196c0b034c958008a03e5c357ffe5e2fe22666a09680db2e4969636a36d637d01c8b18149d5e0ef4b8fcb2bd02a5e2ccf WHIRLPOOL 534b0d371fa15d662c4ac4b2dee130ccad594eefb509804d7054266a42b75cf35fd3e7c5411255272436a2db5c4c01abbe41033a7d692afcb04e195b89bf3f06
-MISC metadata.xml 370 SHA256 7e81ec48aa303ecdf8c2328b1ec9017508864114a7bf600476ad16684c965bf4 SHA512 47d589c916847a608e4862d2c8f20d9207719c4feaa896a173456d419794d1528b63d0fb62effac28f309951215cc042f62cac44bdee384b4d50b4f626362c89 WHIRLPOOL d2c308a0d02e55a5e7b4cb81b24dff43e127f5fd921eb0360432d25c807fe0284a2cdc12c31bbe4ebfcda6554359a60dea2c46c6f2619eb3580b5e6c1f045117
+MISC metadata.xml 482 SHA256 b9283ac022494a7d9f4adddc6428bc85e66dd4cce954503e838be95b588bab8d SHA512 74eb8d2fb7b19f269dcf5dbc67a5f63cac1589343a069011dfe8492a0bc1d82b526a175b2fad91a00f7fd60e4a77bbf2b7f7dea4537d6ae9221a9e93ca2bdd60 WHIRLPOOL 84472ef3889a508e70031c65656914495d1dbc3c67067ec4cd5ec7534a7fb103a0dca71c8ff4de0acb426189f65df4e78c10738bbf7aea9f61b624cc15a4eed0
diff --git a/app-crypt/kbfs/kbfs-9999.ebuild b/app-crypt/kbfs/kbfs-9999.ebuild
index 4da71bde3c9a..b084faeb8f15 100644
--- a/app-crypt/kbfs/kbfs-9999.ebuild
+++ b/app-crypt/kbfs/kbfs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ EGIT_REPO_URI="https://github.com/keybase/kbfs.git"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="git"
 
 DEPEND="
 	>=dev-lang/go-1.6:0
@@ -37,8 +37,16 @@ src_compile() {
 		-tags production \
 		-o "${T}/kbfsfuse" \
 		github.com/keybase/kbfs/kbfsfuse
+	use git && \
+		GOPATH="${WORKDIR}" \
+		go build -v -x \
+		-tags production \
+		-o "${T}/git-remote-keybase" \
+		github.com/keybase/kbfs/kbfsgit/git-remote-keybase
 }
 
 src_install() {
 	dobin "${T}/kbfsfuse"
+	use git && \
+		dobin "${T}/git-remote-keybase"
 }
diff --git a/app-crypt/kbfs/metadata.xml b/app-crypt/kbfs/metadata.xml
index b925088bda74..00881f3d617a 100644
--- a/app-crypt/kbfs/metadata.xml
+++ b/app-crypt/kbfs/metadata.xml
@@ -8,4 +8,9 @@
 		The official Keybase implementation of the client-side code for the
 		Keybase filesystem (KBFS).
 	</longdescription>
+	<use>
+		<flag name="git">
+			Build the Git remote helper for storing repositories in Keybase
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-crypt/kencfs-plasma/Manifest b/app-crypt/kencfs-plasma/Manifest
index 334d6e22b548..3f84b4431204 100644
--- a/app-crypt/kencfs-plasma/Manifest
+++ b/app-crypt/kencfs-plasma/Manifest
@@ -1,3 +1,8 @@
+AUX kencfs-1.4.0-encfs5.patch 413 SHA256 4c0eab8077163535d519cdd9de70c8561a4f3f5698f8c1a9c559d3271b1ee317 SHA512 47cb411f80bb4270d3c7e0b132949e2b0185b5170228120ee336fc1bb8ee83c9c0a960746407e8934097381a558be941d08d6e28b774423e58102a3f82a66ae0 WHIRLPOOL 5565e1de3feb3c10ef76afd90015f633e7b90ea985956ad0e2f6d37905bbd4d8ca2c0eb93bf67140bdc7b9c7d3c56d3cd16017b530ee87b6ce4950c401cb035b
+AUX kencfs-1.6.2-desktop.patch 228 SHA256 d39d44d5714e6976e7cdf18abe22e0134b02800ca7c45651d98225fa310ddcf4 SHA512 0f96b65f43fd08cfa116381e5db1ceec81eebb076dca9349d7d3781651bdc7d04e8f4d0cc611f793e581416304174286db98c6aee814059520a47f26bf885d92 WHIRLPOOL 2685f3cd9f7fc2bb385a19d228e95d254255fd010f4dbb37ecb3b2ce7f506ff74d032874540d674ae915997a12c3b780d10e25952e19182b832ccef41d317b49
+AUX kencfs-plasma-2.0.1_alpha-include.patch 267 SHA256 d2fcbf056c642acd35a1b565b7cac9d94c3db2a04c842ba4e1a50ebf5f10707b SHA512 74646bab28c76db89d441e7528ad288f44522dc20f53b5b12b8140d1a61c86d9ae0fb9f559d37fe1de912f176a366000d77b67a3fe3657a3428304a2ce2a29a1 WHIRLPOOL b195a1780e7747800d144e423baaba27b07d5fb540b8a2ee1fef05d5335b7029318dea1a818f7ed153a914918d3313ff730b86767762e55726e9f46c4264f7d9
+DIST kencfs-1.6.4.tar.gz 221386 SHA256 3e88cd2bf0d11ce83746fb5b1e385f172ed506cde922ee2811f9cdbaaa80c4ca SHA512 44dacd0a17194b61d2d73820851b496d6052dbab3893a030db2e63c1be0d1569d80cc75ce0c179381e98b60c5e27ccead8ee257f53f57dea508808616abb514d WHIRLPOOL 8b7f372c8c8304f3a3249a74a565ea77c4c3f255c6db3cf66a2a62951be1b8010e9696dc5d5ac44ea1e39d189c63e4a1ccf562cd4886578e8a2383756e48d24b
 DIST kencfs-plasma-2.0.1a.tar.gz 216580 SHA256 8a46fd2f2f490323350ae17d34d7c10de1afe73943413a3e2cc10e52d3dd6eb6 SHA512 a9093680bb141c18e2d4ed8a966f7176c40c10fa0ee6e5cee25ae26ef3f94e6ffc7e3f0a7b55321640e4ba6e484d75755f901b53688dbfc5c22a1c0b1e01cfac WHIRLPOOL 146aedf68686611be6bbe69c7b9370e27780c7bf33f1ea962c4b48a895770be0b50a03257a8d74b38eef99fbbdfa85a7c116b7f7385b80e343a3063b79f895e6
-EBUILD kencfs-plasma-2.0.1_alpha.ebuild 896 SHA256 6988818e053f2daa732fe7fe75ee996960cda99570291c57bd3b365b03607fd2 SHA512 011f88640c115e3770f1fc58a01864d847b6e3d3b01842b55211241bbf6f01d3e1816cb034f09e569c70e60056705d06239a420af8150885b87be681f6c0c328 WHIRLPOOL 2bb43b2a5edef7af4a4f63d6e4148c1aae0dbbb4f24742c805576a366994cf70a3e0ed614c2a3a2194eeb31ccaea10526d8657f48ca5b44d6a8b64c704e22e9f
+EBUILD kencfs-plasma-1.6.4.ebuild 891 SHA256 db4cb243e3010bb7c5a2d6f6926bfc69df34aa73f6d482eadf779c7113e190ac SHA512 13da37f7e2323b1a889ef6bc23e6af36b818e37e6bf0a52258b36a15275b418455804dac67467ac2717448cf477d7c7fa68ca4d12c635f5259a0d645c867acb4 WHIRLPOOL d93ea87216c394866c6d14ee37d9d46192e30929ebbd05979f8cd61dd0296cd58d9fc0d3daf102dd965ee2dd3ecfaf19bcc992459e92eb80c710466505f2d4a4
+EBUILD kencfs-plasma-2.0.1_alpha.ebuild 942 SHA256 fadc04940792dc53bdf8a291877782e4e2603df4546e87211966bfaad6632cdb SHA512 bdc8261ada220cf77dac4f95ccbb38354e2b4d67e8219367ae3a949b1724a53d2c32e8c9381010d1449d73f85087d2feea00ec87c88d13671825f7d6d420d17e WHIRLPOOL c800b13a5d2e0a723823d06e528b4e209a3c454788b723fda4a192db9b01f362716b03fa40ea1a7af44789e19a14982a4e73ab7a58038dbcdb57373deb292771
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/app-crypt/kencfs/files/kencfs-1.4.0-encfs5.patch b/app-crypt/kencfs-plasma/files/kencfs-1.4.0-encfs5.patch
index 6687ac0f1f9b..6687ac0f1f9b 100644
--- a/app-crypt/kencfs/files/kencfs-1.4.0-encfs5.patch
+++ b/app-crypt/kencfs-plasma/files/kencfs-1.4.0-encfs5.patch
diff --git a/app-crypt/kencfs/files/kencfs-1.6.2-desktop.patch b/app-crypt/kencfs-plasma/files/kencfs-1.6.2-desktop.patch
index 2d8683f11e46..2d8683f11e46 100644
--- a/app-crypt/kencfs/files/kencfs-1.6.2-desktop.patch
+++ b/app-crypt/kencfs-plasma/files/kencfs-1.6.2-desktop.patch
diff --git a/app-crypt/kencfs-plasma/files/kencfs-plasma-2.0.1_alpha-include.patch b/app-crypt/kencfs-plasma/files/kencfs-plasma-2.0.1_alpha-include.patch
new file mode 100644
index 000000000000..2bdd692c122f
--- /dev/null
+++ b/app-crypt/kencfs-plasma/files/kencfs-plasma-2.0.1_alpha-include.patch
@@ -0,0 +1,13 @@
+Fix build when kdelibs is not installed.
+
+--- a/mainwindow.cpp
++++ b/mainwindow.cpp
+@@ -52,7 +52,7 @@
+ 
+ QStandardItemModel *model;
+ 
+-#include <KDE/KWallet/Wallet>
++#include <KWallet>
+ using KWallet::Wallet;
+ Wallet *m_wallet;
+ QString WalletFolder="Kencfs-Plasma";
diff --git a/app-crypt/kencfs-plasma/kencfs-plasma-1.6.4.ebuild b/app-crypt/kencfs-plasma/kencfs-plasma-1.6.4.ebuild
new file mode 100644
index 000000000000..3661c4b1d3f3
--- /dev/null
+++ b/app-crypt/kencfs-plasma/kencfs-plasma-1.6.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/-plasma/}"
+inherit qmake-utils
+
+DESCRIPTION="GUI frontend for encfs"
+HOMEPAGE="https://www.linux-apps.com/content/show.php?content=134003"
+SRC_URI="https://dl.opendesktop.org/api/files/download/id/1486311191/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	kde-frameworks/kdelibs:4
+"
+RDEPEND="${DEPEND}
+	kde-frameworks/kwallet:5
+	sys-fs/encfs
+"
+
+PATCHES=(
+	"${FILESDIR}/${MY_PN}-1.4.0-encfs5.patch"
+	"${FILESDIR}/${MY_PN}-1.6.2-desktop.patch"
+)
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	sed -i ${MY_PN}.pro -e "/^doc.path =/s/${MY_PN}/${MY_PN}-${PVR}/" \
+		|| die "sed docdir failed"
+}
+
+src_configure() {
+	eqmake4
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
diff --git a/app-crypt/kencfs-plasma/kencfs-plasma-2.0.1_alpha.ebuild b/app-crypt/kencfs-plasma/kencfs-plasma-2.0.1_alpha.ebuild
index 51d97e164f65..5b6df0f1ffd6 100644
--- a/app-crypt/kencfs-plasma/kencfs-plasma-2.0.1_alpha.ebuild
+++ b/app-crypt/kencfs-plasma/kencfs-plasma-2.0.1_alpha.ebuild
@@ -30,6 +30,8 @@ RDEPEND="${DEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=( "${FILESDIR}/${P}-include.patch" )
+
 src_prepare() {
 	default
 
diff --git a/app-crypt/kencfs/Manifest b/app-crypt/kencfs/Manifest
deleted file mode 100644
index 3241f02151f0..000000000000
--- a/app-crypt/kencfs/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX kencfs-1.4.0-encfs5.patch 413 SHA256 4c0eab8077163535d519cdd9de70c8561a4f3f5698f8c1a9c559d3271b1ee317 SHA512 47cb411f80bb4270d3c7e0b132949e2b0185b5170228120ee336fc1bb8ee83c9c0a960746407e8934097381a558be941d08d6e28b774423e58102a3f82a66ae0 WHIRLPOOL 5565e1de3feb3c10ef76afd90015f633e7b90ea985956ad0e2f6d37905bbd4d8ca2c0eb93bf67140bdc7b9c7d3c56d3cd16017b530ee87b6ce4950c401cb035b
-AUX kencfs-1.6.2-desktop.patch 228 SHA256 d39d44d5714e6976e7cdf18abe22e0134b02800ca7c45651d98225fa310ddcf4 SHA512 0f96b65f43fd08cfa116381e5db1ceec81eebb076dca9349d7d3781651bdc7d04e8f4d0cc611f793e581416304174286db98c6aee814059520a47f26bf885d92 WHIRLPOOL 2685f3cd9f7fc2bb385a19d228e95d254255fd010f4dbb37ecb3b2ce7f506ff74d032874540d674ae915997a12c3b780d10e25952e19182b832ccef41d317b49
-DIST kencfs-1.6.4.tar.gz 221386 SHA256 3e88cd2bf0d11ce83746fb5b1e385f172ed506cde922ee2811f9cdbaaa80c4ca SHA512 44dacd0a17194b61d2d73820851b496d6052dbab3893a030db2e63c1be0d1569d80cc75ce0c179381e98b60c5e27ccead8ee257f53f57dea508808616abb514d WHIRLPOOL 8b7f372c8c8304f3a3249a74a565ea77c4c3f255c6db3cf66a2a62951be1b8010e9696dc5d5ac44ea1e39d189c63e4a1ccf562cd4886578e8a2383756e48d24b
-EBUILD kencfs-1.6.4.ebuild 832 SHA256 e695d523b5078cc5537bf8323e25c9a681b892d932c7007831f368fe96b9e52d SHA512 a849eb9d03e52c4401f1320d2aa2d51cc60f5411748a3c7b06c88efc1f18fb0db8be77bc7e33b531287b4e0e491b7160ea35a281d66b3b85845a5a1e4736a7fb WHIRLPOOL bd2327b4d5cb1f4f19e56a7420997fb33e8eeccbf5adb98dfbcb7d580010307e4dc2c8cf6b45bdb1c5d151d60a3767ff5250c81b95dcf09fc20587d41cc1e6e5
-MISC ChangeLog 3459 SHA256 b79badaf2ac0ea794180447405622082098e4e7cac9a35435ec1ee44c58d8032 SHA512 16d14016c0d406385e5c95926dd4267ef49904b86843220f1a7bee6ae095286324a98973c6b540c953e269e15e4fa2784189caca43f5489423235e926899009c WHIRLPOOL c1d29c802eb5da17421e02396725ac04b604accf9042213c667fd0176d52308f982d84112e25f3ed2234a5b0f7b218f4ec084cea11f801857ca5a7c3ed423327
-MISC ChangeLog-2015 2644 SHA256 01a32d4dfeca20561235cc382f170cda00ea155b5863970820ecfe5298e58f84 SHA512 24df8a5a5ead26fe64c9f9059d52fa74be7bf5da54ca07eb327b57f38f30c90221c519868ad9c8deffd16a9f3f71022848d2a5b7adbed3dcef03679094ea0141 WHIRLPOOL 1e4c5302fa53aa2b738c4b8c9e619b6122ee391e574986fa8943a8f5f50baaf04a471d76f0371e00befe5fa27e8da65a5196c8d72507df012d68ae44897c5f6d
-MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/app-crypt/kencfs/kencfs-1.6.4.ebuild b/app-crypt/kencfs/kencfs-1.6.4.ebuild
deleted file mode 100644
index f998854329f5..000000000000
--- a/app-crypt/kencfs/kencfs-1.6.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="GUI frontend for encfs"
-HOMEPAGE="https://www.linux-apps.com/content/show.php?content=134003"
-SRC_URI="https://dl.opendesktop.org/api/files/download/id/1486311191/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	kde-frameworks/kdelibs:4
-"
-RDEPEND="${DEPEND}
-	|| ( kde-frameworks/kwallet:5 kde-apps/kwalletd:4 )
-	sys-fs/encfs
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.0-encfs5.patch"
-	"${FILESDIR}/${PN}-1.6.2-desktop.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i ${PN}.pro -e "/^doc.path =/s/${PN}/${PF}/" \
-		|| die "sed docdir failed"
-}
-
-src_configure() {
-	eqmake4
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
diff --git a/app-crypt/kencfs/metadata.xml b/app-crypt/kencfs/metadata.xml
deleted file mode 100644
index 2fdbf33d963d..000000000000
--- a/app-crypt/kencfs/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-crypt/libscrypt/Manifest b/app-crypt/libscrypt/Manifest
index b23b8c2923f4..1126d177203c 100644
--- a/app-crypt/libscrypt/Manifest
+++ b/app-crypt/libscrypt/Manifest
@@ -2,7 +2,7 @@ AUX libscrypt-1.21-build.patch 2460 SHA256 00b2c3a5f2f4692d25e3e6c411e146aca50b7
 DIST libscrypt-1.20.tar.gz 18451 SHA256 6074add2170b7d00e080fe3a58d3dec76850a4f272d488f5e8cc3c4acb6d8e21 SHA512 c7db096c740681c328d4c156372147331c0441906c1f17656a8ddd8345348091295749c4e3105bf26106f826327acac9bda97efec4ce50ac56d64f903c59e9af WHIRLPOOL 5d854936f955fbc08ec7d31e89396d3198ea58cac326ea8ceaedcc360e412cefc9e75b49a959870924cabe79ccf14453209cf450ff0256873c1de744f65706ac
 DIST libscrypt-1.21.tar.gz 19425 SHA256 68e377e79745c10d489b759b970e52d819dbb80dd8ca61f8c975185df3f457d3 SHA512 0f894bc2f47016cdd043ea692a4e4b08891b1a961443265230d5ccb76820d40e50b0d4d63588c44c985cd24e214f07b126d30989d3ce4cd79366f3b8f16c4d34 WHIRLPOOL 7fda5f5118c981d595f9f624ae40674c29fba6ee529ec8f4861b88d9bf11321b7a1285fabd1218356b59e889ddb96c4018513441fb4cebd302639085fcc097d0
 EBUILD libscrypt-1.20.ebuild 722 SHA256 1ab36b25bee260ef3ae5026e0a303fb92d82f7d072e4cbe98b402d78e3b52870 SHA512 482d125da9d0f3a062c84ef70452f6da4c24d3b6fac1eed53b2ffae2faf6b15e14216b8d95522d3fa45306a64a97ddf0e0b5e91f15d0d9319caf174182ca07ec WHIRLPOOL 88ef5dc28d4cc45db4fd515b6e83c090adcd5eb006d995a2db89bebcb823af6cbff87ad429872d70de9c12e2cb5bd209e2764dc50146745f049cddc2618f4bca
-EBUILD libscrypt-1.21.ebuild 711 SHA256 82be4ba258c8907ff2bb9a4dfdeb30da5bfc9a7b7c3de4e672aca3b2970331e7 SHA512 b5bb5c5eaa5c04da9c8f046589938e5bc40f28ed5e4c1b3c4970dd20bca9cab2ac045a99849c6544a788774cefa6b6e130a70b24f457ef57a9f9b799c0e3630f WHIRLPOOL d2f824e0cb4702e9b9dae242c4913fadcc04546fb6c9b3c0a6290972c830643e73db832e7db07ca2d11332dbcf4659fba28690bd7428d28448cad06abaeec5de
+EBUILD libscrypt-1.21.ebuild 710 SHA256 9e1cd1a7e2fb18d37762538fdfd47bf440117589cf33eed7e07e84e7f7cfed01 SHA512 f47b2b835acd83b9f4409533eb1d7c88c53d5c5fbfc208d8d07976992cc0787da134c455a42ce36ec5e8da1abd977953821324cbf633267a691a136c98a86cf3 WHIRLPOOL 979ef44ca648fc559816e1f925c2a0e854358790af09f2f18435168896b9d692b310be50ade44c63598ee98b366981a5e45d1e4aa5058061469e3716069d1ee3
 MISC ChangeLog 2235 SHA256 21a74e80d7dadde6500f36f2081d49630f95ae0b1c3567ae0b4171af45128369 SHA512 5b1798c1479023fe7c895ec5be6db22e40937415b296066de34d0ee02df7750c2d2bfbdf4f4bb3ff738fedccf64b5603d4d1796ffd63525491628727981bcae6 WHIRLPOOL 64021d97cd706b62d3056db19c4336573d55e55043bc581daeb96114be0bcc981d82619283fe02e93f8df51ab65dc18a974e43aa96400572fb446c2e840b8245
 MISC ChangeLog-2015 1140 SHA256 a4212ea3aa533d9b211b3e83f179f0e4d09b0bebd48ef69a1df2e3f736ee4afc SHA512 606ad54de1d822941fa5dac04d6c962ae5eb3059a0819bf26d19ba985b3ebdf0768ae66d7ff02c722711bb216bec08a6c6c5cc55c035622b995b19db1905b14a WHIRLPOOL 028fa99a6acbe34a196e6d3ddf14ec422ee0394dee5f1a0a39e5cbf8282ecc9c388cc249629522bfd32606b4c91ad91218e573c1847d7a0beb5bb7ec596cf399
 MISC metadata.xml 345 SHA256 2b9eaf348e1fb04d7b556aff418828ed4fd94c3f97391cf82d2185822f766091 SHA512 d123a54ae5536171b145454494d00e340797239bc5614a36451b9b975ad7bb2f38c5330069e78dd99f1d23cdb6f252736885af78d8cef63eb57dc93d68033383 WHIRLPOOL 7f355b8ac2c2547ea7ae61e0c17adc027216cf63e468a133a523432189ddf72d51ebba4400ea9ea23a991e2ceff43ec819c0c7230a70c1667fe38048f2f98b24
diff --git a/app-crypt/libscrypt/libscrypt-1.21.ebuild b/app-crypt/libscrypt/libscrypt-1.21.ebuild
index bd109f48244d..a2a17c257efb 100644
--- a/app-crypt/libscrypt/libscrypt-1.21.ebuild
+++ b/app-crypt/libscrypt/libscrypt-1.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/technion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-crypt/paperkey/Manifest b/app-crypt/paperkey/Manifest
index 27e242688959..d5a393b9c2f3 100644
--- a/app-crypt/paperkey/Manifest
+++ b/app-crypt/paperkey/Manifest
@@ -1,5 +1,7 @@
 DIST paperkey-1.4.tar.gz 259446 SHA256 e12bb0ec835127d12a922a8d60b3dfdb3ca8ee60bb5b4d15ae4cea85bbcf336f SHA512 d0e87760bfd66c39c407f59f94cdd3dfd8f399a51b854a2485f923f4f1faa95a40a68ffd018b9141b923c1db346993600e5e3644314e4f8c94585d47f1367e9c WHIRLPOOL 6a02bc0161e165b6e483ac08904943348ec0a10eba509028d5d092e1cec03d9e906e2d1307c16cb256fe4965a62c5c791becc0cc27200ab0b993de985cf629e5
+DIST paperkey-1.5.tar.gz 266722 SHA256 be4fab67fdbb3e67675dc77fb1c3295a3b13f61706718ea3e016eff88d70faef SHA512 3abe6be913748c08dd2a8fad1e0624dd77a14972abdc76722507ec454aa31cd24fe9ae9f85e256300e568fbc84da6369fbf07f93ae8520f71c46edae4f0f6fe6 WHIRLPOOL fec9855999ca783522bc11f5897abef32a4686e5699fe3a7ee330a9b1b6236a6fbd3c50c05802c3df003723010eded6ebf91fce2db3bd4e5b150be3ba873a4f4
 EBUILD paperkey-1.4.ebuild 342 SHA256 977f87381d6900efa3200c21b29e934cb5441735f267a30b7557471cf13d46c8 SHA512 841f89c09c1af3c4e7a05a356bb3f90d04037ab17cd176d2b14f0827f7a26db630b66f3e559dbbc23563d04ad30019181651a4837bf9a72d7e9703f8892e9839 WHIRLPOOL 17269d28c8d1f72ac1aed1ec6740128f0f99a2824eeeacd895f7f1c7e46c7e0504565cd61a236a90b6e68d89ab832f90c524302e1cae6fa826ccb2d85ef39c9c
+EBUILD paperkey-1.5.ebuild 344 SHA256 847ad55e62e22555d34e7bea7eb8eb36e738e4e17f35cf3bfce75382aa56a221 SHA512 00dbd8a2b5c837b3d45578a5baac4e7f771f36197f9b7597afea20a283e9e76cc7a29cf07de427e420797d61eaf62201fcb1c0a46484faeb3c9fbc1ce9860e64 WHIRLPOOL 1ebf65280456af2367c6b9b2ea552c3993f01ec12ba13d8b2937ec6da62511d9b91f677fa1f0312f8edd36bde331bd5334059c3e9b8ea0c73de131c0c2566ed3
 MISC ChangeLog 2325 SHA256 7a7bba35e17201236f7c243e643c9f144b7043cb9b197fd9ad24be0205a3dbfc SHA512 6b36c95162d9f98a6a3735b45ab36ca5e544a4b1358a2346eb7123d51b6425c206cfb3cfd9d43c6d52ee400ebc7493ae53945b10d30f057d1ed1dcc1287c86e2 WHIRLPOOL 426005e4f69c1ac7a52950154baec75c21eeb7d9d4c8f8214ee29fe4b379dc8e7b6fedab4fc6f2722025648d890f1a550d5441932d277c8ba7263f377972eba2
 MISC ChangeLog-2015 479 SHA256 64093dd473dd377b2686c39ba837560907c7583e25e72cf75089a8fd5b9927da SHA512 7e0f016db4af516f9745a78c0e1540c01d82b385cc15d8119a6c3f588bd08d1765132bf6b10bc3399bf51cdcd08787f8c671f2cc3537b275510c3f064f86c7b8 WHIRLPOOL 57f8a41ca0bf0a1ba61d27bda375c34b721dd6883af5059a446713a03e521615917a087333a49b3cc5d9fa5ab80a5f8b8386d0c86fca695c21d765002859e8b4
 MISC metadata.xml 245 SHA256 6fedd876236c2f1fe2687e73628381650ebecef9734f88f6d483bec5bf475a7f SHA512 ce14e948c06d19eefb8504b77746e191099fd4d66083ad01ac62d874029b397af4edc5940312dac09c9ed18ccbcd98909b93fc0bc463c15db97bf68d13c9fec4 WHIRLPOOL 4957affde63b54e118270c40ce12683872777b41ec1a798f7b03807a99917148279d392f71cbcf95ec4e5d586ee5fc0400aea77d9e46083873a441a4907ba13d
diff --git a/app-crypt/paperkey/paperkey-1.5.ebuild b/app-crypt/paperkey/paperkey-1.5.ebuild
new file mode 100644
index 000000000000..92d3e57c7bc0
--- /dev/null
+++ b/app-crypt/paperkey/paperkey-1.5.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="OpenPGP key archiver"
+HOMEPAGE="http://www.jabberwocky.com/software/paperkey/"
+SRC_URI="http://www.jabberwocky.com/software/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DOCS="README"
diff --git a/app-crypt/pesign/Manifest b/app-crypt/pesign/Manifest
index 48a61cc78654..d48894851f31 100644
--- a/app-crypt/pesign/Manifest
+++ b/app-crypt/pesign/Manifest
@@ -3,8 +3,8 @@ AUX pesign-0.112-fix-cli-opts.patch 2228 SHA256 387de650336376a8b5edb2cdc4097114
 AUX pesign-0.112-fix-initializer.patch 388 SHA256 417d2a19d929627a0dec093767bbd19f0c7774184e0f5e607ef90a789e9b630b SHA512 1b76c6dfe7ddc76a2051038894b7e2da72c01ebc05a46d4b6ebc05a092a55d699161e04c4df73d1afb7752e6a138ed8c9c28eda55897c82934ca852be42dae84 WHIRLPOOL 05d5c1a34ff01767ca211545922c9e13208f5ec9fab99738da307465838f78111152adc18d952ca3ea7fcd35a4a8077c33b4cce77583bb98c9c9c09c0d52850f
 DIST pesign-0.108.tar.gz 96838 SHA256 2019882be0286df1c58efa8c588332106b89418a6bd0fce3de8da4ca16636986 SHA512 f72fb9c3e843341300b68e06bb153690734f6e506cdd9f0d9362c760ff48194ed1ed29e0b58a5050e7331069ad47a9902cc9e34bf616667baf84208f2b69a918 WHIRLPOOL 0af005d0b6dbdff23787c009153cae07c6907d111f57831611e85c49656e29e150ffd71683f349880cfb8975547ea3a3e655cdce31b047b355ecf097e7c7ba77
 DIST pesign-0.112.tar.gz 107632 SHA256 df4f5459137126e2fdb06484d755a81b6ec9a7b50099dcc3088ea2d41047cd06 SHA512 9a0cd266f973fbd7bbbd23939d0be3c34dbccd9ab20941bf967ca1b18aa5bf5d2c41cdef0799399e09e7b0fc59a0b34bc660afb6da292eb1c127db2893362018 WHIRLPOOL e5f3d3801ff7df7d643e87bc851f2645931e18df140b25a7add4136db1bd89c2a8da75d8f018533d5b16ab80695740d00ac379e166993a1912ba9ad2abee6791
-EBUILD pesign-0.108.ebuild 1180 SHA256 e4160868100683edb31bb37759b251a1413dba87d6e3a68fcc64e5387a5edda8 SHA512 53c6e8b00914f01cdfbfcce7badbf4c888a6d23276e9787e34750a2aa85783018084ff25883a313b5b2b67a1b82a6b6888bf971f48c39f37e26c01e74183a7dd WHIRLPOOL 973c67e3c80c29539bcf90de723d98ccf58c67c5c0d8bb723331fd4526f8739fb02e9aa315124e883d71df03c7c6208f6922b882cba7b96a457a3df154c70950
-EBUILD pesign-0.112.ebuild 1000 SHA256 30ead77c615a8212ac27a62b312f52bf2306d74096b654b3b09f193116a51e1a SHA512 cc54e08354b28e7ee96304543815f9dd29ecd9e30709bd6f3861ab04286c7c6bfc3f0e66a5a936222741209d2b649af1349b632826cc914268162dc35d5ae2cd WHIRLPOOL 1b99b77badcb4a12f8bf51c97923f83b34bc2a80bc8e0eedb8dddd093740abaf6a497aa91e4c2138177034b8f261e8888fde02c61cfef3fdbb8830c54b1132f9
+EBUILD pesign-0.108.ebuild 1209 SHA256 20d390bb9c11d7adb607b58d0c1e17faa8a6c339a7985bc89863af7d54c0d97f SHA512 db47d7a32a93460ed56c49607c5f5a2d42775dc799fec79f19fe0ab2dcc70bb11448dc7266a41dd4c1c9c586ad36d77d678baf4cb5a089e36da7825cacfbf673 WHIRLPOOL fe27a9240d81c92208bbea8ac79a3e30d044f356b546d7e8f7b49974c1d437e0a0b73c8bbf2bd2a2af7b40f3b4bfba01e5efd52832ddb2c4d78a94d94e6ae9cb
+EBUILD pesign-0.112.ebuild 1029 SHA256 894acac7612a7138b281ebe0cd4acf0c5e7bf961930d33b30da3c4bd4e4c3b2d SHA512 8c19ec52ca3894113e5c65cf75f2a1f184d737872f8c8d37b3112f4521ed7ad172f5d44947307c8ac5c346da6cfead236eadd2622e1c0589446aa41fcf6ad148 WHIRLPOOL 675b9c26a6b27c2c336df91ac8d93b2338629a2dd6f7b4f3f7a93f6bc14273432f8002737d5269dc26946d625fd311ff6952e42e4dea3aec6a762818d0b53904
 MISC ChangeLog 2454 SHA256 f5c5d6fa0fad7b3b0c0c691d91f52a97156350b9ab9afb72d8f23c2ef6c6db0c SHA512 c0e8166c72bdd47be814ac780c46f33d2eb7b15666a686aed4c8c568a0c0fda1bd4eabc5f2b2a04d49644e7e16199487668715a783390ee1a1470e5791f33d82 WHIRLPOOL f644d83492550f0293c5b304a2d629f6f8e744d34dece049c2cd3f5603eb87431ab8ec39a88dab0bb7809d7d7603f6cfe4fa165b6e8d5186416e97212c86cc7e
 MISC ChangeLog-2015 1045 SHA256 c4b1ea3c1832dbd4f460aa346974789fb65824cbd69aacb24dc3a8834377e6be SHA512 970be07aec9815faf2ffbf9855c8331c07eabec884c70d7382d980fc1f376f7f77977f6e653c20e820073db5b001539132a38cc0586ae4db43d036c641d4ab3e WHIRLPOOL 1c9b8f75019201c42ebabb79f89313eb144b2fb33a56cf17857973b8284c0078c337c46194a27ff17ff163ba2fbd268f873993f5e0bdfe87fdc8aed3c31460c2
 MISC metadata.xml 466 SHA256 ed83ff7c2420eafe66aed4da117b1869c3dfb4f4a29865b4b18ca5ca6ccc9e28 SHA512 cffb289b804411ba72b52113ac4784e2873c0c0730496eb3b29a35c2d2a8891031f579e70cb7a64f0da685fedbcf3f0787ed2c630664cb6c363ddbd66e0d1364 WHIRLPOOL 22ad17121a5743d51a59b78837933e65de31de9032bf9da4e92d28655d4568dcb2f186f8f196bff9be901ccb4923afdda989dab0646c96ba08910ce58bfa713d
diff --git a/app-crypt/pesign/pesign-0.108.ebuild b/app-crypt/pesign/pesign-0.108.ebuild
index 5c3ee729fc91..6413ee2491d5 100644
--- a/app-crypt/pesign/pesign-0.108.ebuild
+++ b/app-crypt/pesign/pesign-0.108.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,6 +16,8 @@ IUSE="libressl"
 
 RDEPEND="
 	dev-libs/nspr
+	dev-libs/nss
+	dev-libs/popt
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
 	sys-apps/util-linux
diff --git a/app-crypt/pesign/pesign-0.112.ebuild b/app-crypt/pesign/pesign-0.112.ebuild
index 01a0925a2bd8..a5d5bac847a7 100644
--- a/app-crypt/pesign/pesign-0.112.ebuild
+++ b/app-crypt/pesign/pesign-0.112.ebuild
@@ -16,6 +16,8 @@ IUSE="libressl"
 
 RDEPEND="
 	dev-libs/nspr
+	dev-libs/nss
+	dev-libs/popt
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
 	sys-apps/util-linux
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index d40d1cb57af0..a11b14fa9b0e 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -1,6 +1,6 @@
 DIST rhash-1.3.4-src.tar.gz 249357 SHA256 406662c4703bd4cb1caae26f32700951a5e12adf39f141d3f40e0b461b1e9e49 SHA512 a78be309011798d5e55023eb93f898c10254a42270288fa5ec68ad446b5f3d001e8c6f893683e5171e3858c86d45ce2ce16eefde1173209e1925420c27a7ff7a WHIRLPOOL 5883dcbf0c2bf51036434d1906b85b615eae65ef2729a68d7ac637e2bea3c494cd3ee7fa9a60d3c4f3241bc4fd5c62c8f7e058c0e53649d50dade241e06dda2e
 DIST rhash-1.3.5-src.tar.gz 316867 SHA256 98e0688acae29e68c298ffbcdbb0f838864105f9b2bd8857980664435b1f1f2e SHA512 e8450aab0c16bfb975bf4aeee218740fb4d86d5514e426b70c3edb84e4d63865cd4051939aa95c24a87a78baaedc49e40bb509b2610e89ca3745930808b3ef6c WHIRLPOOL 80540e96b554fad8c18da431677a0bdc361f7c406b746050bd25ad0b2eeb9d318f1ef0d87ef002d8b8c6fa7db6d789391115358a1676358afd478564d193b229
 EBUILD rhash-1.3.4.ebuild 2642 SHA256 e9823e366370edf45b8270b31aec98ad33c175bc25e2d52057eb4a1b9c71fdeb SHA512 a869ce272ad55fc586fcd7ec563e9856ff0a87757914756e1ba46fd3da34ba3a467d5e0454e8d530c9c72975bd5e06f5b42f072ba8301546d01226753dd1d52a WHIRLPOOL 4bde3bb3e0a8a2f815e166ff91dd606434d2026024c9d889479df2982cadd17b45196f05906570926123e65be153a8f1cfd74ab8243df1e0294c49c8c814b66f
-EBUILD rhash-1.3.5.ebuild 2592 SHA256 49406971d0fd5f1ecb89f502505b485e4ae737087a22e79b89b81d8f28e4312b SHA512 ab1dd06b06b54697f52da7c2263d57d9598ccf5f2b620886120900ef6643db33559df3c113f5c37996df3074a9c220fb14e5e35b507644b230aa5207335c5cfc WHIRLPOOL b15db2e3f14a362e0944840f8f0e1b5a0c3679eed5d762cca7634a5ab1a64e47f91515966c10a49a713bcf3df2daf09fb492519b1bcaeb103caaad831eabea25
+EBUILD rhash-1.3.5.ebuild 2591 SHA256 be1ef694a1e7667cd7f96d1260aea5e5eb99f855f3c8d48de7729e9332e45f5e SHA512 a3a0465fb6453b98974defebc4d8e3140a57a5ea978a19d84ea8b3bdcc5d89ee73e20335bb4549c98239d99c2ead559dde398d1f0f2da2e19a064cc291792747 WHIRLPOOL 2c5a624234a0e1e8111656d9b004055e66c07b2f7a374d69c2b7976f4123bda435ffa9ea0ac38ae305a72030d6614d8a647d29887a2701aea47aecf1186a9b3b
 MISC ChangeLog 1898 SHA256 42a9aa251be9c53c86632be46f1a40bb42fccdc94077e44e67f137f16898c43c SHA512 3c7c8dc6b1497db03e2e09c856cd0cde5947e94bbaa1116d088148d01901459d61b4ec50579dd165fd6a22edb2e28f5ca05b62413a0baeea5b47580b89d2e8f6 WHIRLPOOL fc96a4e7ad467ac1a07d19736becfe148f718979e14ba6fee1d037d6901c0601a60444de8c5f232d4870c91c91e54e9cd8c4fd34c6768209977896a34599f2a9
 MISC metadata.xml 843 SHA256 89065f6503470d30fefb7f8c0edb4d8acc8fb486e2f9c4f0e68756ae073bbf7e SHA512 360de1b8627471599f06a5bbd34a4359be7bd5bc39fe97d7db3da57794e2ace132539e56a2cc971b53911887b314a8ff1c689063c86d70473ac771062f1f3b4f WHIRLPOOL b56ecfad838655183ee34037e82528f2a839309a03a26726fbfb6b4868813b9785db132b5f54acca7e400692dd27afff7733518353ada932cb3efd27322cd1a5
diff --git a/app-crypt/rhash/rhash-1.3.5.ebuild b/app-crypt/rhash/rhash-1.3.5.ebuild
index 381e852a6f7a..ae45a3261d4f 100644
--- a/app-crypt/rhash/rhash-1.3.5.ebuild
+++ b/app-crypt/rhash/rhash-1.3.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="debug nls openssl static-libs"
 
 RDEPEND="openssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )"
diff --git a/app-crypt/tpm-emulator/Manifest b/app-crypt/tpm-emulator/Manifest
index b7ba90461811..1378169f953c 100644
--- a/app-crypt/tpm-emulator/Manifest
+++ b/app-crypt/tpm-emulator/Manifest
@@ -1,7 +1,7 @@
 AUX tpm-emulator.confd-0.7.4 34 SHA256 3af4a1b3f83919225c4a66f3de3159bed4e8eec4d55e9da848018c5ea66541ee SHA512 61b5145d3fa5b778ba09e66a25ea183165fafbdafe54aa77d171aed2a87f6b5febc918d33603a9bf58320e9ff3f79e3ec58d03d4674562d31c1c90b942faf504 WHIRLPOOL e95e8e0326f2c64695b63ba8242bf0ff9cdf256411b05b9aff9553b5bb69266d5a8bc1aef0cca701502ad94852cec254dfa0e74fdf546952f13afdabd9cc3598
 AUX tpm-emulator.initd-0.7.4 1100 SHA256 db1036e23b953ce7568eec3fe0ad0842d102429c06c87655065a51d6924b0cf4 SHA512 5fab6f4c9b7057fa1bf23b179747d125ec77729a1a69b762735c429824ce6dfee3033012b027a44e5c731ec86a4e78b8b64c44d27b207867a26a9663382a84f9 WHIRLPOOL 25b5c8fc5689dc5625149e34fec2b9e8b0b503bbf31d2360f9a033f854b23b86858114dbd0262d687bc538d9878651307c2cf0d2e99eb9878e3eb28c1c4515ba
 DIST tpm_emulator-0.7.4.tar.gz 214145 SHA256 4e48ea0d83dd9441cc1af04ab18cd6c961b9fa54d5cbf2c2feee038988dea459 SHA512 4928b5b82f57645be9408362706ff2c4d9baa635b21b0d41b1c82930e8c60a759b1ea4fa74d7e6c7cae1b7692d006aa5cb72df0c3b88bf049779aa2b566f9d35 WHIRLPOOL c75d49e834f8df6c810d7cb7ca3553e742fde0fd6050af7f7aeda8bbdf652084dda6600719eb0b816e1d51bbc5d9f0e119ea40ce3e59af05fd8d55971056fd6f
-EBUILD tpm-emulator-0.7.4-r1.ebuild 1645 SHA256 feac767d59c90a46c69ad9cc5d17dee6b5112ef7c611854d9c581fa407e67b58 SHA512 3de1ecea2853ebc08e6d1f39f998c267348c3f8f5bdf1df10892bb1341e57dbc35e5df2ba7eb65781998dca0428ca912c4744a0e05d1045755ad94b80c672e3a WHIRLPOOL f54eb925f8198ae6c4bc1e8208aa95a2fa9faf6811d51ab972b5f14e9b5f9cae4683f7199d02229a87d9ce680b6db0d13e3ef8d0c97ba37f1057505cc2a0f967
+EBUILD tpm-emulator-0.7.4-r1.ebuild 1668 SHA256 dea25c9dddabd7f87aece320809d552c3fccec059a55fc0a7efa4bb1f888d2e9 SHA512 d35b538d777a826a7d9e329edb1b69ca3974205a2d71aacec3138575ff0a693d92119fca21b15de2baf11dff8eaa2885a0917f31ac3d99f5623dd3ad06d87932 WHIRLPOOL 4d9fa7bbff0236cee544f4989e8f6905ecc15639b3535d7f306dac6f45efaa5d0ff9eec620e8700651bb73aa8ff25f4c6a07c041936b7032d1a37c7557255e98
 MISC ChangeLog 3387 SHA256 f55e1133580bf004cfe86cdd6497dd73f9e4da8376f4f153f800836595d19e39 SHA512 f5282dd2eae01c78af9221eb8c04e4b66a9b5ca8e2a9f675354a8bfb0aeff852c6c589eb3710bee63ae7ade9601c6273ef1658408e69ff75d0808160e47d318a WHIRLPOOL 5a2ab0aeb39d795129ab9244babe18c93f3c013871110406bc60f1e4f9a078c0c31b53ba46d0c2f0c3ff45a85a7a6625cb7014db484da39bdbb8da74e8863839
 MISC ChangeLog-2015 4068 SHA256 cf829802bcc9ccc92c8962e33f031b5a73ea11e79d4bd4df8088db6bbc1b3101 SHA512 bbf9dd6c4bdbbb0a0dec33a11bbfebd995e8d50b78126d0c9281e856d41316b7593c5b4080319d50e1e923e3c7a01488f4b29cfff81187290870a9bd6ff77e3b WHIRLPOOL b53340261f9e958ff00ebfcdf0f6bd854b8dada9d4d4ff5ce62616fe0b5e15211fc771d7b569154da4d8f4659229cffc5bf6a7f72bb2b3551777ce4375050c63
 MISC metadata.xml 322 SHA256 cf1287a6ed50b56fe582bdf43aa900fc5c4d4cf6c14d5ff97d04c7012ed9370a SHA512 59ca2140630f6c408c51176a30ad8357ecaf8c1a3b37b495176b25cf2b1cb259882dded5072440cfbfe2d16741520a0b30b41384db89c794ec183b318419b578 WHIRLPOOL 7feeeddeadeaa17e666f1a304709b12ea88edbfc603f706eba71776e935b788e3d8462297166ff4bdab7079359be9448f8a4200cb01722845cfea1031d7e0156
diff --git a/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild b/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild
index 2e719e5b28ba..8f55dd6e71a8 100644
--- a/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild
+++ b/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+MODULES_OPTIONAL_USE="modules"
 inherit user linux-mod cmake-utils udev
 
 MY_P=${P/-/_}
@@ -13,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="libressl ssl modules"
+IUSE="libressl ssl"
 RDEPEND="ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
diff --git a/app-crypt/yubikey-manager-qt/Manifest b/app-crypt/yubikey-manager-qt/Manifest
index f386c1f24095..0816590f570b 100644
--- a/app-crypt/yubikey-manager-qt/Manifest
+++ b/app-crypt/yubikey-manager-qt/Manifest
@@ -1,3 +1,5 @@
 DIST yubikey-manager-qt-0.3.1.tar.gz 175215 SHA256 e41bcda5aae5e0f92158f591e8e584d25c9b4872475f8e4253c7a7671e94c859 SHA512 d47a6b75b50c2dca073ab74ea2d7c7c46ff86ec338f52d49afd39796cc1f3de7ddd74664b5f60f9013393b9ca24621da63d218eb3c2cb3017fefed2370b269d1 WHIRLPOOL 1d6de66f0450d72e29b9e9a2a959f4ca8ed7c8614b976115ecfb433e8b5f1795d12e6d907f73152b6bef3de6510cbcf236b2386b18a3cba2094269f78522196a
+DIST yubikey-manager-qt-0.3.2.tar.gz 175662 SHA256 5dd780c75e17a141ab882c8c10b04dcfcc61dae7e574c1404a606b05b047cae1 SHA512 5ae0b802f041a37a67bef6f7c8b5224fe47d145bcb3bef8c42e300048e849bbcf333de6d15a9a671ced21741d412af9419c08fd3b018276ce997b3cdd5ba55f5 WHIRLPOOL 5284a3e2f1e64d3b793b82d1064feab7325de12c0b8b6b5328f66440668d7b2628a5dc0df2d0b3b5e3a72a6f4aca511777cd6e2ae9fb3f337cc908cb1a2f1586
 EBUILD yubikey-manager-qt-0.3.1.ebuild 1043 SHA256 3244211d12397be8fe7ac51c50de02f9fc43dfdb664eff6f5c6ebf351e397602 SHA512 74a284e243a833f9e8f7eee39f9ec82004f4fbc9059fdc306b6e5b173904931437199cc982221c257fe79567db6002b03c26c3a1eab88bd8deca62c13986e788 WHIRLPOOL 35d74d60c28a240c49fe7ad6775a9d0a4437a48db690f8b5a3509cdbec812c112b79445d2b742cdd3810501ac45cda3a14b2cf99bd99d4c817917b8589bb8c12
+EBUILD yubikey-manager-qt-0.3.2.ebuild 1168 SHA256 53deb7ff9ddb036123a9b4c6325c489dad5f63dc4c16ff055744b7f365470cec SHA512 fcc73dae2936bdc038d43ac092c23bb2f43d956d779b87a97d41bd38b61b68c9b85bc6be40c2210b6fcbb8eb5d93be73ff50dabbf23d2aacdcf1b98144e5e002 WHIRLPOOL 6269ed15d20b838343f9f922d3eb0fb9e1aa72804f67ed5b8c36bb4ef2e447bfbd2a9196cbdfe9cbdf2e6fcc7b9bfe61d63fc55189b9dc4b65b207c5497e1967
 MISC metadata.xml 245 SHA256 6fedd876236c2f1fe2687e73628381650ebecef9734f88f6d483bec5bf475a7f SHA512 ce14e948c06d19eefb8504b77746e191099fd4d66083ad01ac62d874029b397af4edc5940312dac09c9ed18ccbcd98909b93fc0bc463c15db97bf68d13c9fec4 WHIRLPOOL 4957affde63b54e118270c40ce12683872777b41ec1a798f7b03807a99917148279d392f71cbcf95ec4e5d586ee5fc0400aea77d9e46083873a441a4907ba13d
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.3.2.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.3.2.ebuild
new file mode 100644
index 000000000000..74f07962a8de
--- /dev/null
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.3.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit eutils qmake-utils python-single-r1 vcs-snapshot
+
+DESCRIPTION="Cross-platform application for configuring any YubiKey over all USB transports"
+HOMEPAGE="https://developers.yubico.com/yubikey-manager-qt https://github.com/Yubico/yubikey-manager-qt"
+SRC_URI="https://github.com/Yubico/yubikey-manager-qt/archive/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=app-crypt/yubikey-manager-0.4[${PYTHON_USEDEP}]
+	dev-python/pyotherside[${PYTHON_USEDEP}]
+	dev-qt/qtsingleapplication[qt5]
+	dev-qt/qtdeclarative:5
+	dev-qt/qtquickcontrols:5[widgets]
+	dev-qt/qtwidgets:5"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	rm -rf vendor ykman-gui/vendor || die
+	sed -i -e "s/ykman-cli//" ${PN}.pro || die
+	sed -i -e "/qtsingleapplication.pri/d" -e "/CONFIG += c++11/a CONFIG += qtsingleapplication" -i ykman-gui/ykman-gui.pro || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+	domenu resources/ykman-gui.desktop
+	doicon -s 128 resources/icons/ykman.png
+}
diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index 498a27dc476f..b590bf146e83 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -1,5 +1,7 @@
 DIST yubikey-manager-0.3.3.tar.gz 51223 SHA256 5447c026739d33455ac8ae13ccaef2df231a28dda75ffbd62c91a7c5ce5d30b5 SHA512 ced7acb848747399d4b9f0214044dd40c38b332c2f8557485d61f2f0cb857a9f47d12df59ea6a7bded1076b5d539bc171d1dbc9fd8899699c0cb3cb65b0800d7 WHIRLPOOL f68c896cb10b72271a6f42e34baf3671bfcd9ccd69c688db5fd06fd6672d1cbd12271ccc563f400d922eaf842bd7e5d73af9cac0f725927f7efe4ac520d3790b
 DIST yubikey-manager-0.4.5.tar.gz 55315 SHA256 d91f5b549b23bfc6c04d9446b9ced6c6f80aac702b26a1fa4d1b8df5eb9a36d8 SHA512 232ce7557aaab3c8a27dfa2ceaab0491ac1f97d4332b25e7f77c968da48c9303627defd0246b1e97c7ed766e6a667ac996ac0430cfeb4e7310a0cfc4a633d1b2 WHIRLPOOL 15be6470b114a70d6c960b2518f94799b05e85be5a4c32d23f3e9a8eb20be681f66aed7aee65ea138d2de495e4215730b1ec7dcf99e4328561f205bf71fb69a6
+DIST yubikey-manager-0.4.6.tar.gz 55065 SHA256 6f9aae731e1c71ea65bea48911aa33a29b284afbabe9430f84e07a27cfcfcbeb SHA512 fd52cb346e95b3184fd8e4bbb8e227c75780d7fcf5057712c6def866ea951700f8cdd1286ff857e32754d539dfc7093d809fc585191b05c57f5f983d5b288e7e WHIRLPOOL 1d9178c82b3ffa0622ce57ae372f966a6f729489518d3d85a19062c5dfe82700d21b60992665f497eac623a91c26d913aa813e2d990f93e563b565fe925587c0
 EBUILD yubikey-manager-0.3.3.ebuild 736 SHA256 177041478e894a931a82bdb0fbbd1f08b1f5f7ed384b48e03901a78b7d26aa54 SHA512 16b96e49659f6a5a4b9b3e90a61896de9d6cbcf991e2d9a44df81c48be8f7936f5de7aec380538cbc8ed034b54617928b456b53a2c322631dda476c6e6fe2d8f WHIRLPOOL d849bca0f1d79d58d1fa7f66d977a4e50625b020c49f87ba8022a40ba63b5b980d14700a2631a41f4d2c879b458a3fbc592e7a2f826a6b9729f1a02ea5bff414
 EBUILD yubikey-manager-0.4.5.ebuild 858 SHA256 0ee32b8f039b3ceaf111bc5e341b95a5da2a32ddbbabacc05000e55370f91a21 SHA512 25ace32bacc3ea4dafcc330222cd21b327e859ce138a4a2be4f07a322860dbf503ff00f9b32cd282ff8a97ade6aac59b4b9230ec23cf78b583bec490a614ed79 WHIRLPOOL 42d88df2ab156100d10c345b41aab277e60382d685adf8e1362af166c62a55a5688cef33b709589540c9c6f324d68a5ec25c5ba87b368f44c5129060f249cf22
+EBUILD yubikey-manager-0.4.6.ebuild 858 SHA256 0ee32b8f039b3ceaf111bc5e341b95a5da2a32ddbbabacc05000e55370f91a21 SHA512 25ace32bacc3ea4dafcc330222cd21b327e859ce138a4a2be4f07a322860dbf503ff00f9b32cd282ff8a97ade6aac59b4b9230ec23cf78b583bec490a614ed79 WHIRLPOOL 42d88df2ab156100d10c345b41aab277e60382d685adf8e1362af166c62a55a5688cef33b709589540c9c6f324d68a5ec25c5ba87b368f44c5129060f249cf22
 MISC metadata.xml 466 SHA256 66cba5a1c03e19490dd5cb31c9c66afcf1ba81d808e9f8cd7dd78cde93af2a32 SHA512 6355c94235c5a7a9dbe37fb954d7de5807bbd48d62921f819da7ac1c56f0214820cbf74b2f91311573f8a1726b05960d944b536fbf0e0f27fe49a5aa0a827e1b WHIRLPOOL 38ddba3bc57a218731b1269a6bec87f4171de5a4c25db52aa3b58f1f03833b1f64382e73cc8bdae61987c40f1c56cc9fe96f19547b6b44528eea67de7ea17d5d
diff --git a/app-crypt/yubikey-manager/yubikey-manager-0.4.6.ebuild b/app-crypt/yubikey-manager/yubikey-manager-0.4.6.ebuild
new file mode 100644
index 000000000000..d5ad29c57862
--- /dev/null
+++ b/app-crypt/yubikey-manager/yubikey-manager-0.4.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+inherit distutils-r1
+
+DESCRIPTION="Python library and command line tool for configuring a YubiKey"
+HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test" # Testing requires RSA keys which are not present in the tarball
+
+RDEPEND="
+	app-crypt/libu2f-host
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/pyscard[${PYTHON_USEDEP}]
+	dev-python/pyusb[${PYTHON_USEDEP}]
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+	sys-auth/ykpers
+"
diff --git a/app-dicts/opendict/Manifest b/app-dicts/opendict/Manifest
index 341e98348763..94a8f8bbdbb2 100644
--- a/app-dicts/opendict/Manifest
+++ b/app-dicts/opendict/Manifest
@@ -2,7 +2,7 @@ AUX opendict-0.6.3-pyxml.patch 4271 SHA256 57133ff36d363efbd999f19e66fd9ce85e005
 DIST opendict-0.6.3.tar.gz 132515 SHA256 dad7723512768aeae65fead0f06a3c973b161a86658b94a66c4945beb12f45dc SHA512 687afba45f9fd271acee9f72fd3971fbc624588fe0f4194ad4499e2e64259a59c516854a7b0b1c02b3e214bf6e77e52b5b0713430e3cd5e0127c5b3c8fc02f5c WHIRLPOOL 06a48141bb1da7557d616deda3c4c18500171d4c158cb5f5cc83ca9f1f8037584ade85a742c88a4b6ab667bd6586492fed075e6a4e69fa51c8e37ece75880a62
 DIST opendict-0.6.7.tar.gz 169580 SHA256 d376c8a81e5747e40775214177df9d0f04d6441acaea7435e0cb7e770b6c460f SHA512 ef97ec84591bda4d8d4746fa4532de109cf03d89dfd5aa20e1775224c687b503759c020b2286e5cedd395ebce5db3b2a10495adc31fcc31dbd4fddfca6fee1f8 WHIRLPOOL 215a3f9ec80bf07c662f5cc35f1e698cfabbb74edd8c641681b562bc6a4a47b4b2fe1e889288abb8e5f213441cd501cf9c6d2ad4581501a5c90bb0048623c3d7
 EBUILD opendict-0.6.3-r1.ebuild 2146 SHA256 c2c2ff7333e8e9b3f8840b0f4c07be9cd6078913b3484e48dc8902669e00eeca SHA512 7940c30bf7fb0e12e325b38f48eb17b106a42789d2ccda9d30d269767a1529cdae7a1b49c6845f953bcd0b935174f4e0c304d891103990c07ca16fbda6afbe2f WHIRLPOOL e600476af6b8ab8cef05b8145419f57df4899654c5a0e345eb87910a08a5820aa1137491d37652b1438225fb6d7e43057f5125cae0df753b17d659fcdbc85fc9
-EBUILD opendict-0.6.7.ebuild 2051 SHA256 be8e18d0fbca17b5147ca9af655f4b8c8b9364364e664af91c49d48132172e4a SHA512 c7c41202679ae237334fd3a7a377d0ffd740fd4d6f29988947758710b65eee692919fd02bca7457b99659d736ffea8e1ac4d8cb5d8e538cbd8e5a0ed7cdf8a88 WHIRLPOOL b392b2d38adc11349c481746615a0126614b53f8f6a9ea37821206bc070d4f4136ed65ba25db7acf94fb817a7f257ffe8cbecf3e9b01ceec8980ad81f5d8dd4b
+EBUILD opendict-0.6.7.ebuild 2049 SHA256 858400d0e78c130226435b75a29d18a480cd80c39d0b2509de4e01f455ebf332 SHA512 30cd657a497536afa6c95de547ea48c50d3dd2e8e6af77b35d018fbc9522f43c6b5474f7967c829c07e635b38d99dc5501ac2f15d464cc201d557ed67bcea1ea WHIRLPOOL d915b36e62996d4f237c53fe8a47a65822986db84699a310bc79d91f99c25131a844dca83ca42a8ed624690ca85af613e324f2272a4e23e3960e6282aef9ffef
 MISC ChangeLog 3018 SHA256 b26a6cbcded8c46dd7a7fa55b542bd9b0d0b823a4b8c4f51404f6869701d9c39 SHA512 9b26565a1210b046af002b3b68526a82a06b62a6cd8a95b864dd13beb316fba65663b03e6168cc53f670ac2043a6f75554c498363248b55a61d25efea571672d WHIRLPOOL 1f9ef48d0b0b7dd344b50ef9b42c26ea671f0f3d817c93f7a878bbabb7157cfbaff9b7e21ba14a36e5d538208bc0d4b581215a931d5c4711a9567c1df304a3da
 MISC ChangeLog-2015 4318 SHA256 321c9d6eff448e6dd61cb83eaf4ff94a2ce5065b4db2e189435688009bb1f0d3 SHA512 a519614479b15133964eb1ec59349b4a7cf86bd7d2a3fa2b4344e463bebf56e02c946acbe4c2926f13f49c11468a5b095cb2cbc8c712056a97de8080bd09d8e7 WHIRLPOOL 770641c7bd233032fd26bcb5c0aaa9e1b3eb63552bc2863d6ffdfcd4efc655600c4fd20f7f27363be5fe70eabad9cfab44a576a91cc65c9ba2a64d379e91377c
 MISC metadata.xml 339 SHA256 f76f1bdabe350ce2a9ab82c40a74d2353d2a5a12091bfc7363e856dc3dca5351 SHA512 49affe3fdde01f9c9726abbf3088e9332fd2aad7c47cb7591eee9d23dd18caf4877c2858e457b236bfec2318baa5e3cbf8184ae431825d6d28a01557a58daf98 WHIRLPOOL 1fd51147caa331f1c2b2a52e6df4212826e187c3ff5b7ad8e3c0046088d7908bc70e88dba33c2c5ba62503ef0484155a27a47d9658f639403b8791a66d7c7466
diff --git a/app-dicts/opendict/opendict-0.6.7.ebuild b/app-dicts/opendict/opendict-0.6.7.ebuild
index 892eea3d06a2..99c27f354f2b 100644
--- a/app-dicts/opendict/opendict-0.6.7.ebuild
+++ b/app-dicts/opendict/opendict-0.6.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/opendict/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-editors/atom/Manifest b/app-editors/atom/Manifest
index c27bf64cf8fa..6cabe56b51db 100644
--- a/app-editors/atom/Manifest
+++ b/app-editors/atom/Manifest
@@ -2,7 +2,6 @@ AUX apm-python.patch 388 SHA256 c43a64592954b476cd38fdc3ab24a1e5b7a76993be5b3abd
 AUX atom-1.13-apm-path.patch 549 SHA256 44550739a0ded936ab4af2d38d237602b6687c47d4e5c234e2afcc96e422f852 SHA512 050072d0a9db19c44a7a4c3fdbbe2aa5e558ea133176815c5ef796b1d532b1691dc1b3cf9ca5abc119653de380d3636d963da37bb8652ed560b052c1802a5a44 WHIRLPOOL b905517388e4208cc2d4f425cbb31a5977f511d7869d0c5c1f6dec7e2ee101908d125e00bbbab96e2dc1a0720cd24648182f3a9aa471181e5fc40d513bb80d82
 AUX atom-apm-path-r1.patch 522 SHA256 c4c9c6be2c00ff0d70471814b051f2766a46a856903a7c1eace14655f6c67327 SHA512 48a1d40cded6c4c2875c03867d98819e27da1af6f9ad171836598d3f7a687eaf47a1621397f186c8ebc122db77b24432b68902445d5ff9e641158d5096fa7892 WHIRLPOOL 67379ec8aadb33c53cdb28b70dfcc68ad044434c129dc13fc08efee12cff7d520e0714cf9f05e4a3bd706e5abd22c5a1bdd1eb596ad98c730c4b2a155e5e521d
 AUX atom-apm-path-r2.patch 537 SHA256 ce3f4ba3d203e0440ea95241527f58e1f7fe54061b2a233b7ecbc311090d7f11 SHA512 1172c72c94d25538d63e04202f273b87f794431847d9b1138d4eb43d4578d47ca1ecf2636170a8648eef2afaf01a35114752ebecad2b9cd8c7d4ae04dcbc741d WHIRLPOOL dc41d9d0b404d88a342f179cd16a85854d52c67eb94ed6153a02c6aa463e6c6f2e5a005642dcd136de6b088851c8742355c7e1cdd5f9036f71b72af17854c396
-AUX atom-apm-path.patch 441 SHA256 d8d8f973ede9e5d2d543969ccdf51d5195a8f05084ba802130d963c4ad155d9e SHA512 6cb559afa18586ed2dc00cf296e835e9611cbf0c29965b32132532282a47c94baa5e6066b1c6cfe4ad89fd1eb98abf2e4dc2439bfd7fdd3aed0836f411666484 WHIRLPOOL 7948f35f529cb17bc6193b5f72d534caeb36fa76ee2a3f93eb6b703ea1eb38443df75a797cb2d9cfca69de6aac5969a9a9afc5495f19cadf66477c4bc17665a4
 AUX atom-fix-app-restart-r1.patch 402 SHA256 b5054435a7657ceeb02e57fc1c1db35b69532091cc37121d44b5cf385ea53016 SHA512 6218175e2513f7afdbd6ed4875037929e375fdfd84683f84430e387bb8302aaf472845d74d46f75a79409b867a79b29f06ecfaea4a95ff48d229d080dc74f68f WHIRLPOOL 5604bf1bd9abd695098638c73752acd873da14f09d2d3a170649aa7a47afdd06613de191157048767a4af6c62348d28cf086d092e0c0cdef4d2511eb99125b0c
 AUX atom-fix-app-restart.patch 422 SHA256 fa12269160e78f293f8b74997990853e84444299e0bc33bd0b816ab33669b758 SHA512 2222c7aaeec01394286adc34337ab7f38e29e3b956e4c85dafe97654c85c0d68bb8bcf8b0e198faf2ed6329eb8236f7d16359888a439fd0c110f31b3a81cb7e9 WHIRLPOOL b4394b3ed1ed8b8e338cc0722ab5132174adf80dc6f0f4d67bc29376842763258e8936704d6954fc3e828caa6062689489592f392745de9ed5bcaace1f798ae2
 AUX atom-license-path-r1.patch 719 SHA256 6417fff5f48b9cb164e072d4052b8863211179a68f93fe08a04eacee3414f66b SHA512 2909f47f37d065afe5ef4fd86b8b1c01a1a4d4f9f03e7c762cfdb0f97b53ebec2eaa803b34273bf3401c5a0e1faf03ef10c3caf6f96000d1786883cd08d7b964 WHIRLPOOL f88d1419d125d3cd121ec28e04f1ba62d7557c2ecdfa5e3f90519f04ca349e31b486bde98c291a2a048072b1a3ef67631e14004bf0a854e832675d67f9d1a677
diff --git a/app-editors/atom/files/atom-apm-path.patch b/app-editors/atom/files/atom-apm-path.patch
deleted file mode 100644
index 7ee7cdb4a107..000000000000
--- a/app-editors/atom/files/atom-apm-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/build/app/src/config-schema.js
-+++ b/build/app/src/config-schema.js
-@@ -9,6 +9,11 @@
-     core: {
-       type: 'object',
-       properties: {
-+        apmPath: {
-+          type: 'string',
-+          "default": '/usr/bin/apm{{ATOM_SUFFIX}}',
-+          description: 'Path to apm executable.'
-+        },
-         ignoredNames: {
-           type: 'array',
-           "default": [".git", ".hg", ".svn", ".DS_Store", "._*", "Thumbs.db"],
diff --git a/app-editors/editra/Manifest b/app-editors/editra/Manifest
index 5909446bd8f3..eb87b8fec2d3 100644
--- a/app-editors/editra/Manifest
+++ b/app-editors/editra/Manifest
@@ -1,7 +1,7 @@
 AUX editra-0.7.20-wx30.patch 2264 SHA256 ee850c1ff4151313b5881b26dcf8feefd978dd04498b4670904680463f7e79f5 SHA512 c0befbe2fb2eead2c4fc066767b48938b0f2b17949dc42fd98128d63556268a12b73fb49f22a8e9abf524e4450bda2b2b4e0b4953bc7f3c7c32b6ba1e7eefe63 WHIRLPOOL 08b108cb07dba01c6ea12a764dcc64e9b44ba5281d89a8634b3896694c28b7db5f10dbe3302349539a0b3c50b58f361c42cdedbaf2c1f779e4974fb38da8ef31
 DIST Editra-0.7.20.tar.gz 4072243 SHA256 ed515bca58d87d9a2b3085f322a9fe7c6d1407a3b05db1434f80ea8f7e42ccc0 SHA512 e568ce2a5f04300c33223bf7a0e6fbc52d0a51c3472afb9b613fe21cfbeba0b9b453d87837e52c7c48050fc266ff5ff194a42f797053f21f0a25cd5c4579febe WHIRLPOOL ecfbc9610ba707aaad4995f9832e0f2bf2d79e56a5fadb27ae6c5b671c0f69a166c3d2d37163141789629a30fe56fbeb59c05c0203ae9201e2447ea479f52c55
 EBUILD editra-0.7.20-r1.ebuild 1229 SHA256 e089a9c6f2406de4a40c09839bcfe4a01fd71d1406da8e890511ce9856c1b018 SHA512 0d18d21b90528220f2d6dd1ca8cd61ed8c922f1a39307eec94511f1c7e634ec02a26bf1455fcb7c7361d355aaa3dff75d9bb86ecffe3bd82d9fbc362e2f4429e WHIRLPOOL 989606aa054c30a95cde14890f2501664cdf5fcd62eac56bbd50bfe0c789cfb537731aaef221f30538a6222b8fac7f0723ae920162a89c3146041821c5b64f24
-EBUILD editra-0.7.20-r2.ebuild 1263 SHA256 5a4fc633fa98c69651b37e013fe3798b810c833454277c7dad2d6b6c3690a5fc SHA512 5ed7f65ac2fad154890b6f3fc7a4d080eefc6b5ce8ea2c87e6f5a1995c38c80bed31d19a2d7423931acd13a3592db6f09abe68b14fdc05ba285fc7760a1094b6 WHIRLPOOL 11e3a7a7c360abada1b71eae3b9cdefea8a884c2f76ab3aa5d4a9bd2d55eaee8d36f2bd405f76ccb57da37161f09a6ebe09a5ba11847c94d615dc5d330a1697c
+EBUILD editra-0.7.20-r2.ebuild 1261 SHA256 644531f120c0bb9ef784a4c33abfb42a8ced86c51e412f83ca221b04697c7438 SHA512 629e25267f89ce9f9688ca1660095f28ab92895beae58a01736565dffaa2c23f31c78793ac3e8fe110b43287c642f339f5d5c7f21653a5777d6de34d5edb2612 WHIRLPOOL 576169dbecf0adb51d1c1c3eba293e31e92380b15d1de8b81727d9dc7a35bb77152df29da14f36804757de1c4858ea77b855a610d405de5a27564b019b28c85b
 MISC ChangeLog 2954 SHA256 f3401053f2dbbfe4125c21bcbe4765891077ff462d956f5aa4417493ca844bad SHA512 29e4ea1df313ed66fc3d271e9a316109d34916a8708157bf3e4ee2342a9cd52938d3f92443730095c802ddb961b796c8f08bc7eee57b64d9650abf6c9e2fbf1e WHIRLPOOL 4c2769921db652d271c6277d4d4b81c40bd823209d470741bf12aecddba5ada8762860d97eb1abaf56ba54f32a130f809be8c8931a905b1a42ecd60200b97578
 MISC ChangeLog-2015 6596 SHA256 45499c3b42ab295cc3dbdfbba40bb87fcc6a20a3ac6e024fd779b14de1d966a9 SHA512 d74ba28b915a1071fcae4ba96c029cd308bbc1908f5ded4ed56c4b72d56e3c15aaa513bf756255398ec79e99f7a1c279ecbf7ad0dc867ac799c24b14cc2a60ab WHIRLPOOL e0f95bae0477624c00a55848f575d224503d1b6ecf759a094e563d0fc7ec03e75b666823b18c7dbff477837b582568280f4a038d037aa90cd5e1429fb5e21756
 MISC metadata.xml 261 SHA256 c44cf79e2521fb9e30d1fe5dc005186407fc3a6c45988dd67812566f3f2cdc97 SHA512 f7ad013dd5f01aaedd4528f98ba9a4b4b44d353502df3438a8b513dd2ee7af1e24328c34187e156370efb550c401b81175cccc7a7643ea6a5a83766d68a05221 WHIRLPOOL e52deeefe3ba231f2cad86e533c9584a6f760ebee81e1ae2eed0d5fbd59c8c8e296a6e4bd603a849afd1414ae81b684b902d84a63a1db08d274f7d6f6ac3bc4d
diff --git a/app-editors/editra/editra-0.7.20-r2.ebuild b/app-editors/editra/editra-0.7.20-r2.ebuild
index 4bd7d9c6f228..a105e915cbef 100644
--- a/app-editors/editra/editra-0.7.20-r2.ebuild
+++ b/app-editors/editra/editra-0.7.20-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://editra.org/uploads/src/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="wxWinLL-3.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="spell"
 
 DEPEND="
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 6b1518549278..7a9b992deb3b 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,3 +1,5 @@
+DIST emacs-26.0.90.tar.xz 43908428 SHA256 efb27124cb8f3eeba9472f4f5774b5d9bf4f87fd4d6023aae78469fb5667cf2c SHA512 c263d1d1a12d8b21cc43ddcb46a28ce3a54d0ef09e240518f19bfdabf4c4ceebc3c2d1521aae9808cafdd3e731c93dd22b4f1e7e619e38076aa4ffdbaadea93b WHIRLPOOL 383b4e2fb73a9cfc825859a2f3b791dfbc0ef186fe5c25126e1d562aff27900f5bad452725f62dedb3be5492b365dff80e30d64a3cff709e305697662f252ada
+EBUILD emacs-vcs-26.0.90.ebuild 12493 SHA256 13ce2acce50c51d192e4ce55e6986c55b5229df9976df309b34ddf0bc3ec41fb SHA512 a1bf9e7d9491a54132e56430fc2bd7e01c04bb0bc9377ad6976e8436343e2232874843ea1722cd49a91a6380cb004509b17e12452be5b2ef74d93daf6cafd9f6 WHIRLPOOL 7551b343f7e04f89fe3ed7a864a427706bef772fb1900b1f23dd1ec2d66dd146e6712346f46e856d72b96e60a652f8391f23ce60f7f880deaaa2cf02ef714d10
 EBUILD emacs-vcs-26.0.9999-r1.ebuild 12493 SHA256 13ce2acce50c51d192e4ce55e6986c55b5229df9976df309b34ddf0bc3ec41fb SHA512 a1bf9e7d9491a54132e56430fc2bd7e01c04bb0bc9377ad6976e8436343e2232874843ea1722cd49a91a6380cb004509b17e12452be5b2ef74d93daf6cafd9f6 WHIRLPOOL 7551b343f7e04f89fe3ed7a864a427706bef772fb1900b1f23dd1ec2d66dd146e6712346f46e856d72b96e60a652f8391f23ce60f7f880deaaa2cf02ef714d10
 EBUILD emacs-vcs-27.0.9999.ebuild 12491 SHA256 7c5af3fec50a919b8b54e9da7b384a5dc028aa52ad8322c6c105a92c54adfea3 SHA512 e17454202752433ea2a2e5badcea478ea6a735ba5b7f7d836ae1ce0d91a6b43eb55c15adf98040ffe88e48a09f328424d5268b4bc2a321d519ed0122e7e74919 WHIRLPOOL 0ae026c8a8e723fb025de4ad44cd69791ffb23f9b04f91fbc2e4738da096041c762a75777d263122fcd74255761ce5b4b2d6141f260f44fe5b4cdd5ea618effd
 MISC ChangeLog 10414 SHA256 32cd8f329ea3c934af07ac926bee0c3aa9ecf8ae243feab908a313d5f97dc350 SHA512 0ee17116099eb0c506ec730f1e8564364065fbbac5970f551b7f6339b9f153aa4e293bd99fe952ac8d25a5045b245b11723b206f9594cfccdf46658589df71e3 WHIRLPOOL 5c52e92cf6e1e4cab924922ade9ec2809b4907d541078055d9dd53c2a188c7482d4198ca14f21dccbe022304757228b3cc563dd06171d6d93dffe1490612a637
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild
new file mode 100644
index 000000000000..3f52621bd902
--- /dev/null
+++ b/app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild
@@ -0,0 +1,386 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1
+
+if [[ ${PV##*.} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
+	EGIT_BRANCH="emacs-26"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
+	S="${EGIT_CHECKOUT_DIR}"
+else
+	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
+		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	# FULL_VERSION keeps the full version number, which is needed in
+	# order to determine some path information correctly for copy/move
+	# operations later on
+	FULL_VERSION="${PV%%_*}"
+	S="${WORKDIR}/emacs-${FULL_VERSION}"
+	[[ ${FULL_VERSION} != ${PV} ]] && S="${WORKDIR}/emacs"
+fi
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+SLOT="26"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib mailutils motif pax_kernel png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
+REQUIRED_USE="?? ( aqua X )"
+
+RDEPEND="sys-libs/ncurses:0=
+	>=app-eselect/eselect-emacs-1.16
+	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	gpm? ( sys-libs/gpm )
+	hesiod? ( net-dns/hesiod )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	kerberos? ( virtual/krb5 )
+	libxml2? ( >=dev-libs/libxml2-2.2.0 )
+	mailutils? ( net-mail/mailutils[clients] )
+	!mailutils? ( net-libs/liblockfile )
+	selinux? ( sys-libs/libselinux )
+	ssl? ( net-libs/gnutls:0= )
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	X? (
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-misc/xbitmaps
+		gconf? ( >=gnome-base/gconf-2.26.2 )
+		gsettings? ( >=dev-libs/glib-2.28.6 )
+		gif? ( media-libs/giflib:0= )
+		jpeg? ( virtual/jpeg:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:0 )
+		xpm? ( x11-libs/libXpm )
+		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+		xft? (
+			media-libs/fontconfig
+			media-libs/freetype
+			x11-libs/libXft
+			cairo? ( >=x11-libs/cairo-1.12.18 )
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? (
+			xwidgets? (
+				x11-libs/gtk+:3
+				net-libs/webkit-gtk:4=
+			)
+			!xwidgets? (
+				gtk3? ( x11-libs/gtk+:3 )
+				!gtk3? ( x11-libs/gtk+:2 )
+			)
+		)
+		!gtk? (
+			motif? ( >=x11-libs/motif-2.3:0 )
+			!motif? (
+				Xaw3d? ( x11-libs/libXaw3d )
+				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
+			)
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )
+	pax_kernel? ( sys-apps/attr )"
+
+if [[ ${PV##*.} = 9999 ]]; then
+	DEPEND="${DEPEND}
+	sys-apps/texinfo"
+fi
+
+EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
+SITEFILE="20${PN}-${SLOT}-gentoo.el"
+
+src_prepare() {
+	if [[ ${PV##*.} = 9999 ]]; then
+		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
+			configure.ac)
+		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
+		einfo "Emacs branch: ${EGIT_BRANCH}"
+		einfo "Commit: ${EGIT_VERSION}"
+		einfo "Emacs version number: ${FULL_VERSION}"
+		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+			|| die "Upstream version number changed to ${FULL_VERSION}"
+	fi
+
+	eapply_user
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
+		|| die "unable to sed ctags.1"
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	strip-flags
+	filter-flags -pie					#526948
+
+	if use sh; then
+		replace-flags "-O[1-9]" -O0		#262359
+	elif use ia64; then
+		replace-flags "-O[2-9]" -O1		#325373
+	else
+		replace-flags "-O[3-9]" -O2
+	fi
+
+	local myconf
+
+	if use alsa; then
+		use sound || ewarn \
+			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+		myconf+=" --with-sound=alsa"
+	else
+		myconf+=" --with-sound=$(usex sound oss)"
+	fi
+
+	if use X; then
+		myconf+=" --with-x --without-ns"
+		myconf+=" $(use_with gconf)"
+		myconf+=" $(use_with gsettings)"
+		myconf+=" $(use_with toolkit-scroll-bars)"
+		myconf+=" $(use_with gif)"
+		myconf+=" $(use_with jpeg)"
+		myconf+=" $(use_with png)"
+		myconf+=" $(use_with svg rsvg)"
+		myconf+=" $(use_with tiff)"
+		myconf+=" $(use_with xpm)"
+		myconf+=" $(use_with imagemagick)"
+
+		if use xft; then
+			myconf+=" --with-xft"
+			myconf+=" $(use_with cairo)"
+			myconf+=" $(use_with m17n-lib libotf)"
+			myconf+=" $(use_with m17n-lib m17n-flt)"
+		else
+			myconf+=" --without-xft"
+			myconf+=" --without-cairo"
+			myconf+=" --without-libotf --without-m17n-flt"
+			use cairo && ewarn \
+				"USE flag \"cairo\" has no effect if \"xft\" is not set."
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		local f line
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			while read line; do ewarn "${line}"; done <<-EOF
+				Your version of GTK+ will have problems with closing open
+				displays. This is no problem if you just use one display, but
+				if you use more than one and close one of them Emacs may crash.
+				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
+				If you intend to use more than one display, then it is strongly
+				recommended that you compile Emacs with the Athena/Lucid or the
+				Motif toolkit instead.
+			EOF
+			if use xwidgets; then
+				myconf+=" --with-x-toolkit=gtk3 --with-xwidgets"
+			else
+				myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
+				myconf+=" --without-xwidgets"
+			fi
+			for f in motif Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
+			done
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf+=" --with-x-toolkit=motif"
+			for f in Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"motif\" is set."
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf+=" --with-x-toolkit=no"
+		fi
+		! use gtk && use xwidgets && ewarn \
+			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
+		myconf+=" --without-x --without-ns"
+	fi
+
+	# Save version information in the Emacs binary. It will be available
+	# in variable "system-configuration-options".
+	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--without-compress-install \
+		--with-file-notification=$(usev inotify || usev gfile || echo no) \
+		--without-pop \
+		$(use_enable acl) \
+		$(use_with dbus) \
+		$(use_with dynamic-loading modules) \
+		$(use_with games gameuser ":gamestat") \
+		$(use_with gpm) \
+		$(use_with hesiod) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with libxml2 xml2) \
+		$(use_with mailutils) \
+		$(use_with selinux) \
+		$(use_with ssl gnutls) \
+		$(use_with systemd libsystemd) \
+		$(use_with threads) \
+		$(use_with wide-int) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_compile() {
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	emake
+}
+
+src_install () {
+	emake DESTDIR="${D}" NO_BIN_LINK=t install
+
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
+		|| die "moving emacs executable failed"
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
+		|| die "moving emacs man page failed"
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
+		|| die "moving info dir failed"
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
+	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
+	rm -rf "${ED}/usr/$(get_libdir)"
+	rm -rf "${ED}"/var
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+
+	if use gzip-el; then
+		# compress .el files when a corresponding .elc exists
+		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+		assert "gzip .el failed"
+	fi
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
+	X
+	;;; ${PN}-${SLOT} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share/info
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS CONTRIBUTE
+
+	if use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
+	fi
+
+	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
+		through the Emacs eselect module, which also redirects man and info
+		pages. Therefore, several Emacs versions can be installed at the
+		same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
+		strongly recommended that you use app-admin/emacs-updater to rebuild
+		all byte-compiled elisp files of the installed Emacs packages."
+	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+		machine would satisfy basic Emacs requirements under X11.
+		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+		for how to enable anti-aliased fonts."
+	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
+		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
+		it into /Applications by yourself."
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# move Info dir file to correct name
+	local infodir=/usr/share/info/${EMACS_SUFFIX} f
+	if [[ -f ${ED}${infodir}/dir.orig ]]; then
+		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
+	elif [[ -d "${ED}"${infodir} ]]; then
+		# this should not happen in EAPI 4
+		ewarn "Regenerating Info directory index in ${infodir} ..."
+		rm -f "${ED}"${infodir}/dir{,.*}
+		for f in "${ED}"${infodir}/*; do
+			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
+				install-info --info-dir="${ED}"${infodir} "${f}" \
+					|| die "install-info failed"
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	readme.gentoo_print_elog
+
+	if use livecd; then
+		# force an update of the emacs symlink for the livecd/dvd,
+		# because some microemacs packages set it with USE=livecd
+		eselect emacs update
+	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
+		# refresh symlinks in case any installed files have changed
+		eselect emacs set ${EMACS_SUFFIX}
+	else
+		eselect emacs update ifunset
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 0c77babe19ba..6d616a830e16 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -15,8 +15,8 @@ EBUILD gvim-8.0.0386.ebuild 11569 SHA256 69e77753590eb348468c401faf7be30133a6855
 EBUILD gvim-8.0.0938.ebuild 11285 SHA256 4b694ebbd3757820bab3292265b8cd7f84d31835230e1f731252553e8238c26e SHA512 e734f25ceee65705fcae7354b6e19a80899460315eab3dba1d4258c0915d69df648ddba6a352413e62ea7aa4f552525abe613363fc244a697c0a60cfac46cb78 WHIRLPOOL 8574349e4262adc3cf0942301e00c3898cfb47ededa8385694f19e11ad92777a9d8be8851623b002b70e17cf9e838ccbf1d79bbb1e7cc74608ce62c91d7857f2
 EBUILD gvim-8.0.0983.ebuild 11293 SHA256 76692868b4133172fa58ec6fa7c63b0ba384a134aef1d71edb83082a5afff466 SHA512 16db216752f731bd29624504a113654ac8067d915ff42f96bb304815fbd828504c5934e48ec1bf294f4540453bebd65d0f14719ec13e1d24d9afa3c41e8de343 WHIRLPOOL 2fd94c13e0115e97a34c09816fde05336cc51a98dcfcb1a7396580d697d1bb5ca740d0bbda941ccb1b73dcbd407caf95c37e62dd3f347d2a4ad165b9056f1ce4
 EBUILD gvim-8.0.1056.ebuild 11293 SHA256 76692868b4133172fa58ec6fa7c63b0ba384a134aef1d71edb83082a5afff466 SHA512 16db216752f731bd29624504a113654ac8067d915ff42f96bb304815fbd828504c5934e48ec1bf294f4540453bebd65d0f14719ec13e1d24d9afa3c41e8de343 WHIRLPOOL 2fd94c13e0115e97a34c09816fde05336cc51a98dcfcb1a7396580d697d1bb5ca740d0bbda941ccb1b73dcbd407caf95c37e62dd3f347d2a4ad165b9056f1ce4
-EBUILD gvim-8.0.1188.ebuild 11275 SHA256 9b0ec93799e9ed994ac3a34c8695ab677d32a0ec34fbe2f7e698fab6ac49484b SHA512 ccac725f57082baf12dadd5e0d6098c8a4c00079a24bcf2ee2f32813efc97a9c782e986f73bbb875fcec46e418437fa07d4e2ba9776af425f7b511732b2f72f5 WHIRLPOOL 07ad0e05189c020af505fa1cfb2cbd4134053789e8a5641dba721dfc43dbabddb35ac5f235e7dc9ac86cab5a9b85f63dc862b34758063f3797ee3a9b3b8cc34a
-EBUILD gvim-9999.ebuild 11275 SHA256 9b0ec93799e9ed994ac3a34c8695ab677d32a0ec34fbe2f7e698fab6ac49484b SHA512 ccac725f57082baf12dadd5e0d6098c8a4c00079a24bcf2ee2f32813efc97a9c782e986f73bbb875fcec46e418437fa07d4e2ba9776af425f7b511732b2f72f5 WHIRLPOOL 07ad0e05189c020af505fa1cfb2cbd4134053789e8a5641dba721dfc43dbabddb35ac5f235e7dc9ac86cab5a9b85f63dc862b34758063f3797ee3a9b3b8cc34a
+EBUILD gvim-8.0.1188.ebuild 10477 SHA256 98b3e1d57b033c687745ba0aa9b2e784910e76b758eeb478d7a9d78ac286baf6 SHA512 ca3474ac8e4ffa20bb0d96677f4bee91683cafeceb6db4d2654c4d3f3037adc7a5a78bf57bc019222fbde96d06a5731c4d6474324ac676941115e728dcc085bf WHIRLPOOL fb5a7193c2b8ca3355a1292386d8ad544791f29ad52703f4fc6f29253220ae4e2df8083c168b47835069cca09a7aa27bbfc1042fd61b60611e394a7bf326370a
+EBUILD gvim-9999.ebuild 10477 SHA256 98b3e1d57b033c687745ba0aa9b2e784910e76b758eeb478d7a9d78ac286baf6 SHA512 ca3474ac8e4ffa20bb0d96677f4bee91683cafeceb6db4d2654c4d3f3037adc7a5a78bf57bc019222fbde96d06a5731c4d6474324ac676941115e728dcc085bf WHIRLPOOL fb5a7193c2b8ca3355a1292386d8ad544791f29ad52703f4fc6f29253220ae4e2df8083c168b47835069cca09a7aa27bbfc1042fd61b60611e394a7bf326370a
 MISC ChangeLog 7715 SHA256 5666aeab068ae894e72060f7623f040d7ffde343a06696249b565fd245865a8b SHA512 c473588caa73e7d1874be8fcf42878b8d5e3530ee73c073382368208b6b0126ab0586e2f5d7b563152be359f891db97a89931dcb65921857629530df6543fb4d WHIRLPOOL 6fcb0617e6f2bf3f8d937828558d86aa9da4950b6fe31c80134bbcea1d6f91ffbb10a7d5d00cfedb5f121837b34d31d8ce464844af6862d00193a521f312bf58
 MISC ChangeLog-2015 64168 SHA256 fd464c76716730dfb6349ce37fef75a93302770ffdceaf00928590215337e659 SHA512 8f0ff5bf344c451d2657c153c82a96e65e5ffac317dd560e08e38ba05ed857aefd0d4bc2e23bde7eb2cfae36de678390c3cbda517f9ee3619ab6b3a3d9821311 WHIRLPOOL 9f83a19841c6c03bf21f58514f7cffea4bc7554aeab23d742348f854a19465727fbedf763f1a70f1db7dc75af0e2490b36c8e7cba83e2780e021dd7af7b633a7
 MISC metadata.xml 675 SHA256 14f61375d274e0ef6f46387961533ff04f74f8f82c26ef0ab7555d4b49667939 SHA512 df75c9e935ae47b8961c8b6b984483b8032e39d3833ffcf4784e2630cea870579d45ef5f104b71d6b35f4128ef689394edd72510fce82a76e596749ce69d835d WHIRLPOOL 9962e6a64cc56f1133041a6e7c023800990b5cc38ca296fd9c364c301db19e237e272097ee64a29e43b2b5be0230ce62ef5415215ce5a6f7aefafbcb73d48cb4
diff --git a/app-editors/gvim/gvim-8.0.1188.ebuild b/app-editors/gvim/gvim-8.0.1188.ebuild
index a43f58ae6ed1..b19e4d692308 100644
--- a/app-editors/gvim/gvim-8.0.1188.ebuild
+++ b/app-editors/gvim/gvim-8.0.1188.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE=threads
 inherit vim-doc flag-o-matic xdg-utils gnome2-utils versionator bash-completion-r1 prefix python-single-r1
 
-if [[ ${PV} == 9999* ]] ; then
+if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/vim/vim.git"
 	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
@@ -86,30 +86,34 @@ pkg_setup() {
 	export LC_COLLATE="C"
 
 	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home
+	mkdir -p "${T}"/home || die
 	export HOME="${T}"/home
 
 	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
+	if [[ ${PV} != 9999* ]]; then
 		# Gentoo patches to fix runtime issues, cross-compile errors, etc
 		eapply "${WORKDIR}"/patches/
 	fi
 
 	# Fixup a script to use awk instead of nawk
-	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
-		|| die "mve.awk sed failed"
+	sed -i -e \
+		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
 
 	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+	    >> "${S}"/src/feature.h || die "echo failed"
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+	    >> "${S}"/src/feature.h || die "echo failed"
 
 	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
 	# Hopefully this pattern won't break for a while at least.
 	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+	sed -i -e \
+		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
 		"${S}"/runtime/doc/syntax.txt \
 		"${S}"/runtime/doc/tagsrch.txt \
 		"${S}"/runtime/doc/usr_29.txt \
@@ -119,29 +123,30 @@ src_prepare() {
 	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
 	# this is NeXT, but it's actually just a file in dev-libs/9libs
 	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+	sed -i -e \
+		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
 
 	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
 	# correctly. To avoid some really entertaining error messages about stuff
 	# which isn't even in the source file being invalid, we'll do some trickery
 	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
 
 	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]] ; then
-		sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die
 	fi
 
-	if version_is_at_least 7.3.122 ; then
-		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
-	fi
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
 
 	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	if version_is_at_least 7.3 ; then
-		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
-			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-	fi
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
 
 	eapply_user
 }
@@ -163,14 +168,18 @@ src_configure() {
 	# (2) Rebuild auto/configure
 	# (3) Notice auto/configure is newer than auto/config.mk
 	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -f src/auto/configure
+	sed -i -e \
+		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -v src/auto/configure || die "rm failed"
 	emake -j1 -C src autoconf
 
 	# This should fix a sandbox violation (see bug 24447). The hvc
 	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
-		[[ -e ${file} ]] && addwrite $file
+	local file
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e ${file} ]]; then
+			addwrite $file
+		fi
 	done
 
 	use debug && append-flags "-DDEBUG"
@@ -197,9 +206,9 @@ src_configure() {
 
 	# --with-features=huge forces on cscope even if we --disable it. We need
 	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-	if ! use cscope ; then
-		sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
-			die "couldn't disable cscope"
+	if ! use cscope; then
+		sed -i -e \
+			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
 	fi
 
 	# gvim's GUI preference order is as follows:
@@ -211,29 +220,29 @@ src_configure() {
 	# -aqua -gtk -gtk3 -motif neXt  NEXTAW
 	# -aqua -gtk -gtk3 -motif -neXt ATHENA
 	echo ; echo
-	if use aqua ; then
+	if use aqua; then
 		einfo "Building gvim with the Carbon GUI"
 		myconf+=(
 			--enable-darwin
 			--enable-gui=carbon
 		)
-	elif use gtk3 ; then
+	elif use gtk3; then
 		myconf+=( --enable-gtk3-check )
 		einfo "Building gvim with the gtk+-3 GUI"
 		myconf+=( --enable-gui=gtk3 )
-	elif use gtk ; then
+	elif use gtk; then
 		myconf+=( --enable-gtk2-check )
-		if use gnome ; then
+		if use gnome; then
 			einfo "Building gvim with the Gnome 2 GUI"
 			myconf+=( --enable-gui=gnome2 )
 		else
 			einfo "Building gvim with the gtk+-2 GUI"
 			myconf+=( --enable-gui=gtk2 )
 		fi
-	elif use motif ; then
+	elif use motif; then
 		einfo "Building gvim with the MOTIF GUI"
 		myconf+=( --enable-gui=motif )
-	elif use neXt ; then
+	elif use neXt; then
 		einfo "Building gvim with the neXtaw GUI"
 		myconf+=( --enable-gui=nextaw )
 	else
@@ -287,45 +296,18 @@ src_test() {
 	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
 
 	# Make sure our VIMPROG is used.
-	sed -i 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
+	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
 
 	# Don't do additional GUI tests.
 	emake -j1 VIMPROG=../testvim -C src/testdir nongui
 }
 
-# Make convenience symlinks, hopefully without stepping on toes.  Some
-# of these links are "owned" by the vim ebuild when it is installed,
-# but they might be good for gvim as well (see bug 45828)
-update_vim_symlinks() {
-	local f syms
-	syms="vimdiff rvim rview"
+# Call eselect vi update with --if-unset
+# to respect user's choice (bug 187449)
+eselect_vi_update() {
 	einfo "Calling eselect vi update..."
-	# Call this with --if-unset to respect user's choice (bug 187449)
 	eselect vi update --if-unset
-
-	# Make or remove convenience symlink, vim -> gvim
-	if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
-		ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
-	elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
-		rm "${EROOT}"/usr/bin/vim
-	fi
-
-	# Make or remove convenience symlinks to vim
-	if [[ -f "${EROOT}"/usr/bin/vim ]]; then
-		for f in ${syms}; do
-			ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
-		done
-	else
-		for f in ${syms}; do
-			if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
-				rm -f "${EROOT}"/usr/bin/${f}
-			fi
-		done
-	fi
-
-	# This will still break if you merge then remove the vi package,
-	# but there's only so much you can do, eh?  Unfortunately we don't
-	# have triggers like are done in rpm-land.
+	eend $?
 }
 
 src_install() {
@@ -342,9 +324,10 @@ src_install() {
 	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
 
 	dodir /usr/share/man/man1
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1
-	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
+	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
+		die "echo failed"
 
 	insinto /etc/vim
 	newins "${FILESDIR}"/gvimrc-r1 gvimrc
@@ -356,7 +339,7 @@ src_install() {
 	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
 
 	# don't install vim desktop file
-	rm "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
+	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
 }
 
 pkg_postinst() {
@@ -369,8 +352,8 @@ pkg_postinst() {
 	# Update icon cache
 	gnome2_icon_cache_update
 
-	# Make convenience symlinks
-	update_vim_symlinks
+	# Call eselect vi update
+	eselect_vi_update
 }
 
 pkg_postrm() {
@@ -383,6 +366,6 @@ pkg_postrm() {
 	# Update icon cache
 	gnome2_icon_cache_update
 
-	# Make convenience symlinks
-	update_vim_symlinks
+	# Call eselect vi update
+	eselect_vi_update
 }
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index a43f58ae6ed1..b19e4d692308 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE=threads
 inherit vim-doc flag-o-matic xdg-utils gnome2-utils versionator bash-completion-r1 prefix python-single-r1
 
-if [[ ${PV} == 9999* ]] ; then
+if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/vim/vim.git"
 	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
@@ -86,30 +86,34 @@ pkg_setup() {
 	export LC_COLLATE="C"
 
 	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home
+	mkdir -p "${T}"/home || die
 	export HOME="${T}"/home
 
 	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
+	if [[ ${PV} != 9999* ]]; then
 		# Gentoo patches to fix runtime issues, cross-compile errors, etc
 		eapply "${WORKDIR}"/patches/
 	fi
 
 	# Fixup a script to use awk instead of nawk
-	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
-		|| die "mve.awk sed failed"
+	sed -i -e \
+		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
 
 	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+	    >> "${S}"/src/feature.h || die "echo failed"
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+	    >> "${S}"/src/feature.h || die "echo failed"
 
 	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
 	# Hopefully this pattern won't break for a while at least.
 	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+	sed -i -e \
+		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
 		"${S}"/runtime/doc/syntax.txt \
 		"${S}"/runtime/doc/tagsrch.txt \
 		"${S}"/runtime/doc/usr_29.txt \
@@ -119,29 +123,30 @@ src_prepare() {
 	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
 	# this is NeXT, but it's actually just a file in dev-libs/9libs
 	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+	sed -i -e \
+		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
 
 	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
 	# correctly. To avoid some really entertaining error messages about stuff
 	# which isn't even in the source file being invalid, we'll do some trickery
 	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
 
 	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]] ; then
-		sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die
 	fi
 
-	if version_is_at_least 7.3.122 ; then
-		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
-	fi
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
 
 	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	if version_is_at_least 7.3 ; then
-		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
-			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-	fi
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
 
 	eapply_user
 }
@@ -163,14 +168,18 @@ src_configure() {
 	# (2) Rebuild auto/configure
 	# (3) Notice auto/configure is newer than auto/config.mk
 	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -f src/auto/configure
+	sed -i -e \
+		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -v src/auto/configure || die "rm failed"
 	emake -j1 -C src autoconf
 
 	# This should fix a sandbox violation (see bug 24447). The hvc
 	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
-		[[ -e ${file} ]] && addwrite $file
+	local file
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e ${file} ]]; then
+			addwrite $file
+		fi
 	done
 
 	use debug && append-flags "-DDEBUG"
@@ -197,9 +206,9 @@ src_configure() {
 
 	# --with-features=huge forces on cscope even if we --disable it. We need
 	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-	if ! use cscope ; then
-		sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
-			die "couldn't disable cscope"
+	if ! use cscope; then
+		sed -i -e \
+			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
 	fi
 
 	# gvim's GUI preference order is as follows:
@@ -211,29 +220,29 @@ src_configure() {
 	# -aqua -gtk -gtk3 -motif neXt  NEXTAW
 	# -aqua -gtk -gtk3 -motif -neXt ATHENA
 	echo ; echo
-	if use aqua ; then
+	if use aqua; then
 		einfo "Building gvim with the Carbon GUI"
 		myconf+=(
 			--enable-darwin
 			--enable-gui=carbon
 		)
-	elif use gtk3 ; then
+	elif use gtk3; then
 		myconf+=( --enable-gtk3-check )
 		einfo "Building gvim with the gtk+-3 GUI"
 		myconf+=( --enable-gui=gtk3 )
-	elif use gtk ; then
+	elif use gtk; then
 		myconf+=( --enable-gtk2-check )
-		if use gnome ; then
+		if use gnome; then
 			einfo "Building gvim with the Gnome 2 GUI"
 			myconf+=( --enable-gui=gnome2 )
 		else
 			einfo "Building gvim with the gtk+-2 GUI"
 			myconf+=( --enable-gui=gtk2 )
 		fi
-	elif use motif ; then
+	elif use motif; then
 		einfo "Building gvim with the MOTIF GUI"
 		myconf+=( --enable-gui=motif )
-	elif use neXt ; then
+	elif use neXt; then
 		einfo "Building gvim with the neXtaw GUI"
 		myconf+=( --enable-gui=nextaw )
 	else
@@ -287,45 +296,18 @@ src_test() {
 	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
 
 	# Make sure our VIMPROG is used.
-	sed -i 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
+	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
 
 	# Don't do additional GUI tests.
 	emake -j1 VIMPROG=../testvim -C src/testdir nongui
 }
 
-# Make convenience symlinks, hopefully without stepping on toes.  Some
-# of these links are "owned" by the vim ebuild when it is installed,
-# but they might be good for gvim as well (see bug 45828)
-update_vim_symlinks() {
-	local f syms
-	syms="vimdiff rvim rview"
+# Call eselect vi update with --if-unset
+# to respect user's choice (bug 187449)
+eselect_vi_update() {
 	einfo "Calling eselect vi update..."
-	# Call this with --if-unset to respect user's choice (bug 187449)
 	eselect vi update --if-unset
-
-	# Make or remove convenience symlink, vim -> gvim
-	if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
-		ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
-	elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
-		rm "${EROOT}"/usr/bin/vim
-	fi
-
-	# Make or remove convenience symlinks to vim
-	if [[ -f "${EROOT}"/usr/bin/vim ]]; then
-		for f in ${syms}; do
-			ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
-		done
-	else
-		for f in ${syms}; do
-			if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
-				rm -f "${EROOT}"/usr/bin/${f}
-			fi
-		done
-	fi
-
-	# This will still break if you merge then remove the vi package,
-	# but there's only so much you can do, eh?  Unfortunately we don't
-	# have triggers like are done in rpm-land.
+	eend $?
 }
 
 src_install() {
@@ -342,9 +324,10 @@ src_install() {
 	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
 
 	dodir /usr/share/man/man1
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1
-	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
+	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
+		die "echo failed"
 
 	insinto /etc/vim
 	newins "${FILESDIR}"/gvimrc-r1 gvimrc
@@ -356,7 +339,7 @@ src_install() {
 	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
 
 	# don't install vim desktop file
-	rm "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
+	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
 }
 
 pkg_postinst() {
@@ -369,8 +352,8 @@ pkg_postinst() {
 	# Update icon cache
 	gnome2_icon_cache_update
 
-	# Make convenience symlinks
-	update_vim_symlinks
+	# Call eselect vi update
+	eselect_vi_update
 }
 
 pkg_postrm() {
@@ -383,6 +366,6 @@ pkg_postrm() {
 	# Update icon cache
 	gnome2_icon_cache_update
 
-	# Make convenience symlinks
-	update_vim_symlinks
+	# Call eselect vi update
+	eselect_vi_update
 }
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index b0b5d6666d8a..0078a47e1ee7 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -2,7 +2,7 @@ DIST mg-20161005.tar.gz 140797 SHA256 b7fcb5136a6783ca24c8463ab0852fc1f26bdb2bb1
 DIST mg-20170401.tar.gz 140895 SHA256 0a3608b17c153960cb1d954ca3b62445a77c0c1a18aa5c8c58aba9f6b8d62aab SHA512 729b2d9ba7eb236cc8bcbcf3ac7604494980cbf2fd21dc5a3856011bc830eee75be29a246b0bf3dfa6c7a03fcf69a902ae50d05ea371ac4d0225a4da6089d7ce WHIRLPOOL ecdd49bcf8a220dc7a8c57de322c354437b646db231177e3640ae0840ea49ddd9bfc8d9ecaff6e4c9c3ca140e173b14bc52411bebfe586cac144f412d07b59ca
 DIST mg-20170828.tar.gz 141028 SHA256 1f8886ab62e9abfeed7fafbb5ea71685450a34c5d0a243461bd2c5425161368d SHA512 1ea16b1dd5e9e08abf9fcf0889130b4f39d36872bb64df85470a9ced1db87c0eecb18cc6e8c3c5a04f9049d58ef4492d5a88cf3502ec3351abccb7bddfb90c14 WHIRLPOOL ebe1559c385788f53c4e49a22713fec5bdf22837b854310543995bf2988d0c946ba1386f33eb84a44b10e9811dacc176079dc930562060ecaaec9b3232a781f5
 EBUILD mg-20161005.ebuild 1045 SHA256 0d0e91a456c6dc48be22bff2e653369eb23873765a691244b7a3e62faa5db872 SHA512 dd63f9da0f28961aac1f02d09d021f661d5bf2bfb8baf3509aabf1855bae9d41efd09847d1cdd8c84985146083192b7b3212038180ebe3b2e1256ffed0fa43fb WHIRLPOOL 713b4cc0468427bed55a5d1b6a84b0199b4fd50b91975f919fca7d7933a06727acf970b1c5e10e60fd97f461af935a6deb050a4a10019823afabccaabe01063b
-EBUILD mg-20170401.ebuild 1048 SHA256 e7d8f399044d28bec089282bd9162edfe394357bd65f5efa520fd643a28b7fad SHA512 df13b2ebd4b494962c4515e16f32bbc74a71fe1faae3125dc462d1770d939df68c14d42a6caf2ab010a2900539ad4e3744a699e6302088f1b06de095cb084a9f WHIRLPOOL 85aab9989d77554cb0c81b06d21082e9100f3e6d586a8156166f7b185cb2bb0a094641b83f351f23308c269ce7f52c9c12c28ab800b3f3a510ad49718ac1d91c
+EBUILD mg-20170401.ebuild 1047 SHA256 937348d118eea8ed6615677612bd464950d4ff8f9a41ef0fac010dba75c6f580 SHA512 3b69b1822d2ade70e93a51083eead3bc465b2d8faa883ea88cc362037c0b6d5bbb842a1ee5218ada124d5f8d81ca3c7e2e75b0f3b808660aaeca3c11f21761f9 WHIRLPOOL 61fc9d5bc8ec1eb10fd0f7ad8665962814fe372e2610fcf41f173a7b8993b3bb9ad45ed150f83f25863bb53a1c1b9fd42a37044a737408d34c56c3b8d14a2922
 EBUILD mg-20170828.ebuild 1052 SHA256 3cd84d77e46a82d28179567e11892e133e2eca73406d8d7de26a42243d38981b SHA512 793e3e975a2a74f6160c7ecd1a9f0536b097671a32e772706aaae34865e14c5678cfad9625fa66ca9a987220316502bdbc7ae6d226d1e483342de7a5c04c3fe6 WHIRLPOOL df1f0b2745c4d7f819500e37dac76defded865e8d049c3b0f912762580a96c7f415d8fae889b3144dd3351e79e933d0bc37345798c1b5437f92708b0655f0682
 MISC ChangeLog 5076 SHA256 ae4dafbcb6e834d3d4e0c8954c3991b3fb7572d76c1a349436c65bdc7e56ef53 SHA512 60a6c18aa4a0b5d86362a917d4a866273c13349e8fb8f2e213403b3821771535a28d65f8bb65a51da860f889e283b375eea79d80b7a79e0dce5c25eae5db69cb WHIRLPOOL 1ece1c1f5714be68251471a7f86a48171e4b651ff57a288968851ef192f24dd230be70c8ef4b3dab417e676b32c7dfcb00fa365399675c8d7e42955320f46c53
 MISC ChangeLog-2015 13105 SHA256 cace27ac64a502179a77766381bf98b078859762af50daa67b9d131d2d75d4f7 SHA512 057a9507201db1602e4fd0df06332ea74582c318102efafcc8a2750aa6f17157ce82288cb0e03b5cb62c04f812dd55e0e5158598d7dce98c37e04d891385662e WHIRLPOOL dbb8b7881a97248ed45ac6ab4fcbf09df44bd5dd91ba630dd2b883ea82ec62614c2ce979cd5de329e8a76b7b1d6a52661b2f4a0583b11830984f41b5730f0b79
diff --git a/app-editors/mg/mg-20170401.ebuild b/app-editors/mg/mg-20170401.ebuild
index 1ee1c688f452..a7be354758b0 100644
--- a/app-editors/mg/mg-20170401.ebuild
+++ b/app-editors/mg/mg-20170401.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://homepage.boetes.org/software/mg/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm hppa ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha ~amd64 arm hppa ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="livecd"
 
 RDEPEND="sys-libs/ncurses:0
diff --git a/app-editors/notepadqq/Manifest b/app-editors/notepadqq/Manifest
index d2346fdca051..4432aa519070 100644
--- a/app-editors/notepadqq/Manifest
+++ b/app-editors/notepadqq/Manifest
@@ -1,4 +1,6 @@
 DIST CodeMirror-5.18.2.tar.gz 923001 SHA256 edfccf28e609a08476e9da4f592d7aa23b7e73af3954d90605e0c650abd20a1a SHA512 c979c1ef02bb222b08e64847e5caab9c8a525c96d0eef656a00730d6710b0144144ac656eddef05d50c30c7d33da7dffe1a7580b9d47a5d958af9d6484ea705f WHIRLPOOL 9baaada10513eaad75bb6e8f2d73fd076b85f8a85adec1dc235857ae1f9160d6f463859356d5fce69c882ca4b3a2efc802a62453eb2435f868d9691cb435d73f
 DIST notepadqq-1.0.1.tar.gz 1056249 SHA256 552f274b9c9d3d48e2e55462f33aea8df8ebd0f421b0d7a23b78a46693fbed34 SHA512 781ddf9960227c4ad21fb7e763180cfed7f1c5c0237277335577932678a42a4c2f303f61922d93ec850dbc86df36c292ff10ae053a6e00d7127a48c7ac4e359c WHIRLPOOL 53f47ce9af83e57121e8ad261aece0eda53bbe42d02edebdfd8ffeb3874146c6ab7d63e2347755ac6a447413f46254c6db7ac7aed8809c4ad1baf5a7e0e586fb
+DIST notepadqq-1.2.0.tar.gz 2082931 SHA256 423d224724deb5298837327ce7efa0d71dbe73693c783241eeb7bb2327ee97d4 SHA512 4b6b3e646add4dc21b4d4ddecacefa59785e6525d52ecc17ca418ba14f38ef9024f48af6db3538d195327942971eb9ccf0b5567da58ba15facad332b47742717 WHIRLPOOL 472e7579f49328f9323b9b8c7432372cad7d64627e78f4dc2690aabd2d7f9e0506d4b8f5e7a287f58fcf5bc102a5125387b465a78f9dfdf983e48b9510d478ce
 EBUILD notepadqq-1.0.1.ebuild 1147 SHA256 b2d401eb2b5a7454e407d518a0ea9c8a4cf90d35447b2579929f95c403ae926b SHA512 44c0b195927c434fccc2b5ba7170167321723a846fc513fde27866a0891736559e2343c88553ae0f1763342b40e32a0af0053fea0d8fe028587e4783cddfc063 WHIRLPOOL 557e4b44db0931defb268e320ca5143e4c812df1064187c1c939d8944cc9402be61d62a18c0da3f1e31bf56aa80de28ac231e2e3d248224644d907f94a04df90
+EBUILD notepadqq-1.2.0.ebuild 887 SHA256 3b5491841b3990995304e603bd664ed164a65dfebabb2a33b22436b6472d92d0 SHA512 b5cf204d51dea2771f10fc81e24252bc66db68ce92419fc6e0cab724c071c6cbaba87520cbc4d82fbb1606696aa41a00d2b6c0b267fa36d356a5a0fe3a83c115 WHIRLPOOL 53ab989af4519c43f4d244a6d7e1a146dc52f00824a15fd1d4f0224d1c811ea18db7559789126f51182d8b2daf2f2bfea3931b95668b2b94da67c9a0fe93ed96
 MISC metadata.xml 345 SHA256 a4edd2bf46b2a030179ba2e6ee8c84d4584df79914f1e93623c6eea6e674c443 SHA512 90d1d18d81da9f0870d7e41a4c421fb58872861358fa4f095c5b040c6465752898867e47b866750f19f316fdb8fed42bc878e84ced27ddb2503ec142d035f033 WHIRLPOOL 7abc10f05b045f8ec67e92c65fe84f4118bf49a672a5a9d74c01eb360d1cc705783ad2a1ffaff20e83e6bde21aedd10c5a242f1e74c40a47eb84c194aba02144
diff --git a/app-editors/notepadqq/notepadqq-1.2.0.ebuild b/app-editors/notepadqq/notepadqq-1.2.0.ebuild
new file mode 100644
index 000000000000..7710405ccb60
--- /dev/null
+++ b/app-editors/notepadqq/notepadqq-1.2.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils xdg-utils
+
+CM_PV="5.18.2"
+
+DESCRIPTION="Notepad++-like editor for Linux"
+HOMEPAGE="http://notepadqq.altervista.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# Silence a QA warning
+	sed '/^OnlyShowIn/d' \
+		-i support_files/shortcuts/notepadqq.desktop \
+		|| die
+}
+
+src_configure() {
+	eqmake5 PREFIX="${EPREFIX}/usr" ${PN}.pro
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 404e11acea1c..f4df3d155b92 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -1,4 +1,4 @@
-AUX vimrc-r5 6926 SHA256 19019ab68e724ed0aa2129959f12d6cbdc042de0a102f719bf757079c444c2c5 SHA512 ff99b53d542f6f85adb2062a0cb3605ddd6e447c1b2427e7e4ce58aea843a99cde13473ec53d89ddb380da0358e32a45aa7f857269baf5504751b9eb259418ba WHIRLPOOL 4aaa9a8a1ee817c73d6b93f1595201fdcf1e65beea637f666b30bbb826098cb6719e663985ddd88b54639f4bda4c1941a798cf9b3c93aca8746943d40cb5ef36
+AUX vimrc-r5 7337 SHA256 6b9290c6f71a19e5ab749599e1d3f3d2e118a9d8fa00489dd9553b52df2401e0 SHA512 b9cc07386b97e6042166b11cd6270d4c3134eb816ff396ad544cfb14b349d79b32b5a07b5995580aea607b7936eef0dfd5ab1dc7e158dea26afc0c944fae8e3c WHIRLPOOL a005f2ca3c49afdb903d93fcb1d690856b5d5176468b9cca39fcc3d83fe6d00d481e46e23133cf011bd45351abbc260914ec194e0591d56c766aa2c1a5b3a425
 AUX xxd-completion 461 SHA256 580064ca4db3ac149fd89c743bd9946241220c211721f978f7a3ef97b3c171df SHA512 fc92426ea657e86ff765aa5a60736cdc70db938156dd8946db0a30c54d3f557bd8af421f1713bd750e779ccacd73f8f290a12a5e71ed48259fe1e6dece2de19c WHIRLPOOL 65324afb44612f1dd8f8850b7caa8524cff055d83aaad74c5b5030787463d0a95dbe0ce1b91c1a7b7f3e6954db3c0608ac2a2e1e75572af94e83758237b18447
 DIST vim-8.0.0106-gentoo-patches.tar.bz2 2281 SHA256 9823a91b050eb4b001cc50f508d2ad03c7c256ed49183c1af7582318667f48d4 SHA512 39edd9f518c230d2b0486b18aa155572a9eada4a5e21108573d6e66e2eef1276f23b77d766648f018c9cf973a7d03712d8861be6ea13255d7b389912d554a47a WHIRLPOOL d6d01e3944d56762a2a999ee631f89e212360aa030ddd16ea96e32d518ec171e04d8565dcb89e804248d53e4c6e06b19be239ad2316ea88bb57364815b85d26b
 DIST vim-8.0.0386.tar.gz 13000882 SHA256 25b28f6ef55a8d0b3f255f0fbed90ad1450bde7f7b231cc09d86c5119adc95bc SHA512 3169ea4dbc836c724f63d99cd345227f870a3a922beba84a6b42011685c0dd209f6bba8c69af0650c9a57bb47fc541e1150ca8cefb21fcada022259bf4c94a66 WHIRLPOOL 99a5582e0db0dc53fd8385cddf1fbf13d2fe1dd5c8e33c9959288c19d4b85f50139791269edd4ec3d5cbed6548cc3d9c7962ec1706eb422a4ef83c207aac009b
@@ -11,8 +11,8 @@ EBUILD vim-core-8.0.0386.ebuild 6754 SHA256 8f75d89c4ec220644790a21dcc4abf31764a
 EBUILD vim-core-8.0.0938.ebuild 6764 SHA256 1dc003559e492075c9577d13514860bff86440a114b16149c58569ef5ca7ec83 SHA512 ae48d1c1afd8a62f8f32afe6c6d9c6a9b52352eb594a6c973efae7f42ac480575c1e1f95b1527f346e04a6ad52f649c966daf98a97c684d6419fd9952a4e8e61 WHIRLPOOL 0136e67cd20a20e3d55e33ef92aef3af347eede30079180dcc62b93da218b7cc8f304d1a849c434f3c1f47980822bb67dfb7fcec97f2be689aa59a5d136e2943
 EBUILD vim-core-8.0.0983.ebuild 6772 SHA256 c72b168d4f25da2dfb4fad846855eaecd334b63103269809bec652508751a8f3 SHA512 60fa7940b9ed64b828fa59fcfa11b90b81e63e89d41e2f44c2e2281da620f0325673831cbb2d47c923078e16effdc6b588487f3636f75ae9fdb83ba3c0c0bb5a WHIRLPOOL 578a4dcea44d4116b3e015a06ff0dd48bd49da4d15a83744d94ba4289c1e4ad5e9f4624b6b505045a2551b57bc93ebeeae199c999ec932cca779e888d5113560
 EBUILD vim-core-8.0.1056.ebuild 6772 SHA256 c72b168d4f25da2dfb4fad846855eaecd334b63103269809bec652508751a8f3 SHA512 60fa7940b9ed64b828fa59fcfa11b90b81e63e89d41e2f44c2e2281da620f0325673831cbb2d47c923078e16effdc6b588487f3636f75ae9fdb83ba3c0c0bb5a WHIRLPOOL 578a4dcea44d4116b3e015a06ff0dd48bd49da4d15a83744d94ba4289c1e4ad5e9f4624b6b505045a2551b57bc93ebeeae199c999ec932cca779e888d5113560
-EBUILD vim-core-8.0.1188.ebuild 6772 SHA256 c72b168d4f25da2dfb4fad846855eaecd334b63103269809bec652508751a8f3 SHA512 60fa7940b9ed64b828fa59fcfa11b90b81e63e89d41e2f44c2e2281da620f0325673831cbb2d47c923078e16effdc6b588487f3636f75ae9fdb83ba3c0c0bb5a WHIRLPOOL 578a4dcea44d4116b3e015a06ff0dd48bd49da4d15a83744d94ba4289c1e4ad5e9f4624b6b505045a2551b57bc93ebeeae199c999ec932cca779e888d5113560
-EBUILD vim-core-9999.ebuild 6772 SHA256 c72b168d4f25da2dfb4fad846855eaecd334b63103269809bec652508751a8f3 SHA512 60fa7940b9ed64b828fa59fcfa11b90b81e63e89d41e2f44c2e2281da620f0325673831cbb2d47c923078e16effdc6b588487f3636f75ae9fdb83ba3c0c0bb5a WHIRLPOOL 578a4dcea44d4116b3e015a06ff0dd48bd49da4d15a83744d94ba4289c1e4ad5e9f4624b6b505045a2551b57bc93ebeeae199c999ec932cca779e888d5113560
+EBUILD vim-core-8.0.1188.ebuild 6660 SHA256 1da55a9ab94ed96d4ba8c0d6bfaa5754f71a85223825f7981df1eb176734e3d0 SHA512 920903e21d36555b3276f15fb95c59a26cc0355f6327ba1caf625a0d3e2e2d3be877d4244437a68e29ad71ddc3c7c85bf0ae58228b2f7fab17416abfbfc9d368 WHIRLPOOL 0012fe87cb6d3e428bcaacce70f3ac60b6fdee91584db99cc0af003cc365617bbb0910121f4ad339a6bf36c41f414fa037b655bd69e2ac432952312c40329c7e
+EBUILD vim-core-9999.ebuild 6660 SHA256 1da55a9ab94ed96d4ba8c0d6bfaa5754f71a85223825f7981df1eb176734e3d0 SHA512 920903e21d36555b3276f15fb95c59a26cc0355f6327ba1caf625a0d3e2e2d3be877d4244437a68e29ad71ddc3c7c85bf0ae58228b2f7fab17416abfbfc9d368 WHIRLPOOL 0012fe87cb6d3e428bcaacce70f3ac60b6fdee91584db99cc0af003cc365617bbb0910121f4ad339a6bf36c41f414fa037b655bd69e2ac432952312c40329c7e
 MISC ChangeLog 8466 SHA256 568fecc9d283b1c6af99b67c5a0ba20fa02cbdfa3cdf7c869054c9ae13af394b SHA512 fc31c71c500181b09cfa36f324531392057e5b28c4990346435e9b7002083e15238fa16661178081122bdf58a5adc8ffd2f10b9527e6ddfcba79263ed58cdd83 WHIRLPOOL ddc6b0a57525d743a7e79dc67354b87f4a3ee054023d29aa976cd475373bf7d24501d51686d48257dc8cf67249dd7bb18b418e650d78ce706298c1647b8d6ba6
 MISC ChangeLog-2015 63585 SHA256 fcbf2e79dabadcfea37e13f90bd1a0da5060f06fa4676551bb5ae5c15b140d3b SHA512 f5431dc90fecae587bfe51915711f2cd117505a034dfa821d412e29898d2046feb7afa98762878b9554d602c4a24dce8807b75613ba7b01fb5747ebc5911fe54 WHIRLPOOL 2410b2440a6eecee31ac1f8b2ccfc0ebc5ffbaf043e95fb4734fd1e22fd4b29093296d1a6b63a8e6e66c5d845a3b300f7655c31e2397eddb2a582033796b680c
 MISC metadata.xml 321 SHA256 f9326975290ccd756ea9e8aed462a63d5281409d82e6cf70c1cda86b1783c118 SHA512 7d4a40b09c24eb8f08e6c171a4cf0e332d82f06163846602db338a1ad2e51133ed18694f216ce061fd9964fba3380b9991d86b93f111c6f8d0bb62ac5e14f705 WHIRLPOOL df4da6e95b9dda591cf35853baebf9ebff792a7ba5f03c7060e41d319fcf40e31f5874b31c9841b27ed860e5a8d3346e3afb7cf80e93eb2b297c5975288e5b1a
diff --git a/app-editors/vim-core/files/vimrc-r5 b/app-editors/vim-core/files/vimrc-r5
index 3386b6c54ba0..2409822e628c 100644
--- a/app-editors/vim-core/files/vimrc-r5
+++ b/app-editors/vim-core/files/vimrc-r5
@@ -193,6 +193,17 @@ endif " has("autocmd")
 " instead:
 let g:skip_defaults_vim = 1
 
+" Enable Omni completion when opening a file only if a specific plugin does
+" not already exist for that filetype. This allows Omni completion
+" (Ctrl-x/Ctrl-o) to work with any programming language if and only if a syntax
+" file exists for the said language.
+if exists("+omnifunc")
+   autocmd Filetype *
+	      \	if &omnifunc == "" |
+	      \		setlocal omnifunc=syntaxcomplete#Complete |
+	      \	endif
+endif
+
 " {{{ vimrc.local
 if filereadable("@GENTOO_PORTAGE_EPREFIX@/etc/vim/vimrc.local")
   source @GENTOO_PORTAGE_EPREFIX@/etc/vim/vimrc.local
diff --git a/app-editors/vim-core/vim-core-8.0.1188.ebuild b/app-editors/vim-core/vim-core-8.0.1188.ebuild
index a009ebab1f38..e383fc5b1c03 100644
--- a/app-editors/vim-core/vim-core-8.0.1188.ebuild
+++ b/app-editors/vim-core/vim-core-8.0.1188.ebuild
@@ -33,7 +33,7 @@ pkg_setup() {
 	export LC_COLLATE="C"
 
 	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home
+	mkdir -p "${T}"/home || die "mkdir -p failed"
 	export HOME="${T}"/home
 }
 
@@ -44,8 +44,12 @@ src_prepare() {
 	fi
 
 	# Fixup a script to use awk instead of nawk
-	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
-		|| die "mve.awk sed failed"
+	sed -i \
+		-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "sed failed"
+
+	# See #77841. We remove this file after the tarball extraction.
+	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
 
 	# Read vimrc and gvimrc from /etc/vim
 	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
@@ -70,24 +74,23 @@ src_prepare() {
 	# correctly. To avoid some really entertaining error messages about stuff
 	# which isn't even in the source file being invalid, we'll do some trickery
 	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
 
 	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]] ; then
+	if [[ -d "${S}"/src/po ]]; then
 		sed -i -e \
 			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile
+			"${S}"/src/po/Makefile || die "sed failed"
 	fi
 
-	if version_is_at_least 7.3.122 ; then
-		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
-	fi
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
 
 	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	if version_is_at_least 7.3 ; then
-		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
-			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-	fi
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
 
 	eapply_user
 }
@@ -110,13 +113,18 @@ src_configure() {
 	# (3) Notice auto/configure is newer than auto/config.mk
 	# (4) Run ./configure (with wrong args) to remake auto/config.mk
 	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -f src/auto/configure
+
+	# Remove src/auto/configure file.
+	rm -v src/auto/configure || die "rm configure failed"
+
 	emake -j1 -C src autoconf
 
 	# This should fix a sandbox violation (see bug 24447). The hvc
 	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
-		[[ -e ${file} ]] && addwrite $file
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e "${file}" ]]; then
+			addwrite $file
+		fi
 	done
 
 	# Let Portage do the stripping. Some people like that.
@@ -141,9 +149,7 @@ src_configure() {
 }
 
 src_compile() {
-	# The following allows emake to be used
 	emake -j1 -C src auto/osdef.h objects
-
 	emake tools
 }
 
@@ -174,14 +180,14 @@ src_install() {
 	newins "${FILESDIR}"/vimrc-r5 vimrc
 	eprefixify "${ED}"/etc/vim/vimrc
 
-	if use minimal ; then
+	if use minimal; then
 		# To save space, install only a subset of the files.
 		# Helps minimalize the livecd, bug 65144.
 		eshopts_push -s extglob
 
-		rm -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent}
-		rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor}
-		rm "${ED}"/usr/bin/vimtutor
+		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
+		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
+		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
 
 		local keep_colors="default"
 		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
@@ -194,16 +200,7 @@ src_install() {
 		eshopts_pop
 	fi
 
-	# These files might have slight security issues, so we won't
-	# install them. See bug #77841. We don't mind if these don't
-	# exist.
-	rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null
-
 	newbashcomp "${FILESDIR}"/xxd-completion xxd
-
-	# We shouldn't be installing the ex or view man page symlinks, as they
-	# are managed by eselect-vi
-	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
 }
 
 pkg_postinst() {
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild
index a009ebab1f38..e383fc5b1c03 100644
--- a/app-editors/vim-core/vim-core-9999.ebuild
+++ b/app-editors/vim-core/vim-core-9999.ebuild
@@ -33,7 +33,7 @@ pkg_setup() {
 	export LC_COLLATE="C"
 
 	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home
+	mkdir -p "${T}"/home || die "mkdir -p failed"
 	export HOME="${T}"/home
 }
 
@@ -44,8 +44,12 @@ src_prepare() {
 	fi
 
 	# Fixup a script to use awk instead of nawk
-	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
-		|| die "mve.awk sed failed"
+	sed -i \
+		-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "sed failed"
+
+	# See #77841. We remove this file after the tarball extraction.
+	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
 
 	# Read vimrc and gvimrc from /etc/vim
 	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
@@ -70,24 +74,23 @@ src_prepare() {
 	# correctly. To avoid some really entertaining error messages about stuff
 	# which isn't even in the source file being invalid, we'll do some trickery
 	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
 
 	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]] ; then
+	if [[ -d "${S}"/src/po ]]; then
 		sed -i -e \
 			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile
+			"${S}"/src/po/Makefile || die "sed failed"
 	fi
 
-	if version_is_at_least 7.3.122 ; then
-		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
-	fi
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
 
 	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	if version_is_at_least 7.3 ; then
-		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
-			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-	fi
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
 
 	eapply_user
 }
@@ -110,13 +113,18 @@ src_configure() {
 	# (3) Notice auto/configure is newer than auto/config.mk
 	# (4) Run ./configure (with wrong args) to remake auto/config.mk
 	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -f src/auto/configure
+
+	# Remove src/auto/configure file.
+	rm -v src/auto/configure || die "rm configure failed"
+
 	emake -j1 -C src autoconf
 
 	# This should fix a sandbox violation (see bug 24447). The hvc
 	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
-		[[ -e ${file} ]] && addwrite $file
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e "${file}" ]]; then
+			addwrite $file
+		fi
 	done
 
 	# Let Portage do the stripping. Some people like that.
@@ -141,9 +149,7 @@ src_configure() {
 }
 
 src_compile() {
-	# The following allows emake to be used
 	emake -j1 -C src auto/osdef.h objects
-
 	emake tools
 }
 
@@ -174,14 +180,14 @@ src_install() {
 	newins "${FILESDIR}"/vimrc-r5 vimrc
 	eprefixify "${ED}"/etc/vim/vimrc
 
-	if use minimal ; then
+	if use minimal; then
 		# To save space, install only a subset of the files.
 		# Helps minimalize the livecd, bug 65144.
 		eshopts_push -s extglob
 
-		rm -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent}
-		rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor}
-		rm "${ED}"/usr/bin/vimtutor
+		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
+		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
+		rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
 
 		local keep_colors="default"
 		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
@@ -194,16 +200,7 @@ src_install() {
 		eshopts_pop
 	fi
 
-	# These files might have slight security issues, so we won't
-	# install them. See bug #77841. We don't mind if these don't
-	# exist.
-	rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null
-
 	newbashcomp "${FILESDIR}"/xxd-completion xxd
-
-	# We shouldn't be installing the ex or view man page symlinks, as they
-	# are managed by eselect-vi
-	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
 }
 
 pkg_postinst() {
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index bb155df67fd7..306d58df69d1 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -11,8 +11,8 @@ EBUILD vim-8.0.0386.ebuild 10124 SHA256 bf05c7d3c48a49c8ee2ab91799e2258681d3d8cc
 EBUILD vim-8.0.0938.ebuild 9862 SHA256 5f9c53f531439dfe1736f8ac12524c8c4595d9b89ad6facb259837a098f908a6 SHA512 bde375f135b25a2cdbb2fd6c267f6fdb8510c7d1dd263e86b5a8afa1f72d58da7cad91c73309e29e4ba0ca7fbd866b6c18da1d70aa479623d5671b0c96cd3f06 WHIRLPOOL 2991cb67ad280b04c37ed8255003f4e4fcf8fff15dcb8a7efdd3cf0db34bd7faf4c7710f78b00787da4ae345f7dd76ea95936499db394e02dd65197baa82b3a3
 EBUILD vim-8.0.0983.ebuild 9870 SHA256 36d1bea04e71cc0e7f0b978d2254c1543f78199349fcc1697f4fdf906a6fd34d SHA512 a35b7c35b67c493879f19db7aa1d4c401b3673798e4a4bb474ee4c9395d87d53fddde7f384631efeb1497fd17d6f5ac0177091f133a396a81b41098a9ccd8c8e WHIRLPOOL 54e8274dd5ec8ec511641c476020d3c0d940dcd2f7afafc53ec86771df1fd8fbc789ea13819b70458952ae372c8ab6dea1d6ce430ec109c1d5c99712cb53f86f
 EBUILD vim-8.0.1056.ebuild 9870 SHA256 36d1bea04e71cc0e7f0b978d2254c1543f78199349fcc1697f4fdf906a6fd34d SHA512 a35b7c35b67c493879f19db7aa1d4c401b3673798e4a4bb474ee4c9395d87d53fddde7f384631efeb1497fd17d6f5ac0177091f133a396a81b41098a9ccd8c8e WHIRLPOOL 54e8274dd5ec8ec511641c476020d3c0d940dcd2f7afafc53ec86771df1fd8fbc789ea13819b70458952ae372c8ab6dea1d6ce430ec109c1d5c99712cb53f86f
-EBUILD vim-8.0.1188.ebuild 9852 SHA256 b2698b1f10dfab02e758184b408b0784032de7cb196829fb33e7a48862cb00d2 SHA512 553222b37211dafcbf874c7418cb25e2c9729951bd30afc9ca05b6fba74a0af3dbaa86d61811e249eaeaa7e71db468492c33e55cf1f00e08cf75a679e0f1f352 WHIRLPOOL 53c7bae5aaa659c1f502eb57a2671f8434047aaf426f4d66802b39a8707fb2c338bf2e83c7b822e4963917eec1f261824551190e2930997eb484662be9845006
-EBUILD vim-9999.ebuild 9852 SHA256 b2698b1f10dfab02e758184b408b0784032de7cb196829fb33e7a48862cb00d2 SHA512 553222b37211dafcbf874c7418cb25e2c9729951bd30afc9ca05b6fba74a0af3dbaa86d61811e249eaeaa7e71db468492c33e55cf1f00e08cf75a679e0f1f352 WHIRLPOOL 53c7bae5aaa659c1f502eb57a2671f8434047aaf426f4d66802b39a8707fb2c338bf2e83c7b822e4963917eec1f261824551190e2930997eb484662be9845006
+EBUILD vim-8.0.1188.ebuild 8794 SHA256 f10b697e5d0677d5bcfcfa1bbe1c203d86576d9734dab5476febdbea1ade2d9d SHA512 d19b8648013cc4ee343ef86b7f60115c52b8b77decda206d15bc2530667b48dd69cb92c1db06ddac2c29a21b528e0c08059a7711bdfd0e8ca89eb046f34be516 WHIRLPOOL 6698d79202640a12f7c1425acaa279ecfcd5ec10fab097596397ae26b50985a8e3ef46ae69037ac941d0011aae0001afd8d449a50bb78abc338a351678d0205e
+EBUILD vim-9999.ebuild 8794 SHA256 f10b697e5d0677d5bcfcfa1bbe1c203d86576d9734dab5476febdbea1ade2d9d SHA512 d19b8648013cc4ee343ef86b7f60115c52b8b77decda206d15bc2530667b48dd69cb92c1db06ddac2c29a21b528e0c08059a7711bdfd0e8ca89eb046f34be516 WHIRLPOOL 6698d79202640a12f7c1425acaa279ecfcd5ec10fab097596397ae26b50985a8e3ef46ae69037ac941d0011aae0001afd8d449a50bb78abc338a351678d0205e
 MISC ChangeLog 7848 SHA256 6fc0792ca6d0bc4bf25efefac019e1938db855deffd2a47a02de28f848e29c48 SHA512 de0459f63bb4caad161089ec6e662cb6f5aba4fc8413de18f205ed5e5ec3b1576fe6d3ad9c5799c333bd3435857801a80eb63d77a9ac3e30c1e9ea44580076d8 WHIRLPOOL d8df884c001bb4572d0c50a0b69ce2cdad81abefc95a66769cde7c34eb50a52db31bb192de1015f8927d123102e0c9c4e1222e02b5955f8aea88d1cca19410f7
 MISC ChangeLog-2015 67669 SHA256 86ac1b2a4e92a9eab943636dde488ccb9351b509b3775e8e11f30e5367d48732 SHA512 f84c582b834fdb2907730b9f409f243e10d98777083a8b9a5b689a803d974f2181a93c7de6d197f4482e6b054992f1324d5e0e9d580f7cc89d6d48947a3e9ed7 WHIRLPOOL 047df580ce408d600fd30222ecd55b24414ee3aaea8cd156728a371a878ee0da86ec18843699bc961a911429c57bbf578bd2d4569c2d116f8cf1bac110ee79b4
 MISC metadata.xml 849 SHA256 ae82c0df451d25d22197d773eb096ca82cf1f01c839f7abc2543f22feb476553 SHA512 a4369827eaaa72339f17b1c673aa5f71625b657afad9d2f6079ffc6fd23775aa8f6c52aca0cb193b4815bc6ca9918617c251767343f7044ab79b83b69038c58b WHIRLPOOL e185dee8e1424534b777c9aab3f39659c97bf24e401e83ebacfc6c2cebd35d7bae4e3d6ce2be7162edb9fc91e84036a51909fa3bd9c149c60eadb1f2d4e1d11a
diff --git a/app-editors/vim/vim-8.0.1188.ebuild b/app-editors/vim/vim-8.0.1188.ebuild
index 288ed95e5ccb..be9a4fdae498 100644
--- a/app-editors/vim/vim-8.0.1188.ebuild
+++ b/app-editors/vim/vim-8.0.1188.ebuild
@@ -50,7 +50,9 @@ RDEPEND="
 	tcl? ( dev-lang/tcl:0= )
 	X? ( x11-libs/libXt )
 "
-DEPEND="${RDEPEND}
+
+DEPEND="
+	${RDEPEND}
 	sys-devel/autoconf
 	nls? ( sys-devel/gettext )
 "
@@ -61,7 +63,7 @@ pkg_setup() {
 	export LC_COLLATE="C"
 
 	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home
+	mkdir -p "${T}"/home || die "mkdir failed"
 	export HOME="${T}"/home
 
 	use python && python-single-r1_pkg_setup
@@ -74,17 +76,21 @@ src_prepare() {
 	fi
 
 	# Fixup a script to use awk instead of nawk
-	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
-		|| die "mve.awk sed failed"
+	sed -i -e \
+		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
 
 	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+		>> "${S}"/src/feature.h || die "echo failed"
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+		>> "${S}"/src/feature.h || die "echo failed"
 
 	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
 	# Hopefully this pattern won't break for a while at least.
 	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+	sed -i -e \
+		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
 		"${S}"/runtime/doc/syntax.txt \
 		"${S}"/runtime/doc/tagsrch.txt \
 		"${S}"/runtime/doc/usr_29.txt \
@@ -94,17 +100,21 @@ src_prepare() {
 	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
 	# this is NeXT, but it's actually just a file in dev-libs/9libs
 	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+	sed -i -e \
+		's/ libc\.h / /' \
+		"${S}"/src/configure.ac || die 'sed failed'
 
 	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
 	# correctly. To avoid some really entertaining error messages about stuff
 	# which isn't even in the source file being invalid, we'll do some trickery
 	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
 
 	# conditionally make the manpager.sh script
-	if use vim-pager ; then
-		cat <<-END > "${S}"/runtime/macros/manpager.sh
+	if use vim-pager; then
+		cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
 			#!/bin/sh
 			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
 					vim \\
@@ -112,24 +122,21 @@ src_prepare() {
 						-c 'set nolist nomod ft=man ts=8' \\
 						-c 'let g:showmarks_enable=0' \\
 						-c 'runtime! macros/less.vim' -
-			END
+			_EOF_
 	fi
 
 	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]] ; then
-		sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die "sed failed"
 	fi
 
-	if version_is_at_least 7.3.122 ; then
-		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
-	fi
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
 
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	if version_is_at_least 7.3 ; then
-		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
-			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-	fi
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
 
 	eapply_user
 }
@@ -152,16 +159,18 @@ src_configure() {
 	# (3) Notice auto/configure is newer than auto/config.mk
 	# (4) Run ./configure (with wrong args) to remake auto/config.mk
 	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -f src/auto/configure
+	rm src/auto/configure || die "rm failed"
 	emake -j1 -C src autoconf
 
 	# This should fix a sandbox violation (see bug 24447). The hvc
 	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
-		[[ -e ${file} ]] && addwrite $file
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e "${file}" ]]; then
+			addwrite $file
+		fi
 	done
 
-	if use minimal ; then
+	if use minimal; then
 		myconf=(
 			--with-features=tiny
 			--disable-nls
@@ -204,9 +213,9 @@ src_configure() {
 
 		# --with-features=huge forces on cscope even if we --disable it. We need
 		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-		if ! use cscope ; then
-			sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
-				die "couldn't disable cscope"
+		if ! use cscope; then
+			sed -i -e \
+				'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
 		fi
 
 		# don't test USE=X here ... see bug #19115
@@ -237,14 +246,14 @@ src_compile() {
 }
 
 src_test() {
-	echo
+	einfo
 	einfo "Starting vim tests. Several error messages will be shown"
 	einfo "while the tests run. This is normal behaviour and does not"
 	einfo "indicate a fault."
-	echo
+	einfo
 	ewarn "If the tests fail, your terminal may be left in a strange"
 	ewarn "state. Usually, running 'reset' will fix this."
-	echo
+	einfo
 
 	# Don't let vim talk to X
 	unset DISPLAY
@@ -252,39 +261,12 @@ src_test() {
 	emake -j1 -C src/testdir nongui
 }
 
-# Make convenience symlinks, hopefully without stepping on toes.  Some
-# of these links are "owned" by the vim ebuild when it is installed,
-# but they might be good for gvim as well (see bug 45828)
-update_vim_symlinks() {
-	local f syms
-	syms="vimdiff rvim rview"
+# Call eselect vi update with --if-unset
+# to respect user's choice (bug 187449)
+eselect_vi_update() {
 	einfo "Calling eselect vi update..."
-	# Call this with --if-unset to respect user's choice (bug 187449)
 	eselect vi update --if-unset
-
-	# Make or remove convenience symlink, vim -> gvim
-	if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
-		ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
-	elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
-		rm "${EROOT}"/usr/bin/vim
-	fi
-
-	# Make or remove convenience symlinks to vim
-	if [[ -f "${EROOT}"/usr/bin/vim ]]; then
-		for f in ${syms}; do
-			ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
-		done
-	else
-		for f in ${syms}; do
-			if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
-				rm -f "${EROOT}"/usr/bin/${f}
-			fi
-		done
-	fi
-
-	# This will still break if you merge then remove the vi package,
-	# but there's only so much you can do, eh?  Unfortunately we don't
-	# have triggers like are done in rpm-land.
+	eend $?
 }
 
 src_install() {
@@ -305,26 +287,23 @@ src_install() {
 	fi
 
 	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
 	# keep in sync with 'complete ... -F' list
 	bashcomp_alias vim ex vi view rvim rview vimdiff
-
-	# We shouldn't be installing the ex or view man page symlinks, as they
-	# are managed by eselect-vi
-	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
 }
 
 pkg_postinst() {
 	# Update documentation tags (from vim-doc.eclass)
 	update_vim_helptags
 
-	# Make convenience symlinks
-	update_vim_symlinks
+	# Call eselect vi update
+	eselect_vi_update
 }
 
 pkg_postrm() {
 	# Update documentation tags (from vim-doc.eclass)
 	update_vim_helptags
 
-	# Make convenience symlinks
-	update_vim_symlinks
+	# Call eselect vi update
+	eselect_vi_update
 }
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index 288ed95e5ccb..be9a4fdae498 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -50,7 +50,9 @@ RDEPEND="
 	tcl? ( dev-lang/tcl:0= )
 	X? ( x11-libs/libXt )
 "
-DEPEND="${RDEPEND}
+
+DEPEND="
+	${RDEPEND}
 	sys-devel/autoconf
 	nls? ( sys-devel/gettext )
 "
@@ -61,7 +63,7 @@ pkg_setup() {
 	export LC_COLLATE="C"
 
 	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home
+	mkdir -p "${T}"/home || die "mkdir failed"
 	export HOME="${T}"/home
 
 	use python && python-single-r1_pkg_setup
@@ -74,17 +76,21 @@ src_prepare() {
 	fi
 
 	# Fixup a script to use awk instead of nawk
-	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
-		|| die "mve.awk sed failed"
+	sed -i -e \
+		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
 
 	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+		>> "${S}"/src/feature.h || die "echo failed"
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+		>> "${S}"/src/feature.h || die "echo failed"
 
 	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
 	# Hopefully this pattern won't break for a while at least.
 	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+	sed -i -e \
+		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
 		"${S}"/runtime/doc/syntax.txt \
 		"${S}"/runtime/doc/tagsrch.txt \
 		"${S}"/runtime/doc/usr_29.txt \
@@ -94,17 +100,21 @@ src_prepare() {
 	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
 	# this is NeXT, but it's actually just a file in dev-libs/9libs
 	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+	sed -i -e \
+		's/ libc\.h / /' \
+		"${S}"/src/configure.ac || die 'sed failed'
 
 	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
 	# correctly. To avoid some really entertaining error messages about stuff
 	# which isn't even in the source file being invalid, we'll do some trickery
 	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
 
 	# conditionally make the manpager.sh script
-	if use vim-pager ; then
-		cat <<-END > "${S}"/runtime/macros/manpager.sh
+	if use vim-pager; then
+		cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
 			#!/bin/sh
 			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
 					vim \\
@@ -112,24 +122,21 @@ src_prepare() {
 						-c 'set nolist nomod ft=man ts=8' \\
 						-c 'let g:showmarks_enable=0' \\
 						-c 'runtime! macros/less.vim' -
-			END
+			_EOF_
 	fi
 
 	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]] ; then
-		sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die "sed failed"
 	fi
 
-	if version_is_at_least 7.3.122 ; then
-		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
-	fi
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
 
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	if version_is_at_least 7.3 ; then
-		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
-			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-	fi
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
 
 	eapply_user
 }
@@ -152,16 +159,18 @@ src_configure() {
 	# (3) Notice auto/configure is newer than auto/config.mk
 	# (4) Run ./configure (with wrong args) to remake auto/config.mk
 	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -f src/auto/configure
+	rm src/auto/configure || die "rm failed"
 	emake -j1 -C src autoconf
 
 	# This should fix a sandbox violation (see bug 24447). The hvc
 	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
-		[[ -e ${file} ]] && addwrite $file
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e "${file}" ]]; then
+			addwrite $file
+		fi
 	done
 
-	if use minimal ; then
+	if use minimal; then
 		myconf=(
 			--with-features=tiny
 			--disable-nls
@@ -204,9 +213,9 @@ src_configure() {
 
 		# --with-features=huge forces on cscope even if we --disable it. We need
 		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-		if ! use cscope ; then
-			sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
-				die "couldn't disable cscope"
+		if ! use cscope; then
+			sed -i -e \
+				'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
 		fi
 
 		# don't test USE=X here ... see bug #19115
@@ -237,14 +246,14 @@ src_compile() {
 }
 
 src_test() {
-	echo
+	einfo
 	einfo "Starting vim tests. Several error messages will be shown"
 	einfo "while the tests run. This is normal behaviour and does not"
 	einfo "indicate a fault."
-	echo
+	einfo
 	ewarn "If the tests fail, your terminal may be left in a strange"
 	ewarn "state. Usually, running 'reset' will fix this."
-	echo
+	einfo
 
 	# Don't let vim talk to X
 	unset DISPLAY
@@ -252,39 +261,12 @@ src_test() {
 	emake -j1 -C src/testdir nongui
 }
 
-# Make convenience symlinks, hopefully without stepping on toes.  Some
-# of these links are "owned" by the vim ebuild when it is installed,
-# but they might be good for gvim as well (see bug 45828)
-update_vim_symlinks() {
-	local f syms
-	syms="vimdiff rvim rview"
+# Call eselect vi update with --if-unset
+# to respect user's choice (bug 187449)
+eselect_vi_update() {
 	einfo "Calling eselect vi update..."
-	# Call this with --if-unset to respect user's choice (bug 187449)
 	eselect vi update --if-unset
-
-	# Make or remove convenience symlink, vim -> gvim
-	if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
-		ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
-	elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
-		rm "${EROOT}"/usr/bin/vim
-	fi
-
-	# Make or remove convenience symlinks to vim
-	if [[ -f "${EROOT}"/usr/bin/vim ]]; then
-		for f in ${syms}; do
-			ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
-		done
-	else
-		for f in ${syms}; do
-			if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
-				rm -f "${EROOT}"/usr/bin/${f}
-			fi
-		done
-	fi
-
-	# This will still break if you merge then remove the vi package,
-	# but there's only so much you can do, eh?  Unfortunately we don't
-	# have triggers like are done in rpm-land.
+	eend $?
 }
 
 src_install() {
@@ -305,26 +287,23 @@ src_install() {
 	fi
 
 	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
 	# keep in sync with 'complete ... -F' list
 	bashcomp_alias vim ex vi view rvim rview vimdiff
-
-	# We shouldn't be installing the ex or view man page symlinks, as they
-	# are managed by eselect-vi
-	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
 }
 
 pkg_postinst() {
 	# Update documentation tags (from vim-doc.eclass)
 	update_vim_helptags
 
-	# Make convenience symlinks
-	update_vim_symlinks
+	# Call eselect vi update
+	eselect_vi_update
 }
 
 pkg_postrm() {
 	# Update documentation tags (from vim-doc.eclass)
 	update_vim_helptags
 
-	# Make convenience symlinks
-	update_vim_symlinks
+	# Call eselect vi update
+	eselect_vi_update
 }
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 73a9787ff165..ceafdd5ed3a1 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -2,10 +2,10 @@ AUX 50ebuild-mode-gentoo-1.31.el 649 SHA256 d50596cd7ff2d7e3e3315fedf48181d0d0af
 AUX 50ebuild-mode-gentoo-1.39.el 805 SHA256 1ca8b5002c5ca56bece6798b2f5e94ae6d6a9ae9fe4fbd9a005e0e27d6bee476 SHA512 8038b7bac0f3322b1149467152790dac7cd133234afe7c362c0e14686e378bc27eaf432a7194e1748dda80b41483943facb44e1a66466ebdcb4e7a0768e8f629 WHIRLPOOL 7c26ff47ffbd7e2d9697560ef9cab105bc9f3243946a375cf7f108a6b4bf1ea27be750518ce9404d175573740d63abb264626024796eb10745346dc0f4339684
 DIST ebuild-mode-1.37.tar.xz 30816 SHA256 f7368a8757036874dde542c69c26b824fe3da5241098f89a6b7d7e2665cbbf1d SHA512 1d570b213ad0c6eef8817f69c99c0862703b9bddc24477234dde542b697ba372a06bbe8e4a91179a7d528b720a7dbfc13bb92c8ea0a4d3b3b8684fa4ee0065c0 WHIRLPOOL 75928f5965bdfe66733e203588f01ab3b5de67a5958d33f41069d0793842bd9617ab0904ab71f95aeae04e0aa2f55646e4c545d6199cc1d357140b8fd1a714ab
 DIST ebuild-mode-1.38.tar.xz 30744 SHA256 63f39bb1a09e29b86e5048f162f4779f287c8825e161a092e74530962947d3c3 SHA512 bfcc4fb100f7d9299e9b466c7661e865f9b93ee352780da1647f1a98159fe3e9eeb8cd4b7d1d9906d532316d1256ec7b6f821cac3d064cda15f2fd62ca7cb349 WHIRLPOOL ea61825ac0fd2d50ec9722088b03ed9664708dd6fac076ff3db8323bfdf8d1b2e351c7059f2f77471ea200b7a19d9f67ab233ebdb743ece80218f0e940fb0706
-DIST ebuild-mode-1.39.tar.xz 34476 SHA256 15ed940d9cc600a9058ced8dcee0e88e0cd635cfe85c385e84a4b738ed70e051 SHA512 ba4f082c5b9bf8e80077f31d8134eb06d927d1f34b505a43b093832b3763a84f37136f8458d863b28d31c0512ffa7c460c1f7640f2e107f3eec3f5c95eb80da7 WHIRLPOOL ae2c4cf6783adb1dad058a84794efdd510d972a81961da21adeaf5f36cc9870ecfa80c1aa1ae8fe79e2c10c8082f9f6dc32e6e051f846dce1787843e9f0e78f5
+DIST ebuild-mode-1.40.tar.xz 34676 SHA256 fcce06f2c429989cecb50d043c50a06c28e640987aef84f5760a1c5df1793ef2 SHA512 50caa3255ff874e779f8dcb34b84845fd3b03edee35fc20df8aa3606dc2a00a4a0e88fab79f7872cfe3e92f04263ce74e60f3aeb1d97a2706116414ac9b352d5 WHIRLPOOL 369b152f1ffa6cd818fbb5be7d1ef054508056adfa1fa614d8bcbfba71c8b7f8a61e7b81ee162632cb31e4914c15c7def07bc64ef62a41eafbb9572749a35037
 EBUILD ebuild-mode-1.37.ebuild 740 SHA256 ea837984dc74d7027a9b9136a118f5c94a86ce7c1db2a70ce87e563b389cbadc SHA512 63813337bf774b92901a4b2443cb70587c9e548cdbb2e0e1e210bac256dfac49ee69e2edc34e8f0529b8e251991e0398472ac7d393f3884b95973c15dc1790cb WHIRLPOOL 4aa850e0881a510f045070c0c6211ec73ac349ed4040680f1b5555cf3eed98deeeb8ba41ac88f75aa119502ea05466326bf9a326c784fdaf37d2311513173208
-EBUILD ebuild-mode-1.38.ebuild 749 SHA256 4640a73095d22835815c4ab851deea0bc2e47c7c8832a62414954f39e498b972 SHA512 670ae3060b78111c3b0cd8db1c5515eadf7a08cd177929d2d1505742a76c78b28feec76b073d6c6ca38259abe03430efb7d5002d5ba67ecb39933f5c0540880b WHIRLPOOL 7b37aaf0e5687b29c1026b9685700c90302f38b05ab73426ac56088c60ba36c416ab6117dadd8b2f0dc2223652b383d69d8f2cfa78d307520500f863340b2f10
-EBUILD ebuild-mode-1.39.ebuild 788 SHA256 a19bdf44bffd75311bae9bbff2d30bdd9ca40c0d7bb3d1280e36653359f37a5c SHA512 1227b7747bff1bc0055e7ecd2f1779aa3434c20935728d5ca4ec77124658b5b3c92bec82d8413933f8e2e99798752bfe03bc718b467b961fbbdd177e20728dc5 WHIRLPOOL ff1d7b8df17b59febdf8b58616fdf671434217975e1bacce76696c22481398d59011561573a0a486b0cea82e123121fec3210965b21b6babe35c2bce53bfd797
+EBUILD ebuild-mode-1.38.ebuild 740 SHA256 ea837984dc74d7027a9b9136a118f5c94a86ce7c1db2a70ce87e563b389cbadc SHA512 63813337bf774b92901a4b2443cb70587c9e548cdbb2e0e1e210bac256dfac49ee69e2edc34e8f0529b8e251991e0398472ac7d393f3884b95973c15dc1790cb WHIRLPOOL 4aa850e0881a510f045070c0c6211ec73ac349ed4040680f1b5555cf3eed98deeeb8ba41ac88f75aa119502ea05466326bf9a326c784fdaf37d2311513173208
+EBUILD ebuild-mode-1.40.ebuild 749 SHA256 2a890b2a4f3edd6900fa2d0abfab087dbacbb179a8484f86f62aedb39135da33 SHA512 37a077ec8dc58e8177f4969005d5f710632d36b4dd9cb93355a75c0806ff0b57face77c90d10624cbada6d7569d7073ebcf4958a3f9a6ba8e52a0edf79b43485 WHIRLPOOL 5ce7e49def109ebbf9e3e944f690ef6e104e0d7679a031aa0d689bc29993e648cc7c02057ae3e2bd11d7a6f80240e7a57e84db856d429557d721877e3bf1d168
 MISC ChangeLog 6182 SHA256 534ab954443483d271e0034a7c8f0f4b7fcd31227cf935a43a38ca6c2f529198 SHA512 204767fddb3cd77cc6a43eb28757cf63426093cd418f5543e7470aba36cd2ad151833db54ea5fded0e967733c622dff49b7eda0537c8c13a2bc01ddc61b42fb5 WHIRLPOOL 75f30cba80d3ce29b168b987d57d2ab635ac7882ad2ee7e17ddfdb7205dd2e65f220ac1bc355409158a5eac94e142dd2a96d6980cb39bccfbf117a6621a06b1b
 MISC ChangeLog-2015 21811 SHA256 b971b78ec16e0a9c017e5bd39296c419f794c0321c456f40418283b89ca741e0 SHA512 7cf0456506133464789eb9d40a7f7aee257c7ac43db7466f5f6a9f4bbbe2e72a72ad8a4bf2643dee4cdca30de1825ed0bf39afb1c8507be56a11442a70aef17d WHIRLPOOL b8a63cf919e294ee265fa46dcfb4b1c5c7439d1d7cd934eb587310fad7ff7e60cc88ae4e0003e544bf11a885b2e88710268350bc2b7ed070298c30dc2a5aeda6
 MISC metadata.xml 403 SHA256 242dbd8dcc9a66dcc32b17fbff6a579ec4287bca3e00a0153ad19026ba73cdc2 SHA512 b6c2ed67a0eac9b03f15bc00374f925eb8ba28000f8d1ebbe03f75e26c953ef799fe73c0bc1658089e5ab687cb07e97ff8d74123b6a67cd5dd8246e81051c239 WHIRLPOOL 419be6da400846e13dfdbd1f4c74b32e82c2bf9b0c7ea620a907e5f5ce84b383a3550a9fe93922cd431cbd51e787f99269587305ff3dbaaa2a05aea20d65ecb1
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.38.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.38.ebuild
index 0c3afe1a7427..1b7fc32843be 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.38.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.38.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 DEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.39.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.39.ebuild
deleted file mode 100644
index 6d63bf881edc..000000000000
--- a/app-emacs/ebuild-mode/ebuild-mode-1.39.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit readme.gentoo-r1 elisp
-
-DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-2+ GPL-3"  # GPL-3 (only) for glep-mode.el
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-DEPEND="sys-apps/texinfo"
-
-DOCS="ChangeLog keyword-generation.sh"
-ELISP_TEXINFO="${PN}.texi"
-SITEFILE="50${PN}-gentoo-1.39.el"
-DOC_CONTENTS="Some optional features may require installation of additional
-	packages, like app-portage/gentoolkit-dev for echangelog."
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.40.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.40.ebuild
new file mode 100644
index 000000000000..4d22f1bea1c6
--- /dev/null
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.40.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit readme.gentoo-r1 elisp
+
+DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+DEPEND="sys-apps/texinfo"
+
+DOCS="ChangeLog keyword-generation.sh"
+ELISP_TEXINFO="${PN}.texi"
+SITEFILE="50${PN}-gentoo-1.39.el"
+DOC_CONTENTS="Some optional features may require installation of additional
+	packages, like app-portage/gentoolkit-dev for echangelog."
diff --git a/app-emulation/cloud-init/Manifest b/app-emulation/cloud-init/Manifest
index 00bc7a9ce464..924d8a9cc300 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -10,6 +10,7 @@ DIST cloud-init-0.7.6_p1212.tar.gz 451717 SHA256 d213ee72a62cef5ef63369737a52c0c
 DIST cloud-init-0.7.7.tar.gz 477287 SHA256 d7b75e314ecdb99619014f21f3b622294a6c3bde248887dfb5e9cedb927ad0b0 SHA512 06cd2bba67da9668204416073af771145668db43777d6f183dcb54e8e1d9d12471fe3bfc99dfbc03a81814c5614347ff7d6acc5dbe117e1206d7fc2041ae4b62 WHIRLPOOL 9fccfba02aacc138dc62a6be9547fa1e5bd6959a96eef9b7f6f1ac86112049b36751882d954ac0e8d7aa5bf9580c5e27ec9abfdc2ef542628af448c00c468a09
 DIST cloud-init-0.7.8.tar.gz 508777 SHA256 4a4f1f7fb9dd0987a02aa7cd6f609910294fce8f9724dcebc0cd88630b4f1fd6 SHA512 ff6c3837afe702359879f0ae1d7443247b0ed97d60ecf0cbe85fc364dc833e553962aae221f48becb104ad3f951a28cbd742a3b8521ef25dfb8fd19439759447 WHIRLPOOL 1881cc41ee85e69cf5169115c7449ff581f927def51aaf3df986b8e8c29baeace658bb24bc5b98fd6eab6fdb5f05ab4555ba4081b7758402089a35fe20595876
 DIST cloud-init-0.7.9.tar.gz 602188 SHA256 76edb80bf1bdbda68f8014bc057a303ae438a139bdf394e825e548d6ae39d472 SHA512 ee52909f634f51dcf9e1229a8f49faa8c562bf05b69fac108fcc80cb3217f4364a33cf696df015e4dcd7887c68cf6108729850648b4daee07b3d3247ca3cc5b1 WHIRLPOOL 02093161cd3c6930b868ed18ca2e649ebbfac57b4ba3e8dcf4cb3107775cf052c739a0aee40ac79c69511efe5b3dfe60cbc2d55d9bbad74512cdf3a31fb77261
+DIST cloud-init-17.1.tar.gz 780532 SHA256 80f3bf5e8f57b67ac599aba2856568aeb30bd25187c7a363bed157a1e4d63e01 SHA512 988cae4291c8d6a5bce012b78d651c602c02ad38c3790e9ed9aa7c815ae84c98767718ab9b0d346ddbc9c83cb886d455590128af750183618c0bf0f0c5a79564 WHIRLPOOL 13a62d556a0d96bb81ccf0daa7dc4f4527aa9d3380e542b9d5cf00efc1f18c57ecb23aedf88ceb7a85ba04e11b8addd2f779e88f53a2a971a9e95e8a1b457938
 EBUILD cloud-init-0.7.6-r1.ebuild 2585 SHA256 df26a8f48eb2eb38372485882f4327b5c3aff4410e1ff28ea285aac63cc7c67b SHA512 0c82e788cacd91e923ff57c240a3615c20157d2a4ba1fdf7d28eb6f0e9f7c55b64b3ef321dc1f2cadd40e47128d2ef0854f3488fe7aabf5cdcf3f8b326eb6ad8 WHIRLPOOL 9319eb572c5a8a698e64992f612ff193e702dc501ebf4cafb6ff50fa1c4f4801b1ca99efd73a3562bc1c66c197620a71c0a925ce2f3a9098efcdc6fd56dad548
 EBUILD cloud-init-0.7.6-r2.ebuild 1922 SHA256 abbd4a3c48cb4d88b908fdf956a593a6cc7edfea0c4d46f956a6bb67af7b954b SHA512 a3e22b4b2985670b8de5fe9af2f2ef16df626a3b3acfdf1d1656f247e44ae91b9629fc693829beb7ea931be38509b418c52f5257f24d1f02045f97735c8ff8f3 WHIRLPOOL 09badf0e47bae767077cbf9ab5a1d3d09548e09237ee12bc36244ef72d487e4ee8c1c92b5427f31661277545b1226e95013ce020f8db3e4635fc985ebb036d70
 EBUILD cloud-init-0.7.6_p1212-r1.ebuild 1989 SHA256 1152a314e3d891eee09507e1811af76cb2fab439e73e4809ed8cbc6add6c28f0 SHA512 4e71e5ff1b4a2ea8bf600d627911f7eb197d5f90f354e553996388bdef13309ceecab732b168e1f4c3bd8d5fa3dfa736a34bc535eedb55ffe6c23a6b1eb873ce WHIRLPOOL 47f7d07ac5c4db8d685f2849234ce8e78ee17c0c9e5d8e446ca5a986dee38d991ab7302cbd965d3e2940e95de21f9e63a2b3ca1863939380b1dac3fac8239535
@@ -17,7 +18,8 @@ EBUILD cloud-init-0.7.6_p1212.ebuild 1952 SHA256 0e1f41152c5e70596c0f10946cdd183
 EBUILD cloud-init-0.7.7.ebuild 2399 SHA256 726a74c4265e9d18f3599ec0f1d4518f69688af19ca224ed32efff1a9fcf0859 SHA512 1c171970b6e60cc075b3863dafbb527fe23ad2ff0005303b34dba2d5ccff640ade4cfc0bfe54f97d0dd424b95266624599fd585d8931e92ad78bf5b8dae38bce WHIRLPOOL 2511737b3a0d9d229e92595c32393f1ac6496b0ecae1de6afea02608a4465852ad34178acc047709b84d29853d44193cc5dd3e9e74c2975555799cf66406df8c
 EBUILD cloud-init-0.7.8-r2.ebuild 2547 SHA256 305353ce70285b6648611378d972ba4187f6d1fafb3d1b4b1b61ef4703b77d9c SHA512 972a04cc2c359f7271960820f4212ae1afc13def893b5bd87efe8ed30dd5f03f7219c008c9c7806f918eb7dbe3609e3c0407b7c0d5d5ad66b568abd2361ce2ec WHIRLPOOL 1cc11aa4c9eb4afc7e61365842ae2ef40cdb80235f57e3af3a0f1a6898e7d9664389faf33988b6ff317b28a2f3fb880ffcb7ff5f4c18e0b65ad93411e981c0cf
 EBUILD cloud-init-0.7.9.ebuild 2542 SHA256 6f494ba3d828db5219d273f1573808063fe64778271011e0d255ebfb714c5eb5 SHA512 11db9733a73ca6ca53189b2f768e08a471a00adb419d96b00d7a64731299aa43fe45f6b4a03e1ebe16ce7d58316b06eb96933a83b99cb19bd6a6b2453278220d WHIRLPOOL 078703b94e2cec80eb08ec9d635f2f06e257ff54bdf34f63d89bdb4ee2fbfab13922a2547684de612f1b5f5f2c1c04812dfd9b7f73bb33c6c1f8f654c9f77329
+EBUILD cloud-init-17.1.ebuild 1936 SHA256 c71c30f374e4a5ce6f1bc7c0c527c92e67198fd78155a8eaac10b027d534884c SHA512 0137be211b6d6a4bd72842255b6d87554d950936b5acb87ffd5d0c748e921222af1838c40eabc2546cf4071c8a13f442dd241f37c38069f9c9da3e15851963d9 WHIRLPOOL c3e8ea955801120fb774460ce63435911f6366ed72829cb75f0d15124f8ca38ad4dffdfc74d5c8d039c6a60d58b53279b7c2991c06d00b18fc384fdaf4d51b42
 EBUILD cloud-init-9999.ebuild 2219 SHA256 4f95c95c9814175961b50e8afb4c769cfb373e7fd76eee460feda94206b5d90d SHA512 f50bf3530aef585d11e8984a2252724d0e0a89e1b912304f26ec0a74cdbde78103eb7efb2ed4d9a7cf69c3db43970c7f40a959c5a969e85a547ce9e2a3894be5 WHIRLPOOL 95ac6e6797fa8a3f48184cc2cad12250f7add5d57eca6306eaf84904a0ca1c0c0c0429de849ebaa40b37d12850f4be4656c7269eb99e2f7014c90d0cfb6f99bc
 MISC ChangeLog 6321 SHA256 6827aba1d60badd5cca5d44c55033291eb99c1d98d3f6d2bd238a942ef06ac9e SHA512 cf30e71550bcf4d4c73d7c80691a973e8dbaaa726c5341389af3cd79d3f4e0f890d818bc2b6b9e2d2c31153669026c038e198f68382b7dab65495b55aca93f0d WHIRLPOOL 0fa6fd9fe30b196bbc3878616e7e85a377f96eb8f51a2eff5f7e7d7bd07a68654940f82a3c465d894bc6e6484cf86efcf18478234950f16cd507ced1c6ad4648
 MISC ChangeLog-2015 3361 SHA256 be1943a0d510b5b544b7e31cb630149f23093559da96b30c3933c073021b0bb7 SHA512 c2eea40c0d70371003e10986f5d674026dc325862d17793c60af3588ec81f6f54ba2d0402467e35f3c78c67d71203198029a2a1918fd028b36505277cb02c9ad WHIRLPOOL 711132a9e69fcb065186b293d3ceaef3febe8e0456466dff0d84ed497ed209ea1d144b6f20fa5b4982a5bb5eb9998c34b8ffb6f49ba23304cc35949b0015cb49
-MISC metadata.xml 561 SHA256 f4687f875ff0bb6e1c1072335f53f7deeeebc1cad46c629c7ac9d05fbca0d8f6 SHA512 76fcc7f7853794562c8a3e9359cc573d549b9bc627846bc9b9ebe67739cf4b2a97635baa7bc8fdefcf87284933d50e7f294d8e852ccfb2f5f822aa812712415c WHIRLPOOL 3c0c0e2498170ab20753a2b044f0d88c4205cd127d8223d184764d4fe16a73087bd551169c7e1b8ec7b9f60b6569427c48eb5920558020205a76026dc9d5565f
+MISC metadata.xml 578 SHA256 8f260ceade89912cd1f1468d09d0afc784716a81e3ae97d8b3835917b0e5ef4f SHA512 d7cc9ad3a86774be908102fa24f59c5b4bf42228f8c78d15887432eacdeafa2363ab34ec7446a12de28389750a222794653c3b1dfba64d680ca0288da0322599 WHIRLPOOL c4e1414bd802913d14efa25726849f779d7a6a7933106d490312cfe55fa1418158d67238f4c2949d82d5030d04d6e324a100bcee62ece3388a64ae19a3fa175a
diff --git a/app-emulation/cloud-init/cloud-init-17.1.ebuild b/app-emulation/cloud-init/cloud-init-17.1.ebuild
new file mode 100644
index 000000000000..9a77fbe60223
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-17.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1 eutils multilib systemd
+
+DESCRIPTION="cloud initialisation magic"
+HOMEPAGE="https://launchpad.net/cloud-init"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="test"
+
+CDEPEND="
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/oauthlib[${PYTHON_USEDEP}]
+	dev-python/pyserial[${PYTHON_USEDEP}]
+	>=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${CDEPEND}
+		>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/contextlib2[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	net-analyzer/macchanger
+	sys-apps/iproute2
+	sys-fs/growpart
+	virtual/logger
+"
+
+PATCHES=(  )
+
+python_test() {
+	emake test
+}
+
+python_install() {
+	distutils-r1_python_install "--init-system=sysvinit_openrc,systemd"
+}
+
+python_install_all() {
+	keepdir /etc/cloud
+
+	distutils-r1_python_install_all
+
+	# installs as non-executable
+	chmod +x "${D}"/etc/init.d/*
+
+	insinto /etc/cloud/templates
+	doins "${FILESDIR}/hosts.gentoo.tmpl"
+	insinto /etc/cloud
+	doins "${FILESDIR}/cloud.cfg"
+}
+
+pkg_postinst() {
+	elog "cloud-init-local needs to be run in the boot runlevel because it"
+	elog "modifies services in the default runlevel.  When a runlevel is started"
+	elog "it is cached, so modifications that happen to the current runlevel"
+	elog "while you are in it are not acted upon."
+}
diff --git a/app-emulation/cloud-init/metadata.xml b/app-emulation/cloud-init/metadata.xml
index 246445d7479a..7ed5f6002ad3 100644
--- a/app-emulation/cloud-init/metadata.xml
+++ b/app-emulation/cloud-init/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>alunduil@gentoo.org</email>
-		<name>Alex Brandt</name>
-	</maintainer>
-	<longdescription lang="en">
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>alunduil@gentoo.org</email>
+    <name>Alex Brandt</name>
+  </maintainer>
+  <longdescription lang="en">
     Package provides configuration and customization of cloud instance.
   </longdescription>
-	<upstream>
-		<remote-id type="launchpad">cloud-init</remote-id>
-	</upstream>
+  <upstream>
+    <remote-id type="launchpad">cloud-init</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-emulation/docker-machine/Manifest b/app-emulation/docker-machine/Manifest
index e275b82348d1..b13c7b0a4337 100644
--- a/app-emulation/docker-machine/Manifest
+++ b/app-emulation/docker-machine/Manifest
@@ -1,10 +1,6 @@
-DIST docker-machine-0.10.0.tar.gz 1605832 SHA256 ed64698723436e68341a1ebd8486006293eac306bfa8628e924b38bfcb5b039d SHA512 337ed74474b5e55e10ccd7c8bb3b778d06fc2c56c1646678715548ddeb41a0b7320212d498ad96cbdd08137f78013506b569c4e0aa0a2f28169264d64d814f7c WHIRLPOOL 06802376ba23ec1706ad09c784e3ceb70aab439d88523c2845a69a895e9a31911737bbf889f91627caae79e31cf8039265382183f7112987f0de6aea58adf138
-DIST docker-machine-0.12.0.tar.gz 1663612 SHA256 2238dbb8580ca2399c64fa6cda0089a9dde6142d4dcbb8d750aedbeee042fbfe SHA512 5fd27fcae1a44ed45db229342c93b3d53f0c193eaaf95d8f12d6e2be830c14c13154fd9338050f28b52bc0a5f8586bd72b802afc042b8d7f6c4d5dd5bc4c12ac WHIRLPOOL c0e6929447a1c6c582ce5e1aa2a01452661d9e1b9edcd43de75fd3300f200454c7b94196cf38a055befbebceb75decb7a303108ebd19e0512dae56d9ab55b6af
 DIST docker-machine-0.12.2.tar.gz 1725590 SHA256 d8b89fcaa8226bd0ed294630b12740def88c70b1924ca4cc1ea05a19b25c05a3 SHA512 58b2ed13b56034f5bfb8374397aead67c669fc544409932f6c29ca56578ad61b3f584a8f32b281cafac56a9647d6e215ab5138045c2c6810a5d202c68bfdb3b0 WHIRLPOOL 391f7dc350ff45cc8754a1f17162b78879ebd81dee38be83cda4c7f78aaccaecf5917ad55fad6e22e9540401ddb10a355a3f17e91eddf2761686981dbf86dfed
-DIST docker-machine-0.9.0.tar.gz 1603705 SHA256 8e445e70a92c98a5e73594d8aea07b31dda6fa4ed2d1e7643663f0267e05f25f SHA512 f405f4b50e493d8c3e7526e89c8b45edf9167c9c04a1dfc9dafad3070f32a9a38570f02b900ceb322a43c596558c07b8f0b060cc4afe1fe2b6b6f4af0179a779 WHIRLPOOL 39b504327264c6f0ba2268fac2fa03c1b4f5f93c9e347d6f459e4a5f6bbfe773c5c272fb63d10fb272b92aa622e7474679f67200583f10fb5156f3198b0c1adb
-EBUILD docker-machine-0.10.0.ebuild 894 SHA256 c745699ffccabe14062205652b5ad7fa27c0880dbd721779e6dd38904d75693a SHA512 c910c83ddc89c7c6d43a396820a476e405dd0222ef5cd8be7e53d11ca29833ae79ba79bdce20efebf17b22a4957d31446238fd1af00ad4391740b1198d7e9c9c WHIRLPOOL 40803d0a1c8e787548b5d218e28fef63572793c4ac8a3c869e4643e0155ca748222b49dcbaf524b4e201d2b739bc34c3c7f55cd6b69efe7c2cb0ae487d2da4f2
-EBUILD docker-machine-0.12.0.ebuild 894 SHA256 c745699ffccabe14062205652b5ad7fa27c0880dbd721779e6dd38904d75693a SHA512 c910c83ddc89c7c6d43a396820a476e405dd0222ef5cd8be7e53d11ca29833ae79ba79bdce20efebf17b22a4957d31446238fd1af00ad4391740b1198d7e9c9c WHIRLPOOL 40803d0a1c8e787548b5d218e28fef63572793c4ac8a3c869e4643e0155ca748222b49dcbaf524b4e201d2b739bc34c3c7f55cd6b69efe7c2cb0ae487d2da4f2
+DIST docker-machine-0.13.0.tar.gz 1730091 SHA256 f75f6602a6d013a7b2ae517c3bdb07d8977825c1a0506157831fcd2ae083dc25 SHA512 c31b3505e475f5e55310cc3b8805db8b94522703956a640954c3898c584fc3a07830c346535855cbb2fb10016dd0e7ef72e7174e919a3651f05e18b652132121 WHIRLPOOL 336249121f9b15011e4fbf64f11363d57718567927b8eb7b6868f544ee986b037856729925c6477330e9c38b36a2ce62ba8c94917df57fdca4e5af676aec975e
 EBUILD docker-machine-0.12.2.ebuild 904 SHA256 13d14a9bda778fb4edc00ef046e5bf1a7c588fc5696b9d89265427be1f6c3415 SHA512 1d71e0fdeec91958575e92675c16274ad82d196384fdd1276e03baf2dfd31fbe33e9f8a48d44ea3014190fbe053b03b31cd648e9c5a5eee025a43f4923762331 WHIRLPOOL 0289f74c9a9524d097439d03c5d074afdadb76bdddb0b0049c51d119d9f58cae89940cbe66f3332f401306b5bf5e14c29b20c9ee32d0f44f5adeb24e6bffbcaf
-EBUILD docker-machine-0.9.0.ebuild 904 SHA256 a2a4b9bd8ac1d6ec92287183e99fe1fc0a61bd06568b3b2da4fee6e60210d0ab SHA512 d841664501488d4c4a2fa2e98b663f5865466e44b57ce8803b091890346b3a63c4e8f0fa5be896958b97f9667003aa72bec3ccb82359069bade29213059ba618 WHIRLPOOL 168b71378b86e44f446498c1c7940279d9146852407ac99d159c9e606ce509e2acb2d7fe9427ea853496f75d54ef4a2e24fc238738bf0ac82e8b8f196845f0bf
+EBUILD docker-machine-0.13.0.ebuild 904 SHA256 13d14a9bda778fb4edc00ef046e5bf1a7c588fc5696b9d89265427be1f6c3415 SHA512 1d71e0fdeec91958575e92675c16274ad82d196384fdd1276e03baf2dfd31fbe33e9f8a48d44ea3014190fbe053b03b31cd648e9c5a5eee025a43f4923762331 WHIRLPOOL 0289f74c9a9524d097439d03c5d074afdadb76bdddb0b0049c51d119d9f58cae89940cbe66f3332f401306b5bf5e14c29b20c9ee32d0f44f5adeb24e6bffbcaf
 MISC ChangeLog 2295 SHA256 8d8a25fef31e53e0f66327f9d37540ee994eb0e69c4be866fc5771716c5af2bf SHA512 c04992c741e57a7fb39740e4c0afd5ecee13969c5490ad16f01a5a342f686596cbe796eb9f410c1d1d14f03008175a760aa89c9ae61fd41a403870c2423169fc WHIRLPOOL 55be5950c7f3ca6f4178f0a830ca43528db9f715255266a4c934b778a81351eb2791aa6a17e8e5e0e5d678b368f931051a0507a8ed8d13b314c6ea0cd6b189b5
 MISC metadata.xml 305 SHA256 ac57e0fbfac5cd756815724694163bb9c0a422772f12329e001958b853d1d2d2 SHA512 9d29b2f3f29ec6838395364bd85b38f0e54fc3a89f79041d5ddd492ef999018cff92e5ef6e6bcb5bc32cd7f57059531d10fd3ac5a5481da1fb1218081916a8bc WHIRLPOOL 193898fcd0e44d119c24769c82dcd6a6388436abc8aa4d25f87fcddf08e5a1e6644f474b4eb97ae15d123f21bc15bc17e88565c1d4946c8b9419e7568da4fcc7
diff --git a/app-emulation/docker-machine/docker-machine-0.10.0.ebuild b/app-emulation/docker-machine/docker-machine-0.10.0.ebuild
deleted file mode 100644
index 9a9deea991e6..000000000000
--- a/app-emulation/docker-machine/docker-machine-0.10.0.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
-
-EGO_PN=github.com/docker/machine
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64"
-	EGIT_COMMIT="v${PV}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="Machine management for a container-centric world"
-HOMEPAGE="https://docs.docker.com/machine/"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-DEPEND=">=dev-lang/go-1.7:="
-RDEPEND=""
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-src_prepare() {
-	eapply_user
-	# don't pre-strip binaries
-	sed -e 's|\(GO_LDFLAGS := $(GO_LDFLAGS) -w\) -s|\1|' -i mk/main.mk ||die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}" emake build || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md ROADMAP.md
-}
diff --git a/app-emulation/docker-machine/docker-machine-0.12.0.ebuild b/app-emulation/docker-machine/docker-machine-0.12.0.ebuild
deleted file mode 100644
index 9a9deea991e6..000000000000
--- a/app-emulation/docker-machine/docker-machine-0.12.0.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
-
-EGO_PN=github.com/docker/machine
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64"
-	EGIT_COMMIT="v${PV}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="Machine management for a container-centric world"
-HOMEPAGE="https://docs.docker.com/machine/"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-DEPEND=">=dev-lang/go-1.7:="
-RDEPEND=""
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-src_prepare() {
-	eapply_user
-	# don't pre-strip binaries
-	sed -e 's|\(GO_LDFLAGS := $(GO_LDFLAGS) -w\) -s|\1|' -i mk/main.mk ||die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}" emake build || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md ROADMAP.md
-}
diff --git a/app-emulation/docker-machine/docker-machine-0.13.0.ebuild b/app-emulation/docker-machine/docker-machine-0.13.0.ebuild
new file mode 100644
index 000000000000..1697e3defa68
--- /dev/null
+++ b/app-emulation/docker-machine/docker-machine-0.13.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN=github.com/docker/machine
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT="v${PV}"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Machine management for a container-centric world"
+HOMEPAGE="https://docs.docker.com/machine/"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="hardened"
+RESTRICT="test"
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+src_prepare() {
+	default
+	# don't pre-strip binaries
+	sed -e 's|\(GO_LDFLAGS := $(GO_LDFLAGS) -w\) -s|\1|' -i mk/main.mk ||die
+}
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${WORKDIR}/${P}" emake build || die
+}
+
+src_install() {
+	dobin bin/*
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md ROADMAP.md
+}
diff --git a/app-emulation/docker-machine/docker-machine-0.9.0.ebuild b/app-emulation/docker-machine/docker-machine-0.9.0.ebuild
deleted file mode 100644
index 42b0669e9d18..000000000000
--- a/app-emulation/docker-machine/docker-machine-0.9.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN=github.com/docker/machine/...
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64"
-	EGIT_COMMIT="v${PV}"
-	SRC_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="Machine management for a container-centric world"
-HOMEPAGE="https://docs.docker.com/machine/"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-DEPEND=">=dev-lang/go-1.7:="
-RDEPEND=""
-S=${WORKDIR}/${P}/src/${EGO_PN%/*}
-
-src_prepare() {
-	eapply_user
-	# don't pre-strip binaries
-	sed -e 's|\(GO_LDFLAGS := $(GO_LDFLAGS) -w\) -s|\1|' -i mk/main.mk ||die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}" emake build || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md ROADMAP.md
-}
diff --git a/app-emulation/dosemu/Manifest b/app-emulation/dosemu/Manifest
index 65f421998b70..dceaed73e9ef 100644
--- a/app-emulation/dosemu/Manifest
+++ b/app-emulation/dosemu/Manifest
@@ -6,8 +6,7 @@ AUX dosemu-1.4.1_pre20130107-ia16-ldflags.patch 1688 SHA256 5fdc3975d0c764204369
 AUX dosemu-1.4.1_pre20130107-no-glibc.patch 559 SHA256 29e59d4049e0af0ff8d97478a1e06091bea5ec700503877c4814d538fdaf70b7 SHA512 c53e3f7ed1b7a74e1112ea5507d0912ef1d16ff657aa5a03132f6b4c35ddb638ecde40ef554254f429316ffd74fc2d8afb59548d97547eeed231c80c0c057eed WHIRLPOOL 1a08dafc08d01bc168a8bcc760966246c34003ebf271fc7b13a44afaabcff8fc8efa7d4a6b4fb72a67ea9800618adae75573ee2a602bd1d08cd26c5789d73fd5
 DIST dosemu-1.4.1_pre20130107.zip 2767256 SHA256 072e1d8ea9c574b02e556d926a287c9c55b82384ed652bb8dd6f3488801901aa SHA512 eb8dcb914a74b235f2b37ff4dd5c1c84b4916ff195c7bf76cdbe6a4d5e6247c57297eef0c579f219ff7f475e727d66fa5a0f314da46d79cc97a0d794e9ad5864 WHIRLPOOL d2835f82515e40d3c85c1ee53c7add5ba055637864ee63997ec912f53862006e33b4139a253b98cb76ca3cdbd7bdca6614609d9e8e716b074283e77cd8105e3c
 DIST dosemu-freedos-1.0-bin.tgz 1205628 SHA256 080c306a1b611e1861fd64466062f268eb44d2bf38082b8a57efadb5a9c0ebc7 SHA512 d0c4235ceac55de63ce5f72e51b7d57a82b8104f4bf2df6f4dc25c9889d3337b40d75665c2dfc98492ec7123e0959a725f5c7579e145895024bd80a07036e3bd WHIRLPOOL 9e6acf38dc8fafe95a49baaaac2a97fdd02c508b7c30c60823f8af7f44aa62b8d82c92661640b4cef05fcdbea401fafea752ec4a0e439a8eff361dd41aa392d3
-EBUILD dosemu-1.4.1_pre20130107-r3.ebuild 2210 SHA256 7f564ae5815adbb8093b5b0e200ad159db4866dd7826a87a52f4e097a86678b8 SHA512 8eec21fcc4f82567453f3d8c3a9e89a9c49090c6324b9a728336f95c036d329d180fc9ad47888b0dd0fb4175b12010e61da9b9ab910506fa36ccb394b2bb4e11 WHIRLPOOL b67e61c399c17ff18bd3d400eb8bc58a2663f39f850eb63fecf8ca5a496eda266e70aafe7ad982baaabded99c1fa979bd043caceb53393c20333f16c7761852c
-EBUILD dosemu-1.4.1_pre20130107-r4.ebuild 2528 SHA256 fe335134854d8d3a46745db9c7dfc429c498b30411414699ef4c1c4130ed9f84 SHA512 fef7eade74a2c124b28029bd81ad1e9976b3578ea05a94e8a09b725b2c2cc181fcfb14ac90d5e9a778271d8aa97e7d29d754b412714bbae2cf1cb535d23439e7 WHIRLPOOL 09f2385797b7763f272ea7ef54cd69e9ac42ecc2af884b7c83903db7bd62de8e68bf9d04b0842f6472aec8f31a010c69667ff5c1b7b26b9b6255f3c3ca9b3e4a
+EBUILD dosemu-1.4.1_pre20130107-r4.ebuild 2526 SHA256 bd2402537d7061191ecc5b46b65d135f68631b2ee8e07712a23e8b32eb4a821d SHA512 bb92985c30a089cd06bcb5221e5f6e7ade17b98e7a98fdbb51a18ac6fdcbc412cd4ab834dfebfb2b8f16097796fbe8c56f3c4abda902bb2a1a4e0a8463ac4c02 WHIRLPOOL ae783002547bd3244c465e57505e54caa396aae8c1060e1b909b43b209112ac56ed3b43017e23c4ef4b5907fd4345a27f3c51a81393216eee3f85345708accd5
 MISC ChangeLog 4068 SHA256 b2fbf8843568f1ac97c02c178d3299d7e15a72c4d30e52162d741cac620e5f42 SHA512 37e3c8d1f247d2b7a54ce1537ad70f46fe97d53a0acacdba3f8c53c455a365d5feada5c0fa5f9195898a6876e665d6316bb592381dbc0891c828d2d0529933bc WHIRLPOOL 7bd2a2608b06a0a14152102d9a286fdfca527b807824c65f7d50c99502dc56952f281b0880f3d85d3052d8d6de3a36413bf9edbaeb1c405b441baf0bf7cc8aee
 MISC ChangeLog-2015 9124 SHA256 29bdd1f0271a8d9bb3cb211565ce34d27738229d11c12c4a52e54906d9ede5ac SHA512 9b70931aed528f1279c4e9e726fae2fad45b5fc6c8c6c28e46ca2048fae1b089fab8f36dc0bb285fa85f2b445d52620e38c16337a58b08571ccae5e4705b50a3 WHIRLPOOL 344e78ca239fd94b030fa076ed23395f01c09be31825caf89c7c558ab4a43ef49e134ddd4ebd124a1a8fd070f00766f8f25365fe38c1d98a831c246befc36fab
 MISC metadata.xml 432 SHA256 eee767a8db09c9f12d83195219073e5895d157b096d59308ea31c2d9313a93bc SHA512 da0538836dc326d714141ab6c7b9f00bc1604fa5b51df7d9d548a8e3d889072b3ee8890a25705e2a7c2c1c31645c0b9af85ce6a2d1e4aa142a4d83a08fd6f9d8 WHIRLPOOL 70837a0b55b4b70b260844cb6f5a69e4e12994d3aa7533c7f4638ee09caad18ccbaf02a2c51503c68a1982b89a803b6a0b1017ef59db1ced562b6b51c1c6e4b4
diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild
deleted file mode 100644
index 59a9fdf16d5e..000000000000
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic pax-utils toolchain-funcs
-
-P_FD="dosemu-freedos-1.0-bin"
-COMMIT="15cfb41ff20a052769d753c3262c57ecb050ad71"
-
-DESCRIPTION="DOS Emulator"
-HOMEPAGE="http://www.dosemu.org/"
-SRC_URI="mirror://sourceforge/dosemu/${P_FD}.tgz
-	https://sourceforge.net/code-snapshots/git/d/do/dosemu/code.git/dosemu-code-${COMMIT}.zip -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="X svga gpm debug alsa sndfile fluidsynth"
-
-RDEPEND="X? ( x11-libs/libX11
-		x11-libs/libXxf86vm
-		x11-libs/libXau
-		x11-libs/libXext
-		x11-libs/libXdmcp
-		x11-apps/xset
-		x11-apps/xlsfonts
-		x11-apps/bdftopcf
-		x11-apps/mkfontdir )
-	svga? ( media-libs/svgalib )
-	gpm? ( sys-libs/gpm )
-	alsa? ( media-libs/alsa-lib )
-	sndfile? ( media-libs/libsndfile )
-	fluidsynth? ( media-sound/fluidsynth
-		media-sound/fluid-soundfont )
-	media-libs/libsdl
-	>=sys-libs/slang-1.4"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xf86dgaproto )
-	>=sys-devel/autoconf-2.57"
-
-S="${WORKDIR}/${PN}-code-${COMMIT}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fortify.patch
-	epatch "${FILESDIR}"/${PN}-1.4.1_pre20091009-dash.patch
-	epatch "${FILESDIR}"/${P}-no-glibc.patch
-	epatch "${FILESDIR}"/${P}-flex-2.6.3.patch
-
-	epatch_user
-
-	# Has problems with -O3 on some systems
-	replace-flags -O[3-9] -O2
-
-	# This one is from media-sound/fluid-soundfont (bug #479534)
-	sed "s,/usr/share/soundfonts/default.sf2,${EPREFIX}/usr/share/sounds/sf2/FluidR3_GM.sf2,"\
-		-i src/plugin/fluidsynth/mid_o_flus.c || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with X x) \
-		$(use_with svga svgalib) \
-		$(use_enable debug) \
-		$(use_with gpm) \
-		$(use_with alsa) \
-		$(use_with sndfile) \
-		$(use_with fluidsynth) \
-		--with-fdtarball="${DISTDIR}"/${P_FD}.tgz \
-		--sysconfdir="${EPREFIX}"/etc/dosemu/ \
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_compile() {
-	emake AR=$(tc-getAR)
-}
-
-src_install() {
-	default
-
-	# r - randmmap: dosemu tries to get address mapping
-	#     exactly where asked, loops otherwise.
-	# m - allow RWX mapping: as it's an emulator / code loader
-	pax-mark -mr "${ED}/usr/bin/dosemu.bin"
-}
diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r4.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r4.ebuild
index 67e228d97944..8b5fcdc0a693 100644
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r4.ebuild
+++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/dosemu/${P_FD}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="X svga gpm debug alsa sndfile fluidsynth"
 
 RDEPEND="X? ( x11-libs/libX11
diff --git a/app-emulation/kompose/Manifest b/app-emulation/kompose/Manifest
index e1cc0a6345dd..9570deb77e9f 100644
--- a/app-emulation/kompose/Manifest
+++ b/app-emulation/kompose/Manifest
@@ -1,8 +1,4 @@
-DIST kompose-1.1.0.tar.gz 5090229 SHA256 912c6f1e1e609372e355237604cb8915d7b8b47147a3230c35ac5d9c2615eef3 SHA512 4082644a8bbe2ad23555e4d1ab72cc10f6e4cd70af3d654ee337bf344e3044b477577097886259944067959cbffc9be34140ac735c3f58f70a58ea18958fadab WHIRLPOOL 207910b2b624ad8314cad30f2759b3e0a67277623db1198c0f9db1678624ecde77b5d6cbe04de075efe4b0dc8adf216e44fe4838c18728617f95c2e0c2e70b6e
-DIST kompose-1.2.0.tar.gz 5091229 SHA256 9fb15d30c6e33025237801f401d6b57b164a142f205d48b1574edf1f9aa92434 SHA512 a01ee5366d748ddc3a21ffb31048759408968c0c51ab756b65ae4d02ae6a03041b94a23ae90e15765366c5947956d4e8e9a129ef5bf6cd74e586c6fad5ba5434 WHIRLPOOL 84dbbc9c1339e4838382fe6c23b8330866ea1a9370de93a0d5653093da454674f40471074740b4f23f61dedac2e5c2798299e2ad2800a8b3a2c2b25dd5bf8940
 DIST kompose-1.3.0.tar.gz 5166961 SHA256 c047708123b769d23cd8e68063b01b6229c5e76338ec294ba0e62a4b73ef46d8 SHA512 394cc35022d6c9f3e70cc8ff567f403fad84b54c71a0c7da856313162bf41223d7dff59abff372f7726404dec04283deb5e0c0960f966471f86607140eddb4d4 WHIRLPOOL e0300c3380e058351f6029ca158c1b8ba5a5c91fd5583dbad84dea7faff2f8f472fcb50eda9673d58c1711c7607d4abb2353fd957c18f4ffa4a5f90413a2c704
-EBUILD kompose-1.1.0.ebuild 886 SHA256 a05f028dc1cfce45d64ad62949fd28ef4702efc6191bccc8e712508a0dd317ce SHA512 9574a4a99dc574d37ce216da587d146154ff2295989eb3b5819bfe06fe4ff4c6335f83f059e1a9e7539de29734acc13d938bab5a0d9e8ba0bb10d34db882eb31 WHIRLPOOL bf8f445a54aead0c6d3c21504448a10a1845fe0436407ebb821d701987343f11e43a905cf01dbf6e8bc96937f69f104df4b9ede0549f1387777ff538bff091c4
-EBUILD kompose-1.2.0.ebuild 886 SHA256 1ae3c029d3b1d1fde1055474cecbc2e0099e7439a7f82a305e92552f2f63c834 SHA512 824599363b466e73ecdfc4ce9877e16b788c1650e330b8173203e047225ed0882c17f855e069d86447482fffa7d374b9d25f826c6f32ce61f75dfc1bf90d836a WHIRLPOOL 11593a0e0958a122b95dfba29148e00258d5056e876d5b08f58d07e8579e7c78df82c658f997f75f3b7946dc8feead9b6d18991ad31134c5a47575c67d1062a4
 EBUILD kompose-1.3.0.ebuild 886 SHA256 1ae3c029d3b1d1fde1055474cecbc2e0099e7439a7f82a305e92552f2f63c834 SHA512 824599363b466e73ecdfc4ce9877e16b788c1650e330b8173203e047225ed0882c17f855e069d86447482fffa7d374b9d25f826c6f32ce61f75dfc1bf90d836a WHIRLPOOL 11593a0e0958a122b95dfba29148e00258d5056e876d5b08f58d07e8579e7c78df82c658f997f75f3b7946dc8feead9b6d18991ad31134c5a47575c67d1062a4
 MISC ChangeLog 347 SHA256 d0790ddd06a0fb4b66cbd8218e5133b48d83123901779f34374d13cb9c2774d6 SHA512 994657458b7bca0bf26b7d6c540005ce11555537257d6411896bc6794f2795c96fde797ad2981d74b82003b69326146408690fd0138c609d2d6c0fe123437e36 WHIRLPOOL d246419da647e361abd42ac0cbc70888debfa4713ff8dfaadd7936af2491a044d8624799673b7069452172de2bc5bbc41b909044c80563f3c26bfb411f78dd33
 MISC metadata.xml 328 SHA256 784cc118763cc0c5f4c0d3d0f4ac7ee72162fa1560538ba9d6490da5edc3ac22 SHA512 e2091ec84a909ad6c2453bd832817461e39b7c355c28bd99c19d9e85dc4a621606c34066f596a68585c3762b6b156455ca012495c5c336b9ba929d163b923042 WHIRLPOOL c20bd37669f25c96efef1a8dc03c4d79abb7e05fe86d48354c192293c258efcc3bbee4342cf4c576a872ac41e8aded91590a06466e3bed875c4e77dba785838d
diff --git a/app-emulation/kompose/kompose-1.1.0.ebuild b/app-emulation/kompose/kompose-1.1.0.ebuild
deleted file mode 100644
index 157993de5ebd..000000000000
--- a/app-emulation/kompose/kompose-1.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/kubernetes/kompose"
-EGIT_COMMIT="v${PV}"
-COMPOSE_COMMIT="36652f6"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Tool to move from docker-compose to Kubernetes"
-HOMEPAGE="https://github.com/kubernetes/kompose https://kompose.io"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-RESTRICT="test"
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	GOPATH="${S}" go build -ldflags="-X github.com/kubernetes/kompose/cmd.GITCOMMIT=${COMPOSE_COMMIT}" -o bin/kompose src/${EGO_PN}/main.go || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc -r src/${EGO_PN}/{docs,{README,RELEASE,ROADMAP,CHANGELOG,CONTRIBUTING}.md}
-}
diff --git a/app-emulation/kompose/kompose-1.2.0.ebuild b/app-emulation/kompose/kompose-1.2.0.ebuild
deleted file mode 100644
index 11fd6fc9e7e1..000000000000
--- a/app-emulation/kompose/kompose-1.2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/kubernetes/kompose"
-EGIT_COMMIT="v${PV}"
-COMPOSE_COMMIT="99f88ef"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Tool to move from docker-compose to Kubernetes"
-HOMEPAGE="https://github.com/kubernetes/kompose https://kompose.io"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-RESTRICT="test"
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	GOPATH="${S}" go build -ldflags="-X github.com/kubernetes/kompose/cmd.GITCOMMIT=${COMPOSE_COMMIT}" -o bin/kompose src/${EGO_PN}/main.go || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc -r src/${EGO_PN}/{docs,{README,RELEASE,ROADMAP,CHANGELOG,CONTRIBUTING}.md}
-}
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 30444c2f7f10..e879cfa0e899 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -5,6 +5,7 @@ AUX libvirt-1.3.4-glibc-2.23.patch 2049 SHA256 8fa125da2a8e6dabf17fc47863597b2b3
 AUX libvirt-3.0.0-fix_paths_for_apparmor.patch 2904 SHA256 77ccadc9bf80b029a3105ac7609b759d5b73c40fef03d4eabcb6c6c9bd3334f9 SHA512 be4aba4b9bd44bb2f1b4f269f573caafce746783e0a7c08ff72d03a96b9675261346ededaf1d6b6c89afaa6d2b88fe7fb0d9f120d40fd714179e6f9d209a6724 WHIRLPOOL 917b54d20a1a2567052de25f08b8296b392002292303eee11acfee486eb8437a767695325adc63a08f239edcbdceae9787f63cdebb313631c7e6880c97a54caf
 AUX libvirt-3.1.0-musl-fix-includes.patch 221 SHA256 40b1814d2a1d05a987242af46592a74feb612ccb3f064e93984bdad29d9c1fc7 SHA512 876c7dacedcce1d69938779b978b3a23b2f51128f121b4aa53f5f301d7740f90d77f335523210ed492b68b5f7a0b864b25a694ee562fb5e8ab1b6411d3da48e7 WHIRLPOOL d9d7f57cee28f1f6149f6de6f853f08679cbb9b3e82b019ff6046da525c1768ea3f7ef34cf3afa6033e87f80e8f5c74e5f2d129122d8df6edb371e743a3a3af5
 AUX libvirt-3.6.0-ssh-malicious-hostname-fix.patch 1770 SHA256 6dd8209b02a14f4db4cd4b3903d62418bec4a200b2c85eb597266eefc4fb0814 SHA512 177a85183d9a4b3e2a8be523cfd10c8dd8e7988aca69864c3ff55ebaf5576eebf904317ac0814e588be21909b21c1deb1dfca13f84f3af54ebbdb55e8f12f562 WHIRLPOOL 1935e293c8a438b326b6c617fd695f93e92c99b6bca13c7815a62ae04bc7c2dba885763595b02a7d4ec4f3235124ff03cea704f4e56ac7c613edbeca847c9225
+AUX libvirt-3.8.0-CVE-2017-1000256.patch 3737 SHA256 af14abe57e4764eb35df8e104f992132e0ca9797d5b470adde6515f6c7c95c10 SHA512 2c3e88670ec9531207c60b89e8e2ec6188834e795cd0e698d63781209182801209d4097fd72607166853b54a9f301a160b575f757741da5aeb995d752bbcb80a WHIRLPOOL 61cfac579defb75b2d92622c3fafc25036f9b3d5260e296941188d541327b381397b4bf996c9e5c5b624aae82a76b43798bf3253b66d26e3f7f3e5fba70273f9
 AUX libvirt-guests.confd 2430 SHA256 d5f85bb8c1d2010347f23badc422e98046b97a0066254739b5829fce07837d63 SHA512 78f419a89de7aabaad860903c24f1c070786fc1296d987e61dd537705b0e7f71a46c315888028f3826c3417e42861ca8471788be4ec5695e98427c5f18ae63fc WHIRLPOOL 4f06b9319f52b872f14f86da9aeeafecf176c46755955c7773badd0df239fdd76efaff50921565154fa24896d0e4b07df788e785ed6ff5f2308c0ba0e79a9418
 AUX libvirt-guests.init-r2 5412 SHA256 f78ced5ebe644522c6ce102b3f6bcf932686243a50629559f988548c570cad3a SHA512 0f46ec5776c61d1776248779fa894b1a6d7b98d0eb8e8374b320c785c25d92468f087e350233b9152eb2cd0680f6b334c3a61684dabc7c5b559d3b55fdcb712d WHIRLPOOL 77ce5c6e615c94b437f13f8bfb2689cea7b8231a4aa227e83944fd66793a3daf0ada8c041c358f38c2f676dfc7fb071880df682dcc759f63e8e20f033e141d39
 AUX libvirtd.confd-r5 740 SHA256 4f7fba7e64533868119c0f3355aa22932e163b208397323dc2cd96daadcc4079 SHA512 98f935589dbc5f2a99329f77fdf84c563fa0dc99404b7476603679478d68ce8dbea2c88645251d3c28f59e7bcae124ae632972146e8a8c3e0e9fcbfb27296f91 WHIRLPOOL cc40f10c1ab440efff318f4cac95c0923dfb3309e727d3de4a5dd5cd95181da76a6f1de4ad6740b99d0b65b6bbf5a5128ce24288f77a91268e74d2e8d8e95e49
@@ -14,10 +15,10 @@ AUX libvirtd.tmpfiles.conf 36 SHA256 0102a9bbbb6fc9764c2d49933a89d1661b3999aec53
 AUX virtlockd.init-r1 570 SHA256 23ddea66fb2d85c17c382daa07abfabe7fa57d62406d2ca5df0c755f5dcc3834 SHA512 65a05d406200da9a534df5caa1b9cb2af97f0b03f64e6b4157322975fa754f59ae74fff9ec8301a6c0510e4b75e2b72a78cddf004a76109e18c375e83527cee5 WHIRLPOOL 7959e426986747165ef074ca52b8049aa4120b0206b7532330346552fe5811a46fa71b58e02fcd37e55b872e099ccc8688fcc3f30b2e2316e01a4220806d49b4
 AUX virtlogd.init-r1 569 SHA256 1647c11779fd874bdc115234bae0f0f65278084541473d2825aa9864ad49f939 SHA512 0a3e083e742f9e0d8206ab9a48c63bbd395bdc24e5551e2cbeddffa3fb576a817b73dbafe646c392a35c354d6b65426a9b6f3ce3dcafc30077715e90684968c1 WHIRLPOOL e0fa334c60dac4aa1ff721c3c4e957a688e0a58297cb06249de50dd838c55eee3c1c00fcb4b1c06b74c1fb61c52354889a09bd2793c8623faa120489cac95c3a
 DIST libvirt-3.6.0.tar.xz 14797704 SHA256 3a2c97f6950796f300f6a2e0404f4de8e51c3b9430cdb82738439adb0ac59e3d SHA512 6cde735a18cb71c9e6dbb25cd2a8f9c72d55ad7d74bdf97b00d784593f0bc59498917fb235ce04de4428899241520d87bf19c015b80282b3d0c12918d9b8b288 WHIRLPOOL 8185ad998158bac9aa6bc0dd0f590a3d9fb393ad94d308bdc84e60ac5c56e110d5f4a2355e2a10b01a6521d8261ae7484aee275e12a17cc7f2830f169e990596
-DIST libvirt-3.7.0.tar.xz 14803752 SHA256 4e7bcb209eeef99f026484293abc733e30ed06dabcdde62c4c3e95f71b2b67ba SHA512 b3f7021ef4c6954430f8fa503f0c49e3df4f662b228cb631ba2c2139ecec2307dde6cec05037cc28663e82ab1001296c20c5c68acd183cd364dd484a7746f498 WHIRLPOOL 93ae283bd9048983ea6f1bb9572a94313b40c0d7e82c8d61fc36c6b2fde6b2d1a16333a2ac89ef0675130eda07b5268d2ed3ddaef8305dd04858291559b95850
+DIST libvirt-3.8.0.tar.xz 14868712 SHA256 73eba834089ed0ce74e3183a7f12cf0c6f7de08e9a700b5456c62fb124f903f9 SHA512 fc48f29b493a5ec2b3586f6c5df0b8cb81f3f26be847bc42acfb6481d45970edc760dda0232ad57b95b8cf13382d0269dd3edf4a744040cda15b835d32d8c672 WHIRLPOOL af36d20c2713398f0d7aaf1b9fc2bcf978abc096d3070cb7cb1efa6680204e591e02b03340f4d862f6e7d1fabd4135cba23eef8ccd459264a44a052acf0e509e
 EBUILD libvirt-3.6.0.ebuild 9705 SHA256 5d9511479f979dce30eef8ddc68a80b0e602461a459b8dd71f637d6628a44061 SHA512 e44a8cdfc9d9070c726610d6ec2f4191fdbc19fb2e3dceff4ac2a232aa73d43d8a7a2548909906c0d5d273c23e3fd2762d8a7379cdfa03a539d09d36d38dd9d9 WHIRLPOOL af6d2497a375d6639b3c0903abdc8c0cf1122b62a03de0825ade097eed2acefd18acc3781e3a05fc9a27afe26ddf69a5ae497ffc3b98cc00556674aaef84adc1
-EBUILD libvirt-3.7.0.ebuild 9633 SHA256 77b30ad103039e78f1ba2feebddc3e4760d85516e22a16e00182aa0810c4f2d3 SHA512 676e228e30c94d0ffda19443de127e5d1df224a25b04d6543329b63eca52faef7a13493bb680e55bfcb9c5df29d6786b5a7ae22886d7bf60fa37e338a8147bd9 WHIRLPOOL bde33afb6b43120c9853f799b08a68f0298ae6a9e424d222391aedf34180c9a6b224e586bc484d297993d8c920dedd2c1c3b4027afe6c33c711322e908e89aa8
-EBUILD libvirt-9999.ebuild 9559 SHA256 4cfbe31874591a16b09c161b1de03dd93e9f055a9ffe8c291988993188a6c88e SHA512 c371eebaba49abe6018f69faf9f41c6b7801efb36f2ddd52474f3ea692bd0dd6d3b6dfcd9565036f91f2cccfc4d62ce804207b6804914b47ff5ef60037ba03eb WHIRLPOOL d126e9a509c39a4bf6f3cdc7f7a4fee1166a3fe1d8739ae31352b4b1197c5a8cf9f51d45656c3492e26ebbe5286f3e734df42eb21cf41ec77183d27e6f00e5e4
+EBUILD libvirt-3.8.0-r1.ebuild 9654 SHA256 18017ad471d8ba23b78489d29d6bb5f5833c6ade99fcf418b848d04b966eaa32 SHA512 81d1abce5b9fc4b3705b59d12d0383e178d0a443952ee8828d08fd4ba2c890129c6cae25d188ffe8bf19fbd8221073488fa6c57b41968b689ece539f0bca7e1b WHIRLPOOL cfff4b177ac911a659855445fe2842428dbdcedf1f403890a8049d5a418468847b7a8fa013fc2ae5898ddff9ba07062ff77e1286e6b74dee2593a4dc8936f3a8
+EBUILD libvirt-9999.ebuild 9506 SHA256 d5af8cfea0f8f40cb4c1e474a64709440cd5fc31672af9be7bc607fcec880f04 SHA512 669472ae963372efc043f20dcf3a38d06fcdf45eb80ca13c7b76e6fed35590255206731ebd4a42b95017399bba309d49e734c14c07c9b5dc22cc7ae7819dbac2 WHIRLPOOL 1158f1338973b99a1dc518aae73e50015fff4cc2a7d8afee086784525571b2668b76dd5f6eaf5391d8a80d6817f4d8c5caf363d93e758b89202ee73e4c047f43
 MISC ChangeLog 27207 SHA256 94b83a13739094fab2b993a9a833e735422f1117aa3511fc399ef7449977cbe4 SHA512 36eda4a70d13b8e06fc293ae0a31e0841e0bbb541b3c8294e9a3f341957739208836f353175cba6ff6f3b9f99c41d6be6ab69909812a5d28f2b3b79b6e386fa0 WHIRLPOOL 8721914e310158f81b907583aaeac8d2000a3db9e63f761cd7ee9674ec7834f953f9ffa248a06938d5af5ae98aee304a1e53467e8d134ebf56351ff37aaaaa48
 MISC ChangeLog-2015 33229 SHA256 9b5ab13f86ef62f4eead3fc3ce0a20da725cf43437e4edc24c606fa56ca46831 SHA512 e1209249689918947d066bb91245d851f39a48b78819cb3265aa36cbe5e678e8374ef7a6279dffe678b7264a4d53aecf1d5e4f4e690e4a70df32dd84a067571a WHIRLPOOL 94ef57fc540991bc6fc9442a3d74cd6e7c10bccfee41275fca6ae4286fa73ef8bf1d9c1e9d76f10a6c2548250f5d1e72a9c1776c7b504efd9325f61b09bee55d
 MISC metadata.xml 3766 SHA256 66a0ada4191fa3c10cf6b50c8d42bec0c4fe41c0fbc4453f3f48b09355756c16 SHA512 10d96f652bdcf32e34ea415a37de0c3c4aae3a716403a0ca73228af640788734119cbf4ade26a450cc3cda81ef6182391a6f590a851a6834d52394b7c81c49ed WHIRLPOOL 1d69d7520f3e228e730c1cb035996b5a3ba27bd7e4bfcb92703de69b16eb4f5c0dd7631cce75076bd8e98e61fca68802f4262e2f76a88818eca11b2e2bdc3b1b
diff --git a/app-emulation/libvirt/files/libvirt-3.8.0-CVE-2017-1000256.patch b/app-emulation/libvirt/files/libvirt-3.8.0-CVE-2017-1000256.patch
new file mode 100644
index 000000000000..8c347cd799ad
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-3.8.0-CVE-2017-1000256.patch
@@ -0,0 +1,74 @@
+From 441d3eb6d1be940a67ce45a286602a967601b157 Mon Sep 17 00:00:00 2001
+From: "Daniel P. Berrange" <berrange@redhat.com>
+Date: Thu, 5 Oct 2017 17:54:28 +0100
+Subject: [PATCH] qemu: ensure TLS clients always verify the server certificate
+
+The default_tls_x509_verify (and related) parameters in qemu.conf
+control whether the QEMU TLS servers request & verify certificates
+from clients. This works as a simple access control system for
+servers by requiring the CA to issue certs to permitted clients.
+This use of client certificates is disabled by default, since it
+requires extra work to issue client certificates.
+
+Unfortunately the code was using this configuration parameter when
+setting up both TLS clients and servers in QEMU. The result was that
+TLS clients for character devices and disk devices had verification
+turned off, meaning they would ignore errors while validating the
+server certificate.
+
+This allows for trivial MITM attacks between client and server,
+as any certificate returned by the attacker will be accepted by
+the client.
+
+This is assigned CVE-2017-1000256  / LSN-2017-0002
+
+Reviewed-by: Eric Blake <eblake@redhat.com>
+Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
+---
+ src/qemu/qemu_command.c                                                 | 2 +-
+ tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args     | 2 +-
+ .../qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args                 | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index 46f0bdd18..f68b82d08 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -721,7 +721,7 @@ qemuBuildTLSx509BackendProps(const char *tlspath,
+     if (virJSONValueObjectCreate(propsret,
+                                  "s:dir", path,
+                                  "s:endpoint", (isListen ? "server": "client"),
+-                                 "b:verify-peer", verifypeer,
++                                 "b:verify-peer", (isListen ? verifypeer : true),
+                                  NULL) < 0)
+         goto cleanup;
+ 
+diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args
+index 5aff7734e..ab5f7e27f 100644
+--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args
++++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args
+@@ -26,7 +26,7 @@ server,nowait \
+ localport=1111 \
+ -device isa-serial,chardev=charserial0,id=serial0 \
+ -object tls-creds-x509,id=objcharserial1_tls0,dir=/etc/pki/libvirt-chardev,\
+-endpoint=client,verify-peer=no \
++endpoint=client,verify-peer=yes \
+ -chardev socket,id=charserial1,host=127.0.0.1,port=5555,\
+ tls-creds=objcharserial1_tls0 \
+ -device isa-serial,chardev=charserial1,id=serial1 \
+diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args
+index 91f1fe0cd..2567abbfa 100644
+--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args
++++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args
+@@ -31,7 +31,7 @@ localport=1111 \
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -object tls-creds-x509,id=objcharserial1_tls0,dir=/etc/pki/libvirt-chardev,\
+-endpoint=client,verify-peer=no,passwordid=charserial1-secret0 \
++endpoint=client,verify-peer=yes,passwordid=charserial1-secret0 \
+ -chardev socket,id=charserial1,host=127.0.0.1,port=5555,\
+ tls-creds=objcharserial1_tls0 \
+ -device isa-serial,chardev=charserial1,id=serial1 \
+-- 
+2.13.6
+
diff --git a/app-emulation/libvirt/libvirt-3.7.0.ebuild b/app-emulation/libvirt/libvirt-3.7.0.ebuild
deleted file mode 100644
index 8df3d9b0ab59..000000000000
--- a/app-emulation/libvirt/libvirt-3.7.0.ebuild
+++ /dev/null
@@ -1,381 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils user linux-info systemd readme.gentoo-r1
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
-	SRC_URI=""
-	KEYWORDS=""
-	SLOT="0"
-else
-	# Versions with 4 numbers are stable updates:
-	if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
-		SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.xz"
-	else
-		SRC_URI="http://libvirt.org/sources/${P}.tar.xz"
-	fi
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	SLOT="0/${PV}"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-LICENSE="LGPL-2.1"
-IUSE="
-	apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm
-	libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit
-	+qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network
-	wireshark-plugins xen zeroconf zfs elibc_glibc
-"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	policykit? ( dbus )
-	qemu? ( libvirtd )
-	uml? ( libvirtd )
-	vepa? ( macvtap )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="
-	app-misc/scrub
-	dev-libs/libgcrypt:0
-	dev-libs/libnl:3
-	>=dev-libs/libxml2-2.7.6
-	|| ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 )
-	>=net-libs/gnutls-1.0.25:0=
-	net-libs/libssh2
-	>=net-misc/curl-7.18.0
-	sys-apps/dmidecode
-	>=sys-apps/util-linux-2.17
-	sys-devel/gettext
-	sys-libs/ncurses:0=
-	sys-libs/readline:=
-	apparmor? ( sys-libs/libapparmor )
-	audit? ( sys-process/audit )
-	caps? ( sys-libs/libcap-ng )
-	dbus? ( sys-apps/dbus )
-	elibc_glibc? ( sys-libs/glibc[rpc(+)] )
-	firewalld? ( net-firewall/firewalld )
-	fuse? ( >=sys-fs/fuse-2.8.6:= )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-	iscsi? ( sys-block/open-iscsi )
-	libssh? ( net-libs/libssh )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-	nfs? ( net-fs/nfs-utils )
-	numa? (
-		>sys-process/numactl-2.0.2
-		sys-process/numad
-	)
-	parted? (
-		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2[-device-mapper-only(-)]
-	)
-	pcap? ( >=net-libs/libpcap-1.0.0 )
-	policykit? ( >=sys-auth/polkit-0.9 )
-	qemu? (
-		>=app-emulation/qemu-0.13.0
-		dev-libs/yajl
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virt-network? (
-		net-dns/dnsmasq[script]
-		net-firewall/ebtables
-		>=net-firewall/iptables-1.4.10[ipv6]
-		net-misc/radvd
-		sys-apps/iproute2[-minimal]
-	)
-	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
-	wireshark-plugins? ( net-analyzer/wireshark:= )
-	xen? (
-		app-emulation/xen
-		app-emulation/xen-tools:=
-	)
-	udev? (
-		virtual/udev
-		>=x11-libs/libpciaccess-0.10.9
-	)
-	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
-	zfs? ( sys-fs/zfs )"
-
-DEPEND="${RDEPEND}
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch
-	"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-3.0.0-fix_paths_for_apparmor.patch
-	"${FILESDIR}"/${PN}-1.3.4-glibc-2.23.patch
-	"${FILESDIR}"/${PN}-3.1.0-musl-fix-includes.patch          # bug #609488
-)
-
-pkg_setup() {
-	if use qemu; then
-		enewgroup qemu 77
-		enewuser qemu 77 -1 -1 "qemu,kvm"
-	fi
-
-	use policykit && enewgroup libvirt
-
-	# Check kernel configuration:
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+="
-		~FUSE_FS"
-
-	use lvm && CONFIG_CHECK+="
-		~BLK_DEV_DM
-		~DM_MULTIPATH
-		~DM_SNAPSHOT"
-
-	use lxc && CONFIG_CHECK+="
-		~BLK_CGROUP
-		~CGROUP_CPUACCT
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~CGROUP_NET_PRIO
-		~CGROUP_PERF
-		~CGROUPS
-		~CGROUP_SCHED
-		~CPUSETS
-		~IPC_NS
-		~MACVLAN
-		~NAMESPACES
-		~NET_CLS_CGROUP
-		~NET_NS
-		~PID_NS
-		~POSIX_MQUEUE
-		~SECURITYFS
-		~USER_NS
-		~UTS_NS
-		~VETH
-		~!GRKERNSEC_CHROOT_MOUNT
-		~!GRKERNSEC_CHROOT_DOUBLE
-		~!GRKERNSEC_CHROOT_PIVOT
-		~!GRKERNSEC_CHROOT_CHMOD
-		~!GRKERNSEC_CHROOT_CAPS"
-
-	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-		~DEVPTS_MULTIPLE_INSTANCES"
-
-	use macvtap && CONFIG_CHECK+="
-		~MACVTAP"
-
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_MARK_T
-		~BRIDGE_NF_EBTABLES
-		~NETFILTER_ADVANCED
-		~NETFILTER_XT_CONNMARK
-		~NETFILTER_XT_MARK
-		~NETFILTER_XT_TARGET_CHECKSUM"
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	# Handle specific kernel versions for different features
-	kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
-	if kernel_is ge 3 6; then
-		CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
-		kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
-	fi
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	touch "${S}/.mailmap"
-
-	default
-
-	if [[ ${PV} = *9999* ]]; then
-		# git checkouts require bootstrapping to create the configure script.
-		# Additionally the submodules must be cloned to the right locations
-		# bug #377279
-		./bootstrap || die "bootstrap failed"
-		(
-			git submodule status | sed 's/^[ +-]//;s/ .*//'
-			git hash-object bootstrap.conf
-		) >.git-module-status
-	fi
-
-	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-e "s/USE_FLAG_AVAHI/$(usex zeroconf 'use avahi-daemon' '')/" \
-		-e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \
-		-e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with apparmor)
-		$(use_with apparmor apparmor-profiles)
-		$(use_with audit)
-		$(use_with caps capng)
-		$(use_with dbus)
-		$(use_with firewalld)
-		$(use_with fuse)
-		$(use_with glusterfs)
-		$(use_with glusterfs storage-gluster)
-		$(use_with iscsi storage-iscsi)
-		$(use_with libvirtd)
-		$(use_with libssh)
-		$(use_with lvm storage-lvm)
-		$(use_with lvm storage-mpath)
-		$(use_with lxc)
-		$(use_with macvtap)
-		$(use_enable nls)
-		$(use_with numa numactl)
-		$(use_with numa numad)
-		$(use_with openvz)
-		$(use_with parted storage-disk)
-		$(use_with pcap libpcap)
-		$(use_with phyp)
-		$(use_with policykit polkit)
-		$(use_with qemu)
-		$(use_with qemu yajl)
-		$(use_with rbd storage-rbd)
-		$(use_with sasl)
-		$(use_with selinux)
-		$(use_with udev)
-		$(use_with uml)
-		$(use_with vepa virtualport)
-		$(use_with virt-network network)
-		$(use_with wireshark-plugins wireshark-dissector)
-		$(use_with xen)
-		$(use_with xen xen-inotify)
-		$(use_with xen libxl)
-		$(use_with zeroconf avahi)
-		$(use_with zfs storage-zfs)
-
-		--without-hal
-		--without-netcf
-		--without-sanlock
-		--without-xenapi
-
-		--with-esx
-		--with-init-script=systemd
-		--with-qemu-group=$(usex caps qemu root)
-		--with-qemu-user=$(usex caps qemu root)
-		--with-remote
-		--with-storage-fs
-		--with-vmware
-
-		--disable-static
-		--disable-werror
-
-		--with-html-subdir=${PF}/html
-		--localstatedir=/var
-	)
-
-	if use virtualbox && has_version app-emulation/virtualbox-ose; then
-		myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
-	else
-		myeconfargs+=( $(use_with virtualbox vbox) )
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	if [[ ${PV} = *9999* ]]; then
-		# Restore gnulib's config.sub and config.guess
-		# bug #377279
-		(cd .gnulib && git reset --hard > /dev/null)
-	fi
-}
-
-src_test() {
-	cd "${BUILD_DIR}"
-
-	# remove problematic tests, bug #591416, bug #591418
-	sed -i -e 's#commandtest$(EXEEXT) # #' \
-		-e 's#virfirewalltest$(EXEEXT) # #' \
-		-e 's#nwfilterebiptablestest$(EXEEXT) # #' \
-		-e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
-		tests/Makefile
-
-	export VIR_TEST_DEBUG=1
-	HOME="${T}" emake check || die "tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
-
-	find "${D}" -name '*.la' -delete || die
-
-	# Remove bogus, empty directories. They are either not used, or
-	# libvirtd is able to create them on demand
-	rm -rf "${D}"/etc/sysconfig
-	rm -rf "${D}"/var/cache
-	rm -rf "${D}"/var/run
-	rm -rf "${D}"/var/log
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	systemd_install_serviced \
-		"${FILESDIR}"/libvirtd.service.conf libvirtd.service
-
-	systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-	newinitd "${S}/libvirtd.init" libvirtd || die
-	newinitd "${FILESDIR}/libvirt-guests.init-r2" libvirt-guests || die
-	newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
-	newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
-
-	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
-	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# we only ever want to generate this once
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
-	fi
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/libvirt/libvirt-3.8.0-r1.ebuild b/app-emulation/libvirt/libvirt-3.8.0-r1.ebuild
new file mode 100644
index 000000000000..7ac23060bb18
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-3.8.0-r1.ebuild
@@ -0,0 +1,381 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils user linux-info systemd readme.gentoo-r1
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
+	SRC_URI=""
+	KEYWORDS=""
+	SLOT="0"
+else
+	# Versions with 4 numbers are stable updates:
+	if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
+		SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.xz"
+	else
+		SRC_URI="http://libvirt.org/sources/${P}.tar.xz"
+	fi
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	SLOT="0/${PV}"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+LICENSE="LGPL-2.1"
+IUSE="
+	apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm
+	libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit
+	+qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network
+	wireshark-plugins xen zeroconf zfs
+"
+
+REQUIRED_USE="
+	firewalld? ( virt-network )
+	libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	policykit? ( dbus )
+	qemu? ( libvirtd )
+	uml? ( libvirtd )
+	vepa? ( macvtap )
+	virt-network? ( libvirtd )
+	virtualbox? ( libvirtd )
+	xen? ( libvirtd )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent
+RDEPEND="
+	app-misc/scrub
+	dev-libs/libgcrypt:0
+	dev-libs/libnl:3
+	>=dev-libs/libxml2-2.7.6
+	|| ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 )
+	>=net-libs/gnutls-1.0.25:0=
+	net-libs/libssh2
+	>=net-misc/curl-7.18.0
+	sys-apps/dmidecode
+	>=sys-apps/util-linux-2.17
+	sys-devel/gettext
+	sys-libs/ncurses:0=
+	sys-libs/readline:=
+	apparmor? ( sys-libs/libapparmor )
+	audit? ( sys-process/audit )
+	caps? ( sys-libs/libcap-ng )
+	dbus? ( sys-apps/dbus )
+	firewalld? ( net-firewall/firewalld )
+	fuse? ( >=sys-fs/fuse-2.8.6:= )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+	iscsi? ( sys-block/open-iscsi )
+	libssh? ( net-libs/libssh )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
+	nfs? ( net-fs/nfs-utils )
+	numa? (
+		>sys-process/numactl-2.0.2
+		sys-process/numad
+	)
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2[-device-mapper-only(-)]
+	)
+	pcap? ( >=net-libs/libpcap-1.0.0 )
+	policykit? ( >=sys-auth/polkit-0.9 )
+	qemu? (
+		>=app-emulation/qemu-0.13.0
+		dev-libs/yajl
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	virt-network? (
+		net-dns/dnsmasq[script]
+		net-firewall/ebtables
+		>=net-firewall/iptables-1.4.10[ipv6]
+		net-misc/radvd
+		sys-apps/iproute2[-minimal]
+	)
+	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
+	wireshark-plugins? ( net-analyzer/wireshark:= )
+	xen? (
+		app-emulation/xen
+		app-emulation/xen-tools:=
+	)
+	udev? (
+		virtual/udev
+		>=x11-libs/libpciaccess-0.10.9
+	)
+	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
+	zfs? ( sys-fs/zfs )"
+
+DEPEND="${RDEPEND}
+	app-text/xhtml1
+	dev-lang/perl
+	dev-libs/libxslt
+	dev-perl/XML-XPath
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch
+	"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
+	"${FILESDIR}"/${PN}-3.0.0-fix_paths_for_apparmor.patch
+	"${FILESDIR}"/${PN}-1.3.4-glibc-2.23.patch
+	"${FILESDIR}"/${PN}-3.1.0-musl-fix-includes.patch          # bug #609488
+	"${FILESDIR}"/${PN}-3.8.0-CVE-2017-1000256.patch           # bug #635174
+)
+
+pkg_setup() {
+	if use qemu; then
+		enewgroup qemu 77
+		enewuser qemu 77 -1 -1 "qemu,kvm"
+	fi
+
+	use policykit && enewgroup libvirt
+
+	# Check kernel configuration:
+	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+="
+		~FUSE_FS"
+
+	use lvm && CONFIG_CHECK+="
+		~BLK_DEV_DM
+		~DM_MULTIPATH
+		~DM_SNAPSHOT"
+
+	use lxc && CONFIG_CHECK+="
+		~BLK_CGROUP
+		~CGROUP_CPUACCT
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~CGROUP_NET_PRIO
+		~CGROUP_PERF
+		~CGROUPS
+		~CGROUP_SCHED
+		~CPUSETS
+		~IPC_NS
+		~MACVLAN
+		~NAMESPACES
+		~NET_CLS_CGROUP
+		~NET_NS
+		~PID_NS
+		~POSIX_MQUEUE
+		~SECURITYFS
+		~USER_NS
+		~UTS_NS
+		~VETH
+		~!GRKERNSEC_CHROOT_MOUNT
+		~!GRKERNSEC_CHROOT_DOUBLE
+		~!GRKERNSEC_CHROOT_PIVOT
+		~!GRKERNSEC_CHROOT_CHMOD
+		~!GRKERNSEC_CHROOT_CAPS"
+
+	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
+		~DEVPTS_MULTIPLE_INSTANCES"
+
+	use macvtap && CONFIG_CHECK+="
+		~MACVTAP"
+
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_MARK_T
+		~BRIDGE_NF_EBTABLES
+		~NETFILTER_ADVANCED
+		~NETFILTER_XT_CONNMARK
+		~NETFILTER_XT_MARK
+		~NETFILTER_XT_TARGET_CHECKSUM"
+	# Bandwidth Limiting Support
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_T_NAT
+		~NET_ACT_POLICE
+		~NET_CLS_FW
+		~NET_CLS_U32
+		~NET_SCH_HTB
+		~NET_SCH_INGRESS
+		~NET_SCH_SFQ"
+
+	# Handle specific kernel versions for different features
+	kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+	if kernel_is ge 3 6; then
+		CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
+		kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
+	fi
+
+	ERROR_USER_NS="Optional depending on LXC configuration."
+
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	touch "${S}/.mailmap"
+
+	default
+
+	if [[ ${PV} = *9999* ]]; then
+		# git checkouts require bootstrapping to create the configure script.
+		# Additionally the submodules must be cloned to the right locations
+		# bug #377279
+		./bootstrap || die "bootstrap failed"
+		(
+			git submodule status | sed 's/^[ +-]//;s/ .*//'
+			git hash-object bootstrap.conf
+		) >.git-module-status
+	fi
+
+	# Tweak the init script:
+	cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die
+	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+		-e "s/USE_FLAG_AVAHI/$(usex zeroconf 'use avahi-daemon' '')/" \
+		-e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \
+		-e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \
+		-i "${S}/libvirtd.init" || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with apparmor)
+		$(use_with apparmor apparmor-profiles)
+		$(use_with audit)
+		$(use_with caps capng)
+		$(use_with dbus)
+		$(use_with firewalld)
+		$(use_with fuse)
+		$(use_with glusterfs)
+		$(use_with glusterfs storage-gluster)
+		$(use_with iscsi storage-iscsi)
+		$(use_with libvirtd)
+		$(use_with libssh)
+		$(use_with lvm storage-lvm)
+		$(use_with lvm storage-mpath)
+		$(use_with lxc)
+		$(use_with macvtap)
+		$(use_enable nls)
+		$(use_with numa numactl)
+		$(use_with numa numad)
+		$(use_with openvz)
+		$(use_with parted storage-disk)
+		$(use_with pcap libpcap)
+		$(use_with phyp)
+		$(use_with policykit polkit)
+		$(use_with qemu)
+		$(use_with qemu yajl)
+		$(use_with rbd storage-rbd)
+		$(use_with sasl)
+		$(use_with selinux)
+		$(use_with udev)
+		$(use_with uml)
+		$(use_with vepa virtualport)
+		$(use_with virt-network network)
+		$(use_with wireshark-plugins wireshark-dissector)
+		$(use_with xen)
+		$(use_with xen xen-inotify)
+		$(use_with xen libxl)
+		$(use_with zeroconf avahi)
+		$(use_with zfs storage-zfs)
+
+		--without-hal
+		--without-netcf
+		--without-sanlock
+		--without-xenapi
+
+		--with-esx
+		--with-init-script=systemd
+		--with-qemu-group=$(usex caps qemu root)
+		--with-qemu-user=$(usex caps qemu root)
+		--with-remote
+		--with-storage-fs
+		--with-vmware
+
+		--disable-static
+		--disable-werror
+
+		--with-html-subdir=${PF}/html
+		--localstatedir=/var
+	)
+
+	if use virtualbox && has_version app-emulation/virtualbox-ose; then
+		myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
+	else
+		myeconfargs+=( $(use_with virtualbox vbox) )
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	if [[ ${PV} = *9999* ]]; then
+		# Restore gnulib's config.sub and config.guess
+		# bug #377279
+		(cd .gnulib && git reset --hard > /dev/null)
+	fi
+}
+
+src_test() {
+	cd "${BUILD_DIR}"
+
+	# remove problematic tests, bug #591416, bug #591418
+	sed -i -e 's#commandtest$(EXEEXT) # #' \
+		-e 's#virfirewalltest$(EXEEXT) # #' \
+		-e 's#nwfilterebiptablestest$(EXEEXT) # #' \
+		-e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
+		tests/Makefile
+
+	export VIR_TEST_DEBUG=1
+	HOME="${T}" emake check || die "tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
+
+	find "${D}" -name '*.la' -delete || die
+
+	# Remove bogus, empty directories. They are either not used, or
+	# libvirtd is able to create them on demand
+	rm -rf "${D}"/etc/sysconfig
+	rm -rf "${D}"/var/cache
+	rm -rf "${D}"/var/run
+	rm -rf "${D}"/var/log
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	systemd_install_serviced \
+		"${FILESDIR}"/libvirtd.service.conf libvirtd.service
+
+	systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+	newinitd "${S}/libvirtd.init" libvirtd || die
+	newinitd "${FILESDIR}/libvirt-guests.init-r2" libvirt-guests || die
+	newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
+	newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
+
+	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
+	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
+
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# we only ever want to generate this once
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
+	fi
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 9ae7d7ea4e43..3716e896837b 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -29,7 +29,7 @@ IUSE="
 	apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm
 	libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit
 	+qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network
-	wireshark-plugins xen zeroconf zfs elibc_glibc
+	wireshark-plugins xen zeroconf zfs
 "
 
 REQUIRED_USE="
@@ -68,7 +68,6 @@ RDEPEND="
 	audit? ( sys-process/audit )
 	caps? ( sys-libs/libcap-ng )
 	dbus? ( sys-apps/dbus )
-	elibc_glibc? ( sys-libs/glibc[rpc(+)] )
 	firewalld? ( net-firewall/firewalld )
 	fuse? ( >=sys-fs/fuse-2.8.6:= )
 	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index e0b390981eef..588ce78b15a7 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -22,8 +22,10 @@ AUX qemu-binfmt.initd.head 1445 SHA256 a9b4b1d1ffa82d572c01f14ebfbafb4b3a4c2eb5c
 AUX qemu-binfmt.initd.tail 245 SHA256 1b765f5212946b73b8e4d92f64d34a9d2e358ef541c02164f6d6dd93cb15e1e7 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737 WHIRLPOOL 41ddd1751101646e700a6fe4ef879bd4149d646a801f97e40534051895697dcbded06a1edda51457a0d624fbf68442c3e57178a3ee8e683e35368b88d10ba4a4
 DIST qemu-2.10.0.tar.bz2 30955656 SHA256 7e9f39e1306e6dcc595494e91c1464d4b03f55ddd2053183e0e1b69f7f776d48 SHA512 ea21c014030f8a902df159641e6ccb45f0850ac5cb1cb8ab6845124c44ea5def54845e7bc66a6e80d624c78069f9baa913ee5119704076ae4ff47ab018ace9f9 WHIRLPOOL 58f846788fdf2b0c90e6d17ce921a1fe02556968d38ffc11be7e32b81ebc723dfeaa790f22d8085d4f388eb01fe0daa3ddbc00630c5ecba083df33cc9709fb39
 DIST qemu-2.9.0.tar.bz2 28720490 SHA256 00bfb217b1bb03c7a6c3261b819cfccbfb5a58e3e2ceff546327d271773c6c14 SHA512 4b28966eec0ca44681e35fcfb64a4eaef7c280b8d65c91d03f2efa37f76278fd8c1680e5798c7a30dbfcc8f3c05f4a803f48b8a2dfec3a4181bac079b2a5e422 WHIRLPOOL d79fe89eb271a56aee0cbd328e5f96999176b711afb5683d164b7b99d91e6dd2bfaf6e2ff4cd820a941c94f28116765cb07ffd5809d75c2f9654a67d56bfc0c1
+EBUILD qemu-2.10.0-r1.ebuild 23068 SHA256 e5c1628f1e8e73b5e858140056845133835fdb2b6570a2404d4dbdf8b94a2579 SHA512 0d7fbcd6264de79c69c6eb77e19d62bc207231c25cb029673adcb74514d9998fef8fac99f40e9a881f60c3ba534fc0be6fac70d6f3ffbfa3f9768ca812eba260 WHIRLPOOL bbac6afbaab76f2783499a40efafa066b85e9a1e90c7a25673932c436762ae5d1bdae24b302adae74e75c3e328ab54d143228d745d5fca438194909945756fbb
 EBUILD qemu-2.10.0.ebuild 23014 SHA256 5661bcdf733b57323be130bfae702bfb03bd46e0e00e10314d9588b803c6d882 SHA512 ea12fefa312f2d483aa5abaf01f04eb7dd751c0f458f3ec3dc5f2629da45545d94f4029dbea5c59a61cfd80cc5d9007233a7ffc12bc8b8da94c015adb4934ea0 WHIRLPOOL ae9b86c03cd5170ec6fdb51bdb4bf50cca2b8e00a86e53e36f34728343462c0be8692f396f718158d8982e94e040d72f8e1b22ea6ab331cacb12c474d29026ba
 EBUILD qemu-2.9.0-r56.ebuild 23730 SHA256 2912b01e8567360795fef73ff09bf40735bc47c4b1e85d22ea01432e434daea4 SHA512 fb876999c82f735cf7739ef3014848b9afe51608ae0b084f5cdc3de9c409295acd50b2f17a70516e50007f5fd1f8f4ffc824abdfea248e930897870ee2758c08 WHIRLPOOL d4e440a25c8a7159a3857bd20262d1e0d808ab2a67d8620bbcaa2130f3b6f4326ea943e6613075f921a54ee7d9ca2f22739eee4bdd5cf5fabe8904c5fec57ef3
+EBUILD qemu-2.9.0-r57.ebuild 23783 SHA256 57f7265327250df50acda43d3a2c22a399be0cfe76cbd10b93c10d54b967574b SHA512 7aea2a4805626d378da3c16d845f6750d7646bbdeef99236a254105ceece53b552b1d707f60a26f349eca96e275cd7d5ef7de68caa39325fedfe1fd0a710a434 WHIRLPOOL fe62c1168662c38661afefb5a41e62565ec50ba4f980b203cbcad5629300f54409e942cf41f85b8f8d2f1ecccae086e3266615460d0ac925e1b48a8c0c76d331
 EBUILD qemu-9999.ebuild 22927 SHA256 d4ffd7f56adff9f0704b7b490692d0a70151e60994ca82527693c83268d044ec SHA512 786ba9549bf834a68a474eee41ab7ec9acf55e330e200c9b91abfeecc24de1bbe893b2094e7df78911d024cbd9458a5f6f7a8fbd563a414a7fc59b0bf2e01f5b WHIRLPOOL 2ab6d77482f164cd93dac57d21e3c798f46a886e1c13e3c0bbda0ff5213ff43c6753cfce92b71faf098c16a7188657c368988eace9a9def2534018f17012cd1b
 MISC ChangeLog 34977 SHA256 48c9a111a9eac22d5aef983a5c98fd2ce37cbb2df943a32638287d3a7477c6da SHA512 4a97d97960ad4accde6b48764a380160484427db586ded5d1699327a89e412760d9e7ed81a185f6900afed171f0023dd4c34dfc2148d98ff222e0c24c2af1649 WHIRLPOOL 75bd0f8453a37ad223f11f28971f195a54e003e973b6e44aa48f4b9b2532bb3dd39f35655c239d7b3b7a6fc0c4ff719ae5abab652b92da6664cd8bee523ef047
 MISC ChangeLog-2015 58193 SHA256 60c1a4f4c85515520ab14da920bbbf4a6813491ce16b5357a0456ea588815a5c SHA512 ddfe8e75aabe59b731a4a8b31839d8c71fd516620306d2bc99d7641cc501652974e053104caafa7550c5ad33b6834295f6743a98b9419d292b8bf6f67918ccd3 WHIRLPOOL a6841f79c3ba1cbf76a8c7fde296a2912c46ddd251494dca3bf3bc13391c80595b6f80125c383823899942248008ede7065b0f5c8e43f9bc1d0464aa62cc187f
diff --git a/app-emulation/qemu/qemu-2.10.0-r1.ebuild b/app-emulation/qemu/qemu-2.10.0-r1.ebuild
new file mode 100644
index 000000000000..a1210f3d5994
--- /dev/null
+++ b/app-emulation/qemu/qemu-2.10.0-r1.ebuild
@@ -0,0 +1,784 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses,readline"
+
+PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
+
+FIRMWARE_ABI_VERSION="2.9.0-r52"
+
+inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
+	user udev fcaps readme.gentoo-r1 pax-utils l10n
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+IUSE="accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt
+	glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux
+	kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png
+	pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy
+	spice ssh static static-user systemtap tci test usb usbredir vde
+	+vhost-net virgl virtfs +vnc vte xattr xen xfs"
+
+COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel
+	mips mips64 mips64el mipsel nios2 or1k ppc ppc64 s390x sh4 sh4eb sparc
+	sparc64 x86_64"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS}
+	lm32 moxie ppcemb tricore unicore32 xtensa xtensaeb"
+IUSE_USER_TARGETS="${COMMON_TARGETS}
+	armeb hppa mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus tilegx"
+
+use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
+
+# Allow no targets to be built so that people can get a tools-only build.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	gtk2? ( gtk )
+	qemu_softmmu_targets_arm? ( fdt )
+	qemu_softmmu_targets_microblaze? ( fdt )
+	qemu_softmmu_targets_mips64el? ( fdt )
+	qemu_softmmu_targets_ppc? ( fdt )
+	qemu_softmmu_targets_ppc64? ( fdt )
+	sdl2? ( sdl )
+	static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio )
+	virtfs? ( xattr )
+	vte? ( gtk )"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# and user/softmmu targets (qemu-*, qemu-system-*).
+#
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+#
+# The attr lib isn't always linked in (although the USE flag is always
+# respected).  This is because qemu supports using the C library's API
+# when available rather than always using the extranl library.
+ALL_DEPEND="
+	>=dev-libs/glib-2.0[static-libs(+)]
+	sys-libs/zlib[static-libs(+)]
+	python? ( ${PYTHON_DEPS} )
+	systemtap? ( dev-util/systemtap )
+	xattr? ( sys-apps/attr[static-libs(+)] )"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# softmmu targets (qemu-system-*).
+SOFTMMU_TOOLS_DEPEND="
+	>=x11-libs/pixman-0.28.0[static-libs(+)]
+	accessibility? (
+		app-accessibility/brltty[api]
+		app-accessibility/brltty[static-libs(+)]
+	)
+	aio? ( dev-libs/libaio[static-libs(+)] )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bluetooth? ( net-wireless/bluez )
+	bzip2? ( app-arch/bzip2[static-libs(+)] )
+	caps? ( sys-libs/libcap-ng[static-libs(+)] )
+	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+	fdt? ( >=sys-apps/dtc-1.4.2[static-libs(+)] )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
+	gnutls? (
+		dev-libs/nettle:=[static-libs(+)]
+		>=net-libs/gnutls-3.0:=[static-libs(+)]
+	)
+	gtk? (
+		gtk2? (
+			x11-libs/gtk+:2
+			vte? ( x11-libs/vte:0 )
+		)
+		!gtk2? (
+			x11-libs/gtk+:3
+			vte? ( x11-libs/vte:2.91 )
+		)
+	)
+	infiniband? ( sys-fabric/librdmacm:=[static-libs(+)] )
+	iscsi? ( net-libs/libiscsi )
+	jpeg? ( virtual/jpeg:0=[static-libs(+)] )
+	lzo? ( dev-libs/lzo:2[static-libs(+)] )
+	ncurses? (
+		sys-libs/ncurses:0=[unicode]
+		sys-libs/ncurses:0=[static-libs(+)]
+	)
+	nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
+	numa? ( sys-process/numactl[static-libs(+)] )
+	opengl? (
+		virtual/opengl
+		media-libs/libepoxy[static-libs(+)]
+		media-libs/mesa[static-libs(+)]
+		media-libs/mesa[egl,gbm]
+	)
+	png? ( media-libs/libpng:0=[static-libs(+)] )
+	pulseaudio? ( media-sound/pulseaudio )
+	rbd? ( sys-cluster/ceph[static-libs(+)] )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+	sdl? (
+		!sdl2? (
+			media-libs/libsdl[X]
+			>=media-libs/libsdl-1.2.11[static-libs(+)]
+		)
+		sdl2? (
+			media-libs/libsdl2[X]
+			media-libs/libsdl2[static-libs(+)]
+		)
+	)
+	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
+	snappy? ( app-arch/snappy:=[static-libs(+)] )
+	spice? (
+		>=app-emulation/spice-protocol-0.12.3
+		>=app-emulation/spice-0.12.0[static-libs(+)]
+	)
+	ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
+	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
+	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
+	vde? ( net-misc/vde[static-libs(+)] )
+	virgl? ( media-libs/virglrenderer[static-libs(+)] )
+	virtfs? ( sys-libs/libcap )
+	xen? ( app-emulation/xen-tools:= )
+	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
+
+X86_FIRMWARE_DEPEND="
+	pin-upstream-blobs? (
+		~sys-firmware/edk2-ovmf-2017_pre20170505[binary]
+		~sys-firmware/ipxe-1.0.0_p20160620
+		~sys-firmware/seabios-1.10.2[binary,seavgabios]
+		~sys-firmware/sgabios-0.1_pre8
+	)
+	!pin-upstream-blobs? (
+		sys-firmware/edk2-ovmf
+		sys-firmware/ipxe
+		>=sys-firmware/seabios-1.10.2[seavgabios]
+		sys-firmware/sgabios
+	)"
+
+CDEPEND="
+	!static? (
+		${ALL_DEPEND//\[static-libs(+)]}
+		${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
+	)
+	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )"
+DEPEND="${CDEPEND}
+	dev-lang/perl
+	=dev-lang/python-2*
+	sys-apps/texinfo
+	virtual/pkgconfig
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+	gtk? ( nls? ( sys-devel/gettext ) )
+	static? (
+		${ALL_DEPEND}
+		${SOFTMMU_TOOLS_DEPEND}
+	)
+	static-user? ( ${ALL_DEPEND} )
+	test? (
+		dev-libs/glib[utils]
+		sys-devel/bc
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-qemu )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.0-cflags.patch
+	"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch
+	"${FILESDIR}"/${PN}-2.10.0-CVE-2017-13711.patch   # bug 629350
+)
+
+STRIP_MASK="/usr/share/qemu/palcode-clipper"
+
+QA_PREBUILT="
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/palcode-clipper
+	usr/share/qemu/s390-ccw.img
+	usr/share/qemu/s390-netboot.img
+	usr/share/qemu/u-boot.e500"
+
+QA_WX_LOAD="usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-cris
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-microblazeel
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-or1k
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-ppc64abi32
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus
+	usr/bin/qemu-s390x
+	usr/bin/qemu-unicore32"
+
+DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
+kernel module loaded before running kvm. The easiest way to ensure that the
+kernel module is loaded is to load it on boot.
+	For AMD CPUs the module is called 'kvm-amd'.
+	For Intel CPUs the module is called 'kvm-intel'.
+Please review /etc/conf.d/modules for how to load these.
+
+Make sure your user is in the 'kvm' group. Just run
+	$ gpasswd -a <USER> kvm
+then have <USER> re-login.
+
+For brand new installs, the default permissions on /dev/kvm might not let
+you access it.  You can tell udev to reset ownership/perms:
+	$ udevadm trigger -c add /dev/kvm
+
+If you want to register binfmt handlers for qemu user targets:
+For openrc:
+	# rc-update add qemu-binfmt
+For systemd:
+	# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 2 6 25; then
+		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use the"
+			ERROR_TUN+=" virtual network device if using -net tap."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
+			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+			ERROR_VHOST_NET+=" support"
+
+			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+				CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
+			fi
+
+			use python && CONFIG_CHECK+=" ~DEBUG_FS"
+			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
+
+	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
+		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
+		eerror "instances are still pointing to it.  Please update your"
+		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
+		eerror "and the right system binary (e.g. qemu-system-x86_64)."
+		die "update your virt configs to not use qemu-kvm"
+	fi
+}
+
+pkg_setup() {
+	enewgroup kvm 78
+}
+
+# Sanity check to make sure target lists are kept up-to-date.
+check_targets() {
+	local var=$1 mak=$2
+	local detected sorted
+
+	pushd "${S}"/default-configs >/dev/null || die
+
+	# Force C locale until glibc is updated. #564936
+	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
+	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "${var}: ${sorted}"
+		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
+		die "sync ${var} to the list of targets"
+	fi
+
+	popd >/dev/null
+}
+
+handle_locales() {
+	# Make sure locale list is kept up-to-date.
+	local detected sorted
+	detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u))
+	sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "PLOCALES: ${sorted}"
+		eerror " po/*.po: ${detected}"
+		die "sync PLOCALES"
+	fi
+
+	# Deal with selective install of locales.
+	if use nls ; then
+		# Delete locales the user does not want. #577814
+		rm_loc() { rm po/$1.po || die; }
+		l10n_for_each_disabled_locale_do rm_loc
+	else
+		# Cheap hack to disable gettext .mo generation.
+		rm -f po/*.po
+	fi
+}
+
+src_prepare() {
+	check_targets IUSE_SOFTMMU_TARGETS softmmu
+	check_targets IUSE_USER_TARGETS linux-user
+
+	# Alter target makefiles to accept CFLAGS set via flag-o
+	sed -i -r \
+		-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
+		Makefile Makefile.target || die
+
+	default
+
+	# Fix ld and objcopy being called directly
+	tc-export AR LD OBJCOPY
+
+	# Verbose builds
+	MAKEOPTS+=" V=1"
+
+	# Run after we've applied all patches.
+	handle_locales
+
+	# Remove bundled copy of libfdt
+	rm -r dtc || die
+}
+
+##
+# configures qemu based on the build directory and the build type
+# we are using.
+#
+qemu_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local buildtype=$1
+	local builddir="${S}/${buildtype}-build"
+
+	mkdir "${builddir}"
+
+	local conf_opts=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--libdir=/usr/$(get_libdir)
+		--docdir=/usr/share/doc/${PF}/html
+		--disable-bsd-user
+		--disable-guest-agent
+		--disable-strip
+		--disable-werror
+		# We support gnutls/nettle for crypto operations.  It is possible
+		# to use gcrypt when gnutls/nettle are disabled (but not when they
+		# are enabled), but it's not really worth the hassle.  Disable it
+		# all the time to avoid automatically detecting it. #568856
+		--disable-gcrypt
+		--python="${PYTHON}"
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--host-cc="$(tc-getBUILD_CC)"
+		$(use_enable debug debug-info)
+		$(use_enable debug debug-tcg)
+		--enable-docs
+		$(use_enable tci tcg-interpreter)
+		$(use_enable xattr attr)
+	)
+
+	# Disable options not used by user targets. This simplifies building
+	# static user targets (USE=static-user) considerably.
+	conf_notuser() {
+		if [[ ${buildtype} == "user" ]] ; then
+			echo "--disable-${2:-$1}"
+		else
+			use_enable "$@"
+		fi
+	}
+	conf_opts+=(
+		$(conf_notuser accessibility brlapi)
+		$(conf_notuser aio linux-aio)
+		$(conf_notuser bzip2)
+		$(conf_notuser bluetooth bluez)
+		$(conf_notuser caps cap-ng)
+		$(conf_notuser curl)
+		$(conf_notuser fdt)
+		$(conf_notuser glusterfs)
+		$(conf_notuser gnutls)
+		$(conf_notuser gnutls nettle)
+		$(conf_notuser gtk)
+		$(conf_notuser infiniband rdma)
+		$(conf_notuser iscsi libiscsi)
+		$(conf_notuser jpeg vnc-jpeg)
+		$(conf_notuser kernel_linux kvm)
+		$(conf_notuser lzo)
+		$(conf_notuser ncurses curses)
+		$(conf_notuser nfs libnfs)
+		$(conf_notuser numa)
+		$(conf_notuser opengl)
+		$(conf_notuser png vnc-png)
+		$(conf_notuser rbd)
+		$(conf_notuser sasl vnc-sasl)
+		$(conf_notuser sdl)
+		$(conf_notuser seccomp)
+		$(conf_notuser smartcard)
+		$(conf_notuser snappy)
+		$(conf_notuser spice)
+		$(conf_notuser ssh libssh2)
+		$(conf_notuser usb libusb)
+		$(conf_notuser usbredir usb-redir)
+		$(conf_notuser vde)
+		$(conf_notuser vhost-net)
+		$(conf_notuser virgl virglrenderer)
+		$(conf_notuser virtfs)
+		$(conf_notuser vnc)
+		$(conf_notuser vte)
+		$(conf_notuser xen)
+		$(conf_notuser xen xen-pci-passthrough)
+		$(conf_notuser xfs xfsctl)
+	)
+
+	if [[ ! ${buildtype} == "user" ]] ; then
+		# audio options
+		local audio_opts="oss"
+		use alsa && audio_opts="alsa,${audio_opts}"
+		use sdl && audio_opts="sdl,${audio_opts}"
+		use pulseaudio && audio_opts="pa,${audio_opts}"
+		conf_opts+=(
+			--audio-drv-list="${audio_opts}"
+		)
+		use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) )
+		use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) )
+	fi
+
+	case ${buildtype} in
+	user)
+		conf_opts+=(
+			--enable-linux-user
+			--disable-system
+			--disable-blobs
+			--disable-tools
+		)
+		local static_flag="static-user"
+		;;
+	softmmu)
+		conf_opts+=(
+			--disable-linux-user
+			--enable-system
+			--disable-tools
+			--with-system-pixman
+		)
+		local static_flag="static"
+		;;
+	tools)
+		conf_opts+=(
+			--disable-linux-user
+			--disable-system
+			--disable-blobs
+			--enable-tools
+		)
+		local static_flag="static"
+		;;
+	esac
+
+	local targets="${buildtype}_targets"
+	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
+
+	# Add support for SystemTAP
+	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
+
+	# We always want to attempt to build with PIE support as it results
+	# in a more secure binary. But it doesn't work with static or if
+	# the current GCC doesn't have PIE support.
+	if use ${static_flag}; then
+		conf_opts+=( --static --disable-pie )
+	else
+		tc-enables-pie && conf_opts+=( --enable-pie )
+	fi
+
+	echo "../configure ${conf_opts[*]}"
+	cd "${builddir}"
+	../configure "${conf_opts[@]}" || die "configure failed"
+
+	# FreeBSD's kernel does not support QEMU assigning/grabbing
+	# host USB devices yet
+	use kernel_FreeBSD && \
+		sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
+}
+
+src_configure() {
+	local target
+
+	python_setup
+
+	softmmu_targets= softmmu_bins=()
+	user_targets= user_bins=()
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		if use "qemu_softmmu_targets_${target}"; then
+			softmmu_targets+=",${target}-softmmu"
+			softmmu_bins+=( "qemu-system-${target}" )
+		fi
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		if use "qemu_user_targets_${target}"; then
+			user_targets+=",${target}-linux-user"
+			user_bins+=( "qemu-${target}" )
+		fi
+	done
+
+	softmmu_targets=${softmmu_targets#,}
+	user_targets=${user_targets#,}
+
+	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
+	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
+	qemu_src_configure "tools"
+}
+
+src_compile() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		default
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		default
+	fi
+
+	cd "${S}/tools-build"
+	default
+}
+
+src_test() {
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		pax-mark m */qemu-system-* #515550
+		emake -j1 check
+		emake -j1 check-report.html
+	fi
+}
+
+qemu_python_install() {
+	python_domodule "${S}/scripts/qmp/qmp.py"
+
+	python_doscript "${S}/scripts/kvm/vmxcap"
+	python_doscript "${S}/scripts/qmp/qmp-shell"
+	python_doscript "${S}/scripts/qmp/qemu-ga-client"
+}
+
+# Generate binfmt support files.
+#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
+#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
+generate_initd() {
+	local out="${T}/qemu-binfmt"
+	local out_systemd="${T}/qemu.conf"
+	local d="${T}/binfmt.d"
+
+	einfo "Generating qemu binfmt scripts and configuration files"
+
+	# Generate the debian fragments first.
+	mkdir -p "${d}"
+	"${S}"/scripts/qemu-binfmt-conf.sh \
+		--debian \
+		--exportdir "${d}" \
+		--qemu-path "${EPREFIX}/usr/bin" \
+		|| die
+	# Then turn the fragments into a shell script we can source.
+	sed -E -i \
+		-e 's:^([^ ]+) (.*)$:\1="\2":' \
+		"${d}"/* || die
+
+	# Generate the init.d script by assembling the fragments from above.
+	local f qcpu package interpreter magic mask
+	cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
+	for f in "${d}"/qemu-* ; do
+		source "${f}"
+
+		# Normalize the cpu logic like we do in the init.d for the native cpu.
+		qcpu=${package#qemu-}
+		case ${qcpu} in
+		arm*)   qcpu="arm";;
+		mips*)  qcpu="mips";;
+		ppc*)   qcpu="ppc";;
+		s390*)  qcpu="s390";;
+		sh*)    qcpu="sh";;
+		sparc*) qcpu="sparc";;
+		esac
+
+		cat <<EOF >>"${out}"
+	if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
+		echo ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
+	fi
+EOF
+
+		echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
+
+	done
+	cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
+}
+
+src_install() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		emake DESTDIR="${ED}" install
+
+		# Install binfmt handler init script for user targets.
+		generate_initd
+		doinitd "${T}/qemu-binfmt"
+
+		# Install binfmt/qemu.conf.
+		insinto "/usr/share/qemu/binfmt.d"
+		doins "${T}/qemu.conf"
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		emake DESTDIR="${ED}" install
+
+		# This might not exist if the test failed. #512010
+		[[ -e check-report.html ]] && dohtml check-report.html
+
+		if use kernel_linux; then
+			udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules
+		fi
+
+		if use python; then
+			python_foreach_impl qemu_python_install
+		fi
+	fi
+
+	cd "${S}/tools-build"
+	emake DESTDIR="${ED}" install
+
+	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
+	pushd "${ED}"/usr/bin >/dev/null
+	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
+	popd >/dev/null
+
+	# Install config file example for qemu-bridge-helper
+	insinto "/etc/qemu"
+	doins "${FILESDIR}/bridge.conf"
+
+	cd "${S}"
+	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
+
+	if [[ -n ${softmmu_targets} ]]; then
+		# Remove SeaBIOS since we're using the SeaBIOS packaged one
+		rm "${ED}/usr/share/qemu/bios.bin"
+		rm "${ED}/usr/share/qemu/bios-256k.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
+		fi
+
+		# Remove vgabios since we're using the seavgabios packaged one
+		rm "${ED}/usr/share/qemu/vgabios.bin"
+		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
+		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
+			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+			dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+			dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
+			dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+		fi
+
+		# Remove sgabios since we're using the sgabios packaged one
+		rm "${ED}/usr/share/qemu/sgabios.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+		fi
+
+		# Remove iPXE since we're using the iPXE packaged one
+		rm "${ED}"/usr/share/qemu/pxe-*.rom
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
+			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+		fi
+	fi
+
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+firmware_abi_change() {
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least ${FIRMWARE_ABI_VERSION} ${pv}; then
+			return 0
+		fi
+	done
+	return 1
+}
+
+pkg_postinst() {
+	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
+		udev_reload
+	fi
+
+	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
+
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_print_elog
+
+	if use pin-upstream-blobs && firmware_abi_change; then
+		ewarn "This version of qemu pins new versions of firmware blobs:"
+		ewarn "	$(best_version sys-firmware/edk2-ovmf)"
+		ewarn "	$(best_version sys-firmware/ipxe)"
+		ewarn "	$(best_version sys-firmware/seabios)"
+		ewarn "	$(best_version sys-firmware/sgabios)"
+		ewarn "This might break resume of hibernated guests (started with a different"
+		ewarn "firmware version) and live migration to/from qemu versions with different"
+		ewarn "firmware. Please (cold) restart all running guests. For functional"
+		ewarn "guest migration ensure that all"
+		ewarn "hosts run at least"
+		ewarn "	app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
+	fi
+}
+
+pkg_info() {
+	echo "Using:"
+	echo "  $(best_version app-emulation/spice-protocol)"
+	echo "  $(best_version sys-firmware/edk2-ovmf)"
+	if has_version 'sys-firmware/edk2-ovmf[binary]'; then
+		echo "    USE=binary"
+	else
+		echo "    USE=''"
+	fi
+	echo "  $(best_version sys-firmware/ipxe)"
+	echo "  $(best_version sys-firmware/seabios)"
+	if has_version 'sys-firmware/seabios[binary]'; then
+		echo "    USE=binary"
+	else
+		echo "    USE=''"
+	fi
+	echo "  $(best_version sys-firmware/sgabios)"
+}
diff --git a/app-emulation/qemu/qemu-2.9.0-r57.ebuild b/app-emulation/qemu/qemu-2.9.0-r57.ebuild
new file mode 100644
index 000000000000..a63311cba203
--- /dev/null
+++ b/app-emulation/qemu/qemu-2.9.0-r57.ebuild
@@ -0,0 +1,796 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses,readline"
+
+PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
+
+FIRMWARE_ABI_VERSION="2.9.0-r52"
+
+inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
+	user udev fcaps readme.gentoo-r1 pax-utils l10n
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+IUSE="accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt
+	glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux
+	kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png
+	pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy
+	spice ssh static static-user systemtap tci test usb usbredir vde
+	+vhost-net virgl virtfs +vnc vte xattr xen xfs"
+
+COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel
+	mips mips64 mips64el mipsel nios2 or1k ppc ppc64 s390x sh4 sh4eb sparc
+	sparc64 x86_64"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS}
+	lm32 moxie ppcemb tricore unicore32 xtensa xtensaeb"
+IUSE_USER_TARGETS="${COMMON_TARGETS}
+	armeb hppa mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus tilegx"
+
+use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
+
+# Allow no targets to be built so that people can get a tools-only build.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	gtk2? ( gtk )
+	qemu_softmmu_targets_arm? ( fdt )
+	qemu_softmmu_targets_microblaze? ( fdt )
+	qemu_softmmu_targets_mips64el? ( fdt )
+	qemu_softmmu_targets_ppc? ( fdt )
+	qemu_softmmu_targets_ppc64? ( fdt )
+	sdl2? ( sdl )
+	static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio )
+	virtfs? ( xattr )
+	vte? ( gtk )"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# and user/softmmu targets (qemu-*, qemu-system-*).
+#
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+#
+# The attr lib isn't always linked in (although the USE flag is always
+# respected).  This is because qemu supports using the C library's API
+# when available rather than always using the extranl library.
+ALL_DEPEND="
+	>=dev-libs/glib-2.0[static-libs(+)]
+	sys-libs/zlib[static-libs(+)]
+	python? ( ${PYTHON_DEPS} )
+	systemtap? ( dev-util/systemtap )
+	xattr? ( sys-apps/attr[static-libs(+)] )"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# softmmu targets (qemu-system-*).
+SOFTMMU_TOOLS_DEPEND="
+	>=x11-libs/pixman-0.28.0[static-libs(+)]
+	accessibility? (
+		app-accessibility/brltty[api]
+		app-accessibility/brltty[static-libs(+)]
+	)
+	aio? ( dev-libs/libaio[static-libs(+)] )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bluetooth? ( net-wireless/bluez )
+	bzip2? ( app-arch/bzip2[static-libs(+)] )
+	caps? ( sys-libs/libcap-ng[static-libs(+)] )
+	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+	fdt? ( >=sys-apps/dtc-1.4.2[static-libs(+)] )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
+	gnutls? (
+		dev-libs/nettle:=[static-libs(+)]
+		>=net-libs/gnutls-3.0:=[static-libs(+)]
+	)
+	gtk? (
+		gtk2? (
+			x11-libs/gtk+:2
+			vte? ( x11-libs/vte:0 )
+		)
+		!gtk2? (
+			x11-libs/gtk+:3
+			vte? ( x11-libs/vte:2.91 )
+		)
+	)
+	infiniband? ( sys-fabric/librdmacm:=[static-libs(+)] )
+	iscsi? ( net-libs/libiscsi )
+	jpeg? ( virtual/jpeg:0=[static-libs(+)] )
+	lzo? ( dev-libs/lzo:2[static-libs(+)] )
+	ncurses? (
+		sys-libs/ncurses:0=[unicode]
+		sys-libs/ncurses:0=[static-libs(+)]
+	)
+	nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
+	numa? ( sys-process/numactl[static-libs(+)] )
+	opengl? (
+		virtual/opengl
+		media-libs/libepoxy[static-libs(+)]
+		media-libs/mesa[static-libs(+)]
+		media-libs/mesa[egl,gbm]
+	)
+	png? ( media-libs/libpng:0=[static-libs(+)] )
+	pulseaudio? ( media-sound/pulseaudio )
+	rbd? ( sys-cluster/ceph[static-libs(+)] )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+	sdl? (
+		!sdl2? (
+			media-libs/libsdl[X]
+			>=media-libs/libsdl-1.2.11[static-libs(+)]
+		)
+		sdl2? (
+			media-libs/libsdl2[X]
+			media-libs/libsdl2[static-libs(+)]
+		)
+	)
+	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
+	snappy? ( app-arch/snappy:=[static-libs(+)] )
+	spice? (
+		>=app-emulation/spice-protocol-0.12.3
+		>=app-emulation/spice-0.12.0[static-libs(+)]
+	)
+	ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
+	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
+	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
+	vde? ( net-misc/vde[static-libs(+)] )
+	virgl? ( media-libs/virglrenderer[static-libs(+)] )
+	virtfs? ( sys-libs/libcap )
+	xen? ( app-emulation/xen-tools:= )
+	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
+
+X86_FIRMWARE_DEPEND="
+	pin-upstream-blobs? (
+		~sys-firmware/edk2-ovmf-2017_pre20170505[binary]
+		~sys-firmware/ipxe-1.0.0_p20160620
+		~sys-firmware/seabios-1.10.2[binary,seavgabios]
+		~sys-firmware/sgabios-0.1_pre8
+	)
+	!pin-upstream-blobs? (
+		sys-firmware/edk2-ovmf
+		sys-firmware/ipxe
+		>=sys-firmware/seabios-1.10.2[seavgabios]
+		sys-firmware/sgabios
+	)"
+
+CDEPEND="
+	!static? (
+		${ALL_DEPEND//\[static-libs(+)]}
+		${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
+	)
+	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )"
+DEPEND="${CDEPEND}
+	dev-lang/perl
+	=dev-lang/python-2*
+	sys-apps/texinfo
+	virtual/pkgconfig
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+	gtk? ( nls? ( sys-devel/gettext ) )
+	static? (
+		${ALL_DEPEND}
+		${SOFTMMU_TOOLS_DEPEND}
+	)
+	static-user? ( ${ALL_DEPEND} )
+	test? (
+		dev-libs/glib[utils]
+		sys-devel/bc
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-qemu )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.0-cflags.patch
+	"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch
+	"${FILESDIR}"/${PN}-2.9.0-CVE-2017-8309.patch    # bug 616870
+	"${FILESDIR}"/${PN}-2.9.0-CVE-2017-8379.patch    # bug 616872
+	"${FILESDIR}"/${PN}-2.9.0-CVE-2017-8380.patch    # bug 616874
+	"${FILESDIR}"/${PN}-2.9.0-CVE-2017-8112.patch    # bug 616636
+	"${FILESDIR}"/${PN}-2.9.0-CVE-2017-7493.patch    # bug 618808
+	"${FILESDIR}"/${PN}-2.9.0-CVE-2017-11434.patch   # bug 625614
+	"${FILESDIR}"/${PN}-2.9.0-CVE-2017-11334.patch   # bug 621292
+	"${FILESDIR}"/${PN}-2.9.0-CVE-2017-9524-1.patch  # bug 621292
+	"${FILESDIR}"/${PN}-2.9.0-CVE-2017-9524-2.patch
+	"${FILESDIR}"/${PN}-2.9.0-CVE-2017-9503-1.patch  # bug 621184
+	"${FILESDIR}"/${PN}-2.9.0-CVE-2017-9503-2.patch
+	"${FILESDIR}"/${PN}-2.9.0-CVE-2017-10664.patch   # bug 623016
+	"${FILESDIR}"/${PN}-2.9.0-CVE-2017-10806.patch   # bug 624088
+)
+
+STRIP_MASK="/usr/share/qemu/palcode-clipper"
+
+QA_PREBUILT="
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/palcode-clipper
+	usr/share/qemu/s390-ccw.img
+	usr/share/qemu/u-boot.e500"
+
+QA_WX_LOAD="usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-cris
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-microblazeel
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-or1k
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-ppc64abi32
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus
+	usr/bin/qemu-s390x
+	usr/bin/qemu-unicore32"
+
+DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
+kernel module loaded before running kvm. The easiest way to ensure that the
+kernel module is loaded is to load it on boot.
+	For AMD CPUs the module is called 'kvm-amd'.
+	For Intel CPUs the module is called 'kvm-intel'.
+Please review /etc/conf.d/modules for how to load these.
+
+Make sure your user is in the 'kvm' group. Just run
+	$ gpasswd -a <USER> kvm
+then have <USER> re-login.
+
+For brand new installs, the default permissions on /dev/kvm might not let
+you access it.  You can tell udev to reset ownership/perms:
+	$ udevadm trigger -c add /dev/kvm
+
+If you want to register binfmt handlers for qemu user targets:
+For openrc:
+	# rc-update add qemu-binfmt
+For systemd:
+	# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 2 6 25; then
+		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use the"
+			ERROR_TUN+=" virtual network device if using -net tap."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
+			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+			ERROR_VHOST_NET+=" support"
+
+			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+				CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
+			fi
+
+			use python && CONFIG_CHECK+=" ~DEBUG_FS"
+			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
+
+	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
+		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
+		eerror "instances are still pointing to it.  Please update your"
+		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
+		eerror "and the right system binary (e.g. qemu-system-x86_64)."
+		die "update your virt configs to not use qemu-kvm"
+	fi
+}
+
+pkg_setup() {
+	enewgroup kvm 78
+}
+
+# Sanity check to make sure target lists are kept up-to-date.
+check_targets() {
+	local var=$1 mak=$2
+	local detected sorted
+
+	pushd "${S}"/default-configs >/dev/null || die
+
+	# Force C locale until glibc is updated. #564936
+	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
+	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "${var}: ${sorted}"
+		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
+		die "sync ${var} to the list of targets"
+	fi
+
+	popd >/dev/null
+}
+
+handle_locales() {
+	# Make sure locale list is kept up-to-date.
+	local detected sorted
+	detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u))
+	sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "PLOCALES: ${sorted}"
+		eerror " po/*.po: ${detected}"
+		die "sync PLOCALES"
+	fi
+
+	# Deal with selective install of locales.
+	if use nls ; then
+		# Delete locales the user does not want. #577814
+		rm_loc() { rm po/$1.po || die; }
+		l10n_for_each_disabled_locale_do rm_loc
+	else
+		# Cheap hack to disable gettext .mo generation.
+		rm -f po/*.po
+	fi
+}
+
+src_prepare() {
+	check_targets IUSE_SOFTMMU_TARGETS softmmu
+	check_targets IUSE_USER_TARGETS linux-user
+
+	# Alter target makefiles to accept CFLAGS set via flag-o
+	sed -i -r \
+		-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
+		Makefile Makefile.target || die
+
+	default
+
+	# Fix ld and objcopy being called directly
+	tc-export AR LD OBJCOPY
+
+	# Verbose builds
+	MAKEOPTS+=" V=1"
+
+	# Run after we've applied all patches.
+	handle_locales
+
+	#remove bundled copy of libfdt
+	rm -r dtc || die
+}
+
+##
+# configures qemu based on the build directory and the build type
+# we are using.
+#
+qemu_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local buildtype=$1
+	local builddir="${S}/${buildtype}-build"
+
+	mkdir "${builddir}"
+
+	local conf_opts=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--libdir=/usr/$(get_libdir)
+		--docdir=/usr/share/doc/${PF}/html
+		--disable-bsd-user
+		--disable-guest-agent
+		--disable-strip
+		--disable-werror
+		# We support gnutls/nettle for crypto operations.  It is possible
+		# to use gcrypt when gnutls/nettle are disabled (but not when they
+		# are enabled), but it's not really worth the hassle.  Disable it
+		# all the time to avoid automatically detecting it. #568856
+		--disable-gcrypt
+		--python="${PYTHON}"
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--host-cc="$(tc-getBUILD_CC)"
+		$(use_enable debug debug-info)
+		$(use_enable debug debug-tcg)
+		--enable-docs
+		$(use_enable tci tcg-interpreter)
+		$(use_enable xattr attr)
+	)
+
+	# Disable options not used by user targets. This simplifies building
+	# static user targets (USE=static-user) considerably.
+	conf_notuser() {
+		if [[ ${buildtype} == "user" ]] ; then
+			echo "--disable-${2:-$1}"
+		else
+			use_enable "$@"
+		fi
+	}
+	conf_opts+=(
+		$(conf_notuser accessibility brlapi)
+		$(conf_notuser aio linux-aio)
+		$(conf_notuser bzip2)
+		$(conf_notuser bluetooth bluez)
+		$(conf_notuser caps cap-ng)
+		$(conf_notuser curl)
+		$(conf_notuser fdt)
+		$(conf_notuser glusterfs)
+		$(conf_notuser gnutls)
+		$(conf_notuser gnutls nettle)
+		$(conf_notuser gtk)
+		$(conf_notuser infiniband rdma)
+		$(conf_notuser iscsi libiscsi)
+		$(conf_notuser jpeg vnc-jpeg)
+		$(conf_notuser kernel_linux kvm)
+		$(conf_notuser lzo)
+		$(conf_notuser ncurses curses)
+		$(conf_notuser nfs libnfs)
+		$(conf_notuser numa)
+		$(conf_notuser opengl)
+		$(conf_notuser png vnc-png)
+		$(conf_notuser rbd)
+		$(conf_notuser sasl vnc-sasl)
+		$(conf_notuser sdl)
+		$(conf_notuser seccomp)
+		$(conf_notuser smartcard)
+		$(conf_notuser snappy)
+		$(conf_notuser spice)
+		$(conf_notuser ssh libssh2)
+		$(conf_notuser usb libusb)
+		$(conf_notuser usbredir usb-redir)
+		$(conf_notuser vde)
+		$(conf_notuser vhost-net)
+		$(conf_notuser virgl virglrenderer)
+		$(conf_notuser virtfs)
+		$(conf_notuser vnc)
+		$(conf_notuser vte)
+		$(conf_notuser xen)
+		$(conf_notuser xen xen-pci-passthrough)
+		$(conf_notuser xfs xfsctl)
+	)
+
+	if [[ ! ${buildtype} == "user" ]] ; then
+		# audio options
+		local audio_opts="oss"
+		use alsa && audio_opts="alsa,${audio_opts}"
+		use sdl && audio_opts="sdl,${audio_opts}"
+		use pulseaudio && audio_opts="pa,${audio_opts}"
+		conf_opts+=(
+			--audio-drv-list="${audio_opts}"
+		)
+		use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) )
+		use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) )
+	fi
+
+	case ${buildtype} in
+	user)
+		conf_opts+=(
+			--enable-linux-user
+			--disable-system
+			--disable-blobs
+			--disable-tools
+		)
+		local static_flag="static-user"
+		;;
+	softmmu)
+		conf_opts+=(
+			--disable-linux-user
+			--enable-system
+			--disable-tools
+			--with-system-pixman
+		)
+		local static_flag="static"
+		;;
+	tools)
+		conf_opts+=(
+			--disable-linux-user
+			--disable-system
+			--disable-blobs
+			--enable-tools
+		)
+		local static_flag="static"
+		;;
+	esac
+
+	local targets="${buildtype}_targets"
+	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
+
+	# Add support for SystemTAP
+	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
+
+	# We always want to attempt to build with PIE support as it results
+	# in a more secure binary. But it doesn't work with static or if
+	# the current GCC doesn't have PIE support.
+	if use ${static_flag}; then
+		conf_opts+=( --static --disable-pie )
+	else
+		tc-enables-pie && conf_opts+=( --enable-pie )
+	fi
+
+	echo "../configure ${conf_opts[*]}"
+	cd "${builddir}"
+	../configure "${conf_opts[@]}" || die "configure failed"
+
+	# FreeBSD's kernel does not support QEMU assigning/grabbing
+	# host USB devices yet
+	use kernel_FreeBSD && \
+		sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
+}
+
+src_configure() {
+	local target
+
+	python_setup
+
+	softmmu_targets= softmmu_bins=()
+	user_targets= user_bins=()
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		if use "qemu_softmmu_targets_${target}"; then
+			softmmu_targets+=",${target}-softmmu"
+			softmmu_bins+=( "qemu-system-${target}" )
+		fi
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		if use "qemu_user_targets_${target}"; then
+			user_targets+=",${target}-linux-user"
+			user_bins+=( "qemu-${target}" )
+		fi
+	done
+
+	softmmu_targets=${softmmu_targets#,}
+	user_targets=${user_targets#,}
+
+	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
+	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
+	qemu_src_configure "tools"
+}
+
+src_compile() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		default
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		default
+	fi
+
+	cd "${S}/tools-build"
+	default
+}
+
+src_test() {
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		pax-mark m */qemu-system-* #515550
+		emake -j1 check
+		emake -j1 check-report.html
+	fi
+}
+
+qemu_python_install() {
+	python_domodule "${S}/scripts/qmp/qmp.py"
+
+	python_doscript "${S}/scripts/kvm/vmxcap"
+	python_doscript "${S}/scripts/qmp/qmp-shell"
+	python_doscript "${S}/scripts/qmp/qemu-ga-client"
+}
+
+# Generate binfmt support files.
+#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
+#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
+generate_initd() {
+	local out="${T}/qemu-binfmt"
+	local out_systemd="${T}/qemu.conf"
+	local d="${T}/binfmt.d"
+
+	einfo "Generating qemu binfmt scripts and configuration files"
+
+	# Generate the debian fragments first.
+	mkdir -p "${d}"
+	"${S}"/scripts/qemu-binfmt-conf.sh \
+		--debian \
+		--exportdir "${d}" \
+		--qemu-path "${EPREFIX}/usr/bin" \
+		|| die
+	# Then turn the fragments into a shell script we can source.
+	sed -E -i \
+		-e 's:^([^ ]+) (.*)$:\1="\2":' \
+		"${d}"/* || die
+
+	# Generate the init.d script by assembling the fragments from above.
+	local f qcpu package interpreter magic mask
+	cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
+	for f in "${d}"/qemu-* ; do
+		source "${f}"
+
+		# Normalize the cpu logic like we do in the init.d for the native cpu.
+		qcpu=${package#qemu-}
+		case ${qcpu} in
+		arm*)   qcpu="arm";;
+		mips*)  qcpu="mips";;
+		ppc*)   qcpu="ppc";;
+		s390*)  qcpu="s390";;
+		sh*)    qcpu="sh";;
+		sparc*) qcpu="sparc";;
+		esac
+
+		cat <<EOF >>"${out}"
+	if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
+		echo ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
+	fi
+EOF
+
+		echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
+
+	done
+	cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
+}
+
+src_install() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		emake DESTDIR="${ED}" install
+
+		# Install binfmt handler init script for user targets.
+		generate_initd
+		doinitd "${T}/qemu-binfmt"
+
+		# Install binfmt/qemu.conf.
+		insinto "/usr/share/qemu/binfmt.d"
+		doins "${T}/qemu.conf"
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		emake DESTDIR="${ED}" install
+
+		# This might not exist if the test failed. #512010
+		[[ -e check-report.html ]] && dohtml check-report.html
+
+		if use kernel_linux; then
+			udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules
+		fi
+
+		if use python; then
+			python_foreach_impl qemu_python_install
+		fi
+	fi
+
+	cd "${S}/tools-build"
+	emake DESTDIR="${ED}" install
+
+	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
+	pushd "${ED}"/usr/bin >/dev/null
+	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
+	popd >/dev/null
+
+	# Install config file example for qemu-bridge-helper
+	insinto "/etc/qemu"
+	doins "${FILESDIR}/bridge.conf"
+
+	cd "${S}"
+	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
+	dodoc docs/qmp-*.txt
+
+	if [[ -n ${softmmu_targets} ]]; then
+		# Remove SeaBIOS since we're using the SeaBIOS packaged one
+		rm "${ED}/usr/share/qemu/bios.bin"
+		rm "${ED}/usr/share/qemu/bios-256k.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
+		fi
+
+		# Remove vgabios since we're using the seavgabios packaged one
+		rm "${ED}/usr/share/qemu/vgabios.bin"
+		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
+		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
+			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+			dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+			dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
+			dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+		fi
+
+		# Remove sgabios since we're using the sgabios packaged one
+		rm "${ED}/usr/share/qemu/sgabios.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+		fi
+
+		# Remove iPXE since we're using the iPXE packaged one
+		rm "${ED}"/usr/share/qemu/pxe-*.rom
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
+			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+		fi
+	fi
+
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+firmware_abi_change() {
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least ${FIRMWARE_ABI_VERSION} ${pv}; then
+			return 0
+		fi
+	done
+	return 1
+}
+
+pkg_postinst() {
+	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
+		udev_reload
+	fi
+
+	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
+
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_print_elog
+
+	if use pin-upstream-blobs && firmware_abi_change; then
+		ewarn "This version of qemu pins new versions of firmware blobs:"
+		ewarn "	$(best_version sys-firmware/edk2-ovmf)"
+		ewarn "	$(best_version sys-firmware/ipxe)"
+		ewarn "	$(best_version sys-firmware/seabios)"
+		ewarn "	$(best_version sys-firmware/sgabios)"
+		ewarn "This might break resume of hibernated guests (started with a different"
+		ewarn "firmware version) and live migration to/from qemu versions with different"
+		ewarn "firmware. Please (cold) restart all running guests. For functional"
+		ewarn "guest migration ensure that all"
+		ewarn "hosts run at least"
+		ewarn "	app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
+	fi
+}
+
+pkg_info() {
+	echo "Using:"
+	echo "  $(best_version app-emulation/spice-protocol)"
+	echo "  $(best_version sys-firmware/edk2-ovmf)"
+	if has_version 'sys-firmware/edk2-ovmf[binary]'; then
+		echo "    USE=binary"
+	else
+		echo "    USE=''"
+	fi
+	echo "  $(best_version sys-firmware/ipxe)"
+	echo "  $(best_version sys-firmware/seabios)"
+	if has_version 'sys-firmware/seabios[binary]'; then
+		echo "    USE=binary"
+	else
+		echo "    USE=''"
+	fi
+	echo "  $(best_version sys-firmware/sgabios)"
+}
diff --git a/app-emulation/virt-what/Manifest b/app-emulation/virt-what/Manifest
index 163421054448..41ff3cfbd29d 100644
--- a/app-emulation/virt-what/Manifest
+++ b/app-emulation/virt-what/Manifest
@@ -3,7 +3,7 @@ DIST virt-what-1.15.tar.gz 163117 SHA256 7ab9220d4682eadf9139c6afe62d33ebd273fff
 DIST virt-what-1.18.tar.gz 173703 SHA256 bc42dd8214a6f30a1e6f2478faf12c41ecf0a0c8b9e493241f02416ae28162f4 SHA512 8085a38111d5664f411f5bb9d2ee221bc22e5b0f2d993e8d518718b3f63b16ba73e052b1623c090493cf8fef52fd237ba823377503a32b4b7d03cc5380d5c613 WHIRLPOOL e5b496a0cabc65ec9553a6fd55d4a30e8f7501683af384107a40999c4c393ebc21dae37a67a1f377bb224f5e369af281a44adc468ba68072f2b137cb9d66c6f1
 EBUILD virt-what-1.12.ebuild 496 SHA256 381bfa0e8d702fa054c5482d7d6d2938f9c5b6368146bcae580fc4a4ea4d49d7 SHA512 d1d376cd0270cfb18d2db9af21dc6e7968623f246ad70def2f89cc3a8a7535c2230fdaf98aef5f1b805719917fb337ad103a694790a88777c5441ac6b515cf28 WHIRLPOOL 5b31c31fe3decf00d824cfb1e0b5343649e6e6cd2316ecf0e42932ca0bf75139430a03fb16e9cbf4c81e98eb858c175821deaf8081b54eb0ca254232c82645a6
 EBUILD virt-what-1.15.ebuild 486 SHA256 48db7e6982ac79e1967e4582d8a0177215927aa350945cf4697383dc7cba92f4 SHA512 bd6be7716b1f6214ff64ac3c4b79414ed11a4958391083e0ebc8f80dedf2c2c99919d43e0ecebf06ce465b5535053d061dfdc24852111cba48eff12ced78d50d WHIRLPOOL 15a5a9d51cc52c321a03a5cd2b36fbc84355da802def9ce04d00da9148b968b40fc2da77c68934b5f12a24298962f5162c618d4bfce8feb49e6e7832c6548d93
-EBUILD virt-what-1.18.ebuild 613 SHA256 2335344d1b587d7230d1aec97e91923f44c2e1605633dfe734ff1a2079ef2aa6 SHA512 31a832a6826ff5552a6983326a863b32ff055e0c2ff07853766345dfaec54a8457c27776c2a01ab1f6c96ba1f59ba1f9c88a87924386c812bedd0123e949aa3d WHIRLPOOL 9d3eb2a6b07cee1c358b03cedd62551eb902dff1284659ab140156ad043c9edaefd1872ee8d655eaea036e164fb446db37628e13956d9f981e1eed1ea8702753
+EBUILD virt-what-1.18.ebuild 612 SHA256 1dfaa07115ceba0841b0ee40d4cf61f11ac25d36860597b18cee7711fd197492 SHA512 3057a8a4ca7bc460516bd6a45735f45952f477f46bad87ae285058e8bcc3bdc56105299ba91d7cd45d4eed74d87c821fdb3829486e4ccd9e01a89fbb09adfa57 WHIRLPOOL 056390abcf9cc2d4536d12ef1c1ac8d84fc78a88ad4c0ba3ba919c1d446bed04607daf1f46e0b44460e123146d0e3e10298c176f82f0e64c15fc0ca9c0ad7ed4
 MISC ChangeLog 2741 SHA256 58eb4e07a8f96e2e7ccb2ddba0bc788e7bb0fb1d58b521f8e5af5267058245ca SHA512 451723b4e8db5e6cd5f3db3a9b8a0f6fc92c9a1a0d7d582b0b8ded5acc153e916f3c718f883bd694e0a2b88a78dc90cd4f371924f6c73d2baae7c37bb90d76ba WHIRLPOOL db8e359e101f255131f3c4a830a4c0a47283013c04badc8d4010ccfa724053b8c8d68c08977552a32be220137bf0f05774c3070dd603df1215e41c10da08dd35
 MISC ChangeLog-2015 2123 SHA256 9624a27899d13aeb2b5b699838ad2127b527ff9652558e4e5947303113f39a91 SHA512 77b82e4e94dfd3ca584a9d9257439da2f3410748e0206f5de1e3641ee1a5ba6948c41e499db9e8a0de68305bd736aa92c58ff7f2c718113e6291b6ae92a2a92a WHIRLPOOL 2b8a7220e10de9bc3724dd01a4a6f2063ee08050eee4d58697d461103671966d45ab9fe0afa5eebbc260f45289aee22b8c0818ecc1c919680db6fa387640adff
 MISC metadata.xml 456 SHA256 0eb0c67988b9859d773f87d2f6d7bbf8f9ca45b1391a5cffe04a2512bad67a6e SHA512 9b3ce56970ef01166980d6e5275bf4d740c47c044ab531cedeaac4e606d369f2c65b22fd8d8387332f0428ed7d9970d8b7e6363b48cb73c5b3326c7b463906bd WHIRLPOOL d6365ce01f2a538f495f6f7a9bc37a3374363e7523b2870621328ab76a4edfc1020f958e10ab9e6491b98f6f1f29f9f036c92de89c0b188b610f4f097ab98900
diff --git a/app-emulation/virt-what/virt-what-1.18.ebuild b/app-emulation/virt-what/virt-what-1.18.ebuild
index fd7406dc23cb..50cdbef36db8 100644
--- a/app-emulation/virt-what/virt-what-1.18.ebuild
+++ b/app-emulation/virt-what/virt-what-1.18.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://people.redhat.com/~rjones/virt-what/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 arm ~hppa ppc ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 arm ~hppa ppc ppc64 ~sparc x86"
 IUSE="dmi"
 
 DEPEND="dev-lang/perl"
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 1890749a12e1..7a37ba32e64d 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -9,6 +9,7 @@ DIST wine-2.14.tar.xz 19447812 SHA256 03f934d95181f728600ca04d395f10e821ee38cfa3
 DIST wine-2.15.tar.xz 19463720 SHA256 d82d500cbf81fb08c711d3619bd52373138a05574d044f089af89707274868b3 SHA512 a52a42dd1f20fe68213c55a07ac5b2455150806e534f0ab77a8e9ae3d2f12840983fa92290dac569207d3640c7f45cda83801e9f2e80294863ffa854c6c89171 WHIRLPOOL 99c9497a44859ce310c764b3cd172d83ca1a2dce13633fee930ddbf1c40651ee4470f6bc9cfcb407ce65298a2afd73dc9edc536c2ba6f076631e5cf2085b8e61
 DIST wine-2.16.tar.xz 19484716 SHA256 a561edcabecd6c44948e5b2ef11941b2ba047275240418fa2c98c1fdceda2c21 SHA512 749a36b536506c4b63ff7512e316f44503cdb0db46e38a124da86df638f3e8ff9c404b034ece5cbb95cf20c09bc46be9a38f2ee66480aa6a4f2385e2a7a7eea4 WHIRLPOOL 92ae0a427d89b24d41d4565e333cf3b7499c1dfedb6d2a204f934975c35cb589d38b4f669890c1fd6a37b9fe8f34d98be3e7d0986e9ff99516fe00a004574520
 DIST wine-2.17.tar.xz 19505528 SHA256 7edc95739043ccc55957af663fb910318283dc5d1db42cd7f0224e30acfcea69 SHA512 cb10c876e689aa601c68673aab32c0514dd174692a01bdb3afc78d5e6079b0e77f48783af2f54245f397c762da3b4e5f2c1d39d2ce7fdb3b117d338b95c24810 WHIRLPOOL 196427a68ab3b1261cb63bafd7f82b7a688ad439fa82ae3fc04b18c9da14cc8e95b827ca8ddd07124e1179c55ed0e0aba3bdcb4639b724a6dacf4952e8827e16
+DIST wine-2.18.tar.xz 19546360 SHA256 9f0931129878157d717cb39f16cd33bf49f40aac77331c93d0ad30f2ccac4f50 SHA512 61cc39fa3d2b0a0ab3c5d17579865e6aea76dd9513a4b3c45975a2d5c05f2b4ba952b97eef547131a014763c7f692a08df29bc2ebf7e4ac7e2616e6a7822ddb9 WHIRLPOOL e864dd1705c0480d3f3095aa02ab1e7bc5b41693cd6b791cdf05e636c7099562020ac3adcba6421653efdf5dbe232b5abe9071792785e008ea30dedbb63e080e
 DIST wine-2.2.tar.xz 18916364 SHA256 64cb57e1d8aa07f5c89ef26743b494f2d3ef9c0f4e50d3ee896a93535f7751f4 SHA512 0700868244d397c1442948716321e5ff030c667edce464570f76aa4340199489a422872aa3975bc0a57b8285c9d59fc04e223a4bde094169fc6db460acb626c4 WHIRLPOOL ffc3d357a76592651b589c6ac6608720d0258474890faf8fe3e20ac29cdd1496d569721256f9389d347bf2734a556099154fd18ef1b56f45bb46c4c15771d6ca
 DIST wine-2.3.tar.xz 18931732 SHA256 afc95c7a87cc8f0730b462c50a5dfc9c462eb02c6bf5874b4fa99946f49e067e SHA512 bea78e8468555ff9e08dedf3918da5ea82721549c43984869989bbdafeea00e454820ff9558aa29925c97a165a9b01e5cd1fd397f133833c58824984a6686171 WHIRLPOOL 1f5ec8e5c32d124277e4c71d95726d3a5337575757c3029567c77165d65fcfec2ddf33d3863b4bf55c9eff7c3582c1ec7dbd76d84ed8bbbe89dd16db6b0128c1
 DIST wine-2.4.tar.xz 18953748 SHA256 87b5df07e4781fecce2f92415a4717208ea253a20a0df8b36b9f90b69b72748e SHA512 15ae7e97dc72a8636b2c15c93803ed430fa456d673add61457cf3e479e769559c682b40949b5d38828f6681f13183e560fcb4a2eb0f0ba25e6eade46f7d3d7c0 WHIRLPOOL 558ab7b7517ad5e03366b4db974047eba776585e958a5b71bb2e93993e21bc725ea7a8bcf2a4354f34ca38c94ba99ccd15f2f8b5e4b58066bf339d3517eec56c
@@ -27,6 +28,7 @@ DIST wine-staging-2.14.tar.gz 10179829 SHA256 cd4c8e400a808cbfa5c5cf088ea874c761
 DIST wine-staging-2.15.tar.gz 10190900 SHA256 f2b5c43fbc185a6fd6399f4c351b83a172737977b2ebb1cbdeddd1838d044bc2 SHA512 75d64d103839da2daed6e5b2400185c0a5274d0e50b675283bbadff70cafe712e573701207d80c8e8af7f68d1d273efec3c0d705dc982c74b8574929daadecfa WHIRLPOOL 13239aa636fc102fb374ab8724b7dbce8e9b95f16797a4f5faf8a5e7789d60e6b485c7495ccef4568edbbb0549d657a6758642de2e98b449b0ced2725136e444
 DIST wine-staging-2.16.tar.gz 10220855 SHA256 da0ef4b0eafe9cd1b9cf26a5b950088adf1308e17a0d6f4ae62516b6ee64248e SHA512 96585caf77569a31f516aefe230a8907ef91db29759f75075593b751985f294bf292a1c146d287a3f0859a6b6273560670c4bc734ef0fbecb0809574eb3f09ba WHIRLPOOL 66128c8d59593243e95d6765b9fd8ace59e85e365a5e8a41eeb17d370464005aef060ddf3d862d0a3638048fd92189860e69a3cbf7d24d3ce1e420200d4b3cf5
 DIST wine-staging-2.17.tar.gz 10211107 SHA256 f511bf3438dc418b4f667513bf1ae419255e4ee62229e9205c0c64b047222183 SHA512 b652f6a852a1382c1b8275e172b7ac7608749c34aef5c0c5387cf262bf0da8db67a77ce397d49e53f3e2a8f210a3dbea1a9b3f3feb15c7d5bad8952b6fb7b53c WHIRLPOOL c45dc5fc91bc774f9f28bb06dff959391829fafac398bef198755395afe5a65bb2d32ba3ce157607a6040481955926866ed8f0760850bfca821be8599f4d7b64
+DIST wine-staging-2.18.tar.gz 10243957 SHA256 69c75d3ca17b1c3617cd0934a9e9ad6fca37c6679900d2cb63f6981aa1026cc8 SHA512 fe18b53d4160596d134ceed392f6459e9c183381f4712add43d8422e77d7d5d89ff34a3bb3afbd7740f250d85dfda0f3501e9600a41270790ae02138ed6d7dc7 WHIRLPOOL 2dc1429a7a4f13ee01b1317f1937ef7ec6b42c3cfdd78ff78bb8273e1056751edb2ac119904ba48ab645b430f269a9361a6d42bcbb5dfb46bd15a129569d3194
 DIST wine-staging-2.2.tar.gz 10078327 SHA256 9d3cbf7e5f12c623d275457b910a158e0b176fcf50c09a5f8425864de604bc1d SHA512 8ad3f8ba4c6439a9ec4884a55018a67c9e2c2384830074646aac7b70cb9f4f5a20f760247ab42dc3d2f697cdac7ea5322be8ed12c435cb0bc185ac08fdd4dd91 WHIRLPOOL a34c19aaace64307de56d935cb0cef17d7c066c39b83c51e70ea76a20083f928bea55fe38d62b7a8250b0a9e8f00e0d2b744f43fcab433069ffb96625d955303
 DIST wine-staging-2.3.tar.gz 10071742 SHA256 9a81be606836fab6203857f7937ff97575947f75d52c80fb5489418efb8b87e1 SHA512 8e8af1e36cc69c63ec3542f0ec4db18b6d8c16b5c9077eb211297f3a886519da71bcf72934bf8d6d72e44c7c9f765e1d00203d0d75cab8544f69f9b0c10a7133 WHIRLPOOL 50738a6e20890748d7eb01152244d34b259759f61b3587ba39815dc066fc8e2b66ce182e1ddbc912f50076a3599aa060ec6a94eeaab4513ce3a776711929b9b1
 DIST wine-staging-2.4.tar.gz 10067020 SHA256 709cab12c0ebf7cf9504fd4a67eb851272309e00066ad81f184b0f55c63e9deb SHA512 55d11851697836b582ba54696cadc812ef6b14872440f5c3ed6fbe30a05abcb8abe2ab31a11ea4daeb354854c7c0e6549401d4b26b26621808bdeb89aeb206f9 WHIRLPOOL 8d344b7e6e89322c8dbbe6fd211851c90a45a33b514c182609cc60dc21939f791abc71d8665cd66e5c5161f159fe24c4772b99405833e3d11985a644e1335eaf
@@ -45,6 +47,7 @@ EBUILD wine-staging-2.14-r1.ebuild 19982 SHA256 7866a109eab8da015f1f3d44c67a61d1
 EBUILD wine-staging-2.15-r1.ebuild 19982 SHA256 7866a109eab8da015f1f3d44c67a61d145815b89143fee4dfce041dbc899d335 SHA512 940cb4906a24edadf552d1f3bbdecd79881374a5740ed7c082aa23c04e1519420a7f3375e285d56beb3cbab6bbaf6450240d096d305b1416856b17c3970ce638 WHIRLPOOL 44a5e60f344eaac880a37624dd9201086b8df1452cfac88431b6c8a595501a6dd326fa7a7016229570c1d2657f9adb4074acb4053cc466e24f969d262670615c
 EBUILD wine-staging-2.16-r1.ebuild 19982 SHA256 7866a109eab8da015f1f3d44c67a61d145815b89143fee4dfce041dbc899d335 SHA512 940cb4906a24edadf552d1f3bbdecd79881374a5740ed7c082aa23c04e1519420a7f3375e285d56beb3cbab6bbaf6450240d096d305b1416856b17c3970ce638 WHIRLPOOL 44a5e60f344eaac880a37624dd9201086b8df1452cfac88431b6c8a595501a6dd326fa7a7016229570c1d2657f9adb4074acb4053cc466e24f969d262670615c
 EBUILD wine-staging-2.17-r1.ebuild 19982 SHA256 7866a109eab8da015f1f3d44c67a61d145815b89143fee4dfce041dbc899d335 SHA512 940cb4906a24edadf552d1f3bbdecd79881374a5740ed7c082aa23c04e1519420a7f3375e285d56beb3cbab6bbaf6450240d096d305b1416856b17c3970ce638 WHIRLPOOL 44a5e60f344eaac880a37624dd9201086b8df1452cfac88431b6c8a595501a6dd326fa7a7016229570c1d2657f9adb4074acb4053cc466e24f969d262670615c
+EBUILD wine-staging-2.18.ebuild 19790 SHA256 cda795f03527229a2f2be75c85f785f250c97c9ecfe82ef86b83d14401313db0 SHA512 86e3bf6fba538cf5f36f25cf892dc449fd24963256099e2a1cb2f4f8b61de1bc15c823ddd07686fc718c98b57d8baa3b0342bd1a33eee9dfbfdf7951f7fce5ae WHIRLPOOL 0d773a4b627819e99ce22ea66f36acbb554f52b3c005c852853b418eecdb754f8f4fa28e67738cc62f7c7395da504bf6a8507822a0bc32a7c3240373e6673eb9
 EBUILD wine-staging-2.2-r1.ebuild 19982 SHA256 e33c8f8e5d60b7addb4d4a4be6ab72594953f6cd912432f484128a603fd1ab11 SHA512 a52d95f7bb9515a061c079f3c1be7f867574be9399c99b7d48312bb718a01c050cd79dc5c1baf3a7ab99aedd63d6c23c19cc698d245687cdda27685ddf84ef0a WHIRLPOOL a138efdf7731e635feefb0d70e99475255dff2642dcff847907c2fc0421af0025c3c81f8aba8ef415b81250bbc37ee4b5eb0259845919150f097f43a9caaf20c
 EBUILD wine-staging-2.3-r1.ebuild 19982 SHA256 e33c8f8e5d60b7addb4d4a4be6ab72594953f6cd912432f484128a603fd1ab11 SHA512 a52d95f7bb9515a061c079f3c1be7f867574be9399c99b7d48312bb718a01c050cd79dc5c1baf3a7ab99aedd63d6c23c19cc698d245687cdda27685ddf84ef0a WHIRLPOOL a138efdf7731e635feefb0d70e99475255dff2642dcff847907c2fc0421af0025c3c81f8aba8ef415b81250bbc37ee4b5eb0259845919150f097f43a9caaf20c
 EBUILD wine-staging-2.4-r1.ebuild 19982 SHA256 17f8bce5e24aa140bbab385666fcddc562a585d12abdfce16ecc5065a0d57b6e SHA512 5d1fd68c6873b4e30a596be0509977e11513426bc4c3f942e1544fb628a43cefb52348bafb9573952a7989371581ee104acb67ecf99306d91ff8d55d81614e9c WHIRLPOOL 32f7760267d2aae8f7663de860d272ac9c1749170092168fb526358acc1b111d956ab31099e1b0b4a9dad81a93f571ec0b3bf09627b04c3942afd6969366b6e1
diff --git a/app-emulation/wine-staging/wine-staging-2.18.ebuild b/app-emulation/wine-staging/wine-staging-2.18.ebuild
new file mode 100644
index 000000000000..64f408768d4c
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-2.18.ebuild
@@ -0,0 +1,598 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(get_version_component_range 1)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+GWP_V="20170830"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+if [[ ${PV} == "9999" ]] ; then
+	STAGING_EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging.git"
+else
+	SRC_URI="${SRC_URI}
+	staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	osmesa? ( opengl )
+	pipelight? ( staging )
+	s3tc? ( staging )
+	test? ( abi_x86_32 )
+	themes? ( staging )
+	vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-baselibs-20140508-r14
+		!app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-db-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-medialibs-20140508-r6
+		!app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-opengl-20140508-r1
+		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-sdl-20140508-r1
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-soundlibs-20140508
+		!app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-xlibs-20140508
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!app-emulation/wine:0
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:4.7.1 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	dev-util/patchbin
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
+	prelink? ( sys-devel/prelink )
+	staging? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	xinerama? ( x11-proto/xineramaproto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+wine_compiler_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+wine_env_vcs_vars() {
+	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+	local pn_live_val="${pn_live_var}"
+	eval pn_live_val='$'${pn_live_val}
+	if [[ ! -z ${pn_live_val} ]]; then
+		if use staging; then
+			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
+			eerror "cannot be used to set the commit. Instead, you may use the"
+			eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT."
+			eerror
+			return 1
+		fi
+	fi
+	if [[ ! -z ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environmental variables"
+		eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT"
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+
+	# Verify OSS support
+	if use oss && ! use kernel_FreeBSD; then
+		if ! has_version ">=media-sound/oss-4"; then
+			eerror "You cannot build wine with USE=oss without having support from a"
+			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+			eerror
+			die
+		fi
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
+		if use staging; then
+			local CURRENT_WINE_COMMIT=${EGIT_VERSION}
+
+			git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}"
+			git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
+
+			local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
+
+			if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
+				einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
+				einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
+				einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
+			fi
+		fi
+	fi
+
+	default
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+
+	eapply_bin(){
+		local patch
+		for patch in ${PATCHES_BIN[@]}; do
+			patchbin --nogit < "${patch}" || die
+		done
+	}
+
+	local md5="$(md5sum server/protocol.def)"
+	local PATCHES=(
+		"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+		"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
+		"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+		"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
+	)
+	local PATCHES_BIN=(
+	)
+	if use staging; then
+		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
+		ewarn "Wine bugzilla should explicitly state that staging was used."
+
+		local STAGING_EXCLUDE=""
+		STAGING_EXCLUDE="${STAGING_EXCLUDE} -W winhlp32-Flex_Workaround" # Avoid double patching https://bugs.winehq.org/show_bug.cgi?id=42132
+		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
+		ebegin "Running Wine-Staging patch installer"
+		(
+			set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
+			cd "${STAGING_DIR}/patches"
+			source "${STAGING_DIR}/patches/patchinstall.sh"
+		)
+		eend $? || die "Failed to apply Wine-Staging patches"
+	fi
+
+	default
+	eapply_bin
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+}
+
+src_configure() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir=/etc/wine
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with ldap)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with v4l)
+		$(use_with X x)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	use staging && myconf+=(
+		--with-xattr
+		$(use_with themes gtk3)
+		$(use_with vaapi va)
+	)
+
+	local PKG_CONFIG AR RANLIB
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	# set AR and RANLIB to make QA scripts happy; #483342
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	# Remove wineconsole if neither backend is installed #551124
+	if ! use X && ! use ncurses; then
+		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+		rm_wineconsole() {
+			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+		}
+		multilib_foreach_abi rm_wineconsole
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+	fi
+
+	# Failglob for bin and man loops
+	local glob_state=$(shopt -p failglob)
+	shopt -s failglob
+
+	# Make wrappers for binaries for handling multiple variants
+	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
+	for b in "${D%/}${MY_PREFIX}"/bin/*; do
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+	done
+
+	# respect LINGUAS when installing man pages, #469418
+	local l
+	for l in de fr pl; do
+		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+	done
+
+	eval "${glob_state}"
+}
+
+pkg_postinst() {
+	eselect wine register ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${P} || die
+	else
+		if use staging; then
+			eselect wine register --staging ${P} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+
+	xdg_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_prerm() {
+	eselect wine deregister ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine deregister --vanilla ${P} || die
+	else
+		if use staging; then
+			eselect wine deregister --staging ${P} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-eselect/eselect-postgresql/Manifest b/app-eselect/eselect-postgresql/Manifest
index e531702d80a9..87d09e441e5a 100644
--- a/app-eselect/eselect-postgresql/Manifest
+++ b/app-eselect/eselect-postgresql/Manifest
@@ -5,7 +5,7 @@ DIST eselect-postgresql-2.2.tbz2 4428 SHA256 ea938c941b7c8ecd752a46f40bab08dcf1c
 EBUILD eselect-postgresql-1.2.1.ebuild 672 SHA256 f10af65fe36d43e517fc1d06cbb94c5211aed5edbc02ceb0c4d9648034391f53 SHA512 d137b8ef89461e40a8f2fe1afaf290e4e029a5b1374e00b3f9a4b96d0a8d5490bd71da30aaf33f3cd690c03652764f1371074d2f0320c7cfb57972a0a0ba06d1 WHIRLPOOL 14d4b99ec63f27872f7c47cc1b4ab09b4227c8e2ec4729b17d9dd09d7e1067e619d83e2a4ad5004ed69aad9eaaf407cdf7601a78a3f9b8bc081d979f40cf7e25
 EBUILD eselect-postgresql-2.0.ebuild 953 SHA256 30f027bd6373c95888e8bed2e1112301573941c84c0db228f2abb568066179a6 SHA512 c437f9753c52b012250d404007ebf30f046a800692981c415e63d798b39c6b9de686b4dd6f6a92837fff495ebc43ba5ca04155aac5e2d0b45a4a684e4a94acd7 WHIRLPOOL 439753ba9973f46c7ca551df5525766243be6fa6cef3a01ca93eaf10f5253d93c7c52cd440813579fdb2e1579bec2e5ce26c71bf2c9be34344f973cc924ccff0
 EBUILD eselect-postgresql-2.1.ebuild 945 SHA256 7cd221455545fa4eadb2c40250d0ad1b60213da62ae526a49115b92ab665325b SHA512 094973b5db9a173c6a4045d7cc8174dcaf5bac1ff9711a4f39f39acc61f7876135a645c511e2abe7818ba069f013e0328bcd233721ae6e4a724d608887628f64 WHIRLPOOL 79b2f291cbe0ae6ee1fb930d915bfca0fca0e6e58a21cd03559735942afaa3f715a0e80fbbff696706403722896180905b10273581b8a7d92addcc30b6340147
-EBUILD eselect-postgresql-2.2.ebuild 946 SHA256 2ae2a2fefb34dd85a5294aa86b84facb65b31163401eeee503ed824e45757fc1 SHA512 d2eed1b05dd800b3b1ecb8e00a44540e103d49c54fa9e708449e780f170dc233d0c888182c26560b8be3290aa224bb40b7bd9a3dcbfc701d057aa9f41003769f WHIRLPOOL a980f513725f202ad84691ee38ff202f655ea7bf8de4be6c181b5a3366400fed65771370e3f8a57cc228feacc7888933e9f4e3a68fe47e12f3d1a29c4af5bf70
+EBUILD eselect-postgresql-2.2.ebuild 945 SHA256 7cd221455545fa4eadb2c40250d0ad1b60213da62ae526a49115b92ab665325b SHA512 094973b5db9a173c6a4045d7cc8174dcaf5bac1ff9711a4f39f39acc61f7876135a645c511e2abe7818ba069f013e0328bcd233721ae6e4a724d608887628f64 WHIRLPOOL 79b2f291cbe0ae6ee1fb930d915bfca0fca0e6e58a21cd03559735942afaa3f715a0e80fbbff696706403722896180905b10273581b8a7d92addcc30b6340147
 MISC ChangeLog 2663 SHA256 9b5772e1707565d6d9bc512401b960f26f7efecc89cc2ac0780c0ac6e5f773d0 SHA512 1400ab77aae6f7a0b14cc696476b6fdfb12f3b457a8efcd91d44d1182d9cb3340c5983d1744416f6d88d29b40ee094fd05510b8a6756c80b551969bb8f10f12f WHIRLPOOL 1be60eea1ea0ff0b3438065e554dda0eb53de5926f71cecdd030dbd4f8be4a9ceacdfe483a5e643f3ecc6b7fddbac99b87b9d62580a02899c4622eed6d760e3c
 MISC ChangeLog-2015 8659 SHA256 4a87dfa66639f2c4937e4eab5da6469d66dc40d764434c6b7881621866da7792 SHA512 d0fbaf00ab3fc960ec19fe70ef8d38d51b3da7ee9ed51e5c72f410ead58c66dd96b7b19a9b19a6354925e71f3d189d88640d3700b5338eb6d5e63769f08a0312 WHIRLPOOL dc9124e1a9b90b80f80f1e2935dbbc088c2b07d484cabd5146589dbb59aefdf3ada81a5eb8d23a0000b7a67b0b563e0ec51f21f24690b904bc5c8ea8c67efc9a
 MISC metadata.xml 447 SHA256 fd0094d36aa35d98eb40399c97571bf1e6d28220b199f8fcf04d3edcd6a58322 SHA512 9e1f1d7edd700ce070f0c2deb461ac5b61c058cc7331cb582ed4ec098e4e04c19b15f9f3289df1a5e3a1bb243b8983a52a2b18b0af7884941ee6a6a4e067b1a0 WHIRLPOOL 64465df15bcd1d56791c71225081a0dfa52163bf295a0ccc6e71ca5084ebf0728fc2f44dc04bdd96a6201a8a84d75552f7853518558a1821b2e51cc6e6832acd
diff --git a/app-eselect/eselect-postgresql/eselect-postgresql-2.2.ebuild b/app-eselect/eselect-postgresql/eselect-postgresql-2.2.ebuild
index aa938c89824c..4cdbf680c4fd 100644
--- a/app-eselect/eselect-postgresql/eselect-postgresql-2.2.ebuild
+++ b/app-eselect/eselect-postgresql/eselect-postgresql-2.2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.gentoo.org/"
 SRC_URI="https://dev.gentoo.org/~titanofold/${P}.tbz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="app-admin/eselect"
diff --git a/app-eselect/eselect-ruby/Manifest b/app-eselect/eselect-ruby/Manifest
index 5929d0b862b8..f8d4e0a9b55c 100644
--- a/app-eselect/eselect-ruby/Manifest
+++ b/app-eselect/eselect-ruby/Manifest
@@ -1,7 +1,5 @@
-DIST ruby.eselect-20131227.bz2 1920 SHA256 b425962f9898ceb8bcdbb55d9648f3d98b82a916c4afa95b2fb1ddcd39cc3689 SHA512 9f13d4a6dc45923f88b145984f9c537846d4cb937b73c2be916792c70ff3c751f1e12b76f33686e35053bf6af1392e6c7e276f06dfb728e6a20f6335f739b784 WHIRLPOOL 38135af69952aff7cf874608365029947733733d33a3c586367ccf6fceb1bf2236781c9fe554a5654f720c19ef0fb0bd3dd5773a108386c6185a2fc2d94ac37b
 DIST ruby.eselect-20161226.xz 1900 SHA256 55e1c16e92748c2853620780fbd9db8a28a88cb5e2dd1bfe92d104be8b60397f SHA512 69cf17e42d9908fdfc9b08a3ca2c1f406a5968fc1c22663cc4b2388ad29d3bdb8aec4f0210ce9d5c118514aea81a4465a299347dd702f859ba8660fcb3882f17 WHIRLPOOL e09a8964e77cd8293ca3fac41cf6bd819004bd62f4cdec0eae35b331073b175bd4085631660bcead0e93510bc7ada051070d2316aad3de6bd17d8cb0156fd6e3
 DIST ruby.eselect-20170723.xz 1972 SHA256 c383871ce89a06c0fbaaa595a6746516556a17184146623abf3983402fbe342b SHA512 9c0614bc7e2ce9811466f257035d74622a96db8d44aa0908414fbac7d4142c34350257b08ace7371901e46cc0c9a38c3f2acae3caea4fb354ccc37b8c919b48f WHIRLPOOL 192c27a562536e848fa60e2ab1998c56308cf89655f86c887de4a9b58c2cf0efb7d8b8ec97f0018f865002d9d9b01d792d5cde6aeb8ca9feb8ec8d62480ce772
-EBUILD eselect-ruby-20131227.ebuild 683 SHA256 b4df4b8f8edce2c57f8d37fa52c3509b758f5524cc8f034d037cc33ac4f7f885 SHA512 f9c97794ad34fbec459d94384a07a3219fc08f166c74f55e2f1b1e80b842145e1efbe761ca92bfd07c9eef9ced35bc46d27527c60de756db597aa25bb88ed4b2 WHIRLPOOL 39d298331417f0a504f2693e36f4c1c8047f8ab49cb0e8306846a3a51d8d3138b4c640d045ea35832c54fbc98c0f44124f0f996c312ca1f57c761945704045a2
 EBUILD eselect-ruby-20161226.ebuild 714 SHA256 33bc1ae88606bb21db35ab12d41f368ba8ea82d71a631e0c3a22906c8eb9741f SHA512 f504faeafd5c12d1b1d01f1c4968df146a445bf51d0fb0d1a00a11c928265e99459cfea32ca38e2a5a07a82efa3585521568d6f5b4563b30f8541552893ebf85 WHIRLPOOL 0ec9db61d0d5e0306294523bbd91d53a607611fd3f0d9c1f087ae8fcb9e88360e7e63b8451badfd4fde775c226e132a04120ff290c9a930f2a686d89218762e7
 EBUILD eselect-ruby-20170723.ebuild 719 SHA256 0e6e37afc9b267e3c0dd33a630ceebfa280ccb02db871286b0b73b86ed6fc043 SHA512 067c046d13b7057529220ee394147e1dc1e7c705d5ad7277fc6fb4676ba652a196694ade7fdc3ae52c70e48543ed89a35bb807e439fae7e16e553541d3645bf7 WHIRLPOOL b2ad36fb778f0c9886bbe2f43925ccf350da450be7ba6f7357462f061c5f8baef61faad4c8b471b5d7d9795c253e4f69ed08b6d41d5aa69a20844e6fcc7a2d26
 MISC ChangeLog 2797 SHA256 6100366362ab129629b42abd13b11212f034aecd11b0a1fd837e46e8d70f914d SHA512 60667570c0943ffa368eb4e5ce0ba50b5e9eab00140de85b11025bd8f3964a20f9ddd0e28e75e8f2d638b628284552949de1c47299b46815d06068444cf8f4f4 WHIRLPOOL 429f04fb0059238ca568e7613e72041d3e547a086a4c9aa86a0139c8b71101b89160a654befc3a0716dd402f532cce82055e8c8db33abdae40fba0a070bd9f9d
diff --git a/app-eselect/eselect-ruby/eselect-ruby-20131227.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20131227.ebuild
deleted file mode 100644
index 9b01232217a0..000000000000
--- a/app-eselect/eselect-ruby/eselect-ruby-20131227.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Manages multiple Ruby versions"
-HOMEPAGE="https://www.gentoo.org"
-SRC_URI="http://dev.a3li.li/gentoo/distfiles/ruby.eselect-${PVR}.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=app-admin/eselect-1.0.2"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	newins "${WORKDIR}/ruby.eselect-${PVR}" ruby.eselect || die
-}
diff --git a/app-i18n/fcitx-anthy/Manifest b/app-i18n/fcitx-anthy/Manifest
index 5a6effd0134b..c6141728d5f0 100644
--- a/app-i18n/fcitx-anthy/Manifest
+++ b/app-i18n/fcitx-anthy/Manifest
@@ -1,9 +1,12 @@
 DIST fcitx-anthy-0.1.1.tar.xz 68604 SHA256 c508068c7c9a56c26ea44b8e6ddb90a2ea75860031f89e171dcda8ec4cd08955 SHA512 e2c4bb20f0b0a370e5f28bff14312c2c14210695418438ebe697b94570fe502be8c96dc8fbf813fd3aa6e352283a7d31808a1f12266d4a8050646a8ae86de9d9 WHIRLPOOL 48f674ef23d62f2dc1286712cbb252d709d9e3890921d1f9296ff89f85c5ae211daa887841fc01f267fe44764275e8b6de4aef859d9f1456cb24f00023b262ce
 DIST fcitx-anthy-0.2.1.tar.xz 72196 SHA256 fd208474666f09f1c189c10c2c0fa9cfda33948b704410e02878fdd92174d78d SHA512 18599251d6ebda96a23f81f63d91e9a9d469d2ea534975c2f4ddbc80584d70646ac6d157d0571f9d48565c0cfd1bb111e2907cae2c00b750014b9f39a7bcf961 WHIRLPOOL 99632911a7831ce24c7535b0e0a249cbbc48b24ec44682f6a09e3dc0a61d7eb74363642098158cc409c3390fb141d03591f1e1b1b3683164d4d6002fe9c92769
 DIST fcitx-anthy-0.2.2.tar.xz 72360 SHA256 c8dd54fee3ada834d6ed0df561a95210256ea2a17fa5e00d9ae09892bafbd92b SHA512 a4b1eeba813481cc40617e70bd5ee97d1921dc92bab15cf0bdc059d689c239e46caf9e8aba3403ff6374acfbdea565261a948444fe40fa18d5513797eccbd28d WHIRLPOOL 7427384e8e12d7e35027a4a149cc758828fb9664204490d35f7b43ad083cc8545c4b52164af716065bccdd4a347f047e34c80cac32699641798fd2e21dccc8ea
+DIST fcitx-anthy-0.2.3.tar.xz 78020 SHA256 ed9b4956356ca68e5f7bdd46492873ebebc921a6cf713d7fc62e5680393f5d06 SHA512 2769871059053fb370ba84af7cdf0c461d64724a240d58a5a8889cfd9bfb5d145998f79ed2d06a1ae1ab907f9db04fc122bfaf6957ef572fc833e400ffefc642 WHIRLPOOL 4550f529d98b31abf7e632998fdd5d082045ce2daff251a860f7feaa966fba2955d7fdfbdf0be977f81c64cdd0473f082e8356569d70f3c29943846e9ea92570
 EBUILD fcitx-anthy-0.1.1.ebuild 546 SHA256 604f0821ab837ab5e365960809210dff7252088783a3460f10491e720bd16285 SHA512 3fece6bb17e588880cab84dd6f53842fe7aae0e91d9c008412ec601c7552c27714e3641b63f3b74a55f7bb1d9535f9868d6508cb0e3f72f8ecdb3622b77e5c7d WHIRLPOOL 75b35b054f9ecae858ef8bc61d2492f4d3be6caf9a011ba23d5b05ae5e70b27a956d0d51a5fa5f3a917aa1e7906763fbf5eaab193cf50fc9276349463fdaf982
 EBUILD fcitx-anthy-0.2.1.ebuild 555 SHA256 22d3604c182a54f5b8b4eb10abad7248cae45857f99e9e82c364f2c49f8a2339 SHA512 0a3ca967059895b76ee2b1f60ed1e28e2646deca2988a62241035017ccf264f0cebe920c18ffb23e33916e11fcbb2f274f0a0ad234f192b5b2ecbde88c6e3161 WHIRLPOOL b9a7e34c1db46f9e68a0d3ecc2b5d5dafed5f1c1dada3a8c95122603c9ff49cf5d271713bd2991725ac3e44e97c283d9a7c3f4d238d8b645c4a34d85dd02077c
 EBUILD fcitx-anthy-0.2.2.ebuild 557 SHA256 4c1b1635958e41150673e8539c561b2370c464110d7f47ac928a714b99ebfa7f SHA512 0143cadaa44bae98e47f5539ee9cc6d762840cf4c786994d2ad6928c5d5aee723e6a9fc3e05f981d77d8cfdf0da33c0a4b41c50b0a5de7d53920fc0e372b61d4 WHIRLPOOL 54104a3d53bfe2c14b5c80db53b500956d4d7bec8d37b08b8a5f04cdc41e8e383fd6d10d19f527cd9811ebbc27b1c64cef3ff6accf9db2cb1ab50dc47e2efce3
+EBUILD fcitx-anthy-0.2.3.ebuild 798 SHA256 2842e618e62d84fae2a91a9847c2f3cfc468b9f0e2cef68f1e9fb00277aec300 SHA512 98ce1e843c10c2b22fcb0279d63902000f3192cac5149d7de075daad6f6079ecae58d0b49f38ec9ff4406288abad695f1b9d8e6e4a4f15c94daccdf834d0656e WHIRLPOOL bbffee20ab1c8ccd2941aee51fd8d597d36e75194e524cdfb09cd281276f1bf779aa209f4b9d1724d9f942bf5696f50380c418867be44a53e14395a341254b67
+EBUILD fcitx-anthy-4.9999.ebuild 775 SHA256 d5311855be82defe1c47a43816dea7bd07a66c710b7e04dfdee16fb970d8505f SHA512 a8c73f6c922e1712d5a834ea3518b88b077fde056506600db5450c733be11d2570e2553d65d89fd7647909aff8bfd16c6d53fbfcc50e369974db9fdde71062f9 WHIRLPOOL 0dd0cc4c60c41be59d13e5e39f2e8d253cf441f5bff7f5015cbca4c3082a164855217f41a586fc9696a3ad1a824b302f6b8603ae8214b1d2274b668c33acb215
 MISC ChangeLog 3097 SHA256 fb61e0b1c955292d73a91f9be30e9c30ef985eb8d4516001a7457d3bb6ae0f3c SHA512 1c28ac10816fa72549225b86a10a130ebf768e998ad4508fff09018a45f0039e50ad123da4f16d46aff2842b1174e8fdd91efa025e18d5d156de8d565c5284a0 WHIRLPOOL c8f7a53020c3555be3cf1a943918295246bc1367852327323d6792e0108a2fce0e3eeb6c1cd963050f78be8f413b8dad884ee2c08015beb1cee54985a637e16e
 MISC ChangeLog-2015 1546 SHA256 bb0fe2c154f94786e5c0f6644ce7c5b43cae2c70aeb05b461178c57320cdafc8 SHA512 484fdd99f466dd0bda039a267cfdc5e51fc1a240b152a157ea73946046f8d3fc3811399ca031f82453645e76773803399c8f84fd2a42b643a4559553ab8da2a7 WHIRLPOOL c807284e9424a581e9b76344d3b654a0b40591ac0070fb7600a697272b8ec453234b5fe8235e87659857f8c4ea593b5dd134a8bfe435c5f2219e8704c97a4645
-MISC metadata.xml 368 SHA256 35771713c1279c6a6256b587a24bc95638761053755ebe871015e0a62bdb3d72 SHA512 02412f1f558f3b859d1327a440038b9d9ce6d2430510ef98bdb2ddd2b2ccb9ae682f76e76fdefc47e903ba08e93f6e46e9aabffe6cdfb4e57d33daaa63dde29f WHIRLPOOL ce52e2c48610b125b418018b4043cb24b09c1bc9a959275610a0af5a76c5da179703b20fc3aa938434834f8be6ad79339baf3cc4295f2c11a26a17eafad0719a
+MISC metadata.xml 450 SHA256 e110241438ad8616ce364afc7b13d9a43e233a3e4caa4698a3d85bcd65657810 SHA512 6100dad76b1522292d84eac3dacf69890747a6c76cc1c1e519b97f749a6d86ba34d3cfa439b6a529db87df9b4f0a019ac38e616860c6fa734186631dffa75d47 WHIRLPOOL 3cbd8ffd3bd7473f6b7e0f2ff700e08650c825af19d040d1447bf8b29df7776b4b271cc37391e7f8a34039c89549bef8349a0edb079fb3fb2896c324a5ed3f95
diff --git a/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild b/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild
new file mode 100644
index 000000000000..b9f2d9c0e8dd
--- /dev/null
+++ b/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/fcitx/fcitx-anthy"
+fi
+
+DESCRIPTION="Japanese Anthy input methods for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-anthy"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4[X,xml]
+	app-i18n/anthy:=
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=(AUTHORS)
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/fcitx-anthy/fcitx-anthy-4.9999.ebuild b/app-i18n/fcitx-anthy/fcitx-anthy-4.9999.ebuild
new file mode 100644
index 000000000000..c5fba16429b0
--- /dev/null
+++ b/app-i18n/fcitx-anthy/fcitx-anthy-4.9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/fcitx/fcitx-anthy"
+fi
+
+DESCRIPTION="Japanese Anthy input methods for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-anthy"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+"
+SLOT="4"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4[X,xml]
+	app-i18n/anthy:=
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=(AUTHORS)
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/fcitx-anthy/metadata.xml b/app-i18n/fcitx-anthy/metadata.xml
index 49f2185b80dc..5e15c729652f 100644
--- a/app-i18n/fcitx-anthy/metadata.xml
+++ b/app-i18n/fcitx-anthy/metadata.xml
@@ -9,4 +9,7 @@
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">fcitx/fcitx-anthy</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/fcitx-cloudpinyin/Manifest b/app-i18n/fcitx-cloudpinyin/Manifest
index 2e4d5d412ba0..848e4e2528a5 100644
--- a/app-i18n/fcitx-cloudpinyin/Manifest
+++ b/app-i18n/fcitx-cloudpinyin/Manifest
@@ -1,7 +1,10 @@
 DIST fcitx-cloudpinyin-0.3.1.tar.xz 19296 SHA256 2c919bf7979964bef861b432b821fc43fa94824e82372b03c653219b0fc05f6e SHA512 fda8501d8c132b3810f70d984f77652cefad5a052580c6607f893efdfed132a05053c6edf3ea8ba829e33abc237808eac6ca3521c6616ad2cfa5e3c4e0045297 WHIRLPOOL bcd8aae0339ecdc3db58a950c475e81133a90b08f9294dfea224d38ec7b6e2f929fff2d389761f2c90ee1553b9bd02fd8bf93ab9ef7c23101affebfff7b76d33
 DIST fcitx-cloudpinyin-0.3.4.tar.xz 20796 SHA256 c131e8cfd4d171f7749c2934f13092dcdffcf3d4ff1cefde7ed67daed74b7d90 SHA512 ecfab0e45387793986fc75f24372d69910552d6168c9dd63f258bf05bfa397350bfea2a6fc419ab067fc5a7737a3e8c39d4b8ae5d0501871e3365c8a07553b09 WHIRLPOOL 7dbecb3f5ec38c50364abddeb5c44318503fdf40783b6efd5c8ece029f0cd56f750057b547a25fa6836458ed15646d5923e09c4fc33d927f9d1a40e5332577c7
+DIST fcitx-cloudpinyin-0.3.5.tar.xz 22424 SHA256 2515fe35d1f9d377a997ce8095425ad71d0c76e3fcba2e1fffefc2ba46b765a3 SHA512 b56cde4955fab02d204cfe937b46aeb5b6adf9e4eb4fead6e7b8e0b5cd1ebce06a0de3f9d477a1cb58eb077655f17975b7e13951074d1766b283b86eeb5b276e WHIRLPOOL bf05a4c882d14a9ac3a52bd2d3faf87ee67aea583199d7c5888f425db0f080bd6bc73a8fd3a2236f69a65f40ceef9bf2882dd24838f7dbba8407eafc8695235a
 EBUILD fcitx-cloudpinyin-0.3.1.ebuild 494 SHA256 06319b12c38901a0a276fe9f0ddfc8994a1a5d0beb8dcefc11890377c6be069c SHA512 a4048142501cc6683b4427127c7c0fa188c99f3e33dfd04783007ccc87a967e86923a8ec17cdfe835d53184bd3628e482ac0f52e75d12af2e5e1ada09ff569aa WHIRLPOOL 31dd82509b63801d291fd8efc375267c6b6a743e3c1da7318f43f9d6c419bf1236422d21c2773ac6d72532e2b3090120bdb2b61be7a1770ed2ff736eb0e145fc
 EBUILD fcitx-cloudpinyin-0.3.4.ebuild 495 SHA256 bfc67b0472a86fa30c80ea532098e8f2c87eb08d1e3fdbfb433fb8143634246f SHA512 37d21184dbba30e7a33c802f8bd22077d97608d882b55f441e273a568bfff2fe0dcd60c6794a93d0595b767555dafbc1e52f9f56ab4e7ccf6344b276554cb7c0 WHIRLPOOL 1d32187c86ba56592ebb724f5465a8faaa0bc107efd8bde9fadf494a08fe9aa10ed2e0c9ca5bbe583340a83c7d5004697a7f6a4f548c442feefa151e23614d43
+EBUILD fcitx-cloudpinyin-0.3.5.ebuild 739 SHA256 4d3fcfafce93d781b73b3e62f28c4f371f6e30c8546d0079b07e363fe1a5efa8 SHA512 c55e0be75dfd53744d1012e084d6d0839644025fd092d97bbe04f356f59401f557bb216e1ea151c55e79ec9b3d115d438005f89fa4a6417af041a01d69e04cb7 WHIRLPOOL 1a17c7084ed9a57263caf68c473b464574bb2148944d1e8175a5e7b7d3276917c60cac681e5029802571e5ab64b5821392b1ab20d5b0028cd90da77d238ec07b
+EBUILD fcitx-cloudpinyin-4.9999.ebuild 716 SHA256 0e33a71914ed181209e354931aa0aa914adc7c788cadb200074d2aaece7247e7 SHA512 fb16336058eda6ebd85001efa3f515eadc7dae11d0c0009015fa59a25ce51261cd005dd96b01004a1528e8f31430a39e73bc378035fa188ea30db310e8a33338 WHIRLPOOL 2603c646ab85059c2bec8d81cc05f836a0e6697754aaa14b0df85248c44a5d95c5af0c7737dbe43512103540c06d353ceb8e06adc30c6744dd61fa4bbe13dd62
 MISC ChangeLog 2816 SHA256 1c57c6d043a47016e5fa851b087276cf3f40d7385bb974339c2e012180fa7ab9 SHA512 37a408b59e24acaf682c6435c41a74e7cde0b30717a7e620456940cf8caa237842bc926b3d9bfbd3587e28b1c955c00809a57d31494678b68c69f6310630d3bd WHIRLPOOL d876a0b9d7964fb10070fdd437f8d51a90a245e92ff590dc90c00140d43618fb443eb3a7fafee28ce286e401a8c55b8f6f69f3f47406349f4793b62c934b1568
 MISC ChangeLog-2015 2532 SHA256 66cb3e178ffe129233216cfeaf3788696589cb04705715da287110cf1f2f1ea6 SHA512 6e287439e794d9bd0e8674947a00826a8d321cba9077c4a5246fd51104b8af6a1dd17fd3042917fcfc4dab439bed2268f37765ce784e3c2704c47a143b38890f WHIRLPOOL edb5bec01dbc08ed5cdbacdd132e36047eefff9e400e7de3373ef148af0eef6a048ae35aee0a5dacdb5d9077835f264b430e23443122c4d8e652064b40abe86d
-MISC metadata.xml 443 SHA256 9aaa0c4737141ef1fa241b4fbca896f5537fa38823a175d3c00245fb18d5d7d3 SHA512 01d63563a2a52e619e9b329c5ab806deb4ac204fe9d45c4db879d30466a7a6d20565dd1698e8d1573a59a075187149b7e7dc06ecfa36ad18faf8fbd64c762a7f WHIRLPOOL 218c00c3019efb331b141b46cbd633151ca252b8e858d3f5a59ced7c8ff42e0ffcbdb2c0b30c60352e9324bf6540e140ecf1584b4ecfd38818c83c23fce16ffb
+MISC metadata.xml 456 SHA256 523fcd35ff4ac9df5b4f5969697ef8d33f5acd41f51dc00abb62c13c10780f16 SHA512 d101b830ffa54146258fa424d14129c3693abe3e64582a3fecae2add16d0928d4d18642ff5c5816227cd458862dde6778d679a9cdf8605187862c657060f63ca WHIRLPOOL b08440dca252fc58ee8e63dd7dc52fbafb91210f5c904cd32c8a2bba389427095694d98491785062664e555a1aa896bfa64e94f306d5934d933279696d62b5f0
diff --git a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.5.ebuild b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.5.ebuild
new file mode 100644
index 000000000000..8991ceab3f88
--- /dev/null
+++ b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/fcitx/fcitx-cloudpinyin"
+fi
+
+DESCRIPTION="Internet look-up support for Chinese Pinyin input methods for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-cloudpinyin"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	net-misc/curl:=
+	virtual/libiconv
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=()
diff --git a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-4.9999.ebuild b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-4.9999.ebuild
new file mode 100644
index 000000000000..5d4ef1849fb9
--- /dev/null
+++ b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-4.9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/fcitx/fcitx-cloudpinyin"
+fi
+
+DESCRIPTION="Internet look-up support for Chinese Pinyin input methods for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-cloudpinyin"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+"
+SLOT="4"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	net-misc/curl:=
+	virtual/libiconv
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=()
diff --git a/app-i18n/fcitx-cloudpinyin/metadata.xml b/app-i18n/fcitx-cloudpinyin/metadata.xml
index e4f3812b18b2..a46ab006f456 100644
--- a/app-i18n/fcitx-cloudpinyin/metadata.xml
+++ b/app-i18n/fcitx-cloudpinyin/metadata.xml
@@ -10,6 +10,6 @@
 		<name>Cjk</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="google-code">fcitx</remote-id>
+		<remote-id type="github">fcitx/fcitx-cloudpinyin</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/fcitx-configtool/Manifest b/app-i18n/fcitx-configtool/Manifest
index 2845b5ad9602..11285ab195ba 100644
--- a/app-i18n/fcitx-configtool/Manifest
+++ b/app-i18n/fcitx-configtool/Manifest
@@ -2,11 +2,11 @@ DIST fcitx-configtool-0.4.10.tar.xz 50440 SHA256 bcc4976976bfbddbfec3f689f38927f
 DIST fcitx-configtool-0.4.6.tar.xz 41992 SHA256 8d64107f9f12b4f2cbd82e40b87a2dc4dc76d0ff854481c1103d5e9a2c2e129d SHA512 946bceb77fc6d14210154d9264c86d3333f910893cf3054f65eab72641421847e8ac003889b742f4c28f74c8ab1cfbcfb82abe35ea83ca2548cfc1decc92fc4c WHIRLPOOL 58f8a420f6c98cb6d710bd05d8ca2a3ca48a115015e6de98b105bf71b59bf3dab34eb63009d763dc7a3554fa6ec0b442e8bb277f890230dd94ec371397a6766c
 DIST fcitx-configtool-0.4.8.tar.xz 47196 SHA256 0ebc06d9d325fed096e9cb61fe53b82000d2de0e9aefe5945ba8f0aa2ca851ed SHA512 7b3c43b9d7d1dab04880effe6fc4e80e64c9bad34699c0c8d2992ec971605ef2eaa0b1fb13f71a582289c75560c3edc95af21f6413ac2bb594d5cdb31a0b4cb7 WHIRLPOOL a1817bcc9d6bdcd96e66dbe71d44cb66d6b66802e366b8f21d5f922495176463fc23adff2bbdbfb4003ddcef43839fab06715231fdaada8714eec1e3a073f18f
 DIST fcitx-configtool-0.4.9.tar.xz 48796 SHA256 592075d28224f8ce5304281c507ab2f9a9dd93f118eeec30d442ff3db214f9fa SHA512 800c731b370ace833179560260df7ffc9c0235c4f3257e8a99a0194f2fd06b71f738e6c77985871c3368179f944da2165dac5d4a8f7ba083519cb2509a9eb62b WHIRLPOOL ae5157178cbaedd66512da6548e79b0a09dd11e4ce8797ae3387c698cd33b51facf1153dca0d3e16cbf77a01959d01251a5dcd7fb6b30f119807d56a2a0f8470
-EBUILD fcitx-configtool-0.4.10.ebuild 821 SHA256 9808baa69ae7781ea39436debeb4132370550ff0444ed74f54a13f067d650453 SHA512 46083691aee4639d47437fa177920829361656f3a5bc94f9cdc3abe75d86d0cec1330d100297eeeecda6d35e7ad0a66f920f83c8ad1970446153beeb217e8bd2 WHIRLPOOL 8cf7d0c228664f71e119fa159a0c335d8421a303d82b146152d26ada1b309f74a8f44e6f683e7e8e5841ee7a46e4b9163510151a76e41d0a36059ba058128ba1
+EBUILD fcitx-configtool-0.4.10.ebuild 831 SHA256 a93085c476c436f713945e45b08c0b7fae7b805905d3889e5960d65a45f50d6d SHA512 0036c8a40aa657b937bbfc1c9fe3bdc79c85978e62bf438a3674e573842feb0f645227cb938e2c9faea267c5581926357bfe0525572560bb87846ae7403bad71 WHIRLPOOL f60663979c4b456b68d4bedeb2f057d5ae47f729ec68d863be86c6e5123884e2db77e53f626f2411fe853cd8a9cabb71b7b5e37f4e7c7b94839c8d677b667c4e
 EBUILD fcitx-configtool-0.4.6.ebuild 735 SHA256 ec6c0a585b4a3d6ae21c13b772ef3cd0a271270af71870a4e394dc905ebdb124 SHA512 901003da2ddfef080860b1a4365b95952aac85c0364738b40398daf71fc32f69c3f1477f3a5cac21bd4260f5aca162fe21209564711a8f254b2ae03b8ba8d0a7 WHIRLPOOL 0e828b325ed0e854b4c5f41cd239656d71541310f4f8c02d46721c72c576f4a857fd183c227798e0f9c36d5916537a97ed54720ff54a76986b3b9b010cfc42e9
 EBUILD fcitx-configtool-0.4.8.ebuild 735 SHA256 77adf1ecaffaa2de165be71a7fa64cd0ad1e12614725a8450306a2eced5a2da5 SHA512 71b4fdfbe5fad660ef83fa3941bd704ae8c71dc62fc42619958d376c33f6bd5235b41951a55700fd1d4004564dfaf896bad18c9d47800c79a5a593157d5ae977 WHIRLPOOL e3146c685c8682c59042daab087f24ad9f52ed786bccdbfc9853e2deec135995119daf4e538ec030b0783c34b2b0006a1c6b6780da38184d689e0ca89b3f6752
 EBUILD fcitx-configtool-0.4.9.ebuild 809 SHA256 69b7d71c36cc631f09d8544aa43a4594651544ffba04bb767eba92425274d37f SHA512 d67406a9d177b1e44d70f84b54887d268d3db2c71dd2bed3373943e08e953aeb8ea664cf861c3ddc394b2f41d58de86422b24984e3329280318bcac3ff9c1e6a WHIRLPOOL a09226ec4d5a8e2f0b3b4d47fec65286d1a1050c9d533054f840a2d12a990cc2889f071fd63fb586b0853af1f7607447a0dff740e96a5190fb096b4c92a3595c
-EBUILD fcitx-configtool-4.9999.ebuild 798 SHA256 353e141aa507dee86a985e30b65577247197d6cba4ad112e3a8d56ebd23b5574 SHA512 2e9b181ad32938da641082dddf1e662c44aea874cd3973003ace447045db844b6abadec824d9fbc862e627c10c0df14a3b8d5ed1220d1987b30481b20a5d53e7 WHIRLPOOL c5f8225f23133defa058edc1b8b8315534510d569239d8d3bc0f80265a700b109ed36d395c8fbcc85d330fe42147e63a2a91aba92132381f3e821f0dd80ffffa
+EBUILD fcitx-configtool-4.9999.ebuild 808 SHA256 420e7ef6c9920dd0f3460c1e5badbaee23e7d9ba99892977643e939208ab1000 SHA512 6767d4349e1baa4060bd62bab03abe20b6f0050507d81c80ec4ef1e35ffe3c9d143ad47e51610554b514c470a1a8bed162e5e6cf76d34686333a52c091ec3457 WHIRLPOOL 63144f4cf5736d4674304b1f03ee0a763204350c78b57f4a4e24f4c748916ad863f1eaf0c3431fdbe5cd8b27e693bca98b33685d13d4bd25ac0e590f94fe59da
 MISC ChangeLog 2810 SHA256 5d25f29c04b8c255dd517ab9d6ecd0e6aa1dc82d368c24027e12a37f569f154c SHA512 deedcba5c6e5e54bbdffc2f216ad4e599661b743e1ef913821442efd4736cc3069d5bc97b86f34e18a55f21597852bee8b2373aecd5b7e3fd42d9fe317bebb97 WHIRLPOOL fbef04be83d1faf237e8a01d52c09fae029bc52b870b0a0eabb6be3e81f78d1d5b7dd1dcfeb8d0941e0420d1ea168c61fe7a865def53d3f95862bb25c98924f9
 MISC ChangeLog-2015 4140 SHA256 3fb8f913ef8c9e6247e9448533d12100068e80be5f1cbaee681a733db0833507 SHA512 79a7093f5d416af55fe8eb4b3231b7daba39db02f553e4ce7341cc0d80996b825e46e95b0102233b576312c2796f8e03cb6f0d9c649305520b258f4c1b1ecff8 WHIRLPOOL 64835068e1eb6987ccccf7a850f885f131ab929d27e2a6f5ae9eb65406a204f27295a427f232858dec42e7e763b23d22be9e3396b80401e62e8c8935d443594d
 MISC metadata.xml 520 SHA256 0148eb17ee9f34fe10f6c7948a22aedc14a9de571537a38aa46dc0145610aaff SHA512 3c6521342c319563317575bbd5ad69c3f904ed7e0354ebfb059e20c64be93b5b89c62f9b05537524af02e90a8a3ed39abefd46fae331dc3be7b1180febc916b3 WHIRLPOOL b29fbc4498cca6a7ce0a3e8d1c147ce23839b4febe9e9d4956a9065621942878d8c99635ee746c918321f8bce6a2fa2341163163ee24f7d504d82b0c9f745419
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
index 0b23abbbe065..aec81502365c 100644
--- a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
+++ b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
 fi
 
-LICENSE="GPL-2+"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="4"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild
index aa0e86bd5706..42953c81e022 100644
--- a/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild
+++ b/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
 fi
 
-LICENSE="GPL-2+"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="4"
 KEYWORDS=""
 IUSE=""
diff --git a/app-i18n/fcitx-hangul/Manifest b/app-i18n/fcitx-hangul/Manifest
index 55fe652d8e16..5dec8dc3924d 100644
--- a/app-i18n/fcitx-hangul/Manifest
+++ b/app-i18n/fcitx-hangul/Manifest
@@ -1,7 +1,10 @@
 DIST fcitx-hangul-0.2.1.tar.xz 25064 SHA256 a084789d2f5646af9e60b8f95385ee1cbbd2dc402709a8b3a8ea82a16fbbae97 SHA512 da1a0926be129dcf49b5fd199b7a75d4f66d3c58944c7f5ae70219a2903c0277a99e9bd05e0758ae86f24b51f910425d70ea86112d85e852cf6f5f1f7fe78db8 WHIRLPOOL c4dae7a479d385da877ffdea36d439e61fa441090b8f86cecf83239250f1cc1ba19204f378ce39c02fe135dd120a4858819c183b25a79dc1989b0a236b6d37bd
 DIST fcitx-hangul-0.3.0.tar.xz 25600 SHA256 978a66471eb200cc3807fe84e9b5f1392fefdcd51031e5a0bd8647fa994507cb SHA512 07085508da98c49bcecf75fbfad6681263a735a1efcc4fb7a6fa05cb215dfe0c338e95e26cc55e488501b5abbc1007464b1bbf488f07aaca2d1a0a18c8173074 WHIRLPOOL 9833d6eb8484be33e84275174b2b81cc88dbb8d2561c15c7897e172fef61045c856cb9c2c42e7df9baf4d3dbdeb987db556b6a2e8a3e1462cd93f80b6a933b7a
+DIST fcitx-hangul-0.3.1.tar.xz 26612 SHA256 6dd5fd5956924c85af92ebefaef1e113e38fa814355fbb0f07c26049c3014437 SHA512 6ad2e34644c9246490a91342a11b186d40702f7e587beeb056ad98538da50dbf9fdc9f298e5b379bef50f63ad5be5da79ba84e60a22b57c330d0a68dd5bf5ca6 WHIRLPOOL 76796f5ce6b904971ca2c4db0b24eeaa436033b054fed5f16a46f0c31dfcf8dc324c336c1731634cc507874dc1758a363be70d8fa8753c90b9204b4edf6c6da8
 EBUILD fcitx-hangul-0.2.1.ebuild 549 SHA256 a8596dc997324a21d8c01b3aeb377efe1a5e32afd90fb6188aa6ce514f4f971b SHA512 af4427e1a59ab8a963e585f2e9363feba2e2e4fa206b2fac848c011a88c1a3ff6ed569394ec4f6f9078895981ded64cc658427177f9f274574f8952a8b147d0c WHIRLPOOL 4785060a3af6ace7f9dd1740d8df2fba0b77c7ac279a18fbf34c6f8e0307294bec4e16c25d54b4f9166ed746e4400a29e5bf24cb83e393d655749ac820e1139b
 EBUILD fcitx-hangul-0.3.0.ebuild 550 SHA256 7f3f6390dadd1970cf55fba2b305547330ea71e6853b3a25cc4b6e81d21d9298 SHA512 2fc1d3fe285052e91d49bcbc303107261fdb3532c71c0403b47875cd191d0fd9b01eb9ea204f0669a2fddb19dccaaf436d2ff9b3ebe00e7187f4005c3c9f5a1f WHIRLPOOL 9818ec64601a0639b1446b072403f61fba5e6ebacf4187ed4f7013e9a981bd7db17edff5944547c780abf14e9dcf65ac626ba2d61a074cfeed81224eac1a5bed
+EBUILD fcitx-hangul-0.3.1.ebuild 832 SHA256 0adbec681856f81c68ebe8a5f01af2db88ce7e05b9aa559ae092826067b18eb3 SHA512 86ec7d6d86f52695d37efee9ad5fb12d1d518d353aa22256bcd35d77f301eb600c3647cbe34588711a17fffacc5a30cbaff451b5402f6b29e5b0f0d24d3c2896 WHIRLPOOL e31532929aa3ab4e1896192e2f479837cb7ee5afb2ea77fc6d0f1aec72fef470d1d9130659271084fa8ce4ba4abeccbf35c1572d93231994f36e7813f9ff3b50
+EBUILD fcitx-hangul-4.9999.ebuild 809 SHA256 6348bc2b70ceb63ca868382eaf6ec92d0eb07cc8e61d042ca6e678c60f120690 SHA512 5bf31b8fee6835fe2497c1836aae1885197070ea7ceff7955d7e3e3c711ea6ccd6e9d0357a2188ad5c11232bd4c80b1582647135a62ccd08e8121863add017a4 WHIRLPOOL 13066007a9b923092364dbb69df5a2f5d8a40400cb756506e2a410ece3201d90dfadad0518667f0110b39c5e49599c5ce2b697cb393e52118a8335564ebf250f
 MISC ChangeLog 2894 SHA256 f030d5048536285757ae46a20b63127d7e91f8fd6b61346fb59cbd78c8f96683 SHA512 6cfeeeb148d8d31292bc2398d3dfb42933dbe7290c16b8a3c9d6cff02807bc597feaa938c341a41839132dd052cf14600a91b13d0f21bf4c861d6c169f2cd8c7 WHIRLPOOL a62d09a57eef912c07c6761343743dc38f829cac3eef65754559f99f9ff4598e6e08797735a8d93d832905929a71fce9926a8fc9d99fdad89fec7b4d307a0d06
 MISC ChangeLog-2015 1244 SHA256 82c3df1337eeaf0d06de5b5a3e64618d4d6b522b73ce3e5239c3d2c5c78d8524 SHA512 f00ce6b69d5429345a6ee783cdf0209b8c3f3667428f4f2735c095a792f923c5243e2deb1f0cf4c35044ad8099ced25d0cd1afb87c77ee11549588f90ae578d4 WHIRLPOOL 801aea08d6653cf65a240a60224986bd7b395fe4fd5f84551d9f7a5ac94429b6a9ea12c5a17db45527d8846cc6fe4be0dada77d27c42fd89d247621924dc213a
-MISC metadata.xml 368 SHA256 35771713c1279c6a6256b587a24bc95638761053755ebe871015e0a62bdb3d72 SHA512 02412f1f558f3b859d1327a440038b9d9ce6d2430510ef98bdb2ddd2b2ccb9ae682f76e76fdefc47e903ba08e93f6e46e9aabffe6cdfb4e57d33daaa63dde29f WHIRLPOOL ce52e2c48610b125b418018b4043cb24b09c1bc9a959275610a0af5a76c5da179703b20fc3aa938434834f8be6ad79339baf3cc4295f2c11a26a17eafad0719a
+MISC metadata.xml 451 SHA256 ef4a8e01d676ad123a9633797c085b116cf88cdef21281eb7ed69d17017c766d SHA512 71946f56143f4b7e4a7a4b032f36d95a94ab5c6a78a8f89860233a0e3b2a5c57088d9312a936316af0035ce2058c473595eb89cd5cd699cc2c86ad57be699891 WHIRLPOOL 736778834f65d796a49fcb6ff5af6136bc1b024e84b679ef168e74a8ddb87f11d00bcf59db8a93e8be30f5648876e1fd28b62618077df1021f05017856244b82
diff --git a/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild b/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild
new file mode 100644
index 000000000000..3872437ea348
--- /dev/null
+++ b/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/fcitx/fcitx-hangul"
+fi
+
+DESCRIPTION="Korean Hangul input method for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-hangul"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	app-i18n/libhangul:=
+	virtual/libiconv
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=(AUTHORS)
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/fcitx-hangul/fcitx-hangul-4.9999.ebuild b/app-i18n/fcitx-hangul/fcitx-hangul-4.9999.ebuild
new file mode 100644
index 000000000000..7fd3d0bc6476
--- /dev/null
+++ b/app-i18n/fcitx-hangul/fcitx-hangul-4.9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/fcitx/fcitx-hangul"
+fi
+
+DESCRIPTION="Korean Hangul input method for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-hangul"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+"
+SLOT="4"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	app-i18n/libhangul:=
+	virtual/libiconv
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=(AUTHORS)
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/fcitx-hangul/metadata.xml b/app-i18n/fcitx-hangul/metadata.xml
index 49f2185b80dc..ef7714e27ba9 100644
--- a/app-i18n/fcitx-hangul/metadata.xml
+++ b/app-i18n/fcitx-hangul/metadata.xml
@@ -9,4 +9,7 @@
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">fcitx/fcitx-hangul</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/fcitx-qt5/Manifest b/app-i18n/fcitx-qt5/Manifest
index edf69f582a0b..d01685585f64 100644
--- a/app-i18n/fcitx-qt5/Manifest
+++ b/app-i18n/fcitx-qt5/Manifest
@@ -6,8 +6,8 @@ DIST fcitx-qt5-1.1.1.tar.xz 56352 SHA256 4b062869dae011747ff257e6976debd1d69fb13
 EBUILD fcitx-qt5-1.0.5.ebuild 860 SHA256 d8cb4ee5dc2b7228a6960af1baf075585437c4fc630eb8749c4fcbb9ff2b473e SHA512 08f085874b6e2681846ba6abc3a88f8d21e13e009197e3b2955f920f74f8c6a5778d565ca5d8ec8a0ffcda130b4620b3c7b05f068704493f33a583fce366fb8c WHIRLPOOL afee0f3252f99a044bd7c54852f0b6ec976c05d63a3dcf5fc89b019dd7d93e415a5aea0beff8f1d39d3447ec822a9c090a6b2426a4b62da67acb38f1d94029f2
 EBUILD fcitx-qt5-1.0.6.ebuild 818 SHA256 0a296833bba8c1c01fea77e443b3e792d1c92201cf189ea1fbf2b9205769aa7b SHA512 47626df5ea35a0ed011d12589a95aaf71ef0c59f6070efcf310e64c0de8a3ff5fa77e014e6cfac2cad6694ace40a7fcb313de6d51cd92b83b3e44ba8fcfbd824 WHIRLPOOL 1970b80b93ab02f093998af92b1efc4f004b4382f0c102b86f0818b8cb4ea9bb5384c105a951def436429d45e89067c1f71858d6e9739d0896c6b4c39d6858a8
 EBUILD fcitx-qt5-1.1.0.ebuild 816 SHA256 2c8b0cd85dc0f4805fe1e608d15379ef980fdb42f83a31ec17f2a0e5a1972a22 SHA512 d25fb2bfb7706cba12f36a8cd40b420d94c01cfbd5f177b1dee41e8ad3d259fdefe4da1dd0aed40dd8016f9ebf7ec4364812f21678678ad07d8c771bb8e3dcee WHIRLPOOL 4af6e879bef817f5ff376eced3d7b97d32e3bc98ba339ed45600bb5f7597ec5301f9c78bce5dd05c6306ec7c28fcfd615058de4c9163b3bbdc4a44b30a678038
-EBUILD fcitx-qt5-1.1.1.ebuild 830 SHA256 72e83961bc9bd08d19ab4fcc3d19da3e92e3c188057ac71e5e0284eae338b66f SHA512 f9b4973a27a0f56b423571c78fde4b806d15466eb5bdb5ae172e895d883f152ec421642db7bfb1769bc4547196a5cfba8821f8b52d63344dbb16fb75b93cfbfa WHIRLPOOL 0e9d8c1ad865749f23831a37867ebd25c05b75677fff1d7f55a153a048dce80a1a13891304ae4c3f628c9c5994ee393b12d39dbc896132fb39f6fb78e9fa61c5
-EBUILD fcitx-qt5-4.9999.ebuild 829 SHA256 4a3acaba884861ab236a345f22e308af4f53fd7e777d73b91e9cc517ca0cd802 SHA512 ae82b2c5f6c1a035bbb71a545694b3a57e608de862a4b6d133f17fe3f99d9805806c17d99f11f42672fa4ed86ab1a614ca687abd0cc16eff1b7929a5f656aaa9 WHIRLPOOL be3cd46fadc5a2ba5ce54995c6756173c9d95d65894563b84b0485b6282f588c26d481ba27d7c4dff470ccdf015fda12164e6dd3a02568b64e0fd1229f3d6191
+EBUILD fcitx-qt5-1.1.1.ebuild 838 SHA256 321cd274c204048f2e14a55f132e876b1c06417f9c0dbd8788c1043e8d5b955a SHA512 dfc9a8eba4aa3834c1194b84d3eb23d7f21046c0659c4c93c71d369a0b689f365542cb9dbec15af72b3d84a5b0b9a60c7ed5e47718f48f1d8a1539864abc7097 WHIRLPOOL 59a9a5b4a109316307042cd36b0a1772e04cf0503b8b17dc523d588d312993a7c93d0aedb3a64723d4374ddd54aca72dfb1e969fc5e62e69db2c113ca2f4bfbe
+EBUILD fcitx-qt5-4.9999.ebuild 837 SHA256 a9538b9ec41a62169f0fa9b1931ebd1e7d34761ab34fadc7d2fa5edea5e37ba9 SHA512 587dae1dba3bbcdfa09329348d8eaed38aa277a8fa84c288bf958a668133f16650a5fc9900ea364fc1b8cd6b8c35d64640c1eea9f59d2b7bd340822e2cd23498 WHIRLPOOL c2492f8558ae8aa8116b9c671f17b72b0cddd75bd5c499ece1de990a11b8fecf4d3912361f3f10c0caa3c52c26d9ecdfd950d3250d53100976ba794c892d0c78
 MISC ChangeLog 4384 SHA256 261f8d3d58fa4dbf1d6ab5855c99b16dd16a4debd289a01ec3c7a197fd03eb1e SHA512 fb76c92b2cb205d781b12b3e11b80104fcf4cabd4c38e953f15ed4eb4bd4e659d7fb5a65748fe2a2e9fe512ce73e0b36eda2dc3dd6fe5be8fde94a356426821d WHIRLPOOL 9f93b04594daeaf416b2093b12ae5d39844968e7ef0d46a0645d688ba1e500973f87541c6cb7ee2a3a4535d137ff6eec905bfe088cf2e84c2f6ad1e9c916087f
 MISC ChangeLog-2015 843 SHA256 e89e001966ce223ad3334738870444dca20664da57c0b0d64b11de32fc26f3cb SHA512 714b955d8a859889a2af1d47882c3d06e5a056a8011a11b191c867997c91f90a8fcffc65bcc891b452a34d04feea31d75c8cb16ff9bff837ee6adab3bf648407 WHIRLPOOL 0e9661f71dfaaf03bf5b68167c5f8442112fc0d7f94b6c82f1cdb5ef0eb1e82a5ed81fd44dd859827fe61f83278b157c50cf4cbf9e840da9cc8d8c15bd38916b
 MISC metadata.xml 448 SHA256 51d64c2dd912603ad14ae9e3fc20014911082ebec23f27468f06c2d0a39ef05a SHA512 37fc515507954a58b16c0fc81ddfe1b24ac21db88b7cd858ef14167526ec48ddfaa144ac5653bf9c5fffdc148ecbeb82ae57b807822c8f85a5cf90d3c81bd6a4 WHIRLPOOL f521d77d9953ee344937204f7be001e5eccc201b7fe8b9be6139728367aa64b0665877ee706e9df989576ac6faa64480da0b068dae1fec7066bf431a86ddd6bc
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.1.1.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.1.1.ebuild
index 18564da597d7..39f01c90148d 100644
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.1.1.ebuild
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-1.1.1.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
 fi
 
-LICENSE="GPL-2+"
+LICENSE="GPL-2+ LGPL-2+"
 SLOT="4"
 KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
 IUSE=""
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild
index b1b4481aedc5..5b544d18cff9 100644
--- a/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
 fi
 
-LICENSE="GPL-2+"
+LICENSE="GPL-2+ LGPL-2+"
 SLOT="4"
 KEYWORDS=""
 IUSE=""
diff --git a/app-i18n/fcitx-rime/Manifest b/app-i18n/fcitx-rime/Manifest
index 7e21db09a38d..be9f055648f0 100644
--- a/app-i18n/fcitx-rime/Manifest
+++ b/app-i18n/fcitx-rime/Manifest
@@ -1,7 +1,10 @@
 DIST fcitx-rime-0.2.0.tar.xz 8116 SHA256 e4bc9243abffd1851b4ee19c88d7c2b32ede134aeda60aee930388f9f33ca269 SHA512 3f02d7bf0e47981e7a135ccaa46653be319d1bb716bd939b50419e47b8d3c07b347434e8529522d4266bd5fac6dbc2cdc1bfd4b7ea0607250023f70f97006228 WHIRLPOOL 7dbdcd3ac90f2d901b5b5c06541b9f6f1debf4ad833c2ddacb840dbd80a4443725fc7bdb41ad2261db8f34cb0dc77fe3d5f0c45e69a0a056618518007c1c708e
 DIST fcitx-rime-0.3.1.tar.xz 39648 SHA256 3ca74de4d20e8fd0e67eb4ccae8af3790bb1f557f183c2af32cb45f371e8521d SHA512 5d3c8fc119e1a104987a7876f3b1c54da074e34ce9feb9c02efa7c9cfd788c3735680a03cdb50d69a5512a9f075c7326bdc267cf076daa916238898da81d2388 WHIRLPOOL ed8f4ed563dfbe01aaac71bb847d4a9b641b041f9916c8c6c34a444202ac00720ebe4274c30906141b103fbbf55d7ce045cef094792c1fffadae03dd0ce73f7a
+DIST fcitx-rime-0.3.2.tar.xz 40960 SHA256 f97ea6f515fcc5f526cc25dce3d4ba05fa1c83001f68502d6c284ba39cd5a82d SHA512 8c6d845b0899d9b8b9b41b895abd5c1b8916856b71f529aabd08d1c27a2b09bb5a9343912d088da460c2e22da0a3ce759a34fd13099a149bb8cd1ff4eafe29f1 WHIRLPOOL 57b979a8ef850ec1c4f85b6b3b5841ad17f73c1861223d033c7b79db6c301f1f0da13c4ab53661a4899ad13db40c424f3c1b257dd2058e28fe89f6d57c2bf17b
 EBUILD fcitx-rime-0.2.0.ebuild 707 SHA256 25fbf68f0306aadaa989b00f135ac81064713d86092344a65a4a8184690bfcb1 SHA512 3d7c15177bb138a676dc388d2f4db78e58ed0df7458412a36f7957833d6b16858f95eaa34b8d68b1cab96e5b156a4b00b220f45ee8410ab251d1b074eae9d5f9 WHIRLPOOL 6b8c8721f1e18cd57f666896b067a19a25059a3fbf3e04f347d94be1cd861859c01db5d1ee7254470f9355bcd799b1ea89996127e03d16726073a144e76a3d1a
 EBUILD fcitx-rime-0.3.1.ebuild 716 SHA256 59b13adf544139c71e3521e337656b364cbacbd87e8c18994ad8a840b082ae79 SHA512 8e22c660c8cc0fd218a7a0ca735aee10f965013ee7e7e96b66d57afe197e474b7280406e0c1e3110fd2b512c21f5711774d5a01916efffd11f60ffe55cfcc359 WHIRLPOOL 8403b0672b03d2b9ad22ecc403ab892dfb4f85dca6e58cabee98b8cae30acaaf2af235023a211ff588fe09dc871fc733c78f1d36e7ea133371fe505980c14408
+EBUILD fcitx-rime-0.3.2.ebuild 932 SHA256 7012e4d393b420371e44a7c37e76c5dda958b357bd55ed1d4c4d65b435fefc38 SHA512 944fe19801a3980be6a01444cce3a69d28e54597ed9d8143574c8a4653c7ba84d2da3218d7483daddcd71165f36c41227fbbf1af6e342417136c94da62057f42 WHIRLPOOL d1fe87788bb7ca3163fa7903959624897842d3db18d63b6417cd006a2bd9963f4ac31b2bf531a37bd0f150bbcb2750b7e4cf80ab54724202550e7e10291d0af4
+EBUILD fcitx-rime-4.9999.ebuild 909 SHA256 a75119d83505683c5ee428eda83f1d56d5773e5da89846ea8748f7f8244c01dc SHA512 3a913bba52ef1a2f58084a116f2b255afcd5f225b50ac0f6c8bb9b79a4fa578d9e9c6d7efb9fcb9f3218781199019fab74c5ee374e161dbeaf4f9a5b87a9f658 WHIRLPOOL 9a43dc47096903af275f14bc40c0a7312efaf02054e17e0ed3b10d371f0dfa1cd099eae51eee5ad59bb2f755c592d84e22e87fcc88c416d6048b416834ab9e70
 MISC ChangeLog 2972 SHA256 71c10dd05ada26107340c89a2921d037f6caa3a106d2f6867c2a66c6aed77de5 SHA512 d6b9bdaced57ac9bb561ca9a188f7847cc7722f6bcf8e8bdc43b5ae9f150e91da8623276b53217959e7769777837044b1f1646e2141ede330bafe2472cdcd932 WHIRLPOOL 56a5fab9c08b5117fedf63c13c169cbed5b59afa26e5a6063629fcd37686a41e4008b85b0fcd51918586ffdbb53937210443c51cdba3aef2fe2fa2acd263b860
 MISC ChangeLog-2015 2201 SHA256 1c6a150b9716f4e1dbc3f6f2405cfb138f81b4c133a63d2ff605456362376f02 SHA512 5792009e10b17e5e3512c1347db541d925ecc35ad89ea14c03d0f75574195a6f4f3617a119056b616231a291bd0864527b31a9e30d9a98bed587821ce4b9d24c WHIRLPOOL f2652aa2be1cb2e47c43d16be1afdbeb482083ef017947c8dd4eb11ed886062269a49d2d6ab4a0f22492d46defb3d971b26d78a18834417909436539deb09d20
-MISC metadata.xml 613 SHA256 91ad7a62a0ef91b6004a0a24b90e0ea608e9fa17e0c81b9d4ba8cefa2c9d6deb SHA512 989964968974e71ee0ccbc9325bae9c26c44051327283ff48274ed98e3a329b159980c16809e2f80105d1a67d49f65760171dac16b8c17013ebe166fb0177d3d WHIRLPOOL 0e3a0507759d98ed786d6e5543d1d840a0db7b2bf2207f3636b990af3f8faf8b7d7b99b369414742461aefc1ee1f803f0f7e83cc812e3809a40ac04a96b25374
+MISC metadata.xml 550 SHA256 d59dd9b7948489903dc595096e90e745f9662f481f39bec5d3e0b3430d4ee294 SHA512 c22070e9df3fd2a04ce2ec1c1b1ce1b7b90db41abaa80d8dad82064a4bd218afef7d2ceff15e30530d8f95cf7e91cd43cb0da985f2f2312ef5c4c3c228b9f1e4 WHIRLPOOL d58e45625c2e2acedd5ea079a8eed25ed3d95de1a0efb5e3a6b08f328c0d015312be6f3b8bef9f830d294823a2d8be4b3a4a67b502480d55d626ab7eb1029cfa
diff --git a/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild b/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
new file mode 100644
index 000000000000..c11c94262a49
--- /dev/null
+++ b/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/fcitx/fcitx-rime"
+fi
+
+DESCRIPTION="Chinese RIME input method for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-rime"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	>=app-i18n/librime-1.0.0:=
+	app-i18n/rime-data
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=()
+
+src_configure() {
+	local mycmakeargs=(
+		-DRIME_DATA_DIR="${EPREFIX}/usr/share/rime-data"
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild b/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild
new file mode 100644
index 000000000000..35443f12a6e1
--- /dev/null
+++ b/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/fcitx/fcitx-rime"
+fi
+
+DESCRIPTION="Chinese RIME input method for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-rime"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	>=app-i18n/librime-1.0.0:=
+	app-i18n/rime-data
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=()
+
+src_configure() {
+	local mycmakeargs=(
+		-DRIME_DATA_DIR="${EPREFIX}/usr/share/rime-data"
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/fcitx-rime/metadata.xml b/app-i18n/fcitx-rime/metadata.xml
index ace10f659bae..45175a156241 100644
--- a/app-i18n/fcitx-rime/metadata.xml
+++ b/app-i18n/fcitx-rime/metadata.xml
@@ -14,7 +14,6 @@
 		<name>Cjk</name>
 	</maintainer>
 	<upstream>
-		<bugs-to>https://code.google.com/p/rimeime/issues/list</bugs-to>
-		<remote-id type="google-code">rimeime</remote-id>
+		<remote-id type="github">fcitx/fcitx-rime</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/fcitx-sunpinyin/Manifest b/app-i18n/fcitx-sunpinyin/Manifest
index 258b6f258595..24e00b5b0733 100644
--- a/app-i18n/fcitx-sunpinyin/Manifest
+++ b/app-i18n/fcitx-sunpinyin/Manifest
@@ -1,8 +1,11 @@
 AUX fcitx-sunpinyin-0.4.0-gcc46-compatible.patch 672 SHA256 e2de8ea64fa9507dbb040db09ebbb346c29bfaf325827ca333202f40cf87bd90 SHA512 67ef866cb6e0a2c16f53249e60ee6df4ba9fd5a5c796d66527efebe68fe32b7da6daa3fd5488a1b4c86523380cc5dd1b51e975261b38cdb6e49e982fe9b18c85 WHIRLPOOL a4b1f43463c35b79f5e222a7577cc7f3a8afc0487c47d654f9158aaaa72c620f3e4344fada23bb938caeb465dc7393a10fa8f72a5f1e445c29dbbe14b499580c
 DIST fcitx-sunpinyin-0.4.0.tar.xz 40264 SHA256 366af4123455bd85e5af104ca0368057470079937f79eaa70e58951de4743acc SHA512 53def2f36de0d9517da0d154ae8926075c69a5712bf74a3e5ba5ba6266e2d94152dac77e051473828d98ed6a78d3f10557a8ca2081bf1f799405a4f6a4afb83f WHIRLPOOL 2c92a9d0a9d48eb8e4aca895ccddb91f1d1fbaf137bdc4fe32519cd25a8294be39140d117a0d4d20a5a3fa3c21086bd6edbd44d93fafdf8f885aa7d3d36f9843
 DIST fcitx-sunpinyin-0.4.1.tar.xz 41076 SHA256 7bd0c61a3c821719760bff72c3c114b28e277b87f54dcb61d83e3548b1eb6777 SHA512 7ad9065d86d7bb3ceb6536a0fe3559bf2ba60aebe69e2f07c8dadad1a0a2283a1b85712105c6c2a2bf19b9645c4392204db9c3d1db234618ba7f62ee44eda85c WHIRLPOOL 9339656a5b8cf1359af8f3ceeaa630862a31d4a1089a4b3a738f65c275f0f61d8d06bbe89e496f8922ba4b09b384d96aeac43d7bdfcf21bdaa555c79efd10709
+DIST fcitx-sunpinyin-0.4.2.tar.xz 42984 SHA256 0bf2d72d77732f06e7f04c119507c08b9618b21c4027e3997186bd7e4d0788c4 SHA512 8ade5d94e5227c0b72d2844c09c2699e4b8c66cecbd4107791168d27e15f68b28a4445bf42df7bd6fb44119ec42c5b574293bb417dcde8998578f0debd656a2a WHIRLPOOL 18c55c3e7fd7a5ad8ef52d7734cbe2b65e4ec635535a0ecb841199af5a39ec3ca720807857ada4b493b7c4de80431b74deb0f8a6c8863ed8f1633e6d6a15f33e
 EBUILD fcitx-sunpinyin-0.4.0.ebuild 619 SHA256 ff07958c8a22c001b70ca4b47c00abca2b709e710b2638f0500fe614bbc454d1 SHA512 aed8dea96a1429e08d8f54ad7de27b7b49add7f126a23330230f13c5d0cbaf54a46f01d7569a52d0789b24bada7a0de72424c1b8252bdf7e91c8af8ea2bfe391 WHIRLPOOL 1783e5bae8d30d26406161edd550b005f8581c5067f50922147781b51283e7419801c5db7f2241f5a84299f3952e34390edea3483ec40525f73ad2e6306c9b37
 EBUILD fcitx-sunpinyin-0.4.1.ebuild 563 SHA256 e7f2f68d62170ab9e570941cb22420d01bbe670d503cbb0dbbbe26ef4c5b5db6 SHA512 e7042ad79158fd8d2b5d06643c75c15c5c676f4fb85ffc4a16041bb5f006b2d3e4f916115b95d73e5279c3c4f41b6c1cd98fbdc2b6058a645bc86460f3e823f2 WHIRLPOOL 59a0d72a90b565bf24ca00af94b62076c463137c91e1898af9c61fd804d1fe9c4353b2cb899f360b0e9575b30350a629a09c27675f8a644bfd0abf64bcd6e092
+EBUILD fcitx-sunpinyin-0.4.2.ebuild 819 SHA256 37f6827b2c0b995e08e0519e09055e8fcebf9c4f890781737fd73f4260d52b3d SHA512 f2640b5bf001d1a27ddeaeec8b83237272d5b72cf3a00d7ae8b09f2aa70c7570d7b7e8afc9fa1a9fe9e5ce108b5a5a1d70745742e5d930fa2078d0906d6b25ae WHIRLPOOL 6d71769af5a29265418bffd928f4ee45cec3c295c5bbfb52c89c1d9fb7e50157913e3d10813d437af2d168afe32e870d96c2bc3cf1af489e03bb80bc2a35f373
+EBUILD fcitx-sunpinyin-4.9999.ebuild 796 SHA256 975aed79e64348e9b0d21f4fcf4374895d335b596246dad1c1204c8fcb6f5924 SHA512 6657692f841ed756ad7c0969eb0fc9f136486e55a97bc880a400d203a5cdf6b42102bef0872bb0b5ce2b067e7b9394267304af24db28a2aadd47dc8b91e65538 WHIRLPOOL 78753107b0a58dd886485b69993673c79035f8a826cf80cd5a6e390a2c8bf13d9fa9198ce0abc42411e0252149042dcdfb60bd7a8e2c81af635f2b525196f5e1
 MISC ChangeLog 2971 SHA256 ba05321b743405855a418c70b5007a87386e7eb2aa6f557eaf8a6442be0eb2c4 SHA512 f0bd7f7a401afd6bc1f66ce74cb1b7f06b038ae54a74ee2bcdfff346165eedede68014109cbca91e6561ac642e83671bbe8e9e13238c6113f42a2371188b8224 WHIRLPOOL fcfc7b2d9c256d31047f8fca68bafc7ba6373b9f0cffc55fd042d2120f4c59bebc1984224c17248633513304cf5e751a5add2981ed9d7a3d80679630a0bdbdec
 MISC ChangeLog-2015 1573 SHA256 2b9a8bb93c34c9f2eb045ba0d1a234d81b86d1d844d9e9d318376d8453bfe742 SHA512 06f44a72c7a4db6d41a3bfa4e6c73df90066c403d2ae78416534f79c67467b3e74e571c7b76ddaea1705b8a23c7fd13faebd47bd89a09a1445258b58ec6c3caa WHIRLPOOL 9cdac77d8db93b667a4153714691700576612bd826b57e62c837839430000818267b9cd6e8c0e6accd612b80b9fd392c4883153c8d9386a9cceb437a13487da0
-MISC metadata.xml 443 SHA256 9aaa0c4737141ef1fa241b4fbca896f5537fa38823a175d3c00245fb18d5d7d3 SHA512 01d63563a2a52e619e9b329c5ab806deb4ac204fe9d45c4db879d30466a7a6d20565dd1698e8d1573a59a075187149b7e7dc06ecfa36ad18faf8fbd64c762a7f WHIRLPOOL 218c00c3019efb331b141b46cbd633151ca252b8e858d3f5a59ced7c8ff42e0ffcbdb2c0b30c60352e9324bf6540e140ecf1584b4ecfd38818c83c23fce16ffb
+MISC metadata.xml 454 SHA256 75ead4c0c8c9fd873adbe46b83dec52c51242e42d8c7e7c06e3a7d30ca9b89fb SHA512 4d1a4ccae3b7f553075938c4d59ea3f7eaf65e6e18969a5af3956ab120d6a88e1c5c67f5e91994498750058b54c5f26436be38599bcd22cbb03068307069e4c7 WHIRLPOOL 4d49c14a5a809010bc0d9a1df8040fbef88f0d0e628a0503a6f133f949f9eaf2d622526e5dcecb06008b0ff92429589ef231dc2a9a2d38d22fce8df2b8611f9f
diff --git a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild
new file mode 100644
index 000000000000..f5626388d9ed
--- /dev/null
+++ b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/fcitx/fcitx-sunpinyin"
+fi
+
+DESCRIPTION="Chinese SunPinyin input method for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-sunpinyin"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	>=app-i18n/sunpinyin-2.0.4_alpha:=
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=(AUTHORS)
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-4.9999.ebuild b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-4.9999.ebuild
new file mode 100644
index 000000000000..20c11e0aec3f
--- /dev/null
+++ b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-4.9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/fcitx/fcitx-sunpinyin"
+fi
+
+DESCRIPTION="Chinese SunPinyin input method for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-sunpinyin"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+"
+SLOT="4"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	>=app-i18n/sunpinyin-2.0.4_alpha:=
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=(AUTHORS)
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/fcitx-sunpinyin/metadata.xml b/app-i18n/fcitx-sunpinyin/metadata.xml
index e4f3812b18b2..a29735352546 100644
--- a/app-i18n/fcitx-sunpinyin/metadata.xml
+++ b/app-i18n/fcitx-sunpinyin/metadata.xml
@@ -10,6 +10,6 @@
 		<name>Cjk</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="google-code">fcitx</remote-id>
+		<remote-id type="github">fcitx/fcitx-sunpinyin</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/fcitx-table-extra/Manifest b/app-i18n/fcitx-table-extra/Manifest
index 185c63bf4b4c..310788ac53b9 100644
--- a/app-i18n/fcitx-table-extra/Manifest
+++ b/app-i18n/fcitx-table-extra/Manifest
@@ -1,9 +1,12 @@
 DIST fcitx-table-extra-0.3.3.tar.xz 3350592 SHA256 ae2bbf9146dfdeafb6220c9a738ddc1f0437da2c5f2da0d578ba4970bc74767d SHA512 ea100ba7bfc558395b678390bb787b15f674c13140ab22b5a9ef423e5114399633d24ec322904fd61d8f3613058744d08f615d4330ed948aad9dcff09818e36f WHIRLPOOL 10a61ea0aac14e9b55902276557c5b5daba17c14a3101d4e4e1384c8922c89dbfe96b1ac543e9ad3408f0951ecd7869a8c4c0d36d168129b2f78d611a0f70158
 DIST fcitx-table-extra-0.3.6.tar.xz 3694520 SHA256 9f80984d23622b90a7d5fbf439f54d7d46f6e2f640618b00079214f50a62a233 SHA512 3970fd9fb14afef5bc55fcfb8234c12951cf88a8ead9be1575ba3100d08f83f23c923093722380ca9c066d6a3fa065bd51f176b09815b0c85f13d8351a004304 WHIRLPOOL b296eb3198cbf578c4b556942591aee9a9998e3677776a8a6d5a4b80cc3e360d4b6cd784e88d5eb3714879d1ec1231d13e2ad9cca50439470362ae1a9473963a
 DIST fcitx-table-extra-0.3.7.tar.xz 3704164 SHA256 8933570ecd803a4f4fe932c983004e669d81b2f08c3bcaa532151545a42e659e SHA512 628eb7d2b09a3383ab92460dc8c2bc86771482cc84bdce847a394ee595423642dff29a39ccf31f56ea8de833f25e9d42952b55b754dd234d0831b5de5431d16a WHIRLPOOL 2744d91154d51d2388192ce313f4be2e839d5dc33e20622a68208e8e4f155883aedb7b4828e619a1a81e21ea4f893fb6806e59ebed66d842259477a7b4127122
+DIST fcitx-table-extra-0.3.8.tar.xz 3700736 SHA256 c91bb19c1a7b53c5339bf2f75ae83839020d337990f237a8b9bc0f4416c120ef SHA512 454798e9bd25c630ce98e2daf7296e82ba5fbc98027171038a5a7b9ac3169c153302a6703d9416718ec3a0b76db6d732caf3f03c6e6005841c9d7798702542df WHIRLPOOL 8cc9ec82851872b0ab3f81913099465fe17d32a5e363027de8f16cd71c3d0b14a8dfbd7f035cddb8bcb96b83fd615a5d74784dc1d5ed9a6c72f2b249276161fb
 EBUILD fcitx-table-extra-0.3.3.ebuild 557 SHA256 32501d3a92ea3eaf2455cc10169052ba2d6cd68007a209b83b1dd03ce3f16522 SHA512 1f66edb469ae67b439bab0c7e01bb45c3f9429a2a8bde06857e7ee7d6d77571cb52334d96acd429d930558f283608f459c14a189d153b438817c1c54dd36072d WHIRLPOOL 87318adf90a0093c68d8867610e231453f0595b16d7cb54a4fa21e7688035d99c99da69228c37c0e4794b16b204099409ce2dcb4ea5cd4d94e4506c70c3542a6
 EBUILD fcitx-table-extra-0.3.6.ebuild 558 SHA256 3d33cf07c1810aaeca0d057e7046c250b1992d257b8df8cdfbe29a8a597702b0 SHA512 ad38be5004d137d8f2a6f2d8632e8ea88d374e37bdcd3b20f2b1f60e99125d9eb52294cd281fcfa60a712724fdcadaa3d79a9e9b7cc375754e1ad82a13e60060 WHIRLPOOL d7458f00f19692fa0141d45e0d8f3689d38a49e8d230a22fac891fd17bf3171a9a4be90aafbf8295f3b42ac9623e2ddddbbd9ae23b40fd7be662982de39e1e5b
 EBUILD fcitx-table-extra-0.3.7.ebuild 560 SHA256 51cb46dc9873cc1197ca55cc41c72e08f11ddd10a2025a59bdff69d23cd06d25 SHA512 1b6e89b0c97284531294808b00dc57147fa855388bf0c8de9e5e5c771e06c90b22260afbdac07cbff41d52fd9161fd1c9b186ee57e85137659306553966ad589 WHIRLPOOL 096d53446cac367716bd7ba7874611448d1c61aa3a3172ccf3368dfa2cef1d59ceaf54eeb0a67e72ba86c05bf446fdc81e3b04acd3f4971d71cf0c7edf122d56
+EBUILD fcitx-table-extra-0.3.8.ebuild 780 SHA256 1e0cc0bdadf481f75a5a73ed6af99ceef735b26221fe06a3c45108c35fcae0e6 SHA512 29c307ecc60f7c01466d5a379f88e791d305cda3e12daa112b6d9933ea0369d9bc68e97bbdb56835b8dcb57761961df67d45305684878879c1098f911fadbca0 WHIRLPOOL 1ef1c519fbe881db24aaa835cd8426b2b3fc3259bd0c4d03dc3cebadeddead14a9d5e27e0439e47e6ed1fa1491306d2b182619ce2f17ceea7d66566f820ebdac
+EBUILD fcitx-table-extra-4.9999.ebuild 757 SHA256 b8d8eb93a57463ccf48314c82314ef4ffe2428ace0047812e07a0bc76d3621d7 SHA512 b584efa38f6457041b4c83501373dce19be53078a4314b1523799637c3b18b7ee5222485527062ad1be15d9b2c65cfe31d17aeb0a3ceb34c6b9473e6c30d82b2 WHIRLPOOL 349cb95ef4b1534a4f7efefb7505bef1bac662f3069a9f94ceca6419b1bf6a0c27f81514c9f4738f9174a74585e6272fa37c7c47c6985ec25d384021e4aaa400
 MISC ChangeLog 2998 SHA256 93143ba44cd8f6d7008dea5416fd7d030e22bcfbe6ab2c8e0826ceff4111cfa2 SHA512 37cd9fcfa3bba326ecadd83eb6f0a242dd7187b4325e13aeb333db95f05610d455df1bd4842232186eda6587c4dacaa00f0bf0c594100cf896c99ab10631e5bb WHIRLPOOL 953da75a052db060ef499ef9ee13db917c6cbed86e28d5f0d2b3aabaa137195a430cc7bd6f79811f403e60807b6cebdc8700f07aaebeb2684d7575d0ca956189
 MISC ChangeLog-2015 2023 SHA256 d3ad4d699cfeacb00ecbb0c3333d613d9fa3a37c721aaaa16468c475d6e88de6 SHA512 7dbad68694b52c1f0093177afcff773a02e9121e0008ce5045aed33e8ad791bb0e2d157a3a274cdf7feb6f0e0e253ca93fdd29bbfc17aab423af5c58153fa08d WHIRLPOOL d20c8ca309851ae2e37b87f888e00566d5337b12754a5118184d9164653a27a26b48c01a08d37fa50d6fbb930a254c7a3cb7baf6f8b1a5e15e9b71de331e8bbf
-MISC metadata.xml 368 SHA256 35771713c1279c6a6256b587a24bc95638761053755ebe871015e0a62bdb3d72 SHA512 02412f1f558f3b859d1327a440038b9d9ce6d2430510ef98bdb2ddd2b2ccb9ae682f76e76fdefc47e903ba08e93f6e46e9aabffe6cdfb4e57d33daaa63dde29f WHIRLPOOL ce52e2c48610b125b418018b4043cb24b09c1bc9a959275610a0af5a76c5da179703b20fc3aa938434834f8be6ad79339baf3cc4295f2c11a26a17eafad0719a
+MISC metadata.xml 456 SHA256 8384bbe23d43988e17910c6d8b93f038b72c404225f795cff7a166660719deca SHA512 543a24a29523fc93626c2783c3035e3ffd1f7e850a62d80920c5b62b32cb54ff9e811f5d3c15fe785c967daa78e5da56eb38ef6b773a1cdaa4ab3e8e2a3b3235 WHIRLPOOL d5f3a328e4f9a2eba79f3e2a5add6e6051ba96166ddde8d713d84ac2b0b136b7bf972ea874e2d1815f089d182fab08c5608ff074d9e75374b6a8a8a2b011c36d
diff --git a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild
new file mode 100644
index 000000000000..60a3f7c886a2
--- /dev/null
+++ b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/fcitx/fcitx-table-extra"
+fi
+
+DESCRIPTION="Extra Chinese table input methods for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-table-extra"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4[table]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=(AUTHORS)
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/fcitx-table-extra/fcitx-table-extra-4.9999.ebuild b/app-i18n/fcitx-table-extra/fcitx-table-extra-4.9999.ebuild
new file mode 100644
index 000000000000..e1797eacb82b
--- /dev/null
+++ b/app-i18n/fcitx-table-extra/fcitx-table-extra-4.9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/fcitx/fcitx-table-extra"
+fi
+
+DESCRIPTION="Extra Chinese table input methods for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-table-extra"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+"
+SLOT="4"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4[table]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=(AUTHORS)
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/fcitx-table-extra/metadata.xml b/app-i18n/fcitx-table-extra/metadata.xml
index 49f2185b80dc..461bba458254 100644
--- a/app-i18n/fcitx-table-extra/metadata.xml
+++ b/app-i18n/fcitx-table-extra/metadata.xml
@@ -9,4 +9,7 @@
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">fcitx/fcitx-table-extra</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/fcitx-unikey/Manifest b/app-i18n/fcitx-unikey/Manifest
index 13ff580f3a07..bc14986051d2 100644
--- a/app-i18n/fcitx-unikey/Manifest
+++ b/app-i18n/fcitx-unikey/Manifest
@@ -7,8 +7,8 @@ DIST fcitx-unikey-0.2.6.tar.xz 75124 SHA256 9830910f628d455d2701ba430e6cb5b41409
 EBUILD fcitx-unikey-0.2.0.ebuild 763 SHA256 5a5e9c5ed5d53f6da2fd6061d7098da31fc12313b34adfbb4c3b5fddd1a1b928 SHA512 9203c37b47e975074685483a0cbb5d4efbecb9d77201b20470a1d32e3164370a8ae55514386628a38f24e6b113c4888b1303df1fe2a0c72fb1e3e7e1cd22b12a WHIRLPOOL b0e404ea1b9bfacb467d336bc8f2198c0a680ec0b7b58dea79ea89e94e3430fe098c05827f2802cfaf1769ef8c5d5d9ef59d0e49571155acfe363aa94ad92a6f
 EBUILD fcitx-unikey-0.2.4.ebuild 634 SHA256 ff012bdc1e8a6da07ed0e076db384a49c5c894745216ece1ca0a093af9418466 SHA512 d219a6689d919411d0438eb6a2dca3e4865bd6b770c8a9692452343e0d44beba5651b1331c367de75590efc3f6aa04094fa52f7dec2e12bbc6ed0994999667bb WHIRLPOOL 1293b94ac166d1592106bbc4dba8dbfe8a77d071d82fd4294449024d4616905211eca99967abdad56042feabf99a98130d1cbc51026fbe8c3548d2191c201918
 EBUILD fcitx-unikey-0.2.5.ebuild 1091 SHA256 530d1189d400841074785694dafb8fe5d85cc02c0705ed4188778228fa88de52 SHA512 98fd05cceb73b062866b2b5213a31d0c9c4b918801c24b6704279a01ef97b77da9b75bf9a7d36f0c35eb01bc6082b35b347159398f31470f9a10745a2e40e201 WHIRLPOOL d40a9aa19c439ea98998259995a108cf5cbb2611fb48161d1d77450edba84f0e08d7570704d63d327fff7be3b137afa4def4eccb67325a659ba6b9a40e3ddd3c
-EBUILD fcitx-unikey-0.2.6.ebuild 1005 SHA256 c1e4b7d986c4ece8a18e8350fdafb9c887ef2be7eed896e41a63e0d35bf0ee33 SHA512 e5b1823b9fc206bb59bf86319b693a5f9fbb87ff85d5b1139282bf65556b4d34e92e2931caa31852738ba1536ac8ac8770f9fac5d643c7e79fbf75524e223624 WHIRLPOOL 50c699fb68f64d65c15b97a9fa6e53789707f24f5f5e20382d73b7ba266af3c69e279f0de300e0bf422cfa92a9df48bc64cf8911aec180834c8c3591d735c787
-EBUILD fcitx-unikey-4.9999.ebuild 1018 SHA256 c3264749e5f0fc910c33d538840fade8fae923018a6435ae85e6d574d810700c SHA512 82a8202c53cde4e3817f3780bb1acb02114da2aecd757dd4e7d73ce5c6a6c415ff94821bb7fa9c9b36de9d428d16ea88de7897b621b3387690276db74a824442 WHIRLPOOL 92a38c4b83a91e17526c0dec97cdcf11faade20658ca6a509a2e13a40f92ddf5a66b4e678bd1fed1bc0ec3b237fb3d0198aeedbb4c2815c7fb573994a244b612
+EBUILD fcitx-unikey-0.2.6.ebuild 1013 SHA256 a4a70945220b5c7364bc1c2b5d10d441ad877b7c2380da00d19a6554c15b518d SHA512 93e04b532e943fb384b90c676bbeca9850b8f6086eb7f38c25c434639df07fd2a90da6db6e7fdb844be83c9ddc35cb37b2396901c93ec21a4e285949a2826f54 WHIRLPOOL 710e097e77ebcec991a7b51e6470584e69d85f9e33cc0a505191463727b2364e4534f1fae6459c130289dc268fa0c4843535f349becee83af0942a86e14dc306
+EBUILD fcitx-unikey-4.9999.ebuild 1026 SHA256 11b142da0daf75d2336d962198c6f0f994f5025810e23277ae51653586aaed71 SHA512 fa5050db2a5acfcb7badbb1df231461d08d1c789cbce2e4c129be937ba82154843ba9c8a434f66d85b8f2fd3488b96068a69730e45f84af01515794f35221541 WHIRLPOOL 46f37d2f9e1a22462dbd61a178b4731768e172f0ed11f75a08568b541607e214318780d9e96040f9258873d904da6ed464fc9484cd9f2325c3166e93f9fc3d1f
 MISC ChangeLog 3730 SHA256 3ad3d71476fc38d185cddd8d08f03b9f9b2905f33139ac0f7e692a1af221710f SHA512 90dd32766574f2b0b7075fc21d7acd52751092746124aa84c291effdff60f93e175d9166687312d94a4b0488e0fff37beff5533a25890c6dd2679c10c123811e WHIRLPOOL cf32e04e60407a36df03f72807fdd4aaa4c73ecf6152eb65abe41ac457d03cc9fb3fd166b68453bf33228be3b47fd36b34ddb7040ffe2391f633b401aceb7195
 MISC ChangeLog-2015 1791 SHA256 38c01ea949713b3b27ddd895b931c8f190e31ab09501424f3a6294d85740ca45 SHA512 0c7f5bf6eaa51a4c93ee6c69574cd1cc8e09fabc94880d7999aa699b4d8b0bbd0cf4572ced25e4949fa16f724719bf87ee4710f2afe1f7969d67a7395fb3cad3 WHIRLPOOL 79cffc5361cfd803e3d840afb48f247c92dc5423f5a0d256f5ca073de8d37f62da908f05fa583f12a0e1c448d7500406821df574d48346eb4902bbcb3f412318
 MISC metadata.xml 522 SHA256 e00c80e6fa010f21898bc748bd20409051cf3ddef69368f9eb4b151c01a79712 SHA512 c08e14d4e9268a0c0608148117d50b77754f1f9d96433a28f243fd0643d7021a9e2b85ca57de9f4196bcee54eb05b3c5bee497a3dbf77ef9b279c1bff7814694 WHIRLPOOL 23cd95f211e27da846a863a607c35ceadc1d39e76773f6677f40880265b3149421e8726744ab2e7f5652daff8c89b77c8bc2de6955e514437c5de2229c3d99d2
diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.6.ebuild b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.6.ebuild
index 09a76beb9094..c59a60474930 100644
--- a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.6.ebuild
+++ b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.6.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
 fi
 
-LICENSE="GPL-2+ GPL-3+"
+LICENSE="GPL-2+ GPL-3+ LGPL-2+"
 SLOT="4"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+macro-editor"
diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-4.9999.ebuild b/app-i18n/fcitx-unikey/fcitx-unikey-4.9999.ebuild
index 5422ff219bfb..95c318c72900 100644
--- a/app-i18n/fcitx-unikey/fcitx-unikey-4.9999.ebuild
+++ b/app-i18n/fcitx-unikey/fcitx-unikey-4.9999.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
 fi
 
-LICENSE="GPL-2+ GPL-3+"
+LICENSE="GPL-2+ GPL-3+ LGPL-2+"
 SLOT="4"
 KEYWORDS=""
 IUSE="+macro-editor"
diff --git a/app-i18n/libhangul/Manifest b/app-i18n/libhangul/Manifest
index 0ea3731becea..27c2c3dbbb17 100644
--- a/app-i18n/libhangul/Manifest
+++ b/app-i18n/libhangul/Manifest
@@ -1,5 +1,5 @@
 DIST libhangul-0.1.0.tar.gz 2899845 SHA256 5905aa5c557d8d46e190fec1afdd75babf3bc086ef286b42007572703658295a SHA512 cf84850bf7a41e743457300513c5efdf7b3e18d168f4fdc324aaa8e1be78743752fcb98385764f94c707777ab82cc9444e076808e61fdbd915c9c0d7ea93c534 WHIRLPOOL 898c355f587d2943dc9044ffb46a4e4215922a8e2a7c6c36853927e924efb7e47f88ad46741fbb70a1d68547872f2a3db77926cfe9c78ed6171095cd0a466f28
-EBUILD libhangul-0.1.0.ebuild 716 SHA256 50d20704f9798ba494549a6557291e51d95302e01c629a41774436c9dbba7e64 SHA512 fb752bffae41e63fde89fbc2b5ed03e2acc1beeabbfb75c609f29adf97033750f65ac8db7c8cddc324b643a69ab011b9a45b4bef979ec962dd28a3403d283f9e WHIRLPOOL 73c8de6563d0480326e5c36580afc6ba19b6dac04000f1a8822dac427c15050ba4ccd0b270bfb270ca64bcd784d0c6eb679c11b3ffea2d452b776c4ad7249eb3
+EBUILD libhangul-0.1.0.ebuild 763 SHA256 bc2ed60fa7218f2cc4c53567bf35805ea00245a43fe72e117a74c2dc32e5eb7c SHA512 9f3af29d02e41436881622c12f80ffebc7ac7d52ea0cf43dd6c6ec8498bbccc7d2fbe1cdfb0895508fb0ba83d9fed92d3050babdc6440ff7ae02294f365a4915 WHIRLPOOL 1da8a934fbd090c4e0403c31f9d2e2bb2ed84798d670ccaf8d803cfc3fe761e619f61eae80b567d07763e3194476a7fab5626637023882c8eb1d0d2ffcc984b8
 MISC ChangeLog 2813 SHA256 07c0d4885ecad52ae50ce0a5f3aea3cc07e6b6faafc5c266e5d067bb0e7e8185 SHA512 5407f626c1da2fdd2d1fa74e952fe2cf9956756105b037d727eef974613f21fdc8cc46442bd35f4b004239de5f0263f5189a9b2318dbfc5d1b99d68245ff036e WHIRLPOOL 97c2fd927cc86b25631f52bc963882b5d9175861873eb9f680a1ece111cfdf7100a8afa9751f8fe65b0a9d93ca3e2bac8d032ee9b0425ed9b88ea14dc6ef6971
 MISC ChangeLog-2015 4611 SHA256 ca52125750f8822374e65e89cc9305d6eb7fe1363dee15a7119dd3ccdf29be19 SHA512 435f49c8a92d8f8c4f834c4175a14c97c744c22ea7dcd8dd4f4e1171355e8387c03e03ac19106f3891b48209c53671d1a0f3eabc11b0ca315bc88d1b4998bad4 WHIRLPOOL 0c375d7f7b1b3f486ad2aed38fa43a342d9892afab44dea4c040ca7f70675956bc400dc039abe454c667d73db8876350c2824b62124d9962498f1318fbb74752
-MISC metadata.xml 313 SHA256 a5b5b3bf44875505e5c1938c35dd3edcb540510be10268cd99b8cfdab2b386e6 SHA512 dc50ab5219c5f5e27dce97fc904dff4fcf662f846bf0b43d94f4d01014c093adce9aa0767a23c0e2bb1c22584df322f4f89ec2cf509ff2d4140a4b2e5b035562 WHIRLPOOL 54fa667b70c4fc93c185ef7426437e6896f9488cfacce1482850df105bc503e505fd36fe09ca2f822ec21e2f4f01dc34f8098c7269667110cc0e378ec2b3f645
+MISC metadata.xml 320 SHA256 cf54123e78119404a28e6b0097824fec4a45746df4da53f50686923d178d26bc SHA512 ede9ccfc8a3f5d9082a04a60ee48b19b285cc96e21301e95f4e43d10f7f2630a79cda06a0dd8d6670b6308bd74c035f8e51c95e684b2bf4f68a79a86e57a045a WHIRLPOOL 04ded703e72f42b434b83c1e75f1b90414999128cd03f2a677001eb96503100f312b5f9cf7dda61ad12e25c9feab09e113e97f690ebd6f41a861c6e7afe728b7
diff --git a/app-i18n/libhangul/libhangul-0.1.0.ebuild b/app-i18n/libhangul/libhangul-0.1.0.ebuild
index ec22b8af6eca..f8ec424da315 100644
--- a/app-i18n/libhangul/libhangul-0.1.0.ebuild
+++ b/app-i18n/libhangul/libhangul-0.1.0.ebuild
@@ -1,24 +1,25 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI="6"
 
-DESCRIPTION="libhangul is a generalized and portable library for processing hangul"
-HOMEPAGE="https://code.google.com/p/libhangul/"
+DESCRIPTION="Library for hangul input method logic, hanja dictionary"
+HOMEPAGE="https://github.com/choehwanjin/libhangul"
 SRC_URI="https://libhangul.googlecode.com/files/${P}.tar.gz"
 
-LICENSE="LGPL-2.1"
-SLOT="0"
+LICENSE="LGPL-2.1+"
+SLOT="0/1"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="nls static-libs test"
 
-RDEPEND="nls? ( virtual/libintl )"
+RDEPEND="virtual/libiconv
+	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 	test? ( dev-libs/check )"
 
-DOCS="AUTHORS ChangeLog NEWS README"
+DOCS=(AUTHORS ChangeLog NEWS)
 
 src_configure() {
 	econf \
@@ -26,7 +27,11 @@ src_configure() {
 		$(use_enable static-libs static)
 }
 
+src_test() {
+	emake -C test check
+}
+
 src_install() {
 	default
-	rm -f "${ED}"/usr/lib*/libhangul.la
+	find "${D}" -name "*.la" -delete || die
 }
diff --git a/app-i18n/libhangul/metadata.xml b/app-i18n/libhangul/metadata.xml
index cf493e6f8889..8e75964217ff 100644
--- a/app-i18n/libhangul/metadata.xml
+++ b/app-i18n/libhangul/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Cjk</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="google-code">libhangul</remote-id>
+		<remote-id type="github">choehwanjin/libhangul</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/librime/Manifest b/app-i18n/librime/Manifest
index 44da2a54123c..e6531bd13bb4 100644
--- a/app-i18n/librime/Manifest
+++ b/app-i18n/librime/Manifest
@@ -6,8 +6,8 @@ DIST librime-0.9.9.tar.gz 2548968 SHA256 e828acc853a5d9e3ca191d065112c410183aadb
 DIST librime-1.2.9.tar.gz 5516609 SHA256 d9f0e732b5bf0ee9d8872d00c79322eec7682139a898a65555f794795ac5f410 SHA512 2266ef96ad21ec5981b4ca5371d4e16eefed545ffbde07093ae0d0be070a64f9869baa09b6bdcee2522438e08c72a842a7e0b225a6ca1b661708a80cf3aba83a WHIRLPOOL 032c517008b0f4b4d9ccd9d188d480018fa1116d252786953b136de060534486b73997c6574f3ed040f337ca028b83669b135fd2683e54ddf576039a77db19d7
 DIST librime-1.2.tar.gz 5199581 SHA256 fb04a7e0a4eeb2f25031c9a366cedfdab641ab06960f50c42febef5195de9381 SHA512 75a771916a58b1ab678dbf05ac074a651cea077e81d25e4dfd0ea839fabe6cf606135851e72c19d6a8a9c6ed66b89928b90785f282e8786c375bc1d393059227 WHIRLPOOL 44a821fc4e1a562cb01ce7c28efc5a4fd3ca8e9d2d4e55ddda3434b677a17b59d7114a634bfd95ae53072f0e6f2e5f027b2c81ab70fa51b011934c7c39fbcf51
 EBUILD librime-0.9.9.ebuild 885 SHA256 f7f624b33eec3800e2984448d81039d6c58271e09159ebd21ebec5062a10b60f SHA512 905c76d5b75824318e94d8953eb3b5233d2721c1783b42e7312b56f4ab69be89a158f59a6ce4aa259f89d0baf233fb41bd10129a8b87a519c22c4e7f4d5c75ec WHIRLPOOL e8e9a0e6da2f691ee058e92c90a7308c3ce3109f610e32cfaad8adc899c74cb5cb68870539cad9ebd65f0f3754bfe782f44e0ab62deb24fc98c4f866165160e4
-EBUILD librime-1.2.9.ebuild 915 SHA256 30097dadfa5de522be9a70542fe23ede9d8648cb68240b82f461cf880994836d SHA512 268ec6bad8d831002fcda2b01cd6e35d6aa97b5cb261a671f6dcb99e4ce57660684456c6126311c49ccd72aed6351381e41be36fa6b5ce57f096bce0e9f831e7 WHIRLPOOL a81a7126fd215dbb20fc04108de7c8da76c18c26e35457325ba552282a8b1a70554955ddb85d63b9007a8906ba96c1d91ef9179aa8ff32595b222944ddaa6a50
-EBUILD librime-1.2.ebuild 1018 SHA256 a6fa15c146178eebe2c0b504321829216b6f87f20c5205496c19cedb7912f1af SHA512 fb719c3d2b79960b99d1cde79acee51f200fb295baf467b8b97bc8721702059629b133f442ef7f966776178c0e1975db80b668b590944f8caac76d886e7b6560 WHIRLPOOL dfddae515775b261fff729b87fee93631ade4c1af10081781a528286f1d02e0c5ee157d0d6623ed771ff42e92c4e2f734b5c69d08d493e4be1c12b2356edeaec
+EBUILD librime-1.2.9.ebuild 896 SHA256 5140cbca967a82700e296d55e4065ebe159ad9047910fd8a2d03e5d07baaa5bc SHA512 3dd8bc615cf7d555dc909fec154922e64733033899db5f27d2e8e7e7fa334c5f77958be3dcc4825ca682e17a4dd0929cedf62eea94117e7c0db1b00a3169f9eb WHIRLPOOL 49b9385458f72df29dcd15c4bb3fd7c6e733dbff8ad08d723ea4eab29b84266828dbea56830cfc77cd7c7838c6e329d559be4e8359901fba59ca1c512770d6e7
+EBUILD librime-1.2.ebuild 1020 SHA256 ed061f3873b657d3d25a85a2123b9d3e671c248e2e9f0302a1cf97435284b78f SHA512 1671e8fff663a6bf2e90e8b176be0ab178d67ff8f4d511b0a0e0fcc1601932e5d2e1336a832573a97a5923bef5169d63832ce8d03e30145b60b86bf9681b9661 WHIRLPOOL 8ae0bf0609e8d4117c82501bd7c2a20c4392a70f67c8f4c3f3f8b6ba304fa53fe185d8efb067a09369aa672102e688351fd7f7fde90e471836a2fc5eda79a0cd
 MISC ChangeLog 3599 SHA256 7d8ce3e1b9502ca204f9ba3ac0e93db523e5bd093f2a92f518fbfed3e29b0345 SHA512 84168f25368df59942feedab779cc5b4fa7e55b501f99c172a0c27dd0c19e7321c94c57bb0118faa3ce7254c7168563ea5efa35bd630c36316e98a81fa5266c9 WHIRLPOOL 7e4985ad4358c7da94812dbcc317c5bd03b819dcca3306aaa88fe03b03e448cf2c8b4e4b6113edb616a0da46b1a891ee95901587a3df5392a5dcce7d8e883358
 MISC ChangeLog-2015 3322 SHA256 1d5b9b9ce52e660b7dc571cc70c7d7ec01b14447a4c6029a481b733c422d180a SHA512 19325ca6fb92c4ce0bb82757a8fd0be33ddc3dbef5eccb3bc70cd8843c6c9cadfce7b98baee22ae1442f7c49785cbc5da2c613471e2a3f794cef11de9c8c718f WHIRLPOOL 56d910f0c173359ae55f8e3898a38bfac1cca797178145e8f514609905a8888846f3dbfd7dc014257bbab6128df7dcb730d73e9e9640ae98a472e801dfdf473b
-MISC metadata.xml 655 SHA256 6d0b230ef89a8d7224ca98984132af022f55cc154125ddcb4aaff6c83dfa2d24 SHA512 c82501b7e2e2dbbacaad03c74d9691f35cc0d768f55b0539be65af0e5cd939b21d584dfd8800e761e68d4a3d72be54111fa67abf0145def7c9421330b32ed146 WHIRLPOOL 01f05e02ec945b51c5b26a58142f7b39f8bcde59a51f018e4edfe46ed889b79799c18ed28f79c99f0f8b6089cf8c28b43409674100a327d3e6b233c686901298
+MISC metadata.xml 532 SHA256 ee5865e3f53ad49f8ceac00b3a391bf3d31d2b4cad02c70a3e4926d785ada917 SHA512 83904c4885a57569f4e74483bd5efed886ca1fd6708c1e7146ce4893bcbdd66efa82dfd4e563c7b888603e23566de21e928772a597dd2e6fc75d00793c788800 WHIRLPOOL f0ee941a11fd1ba3bf2b0f19c1e3d06881fb82772fd52f790e74b6942ec842214b1d84c6eba27708fca4cdc74d1eceac50b8080bacdba4dc2dd92c2b1b60a54a
diff --git a/app-i18n/librime/librime-1.2.9.ebuild b/app-i18n/librime/librime-1.2.9.ebuild
index de9834370d97..881db9f137f9 100644
--- a/app-i18n/librime/librime-1.2.9.ebuild
+++ b/app-i18n/librime/librime-1.2.9.ebuild
@@ -1,38 +1,38 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI="6"
 
-inherit cmake-utils multilib versionator vcs-snapshot toolchain-funcs
+inherit cmake-utils vcs-snapshot
 
 DESCRIPTION="Rime Input Method Engine library"
-HOMEPAGE="http://rime.im/"
+HOMEPAGE="http://rime.im/ https://github.com/rime/librime"
 SRC_URI="https://github.com/rime/${PN}/archive/rime-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
-SLOT="0"
+SLOT="0/1"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="static-libs test"
 
-RDEPEND=">app-i18n/opencc-1.0.2:=
-	dev-cpp/glog
-	>=dev-cpp/yaml-cpp-0.5.0
-	dev-db/kyotocabinet
-	dev-libs/leveldb
-	dev-libs/marisa
-	>=dev-libs/boost-1.46.0[threads(+)]
-	sys-libs/zlib"
+RDEPEND="app-i18n/opencc:=
+	dev-cpp/glog:=
+	>=dev-cpp/yaml-cpp-0.5.0:=
+	>=dev-libs/boost-1.46.0:=[threads]
+	dev-libs/leveldb:=
+	dev-libs/marisa:="
 DEPEND="${RDEPEND}
 	x11-proto/xproto
 	test? ( dev-cpp/gtest )"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_build static-libs STATIC)
+		-DBOOST_USE_CXX11=ON
 		-DBUILD_DATA=OFF
 		-DBUILD_SEPARATE_LIBS=OFF
-		$(cmake-utils_use_build test TEST)
-		-DLIB_INSTALL_DIR=/usr/$(get_libdir)
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DBUILD_STATIC=$(usex static-libs)
+		-DBUILD_TEST=$(usex test)
 	)
+
 	cmake-utils_src_configure
 }
diff --git a/app-i18n/librime/librime-1.2.ebuild b/app-i18n/librime/librime-1.2.ebuild
index 59b420ff3cd0..e2ccff847d1d 100644
--- a/app-i18n/librime/librime-1.2.ebuild
+++ b/app-i18n/librime/librime-1.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://rime.im/"
 SRC_URI="http://dl.bintray.com/lotem/rime/${P}.tar.gz"
 
 LICENSE="GPL-3"
-SLOT="0"
+SLOT="0/1"
 KEYWORDS="amd64 ~ppc ppc64 ~x86"
 IUSE="static-libs test"
 
diff --git a/app-i18n/librime/metadata.xml b/app-i18n/librime/metadata.xml
index bb81a505ec80..1ef87e42d3d5 100644
--- a/app-i18n/librime/metadata.xml
+++ b/app-i18n/librime/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
@@ -14,8 +14,6 @@
       <email>chen.sst@gmail.com</email>
       <name>Gong Chen</name>
     </maintainer>
-    <bugs-to>https://code.google.com/p/rimeime/issues/list</bugs-to>
-    <remote-id type="google-code">rimeime</remote-id>
     <remote-id type="github">rime/librime</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest
index f55bfab04b9a..46260baa7f3f 100644
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@@ -1,6 +1,7 @@
 AUX 50mozc-gentoo.el 121 SHA256 833039439dea484a430e832df869b3af0b8d42bae63c4d6999e72c97d55d897b SHA512 2d67a6723374872717ab7132f02f4030f00ddecabb8a1fc20c9d69d64406dc2ba2a1109734378fae7b4718a8ae9601beff4b6f27cb43a280fa2e0f946da70685 WHIRLPOOL b9e5235177ee432509c9428b632a1148e8788c1bf9b6fe57bbc4f3f747a038008ef4752a1dfacb86a5be9a018504405e6a68053dd54d381af1fd9170ba9c6ed7
 AUX mozc-1.10.1390.102-drop-Werror.patch 353 SHA256 894411a2dc704157661cc7386abf32b62abea9dc5621bc30474ce3161c54adf7 SHA512 203066f08a5094306d09c3c58f81bfb7a4069bb1eacd31f0d257701a4560adee5452a516351cd9bc5ea7227e40d31bbc6eb177422d3c37514f7573398b389bc2 WHIRLPOOL 0a3cdabbc653c42403fa60d9486927a8b4d9c2003262b973a4f4264424331a02a8fb3c413a736e797525e57f25b12a7ba2fb328ff7a7684b4bb2533f35b2ba96
 AUX mozc-1.13.1651.102-gtk-renderer.patch 547 SHA256 6daa6d077dffbcc133f49745bce5b2503b6097d8280c52a602a99b24eaac7b40 SHA512 7b4a4910a8a0a821fd8130e77ecd0b4f846f7fc2b573607e2ce0280889d625f4e374c60e35995dd5cbc2e8ccaf3443652b60764f538584e0a9d351ca67a28af4 WHIRLPOOL f4dabc1a7a4d29f5830bc641019b939405abc6c36d6acc384ed74a06995dfc31d5993653965acf60f8208969e9643ba97c1d4aca3bb7eac19ee73b4bccbd22e3
+AUX mozc-2.20.2673.102-gcc-5.patch 413 SHA256 6d422910257aa8fb408f36a6e1dce3df9e13760a93c0b935e819405befe5652d SHA512 4c05db865fa7985ff977ac574fe53e43ec103dc17432ed2a2d8a76c5e0230d8ca430eda3848da06b855471e0cd690e62ce73521b9a354f5f3cd4e901ad7e3760 WHIRLPOOL 6e30af73a93c440a363e7c6e5048c1033907a9819be2bcb8245a6cc5885001c564b203de0e00ddde341d1d0c0abba840c475ff6976077d7f426651499f253574
 AUX mozc-2.20.2673.102-system_libraries.patch 9659 SHA256 658ccac9192258e4838b4f25a7aed107fc2121ae16e4e92cf61570a53251f9ad SHA512 c0f858a9536fc449e0d9fb3191df2419f0273a478c31d0404713fc4feae5ffb72afec7b47b57ae2111ed0bf40ead4a75e31a68286440113968e2f4e4d6c2d856 WHIRLPOOL 068e3a5f2d41314cc5f6b3d42787b99ac3f92039061fa83fe4d9728e0d5ff22afad23762b0a75126a273d985a8e3869855bd5eaf381b7e62df9c286b13646763
 AUX mozc-2.20.2673.102-tests_build.patch 1037 SHA256 1f8e35f257e7952fc7818da1748b1be4af578066150304a7f62bdabbc1b95233 SHA512 d99ee7edbb406e123b26ec186933608b42d36193b7bfe67232810c0fbd7a92bd8cfff26dc45eae4f020e82e9a8370cf2033c750250455585b6b3d88cc8c973ef WHIRLPOOL e9384d30f4f8add826dc53fdda1e816563c51c4f7444170667fb041b18782a20f7a3f79c51d7cef19b9a27a078b375d33fdc67d6f5f6bc4321a8a3e03b208329
 AUX mozc-2.20.2673.102-tests_skipping.patch 2086 SHA256 dc86b4d5124e5c3bbce38cf12a0eaf04f7ebad932330fb3a86e7391d14e5843d SHA512 4a2e5a35c5e65ebeb737f656d6efb313c660c2c7cf62abd5d9295fd16e2dffde21d069cd74fd0cfd2454cd7f7c9d136dfbadbf79832db8441c619ff37c7e4b0e WHIRLPOOL f7576123d2e9c096d9301bb3085e3875cb8c72f53621a8adad162b826b8c5784885f4cca6cbfd28a7f7b6d589ffec4e509adcfa1d0c2d2b7e8dfdb4def89fede
@@ -21,8 +22,8 @@ DIST protobuf-2.5.0.tar.bz2 1866763 SHA256 13bfc5ae543cf3aa180ac2485c0bc89495e3a
 EBUILD mozc-1.10.1390.102-r1.ebuild 4854 SHA256 f0c67e771fbe8f2dd8d324f0525e6cf90f14e84d9b1d7919da075f2262818efd SHA512 f84435093d31d49b8b7dd5b71c4f753ed8d0da7fb5666ff4381578dff7d9ab8cbbc02b728923f3f75c00dfe4591f7709f85df9ac7e586a1c3653b79ec0d3c60d WHIRLPOOL a97880e4d4c14843052465f1e981737e5e379d21febd2115a515cc9b20659c0f38f7af6f772f0e00e7b7b5d2bca1adf5887b7358f6d5d319db661befb7d004ae
 EBUILD mozc-1.13.1651.102.ebuild 5036 SHA256 968aa5ea57c352fe27832db8242637d57f2f809b45362144d7556760e17dc405 SHA512 ee8f4d4feffc39dd01dc70ae03a5f4f307d0fff5319c38c25d7dabc35ea66855e58d84e71220ab812e31dcdb47c32097ff6685be945299213dbba24a8836fecb WHIRLPOOL a7fab3c787335db1b8f32bb693b566edb747074df9f278d55abbc22af2443fdc0e8623f1f2b4dd582ba1a854eb8dc64d5bcf38288648fa34c12bc9084ff9c598
 EBUILD mozc-2.16.2037.102.ebuild 6726 SHA256 9dc66731dcb8a792b0a309fc21b262625e1f8c22016ce2bb580b872856730e25 SHA512 eb4d744a8fb5902c66296b96987f8b50e0a3e5d8792951fe44bb84f12c3308d2512341ac89781b62e9db4d1c19b40646a3948449ea744e2e7470e28c048ecaf6 WHIRLPOOL 991dc805f479a90f2ad540ea1d1ed1fd6147f628081e9048554cb85e47583c53b7e1cec19cada1200475a8d8d42d30ea8e5acbf57869a32f1565dac3cde25b75
-EBUILD mozc-2.20.2673.102.ebuild 8922 SHA256 fe3d0ea5bccb5e22934c621e8a30f7b181920e7037b047dfa08473f3bb6a805b SHA512 7167848180259f4730aec41ca8f56a2611894d6670ae0e806109e8b8aa12989637d09c9aa3c106cf4b99f88a7a4a5c230ce07b69af50a6c6a4a2a9b948d14985 WHIRLPOOL 60404395f9c37b6f0be34462167279716615ddfcfef7392616a6da23379e98dcaf1c295ec12cb276e3eac30662edccfe6a9f6dd5dcf191d793a6bf0ac5b3158e
-EBUILD mozc-9999.ebuild 8817 SHA256 38c8908784b01fb85be41365b8b668d57c8dee7a9ea140f4f978fac9f253a709 SHA512 509e26b5bac136458e8da631b8ef2cba9b0489be96dfb08f3ece836dab8e4f3e46db2b77c9bba8094db234d1ef5fcc864ef8b3e5f6200c1dc6cb52d09cebe51b WHIRLPOOL 75da7473481383e6664ed8d95f336163352862a3f77617b14edc79a3bb4aee9cef7a4a89dd3a8c8fb9df37030eccecf817a89a92a252840f3f02deaa5673ed5e
+EBUILD mozc-2.20.2673.102.ebuild 8980 SHA256 7e06e6da0516bbefe16a1a84760a6989488196d1eead07d60c2ec2ee9636d400 SHA512 658afe79f1121d4d920e908743fe3a21ee9529f054a1ec0c74baf304a67ae2549ef81f7ef475a5fcf5072efa67635a0f4db5fa3fb27c2d3e255fdefe00737e1c WHIRLPOOL 50b0ecccf9c7a168a72b09396a9312023a2dc068e95ba15f82e8b03909e9030421b5acdfab5d592d8fab6f14eb0202cdda0077250f254008971376ce636f8f28
+EBUILD mozc-9999.ebuild 8875 SHA256 1efdce8761ce9c4b23b6b147e48bebc8a6e15ce70cde27db015c088175a32ae3 SHA512 325c139315a060116f1ae64f88c93bcc191000a0ec06717e3adb359e624b02f7ad334c806b1b01147c233337ee247f5b53122f7287299e3bb12700b2e812729e WHIRLPOOL b845063d7078942de41a01f0737726e65f938a1b25cc6413798ef049e2cabb25633b1ca6ce3084781e3d6f2b4d8f24df78cba85dd25214a3ff8be7c4f4eaff34
 MISC ChangeLog 3991 SHA256 40dc9da4e7d6d62958c610f045da2e78bdca028852617be136838e3cdb707fdb SHA512 ad3b884e40c14154afe299f353dde7cd3fc08555e281911a1b97b2da60e6e5a34c4de396b974b59bfd9cda4ca6068b74e0ce3cef24c3828d55b708c16fffbcbe WHIRLPOOL 99d04bfcd81c2cce998a72f71a3b6577650d413c02fb05b36ac2e82a8ab3fc625076ff51a5093b5f682fd1c2224b8d6af3813bb7684ed8891e74d2f9425dda9e
 MISC ChangeLog-2015 8901 SHA256 096cea82e38f33a34acfac0b7622c959de656cfe4f1cb3afd3f148e12f3e013d SHA512 2f9acbcf3e7eafd3a1b7052e9b0e7f9a41c565d876cb4eb78360964b3fb7acd9dee3b45ee6a3ed76fe04c00b175e56c63b0b83698c0dbfc6554ab4b474566e87 WHIRLPOOL eed311405f838d6daa955f118d9429db8508a1b08120bed39debe3af397c8bdd5100a6cda0c0b77ae48550407a6b2d49bb63f2c40f6faac62aa183c1479479d6
 MISC metadata.xml 1334 SHA256 a4f99e39449d176f6d38e09097c5df85be755c5747430bfdc41f0a7e1aedf276 SHA512 07979f2fb42667e6281f7617f88d86eae9117e7fb33203acb456379db9468992e2105e520c1ecb7e77c9ad79900daa8c11d57c53b03b5ea89f644dcca020f9de WHIRLPOOL 5c3c78f349c84e394d98d7468145b7ab6e73786b59621987f135ab8fdb6182418d26e0c9bcd18d458062a28d89d81f1bf7b7691fa40b46eb3594109356499207
diff --git a/app-i18n/mozc/files/mozc-2.20.2673.102-gcc-5.patch b/app-i18n/mozc/files/mozc-2.20.2673.102-gcc-5.patch
new file mode 100644
index 000000000000..b8b2bf1808ec
--- /dev/null
+++ b/app-i18n/mozc/files/mozc-2.20.2673.102-gcc-5.patch
@@ -0,0 +1,11 @@
+--- /src/prediction/user_history_predictor.cc
++++ /src/prediction/user_history_predictor.cc
+@@ -841,7 +841,7 @@
+       // swap.
+       if (i + 1 < prefix.size()) {
+         string swapped_prefix = prefix;
+-        swap(swapped_prefix[i], swapped_prefix[i + 1]);
++        std::swap(swapped_prefix[i], swapped_prefix[i + 1]);
+         if (Util::StartsWith(str, swapped_prefix)) {
+           return true;
+         }
diff --git a/app-i18n/mozc/mozc-2.20.2673.102.ebuild b/app-i18n/mozc/mozc-2.20.2673.102.ebuild
index eb93090b7361..ee84afb7d91f 100644
--- a/app-i18n/mozc/mozc-2.20.2673.102.ebuild
+++ b/app-i18n/mozc/mozc-2.20.2673.102.ebuild
@@ -94,6 +94,7 @@ src_unpack() {
 
 src_prepare() {
 	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-system_libraries.patch"
+	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-gcc-5.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_build.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch"
 
diff --git a/app-i18n/mozc/mozc-9999.ebuild b/app-i18n/mozc/mozc-9999.ebuild
index c56eb0e73da6..35e9ab69f408 100644
--- a/app-i18n/mozc/mozc-9999.ebuild
+++ b/app-i18n/mozc/mozc-9999.ebuild
@@ -94,6 +94,7 @@ src_unpack() {
 
 src_prepare() {
 	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-system_libraries.patch"
+	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-gcc-5.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_build.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch"
 
diff --git a/app-i18n/rime-data/Manifest b/app-i18n/rime-data/Manifest
index 82119cf78cfb..f72d6f4233d2 100644
--- a/app-i18n/rime-data/Manifest
+++ b/app-i18n/rime-data/Manifest
@@ -3,7 +3,7 @@ DIST brise-0.32.tar.gz 6697747 SHA256 4462d1f1e8f9cf62bfabc490d2ed1ead4747a92d05
 DIST brise-0.35.tar.gz 6707277 SHA256 89670753ffdd321053a5b8f0b82c68e29129b330a411b841b5b9e900b9a3da4f SHA512 1a2a3ddba9be7089a1b82ce446a3e5dc93a13fff121f861aa1acbdea950f490c9367866902a056296e17de5076a59a54741ceb3a59a9c0ec58b6b7c54f519f3d WHIRLPOOL e00ac2e3f7f50737491b5213b75ed2ee3fa3c08c4073584b6a31315982edcf8090ff3a39fe1fd602f82513dbcf0dab57107d09bc582babc8a966de2b8dccff66
 EBUILD rime-data-0.22.ebuild 438 SHA256 d699d79348590f44bccf29f384530f0121f5af815ff3bb7d1b247ce296f4babc SHA512 0f57059ad5cac0972a48f444a1539f69eeabe98d921c161cad26d4ccecb5712838b5856d5bf9eff0ddfea73515f33d7b822693f3b729f8fbe9523234b29b0d89 WHIRLPOOL f68bb2ce45c97ced2d1d8d1fff3a03d98b9ae8d7d42ad71a6b9358ae912d532cc8997e7446f213692d37e805c4de203b14f7a427e580a51ee648326825ca6383
 EBUILD rime-data-0.32.ebuild 440 SHA256 0a5239caa7c6a00842af6bc9ff6c2c4ef733f2869091a122a396acea57ec098a SHA512 09ae2407d77e5299a3e2ba961f6c320533610515d97f666f447f016b6fcd2e6e3c6b360ffa99dadb37c8d2962f9fcfdd90a771716bac5b83498c612db027fe0a WHIRLPOOL 1e9ab2f70645a9bd4069e9fd7c4515a84f585efe6ab0d44b6c3a9ea6075f9420fdef5bad2e3d27f0fa55d95d23ce3b4dfa6e4ddcbe3c2de919870cbb2c555ba7
-EBUILD rime-data-0.35.ebuild 433 SHA256 8bfc9798e14b44ff30fec74494a766ecdcd4165e348293bee6beae3e36584338 SHA512 b44455124fec61750e12a13bbeb3ea4a40e73bbcf46cfb9ed99487ed0962a091b8de250418146953ccded45e5314f313ac4c796fa214f44447422bfe649dcc80 WHIRLPOOL a47e005e374b64834d2feaa6e77ff8ec1b41275467b78c943b6fcb79dffc0c370e545a3b94649f08e3a355c5252ec8aa129a070a05720e0d45b5b909f6f1786c
+EBUILD rime-data-0.35.ebuild 467 SHA256 bf96b18ad5bc90dc7505bc3ae53863c87e0f128db15817972d278dc9b5134792 SHA512 88835bae1dc94bec5796d015c177bb7107b10d6c414c403cc3a267791bb4f2460e70e17f2a6aa4723cc1b0226a179d8bec3db337caea56a18c6102d596abd814 WHIRLPOOL 545e4cc8be31954c2d56b764f1b7acc27e31022705202440635244a2a4f107a8ebf54cfb00b8abd016ad27d5710e8692adfdc66d7066cfa1ae91240b0e845c98
 MISC ChangeLog 3164 SHA256 41942dad869d9e7ed28ab8499de593f7fb4c1b690ba268ea5e7adce4011b0ff8 SHA512 77911bb2dc5d66a2a5d10bfa8b6c9f6b7dc600019a7b7d8c4fd788b7dce5eda2a424cfbf6279a6701de4af32327e1683147ab3beaa3aaa11a21b5594c0d29223 WHIRLPOOL d0e9a91e86b231b0b1a77d2c2d7b5e4e0d866f45bf7564853c2a3fbcebb61a6592850d4467bf1e16812a2aa2283c3f3ffce57dc7fca0871bd89461a095721f6d
 MISC ChangeLog-2015 2386 SHA256 62ecb6da650ba9879b08e5e9b66a21386646ccf15d7c2a680e90ed75ab7f748a SHA512 c077ae09d9daf036125b8922a966ba808ebebee002400e7b94d9cb936d31af8cf89610bf6360de5db81c87947f02bb60c1e3c812c11cf492dda0bb6299e4eab3 WHIRLPOOL 17fd6554d1471327c03b7dda7a73f6a6ec69c2ac01bedfbe3544d4c174e96868648286d3948f9ba5dc33e622943b3fd727cea68d94464af4d7fcba223cf1750e
-MISC metadata.xml 601 SHA256 dee931dc1737d90d3f341c7a6466d6e5127dae7bf6ca992101f8d2c95ca84a7f SHA512 b99f85bda84da0fe35cda523709d24cea8065b72c57de666a615dcb0acec3b2745b6c06eb53a2cd63bdbc77c8abda232e9020b02965e6dde0f24211361efc34b WHIRLPOOL 6362603a3305ee334cf3c2ac8bc01f2f8919f8f7ba7d1e1b8c4abd6bffb83efbd0938496cae6594d44163c50698d9b001940091bbe530693c7f564756eb7d5a6
+MISC metadata.xml 530 SHA256 ad5164f1479faa41e5592fc37ea9f33e76e827d9d9ab82cb2d3438264dc8ffb4 SHA512 3d5960ae6ccf23726f4213a0fb0f5ea2d43d2cf15e75499ef5cd19fc9deb1d5bda621c5571a77f50a99bc91ea8bd64339de53ee6a5ab2ef13ee6b30ed454d9e7 WHIRLPOOL 35ff778a5d93a2ae29c243f8ffd7a480fbe9f669845e28834504edf208bad64dded7661bc61fad31f73629aa2b919291ccacf9c5eb65e6263d69a7df54f433e2
diff --git a/app-i18n/rime-data/metadata.xml b/app-i18n/rime-data/metadata.xml
index f0aced69ea0e..c91a76f3d447 100644
--- a/app-i18n/rime-data/metadata.xml
+++ b/app-i18n/rime-data/metadata.xml
@@ -14,7 +14,6 @@
       <email>chen.sst@gmail.com</email>
       <name>Gong Chen</name>
     </maintainer>
-    <bugs-to>https://code.google.com/p/rimeime/issues/list</bugs-to>
-    <remote-id type="google-code">rimeime</remote-id>
+    <remote-id type="github">rime/brise</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/app-i18n/rime-data/rime-data-0.35.ebuild b/app-i18n/rime-data/rime-data-0.35.ebuild
index 8063bfc70916..6c50f8abbec8 100644
--- a/app-i18n/rime-data/rime-data-0.35.ebuild
+++ b/app-i18n/rime-data/rime-data-0.35.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI="6"
+
+MY_PN="brise"
+MY_P="${MY_PN}-${PV}"
 
-inherit vcs-snapshot
-MY_P=brise-${PV}
 DESCRIPTION="Data resources for Rime Input Method Engine"
-HOMEPAGE="http://rime.im/"
-SRC_URI="http://dl.bintray.com/lotem/rime/${MY_P}.tar.gz"
+HOMEPAGE="http://rime.im/ https://github.com/rime/brise"
+SRC_URI="https://dl.bintray.com/lotem/rime/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -16,4 +17,5 @@ IUSE=""
 
 DEPEND="app-i18n/librime"
 RDEPEND="${DEPEND}"
-S="${WORKDIR}"/${MY_P}
+
+S="${WORKDIR}/${MY_PN}"
diff --git a/app-i18n/sunpinyin/Manifest b/app-i18n/sunpinyin/Manifest
index 3473b8e733d7..490f23638f6d 100644
--- a/app-i18n/sunpinyin/Manifest
+++ b/app-i18n/sunpinyin/Manifest
@@ -7,8 +7,7 @@ DIST lm_sc.t3g.arpa.tar.bz2 25098718 SHA256 c80093a8b43561e64158de4139967eef39b8
 DIST sunpinyin-2.0.3.tar.gz 169394 SHA256 4ab776e7563f69f8dbda8fac7cfaa42bd0db1ea68bab15f756094ce5398d83d1 SHA512 25f1fc4b8f550663861f2c7426832924676f83e1f201689fde51b04ca78704b46dbbf2b92736234d5e1a729ba1bb23bd1f3a0394f6b8b54cb0df57b9bb7ece1d WHIRLPOOL 71a4efedcbe4ec1dda9ecb1b94256a0e5e8ca570a234a8b378f85af68bf3da9f3b9220aee98c2f3ce509daa33996fea8b554e81594c299281ede58167cf633e8
 DIST sunpinyin-2.0.4_pre20130108.tar.xz 964764 SHA256 e650957aced55075448b7f02298d0c5cf59a8b8e041e9c7d92d24cb5170de93f SHA512 7c1dd7db8b800e9d436746a560a16de2c6777576868f2e7e28f6dcb767b91ccd62b974f9d4ce6bd6ce80d30e1ee83887c3ee03c227e7e9fa59c01db4867465b2 WHIRLPOOL 82535dcde38c2fce17877e465db7ebeaed14a7f305ad96ca451c5b35ae04244a94e9bde9ce51092a390964c557e39ab43742d2370342f9b72722b24f916c55d6
 EBUILD sunpinyin-2.0.3-r1.ebuild 1617 SHA256 c5eddf6b1868e5e05e46c88a145551111fe9633cf97ed0fa71843bc1ceba2f7c SHA512 285f5aed247330d819dea7299230def6cabe23d12b1658bfc5c24004e78f95a38bb9862463ee533a540a32e8780ac78a01966d2f70dd71563a58b7bc22325bae WHIRLPOOL cb2da32c6c9302ec58ba258b52921f8a5d3367d3b7a37e40d8d32e519102e1882fee40f0f2eda09d25218ef881e3c2bf3085fd829af1ea02d20c2eb24a5889e0
-EBUILD sunpinyin-2.0.4_pre20130108-r1.ebuild 1059 SHA256 ab532383b8f58193ba46017a790419ae22dfb3894def6b272f78291de4964b6b SHA512 e76f53355cbeb3aa82d0a0344bd72d2571773292fb9165431cbfbd86179bfb72e10d59485a95fe4f34444d1218c0ace5b874f98024bb2ef32fd12e7ba357c0db WHIRLPOOL 6619f9e033c9d83f604f314da2f8f17a32ce9f4989b4191143b6d873b08821b3bbd1ef354f7c7935f0f3b166512bd75e88e6c1dfcaea2ce90199c47a05280ccf
-EBUILD sunpinyin-2.0.4_pre20130108.ebuild 1011 SHA256 0152bb0cc8c8404767151ad883ea737099151b6146ca59f49690eedd33c2f059 SHA512 68a82c30e991444fcddba1b27cfd1637b7dd07f599ff6152599b488cc100fafe8d9f02675332733a406af6670f254a55cb0774d6b1048e8aeaa727f835fbcb28 WHIRLPOOL c896a2611e9e685f365ed71b664117ccdfb36eef764ec9aca95fa221f83940a4d68e6bc1466c8f7aa0d5d791487b768fd58dd10723f3d03e918196c66ec96ea3
+EBUILD sunpinyin-2.0.4_pre20130108-r1.ebuild 1059 SHA256 55eca806a5b8c6cc35ceda5d22eee512d6a371c5dc2fe488bef9cd55503dcc97 SHA512 9581f70e323fa36ad580ad4db354d129da3d3f3eeccedf4dbd277c78543bddedc827750588db9fe1a14f2b8218b9ee506f98020d7e49feec68974df1cccaa488 WHIRLPOOL ccf1bc95d979a1b79c9cb5b1294e52b84845935e4d5e5b35c8a052f06267a66e2a6e0a469a2c5fea33ece85d3aeabbc984467f0a65da34550a8ab616e993b895
 MISC ChangeLog 3463 SHA256 bcd93ab07bf8a5a245eda401780d01978eddd06d511689424911fa65980bd196 SHA512 9fa7ebe4e935e33fc4b7dd932877287223f93993df5451220229e3f65175472ef5c6d5fa3c14d199f99afb515962147bb4ee3ae3abc675d64a6d2641fc52fe4a WHIRLPOOL 759ad97189825adb8de6d21a025d3d90031442d0cc73cce51590cf6199c6a7933ec51a18919618fee0b79f3e88ad7df882af664fd59d4f95acd8087c92e69117
 MISC ChangeLog-2015 3001 SHA256 e31d7745175660fb756dd46882d0942c329b96db2be582126144ab44dafd6274 SHA512 c455286568062737730ede3b5dc55f7c7330aa08ea8f3e897063f6514d8904c870c8be765699f2d7a8dfa0b641a499c01478b3ed4201ed74d264ade3b1e82c60 WHIRLPOOL 4883106b612c18a9723c026090e7bd269521b9adc2103340cdd13c6b2533bda4fa895e6dca0e46be47e2e96e552e19eb0633ad77c028ce2c69f090ca6699efc5
 MISC metadata.xml 328 SHA256 28e1068608e622ed813bc6cd681a3f6d035b2550a6f884ab0b8b8250a33dae17 SHA512 c67333df77b03f92845334d6b738c172cc2e1935b5df4cad2d7bc983c08cda59f1427588ab8d054cd40b7fdc52c0adcb516d74c7de4bb320f85979a6a3297628 WHIRLPOOL 1293bb8bd16e7a829cb0099f40b9c6c45f8d4d17d9cd608ea5adddb61dd8d5888cb50802e7c110e03f84597a94bb8f0917908a8b8576de0e031ad3305703c72b
diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild
index c57e4b545664..6f6822d8fdb3 100644
--- a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild
+++ b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
 SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
 
 LICENSE="LGPL-2.1 CDDL"
-SLOT="0/1"
+SLOT="0/3"
 KEYWORDS="amd64 ~ppc ppc64 ~x86"
 IUSE=""
 
diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108.ebuild
deleted file mode 100644
index afa03b36a59b..000000000000
--- a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit eutils multilib python-any-r1 scons-utils toolchain-funcs
-
-DESCRIPTION="A Statistical Language Model based Chinese input method library"
-HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
-SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
-
-LICENSE="LGPL-2.1 CDDL"
-SLOT="0/1"
-KEYWORDS="amd64 ~ppc ppc64 ~x86"
-IUSE=""
-
-RDEPEND="dev-db/sqlite:3"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-PDEPEND="app-i18n/sunpinyin-data"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.4-pod2man.patch
-	epatch_user
-}
-
-src_configure() {
-	tc-export CXX
-	myesconsargs=(
-		--prefix="${EPREFIX}"/usr
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-	)
-}
-
-src_compile() {
-	escons
-}
-
-src_install() {
-	escons --install-sandbox="${D}" install
-	rm -rf "${D}"/usr/share/doc/${PN} || die
-	dodoc doc/{README,SLM-inst.mk,SLM-train.mk}
-}
diff --git a/app-misc/freemind/Manifest b/app-misc/freemind/Manifest
index 8638c639134f..7fe3939a4807 100644
--- a/app-misc/freemind/Manifest
+++ b/app-misc/freemind/Manifest
@@ -1,5 +1,5 @@
 DIST freemind-src-1.0.1.tar.gz 31617138 SHA256 018285126b27eae7392b8c3bfb513f25bd70b9907440e5eb8209f20b4fbd8619 SHA512 f3b7bd526da3075e883292fc88dd5b01f5b0112c58cfeae25a6be9c7dbf4a5444839821e3e2554303032d832b4520fa742894c09ded2705270f51aca98167fb5 WHIRLPOOL 5c3e1c795060bb92bced84fcf785c721c0ecf2ea8fcd8440cfe4935255bb4685c78dc4ad5991ee425a3c7d37589a8698ee9e1b3e4c63d362bc172edbe4e281da
-EBUILD freemind-1.0.1-r2.ebuild 3041 SHA256 4e8a390015f14ee5bbc5076ec1577affe4831eb9975ea23465fe84bf1fedfff2 SHA512 e5cfa780adc91cf4dda6aba410458711f3b9b5de0fd1f977a359ad406ca0ad9d1dd154fc3249ba34cafd11ef312f458065cd01151ef3cbf636b646a37432e412 WHIRLPOOL b9dff36f784cae4afbe763d652f3996fbc426e72e263a94d7a068b7e545711c87fb758e8f34cf6c8749f258a013c4288f1377c893e1a53d40dbd983406b400cd
+EBUILD freemind-1.0.1-r3.ebuild 3041 SHA256 65ec56738107578fbe6213d3cbeabbfead7fb052565d32974f07beadb4204e6c SHA512 5b637ec3cc9c36d0a9466d47b0bbc9f355d492d09bbc6457ab9fc0fb87c8665a17309f323f3711713c4b0b411257f371832a1afa1164b6126232cd95b76ac6e6 WHIRLPOOL 346f1f83061553425f0555619bc6d3325a45b333f21da05a8e02fd2fb94403f4631c148ec6c57bb406913282c4dd1c0b388cf94da925dd44ac7e939dc80be509
 MISC ChangeLog 2957 SHA256 9e704d407321b1de7d44ade1e9604594d1fbda3c3920528486ba70be8c80ff51 SHA512 2134d58eaccf7497506ad7a78b107112045c05abf15889f98bb4239b9882d3e82a1e8a3f8583157563e080ce36ca06346cb388ec3de20a107c44881eca660cc2 WHIRLPOOL 337ca02b5f6b09a542db66b07e5c6ee65b094aaae13144108becee7a8cd4cd4efa641e9b560e04c7ba5ce4b6094037efd52b24bec85d85fd59bd2213dde5c530
 MISC ChangeLog-2015 12051 SHA256 c3f7fbf2e1b8217042491cf3eda417093b041c0b0b9e48097825bbc80fdfd3bf SHA512 a2f278195afae2254eaa4d3d2af0d41292c20934facd55d34c9fd7258a952b1f7216610776b794647bd01c991f8cfa03d01dcd698075cc67a3d6e24fcdc228a0 WHIRLPOOL 6e29465592ddcc3ef11e5cdbaa7fac5fb3651e8d4b778d7817f777fae78e92133ce66130dfd31209ddc51f11979c71cd1453bf2814c640b72351a65ee698faa0
 MISC metadata.xml 643 SHA256 bb4552970de23143cb509d162bb941de0634e992e29ac9ed468e8afed4704ee1 SHA512 2075eb39f587784119d83827cd4614dab2146bac37440ed3b8430fcb29fb4b0a1f53470e72f64ba875908e0b64a894074627e7beb6aa5d29d1893afa47445788 WHIRLPOOL 8af0ec2f6029967e033c7d652b76e55a33510cb695cd0cc72b464611740c13b8ae462b10bed2af91fa16880c3b3ccda906e4ec9b577120e799cc47870be5dadc
diff --git a/app-misc/freemind/freemind-1.0.1-r2.ebuild b/app-misc/freemind/freemind-1.0.1-r2.ebuild
deleted file mode 100644
index 41a1ca8b39f9..000000000000
--- a/app-misc/freemind/freemind-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Mind-mapping software written in Java"
-HOMEPAGE="http://freemind.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="groovy latex pdf svg"
-
-CDEPEND="
-	dev-java/javahelp:0
-	dev-java/jgoodies-forms:0
-	dev-java/jibx:0
-	dev-java/jortho:0
-	>=dev-java/simplyhtml-0.13.1:0
-	groovy? ( dev-java/groovy )
-	latex? ( dev-java/hoteqn:0 )
-	pdf? (
-		dev-java/batik:1.8
-		dev-java/fop:0
-	)
-	svg? (
-		dev-java/batik:1.8
-		dev-java/fop:0
-	)"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
-	pdf? ( dev-java/avalon-framework:4.2 )
-	svg? ( dev-java/avalon-framework:4.2 )"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${PN}"
-
-java_prepare() {
-	chmod +x check_for_duplicate_resources.sh || die
-
-	# someone got it all wrong (set/unset vs. bool)
-	sed -i -e 's|<property name="include_latex" value="false"/>||' plugins/build.xml || die
-
-	# disable dmg build on Mac OS X
-	sed -i -e 's:<antcall target="dist_\(macos\|icon\)"/>::p' 'build.xml' || die
-
-	use groovy || rm plugins/build_scripting.xml || die
-	use latex || rm plugins/build_latex.xml || die
-	use pdf || use svg || rm plugins/build_svg.xml || die
-	# not compatible with releases of jmapviewer
-	rm plugins/build_map.xml || die
-
-	rm -v $(find "${WORKDIR}" -name '*.jar' -o -name '*.zip') || die
-}
-
-src_configure() {
-	local build_files=( $(find "${S}" -name 'build*.xml') )
-	JAVA_PKG_BSFIX_NAME="${build_files[@]##*/}"
-	JAVA_ANT_REWRITE_CLASSPATH="yes"
-	JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-	JAVA_ANT_ENCODING="utf-8"
-	java-ant-2_src_configure
-}
-
-src_compile() {
-	local svg_deps svg_build_deps
-	if use pdf || use svg; then
-		svg_deps="batik-1.8,fop"
-		svg_build_deps=":$(java-pkg_getjars --build-only avalon-framework-4.2)"
-	fi
-	EANT_GENTOO_CLASSPATH="
-		jgoodies-forms,jibx,javahelp,jortho,simplyhtml
-		$(usex groovy groovy '')
-		$(usex latex hoteqn '')
-		${svg_deps}"
-	EANT_GENTOO_CLASSPATH_EXTRA="lib/bindings.jar${svg_build_deps}"
-	EANT_BUILD_TARGET="dist"
-	EANT_DOC_TARGET="doc"
-	EANT_ANT_TASKS="jibx"
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	cd "${WORKDIR}"/bin/dist || die
-	local dest="/usr/share/${PN}/"
-
-	java-pkg_dojar lib/*.jar
-
-	if use doc; then
-		java-pkg_dojavadoc doc/javadoc
-		rm -r doc/javadoc
-	fi
-
-	insinto "${dest}"
-	doins -r accessories browser doc plugins patterns.xml
-
-	# register plugins for java-dep-check
-	local plugins="help"
-	use groovy && plugins+=" script"
-	use latex && plugins+=" latex"
-	if use pdf || use svg; then
-		plugins+=" svg"
-	fi
-	local plugin
-	for plugin in ${plugins}; do
-		java-pkg_regjar "${ED}"${dest}/plugins/${plugin}/*jar
-	done
-
-	java-pkg_dolauncher ${PN} --java_args "-Dfreemind.base.dir=${EPREFIX}${dest}" \
-		--pwd "${EPREFIX}${dest}" --main freemind.main.FreeMindStarter
-
-	newicon "${S}/images/FreeMindWindowIcon.png" freemind.png
-
-	make_desktop_entry freemind Freemind freemind Utility
-}
diff --git a/app-misc/freemind/freemind-1.0.1-r3.ebuild b/app-misc/freemind/freemind-1.0.1-r3.ebuild
new file mode 100644
index 000000000000..6a412d2e8a82
--- /dev/null
+++ b/app-misc/freemind/freemind-1.0.1-r3.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Mind-mapping software written in Java"
+HOMEPAGE="http://freemind.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="groovy latex pdf svg"
+
+CDEPEND="
+	dev-java/javahelp:0
+	dev-java/jgoodies-forms:0
+	dev-java/jibx:0
+	dev-java/jortho:0
+	>=dev-java/simplyhtml-0.13.1:0
+	groovy? ( dev-java/groovy )
+	latex? ( dev-java/hoteqn:0 )
+	pdf? (
+		dev-java/batik:1.9
+		dev-java/fop:0
+	)
+	svg? (
+		dev-java/batik:1.9
+		dev-java/fop:0
+	)"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	pdf? ( dev-java/avalon-framework:4.2 )
+	svg? ( dev-java/avalon-framework:4.2 )"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}"
+
+java_prepare() {
+	chmod +x check_for_duplicate_resources.sh || die
+
+	# someone got it all wrong (set/unset vs. bool)
+	sed -i -e 's|<property name="include_latex" value="false"/>||' plugins/build.xml || die
+
+	# disable dmg build on Mac OS X
+	sed -i -e 's:<antcall target="dist_\(macos\|icon\)"/>::p' 'build.xml' || die
+
+	use groovy || rm plugins/build_scripting.xml || die
+	use latex || rm plugins/build_latex.xml || die
+	use pdf || use svg || rm plugins/build_svg.xml || die
+	# not compatible with releases of jmapviewer
+	rm plugins/build_map.xml || die
+
+	rm -v $(find "${WORKDIR}" -name '*.jar' -o -name '*.zip') || die
+}
+
+src_configure() {
+	local build_files=( $(find "${S}" -name 'build*.xml') )
+	JAVA_PKG_BSFIX_NAME="${build_files[@]##*/}"
+	JAVA_ANT_REWRITE_CLASSPATH="yes"
+	JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+	JAVA_ANT_ENCODING="utf-8"
+	java-ant-2_src_configure
+}
+
+src_compile() {
+	local svg_deps svg_build_deps
+	if use pdf || use svg; then
+		svg_deps="batik-1.9,fop"
+		svg_build_deps=":$(java-pkg_getjars --build-only avalon-framework-4.2)"
+	fi
+	EANT_GENTOO_CLASSPATH="
+		jgoodies-forms,jibx,javahelp,jortho,simplyhtml
+		$(usex groovy groovy '')
+		$(usex latex hoteqn '')
+		${svg_deps}"
+	EANT_GENTOO_CLASSPATH_EXTRA="lib/bindings.jar${svg_build_deps}"
+	EANT_BUILD_TARGET="dist"
+	EANT_DOC_TARGET="doc"
+	EANT_ANT_TASKS="jibx"
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	cd "${WORKDIR}"/bin/dist || die
+	local dest="/usr/share/${PN}/"
+
+	java-pkg_dojar lib/*.jar
+
+	if use doc; then
+		java-pkg_dojavadoc doc/javadoc
+		rm -r doc/javadoc
+	fi
+
+	insinto "${dest}"
+	doins -r accessories browser doc plugins patterns.xml
+
+	# register plugins for java-dep-check
+	local plugins="help"
+	use groovy && plugins+=" script"
+	use latex && plugins+=" latex"
+	if use pdf || use svg; then
+		plugins+=" svg"
+	fi
+	local plugin
+	for plugin in ${plugins}; do
+		java-pkg_regjar "${ED}"${dest}/plugins/${plugin}/*jar
+	done
+
+	java-pkg_dolauncher ${PN} --java_args "-Dfreemind.base.dir=${EPREFIX}${dest}" \
+		--pwd "${EPREFIX}${dest}" --main freemind.main.FreeMindStarter
+
+	newicon "${S}/images/FreeMindWindowIcon.png" freemind.png
+
+	make_desktop_entry freemind Freemind freemind Utility
+}
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index 7fa2be98dc02..8c260e80881b 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -12,4 +12,4 @@ EBUILD geneweb-6.07.ebuild 2093 SHA256 1499bed651e4c525e3b9be36ab13fbff0b78d0b11
 EBUILD geneweb-6.08-r1.ebuild 2001 SHA256 1169ce4466f218740fc7bfc13e9b311a9c20ad7bf9c633c0b5bbbabfc998227d SHA512 d7473dab32d1725b2f22faad0ca1997b11d41154fd1a7a336b0e84c4e1fd0a3c230dca334a2b7d771543665ba4748382c319654d3634b4f934a18470f713b0e0 WHIRLPOOL 82f7cc34e5802e995f9fa694a78df47f5ce56108fb9bb206a9dab9d1b2a28bc0b3618b3cf51ba66d03a2a40d5989644b2925366e2dca81401c73ae72156699ec
 MISC ChangeLog 2821 SHA256 6bdf3fdd7fe040346b33aeb3efef22d4f84c1a42e5ec1a1c50bf68221e6922b5 SHA512 5e8ef4e9c4e29ba975ac3045a107f20ab9e72ab5b5d4bb5b35fdcbfc89e68dd7ffedaa4da88b65e8c8767b4d12b3b44d7ee63abece1d6b67838d311a688a13ff WHIRLPOOL a13afe8931319f6cba92457a8aeb71c4d7cc880c6ccafdb25b4b17030eba020459ebe43f876d48e20cb21fcb7c207e782d5b95b79bc1e35c6efff5ed10eb87e3
 MISC ChangeLog-2015 5741 SHA256 cf2718ba12ba71ff6c4862701777ca5cc9aba3ab184c3a6bfe6abb81aa007387 SHA512 51cefbba16d9f642f0005a6535b48a559aa8b3b8f94f6be3c60efd5056a3d07592630aad6faeea718c7847ea3e1b519367d736aa84614320666c0874fa8c159f WHIRLPOOL 8a4f2c758fc6787e8dce029f5610e82168571c4d59cc5616ff5267fd9eb6a09c6aaff17b3cbafd12c772ab4ecf5781decb16c0f1cef9a5662c6fca2a1fdc0a27
-MISC metadata.xml 779 SHA256 a01308e9fcdbb5e38e481e4a31f6013f9cb39aace3119c3707a012aace13d411 SHA512 e58122b92b708659fa9da568bec289c2abfb4d76762e4cef948649651d3ae2c3509c8edbd4cfeb124ace65c483852a3c5df1c37b623be33d466afafb17b20737 WHIRLPOOL d0c968e44a7341f7e701000aaf326ec45a867e9f7b7886ddf31b497d6a9132e55860ff60419ddee60c1673f02e465fd53f940809f73269f55fe9aa67e336a1a9
+MISC metadata.xml 652 SHA256 be88df5403363f99df6f53b412ffee7053265eef1d896a927e6fa741eacab765 SHA512 7c94f8655959224e21113156e943d28dc9653f767fcd0cb6a9e7ec149abf3deabe850b404ba3b92384fd5bc919cce973c73b622746efc2a2862c86a62136d973 WHIRLPOOL 1daef6e83ec60128208cc9f9a9da4100ddb28c8eb31e31a58d3ecbcaba1d45245afe6d93b4da9fa9e8529793c8261e17e18054dc42ae0bed567db5a5243b293e
diff --git a/app-misc/geneweb/metadata.xml b/app-misc/geneweb/metadata.xml
index 58ced0f61ed4..4d7f59b58f9c 100644
--- a/app-misc/geneweb/metadata.xml
+++ b/app-misc/geneweb/metadata.xml
@@ -11,10 +11,6 @@ off-line or in a Web environment. It uses very efficient techniques of
 relationship and consanguinity computing, developed in collaboration with Didier
 Rémy, research Director at INRIA.
   </longdescription>
-  <use>
-    <flag name="ocamlopt">Enable ocamlopt support (<pkg>dev-lang/ocaml</pkg>
-    native code compiler)</flag>
-  </use>
   <upstream>
     <remote-id type="github">geneweb/geneweb</remote-id>
   </upstream>
diff --git a/app-misc/gourmet/Manifest b/app-misc/gourmet/Manifest
index 43fcb4174532..28b2101a62af 100644
--- a/app-misc/gourmet/Manifest
+++ b/app-misc/gourmet/Manifest
@@ -4,7 +4,7 @@ AUX no-docs-0.17.0.patch 338 SHA256 b6fb37e3ea0794e7024cc2ad04e5b8b10b2c10d04f37
 AUX tostring-to-tobytes.patch 988 SHA256 107b0cc16de64681702587d19964b5f21c3be665e3011c44854c89cfaa95e9b3 SHA512 72b12c9e775bea34ce82c53a8e808fd212eec523f03ca591735ee90121cc45ec6a6464168fe16d66c9889e92168accf8643b0486bc53ef8d144aa92070f3f94c WHIRLPOOL e8413d4e4ef967666671892970f6c2f934b8c43d023b45cf4eac621c8f38838d3c744134d97dc1cdde3c9a57e01d0f0ece4b5f6232b689caddc529c0f0115ed2
 DIST gourmet-0.17.4.tar.gz 8487830 SHA256 13edd3b9c3a3507d20b80cff0f88183ac7979b720e7577290815ffacca097fe3 SHA512 54010a5527f33e08b38d0fdf143cc4528e8ccc65ccad3253074135212751c3bc4385ba5f721327268f455bf85ff6f248e56ebfa1b98933a4ee061983eb9daa4e WHIRLPOOL 9f0f795ee405c0e72587451cbe5b6b72d5d35df2697f55325879c6841a39110773a4837f93b7823e4c0f64a48feb7b192a76cb6c7cc91f8bcd1bf40e9a065105
 EBUILD gourmet-0.17.4-r1.ebuild 2291 SHA256 08dd4a8b2222780166673f8ab1a5e8e0e522fed618ccf854d558fd039744ba55 SHA512 03b300cbfa5d4a1d9cd13301f33d817d9171fed26d21e329d523276294a562111b0db9b2cb04012879d782a6d871eb4117865569b6c769ad98a492f8bc8c2a35 WHIRLPOOL 00c53c330ea226caaa501879abaa94ca5ebca6bd0e6fe7ecbc35fd160dfed587340b191778a8a22ecde7d88e8a38422e873035d27e4e58fd17d4ac7fb1e12c7f
-EBUILD gourmet-0.17.4-r2.ebuild 2313 SHA256 0f3190e0bbf01ed51055cf582ae5ebd368d393748ea66f95c5669d35a2013875 SHA512 b1b383bb6e6c3805f2f1a521459ea01d2b3967405daa290d432dcf399bd3138f4f0829205a57a019b6601a549d2c6d9c1ec3f7c1fec56e86b034bce0986badd6 WHIRLPOOL 0546c64b9edb1f6f095671ed9d590d8abcab11ab3f3aab8c8cc70cba3b041d505764812ceea1e1fd08ecce56407d58a2453c86fb923d19557f4332b51b9d2143
+EBUILD gourmet-0.17.4-r2.ebuild 2312 SHA256 610f58aa96ab8fec8c269a74276a1c3694834a4c7235178546a7c9a1d497c612 SHA512 4163adbc0a8d7142a4779855d920f238f6870d2b94f3142b09b0f99bcf22108ebbd8c0161c808eaef6ad63d9d1ed858ed8a300d1b29a1b2a81b17ad91ff0a04c WHIRLPOOL 04367d6799caade424024aecf1f5636b62e73a953bf5c9795fbbd6ded739ac718e599e05ae63fa800e460679dceee4cbfa51c1467066fc62736742193ce923b3
 MISC ChangeLog 4043 SHA256 4d35bdb62214b893017d15f17f6d825cb2193ae3447425b54ae5cb6f42ec022a SHA512 0d3f109bff5b6b145714719eb7997908c06746ec4bfb07b6483ee107313fd4f79ce260c2969c025edb94c51ac435d63d19382c710c72b4457861423d5b3b57e0 WHIRLPOOL 59f7afd65d268274d2e60255a8b2abf2691ecc8bf9283854ec805fef1d21e93f1a4a4a656a04ecf73b8944290ba58d353c1a5b9606e7e5c8494d0fc35ade8d3e
 MISC ChangeLog-2015 8201 SHA256 b44e9b26ff4eb17d38233669702778e7d55cfa7741d4ed44d7213766765b0bd4 SHA512 04be873ec81e52ae74c1230b8b27774a37ffc80031bb997156c33d2412c1f189802eeb97999e6dd262cc85dd9e36f24bf863b57b94501be1d2f90ddbc2d433ee WHIRLPOOL 5e4cde6b304741352c3f598f2eefdf3e4fbc1c7743a04d4304059ae9b44d4564800822915b8d0e8f7077cfd63c94a90b4dac804624786c189ee5a27d1d30f7e9
 MISC metadata.xml 1559 SHA256 1e196f806b37e797b1fae33e4a5867c479d9c55cb7e43d5e4f86ae804e2f58b4 SHA512 67cb0b91052e1a2b0cd917839f796435cd45fe157e69d1ac8fbad7a3f4e09176db9f8d217edf0dd032cdc5b20a1e1c2ab3c56e57ddb8e291f55e5a1ff27764bf WHIRLPOOL 75a78af0c29da24788019851196cad3366063e9433dfacfee14ffdd5142b9070a8e28ec172864d5cff18cc80c937f1b1e3709aba4ecc76cad374ae00a9715e2c
diff --git a/app-misc/gourmet/gourmet-0.17.4-r2.ebuild b/app-misc/gourmet/gourmet-0.17.4-r2.ebuild
index 1e75e0170123..0e0dd28ffa97 100644
--- a/app-misc/gourmet/gourmet-0.17.4-r2.ebuild
+++ b/app-misc/gourmet/gourmet-0.17.4-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/thinkle/gourmet/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="-i18n -ipython pdf print spell sound web"
 
 RDEPEND=">=dev-python/pygtk-2.22.0:2[${PYTHON_USEDEP}]
diff --git a/app-misc/gtypist/Manifest b/app-misc/gtypist/Manifest
index 77f3f9cda01f..8c59f6b4ae3d 100644
--- a/app-misc/gtypist/Manifest
+++ b/app-misc/gtypist/Manifest
@@ -11,4 +11,4 @@ EBUILD gtypist-2.9.2.ebuild 1441 SHA256 decaaff0808bf824981abd28de470953faba582a
 EBUILD gtypist-2.9.5.ebuild 1425 SHA256 dc5c8134fc2e5ba458e3630a3ab47740e5162d37dbfc9f1bb368dc861bd5669d SHA512 6a38b76087e92c1b1fdb9d7010ce3838b166755f3dd390fa7c1eb78a56137af4750dc44e5d238ba87a01659570c23aa1f708fe0dd241dd1ca96464cd2280ed0c WHIRLPOOL 64c7b78543dec3c31b117c788e98ecbf9ccb0c1dd5abc0ed1882f4bab5a91bed919f8fa8283718453a49e86057ab008cbedba54f9feb0a6b59d3ed5869e62631
 MISC ChangeLog 2888 SHA256 b9b943fe82f2c3ae7786e8054a087da08d467a140d0a74cbd01161c7ca8f8f0e SHA512 0772538e98ad5a5527cf35335ca2e0cb470e90e0e03f3e47fd7bab5ca54752b3f9f1bae80d4aae8b15edad18e381a855527b654cc7e79ae44f2731c9935884a3 WHIRLPOOL ab7ba83087e88a926daf8ae12465f4823107d478b21c8d313000b2f45ee68e3a0720373e78a735823eb67fd23ecba23d9767167cc5eb4451816aed11cddb1845
 MISC ChangeLog-2015 4975 SHA256 9085cda2b8b2a39abbf4e976695f35e94c30a5385324bc82b2683d86460e9511 SHA512 5bb6d3271da09459e5cd3652d93ae8a1a480f2bd38a76f6481ce37d23b06e9f308540feec79fd76026587b5150fbe9c83033878319815fe277984099596be191 WHIRLPOOL 8ebaae4be92a9ff154613a106f93f855bedce5c0a9d1e62462520c74a06619c421dcd4a84e300d78e0ad8a518916cb97a97b30106bcfa2310acd3b9517aac118
-MISC metadata.xml 362 SHA256 93ff0c3bf6e1acd158d1571e1a16594ee9081790a80fb93e38a67499b0841531 SHA512 67c2ce82bd951afe3a435c846b6caba9baea19b1b172d4080383899cd669908c54c85c55aec7c8f10fafdcc64bc59d3fd8e60524bd0f78080fa9af48cc7fe3c3 WHIRLPOOL ecf7dbec17d5f9fe1ef07f019fa28f7e8b1d270caab9aa2a2405340e7f780051f13a3c0c92bdc4cc964dc8caf3cf1aa966b6fe433e90462a26cae984a2d28f1c
+MISC metadata.xml 246 SHA256 fe6ad7f4bc81b63c410d3c73cb81eb190019f04f11080a6a0c68c9950bc47aad SHA512 868f217ab39861a74e1e85a7920bb2c283cca35d231d4cd2c8e66a6d9ad81d5b03343701fd508ba13bc7c273e4d34678954005d2f58cbb147beb01ad3b7197ee WHIRLPOOL 9fdeba9d8354a401aa01d69c003f1e3b6ec9b76aa186c7d4e7cd5948e1fb7d0fd817478f8c43758aab3d485e5a26a272106f88956c2d68504b9986df973befff
diff --git a/app-misc/gtypist/metadata.xml b/app-misc/gtypist/metadata.xml
index cc9ea98bbd54..df96eb34a05f 100644
--- a/app-misc/gtypist/metadata.xml
+++ b/app-misc/gtypist/metadata.xml
@@ -5,8 +5,4 @@
 		<email>dabbott@gentoo.org</email>
 		<name>David Abbott</name>
 	</maintainer>
-<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/icdiff/Manifest b/app-misc/icdiff/Manifest
index d960b4273dcc..c8e570d49428 100644
--- a/app-misc/icdiff/Manifest
+++ b/app-misc/icdiff/Manifest
@@ -1,5 +1,7 @@
 AUX icdiff-1.7.3-dont-check-changelog.patch 546 SHA256 4e6d151fb694052ae91d62302a0dd2b78c86a8e06290297362b1c466d81ac8ad SHA512 e3cf4f6238b3d49b6f3b1ce42a340815c535bc7482af22e722d0f5afcb0e3bbb1771b9de4a76fa77f5abe47b7b2f7c4b27e933e9e6a27d48b020975e95a7abc0 WHIRLPOOL ea63db5fe58d33ed9feece4fa219e2ab1aad8ca148cef2fcfba0d1794480e3549a7f100f65efee4a4675eeeb60af9e7fc1de2271f7637f087afcdc7abc48d184
 DIST icdiff-1.7.3.tar.gz 20215 SHA256 5161265f72a7c9c1d2d7b0780a381743ef3d3127944a96786422802a6bc14ca5 SHA512 ae8ca394c3fdf820d4795282672bc44eb01f88f9614d6240f035c31f99130b188185a0e241c3c17974d76f604b85ef48aa8296835b5dfb46463a88cb1f68d305 WHIRLPOOL 994bbc53673db6559444908b9a08e71283060648fdbc86e607b5ee229a933d13627b4e02b7b41fc25bf41021b9d86bed4d9e1b9df978922102b724e7be0a4642
+DIST icdiff-1.9.1.tar.gz 24387 SHA256 18cf11866150eba1ecec1370611921246918310f4b5cb101045db523a05fb37d SHA512 f73108f6f3a4a2fc40e041bbe7b5934acd76684bb54a3fa544e9f146fd3c528528928378496f53ad92d649547ccc491a77296b6fa57e4534abb13d61c0df8d58 WHIRLPOOL 6599f4fb4bd399ca89510f7a1980d86cab9443e97850f9ba77f6431a74cb4cb363b2c32d6bf7e834b55bc8ac9698177c104484656c02df6ada2d3ba85ed7f8b3
 EBUILD icdiff-1.7.3.ebuild 623 SHA256 f07fea63b988ac68d911e8263a414c2266e0aacbbae004bfcb8d065c2ed2b496 SHA512 162251baecd2754230ea9d50793783c595e8f24cc07c20590f3daa789fda3a4252af69358a2197bdc9b385d61a2a5a01f02d6874d8c44a43bc0840219ab6e412 WHIRLPOOL eb86c8be41342595e52f1554a4086d2268279befbb511efd1e9d6d4f0f330f6239a5b850fab90b909dcad74f5c8c177abfd3802a9a3b3d6e677ecfd758695936
+EBUILD icdiff-1.9.1.ebuild 556 SHA256 bfac58f9f212c9ae3fb0fc983b45722fa2c6f529e970ed7b7906d5fd7833abd8 SHA512 f9dea5dbff160a7b185ef6cb40c917dda0d33d29e77f1c491090f25e38d99b24be9c663a424d5949113b00cbe8ff6e74adcb15bc0933eb3a4bdbba9045084a1b WHIRLPOOL 7677d6fcd204f58531772ad9ce9a2811278850a1f0312bbbcc4012a2098e85cd371f892975c14cffa8e8fb542b90ab4fc20edc636e9922548d4d29accd1c32fe
 MISC ChangeLog 355 SHA256 ff5dbe5983ee64401cc9f77dfa44f30961a46c056bf0d48a6c50efd910f548c2 SHA512 e4b10518c7f3e46865217b647884fc47de558f128b58fc0b91d086336e6fedd9b4cf8bb8c1e1036fd2525947d108ef2aded44ffa579e5ee9101687ea607ea6d2 WHIRLPOOL b3ec8c25e95914aaaf3bb6fe48db41871f84dc11919d8fd8d19ffcde7ab12dbdbe1ba97a960017af35e717f9b8a4b56cde54482ed7a04342a1d6fc51da8f2efb
 MISC metadata.xml 342 SHA256 fe27728b1552e91ea542b7eed023a58f23dc8e86d84a58fcd37162721869ae24 SHA512 a897866e5d709999db69d3b1a4c8d1d1b15328970b27015f7549cf7b4fc6be688063f94fe31b0144227318c252e80bfd189fdf9f34dfdbf4dbfe0412e0b818ed WHIRLPOOL bf714366e2e82d0018a654e4018c5811d493a7a115567f93403033ac5d26a1e944de08550c75a91d644d892d837bad0fb3290f63c75890d2f52254f4385a07eb
diff --git a/app-misc/icdiff/icdiff-1.9.1.ebuild b/app-misc/icdiff/icdiff-1.9.1.ebuild
new file mode 100644
index 000000000000..eda476f4a614
--- /dev/null
+++ b/app-misc/icdiff/icdiff-1.9.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python2_7 python3_4 python3_5)
+
+inherit distutils-r1
+
+DESCRIPTION="Colourized diff that supports side-by-side diffing"
+HOMEPAGE="http://www.jefftk.com/icdiff"
+SRC_URI="https://github.com/jeffkaufman/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DOCS=(README.md ChangeLog)
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+python_test() {
+	./test.sh "${EPYTHON%.*}" || die "Tests failed"
+}
diff --git a/app-misc/mvcase/Manifest b/app-misc/mvcase/Manifest
index 3558c14aac4f..4d9fe50664d7 100644
--- a/app-misc/mvcase/Manifest
+++ b/app-misc/mvcase/Manifest
@@ -2,6 +2,7 @@ AUX mvcase-0.1-flags.patch 531 SHA256 9bd38f4e347a3ae19f047b1ee8e2e949a626f5bf3f
 AUX mvcase-0.1-includes.patch 526 SHA256 8e0b504f110241e1ff82dcf8d3475831d7df5a83324d6ab1f89b9b39abf0c5ef SHA512 1860cf88e66a4bc219546a87e337056f66a344d6ec400c21bf37c7d7d5b34fdddf3cf2ac7c05274f2c6f313ee7fd530240e1d2089e598b5154c8eb2c4dffa30f WHIRLPOOL 684b0e912a6749a53bf62c78b045432414e778ec9054aa343a230f9aa42befa78664a1679a0ac247f5a8d659e320df63e6a588e05084b63e550c082d18ddd5c6
 DIST mvcase-0.1.tar.gz 9467 SHA256 87eb97918fde3a740f4c4968b7fb737909de124ea89774d34c0201bd107c93a2 SHA512 1b6030d51cd0da7bede43f1b528c2b2cc713b3c6ca0ccbb4931672185998957aad1b2e0e78a78148c412b6a36052076caca3606016ad1404e6028442dff8648c WHIRLPOOL c47c1bcb8839478c72577481936a68b1a805f4bb4cdd7ec5770adc9c30862ef766483470f1e0a5677a04fe4dded2b4236a7f16eb76ef78a3414737aca7c44cab
 EBUILD mvcase-0.1-r1.ebuild 676 SHA256 b36f247d64be462f1571af01d0328a109be8b4abe04d5b1c53f2f4fa48f9623e SHA512 4fc782129c08e4fe83e997dd26c5d3ca7d81cee74767f96dbb93d26130ee094d12a50e9979092e327500dff2eb2932dc51f7438294a614040090f792298c5db5 WHIRLPOOL 78edeebf63658d483dc3a93432259234dc5cf4e74ac3f3767f424e0ebb8137ae02cc4d41611c81d29ca80d71696755788a8a041c019eeafa2f44be97186dfab3
+EBUILD mvcase-0.1-r2.ebuild 641 SHA256 8acce5197a307d1f80900bc2df33a3d827c5b7c9e910e40955a5ce6c01454d5e SHA512 81cb0169264d89febd4af26629577945f827019d0d2fee28585d4218a7bc0b8ceb76fc2cbee1c5c3e619a897eef0a05f398a7c525e5d397546fb6dea2a6ecd45 WHIRLPOOL 621fb2cc6a23a57b77bf883223691b526f5cae1680b0e756969b1e39da4a963c2b183ae9a70e32839004e5f14232b59f7977e2f76f823836c2f523cbc9b83bf8
 MISC ChangeLog 2588 SHA256 4f56da41dfde6a9a7859e1faad0af92fb8b8bc0d1ff8971e7875d44156be9788 SHA512 0d1b1a31ff29eed00c9e2cb833cb4f492fd613286294f40799e1c489617f3c07162c165c52cf7166a703b9fda5d22a0bfe6b40156ffa78e11decee7459932dc6 WHIRLPOOL bb479f625db31c07e7f9644a1c5ee6858a6e61ef05e6bf5005b91beb5864e8a47b9444df27b3a955df6609b46e48848998c4a82bdad4bd82279a80d9339fd769
 MISC ChangeLog-2015 1738 SHA256 1f23af0ceb3eb60bdd097bfb13dd491d3b3e09404c2363b1dcc4db6224d9cfcd SHA512 51356805e2c735a2bf113bd3577326fc54e6ef1bf54265cc8990b2fc51da27d613efc761638c114b2b04189d11950ea2b79a6c9a6b818e74702ac4a073788114 WHIRLPOOL aaef277c7e49c6e42a525a5de2b1d46a6b5b1abef8822c39dadbaa875ceaa807a124cf17a5d2fe3ea3c0022ef23699b30695dccfef39e5018b8d6aaa79829542
 MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/app-misc/mvcase/mvcase-0.1-r2.ebuild b/app-misc/mvcase/mvcase-0.1-r2.ebuild
new file mode 100644
index 000000000000..568fed8c4a02
--- /dev/null
+++ b/app-misc/mvcase/mvcase-0.1-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A modified version of mv, used to convert filenames to lower/upper case"
+HOMEPAGE="http://www.ibiblio.org/pub/Linux/utils/file"
+SRC_URI="http://www.ibiblio.org/pub/Linux/utils/file/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="dev-libs/shhopt"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-includes.patch"
+	"${FILESDIR}/${P}-flags.patch"
+)
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
+
+src_install() {
+	dobin "${PN}"
+	doman "${PN}.1"
+	einstalldocs
+}
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index 9e3a2ab9cc37..da150f67e576 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -5,10 +5,12 @@ DIST screen-4.4.0.tar.gz 846010 SHA256 ef722a54759a3bf23aad272bbf33c414c1078cad6
 DIST screen-4.5.1.tar.gz 963153 SHA256 97db2114dd963b016cd4ded34831955dcbe3251e5eee45ac2606e67e9f097b2d SHA512 ca53477ad38264be38efb1d10a1337b647dd061127162c77533b17a30d046cd0caabe38e4a9e5389aac30d5dc62eb53e7877411e69adae36d0ca869bd0a82804 WHIRLPOOL db60013141e3f426107d3f1e518b48fc0bbf89fbf51b26b5ac7208b9940448397ec0009d389365289a1d06421b403982093c8b7ee8d891eea20c704d7ad376b1
 DIST screen-4.6.0.tar.gz 849062 SHA256 9433706b653e941cc4c745f28e252e57be2a141eded923e61cc2c4a09768fed4 SHA512 2ee7cc51c62a478e72eda0647f3f347e63f40384e19bc11b074158bd94cdb628c6425b1dd7a472496d56bff11a30a9dc58859c2e7e539fae2a8718ed9b0f96d7 WHIRLPOOL 62593811fed8dc2e92acefb80751a60ad7170429047f9acf0ec21718ab303add365ae469d11d3371524095a53c750216ae07e572a640439db26e1526c7ed12ee
 DIST screen-4.6.1.tar.gz 848979 SHA256 aba9af66cb626155d6abce4703f45cce0e30a5114a368bd6387c966cbbbb7c64 SHA512 e5d029400ed5b509ebddc1f55812c33536d6f5ce91119537c7d06e1fa7dee84939c43337df4638f61c818ce0412f4d08fe212202162a4483a9e84bbc4b3e4336 WHIRLPOOL aad842c61961d01712017da64a3d9fbc5bcb74ecb0310b5d371ea8aa5eacf694826a66dea00c0b1c24de9918aafe6bf5b770342ec2ac840fa68cfa1fb52785fe
+DIST screen-4.6.2.tar.gz 845210 SHA256 1b6922520e6a0ce5e28768d620b0f640a6631397f95ccb043b70b91bb503fa3a SHA512 224bd16ad5ae501d1b8bb7d2ba9cc19e6a0743de5a5b320109c2f6bf3b1ca564cc7094ed9211be13733d9d769cde77d13fe236341d448cad0518038ab1e85c99 WHIRLPOOL e918461451b49d7c291911763ee617586d93088f777c41b378ea00d0192c7ab9787e7137baedf3cc8f4169ee0fd6aa65348bca543bbc0d10d00d31dbeb7826f7
 EBUILD screen-4.4.0.ebuild 3956 SHA256 d522def5c9aee5fa33e443e10f2d7bd1928c936fd3f2117aeaff670e33a75644 SHA512 e143bf0d0f01d1f505ec84b4c55f36ba70391b117cf78694373fdd7b892d5df4b208b27a3d711daac0a3edbf05debfd9aed03eaff961083bca791df504c07185 WHIRLPOOL a27b51d080154604fc072652e13caf86bf10d23dc5c49abac4cd94fb38cfadee4da5d529f8ab969e51877993ac1dd58871e2d1db86b84d6746f3375c266cc881
 EBUILD screen-4.5.1.ebuild 4139 SHA256 756e30ee1819c554bff6089ba5588d4f73a69733592bf84bbfc09b9c5f7cb7fe SHA512 11e9a7ad1a85dfa67dc6fb6a1e738529c74cb0b82ea96d6fa023b4e6b71cfa14046b318e42d742595e9bda33af1d7514d1a6b0efc48696975b5d939db177471e WHIRLPOOL 1e77bb5a8e36402b7d15df01d89f97c3e8b50e4f386616a63d64ed143e105f6b8de06d8736ed649e4953d82d70cd0a8c02d316a1f50710bc0176aba375964474
 EBUILD screen-4.6.0.ebuild 4087 SHA256 bea936ccf54b555f23e9c56a49d591ec27529a9046574eead4f42caa0832f4dd SHA512 6c9b164723d23fffff0cf5a4fc346e2da8edf53fb877755c36c6106ab59b60b191ce17996597458df11b2a423a4a26db14b78e6e13d1c247ff2fbe4db2742968 WHIRLPOOL 660b1e137ed3d73d03d0a5fc91cfd41ce0854309fab036a2ec740e8b10b22ede626300ab898a91343b9530aa1aaac8b899209cde07aa4c7d90b81fcf28a01a7f
 EBUILD screen-4.6.1.ebuild 4087 SHA256 bea936ccf54b555f23e9c56a49d591ec27529a9046574eead4f42caa0832f4dd SHA512 6c9b164723d23fffff0cf5a4fc346e2da8edf53fb877755c36c6106ab59b60b191ce17996597458df11b2a423a4a26db14b78e6e13d1c247ff2fbe4db2742968 WHIRLPOOL 660b1e137ed3d73d03d0a5fc91cfd41ce0854309fab036a2ec740e8b10b22ede626300ab898a91343b9530aa1aaac8b899209cde07aa4c7d90b81fcf28a01a7f
+EBUILD screen-4.6.2.ebuild 4087 SHA256 bea936ccf54b555f23e9c56a49d591ec27529a9046574eead4f42caa0832f4dd SHA512 6c9b164723d23fffff0cf5a4fc346e2da8edf53fb877755c36c6106ab59b60b191ce17996597458df11b2a423a4a26db14b78e6e13d1c247ff2fbe4db2742968 WHIRLPOOL 660b1e137ed3d73d03d0a5fc91cfd41ce0854309fab036a2ec740e8b10b22ede626300ab898a91343b9530aa1aaac8b899209cde07aa4c7d90b81fcf28a01a7f
 EBUILD screen-9999.ebuild 3680 SHA256 b4c700884e7deeb35b1ce18bbf602c3a10328492f28cec8b56b637eaa4e227ab SHA512 f27332b033f31450f6cd66ea8e9a39866470633e17eac7d6ea26bc093aaa62f85dc5001875478592c417889e298c2eb87f16954735e015405f4d4ba712cf09e5 WHIRLPOOL 3d0df4796c469378a550732fa23319c8101f60f2fe7a05e49cc470a134ee1f4781117e4a1518b44855f03bbfb5e54ce25eef6906931a12bc111f28ebcdc9741e
 MISC ChangeLog 8688 SHA256 5fb8c35b0b43b5d0c575c17e1d01089a3b0e153687e249e0b98bf9546077c3c5 SHA512 c0a284f5f073cb356fe05b62bd7c938aea0e1cf99139815568c934f3853e77420b081d2f2f606df37e9a11c8c461a7992f516b4fae470f4955e71277173f7f6f WHIRLPOOL 2f283c0cd3cb874ba334abe711f3ca2633c7ce895c1f240a0e03cd9d369b559e428094290fdd29dc265a2e82336666dd848a9d767c55513e7c66bf18c302991e
 MISC ChangeLog-2015 29858 SHA256 481ee48a0440100320f3ebf9d717d6aebb6f95ac4eff5ea793711b9e24f5324b SHA512 d3015d0c2ab3e7f019c414fc95542ff3408ee1ddccf1e805e5885646307141aa9c6d0a4aaf1bbe733b930da929e6eb1896c632cfcc2658ee4508a1c9fa830eac WHIRLPOOL 17a24afb34b439e9eff882ad54410af5117f41e92540854981e56671d5746b9caa15d6196d572a5d0421948763dea9a2f0953d0440792e1bafa593f00424e237
diff --git a/app-misc/screen/screen-4.6.2.ebuild b/app-misc/screen/screen-4.6.2.ebuild
new file mode 100644
index 000000000000..01169b42901c
--- /dev/null
+++ b/app-misc/screen/screen-4.6.2.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SCM=""
+[[ "${PV}" = 9999 ]] && SCM="git-r3"
+inherit autotools eutils flag-o-matic pam toolchain-funcs user ${SCM}
+unset SCM
+
+DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
+HOMEPAGE="https://www.gnu.org/software/screen/"
+
+if [[ "${PV}" != 9999 ]] ; then
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+else
+	EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
+	S="${WORKDIR}"/${P}/src
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug nethack pam selinux multiuser"
+
+CDEPEND="
+	>=sys-libs/ncurses-5.2:0=
+	pam? ( virtual/pam )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-screen )"
+DEPEND="${CDEPEND}
+	sys-apps/texinfo"
+
+PATCHES=(
+	# Don't use utempter even if it is found on the system.
+	"${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
+)
+
+pkg_setup() {
+	# Make sure utmp group exists, as it's used later on.
+	enewgroup utmp 406
+}
+
+src_prepare() {
+	default
+
+	# sched.h is a system header and causes problems with some C libraries
+	mv sched.h _sched.h || die
+	sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
+
+	# Fix manpage.
+	sed -i \
+		-e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+		-e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
+		-e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+		-e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
+		-e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
+		doc/screen.1 \
+		|| die
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
+	fi
+
+	# reconfigure
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# enable msg_header by upping the feature standard compatible
+		# with c99 mode
+		append-cppflags -D_XOPEN_SOURCE=600
+	fi
+
+	use nethack || append-cppflags "-DNONETHACK"
+	use debug && append-cppflags "-DDEBUG"
+
+	econf \
+		--with-socket-dir="${EPREFIX}/tmp/screen" \
+		--with-sys-screenrc="${EPREFIX}/etc/screenrc" \
+		--with-pty-mode=0620 \
+		--with-pty-group=5 \
+		--enable-rxvt_osc \
+		--enable-telnet \
+		--enable-colors256 \
+		$(use_enable pam)
+}
+
+src_compile() {
+	LC_ALL=POSIX emake comm.h term.h
+	emake osdef.h
+
+	emake -C doc screen.info
+	default
+}
+
+src_install() {
+	local DOCS=(
+		README ChangeLog INSTALL TODO NEWS* patchlevel.h
+		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
+	)
+
+	default
+
+	local tmpfiles_perms tmpfiles_group
+
+	if use multiuser || use prefix
+	then
+		fperms 4755 /usr/bin/screen-${PV}
+		tmpfiles_perms="0755"
+		tmpfiles_group="root"
+	else
+		fowners root:utmp /usr/bin/screen-${PV}
+		fperms 2755 /usr/bin/screen-${PV}
+		tmpfiles_perms="0775"
+		tmpfiles_group="utmp"
+	fi
+
+	dodir /etc/tmpfiles.d
+	echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \
+		> "${ED}"/etc/tmpfiles.d/screen.conf
+
+	insinto /usr/share/screen
+	doins terminfo/{screencap,screeninfo.src}
+
+	insinto /etc
+	doins "${FILESDIR}"/screenrc
+
+	pamd_mimic_system screen auth
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]
+	then
+		elog "Some dangerous key bindings have been removed or changed to more safe values."
+		elog "We enable some xterm hacks in our default screenrc, which might break some"
+		elog "applications. Please check /etc/screenrc for information on these changes."
+	fi
+
+	# Add /tmp/screen in case it doesn't exist yet. This should solve
+	# problems like bug #508634 where tmpfiles.d isn't in effect.
+	local rundir="${EROOT%/}/tmp/screen"
+	if [[ ! -d ${rundir} ]] ; then
+		if use multiuser || use prefix ; then
+			tmpfiles_group="root"
+		else
+			tmpfiles_group="utmp"
+		fi
+		mkdir -m 0775 "${rundir}"
+		chgrp ${tmpfiles_group} "${rundir}"
+	fi
+
+	ewarn "This revision changes the screen socket location to ${rundir}"
+}
diff --git a/app-misc/spacenavd/Manifest b/app-misc/spacenavd/Manifest
index 7a270ddcd800..7e9f05f64783 100644
--- a/app-misc/spacenavd/Manifest
+++ b/app-misc/spacenavd/Manifest
@@ -10,7 +10,7 @@ DIST spacenavd-0.5.tar.gz 41746 SHA256 0eecc5b5ad47ee6376d1521f2bc7c8f8fc02904cf
 DIST spacenavd-0.6.tar.gz 54730 SHA256 c2d203bf96c5a959590146a43fe5d6e5e8c5c38a8b2f55aa199d967d0d88d0ab SHA512 ff039e169805365ce8c1df1258eda6d263a0724c087b22a9e78269629455580817027d936e6bb7014b7654f48aa23232e8059585175003034e4bd3e0d6ed8200 WHIRLPOOL 2f7ff91302c9970d54c7983e7e3ee75d2254d2a8640d701e1449f9a31dfab0937c811491acfdf15356ebfe4914462468031090954c28ffab59a30068a60f19cf
 EBUILD spacenavd-0.5-r5.ebuild 2319 SHA256 c2549ef92c5912df46075618b57aaf7d85ebe95a774884b19de88f3e4ce646a2 SHA512 4fca63971153edfb5a69ca8cf40e543edcfd3f8c97ec729fc3afb550d00027566097f409a46c15bc2585dfe833e63208f709e3d713e58cdef2e730cd58c95444 WHIRLPOOL ddc82f961a6d5ebda0c534bc74d7036c3fa4461c5f916d468361919dac8c1c0f1a3cbaddf6c44a5f66bf86b878eca284878c63990a6c2a9e938a1972befc38af
 EBUILD spacenavd-0.5-r6.ebuild 2303 SHA256 72fbdd2f1a299c4d8d67ab59e32b9f9d413ab433970a447e000267e592885460 SHA512 aeb2e1501a7a0c40f94c809994c29dc902a142362b5d5802d4a3354b62dd9c7880699eb2ba9c79a3f288cc301d453177e24ec9850c40b26758c2bfd82740d31b WHIRLPOOL 29cd0403bdf2a1ef19bb15d060ee717b6fc616d29b1bc6ac241500a022754652b302ac4b8416caf26b64e216ee36c43f6b74371d0f77b98328b89ff5e630b57a
-EBUILD spacenavd-0.6.ebuild 2232 SHA256 72e1226cc6c60245abf7c44079f54b08893e235c44b5ed5757f01908f33c61ed SHA512 c555cefdb0c7e09a3398e1897c4b0305d3697011aaa595a7a57ebb0e0581f5f1d0844166ccb3342132b4f98714f8528f9eaa7ffe5c6d55a59799edcb5de36a12 WHIRLPOOL b234281631edd49d65b8fb147deca3f296bf6c6bd282ee0d66b594e5009437ea5b356253d87bf4a5ba73ac20a39352aa94031829f50b448763c0f9ccd053a205
+EBUILD spacenavd-0.6.ebuild 2231 SHA256 c890e22d4a9ccfa73392f669e1667147b6fbc263998d72d2c1e60c4f0135d60e SHA512 6eabf8aedee3e6baca3a8760a821d3243f4dfac99fd529b6bc662a70284c5a0b925183e7b7894d77b8826da18371b3e0ac3911442a89ff7301e1922ae51e6dd1 WHIRLPOOL c9e9a89435ff8f7879fb439a00006bb700e45da42d5b20e0943d2ad3f3876c96c191150342b4318b8c0de9332404806054ea0313a3728f193575dcfafb3e8e3f
 MISC ChangeLog 2904 SHA256 f323bd3a37cc628339a4eee752d572fa1dc069b64ce0c23e29c7b3ce97bd4a86 SHA512 a98e326bf8aad4ceea1c579b0b4f753d73cb101598c687212d651c91e89c06caa9c5e71c50d6b37bbcdb8cc184886fc7b40a74d58536b4788380a537217642f8 WHIRLPOOL 711c759d384b73b48debc7e319b3934a02f9c5b75f6348e185cdd191c26b1f4dfdef612f4c8e4a7927812a5a99334e2f5a24eda44f53e73d8bb5eca77d6f5dae
 MISC ChangeLog-2015 3313 SHA256 446a7b9225df0b30e7113ed715d793e62c7c203c510ba38030e0912bfabf7802 SHA512 a493d152382f2450c123ccbdf1659fdb9cc98ebb01ef4b7d7dbf3838b4ef75c0e1e83572352d9a95728b6df7d2a29a5a975750cf937b54293a1e7e588532a19e WHIRLPOOL 9b7e5f74d3e70088227f5139f5947859ed4b8da888913cfb776e2c7853d21f9319eef702ebae053d25aa5907ff29ab58ac4f658064031a1c7342fe5dbef0f24d
 MISC metadata.xml 1044 SHA256 a02f67b861bcd108eec317743e01c4d00e7bb1fea24e498d79eb942859272730 SHA512 04b15a567deac4a6bc1a0b250c585d863d9bebdca0a5160a3b77e1830190abadf1b98371b33e60a8d67978de3f0db117d51d598a861782663cf7b35e74a5d859 WHIRLPOOL df6075690580d11e00a019fee67a61ee7b3baa933068329ff17b13ee7f0481d9ecdb2f7247d40f347ea24f9f6581859e49c202101021d68fd8e6b2417b26ca18
diff --git a/app-misc/spacenavd/spacenavd-0.6.ebuild b/app-misc/spacenavd/spacenavd-0.6.ebuild
index df16c9432ab2..49ddec7b9ad1 100644
--- a/app-misc/spacenavd/spacenavd-0.6.ebuild
+++ b/app-misc/spacenavd/spacenavd-0.6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://spacenav.sourceforge.net/"
 SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}%20daemon/${PN}%20${PV}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ppc64 ~x86"
+KEYWORDS="~amd64 ppc64 x86"
 IUSE="X"
 
 RDEPEND="X? ( x11-apps/xdpyinfo )"
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index 8a145ad2494c..8db0648f2983 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -1,11 +1,9 @@
 AUX searchd.rc 656 SHA256 719ec5bed997d1040647ae9cccf2e164da5d9ea585d63cb79ea57034ca6b4db7 SHA512 0b24b6dfe10a99c9bb18b7acdaadf2f5d7e3fab2ea80a719bd65b9ea6f6dc83f249d4c2ecb52c48eed73e515f8e76bff294ff39b1ab6375a947a9a137211949c WHIRLPOOL 80e020e228062473dc23a1d0c0175119fc52d4dabdc3e91a86acd4784afdbe858490443a0dd05a8869fda881993610b7a4b186db53c0b0f7959261dc15dab6ad
 AUX sphinx-2.0.1_beta-darwin8.patch 538 SHA256 e7350f5c5fcd1a5a0925cdb9a775efd5747d5d790aa9eb3319717e98be82b683 SHA512 342d4ecd3e75c208e358a39de6e5cd2a2bd9dc627f53893869c2280ba5b50546c7edf8476c07cf681c8d1921eeadbeaf48c75337efba0349b951c7a4569f0c14 WHIRLPOOL 7b35a4081c03e821c10e17bb36b91d8a4f1438a64d1b29b979a2163a90419971b70ec6a8c2ee80bec34c4c505f0aa0d83a59bea9261bbb3a03960d2ba9d8f9e9
 DIST libstemmer_c-20091122.tgz 129207 SHA256 ad4e152379214480d599c86dd19421a36fce78cedd20fc324520c5bba0a512e7 SHA512 d1b2203dcc3d0f421526d3ec2f7e04889f93221222efe50501b4a1c7e74dfc51905141d4ada5a76feab5cec8dbc64f55dd55b53f6e89f658c67e72dc6667091d WHIRLPOOL 03baf5de80854a2726990d1f79e17a46342b0d8431a564805d78878bba1eba0c1aba6f4f53c64eb1a1946b50053632c32c9106305f0a53623068531f2b67b5c4
-DIST sphinx-0.9.9.tar.gz 1218359 SHA256 bf8f55ffc095ff6b628f0cbc7eb54761811140140679a1c869cc1b17c42803e4 SHA512 bf1f6b3429beac9336ed975137b9cc582541357df487ae97f407589458fa4cc4f3a797c868fd505c6b4e97a73b30a0f7f9c7ab6b3d8685ba173fde6d1d5383c2 WHIRLPOOL 70a7db079e35671c17f1c29d71569c4b643462475b10dbed6342a74ed20304ea740e442fb97af874fb3acc3cb9eb8a07ff43aa90dc90c9cf477fb1d651ced021
 DIST sphinx-2.0.10-release.tar.gz 2016687 SHA256 efc9e90d1edec4f159846c8d4ca8839e7dcf9ef88c117d0d369aaead75809f0a SHA512 d22a0ce261cd6decda2e9e91fc9806699c818bb45a9c9c5e11a0944a698d47b5862c577eb55e7b57dd208db982e7f8bfc7163af37aaedc1c537841aff1409952 WHIRLPOOL 46e17cc73225692e8ab73438547863ba78ef7c1be306bd46e393723220007b95d9a0ca62cbd8175423b62bf4599a68c4a4831ac6472d02249104ecdf0e3892ac
 DIST sphinx-2.1.9-release.tar.gz 2443797 SHA256 6289aa0ac3e1456a0c9181ce6bce2287778b5a163f685a1376e181fc87eb7c03 SHA512 7f4538011db5d68bd00c00978d476f780fc2d355113bd2819996bacbaef90b0de5b14c946a9aad83157b818d9b6b01ee0a26bc72862cfd151067ad9967c18f56 WHIRLPOOL fd9e6d31c8b9d88b8de7462ccd947aeb85d97ee4c23c64788653f732a5e47dad134c0f8cedc3b0ccc2d744eb0c4aaeb2d32fbdb02bae50be0d4ed8841a0683a1
 DIST sphinx-2.2.11-release.tar.gz 3061998 SHA256 6662039f093314f896950519fa781bc87610f926f64b3d349229002f06ac41a9 SHA512 cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689 WHIRLPOOL 34e4aeb41f1b8e352404792cb18149542e624fd739b5d11bee688f49c8be5067553414e9bf57b4352408ce3a6ffb16ece843af8bcf3625a75813a6adaf231e62
-EBUILD sphinx-0.9.9.ebuild 1459 SHA256 2ed66f6df94ede4a9509b58f9f47662650fdef2270f26b0f6644b43ac083e75c SHA512 f3dafc5cbd51133e8290a11082a018a8cbffd587209398cc10ba04b65f19ef80ab0abcc08cec24602274281b51625c5cf490a3055572c9e9ebd164e531a776a6 WHIRLPOOL a213d8431f8170d3512a9e9a9c7769e4c7acca711203db651ab3ca26584d1196ef4e72206810c0a0123e11ef2d55c5c4305536974cc36d3e86cb33f2a6dd3b86
 EBUILD sphinx-2.0.10.ebuild 2618 SHA256 33f8d877e50383c13f63dde90803c02172e0bb4fbd0f8000fd120d9a32437b7a SHA512 1fb0f297183c55d0aefcb32d2c5594e28e85c441c49f32a5e65bab3598c69362a39b2ae8c471b34751a759aa86024901fe92c53784adad1e8845c732a2a4cb03 WHIRLPOOL 1854126f8db31290e7539a3af974f146f9b0a2d485abda6899035eaa3442c1fd2e5d3c109393377aacd4467a0c87c6caa96359b71c8c89737ee3862de5d9f699
 EBUILD sphinx-2.1.9.ebuild 2353 SHA256 9750378bd3a2a42327814200760f6aee8e3060634232cbdb091421fa6687e98a SHA512 fadf1c6b4861f1ba4307a4c5a6e18177ea44ad6d2b1a35a4a043309e97680258519216de8772446cd43d2a5500defb79978284f33b1e17944746b4b13a02cfc0 WHIRLPOOL 7ff12c7f44771f529370ec168e804e1b1e5629eb1934580f064b740587bb0459b695d563a4aad924bc632fe1f9d743c8a6372249f9da654d2a860993537d5359
 EBUILD sphinx-2.2.11.ebuild 2379 SHA256 b234cff9fb9f4e0e1a8903f2542c13559790046ebfb43bb090f1e5c3d4c23fdd SHA512 658227af2ac8ce1a5e1d0ac852528d2097ff8019470e9a50ea4c9f76a930dfccd83cbb1b7f57567bb8924236092be8b584c15203e7362c51564b1189eb06cd38 WHIRLPOOL dd9dd06d2f40341832cc170501fb59c52e87c4e072ebe1477734825d14e4efbf3e1d739280d70c9e1e966221b091fe99e02e175831a3d8810f1c41006e25b213
diff --git a/app-misc/sphinx/sphinx-0.9.9.ebuild b/app-misc/sphinx/sphinx-0.9.9.ebuild
deleted file mode 100644
index 462fd8723520..000000000000
--- a/app-misc/sphinx/sphinx-0.9.9.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils autotools
-
-WANT_AUTOMAKE="1.11"
-
-MY_P=${P/_/-}
-
-# This has been added by Gentoo, to explicitly version libstemmer.
-# It is the date that http://snowball.tartarus.org/dist/libstemmer_c.tgz was
-# fetched.
-STEMMER_PV="20091122"
-DESCRIPTION="Full-text search engine with support for MySQL and PostgreSQL"
-HOMEPAGE="http://www.sphinxsearch.com/"
-SRC_URI="http://sphinxsearch.com/downloads/${MY_P}.tar.gz
-	stemmer? ( mirror://gentoo/libstemmer_c-${STEMMER_PV}.tgz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug id64 mysql postgres stemmer test"
-
-RDEPEND="mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )"
-DEPEND="${RDEPEND}
-	test? ( dev-lang/php )"
-
-# Tests require a live database.
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	if use stemmer; then
-		cd "${S}"
-		unpack libstemmer_c-${STEMMER_PV}.tgz
-	fi
-}
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir="/etc/${PN}" \
-		$(use_enable id64) \
-		$(use_with debug) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with stemmer libstemmer)
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc doc/*
-
-	dodir /var/lib/sphinx
-	dodir /var/log/sphinx
-	dodir /var/run/sphinx
-
-	newinitd "${FILESDIR}"/searchd.rc searchd
-}
diff --git a/app-misc/ttyrec/Manifest b/app-misc/ttyrec/Manifest
index 7e4c66a0864e..90d87746e844 100644
--- a/app-misc/ttyrec/Manifest
+++ b/app-misc/ttyrec/Manifest
@@ -1,6 +1,6 @@
 AUX ttyrec-1.0.8-flags.patch 591 SHA256 a7500040b86a41c7dbac7b5a84fb6d45877dfd3f75adf0c8fd6b35d4cf3fae95 SHA512 245a5e34611869d4b612a25922cde034ad3e54a3b7579850f2ddce3e0200726ed3707a518464c176044c9a9ab5f60737ded7941f1882d560d963c59e6221861c WHIRLPOOL 948911ee3ba4b50449f91138c2b4f12b5b8c105a9da2cd7291a00fb770999ce85eeed77afd4dea4d55731dafd305170ead59e30ccd594972c9217e8620401b8c
 DIST ttyrec-1.0.8.tar.gz 8528 SHA256 ef5e9bf276b65bb831f9c2554cd8784bd5b4ee65353808f82b7e2aef851587ec SHA512 b7f6f4c78c5148dacc7058534d89f13fcf333ee9e099d4475135e9c15a99a8aed72bf4bd5954652a6bb044d11ad35b4cb8d07208a5349c79c811f68fde7e8611 WHIRLPOOL d8f51ea4c88082b0f272170fec7aed0fa14d153b145f17958dc6101b5e383bbf7dfc4c5ed9cdbac23c08cef6baf25f4b65f3db13f7575bae65bf9ca3f58d48e3
-EBUILD ttyrec-1.0.8-r2.ebuild 693 SHA256 c704c90c465eb86fca5ca57d68c2cee66a6f05ebe6bf7746383835a4465b2b68 SHA512 09943ab49cc9d1f969f851cefd87931a3ea1603a0396052319d7af2273838d02a894f5c834296c467581007d026d26832b18cc3df878ccb1e01543c7c3436ca0 WHIRLPOOL 0a799de7948bd054b8fba61973454a1dc279a8ef1c29d8a30b283b265b3616c4ff330b15918b5f73b0fc2729eb8c45dfc5374aa988d8b931ce28b5df48fcc549
+EBUILD ttyrec-1.0.8-r2.ebuild 692 SHA256 94abd28adfa2300d9d8569497890b947449b7ea443db5dc64762084176e58632 SHA512 f3c65b0fe210ef0f5703ca1499eda212e38b293ae6cc0c8445c38e419ccdd0581a546390341e54a53e34f1f389214f822939e29a782b12d14e24ae8f9dd7be08 WHIRLPOOL f2f3636774b7f208a3249cc2615541613e12aaf8598e766b7a3ab82f3e99ddf52fe7ba96bc43b397400c007006298798bbc534a8f6e0489336bdedbc96999a4a
 MISC ChangeLog 2560 SHA256 04eda61f241c162d03859e38bc8815f72f8ef12f62e15f5d688074948b337f05 SHA512 c6e2ad1150421b6dfe44200e9920304e7531c0bcf2ae48d4db0f6432f6be716771cfd4375a52c90015dd4070b82887424f71c93b725241a9de8db0f3a4ba0cfc WHIRLPOOL 29e0e105acb674ad79912b4c5f737d08e704348c2e3ae169b66dad4d47db5c367139655c90abf5e329ff38500d5d09c4994402da9e064d55d85eed5a0ef9dfdb
 MISC ChangeLog-2015 3181 SHA256 556555b8b3f9eeb9e89672e9b602bd12cd7fb13e844f7558b3ebb7c0e9d1959c SHA512 efccd026856a7bd9b93e0436f893e771b8bb272404ffd3cda853b3b93ca425487cf6023679d626eab769d28d68ed5bf80c77a12770ed210594031edab510df91 WHIRLPOOL 4b88e585f7b8be8d28ed0892ff4d521697edaf53b13ce8e4d297187c85326acecb03e37cf68b5d3ca0f7965d42d0c213732b20f0085d04daaa04c9b57ed20030
 MISC metadata.xml 575 SHA256 43d494a91bc668699a2f6fa128e1fd2971668d92f2e136765c359891589776a4 SHA512 57adba15d5ac7ae8f49445e81c7aefd99a840721b8636505908493e3e76ed12c24eb5ae87970de701395415c096ca360ad81fe27139fb4db79cfc3da1b7784fa WHIRLPOOL da0fa028a2e557e1a440ff090f2f7610dcd470887c414b3289469de23b5ec6ee3d1dd47920872ef05362dcaca889be5a9c4043515f462860401c05fc1e1b1d48
diff --git a/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild b/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild
index 6affc3cba9b4..98e3a621aa51 100644
--- a/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild
+++ b/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://0xcc.net/ttyrec/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 PATCHES=( "${FILESDIR}/${P}-flags.patch" )
 
 src_compile() {
diff --git a/app-office/ledger/Manifest b/app-office/ledger/Manifest
index 590328e5e18a..ed797f7c1531 100644
--- a/app-office/ledger/Manifest
+++ b/app-office/ledger/Manifest
@@ -1,6 +1,7 @@
 AUX 50ledger-gentoo-3.1.1.el 166 SHA256 e16c4eaa7a034e44c7cc53d5288d6506ad791765510d534adf964a38c96dff0e SHA512 d5e2450d19d5d24e2db22429fa2ee8d46ae7284c91b1f2ed6eb32a0e6b70e1996f4b2f41812084b0330011d33fbcb2da11bf2d5b9f28a157f4c05d1106c418d5 WHIRLPOOL 3eb8764fd439bdba197c879d7e6e127485249afeb83f5c65855f56a51202842b12d0f051020447ccf7862eb47ea1d6df769c2fe7ad8bf8616f391fbf978ddde4
+AUX ledger-3.1.1-boost.patch 774 SHA256 3fe6750973d1ac10c822735759b35f362a68afb3dfa9887aaa7d83839a9e99eb SHA512 7f7eaa69ef377df1e9e449981c446ea52ef1d2311a9d96e325bf067af702f0361b05d70d6d52bdeefc7c9471cb68eceaa6fae313976e9b9676110b4e97198ba8 WHIRLPOOL 2f29624ef089cc31477ce8f000706906d90a8c24d28202f88151e52442f5176a1c49e1e7c4ec1008a5c29daf66bba54d42ee9c7827d10e313196a84cfd6ccc69
 DIST ledger-3.1.1.tar.gz 842364 SHA256 90f06561ab692b192d46d67bc106158da9c6c6813cc3848b503243a9dfd8548a SHA512 3f81b98a414cdfc0e272de4e958770149fb1acc8bda880d270e1459ce35294a220c52820bb9af49a751ac3a80b878f81fc7799ba41e0a1be43eba72081351bf5 WHIRLPOOL 89a83818adbe206167dbfc999dd589f1943d199cf84979fa82754f597a863c115fec85bbdabc4413714b4253502833170e6327bfc0d2321c392b9a3d73400061
-EBUILD ledger-3.1.1.ebuild 3145 SHA256 8dbfa834dedaf4dd47ee30aa2558e6c7f53530d835e20d4835ab09ae1cca589f SHA512 ac3f3f0ac50fd428dc00adc379a03a0454d9db9290d86af6c27695b585b12fbfe59f7a755bf485c4f14185275ca37012e7658b3e26f1126c210c9d02d94fa441 WHIRLPOOL 0036e33dfcbda823948c10e8bc52ef8a73333536a7845c9775f6565266bbcfca16b8da6a43701446b977f6cc15ec318240c9d86d96097d457e0987039c121c5d
+EBUILD ledger-3.1.1.ebuild 3202 SHA256 c5ba8445587edbde8b2672ffab0c38eb944c4ac5a144552241bc1b9b6236d464 SHA512 86954ff4ffac4f5105e13f4a362e8a5f46dccedf236e0a465dce878996308e12a7302931c87bf08f7bbedfdd5b577fe486c363c5dd80ee28afebc6f7b8e78082 WHIRLPOOL 2fe01fb8924d79931e20333d857a4699df6bd7b6341d0629cd8135a19c67df0f4a643d5aee1d23bff93c242146abf0411ac7886882a1430debbf464fbdb9258c
 MISC ChangeLog 3839 SHA256 bc9a08e3e77d41a35d6ef3105976de882b36d931433af67f63f39119e1492e53 SHA512 e3803d9055adf59ad8014014209416d79437aa705057eb7b8fdade921dbe47d62153a744c6e7f9c1d7f26228ed29f798a45fb19cabe469f98660dea5c9c50991 WHIRLPOOL 94dbb592ca0d98bc172229bafdad430c2e6d5869908919e7acc8830f93019f0c51cb9e4da73a2ee8eb8d3940b54325b01bf1f7a31134dbeb8dd84f010ab8b603
 MISC ChangeLog-2015 5605 SHA256 f7f8807d67c60170c3c6dab4b9b2731fbe325c1f1fa6fb2152598852f303c3a9 SHA512 2f174a32b13ee74e74c92add0fb5575af76513aad6d76d5c1f2ef3ca242fa21f91caf068876e7df33ea730386966d0e6faab907d00eae5e716e2d4352eb61747 WHIRLPOOL 1861fe794e918e7c536ca2d50262acbddeb2c613d155cd706dbbbd4b9d5e46b03ba49dc871c98f62930fb6992ff49cb89ba7e3bed060fbb5126f7ffda4ded661
 MISC metadata.xml 306 SHA256 ca968234f5aa5aa39ded94b12d271aa7190b5445ad2a2b28c030a63f2d6b3adb SHA512 c83b1be9474bbfa3296040c56bf14e22afd214835a44907bcb4db2a8047f05e1fe49b1d1ebe5bcd72fe5ed2f27c832d20169aa813f0d9bd619fc1f7a1c5e15cb WHIRLPOOL 9247dec90625b7ba70fdc239496ff4ed2fab88dc4d31fadcf280824c28ee0557076e70141dde4f1f552d35ab285890e2a9096d5b48f38ee82c4086c15c07b5b9
diff --git a/app-office/ledger/files/ledger-3.1.1-boost.patch b/app-office/ledger/files/ledger-3.1.1-boost.patch
new file mode 100644
index 000000000000..b69a42a50113
--- /dev/null
+++ b/app-office/ledger/files/ledger-3.1.1-boost.patch
@@ -0,0 +1,22 @@
+From 1856b8c4902498843f4da37a7aaeb2ce85acc1d3 Mon Sep 17 00:00:00 2001
+From: Denis <dkasak@users.noreply.github.com>
+Date: Mon, 12 Sep 2016 12:49:40 +0200
+Subject: [PATCH] Fix compilation error with boost 1.61
+
+---
+ src/item.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/item.h b/src/item.h
+index ca16d87b3..4dc6df7e6 100644
+--- a/src/item.h
++++ b/src/item.h
+@@ -92,7 +92,7 @@ class item_t : public supports_flags<uint_least16_t>, public scope_t
+ 
+   typedef std::pair<optional<value_t>, bool> tag_data_t;
+   typedef std::map<string, tag_data_t,
+-                   function<bool(string, string)> > string_map;
++                   std::function<bool(string, string)> > string_map;
+ 
+   state_t              _state;
+   optional<date_t>     _date;
diff --git a/app-office/ledger/ledger-3.1.1.ebuild b/app-office/ledger/ledger-3.1.1.ebuild
index f32cda9c830f..31ed49d068b1 100644
--- a/app-office/ledger/ledger-3.1.1.ebuild
+++ b/app-office/ledger/ledger-3.1.1.ebuild
@@ -42,6 +42,8 @@ DEPEND="
 	)
 "
 
+PATCHES=( "${FILESDIR}/${P}-boost.patch" ) # bug 609108
+
 # Building with python integration seems to fail without 8G available
 # RAM(!)  Since the memory check in check-reqs doesn't count swap, it
 # may be unfair to fail the build entirely on the memory test alone.
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 5a479fb19527..a13210239444 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -10,7 +10,6 @@ DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555
 DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f WHIRLPOOL 8e446eb44188046b0e90694feba232f42c2e9f13d0f43783a18de37c94b86ff919b994931125c5d8001ecd320c1f4db5da482847304aa61646600a3bb33144b4
 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
 DIST ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz 1769329 SHA256 3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305 SHA512 2f8d473916abf9822367edbe857fc2e12dc9858d12e790d689d787e439904bd6a452bf631043aa66e7502457ab0815a473657f58fca17a213e2490f5655e5ae5 WHIRLPOOL 29ddaef03d46fe08aa2dba200be755817f8e77de3bbbb3ed86dae65e891239f3051f79fdfadec6ae56023197e32e1c44a94385a1ce306081f3bf94be6226f8c7
-DIST libepubgen-0.0.1.tar.bz2 376956 SHA256 eea910b042526ed52f7ab9292b7fa31fca32f9e042285818074ff33664db4fa2 SHA512 1665e5f4708b4c296b9075fa7ab250b3571ebcb42e51c4d195f63eb1969b9014e7490cc2a80dda608eb21e0b127cf7eb8911ed3e5aaa46a89dcad8748618f62a WHIRLPOOL 5b2a7e3878f87e5ca1c353f9ca82daf01946699eb974d3f4092157c916117716ba4ba4969c05da02ad8f08fdd4324dae585fefe332814e004b40cd56b8ef0df1
 DIST libreoffice-5.2.7.2.tar.xz 184589464 SHA256 106154a72a329605166a49bfa31c6d1cc03133d600ad0ef340b45e4e2a92891d SHA512 f7414a0d0d654d1d9bd6c5524ff2acf2f21c544dd6ed79f4f2d22f79db46264f95f7ca8dd482027f7a573d2d491ea6c8d9875b262d5e2b917dfddb749a3ea95f WHIRLPOOL 28d7f9531190a16bdea14c5dcc710ef593085fddca1b4d7d0cd6107d5f93e4b94a1ae035a626376ab7abfcd926a263b1437de1e52011bb96aa6d87b046a38da8
 DIST libreoffice-5.4.2.2.tar.xz 192795940 SHA256 2fda4a8c446786a3afff2cf1b07b818c45c9dcd136bfae1f3191b0b1565ba675 SHA512 37edf44b4b3c3e694f5b5915647f9555413c3fcc6d29f5f8d74806439b65ed90418905476d7b75ce58a032abb1f55cecf1ca74b63279666ca2af5f3ac95a645c WHIRLPOOL 1d2f55af8da2d1c8f2998cc3ab6346be7f6e2e524fef664281ba585910a9e98914c9e07612d597a89c77ab6dc25beffc4dcb1b4575f314752a892d18ea15415d
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
@@ -19,7 +18,7 @@ DIST libreoffice-help-5.4.2.2.tar.xz 2343504 SHA256 5fc740dbe77876b96ed731f0a6ce
 EBUILD libreoffice-5.2.7.2.ebuild 17873 SHA256 5f8c7f5d41dafd9a7bc56c250885bd143946d3d84eda8c872baeadc4769b88b7 SHA512 4257b398839fc7aec7017a954df0db13a51adf9914b83835656f0783ffb38b6df540f7deec15e8d6fe7700a240ee6c756129b4fb37c196e7705808e357285f81 WHIRLPOOL 8f569cf8d75dda399fadaf1a04f8093535b984aed3b6d828850517c70f7c240f5fec7e63736ab110f4d86309a8cd4bd5cbf3402c1bbd7afc9b8db09abaf1e260
 EBUILD libreoffice-5.4.2.2.ebuild 17283 SHA256 14ba5e25b12bf5b53aa6631c6683b413d8135b7370b23a22308055f47589d5ac SHA512 610f7ec6c5d0436af71cd3ce517db895582648ec2cb19f6b5e517c939159cc84bb0e1892c521509cb81cea30688a7698b83da393b7dc3ada79313857f091bc40 WHIRLPOOL 9b743e721279d5445b610e9bcf652b68bc215f4baf6630fe0194709438cb7fdc82ca099513793591bc7b9a766a7da26b8698bd9225bb5a2ed4bfb94b7a22df3e
 EBUILD libreoffice-5.4.9999.ebuild 17276 SHA256 45cc30bda4be93677fd5fb20c47be56240b449871c4dbe514e7a6372cee69204 SHA512 830025d8b37ba9b92e600a9756ecff6e24deca3c2bd6f7c6b8a3044daa8fbd19d5c4a2aaeda28a16afa65142fec76134cc72fe1a5c16b80cb7f734e336ec7c88 WHIRLPOOL 048958f69d8ba65a4b47f0fc8e1dcc0022a7d1ee60eb7e03d835d3d34b0812f9f284f046849767266935e64850b4898cfcdd7e911c5bf47d35714fc05d843ad2
-EBUILD libreoffice-9999.ebuild 17187 SHA256 ca7a398c3632a76e8ca04e6058a83b4a7fa0e3f5747d82df79a2759a437c5752 SHA512 1998e3959bff32abae140d4b9ab1a770d9e46f81bc49179ada205cc0d64cb655f403fab3d14999f7eccd959545d479f057e53fc2fc688091297b75bdbbfa0f20 WHIRLPOOL 01f67fb0e25bc3ca4992578ba010faf5f4aab2ee973f9ea34abfefe9e5c5439aa4f000cfbc76413bc84a576fc2f601791a930ac2f6ef14f4586ba2ba806fb66e
+EBUILD libreoffice-9999.ebuild 17151 SHA256 65b71313191fa0a668eaa05fc7dc948ef736602624c0df3b1daef3667bf9e1ea SHA512 c1b6fecb28e401de8c186800d34fa87df0758d0b6a4b6c0fd81936c9588ac134da9b3fbe253595d4ebaa14be9a16e5196d1e444ee4549a2f9395b72a831b2cd9 WHIRLPOOL 30cd1666b07b834bfa59efb553bbffca1261d8557c558cb3972eeeb9b107b14e160745d203c9bf4ee8053b7cf49bd1ac4b391e756ed21d94be21d22e722021d2
 MISC ChangeLog 26281 SHA256 bd07909b751104de22082cb359251b4c87df9c9a029e0f0573606e1d09687e29 SHA512 c037427319b94ed201e768b1d6b5ac37ef5e7eff313d197f681bf30469ca66058024418b105adf09e2990a513c215726367df6202fe0bb0f41f9939adb3efeb6 WHIRLPOOL 01ae7f053217c02f6c0a93efd482ff1adf4dfda79a3b4e8dece1e95af2add09d1b38a66e99808f423e180553ddf37d677bcf725954dda2165c0c6f4923eec363
 MISC ChangeLog-2014 109721 SHA256 db62affd74b541212d4043dbc88acf51fb8aa36602d6e5625cab9b0b823a54f7 SHA512 6481d8f26924300ca46f0cd216962167b6ce5d53028558b0128ed4f996a8cf5576182e9e511493e4b57f628189fc127dec9ce62110bc8d3d85c6d4e2a815bf26 WHIRLPOOL 76c87a30a9296f64675baeb5f77a8500b9b1ff25c6edd5a5d0b984dc3cb3b3aecee37938d882194d6be58ef34c8b1925c1d9b8b7a7b786a5d68539fba714e627
 MISC ChangeLog-2015 9339 SHA256 efed9b1e7f6ed3ce24e8351037daeb8b050089969bf6ca5e5c013d42ffb2fb88 SHA512 7b58f85ea022bc91f78c812e09381660c25fb054b8f4e53e17e81161db775c832e441c5c64f50ab3d0093edc627a6bbc54c53f3fc75470d149ccb7ab92beba39 WHIRLPOOL 90c23e45e3afe143983ff60c5ca561f55169014d80d78e7d67b4342c2d7c71a0cf5548ed6316cc98366c3f205f506374a9643d22697e542c83243ca5bad1c78c
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 4be2836950fb..69cf20f437e2 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -49,7 +49,6 @@ unset DEV_URI
 # These are bundles that can't be removed for now due to huge patchsets.
 # If you want them gone, patches are welcome.
 ADDONS_SRC=(
-	"${ADDONS_URI}/libepubgen-0.0.1.tar.bz2"
 	"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
 	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
 	# no release for 8 years, should we package it?
@@ -85,12 +84,14 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	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/libodfgen-0.1.0
+	app-text/libqxp
 	app-text/libstaroffice
 	app-text/libwpd:0.10[tools]
 	app-text/libwpg:0.3
@@ -454,7 +455,6 @@ src_configure() {
 		--without-help \
 		--with-helppack-integration \
 		--with-system-gpgmepp \
-		--without-system-libepubgen \
 		--without-system-sane \
 		$(use_enable bluetooth sdremote-bluetooth) \
 		$(use_enable coinmp) \
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index de45f2b9af28..43de7917e833 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -7,7 +7,7 @@ DIST lyx-2.2.3.tar.xz 15501856 SHA256 4fcaeb7c202472d9ea21bf826fb30541015fef33e7
 EBUILD lyx-2.0.8.1-r1.ebuild 4335 SHA256 2bba25589de5d5f1e7291709a9bbe0f5f9aff1ed3104e1752db341968a6b8b52 SHA512 824bf4865268d7e7594f7f1ec21ad8128602765bc8ae9b4d86ea7ffdb12cd5ac54cc9b61e48e5badb4e5cd388f067afe05b1cc5b5d73b380900e51a5f3339c82 WHIRLPOOL 9d0e2da1b28bd7226250937db2d13a85649a587c8b062d231035b0b02a0bf54ce66eb70d7765acb87fd1559a693daabead2fc85effc005a65bda1a71e1287c88
 EBUILD lyx-2.1.5-r1.ebuild 4251 SHA256 600a781a4b2ba56715469d22837019332a08455fc185a900f485ffceada13400 SHA512 a46a099611d5e83fbf7ef35d27c1a2e7f16eb74af8c68a7800a13642b3c8c21365d735fa53d79c934f2233314e9da868ce3364e36d62a7a1b341f7cbe445a18e WHIRLPOOL 1099a33d54829072960a2cc479d9e12631c94d00d51651d6ee23ccd4c2804a91d8b9d134f6fc328b17362a9b1d8d2c618c9e861324ce061341c9a7c313d04857
 EBUILD lyx-2.2.2-r1.ebuild 4648 SHA256 3aec1d028201a5c104c6ecac56e92f7eb370c9eead3355283eb28ddf6c18dc5e SHA512 114a72c180d8ec7bb014881ca0d139f20598de34e21eaf1327cb966e4150e4ac0b44f21e502b916ec1cc9101eec4e7538acf90625f2692c1768452b0399c5be7 WHIRLPOOL 72ef6fcd90a29cbf01a4d134ce0128b47ef3302b43066fcc4cbec7d0e9b458110a6f6f7d1c0d513eac6a28ed223280a85ee8abbfa19ad42ea0da356202939fa2
-EBUILD lyx-2.2.3-r1.ebuild 4553 SHA256 a6083dbfe819126f0f2b9d1e4ff06a2ee0f293d38b3fbb6672fbbc529ce01327 SHA512 d531486201418dcf59a94d4e483efd05237d131fb769ba3f4de0b0445592cb22b5bae842cb0c64a2ccd240bfb0f00cd8ebd769ad7493b300e2bea3acaebcc1b4 WHIRLPOOL eac777768c39afb38cfd28fa14eb7416344de4822665c838c8b40d27bd9640dfb6a515bdc2b1cab774277b6559bf99e663ae6385f19c9224dcaa303e61570e91
+EBUILD lyx-2.2.3-r1.ebuild 4552 SHA256 3fa2fd7f84e73c8803ee9d5fd6bfc8bed09e3d79504abf7f9111a7d47d69fd3c SHA512 689f7a4a2451a72917ea586006c1388adb993f9ac69bf3995fee2f52ab23d97bddf78331f170b4b10984e2ccee74aafb0cd52ebd5b999f590f89ef48f63042cc WHIRLPOOL 7ceaa443befc5333879059e663a4a681b4285ecb115371206ce06489e07ed5a9c8b9726416d81ef968fa5244cf668c4c5e363998ec48ce27424ff6ca57098bdd
 EBUILD lyx-2.2.3.ebuild 4648 SHA256 3aec1d028201a5c104c6ecac56e92f7eb370c9eead3355283eb28ddf6c18dc5e SHA512 114a72c180d8ec7bb014881ca0d139f20598de34e21eaf1327cb966e4150e4ac0b44f21e502b916ec1cc9101eec4e7538acf90625f2692c1768452b0399c5be7 WHIRLPOOL 72ef6fcd90a29cbf01a4d134ce0128b47ef3302b43066fcc4cbec7d0e9b458110a6f6f7d1c0d513eac6a28ed223280a85ee8abbfa19ad42ea0da356202939fa2
 MISC ChangeLog 6253 SHA256 244834810e233c44d7c06d6d7d075aa39a64d15dc9c545a75e369d65046fdf98 SHA512 6778f6c82eb4ed97274776a4972635d8365e46ed23dc864180afd6a0530074b5a2e373e58d211cfc23c880a43b3e942f3e81be5fb7f67d1909816f33c57c4d4d WHIRLPOOL 33f80c698e6a8c46541ee5bf23141e82b9c46998dadbadce8481983b9ea710c91d3064c99aae768c73438d4ce02afa85423564c25c9c376fa98c31ed72f0e9b4
 MISC ChangeLog-2015 45256 SHA256 7990ac382649222f1681095b7e474e46240ae052ad87391fd1c3cbf7bd0d542d SHA512 ad3736d144428e9525287ab343b1da0b1f7b2b445d7d839b839270a9a472e01fca7773b5b40a7a2af1230441898d92221e860e2f351cbcdd4705b7d4639300b4 WHIRLPOOL 57728c9c2cf2d86347d010ae2989fce4796fe3a5b086e64f1a75943f3667b8cb15c323e73e6522961d443aa4cd7da56e7fecc26fa1ca9df98dfac4f132178e57
diff --git a/app-office/lyx/lyx-2.2.3-r1.ebuild b/app-office/lyx/lyx-2.2.3-r1.ebuild
index d5cbed051580..db2d7677649b 100644
--- a/app-office/lyx/lyx-2.2.3-r1.ebuild
+++ b/app-office/lyx/lyx-2.2.3-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${MY_P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ia64 ppc ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
+KEYWORDS="alpha ~amd64 ~hppa ia64 ppc ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
 IUSE="aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls +qt5 rcs rtf subversion svg"
 
 LANGS="ar ca cs da de el en es eu fi fr gl he hu ia id it ja nb nn pl pt_BR pt_PT ro ru sk sr sv tr uk zh_CN zh_TW"
diff --git a/app-office/openerp/Manifest b/app-office/openerp/Manifest
index a18b3e50246e..64f431c1ee69 100644
--- a/app-office/openerp/Manifest
+++ b/app-office/openerp/Manifest
@@ -8,8 +8,8 @@ AUX openerp.cfg.2 1145 SHA256 06af3effd55c7029bc38ffb7f8b92688691d2794fed6f8ccf1
 AUX openerp.logrotate 197 SHA256 c015978e8239c470f9614df0661565d7eaf288305afeb7826363f1da01afd8db SHA512 7e6b1475985287bff9cd4a61f747f1dd9b5efdcecb1520dcf8efaf72b9200ce632760a458a6276e317e9d69907560ac187dfd0ecb24c7ff655edb0627967d2bd WHIRLPOOL fab493daecfd58556d87762d472c3b403ed2e7e85e01ca6d275c709feedc56737295b4f09e75a4d5e0549f72f5e6d07eaf4daab76c4e3066b2f6fbf7785d0c99
 DIST openerp-7.0-20140125-002455.tar.gz 64214375 SHA256 2bf832dda8f8e844476bb76cd60be84da1cc219e97be9da15b0a95b1e537bc4e SHA512 a923fe3240cf44f6384f18bd37853d15fe132aab97494e713f095253cd4b72d32a89e33ba3623a523b81b9863da6d5bca24c4020b20829975e4185d6e5093b3e WHIRLPOOL 5a4fcb37a6ea800e63294fe6b9dcbb3f82e91d1f0adfe412935b699b8e0c2901914dcfc5c0c62e2b289e057ecb4f30c5a4c06887c2d8e893ce1c1b03e6f5ce62
 DIST openerp-8.0dev-20140125-000101.tar.gz 82648176 SHA256 647c4a5ec28340f7c5a32dd50173b98bf62dd18ba00cc1929538a8803c704da0 SHA512 560f0cd9aadfb010dfba1a114ca17ed8dc7b63fffdd93325811b87530e97a8e629c46442e777bd0c53fb38b1a985e769e3fb5f5edf66b9b45f21be3e8973aedd WHIRLPOOL 1fb6e185250c08e948b11f2ca6581723055eefd0edb6a7999029b950b064c7aebf23a83bc014240c2d2d78284fcf8292761b6cc7733f270f14bfd4a98673a222
-EBUILD openerp-7.0.20140125.ebuild 3727 SHA256 d51cd4830e6ff48e19c9f521d3fcfaf2367a393c4028a581ddbab648e742131e SHA512 c6726e115f0a073226f8ed90cc97f92d40819e5d35a7ac11d7aa9e17584dd520d2999d4e7923ce788ca295f241189ed9b08b339786a29a553a90cf16bed283b9 WHIRLPOOL 0bf5239dd026040f852ad7ebc6e6125af66f36eb5bcd9aeb53e8e6d5c056cf6b446750b12986d9566cb394a0a2a514c1212f380f88a9cf1797ccb146ba30cc8c
-EBUILD openerp-8.0.20140125.ebuild 3721 SHA256 024a9736a2a51f7ed1a654aaac3b800355c33e697f4a21044d7b24114b0d7421 SHA512 fce9fa5f87ab3155d8b7cc0fbdbc4020d889c1c7ce007e4e0e632027f50ab21d2458dfc706c65e53fda3beb45543cb438e4705efdae5e9cdf319196707255c2b WHIRLPOOL 1273a77b7be43a7f1bc8a19a08e3453a7b7e14c29116fcf3d8e5c31305712d6fc9e53b3e4e0bd0840a7d2c016324cbd80c158ddb731b09f296a984f9431c0498
+EBUILD openerp-7.0.20140125.ebuild 3730 SHA256 2d0a01c5f065b1d8c8c213ecb4664a01b77acd0a7cf900f397a46d1c788f5ca9 SHA512 37ab44dd9f38b002ea8a31bfc8e731dca272f8cb608dbb4d44176307041ce6620cac9de0c7412dff92ef068a5dcf4c2d8b584f2c45bb26b537552ea06b97a204 WHIRLPOOL 323cc6f2329862a29fe053b3b5d44132bc76f12962cc365314b0a4a3945f78c539da5f71aaeaa494a8c9545aa0dbc6f141a8719fd4c16d6c9d92107cb36dc918
+EBUILD openerp-8.0.20140125.ebuild 3724 SHA256 18e0743e707c4c59f01abef52e9fb75f9a8d50a8f010df619c88c57fecfc68e4 SHA512 9d71d0dd2c72d6d55f3a60e4cc170022814609fcc0e2347d111d38a9826cd07acf8e1c2e72ccc2ba8c1c2e0c66e7603eb4a8f491a4baa2aac95d579582a24fac WHIRLPOOL a991a921a2b8e46d400087d0703db7b887ec91cdc07db100caca2bde041aea9522239e42f7846688c0ae3dc0eba4ca8ec887da9750095424c122e47f98dce28a
 MISC ChangeLog 3408 SHA256 0866ea7d5245c50a925f4b951464ae2993988483330790e707fb8e4f06493b55 SHA512 3d99c9392f57a92d5195c6320f22f152a52b1de2afdef19889e31663ee3c6745e2353875326994a258d06cc430d8471fb5c5109e2435f1b45aca11d9bfce8ed8 WHIRLPOOL 45ae3e5b0fa26baf28bec1d40bd2f608a9f574da2e5284cb4fe0eb42d461ea79820d1265a6b0fcdbf3ab79a044e1cad279e0462f24dc0ecb743d1bd1dd81c814
 MISC ChangeLog-2015 3315 SHA256 f8c1ae87e31a3c0f46cb3516c92fe3f1e56a3e2186cb0b5bf81d4b54e9f523b3 SHA512 683b0de8e9b7a99157311fac8b95da282ea892b55a8dba1669a1fbe78041243356836c68cf521f68bdc838a7d127c06f30ca76bbef1e9c328b140134c56b2dae WHIRLPOOL 7d19f753969ad4795a2550a578ea4f3799ac68fdce971dc0871d49238a1a49f29d2f3fcdd3bad4bc66c974e14a372f3483ce1e1cfb513a0ecf74d31853e1c360
 MISC metadata.xml 283 SHA256 1d087260f5345e45a240f63f3fab4e060c43ab413d1254cadb9d0c084f0d806b SHA512 17639738efdc4bf47d4c45edd2264db8b149b65fa8b0fa40888f56642e9fed3e91a84a7de7f3cfcb9fcef4fcb221f6eb4ce233abc4f865d9ccfa38ba436f7745 WHIRLPOOL 1a7e4bb394bb73142410fbf50e6bcf891fb03b65e34bc77ae0279f301195d42e39c94be7f1ca738048f8441a60f66199b1d6d4d0b956eaa01953bc2d474dc98e
diff --git a/app-office/openerp/openerp-7.0.20140125.ebuild b/app-office/openerp/openerp-7.0.20140125.ebuild
index 97875513997c..f278f7474ac6 100644
--- a/app-office/openerp/openerp-7.0.20140125.ebuild
+++ b/app-office/openerp/openerp-7.0.20140125.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -50,7 +50,7 @@ CDEPEND="!app-office/openerp-web
 	dev-python/unittest2[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/pillow[jpeg,${PYTHON_USEDEP}]
+	dev-python/pillow[jpeg(+),${PYTHON_USEDEP}]
 	${PYTHON_DEPS}
 	"
 
diff --git a/app-office/openerp/openerp-8.0.20140125.ebuild b/app-office/openerp/openerp-8.0.20140125.ebuild
index 76beb424a29a..cebc58dc92c2 100644
--- a/app-office/openerp/openerp-8.0.20140125.ebuild
+++ b/app-office/openerp/openerp-8.0.20140125.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -50,7 +50,7 @@ CDEPEND="!app-office/openerp-web
 	dev-python/unittest2[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/pillow[jpeg,${PYTHON_USEDEP}]
+	dev-python/pillow[jpeg(+),${PYTHON_USEDEP}]
 	${PYTHON_DEPS}
 	"
 
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index b7eeb67bbfa8..a8266e21afec 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -12,15 +12,10 @@ AUX scribus-1.5.3-fpic.patch 499 SHA256 f9ea952e09140b3d293789c979fad9654e03265c
 AUX scribus-9999-docdir.patch 1309 SHA256 49c1c5072caf3f9e6cdde3a521be1752c18200bd4729aa788516b6de3a9a8fb7 SHA512 5f3bd4fe4f61a2c8d2a58e3f480c95d32280358366a7eabc3c483abe1f3ef07ef5e3864be8ffce8b48584da23f81cb9b96b81c83a59ad4f3da5c7a5c34234063 WHIRLPOOL d645814bfa927de341a7c122b5481bec9c145c39a86b864181e4737109f9db64fe3921c1e4a0e2eb2293f140b370f500c9ac6b27d9b6e37f3166eb2e49a28a59
 AUX scribus-9999-fpic.patch 499 SHA256 f9ea952e09140b3d293789c979fad9654e03265c0392e975d24513819ef67c19 SHA512 e38fc85e72af67c0fea4c14dad92a759f5065cd4e337ef2257a90f27e39297c6991c467e53e9c51ae247bf2f8c34fa62fa76cf839a53b386c9c378e53756d015 WHIRLPOOL 06ea6c67e2fe6a367df34f615efb0f5e2ff2f4e3f756f3d564d4eea27e5184e97f3820087bf7f8a5278dfbf994d8fdc6a26397bb876a83c0a5b601cba636a02b
 DIST scribus-1.4.6.tar.xz 73601104 SHA256 21e336500d9edc9c90ccf73087e5ef3df59ec3e4a3cbfec15367bcd8d078a19a SHA512 74d8a89eb767535bcd8fe5e3c55d03709d59ff8fc5280005bcc2ad36cae1d37c8442ab85abaea86fdee9f351a901c86947231001324e2d8df00cbd8e5c18d1e3 WHIRLPOOL 5c2ee366cb53720b35ffec2f7e2db244105a95ed7b14c27cf4fab7636cbdf10c6a370c0a14f65f630cd8252b22a4a3ec4b5e592c71308f78269205a89ae56fb7
-DIST scribus-1.5.0.tar.xz 75867348 SHA256 a3dbe66d12719355d41ae7f2cac7a8c9d5599b12aeb5c038d939636f054e8e68 SHA512 3d3f311543019cf985e12d25d0a9bd2ea470679aee0f40d0aed4d2f1532ea3cdbd4d2e215e59b559b4301613fb71f738a348c56d09d3c6e32da0047d9e212065 WHIRLPOOL feae71d139724b4927c81cab5d13168a9e00383f9a7890484cf5ab62f001b266b4af954440bc7edc51eedb65c3ace4541a7fc0836b0f6237061d6d38371ac6ca
-DIST scribus-1.5.2.tar.xz 74456064 SHA256 ec5eec23aeda655d3a761cffb85853dcd2ede3973b9e62a1b3c28bd1093c74f5 SHA512 c3531bc5ef97e1f7d026ec7cff872ff7a6ea36472c794b632bee1a84fdeea87deaa56e8b9c467fe8e6db694266efc9ec84d822e5feefd2f99b4469d08826cea4 WHIRLPOOL cc1cd41c725aaa240a064149c011cee31f04e738ea386285b75f31aeb200b9351e6e434ed517a2d600c1de694f2f3584012e9213b0fdf094a6497d04c14e3fb7
 DIST scribus-1.5.3.tar.xz 74222084 SHA256 73a30b4727e19f5d301a936d23a84275cc4f5613a92416cbd843f5167721d74f SHA512 487cea685869397bc52acc7be8e8e9f4bad3f594c1f95740207e4d9e26b07461a7fd2a95d5337b38f1b0fa6504a9f6059cca6740c78cc165eab0b779ffdfe980 WHIRLPOOL 0e4c36089e00f7bfc582f2138f4b402f26ca22ea6c7ecd1adce066e1b8741b839d34e769c2a7c4806e79279627d678223332cf36609d68716d32515f3389a48a
 EBUILD scribus-1.4.6.ebuild 4200 SHA256 3409ad9d9229400293e30aead1b63baf787a9be2376f6b242f59a77cb0b743a8 SHA512 78beca755fc0fbe0954a54cfcb139036f89e2b32fded489bb8e9ab2b66e2f5a31bb97f6bcadf2875db33ea3199dfee01a0fcee57c48fcd0179dcf67f6ee13891 WHIRLPOOL a16eefe7b69623ae2066f680f02745a4a778ab06e93bca7118d4663c19e9356e30f8431b2b198aa0b6ea264f9abd3356a623bbb651dbf2f70a0cbd88a59f1237
-EBUILD scribus-1.5.0-r1.ebuild 6249 SHA256 98808edfa449621e9b4169d1987ce4065dc846fa8571633190329f6c78862ab4 SHA512 e6f21d514f552b417547b409300a404be9bb34b87067585e382c439852732d3a144f3461f630a02b457c143acf8a043c7a99c152520e74503032d8b80e86dfed WHIRLPOOL 10fce39be4edf237fce048a4a1b462459d8ef02f390acd17dd4d335a9d6cf82cf8dca2f71edeb3108976fc1434206b441b888e26ccf9e00dac739b7224ad1ee2
-EBUILD scribus-1.5.2-r2.ebuild 6335 SHA256 647db31366c935a43d9b5db1d3303eb4ea56870a28ee69566da50082ee3f2d5a SHA512 e2fa051d1731d924aab6b1e1da2d240756dae368ef69dd0073d2af1847e597f623f597262daed271c2b9804e9e02989fc04fd2c801a72f0c9ec6d60f025b42f3 WHIRLPOOL 66f5400e72e410dca613780058a372dc0807e0366d985f39bc54844784ac9b91914641b7c016f67eb08a4f9374dab97cca2403be88bbe5e237ba20d6e527fb2e
-EBUILD scribus-1.5.2-r3.ebuild 6737 SHA256 3c58e527834e40c797e5b2a41ef022a2d96ce2f26a56b391887ca642a52f6e3e SHA512 d2ebd5b6bab138e99df5cc718d9739b1b3a895e607ccc75faa203fe2dbcf423caa1e0397a48e86f08935785bb965a27276856be35730bc21672e555233cb9b64 WHIRLPOOL df1a9acb3b13b8752f02a62e70ca3d6d1b02a35c16652e42367af8ad2a45fc7d6a6f5a3d3ac013a87d7031fa41874235eafc18c0dd90c14ca593d787cc48bc08
-EBUILD scribus-1.5.3.ebuild 6636 SHA256 cab1f71b1ab159ce96de1ba90f7c11f4adf8ed5d9f16fc63b00302e033539e64 SHA512 ed00a85e5838de6fb80d56cad6068bf9b3b203253cd2aaf36a80c217f326c0ad5a5ffca1c1558504a1a8e855d47ca5cbb2a6690a0876309d499a8528033f9ba2 WHIRLPOOL 064a0d3c88152ea438fee8cb12959cf42edff8c91a1b3dd3cc180ea396d5a4e1847e26f2c093fb6a497a5098db35eebc915f33fa1105caa7c554a9d4152c1a38
-EBUILD scribus-9999.ebuild 6627 SHA256 e67495b2cb1ec9e5353a1b4980f25d67ade402c8305b1e407e1f3e0fbef274c4 SHA512 7a403aa83c7db2234e5968e15bcdd6cec706a79527eef7038974f9b631688afe580ec0304a6fbd5b2cc9f117341ee36b2f4b45afc9393c0966003e53dc2ae0ac WHIRLPOOL ce49a8b7716702d7cd4dd16d3c932389036d55d6d7966db4f12831b20f3443dd4530febf27f5404bba89920dd88173e131ea8debb310fe14be367c670a8a4cd1
+EBUILD scribus-1.5.3.ebuild 6695 SHA256 47381d1e4981aa137e598c6133175d3f1ef6bfb2e3f0cbf0385ef60d05d90788 SHA512 1325a44ef7090dc87d9a39658d85f1a0328c7443dd3e8e74cd5e2b7daa98bee6abe02672220085db8d9aec9ce928a01dff68262903e22c02c8de4f76f7173979 WHIRLPOOL 3b4f03286ed8029deaabafd38f9332d91e17be3a3cc8e857f5ba1bc6a2cba71a8d226ac6ecc1165862d77e422fd7686f888ea23985c0504355bc512f0ae7e26c
+EBUILD scribus-9999.ebuild 6686 SHA256 e0028c375384aba9a4b641e45bb06870d3e0c2b32056137e30421e7fe4d091f9 SHA512 e1d92175029bd07824ab1e92875fcdbaff3c830e274e9002189fc7edb76bb1e39102bdd7d0b4473363dc727a3abceb5ff63cacf4ae2593d9d272768f1e4d4523 WHIRLPOOL 89ce4e9f04eea9d6ed797f190b129440fc81144968bd182b14865e46274e7fa3352f537989924dd002ffb459f006782d546125f2e00dd7e44a00617c9050e2c0
 MISC ChangeLog 9778 SHA256 770902fbc7ba329b09be36932d12e4a7938a6d527c26eef4123c150fbecbf573 SHA512 242c3bad1617d51fb635222301578f3ca993c95c48dcb474bd2703f3db05faa1b0bd1ddde566a132c77b19c53a9bb76c8413f11f6ed9026f58133aa5d02f87d5 WHIRLPOOL ddf0156b4e30194b14c902eef2d8e2a198c83f779de2ec3f310dbbdf841b62af3462ca3535b59cb4c78041675bbd43c2a0b751ab120706d5632ddf1b22e7666e
 MISC ChangeLog-2015 29142 SHA256 ae387a21c374d46fb2a44a47eb4b8684d7d29eace0aa6cd5ef16ba4ed86fa952 SHA512 7467b987b0683335df402c697fe15657006a24313784049a04f313a684d7b1708d18a14b9c6a3942c6405ecb57f4c731cd53dbca12160c8fecc9c278efb8c945 WHIRLPOOL f768c5d6c111dfda47c4052e0c97abc98a58129a55040553923603468788400894daf37177bffe2e0f8cdd60157933bfb9e5469ca8b2390c09a65642cfffc0ab
 MISC metadata.xml 895 SHA256 15327a03fe8ab12f9575927e72aaf13c9a14f7435f36461dd9ddeb0736786bf7 SHA512 a4b3ba4d363b674e781faa22cab86ef0455b235d9aa1bc4da12b4cc1ae4f23b954f81fdd4ca2348057d2c5108b141a4d6f3307eaf8ff79f76a2754538b80faa1 WHIRLPOOL 5a6d947b0fb126a28bf61dbfe0776d10a01c5e333f341faec9301c25cec069794190cdf8c912f74656dcc80a390af358d29d2ed389806cf4a216c53fb4de8507
diff --git a/app-office/scribus/scribus-1.5.0-r1.ebuild b/app-office/scribus/scribus-1.5.0-r1.ebuild
deleted file mode 100644
index c55e97393ae5..000000000000
--- a/app-office/scribus/scribus-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk?"
-
-inherit cmake-utils fdo-mime flag-o-matic multilib python-single-r1
-
-DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="http://www.scribus.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk"
-
-#a=$((ls resources/translations/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'| awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_: :g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e 's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a
-IUSE_LINGUAS=" af ar bg br ca ca_ES cs cs_CZ cy cy_GB da da_DK de de@1901 de_CH de_DE el en_AU en_GB en_US eo es es_ES et eu fi fi_FI fr gl he hr hu hu_HU ia id id_ID is is_IS it ja ko ku la lt lt_LT nb_NO nl nn_NO pl pl_PL pt pt_BR pt_PT ro ro_RO ru ru_RU sa sk sk_SK sl sl_SI sq sr sv sv_SE th_TH tr uk uk_UA zh_CN zh_TW"
-IUSE+=" ${IUSE_LINGUAS// / linguas_}"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	tk? ( scripts )"
-
-# osg
-# couple of third_party libs bundled
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	app-text/libmspub
-	>=app-text/poppler-0.19.0:=
-	dev-libs/boost
-	dev-libs/hyphen
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	media-libs/libcdr
-	media-libs/libpagemaker
-	media-libs/libpng:0
-	media-libs/libvisio
-	media-libs/tiff:0
-	net-print/cups
-	sys-libs/zlib[minizip]
-	virtual/jpeg:0=
-	>=x11-libs/cairo-1.10.0[X,svg]
-	boost? ( dev-libs/boost )
-	hunspell? ( app-text/hunspell )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	osg? ( dev-games/openscenegraph )
-	pdf? ( app-text/podofo:0= )
-	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	app-text/ghostscript-gpl"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-docdir.patch
-	"${FILESDIR}"/${P}-fpic.patch
-	"${FILESDIR}"/${P}-QObject.patch
-	)
-
-src_prepare() {
-	rm -r codegen/cheetah || die
-	cat > cmake/modules/FindZLIB.cmake <<- EOF
-	find_package(PkgConfig)
-	pkg_check_modules(ZLIB minizip zlib)
-	SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} )
-	SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} )
-	MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
-	EOF
-
-	sed \
-		-e "/^\s*unzip\.[ch]/d" \
-		-e "/^\s*ioapi\.[ch]/d" \
-		-i scribus/CMakeLists.txt Scribus.pro || die
-	rm scribus/ioapi.[ch] || die
-
-	sed \
-		-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
-		-i resources/templates/CMakeLists.txt || die
-
-	if has_version ">=dev-qt/qtcore-5.7.0" ; then
-		append-cxxflags "-std=c++11" #bug 591948
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local _lang lang langs
-	for lang in ${IUSE_LINGUAS}; do
-		_lang=$(translate_lang ${lang})
-		if use linguas_${lang} || [[ ${lang} == "en" ]]; then
-			# From the CMakeLists.txt
-			# "#Bit of a hack, preprocess all the filenames to generate our language string, needed for -DWANT_GUI_LANG=en_GB;de_DE , etc"
-			langs+=";${_lang}"
-		else
-			# Don't install localized documentation
-			sed -e "/${_lang}/d" -i doc/CMakeLists.txt || die
-			safe_delete \
-				./resources/dicts/README_${_lang}.txt \
-				./resources/dicts/README_hyph_${_lang}.txt \
-				./resources/dicts/hyph_${_lang}.dic \
-				./resources/loremipsum/${_lang}.xml
-		fi
-		sed -e "/en_EN/d" -i doc/CMakeLists.txt || die
-		safe_delete \
-			./resources/dicts/README_en_EN.txt \
-			./resources/dicts/README_hyph_en_EN.txt \
-			./resources/dicts/hyph_en_EN.dic \
-			./resources/loremipsum/en_EN.xml
-	done
-
-	local mycmakeargs=(
-		-DHAVE_PYTHON=ON
-		-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DWANT_DISTROBUILD=ON
-		-DDOCDIR="/usr/share/doc/${PF}/"
-		-DWANT_GUI_LANG="${langs#;};en"
-		$(cmake-utils_use_with pdf PODOFO)
-		$(cmake-utils_use_with boost)
-		$(cmake-utils_use_want graphicsmagick)
-		$(cmake-utils_use !osg WANT_NOOSG)
-		$(cmake-utils_use_want debug DEBUG)
-		$(cmake-utils_use_want minimal NOHEADERINSTALL)
-		$(cmake-utils_use_want hunspell HUNSPELL)
-		$(cmake-utils_use_want !examples NOEXAMPLES)
-		$(cmake-utils_use_want !templates NOTEMPLATES)
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	local lang _lang
-	# en_EN can be deleted always
-	for lang in ${IUSE_LINGUAS}; do
-		if ! use linguas_${lang}; then
-			_lang=$(translate_lang)
-			safe_delete "${ED}"/usr/share/man/${_lang}
-		fi
-	done
-
-	if ! use scripts; then
-		rm "${ED}"/usr/share/scribus/scripts/*.py || die
-	elif ! use tk; then
-		rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
-	fi
-
-	use scripts && \
-		python_fix_shebang "${ED}"/usr/share/scribus/scripts && \
-		python_optimize "${ED}"/usr/share/scribus/scripts
-
-	mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
-	ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
-	cat >> "${T}"/COPYING <<- EOF
-	${PN} is licensed under the "${LICENSE}".
-	Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text.
-	EOF
-	dodoc "${T}"/COPYING
-	docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING}
-	doicon resources/icons/scribus.png
-	domenu scribus.desktop
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-safe_delete () {
-	local x
-	for x in ${@}; do
-		if [[ -d "${x}" ]]; then
-			ebegin "Deleting ${x} recursively"
-			rm -r "${x}" || die
-			eend $?
-		elif [[ -f "${x}" ]]; then
-			ebegin "Deleting ${x}"
-			rm "${x}" || die
-			eend $?
-		else
-			ewarn "${x} not found"
-		fi
-	done
-}
-
-translate_lang() {
-	_lang=${1}
-	[[ ${1} == "ru_RU" ]] && _lang+=_0
-	[[ ${1} == "de@1901" ]] && _lang=de_1901
-	echo ${_lang}
-}
diff --git a/app-office/scribus/scribus-1.5.2-r2.ebuild b/app-office/scribus/scribus-1.5.2-r2.ebuild
deleted file mode 100644
index 824cec778e93..000000000000
--- a/app-office/scribus/scribus-1.5.2-r2.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk?"
-CMAKE_MAKEFILE_GENERATOR=ninja
-
-inherit cmake-utils eutils fdo-mime flag-o-matic multilib python-single-r1
-
-DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="http://www.scribus.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk"
-
-#a=$((ls resources/translations/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'| awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_: :g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e 's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a
-IUSE_LINGUAS=" af ar bg br ca ca_ES cs cs_CZ cy cy_GB da da_DK de de@1901 de_CH de_DE el en_AU en_GB en_US eo es es_ES et eu fi fi_FI fr gl he hr hu hu_HU ia id id_ID is is_IS it ja ko ku la lt lt_LT nb_NO nl nn_NO pl pl_PL pt pt_BR pt_PT ro ro_RO ru ru_RU sa sk sk_SK sl sl_SI sq sr sv sv_SE th_TH tr uk uk_UA zh_CN zh_TW"
-IUSE+=" ${IUSE_LINGUAS// / linguas_}"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	tk? ( scripts )"
-
-# osg
-# couple of third_party libs bundled
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	app-text/libmspub
-	app-text/poppler:=
-	dev-libs/hyphen
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	media-libs/libcdr
-	media-libs/libpagemaker
-	media-libs/libpng:0=
-	media-libs/libvisio
-	media-libs/tiff:0
-	net-print/cups
-	sys-libs/zlib[minizip]
-	virtual/jpeg:0=
-	>=x11-libs/cairo-1.10.0[X,svg]
-	boost? ( >=dev-libs/boost-1.62:= )
-	hunspell? ( app-text/hunspell )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	osg? ( dev-games/openscenegraph )
-	pdf? ( app-text/podofo:0= )
-	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	app-text/ghostscript-gpl"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0-docdir.patch
-	"${FILESDIR}"/${P}-fpic.patch
-	"${FILESDIR}"/${P}-cmake-qt57.patch
-	"${FILESDIR}"/${P}-qt57-build.patch
-	"${FILESDIR}"/${P}-cxx-build.patch
-	"${FILESDIR}"/${P}-gcc6-warn.patch
-)
-
-src_prepare() {
-	rm -r codegen/cheetah || die
-	cat > cmake/modules/FindZLIB.cmake <<- EOF || die
-	find_package(PkgConfig)
-	pkg_check_modules(ZLIB minizip zlib)
-	SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} )
-	SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} )
-	MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
-	EOF
-
-	sed \
-		-e "/^\s*unzip\.[ch]/d" \
-		-e "/^\s*ioapi\.[ch]/d" \
-		-i scribus/CMakeLists.txt Scribus.pro || die
-	rm scribus/ioapi.[ch] || die
-
-	sed \
-		-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
-		-i resources/templates/CMakeLists.txt || die
-
-	edos2unix scribus/ui/propertiespalette_utils.cpp
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local _lang lang langs
-	for lang in ${IUSE_LINGUAS}; do
-		_lang=$(translate_lang ${lang})
-		if use linguas_${lang} || [[ ${lang} == "en" ]]; then
-			# From the CMakeLists.txt
-			# "#Bit of a hack, preprocess all the filenames to generate our language string, needed for -DWANT_GUI_LANG=en_GB;de_DE , etc"
-			langs+=";${_lang}"
-		else
-			# Don't install localized documentation
-			sed -e "/${_lang}/d" -i doc/CMakeLists.txt || die
-			safe_delete \
-				./resources/dicts/README_${_lang}.txt \
-				./resources/dicts/README_hyph_${_lang}.txt \
-				./resources/dicts/hyph_${_lang}.dic \
-				./resources/loremipsum/${_lang}.xml
-		fi
-		sed -e "/en_EN/d" -i doc/CMakeLists.txt || die
-		safe_delete \
-			./resources/dicts/README_en_EN.txt \
-			./resources/dicts/README_hyph_en_EN.txt \
-			./resources/dicts/hyph_en_EN.dic \
-			./resources/loremipsum/en_EN.xml
-	done
-
-	local mycmakeargs=(
-		-DHAVE_PYTHON=ON
-		-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DWANT_DISTROBUILD=ON
-		-DDOCDIR="${EPREFIX%/}/usr/share/doc/${PF}/"
-		-DWANT_GUI_LANG="${langs#;};en"
-		-DWANT_CPP11=ON
-		-DWITH_PODOFO="$(usex pdf)"
-		-DWITH_BOOST="$(usex boost)"
-		-DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)"
-		-DWANT_NOOSG="$(usex !osg)"
-		-DWANT_DEBUG="$(usex debug)"
-		-DWANT_NOHEADERINSTALL="$(usex minimal)"
-		-DWANT_HUNSPELL="$(usex hunspell)"
-		-DWANT_NOEXAMPLES="$(usex !examples)"
-		-DWANT_NOTEMPLATES="$(usex !templates)"
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	local lang _lang
-	# en_EN can be deleted always
-	for lang in ${IUSE_LINGUAS}; do
-		if ! use linguas_${lang}; then
-			_lang=$(translate_lang ${lang})
-			safe_delete "${ED%/}"/usr/share/man/${_lang}
-		fi
-	done
-
-	if ! use scripts; then
-		rm "${ED%/}"/usr/share/scribus/scripts/*.py || die
-	elif ! use tk; then
-		rm "${ED%/}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
-	fi
-
-	use scripts && \
-		python_fix_shebang "${ED%/}"/usr/share/scribus/scripts && \
-		python_optimize "${ED%/}"/usr/share/scribus/scripts
-
-	mv "${ED%/}"/usr/share/doc/${PF}/{en,html} || die
-	ln -sf html "${ED%/}"/usr/share/doc/${PF}/en || die
-	cat >> "${T}"/COPYING <<- EOF || die
-	${PN} is licensed under the "${LICENSE}".
-	Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text.
-	EOF
-	dodoc "${T}"/COPYING
-	docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING}
-	doicon resources/iconsets/*/scribus.png
-	domenu scribus.desktop
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-safe_delete () {
-	local x
-	for x in ${@}; do
-		if [[ -d "${x}" ]]; then
-			ebegin "Deleting ${x} recursively"
-			rm -r "${x}" || die
-			eend $?
-		elif [[ -f "${x}" ]]; then
-			ebegin "Deleting ${x}"
-			rm "${x}" || die
-			eend $?
-		fi
-	done
-}
-
-translate_lang() {
-	_lang=${1}
-	[[ ${1} == "ru_RU" ]] && _lang+=_0
-	[[ ${1} == "de@1901" ]] && _lang=de_1901
-	echo ${_lang}
-}
diff --git a/app-office/scribus/scribus-1.5.2-r3.ebuild b/app-office/scribus/scribus-1.5.2-r3.ebuild
deleted file mode 100644
index 43bee267eac7..000000000000
--- a/app-office/scribus/scribus-1.5.2-r3.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk?"
-CMAKE_MAKEFILE_GENERATOR=ninja
-
-inherit cmake-utils eutils fdo-mime flag-o-matic gnome2 multilib python-single-r1
-
-DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="http://www.scribus.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk"
-
-#a=$((ls resources/translations/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'| awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_: :g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e 's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a
-IUSE_LINGUAS=" af ar bg br ca ca_ES cs cs_CZ cy cy_GB da da_DK de de@1901 de_CH de_DE el en_AU en_GB en_US eo es es_ES et eu fi fi_FI fr gl he hr hu hu_HU ia id id_ID is is_IS it ja ko ku la lt lt_LT nb_NO nl nn_NO pl pl_PL pt pt_BR pt_PT ro ro_RO ru ru_RU sa sk sk_SK sl sl_SI sq sr sv sv_SE th_TH tr uk uk_UA zh_CN zh_TW"
-IUSE+=" ${IUSE_LINGUAS// / linguas_}"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	tk? ( scripts )"
-
-# osg
-# couple of third_party libs bundled
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	app-text/libmspub
-	app-text/poppler:=
-	dev-libs/hyphen
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	media-libs/libcdr
-	media-libs/libpagemaker
-	media-libs/libpng:0=
-	media-libs/libvisio
-	media-libs/tiff:0
-	net-print/cups
-	sys-libs/zlib[minizip]
-	virtual/jpeg:0=
-	>=x11-libs/cairo-1.10.0[X,svg]
-	boost? ( >=dev-libs/boost-1.62:= )
-	hunspell? ( app-text/hunspell )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	osg? ( dev-games/openscenegraph )
-	pdf? ( app-text/podofo:0= )
-	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	app-text/ghostscript-gpl"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0-docdir.patch
-	"${FILESDIR}"/${P}-fpic.patch
-	"${FILESDIR}"/${P}-cmake-qt57.patch
-	"${FILESDIR}"/${P}-qt57-build.patch
-	"${FILESDIR}"/${P}-cxx-build.patch
-	"${FILESDIR}"/${P}-gcc6-warn.patch
-)
-
-src_prepare() {
-	rm -r codegen/cheetah || die
-	cat > cmake/modules/FindZLIB.cmake <<- EOF || die
-	find_package(PkgConfig)
-	pkg_check_modules(ZLIB minizip zlib)
-	SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} )
-	SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} )
-	MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
-	EOF
-
-	sed \
-		-e "/^\s*unzip\.[ch]/d" \
-		-e "/^\s*ioapi\.[ch]/d" \
-		-i scribus/CMakeLists.txt Scribus.pro || die
-	rm scribus/ioapi.[ch] || die
-
-	sed \
-		-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
-		-i resources/templates/CMakeLists.txt || die
-
-	edos2unix scribus/ui/propertiespalette_utils.cpp
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# bug #550818
-	append-cppflags -DHAVE_MEMRCHR
-
-	local _lang lang langs
-	for lang in ${IUSE_LINGUAS}; do
-		_lang=$(translate_lang ${lang})
-		if use linguas_${lang} || [[ ${lang} == "en" ]]; then
-			# From the CMakeLists.txt
-			# "#Bit of a hack, preprocess all the filenames to generate our language string, needed for -DWANT_GUI_LANG=en_GB;de_DE , etc"
-			langs+=";${_lang}"
-		else
-			# Don't install localized documentation
-			sed -e "/${_lang}/d" -i doc/CMakeLists.txt || die
-			safe_delete \
-				./resources/dicts/README_${_lang}.txt \
-				./resources/dicts/README_hyph_${_lang}.txt \
-				./resources/dicts/hyph_${_lang}.dic \
-				./resources/loremipsum/${_lang}.xml
-		fi
-		sed -e "/en_EN/d" -i doc/CMakeLists.txt || die
-		safe_delete \
-			./resources/dicts/README_en_EN.txt \
-			./resources/dicts/README_hyph_en_EN.txt \
-			./resources/dicts/hyph_en_EN.dic \
-			./resources/loremipsum/en_EN.xml
-	done
-
-	local mycmakeargs=(
-		-DHAVE_PYTHON=ON
-		-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DWANT_DISTROBUILD=ON
-		-DDOCDIR="${EPREFIX%/}/usr/share/doc/${PF}/"
-		-DWANT_GUI_LANG="${langs#;};en"
-		-DWANT_CPP11=ON
-		-DWITH_PODOFO="$(usex pdf)"
-		-DWITH_BOOST="$(usex boost)"
-		-DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)"
-		-DWANT_NOOSG="$(usex !osg)"
-		-DWANT_DEBUG="$(usex debug)"
-		-DWANT_NOHEADERINSTALL="$(usex minimal)"
-		-DWANT_HUNSPELL="$(usex hunspell)"
-		-DWANT_NOEXAMPLES="$(usex !examples)"
-		-DWANT_NOTEMPLATES="$(usex !templates)"
-		)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	local lang _lang
-	# en_EN can be deleted always
-	for lang in ${IUSE_LINGUAS}; do
-		if ! use linguas_${lang}; then
-			_lang=$(translate_lang ${lang})
-			safe_delete "${ED%/}"/usr/share/man/${_lang}
-		fi
-	done
-
-	if ! use scripts; then
-		rm "${ED%/}"/usr/share/scribus/scripts/*.py || die
-	elif ! use tk; then
-		rm "${ED%/}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
-	fi
-
-	use scripts && \
-		python_fix_shebang "${ED%/}"/usr/share/scribus/scripts && \
-		python_optimize "${ED%/}"/usr/share/scribus/scripts
-
-	mv "${ED%/}"/usr/share/doc/${PF}/{en,html} || die
-	ln -sf html "${ED%/}"/usr/share/doc/${PF}/en || die
-	cat >> "${T}"/COPYING <<- EOF || die
-	${PN} is licensed under the "${LICENSE}".
-	Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text.
-	EOF
-	dodoc "${T}"/COPYING
-	docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING}
-	local size
-	for size in 16 32 128 256; do
-		newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png
-	done
-	newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png
-	doicon resources/iconsets/*/scribus.png
-	domenu scribus.desktop
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-safe_delete () {
-	local x
-	for x in ${@}; do
-		if [[ -d "${x}" ]]; then
-			ebegin "Deleting ${x} recursively"
-			rm -r "${x}" || die
-			eend $?
-		elif [[ -f "${x}" ]]; then
-			ebegin "Deleting ${x}"
-			rm "${x}" || die
-			eend $?
-		fi
-	done
-}
-
-translate_lang() {
-	_lang=${1}
-	[[ ${1} == "ru_RU" ]] && _lang+=_0
-	[[ ${1} == "de@1901" ]] && _lang=de_1901
-	echo ${_lang}
-}
diff --git a/app-office/scribus/scribus-1.5.3.ebuild b/app-office/scribus/scribus-1.5.3.ebuild
index ef3ef1f94e27..a6585de00ff1 100644
--- a/app-office/scribus/scribus-1.5.3.ebuild
+++ b/app-office/scribus/scribus-1.5.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="tk?"
 CMAKE_MAKEFILE_GENERATOR=ninja
 CMAKE_MIN_VERSION=3.2.0
 
-inherit cmake-utils eutils fdo-mime flag-o-matic gnome2 multilib python-single-r1
+inherit cmake-utils eutils flag-o-matic gnome2 multilib python-single-r1 xdg-utils
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
 HOMEPAGE="http://www.scribus.net/"
@@ -34,6 +34,7 @@ COMMON_DEPEND="
 	app-text/libmspub
 	app-text/poppler:=
 	dev-libs/hyphen
+	>=dev-libs/icu-58.2:0=
 	dev-libs/librevenge
 	dev-libs/libxml2
 	dev-qt/qtcore:5
@@ -46,6 +47,7 @@ COMMON_DEPEND="
 	dev-qt/qtxml:5
 	media-libs/fontconfig
 	media-libs/freetype:2
+	>=media-libs/harfbuzz-0.9.42:0=[icu]
 	media-libs/lcms:2
 	media-libs/libcdr
 	media-libs/libpagemaker
@@ -197,14 +199,14 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	fdo-xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	fdo-xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 4d31199ef777..940b81ce23c8 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="tk?"
 CMAKE_MAKEFILE_GENERATOR=ninja
 CMAKE_MIN_VERSION=3.2.0
 
-inherit cmake-utils eutils fdo-mime flag-o-matic gnome2 multilib python-single-r1 subversion
+inherit cmake-utils eutils flag-o-matic gnome2 multilib python-single-r1 subversion xdg-utils
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
 HOMEPAGE="http://www.scribus.net/"
@@ -36,6 +36,7 @@ COMMON_DEPEND="
 	app-text/libmspub
 	app-text/poppler:=
 	dev-libs/hyphen
+	>=dev-libs/icu-58.2:0=
 	dev-libs/librevenge
 	dev-libs/libxml2
 	dev-qt/qtcore:5
@@ -48,6 +49,7 @@ COMMON_DEPEND="
 	dev-qt/qtxml:5
 	media-libs/fontconfig
 	media-libs/freetype:2
+	>=media-libs/harfbuzz-0.9.42:0=[icu]
 	media-libs/lcms:2
 	media-libs/libcdr
 	media-libs/libpagemaker
@@ -199,14 +201,14 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	fdo-xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	fdo-xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index e00e66632b83..c088919de161 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -7,7 +7,7 @@ EBUILD eix-0.32.10.ebuild 2941 SHA256 431fa60b9dcfae7d9a372730fa00e2cea9cb79790c
 EBUILD eix-0.32.4.ebuild 2360 SHA256 26b9b757c3e31bd1d7b543e885112645d592e6a823e281fb9f8a9b96aeef7a99 SHA512 1b34e69dcab7ca2851ebb26ede4c73acc3221ce03370935674ac6f399f9005bcb6bed6f40c783d578891ab0ef0056182a94ef1e9bd64743f20e887a31249dc06 WHIRLPOOL 512bda5d7170c6e916815468cdef499a31f10fe6a24ab4674e7c451a3f11396c2d5ed1b3ad6d313f1433e068c57a9ff916bbe76fa94f867ec24c88cc3e73ee78
 EBUILD eix-0.32.5-r1.ebuild 2941 SHA256 431fa60b9dcfae7d9a372730fa00e2cea9cb79790cd458d217d06a3705516bdf SHA512 ce4660b31445a0bb1b4ff1a4624e0f8db7f6a6ced85a8e3b7109e2bd6dc8244511fa95e4b79d130823917ff810529f9e611e92c5a13dba0c0941e089fa6eb254 WHIRLPOOL a36c91cb65c98fcede5563e3e76a87d827c0a941e850e63034fb0af48848c7e6e6f43df83beac3dfb03d35e2c1dc0cdb72bd7f3f0cd4769c9851e1fb10ea2786
 EBUILD eix-0.32.5.ebuild 2454 SHA256 affb1e42e44c972dd070af11bbf9a68394e6c8fe8f3d5869b764978d3e00a6e5 SHA512 248caf260d7f06375eca2a60debc9427326623496a90c321a5f33b141b247c2d660345dfd3aa60473003e02d9e86ba78f14c91c19576f742d700aa7f7dd207c0 WHIRLPOOL 33c8f33093b4c6268f50e044e5ac987cad5b2654a6f2b65edbdb1c13f9b1ab0d384565491bc28a5a59b611b686257789810896818f57d743954f70f73552ced9
-EBUILD eix-0.32.9.ebuild 2935 SHA256 141d76544dee96bba594cd364ee28ab0509e83397c6deabc658513867bcd8c5f SHA512 15abd792e3e9302bbb60076780b04ba6b25c564921a777807cabb9f16d0825e9f9403e31bd22d3e958572aa149f6e916c0151dcd7c1ffd7f394632915cc175d1 WHIRLPOOL 13c9a729e2512c05961ae3141398cd002b40f47c259c5e2ac269860306ede72eb611afaeda7b864f82fe644fcc639be41030e85d6a939ab32ca0c038deaa7a50
+EBUILD eix-0.32.9.ebuild 2934 SHA256 daf51f6239185b3cf61afc7506798df5de226221884bfea9eed94cc068e08709 SHA512 85eb3be3b7d9120146920d716edfc162f5b35ead802a1804eda8888b76f8ac42ab1986b7bd51bf8b3b63a7ca381bc71061e3a1a2560a71ceac15bde666434af5 WHIRLPOOL ffe9cd2cd83aa3e8f988bd9c772503ce5e39c6ce0675f8ba29dc02049fb0ac2083c7ed11cff6cfb5e370ba25230faeb55aead99198440754ef4b767118a59672
 EBUILD eix-0.33.0-r1.ebuild 2875 SHA256 5b5f9dbfdae314c5104a658b389bd4e2e2026e9dfc3ce2ee7d9407f801c5fe74 SHA512 83747fb3c36f165cf989edc73c00cb6905a002218eefd1058099580aa53ab7819d7765af6626725beef9b32915dafb72fd4b3e7b5e207e434e3457a7f82fadb1 WHIRLPOOL adc0c4340237ac758a41787a81a9fd073025a722563e0ca454ad53c25c6c52b676cf80410b6e6d99d0527b459566b4ff7204c2c1b06aa3bea7705a2847cab82e
 MISC ChangeLog 9770 SHA256 4b50e3176529311b7210564458969cfe7e9bcccbb476d012507a1b01dcce5d6c SHA512 fb26b4781f4a4af63619763afd097566190545b48a81e737e58ea7aab41f12b4bf8e9e713f4302bea29f3779626cf172f5f3713546a51c39ae14f52faef84da5 WHIRLPOOL c3b7f92c57f9b21cf095f867406895c29de2e5f3ab72a4afeb53994d2a75e3c72ab27239b45fa4fc91373f9bdd5e1c8968ec53fa9f1870932992a75bd51424e6
 MISC ChangeLog-2015 62879 SHA256 dd3e3360c5a6ff69ddc4ebd0263adcbde4b4c72d130ba57b2ae304af40f62c09 SHA512 d6f1888e8cc75bccd6609c062689c64d978458b4bd9056a9297016d1419752f65cc19f7c175d0d0ffe4d7ddfbd3bb22b668717f073525a18cd6c136f9e000f46 WHIRLPOOL 4bb43b05071475173f9bc3afa4d7bfef3ad434c0a8ae9de21d8e9aa78272730c83dc21789aecaf886491aa1c5dbcd93b4a5213b6c83b7124b823225bd4b17c10
diff --git a/app-portage/eix/eix-0.32.9.ebuild b/app-portage/eix/eix-0.32.9.ebuild
index 1a7168ed6a6e..edc7e712d07e 100644
--- a/app-portage/eix/eix-0.32.9.ebuild
+++ b/app-portage/eix/eix-0.32.9.ebuild
@@ -12,7 +12,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 ~sparc-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 ~sparc-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/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index bd21e3391a2d..fe9c5ab4527d 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -8,7 +8,7 @@ DIST gentoolkit-0.4.0.tar.gz 3215377 SHA256 3696b45b304b4b789f21d897e09311cf0847
 EBUILD gentoolkit-0.3.0.8-r2.ebuild 2569 SHA256 e20a5852712f094eecda0895280fd72836a18e9237f160e6c4f961a6f4985d5e SHA512 0796f45a84f363d3c868445d4e34e6e87d65c00d3cc01c398e44071d33040fb1d65aa2132386374e4e16c8c654f03f34fd3f2a18f28ff5810f48db995fdda3f9 WHIRLPOOL fee5219af98ab4c9b3484b88ae577851ad769e3c94d1cace0f5abc74232bb2b1487ed09d3e423007c0a45b3ecff1df1976e821c47d22cec825d76a83313fe34a
 EBUILD gentoolkit-0.3.2-r1.ebuild 2244 SHA256 0e7b5fc22d0415f1493f931e4ee7b5fd16e1873b96f93a022efeca009f4e778a SHA512 0f7841b73128a56f85889480d7358d7472b5e40ec5eb1f53c7191bf2ef37e73b6744d340acc0f94fcdffb211f568ee0d87e73f03fcfb47dfb2b214eda50090d7 WHIRLPOOL 5ee1e6733481143b95aba28bd655205b9fb69d53aeca5efb3dcb622d77215d4d77400a2a9cff5d977963088606a0eb041e106b74b6dfe4e6c1b0312394f58b73
 EBUILD gentoolkit-0.3.3.ebuild 2190 SHA256 96abe4ba43ac0dcd731c08fb7609f60d6477060c350fb9270455245ea6ddd889 SHA512 6f95f1af8e2ae139ef6058b3798f75e331890bc05efb8abb4cc3c0e4014176424a424e9663f748f3cbae510186d8a7dce1b9d11e0813aa5e65ac9e4ee6d3aaa8 WHIRLPOOL 0476bfb125e2fb141398ed5a9a483de7fe5ba34c35be9591b43e2c92ace976b4bcc1c137ca4220bb3c63a72973930579a8d50c9b188dd4eab92ae70c90fbef18
-EBUILD gentoolkit-0.4.0.ebuild 2169 SHA256 6bcb86f3de5f3834f96e72e13ef1dd209304c58106a84d17fca663ab29411bb7 SHA512 df9634374caf14b6358661f2021e8cdbf5c4bd1f50834b5680125fb8b067f0e8f430af2334ee25692d859e0686c4c15ed2f7688c54543ab5a1b54127d41e6b41 WHIRLPOOL 156abf5fe310787c9e91216c5ae426ae17f74c2b0c7f936d6c1274fb9ffc26c71659598df165e0833c148c6c8f2dad3e63b13de6dd427da0076a889c70ea84c7
+EBUILD gentoolkit-0.4.0.ebuild 2168 SHA256 f7cea2c772b420a4a38c009f488861f428238355076bab4c1569241b6f48a31f SHA512 e207659c944eacee1e266099e4d29a2abc09e07ce083f55079d7403844cc553ef0fba0be9e231824aac5dcd2781be5f9df8521123953c79f83aa0376b38349f2 WHIRLPOOL 7364f0d35327321a2f11d29587060c51bc46b97f917f38ea0a5b3d6800806a9f869fa664a26af56560bd5e4faeeffe45f59f72d91239d9d8a5d1c69623f6825c
 EBUILD gentoolkit-9999.ebuild 1972 SHA256 d581494f29bafdb6b585d48dd54b5fc494a1d6e765ca1b03c8a8102dc46c276b SHA512 3c4443aa492625e7636854c651a1c70fb7059dd22e0168765bf27fb89dcb473f9c18dbc479a278067eda756021bca20e482e941a2b4ffcdd48f987cd800ba2c2 WHIRLPOOL 914f86d7971d167ae2c06241946397974d03724445e20af5ec4f1a47f1a9a1331098eac7ac2bca07e8045adcc457777b5d771b29f2993ec2fb5efa45e65a1aa1
 MISC ChangeLog 7216 SHA256 ecd70d2fd05932d6ba807c47f2f141c856d6fdbc60e7541c7a3f446916ba15ea SHA512 a9ab9e5e6eba30938c756ecf6a6af5671dab5a567384f6d7d124724d7e8eb5daba3975c31a736a1e31077456736a6b311188b1c3569ce8e1066cf2a9acdbbba1 WHIRLPOOL 44d726f589915c8b348775ff61f6fcad879b9853aabd7316f8a8483bd94f6fb68334feee9d1cdf17212f34d2c3b1931524e8fe65ccbe13aca062e41296e162b4
 MISC ChangeLog-2015 81145 SHA256 2be0115c31ea5a66f6ec2cab2d1280dd85d47c7fcb68dbd2ab81ae732b2adbf1 SHA512 a4a8f6cc06b49b8be331a0eeefa5bfa9c18ae4599025c0e6846497af0ba39cf627f4520082d50b818eb21716b65005bb155de466bf25a61f9c3f739119327b28 WHIRLPOOL ce50e41dbd48411c01c2390ab9c5eec9953c4a3c4128a4f104aca579c59b73d37910621d959049a8dac16c1e2cf2c39833f02666c683fcb50ca5ac7d7e396cfc
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild
index 4624209bf61e..d2b36e84cf6b 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-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 ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
diff --git a/app-portage/getdelta/Manifest b/app-portage/getdelta/Manifest
index 40fe84c47930..77b64cb5c8a8 100644
--- a/app-portage/getdelta/Manifest
+++ b/app-portage/getdelta/Manifest
@@ -3,4 +3,4 @@ DIST getdelta-0.7.8.tar.bz2 10335 SHA256 72bd5dac59e86a5c78217a15e3198df513152dc
 EBUILD getdelta-0.7.9-r2.ebuild 1391 SHA256 2b116f25a5ac6a047ab0a06469efc6aeb0901151e4a65b03e8bb7d1eec20881a SHA512 5d50594b215d4901b7378d627d78c51162bc39ec75901ecb00722658704948bc4e8dffc4eba4467fb2c32bf0dc389c7b1d0f7930c3cfb318f16bfb1da81deb1a WHIRLPOOL 8821a3e0877532f7a4fcdba98ca84e06867ee205b4a2f4cccaa000f3c7424a19796f535127bbc0191ee123dc9a1b567b998861683a48f0b2fc04a1993255371e
 MISC ChangeLog 2468 SHA256 09f1dc1393ee22015f37a79bebd5ce01986fad9f31b3bab6737bce52c44896fd SHA512 9c3041c8b79bcc73a71884bbaae8043b04cb43f04ddb0531f225a7666cf4bdc9ed16c8a0d0bce5e24ff5e7df1545716f7f65523761518244360d3b4b025ac6b7 WHIRLPOOL 33a343db93464fd623afd69b583cf3b7ddacceb0063a08c6f2555c01e2d19b855e16b4d355c3d33d533587974f3342ebcc706f37422a2c9a5d28860e61695643
 MISC ChangeLog-2015 4496 SHA256 8b83addcef5950dd0e2a4781146dbd67afeb3bdd8798affc1dba66302abd1f66 SHA512 2328b4b3e0ba54fd05677d76183813da2a103fb1a4493c510d2b954dd80f360cc1d9d9ae4e5618777eee0685a3c5299d0727428bbfecf0180cb0ce5d82437eaf WHIRLPOOL b8e3f4015a63e1c68fe0bffadb7cd7f44de8c1056284e7070de663ffa9cfd890d710150f1716358d6a32069413e863f274ac74def2050852ad06f74ec243f880
-MISC metadata.xml 495 SHA256 470b264a335319f6017d0a732f2928060c37263df90e12a03dab96754fec3840 SHA512 1e2fbc185f118b58adafb9ccc5c03d56d3802aa719601ba2bda7cdc2fae31a4f558261087d1da74e33786539f7b827a24acc9ad85a0ae4dadd26be31417efd92 WHIRLPOOL dd4a3bd3db297bd2bc61b1ea613de0b297768661b1f5a12153ba0e0d9a59627b93a36927a9ed06421df7f745df28a643691516a1f1c7b81bc7be8c2be9970886
+MISC metadata.xml 253 SHA256 0c78fc0afa8613e977eb4628a883b16145da7aadb7d5de8f1c46404cefd75e5b SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1 WHIRLPOOL 7a7e49ac517082517073244d5b110e8f751910e5f5245d52dada566f95f2432696db1747492592bc84b35fdf48e947d2e9aeca6e44f1f2a5076c26f3d6e1870c
diff --git a/app-portage/getdelta/metadata.xml b/app-portage/getdelta/metadata.xml
index 9b449d0de5af..f3de5f693ed8 100644
--- a/app-portage/getdelta/metadata.xml
+++ b/app-portage/getdelta/metadata.xml
@@ -5,12 +5,4 @@
     <email>patrick@gentoo.org</email>
     <name>Patrick Lauer</name>
   </maintainer>
-  <maintainer type="person">
-    <email>nlissne@linux01.gwdg.de</email>
-    <name>Nicolai Lissner</name>
-  </maintainer>
-<maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
 </pkgmetadata>
diff --git a/app-portage/mirrorselect/Manifest b/app-portage/mirrorselect/Manifest
index 83125dcdd07d..188a71aaf4e1 100644
--- a/app-portage/mirrorselect/Manifest
+++ b/app-portage/mirrorselect/Manifest
@@ -8,7 +8,7 @@ EBUILD mirrorselect-2.2.0.1.ebuild 867 SHA256 524d3c915ee61f7412e8e50417acc8a762
 EBUILD mirrorselect-2.2.2-r2.ebuild 1132 SHA256 51c42c18e87c40736a4511f1820ce29cff897c2f9e9b89ba4b1818cad840a2fb SHA512 42ad846a47675f9fcf9290b09941ef161ee5b827e42025e81937a502ecb39e8d6e597c206f9b55b28f12fce2554a1af14890cc43ae85f373e5ccb1171f8aea8a WHIRLPOOL 2681fbd5ad9a1b32c681ac7676ba696f3ee74973e4a84b95c5aa58929b7ab13fff7995137a60ddd0e0b7fa53e72816577ff69071f1258ffeb7556a70de96fea5
 EBUILD mirrorselect-2.2.2.ebuild 1018 SHA256 fc222c999b977535990cd4b98d05f1b6dc581278aa93bd10454b7034ed682893 SHA512 95b12638b7e49a49597abedffb6e09c412237714ee649a10360c595a38935512644988b226afde7526749568938a1453aaff03c28d7ce77c623414476f94597e WHIRLPOOL ae5fe5c551a9a989e8e56a2c3407572099c71638156a91790ba360cab71b1af50aeb4e83f5f9c1ab253c03f55abc05cf939c182ae2cc6283e42027dc6ccc6ab1
 EBUILD mirrorselect-2.2.3.ebuild 982 SHA256 f52a7c60c52b8ae3a3aa81e75b683ffe502dc9103053332c547e84b589af326e SHA512 59cd003de18fce4bbacf0a5ce7d5da7cceb423a2790de29ddffdc72386f9f4daf602730e4f4b583b0f1ea8a96f82a4a9543dcd1feae9559a52eb466117337e29 WHIRLPOOL 4b640a59a5595687c281869ddd3a505990af55a8cbc6209ad91181e97aa12ad59fcc1202479fda3d654a866befa7601594f20d8822d8dd2e68e98b85d8a959e4
-EBUILD mirrorselect-9999.ebuild 1045 SHA256 f42f54122b83d979b529f2506cd7103036d310bd726e29c70434b96793737dd9 SHA512 8775aeacb9942cfa6761f25391843449310a9b540845b01090a7cca57b6d1b804e733e8429fe2b16139af346960884070e895284335683fdf69665cda60f04cc WHIRLPOOL 2f1705adc553e1becd1d4a1927ffc2b20b0b0de3543b0ff4d9db57285c8e9445a09b6d87425be81282d9063fc89a38c0999bed86fe4c4644b2527ff80a13ade5
+EBUILD mirrorselect-9999.ebuild 1053 SHA256 b03239f19397586339be557965d4ad91223bb8c551581755c349353651326858 SHA512 e1ec6c42a99cd00ab71ed10aadbb8a7600a388c3a56a5b20662fb15017649e8fc95afb5e27deb9a67b407aa00b16b59207a661bdb420a44bae1e27174fe205dd WHIRLPOOL 920417248e1c69abc68307cde10e54ac4aeacc6886f6cab24e91ccddaba3f4d44804e4a5a105da282f7248fac5751e85839f3c377f7dd9aff233e9ebade7ae97
 MISC ChangeLog 3234 SHA256 a470d0747ffc95fe85798b97765e57e0dc8d5cc01b9777ae4463ddb0777daa4f SHA512 9ad777fef588761c2dfc199d8e66f7a7694db354d854863721c9031974f4707cc5e76f0f0b5d88d279db820681d1a4cf93e7fc0e255e32b3ffe2f48463a0debc WHIRLPOOL e7f2c1bb7cc30476b714856543493cba9f171478b8352a1567c0ce82e4843086bc5d32d74c4a795dc7ae20d74d3bb3a9e8622e22fa2ca8c7bb19e5c03136cf81
 MISC ChangeLog-2015 26452 SHA256 aea6097654520a07a39f6d6f3ca0423244b4bbb64714ae013017b636547617d8 SHA512 2eadbd2b3bbfb96540f3ba9914590f18b69d10f9d68be4cd46b0f139f058ee0994607e35640c1bac3fc44863de2473a4f985c61f75c4c347980f0cb01180047c WHIRLPOOL 6964bb40d7435f8fa27e89cd2f9b3df1ec2821d1dee1a48a2c0bd3b4cb0d28b083923555d8277acd3793c4b03c255a648ccb3f36d92b8c6bd50d8ec8e60408eb
 MISC metadata.xml 470 SHA256 be91a5dc173ee9e08b578140db70f8e8b5875d38834c5ca041cfbb0cde01e0d1 SHA512 31405437e73acec409d4d9c14d33fb10b03aed300ac88d5f793666cc7324abd46ff8703d794009316716d1a63b2b80721dc5e0841f0e1d0fbebc1f9b83f13acc WHIRLPOOL 72fca0179318df04428d67d8e36233f14f7ec58473d9211241bcd6870ca0a4ac92e6a63e18e5917bfaeb861ebf312d151869d5d33daccdfc1856ee77f23fad14
diff --git a/app-portage/mirrorselect/mirrorselect-9999.ebuild b/app-portage/mirrorselect/mirrorselect-9999.ebuild
index efbbddff3d18..4b49dae3c819 100644
--- a/app-portage/mirrorselect/mirrorselect-9999.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils distutils-r1 git-r3 prefix
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index d3f249a54026..f8888a12b016 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -6,7 +6,7 @@ DIST portage-utils-0.63.tar.xz 529012 SHA256 7a754cccad2d4c3331d348ba9df51bb3b95
 DIST portage-utils-0.64.tar.xz 533124 SHA256 a53505758d04b2115f636afc9f0c15176a591f3cdb58f684cfd148b29c4783f0 SHA512 e384b88454607aa9123ac3a71d55fb16de475ba59f4ba6efd236594f42140e75650696430138cdb6e1c4e1792db091bbc1db42b1c1102fd579af6514ecefffb7 WHIRLPOOL 19e34782c2f1ed637db73865acc6c07c4162ace55c0b24287bf92c66a9ebea4ca0ab230bb94478aa71bee72280231f75dd5de4eb8fc10248b52ee77cc977392e
 EBUILD portage-utils-0.62.ebuild 2255 SHA256 521aa5d3d09a887c1971d6f2003840feba084f26ab58806bfbda8113c57759ba SHA512 7623733d270ec35228f8ae3383ec123a4593e764aad2c960ab37ad3e08e616cc60e690dc59494dfcf4a06162ff822377bda580a0393beda20ea026bf557cf22e WHIRLPOOL 74b65fa301f624495c83fbfeb47e1f1d1e34efb2531778ab2ca2df9dd42c97db5b668c6e11464071b88183637c4b38824fc669363607eaf05cfb1c1fc23a975e
 EBUILD portage-utils-0.63.ebuild 1202 SHA256 3b1d9e46fc06983f68e1596f696e5577a1ac915e2f8dc30810b87be66c34224e SHA512 59a8f22bff1da852dbc0b4cf6d37b98c8a7dbf4c1fe5abed40f771479471a08de418a4e898d90b6e52fd13a1bf92e6a3f74a88792bf52b54de27d9ae41cec3ad WHIRLPOOL 5b99ad53bdc322a9d4216c018b98d430a3f3003e8b0884be7b2613f3ca89a38c4040377f3b69502542db819b5ed96c75ad48362c5b357578680a4ab1e4a68962
-EBUILD portage-utils-0.64.ebuild 1092 SHA256 73d7591d9e61f8ae7cfd43ec078d539e650ebd67fbda1ec212f8b688857b89bd SHA512 d39de750a6a4e4ad2522c2caa1a80a963430417412e0908a8e54f015be4f62c492a8a6038b8bdc7aa1bd42320cfc3af6c537d1931bc1cf235047cdbe3da259b1 WHIRLPOOL 52cca1546ea531f94a90207d91c7c650186bc6a4b636a88a304471ec745ee7766b24232b3cb6b2efc5e5046c172b46679069c66bf52e18ca4f4ccf21419dc935
+EBUILD portage-utils-0.64.ebuild 1091 SHA256 ce0ce84f03c77d99f263bbdd1ede443416c2ee58b954bfae515c047799779961 SHA512 ef73373fdfcd7dc2c205f90cf96bad725c3d9578a816548e7aeefadb6414b43dd290ca637d79e8969e8e40a41b6146a9dc28b05288719a18dcfc8f07f67e2cbe WHIRLPOOL 60332b47a5bfd03fcd8c7096a10046d601f77b8300964e05bbc2a5c58da27197fead3055077b429f254560c35ce69d9ccb588090c157de964d59c30a007416d8
 MISC ChangeLog 5551 SHA256 ff22e38cd7884953731308cce4eec5c58ab6fc20346fe1f63b67b8218f5a3045 SHA512 b60867699b62397ad1eeaa58a1f7a39ab7582b73df14901a3d7fc12c7c073a31090e051b8e5de4dca5ab5998765b20a015783569b2678efdd19b6d868a9b4ad0 WHIRLPOOL 69858193d50d6c894f176dffa6ea92cd759a1ed0eecb3403d3c695211260f9301e3dac724f0ab9571f74afc2d28b3e4512f18a5eb7b865eb97c36ec47bc31385
 MISC ChangeLog-2015 29800 SHA256 fb987414375c6e0cf3014c646223045e16cb82678578617025df2a8b51c05312 SHA512 3905ac03de51f61ceaeb5873c57702459af1dc6158594015752e2b72a636006664ee1a6da783f531a27988352d73c9dd8a68aa1775d44fd9649565ca380a2134 WHIRLPOOL ee3a960bc7e66f1f5501b2ad24aedacc7fada42337a3f3a7a6478098e48177f8c334749b13272fb27ba4ddefa37dcc3d85826decabe7363230bcb80973cae427
 MISC metadata.xml 214 SHA256 67bae2549564e628c2309c047a10077b3864da7f3903a79a64597be1197ca4d4 SHA512 d0c4ab837bd2d936086900fa4ad3d048ad069bfbc58dc7f07ad3819b383646d66f392407314bfe8f542fb8b0b2ffec0848bc7b2d122469f23b9ddaa4aec0a9cd WHIRLPOOL be2c2d84627f9fd53ea5a6b1d1e7bb570423c19588c69157546fa3f6d615be5f98caf2227a0d218ff4ca5df3433baefef6f6d2d7b1ecdec773f8ba8689477758
diff --git a/app-portage/portage-utils/portage-utils-0.64.ebuild b/app-portage/portage-utils/portage-utils-0.64.ebuild
index e4abec1e8395..3d08632ea6b0 100644
--- a/app-portage/portage-utils/portage-utils-0.64.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.64.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 RDEPEND="dev-libs/iniparser:0"
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index 750c7c10a533..2bef8e945878 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -1,16 +1,11 @@
 AUX repoman-2.3.0-bug-586864.patch 1034 SHA256 178a501c97e39666d49e656ce649c909433848a0ccaa45326fcf238e33ff9299 SHA512 463bd5f0255165faf0c60faa327c29d9eb1a6f9ccdf41369879485f234e1bf9d2713332c115b36088ac9227a56ca154786b3955b2d6e8ffdf7bdc3f10a5a762e WHIRLPOOL 82594eda5b608e4c5651ec769f76eb5842256160430319348f0a3dcc8934278e6ea03d39639e759d9880dd525febc59925e53ee53811fea8071fb000202a361f
 DIST repoman-2.3.0-bug-586864.patch 1074 SHA256 4ad35afd9237be63c1c2c21348501499c252c4bf828a04f08ca0a129e091001d SHA512 b48112a623a4844e5783f229ee0208f729b99ab46128d19735a76633efee17deb81342b5dc8fa67f4f4f5a851509c04c8d2f2ba2cbd992a9d26e61da4ed5f7e8 WHIRLPOOL f1cb4d9a11d8958fae726642bd0d12a0bb8d6564077c09b961fa2f0448c0503132683b4199e37f7cbd5bfd01adb1eede50496ed9b2ad32572284eacd3b2cd2dc
 DIST repoman-2.3.0.tar.bz2 75285 SHA256 e67d1a2dbb89f44e64a49259e64affcf138ade8ad0f397b93c9cbdecd517b726 SHA512 960c63caed12f7c89d374ecceb39677b62d588bf75cc8da1857641c60310061188f4c2fd7177c93a4e8f20cf00a423426f2a70666320f263158531a618a7ff9c WHIRLPOOL bff6d55a4abc5032cd3d04d8e56ec3bb7902c6877836ca4b129f5a57480c01eb6a6225b75fd0cc0b6a2a2991728896ddef3b7ee2a225a901c0523d88d99cecf6
-DIST repoman-2.3.0_rc1.tar.bz2 74621 SHA256 e1de34b710cd43787a91ab49e0b0a6ca32d942ee130ec74523b00f3c5f4ccefa SHA512 7594053472512ab66a269acd1e5f3a9191a519df061ed65b612af0ee30f830ff71ab6b602416aa968476fec1f534ecf313317a28df6120b74c7379197b769983 WHIRLPOOL 9e00736856879f222eaa2f8330109e92b8c7d262ed5a1ef0cf0c3c36f84dfdedfea2de202043aba7585f42353e1ebaf04b16329c812d7e71f957cf697899abd0
-DIST repoman-2.3.1.tar.bz2 76678 SHA256 93a39ff20eac6166ec29497ae2476cc168ea35d8822aaed33a3010fe9c2abf91 SHA512 6655027acaa6b98b7fdf927b6744e87b6ea09fe6d61653874aeb5603943aa9fc68df9435335dfc8f51d25949354660eaccdd1c8b659dbc87aea7a2f8bf3dfd16 WHIRLPOOL 29ddd58a8585a3926853beb66afe5d1a41a16667c9155b7dbc08a63ec02ea8873b304ac7267e3525341cd49c15dcc0dc01e0d0802c61a438fb75b113b7aafd66
-DIST repoman-2.3.2.tar.bz2 77218 SHA256 69b6ed4fae2475f4b4faa4117498caa943ec8e9e360cd5551e819abc7315d19c SHA512 262dfa8d018b318df695003ec1f370d0d2065f50594cfc2c2ef26989409f61d43e6c0e42d279ed1e316e2a9027ca3fd6e46a06b95d80700d57e0bc3e3713cb6c WHIRLPOOL b571a759717af651737047d13dd35f122d982a73091f2c4509ff4e45301badf947ecd10668f10ef5cb865eb0b0e49133ceb4561d9872bde9bc4de7cbbd524360
 DIST repoman-2.3.3.tar.bz2 78045 SHA256 8e8fdb81e3c1f0a7a1d49b161083fa39d47883b3b2bb6ff9456d23f41a75b807 SHA512 17212c19b14817a8a004619dd56ad557457d45919da45edfb27538304e68187fe1104f0b6ccc2b29fa1709645a7a82c75676b118b20d79dc790b0eb2ebf5a2ce WHIRLPOOL b4533763b06ef3e1e2e885bcc5340e05a4d8ab32d47856cbe48920066dcbdb4ce3fd867bef17eecd0caeb91e5481fefdab020e6046518145331727c9496a7a15
+DIST repoman-2.3.4.tar.bz2 78764 SHA256 fedfb840333ce6784fdd244ef23075b67fdf018f6c88aca459b48ae026e0e02c SHA512 1a434eea6361cc06ba3c27ccd31aa02875af1a577860490f8de666b0160370f09d1c46cea95d577163845e12c5672486b176c0009c32e735e16752d67bf4d96c WHIRLPOOL 695ccb19e820274eeb2c3d14506cc3239cc48d2ee925e6600aa311dd38f54617576d9d159fe5554323a89f18a75f83f6bf4478422607216634842185895a89a2
 EBUILD repoman-2.3.0-r1.ebuild 2524 SHA256 ced87e9d318754b7a622020f0af5a853a7466f0556fb2ff31a00d197c2ba470d SHA512 4fd4259a8160ea50677dbf7dd790fcd158dd48986e5ba60e6fd45db17d69e70f0a296e5b04f7a4199f1641364a558395723686763787117a0460c4837b89c0d7 WHIRLPOOL 03c0b1f6a9aa5fb54e7f0bab25e7de458ddffe5d213df09eddc07fea95bddbd940aad7f6f4234d7a6fc3f046216541c1286f55a414f4682080dd47ace4b2c1bd
-EBUILD repoman-2.3.0-r2.ebuild 2070 SHA256 b515ace3569a701282ffc57b0e88de2c02648fbb7c71f666adaaa1846a81d9ef SHA512 88c1b2d5bdb4d2673a01bfc818ff86a6d97ada48384fe3f1817fc65c420682e55a8b354ed6cfde341e8d36c443958d65b5753271ce5e0d32cb8888e226eea6eb WHIRLPOOL 99940667dcbe426e757372d0e7862f98f9a4b341c9ae4d6b3507954c024b534442c60650614dad65e8f78596c14817e8d57e6868627a991c0ee7eb08d7dd9e28
-EBUILD repoman-2.3.0_rc1-r1.ebuild 2339 SHA256 4c6c38efdfcde04082c1abccf2a00645acfff98dd7ef89e8691ff5cdc81277f3 SHA512 ea588da9b8b92cbd796093a3300d052d8083f77fd1f59ff62abf670a037e5e81cded59aa9bb8119f5c6fd387e57ccbb86dad6ce3c89dc0ade4bb22622223da5c WHIRLPOOL 93954d495fdec814267153ed0f8e7d27342406a9317c63b05202c7c8f57c16d2205430f1408ec838b93e24e8f871b0676af958c7cabcbd64e6b10ed15386f78a
-EBUILD repoman-2.3.1.ebuild 2308 SHA256 ae768d03e3e3169aaa1f2d71787e6b357fde3149c850ec296dcfc5eb832cd1ac SHA512 3dbdd9a4e2e3a7d7dcff47bd8961556499f9ff4dc16fac691fdd42f0e80c48d3da6bdd51b045f42696b5aed0aed6936d0d3d1b967bb9cec7c5b347e87ff7f84e WHIRLPOOL ed7304e9a4d7e2ba05d1f1958688262e7dab45d55a177ffb73c9c642e1dfc5df89b4b0e0a8d71232c4c62349dab3415cd3aa466959fb2548c870cf6d6987433a
-EBUILD repoman-2.3.2.ebuild 2329 SHA256 3d8f24a69c42d287cfff8426a9ccb4d422cdf46c1aba5e5ef98df35b2b122c8a SHA512 98e29099a07f6e64448c9845f229bc5bb8d6d85e957d84e920f1d6a7c08166c5812e01e8748bc77c9f75694dc1a6f421b7508fc005e24f7782d5cdbf21bc7e31 WHIRLPOOL 3bb64068eed7311ecbf46f8f555f0c4dd7727ecb04ac7f004a3f0a220bc8f724c65613335a705efe66afce0bab3f2cc6efb6ec5d44372f6ecdf11323edfb44e3
-EBUILD repoman-2.3.3.ebuild 2321 SHA256 2c2d87f313c5a22d56b0b7ae33d631a47681b176920fa7c4875f2e2d3ed804af SHA512 d864d75295c2895d2bf961eea2ccba01fa06f0b37985bff00965f40d01467870893021a6a66f62aba6f1fd57eff1cb255f97c4c3243bebddebaf8a189b340cff WHIRLPOOL ef1fbab485cb2d4a3e98158b217db094844e761d6856729df15e9aa672f6adce948487e677879fa3b3ab9b9a706a3e8599c7387c8099398f4557c623aab22438
+EBUILD repoman-2.3.3.ebuild 2320 SHA256 bbe1e6841001a32a7594415a6b03939cdd1b00b9f52b9e8b88073c3024d1d494 SHA512 30b61a3a5c12b53fa0edd7d8bf64a4ba082611e04cee2966661b2cabd4d52ae81430801fa18833ed9fb85183cf015c3d20ff416ce0a8ada0243f5c2e2838bccc WHIRLPOOL 8075fbc67e2e20b16462eb5707c1e27d4171f311904e1be4c61a34dc9d68d2d2ede943dbc4742ba6d336028011678bef78e2238cf488abc27e43661869c06573
+EBUILD repoman-2.3.4.ebuild 1911 SHA256 114c92105f529c817319119d3c8014f37f3fe1b4a5a2596267454b16a98ff428 SHA512 13466195689cc62920b4d1e74a8e0420cf41dd394785d59ed5f9f6f6b2010251fa29223c721d8d0e1e94c613b01c8f467257899327987bd9f18c3830f0826cf5 WHIRLPOOL 85d64a9e32c6294e59a10936d4ee98be8c6c3c8279613f5b782e1b7288e8534c53d0beb147d796102b612d9cdf37c5a9e2a0f662b4b73c0f6224b1b34145d379
 EBUILD repoman-9999.ebuild 1911 SHA256 114c92105f529c817319119d3c8014f37f3fe1b4a5a2596267454b16a98ff428 SHA512 13466195689cc62920b4d1e74a8e0420cf41dd394785d59ed5f9f6f6b2010251fa29223c721d8d0e1e94c613b01c8f467257899327987bd9f18c3830f0826cf5 WHIRLPOOL 85d64a9e32c6294e59a10936d4ee98be8c6c3c8279613f5b782e1b7288e8534c53d0beb147d796102b612d9cdf37c5a9e2a0f662b4b73c0f6224b1b34145d379
 MISC ChangeLog 3297 SHA256 e5006daf1eb546a30991fab2d1cac52df6c32b5527671aaefcc6d1df5013f280 SHA512 46e97258481fd9d9da54ffcd58af12af33fbd640e63658d0169e5118bd8af19e717008e049909754ff1af5645d0233c6ec0c5fed5f7e279e5bb2a13b2a88c500 WHIRLPOOL 7b8729002820e4a461853023ab65acb37edd535712da93f607ac330822c84d3c1159c2198cffb7e90b257e03915925debdcc83a1674bb089f97c7bc03775d466
 MISC metadata.xml 472 SHA256 86bc3425785a5e30c01ee34eec4888dc145ffb17a005a91ceed62141923092ef SHA512 53566a405056159de7412ea3b447ce6a7b73833fe927a04b5576bc77b2f4b181de8413956ff2b0b1836025352566b0a44252c2ebaf313cfea4020ea5490f3ab0 WHIRLPOOL dcbe2acccbeb3454b0ec333a99d35332c57801fa52e74efd2a14d4d605e64d26ecb93e41db8ccb40fa2efebe3715a83f7163c19d1e0a1d013c425a0f38ad6e6c
diff --git a/app-portage/repoman/repoman-2.3.0-r2.ebuild b/app-portage/repoman/repoman-2.3.0-r2.ebuild
deleted file mode 100644
index ed54ebf5fd53..000000000000
--- a/app-portage/repoman/repoman-2.3.0-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1
-
-DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="
-	!<sys-apps/portage-2.3.0_rc
-	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.3.0-bug-586864.patch )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if [[ -n "${EPREFIX}" ]] ; then
-		einfo "Prefixing shebangs ..."
-
-		local file
-		while read -r -d $'\0' file; do
-			local shebang=$(head -n1 "${file}")
-
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "${file}" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "This release of repoman is from the new portage/repoman split"
-	einfo "release code base."
-	einfo "This new repoman code base is still being developed.  So its API's"
-	einfo "are not to be considered stable and are subject to change."
-	einfo "The code released has been tested and considered ready for use."
-	einfo "This however does not guarantee it to be completely bug free."
-	einfo "Please report any bugs you may encounter."
-	einfo ""
-}
diff --git a/app-portage/repoman/repoman-2.3.0_rc1-r1.ebuild b/app-portage/repoman/repoman-2.3.0_rc1-r1.ebuild
deleted file mode 100644
index fba438681a65..000000000000
--- a/app-portage/repoman/repoman-2.3.0_rc1-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(
-	pypy
-	python3_3 python3_4 python3_5
-	python2_7
-)
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1 multilib
-
-DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-lang/python-exec:2"
-
-RDEPEND="
-	dev-lang/python-exec:2
-	!<sys-apps/portage-2.3.0_rc
-	>=dev-python/lxml-3.6.0
-	"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/repoman"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "This release of repoman is from the new portage/repoman split"
-	einfo "release code base."
-	einfo "This new repoman code base is still being developed.  So its API's"
-	einfo "are not to be considered stable and are subject to change."
-	einfo "The code released has been tested and considered ready for use."
-	einfo "This however does not guarantee it to be completely bug free."
-	einfo "Please report any bugs you may encounter."
-	einfo ""
-}
diff --git a/app-portage/repoman/repoman-2.3.1.ebuild b/app-portage/repoman/repoman-2.3.1.ebuild
deleted file mode 100644
index 6a2af5d05d95..000000000000
--- a/app-portage/repoman/repoman-2.3.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
-	S="${WORKDIR}/${P}/repoman"
-else
-	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-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="Repoman is a Quality Assurance tool for Gentoo ebuilds"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=sys-apps/portage-2.3.0_rc[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if [[ -n "${EPREFIX}" ]] ; then
-		einfo "Prefixing shebangs ..."
-
-		local file
-		while read -r -d $'\0' file; do
-			local shebang=$(head -n1 "${file}")
-
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "${file}" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "This release of repoman is from the new portage/repoman split"
-	einfo "release code base."
-	einfo "This new repoman code base is still being developed.  So its API's"
-	einfo "are not to be considered stable and are subject to change."
-	einfo "The code released has been tested and considered ready for use."
-	einfo "This however does not guarantee it to be completely bug free."
-	einfo "Please report any bugs you may encounter."
-	einfo ""
-}
diff --git a/app-portage/repoman/repoman-2.3.2.ebuild b/app-portage/repoman/repoman-2.3.2.ebuild
deleted file mode 100644
index 93c73208b024..000000000000
--- a/app-portage/repoman/repoman-2.3.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
-	S="${WORKDIR}/${P}/repoman"
-else
-	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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="Repoman is a Quality Assurance tool for Gentoo ebuilds"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=sys-apps/portage-2.3.0_rc[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if [[ -n "${EPREFIX}" ]] ; then
-		einfo "Prefixing shebangs ..."
-
-		local file
-		while read -r -d $'\0' file; do
-			local shebang=$(head -n1 "${file}")
-
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "${file}" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "This release of repoman is from the new portage/repoman split"
-	einfo "release code base."
-	einfo "This new repoman code base is still being developed.  So its API's"
-	einfo "are not to be considered stable and are subject to change."
-	einfo "The code released has been tested and considered ready for use."
-	einfo "This however does not guarantee it to be completely bug free."
-	einfo "Please report any bugs you may encounter."
-	einfo ""
-}
diff --git a/app-portage/repoman/repoman-2.3.3.ebuild b/app-portage/repoman/repoman-2.3.3.ebuild
index 14c363f5d47c..fe87e427fefa 100644
--- a/app-portage/repoman/repoman-2.3.3.ebuild
+++ b/app-portage/repoman/repoman-2.3.3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/${P}/repoman"
 else
 	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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 ~sparc-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="Repoman is a Quality Assurance tool for Gentoo ebuilds"
diff --git a/app-portage/repoman/repoman-2.3.4.ebuild b/app-portage/repoman/repoman-2.3.4.ebuild
new file mode 100644
index 000000000000..a5a60b0ee04b
--- /dev/null
+++ b/app-portage/repoman/repoman-2.3.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE='bzip2(+)'
+
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
+	S="${WORKDIR}/${P}/repoman"
+else
+	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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="Repoman is a Quality Assurance tool for Gentoo ebuilds"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=sys-apps/portage-2.3.0_rc[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "This release of repoman is from the new portage/repoman split"
+	einfo "release code base."
+	einfo "This new repoman code base is still being developed.  So its API's"
+	einfo "are not to be considered stable and are subject to change."
+	einfo "The code released has been tested and considered ready for use."
+	einfo "This however does not guarantee it to be completely bug free."
+	einfo "Please report any bugs you may encounter."
+	einfo ""
+}
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 8b0d28d04b28..9fe52a8e1ac9 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -5,8 +5,9 @@ DIST bash-completion-2.7.tar.xz 280048 SHA256 41ba892d3f427d4a686de32673f35401bc
 DIST bashcomp-2.0.2.tar.gz 3625 SHA256 6ede58bfbe99f0dca1eb9236492aa20a6755e5731526de56e15d1e2b220165c9 SHA512 46bc1bcc32263135f44be68569459a409250dd2c81c18190735f11e13a26508e9d3cb91d24a8fe7b21bdea678347873b7ac1b67d5e8c78c8444011f85dfdcdce WHIRLPOOL 4b6cb989235d5fed8fd9986c1419ab337df38384fe2b307fd78f08f8696f4a2328845ed4f27913a36e9a544e973690bc0dd2af73816e272c3faf27ff2eafa585
 EBUILD bash-completion-2.4-r1.ebuild 3173 SHA256 09d54454ec4c629c21747d071a2c31e432289c207d96b3eebc8cc651ec2fef2a SHA512 5421a782dff1e908fdaafa97b58bcacdaa250ce6d0a701765506bd3384a5f32983bc86e4733336913462102c842b8168fb9e30450180820ce0c6239582467cce WHIRLPOOL b2d3d4d43181c63fa2c49358c6a5d47f310fd6cf578167180aa43eb49784bfa8f0852954460118a34001f00f585459ce975003fb8612931c2b312ab37f038d75
 EBUILD bash-completion-2.5.ebuild 3183 SHA256 2d5e15afb28616799eb7b6129f1c112009155685b7c15fe0dc8214820ae21ae0 SHA512 a3a790e199dfba8150c2f5abdc120e5c3b8b41814f996c034e432b4633b211f79eaf056a3622823b36ea0a259cb9ee3ce09210e3e631250fdd6cc315a2642e0a WHIRLPOOL 35e91efe36b01564a3e913980c5990ee5cd1dcf0f0826d360adc42dc3b3cd07ad011e348c6d3f380a450e351b006dbd847ee7b79469312502bdb4a10e5fce34e
+EBUILD bash-completion-2.7-r1.ebuild 3880 SHA256 cc720c4b6680d7e01ceb6058d7dac216e13d856689debf90bd14533f987acf93 SHA512 ad265aeaddcdacd962972df67c996735a08ab82de41a24e23189f4f1b81fe753d2b8f588e4b36699b98a6b0072a5f23b2267c3cc369857747b4c4d97e041cd16 WHIRLPOOL 990c22675fd92eeea3227ecfe228fab498345e97d973a77467f70b06869533fb5cc7cca3547d900071467c86b320d916531c090855b742c16144e5d4f111a780
 EBUILD bash-completion-2.7.ebuild 3830 SHA256 f9ec686bc229fab63cd5ce40eb1dbae31390b6a5dcf7d5b9beaf0795971509ca SHA512 7d49ec4fe462c1cf62ad61e76d4427d231ad8aeab4dde7fa0a921b13503a4ae4f382d1de820f208c13ec656af2d26aad8e4b107a906e941863e5ece381b5e645 WHIRLPOOL 4e91de2ddba1f285dacba09265a2fdf7f590a9a5d202aae96ecbd09b1bbbc9b71380269e78b6eb9f8a792ce241c23297cd9ad2849d8969a9bf855226ba1f6fd9
-EBUILD bash-completion-9999.ebuild 3798 SHA256 6e46d1c15ed52aeddf28bdb6ab7be20bf445a92f236c70824fc026113d3c23ee SHA512 6c0f24c7202bf08fcdc5a7e1e78187be0349bf83bc1aa98a5f47551adf355c88ab11f53693c0972ba2622c477f549f91d3f5b1bcdb407ab96fab9311cc649a95 WHIRLPOOL e33502210356baacdb67938b790384b1fed0f67e7500866345daf9c7135a5727a17e0c5b3517485ca82e85c1ea5131f1db4394e4575ed5dbb2372cc4599f1ec8
+EBUILD bash-completion-9999.ebuild 3859 SHA256 4916b1c81013285d987cf55c22af96ead1e35f831bf99342a351d709ee49da09 SHA512 01d182b8eba17ea9d661b8c562e5b066c82a3913e593ff82da817f0c882bb13e4ebc825cafd9ff9bf594fd545da90dad2f5db498db5e12a089d58f5e66b87633 WHIRLPOOL 56fc5d5d8aee6983c1b2b1c74f42b8950f8a98c214788eb938a79598a9d23ea61014cb14b0bcfedfb07364042854f8a364bb94e1642ce5f718b7c1e9a765acc9
 MISC ChangeLog 6192 SHA256 7aa78e4d3347e97e9a2676ad90b03dcfbf6bb185ce6f53050786420a7e58b42d SHA512 d689eca6fe0572923dbc618aa95d7a4b43a92654d6485ca14ae974581c3728dfeac45f139788b22b56d17ae86e063316e474f8ce10a7092e43abaad840579c2c WHIRLPOOL de6bc49d153a04b105d21a4de5def31dc028638190a4b51d66d241abaea7206d5704ddba15bef9a5f74acbce2a0b134d9bb38deacac896e9ab4efd16ccc22ddc
 MISC ChangeLog-2015 49155 SHA256 df2d7ecd84a601d6a713409dd0ea3f8c2dacadf9b2f637769c6e8787d66cee1d SHA512 31fec84312c20ff1612f57f1bac506937c128b13005246ba36eaa449c1aff7712cc3645952fb9eebf3a24483590010fb5a954d43f238f47cd759911830fe5205 WHIRLPOOL 1463d6fa3480fd139341ade021e1e70884dd72e5f22aa16cb74eb11c8c4b606014b0b4f6369db06fcc9c76e354016d196a2b206fb0681c5b71237aa37991c914
 MISC metadata.xml 1285 SHA256 efb4f76c8b2dfe1e809c94fd10aac8b3a4e3ada43ceb33f95193ba246a482529 SHA512 e935bab45ac355ca0a05df6f6f9aaf8e20ef73fa3ce4f2bde83b331cccaa7ae7756a6a62a075b148194b556da8f41f4cf2aa72f271958333d026913ddbfcc133 WHIRLPOOL 6e76587fa0d9e19603fb1bd27100c076ed00840f994bd2b73b9208f438503874dcdc02be6a9c986666cf6d00fb9068d6a6f6dbd1de7662e282be11652412ac83
diff --git a/app-shells/bash-completion/bash-completion-2.7-r1.ebuild b/app-shells/bash-completion/bash-completion-2.7-r1.ebuild
new file mode 100644
index 000000000000..421b73926166
--- /dev/null
+++ b/app-shells/bash-completion/bash-completion-2.7-r1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+BASHCOMP_P=bashcomp-2.0.2
+inherit versionator
+
+DESCRIPTION="Programmable Completion for bash"
+HOMEPAGE="https://github.com/scop/bash-completion"
+SRC_URI="https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz
+	https://bitbucket.org/mgorny/bashcomp2/downloads/${BASHCOMP_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+IUSE="test"
+# Multiple test failures, need to investigate the exact problem
+RESTRICT="test"
+
+RDEPEND=">=app-shells/bash-4.3_p30-r1
+	sys-apps/miscfiles
+	!app-eselect/eselect-bashcomp"
+DEPEND="app-arch/xz-utils
+	test? (
+		${RDEPEND}
+		app-misc/dtach
+		dev-util/dejagnu
+		dev-tcltk/tcllib
+	)"
+PDEPEND=">=app-shells/gentoo-bashcomp-20140911"
+
+# Remove unwanted completions.
+STRIP_COMPLETIONS=(
+	# Slackware package stuff, quite generic names cause collisions
+	# (e.g. with sys-apps/pacman)
+	explodepkg installpkg makepkg pkgtool removepkg upgradepkg
+
+	# Debian/Red Hat network stuff
+	ifdown ifup ifstatus
+
+	# Installed in app-editors/vim-core
+	xxd
+
+	# Now-dead symlinks to deprecated completions
+	hd ncal
+
+	# Installed by sys-apps/util-linux-2.28
+	mount umount mount.linux umount.linux
+
+	# Installed by sys-apps/util-linux-2.31
+	rfkill
+)
+
+src_prepare() {
+	eapply "${WORKDIR}/${BASHCOMP_P}/${PN}"-2.1_p*.patch
+	# Bug 543100, update bug 601194
+	eapply "${FILESDIR}/${PN}-2.1-escape-characters-r1.patch"
+	eapply_user
+}
+
+src_test() {
+	# Tests need an interactive shell, #477066
+	# idea stolen from:
+	# http://pkgs.fedoraproject.org/cgit/rpms/bash-completion.git/tree/bash-completion.spec
+
+	# real-time output of the log ;-)
+	touch "${T}/dtach-test.log" || die
+	tail -f "${T}/dtach-test.log" &
+	local tail_pid=${!}
+
+	nonfatal dtach -N "${T}/dtach.sock" \
+		bash -c 'emake check &> "${T}"/dtach-test.log; echo ${?} > "${T}"/dtach-test.out'
+
+	kill "${tail_pid}"
+	[[ -f ${T}/dtach-test.out ]] || die "Unable to run tests"
+	[[ $(<"${T}"/dtach-test.out) == 0 ]] || die "Tests failed"
+}
+
+src_install() {
+	# work-around race conditions, bug #526996
+	mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die
+
+	emake DESTDIR="${D}" profiledir="${EPREFIX}"/etc/bash/bashrc.d install
+
+	local file
+	for file in "${STRIP_COMPLETIONS[@]}"; do
+		rm "${ED}"/usr/share/bash-completion/completions/${file} || die
+	done
+	# remove deprecated completions (moved to other packages)
+	rm "${ED}"/usr/share/bash-completion/completions/_* || die
+
+	dodoc AUTHORS CHANGES CONTRIBUTING.md README.md
+
+	# install the eselect module
+	insinto /usr/share/eselect/modules
+	doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect"
+	doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5"
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 2.1-r90 ${v}; then
+			ewarn "For bash-completion autoloader to work, all completions need to"
+			ewarn "be installed in /usr/share/bash-completion/completions. You may"
+			ewarn "need to rebuild packages that installed completions in the old"
+			ewarn "location. You can do this using:"
+			ewarn
+			ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +"
+			ewarn
+			ewarn "After the rebuild, you should remove the old setup symlinks:"
+			ewarn
+			ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete"
+		fi
+	done
+
+	if has_version 'app-shells/zsh'; then
+		elog
+		elog "If you are interested in using the provided bash completion functions with"
+		elog "zsh, valuable tips on the effective use of bashcompinit are available:"
+		elog "  http://www.zsh.org/mla/workers/2003/msg00046.html"
+		elog
+	fi
+}
diff --git a/app-shells/bash-completion/bash-completion-9999.ebuild b/app-shells/bash-completion/bash-completion-9999.ebuild
index 543a7c362bb1..0d8fdec50aa0 100644
--- a/app-shells/bash-completion/bash-completion-9999.ebuild
+++ b/app-shells/bash-completion/bash-completion-9999.ebuild
@@ -45,6 +45,9 @@ STRIP_COMPLETIONS=(
 
 	# Installed by sys-apps/util-linux-2.28
 	mount umount mount.linux umount.linux
+
+	# Deprecated in favor of sys-apps/util-linux-2.31
+	_rfkill
 )
 
 src_unpack() {
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index bc1863eafe67..d97af0a9d049 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -8,7 +8,7 @@ DIST dash_0.5.8-2.diff.gz 41715 SHA256 00168a934864c26cae9a51367fe7ea013ece2d484
 EBUILD dash-0.5.8.2.ebuild 1696 SHA256 bfc5526949abc2a6321882fcae4805738c2334765885303eb7ef0b6e666784f2 SHA512 66d84df096ffdce607a3f4bc4e857d807955d945245f96db6e9a33640306ccd3418c79691f2f7e08efef7a877c3e79902c39340ec68d5bab9b0cc657554fbbd7 WHIRLPOOL b84b7e4d6e06a5cb670cbd4aa93f58e3837c188edf159689b4461e762f342cacf3ca224cf526e6f5204d66332c28295cd0c98f04e6d3a9024a22abde0510fdfd
 EBUILD dash-0.5.9.1-r1.ebuild 1949 SHA256 6f2d7aca634cd3cba114c8ecf261ff39a8991db1798890c0b6e5ac5ad8171bd1 SHA512 37324ad3e7fdb9f23924191ab0ae841e6f1948e7b9a9149af55314ee13b1577965c1f3fa5b464536928adb5045a2b5573eb8785316dd60f5008aeae8efe7e199 WHIRLPOOL a91fd8511f18111ae8a488f105b90b578588902dcd8485816936b57790d775a7cffd10b3569e5b2e4e8e2c52d5a4e29fad1dd2be9998c40c6472882ccd0b6f9e
 EBUILD dash-0.5.9.1-r2.ebuild 2048 SHA256 fa063b40842e91cde7d130daa0ac8c0c8d4c21189f873ec9580c9e5b6fd53420 SHA512 59341ffefbc51e667f45412a518ae5264b2192657d201a2852e446445e243e8da2f1ddc0ade395616ec5359037ee38bbaa6804b68e809e30f106796964b8bc5d WHIRLPOOL accc020b9532f4491340dacd4806471381692164107634f992afca399df40c77b0f4f5e917dde33721bb72c66a367c5db201230ae0e2d394685f1f2c8bc245d9
-EBUILD dash-0.5.9.1-r3.ebuild 2106 SHA256 e304bcb079674e066eb492f337651287ee98d60ba7e97f7c93e30aca1403feab SHA512 f2a29e18b56749bb0da754b273a9bc53e8660064445db654ee3c4cf0376b554c28dde1ccfc72425538ca4ded1f8545129c8020ef91221adda3e8171cfcc8e50d WHIRLPOOL 87dee1f0382cbc58169d09a84a5204506a2d2fe62cb5992a1d39a11ec4386d09fa58e6f659e64f186f1e53ac411fb7f0d8e9a5c195cb6b28b1e2197090c1299a
+EBUILD dash-0.5.9.1-r3.ebuild 2105 SHA256 0984b1b8c22fbc6e2d053f2bf8ff946f8d1d9b3f2664809946fc56399f68dd33 SHA512 70698c7ff0fcb7b45915a816be24c3b33cf57bfd1acdbe9956519b1a3c44976176f0fab4a7e7bea324278817b548566ff43aa92d63b743f7503d9da37e69ae9b WHIRLPOOL b67e54f65ee99d53e8ee9ae8a39411883c67f5e83e2ac177d50f28e907124cf364eb106bccc04ce0d46dca1e80d011c82453dc9ece2ea6bf1bb6a265cfc1e688
 MISC ChangeLog 4024 SHA256 34814af15c0326e0550d05b318c80c92cb2d2c8cc1b73c351899496f6e93a9be SHA512 ec30c4d901539291f6283e2168bb568e5ffa2094a7d9b5943479e9fee4b25aff48249c9f89e2aa4c7c743ff30fe7be5b6c178a2296ec0ccfdc01b93b515dbaa3 WHIRLPOOL ff46e3a76f0ac408ae8f2d8dfb72a79933c17f8ddfc8c912f1539bd8bcfc5fd0ca0c2a2f070e2945e6b6be5bc075de736971ca2c61b63c18b4620624dcd0b503
 MISC ChangeLog-2015 18249 SHA256 8603fd4a2bb147a85bbc0d443ecb01237ca2607e5de8e3131f7677c5053dbf42 SHA512 2a33ff70bbb487004062b25f615229b2f36ccb8e906cac77cee864ac8b3d86451ad5f791019cdd1305256cff4e610497df25d9884e2b49ebe4484d5652073156 WHIRLPOOL 015ff7d5fb87a8cbbbb0917924801179c458aa83a77f8152ef3589a387b29a8e6cf9b447f3125384999df25880647d777862d114316495c15553c35b611a76da
 MISC metadata.xml 598 SHA256 424265a2612ef7988f5b18f295731dd2feb92837c2c7394017d888284fb4ea92 SHA512 a477ff729919625c910ef9a0b95ea85e683122383c4026c1c51f163d8faca06749ec05eef8b4f01ed9eede68b49e637f24f94202b8a00e67bb01bc21294610e6 WHIRLPOOL 57ae7f76ae9a062b54db43161bfbe74412ddcdda26fb6da0e82ebad02f593e4ec48e67608a80b45f9637692a5bfaeb8b63f2c6dba8d8cc418571c7a201ed2867
diff --git a/app-shells/dash/dash-0.5.9.1-r3.ebuild b/app-shells/dash/dash-0.5.9.1-r3.ebuild
index d0c39a8bc4a4..fb0b070b5f1e 100644
--- a/app-shells/dash/dash-0.5.9.1-r3.ebuild
+++ b/app-shells/dash/dash-0.5.9.1-r3.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libedit static vanilla"
 
 RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index be8691eef107..9849e3c1a3ac 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -4,7 +4,7 @@ DIST fish-2.5.0.tar.gz 3496831 SHA256 f8c0edadca2de379ccf305aeace660a9255fa2180c
 DIST fish-2.6.0.tar.gz 3575346 SHA256 7ee5bbd671c73e5323778982109241685d58a836e52013e18ee5d9f2e638fdfb SHA512 d4ded5ce24600e85673a7bb016e9dc36bce999b27f40e6b1ce0b9ca49a421be2d444d9d2b6f178f6eee963e59daa4a65df4c3de2a8086a610486f758fcfb0ed1 WHIRLPOOL 3316c1bd8778a1eba5b7b65edf28495ec89ec01ba3d0bc26cbc64ce69bfcd73a538c9a5463c9385f55689e3e680241d37e36bfec309f87c6ee98934f74fd7aa4
 EBUILD fish-2.4.0.ebuild 1877 SHA256 29a7ab3301e00e6610cedb280d95fd094f97eb2e62a4fef0f3f1ac0eac91843d SHA512 d933209c285be394428524f844cd3bb55a471fbc79be0a3581a8cec73b0dbb73ab386782bf5b9a8ecbfa1fcc20290be4b822948deb644fa185145941cb9f25d7 WHIRLPOOL 7131a648485aa4a5fddd16599febc4ff5324e5cad5e2235fcd444eabc929927dbf58d791b29a96437a22d01c641851109331f326f7f57ccefe3bc14c4a0609c5
 EBUILD fish-2.5.0.ebuild 2122 SHA256 faf104bead0103640a62bf883dfaf063daa387bae3b1551b85a913782a579121 SHA512 28dbe1515cb8f96b35a9809a5b103bf45a79203050d2374838fc031f4b7b97fad07459d8899bab702ec98e2798540ce9e52963eb4f5430c0260528a8ec6851a7 WHIRLPOOL 3ce775ee38e1f4c7a2a39ef0afbce080eb08cbde3c5a9be7d3aff4b5fb6eee081f5d6c49fd27bc85da2fe5e189a60332db0427e57f7c4aa2e84f04d23d17a3b4
-EBUILD fish-2.6.0.ebuild 2103 SHA256 7be05b398f9a826b5282dec274978c55949ecb1e46cab034e038efe539cba550 SHA512 223a3d7c7fceaa6aea83138b737cf74ab72a1b2b17c7438f43e837d986fcfd5583bda79a3f718cd524bfba79d11b1bda61e814b3708a75ccd932d9eb08919a85 WHIRLPOOL 944500326abcb1d9a22450b92892d351e2823bcb3edffc41c0efb1bb25c88c36272d909c18e0b9f80a391096b834e5fd72fa69c5f1388ed360d6a81528926bad
+EBUILD fish-2.6.0.ebuild 2102 SHA256 c3848a3d139e74813fc6684fbb7e3d67994447e649fb857739406e633e5d9592 SHA512 5dc3509e05d5151f7c5705381f0a2aba8c98b6d208a990dd49de9250bfbaa46a96eab247b175acfa0737aa17370d65d93ccdffbcc020897cb7d907da7a9bbaaa WHIRLPOOL b4338606075d6df076a5d0decba711cd47d829060fb0da2d6fd5c24b7b2b636854dae1f88b930ba5035f606cf8fb1be936d7c518c4a9418706f37867859b5fd0
 MISC ChangeLog 4266 SHA256 a1da0515d9df5080a95f75942508c85d0a11971edc4cec45c0fe9d1b6e0724da SHA512 94ce9fd4fe7754244eb5cf33804c27a4a46f262e7f35f6b73991d741c2e28e0e898b0102e070582daa9821582fa6ffa66967bb9c39fd30224a04c7b6c38928f8 WHIRLPOOL 94cd84f0494023da953bce4fe02f7ab19a8da8b4638122ad2b9dbca271fa5a1ca0dccca663ff1898609153b5da1da15d833b8efe5835f12a569891cd66b798c1
 MISC ChangeLog-2015 12909 SHA256 4cb0e569f70bf96e0968b9ab6fcabdcaa7c1ec3e36a3f8897174b6fac87cda73 SHA512 c74ef90c9574c8115a3c23dc147095f036ff6b121933f837af451a8fbb974d4d8599668da9cd81afcde71ec7a10dda331ea25b64f5ca9296cb1a0708f83a86ba WHIRLPOOL cb88ef78f054b75d1687b98536f23b45ad4fc79a92d6727f61b5f2eb443d64fc50dd89ade150bd5912ca9bb9da2c27091294f81456562c1acf762b1b2a3ec72d
 MISC metadata.xml 509 SHA256 73aa49594b1c3a374bbcd282f4c66ad58744a88ed0b858d1ea57b0ac50016d5b SHA512 b4ba8bf04d8814847af718f64bfc59e79f6146f2841da5b8e9d1854caa9d72526cca85d2235483970656f5d78a9bcaba2d636b91ef6406f6f6a32a9fee3c312f WHIRLPOOL 23985a921962a204f7e8d732a8384c990b6acc393cf3bf00d2c2c2d425f933ea93bf9830010703f9d885a3f4377acf88ea7eea694c516c70a86c249d38c9ffc9
diff --git a/app-shells/fish/fish-2.6.0.ebuild b/app-shells/fish/fish-2.6.0.ebuild
index fdb99dc66952..c8031c924452 100644
--- a/app-shells/fish/fish-2.6.0.ebuild
+++ b/app-shells/fish/fish-2.6.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${PV}/${P}
 
 LICENSE="GPL-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="nls"
 
 RDEPEND="
diff --git a/app-shells/push/Manifest b/app-shells/push/Manifest
index a2050479da05..b1a0e0ed2814 100644
--- a/app-shells/push/Manifest
+++ b/app-shells/push/Manifest
@@ -1,7 +1,7 @@
 DIST push-1.6.tar.gz 1955 SHA256 713dea172ede55971ff82da932782503c2aa6703eba73c1ac317ec4c8eb22e80 SHA512 4623f51249138bacb7251fb5d5d1ae8dd070de7ce628e42b6eed90a4b6ffd36d28eb58b116f5b1833bc1affa8db539da9b94d104ffe03c6bd1e294b56c393c86 WHIRLPOOL 787f65542e92fd10c411969d03ec17b45a90b35e9c8e17b9fb3e732fb1d97813f04c3a03cc329a469a5bea2a194f879f4c600e2e534dd8c778f7f712d4c171b1
 DIST push-2.0.tar.gz 2211 SHA256 2d5e1c5b580f77ac9fb65b7b75c6220ee88687b6e7340ccc746e42e5632604b0 SHA512 03c40bd8b3b09473952ecf13edd622533616de47638741214b40856b33993f9310d62be34fac6f68b950f58167c3111082554961a800a43a3ecf8a7d138ffdff WHIRLPOOL 6abbad060edbb3d9873c24b73bc61f38f6a4fd38633021e66f8d3a5a04b61dfcdec4c68afed5e8fe06f817cf924adfafb439ddb415c71fc4e1b52ce561ec6fa1
 EBUILD push-1.6.ebuild 661 SHA256 6f6c67a0131bdbc3255eec0f315f06354c2bdd47243387f1e986f4507261399e SHA512 0ea7a9793359168d5b07d8a7cffb157cc472e6cc1afffe8f3be57cb65b6572e5a096c3f85b99421817f7e798c30352817ac7ca1eefae76641698708c6c641cc1 WHIRLPOOL b1a19f2099b2292b5450e2eb520edae303d07504c308922ea20ccb36b66973dc5012ebeddc4f8263c73cce6cc23ceb48fad60ee98004002463ef499ff4ab1376
-EBUILD push-2.0-r1.ebuild 698 SHA256 2a5f7003e534f23221c5bfcff6c0fc5bd33f6408cd1edf74197c27df95b78073 SHA512 6634aeb94adfde408abab4f329da2e588b080b298fc26af7c874395eff38fdda4514ed7b7e523252187a37e75aaf268bf1eebc81d4a9cefee5bff242dc8912c5 WHIRLPOOL 2f5bc9e71234b0d86da4db80614389b3dd3ae5679e85b254a496ee10dd9a01ef497193076e9d2fdf9ab35f3600ff0b68dc011c99eae35915b080690e17bfc365
+EBUILD push-2.0-r1.ebuild 697 SHA256 5a7e7c03c13c2f33daa7563a8107d93a3ec9ee35fdea58fc8bebe520fae5466c SHA512 f6d0afe56c7713cdbde99251363b0a4d597c243896ff9ff6ccb68148c59a029a668e2d1e00013d924b8cfd24fb527b9579766c21a9c10b99b2384daa0794ab4b WHIRLPOOL f260a7fdfdbcb4df2a24b56786a1cb4e75dade0ce43d173d44eba6b36c6c416a1fecd51ef1c3c474b8a4605940814f1f4dc92ea7705d1199a131e778662e50ac
 EBUILD push-2.0.ebuild 656 SHA256 ed1ad22a35b15c2b52bc229d7ebd50132813b8e0dc9c19aa15d311bd970a3d96 SHA512 3b931ab3ab95d5fe39d7ce75284509c12978da5cc8628ca3b68672595d98ebad9cba9f00b5c8f4138bb8a27f0908e3a9cee34123215433387088f224c400b798 WHIRLPOOL 9d87c98449f0a80344d3d97e17a5bf10e8629d88055595549f4659d16fc2b8d552ea8f63d1d4f7f27e51575ee8a3b358f19013f09b9790b3086c0bfc26b1ff24
 MISC ChangeLog 3126 SHA256 513a6b419196e34ba3508aa7a0a1f69fc4c70298ee9ce8566a35156758a6fe68 SHA512 f4b108177118ba3c1344dc069355392a21f56a30761502c405a9e96b75575e89c3d02c6193f43055b2337b00c706fb112dad59cbc264dadce3aaee2a5af8fb65 WHIRLPOOL 05a094e3ce8adf0645fc9ccdfd277018fc5e2a0684a94377e5c9f48db720ceeef64c344f3c4211e5d48659733b3db5eeb91e1472fe1c393da909369902e6ad75
 MISC ChangeLog-2015 3213 SHA256 86a9bcba288cbd5fe5a05d4a87f3ca0af1a948af27d6483e86a4252c66143ff7 SHA512 0bbe433febe296ed1f402839233583a0920e628a2517b6ecb3a060f9bee257347450c9a716388e54fb2603c81d18c0d4566fc791a8949b95bfc320a69ce7787f WHIRLPOOL 940bf04364b14cc63d0b7bdd5866f9098d8f8f2124141869022829b89ef53fdb81e369310c22ba6428ac0cea676b84d47e2f7df19d0d218a7b65de3a418c2585
diff --git a/app-shells/push/push-2.0-r1.ebuild b/app-shells/push/push-2.0-r1.ebuild
index d2b87d7693bc..1dab5893c5b6 100644
--- a/app-shells/push/push-2.0-r1.ebuild
+++ b/app-shells/push/push-2.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE=""
 
 src_install() {
diff --git a/app-shells/quoter/Manifest b/app-shells/quoter/Manifest
index 4c8a6eda1871..d2ec1c240923 100644
--- a/app-shells/quoter/Manifest
+++ b/app-shells/quoter/Manifest
@@ -1,5 +1,5 @@
 DIST quoter-3.0_p2.tar.gz 10691 SHA256 19a335095991c8fa0f637c81b7e8b9a262af67e230507af87f3c113228965732 SHA512 23d77105fa05d79a7d0bcaa3f6aead25b7cb3b6f459d2740314616da587e03cd3e6b0b1e8af8f79904309bbe76603db848d42996ed7ae5ef779e27184a434fb5 WHIRLPOOL 1c083d7dc9bc8e1e4719b6e4c03087f39d4324df3aa70011e84087c7de3145f932ca3ae9fc1057b17dbe9471592c5d32ac99dff63b7962fb3c7548b31aa2a225
-EBUILD quoter-3.0_p2-r1.ebuild 766 SHA256 19992d1263bb0bbe79dbb3aa2e0110b7e68b475515413779129293f9338422b6 SHA512 4290c496e95469d29ed10bf4c8cc808080492acd5380ae1753e16902cddeebe721f9e041e914aa18e78769f348a3cb38fac1423e80920a26464591ccdfac3b8b WHIRLPOOL 01f78f4512b6a1606a7710814471b6ab2c1df50f2ecb057ab124191bf579b5a386a6349b0dfce70cab6d40ea964f258adb91c40149826445f051035064e694ce
+EBUILD quoter-3.0_p2-r1.ebuild 763 SHA256 d0f340a73ecfa37ee984c433d0d07fce339ebb29d8153a0bf6c7f4ee099095bf SHA512 86229152dba6ac93ee22a80564c907d90bd927400108707594b390ae927699d597db3283092e3f980cfb6e9b3ff07992e476ff6d7aa0de062af3ff85f451cb3c WHIRLPOOL 6336a72ea8c3050f5c8f5e3bbeef819d4c4bdb1e6a571be84ba4fa0b4a3dc51074bb917fc6ee5215d172d0fe16de1d392779d92ca43b7861c54fb0baa39ecf32
 EBUILD quoter-3.0_p2.ebuild 652 SHA256 794d3fbfeae65d9e54ab274f0e0e8e060775e34e733de22d1010252110b06c60 SHA512 0196c51aaf96642caad2a0263cbec45ba86f74dda973f0bfd959ac8a644812a389f3f79b83892bff9535b1fb0bb28aa0e9479bf4d4b0f73681971aaa88237663 WHIRLPOOL a2db7f15f27786f08ebe176592e369367d9693c7dd38888308a2fbc19300e10098012c6ed78da12fddeb14da9d71991f6893f3e32857b7ef4887ad1e211e2229
 MISC ChangeLog 457 SHA256 0412d4151c0c50ec8543fc799809bf6538a8edf5462fa0f618d2f283cab313e9 SHA512 afc61b58837490575e8cf4fc2b4d01f4f7e8eae13f0c96432571ba7b2d2306698fdee31947a988dbada978a81dd4e417ea1544555a0e093a34970caf9ed4598a WHIRLPOOL f5289411d03ee5c837315fd67c0e676dadf122214c75d424dd74e5294b46ff148b5cc17534ec00700875e50e23b2c527bf476bb9d44d7e33c3a20a6384b1969b
 MISC metadata.xml 696 SHA256 9ba9b0f2104b664f7dcaa9077ada0449368a5f1060f50f13f92ef8841ca1c20a SHA512 30cfae6f7af84bdde697740d3d03d27ddaaed81cd631a9fb8e2b12f11e8acb0de2680437b5679def2c8e3bb09bd69c26651e89d4f67e46b2e72e6e8274cee358 WHIRLPOOL 99bd2dae80f381c15370f469a3b706c182c538368ffe7a1b9307b46f479c3aa2e7b263e6f7ec71c942533be541d6401dde47ec89bf1f219e8c8ab9002dd9618a
diff --git a/app-shells/quoter/quoter-3.0_p2-r1.ebuild b/app-shells/quoter/quoter-3.0_p2-r1.ebuild
index cead063d23ca..1eccf5005a7a 100644
--- a/app-shells/quoter/quoter-3.0_p2-r1.ebuild
+++ b/app-shells/quoter/quoter-3.0_p2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE=""
 
 src_install() {
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 8151539ec91a..6d86dd674c5c 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -18,7 +18,7 @@ DIST zsh-5.4.2.tar.gz 4482413 SHA256 957bcdb2c57f64c02f673693ea5a7518ef24b6557ae
 EBUILD zsh-5.0.5.ebuild 5072 SHA256 3f19f1a91188f9ba78412d8653a5d4f258b6c115500504b5b5bce11c1bf3213a SHA512 0081b5436de379de9bc164ed04e69fcd34481a738d192013091f660cb0fedca66bad23fcb129694a13993d6f2e26031be9a34768eb7329371b112148dbf2b433 WHIRLPOOL 2e3601a158e38ae106dc392c30ad68db6b43c63b333f6c9b06b32d020e59d1c58d1748fada15a3058fe5f19eed1d08f3bdddcc86fda99f02c28156a97bd93d4f
 EBUILD zsh-5.2-r1.ebuild 6003 SHA256 a0e58d57d03f763f2b6f0df244071c2a6c90eea756a6352103b9a617552a3a7c SHA512 69524e436c27c178a06b0cad5a67af9c54e6ac7ebbc6c9d62393c80e8ad8a2f89d02962ee3645d4857ad7772c1dff2cdc7e6b602813a184a413876ef2d9747c1 WHIRLPOOL 51fe230e26dcaa8949b7722c972e6ca0e12ad4af2d83c49cb86ef7946637a59863b1b04d9b935ee6da67e3cece350034014cab1d62616c3928713c8689dae6d6
 EBUILD zsh-5.2.ebuild 5902 SHA256 96c65d855e64c69ba91f06458f73f9b74401c06a6a2eb3a4a2c82e5f18c8ff7e SHA512 951baadb096bb2741bd53034e992aef28b7be5e829364698d434764a41d18cbb55eb6b552d604934d79fb959030f0c89f44a829d7f3251235e83b340edad2c0f WHIRLPOOL ef3a9772ca996ab9dc4705e2e465814929ee2020c951c0d9677b48dcccef0795e48d1321ddf140ce8daeb9f1e6042004a03bc0c5ff179108cfebf0478a6229c9
-EBUILD zsh-5.3.1.ebuild 5997 SHA256 531db857f22f55d7e013d4e927e4e8da2c882f467ccbd32e06fa4b1364c5cd4a SHA512 6bc0beace267b10a93c0b7350f5f52ef73367abd53f3efd663fe8dfbc906a8f4c2331309064331ace90617bdfbd9d8d4cf7f1492135e69a3ecff110981489a0b WHIRLPOOL 7338613d2f745e8f8d85c1ffa078c47c2b295fc6dfa0f03b27122717d45940dc38bda882b4c3707633998ff894bc5f1e1fb25b61de5615c37d533fa3a09792e9
+EBUILD zsh-5.3.1.ebuild 5996 SHA256 5534a64d11bb13abd451365dcb475be94d32fd4cc5d81e2600acbb5196d1ad6f SHA512 b525f5b9510f009d203a663c5fab6af9f324c15c0323175b582d7d6de93a9bea2bec374d513201f1b3af01c693e15aec2d99b087896b6eb3ec71d86b772a5277 WHIRLPOOL 52ecea404626331a5cc7451ffe6b0bfdac741a3db40c219e1ed9dcc957fdca3630edbbbaf0b87c730637c3a8b541c55441ee9e96c3b611bc76fd2f5b293b4290
 EBUILD zsh-5.4.1.ebuild 6033 SHA256 7863669fca1c9b1f089c2a75750cd600b3559eb8fc82eb34e63b16263b9fb887 SHA512 569866901cb07fc0264e7f29fcb061ec70b191fd28c94e3f186604e44b1a520a1b5a636a726b99fdf7d4617cec3148ae45d1188c25096d1ca75b5fc3cf5c037e WHIRLPOOL 78f9484e303973a59d5f0a542569a6b686709bccddba300003b970b293b0acca648d23f9d81f5a4caca26599f9786e65f10ce7f7416c18bff6317e0df90df5d1
 EBUILD zsh-5.4.2-r1.ebuild 5829 SHA256 fd67393e6024c3e64e69bd6270823945c935ceb7d19e8b5349319100fd32aef1 SHA512 aa8be68089a1b7eae939a1face739920b72c99b25ffeda6bd57e5d58e924cbf6a0ba35de042552aba237bd26a4cd35e0955c8596a64876cb01e3a2673642f5cf WHIRLPOOL 88ca42ba0762e06348360dff997656ebef1a21c90aaaa35b474212b6eb9904d361131a74334e6266bf28eed5fc16a39d13169fae77ac9dc4a7a509a77aec7404
 EBUILD zsh-5.4.2.ebuild 6008 SHA256 4d5564f1cc4d38cbc53d27dc5f5d8a76256c7b07732750977beb7872a50c0bdb SHA512 0716185d5d48a367594ca1ef7f5eb12731421d854e5f85fea3b824cddf68e0e3f85f9343b36ef0511c424f9191b642b6066fccd7c5819d3d8d10b63a5becacfb WHIRLPOOL 876925c8e2bc5c5ce52177d11b73cb87c9982b8b123e4155e815a94d9c531a4d2305b336739917b6e9ddc203aa03d96fbf99cff40b37ea672ea3b060766d05ba
diff --git a/app-shells/zsh/zsh-5.3.1.ebuild b/app-shells/zsh/zsh-5.3.1.ebuild
index 800cc73344a4..e28a4cc8e1a5 100644
--- a/app-shells/zsh/zsh-5.3.1.ebuild
+++ b/app-shells/zsh/zsh-5.3.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
 else
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="http://www.zsh.org/pub/${P}.tar.xz
 		doc? ( http://www.zsh.org/pub/${P}-doc.tar.xz )"
 fi
diff --git a/app-text/atril/Manifest b/app-text/atril/Manifest
index 94a2adcb5bc1..cb6ec6880c3b 100644
--- a/app-text/atril/Manifest
+++ b/app-text/atril/Manifest
@@ -2,12 +2,9 @@ DIST atril-1.12.2.tar.xz 1663920 SHA256 47cd22969d4ff6ef860a310a57f77f1fcc0c5674
 DIST atril-1.14.2.tar.xz 1703272 SHA256 9a8eadd85bda4539560f01a2127be4d6c358c07c6a744c09d1fdb5bff7ce14f4 SHA512 9f77abe43848a3a35df1484edef4a6bbc6339f82b0d8e9f3c149c44fd632f2720acf24bcc1354b944c5c364fc4ce1d70b733c1ec5bc40b1a17041e59acf7bd9b WHIRLPOOL 3e4bf2f6af6369b7cf410f161c159f6f0221d311b354c24d8b86fbcb14c3553d01ea6d79667d9817541aa401202bc8590d074f635745730854a148ca74b41dfc
 DIST atril-1.16.1.tar.xz 1691456 SHA256 c74a5f8c8603fa5952efb4343f055677e4474f1907080be9658d4456d3dc092f SHA512 69128171f13f50079b0b40bfada868967c289b5970e3cda3454f10e7cf723000ab29290c7c9ada67648c370472fd51eeb0a8dbbfa0af05babfc85cb28e3570fe WHIRLPOOL a7b386897c598e473642aa8c3ba2a40211c4389ef3560e574adf04072882887e37a50a7d83ff5fab4c74982908994c926211272d33220fb47a360e05c851a670
 DIST atril-1.18.0.tar.xz 1688144 SHA256 c2284f17f7b683efa22615f00cf2768ea07667981d8304566e49c3d863de80fd SHA512 71e40faebfac08c60c90e7c919d2274976a5f03e6f9c6882fe81d4736152c14b1baf45da770f357030708d103203a4ffc47387c736c4df8737dfc5caf1fd466a WHIRLPOOL 4cef97e4a832a2123ddfc1ddaf2af8d44af9a746676ce356c0d7dcc4fe463a762ab33982fa2045ca9bf461dd79c52b513d6fe263fd153121ff3a6afad1708ecc
-EBUILD atril-1.12.2-r3.ebuild 2347 SHA256 1253933089f14ca020345ff8788bd6b3f715ce76a5b652585d2409429d31021d SHA512 a02f369ebb18e2b6f0c6e99e8db6185928bac62d02a29381f88872ee63fb948296e1347c15bc2b687f349e7036887d70f193adc26c9d13d07778537598a2f0ef WHIRLPOOL 99dacb65e3c753f0186529cdb8b1d88a3b5bdd33e9e116aa7a72f217fe21e3a78a0c0c550356ddeb2c767efb95efd68c22644a7ee92094fd40d0996303be6fac
-EBUILD atril-1.12.2-r4.ebuild 2333 SHA256 820ed2d8933682b746aedeb92b1e8233379d6ee8951ee09a9a7a116b1e692e26 SHA512 c485c4bda248f2719800166ff8a5b6fcdc6610012661bdc0a490ef06414ba2a2a5a9f483841d7c2bcb5efe4900f3fa4b06b348935ec0e6d2d84c0482405edc60 WHIRLPOOL 818fd64bbbbd3e961f02b2d1e9b888479e53cc3cf90e2c44e5fb5825cf367d7592acaaa19390eced529f7b8c8cfe6181581eaa4d80c15ade0969b7554923b3d5
+EBUILD atril-1.12.2-r4.ebuild 2331 SHA256 13b99c99ec1eba20661adb1a5fc6ae04f12d892cfdd3f452091866a7e0d220aa SHA512 897bc693606b157ab17b9a1f56b3a26e3a3d69b0bca0f8d0ebec5af5a0777acfe8dd60457090ae2d1fe04280b9a455e8c92c669fe2afa74b0045ace60a8a6eb4 WHIRLPOOL 5a0ae9c5b34907a0e1f25db017c14e39559d5ea02c1bf5d8104e849f6d9f64ce86c359a581f92d336f5f7b3ab88761298282fdca2939b07f3586f04c97b5f676
 EBUILD atril-1.14.2-r1.ebuild 2373 SHA256 4788380fad37640ba89dee20d02d94982bd37860516f3591bfe45c96b3853d78 SHA512 f10dac5113a74cee27f28f47ae59e850a9331755864016cf35a24fe3ddcea84a7e6ce2d24bbc8237d2b4745afc1fd4616f5f8d0df9c6bd5aa1cc2c36fa5b4625 WHIRLPOOL 4880b967e3ccfb9cdac0d96a3516bcd7bf8e51968144a916cdeee2fba70dd14b373305f3bf9e47848bd5d460e867cd7b5cdd4724cd0e708e348ce7825c2d7f62
-EBUILD atril-1.14.2.ebuild 2389 SHA256 ddcb7f1878c7ddf682d91300cef883b4221f3c24853fecc5caabe1fd48acad00 SHA512 6910eaf71e24fcf9c42048dde071f2117f5f8ed81e122a6d4619a977a16e2977821870edbe62ade81e39dd3e34ff689e6cd29a9c8dea4c96008dd86f04240e80 WHIRLPOOL 05837650aa69af56cd846e8d94e735bed40efa027dd3872ea6a04e72053db9c04ad5d671832cf94b5d53854fdaa38abc3e0315f75c7c071ac81c1f25b8c49283
 EBUILD atril-1.16.1-r1.ebuild 2310 SHA256 863f2e70efa1a475f315b36178c62944f6e6c578ea7bba337ef1802c09217ab5 SHA512 61d811ce7d246b8e962dfd60a710da7a5f08ad17bb532a0396f1206599918e0eb89ec7675032fc1a3bdb72724073feb80d35875e7215636fc8d22abff43fb188 WHIRLPOOL 36a2a17f9abdd27a230e723363be251f62713bc397a9275ca2a530b5c34fc14e2fe47cd55ef1e8387fba939c318746d89272a7634473287a156b92861e739903
-EBUILD atril-1.16.1.ebuild 2326 SHA256 984eb424094ca9c714e96dc9b000d7e3b94fdd4e41da69f8a1184a5cd7272f62 SHA512 1ffc591b8b4c193909d5603f8aecb2eb1501aa9b8ab4e2abe9fe9a33a39268e1e73b62f59edf0a80294915bec82e2fb13162b8666a8821e21d624b9fb988676a WHIRLPOOL afb0f8d98775e8c5365fc70821afe4f57c7373eac43301ee1378923769fd25a4300cfc14425f117770a53fa57879c4e862c7de6245ce0ea076d6a7f763352546
 EBUILD atril-1.18.0.ebuild 2162 SHA256 ae522c7814cb10a077f42ff5451b591c7b69a94e24259b2f2f25dc4e7b1421de SHA512 813b95f5230e292164c658147e961b6cc2eb5ab80ad63643fa06fcc6bd9092750f4af45b8de4c85965b704740ec8e138cee25185296d8aa5156dca58f96212a8 WHIRLPOOL 53d52337cd9aacd7f5616750dfc06e832e6554e7a5883a9bf28266c0099267a7b65d4d28bf5df249892d5ceb47d726a8c4169e30e2843b042b711698e7068ec5
 MISC ChangeLog 5815 SHA256 01a88c082c524b9bb8ae0d8b8a2ab495bf2afb3925af22107262a098c36705a3 SHA512 8ece396a1ff632fa5a4ccde01b89838b6298841966a541ef5212e0d7eee11ec9ec58911e51fcae3114985b1572cb91c6ba0463fdbfeed4cec1f911ee58712415 WHIRLPOOL 73ea430fc247eed383c67339cd1887ea49624ca38759a43cfd06cca6770a75d2d2d689a4ee2d96bdb1eb5fb098626a97a9d49496892315756f3dc74762ae54fc
 MISC ChangeLog-2015 1249 SHA256 3aa2ad53dda652f8f91d9288596c475473adbb27ba6fd0a3e0a7b5225a44e30f SHA512 b9976048766136413bfbab246302d3c7bd92f1c5a0831465c37aac68e325e5aab60a65d36335b8046c2be74912f3929577d3f6cac7418e9c4ad2bebc017ad339 WHIRLPOOL 12e953096e9fe2eed2e8109fa3d71af1e836d909fe052ae8d05477901bcce54c091c65a995b8158425774b96163a36ecfa952bda1861180314b8e124de0c8ec4
diff --git a/app-text/atril/atril-1.12.2-r3.ebuild b/app-text/atril/atril-1.12.2-r3.ebuild
deleted file mode 100644
index 78c75e698fc5..000000000000
--- a/app-text/atril/atril-1.12.2-r3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Atril document viewer for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscript t1lib tiff xps"
-
-REQUIRED_USE="t1lib? ( dvi )"
-
-RDEPEND=">=app-text/poppler-0.16:0=[cairo]
-	app-text/rarian:0
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.5:2
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	sys-libs/zlib:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	>=x11-libs/libSM-1:0
-	x11-libs/libX11:0
-	>=x11-libs/cairo-1.9.10:0
-	x11-libs/pango:0
-	caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] )
-	djvu? ( >=app-text/djvu-3.5.17:0 )
-	dvi? (
-		virtual/tex-base:0
-		t1lib? ( >=media-libs/t1lib-5:5 )
-	)
-	epub? ( dev-libs/mathjax )
-	gnome-keyring? ( >=app-crypt/libsecret-0.5:0 )
-	!gtk3? (
-		>=x11-libs/gtk+-2.24.0:2[introspection?]
-		epub? ( >=net-libs/webkit-gtk-2.4.3:2 )
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3[introspection?]
-		epub? ( >=net-libs/webkit-gtk-2.4.3:4 )
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.6:= )
-	postscript? ( >=app-text/libspectre-0.2:0 )
-	tiff? ( >=media-libs/tiff-3.6:0 )
-	xps? ( >=app-text/libgxps-0.2.0:0 )
-	!!app-text/mate-document-viewer"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	virtual/pkgconfig:*
-	sys-devel/gettext:*"
-
-# Tests use dogtail which is not available on Gentoo.
-RESTRICT="test"
-
-src_configure() {
-	# Passing --disable-help would drop offline help, that would be inconsistent
-	# with helps of the most of GNOME apps that doesn't require network for that.
-	mate_src_configure \
-		--disable-tests \
-		--enable-comics \
-		--enable-pdf \
-		--enable-pixbuf \
-		--enable-previewer \
-		--enable-thumbnailer \
-		--with-matedesktop \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with gnome-keyring keyring) \
-		$(use_enable caja) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable djvu) \
-		$(use_enable dvi) \
-		$(use_enable epub) \
-		$(use_enable introspection) \
-		$(use_enable postscript ps) \
-		$(use_enable t1lib) \
-		$(use_enable tiff) \
-		$(use_enable xps)
-}
diff --git a/app-text/atril/atril-1.12.2-r4.ebuild b/app-text/atril/atril-1.12.2-r4.ebuild
index 8a29b95e1db7..aa353029fbdf 100644
--- a/app-text/atril/atril-1.12.2-r4.ebuild
+++ b/app-text/atril/atril-1.12.2-r4.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 DESCRIPTION="Atril document viewer for MATE"
diff --git a/app-text/atril/atril-1.14.2.ebuild b/app-text/atril/atril-1.14.2.ebuild
deleted file mode 100644
index cec82ec0eadf..000000000000
--- a/app-text/atril/atril-1.14.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Atril document viewer for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscript t1lib tiff xps"
-
-REQUIRED_USE="t1lib? ( dvi )"
-
-COMMON_DEPEND=">=app-text/poppler-0.16:0=[cairo]
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.5:2
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	sys-libs/zlib:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	>=x11-libs/libSM-1:0
-	x11-libs/libX11:0
-	>=x11-libs/cairo-1.9.10:0
-	x11-libs/pango:0
-	caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] )
-	djvu? ( >=app-text/djvu-3.5.17:0 )
-	dvi? (
-		virtual/tex-base:0
-		t1lib? ( >=media-libs/t1lib-5:5 )
-	)
-	epub? ( dev-libs/mathjax )
-	gnome-keyring? ( >=app-crypt/libsecret-0.5:0 )
-	!gtk3? (
-		>=x11-libs/gtk+-2.24.0:2[introspection?]
-		epub? ( >=net-libs/webkit-gtk-2.4.3:2 )
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3[introspection?]
-		epub? ( >=net-libs/webkit-gtk-2.4.3:4 )
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.6:= )
-	postscript? ( >=app-text/libspectre-0.2:0 )
-	tiff? ( >=media-libs/tiff-3.6:0 )
-	xps? ( >=app-text/libgxps-0.2.0:0 )
-	!!app-text/mate-document-viewer"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/rarian:0
-	app-text/yelp-tools:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	virtual/pkgconfig:*
-	sys-devel/gettext:*"
-
-# Tests use dogtail which is not available on Gentoo.
-RESTRICT="test"
-
-src_configure() {
-	# Passing --disable-help would drop offline help, that would be inconsistent
-	# with helps of the most of GNOME apps that doesn't require network for that.
-	mate_src_configure \
-		--disable-tests \
-		--enable-comics \
-		--enable-pdf \
-		--enable-pixbuf \
-		--enable-previewer \
-		--enable-thumbnailer \
-		--with-matedesktop \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with gnome-keyring keyring) \
-		$(use_enable caja) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable djvu) \
-		$(use_enable dvi) \
-		$(use_enable epub) \
-		$(use_enable introspection) \
-		$(use_enable postscript ps) \
-		$(use_enable t1lib) \
-		$(use_enable tiff) \
-		$(use_enable xps)
-}
diff --git a/app-text/atril/atril-1.16.1.ebuild b/app-text/atril/atril-1.16.1.ebuild
deleted file mode 100644
index 25821be1a795..000000000000
--- a/app-text/atril/atril-1.16.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Atril document viewer for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscript t1lib tiff xps"
-
-REQUIRED_USE="t1lib? ( dvi )"
-
-COMMON_DEPEND=">=app-text/poppler-0.22:0=[cairo]
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.5:2
-	sys-libs/zlib:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	>=x11-libs/libSM-1:0
-	x11-libs/libX11:0
-	>=x11-libs/cairo-1.9.10:0
-	x11-libs/pango:0
-	caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] )
-	djvu? ( >=app-text/djvu-3.5.17:0 )
-	dvi? (
-		virtual/tex-base:0
-		t1lib? ( >=media-libs/t1lib-5:5 )
-	)
-	epub? ( dev-libs/mathjax )
-	gnome-keyring? ( >=app-crypt/libsecret-0.5:0 )
-	!gtk3? (
-		>=x11-libs/gtk+-2.24.0:2[introspection?]
-		epub? ( >=net-libs/webkit-gtk-2.4.3:2 )
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3[introspection?]
-		epub? ( >=net-libs/webkit-gtk-2.4.3:4 )
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.6:= )
-	postscript? ( >=app-text/libspectre-0.2:0 )
-	tiff? ( >=media-libs/tiff-3.6:0 )
-	xps? ( >=app-text/libgxps-0.2.1:0 )
-	!!app-text/mate-document-viewer"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/rarian:0
-	app-text/yelp-tools:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	virtual/pkgconfig:*
-	sys-devel/gettext:*"
-
-# Tests use dogtail which is not available on Gentoo.
-RESTRICT="test"
-
-src_configure() {
-	# Passing --disable-help would drop offline help, that would be inconsistent
-	# with helps of the most of GNOME apps that doesn't require network for that.
-	mate_src_configure \
-		--disable-tests \
-		--enable-comics \
-		--enable-pdf \
-		--enable-pixbuf \
-		--enable-previewer \
-		--enable-thumbnailer \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with gnome-keyring keyring) \
-		$(use_enable caja) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable djvu) \
-		$(use_enable dvi) \
-		$(use_enable epub) \
-		$(use_enable introspection) \
-		$(use_enable postscript ps) \
-		$(use_enable t1lib) \
-		$(use_enable tiff) \
-		$(use_enable xps)
-}
diff --git a/app-text/bibus/Manifest b/app-text/bibus/Manifest
index b540dd31f9e3..2de977cbc89b 100644
--- a/app-text/bibus/Manifest
+++ b/app-text/bibus/Manifest
@@ -4,7 +4,7 @@ AUX bibus-1.5.2-wx30.patch 7623 SHA256 37d21557bf4375b048df41cbdd346ffc08b57deb8
 DIST bibus-1.5.2-lo-4.patch.xz 13196 SHA256 b7147230929c304ab357c6a725c5cabbd577607e6200df968cdf2c057603c8a1 SHA512 68b90574e9dd0bb3e2cc89c539ff35febdf4ac37dfb65c06709d21b62fdda0108c93f05d37ab96bf52c4f99bbe20caa361d562c297b05dc7ea37404eea659fd1 WHIRLPOOL d807d81277fac722c50d98575939142a6f1f5a1e9eb88dec0acf0053349f54ecce7d7dcf070742b143bbf166704994b401eeb1e1ecd3e32c351d9bc41c09d1d8
 DIST bibus_1.5.2.orig.tar.gz 5411889 SHA256 c6c66d6bdce403b7791bf58cc16eeaae9f0e9d1c3f0ba8411f9f3e694d740f02 SHA512 33d091dacc707859a11010fcba57691a3e2726ae7579d601720b4398f7be29b580be978da8cd058fab491ec5b52dd3ce33c964a8d5077f8e80d8f0f387ffa2c4 WHIRLPOOL 964f13902a8a20d9e838784cf1f0a032bb2327cd28f3b2470c35a7394ae7f7536a7884d798a8308049a02f6976183ffb1c56cc4d8b20dce13f98033668a90d38
 EBUILD bibus-1.5.2-r2.ebuild 2073 SHA256 d697f9e7200a2337d27def9544ed63e5851e69a9f78020b8ed0752de8e0c6076 SHA512 bb07320da8f9e63bb854010fad2e0096da1d4c8858b38ed04b15971cfdb5b103af233098f5d45dd1e9ef6831d070adf799b246626f04405c5f503302075ce0c9 WHIRLPOOL 2daef5c50ebb43c9a3b34bc687d398304b3bf2f685bd3724b65fcd2d763f0c9e219679c3bf1bc5f12311b808408f00926ad9ba7dab14327044aaecc7f38cbf04
-EBUILD bibus-1.5.2-r3.ebuild 2067 SHA256 9de71d7bd004abb59cf4bc303711ebe39786af052539aa07a5e6f9be39fd4f94 SHA512 c635061c82dc2c9496eda0c4bf587265cd54015eb070f93333a427bb8d2da8b12f98361431b9b37a6e552ed972069958e5b1f447807edbdc775b7061a75976b7 WHIRLPOOL 3066fc81f9c828244438d4ff7ed716555b50c85cf1b97b78092730c29b324581e1bbc639997b457bf1417d40b1d60037e5761387971b7492d610c85e9d0396a9
+EBUILD bibus-1.5.2-r3.ebuild 2065 SHA256 b931a57196578a8d6829add9a4f9182fe9d4ef80065d8889d723ff8c3018f7ac SHA512 c0a3d1b9367a36898e8ec88e46c32f0339f417633fcfce8ccad95806826be75590b08430fc65f462371e28c7900df83947e28588b8502ccdfbbcdcca27869794 WHIRLPOOL 3c9ec18378dde8da1fdefa7699a989ac1349fc01c573c511f052aeba6824dbdd0435b9f3b46e96454010acfcc66785e86a1118dc59e221c2ee984543adb31e1e
 MISC ChangeLog 3773 SHA256 b73db29405ae3406a30584ceed8334c0fe13e53b31a3e1476d5d0851261511f4 SHA512 97ffa22c04e16029a22d59c92024247cca7681ed768a9cd97146c65a61cfd8fb28b1c4aa382f6ccdc98da1bd34214fe571ddc68a9ab365277cadfcca6ccf461d WHIRLPOOL 00f1aad3c8946ed9d6847c76c4779c42b02c637e7dab626cde6f3ab0523844577f14315f7619734e4392b77c5c5bddfe3f8977d67df8e45f1b4a451abd12725a
 MISC ChangeLog-2015 6768 SHA256 09751212cad7560fbec3888ddaaa6a9b2a12223cbaf0b02ed7043db36bd412fc SHA512 04fe6a2f805ffca73a117c55936c8a186765cdc60f5635a0e5bd2ff56a7bb269744e3e81ec15683dee0d6a0430e5ade042300fd9352f173d92e4c91223b365ec WHIRLPOOL c155f7cacb2c02f0e58e88497584043b01c9ca6b502e86ebc9642c34d55ad24610dda000e36ce66e8663718a2982fd8e78fe8d3997c59c2b8a6d1e8177fe1e03
 MISC metadata.xml 335 SHA256 cd07b450a91fad05d81c79343968a94d3d3419d5765979d6905ed6cd15d1434b SHA512 fe16c696e26755549539bce6b16f8370df11af5bf69c774a103ea608e99525e83a8e2b355efcff51a42f8296bc0146e66d4d4e49004e1a54dbbaba98dcdc867f WHIRLPOOL 11ead0861679bc2f692c1ee669dc823501320590f9e1a509b7aa350f73c2966a94a0c57029bae06f00d569b4c17259c504f586425a43a53695e24172556eb443
diff --git a/app-text/bibus/bibus-1.5.2-r3.ebuild b/app-text/bibus/bibus-1.5.2-r3.ebuild
index 712ed76b6310..b00c1bb65595 100644
--- a/app-text/bibus/bibus-1.5.2-r3.ebuild
+++ b/app-text/bibus/bibus-1.5.2-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="mysql"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-text/discount/Manifest b/app-text/discount/Manifest
index 1bd78564d3b6..655ada350b07 100644
--- a/app-text/discount/Manifest
+++ b/app-text/discount/Manifest
@@ -1,7 +1,7 @@
 DIST discount-2.1.8a.tar.bz2 85161 SHA256 c01502f4eedba8163dcd30c613ba5ee238a068f75291be127856261727e03526 SHA512 a1eba7076a27da56136b8057189c5474a36bf11f8233cbae270c8a0cf9b070332b4dcdbbbecfbfbe1d8c19961ccaf87cee27ebe855c6bc6558d8ccc423553c96 WHIRLPOOL 5d7148f6c4e9f84a5290fffafa417c4684517df6fce0deec773beb2f89b4416b7849aa50351c27338653b8950b68c3c49ba223d31e347ad7562b0cb040761114
 DIST discount-2.2.2.tar.bz2 89288 SHA256 ec7916731e3ef8516336333f8b7aa9e2af51e57c0017b1e03fa43f1ba6978f64 SHA512 67d882c0a334592230332815c543458b3c916a950bf7983f8a468fbc9f61154b4023d4bf451b76639fcb3a076506b48118f192a8e21f2535b3f49c7f081bbdf3 WHIRLPOOL 30ea10c83c54ffe43720486b8cec652d5f0ed60263904f9a8f902baa9feef7fdb4abab4ee69f0be12311c0631b53dfd8816d40cd43e755f31a2afa0eb46a3c87
 EBUILD discount-2.1.8a-r1.ebuild 2429 SHA256 615f0f325b6098ed931e1f96f6bcffcf666b6facd133b99b19ead8afef73c840 SHA512 065784f0effb3c1c24ba3b7897022480c956aa07a1288e047fb5e1a2fb51a347a7950f5ea09b4af2ef01222021297b4a8744fac70d07532651af978aebfe6118 WHIRLPOOL dfe3ea7f4047b9e0c6b12ec081ed3a97efc893cb8dfab4891ad792eded58ab4bcd79fcb8ab6fe8a20d3466cac1a86b836145e5c8860bda23f8f3614b53b0f0c3
-EBUILD discount-2.2.2.ebuild 1745 SHA256 73cfe60ccfb1b37407792188256cadbcc917b2ef1ed42b10c37e9dc170f8b50f SHA512 6bc80e256fd4d7ed70e4c525671ea2b65a746d356053f7b0d5e5ff33f43f9bdfbfe9a23ae843ef8096588c5895455d108c63d0d1f518cd7621c06c971d7ac4e7 WHIRLPOOL cd160268c82aa6cd43bb8927b9f0ce63f4026cd2472d72e6d173896b043d0f21f45778fd453b13fe85e6c4f79bfb93ae8b9a9470047b07c1c3c036ae48483be3
+EBUILD discount-2.2.2.ebuild 1790 SHA256 b956a185bcf230c43df4da2f735d34bdd607716c0da4d0bb8526ff3687e61b27 SHA512 a69861b85f1f2b30dfcbb08892ee4daa00fd4792536a9b90ff43e067d22f8f2716502d51e234e698eb09f4aa472bb68fb648083bfa1406abc29eba2f3239e989 WHIRLPOOL d72dcf9aeef73bd21a3cdbb3711f956310d47a7ccb6327211593f38cf56c665d7b90ebb387343fdc002a686406daa67cad0f0b6b84cbc4fe92cb0655a44c1228
 MISC ChangeLog 4437 SHA256 d5163ee5d70cd238e1d1f4660191c8bcacf611acd85cc7c979c9d2574e656362 SHA512 d86bf209c399934d4e61bb6301d13a9bc0479d2177e027683e793b59428312e3b0987e3ed51a2b30a6f2c0f770361481d17cad2919f7341534939a61b02e74ad WHIRLPOOL ef0c778f497f1b471fc6be02bef58b821a4164056b1be0be1283c521922c3c7be32cce4b000dc06fed5d9f8f9f85b72c3ec56ab354f3a157595fe772887df223
 MISC ChangeLog-2015 2472 SHA256 7e63434fb1e7db783a0d961204a17cfed6790b3dd940fd238fecb5aa966520b5 SHA512 1c296077c16676cedcf2db0e4de5d17204ef2c496fd1145084be1be3aef8b711fa2c48ca287f4e04a51b6b5b02304bc6cb0a69976b05a22e8ca9d4ffca2675f8 WHIRLPOOL ebee3ca9558584c36adb5a61f11a955fe993a540f8699addbd2260c2fc39f19202128c7f54e213f0988de735619439a91fb05804f365ddd00c9d597c20ac2e0d
 MISC metadata.xml 366 SHA256 c99a065110021175e05522d5512f0dbbd68597796c4ec69689cf454acb6b35ab SHA512 39d05813a4efdcd14d0f5932efc63c25ae22b83088cb1bf020863e8ab9bdb348bcbd48901a2dff3c1184dc1483ae3868d2b4a2fd942dda91150944008773db3f WHIRLPOOL e7c7f81de4d006693fe9039cbd2b4aafb72336dd19cde6fe49acd5cff16d5484825f4d605f4b823e1b541b7f50fb4fa91603aa7563443482b87c21a3584b8184
diff --git a/app-text/discount/discount-2.2.2.ebuild b/app-text/discount/discount-2.2.2.ebuild
index a16f7b4e4025..bb4f809a591c 100644
--- a/app-text/discount/discount-2.2.2.ebuild
+++ b/app-text/discount/discount-2.2.2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit toolchain-funcs
+
 DESCRIPTION="A Markdown-to HTML translator written in C"
 HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/discount/"
 SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2"
@@ -46,6 +48,7 @@ src_configure() {
 		--debian-glitch
 	)
 	einfo "Running ${configure_call[@]}"
+	CC="$(tc-getCC)" \
 	"${configure_call[@]}" || die
 }
 
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index 6fd393c378ac..0036c55c8417 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -2,7 +2,7 @@ AUX djvu-3.5.24-gcc46.patch 859 SHA256 c13e57ca5bbe87c57d74643cfe35ff6eeb823e575
 DIST djvulibre-3.5.25.3.tar.gz 2543949 SHA256 898d7ed6dd2fa311a521baa95407a91b20a872d80c45e8245442d64f142cb1e0 SHA512 0e38f56d77915ee6707dd19a36a8ca9167608c39449a5c73de9cd784d712852c07c068b79a794e25f6d3ded0f927d083413dde197c9fc8f7b68c03cffe68035b WHIRLPOOL 43ce341be7dd6322f7bf05ed541e9eb6b8b923d95893bb8f8b78761ae452384e39c39e23723b4d0fc7fe8e95301dc414ac9c2d74a169a6ae12b86e5968f1edc3
 DIST djvulibre-3.5.27.tar.gz 3648522 SHA256 e69668252565603875fb88500cde02bf93d12d48a3884e472696c896e81f505f SHA512 62abcaa2fe7edab536477929ba38b882453dab1a06e119a3f838b38d5c61f5d8c252e4769e6534582b826e49bcfb490513179580fab9c3afa84aa92053ccebee WHIRLPOOL 7caff93eeaaaccb393c03013b62220cfc1b1a50e4d6da4a107ae0267fed1f5f9e6d3ad2b61845be5192b67917ec064a2c21c0f4ad567d4b0d6f56168ae4593bc
 EBUILD djvu-3.5.25.3.ebuild 1769 SHA256 74bdbbbfdb83702f9d9c50b982777c6595b5907111d3dafd9f05501e556717d6 SHA512 51e5ed5fb1c2f3deff3e989c5bbabeb43177ac7ba0174f5ecc6916bb1734d88fcc6f6a9585183a30688ee70dae214c27b047b9f762e9b9eaafc3b5f77af86d53 WHIRLPOOL 8bfc83c75eeb2c0d828ac775d522c563e7e66e80bf11f3dc6842635ec078f05e093158bdcd934fc2785d2d5574a376187703f0dac1e514d4a300858bb65bab1c
-EBUILD djvu-3.5.27.ebuild 1467 SHA256 ad22a204b85f5f5ef25cd2a68fdf7873673ae03daac37966909338fac282075f SHA512 6c244b2ee9107d061d0f8abd74efc606551196b479c1a527db6bfe232fae3843112e3ed2fa29e8eba85ab54bcfde4dcc50a98cec4e6fd8ce729764adff3e84f2 WHIRLPOOL 2527af8d44848dd751f90a581672eae13aa870dfbd218604d1fe583d70dee84a76ab8bf24c6180dd4368277b41d97c7a4c528365634aaaf311faa666cd4bfdef
+EBUILD djvu-3.5.27.ebuild 1465 SHA256 dc3ab26c9ac2337ec7619e1f697a9be07ff0eec62ecb0b947733c1d6db6c4d00 SHA512 0d64086380727997383fa367f56b9e0d911baaad4506d8e5e01073e28d2bd856e876fad5027e1234ec31bf8e6c5baba3d609e658bcba6a63616b212e18a2a53a WHIRLPOOL c3bf8ab63f5cf4c3b3574a518cf9ea2bee9cb71731bc3032b9fa92221ab4458357f323bce49e15424f158c6d6579a6edbf0653ef07f18986d544ecd2a10c44f5
 MISC ChangeLog 2697 SHA256 3ebcc8d9f9877e3a024cda8dc6019f96cfca7bf2957e48c5b76844a3e93e5f50 SHA512 abd6829a18b99296f8c5a80fe95ed69978ac786b69bcd888b008d454f661e7335ce7895d6f70e4e5886e76a6654e0122703933deca2894fe471a96741f3be826 WHIRLPOOL db04442f5ba2ddb49d024716e3d7d14aeecdf3c41c28446c5df1e5b2e44c69e5f79ab31b2b68f00e65d8d6ec950b406a655faad1757bf5f70c222d60dcde3195
 MISC ChangeLog-2015 19330 SHA256 31c029f70ed8223ca5c5be0260751729a69f6182668b7d050156f565db4358a7 SHA512 e8297dd91742f743281c4731fad3ef41b128fb88bfcabbf29e567051bc8e1e3ae643a908ef94fbeb015f2b19e4af113c93fbe7913e19d1c53efae23b6fd8d1bb WHIRLPOOL 165ef2401a0e602607a30d8b3c15154c89e0e450172d09731d23bfdb4909779be424cdc93db556fc718733fd39f2a0885a223c39da6ed4a6ae5f96fc19513817
 MISC metadata.xml 948 SHA256 9c5cad18c654bf32ac6e4f8fbac22e67318ed3400c2ca4acd11053c0cf160b40 SHA512 e5cfa3a2b2077a3f0dbfcc99165fb678e8c8759724790d520f1bed670fed5e753a47207bbbcd7d2ff2d55def5b34bf32201771918c9e7a16583d91553ac75e42 WHIRLPOOL 2198d5d107ab6a0aa44d64408a8d0fc8202e187c018cf497a306f67320eda7a90b4a102404081491a1468b5c2d4067abfd1616df4eb41080853107daf80f80de
diff --git a/app-text/djvu/djvu-3.5.27.ebuild b/app-text/djvu/djvu-3.5.27.ebuild
index e77303c6ddd1..ab44200ff0f2 100644
--- a/app-text/djvu/djvu-3.5.27.ebuild
+++ b/app-text/djvu/djvu-3.5.27.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-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-solaris"
+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-solaris"
 IUSE="debug doc jpeg tiff xml"
 
 RDEPEND="jpeg? ( virtual/jpeg:0 )
diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index 961c6a6be079..e1bd3957ba84 100644
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -2,7 +2,7 @@ DIST dos2unix-7.3.4.tar.gz 640991 SHA256 8ccda7bbc5a2f903dafd95900abb5bf5e77a769
 DIST dos2unix-7.3.5.tar.gz 662133 SHA256 a72caa2fb5cb739403315472fe522eda41aabab2a02ad6f5589639330af262e5 SHA512 beafefa715d894ec51bd808b18485bcf413f93b888203486e659f7e30b922b32b2f1da2305ef9ae85e54085ba3819bd512957bb872b529fe4728000cec7d3e58 WHIRLPOOL e1cda793c7e9a2b0f0000c61f5c4b9a48db37d41020af14e253b838768e81b0e94ea7a0666be712f79f89b05e5a6f72a1bf8516a01822f5da39062cc0bedf01f
 DIST dos2unix-7.4.0.tar.gz 710339 SHA256 bac765abdbd95cdd87a71989d4382c32cf3cbfeee2153f0086cb9cf18261048a SHA512 41be6b0c747f4a8e316eccecd468c8250aa6791962485569eb9496def60818ae434d619b5cfb5f80f15f8d17800314f5aefe229dc5d37faaa34e1270575175e9 WHIRLPOOL 89f093ff96aadbe64f5fb448d2be337464a0059cee3009cd513dbd0315b486c012efe53273467774dc9f884dfe5b1a4ee65903b94c2c5dd8c062ed3e41eed94a
 EBUILD dos2unix-7.3.4.ebuild 2026 SHA256 2740f83a639d0e3de27e615e429dbbd9bc61a6ba67addcea2ff5514f9d288e71 SHA512 5e251e9ff961e07e91fef0c462d32f4e3b0ad7b7cfbb38a35b11c9a784b79256a4a4073a55adc4e96ff67fc896f85f2d007662cef8cfb09061709a02ddb4d760 WHIRLPOOL 3a6302216ca7ffc009902dae8475991151f0dcb9f8a38b7b46deb2a05b54eb6fc0388021130f911a2af5c36006631bbbfa4ace248a5614319da0cf2b3c77c923
-EBUILD dos2unix-7.3.5.ebuild 2039 SHA256 3371b893e1de59b1dbd63793ae157375256b2277e97dcd9d4c4a723da16df76e SHA512 c2a358843659b69e1c32164da741b8fb4229cb603d4928a193940df201321767d00e0cfe084d69a2c2d34c3b13c975be083ec5f90cbc27b53332234c94a6056d WHIRLPOOL 517e7708852bb2b65a662a03a4b90d93efa9f619aff82218d96af01d49b0c46a6a8250dd8ba90e66ba2002d6c4fc75c1b1022d4d2f1a3bba937efe2ca234fec6
+EBUILD dos2unix-7.3.5.ebuild 2038 SHA256 ab86ad639db2298ba269fa004604c3a4639b50af774d74efdbb6c1945c637e20 SHA512 70aac16e854bd20d886dea1bf6b7d935e27540cb23a4088b953f67864a2bf50e6b522fe4e07ab6ebaaa0a047b43fa26827a3040fefc801f72900bbdb8fdd8531 WHIRLPOOL 1694611b55db83be7061894919ec7826592565f16b796961c56cec26dfef5f085a5eedb256eedaa693eae76a35e0ea8dfd3901a5588d4c8b8fcc3c9c7f032253
 EBUILD dos2unix-7.4.0.ebuild 2046 SHA256 c619db5f4357058ed36ddc65f95fc97996c4a5886863211c4dbc488d245a393c SHA512 27fc2bd3e3e43512d4ab571ca5ddfb4f6ba8e0940eb8bd65c9d90f0c602822334f5789f3a2101311006fb614708ca32396ae8c3d24b8b313aa9248c8cd76d350 WHIRLPOOL a56b643af417670b4eff43acbd543dd688e1f2dac13f46f673d54f45529900456191815a5fea34690ec73396b40adf1aed94e9e6104bf5754855ef9173fa7c67
 MISC ChangeLog 7196 SHA256 4a2c232190d6729640540918b5be7b533c2edaaa445f850cc6a47b9c3a59f04a SHA512 66da70a04731f3bd299bc577885b31e3c278016b38b1f5228394a384f960c49a0c3e97154ec82ef1489c9a9fce195077254240e458f649037e6859b0c060fe50 WHIRLPOOL 48484b065ae3a96f6c15a454e701ce60cac060d2a1e1466afc29d18544ca2f9d2d5cddb60820b6d8f400c568d1a2386febc868662587b5ddf6c9996ec7adf5d3
 MISC ChangeLog-2015 19680 SHA256 99b0f5f0d9a2a0ae8117f683cd295d8a8c5b0cfc2208325fc96cdb7c6ad416db SHA512 6921c2763ca5d07eba46899fc0ba3869042972fc9d60e85c835eb50d08b56ebc6a176a64d1e808802b1afe5ea7b6c2ad74f773fc50e55fbd83ee224c317a003e WHIRLPOOL f9e49b2959b16982e507cd9b67e24d9d5fd535d1b61676f1621a012ec2c15541a5382ab54aedd635669c13be995ce008d77dc52e0110c168da42a6d407465cf5
diff --git a/app-text/dos2unix/dos2unix-7.3.5.ebuild b/app-text/dos2unix/dos2unix-7.3.5.ebuild
index d6307cab1895..1f097e87f841 100644
--- a/app-text/dos2unix/dos2unix-7.3.5.ebuild
+++ b/app-text/dos2unix/dos2unix-7.3.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug nls test"
 
 RDEPEND="
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 383fe91d121a..74bf06ebb12e 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,8 +1,8 @@
 AUX 3.22.1-CVE-2017-1000083.patch 5157 SHA256 7e755824da994a0d9b82f85733ac20c17a881fa98d9e5165368387b2f9e279fd SHA512 f7bf0a0015191d4994d7e6a40a8a3bc4b8b2ec18ad04ca8fc46cca455709955d9f13d7ab2a0f419faca55a85064c4fe9c9f57ac4d9683f0c3fb61331996eb921 WHIRLPOOL 3261868e9c82009dad0aadd52c535a38dcb86b7071a27c352614d8eab93d68aa69a0a11d1d42a9b26193e82f102698590e487b55444fc3a0d72f83b8c9850082
 DIST evince-3.22.1.tar.xz 3365004 SHA256 f3d439db3b5a5745d26175d615a71dffa1535235b1e3aa0b85d397ea33ab231c SHA512 c36a90bf98f25b4f9f05536f1a09c38be30b814529e17a4ab159ba7c1e952402a211f335d4cdf1928ace8a5b46d6d019fbbd457ce11c2ffa264d8bb7c32d5a18 WHIRLPOOL 7b646bab40f9c05b7689de70b1de2e313b0576a772887187d71b51b00c456251169b7e5bb85f44f443a0dcce5199a405dc303c49a4be3d62c244225493c58749
-DIST evince-3.24.1.tar.xz 3511576 SHA256 9ca0c5213407b37be55fddb04a85d9301b692c4412c5920319d975403bff0f37 SHA512 205c1c9b68c9215bdcebf0c36841a35898e056ef8e56208db62c1fac04c4efad8fbc0800f410e3c94c526536adba5e8ead68bebec8f81061a3831789c5173726 WHIRLPOOL de0074c42ec8614a7ef34848de6768a722a855f3113fdad7392993a913f707f6e4fc55f86cbab945b41bc84ba92d79c82e2bc0b680a99702681b4d775706e3c6
+DIST evince-3.24.2.tar.xz 3509216 SHA256 6b89c3c76e32f71e56d3e2478a6c1a84438d2f3fd79c2c335d4346c1785a43d9 SHA512 77e099ff60188f982a49f5c8287eb2ed8d42402a15a54ccf8367b3814e7e16ba31354363d3f101117153792daa96f653f24bb06193b5e749d0ebfaac7d7c1e0f WHIRLPOOL a4cf7933be3da2a2c53e22a1b017f4872b77d1ac0a64ecdafab2548bd43753d7083659c2d76bd84fe86676547bde9afbfb4e1a7459b13f9cf6845635d83bef66
 EBUILD evince-3.22.1-r1.ebuild 2874 SHA256 0832fb9f4f4095f23763a6c9b6f419c12d29768ad4e42365d911f81a1ce94012 SHA512 0b41b16686f158123aebc9cd939186524c6c0c84bb2e8dd043620538f2d283ebdf98fcdedadb713adc8f969403bf29b42b0c4854ad7ee043ac68e721d6aab075 WHIRLPOOL a838857c14986adef4f0671a6ac60560a1d98daf8a49c82195b1b09d47f38e6d9809b875cee1d3c185bb75269b7dbf3b1d133f0a52bdb5e84245e1cf9a38c3da
-EBUILD evince-3.24.1.ebuild 2819 SHA256 af3cebcf6c6ded6a839280df54f92a2106d9183fd13b5f1028d8eecc31b735b1 SHA512 7aebe03d4e66ee9a686c08ac8f0c3c0e9205a3cc35e3334fc463eaa4112b01a817558c2760a25f57371685e0e6fc3e9f7bbc57003f1879c5a43eeda3ad7a94f2 WHIRLPOOL 48b96ace9dd75c62fe41f88d5fb5f2a8ca18ca9185c47939156622cbc943150c03a52c1241ab75410a78bb1df721f4661ce830a97b43fd4b8273b09f0628deac
+EBUILD evince-3.24.2.ebuild 2819 SHA256 af3cebcf6c6ded6a839280df54f92a2106d9183fd13b5f1028d8eecc31b735b1 SHA512 7aebe03d4e66ee9a686c08ac8f0c3c0e9205a3cc35e3334fc463eaa4112b01a817558c2760a25f57371685e0e6fc3e9f7bbc57003f1879c5a43eeda3ad7a94f2 WHIRLPOOL 48b96ace9dd75c62fe41f88d5fb5f2a8ca18ca9185c47939156622cbc943150c03a52c1241ab75410a78bb1df721f4661ce830a97b43fd4b8273b09f0628deac
 MISC ChangeLog 5311 SHA256 e1308727ba2c885331119d8bc2e280c78edb8ca853493bd9e8c575f647c7bc1c SHA512 d58d5bafd59b1f3c04d4781edb6c0509a1583dd53f8ef5ea020c1042b63e2be0d7d5d7ce037833a31d82fa7e13394991bc1643751ac0250f1e07c2cd49992290 WHIRLPOOL c6b16268ac6c374eb945800e66709691205c8255a4914ef4114e547d35eb648ac6e43a86d5a117018c076789cb3f3a201930d9036a6b9b147a2c7a742a6a620e
 MISC ChangeLog-2015 44981 SHA256 e8ed4f19d188781c6eb9321bbcea98648fbc3800a6d2e18167adfec313c7e589 SHA512 eb0b055150f34498fdf1a951195e4571ac79b4a43c99f4f5aa86c66a55a5db42335e29712e4bfb7f1e6cd89a98bf49bb4de7709a7c75812826f03f7194016ed9 WHIRLPOOL 4eccd6bf9e9293a82e01c3d45a40fa097556cf1cd18c7d04f7483a2a1c37d79e1823904b12ff54d9f0eec4065af099036d17b35c7e1c4c8eb7622a48f9ef0107
 MISC metadata.xml 612 SHA256 9dcf1b7b52be95787c7208d719f965fbcb88ec5b40d50e4a994dfff9af9dcbb4 SHA512 a9ce7d786d979e14c852b0fe3f722b346dce2f1f52b8f9ab272a1f2291ce88adba78c5d347e3e33a3bb0a58f46d77d20febc92516a4c12bc9f987cccd7aa977c WHIRLPOOL c766224427b16bdc43a415c9753fa9a4dc55b2d8ac5f745003a1bbc175a3f13e85be7731800b55fe84340cc752124c7361b39e8ca032ca075b8c6d6d0948e526
diff --git a/app-text/evince/evince-3.24.1.ebuild b/app-text/evince/evince-3.24.2.ebuild
index 28ce5a2f8a0d..28ce5a2f8a0d 100644
--- a/app-text/evince/evince-3.24.1.ebuild
+++ b/app-text/evince/evince-3.24.2.ebuild
diff --git a/app-text/html-xml-utils/Manifest b/app-text/html-xml-utils/Manifest
index a5d2cd06b66a..52d01851329c 100644
--- a/app-text/html-xml-utils/Manifest
+++ b/app-text/html-xml-utils/Manifest
@@ -4,7 +4,7 @@ DIST html-xml-utils-7.1.tar.gz 319559 SHA256 ec0efd2263b864bb7e0ae5c59f02c43c5d8
 EBUILD html-xml-utils-6.9-r1.ebuild 534 SHA256 97a6edec295d0d2e1925760b9f2946b29f6ab00d70405afa54bd99f030042ec6 SHA512 39cc174c62a8c96d16d00987ac39c4160b4c12804c4ddb0d21cc2bb49ddb5226c12c196416f7f9a0700667ab83f6a471a76b3dab95685f667aebae5add450cc0 WHIRLPOOL 44e518fa5c75c1514fd59360f87f7eb5d43f1835c70518365c59c2e8f88735ae87db5ff7472aa711d888dffc208f88543812407626bd8da9834d87fcd9a45ded
 EBUILD html-xml-utils-6.9.ebuild 521 SHA256 92b742074a280127ce69f1fb9112e2e9eae1922ae0ec6a714ae20b16b85af670 SHA512 624d91296ebae1488e978eef8c477da23d096a08ebb16a60c92d2862bbe09f0a80694a635870801c00e6e59cfe2f3c601eaac232e2ce76539d89149020f22d15 WHIRLPOOL 9f6949a8399f1123b70c2628c19654c507a457df5138aa5152f17dfa212a7019473cbd2a09a4f05219b164a4d3facc17a6c95771770076b88dca5bc68906d4ed
 EBUILD html-xml-utils-7.0.ebuild 715 SHA256 bccf4e0e923373c1d8f59e81ed3258a1b6f2b4417cea6878a1d0ad89233164ca SHA512 76c019ff9e14c846de543bff0720cec0302c358fc3987829a9aaf049c29d571436a1c31ccfd1f65d54315d9d0dab24856258964fc910e291ef9c8e59b754a2ea WHIRLPOOL 9f299c6ec0b18bad8e0ffa7366dc4f2268f58e283279bf550af42c6dd4215048c3d48ea8dd129fe6870edce039876db717efd338de0abdfaffcb39fcf672872a
-EBUILD html-xml-utils-7.1.ebuild 724 SHA256 4be6ca2f970ff00118c96a8b2037c0a13054881a60c516ba6f05c4ea389ea82b SHA512 7ceedb6d8ce7288edf2582f37af8e6bf4d48421dcb740578c8666fadd0b4dd0dfbc1f3ab1e340c5bbb4825549fb87ecae7feb09672ab60f7acbd805e3242d15a WHIRLPOOL c2e53752b63c85ddfc31e1b4cff7fe8094e02d2c689f15183be77518deda9e0ca55f98732c3cd4b7f9e75015d3202a24c54b7217b3563dec27da0ebcadf56429
+EBUILD html-xml-utils-7.1.ebuild 721 SHA256 d1a5f2a6d5e43d6d27a9c601dd54778b30231e25aff2e0b7fd6a7f98e2cb6ce6 SHA512 079501e0517bb3bb3e17254f1c62894aa6c0b3caf56709cd83812d391166e9372b983202cdc2a94980173fbab332be9cca8088d519e9b856c50b02e8152f059c WHIRLPOOL 32ec674c2ba21d9544f904ac770b1c04f36c56ee09146da10a7a7378cf4f19fab9983053a43b0af33153e32d2a6a2f13efc88d60becc2f4d809b8657e4284a4a
 MISC ChangeLog 3512 SHA256 816925977485274a4192d5eef75ef7365a28dd7bb18c254dcd67533eb907df2a SHA512 f5324420ac84e6e09b764662dfa1e1e7e66510bbec71840406568584987753468dc772bc1a8c3c58653fc3aa33dd8742f4efa2a0e737b876542eb1e312457149 WHIRLPOOL d28a3a06a12a325acabb059a22252ff6b81400bbe33a8acce194d9bd6092ead3484fa580b769fe1bdcf94c146d723a03c68d602626d9b35c601203e0aa9b3615
 MISC ChangeLog-2015 7768 SHA256 8dabacae0f327d94ac8db165bf67a7ac53096ecad39fd5e9d1eed30828dcd37c SHA512 f93490f9ad442c71e7cdde74e90557f23822b4b4e97d6dbf1ca5a97c8fbc0f2f17935fe7a0985c93b2c556d3d07ee7fdebf480068b8e16c630d334610a6301cd WHIRLPOOL eef546a4b7b9416b21edd65d41980877047b442c8a904a7e2a17f517733f30865b4563b89e0bd38acd4add6c2e57209fd602702f63ce18c314df60ab8af85e07
 MISC metadata.xml 220 SHA256 998ce4afb847c8594ee92e054f8a06ae3de375d38b2e400eebab911ebbad60a8 SHA512 1db105eebacb6c7d44fd17746981e6e24badb2e81327410aa935a7603379cfcc8f3cf27dcf4e9d870cea2f73f6a15cf052e3e785205095ea9a93d72980ff71cc WHIRLPOOL 23c78e4c05afc8a04239236928ca26e539b0a969f44389b90a34fef3f4a57f18d9db2838d3df439c482cd4b89ce8b959dde5e83500c44ebd2af453629ef79a3d
diff --git a/app-text/html-xml-utils/html-xml-utils-7.1.ebuild b/app-text/html-xml-utils/html-xml-utils-7.1.ebuild
index 080b0bdc12c5..38e21f4c0f04 100644
--- a/app-text/html-xml-utils/html-xml-utils-7.1.ebuild
+++ b/app-text/html-xml-utils/html-xml-utils-7.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ppc ppc64 x86 ~x86-linux ~ppc-macos ~x86-macos"
 
 RESTRICT="test"
 
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index 9c77bb021a6a..687408edef80 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,4 +1,4 @@
 DIST lesspipe-1.83.tar.gz 115129 SHA256 d616f0d51852e60fb0d0801eec9c31b10e0acc6fdfdc62ec46ef7bfd60ce675e SHA512 c6418ac2bfc2dee9d32d56b0ea4a94954b1431db54fef8b67a9cf7d961cf4a23d87b2f41b2a4560d2333029c6d4ed5c6f399cb635f857bd43f1603993b5cb55d WHIRLPOOL 4ff4baac25c768a4177d71a82f766b326cff6840e0032d6b9125506de38ff20264b71c765cb08777adda9e9f24e18e33e452667be8e7a94f7fef062f1d6f019f
-EBUILD lesspipe-1.83.ebuild 1161 SHA256 9ade675aaa4337be94dc34bc8af9cca8124a8fbbb0724d31837e710489627cd5 SHA512 0e14c9d4744af386c1f575874fcb0fbc12d405456c210b55240032f330f6626953c1ea7a361f24a154a377e6bf9837fb04cb3367d3bdd655ae5d3b377b4679e4 WHIRLPOOL c3114b8c528dec3604c20af95934ac8d1b7f3baede2efc359195900d3b11d2bd666738b0ddb15bca84f80b87cecb5d2d839e4e99cf325d84dc2e101beaee0d14
+EBUILD lesspipe-1.83.ebuild 1160 SHA256 b51d8cdb3a12a8c1c51613a9b852d356289b1083c63c5d3fbaf1640f5b70971f SHA512 dd378d2a7c307564ba93995327a14f9d89fcf02fcb0b586a056bde0f852170449ba616fc2d7c5d3a5543420a9120bc449dd8687c018eac35e6d1aa840bca59df WHIRLPOOL ad571a67781cdc6d95feb586d44ca693d2d2c4d908178ff8311d635b96d7b967bc27718b9e27b3c346f2ad08cb9b1f5775db5954bb898898083f97bfcfa09f42
 MISC ChangeLog 379 SHA256 5b9744ac3446c67febdbf8f9f71388d6c5cb8c7aa4bc27da4474939b3724a8ba SHA512 8f4ea82e6b15ca4289f2efbe6c0d1329dc0cd208a566c07ffaf2b97547b4d1d65fc6d5f5b8efef3d102732964d764c494a883ca4c334c31c7fb7cf2d79c3d166 WHIRLPOOL 60229df4aa2e3561b37347d08959d266f9582624e92943a1da56c30eede83edead639bd5b60a53fea3c1615bfc4ce458e623d9f1a2eaa5dbefa54c91ee4047c8
 MISC metadata.xml 303 SHA256 de8626350ef7a3645b1c23c4d372e6757a1828e6e8d53ffa2e7b5046ddc95735 SHA512 efdd1963073db285de7f83ff804fdc98876846cb011fa0c8aa65f9b3c1dd6b7cdb039ca6a7a03018edfdff930f817208bb29601bb0c5571fc16d637615e0c7b7 WHIRLPOOL 9ad464bec6ae95b2f2dc5f675dace1a5bcec9bd8a59b1b5ecf0d73c9b26f23583531bbe5ce0f28e59c152928ae4fb7db1afd819d7fffb3b940945cc0447c6354
diff --git a/app-text/lesspipe/lesspipe-1.83.ebuild b/app-text/lesspipe/lesspipe-1.83.ebuild
index a3dc8e985281..228307252d38 100644
--- a/app-text/lesspipe/lesspipe-1.83.ebuild
+++ b/app-text/lesspipe/lesspipe-1.83.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www-zeuthen.desy.de/~friebel/unix/less/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/app-text/libepubgen/Manifest b/app-text/libepubgen/Manifest
new file mode 100644
index 000000000000..116f874288a8
--- /dev/null
+++ b/app-text/libepubgen/Manifest
@@ -0,0 +1,3 @@
+DIST libepubgen-0.0.1.tar.xz 295780 SHA256 6e221ea10933bf6a80525e134c51e1adb6cdd67184c368fcdcb73ce8dbffeac7 SHA512 9add9c873ea0ad1b04fcfdfb987c7974b20f7e0c6c6b5a65b6ce5105a85318307fb9871ab60e998da649da378038f6df3722001940d00a7bc88af6dc87bd8945 WHIRLPOOL e90a196de03160f866bf0270e1a9b9a38fb9e8f2b03020dd1dace24fc8c324105a997b847e3285ec99e4ce77497b58e150dcc0c72b157ee40c5bae2d4dfe446d
+EBUILD libepubgen-0.0.1.ebuild 670 SHA256 ea892725b9113c46a33a4754ae5e5b4ce110d35f297e82d4e713ffd4f9c5e2a4 SHA512 c2f47d84b0901c002550df5e2cf8c2409c5e164898022b45be04bfceda549513e2bb72d6733ec0679406ee1c8593dc304b434ab88666cb922cbe0144a17afd49 WHIRLPOOL 0339a52c14cbfe5c0e6c2568dd09d9fd01521a35fd2083098fa52f19df1bb63c8ce9bd859b708b68385644bdbbd389a7a0a61ac664b4dc21e30b6f2a66218969
+MISC metadata.xml 255 SHA256 34d028c790cfe86c47c5c3dcf8655fcefc3e23ff52fed38a400ce42d678c8c5e SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3 WHIRLPOOL 87f7199996948fe95e5417f8da0c4c90cd51a68f246ac8ae87a2e2a31c11c709f220d664eb893b34692577415e5f5eb351dd7e310dbc59f508fa40c7edb8ceeb
diff --git a/app-text/libepubgen/libepubgen-0.0.1.ebuild b/app-text/libepubgen/libepubgen-0.0.1.ebuild
new file mode 100644
index 000000000000..508558384209
--- /dev/null
+++ b/app-text/libepubgen/libepubgen-0.0.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="EPUB generator for librevenge"
+HOMEPAGE="https://sourceforge.net/projects/libepubgen/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc test"
+
+RDEPEND="
+	dev-libs/librevenge
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	econf \
+		--disable-weffc \
+		--disable-werror \
+		$(use_enable debug) \
+		$(use_with doc docs) \
+		$(use_enable test tests)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libepubgen/metadata.xml b/app-text/libepubgen/metadata.xml
new file mode 100644
index 000000000000..13ce236ee519
--- /dev/null
+++ b/app-text/libepubgen/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/libqxp/Manifest b/app-text/libqxp/Manifest
new file mode 100644
index 000000000000..e0525b6fd9a5
--- /dev/null
+++ b/app-text/libqxp/Manifest
@@ -0,0 +1,3 @@
+DIST libqxp-0.0.0.tar.xz 337292 SHA256 0dd32afbf1c889debc28848b260c1bdc0eba5f57504476b787e164f7c59776d5 SHA512 c92cb6298ea4643e29145732ff3b6df806f2d30c86ab4967e445dcbc8c43b6d9fdd17c30a3e6131b4f0f2a42135caa0137b61aac2ab2722528a08e1fd6c02df9 WHIRLPOOL b24aa8205ab11792f189dc1862f54afafe2b7fbbbd45487ec5a212afa3946de5f1372af59ff0c05332d7b77763b112ae95de017b24d472221015655d719e7093
+EBUILD libqxp-0.0.0.ebuild 729 SHA256 c7a113db28355aa36057a83f586a3211335e5fa6c7b6ae7ae52abc45cbae9461 SHA512 d53e5c523bbc5fd08f428fe65a6a6b099588a5cff60399bee9718378e82038a0b167cbb084ae097faf373a50f6ffffe4bb73015a9002b00dab01f18054c67ac5 WHIRLPOOL 5e954bd037dbb39425c59046b6445a3c755402cf295e30cb2ee023c7b9677c8e5babbaec6a0d687ae8a0630083b987311c21cd77808f8f7c5b25e3eda75035c9
+MISC metadata.xml 326 SHA256 e53dbbf9375deb78071db86cffa24f588589f357c40afcc8dc5d08dbbdc40d17 SHA512 97b3e21efde5b88155863552b56e196d2349d761106177deb84e587d3bd0c08cf4e91ec779caf1db86970ddd3f6ce7ce76ded2e08a8a763e93428a9042605e6e WHIRLPOOL aa63df9c272272f7875927027aeae84e218fd637349102c365325b3ee7714ff52f031ca4752a065d781451d3e3cea6d293f5d1118729900c67383028ecf4db99
diff --git a/app-text/libqxp/libqxp-0.0.0.ebuild b/app-text/libqxp/libqxp-0.0.0.ebuild
new file mode 100644
index 000000000000..f38c8f335ab0
--- /dev/null
+++ b/app-text/libqxp/libqxp-0.0.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Library parsing QuarkXpress documents"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/${PN}"
+SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc test tools"
+
+RDEPEND="
+	dev-libs/librevenge
+	dev-libs/icu:=
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	econf \
+		--disable-weffc \
+		$(use_enable debug) \
+		$(use_with doc docs) \
+		$(use_enable test tests) \
+		$(use_enable tools)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libqxp/metadata.xml b/app-text/libqxp/metadata.xml
new file mode 100644
index 000000000000..e99ec98e14f8
--- /dev/null
+++ b/app-text/libqxp/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>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
+	<use>
+		<flag name="tools">Build file conversion tools</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-text/master-pdf-editor/Manifest b/app-text/master-pdf-editor/Manifest
new file mode 100644
index 000000000000..162d3ecb85ba
--- /dev/null
+++ b/app-text/master-pdf-editor/Manifest
@@ -0,0 +1,3 @@
+DIST master-pdf-editor-4.3.61_qt5.amd64.tar.gz 14950654 SHA256 d54ea747dc17bc5fb3020495688be529d4c8c7314b7703d171d71bc82cead5bc SHA512 0c416df191a2796fdafa6014c258166d47037039fcc9205398138a46d59b1f771d9ffe38eb16f22f4300c3e965435300037d7413a86efb997395e6e974baecb5 WHIRLPOOL 5a40bf8589abcfb9681a920cca686f160f482d330c1086a3af6bf8ce11678ff3cc362ebdb60b8e0c4bb36852d378e70ae0aa017c859689580300408def39b706
+EBUILD master-pdf-editor-4.3.61.ebuild 1629 SHA256 b91613a4767e176f57e43e0ae5e7abf9621b57fafbbb150219d66beae2d6265f SHA512 8c5ac33caf8c69d9a606da47152c84aae104d4b566653003c5e437e5f018a09201a65ffd954f779404bd51cbdce43591e73a6a56867ff1eb3cd1ce6546aa2a9a WHIRLPOOL 5cc9ccf367d6a5f48b10b7745a690ddf4892103470bf710d27478890195ae2b2f9feebc98f73e6e840cf138998c4b1b9d7ea2e249f6ccf36a08395556e706c1f
+MISC metadata.xml 367 SHA256 925278b2cadffc19f6deafd8f637158b911860f1c318b58a940eb8960fd28e5e SHA512 d54bf635e54008ebabde5039e2527297b8f80204138c90c7744d928041445ca667232a92e6b7ca357f844f2c8ada6b80f13b7de4ae4768e30ec676b55ae73156 WHIRLPOOL 22c401ff9d910104e0ac66cf5d90fd49ac3cef030bfe222b13cace3e3bd604ecf75cd3d92c3bf3d26056c5755608c1ce69c4f2d0334028066c01f359222bdc2c
diff --git a/app-text/master-pdf-editor/master-pdf-editor-4.3.61.ebuild b/app-text/master-pdf-editor/master-pdf-editor-4.3.61.ebuild
new file mode 100644
index 000000000000..7f5e919d6361
--- /dev/null
+++ b/app-text/master-pdf-editor/master-pdf-editor-4.3.61.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit xdg-utils eutils versionator
+
+DESCRIPTION="Master PDF Editor is a complete solution for viewing and editing PDF files"
+HOMEPAGE="https://code-industry.net/free-pdf-editor/"
+
+SRC_URI="http://get.code-industry.net/public/${P}_qt5.amd64.tar.gz"
+
+LICENSE="master-pdf-editor"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	dev-libs/double-conversion
+	dev-libs/glib
+	dev-libs/icu
+	dev-libs/openssl
+	media-gfx/graphite2
+	media-gfx/sane-backends
+	media-libs/freetype
+	media-libs/harfbuzz
+	media-libs/libjpeg-turbo
+	media-libs/libpng
+	media-libs/tiff
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	>=dev-qt/qtsvg-5.4:5
+	>=dev-qt/qtnetwork-5.4:5
+	>=dev-qt/qtgui-5.4:5
+	>=dev-qt/qtprintsupport-5.4:5
+"
+
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${PN}-$(get_major_version ${PV})"
+
+src_install() {
+	local dest=/opt/${PN}
+	local bin_name=masterpdfeditor4
+
+	insinto ${dest}
+	doins -r fonts lang stamps templates ${bin_name}.png
+
+	exeinto ${dest}
+	doexe ${bin_name}
+
+	dosym ${dest}/${bin_name} /opt/bin/${bin_name}
+	make_desktop_entry ${bin_name} \
+		"Master PDF Editor ${PV}" ${dest}/${bin_name}.png \
+		"Office;Graphics;Viewer" \
+		"MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
+}
+
+pkg_postinst() {
+	sed -i -e \
+		'/^Exec=/s/masterpdfeditor4/masterpdfeditor4 %f/' \
+		/usr/share/applications/masterpdfeditor4-${PN}.desktop || die
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/master-pdf-editor/metadata.xml b/app-text/master-pdf-editor/metadata.xml
new file mode 100644
index 000000000000..82340dc648a0
--- /dev/null
+++ b/app-text/master-pdf-editor/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>joaompssantos@gmail.com</email>
+		<name>Joao Santos</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/opensp/Manifest b/app-text/opensp/Manifest
index 61cf0ae04c03..22949cb347c3 100644
--- a/app-text/opensp/Manifest
+++ b/app-text/opensp/Manifest
@@ -2,7 +2,7 @@ AUX opensp-1.5-gcc34.patch 263 SHA256 679aa70752d48a6bd0d2ff32c8e4c7153f2ce6e50a
 AUX opensp-1.5.2-fix-segfault.patch 747 SHA256 d60915133b0d00ccd5453864af4e389e50825071f70bb2c7f88e53d9fd81246b SHA512 e0c72df8e8b191c6cecabcac550cc52918bbff7c2fddf8099ff4403de0fe817c1f3f5deb44b4c33e9d135a97a4fd8978c4090f6740c99dbadc6f9b06e24c41cf WHIRLPOOL e4028a8980d17dcc303166147cfcf24d21aaed79db70ebed45c259e94928f77042046da60e5e18f34c638d2635958e3e0ee04fd89317a495f1460ad728203c17
 DIST OpenSP-1.5.2.tar.gz 1521390 SHA256 57f4898498a368918b0d49c826aa434bb5b703d2c3b169beb348016ab25617ce SHA512 a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e WHIRLPOOL 9565425b87d0f68025a2058e8941c5c64519cdb1ab3f22aeec6968473989f39b805dbfa8ca8c74f3968358fac2144756cf50aeab8e6c9ce8112610bd445d5ce2
 EBUILD opensp-1.5.2-r3.ebuild 1917 SHA256 de2b546d7d060b4a3f98f88f770b1aa3c187874de3832bdf695afbe78358ef54 SHA512 4f7e27bfbdaa0987c3e87fac99082732a1f741ced6404cd0282b489a56b4164f8e8f4688644b55c25da5f31472e043557a119658658590f16f15822f078ed213 WHIRLPOOL 3431c7242b2d80ecc63c2b228c6c11d3793e9eeff95d933f3e3341b604e02c1f2e3fb19fed265cff60c1c645e6f1e2ab535508729ec0776116b6e4d1c97c09c7
-EBUILD opensp-1.5.2-r4.ebuild 1981 SHA256 c2b5062ced9d601e5cff305f15475e4307ba881d7f3ef1ef03158898ec9efb24 SHA512 4520d96aaf2bcc86ecdcfb22dcb959f9fa5709584f1484a3939fc2bc9bba93c1bf51839635e50dd00d25676bb0f3b92b6b784df54e4150f311055a9afd670b5e WHIRLPOOL a16e6dfc7b0f4580adc06ced37034795aef1c25612dc9dad076e6597f27dc3ed308546516b12ae3e58bf4628690056a3150b99297f04e21609e3ac5190cd4447
+EBUILD opensp-1.5.2-r6.ebuild 1956 SHA256 5fcb5db5298b673078ed1bf084122a523a5421a280547f6fd70af7a9cd82854c SHA512 c0305b0aad809dfbeef279c93cfe6366b7989a43c636203f37bb9dd863017c9cf5197baea5a3836bd7913ea2d58cae329f6423623940e44d0b7a399e5ff8afea WHIRLPOOL 3519abcd8eabbfb73b46b202f412b170fdf6e12d96d5e2d2e4fa0823fbcf34bab358c882de32e098f870034cb611c65a9826ec678ce6745649a36a61a287aa06
 MISC ChangeLog 2308 SHA256 39f03a192deff58d623a4f5505e8778b7efc803cc06b2c53351c0898b235bb9c SHA512 5e42030043dc81b6354cb59d2b4bd2b2f570f4569a13b522d0c2ca23f030e2f882cdec27e22ae7b054558703eec4b9157dde98825c4119cc716c8d8bbe043fbc WHIRLPOOL e9282199927cabae628767bfb7fcfc70ee3d50677d2a960246b084728c3c66d1fc5cb8f72db7a5e6f5aa66cfd2fe80d625bebd6c7763b01205e90e3fee454001
 MISC ChangeLog-2015 9194 SHA256 085d0f865e1ca53847addec0946b26d7df5db7739bdef9b818c98aa8faa943c6 SHA512 abc62ec98d05235b3829a5c9c1a49b67194c1d5e0fcad5d6855bc0e9195cc923008a2bb8276752d35361d33f4618219e2d91a7de3014f8368f3d825fa70d2657 WHIRLPOOL de03203e03881b3e290b8ca4f5d0c13b9cb65010b91d1d3dde4176907057aa6c8f89454ba39e15bd965229d3c9d8ce8313a3e4a87440755f2bfabaf7dea1a226
 MISC metadata.xml 418 SHA256 12de568288fe2a8d05ea073ac0a0d965aa617abc68e9690f6b37281fb7398756 SHA512 d69bb957dd6b4af7a13527a7c6fb15b7df9ae62cddafb561557654d4076c3e455b28ed16c081fe6c8843c0ed9ec26bef4d26035ac6389d6d95523953bd940008 WHIRLPOOL 9f1c7b3cae102ff14a90c7716291422ef5034cd419dce26135f4c7eda67ab5941f0a5b2050266d8b753e699a540a38ae8bbfaf99418c1355073259ff7d9ec009
diff --git a/app-text/opensp/opensp-1.5.2-r4.ebuild b/app-text/opensp/opensp-1.5.2-r4.ebuild
deleted file mode 100644
index 9ca36741d8cf..000000000000
--- a/app-text/opensp/opensp-1.5.2-r4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic autotools
-
-MY_P=${P/opensp/OpenSP}
-
-DESCRIPTION="A free, object-oriented toolkit for SGML parsing and entity management"
-HOMEPAGE="http://openjade.sourceforge.net/"
-SRC_URI="mirror://sourceforge/openjade/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc nls static-libs test"
-
-RDEPEND="
-	|| ( net-libs/libnsl <sys-libs/glibc-2.26 )
-"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	doc? (
-		app-text/xmlto
-		app-text/docbook-xml-dtd:4.1.2
-	)
-	test? (
-		app-text/docbook-xml-dtd:4.5
-		app-text/openjade
-		app-text/sgml-common
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-segfault.patch
-	use prefix && eautoreconf
-}
-
-src_configure() {
-	# The following filters are taken from openjade's ebuild. See bug #100828.
-	# Please note!  Opts are disabled.  If you know what you're doing
-	# feel free to remove this line.  It may cause problems with
-	# docbook-sgml-utils among other things.
-	#ALLOWED_FLAGS="-O -O1 -O2 -pipe -g -march"
-	strip-flags
-
-	econf \
-		--enable-http \
-		--enable-default-catalog="${EPREFIX}"/etc/sgml/catalog \
-		--enable-default-search-path="${EPREFIX}"/usr/share/sgml \
-		--datadir="${EPREFIX}"/usr/share/sgml/${P} \
-		$(use_enable nls) \
-		$(use_enable doc doc-build) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake pkgdocdir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_test() {
-	# Skipping tests known not to work
-	emake SHOWSTOPPERS= check
-	SANDBOX_PREDICT="${SANDBOX_PREDICT%:/}"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		pkgdocdir="${EPREFIX}"/usr/share/doc/${PF} \
-		install
-
-	prune_libtool_files
-
-	dodoc AUTHORS BUGS ChangeLog NEWS README
-}
diff --git a/app-text/opensp/opensp-1.5.2-r6.ebuild b/app-text/opensp/opensp-1.5.2-r6.ebuild
new file mode 100644
index 000000000000..f2198eb5e884
--- /dev/null
+++ b/app-text/opensp/opensp-1.5.2-r6.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic autotools
+
+MY_P=${P/opensp/OpenSP}
+
+DESCRIPTION="A free, object-oriented toolkit for SGML parsing and entity management"
+HOMEPAGE="http://openjade.sourceforge.net/"
+SRC_URI="mirror://sourceforge/openjade/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc nls static-libs test"
+
+RDEPEND="
+	net-libs/libnsl:0=
+"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	doc? (
+		app-text/xmlto
+		app-text/docbook-xml-dtd:4.1.2
+	)
+	test? (
+		app-text/docbook-xml-dtd:4.5
+		app-text/openjade
+		app-text/sgml-common
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix-segfault.patch
+	use prefix && eautoreconf
+}
+
+src_configure() {
+	# The following filters are taken from openjade's ebuild. See bug #100828.
+	# Please note!  Opts are disabled.  If you know what you're doing
+	# feel free to remove this line.  It may cause problems with
+	# docbook-sgml-utils among other things.
+	#ALLOWED_FLAGS="-O -O1 -O2 -pipe -g -march"
+	strip-flags
+
+	econf \
+		--enable-http \
+		--enable-default-catalog="${EPREFIX}"/etc/sgml/catalog \
+		--enable-default-search-path="${EPREFIX}"/usr/share/sgml \
+		--datadir="${EPREFIX}"/usr/share/sgml/${P} \
+		$(use_enable nls) \
+		$(use_enable doc doc-build) \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	emake pkgdocdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_test() {
+	# Skipping tests known not to work
+	emake SHOWSTOPPERS= check
+	SANDBOX_PREDICT="${SANDBOX_PREDICT%:/}"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		pkgdocdir="${EPREFIX}"/usr/share/doc/${PF} \
+		install
+
+	prune_libtool_files
+
+	dodoc AUTHORS BUGS ChangeLog NEWS README
+}
diff --git a/app-text/rnv/Manifest b/app-text/rnv/Manifest
index b0d96a1ba3dc..aced045e0cba 100644
--- a/app-text/rnv/Manifest
+++ b/app-text/rnv/Manifest
@@ -4,4 +4,4 @@ EBUILD rnv-1.7.11-r1.ebuild 650 SHA256 8fed62e000cef68ec14380a6efab6d18ab3003b8f
 EBUILD rnv-1.7.11.ebuild 576 SHA256 f7186e11ecec42b665d0fd29f14de4f1c13a808080821dd45911a1db63ad27bd SHA512 d94b3b964563764f5ae11f9a7468d75b00ed5522f1a0c4cdb5b23d6c9f316f9b8a357998504086af8df22b3c04533cec7188fed7f107334e48209933be36a6b7 WHIRLPOOL 89b9249d5111ae8e9bdb104bf11cc5969952cbf1c0a8158a57e564792eb59b0e272f373d7c09285299ee285f3644b6eb606ad2dcbb4c5ab1a2c2ff176e25db0b
 MISC ChangeLog 3356 SHA256 de8ce5098ee1533e7b60c45a4ed177121ada64095f897fee306f4189e6b20ff6 SHA512 0145f0a79794e5865617ec90bdb94a83c01eec781941f2c612843d83af1e97888ae6722e99abb52aff822513a3c8a878b758216ccf27873cfcfd00abbb6e0e01 WHIRLPOOL b10751cc2352ff7ee2ed084523bb210700b9e3d3e59327bfbe25bbb7e3e802766a26059bfe070660a9bc40a5f48d1fa558ac07d94405dd5243ac5d3957981f0a
 MISC ChangeLog-2015 2843 SHA256 e659761186aeec1974bc3e9e75fd23e89b16f0ff72082c7900c2c6091791aac9 SHA512 400a7e01c44c43abcb82c143a24101e91a1668484358ae58f92dbd766f17a47d225316179bdc7d8a6c6108717218d3dae28bb60f16e2128b28ef7e35ef7a4144 WHIRLPOOL 5d3e96fd8dbc82313eede01520a053348078e823cdfc675e8511f657d2633e04e4c284552d2c02dae7c16d0bbbfb88caa220dfa4026aeb92b176a0e0690f9b98
-MISC metadata.xml 402 SHA256 b3084c02db396a2fa0d95e3aa2ec56f42928a9755067040e86a8b706dce9a1db SHA512 4d9406d86d89d241f23290eb315695ea70bbfdb8f9e9c3c996a798cd473aeceac37f82178191505a5bb7a51479fa74dc20d6dc40a930b1b0a6d6433a3fe36f43 WHIRLPOOL 8707d0900e03937e1cb13bf185f1d20ffb860a4a1b01bb7d95aecab61041a2fff5be839b2809cf43d3afb5d4734cb9a6ab17fe5ca7bbe56575adba95a711aea1
+MISC metadata.xml 239 SHA256 662bf89c79e530486a0dc5039c7ba190d4190eddf27c50771d603199ec836fda SHA512 7eb6bf1beffa771eee5c4de5dcf2ba3966398fcf6ea009eaeaa1d73cbdfc3d38907b8fd3c711144089b2ae506bcfa394f76ffd66238fd7df8e2f95589bb2f5f9 WHIRLPOOL a371312fb1caec3581efb17596df6e87bae03e75bf1a1829c9f4805d811be05feb75a9bd90db48f228b72092158baebcd106bfd3d93a8f11a98fa3289abfeff4
diff --git a/app-text/rnv/metadata.xml b/app-text/rnv/metadata.xml
index 857f078172f2..453784645d4c 100644
--- a/app-text/rnv/metadata.xml
+++ b/app-text/rnv/metadata.xml
@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dma05@web.de</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">rnv</remote-id>
 	</upstream>
diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index 670a1f91d970..92d4758dee44 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -1,8 +1,8 @@
 AUX xmlto-0.0.22-format_fo_passivetex_check.patch 2286 SHA256 64c1df49f92a44d4219c10b60e60bee34063fc6b99ae5f0ed1b14e11b27ea16d SHA512 c8eeb3dc909431dd2fb9f5286b6ee98a40dce80a29606a9884bdab50c039ac90097720b9b968dfac76546492844de0b72f2f6c937da14b47142ad81b897023f4 WHIRLPOOL ae83df73b7682f05b6e048aa7908331ef5b1ece0f2a40dfb968bfadd1991611fb998edd33dcef2984f0e5259e11a597a1620f9025a1f2d98554bd96da52b18be
 DIST xmlto-0.0.26.tar.bz2 119819 SHA256 efb49b2fb3bc27c1a1e24fe34abf19b6bf6cbb40844e6fd58034cdf21c54b5ec SHA512 85110f22a7b5a5c8de4115ae5d0391645a223191b17455a4f9539b02f56f7003fd4ba70e48f0e5e46cdb91220a9027802e725f88ca8659e3ce1576f8609ccd18 WHIRLPOOL f7ded4ceb65adcfc7c06bfdb8a3d22ca7195c098b5bcf26b3884111f536b72efbf5e642eeeee8be17d4a33db3accc139d78178dba2fe5a98037712048c2410e4
 DIST xmlto-0.0.28.tar.bz2 127921 SHA256 1130df3a7957eb9f6f0d29e4aa1c75732a7dfb6d639be013859b5c7ec5421276 SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1 WHIRLPOOL 4adbd66f85ed0ca90cb122dc08f9817d82e0b2bd417ae2ca8bb97e1fa3e301ab344d1ff9b9dec8571a6a519f1e0a80f0ce133d2618a211a64b0982c0b2b8c5f6
-EBUILD xmlto-0.0.26-r1.ebuild 1394 SHA256 27aee9ffd5aef12b1695d0849ba15d00442e15a070ba9f88233a8c17edf0aa89 SHA512 464125df8e6123886a7bb032544460e34d3fac328800f8a099fa3bbbfe162b2bfc2accc5dee39c65a11dc57e49523a7f8bea4a72a7b534487e92d9a7d24a5c56 WHIRLPOOL 74b0b2b21ed7003c410d3e7d809b5442816585771951dd94386bc94f2606c142a286f376e9e22b67d0a449ed5396b2bf982606bb74274f42b3882c73206f4437
-EBUILD xmlto-0.0.28-r1.ebuild 1406 SHA256 861137815545632fb61d697b9b641a19e4f6f40b0fd09adf78505d641ccff3e3 SHA512 e7c6e876c892f9596c19fd10f06b5d8d69f92ab55c9cf92624a1c87545c737bbc8f57ac8b952c02985c4a6385b42d97c0b904515120b0369cc0714f478eccc21 WHIRLPOOL c2334262be9de0538c0caaf02e6b3e7957e2412fc7c72e9a216924cf09cd2a453d3e1376e06842b20946016a7ac3e97ffd16bae21dfe3304cb7fa174ec14f3f1
+EBUILD xmlto-0.0.26-r1.ebuild 1360 SHA256 2343404586120c60b9f0221922a4121db50fec19878ea3a694ce857bcb87481e SHA512 2ef0a60cc7f8ea950070edcfef7b6582ac4b641d1a6e1e3f4206c20ad1b254f85f48c162b0a98e7633ee736157734984c7e4e03f978357b013262f8bd8e67ca0 WHIRLPOOL 6f3121e14f3d4bfcc7ddfed2cf77883ef5c0bef43a8c82de7d7b7b2aaaa35a85ce664b969a6296e1890084172aad7cb2dfca10c098e47ca6a274ee2d8aa16097
+EBUILD xmlto-0.0.28-r1.ebuild 1372 SHA256 5dbfca9d917a28fef4b88f7bc0d2d822a3c7b302f202b6bac7e0801e7be932f8 SHA512 a520e13daa04aedf7952859e30bdfd87c96a35e39363e1c379af6158d6f47704f0f11af766c8041340a4558dfd513b376fc48e1a41f9d446a52d9365abf5dec8 WHIRLPOOL 5eebbf6cd0db4534340e11f4d62912639d863e16f3ebe7fc20c7d034fb0b2ddd9ffea2bbcd0d761a31a52de6a38649a523c2167de6d40b3f6cb80c7fa992b4e7
 MISC ChangeLog 3521 SHA256 8b2e90c61add15760ba829b26949e4533f30ae5fbf1240331efa38bbf5a26463 SHA512 4b5aef60fcf5d0afcdafe36e99abe9e3eb5892279e3dca2302eb08307aae1192d301786fa1eb25bb84a7f6d38468fb671f6b8e859bf2beb397d57e4685d7868f WHIRLPOOL 3d31d93b06d6d0650c8175a12186060654635333b3362e1bfe31bcab5154c36eba256a9efcb990071eead8cab68bd6490875feb727a1d7d921c033dd4ab69048
 MISC ChangeLog-2015 12889 SHA256 664e2564cde09621649415b636efae8d8b846c5eaef9dea2eccc321b519721dc SHA512 962a84dc23501ed2699789e4383ff4085b9d14353f6375254bbdec8de766a34b106eeb1f859a4f7dc28209311443c12911b7362e5520bf9a5e42d9700bfcb96c WHIRLPOOL 30dcbad24d85623a3cce1607d6a4181ee34a8f3847a2c1b0589035ac9ce511d2802c6f167c904dbb4985c70563d934265a55f03867751b542d40a613993bfbcf
 MISC metadata.xml 247 SHA256 8afdfa1e3d4e32c0657326871389067326bcc1dc1ca57efd4165808c6c649ffc SHA512 f2b92e9bda8e4466d98436c15ee46b2a382afa4bfcf868678bb245abda936298ed41d03f3dcf5a61000ae1b1031a5578635e15293d63c531773d6a42d356af47 WHIRLPOOL 0e83d34a4f68934b022a4e0fcd3b60de44a8149fd6faf62176d15288eac700ca1b62de073912f7a2e61bfb2023e1ac1e8364642576135e0c631229fb3603e809
diff --git a/app-text/xmlto/xmlto-0.0.26-r1.ebuild b/app-text/xmlto/xmlto-0.0.26-r1.ebuild
index a09fe62fa98f..7131d28dfe9f 100644
--- a/app-text/xmlto/xmlto-0.0.26-r1.ebuild
+++ b/app-text/xmlto/xmlto-0.0.26-r1.ebuild
@@ -5,8 +5,8 @@ EAPI=5
 inherit eutils
 
 DESCRIPTION="script for converting XML and DocBook documents to a variety of output formats"
-HOMEPAGE="https://fedorahosted.org/xmlto/"
-SRC_URI="https://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.bz2"
+HOMEPAGE="https://pagure.io/xmlto"
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/xmlto/xmlto-0.0.28-r1.ebuild b/app-text/xmlto/xmlto-0.0.28-r1.ebuild
index 2e79b5582e6f..dcdf3321459f 100644
--- a/app-text/xmlto/xmlto-0.0.28-r1.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r1.ebuild
@@ -5,8 +5,8 @@ EAPI=5
 inherit eutils
 
 DESCRIPTION="script for converting XML and DocBook documents to a variety of output formats"
-HOMEPAGE="https://fedorahosted.org/xmlto/"
-SRC_URI="https://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.bz2"
+HOMEPAGE="https://pagure.io/xmlto"
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-vim/ackvim/Manifest b/app-vim/ackvim/Manifest
index 0dfb9e89bb3f..6d47178e3948 100644
--- a/app-vim/ackvim/Manifest
+++ b/app-vim/ackvim/Manifest
@@ -1,6 +1,4 @@
 DIST ack.vim-1.0.9.tar.gz 9361 SHA256 598af55eed01886428027ea26f3f99a5029ece88c28e34c22fb94d09ac552cab SHA512 42c931433ca2554cee0ccdc576891ba82efaebb0e5301ab279b3db8160816892b6f6232da7389058177ef9640a07e9582409c852ee5b55f3c9ee0b6f547ae8d0 WHIRLPOOL eea0a155e3249cde98072367b7bcffc063f22ef250125c46e3a5b0713267a353bd30275e4d8f169087e5108c1734b16796bb836b249dd6663868b6164d051154
-DIST ack.vim-1.0.9.zip 11910 SHA256 b479b04a94ddc4dd29bb9b525ba5e35f4925a96e92dd90a65120f225fd4fb241 SHA512 fc973144e4f82ee76f72709ab3755ed8c8fae0e3f9058d97cb4a19fb81cfb21aac4f0976e2fabfdbed67b9a2220732e335b81666ee42a31d9b4339881024cf10 WHIRLPOOL d4b4864d8dfcb41d0222a8f5bd81f3f3d64d4796b09ed3aff0ac347fb424246e165f6dfa2177723fa7805bed4b07c0973febbff9b7525bf0d6e4aa8467e8d8b1
-EBUILD ackvim-1.0.9-r1.ebuild 527 SHA256 74cdbd871b7fef4f7fb59d8c23bbacfc205ea5f787f917cb75fad1e39d94c0e8 SHA512 ad5d330bd98b620e0e8633e6ca964af68f5aff89f80aeb6e4611003fcd57069493aa02e55fbf5ff7579fa8ec2b911861c74924d8c0c40123d0d8c0adf38ac1e8 WHIRLPOOL 9e5948c9b6d6fd028be6d3ce1000fc3e4cea93ce4b65a5ae23968b8b4814eb5066e404e208730409215bca9f34d00938d4925ab88d1d64d0434845cc96dbe238
-EBUILD ackvim-1.0.9.ebuild 457 SHA256 3de156bc82736f392f40016c4ae3b8836749ccb028fab7e5b2e0bd47058e0f61 SHA512 922a620c3c3761f724133aebc407f55771effe7b97e11bc01020a9259b674f67ab708c603c701e716b84d6c34bd4ad43b825509647ff9f4158aade2201ed9280 WHIRLPOOL 7130b80ba46dbb2cb25e0708b141b2588281dd2a9f6afc3a227046b982356ccf5e50c9f3285a73bfbff79ccc147450d189248107be7dae9223664432c8e1b434
+EBUILD ackvim-1.0.9-r1.ebuild 525 SHA256 d006974b20d11cd4c09ce0927f0b3e2e446216d3aa02c373c0c317af50fc3d66 SHA512 c1584b58eb21af819309bbaa079d8762cd8a69034e12dffd243eca49bdc20d160ac92a3e5ba4c5c0d09e53cfb4a57ed421453dd1aad4b1a25c00b963e8138ced WHIRLPOOL d644732c4721b333651983c306c480aa873e701e467ce9b228a8be59633ad75336fc12b2eddd4ba73f79ff1bf2060fbf15cfdd99319bfcda9869965f601ecbd7
 MISC ChangeLog 938 SHA256 dca2d568aba2913dade646459e59886cca4933b5488ca89f6336c46a8c2eb9e0 SHA512 42b5ccdbc62d4561e7442e94ab7facada774f7c37e837820f836c8fd7330f44625da415a372a268ec3661be82c75c3441d3f96e0f082cbd4d6ef479720162484 WHIRLPOOL c67ed2afce3c783bc62dc01fb4adc3de6cd0fa7ed2d2cdd6ebf21e1ba8e92d0f8ef9f3c23a337d98fbb41be1df1f604b7f95c7fd121849e252cf7d1e34db5c7c
 MISC metadata.xml 441 SHA256 74e85a553f3be32577a0b61571560cc942fd88f9541152091b9b3e8db1125001 SHA512 2d1dcc58aad00a20900a58a57a4a560adef15405ae2c9a04e52cb82504e8999bcf2461cd39d8bec8211c1815cbe82ea8dce35970e83ff2357f8e0974c38a9d6d WHIRLPOOL 7c6977e0eb1005ecba410be2dede2727f0b31e539dac15e0373202d6413605509cd8687c9b0c22398b1eddae97e13ac0203fac792aa75ee6ae2aa923bdaf86e6
diff --git a/app-vim/ackvim/ackvim-1.0.9-r1.ebuild b/app-vim/ackvim/ackvim-1.0.9-r1.ebuild
index 2157915d1aa7..1b57e2677c19 100644
--- a/app-vim/ackvim/ackvim-1.0.9-r1.ebuild
+++ b/app-vim/ackvim/ackvim-1.0.9-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="vim plugin: run ack from vim"
 HOMEPAGE="https://github.com/mileszs/ack.vim"
 SRC_URI="https://github.com/mileszs/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
 LICENSE="vim"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="sys-apps/ack"
 
diff --git a/app-vim/ackvim/ackvim-1.0.9.ebuild b/app-vim/ackvim/ackvim-1.0.9.ebuild
deleted file mode 100644
index 21d6e2a00073..000000000000
--- a/app-vim/ackvim/ackvim-1.0.9.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-MY_PN="ack.vim"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="vim plugin: run ack from within vim"
-HOMEPAGE="https://github.com/mileszs/ack.vim"
-SRC_URI="https://github.com/mileszs/${MY_PN}/archive/${PV}.zip -> ${MY_P}.zip"
-LICENSE="vim"
-KEYWORDS="amd64 x86"
-
-DEPEND="app-arch/unzip"
-RDEPEND="sys-apps/ack"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/app-vim/vim-go/Manifest b/app-vim/vim-go/Manifest
new file mode 100644
index 000000000000..bcfa9a4e40cd
--- /dev/null
+++ b/app-vim/vim-go/Manifest
@@ -0,0 +1,3 @@
+DIST vim-go-1.13.zip 900566 SHA256 b4a6212becad775f90dedcb8045b04bf691f32c258c1fead68d5fbb7b775b463 SHA512 3a1818c126c6ab01cd6993336c9e87f88357375b5252e0aeed434dccd0514cbcb1b7c96dce2aaf8f8c2e21909a17bf4bbb39a386ee1f7049b50a85ed9c635817 WHIRLPOOL 0c92fe8f0f685401a9014124a0fb7341b7891dc5346b5af50124a5d2435614d11ed9d24922e0d5fe4cbfe0045ee0539769b3592ff5a0fdecf0f260a090e7b28d
+EBUILD vim-go-1.13.ebuild 581 SHA256 d38557282d9ca1fa81bdb185f139a5caa06b46e3b506cedab7dedd094edb79cf SHA512 39be06222c2466c2fee043542a471fd2e75b237c276c9126a63024fe2ac94f29f5ee0b08fe4afcfde4902aa6b3f5f74aacf89cdcda6449d67e5789c5fb3c8349 WHIRLPOOL eae35cde204f1e76339f1635fc45469dffa9f6782d2d7259dced69f6c51eb693842635a74bcd9b0b4891931ee08afb63b8f869094f1b77dff6db304aeb3f59e9
+MISC metadata.xml 326 SHA256 648cc60fed079e73be22699873a0923c49a9f06dcd29c5282f8af475f172f7cc SHA512 0075500c50b5ad7cf5610fbc4bb71e3ee3d655bc089916371ee0d66731387a2268df98ed6d7fcad6e70db28d6852b48c2e6742e131b7c5d50fc7a9656807fc60 WHIRLPOOL bd244d65f5f9eaa9dccc7a08f2fe382a8ac6e3b699af2dff0ef3361776abe70e054e67873ae4ff3f69b7d3c74b6c0475782ad6a8bb7b2d66e945e881c32070a8
diff --git a/app-vim/vim-go/metadata.xml b/app-vim/vim-go/metadata.xml
new file mode 100644
index 000000000000..a34620b83509
--- /dev/null
+++ b/app-vim/vim-go/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>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">fatih/vim-go</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-vim/vim-go/vim-go-1.13.ebuild b/app-vim/vim-go/vim-go-1.13.ebuild
new file mode 100644
index 000000000000..2cffe300bf04
--- /dev/null
+++ b/app-vim/vim-go/vim-go-1.13.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Go development plugin for Vim"
+HOMEPAGE="https://github.com/fatih/vim-go"
+SRC_URI="https://github.com/fatih/${PN}/archive/v${PV}.zip -> ${P}.zip"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="$PN"
+
+RESTRICT="test"
+
+src_compile() {
+	# safely skip `make test` triggered by `make` as it runs `go get` commands
+	# TODO: see :GoInstallBinaries (https://github.com/fatih/vim-go/blob/master/doc/vim-go.txt)
+	:;
+}
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index 91d55972e331..07174b6e8026 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -5,7 +5,7 @@ DIST eigen-3.2.8.tar.bz2 1161201 SHA256 722a63d672b70f39c271c5e2a4a43ba14d120156
 DIST eigen-3.3.3.tar.bz2 1642001 SHA256 a4143fc45e4454b4b98fcea3516b3a79b8cdb3bc7fadf996d088c6a0d805fea1 SHA512 bb5a8b761371e516f0a344a7c9f6e369e21c2907c8548227933ca6010fc607a66c8d6ff7c41b1aec3dea7d482ce8c2a09e38ae5c7a2c5b16bdd8007e7a81ecc3 WHIRLPOOL 4394f0d8f98dafbf913dc8c81e11935300bde458e9d2332a3eb35bca3930b76813a343da1c566a4c374d3d5f92aff5615c151935e29c783c71ae09e7088d2b2d
 EBUILD eigen-2.0.17.ebuild 1356 SHA256 d28de3b4523d5dd54d9da844a3c6adbe663990b573c1a0cec27bc80c0797e13c SHA512 142e42c213ddd740d7e43e91dbf9ffb957f379fbf996e3f33b3d4d2050ea5b3d67d09d5180364c37eb1da583ba5634206aaa6da0063a64f8c29b847d8a73cce4 WHIRLPOOL 1a39378d6271aa425132e25327ce388a42e852a099b15fad262c84298db17a107698268f04dd401898fa328be049f476c37e75e52c2fc9f23a7bb14d4afbf50f
 EBUILD eigen-3.2.8-r2.ebuild 2546 SHA256 29f268320fff60a1d5009cf169025cf7db3bebf94aa34ff80179bda206d42049 SHA512 b6879c780252842d486ee347bdaea5fc77e7f7ec98c10cb8f6d0060145a607fe3486daaf5102aed99f221b20a05a1caba9c0c8fe066a13ff68f10f638cb16bc0 WHIRLPOOL 0b43b86ae58fa5e579f855401cdeb49d43b7cd5926f671a2e7628862861abe1e665a29ee08196106ab720c96c2210bde2b98f5174b17418aa186e74832ddd655
-EBUILD eigen-3.3.3.ebuild 2710 SHA256 39117cc01766eea27efd51a907cb7de5660cc5ed7330cd33c1ca9f67ad67eab0 SHA512 4f1f27d2408568b5d68c5dec8814589378ecd610b0e94f5dfe904dc7616aba7186711896c9e1e33046079e25fb3302b302816426f9254616e2f733fa8cd191c7 WHIRLPOOL 1518581a96c1199c0ba6d9539ff153ce857d983771ac81e05933cc0e9951b33a48546e2ad6d4034794473078dc93bb6519e71fa1e13dda8afea1e259e52a194d
+EBUILD eigen-3.3.3.ebuild 2142 SHA256 ee12a7ad57f16065ae03323b219a83ceefd8c5a69e0c16baf6a6ef41e4719790 SHA512 6ab4b28b44512424b11d43d1dcd4c004010a959bb233ad0f876f82a14fa808490514e631d3c394c3da84ce230eba8c6d85b6b7e110e5d52c8d4d835ff59e6b58 WHIRLPOOL be81675f62dd0162c92ea2acb7fd03a0db796ef907e1d47861a46ac3764df80efd2b741843f4c584720b998e3686101cc20ef844660122b536a46568bf849346
 MISC ChangeLog 6521 SHA256 d3ee49273d81c3c6b2bcb4ec891b8a1088bccaee60dbee866f6ebbac8103687c SHA512 5fb93fa697193a83de61cf419806f4d608b1e2f34e962897fa42ef73bcdc611d30658baa952b6bf2405483298427365a27102a3dbe4bdec92d5db04d6844e93f WHIRLPOOL 264f93070cc66451aba1666df622bc37ac3085718aff741743315eaa7d2c862419fc317dc0e6da18dd9940f01370ecc754c88abd96cc9b7a030ed4abe6675009
 MISC ChangeLog-2015 11211 SHA256 7b81a1723a5ebeaa300f3951ec376856a35ba93e1aecda813b2042dea4c40196 SHA512 4f3af9be28b24401e4e18bd36fbf694bd3a5371526668b7b9650e8aad61cb03ab356e8628f3b1a0f5ba765c0accbb9fad9463f364d2c718eeed8c2d7a13659f0 WHIRLPOOL 319f8560a4477d4165e4b65ede6acd648986cc35d665dcbf298aa2b3173098d64a1cd9b278d4adf452455d88dfcf8267315bd5cb773a7bf4d9c917cb758f70b2
-MISC metadata.xml 1021 SHA256 13f69160f758372320f929a14d9b5d63a61b281f10c3f184bd091e966a833ba0 SHA512 80fa38e69adebe7ef6d54681bcba8ac1b05f60d65850292bfd7fae148572a1f954a3890d5d7e22046888043e39784c810069538a52d85da53516176bfefe9317 WHIRLPOOL e0ce57572b3cccc20d22a940b324788a2b35300dfac9fd0eec4e48afb3e0411f137bce365d1b4306aac9aa303569814e224d08abe34bc7edc47802e7a3d8f519
+MISC metadata.xml 945 SHA256 b49532eed7b61a8b34c752bb482d488c178e64e56dccc89e78137a66946a4a48 SHA512 c5401b0251bf5668117951522b019e6fcce6b5ed41ec933a6edec7869ed5505040d8f75fea7c4c17eeb691f331412bc3d2a7103b7f706cd582496feb6e7a3e57 WHIRLPOOL 1752ce4501832654d999b3edb0c98cc6d12eeb98dfa2779dfd9520171bd41a58786debb577c8a889c65d5db2ab37c08089d4af1aaf5facbb417879bb52a29c7e
diff --git a/dev-cpp/eigen/eigen-3.3.3.ebuild b/dev-cpp/eigen/eigen-3.3.3.ebuild
index 56cab46ed3bc..77378a727f22 100644
--- a/dev-cpp/eigen/eigen-3.3.3.ebuild
+++ b/dev-cpp/eigen/eigen-3.3.3.ebuild
@@ -16,9 +16,6 @@ SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="altivec c++11 cuda debug doc neon openmp test" #zvector vsx
 
-IUSE_CPU_FLAGS=" avx avx2 f16c fma3 sse2 sse3 sse4_1 sse4_2 ssse3" #x87
-IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}"
-
 RDEPEND="!dev-cpp/eigen:0"
 DEPEND="
 	doc? ( app-doc/doxygen[dot,latex] )
@@ -84,16 +81,7 @@ src_test() {
 		-DEIGEN_TEST_CXX11="$(usex c++11)"
 		-DEIGEN_TEST_CUDA="$(usex cuda)"
 		-DEIGEN_TEST_OPENMP="$(usex openmp)"
-		-DEIGEN_TEST_AVX="$(usex cpu_flags_x86_avx)"
-		-DEIGEN_TEST_AVX512="$(usex cpu_flags_x86_avx2)"
-		-DEIGEN_TEST_F16C="$(usex cpu_flags_x86_f16c)"
-		-DEIGEN_TEST_FMA="$(usex cpu_flags_x86_fma3)"
-		-DEIGEN_TEST_SSE3="$(usex cpu_flags_x86_sse3)"
-		-DEIGEN_TEST_SSE4_1="$(usex cpu_flags_x86_sse4_1)"
-		-DEIGEN_TEST_SSE4_2="$(usex cpu_flags_x86_sse4_2)"
-		-DEIGEN_TEST_SSSE3="$(usex cpu_flags_x86_ssse3)"
 		-DEIGEN_TEST_NEON64="$(usex neon)"
-#		-DEIGEN_TEST_X87="$(usex cpu_flags_x86_x87)"
 	)
 	cmake-utils_src_configure
 	cmake-utils_src_compile blas
diff --git a/dev-cpp/eigen/metadata.xml b/dev-cpp/eigen/metadata.xml
index b81958c50e6c..45f9aa6a9895 100644
--- a/dev-cpp/eigen/metadata.xml
+++ b/dev-cpp/eigen/metadata.xml
@@ -19,7 +19,6 @@
 	<use>
 		<flag name="c++11">Build using the C++11 standard</flag>
 		<flag name="cuda">Build with cuda support</flag>
-		<flag name="cpu_flags_x86_f16c">Take advantage of CPU feature f16c</flag>
 	</use>
 	<upstream>
 		<remote-id type="bitbucket">eigen/eigen</remote-id>
diff --git a/dev-db/kyotocabinet/Manifest b/dev-db/kyotocabinet/Manifest
index eb84f291fc88..d8c715780ba6 100644
--- a/dev-db/kyotocabinet/Manifest
+++ b/dev-db/kyotocabinet/Manifest
@@ -3,7 +3,7 @@ AUX kyotocabinet-1.2.76-configure-8-byte-atomics.patch 1250 SHA256 9a71b33b33e95
 AUX kyotocabinet-1.2.76-flags.patch 894 SHA256 f1b1ab691b56c382464b83dcfd13a41cf6a694ce6ad74d3fef822a41002d7548 SHA512 60a15c54994a5f338cf168feb831d858fdd2cadd16ea0c8001ef652e8502797f5920d3fed0a3ec4a6a2d817381b4690410878a18c7c859df34e26b033f48fe03 WHIRLPOOL ce032205dbb64987cb3cad63b6283811d85703e4901ce49795cd301fe0e74a08a73354af03b1398325812e80a4a227544f384f5d5b2e75a2865197cf865f6899
 AUX kyotocabinet-1.2.76-gcc6.patch 289 SHA256 85e9d7e48c5819ad712194a25a7c7908f966bcd3de2db2f456cb1f4dce4410e7 SHA512 755fe06635309139d55d1ede2e5ec30e37867501ead68abd3218c59ea016b72c9aa4d7d4072e15b53d22755606949dfaafa7b283d33a821d280fe7791ee8ff10 WHIRLPOOL bdc4f5a23b8479a08482dc55460124bbbae3bafa98834c92e3399f093d4400966be01babf4138f375744c465d1bbe99fafebb94d714e1aff71d7d7ee2be007a1
 DIST kyotocabinet-1.2.76.tar.gz 951930 SHA256 812a2d3f29c351db4c6f1ff29d94d7135f9e601d7cc1872ec1d7eed381d0d23c SHA512 278db7b327eb4c21bf0137d9aa14fb67d74d5ce7ed1cb29fc9120d157a60de165ec0cf842903eb7952e8f998045ae585b958977fa973ba0e0773381de71d9f6a WHIRLPOOL db984a6dcef0e3f313e56e5398a0fe75d1014e02dce04c4837d0aa01c0e97eb04eac728f4e9b600acec22a098a1f19ba33d8abb2ee50a8a60ba64afcd6d9c873
-EBUILD kyotocabinet-1.2.76-r1.ebuild 1285 SHA256 0e19f78951c35f35db402b4a5cb5ab2e6f31a03ea39d34bc4e4be950ce3ada05 SHA512 a7fe18f52685252e4895e055a4988c52aa2e74823bc6b7746801de46567ef300e37780d54ef80694a673489817a5551c09e1027d05af1cd34e7074e0a8613c2e WHIRLPOOL 9f2104301f95c1248560022b66140651cccbba938adff8108c7f201857402c8c2f436a56b8a9698db0506fb7999a6b613d2363406a5aa689390688f0922e15a9
+EBUILD kyotocabinet-1.2.76-r1.ebuild 1291 SHA256 5d30ac7ace69cd983cb52b8336f818525ac4154fd407e4e5caf601ae9c0fae6f SHA512 1b56fd8c64a5263e888b5ff69b000cfa6ae849fa6c2d5b3f3cbbc1c876f8721b1f5579e3661203b8e942af7647534f8b4c75d0d77be5b3672f2b12f56ff0cef3 WHIRLPOOL 8a9f38c4299028f03d8fbfe070d97916f888852cb0e65637db9f93d142d0c4ae02acb32cf314b85e2cdca3df3508fb38a3ece60bd6dcf800219d2962de9de48c
 MISC ChangeLog 2906 SHA256 8ddde6926b42e78e07b1edb549622e7867ddd79fdd135268a3e756770262578e SHA512 409116d7d7ce681e048db6114f1aec47e6460c9ffd4abca0b00cf683f9bf936eb2528b9e4d7eda63fb07bbb66b8abc7ff7da362652416fe2f3801d00b77ac5d9 WHIRLPOOL 909c336b50df6ec364e5c20ed4d23047599354d76839ab8fe855b40d613bf1d7de1cd575aac6e0e76a9721c68319d44a8b831f99633e27e7fd00b61b718095d1
 MISC ChangeLog-2015 5230 SHA256 15d8574833ef6bc862bb417b75fa23785587e156bbf1692671323cbf4faaf019 SHA512 d10f964f1484345b400e408cfe1a4b86b1bd1132f42d55eb88b2bcc02cb192613f77280ad033cc7d797a883a2caec1d7f028d6e494d448530125d07a4cf809e6 WHIRLPOOL 1024586afb88d8f88b2d6eb0bb33d854e07ffb78746ff8b40a3829cca1891273f872190d03ea22a72a08fbaea9352f6b1298ad86e6106df28118a6f8f99ad644
 MISC metadata.xml 247 SHA256 0deec0776f26fb762fdf7711f4589b14f52a2456436ef557eec62a2cf2fb2bb7 SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7 WHIRLPOOL a135fa622e99d3dcdb432bc6b3c366076b3d86b4bfd9a76c852d781b8e9152541c7e7a2c7c6d6a3c4d2200dce792847a08166aaf7c17c22b6299dfe868234dec
diff --git a/dev-db/kyotocabinet/kyotocabinet-1.2.76-r1.ebuild b/dev-db/kyotocabinet/kyotocabinet-1.2.76-r1.ebuild
index 4b7d4de72a8f..e17656c63b05 100644
--- a/dev-db/kyotocabinet/kyotocabinet-1.2.76-r1.ebuild
+++ b/dev-db/kyotocabinet/kyotocabinet-1.2.76-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}pkg/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="debug doc examples static-libs"
 
 DEPEND="sys-libs/zlib[static-libs?]
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 0b88f7cf56f4..7362305d66fe 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -16,10 +16,10 @@ DIST mysql-extras-20170310-1426Z.tar.bz2 307052 SHA256 23f5becec389fc49e7cf0d52c
 DIST mysql-extras-20170316-1355Z.tar.bz2 308933 SHA256 ebcb4f03413ccf42877558ad365db01bbb5ef2e12620a9be479ffc2514d9830e SHA512 5bf7938bfa5989da85216fbca4575397fc05c83e1afac76bd6c0b338a876caf37194f53a2a933d6f69eb31727ca005be617e53a8fdd0a95d8f1f68684c4ba68c WHIRLPOOL 701871ff554970adef8e5eb1e2e966a09c4b59ac7931df125f78a4fcfa415e87767184a9d3418013d27410ad0482673942f1df48d5e5de68917f49e1efa96689
 DIST mysql-extras-20170830-1210Z.tar.bz2 312079 SHA256 eda0090fb448e22a004e334956278a887843a3b2bf3ed523b80dd4691d4729d4 SHA512 55553de3bb93b09c29ff411c135ff2762edad3498d9e8fb844df349ce8ab864969668f2bbc3ba99e2217cc20f1c9155443794c301ca064d09a1b45ddead567c8 WHIRLPOOL 961073913064ad3f4decf4221bd9f87fd8bd6349c3e13c1c799e5622b9f2353a2981d2577c5a00c026ac006c03a1c609f4527c2d9027610214d2e79bc5be0669
 DIST mysql-extras-20170926-1321Z.tar.bz2 312466 SHA256 e2ecfa43d70d9796cfd60dc2448b8e76e4e35ccbbe12b6a4becc8f854e172c12 SHA512 556e782ccc40d8cffb2fde8c46038c90023440c07785ec667f898afdb8c802faeb4dbfe8b3918a1e563b46d1dc8c0de1172f7843ce08ee1ded435b344f8f0cf5 WHIRLPOOL cae69f01090231bd25a48002e8682b70894d0b4e3ae43083fb062db159a44d4b085edb46f92ed0452d98fccbec7fc0fd1f97eff9fd16b810fc22e845e8923b50
-EBUILD mariadb-10.0.30.ebuild 6886 SHA256 e9ed5cf89f7d44ad61b6c9c35d958fbfe6b56b30cd7cf22c405e1f31d2bcba09 SHA512 4c8ed348db2b71ebc351a78c141b56fe1736e35e7db6819612c43f347251b4fc68db9a2b982a1a70219310e23b0ffdc3bdf1253cebd6955ba0700c76b39a2ca3 WHIRLPOOL 4ceb753a8122b9c2e42cc1ad7e85f5c71d3e06dce0eb22dab57982e8f102101f42cef4a85367c66f2eb2e2b0ee1924226284fa72e9f229fb523321a1a672d062
-EBUILD mariadb-10.0.32.ebuild 6767 SHA256 9ea0af871fe806b30a877415da0b0881cd24f3eb3611d4e2dec18e78e15c443d SHA512 8ecca9144723916e28351cb349ea465227946d08ce905a19c7fe5503018c3e8441549a92ef6bffcd8d2ee9eedff3541354ab920d89c4f4f0bbd5ea1c19f96e5e WHIRLPOOL 8736b28d7092ff0f07b722f057a7f9ee65960b2d2a6b633fc17b0f14925a5ee68de857393ba433f1f0c126307d3e496bc6b306659769e9e576b14c66d0ef67e2
-EBUILD mariadb-10.1.24.ebuild 7187 SHA256 fb9a9a37ea87839b5df675be187df0756853d995e56af9f46e4d938f1f3bb778 SHA512 f88e2f171b9785ab6c834511ca71d9939eb36020a32cfdba5fb91f81253df8a35b891db321c0f796dfec03c7fa39226d1696607518efbaa446531590de97a75a WHIRLPOOL 95a507b48de0251948e1511c285d50b7fdbc490395ce3618a2e4517fd3223d62e17787837570f5f4ba5b78d3b7f773889826ef0966ae7b92ed7da9d6639a0f21
-EBUILD mariadb-10.1.26.ebuild 7255 SHA256 3dfe3f3c0effdb9a13b4e89398169a58773c056da51a12ac9c79e28ed0cc2b02 SHA512 171bd1cf59c77e98505f9f2217a5522611977fcd1c13d67dbe551892da3569b45298a032e33d5aed8cc2caa95f326c6f011291f678436a7fb3069133792693c7 WHIRLPOOL 3bc062878d0be9c3211299ab3e2c2d90d970f2cb2cf311dfe3fa799545bc09fd32f6da3532883dc5a6a4adfb42e23459b302d43bb01ebb1d776f5811f5102156
+EBUILD mariadb-10.0.30-r1.ebuild 6886 SHA256 e9ed5cf89f7d44ad61b6c9c35d958fbfe6b56b30cd7cf22c405e1f31d2bcba09 SHA512 4c8ed348db2b71ebc351a78c141b56fe1736e35e7db6819612c43f347251b4fc68db9a2b982a1a70219310e23b0ffdc3bdf1253cebd6955ba0700c76b39a2ca3 WHIRLPOOL 4ceb753a8122b9c2e42cc1ad7e85f5c71d3e06dce0eb22dab57982e8f102101f42cef4a85367c66f2eb2e2b0ee1924226284fa72e9f229fb523321a1a672d062
+EBUILD mariadb-10.0.32-r1.ebuild 6767 SHA256 9ea0af871fe806b30a877415da0b0881cd24f3eb3611d4e2dec18e78e15c443d SHA512 8ecca9144723916e28351cb349ea465227946d08ce905a19c7fe5503018c3e8441549a92ef6bffcd8d2ee9eedff3541354ab920d89c4f4f0bbd5ea1c19f96e5e WHIRLPOOL 8736b28d7092ff0f07b722f057a7f9ee65960b2d2a6b633fc17b0f14925a5ee68de857393ba433f1f0c126307d3e496bc6b306659769e9e576b14c66d0ef67e2
+EBUILD mariadb-10.1.24-r1.ebuild 7187 SHA256 fb9a9a37ea87839b5df675be187df0756853d995e56af9f46e4d938f1f3bb778 SHA512 f88e2f171b9785ab6c834511ca71d9939eb36020a32cfdba5fb91f81253df8a35b891db321c0f796dfec03c7fa39226d1696607518efbaa446531590de97a75a WHIRLPOOL 95a507b48de0251948e1511c285d50b7fdbc490395ce3618a2e4517fd3223d62e17787837570f5f4ba5b78d3b7f773889826ef0966ae7b92ed7da9d6639a0f21
+EBUILD mariadb-10.1.26-r1.ebuild 7255 SHA256 3dfe3f3c0effdb9a13b4e89398169a58773c056da51a12ac9c79e28ed0cc2b02 SHA512 171bd1cf59c77e98505f9f2217a5522611977fcd1c13d67dbe551892da3569b45298a032e33d5aed8cc2caa95f326c6f011291f678436a7fb3069133792693c7 WHIRLPOOL 3bc062878d0be9c3211299ab3e2c2d90d970f2cb2cf311dfe3fa799545bc09fd32f6da3532883dc5a6a4adfb42e23459b302d43bb01ebb1d776f5811f5102156
 EBUILD mariadb-10.1.28.ebuild 7320 SHA256 b45d0316aed437a96b46648109783fd9a8d3252d92acadf89e8a763843327e49 SHA512 4868269e57a2951e6f51dafb51fea044902e390aedaf2d1229b85c61fda12f39cf0b01935dcd4ae111b5323b647c9f639cc4fbfe03d20f50b56085babcb275e9 WHIRLPOOL cbaf38b55fcc2d3f2b0ba00fbde07b513077952b33d3679f99a1b48eb5e15638f274753bc1b536570350890d0faa5ccaa3e45934984699d95c3c9fb8fb56f45f
 EBUILD mariadb-10.2.9.ebuild 33584 SHA256 2493e44d407da15ee064afb0dae082980514d5b8754a4f0cf9cf544a8f435724 SHA512 308a9089edb55264e290aed7fade8ba2e4c9bdb6c83204dbbbfdf3f0b205a64a82874079134d48de958b0755f92d3fc9a1a2e73fefd105c58862c4ca1a327e9b WHIRLPOOL 03a803a33eb343bfef919e4cc5b8aacba74b32ecad01d12dbecbddd71ce26a4a0862d1f539e735bdd91064f3476aca4128bd47852aeee7332b92587766fc72c3
 EBUILD mariadb-5.5.58.ebuild 4241 SHA256 ebb8013626eb0a5a222b3bac6ef12606545e67338903c5872249589ae8d79aa8 SHA512 3de822605e73ca9094f6635ee232b133371823e3f3330d6ecad973c0e9176d2280a5fd5ae6032a4f6e3f914c8a937f912e2aeb91a5802342ced02aee6db11944 WHIRLPOOL 3d68d32e9d157c909659ddb17550c517e5407366c2e867a7d7ecc14594d329e551d42221e2a918155e0a1d6cbe7819a121f8ac3a417110156010ed1716ef230f
diff --git a/dev-db/mariadb/mariadb-10.0.30.ebuild b/dev-db/mariadb/mariadb-10.0.30-r1.ebuild
index a0218bb32389..a0218bb32389 100644
--- a/dev-db/mariadb/mariadb-10.0.30.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.30-r1.ebuild
diff --git a/dev-db/mariadb/mariadb-10.0.32.ebuild b/dev-db/mariadb/mariadb-10.0.32-r1.ebuild
index e02c2cfe240c..e02c2cfe240c 100644
--- a/dev-db/mariadb/mariadb-10.0.32.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.32-r1.ebuild
diff --git a/dev-db/mariadb/mariadb-10.1.24.ebuild b/dev-db/mariadb/mariadb-10.1.24-r1.ebuild
index 12dfcd871287..12dfcd871287 100644
--- a/dev-db/mariadb/mariadb-10.1.24.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.24-r1.ebuild
diff --git a/dev-db/mariadb/mariadb-10.1.26.ebuild b/dev-db/mariadb/mariadb-10.1.26-r1.ebuild
index c40f1daf24c5..c40f1daf24c5 100644
--- a/dev-db/mariadb/mariadb-10.1.26.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.26-r1.ebuild
diff --git a/dev-db/mydumper/Manifest b/dev-db/mydumper/Manifest
index 2efcf3f1785b..759a5b3d256c 100644
--- a/dev-db/mydumper/Manifest
+++ b/dev-db/mydumper/Manifest
@@ -1,8 +1,8 @@
-AUX mydumper-mariadb-include-fix.patch 696 SHA256 b7c2998f31453360d1891e10856210e98672055ecf81b9133eda22564c90af53 SHA512 e4343f00f0f61d63ec8621d42537411158a995e624562f71d322357a7322b46aef8859252e8b8c5c51370247ff70d2cb5187ff33be56e964e54a2e392124fc7c WHIRLPOOL edca806761d639eee3f671dd400ff3d60b5ec66b46b998e7ae771cd21b3eca5bec46aa586505c7062bc8ff2aa8e4fc3ecf0e23fb4b2478878fb82c7944183457
+AUX mydumper-mariadb-define.patch 766 SHA256 3a8df19403d426fe4a42747cea0c165971933037e2861f0b18ce310ad4359e14 SHA512 839061da9fcfc16d0729bf8ba62a5c22a03aba1c089006efd600020a8d618af0f8d962f6a3a92c5ff3acb9847d3a7944d865c035df93a567d7f21bb184e9dc53 WHIRLPOOL 8b899b5e9c8def712ee08b9b0b31620fef49f5d6b1150092d0d380fe458068ed917b7556cb730c5411817ae6d4d2e2332d6985905147c71a429e688a673d52aa
 DIST mydumper-0.6.2.tar.gz 40165 SHA256 fa28563e8967752828954c5d81e26ef50aad9083d50a977bf5733833b23e3330 SHA512 ef9e48cc481f2674456659c061c45f3cb056180ab5576805e75d458658e94998758b894e45ddc06fb716c1d37fedefb644158f07cf6e77f4b5477663e954eb83 WHIRLPOOL 867b7efa6ca00dcfbb32f5dda2b63de038d0da3ac1a127059cbfdae9af577fef74868c38dad2bd5b5a9b4de76f7d108fcb6232b27c41d3062f413eac4cac843b
 DIST mydumper-0.9.3.tar.gz 45320 SHA256 2cd6a074bac7072905bd044ec20955c53c81b10e877ac9c644509940a8d201fb SHA512 3bc2c85dbedf234aecca3b66f445e42bb7ddff83f914d5cc231f6a5755d1c2bf300ae9bf4bdea0717b45ea5338c6c336ec44f375dbf29570ed785ffddda53898 WHIRLPOOL 09988aa314ede6e56ce82c6eade9d29770ca2cbc39d4b2f1cd3f8403f9521e1aa5a372fda7992885c1c25743cc59d4c41cdce8d86eb79b8c7725631c2919c9ae
 EBUILD mydumper-0.6.2.ebuild 949 SHA256 d5de40f9acb0ff0b489b81a763e494d4d3831f7798bde1aa1492d4ed38c9aba2 SHA512 4b5078ef47b20819915e187121d1ff42e31d910e515ab1ec70289fdc775b48ff2da50bd549cb9fbe526dd453b9d09bd5631da12206bb254613a6ed4c0f5d7818 WHIRLPOOL 5886604cbeb5eb0a11aa33365fb00cfecbcd79d60db8f39f72dc816c4f4271a42bf06481057a5f6845c710a20e529ad827e6b07a362fa8fab1f31e195a617d8c
-EBUILD mydumper-0.9.3.ebuild 1030 SHA256 452452ce20ac7136f8b77d7310197dd728dc2a9432757d4bbffdf92167deaa40 SHA512 9d0514b4d1690855c8e828ee29e767410ab19f6726f10eb381c9bed0a0c42e63fa7eed88fc278e532d951f49652d0675d839e3d14c650eb352831cd5f7eacccf WHIRLPOOL 60584b90fec8bc5bc1c3c28eaa6767862923410f17612d7ca7c2e6f9e36c8b7bef090b79ce6650bd18e4db891b23aab2bb050d21286ebdbce5331f1cc6cdeea8
+EBUILD mydumper-0.9.3-r1.ebuild 1025 SHA256 6f234c291bafd0e79feb96f217915479ed8d84e04efec0556a363d1238114306 SHA512 5b1a7b6669e4cfc85d0e32a9a5474de7dc00c27931c72219c1cd212139f616eaf492c76e749ea3cf94f88aa31d35455783b3ceb65943f9f82f34288dc037d64a WHIRLPOOL 392642348de86a4ce5a996b2b25a0fb4268531e15c89350be0dd1766454b81bb74450db850f40d1e8a6a4f8262d3f4de29e4753fab13eed95b227d67374025cf
 MISC ChangeLog 2725 SHA256 d1ecaf2b0c71e99c461f83588d14e73b773277a4aecf10aeda571f84b4a342f8 SHA512 c9eb636071b042ccae43a5b8af330dfed81f2547467931146ad66a360fae0c058abcab3d9a18451d8e5d323c92fe5c8db1e4325b7b76c54477df94cf290a91c6 WHIRLPOOL ef094c02e8427ec6fcaf2e10b6e10e6dd8eb2045b69831de35711398607e28eaaf5b5c0ac76af0d6040602201c799208901f8c24bb75356614f6d2fbb00d7a41
 MISC ChangeLog-2015 1534 SHA256 c65362f5aafb0d2cafc22db7177e28dce95edd3f8bf5d38711440872c3e72c0e SHA512 e269d766dbba9ce8913397f4321d30545bb06e58042619eed88d2de19d69c9f21ec1a0146cc10e9226e6b6394d5b37469754ae1d27cf33a4ddf93a15f1d6ff9b WHIRLPOOL 6640ffed60e7253d2373db39d26c6459803387b55ffa10483d8ce0c69fbb697630e5e33f77904bb5c7e6b8c8c02b317ecf8541d3c958612792e8ed14979a88f3
 MISC metadata.xml 448 SHA256 f67c25fe06defd93c231d0c47d8c25dc1b9e9209f3ce8ab50e2b5b3c5da8e9a8 SHA512 192415f225533e6195856255483cb80c5da21f496bfe048518dbfccf8cdc049339ab5322d125e627a3a84fcdfb052012fd57cbe2083118917b35796f7a9e9353 WHIRLPOOL bf616b518dbc668cbc7d3bc41955253dcca574778a96268bfc8474995b7e658e282fea428940c1e465b7d31d2c9444d7bd3f027febbc13b91b208e8c1b5b51b2
diff --git a/dev-db/mydumper/files/mydumper-mariadb-define.patch b/dev-db/mydumper/files/mydumper-mariadb-define.patch
new file mode 100644
index 000000000000..ee39a33be818
--- /dev/null
+++ b/dev-db/mydumper/files/mydumper-mariadb-define.patch
@@ -0,0 +1,28 @@
+--- a/mydumper.c	2017-09-07 14:53:02.000000000 +0000
++++ b/mydumper.c	2017-10-25 14:53:46.614729185 +0000
+@@ -22,6 +22,11 @@
+ #define _FILE_OFFSET_BITS 64
+ 
+ #include <mysql.h>
++
++#if defined MARIADB_CLIENT_VERSION_STR && !defined MYSQL_SERVER_VERSION
++  #define MYSQL_SERVER_VERSION MARIADB_CLIENT_VERSION_STR
++#endif
++
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <string.h>
+--- a/myloader.c	2017-09-07 14:53:02.000000000 +0000
++++ b/myloader.c	2017-10-25 14:55:34.677729185 +0000
+@@ -19,6 +19,11 @@
+ #define _FILE_OFFSET_BITS 64
+ 
+ #include <mysql.h>
++
++#if defined MARIADB_CLIENT_VERSION_STR && !defined MYSQL_SERVER_VERSION
++  #define MYSQL_SERVER_VERSION MARIADB_CLIENT_VERSION_STR
++#endif
++
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <string.h>
diff --git a/dev-db/mydumper/files/mydumper-mariadb-include-fix.patch b/dev-db/mydumper/files/mydumper-mariadb-include-fix.patch
deleted file mode 100644
index 0914b3acff6a..000000000000
--- a/dev-db/mydumper/files/mydumper-mariadb-include-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/mydumper.c	2017-09-07 14:53:02.000000000 +0000
-+++ b/mydumper.c	2017-10-06 17:39:34.962315949 +0000
-@@ -22,6 +22,9 @@
- #define _FILE_OFFSET_BITS 64
- 
- #include <mysql.h>
-+#if defined(MARIADB_BASE_VERSION) && defined(MARIADB_VERSION_ID)
-+	#include <server/mysql_version.h>
-+#endif
- #include <unistd.h>
- #include <stdio.h>
- #include <string.h>
---- a/myloader.c	2017-09-07 14:53:02.000000000 +0000
-+++ b/myloader.c	2017-10-06 17:39:28.962315949 +0000
-@@ -19,6 +19,9 @@
- #define _FILE_OFFSET_BITS 64
- 
- #include <mysql.h>
-+#if defined(MARIADB_BASE_VERSION) && defined(MARIADB_VERSION_ID)
-+	#include <server/mysql_version.h>
-+#endif
- #include <unistd.h>
- #include <stdio.h>
- #include <string.h>
diff --git a/dev-db/mydumper/mydumper-0.9.3-r1.ebuild b/dev-db/mydumper/mydumper-0.9.3-r1.ebuild
new file mode 100644
index 000000000000..f95deef1be62
--- /dev/null
+++ b/dev-db/mydumper/mydumper-0.9.3-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="A high-performance multi-threaded backup (and restore) toolset for MySQL"
+HOMEPAGE="https://github.com/maxbube/mydumper"
+SRC_URI="https://github.com/maxbube/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+CDEPEND="dev-libs/glib:=
+	dev-libs/libpcre:=
+	dev-libs/openssl:=
+	sys-libs/zlib:=
+	virtual/mysql"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )"
+RDEPEND="${CDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-mariadb-define.patch" )
+
+src_prepare() {
+	# respect user cflags; do not expand ${CMAKE_C_FLAGS} (!)
+	sed -i -e 's:-Werror -O3 -g:${CMAKE_C_FLAGS}:' CMakeLists.txt || die
+
+	# fix doc install path
+	sed -i -e "s:share/doc/mydumper:share/doc/${PF}:" docs/CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=("-DBUILD_DOCS=$(usex doc)")
+
+	cmake-utils_src_configure
+}
diff --git a/dev-db/mydumper/mydumper-0.9.3.ebuild b/dev-db/mydumper/mydumper-0.9.3.ebuild
deleted file mode 100644
index b4970ec03bf0..000000000000
--- a/dev-db/mydumper/mydumper-0.9.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A high-performance multi-threaded backup (and restore) toolset for MySQL"
-HOMEPAGE="https://github.com/maxbube/mydumper"
-SRC_URI="https://github.com/maxbube/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-CDEPEND="dev-libs/glib:=
-	dev-libs/libpcre:=
-	dev-libs/openssl:=
-	sys-libs/zlib:=
-	virtual/mysql"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )"
-RDEPEND="${CDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-mariadb-include-fix.patch" )
-
-src_prepare() {
-	# respect user cflags; do not expand ${CMAKE_C_FLAGS} (!)
-	sed -i -e 's:-Werror -O3 -g:${CMAKE_C_FLAGS}:' CMakeLists.txt || die
-
-	# fix doc install path
-	sed -i -e "s:share/doc/mydumper:share/doc/${PF}:" docs/CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=("-DBUILD_DOCS=$(usex doc)")
-
-	cmake-utils_src_configure
-}
diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest
index ef8b0a91ba08..8f548a7da0db 100644
--- a/dev-db/mysql++/Manifest
+++ b/dev-db/mysql++/Manifest
@@ -1,17 +1,18 @@
 AUX mysql++-2.3.2-gcc-4.3.patch 358 SHA256 0251cb84e6a768f2a2a4a280f1aa8988b314770993aceeb204c5d6a7afbb11d1 SHA512 09ef458ea4e85e251bca585fec84b53c5b7937d06b9843ddb7d12fef9250c042a46738f6fa27866e171f0107de48df9b5b22416c0eeb86eebdff583438404a51 WHIRLPOOL ad72c308896c4c2ef1ce54806aa961eb7314847fb45a0ef9af7778ed3cfe11e6e7981dea850aede25f06b800c8a4f663148f2e6ea8df91d8c28b3d840f32a933
 AUX mysql++-3.0-gcc-as-needed.patch 7699 SHA256 863c19fccc1136a075f1e86389221f766f28f6a42c9f94f8a6db490ad35e796a SHA512 937cceaa198a42a69fbaad2019de4f825f60cbf2443cb07f85b9fa0555711f7639f47b7aa2442d68b4d6e8c40a99c78a930e76ae26e28900f885d35a7e7679c6 WHIRLPOOL e40d16c9f0763c38760ddab22fd3cdb2d6372579de35b246a47ff3e9ffdf69e9010d3e8ced394e7a8d4eb94fa051e90b9b2417fb9c2578f3108e3960a5b6c319
-AUX mysql++-3.2.1-gold.patch 273 SHA256 ffe1cff166f129ef45f2c4e6f2491e4b9e821ed36df57814831172dc652feeae SHA512 c494c0118c29dbe488621d6da101bbf0dccc9b4d0407189c50ec8d204a0aa5865e78557812553bf636213ea39c86522715fc627c82954593b0f4388f9f24beb6 WHIRLPOOL 5e6e7f372df8da74b270ab08e5d13c5043138c6f87e89e830221a22a00c7743734faeda0eb60d9d3d612385fc4225ea47d535c4d895a6405c18015d33bfb55e8
-AUX mysql++-3.2.3-mariadb-10.2.patch 922 SHA256 18e407dcd9004a8b7c1c238659d0cdd494220a58d5cbbebec278daf41a6cf7f8 SHA512 a346b01095fd61baf73f6a9f93c7ddedc872d79780173adab45faae0c5134cffb5b6cbd8d379fb4f8c670007b961e8dfe0562cfe802cfa8b3a6b86f8d9c0b874 WHIRLPOOL 6f7a7d13ddb9c4fe1df1a218c343fe09442fb70ab881e1b2ef7e554d73dc56aa8d5d2814c382ca25e45e62becfca9537866dcf5f98e36030795e5a1021945c39
+AUX mysql++-3.2.1-gold.patch 196 SHA256 12e44bd91f9470688cb0e0ccfe1823122e5c109c6f08cebf2f077fcd758732eb SHA512 34cd99548f5f23371fd02074017329ec4814c59ab02b114a6fd4c811d30015e1e3192a8d5d6a6847f57a076dd606d44e74d69dae6f5581d5b8d252ea359ce658 WHIRLPOOL 517b75010c912b2886af4b4838820ccafcc1dc20ffdac4483812f39ba4f6486ddea39117ca60a936cfcf41166307a7e1fcf56b9f359ce964654c77d0295466fc
+AUX mysql++-3.2.3-as-needed.patch 19502 SHA256 4f88b8a810b0ecf0b172e7791c9590fb2b5a91097064c6a7e42d79c1c0b126c3 SHA512 7b8674d6e1b3ce462e01f2f2d32782c83cdd56ec6288855ea5ff419afc8b139530e1ae4dc104475786856cda4834b11cec3342b8d0447d14f1ae3e77a61580c9 WHIRLPOOL 22c670fef6b425a192df6b7bc61af625623ec5937e86d84940c472d0f148898dd13181675ddb3eab012bf6b6ee8271719d0076fa1884a333e8b6b5e3de4db951
+AUX mysql++-3.2.3-mariadb-10.2.patch 630 SHA256 264bdaa49253ba0d1be78e5755fff41693e9ef8bdc0feb1d1bbd56d5bf531c58 SHA512 550e5adbdaf04dd6460aeafd0e6cad6cd29124c85f4222216574cc41c7df8559b33ce3eda484eba620a7b97c16bc63e56e744770feccf92348ff066173ad8297 WHIRLPOOL d366d427600e3ab6af54ad5f22908862285128f3c0ed2d23e42d65273f2cd68afdb730d6e94ff8023d3f025e52a3205ac222c0b8c741b075cc802d90919dc4ac
 DIST mysql++-2.3.2.tar.gz 1627115 SHA256 3544b964964bc8981118119e82e4883dc9d1de8a72861a19e6687719ed3efce9 SHA512 b546c8369550e541c1a0b1b0e301fdd298a771cb709ad6c6ea3450a8f8bbe7533989a82d1c19cd9bf9a261d7a1fc4c3760919d3d5e3e43b5d698b75b7abf07f7 WHIRLPOOL 2bfc961193baad0053ff9909075db9f5ccfc7c00334483842bc25a94044a1331392f3dc0283bf5f33e69f67c20505bf5b12a01635a0f92716a0c341af5fe637e
 DIST mysql++-3.1.0.tar.gz 1944101 SHA256 256c39a583e7d60947916851754c626312428e9b1d8af3309e34d64ff8404e92 SHA512 bb57bbf03c80edabff701132877f407ecfa1b76958d7655415c59ec939e80fbe250951a16c3d5ea6988dd2c778b623605cb65bf810501f392be2f6b6ad07ad90 WHIRLPOOL 0b5274e0fbc1b2cb40ade9699ddc46d5837e66f3a506502f4dae5f5de4689ac2ccf3989a674db073a36075c541046b174e80bbac3d7df393bd61ef3bfc99fd32
 DIST mysql++-3.2.1.tar.gz 2256735 SHA256 aee521873d4dbb816d15f22ee93b6aced789ce4e3ca59f7c114a79cb72f75d20 SHA512 936021dcf8568d3ee0c935e5c552acc6fd2b57849d1cc60e68b45b690d798d7bfbc1dedc04e21417d1b4c27017b471e4f6cb70de7f1904949b9222090a777de9 WHIRLPOOL 56579d4a1afb5985dc8487d211ea7e5aedfe7acfbcd6130b28b07364e66d6b0142831296a6c6ce2f4de78f45e94572c1ef289db41ee504b05d04f3623d48b2aa
 DIST mysql++-3.2.2.tar.gz 3257359 SHA256 55667bee79a5981b1a04e57e3a4fd8b03bf330e4e3371b023c2bf5ba0f50ed17 SHA512 eb4250394027f1baafa660711d8221c9eb3a70ff2a37331c58807a97a67b84f792290b24830e851b2421f6ccf2867e9f3597af3af41530256c44521a4c4a55b1 WHIRLPOOL c344e77edf8fb5d09fc82c716441ecc53b00b97076d696c52072c79b0c754b7852959c4adac02240cf37ca9159a8f8174a086d43f7cd36388a2c26f2bec38a12
 DIST mysql++-3.2.3.tar.gz 3241023 SHA256 c804c38fe229caab62a48a6d0a5cb279460da319562f41a16ad2f0a0f55b6941 SHA512 b6b0a9856ede9e5e08be0f5ed1689b1256f8cf31c3afbb9c9e7f68d0734380e25909ef31cd04be6b253c86b2f881df10f3793a2d3e32042375dbbab4b0700d0a WHIRLPOOL ea45deaa9a1c7c94e7790117b5f964d7af2e4b85be90dff444eeac4023295d2c076f1f6e8539182b502200c818b50f08543e0e9c7aa7cd9038b1084e1af64ce3
-EBUILD mysql++-2.3.2.ebuild 1317 SHA256 7ecb90a2e47e9bb9b608439059184e32194e922469d7194ad47651012c190a77 SHA512 1997f7bde76e53456ef0191859ac04391fd9a32a40cb07766a0876f1e4810bd29d8b480e0ba8474dc52ec4680c748448ae798f04e67e5dbfb21701c93b475f3c WHIRLPOOL f421f81daeebd32f1cb451a7bf630f111744a27fb5ec1041d4b6fd57897b102cd210b1c5c13a37646e691fd7d558c14c779653cf57e76cae5ae0c441d150af72
-EBUILD mysql++-3.1.0.ebuild 1238 SHA256 a58b2ab1ede7d02d392168f9d46edc78464dab6663e3cfe2bddadd88d2d061fc SHA512 0915d6f160bb38a02d6bdf7bffc7fc912361db8ccc85c7f3c4c425ff5528b92b38d933f9945fe41f5bd457cc991cd848bf85a96360b82de5a0362391aa8d4fce WHIRLPOOL 885478bfe103b7a701a130dffbfaf57697b5df2b1f7125558e50c04c3a9ecb5e1298f7d3e5fc22fec736759815e44a0eed36b5ce331f6cfb0be43a61b74a4896
-EBUILD mysql++-3.2.1.ebuild 901 SHA256 98f3c2f297749af5ec27cbeb828ea27d2de5a85966fc75b3e3ac9a64ed7ed14d SHA512 136c1c7776514af3013eef5093b5c7a078297ecdd5e08394e02d0554458cc5e234576bfc63e020e6e668a0da179bc1846cd10981793f7b93f00b047eff63fd7e WHIRLPOOL 4cf537d22c8e6cf66810c4b1136452c97cb5d5e6683a642bd42cc4414cc9f7af97772575427d49d03032e55ebec53872f8a5337bebbe2cf957e6699300cb08c9
-EBUILD mysql++-3.2.2.ebuild 853 SHA256 a60801a6ff0712a0f4bdfa52e4f120406db77d625dd62aebde63245f9abd38ef SHA512 ef929d98d318f118fdaeba972dc43b755809563d49537fdb97d23f324dfa63788bf03a22d8c89eafbdeb04c971c6cb8efd58f915d0008cba9094df71494b7254 WHIRLPOOL c85a521d4808affc840eceee6a5775e0af60a23e2264ccd3d1430b83ebfc2d406b63d2075fc34a0590feead9f609c99022fd804bfeb2ba97de489557fce6d415
-EBUILD mysql++-3.2.3.ebuild 1526 SHA256 8de48c5a26bb31516643cfbeb11dbf8c351807064cff3ea4c3d88cc1d530abca SHA512 e2d81dae3b02f03d684d0c66d48e998ab869d77f32168ae886b270fa19c520a6ca5bab09dd7d1427e688df0c574a7cef60dcd6e0117b7a16e17807bd9914dc33 WHIRLPOOL 3196d58d17147bd373973b6ddaccc8208232f6436f7199f65b56a97410bcad7dd5d7c722e6655a5a725f62c5bcca5a0cd9fb08ba2538afc31df5e690e2332f11
+EBUILD mysql++-2.3.2.ebuild 1317 SHA256 42f033874ac812861991722c325050e26b4b1fffd955a370da75eb5650f720b4 SHA512 353023121c04882aad8a0c674ade803111e6922bfb9974d91b65179af23a264d5767404ef2eb77e50a685c89d55509196e21a8c397d98d072ab797458d2a81df WHIRLPOOL b546726ff030c1df8c575682e78550a87623ac4e16ba8a79f707b76d4545618c9a05f711349ecbc282ac4b9434ce2c6778d8b5e76d717c44db558c26de472553
+EBUILD mysql++-3.1.0.ebuild 1238 SHA256 27e8f49720f316ee58622c68d01ef66b1d26202b135a272aba4337fef32c4cc9 SHA512 cbd918e3719d0ddb12da283c9f555cea25737ba38ba0e42912e9f8eb134ddafba3f4e0ff13665d3b9336a039f3ff43adbdb969e4a0a3953283d652836de1d3b1 WHIRLPOOL 6e41acced36016e8b900d7901c4e7ac0165156f26ac45c8c31b3e227293fd431f37a066abf0e024f886e6e9a7a13a1b2adc8f8b18077a166cf623553e31d4f92
+EBUILD mysql++-3.2.1.ebuild 901 SHA256 67ba3f870ba8a37e56af609633964dca2785b1f633fa2b697b46b7197f98a894 SHA512 6a2029dab230cf4c1e4c344362ef7ae8204775a1dd898da6d5bbe274c3b5ad1b1d223eb6e4b4c5915b87b7c6b401c40b3630c8aa0546d4c0192ba418f4d1cf31 WHIRLPOOL ecddc1b71e656efa9a52d3dc6e1a8b9997c0b950b506a11ed7acb7e02ab91ee3ada4d5e42d049b5427cde1aff10cf5ecfff8177218fb741df8157288848fc2d6
+EBUILD mysql++-3.2.2.ebuild 853 SHA256 0a4b12087a9dd4a5ded9e50fc9abc8af8ac9a5a78d5d2222e9a49f7bcf9f7cfb SHA512 f617976eaef20a31071983c10ea89ecff0f8cd440c0a040f6b419fd2e109229d0db4bff08dbbdc01ff17937a7ab46f17560b3c81cf18226d08a3739c92ca475d WHIRLPOOL 578c2d41e9a1c4f9074c7787eb04e624316506eb69d2410379d7cc35f918ee5218844b85d944e3b0878c7ba7dd7f07770d36246a1665689565be59777525300e
+EBUILD mysql++-3.2.3.ebuild 1565 SHA256 19f5ec147522c574693ea34651b36b01132056d3a028fc379571271bce8cbaaa SHA512 98660ccefd411d7aa549d05264438be54f0bfdd101c4d85f46a5eea431b9efd4d9ec3385842e5342e8c993a69c12b13a7e655d046d62defa397f9244c9b7634b WHIRLPOOL 430118b61a4c95106518a1e18243fac941decee2d9d3d09be85b0ecf61d6dfa40a102a39cd6417b5e502b247c926e26ab644b75a620b40c7dc26bee15cf8ec11
 MISC ChangeLog 2797 SHA256 cfd626e589d5df15494c538d2c8511645be1d89788e63fcfb2e6de55ba424c8b SHA512 fe65c61a75373bf13b88c7db3b597ebe12324ca5730aebf0e6bfa376cd560e49f7c1e76d490f0ab7142fd4ac61c3fe0d83dfc0e908240b46291762df44122ab4 WHIRLPOOL 0e83632797437426fb0954af96973d98c7e4a84938758723b3d9587a18c82811a9eba181f5e64cb11722ec02849a0d07283cc03564344bfaba81a3a882fa5d24
 MISC ChangeLog-2015 11700 SHA256 69f7c9e777997bc91e9b69a228017c1259fc1f83aee0b017c22f1a223e352c7f SHA512 511705ac466c3d4cf7f5a26adf8745efc4daaa846e1dc58b78cb23aba5ec4eea7848cd565d2521a68400f197d447535002170619e935342750cfe7b3cf04e853 WHIRLPOOL 3377de4dbae18f26d9c0181ef6e338c129efa232f9431b2a85d43b8e2f9b8c8ebe2061b9b1dfe14b1c12926e50555025d6eee473af167c44e8df4bd255e900c3
 MISC metadata.xml 239 SHA256 a35e1476a1677a91f06dd6e4f955fcebc58c3a07f934b5e62fbf801573a5c82b SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b WHIRLPOOL 3ed1945907fa58cbc9997c311d1d0431d481586576ce45b4bc5caf7704ddefe2117305879a97e8021694b86af0d570a34517212b6cc9528224b85e568eee3d75
diff --git a/dev-db/mysql++/files/mysql++-3.2.1-gold.patch b/dev-db/mysql++/files/mysql++-3.2.1-gold.patch
index 0f6bb7eb1f79..8e10752b7f0e 100644
--- a/dev-db/mysql++/files/mysql++-3.2.1-gold.patch
+++ b/dev-db/mysql++/files/mysql++-3.2.1-gold.patch
@@ -1,5 +1,5 @@
---- a/Makefile.in.orig	2013-09-27 09:51:48.646667442 -0400
-+++ b/Makefile.in	2013-09-27 09:52:22.026603184 -0400
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -36,7 +36,7 @@
  CXX = @CXX@
  CXXFLAGS = @CXXFLAGS@
diff --git a/dev-db/mysql++/files/mysql++-3.2.3-as-needed.patch b/dev-db/mysql++/files/mysql++-3.2.3-as-needed.patch
new file mode 100644
index 000000000000..f4172076eec0
--- /dev/null
+++ b/dev-db/mysql++/files/mysql++-3.2.3-as-needed.patch
@@ -0,0 +1,254 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -529,87 +529,87 @@
+ 	$(RANLIB) $@
+ 
+ ssqlsxlat$(EXEEXT): $(SSQLSXLAT_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) $(LIBPREFIX)mysqlpp_ssqls2parse$(LIBEXT)
+-	$(CXX) -o $@ $(SSQLSXLAT_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp -lmysqlpp_ssqls2parse -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(SSQLSXLAT_OBJECTS) $(LDFLAGS) -L. -lmysqlpp -lmysqlpp_ssqls2parse -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__ssqlsxlat___mac_setfilecmd)
+ 
+ test_array_index$(EXEEXT): $(TEST_ARRAY_INDEX_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_ARRAY_INDEX_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TEST_ARRAY_INDEX_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__test_array_index___mac_setfilecmd)
+ 
+ test_cpool$(EXEEXT): $(TEST_CPOOL_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_CPOOL_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TEST_CPOOL_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__test_cpool___mac_setfilecmd)
+ 
+ test_datetime$(EXEEXT): $(TEST_DATETIME_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_DATETIME_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TEST_DATETIME_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__test_datetime___mac_setfilecmd)
+ 
+ test_inttypes$(EXEEXT): $(TEST_INTTYPES_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_INTTYPES_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TEST_INTTYPES_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__test_inttypes___mac_setfilecmd)
+ 
+ test_insertpolicy$(EXEEXT): $(TEST_INSERTPOLICY_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_INSERTPOLICY_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TEST_INSERTPOLICY_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__test_insertpolicy___mac_setfilecmd)
+ 
+ test_manip$(EXEEXT): $(TEST_MANIP_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_MANIP_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TEST_MANIP_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__test_manip___mac_setfilecmd)
+ 
+ test_null_comparison$(EXEEXT): $(TEST_NULL_COMPARISON_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_NULL_COMPARISON_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TEST_NULL_COMPARISON_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__test_null_comparison___mac_setfilecmd)
+ 
+ test_query_copy$(EXEEXT): $(TEST_QUERY_COPY_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_QUERY_COPY_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TEST_QUERY_COPY_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__test_query_copy___mac_setfilecmd)
+ 
+ test_qssqls$(EXEEXT): $(TEST_QSSQLS_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_QSSQLS_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TEST_QSSQLS_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__test_qssqls___mac_setfilecmd)
+ 
+ test_qstream$(EXEEXT): $(TEST_QSTREAM_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_QSTREAM_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TEST_QSTREAM_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__test_qstream___mac_setfilecmd)
+ 
+ test_sqlstream$(EXEEXT): $(TEST_SQLSTREAM_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_SQLSTREAM_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TEST_SQLSTREAM_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__test_sqlstream___mac_setfilecmd)
+ 
+ test_ssqls2$(EXEEXT): $(TEST_SSQLS2_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) $(LIBPREFIX)mysqlpp_ssqls2parse$(LIBEXT)
+-	$(CXX) -o $@ $(TEST_SSQLS2_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp -lmysqlpp_ssqls2parse -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TEST_SSQLS2_OBJECTS) $(LDFLAGS) -L. -lmysqlpp -lmysqlpp_ssqls2parse -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__test_ssqls2___mac_setfilecmd)
+ 
+ test_string$(EXEEXT): $(TEST_STRING_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_STRING_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TEST_STRING_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__test_string___mac_setfilecmd)
+ 
+ test_tcp$(EXEEXT): $(TEST_TCP_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_TCP_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TEST_TCP_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__test_tcp___mac_setfilecmd)
+ 
+ test_uds$(EXEEXT): $(TEST_UDS_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_UDS_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TEST_UDS_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__test_uds___mac_setfilecmd)
+ 
+ test_wnp$(EXEEXT): $(TEST_WNP_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_WNP_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TEST_WNP_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__test_wnp___mac_setfilecmd)
+ 
+@@ -619,122 +619,122 @@
+ 	$(RANLIB) $@
+ 
+ cgi_jpeg$(EXEEXT): $(CGI_JPEG_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(CGI_JPEG_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(CGI_JPEG_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__cgi_jpeg___mac_setfilecmd)
+ 
+ cpool$(EXEEXT): $(CPOOL_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(CPOOL_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(CPOOL_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__cpool___mac_setfilecmd)
+ 
+ dbinfo$(EXEEXT): $(DBINFO_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(DBINFO_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(DBINFO_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__dbinfo___mac_setfilecmd)
+ 
+ deadlock$(EXEEXT): $(DEADLOCK_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(DEADLOCK_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(DEADLOCK_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__deadlock___mac_setfilecmd)
+ 
+ fieldinf$(EXEEXT): $(FIELDINF_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(FIELDINF_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(FIELDINF_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__fieldinf___mac_setfilecmd)
+ 
+ for_each$(EXEEXT): $(FOR_EACH_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(FOR_EACH_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(FOR_EACH_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__for_each___mac_setfilecmd)
+ 
+ load_jpeg$(EXEEXT): $(LOAD_JPEG_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(LOAD_JPEG_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(LOAD_JPEG_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__load_jpeg___mac_setfilecmd)
+ 
+ multiquery$(EXEEXT): $(MULTIQUERY_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(MULTIQUERY_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(MULTIQUERY_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__multiquery___mac_setfilecmd)
+ 
+ resetdb$(EXEEXT): $(RESETDB_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(RESETDB_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(RESETDB_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__resetdb___mac_setfilecmd)
+ 
+ simple1$(EXEEXT): $(SIMPLE1_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(SIMPLE1_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(SIMPLE1_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__simple1___mac_setfilecmd)
+ 
+ simple2$(EXEEXT): $(SIMPLE2_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(SIMPLE2_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(SIMPLE2_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__simple2___mac_setfilecmd)
+ 
+ simple3$(EXEEXT): $(SIMPLE3_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(SIMPLE3_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(SIMPLE3_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__simple3___mac_setfilecmd)
+ 
+ ssqls1$(EXEEXT): $(SSQLS1_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(SSQLS1_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(SSQLS1_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__ssqls1___mac_setfilecmd)
+ 
+ ssqls2$(EXEEXT): $(SSQLS2_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(SSQLS2_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(SSQLS2_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__ssqls2___mac_setfilecmd)
+ 
+ ssqls3$(EXEEXT): $(SSQLS3_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(SSQLS3_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(SSQLS3_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__ssqls3___mac_setfilecmd)
+ 
+ ssqls4$(EXEEXT): $(SSQLS4_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(SSQLS4_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(SSQLS4_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__ssqls4___mac_setfilecmd)
+ 
+ ssqls5$(EXEEXT): $(SSQLS5_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(SSQLS5_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(SSQLS5_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__ssqls5___mac_setfilecmd)
+ 
+ ssqls6$(EXEEXT): $(SSQLS6_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(SSQLS6_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(SSQLS6_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__ssqls6___mac_setfilecmd)
+ 
+ store_if$(EXEEXT): $(STORE_IF_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(STORE_IF_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(STORE_IF_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__store_if___mac_setfilecmd)
+ 
+ tquery1$(EXEEXT): $(TQUERY1_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TQUERY1_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TQUERY1_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__tquery1___mac_setfilecmd)
+ 
+ tquery2$(EXEEXT): $(TQUERY2_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TQUERY2_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TQUERY2_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__tquery2___mac_setfilecmd)
+ 
+ tquery3$(EXEEXT): $(TQUERY3_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TQUERY3_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TQUERY3_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__tquery3___mac_setfilecmd)
+ 
+ tquery4$(EXEEXT): $(TQUERY4_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TQUERY4_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TQUERY4_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__tquery4___mac_setfilecmd)
+ 
+ transaction$(EXEEXT): $(TRANSACTION_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TRANSACTION_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TRANSACTION_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 	
+ 	$(__transaction___mac_setfilecmd)
+ 
diff --git a/dev-db/mysql++/files/mysql++-3.2.3-mariadb-10.2.patch b/dev-db/mysql++/files/mysql++-3.2.3-mariadb-10.2.patch
index f461daac2a43..ff814650e001 100644
--- a/dev-db/mysql++/files/mysql++-3.2.3-mariadb-10.2.patch
+++ b/dev-db/mysql++/files/mysql++-3.2.3-mariadb-10.2.patch
@@ -1,6 +1,5 @@
-diff -Naur mysql++-3.2.2-ORIG/lib/dbdriver.cpp mysql++-3.2.2/lib/dbdriver.cpp
---- mysql++-3.2.2-ORIG/lib/dbdriver.cpp	2017-07-14 14:56:06.206629443 +0200
-+++ mysql++-3.2.2/lib/dbdriver.cpp	2017-07-14 15:28:34.690826959 +0200
+--- a/lib/dbdriver.cpp
++++ b/lib/dbdriver.cpp
 @@ -257,7 +257,11 @@
  	}
  	
@@ -13,9 +12,8 @@ diff -Naur mysql++-3.2.2-ORIG/lib/dbdriver.cpp mysql++-3.2.2/lib/dbdriver.cpp
  #if MYSQL_VERSION_ID > 40000	// highest flag value varies by version
  			(o <= CLIENT_MULTI_RESULTS)
  #else
-diff -aurN a/lib/common.h b/lib/common.h
---- a/lib/common.h	2016-12-30 18:44:44.000000000 -0500
-+++ b/lib/common.h	2017-09-01 09:12:12.270089396 -0400
+--- a/lib/common.h
++++ b/lib/common.h
 @@ -130,12 +130,6 @@
  	#define MYSQLPP_PATH_SEPARATOR '/'
  #endif
diff --git a/dev-db/mysql++/mysql++-2.3.2.ebuild b/dev-db/mysql++/mysql++-2.3.2.ebuild
index d6bdd7a79dcb..7167c329599b 100644
--- a/dev-db/mysql++/mysql++-2.3.2.ebuild
+++ b/dev-db/mysql++/mysql++-2.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ inherit eutils
 
 DESCRIPTION="C++ API interface to the MySQL database"
 HOMEPAGE="http://tangentsoft.net/mysql++/"
-SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz"
+SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
diff --git a/dev-db/mysql++/mysql++-3.1.0.ebuild b/dev-db/mysql++/mysql++-3.1.0.ebuild
index 3a2f4e8e8d4d..b945531b392b 100644
--- a/dev-db/mysql++/mysql++-3.1.0.ebuild
+++ b/dev-db/mysql++/mysql++-3.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -7,7 +7,7 @@ inherit eutils
 
 DESCRIPTION="C++ API interface to the MySQL database"
 HOMEPAGE="http://tangentsoft.net/mysql++/"
-SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz"
+SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0/3"
diff --git a/dev-db/mysql++/mysql++-3.2.1.ebuild b/dev-db/mysql++/mysql++-3.2.1.ebuild
index 35ff9881cab9..1ea7dc61f868 100644
--- a/dev-db/mysql++/mysql++-3.2.1.ebuild
+++ b/dev-db/mysql++/mysql++-3.2.1.ebuild
@@ -7,7 +7,7 @@ inherit eutils
 
 DESCRIPTION="C++ API interface to the MySQL database"
 HOMEPAGE="http://tangentsoft.net/mysql++/"
-SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz"
+SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0/3"
diff --git a/dev-db/mysql++/mysql++-3.2.2.ebuild b/dev-db/mysql++/mysql++-3.2.2.ebuild
index c84fd8d97a30..a7f6809512a8 100644
--- a/dev-db/mysql++/mysql++-3.2.2.ebuild
+++ b/dev-db/mysql++/mysql++-3.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -7,7 +7,7 @@ inherit eutils
 
 DESCRIPTION="C++ API interface to the MySQL database"
 HOMEPAGE="http://tangentsoft.net/mysql++/"
-SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz"
+SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0/3"
diff --git a/dev-db/mysql++/mysql++-3.2.3.ebuild b/dev-db/mysql++/mysql++-3.2.3.ebuild
index 7491c26b1fbc..83594c55eda5 100644
--- a/dev-db/mysql++/mysql++-3.2.3.ebuild
+++ b/dev-db/mysql++/mysql++-3.2.3.ebuild
@@ -7,7 +7,7 @@ inherit autotools libtool flag-o-matic
 
 DESCRIPTION="C++ API interface to the MySQL database"
 HOMEPAGE="http://tangentsoft.net/mysql++/"
-SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz"
+SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0/3"
@@ -17,15 +17,20 @@ IUSE="doc"
 RDEPEND="virtual/libmysqlclient:="
 DEPEND="${RDEPEND}"
 DOCS=( CREDITS.txt HACKERS.txt Wishlist doc/ssqls-pretty )
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.1-gold.patch
+	"${FILESDIR}"/${PN}-3.2.3-mariadb-10.2.patch
+	"${FILESDIR}"/${PN}-3.2.3-as-needed.patch
+)
 
 src_prepare() {
 	# Bug filed upstream about deprecated std::auto_ptr
 	append-cxxflags $(test-flags-CXX -Wno-deprecated-declarations)
 	# Bad symlink for libtool in the archive
 	rm "${S}/ltmain.sh" || die
-	eapply "${FILESDIR}/${PN}-3.2.1-gold.patch"
-	eapply "${FILESDIR}/${PN}-3.2.3-mariadb-10.2.patch"
-	eapply_user
+
+	default
+
 	_elibtoolize --auto-ltdl --install --copy --force
 	elibtoolize
 	# Current MySQL libraries are always with threads and slowly being removed
diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest
index cf63276dfc0f..3c36194a10ab 100644
--- a/dev-db/mysql-cluster/Manifest
+++ b/dev-db/mysql-cluster/Manifest
@@ -3,8 +3,8 @@ AUX my.cnf-5.6 4504 SHA256 d6bfb754105464643f8f2efa14337c2f78a6a6e7e812e998b2ebc
 DIST mysql-cluster-gpl-7.2.22.tar.gz 26075142 SHA256 404b80192c488791cedf6251e64bb01310b20f13fcdb28721e108e92985ae999 SHA512 b3370725f17a5b6577c9822097b6c39e4375bdabca2a403bd45dfeb9fd5920c0e213c894eed33dadba69d9c066427ab5065c587869d82bf2e3438d3bdeb1aa8e WHIRLPOOL 1275fc2a181011c5ea2ac392c94027f399a5ce4fd499ff23790bfad142b1c7d67bc421e7c6a4e64e6bb409f04016196417535d5704d21165c1120bf46ab68544
 DIST mysql-cluster-gpl-7.3.11.tar.gz 42806929 SHA256 6c8cfc99ccbf47cd4304996559de6fb330e9cdf754bec37ff7347be72e50c646 SHA512 89e5b6e845b71ed6945529b7f515d3af96ec6daf79c0085f1d0ea6e4426f61eb3626b688e5edda668be4615df1b8cec4e71acdf0d21150fa2775c79ea09563e5 WHIRLPOOL f03d3b62da793becd6aab775293e5963697f9b4147bf6d662274f689b1a48692b1f4de0ad196e74cb02a07ce2a69b608a4d420ad5dc153b20888ba69dc361dc4
 DIST mysql-extras-20151117-2040Z.tar.bz2 294183 SHA256 2ca16597e869fb0fac4f6e48b779892569698ce83c898df3afaee63131f71833 SHA512 8edbc6a3812d17a2f1a827459867c0747387ff72be86b12fe0e790afca5e4b70e4f23c4098bdb61afa20ef292e2c3b154f16577d5c11999a3e2eec9e43b8d09a WHIRLPOOL f0df653216857527ffa3d31f07ab1c470614b53350f5dbd965ba3bdc398f36f37b506537f1070b03a54203a3847f6557a2ae6757327ce852833fa026de7b518d
-EBUILD mysql-cluster-7.2.22.ebuild 4072 SHA256 4542f954fc00d365ec22957fa29d4d08686a1a32756941d58b655b1ea0d3a082 SHA512 a4911a0abc8c7642704a3e40582e1b7d5f5b9fa900d51873c64f902d9f659b5bd4a87be155f92c3af8ffad441c4d9648aca5a5b30e1f9e59fc010435b2f31daf WHIRLPOOL 064279511fd791f3328f3c67df6e32247022efa983e43349d8f0234f6f79dbabb38cb7c4a5b0cad1ecbde4e637242f4a43879f2271d8c21c59178fbc2f56026c
-EBUILD mysql-cluster-7.3.11.ebuild 4704 SHA256 cce611435c5d31357ca28cee68df4ed55f78efc6b07a2a903605382f24fab4e2 SHA512 9a3fbc8757b0b8edf84253bd6309718787d4e04959734ba9193c69d94ddfc77dced361e096889f7aa8dc0838b73974a4db25e40b91222d8b35f8d5422f38e715 WHIRLPOOL e6c536bd86fc54e0d9f58386703b7be42a8e04fd0e1fb9de60724d8d12165dfadc38d5090ad8933627e47b87d3685d1be89a0b1f6202112681a0b7885e7620b4
+EBUILD mysql-cluster-7.2.22-r1.ebuild 4072 SHA256 59707164db3dd16798912ec03123fe8089476f6523fe7e399399f303b9eca401 SHA512 80fc2e252b524e981626ba617157b83f17f5c3508f930b6946867146d45795b7af04406d1b06ddab5c7b908751b5cd894bdd65c45f343539ec8700d8bca602a7 WHIRLPOOL 077136326af7652f90d766e5d1d725f33298d20c081e49cfd52e8e0d58b9f32f84df56c5f5390cfe12ea77ceee248a5837959e477f385b657c2c8f3b7edb103f
+EBUILD mysql-cluster-7.3.11-r1.ebuild 4704 SHA256 ab09a1942a00f72b4adcc256ffda39757c7c04d6e105d47aeb8ea73b8f575134 SHA512 6b2baae1c3e9c878d4ce37d33afd282cfa11d9479ab37d0f5287571c2c744e4f56d9ccc89118262038b30e706f6e9e9ce7c269ee71530b59d8a4ae55de9e2e70 WHIRLPOOL 4020a60de973e555cdf4b43b0a7de74c55fc86fca2fe796cabd010adb242e1464b8edd8e92c9ef094b3d9ec64cc1c44e092facd1d34678d6f82c51f30f1447ab
 MISC ChangeLog 4144 SHA256 07b9aaf673d386476ecf94e5efd8f36b29bcd6c03a8ed98477705cf1b8a2a04f SHA512 b6ba5accdb4963a66fd2ec137c5d35850d15a8da7891252eec32c381cbb93ffaa92c36d1c49a0b7545063eb58c3f9b79a75d1e5815d9890a403563601634242e WHIRLPOOL fd6aee40cc89ac8da2e1b33acb992963e6bc60f6f9f722ca5779047abb696c26e7dfcd4c07094887639005eb80f8ec699960399022804cf2320b4efaaccf49aa
 MISC ChangeLog-2015 2348 SHA256 343f777d9569de16f5ff95232ebc908eabee68ce641474776aaa8665357e498c SHA512 cc53b01580c21a312d77b59e8d653dcf3c2a8576cf8cf664784d94c60d266224155ed5a2b409c457f8104e05be56bfa449ffb526e42226ece9abd2549d481468 WHIRLPOOL 13ef8138e6c990e173c1042a8b146bcdb6d86121636c79f48226c75931bd3f36f0db0c9d55a348be4ef3e9ef3e7d3a4b00cd6450c524bcbb3472a474c48dc65c
 MISC metadata.xml 1480 SHA256 5f8896f7960f7c265619b41261ff6fccfbcedd29d9a70c4d6f63f960e40d7c50 SHA512 cfb6a753bb071b39f52e8db35b07f70efeae4cb943d57d010a6d42a641c50b6f28b38bf4068536b3c70604da1cb5a428ea5525d0c776ef46cfc4c4c5a37cbbe4 WHIRLPOOL 76bea8ae26e55982611ee7fa24767692327eb53ef386fa11cd128d5e1918e1eb25f639b9a581e83b4c0ce51b8c03630e80ccd3f0a6b1dfb15cc17ba7fc7d6935
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.22-r1.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.2.22-r1.ebuild
new file mode 100644
index 000000000000..09d32b5a664e
--- /dev/null
+++ b/dev-db/mysql-cluster/mysql-cluster-7.2.22-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+MY_EXTRAS_VER="20151117-2040Z"
+BUILD="cmake"
+
+inherit toolchain-funcs java-pkg-opt-2 mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~amd64 ~x86"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+# This is often broken still
+#EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="!media-sound/amarok[embedded]"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+# Official test instructions:
+# USE='cluster extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-cluster-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if ! use "minimal" ; then
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${T}"/var-tests{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin, ndb.ndbinfo, ndb_binlog.ndb_binlog_index
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		#
+		# main.openssl_1
+		# error message changing
+		# -mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: ASN: bad other signature confirmation
+		# +mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: error:00000001:lib(0):func(0):reason(1)
+		#
+
+		for t in main.mysql_client_test \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help-notwin main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic main.openssl_1 \
+			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
+			ndb.ndbinfo ndb_binlog.ndb_binlog_index ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
+			--parallel=auto
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+
+	else
+
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.22.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.2.22.ebuild
deleted file mode 100644
index 264df8423382..000000000000
--- a/dev-db/mysql-cluster/mysql-cluster-7.2.22.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_EXTRAS_VER="20151117-2040Z"
-BUILD="cmake"
-
-inherit toolchain-funcs java-pkg-opt-2 mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~amd64 ~x86"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-#EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="!media-sound/amarok[embedded]"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='cluster extraengine perl ssl community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-cluster-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${T}"/var-tests{,/log}
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin, ndb.ndbinfo, ndb_binlog.ndb_binlog_index
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 \
-			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
-			ndb.ndbinfo ndb_binlog.ndb_binlog_index ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--parallel=auto
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.11-r1.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.3.11-r1.ebuild
new file mode 100644
index 000000000000..f8fb8c1896af
--- /dev/null
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.11-r1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+MY_EXTRAS_VER="20151117-2040Z"
+SUBSLOT="18"
+
+inherit toolchain-funcs java-pkg-opt-2 mysql-multilib
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~amd64 ~x86"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+# This is often broken still
+#EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="!media-sound/amarok[embedded]"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+src_prepare() {
+	mysql-multilib_src_prepare
+	if use libressl ; then
+		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
+			"${S}/cmake/ssl.cmake" || die
+	fi
+}
+
+# Official test instructions:
+# USE='extraengine perl openssl' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-cluster-X.X.XX.ebuild \
+# digest clean package
+multilib_src_test() {
+
+	if ! multilib_is_native_abi ; then
+		einfo "Server tests not available on non-native abi".
+		return 0;
+	fi
+
+	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if ! use "minimal" ; then
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+		# Enable parallel testing, auto will try to detect number of cores
+		# You may set this by hand.
+		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${T}"/var-tests{,/log}
+
+		# These are failing in MySQL 5.5/5.6 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help-notwin, funcs_1.is_triggers funcs_1.is_tables_mysql,
+		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
+		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
+		# mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
+		# perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		for t in \
+			binlog.binlog_mysqlbinlog_filter \
+			binlog.binlog_statement_insert_delayed \
+			funcs_1.is_columns_mysql \
+			funcs_1.is_tables_mysql \
+			funcs_1.is_triggers \
+			main.information_schema \
+			main.mysqld--help-notwinfuncs_1.is_triggers \
+			main.mysql_client_test \
+			mysqld--help-notwin \
+			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
+			perfschema.binlog_edge_mix \
+			perfschema.binlog_edge_stmt \
+		; do
+				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
+		done
+		# ndb.ndbinfo, ndb_binlog.ndb_binlog_index: latin1/utf8
+		for t in \
+			ndb.ndbinfo \
+			ndb_binlog.ndb_binlog_index ; do
+				mysql-multilib_disable_test  "$t" "False positives in Gentoo (NDB)"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests"
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+
+	else
+
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.11.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.3.11.ebuild
deleted file mode 100644
index bb3d2a244216..000000000000
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.11.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_EXTRAS_VER="20151117-2040Z"
-SUBSLOT="18"
-
-inherit toolchain-funcs java-pkg-opt-2 mysql-multilib
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~amd64 ~x86"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-# This is often broken still
-#EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="!media-sound/amarok[embedded]"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-src_prepare() {
-	mysql-multilib_src_prepare
-	if use libressl ; then
-		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
-			"${S}/cmake/ssl.cmake" || die
-	fi
-}
-
-# Official test instructions:
-# USE='extraengine perl openssl' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-cluster-X.X.XX.ebuild \
-# digest clean package
-multilib_src_test() {
-
-	if ! multilib_is_native_abi ; then
-		einfo "Server tests not available on non-native abi".
-		return 0;
-	fi
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-		# Enable parallel testing, auto will try to detect number of cores
-		# You may set this by hand.
-		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${T}"/var-tests{,/log}
-
-		# These are failing in MySQL 5.5/5.6 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin, funcs_1.is_triggers funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter,
-		# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt,
-		# mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql
-		# perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		for t in \
-			binlog.binlog_mysqlbinlog_filter \
-			binlog.binlog_statement_insert_delayed \
-			funcs_1.is_columns_mysql \
-			funcs_1.is_tables_mysql \
-			funcs_1.is_triggers \
-			main.information_schema \
-			main.mysqld--help-notwinfuncs_1.is_triggers \
-			main.mysql_client_test \
-			mysqld--help-notwin \
-			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
-			perfschema.binlog_edge_mix \
-			perfschema.binlog_edge_stmt \
-		; do
-				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
-		done
-		# ndb.ndbinfo, ndb_binlog.ndb_binlog_index: latin1/utf8
-		for t in \
-			ndb.ndbinfo \
-			ndb_binlog.ndb_binlog_index ; do
-				mysql-multilib_disable_test  "$t" "False positives in Gentoo (NDB)"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests"
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mysql-init-scripts/Manifest b/dev-db/mysql-init-scripts/Manifest
index 1a0722a0a77e..ab126512f0ae 100644
--- a/dev-db/mysql-init-scripts/Manifest
+++ b/dev-db/mysql-init-scripts/Manifest
@@ -12,7 +12,7 @@ AUX mysqld-wait-ready 1758 SHA256 98d845897c4098e4a3ca62cd3bad26a6fc2565a33737f1
 AUX mysqld_at-v2.service 1170 SHA256 e6d19a8414fdf78f1eaaf7f5ec2de57864f9fed86f193870fc0a8f108aec9b3e SHA512 a91eb574925afc0096e668799f9806b1cfa4c808ffab26dab5df1934db0dd8059a5e7913b0fdc3374f41e14cc72a6450890c9d746d3ff2de873af91199a71ee0 WHIRLPOOL 7c42bdd333f578b9a5443ae13383539cc116c0b2f32283c0e09ca20e46076b59f5eea40f6be0dd296fb56de04097ee6eded4ae7d1fb345481eb66a5527ddc254
 AUX run-s6 268 SHA256 387eff4eeef85711e052cc5ee7f532f5574e35ff1875c490316b65203009e750 SHA512 82be247195f6d9d230b063e9bda393bab8855382c2f3e5eb4d427fc1eb7e23dbd8c90939224ff2b5e4116a5c9d3f26ebdc9b9f548cde91e7c1217f4f8500c0d3 WHIRLPOOL e7ea48cf98bf7c2a4dd433db0fd64344e62da19f8d7f3b0d092fcd145d69ff1794b432da7a122fef5738684674986e8743141c328e02d1b789a0e4cc8abb32bb
 EBUILD mysql-init-scripts-2.1-r1.ebuild 1821 SHA256 c9bc91af814c1c774e18c6d420c0922d0c144a8a6257dfc626e57c924f17689a SHA512 22ded8b5a54f56a24f15e9285cb5900dd2cda89b21c78eebc0e7b8fd04ba5cde0b4a50f2d2ba51a520263d3ee97f6f5a0dacd30a754af3c5c992ba498be5d657 WHIRLPOOL 3ee855a1b7aedeff173a233f0a5ce56898524734e60f7f7182d5b4e354042c9b57dd3960551dbee9de71544731480ebcfbad49778ffc723e95165dc1bdcee2a3
-EBUILD mysql-init-scripts-2.2-r1.ebuild 1893 SHA256 a18369bc2ed7fcbac0008d0ef3e1192be9eab0acf589158d9a609371d9e63ad9 SHA512 210347f43ef41525f34b2ec6b856ad2b3c55535b0363283554f027ee8b8ba00e0683c488f5afee98b93a9ab5797844e28d02c46d9d98a679cad4986b33bff582 WHIRLPOOL 7ac5eede920bfc9c8ba5d13c90572f63985659524f5bd4f592287d559298b863efe4331efc5615b12a32977fd7cc9ab32880e23203b4c169fd1612f622c132e1
+EBUILD mysql-init-scripts-2.2-r1.ebuild 1884 SHA256 16775628ffe3f15a6e48e23c61ab225aa8a3ba0b9efcfdc9ead09b996acbc43f SHA512 8b16a6c266ca769516513f63dd4e02295369543a9301d95d1cb9a3dc1ca07ead83299f2f7b11017f06ea225bdde2a2a34994456ff11c674bddc03006986e7c2b WHIRLPOOL 6cd543dfbeabc924938967cf9c129277ee6c566e8a9d6d62b35bc1092e4c295eb2212959f3560c8c8997a0d3e5176b23abe9702d72db5a3d53c2a0f4af1867e9
 MISC ChangeLog 5075 SHA256 44ff68e70c3fc274340328cfa85036b4f6f76fc56d9407ce625b5f2899b318b8 SHA512 bdde86bbb6e5411fcac587bbfe3224c860903cde1ea87ef5c47a0f8e21fe70d43601ceb8973c9d4d0f35cd139d361ed40d11f158d4634fff757ffb4c4a96e676 WHIRLPOOL 4fa50bc76b94aceaf16222d44af2efe06d4a1a79645dc1ff095ec7a05ea043395113eabfc0c837539a63513d1e150df4d5042b4d8c1e0e4605ead5f6e42720c9
 MISC ChangeLog-2015 10019 SHA256 bc664645c2510ff8077652c36fdd804b29f4f2c2d84915f75323996d02088be4 SHA512 c7112d3e3695c89f06422f7af6e1b9ed723961c43d5d9cdf5a97ed32943faa66f035b0e04a6ea95499a8b596bc710361d7235c5dae780ab7fed6bc7ff979b2b7 WHIRLPOOL 697811e2925bf4501f4be76e7b48b50def027a8ffd1a01b4d726ff0d4b37ec280c1597f5632a8f90bab3680f0596b6a25ae5b3d11e003a2902f1c6c647d1ffbd
 MISC metadata.xml 243 SHA256 441acc023219e6b01e567b9d627a53793c43f3f2fd1dbe3be0eced9885b70385 SHA512 7c227a1fadd8d61aae9baabeb5d964c93fe0c4d82fb838c83fe0360cf38b24bebf51037726f13188ecd8f52c335368a693b81e74d79ba949576a6dbcb54887a9 WHIRLPOOL f3d0d5ea02babbb1d947f0d274afcdb548af3c4356bc049be314e561f3f6e3ae9503599a44bc8da1e305aa18cb671950adb2fb284060a4b98b67a8a6d16bef73
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r1.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r1.ebuild
index 75b8390652f6..f97a9eec6219 100644
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r1.ebuild
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 66549983be95..ca4690396016 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -9,9 +9,9 @@ DIST mysql-extras-20170302-1359Z.tar.bz2 306816 SHA256 0375bffa8a7b26caab3a13be2
 DIST mysql-extras-20170719-1335Z.tar.bz2 311350 SHA256 725dc29fa4a553cfc0bd07dcc1259e5a38a6d945f757e9f49f554a9a7773abe7 SHA512 3450725b4cdcf1e330aee775c1c169510bd7f06f19b874a3e94203227d393b136165eca1e77270bfc37c534f4120aeeeb3df8fbd71704312836b79a99d81a122 WHIRLPOOL f1606df56f82847a8b4b332c1b61cb695aba2a51aef895fa9596495d89208535f829b8fa69a6e97a26d0b9171d817115b83ce447c8232197353dda258a6d38d0
 DIST mysql-extras-20171018-1948Z.tar.bz2 313540 SHA256 6b910637f7ac2d5132154357db46f47b585f6555846d5f1922e85954e93a527a SHA512 35ba9f3c8462ae188e47f5973e891cbd72e5d742e92fabc09678f93c83bb26337ae11d6fa8400b2a8c5125ba2a771f780e008b7448e3006446b13d3e51adcaba WHIRLPOOL 480c0aa3353076864795f0646a1c833cfeaddeff21e26404e98480f73ff6f4866a9ece39e7dd88e0d1a4ee9c820eb1fd31a46c09bfdb18537f839b0460fc3443
 EBUILD mysql-5.5.58.ebuild 4402 SHA256 f90aaf2c42115fd18c583cc2069f7d3e8a9525dfd9633456f4d24e024620cd3f SHA512 1e1a3e4a0285cd2b51763e91dfdc95daff97d2a2739d0b5938b1f2cd7f95dad33f01b66b0919943550a4f07922b33b69462528fc5c40f501e919444d22ef9916 WHIRLPOOL c7d790a65fb55a1676bf079ed8c18c710e41958a72cb9678c88a756a3d96d6894ac3adca9933b3ad3728bbae5ebebf3979b28146b0b5ee6bd1276fc675f85611
-EBUILD mysql-5.6.36.ebuild 5950 SHA256 aa2069134693657f666cbf7a100701e334a74f2acdeab5b609038d2ed79b6c57 SHA512 864b0a2be4a822855369c19a7c2879b9909caeb607181dc8e6b88617abd32c6ac93f006135a2ffc14a72f170d02a5ea9c80274e3c1cb0c00c253ca365583ae55 WHIRLPOOL b335dd3da99eb6d28a12d85ae1393aab72a9c9af67b3c8087d187fbb0b7f89cf3b69598e76c3f07e74636a0205808ce584d570bb6b9e2ed5b3dbca856876e730
-EBUILD mysql-5.6.37.ebuild 6169 SHA256 4ca65730c9608696fe46ef85933ce11076410aebacb5d0868665149c0664170f SHA512 97c04c4efc40db771592b0c5835b48520b3b5c6e99084f33c43cfae2f74883b99ecab35d8bd646bfe5e18717dd398ce946695d82bb8f7431b914e7060c8603d5 WHIRLPOOL edb2d8e3f65fb1be6a2480442aa72b027cb6fdafc1a541cad3a9d654aa75b18f2939512a747d1926593a9b62b0456191bd4a54dc1346b455575dde31ab32aed3
-EBUILD mysql-5.6.38.ebuild 6238 SHA256 6d9a62e5ec21b8921c1abea734b93e0ffc2572979516a988520a8abc0861a34d SHA512 33d8e28a27d890f0664449761d9ac2855a83cae0451915acb84312f5eebde1a68ee3421b4c9e503936218ad27b25faa9e5145173266532e8d7ca90f7e2fb05d9 WHIRLPOOL b33106c5da2a37d7a293842559086ce1dbf5ae22cada4f56eae34886029686f1c9775bae8469e9b4c3985c3d4906d1ea220d3e0a4ee187fa3ded73e18b5daf16
+EBUILD mysql-5.6.36-r1.ebuild 5950 SHA256 aa2069134693657f666cbf7a100701e334a74f2acdeab5b609038d2ed79b6c57 SHA512 864b0a2be4a822855369c19a7c2879b9909caeb607181dc8e6b88617abd32c6ac93f006135a2ffc14a72f170d02a5ea9c80274e3c1cb0c00c253ca365583ae55 WHIRLPOOL b335dd3da99eb6d28a12d85ae1393aab72a9c9af67b3c8087d187fbb0b7f89cf3b69598e76c3f07e74636a0205808ce584d570bb6b9e2ed5b3dbca856876e730
+EBUILD mysql-5.6.37-r1.ebuild 6169 SHA256 4ca65730c9608696fe46ef85933ce11076410aebacb5d0868665149c0664170f SHA512 97c04c4efc40db771592b0c5835b48520b3b5c6e99084f33c43cfae2f74883b99ecab35d8bd646bfe5e18717dd398ce946695d82bb8f7431b914e7060c8603d5 WHIRLPOOL edb2d8e3f65fb1be6a2480442aa72b027cb6fdafc1a541cad3a9d654aa75b18f2939512a747d1926593a9b62b0456191bd4a54dc1346b455575dde31ab32aed3
+EBUILD mysql-5.6.38.ebuild 6233 SHA256 59e4e3d8a7529b8ad6d382045f283ff4f96b6c48940f82a0eacb57b7cce604c3 SHA512 f20d08986a7259cb402d4f6207f6a67eba1c3257507a083a0f11c14f7741235bd76a3feb17d102ead26e5dd1d36eafa4853f1163632204df72ece15e3743b0bf WHIRLPOOL 33761b4d5dbb9a7a9d36cc8d9abb02e471d2769e0b92bb2ccf199b9a373a6129bf2ef8eeb42585b279022500636df060677f1e16131fc07aa777eabe1921fcb1
 MISC ChangeLog 18776 SHA256 3ff64ef7497a470510146081692817768857fd4f297b98a184202f5fd06f0a47 SHA512 bfcb679245574135e7e0b7f0592771954bba01b6977ca4ffc8a37de181fb7fb60e6bd8b7c23cee0d41c4397341d282f28d43fed11eb176f12178123e0f8032e4 WHIRLPOOL c4601fb0d1ac3238f2d69a439463d66a67d843c197a55f4d9b436493e979393047b9549053fa00b46a3ed3719d72565ebad38c35ace3abab145e751212c047a8
 MISC ChangeLog-2010 108404 SHA256 93dda53b8871d9040e6aebb59f095a8debd5c0a9437e78e5e949989e209ba5cd SHA512 5f54b7c2e25d27680a9313da2450851118e34a57202d9f36f59da52834ca3b587701d93868d71bf684ddc253d49f87837c8d7e2d442f2955dfde8a701150fbe5 WHIRLPOOL 55f758942e3012aa0ae7d529c2f8b6e0d8f4d7cbde09039f16cd05f0a58fc4e3e09ccd50e366effdcaab4641300eb0f494ddbe3a35a645ced8a9d747d80e9821
 MISC ChangeLog-2015 27542 SHA256 997fb94e9984a271cfd68316c0012c16f78234b1aad328c2c5e97e2940f7dcfa SHA512 f07244cfb59f613fcaed97ad0ed135857ba995b616962b145548ecf84176666986fc9fb5e55ec543110755e73d316ee5a733cfc1ce14eb1ca2a1449adfa50859 WHIRLPOOL aed27d4cb6a7cf33d354fb559268baac8c7977dd9cdc821b12af8008c94dc22d0dedace9e33caae6bd676405a3a02628e1a8ae8d3baac46af33b95251a94c70f
diff --git a/dev-db/mysql/mysql-5.6.36.ebuild b/dev-db/mysql/mysql-5.6.36-r1.ebuild
index 3ced3a4395b2..3ced3a4395b2 100644
--- a/dev-db/mysql/mysql-5.6.36.ebuild
+++ b/dev-db/mysql/mysql-5.6.36-r1.ebuild
diff --git a/dev-db/mysql/mysql-5.6.37.ebuild b/dev-db/mysql/mysql-5.6.37-r1.ebuild
index 016e3491ecf1..016e3491ecf1 100644
--- a/dev-db/mysql/mysql-5.6.37.ebuild
+++ b/dev-db/mysql/mysql-5.6.37-r1.ebuild
diff --git a/dev-db/mysql/mysql-5.6.38.ebuild b/dev-db/mysql/mysql-5.6.38.ebuild
index 35dc3122c0a9..050b1e092c8f 100644
--- a/dev-db/mysql/mysql-5.6.38.ebuild
+++ b/dev-db/mysql/mysql-5.6.38.ebuild
@@ -16,7 +16,7 @@ inherit mysql-multilib-r1
 IUSE="$IUSE"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
 RDEPEND="${RDEPEND}"
diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index 33d9c4c624d8..a21f6dc1d67f 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -2,7 +2,7 @@ AUX my.cnf-5.5 4795 SHA256 fdcc4678723fdac5dba4b5f87299f142ed8f683e800a44d18ae48
 AUX my.cnf-5.6 4568 SHA256 4c0657abd5ce47eb84332a85be0a8d808bb8902202722c216c08baa26674e798 SHA512 498826f147ad01615358111511c88f671ff823c400782dbad5f359aff99fa88a7be66e3c3b42fd58a5634f17e12f6a18e1896340f1a5a7acecd75320671c3a10 WHIRLPOOL f9fddb93582129cc332e738f4235a0e22a645cd8a2cbf6fea94666f9ec718093be6cfccf8459c85ada5d34e9bc47612e80b7ac0d9af702033ad1219d3e1801a8
 DIST mysql-extras-20170820-2245Z.tar.bz2 312101 SHA256 619afb88752e461434709ed91e91c2104845a9a9ee67ac944212833f4a715ed8 SHA512 34868c8ba3509ed5e3625c973e16f5015390ca9fc656cbcdbe8f5568bc7cab3708bb7c88b1af324ebb66f86433dfee71b90adf6451556fcfc12ad4e7d32256dd WHIRLPOOL f8e08f47bb0789c25dc096c76340b1ca9db8a264d89aca816e3b45e4dd984dc9dea90554c6c114179dc972026c703404aa8521b3c93fb882d7eadd1295635fb9
 DIST percona-server-5.6.37-82.2.tar.gz 56296960 SHA256 3cf04b64c8bf5b9cc1ea1a68c54ba77a4709d9c9051314e70a4cbd4c904da702 SHA512 38905c2429bee6e6ba9c35b232c87c27c414726b349ff5a878cc94bbc4a333bbf76019478f8e82a10274ffeea5ac71c4520ff534cc434c4844b496b48801ea4e WHIRLPOOL 9e3988072d00f60af467a21092cc737529bd9250ce4ebbfa20834455791a3fb093b11da8bb845bd62e3fa33ad37e63bfbda483139700bd4147e1b7be64578659
-EBUILD percona-server-5.6.37.82.2.ebuild 7431 SHA256 8696b8c7d0f3647312c818df7af75de1c23a12b0d06985ac7f6f10f10bb12c26 SHA512 42b943f7cb7594e8dd1bef942a86db77fe23896310da6c00aeb57ed2a253db8041f0aecf0c54ef1489fa939675d4027adac20b0fa0642d4e5834cedee52ab32d WHIRLPOOL b3d3e92473e7816fad6bc7fdc5345145306ec1c6ceb1bef7174ce4e69bbfa0f2ee210dcdd945bf7ab5b7d643a1bc0ad4171fb2e67a75414cbe7150c960a3fb96
+EBUILD percona-server-5.6.37.82.2-r1.ebuild 7431 SHA256 8696b8c7d0f3647312c818df7af75de1c23a12b0d06985ac7f6f10f10bb12c26 SHA512 42b943f7cb7594e8dd1bef942a86db77fe23896310da6c00aeb57ed2a253db8041f0aecf0c54ef1489fa939675d4027adac20b0fa0642d4e5834cedee52ab32d WHIRLPOOL b3d3e92473e7816fad6bc7fdc5345145306ec1c6ceb1bef7174ce4e69bbfa0f2ee210dcdd945bf7ab5b7d643a1bc0ad4171fb2e67a75414cbe7150c960a3fb96
 MISC ChangeLog 8899 SHA256 25435f089936ab71880a07e1561d3838f0e0413b4d2cf2cf141858d031901f61 SHA512 7dd26f70ade041ac8da7ea727c934aed7622fb54477cf1a6140109e402f991fd352bd561e0f763682ba61d1d4ddc5c6309ebf3cfb629e7d2067c4abf2c01ab0c WHIRLPOOL c3794ce8daa271144c82b48ff24b491f2f169dfbaef20980db6bdec2df25838b633b8c1e0d4b76ebea633c7c11ef85dcd2e2e4cbfecde9008e3ad7836a76f22a
 MISC ChangeLog-2015 3040 SHA256 66fbbbf27d7181ae09ff7335f029e507e8004ea3aa2ace8c6cd6ad6b6dee4812 SHA512 b1de5efb9da051d6d76b3c65480ecc2266a55baf6071fcf84ca6cda81b6e84075a0bc2654f3a05b787c7827b5420de168e027acf27c460131e67acd9fa71190c WHIRLPOOL 6edd5db667d4d347347d7181670e39ec1ea1d36f39ac7032a5bb9cfafaa544f39b8dc8d429c530f24919d4dd4a347fc167af53cf603c577df90352ec8bfee207
 MISC metadata.xml 1505 SHA256 bb735bd3118fae8803888a0567ea6dd9ff39c65b364015be218f16d3f9a1f314 SHA512 0ccb7a31827fa15606e060522daf9364bc843a64cfca8538292e989546e07784ea7a8af54ea7a1b02675c64515a1f2225b22971cda4110610836770d1ff33dd6 WHIRLPOOL 052bc0f6e078fff0f2d44e0ace7bbd814395230cb713090c170f663c8a692162196811d2cdae79c3ef6adf178daa61c30339b735c07594b29685c1268bc54600
diff --git a/dev-db/percona-server/percona-server-5.6.37.82.2.ebuild b/dev-db/percona-server/percona-server-5.6.37.82.2-r1.ebuild
index 887e18914445..887e18914445 100644
--- a/dev-db/percona-server/percona-server-5.6.37.82.2.ebuild
+++ b/dev-db/percona-server/percona-server-5.6.37.82.2-r1.ebuild
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 281f1134390c..3b0b225dd4e5 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -25,10 +25,10 @@ EBUILD redis-3.0.7-r1.ebuild 3312 SHA256 178857c68ff546fe0e5a5bd968afc0979e17e60
 EBUILD redis-3.0.7.ebuild 3312 SHA256 178857c68ff546fe0e5a5bd968afc0979e17e60ab41ed3539655d836c1f036d6 SHA512 de42869cd28e6b9f7ce63ef0baaa64acc0b5465d2bb2a0c23013a42c0a00059a18620ab428eae88b33f4d6a3b37b2e6cc0dc71135af807dbd9d524908d1d80fb WHIRLPOOL 26d3325a56be5d02fa6571d3bfca3a399c765f7ba2e7d6577b13f0117ea5d4b97c7449d1dd2c3eb942f8711bf5c22ec38dd2db42af455b3e2c1d93be40b54e37
 EBUILD redis-3.2.5.ebuild 3578 SHA256 1c935a9f011cf9ceba6a75fb2b0d204817b4aa70cb7bd7e003aa94f98473e627 SHA512 72d8563a1eee0e62d34a3c04583c210a95c0fdd306512f63714324ac6e1302f5a06debb56bae083f9102eef9cade1674f6d5dd746ca7ab796e70592aef659021 WHIRLPOOL ef8f61ee53edbd01e55119105a961bddd4188b92dc55ae54a1ff9a4fe02f0b9139c06abf54864180529a569442785e84592f952e8df0d694f28606835f6d9e07
 EBUILD redis-3.2.8-r2.ebuild 3579 SHA256 7e4ea5f0a2396bd4c0a5e0da06c42422ff58b3fc8d165f00f52012f38749045d SHA512 3acf577e2509cf29ae5274117ec5c512fe390167d88c38b6fd375a5d145e4b94704990b23e3a18d6e8ab6c91e5d5bebb5d6c9330a9975b7ef9aa2d14c0914282 WHIRLPOOL 227ca8851ce549c4947c9a258071b44a1f4c5c3a779946a1d998fbe468741e9be73a275ce01337ab9a02840e5f7452268abd92d396fe3179746a8f767fda7382
-EBUILD redis-3.2.8-r5.ebuild 3891 SHA256 3a9ceddc4b209bf1952223300badbf5ab81d72533485d4248422594d828f5d05 SHA512 00d62cc9e030912c942030466b397accc11100e64175df3031b9e9e67c11d4ac62b0fea66fea903264c3e0eedd883c4c188d563e24a74e9ec1af3cc54ade0bda WHIRLPOOL 8a887d676f07f8116f00c05ef220e22be0b81a17abce12e0e89f3cf112e226cb083c347ee41a5d4b6a8b3eec48b6f5b743d1eba375cfa091157eac876592a915
+EBUILD redis-3.2.8-r5.ebuild 3889 SHA256 c37cab58ba606525e3bccc8215043604984c83ea4b2c3c201b3dfede18630644 SHA512 705a4ddc5e79b6031249775d66ad1bfdf418dda66afa3ecc81bcf14d0507f444a67369dd4dfdb16e7fd55abd2e69ff0ad4b14dbeb76a152c560c2efc4acc3184 WHIRLPOOL 92e3f625293c594e54b21631745739e16488bb7dedc1a5357fdbddc7f53efff61e9cc4195823aaf8bddd44cf64fb3a67f725e6c265e5d850a024439a9b81fc29
 EBUILD redis-4.0.1-r1.ebuild 3722 SHA256 4305a38f60f529600e36ced799a5c780c32a152e5d4e2efcdbf200bb92b8ab0a SHA512 d928b9714a9c028fbe14286c975a5ba385384c4ff32311e060252ccf9802e2f58d945d261a9fd5cd512d7142cb82fdb41a44955c046c253ee399e09578b42a0d WHIRLPOOL cf4a5bd6128143c87808282e24a439d527c6f3efde4308231d8fafd393a41b3869fdebf61c0791ad350ff2665651b4816e46377f8e62820da819d51647cba068
 EBUILD redis-4.0.1.ebuild 3507 SHA256 8e8281d3c068e21e6e925ff905603dc645262577eaa898a4c7032ab479ad7dfb SHA512 e0a258e5e2333d9c88d5ebba37f52cb772bb17d77b719edc0ce443a3a2ac09cd064766fcf7541503fe656ca2f77d890ae911f518b2552e2673f650cc8bd4d13d WHIRLPOOL 62f2267dceddce78da7b81aa49d40087afb39981743ec02a3337c11202e880fbc9126b49a88dc38cfec8d6bc4391565b1573fcbcab420019cb674271e8b40e4b
-EBUILD redis-4.0.2-r1.ebuild 3814 SHA256 949258b27da78e4663f65e1eea15882543cb8978c0dd90e83334026c17cc461e SHA512 3e053a76b16dd7a73cadd890bd5d3afc9a4652f4b5503d0a0c9f135e0c4711e085533cdf3422cdca571ea49ee7769b62145421423a0d619e3941620ab173bd52 WHIRLPOOL 916a0944ff241821cebf34b748c6ef30d80a6cd90fab53e0ba0eb2a15ada43a1a00035b145cab77bbb88727ba674f7edd40c8b4d2d0bc723ddfc4bf58d98caba
+EBUILD redis-4.0.2-r1.ebuild 3812 SHA256 65da43afcf7fcce58248a2f05f88fb8c0c33e58fc8a806e69d3650e5f7120882 SHA512 472cede0d9384fa3f5711d90f4ce3c59c83b9c2dcb3ce6d758ab9489ec5a1e0252e94dcdf0c240d926cd6a97c106452f89209c155c844089bede2dda90bc5281 WHIRLPOOL 928579df3ee041ed931736f880f16e1c7378a58982773e0df52c1bf54093c60baf332e1fafc0cd60b9fedb1bd3ddb69687ccefc860d42d67ee409f9df980bc46
 MISC ChangeLog 9085 SHA256 ed9cb241c3bfe71d3211e01c2a198c4d8e42fbfd42633487141ec65e7c3bd7e4 SHA512 ebcb05824a18732c1daf72785a6ef59305378ea215f3910487fec354771f7a9137d27f0c4bf50a935829f2bd3bce5dbe2bb1a7faf478fc1c8dc01398e435f8b2 WHIRLPOOL e9bce2718149978854fc4adbc99db7daadd1687bf67e68b075ccea02659c71dad7c620a39740d1ac70e0f6a855cc5638b4a3237b85b4719a0ea8100d7524d959
 MISC ChangeLog-2015 14790 SHA256 2b26170b052d7ee86954593cf4c8ac44c071e702b546cfb10b5821371efa5bea SHA512 80ece5f6c84ad894aad3290665c6d2099f7c57eee8682fe85d2ab59969099d5f7e229a81968c02f63601b7e40123073394ffeccb58edfa8c374b6148213956f5 WHIRLPOOL c8828bedd95dc6814790355ad42ed2d378831f821c5185a1db2a45c89ebb770a5fbc3453b4893e7d9831ac98a5384fcaecc920cbda97ba5d7c4a98a4121f33b3
 MISC metadata.xml 632 SHA256 623fd6b8e252684955a557e3bd26a6fa237dce08702e8373a9eb65207a609a14 SHA512 a032eb7204137f8c5e7b75f8b214b0b6fd7f2a119b261a3da2e0cf8979fda5a5f25643870515a8e8d821ff63df3d17808a6e3189cc16a0f87c88f479571e8ef5 WHIRLPOOL 652c5fcb32bf4a79400534743cb5b4803d813daf9ec363ca38c5c1c2c7f3292b16a50e99845274486fbe5c8dda2abe1ce98da28350f18c06a5d508146a7bd172
diff --git a/dev-db/redis/redis-3.2.8-r5.ebuild b/dev-db/redis/redis-3.2.8-r5.ebuild
index cb1541102b7c..595d249c582b 100644
--- a/dev-db/redis/redis-3.2.8-r5.ebuild
+++ b/dev-db/redis/redis-3.2.8-r5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://redis.io/"
 SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+jemalloc tcmalloc luajit test"
 SLOT="0"
 
diff --git a/dev-db/redis/redis-4.0.2-r1.ebuild b/dev-db/redis/redis-4.0.2-r1.ebuild
index 1449a3567826..ec32d4140ed7 100644
--- a/dev-db/redis/redis-4.0.2-r1.ebuild
+++ b/dev-db/redis/redis-4.0.2-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://redis.io/"
 SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+jemalloc tcmalloc luajit test"
 SLOT="0"
 
diff --git a/dev-db/sqliteman/Manifest b/dev-db/sqliteman/Manifest
index b4a754bc6f5d..98fe38acf414 100644
--- a/dev-db/sqliteman/Manifest
+++ b/dev-db/sqliteman/Manifest
@@ -1,8 +1,10 @@
 AUX sqliteman-1.2.2-lpthread.patch 486 SHA256 af99d278b6d0cda9f84487985afdb427f77edd6eff9a1a62edac906dcfd5487b SHA512 e4598b7f74da7c046571a5b6744d172a9d5d8d35c28ff0bd11b0db68a3fa8ba291ab9634a3622ea5aa383fe6aff75318350665a0a75f68224b6ba97cbc8f3855 WHIRLPOOL 63858a7eb84bdc51ae13d41e1c20c0a29f0b88b853a29560f895b197881acaa9fe3456ef13f585d6746489760c48c5ad05b6f238faf57d1e554f83c0bed762ff
 AUX sqliteman-1.2.2-qscintilla-2.10.patch 587 SHA256 572ba772bfe151f3f5bc85e21bea645da84aeecc2a91272ff9b3c4dcb6a94fed SHA512 91af0f16af6c0d686d3e184518262de123bb998fc4802108645b15b3288c8aa242a869dec99c350cdfa9982420f4989e54d8287e9c387073361e2bdcf1310472 WHIRLPOOL 93bf44bac8433293d9a20b452fa4324a9a4519fba0eb7b9d0120a5d40e96777c55fe026b827c9b80125f988f95cdf391172f73acccdc4b9db7cff0efd8e6e438
+AUX sqliteman-1.2.2-qt5.patch 11317 SHA256 5cd44c0b5e4387758b3c485365ed97f2f766b69fff893d89767a19eda800f0ff SHA512 5169991a0b764fe02782dcc94befe1479bcae631f815c268c9e2a3f02c8efbaceb78ecb87d04eea240623fdfcc475b6b91149a4461974f648f4dea62ba07e309 WHIRLPOOL 2e9832bb24741e3866a6f3c7bd620e88bd45624717a1c6132177d693137b0f9de49e73731fe0eac32c73deae2333fedcdf015347bd840db69257220e48410273
 DIST sqliteman-1.2.2.tar.gz 1579855 SHA256 2229e627528ec02a9cf7aba3a65bef8999272fc25eb22112dc3f8ee583eb5dfb SHA512 ada8315247723c6cbb9a4c235ce427aed3fcbe6f4edaa3ee2f9c31c1729d71a4bfc874bb7ca561f2a2c9afad092e2f90c7871646eccecb3e71bcd50d1164faf4 WHIRLPOOL 73f6bee7a98e46ef6e76dca086f6cd9379f3f7c8574df70f92d21ac68def0aef548350877eda319d7bedd6b34f5f128db839ef1b2c583a7ad5565a4a78a42d6c
 EBUILD sqliteman-1.2.2-r2.ebuild 659 SHA256 e5a7d0189a76a303a23cec6b1735d3b02e4c1fc13942f4994734e0ae0788bc36 SHA512 56a3746bef61c5a750c2c7fff27dc02f1a535b9ca2ffadacf864753a49ea52444eaac22c7dc26464e07b034f0056167cdaf56d3a6b70d6d72ecde02137bcecaf WHIRLPOOL 916799ba2a35ec622ceeb02c0eb2c7cb30fbe9b7aa20d6bf0b6615f15e54a1c1bd1acd81ee1ba866d0ec3608f2ffc61a6d65480b25b2b2ffebe61e841da75c0f
 EBUILD sqliteman-1.2.2-r3.ebuild 680 SHA256 6ebd8e39aa81c95bdc65e6f03a6975d71ca82eaca9886bef91a66e8b9a8305f1 SHA512 24abd2d29b5740f05eba51b3663ae77691df586cd07f313273902445a6381d809b26a2694017aa2d6374efe5f186d7b97737c9d012ed4db9a6cb149592a85c91 WHIRLPOOL 0ac27daceb409f7e72d9104850762335903adb98d530e8ac9acf2c9edaca1a3f3622dbd74d9c1e59e80bdb49afa33acaca73d48612ff1aef8eb13ac2c356e4db
+EBUILD sqliteman-1.2.2-r4.ebuild 896 SHA256 7b18ab33b2c667d816d92039e089108f983e8d6094bb7161fe014fe60d698c85 SHA512 e4229ea3c94bbb8a741182b033aae9375d9b2aa422d049a6a13a63e1852b07d513448b0932567bcbc15bcba68b2c3bf98126c1aac80697180dafd87f5a05be6d WHIRLPOOL a712f8f90cb10737c6ae0d60eb93bf7b4f35902b1e5d73f07e8ace15342c55a44c9cbd00528cec6e15f779ad8eb157337afd5a73f219158195187236a0f75b4a
 MISC ChangeLog 3476 SHA256 c9ddffe6aefd0b0f18bd6f93b98bd254d7f728ad9a5f768d5d1ac3bc745ee91a SHA512 fa7ccff18dd334d20a636783b8395d95e27b46dbd401f3a5e64d9e9e90c0dcaf12ef2a8fcb858fd07565dcc97566b42e5b908f1c09d433849b048cbab9fb5d1d WHIRLPOOL b91a6800f13796d66b784266b000b990960b2fdb1c00d08fb3b44f13b49092463a504ee742d222aed4bb2957a9a5d32036f55a04f30908753aa9e0b0b4882916
 MISC ChangeLog-2015 1667 SHA256 ba16bedc2ba55ac810300de58f2f3fea81b5eef5e4a8c467323200e3c94c4290 SHA512 1199bc0c7acb74d0000105d69acf448bbac9f4e40999e3adf6a28343f3d17318e606183ac5bb5fee3667237442571aa48499c17f6e63aa1d4f69cf872fcc68d4 WHIRLPOOL 11b650bfaa1dd418ac08fea148b71a7f31db899fb7ecf34b5a9e286bc9c54d0258de98b330c29144b051aa66cb63ad58ad28971fd4d994ce39d99e1f48e005d1
 MISC metadata.xml 326 SHA256 e5809cdedbb1bf2d8c70f0df907f780c75d89412b8bb19cbf464bb7a70c681c6 SHA512 28cfd089b3652e0bc89c32cffa6bc3c6a10dc84ac786db5de65155ef2752982fd167f5a916f1738848e1bce5ed86d335f463187ad532db06e90d5ce6492f4d53 WHIRLPOOL 142f8b039fc64b663505b4f53d50a0109203cae21914c3df67e1dc9260197b43063c9550010aa5421faf35c31902f599df41aa48dbbefe3a4990d5fa9586a306
diff --git a/dev-db/sqliteman/files/sqliteman-1.2.2-qt5.patch b/dev-db/sqliteman/files/sqliteman-1.2.2-qt5.patch
new file mode 100644
index 000000000000..ebc571a33981
--- /dev/null
+++ b/dev-db/sqliteman/files/sqliteman-1.2.2-qt5.patch
@@ -0,0 +1,346 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d9fd041..f589bfe 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -101,28 +101,7 @@ 
+ 
+ 
+-SET (QT_MT_REQUIRED true)
+-SET (QT_MIN_VERSION "4.2.0")
++SET (QT_MIN_VERSION "5.7.1")
+-SET( QT_USE_QTSQL TRUE )
+-SET( QT_USE_QTXML TRUE )
+-FIND_PACKAGE( Qt4 REQUIRED )
+-MESSAGE(STATUS Qt4 version: ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH})
+-# suggest Qt upgrade
+-if (QT_VERSION_MINOR LESS 3)
+-    MESSAGE(STATUS "")
+-    MESSAGE(STATUS "__ BIG FAT WARNING! _______________________________")
+-    MESSAGE(STATUS "Your Qt version seems older than it should be.")
+-    MESSAGE(STATUS "Althought will be Sqliteman compilled successfully,")
+-    MESSAGE(STATUS "it will be limited in its features.")
+-    MESSAGE(STATUS "There are some important bugs in older Qt versions.")
+-    MESSAGE(STATUS "Please upgrade to the current Qt version.")
+-    MESSAGE(STATUS "___________________________________________________")
+-    MESSAGE(STATUS "")
+-endif (QT_VERSION_MINOR LESS 3)
+-MESSAGE(STATUS Qt4 includes: ${QT_INCLUDES})
+-MESSAGE(STATUS Qt4 libs: ${QT_LIBRARY_DIR})
+-
+-INCLUDE( ${QT_USE_FILE} )
+-
++FIND_PACKAGE( Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Sql Widgets )
+ 
+ IF (WANT_INTERNAL_QSCINTILLA)
+     MESSAGE(STATUS "QSci: Building with internal copy of QScintilla.")
+diff --git a/cmake/modules/FindQScintilla.cmake b/cmake/modules/FindQScintilla.cmake
+index c4592d0..92754b4 100644
+--- a/cmake/modules/FindQScintilla.cmake
++++ b/cmake/modules/FindQScintilla.cmake
+@@ -10,22 +10,19 @@
+ #
+ # Redistribution and use is allowed according to the terms of the FreeBSD license.
+ 
+-IF(NOT QT4_FOUND)
+-    INCLUDE(FindQt4)
+-ENDIF(NOT QT4_FOUND)
+-
+ SET(QSCINTILLA_FOUND FALSE)
+ 
+-IF(QT4_FOUND)
+-    FIND_PATH(QSCINTILLA_INCLUDE_DIR qsciglobal.h
+-    "${QT_INCLUDE_DIR}/Qsci" /usr/include /usr/include/Qsci
++IF(Qt5_FOUND)
++    FIND_PATH(QSCINTILLA_INCLUDE_DIR qsciglobal.h
++        HINTS ${Qt5Core_INCLUDE_DIRS}
++        PATH_SUFFIXES Qsci
+     )
+ 
+-    SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2)
+-    FIND_LIBRARY(QSCINTILLA_LIBRARY
+-        NAMES ${QSCINTILLA_NAMES}
+-        PATHS ${QT_LIBRARY_DIR}
+-    )
++    SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2 qscintilla2_qt5 libqscintilla2_qt5)
++    FIND_LIBRARY(QSCINTILLA_LIBRARY
++        NAMES ${QSCINTILLA_NAMES}
++        HINTS ${Qt5Core_LIBRARIES}
++    )
+ 
+     IF (QSCINTILLA_LIBRARY AND QSCINTILLA_INCLUDE_DIR)
+ 
+@@ -41,7 +34,7 @@ IF(QT4_FOUND)
+         ENDIF (CYGWIN)
+ 
+     ENDIF (QSCINTILLA_LIBRARY AND QSCINTILLA_INCLUDE_DIR)
+-ENDIF(QT4_FOUND)
++ENDIF(Qt5_FOUND)
+ 
+ IF (QSCINTILLA_FOUND)
+   IF (NOT QScintilla_FIND_QUIETLY)
+diff --git a/sqliteman/CMakeLists.txt b/sqliteman/CMakeLists.txt
+index c9154a7..13397ee 100644
+--- a/sqliteman/CMakeLists.txt
++++ b/sqliteman/CMakeLists.txt
+@@ -139,12 +139,12 @@ IF (WANT_RESOURCES)
+     )
+ ENDIF (WANT_RESOURCES)
+ SET (SQLITEMAN_RCS ${SQLITEMAN_RCS} api/api.qrc)
+-QT4_ADD_RESOURCES( SQLITEMAN_RC_RCS ${SQLITEMAN_RCS} )
++QT5_ADD_RESOURCES( SQLITEMAN_RC_RCS ${SQLITEMAN_RCS} )
+ 
+ 
+-QT4_WRAP_UI( SQLITEMAN_UI_HDRS ${SQLITEMAN_UI} )
++QT5_WRAP_UI( SQLITEMAN_UI_HDRS ${SQLITEMAN_UI} )
+ 
+-QT4_WRAP_CPP( SQLITEMAN_MOC_SRC ${SQLITEMAN_MOC} )
++QT5_WRAP_CPP( SQLITEMAN_MOC_SRC ${SQLITEMAN_MOC} )
+ 
+ INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} )
+ INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR}/sqliteman )
+@@ -157,10 +157,13 @@ IF (WANT_INTERNAL_QSCINTILLA)
+         ${CMAKE_SOURCE_DIR}/sqliteman/qscintilla2/Qt4/Qsci
+     )
+ ELSE (WANT_INTERNAL_QSCINTILLA)
+-    INCLUDE_DIRECTORIES( ${QSCINTILLA_INCLUDE_DIR} )
++    INCLUDE_DIRECTORIES(
++        ${QSCINTILLA_INCLUDE_DIR}
++        ${Qt5Widgets_INCLUDE_DIRS}
++        ${Qt5Sql_INCLUDE_DIRS}
++    )
+ ENDIF (WANT_INTERNAL_QSCINTILLA)
+ 
+-
+ IF (MSVC)
+     # this is a must to switch off subsystem:console (console window poping up)
+     # WinMain wrapper from QT_QTMAIN_LIBRARY is used and liner must be modified
+@@ -178,6 +181,6 @@ ADD_EXECUTABLE( ${EXE_NAME} ${WIN32_SUBSYSTEM}
+ )
+ 
+-TARGET_LINK_LIBRARIES( ${EXE_NAME} ${QT_LIBRARIES}) # ${POPULATOR_LIB})
++TARGET_LINK_LIBRARIES( ${EXE_NAME} Qt5::Widgets Qt5::Sql )
+ 
+ IF (WIN32)
+     # don't use console subsystem
+diff --git a/sqliteman/alterviewdialog.h b/sqliteman/alterviewdialog.h
+index 31407f9..b014473 100644
+--- a/sqliteman/alterviewdialog.h
++++ b/sqliteman/alterviewdialog.h
+@@ -8,11 +8,8 @@ for which a new license (GPL+exception) is in place.
+ #ifndef ALTERVIEWDIALOG_H
+ #define ALTERVIEWDIALOG_H
+ 
+-#include <qwidget.h>
+-
+ #include "ui_createviewdialog.h"
+ 
+-
+ /*! \brief GUI for view altering
+ \author Petr Vanek <petr@scribus.info>
+ */
+@@ -22,10 +19,10 @@ class AlterViewDialog : public QDialog
+ 
+ 	public:
+ 		AlterViewDialog(const QString & name, const QString & schema, QWidget * parent = 0);
+-		~AlterViewDialog(){};
++		~AlterViewDialog(){}
+ 
+ 		bool update;
+-		void setText(const QString & text) { ui.sqlEdit->setText(text); };
++		void setText(const QString & text) { ui.sqlEdit->setText(text); }
+ 
+ 	private:
+ 		Ui::CreateViewDialog ui;
+diff --git a/sqliteman/analyzedialog.h b/sqliteman/analyzedialog.h
+index 4b871cf..3f4302e 100644
+--- a/sqliteman/analyzedialog.h
++++ b/sqliteman/analyzedialog.h
+@@ -8,8 +8,6 @@ for which a new license (GPL+exception) is in place.
+ #ifndef ANALYZEDIALOG_H
+ #define ANALYZEDIALOG_H
+ 
+-#include <qdialog.h>
+-
+ #include "ui_analyzedialog.h"
+ 
+ 
+@@ -23,7 +21,7 @@ class AnalyzeDialog : public QDialog
+ 
+ 	public:
+ 		AnalyzeDialog(QWidget * parent = 0);
+-		~AnalyzeDialog(){};
++		~AnalyzeDialog(){}
+ 
+ 	private:
+ 		Ui::AnalyzeDialog ui;
+diff --git a/sqliteman/constraintsdialog.h b/sqliteman/constraintsdialog.h
+index 6ab19c7..61485bb 100644
+--- a/sqliteman/constraintsdialog.h
++++ b/sqliteman/constraintsdialog.h
+@@ -8,8 +8,6 @@ for which a new license (GPL+exception) is in place.
+ #ifndef CONSTRAINTSDIALOG_H
+ #define CONSTRAINTSDIALOG_H
+ 
+-#include <qdialog.h>
+-
+ #include "ui_constraintsdialog.h"
+ 
+ 
+@@ -23,7 +21,7 @@ class ConstraintsDialog : public QDialog
+ 
+ 	public:
+ 		ConstraintsDialog(const QString & tabName, const QString & schema, QWidget * parent = 0);
+-		~ConstraintsDialog(){};
++		~ConstraintsDialog(){}
+ 
+ 		bool update;
+ 
+diff --git a/sqliteman/createindexdialog.h b/sqliteman/createindexdialog.h
+index 9c75b35..186a46a 100644
+--- a/sqliteman/createindexdialog.h
++++ b/sqliteman/createindexdialog.h
+@@ -8,8 +8,6 @@ for which a new license (GPL+exception) is in place.
+ #ifndef INDEXDIALOG_H
+ #define INDEXDIALOG_H
+ 
+-#include <qwidget.h>
+-
+ #include "ui_createindexdialog.h"
+ 
+ 
+@@ -27,7 +25,7 @@ class CreateIndexDialog : public QDialog
+ 		\param parent standard Qt parent
+ 		*/
+ 		CreateIndexDialog(const QString & tabName, const QString & schema, QWidget * parent = 0);
+-		~CreateIndexDialog(){};
++		~CreateIndexDialog(){}
+ 
+ 		bool update;
+ 
+diff --git a/sqliteman/dataexportdialog.cpp b/sqliteman/dataexportdialog.cpp
+index 7ad5d03..ee77b25 100644
+--- a/sqliteman/dataexportdialog.cpp
++++ b/sqliteman/dataexportdialog.cpp
+@@ -223,7 +223,7 @@ bool DataExportDialog::exportHTML()
+ 	{
+ 		out << "<tr>";
+ 		for (int i = 0; i < m_header.size(); ++i)
+-			out << "<th>" << m_header.at(i) << "</th>";
++			out << "<th>" << m_header.at(i).toHtmlEscaped() << "</th>";
+ 		out << "</tr>" << endl();
+ 	}
+ 
+@@ -234,7 +234,7 @@ bool DataExportDialog::exportHTML()
+ 		out << "<tr>";
+ 		QSqlRecord r = m_data->record(i);
+ 		for (int j = 0; j < m_header.size(); ++j)
+-			out << "<td>" << r.value(j).toString() << "</td>";
++			out << "<td>" << r.value(j).toString().toHtmlEscaped() << "</td>";
+ 		out << "</tr>" << endl();
+ 	}
+ 	out << "</table>" << endl() << "</body>" << endl() << "</html>";
+@@ -256,7 +256,7 @@ bool DataExportDialog::exportExcelXML()
+ 	{
+ 		out << "<ss:Row ss:StyleID=\"1\">" << endl();
+ 		for (int i = 0; i < m_header.size(); ++i)
+-			out << "<ss:Cell><ss:Data ss:Type=\"String\">" << m_header.at(i) << "</ss:Data></ss:Cell>" << endl();
++			out << "<ss:Cell><ss:Data ss:Type=\"String\">" << m_header.at(i).toHtmlEscaped() << "</ss:Data></ss:Cell>" << endl();
+ 		out << "</ss:Row>" << endl();
+ 	}
+ 
+@@ -267,7 +267,7 @@ bool DataExportDialog::exportExcelXML()
+ 		out << "<ss:Row>" << endl();
+ 		QSqlRecord r = m_data->record(i);
+ 		for (int j = 0; j < m_header.size(); ++j)
+-			out << "<ss:Cell><ss:Data ss:Type=\"String\">" << r.value(j).toString() << "</ss:Data></ss:Cell>" << endl();
++			out << "<ss:Cell><ss:Data ss:Type=\"String\">" << r.value(j).toString().toHtmlEscaped() << "</ss:Data></ss:Cell>" << endl();
+ 		out << "</ss:Row>" << endl();
+ 	}
+ 
+diff --git a/sqliteman/populatordialog.cpp b/sqliteman/populatordialog.cpp
+index 1e55f63..8e6e246 100644
+--- a/sqliteman/populatordialog.cpp
++++ b/sqliteman/populatordialog.cpp
+@@ -7,7 +7,7 @@ for which a new license (GPL+exception) is in place.
+ #include <QSqlQuery>
+ #include <QSqlError>
+ #include <QHeaderView>
+-#include <math.h>
++#include <QtMath>
+ 
+ #include "populatordialog.h"
+ #include "populatorcolumnwidget.h"
+--- a/sqliteman/shortcutmodel.cpp
++++ b/sqliteman/shortcutmodel.cpp
+@@ -45,7 +45,7 @@ QVariant ShortcutModel::data(const QModelIndex & index, int role) const
+ 		return QVariant(index.column() == 0 ? m_values.at(index.row()).first : m_values.at(index.row()).second);
+ 	}
+ 	if (role == Qt::BackgroundRole && index.column() == 0 && m_values.at(index.row()).first.isEmpty())
+-		return QVariant(Qt::red);
++		return QVariant(QColor(Qt::red));
+ 	return QVariant();
+ }
+ 
+diff --git a/sqliteman/sqlmodels.cpp b/sqliteman/sqlmodels.cpp
+index 178b2e7..82d1f0c 100644
+--- a/sqliteman/sqlmodels.cpp
++++ b/sqliteman/sqlmodels.cpp
+@@ -47,7 +47,7 @@ QVariant SqlTableModel::data(const QModelIndex & item, int role) const
+ 
+ 	// mark rows prepared for a deletion in this trasnaction
+ 	if (role == Qt::BackgroundColorRole && m_deleteCache.contains(item.row()))
+-		return QVariant(Qt::red);
++		return QVariant(QColor(Qt::red));
+ 
+ 	// nulls
+ 	if (m_useNull && curr.isNull())
+diff --git a/sqliteman/sqlparser/tosqlparse.h b/sqliteman/sqlparser/tosqlparse.h
+index 3424fa2..678df90 100644
+--- a/sqliteman/sqlparser/tosqlparse.h
++++ b/sqliteman/sqlparser/tosqlparse.h
+@@ -50,7 +50,6 @@ This file is based on the TOra source code. http://tora.sf.net
+ 
+ #include <list>
+ #include <algorithm>
+-// #include <qstring.h>
+ #include <QString>
+ 
+ // class toConnection;
+diff --git a/sqliteman/tabletree.cpp b/sqliteman/tabletree.cpp
+index 339e259..f4ab00c 100644
+--- a/sqliteman/tabletree.cpp
++++ b/sqliteman/tabletree.cpp
+@@ -6,6 +6,8 @@ for which a new license (GPL+exception) is in place.
+ */
+ #include <QMouseEvent>
+ #include <QApplication>
++#include <QDrag>
++#include <QMimeData>
+ 
+ #include "database.h"
+ #include "tabletree.h"
+diff --git a/sqliteman/vacuumdialog.h b/sqliteman/vacuumdialog.h
+index cac27f1..5e25214 100644
+--- a/sqliteman/vacuumdialog.h
++++ b/sqliteman/vacuumdialog.h
+@@ -8,7 +8,7 @@ for which a new license (GPL+exception) is in place.
+ #ifndef VACUUMDIALOG_H
+ #define VACUUMDIALOG_H
+ 
+-#include <qdialog.h>
++#include <QDialog>
+ 
+ #include "ui_vacuumdialog.h"
+ 
+diff --git a/sqliteman/sqliteprocess.h b/sqliteman/sqliteprocess.h
+index aaa60ca..5bec5b0 100644
+--- a/sqliteman/sqliteprocess.h
++++ b/sqliteman/sqliteprocess.h
+@@ -8,6 +8,7 @@ for which a new license (GPL+exception) is in place.
+ #ifndef SQLITEPROCESS_H
+ #define SQLITEPROCESS_H
+ 
++#include <QObject>
+ #include <QStringList>
+ 
+ 
diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild b/dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild
new file mode 100644
index 000000000000..a7645ef0f775
--- /dev/null
+++ b/dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+QT_VER=5.7.1
+inherit cmake-utils flag-o-matic xdg-utils
+
+DESCRIPTION="Powerful GUI manager for the Sqlite3 database"
+HOMEPAGE="https://sourceforge.net/projects/sqliteman/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtcore-${QT_VER}:5
+	>=dev-qt/qtgui-${QT_VER}:5
+	>=dev-qt/qtsql-${QT_VER}:5[sqlite]
+	>=dev-qt/qtwidgets-${QT_VER}:5
+	>=x11-libs/qscintilla-2.9.4:=[qt5(+)]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-lpthread.patch"
+	"${FILESDIR}/${P}-qt5.patch"
+)
+
+src_prepare() {
+	# remove bundled lib
+	rm -rf "${S}"/${PN}/qscintilla2 || die
+
+	append-flags -fPIC
+	cmake-utils_src_prepare
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/dev-embedded/gputils/Manifest b/dev-embedded/gputils/Manifest
index 8012dcd99b57..30ca888f0cab 100644
--- a/dev-embedded/gputils/Manifest
+++ b/dev-embedded/gputils/Manifest
@@ -15,7 +15,7 @@ EBUILD gputils-0.14.1.ebuild 417 SHA256 8085ab18a997aeea85e5be929d2549cf16b41b85
 EBUILD gputils-0.14.2.ebuild 417 SHA256 8085ab18a997aeea85e5be929d2549cf16b41b8549f7039cb9ebc8e9535f5fbe SHA512 916c92e512b10fb084e6eea1e97d672a1a48644f6a81a9e423ee43ebdad884852cfe1c7343e4f442b3df99d1fcbcfe50ef01698826405894c7f3346b7eca65ab WHIRLPOOL 2a5f6c6d408037b7ddac63d4eabe950b5e9e9a7f89210f4bc9f9d63a118247d5186a0c788c595d5607e1ca90845f4372a0f295a80fccb30d81ba41642ef087dd
 EBUILD gputils-1.2.0.ebuild 417 SHA256 8085ab18a997aeea85e5be929d2549cf16b41b8549f7039cb9ebc8e9535f5fbe SHA512 916c92e512b10fb084e6eea1e97d672a1a48644f6a81a9e423ee43ebdad884852cfe1c7343e4f442b3df99d1fcbcfe50ef01698826405894c7f3346b7eca65ab WHIRLPOOL 2a5f6c6d408037b7ddac63d4eabe950b5e9e9a7f89210f4bc9f9d63a118247d5186a0c788c595d5607e1ca90845f4372a0f295a80fccb30d81ba41642ef087dd
 EBUILD gputils-1.4.0.ebuild 500 SHA256 a7349ce51f47e69e655e490732d86cc58a055ad7418d1347784b571e8dc391eb SHA512 7ebbfff670be8b161b68e7d798d019a9d02eebe3606680e1e78a7cc667f143e54b2da1741c82c4b47b301f3c702d11ed1af4bf2e8b62ec6bd54cae0f54fe7f12 WHIRLPOOL 5716e0006507c2c1496fe4c8640b3c7bfd9c7ca330efbc3d690187384b0bea897686bdec68b92282c6674c517f6c6acf6235e168af96dc5d3478599c0cec619b
-EBUILD gputils-1.5.0.ebuild 629 SHA256 bea15e12c4825edb3ab46ed7eea9af9206c9bc6d5e16234b58a012805635aae8 SHA512 da5a4b65227a1aaff44789b431e581fc308a585a855c7bc5836df5ca43aaac07875d9c98d642ad042f3cf894258801972ab8bd68f341e1d008eb0cc57a611e5d WHIRLPOOL 5203f02461671f0aca0520c917dd63a7ed47b6d8edd0ca79faf4ccf6a20632019b9f25e4939c20e0562c95f087ffed68c89eb3bcfe1940983faf7cf8fdad4c30
+EBUILD gputils-1.5.0.ebuild 628 SHA256 2950046b4cf86e6c41df0ea446384ea62472627da524635cda2225dc256b7a78 SHA512 7a99652cf5b6d057a705149b70e4662a3ed20f3cd265e0ca21e50ac2d806417d178cec2275182dd2e8b7239a5982edc56ea895bdabe3a920e2f2901e29c39736 WHIRLPOOL 0455f28ac69413bf6e15ccde6cb2c4e231dcc79e9fdd03a46bb9e56b4006c3be30ac5055868de1eefc6b7312b1215e3bad2a8875a5a858dacad2261f688ecee2
 MISC ChangeLog 2968 SHA256 04ba8633a3e6d6628f0472c0e26fa85fc89a634641f32599fddbf3d3eb233dfd SHA512 9b2cc991d48f3b1c1a8001a8f40091c96f08dc7370d5896cca8f825532fe65f4cd5b1082b7a35ef16ce77b57592d7678a58bbe5899b5eea34615fa7450b32e92 WHIRLPOOL f249e909f95a15daf6a45ee80a366543557325421bdac202849f5fcb00e2b9d9674b0bf44741c22a5721b571c82971e96810a2d0688942e4f96b976e7f6e60d4
 MISC ChangeLog-2015 7614 SHA256 e36f8b6b6551ca98a9163c66b9121e1b8d724c6a4610d160b8a4fd799cc29229 SHA512 f34fbceabc6eb249fcdf38e0373b330c686cd838b3bbe277c3da5d568cf5176f42885779da15a0ab65c73f769d3e5e4f116503f19563cc6adf2b56b2cca824cd WHIRLPOOL 049a809591ac433dd53188b60eef458f2fc57c938b800d1cef2332a142df479127b6c6836043d93069db2b90920d08a54a25e272fb4bb88074bd338da6e6624a
 MISC metadata.xml 328 SHA256 3200254737b3dc98efd3491086371f7e370ab6d9d8cd55a1be9e83b42da2fd9d SHA512 7883c33a023766278a8d827d6c3435848dc4647e2218c5d7552d14d14a49a6534d75df8b27b6231dcf940b62ed8ac86b0a0bf898233726297d2af4083ab98fd4 WHIRLPOOL 3d5523f2c1bc7d33d857e828fbe2e3b1dffb3db55811652c9fa7c297021fe363c5392f87cb70672a3394d5ac87503d1f0b2f111b2df8a5cc28ed39f380db5221
diff --git a/dev-embedded/gputils/gputils-1.5.0.ebuild b/dev-embedded/gputils/gputils-1.5.0.ebuild
index b6a680017baa..2bdbf466e3e2 100644
--- a/dev-embedded/gputils/gputils-1.5.0.ebuild
+++ b/dev-embedded/gputils/gputils-1.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 ~x86"
+KEYWORDS="~amd64 ppc ppc64 x86"
 IUSE=""
 
 src_configure() {
diff --git a/dev-erlang/cache_tab/Manifest b/dev-erlang/cache_tab/Manifest
index 2fb35a7cbf5a..2031de61ef8f 100644
--- a/dev-erlang/cache_tab/Manifest
+++ b/dev-erlang/cache_tab/Manifest
@@ -7,6 +7,6 @@ EBUILD cache_tab-1.0.2.ebuild 511 SHA256 7a60e120f0458dfc4a32424748e483c2fa22cec
 EBUILD cache_tab-1.0.3.ebuild 513 SHA256 90f9aff5a34057fbed82a1e1ac7df50ba828426637dd31de948a9070d2f30884 SHA512 debf2c7af326ca421de0af51fd6043fd30d14dc167826247edafc08257884bb7b901a515874b0e9c5b26953e09d31fa55de0f5fd4bcec57f12228e55594c5a9e WHIRLPOOL 3901e7777bbd17bc7b3c2a0e254a993e296c08d48d0733fa6144e5d217e3c085d51d1d5a014ab4a6cedd95c4b1c56c89915f9e65625a243c6abf6fb449d540c6
 EBUILD cache_tab-1.0.4.ebuild 511 SHA256 883816668141b5a3ea2d17928118613d5e8ea1bd3ec21da5cbf894b1891d4e3b SHA512 d4eab4d39cada64eee3a95c74053e56ccf203e31c1c2e8f8abaa8793faf0db47deb496b38def8295981730769a38ccf18705c846a6950240db7372f8b2952f76 WHIRLPOOL 215b17f072f6abd47354133efc86af984632157d12884022c9c9fe117d11d4ef6cae85f2b77a5199d68e44d6fb19ec9c4fc7527988b036b3663ff7d44ba768d8
 EBUILD cache_tab-1.0.5.ebuild 514 SHA256 127ff831c3d9e86233a603c5a8eb9ef3067d52cb9b211513fa42a9ee576cef28 SHA512 96f222f12c4cfc4162a18015445c95674a991d1bd6f3d68a1200396e188b9fbc69ff1779e704af0ccc2f3269f18d4bbe7f7cb57b1e863f500f456d3e658b727c WHIRLPOOL cec20b02ef5fac7d767ac16e2e7c3853a5893f8e7a53b145e10bdfbf0909af18bc6a20865be16b52a96841ce4b4f5c26e8b3b859ae8ddd2a9199a714129904c1
-EBUILD cache_tab-1.0.7.ebuild 514 SHA256 858ee9353078e404c3a50598ae7ed9f570e7cdad7741c0d94f7c51bd4111ef0b SHA512 c8cccd8a53290810ada9b1c85c5798304aad0970e14c9f6b42b0dd9411a4db47d7669af26f52d2621dd3b2dd8a180916ed9e63c209c4323a7b8c6af70de53a48 WHIRLPOOL 76088e4dbc5e934c89f66bb73d9865aeedf7b706763d484db2ca6336cfe24f4164c6a45eb013278742dd8f16de91e7d4bb130d18321801a20265fa6e82408db4
+EBUILD cache_tab-1.0.7.ebuild 513 SHA256 47137700dd620b3e0c636bf7e7b7a95e04d842235771520ec346917074321dc4 SHA512 277f1a9db3317f147ca4795582aff0b63cc549787b19f4085f8f64fd481b093eb1841a63354b80738519ee146d2d3dc5a1892b7513be0386c8ecc7cd4388dc61 WHIRLPOOL 44263cbeabd0b211766f8e42bb33caa6339702315ca330cc08bb8ebb26c73103ab9b39bf851468869e43bf8920bf09bc2f1c496818ffa90a1708996ea3848b82
 MISC ChangeLog 1558 SHA256 34e58f8f20b97a40b44ee690c57e7db84c1d762352176c6c65fe3f39adc6d1c8 SHA512 5a8bbc34e6a8f51d7d5e3456a937b5f7f799e52503876f53da8bdf8700ea0d8466f5e5b2441803b83ae05549844a166ec43e56bdc626fbebab508e35af0e07e2 WHIRLPOOL 09dcbd615f2542103b0c6cbbd785559fd697e7459c8e227996a64e4c41946988398a3826da7dd89e48fa33e592298c99f14b0619c3c8b5d563dc059be1ab64b2
 MISC metadata.xml 799 SHA256 d7ef9cb7938d97df32f6fe8999a1e472b8d316de0cba00107a7aa44ca72bffde SHA512 52e947acc35734976976ed0dc3d4286a6abe9f40c23466ba54bc7881a845d1cf0a6dc481d8362990c4de54ca0eebd5b0692c1744bc2e95d4267bb0360d451f9f WHIRLPOOL 8dcc6b0b061e9775a5ad0b7f1b33775a10957dd9cd23fb43fb345ee93115e2b998e563a1de498b468d17354c69016cf305f672b2b245c501feb31338fcabd11e
diff --git a/dev-erlang/cache_tab/cache_tab-1.0.7.ebuild b/dev-erlang/cache_tab/cache_tab-1.0.7.ebuild
index 2adde794c8df..4ccae450d9c4 100644
--- a/dev-erlang/cache_tab/cache_tab-1.0.7.ebuild
+++ b/dev-erlang/cache_tab/cache_tab-1.0.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc x86"
 
 DEPEND=">=dev-erlang/p1_utils-1.0.7
 	>=dev-lang/erlang-17.1"
diff --git a/dev-erlang/esip/Manifest b/dev-erlang/esip/Manifest
index b09d0b5542b8..e4003507dcf5 100644
--- a/dev-erlang/esip/Manifest
+++ b/dev-erlang/esip/Manifest
@@ -4,7 +4,7 @@ DIST esip-1.0.4.tar.gz 84478 SHA256 f10e59d06a7764c97f1dc474a99334d532b06c5f2125
 DIST esip-1.0.7.tar.gz 84522 SHA256 942622cb808978d7eb0f2faa3c6b1577579bf9faa8617d9db58a9b7fe7a59993 SHA512 f25f2ea146a8fbea8f727210fc222649a6d434b5f2f9c2eaab62d56ecaddcd2f2986a96befb1e1291cff9130276d146321c20948d0469c36797c323f94431f3a WHIRLPOOL bdd25e89e32e742508cf58b4321e382e3c7fe6e0cf8ce7128c39ea1270162930eebf6f88bdfcfac65470c8193b87ef01e38aff8bccc310e1fd4f7c5f5adc078d
 DIST esip-1.0.8.tar.gz 84534 SHA256 1954e04ce6afe58992319f394110beb4adb743b11813ea853bf3bc46308fa344 SHA512 c5ed3e4e25d8db7aa67002e7b0bc0f6e7355e4227339ed507064832c3f329d78f6aa7d71eaa80108629b7bb6141f68c2f079decc4799517ac886e7bb3c1415e6 WHIRLPOOL 638d380717b0a7f7ee9f70a65cf7d8b99f0cfbd5a730b3fa02870653219a5a4ec53066f929e02e17ed18719b98302bfbf42b48fa93ff005974c6c6d9045bb156
 EBUILD esip-1.0.10.ebuild 707 SHA256 7e459afad2fcd36ad0b58cbabb60bd9d9b56ec107a5bb17126b87c6d012fa4a0 SHA512 c25ae0cda0cf5b0bd79935292bbe64964301b848abb58baa3afc4781da565160a0c2791e000c124f542974fe554aeb4e497c64f95863440f6b186746c424684b WHIRLPOOL dc85e88040c254269bdbeb6b8facc7aa7090b3dc2c2029cf3e7d96a5f70c6b35cc32fdfffcf28d7ebb96b5b6edcc0256e6922aaa051971e17b3e932d99983988
-EBUILD esip-1.0.11.ebuild 709 SHA256 f19ba936a6120f13b2a505bbe6fdbbd5521ffaf1d202d91b5d2c33129d6dd6e4 SHA512 6e4fe3fb36d2ce633ee5d281242dd7ac9fa23ac92c8800aaaf3acc5356882f336aa82eadced37674fb040aca10058aa004beae1e14ee0ca3e45c8424bdb65176 WHIRLPOOL 08e30b67d7f960dd80577f6b573f03d1a30f632814c0ce54c64f20baf697863417a5fd78e5bf4e8435adaa9572b2a8228506a39faf7379546eb6b5d3fca399a6
+EBUILD esip-1.0.11.ebuild 708 SHA256 14d120ecb984fb1b2747678256da7fd41a74a6f6f9521b3a5ef74f00d48da606 SHA512 24f494760ab870f6030633f04a9661a8b90dcf73b0855e691cc82bbec2ebdfbb6bc660b0f8a569b11734905568204491e198f8277348f5d47b2abaf9790bab83 WHIRLPOOL 6dcea96b7a9489ca2053ee59611adaa0109ab6194810cf69c49aabef8e72f3a3f8274cdec2ead1cde4a8b081c5f474331107ce4462e4575b41384932f33f46ee
 EBUILD esip-1.0.4.ebuild 704 SHA256 76ceb61c07da0f87d7b8c99891ea7561a3208184dd5f6162a182d472ebe05dfe SHA512 4c82c6df5ea2a7ed8067b6a3d86200caf1387530bd48b104482fd3f1d6c299f37b0dfd2b821ffe3a1e234264e4c5d5441c063c3b1f69a202521c32c84b8072b3 WHIRLPOOL 6de901dfada6cd59a9754b0b9c6bd979c01745e77933ce05fd4eb966f109c580f2784148eda3b5c04f313f2fb583154f7e9a2d5d001167fa1d2acca359156d3c
 EBUILD esip-1.0.7.ebuild 706 SHA256 a57cd3f6ec4e6f46e869b726d7e97b8cb0449a358cbb683b94e4bb89cddab45f SHA512 27eef9025b2169fa6b28330011407e1247e73b4afbc9e5c0c3bba7a58539c753eb47aa0aeda1cd1df20cb44f3b5c5c4482be7d3649be99fd4dadde2c931cd934 WHIRLPOOL 7378e37b2271d84b860a3553f93965406896bdb32ec27c941f1464e297607cff20783390509efc803c8718640327c033a51cec56e30d4a7503e7edc4a672fe2f
 EBUILD esip-1.0.8.ebuild 704 SHA256 38ffca800c20f7d61419489317cebdc1d24c561b325aed74ab2dbbfea57eb2e7 SHA512 e54fe2eef6c98626887a1d7f4b09abbce48ca0ebf14b3059808499b6b6cb7b58e50ac58d30fb3fb46a2d2dd0a6c5cf31b9d34cf2949ca502c59d637513576b4d WHIRLPOOL 11b45258ee947ecf52591611d857c48446d813538c3674acfe5eeb0b182eeabbf2f169ddeb1deeb7fd09ad1bdd1dd1f083e5bff994d812770d777cfae185a156
diff --git a/dev-erlang/esip/esip-1.0.11.ebuild b/dev-erlang/esip/esip-1.0.11.ebuild
index 4799c6f97a9d..b3a938dc3580 100644
--- a/dev-erlang/esip/esip-1.0.11.ebuild
+++ b/dev-erlang/esip/esip-1.0.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc x86"
 
 DEPEND=">=dev-erlang/fast_tls-1.0.11
 	>=dev-erlang/stun-1.0.10
diff --git a/dev-erlang/ezlib/Manifest b/dev-erlang/ezlib/Manifest
index 61c0f754d6f7..2e464228cec6 100644
--- a/dev-erlang/ezlib/Manifest
+++ b/dev-erlang/ezlib/Manifest
@@ -1,6 +1,6 @@
 DIST ezlib-1.0.1.tar.gz 45307 SHA256 7d867a7c0e2109264f8000d31d7824f6ffa375858617b63165a7f4728688d84a SHA512 7ec02dd91034eeaad3556071ef78ff6d8e890bc49b2ce5010280db48f9eb65ebfe62628fbbb89110310e359847f0da616f9281683926fb7d0f72972ee77a463b WHIRLPOOL 8160506f50eda8822285c0ae319ca260d5c6acd634b4dd0880a2225c65a168d5b780901dfda39643b5f3ac8fc734414c54b2248bc6977436d019b7df5a253d95
 DIST ezlib-1.0.2.tar.gz 45369 SHA256 2200330f7d4fc595caf8806fec1318b853009ab3d643cf063d19bff59bf2b45e SHA512 90671fdf0bbc23a7f54da665dfb31a3ed2d92180ff5c58d872001481584e6c8b39cd84b3dc947f1efdae10792c2547218017381cbc7056070d22b140e941c9bb WHIRLPOOL a10070d79639ee5249bd527c0473b95773d1c26178abb3623b31ae0081dbcb128077e5bbd15afe881cf3abc5b9b685c70d306de86bef064ae2fd46d522b9c7bb
 EBUILD ezlib-1.0.1.ebuild 492 SHA256 cf67b0c3b8fbad0cdfe04acf5589949ec72452ba6f30f2c36e372b12e61e272e SHA512 7f99ab77b621cc1229cebda4865f461b5438cda0c209a0c0726bdf861679d4aa1b662835c026ec1b9fc82c9bd0f5c113fec4c8543deae05236329a35dc3e74b6 WHIRLPOOL 71a7f20a07f37baa8631207124524ec04f5311ff542571e4142f5bf726fdd995eb2f4e14b5aefa49fbe80736651860bc7bb310c23f407b95de2909d693e692a6
-EBUILD ezlib-1.0.2.ebuild 495 SHA256 0afb25b8ff901beabb56e86c1e31c33b9b6527d8b28e76ce94fb7745f8492c4a SHA512 7583f2a40905e89f9203e518fb41d0a0c2a511bc35c3c8adda3d6ce02b453882ef1e03a9ebacd063d0399542784279e7f44bf51207d45c9ea53c14a05d5116c7 WHIRLPOOL 8dc14a38897229624a5ab416f1c4700964f63a59b4b29ee986144ad1ff10bbbe8939cc7f2faee7b4d0033ad10abff165d81d36bf57acbccf59f9175268eebe13
+EBUILD ezlib-1.0.2.ebuild 494 SHA256 944f898bc32bad18e0f223e6531001af70b8ff3f7e06ce91011b9b9a5fe24ec5 SHA512 c5d86273530f923c8a0fa2a4fa733b91e8cb48d6b71cfcf204e8c356fdb363a5c661515269d110e60ff00600730e3897b9947560e2d097e35eb50c7675326e40 WHIRLPOOL 8d3a374d9b0ea0f5bd6cc80552d17d6a9e358580cb76dc088be5d965053524f0af7e82246812268d3c4eaeb1501adac01b3cac9fa681902ff273dc266b18c5ad
 MISC ChangeLog 1184 SHA256 4de7a645a41a2b2c589629e6159aba1840c349292814e5387f6fb71263b9013e SHA512 5ccd53d238556b824eab0eb6df678bc8006ecb4a9a25e0e08461c2578776bbb1b8fe8a21c1842d5e7bb474bf6f143af093fb4dc08977a4ef33bb6c4b830a1d36 WHIRLPOOL 150dd85844fca11e50d8ac7b3f44523de0e508b67cee17626ed2b16841e379812bce3a6827a8b0473bf85fd7c03c52286843dbf21ceb72469d7d782d21020627
 MISC metadata.xml 335 SHA256 86c9dcb8ca243fcbb4bee53db075c9349cc78598a84f015ed6aa35705b18b874 SHA512 dd160b8babdb0efb02c55b34ae184e88816b8ca95de3a522452978b1a47282b77ed64665e0f3414b4e2b154c0892954dea67fe7fb75994e86532d491c08d927d WHIRLPOOL 2d7b6b6669bfa1e83776289519e4896055a4dc86725a19474a569b037c7a41cee432a2212ef77904e543b205283244b9be65e53d2ca672c2e1adf4717f4e2cb9
diff --git a/dev-erlang/ezlib/ezlib-1.0.2.ebuild b/dev-erlang/ezlib/ezlib-1.0.2.ebuild
index db292d1e05e8..35da38ca4c83 100644
--- a/dev-erlang/ezlib/ezlib-1.0.2.ebuild
+++ b/dev-erlang/ezlib/ezlib-1.0.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc x86"
 
 DEPEND=">=dev-lang/erlang-17.1
 	sys-libs/zlib"
diff --git a/dev-erlang/fast_tls/Manifest b/dev-erlang/fast_tls/Manifest
index 255409cdf6bb..3c1dbcebe8d8 100644
--- a/dev-erlang/fast_tls/Manifest
+++ b/dev-erlang/fast_tls/Manifest
@@ -3,7 +3,7 @@ DIST fast_tls-1.0.3.tar.gz 57470 SHA256 530f18fee1571fecab3ff75d5dd4d2e94472c892
 DIST fast_tls-1.0.6.tar.gz 57994 SHA256 96c3ede9fbdcad510865e1a1759901556fa004d51d81a45d4d24031127feee8f SHA512 d13a5758345521c9a295f6bb4aeedc58ea7fafb42ea3955ca61cb75e15c8755c7a331d139f2c544da9e8d23607a6520caf8fe1e1fad7c016acbca07c0d783fb8 WHIRLPOOL e69cfb8901e07e78ab308ce0ceac02167ead6c667465a8e386717509385c998d1e50f2a8b331c3887fbcdd990b958861f8b3e1e3e2e80a42598cbf07f66fc691
 DIST fast_tls-1.0.7.tar.gz 58069 SHA256 35da558d86aec4abe571740f5f229cd03dbb3abffaf16991fe88304a3a5f72e2 SHA512 46a3ebab09ec5e18b086c8c3e2a87a5d6a35e406e8988c48979d94c3e303d5f9a8bcdb1e8ce74266ba8c59fbb4a4310e445f5ad65f072d28a7b44a0bdec50b62 WHIRLPOOL e04d46127efd2980e7d060c8a32158a8bc3c642eab98fe6e61a2d7412bb74925498edb8a323f5e8843a4c02cffdce23f2f274f108a20b0dc7c3620a12f66571d
 DIST fast_tls-1.0.9.tar.gz 58299 SHA256 72d3110cd8ddcf938738fc9d44f9e0511a3435959caaa15289ed06d6db2f157f SHA512 ed45a5b262d05dba23887e4bf391740f388079afe9a297221de2dae22b62c6dc51b9b739544a54501ee4aebdafce789290764e963218ed3c0095623b407bf0ec WHIRLPOOL 84fdff64adf3f94d4f1a18c5265ce4a50819825ebd001001fdb13dc7a55c026db2e4ec7dfe6a69b65532208fb16a8a1bdbea6ea7c629c9863b6f89c1965ee0ae
-EBUILD fast_tls-1.0.11.ebuild 603 SHA256 9f7172d75c0e518abc166854768f275a75260b4594ef224d60f953ead9a426bb SHA512 811aa7b0630606429c3401ef9c8329ef050413cc12bade2a77cc63d35049d69fccd1aa523dd6fb06975b5b3309ec5ff04a90075dc4c4a8ff5f07e34cea06493e WHIRLPOOL 95278131ece43646ca5436dcdc358a4654503ef6b658d9fc6b87bcf32db690f8456b433d80db0fa190cd83059a66f6566dd3d13af8ae074e2f11e3fe2b7d115c
+EBUILD fast_tls-1.0.11.ebuild 602 SHA256 a4096524b75e0f4c62e367a4588d3d6d0851b386360c6b3165d7b34e7762df68 SHA512 72f6879302292e7d343d96948c9be46db47d2de941e91a5e90775e76eb125a520bd893200ab10c5ae28cc26f58d840867b61ec47abe8856a102f78ab5cf9689e WHIRLPOOL a349f28fba94a7f3173c6a9e8520b75a26c5ff7a3b69cf49be0aa192cf56afbdc3ac1e6bf032d2b6c44d3b52c00873b2e179dc22d0b260c8cbfa900c14c6fdc9
 EBUILD fast_tls-1.0.3.ebuild 532 SHA256 a944fc8288ffc566ffdc1163925e9501abe8acdd8ba4063ef714e2e65fc00190 SHA512 14ae845928c88e7efbb4d9a693b9b61e301b2fd1edea60d01e7072c490c74aaf09b42fd6341047cabee49812f85110465aa24a8c9929e1276af6eee39f342c78 WHIRLPOOL 8240ebbe52c6a46f5e33b4a238d50054ef8655a3b826da51fb7a2322228d22decda86c85cec67d533fd6089116c660b81381eeb02a90e14e52cd604bb6994801
 EBUILD fast_tls-1.0.6.ebuild 602 SHA256 e79a7452e0aa8b640f6e90304e55fffd2c8583cda14b023f74c1fbdf98c1fe91 SHA512 c920da9c247e00e8d2e2adb424ecd6bc2f31b9c363ffe8a2a5687cde527964918f89d7804c05269c1642788603bc2242789f4380d6d49c6517ba1c0e1b88a03a WHIRLPOOL d123ca9b46288425160166c90832be407d1c440ec2ffc8cb37ce0467fa2a22d3566cc0fb46f6bcbd00d7f584733c820296b86dcd176b2fbf13c6f554feef9a21
 EBUILD fast_tls-1.0.7.ebuild 600 SHA256 44cbf88eb0dac031c3fa833df07e7e1b621d15689b018ef5b3f77def51fa6397 SHA512 1428618c39ad08f6a37e28ff0b4793a384c196bc577b22ed3f375cd99587ff851816d2c5b9b310f3130a39375a17533cb615dc9680f5e556d514882cf0dfc4ab WHIRLPOOL ae6e3a124ccca904bae6eef5c4e9f5b5582b57bfdf7c83a1bc951475c998be912bc7837042a47ea94daf6ba50d1e5bb38665d306be851e3b09c42637fa7dd309
diff --git a/dev-erlang/fast_tls/fast_tls-1.0.11.ebuild b/dev-erlang/fast_tls/fast_tls-1.0.11.ebuild
index f0cf6882a085..9f19e1a89c52 100644
--- a/dev-erlang/fast_tls/fast_tls-1.0.11.ebuild
+++ b/dev-erlang/fast_tls/fast_tls-1.0.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc x86"
 IUSE="libressl"
 
 DEPEND=">=dev-erlang/p1_utils-1.0.7
diff --git a/dev-erlang/fast_xml/Manifest b/dev-erlang/fast_xml/Manifest
index b7a22a5f7a5a..923feff02066 100644
--- a/dev-erlang/fast_xml/Manifest
+++ b/dev-erlang/fast_xml/Manifest
@@ -7,7 +7,7 @@ DIST fast_xml-1.1.3.tar.gz 84926 SHA256 59de96e3defc02c9b916d4cc02545cd963c28226
 EBUILD fast_xml-1.1.14.ebuild 576 SHA256 170c16b81f8e02c0e03b25aec8618ae4707d20d4baf7537d843d168e246b1714 SHA512 96b2e45f6bb6332ea123ce6da765c6b39e719329d30e0f8a70cdf9712986f305c208a85bf51a887b1e49a1ec95b3c5654255d53ea25c93f7e8d4a5a547136f2d WHIRLPOOL 32eb27709f5fb2101ed27212619e05006ef0011328211ae74b32783aa70ac182b789aa5036f7b6761eff463bc8dbe2707efda65bba17d30cbcb708e39a4a065b
 EBUILD fast_xml-1.1.15.ebuild 574 SHA256 1192667ef37f87dee796e781e56cd799c34445b35159b783f34abe54bbb3f9b4 SHA512 621f76b1869cdcdefe103c4f8ac774868c72b9b2d102441db8a6e7c4dc3d84013f19a92fe6a24d93011cb4d24cde95d6951552d4e21d423bdd467e0fbe1b5b99 WHIRLPOOL 7b966d7df03a260240c90d1131e8404c2b983b441a6b666baf3a57a25988a053d2f784125dffff4dcc73e5bb6a175fa27803790e31367c78b9af95bfbe97faae
 EBUILD fast_xml-1.1.18.ebuild 635 SHA256 9d57a7545531d219c4cb299a2170a43551cb1c065e1b3b8b37fb17569137302a SHA512 b07c8707e8dbf3cb72dfa901df478eccf554a320c4065e14a1c019760805ec13eb22b024272efe495ab63f3ef55e6dd135777d5ba2893e14dce95ddf400e65f3 WHIRLPOOL 1b6ddf30678f6889e0bf966d89f83c4358d10d8a37ce692c0408352b0fb826a9a71b23ba0a4b0fe70fc0df60486d4e7d4f53da249ae794cff8f78e74797fd02b
-EBUILD fast_xml-1.1.22.ebuild 577 SHA256 aea38e56adddf9583e61d621a402b61ae11063e19d597056d100b92fb2440ca8 SHA512 00a913dd534626d7223edbe0d10143094bd8b9e38d4316ed89df1f6d36111cb1789109d49688e15afa896c3be736e2ee5e4368cbbc86d14ebb7444d2f2eb2bf6 WHIRLPOOL 1a07efbafc932deba844859e2e2051d0692a773b32a109a6cae741423b9afc5b3ab79894d93baa64ad574c75db7038a7eae9dc1120fa62f340629d329963be25
+EBUILD fast_xml-1.1.22.ebuild 576 SHA256 d325c1d564543e0b458c7576ab601ff96d16061c7d6d3cd3436aa0541a2f5477 SHA512 202a6a9b1d71ec52c593abdc193601118fc110775ad68ffa71fb39d85c429d1aa18ea7035a353fe29c88e6218ba29d1e2ddb4ad724427165f68cf3e94614f861 WHIRLPOOL 688edd4f332034cbf339db51fa0fa458c382b1e813cb514671f552f9787471145d970b6f1ccc4012ae86c830a7773e0b15e0e8761edb34b8815aedebcb8250a9
 EBUILD fast_xml-1.1.3.ebuild 595 SHA256 80377e3571b42a8928a85437f01f091f4050b889013bfdd2e42645ed66d524be SHA512 ff50bb3865d38d31763f563d3d7771b9fb06201aef491703e727cece6015fa5161093d42727ac80bc7e126c86959b66757d81617a4ad94914b0f34480335ed72 WHIRLPOOL 51224b229370b2fc9e4468df880a56b965c396c7e8e3caaf11f1a93ff1613a2c8ac4300731628f257bda41cb7cef88aaf79abaaab86d9c58cac8e468c168cb43
 MISC ChangeLog 1882 SHA256 2a07e4583ca4c4c2d6753cc8af1582b8965ffd5c58c40dd9aa9e9c5c92488f50 SHA512 ee77ae309b3329afef3427bb7882bfc17fc1923386315e1be7c102a2e99ebecdee5836b8b13920dce95b086a7611698cbf11bac118fea333d0dcc3581a524da5 WHIRLPOOL c240887a5928666af9539daccddebdbf0a1adaa2b79dd21d197a374b3df3c3a47e1a040c99bde1ac86c4bf7fe4ca9fdf667fb00e8a1c582e25e8931433b7c85d
 MISC metadata.xml 338 SHA256 5fcdec103c7976e476cb745454b6ed023feb012cd59b8fb11cac2a6f621e4954 SHA512 334d44bf23902819adc99490123ab35400bc934f5876d0cfd2a3ce05110a33c2462a30e0a5be39cc4947ba86b1eb274a18b5fbd4529fd2fc2aa061789d2e31be WHIRLPOOL 63190506a92796114ddb0816beb500afc1982c8f7abf651f881142c2e53683b386dbcbb27f1a8fc6dc9af90ffad9abfd653ba437fb0d213d81bac7d5bb8e28d3
diff --git a/dev-erlang/fast_xml/fast_xml-1.1.22.ebuild b/dev-erlang/fast_xml/fast_xml-1.1.22.ebuild
index b0d200c85dd4..f9b283fe0323 100644
--- a/dev-erlang/fast_xml/fast_xml-1.1.22.ebuild
+++ b/dev-erlang/fast_xml/fast_xml-1.1.22.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc x86"
 IUSE="test"
 
 RDEPEND=">=dev-erlang/p1_utils-1.0.7
diff --git a/dev-erlang/fast_yaml/Manifest b/dev-erlang/fast_yaml/Manifest
index 233515907fd6..5f4d21db42f6 100644
--- a/dev-erlang/fast_yaml/Manifest
+++ b/dev-erlang/fast_yaml/Manifest
@@ -7,6 +7,6 @@ EBUILD fast_yaml-1.0.3.ebuild 534 SHA256 4a71f629cf22617bb9370ebdb9e980f3e610773
 EBUILD fast_yaml-1.0.5.ebuild 536 SHA256 2ca55f42d2f8d1d467578eaf272809f80907983fc89836b4439fcd2cb4ff9963 SHA512 1ecb41e6f8be61c5ae5436de14e48eb118dffede1a95bbf13c05ee2335eb414f269363497e83d40b147aa8f7bda00ff77425ca3d85476fe5b4efffe6eb66f2f8 WHIRLPOOL 5afb46ff078d40c584c7c332e980ffe17789d6f817a6e6c88a21fcd86982a8f7744ac35af48dd338312ee8fe644e7664660d091d14cf3328d7dbad2eea213163
 EBUILD fast_yaml-1.0.6.ebuild 534 SHA256 378d79abcc320fc7fff7fd5c6d49dac599ae4f7f616aa1a152d1376ea03e6d87 SHA512 9cc01d7a6cce598a7f9d809dfdf2d27d763e3ca8f9648a652a1794cbc32cce51680a00852f1c8c5d1c2bf1a4e10bcb184af125b657e5b4312656cac6685742ee WHIRLPOOL 5d5669b9efe629a6a8a755e90239b08b6843f5adf79d43432148acc15b4c7fd6354864251e1fa20e406ad01019be9268f5defb136ed2ad8b5b40270ff1b395a9
 EBUILD fast_yaml-1.0.7.ebuild 537 SHA256 7c9772d3ad9841963fc2a72c9f99661e14025b0d070e563d99caf7e4dd561b46 SHA512 36339885ba0c2ee4b355bed6b88b4e185078b2200fc2a516c025b81b4de218209c650c25aefdf4f92b10b8e4bece09e701bec401f79f143f06a8b012aaafb2d0 WHIRLPOOL 277b915f95956b2ef7236da9862d90b9c756e436c3bb3debc1a618416af521c6daf5903966aeb834747ac98d3ec1702fdd32bb795a3e8e0eea8a00ef0f34261b
-EBUILD fast_yaml-1.0.9.ebuild 537 SHA256 89dbd4158d970344ef27ec1adefacbd67c0a434b4f5bce8d7edd8394bdc98872 SHA512 2b1eb51d9ae3c65c4a14a028dbd150bec546eab6696351d5b9cefd32f3d6e24d50eb09beaeee0d2012f72d8de6ce39053aeba524a0d3708e7af64c170be57dc2 WHIRLPOOL f40eeb4c5b56d56789c5ba3be708ab0cdc48bb4805513278d29ef511cbef4910f32d22f12c9cafed0faea6cf9b823af72df4f8d758ac6b0f7d63391a05eae3ef
+EBUILD fast_yaml-1.0.9.ebuild 536 SHA256 af6be3c86b3b03487ea11af38dd693a5565fd364f419251bacb81e49d5425db5 SHA512 994c4ec5496d5ece86117db821e0e8f47bb7aecd004814601adc03d1b174e43412ca96bc8bb1faeb560afe207bee83d8a7b2434ddd50cf0e2e7c9a1d49b685da WHIRLPOOL 3f2f2d90cad33681cb5b604e87f725cdf57e21c439e6be0f63d362942d13d95c40b1dbaa462c784020fcd5b59fb59c255f8812626c76827901823b8a874daaea
 MISC ChangeLog 1558 SHA256 dffed4015be710d899f8a46409012fc87ebfe248bd23871208f9aad14c4a94ac SHA512 56a3ac3d08dc0d751eba1a2ed8853c3def79cb217aff498c60f58298ab0003497e6669110476932dbfffc832f4d840a271a769334fab1ea88ae55c00b3e3d563 WHIRLPOOL 080cbb28041555191bb93c5e4f57bdfef3ff43f4e940b2bcf812cc8b5d9efb87f9ceeb2c50e373977854c11182024884a81e66ea12c49e46e0127d64e9079594
 MISC metadata.xml 339 SHA256 94161bac55a04f8afead648fd36892b62178ec2759c8a6593fe855ed433f5461 SHA512 5a0f1c819b6c71244e21038d920a6537a5271925e64300e072e33b616e0a473c7838c0fc14ea6d7dc7789708541f9f438126b752411225fc0108ffd5f10b9e2c WHIRLPOOL 3ac860cbcd0c237ad6a073e0924252c8cc8b71e33cbb98addfb01bb88657bd52540452d9a17acb6e19ad4e10dddd5af70d5b0261dcf096208d877b1526db048b
diff --git a/dev-erlang/fast_yaml/fast_yaml-1.0.9.ebuild b/dev-erlang/fast_yaml/fast_yaml-1.0.9.ebuild
index 219f64675323..a04089e95eab 100644
--- a/dev-erlang/fast_yaml/fast_yaml-1.0.9.ebuild
+++ b/dev-erlang/fast_yaml/fast_yaml-1.0.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc x86"
 
 DEPEND=">=dev-erlang/p1_utils-1.0.7
 	>=dev-lang/erlang-17.1
diff --git a/dev-erlang/goldrush/Manifest b/dev-erlang/goldrush/Manifest
index eea20b2eb5bc..87ed5646ed8c 100644
--- a/dev-erlang/goldrush/Manifest
+++ b/dev-erlang/goldrush/Manifest
@@ -1,6 +1,6 @@
 DIST goldrush-0.1.8.1.tar.gz 22050 SHA256 75bd74818a6f3c0162696de4803c6b48266a987bbf94fa6857680495d6b4870a SHA512 291b340ad67e09e1bb92d97844fee9d0cc87abe19fb9a9bdae382c407bfd41c0269562fce5716133e8db8e4f1340dbb9bda24b57130ba89b3713d85ba6c4a007 WHIRLPOOL 118474f6aa7c8d944ef38fade8ea5227b6716bb1280fe3b141b2533a679ccd4ee541d54690e84845694f9104310f7550ded6030e5b7ba19a1740243512e1534c
 DIST goldrush-0.1.9.tar.gz 24548 SHA256 6fb8ac6345d940396ecf89d4ce6b9b809039f336d85d7a54239e85106a807612 SHA512 3e1efcfd1ed26641dc054f4f0b4b6a8c40959c8462f6fac9d1bde4818d46700d64bf727c39e27e3428a5717d2ef917b9e35b5982e32546482451a403f0b206d3 WHIRLPOOL 9a64e5044cbfc0b314b191d441b37f7231910252cf6dcb3c42f676168272cf09d497c57f4b34cc9932a22b7264d16a825bf79cf3b14e7b4659311c3d1414e8b0
 EBUILD goldrush-0.1.8.1.ebuild 691 SHA256 d6c1af47b300155b2bdba32be43b1087f222f9c1f74f18cd19d4dea221230b86 SHA512 8a29cbd5a70eb6dac1a6736e668a135f24c979fb00b4af216de5d1d31216b089c764ae7a9dc3029433df32137fdbb67f158623922a69aeabe29fd6326dd7f6ce WHIRLPOOL 75d41f6a4f8d55edf133fc74609321df143c274cef96cd7dcef3ea083d851ec4f6c5995a46fbc408e13e92a92ec600480a18b402dd2826be2e0542c1a0bcec04
-EBUILD goldrush-0.1.9.ebuild 617 SHA256 15aed6254755968bf2cd096f90de597f3e83c782fc66de55eba7437a3b58386c SHA512 47579edf1f54a0d0fb290b9f57d81d54da6a3ce7ee7ff45e209642a81f263138521be98161e536dae56b8ac1df05845af8fce2e5b8b2a60a6dc31b4392be2a61 WHIRLPOOL 6dea91af5c4ac4daaaf2579cea8268c245346ad5e46a56cca3e1245b7b4249a8bc4b54c6c8487f9a09c3a8081cf262880142c02b34e6d4d91eb66e78de73b3d1
+EBUILD goldrush-0.1.9.ebuild 616 SHA256 1f96eea6c01e33842d23055a608f46fea24796615eb20f7886db727c6a888443 SHA512 04da82967f73f8d9e779f6769c698b2826b595763dd6f0e4bf4c84ee3106afa50b7843f4ce330fdae6f511c3577caf8542d8fd78f473b08d56ef4f907b60e9d2 WHIRLPOOL e74fe2279e0286c68bb1c59dc8f081e3e7278e5b994583062c33cb3fd2ad2dcdfa7627d9fca4c8a20a13e411a16b3ade07ff9b826ec22cc6564e82065bf399bd
 MISC ChangeLog 1325 SHA256 c11db807b783bd95d7a4340237251c7954c100c4b114e6142ab9eeed307ee850 SHA512 2de99b3527f0d419ec7f7f9e2b6981885e50c286c3a8e84feb624858ac756d9a37741d0996fe03eaa45fb2628f1cb015b57525febef4c91f033b2c2ca92db809 WHIRLPOOL aadba128eb052ec37819c54952f10bec90f45b843c0619027d1161430a0d5b0bf32f6a885bf517e401cc9e80912a46d35e9d6582c37d10eaf24cd55e354a8d6a
 MISC metadata.xml 335 SHA256 3a5a437cd4d6883fb4f5678bb97db4e150a54bdf1b538c893548a2717fb1c8f8 SHA512 0eb5c364fb230a0565ae6a089a4e97e635fbf31c205a1fd46b1adcd2d9f8e74a7ceaafe46303ef5641dea86efada54a07505173e742e5c2adfce00d397bd8e18 WHIRLPOOL 5cc282ba70fbf854a18942e1ec0647ba7302e2782e0f5309cab1bf7b36c58991cc2d63ff0b75bf826367998def33ae7ce2872f2629287411c278ab0a3534546e
diff --git a/dev-erlang/goldrush/goldrush-0.1.9.ebuild b/dev-erlang/goldrush/goldrush-0.1.9.ebuild
index 901bcd88f016..0ac96323f789 100644
--- a/dev-erlang/goldrush/goldrush-0.1.9.ebuild
+++ b/dev-erlang/goldrush/goldrush-0.1.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/DeadZen/${PN}/archive/${PV}.tar.gz
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc x86"
 
 DEPEND=">=dev-lang/erlang-17.1"
 RDEPEND="${DEPEND}"
diff --git a/dev-erlang/iconv/Manifest b/dev-erlang/iconv/Manifest
index 1b335a3eb8a9..cab77074d195 100644
--- a/dev-erlang/iconv/Manifest
+++ b/dev-erlang/iconv/Manifest
@@ -7,6 +7,6 @@ EBUILD iconv-1.0.0.ebuild 495 SHA256 378b3f79fcca7e50e7de607ef9d8f326e1b8f3bd6d9
 EBUILD iconv-1.0.1.ebuild 526 SHA256 ad213f97b46f26fbd2a831c8245ea153be50568e3b4ec40e3c61fff1c5b8b18b SHA512 28439fef5a728a17104256b92d23724bdd507da1c653168b3ce8f1dec54e00bdd2f47cfba12fb311898aa1175d1e2a96afca3ce9e467598b542c19605acf555f WHIRLPOOL 6ca784419c95ac3c9fdf4613137c8a1d0aa926f3d18cc7bbc01d83389ad1d623a5006db10a9ccddbfd25f28d415e50c5b83c43da5c38e3ff372aa5bf5299cac7
 EBUILD iconv-1.0.2.ebuild 524 SHA256 0a66e625cb7e8d664cb25429016b4cc988a0ffe0fc8dbc9460af8652785072d2 SHA512 6ebda1d08f2c938ea0baae76f3ef69b783aa02d97ce3bae36bcde791cdfc2f4279f464df200104db6b3b921e887422363b490ae0b382dc4f9a29d5ec97d7debb WHIRLPOOL 1920fbfe8ad301836d1e0cbca9aaaeac08943ad054a44b4c5c573e79e2e81c58601623a0a3acb59d6003513b313bf53d5707b4c4a3665e877d641d7c7b3a92b2
 EBUILD iconv-1.0.3.ebuild 527 SHA256 185bd0d497a90504d0d29e34053cfc85f5ca2137c09878c839ebf13ddf71383b SHA512 4a309ea985fdcfab7babd104c2d6319c1d29ca89f15d07ea163a20e1eacd7341b0c029ceba71a502e18109e82b5aebe9d737ad6ab91c23cec9f7481c789f2a18 WHIRLPOOL 6aeb5a6dc86ce2324856badb9026d1e13c9c7f68038630f8150a874588ccdcbbf3a7c9b00372cffb66bf71c251cbb5c3d138dc7d6fbc31f7be576c4fa22452da
-EBUILD iconv-1.0.4.ebuild 527 SHA256 57e71526a48a620d9aeb12814001d44c85cf72de541477ee202f74beee61ee53 SHA512 a6aac568da702ba309bcef363e61800b296c03e528f7f1632d1d2e4ed468f8e4373cec38ac1929139d82d69c760970ef36169c94d3f8570c0cdae662b48685ae WHIRLPOOL 2eb3fe45e21e0a62acad4d84e414c0bb5ec7c084e40d582e4377369fb342aaa10585fb8e4143db893107f0498acb2beb52b59a7e4d2ef32cc1885ab740a5aed9
+EBUILD iconv-1.0.4.ebuild 526 SHA256 02ef3b3fbcd702eff93bbae86d14f5c557d33ff54632ba33f209daab967bba66 SHA512 e10e82524146ce2ac30e29855e1dc92d034d5296375f1023f9c72f8b757571682765a5f1e7cb34388af3020346388a3d0af0600eda7a2606d76ac3c6143da436 WHIRLPOOL 65ff0e8123e5bc49693f64b9ae0d484551ce034cde489ef44b43f939559d8b9cbd56bc32803548aff84a00085619a13d3d37a73d242bd3b845335fbb51668a8d
 MISC ChangeLog 1626 SHA256 62c1bc3716d88fe90bd5761aac6d5db74b8dc3fc2860fc80b19bed755c63cc5e SHA512 b6514478461b036814a1bb8d77f4920fcd58dee26f93b0b964e1aa97b3c7895c76e9389069435578e5b63c08cdbf2216ec0bfeca7a0cef07fb150e5cf700e24f WHIRLPOOL 73f1d2b51a97ca14ca9d3d75bf0ea2aa51f2332c0ae477ae4b5f0adf279497320e18f54d2e721e1236dc49d49985d0faa7922b52002d5210bdc2bc417c81e2a3
 MISC metadata.xml 335 SHA256 23c07315a5088345eb6a817a2dc89b1f48bb09a8a73d1e936289e4b15fadc68e SHA512 db91f7a2cb53da67e1d87f621128b88e70f7ad7dda7ddebb98bcc224550caa2eb9249005a52c137e586a161545a9e0fd5dcb18aa7ab816074e571303b9603de3 WHIRLPOOL 53e36896e9b38320cc2fb8a2ef392b7eb010624ca898d4616988e8d06d6e815e01276c16fc2c638180f1d06e34a5fb1f6f878dd1cf817fc5c3807945970cc8f4
diff --git a/dev-erlang/iconv/iconv-1.0.4.ebuild b/dev-erlang/iconv/iconv-1.0.4.ebuild
index 2aacd1a234b3..2e3bef4a52f9 100644
--- a/dev-erlang/iconv/iconv-1.0.4.ebuild
+++ b/dev-erlang/iconv/iconv-1.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc x86"
 
 DEPEND=">=dev-erlang/p1_utils-1.0.7
 	>=dev-lang/erlang-17.1
diff --git a/dev-erlang/jiffy/Manifest b/dev-erlang/jiffy/Manifest
index 9a0ecf945ff3..dfbe63a1ea37 100644
--- a/dev-erlang/jiffy/Manifest
+++ b/dev-erlang/jiffy/Manifest
@@ -5,6 +5,6 @@ DIST jiffy-0.14.9.tar.gz 1878413 SHA256 5312475932dcbc0dd804f354ebd6a2f56fb8e7a6
 EBUILD jiffy-0.14.11.ebuild 435 SHA256 497d80e3628a5b4e26234e75203784cc22bb1d3bb06415a5aade1d6cd7ae32c4 SHA512 1735cec7a7649091907421c97a6d47dcafdc8049bed393f7edb9cd1ef548061c385bcf56eced46bf67143d63d713f0cf0423b9d75fda058facde0b34933f63b2 WHIRLPOOL ab8eec6f67cb04baf268bfa1fed04c5e4ef211d01ab94c0f1b7efe37312e7d7a66aa657871f6d9d7944ad68a7b33178022dda333e2d9352ce679e46aa526ffe4
 EBUILD jiffy-0.14.7.ebuild 432 SHA256 12e7c0a2c625377ac1ac018d8892c3a33bd04ddc92efb52687bbc0f33ae07082 SHA512 955c586a352489703efc2ff8f5e533da4daab60e8e58c5a6ae14673edf11f9e047a45226c8e8e8e6e7a6e2ea5f500a0fb50a8063f120f8947e633f8c6131a61a WHIRLPOOL fdf70f7ef57be07817aa6bf45e248d76665a0f43a91487b87f8a6d4bfa1ae042d06f260d6faf3d76e5ccf806ea322b8e5c9f0eae8b34c2b66c74e32391420c83
 EBUILD jiffy-0.14.8.ebuild 432 SHA256 8cb99bcfd766052eb5193bd2a244fd1ca23a6344c38152f22dd0821f78bc1c69 SHA512 4606d0c9e1175d32669dc400790cd395b52b77a4730d9b5ada03bbb5d0ee88c7b9049adc2d558bbbb2ad9e307e07d2e5f13a33484131abe483a7fb2860a5e167 WHIRLPOOL ba24cabf87317efaa46a7bbec057387ff2acb8876af4ac2fe9fc3119c52c48e9833b383b24f0d2adb673d342409f975f6deac4c5328dc7413cb126abe98bfac3
-EBUILD jiffy-0.14.9.ebuild 435 SHA256 497d80e3628a5b4e26234e75203784cc22bb1d3bb06415a5aade1d6cd7ae32c4 SHA512 1735cec7a7649091907421c97a6d47dcafdc8049bed393f7edb9cd1ef548061c385bcf56eced46bf67143d63d713f0cf0423b9d75fda058facde0b34933f63b2 WHIRLPOOL ab8eec6f67cb04baf268bfa1fed04c5e4ef211d01ab94c0f1b7efe37312e7d7a66aa657871f6d9d7944ad68a7b33178022dda333e2d9352ce679e46aa526ffe4
+EBUILD jiffy-0.14.9.ebuild 434 SHA256 3dda0baf0fc4575c167f9bad45c0d115ff48d924fa778b8cdb61a9acb7e7bf84 SHA512 572ff48f83f254c366be81c34f9e84fb0918ef0fd87dad4264b86b270803d4c054d75fda92c370cb396529b6836877fa7e0b2e49eb0742f8c62a7b3cf9af46df WHIRLPOOL e661927abc39358a3c7170dad808e60bd38972a1d522b5721ad28c47b481eee107ef9ec770276677538cb40bf3c4ca8624047f52dbe08a871027c673cba62915
 MISC ChangeLog 1359 SHA256 82388813d580b6fddc91e23d93354e45407fdcd6b3cbc9ad7b628bcac9db208e SHA512 ab084b3138c850d045ff099d8888d68b9997bd0c1e669b50cb9a1ea52970c00c8e6e8651a86e592cd1e3807c209e49c228f7806f8afb80a90f2a2ef89eceba0a WHIRLPOOL 8fbcce70cc822a2d4510d9acec9cc2dda93f63f06c96900d95f908fe0cac73357e126adcd64611d42233b2af3f7b10fafdaca4e1c395e759547f4fe2affc663e
 MISC metadata.xml 331 SHA256 12308ab5f062f44cb8d98076932ef8f86035ead029391f39e4ba08844cd68d58 SHA512 1168f1532be24eb2ab6774da4cfdf8576d4abfb058b1b3055708d8f2e6d1d545414bad432f4cb5e585d9821103d2b53a9e60eea1198592f12a3ffe251a230ae8 WHIRLPOOL 8d395b99ecbddce0adf02491dc7ce04a0d801c91f86020abbcd9c5d8d5985b36898ac57e348e712e0cf3a617e8973d3460616ad92859538db0b466e9d1d5ce34
diff --git a/dev-erlang/jiffy/jiffy-0.14.9.ebuild b/dev-erlang/jiffy/jiffy-0.14.9.ebuild
index a7da3d1b9333..597237b25f75 100644
--- a/dev-erlang/jiffy/jiffy-0.14.9.ebuild
+++ b/dev-erlang/jiffy/jiffy-0.14.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/davisp/${PN}/archive/${PV}.tar.gz
 
 LICENSE="MIT BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc x86"
 
 DEPEND=">=dev-lang/erlang-17.1"
 RDEPEND="${DEPEND}"
diff --git a/dev-erlang/lager/Manifest b/dev-erlang/lager/Manifest
index c32d6fcbf790..3a5f71bb5e46 100644
--- a/dev-erlang/lager/Manifest
+++ b/dev-erlang/lager/Manifest
@@ -10,6 +10,6 @@ DIST lager-3.2.4.tar.gz 245002 SHA256 b2212ca817ee551540d4eb815691355e9e0ad4e76d
 EBUILD lager-3.2.0.ebuild 954 SHA256 9551a82f00a7a7322e282133917a57492c820b003bbcc903022e1310b944922a SHA512 5f4be585916c907e3b49ec88d942b3993e75f8e04e389e90fbae1698da371f6e671d178a32f1a0bd9a08e3ed8648a1687d13bdca3c87b58669a283cc0262e385 WHIRLPOOL 60be04cb76c28b5bb3e6db3b0da5560c804aff218c7a19170fc26519c9312b74647be501af7c0fdc386355e67a9b8fff528bb6eefc190950f6900cafabe32840
 EBUILD lager-3.2.1.ebuild 622 SHA256 919755bbaaa486700b5f9210d245019dc622e4bd47b0fb587311c130c7ce39d2 SHA512 0d7578d6071ab7c0deabb7fc9d42542d1277b3925d1608ab98dfdb11755a7cfcc1894d7b67126f9466264a0d3f0b0e161e061181253e3a0a136fba3e276a895a WHIRLPOOL 80ae0351cd91bbf49b92d5b8c035ec81893cf25f322b764f58ae6437dd7974402fcf8dd9e714effec06c74680c52016e018af47a2280f4118cd3e17270bec519
 EBUILD lager-3.2.2.ebuild 620 SHA256 ad6a2a60407412dc9a62a13335ced3dd6a44de3f11ba1dcbf8619f8866f557fb SHA512 84a39cb102fd5c2aef9407aef471b229f51c164c42f5e568d70fd088984e23921f7c65e79950cccbc95b3739488c090b0685c8a216d126e8ca3a8fed7271125f WHIRLPOOL e7541f48d94d02b60496630a39fc732ace42a7ba857727f163c371d6dddb208fc11881756054e22f61414a1531915adda96c6e4838522f6749c0f0f38e54f113
-EBUILD lager-3.2.4.ebuild 623 SHA256 b87722400f203c386ac9d8d3ac055daf970163d8b9c0af962e2239d6dd6a8e40 SHA512 4d0e32b80e71943a29d74c67211a427590dd5c97bb8bcb3dc700ac8a1af52ec2ef1cf4a98a96ca3431d90562f82d7e5b1866a095b0e7f3562ea4ef01a2fe13b5 WHIRLPOOL 194ef3461a296e770ebbc76567ac9ec8b696bdf9edc75199220391cb05c716b0311e6c0b713d12fb358d19eba6f9b8905cb933c993b7adfa3c4b2b6a3af2f6d3
+EBUILD lager-3.2.4.ebuild 622 SHA256 b5c13bbbc5865b67c07274db06c487c393e3575e280cdef6ea9dd09def1f4a08 SHA512 2ce6250b98ec30cb6f7188f8cd59cd7aa29bd7a8747f845ecf673db363616dafb00c6e2af89161871e10f9a7b32190408952f635678d3f5c208b8165e1279936 WHIRLPOOL 7edcf8215875445abdd100760f5c5383940b5d839c4d8467de0518367091098649c53682744126173d23e8d296b3ab13766b84e7854999a5a2b06c2d14473b64
 MISC ChangeLog 2722 SHA256 c926f7907a59aacaa08569ac218985557c3b3d6933a60a00d292862f3b4eee9e SHA512 f15e30de3a2c01728a3a174d7d54fe36a50bb8b9782bbec9f33ca76f2997e9e4b2858e46a5cc979f8610bd8e4124f6d6fe204228f70c79029e79e5c8fb3e3b0a WHIRLPOOL a69464b29f6248e872462ca5fe1320934d7c9e62a7a7a9882d09f793c70361c9b65da6d976af4c24dd652a8f82ec8e12d657424c46a945226e68998fdf47e77e
 MISC metadata.xml 619 SHA256 ccc708e201e83bf91297a68aa8d51a2e5f8909fa165298e9d717de88b4536cc3 SHA512 964778f5dfefcbffad2543a6011e8f7b9a2ef9004a5090b3a57eb66131168b4aa26584cca242cffb5b8c1ad101dc9988f76f12cfab3d191d238f6a6cd9afb856 WHIRLPOOL 9a39fdc2245dc2864e8d5e4c7a77b7742619c8ea7c398ac07bcfca4309a71647d471c0d916ceee5574915adcee38f7e03c411079b30ff77b58d35897de2577bc
diff --git a/dev-erlang/lager/lager-3.2.4.ebuild b/dev-erlang/lager/lager-3.2.4.ebuild
index 4248e7437573..a28fd5269263 100644
--- a/dev-erlang/lager/lager-3.2.4.ebuild
+++ b/dev-erlang/lager/lager-3.2.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/basho/${PN}/archive/${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc x86"
 
 DEPEND=">=dev-erlang/goldrush-0.1.9
 	>=dev-lang/erlang-17.1"
diff --git a/dev-erlang/p1_mysql/Manifest b/dev-erlang/p1_mysql/Manifest
index 32df69c65b74..7e3b723dbfba 100644
--- a/dev-erlang/p1_mysql/Manifest
+++ b/dev-erlang/p1_mysql/Manifest
@@ -1,6 +1,6 @@
 DIST p1_mysql-1.0.1.tar.gz 19329 SHA256 6e06df41e3ceef6f6896b621a6f8158e19d3d204c585439b2ca466b8243a051d SHA512 2e5d3baa255ab7b6d3271e633793bfb265648b260c104256980a1229ea20bf3701d8f665f65fb4785272ea7e4e6a346a262ffbf609de10aec6d8029ef1d4f567 WHIRLPOOL 9c8d772594b1a0fabb44b5efbd912d1dc2284bf596a99fe7ff47415bdf6a7f0b350539b49e50c65360b4fb0c9ca05b0a81d0a2453998cbff22883d3175d590d4
 DIST p1_mysql-1.0.2.tar.gz 19512 SHA256 279c09253f6c101e19f9f2b6dd83c39115cb93d9b36f7a422eae18f15ee01b82 SHA512 ac0656b3134cfae47161a4643188784cf71e8ea19bbd5856e58d4f1d508a8771534975a631da51e7574e5adb3f64cdd250ab59ab7e9138fd5cb865e80522bd11 WHIRLPOOL 09f25b6d654646b94ff9bfc4adea7ee35773058510b4353ec5c8abd54596597047089899b2abd96875439f557f3219b438ae24b88e8efa0acdf7ffbd97b52afa
 EBUILD p1_mysql-1.0.1.ebuild 457 SHA256 c46c4aa440113aa967e6adcaa8ead0396bcaa6f88420a375f7fb91e2f6524841 SHA512 33263eed86382a1a2d6f6eae1ca2400c1974ebd9fe638b22e8703e0fe25d73344dc64c711e777c844021c94025d037d8f8aa0fdd40a6bdbb54e30824b08c2a41 WHIRLPOOL 06581716a86e5c4cfe7e7aa70c4e9bbbf69f909773ff945222b30cb5fd8e869360b6fcb0ec9181f05efdc9d3010f4a189ffb86ea7b1b114c5b81a94df8f03bd7
-EBUILD p1_mysql-1.0.2.ebuild 460 SHA256 e447945600570f3054455ec93cc9cad681609653fabeb202be366dc4a2fb5480 SHA512 004dabe166283d6adb854ee1bf960d3d824740c0f56b4d5c99feab2a9b477bb69b1d2fc4eb14e3b82c9e09d22a98da09218a019822475ca027f3558ea521e699 WHIRLPOOL 2ecc92feb7c955885b34b44907fc2ff6542b81ee8514b411ad2d987557583e69b4b5ad620aef1c6d346674df7b7f44a4d707dd57b6d89a483410a2c1096af5d7
+EBUILD p1_mysql-1.0.2.ebuild 459 SHA256 46e39777020264d9fc4aaa8216b5306a8a3ce775beac8a72707eec85cb41603b SHA512 9af4cc73d5d9c01139f7ece1e5111c0b60b4e2ddc708326f4bddb175e8b2f2e11b6d3063d39d5cb61edb203c4957b105dd1fe5cfc66dde3620bdb641c64d04e4 WHIRLPOOL 7fb180e2a019f5564f292536d9410d78ed80ce0a9d040de0816562ea3de7241c42533503cb6b1bebaba7380095d3d8800ab5c3e269c872a8cf035550d66af875
 MISC ChangeLog 1202 SHA256 f5cabdc32280e71eee01ece277c0df3a473a69a645b85b4d20b33fc83f5e7875 SHA512 c5ca985fbf6d9131532c7690d4f3a163e2e3eaa2e9519348832a6e94680beb4be07e1efd2798d42ef8b022fba16958a2196dbbb8b52d601a490a4cf0bc20cd62 WHIRLPOOL e9d08a8294c35524fdbde39caef392df451bca7703f588dc57ab1fe0a5bf8956f4a7c51e2b72cc6803b4be48fb3ddd172d9d31a7bff6dc3d9278c7afd7207030
 MISC metadata.xml 338 SHA256 23c9106c5b28abd391ca44edce55d0c585201e275783c829caff28126ce8d528 SHA512 0570f14cb80ce3feb1016bab61413efadc16df8ca0a82b1e38f827c9b50c2938d23c21bc81a7e17c5dcf83c7ec321762c0a939a82ce4f7ea9721f883f8015316 WHIRLPOOL 6775569ddb45d280f5ca567237660b3f32d9a7aa857f29414a9e313d88bfff12c309dc35697bbc28043e0d30ac132fea15c1a78ec05a401b18164bc983e9fb36
diff --git a/dev-erlang/p1_mysql/p1_mysql-1.0.2.ebuild b/dev-erlang/p1_mysql/p1_mysql-1.0.2.ebuild
index 7365792b50a5..f619a9ea2ed5 100644
--- a/dev-erlang/p1_mysql/p1_mysql-1.0.2.ebuild
+++ b/dev-erlang/p1_mysql/p1_mysql-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc x86"
 
 DEPEND=">=dev-lang/erlang-17.1"
 RDEPEND="${DEPEND}"
diff --git a/dev-erlang/p1_pgsql/Manifest b/dev-erlang/p1_pgsql/Manifest
index 6377f0c05ffd..b380bec2f54a 100644
--- a/dev-erlang/p1_pgsql/Manifest
+++ b/dev-erlang/p1_pgsql/Manifest
@@ -3,6 +3,6 @@ DIST p1_pgsql-1.1.1.tar.gz 18797 SHA256 843566fb488ee773906ce801672288207c1ad6ea
 DIST p1_pgsql-1.1.2.tar.gz 19347 SHA256 81aff9a4f4e8ce41944013bec9b2f893c2e813697d83abdb186d418487ccaaa7 SHA512 e5ead1e41e5dd0b9ec1ff96e6d133b8a5eaea38f6eb343391f5a7cc9757c3255730b147a621a8d55f7e0be2798186aedba0af2434ed96a981fa8f19c4ba8927e WHIRLPOOL 43d96488bd07410003106760c0aefa01d85ca7dca71970785676efa872017dfc13ae5a7e91f95fdc38e1cf8893fc0da20f305a22441fb2b752774b528e342096
 EBUILD p1_pgsql-1.1.0.ebuild 468 SHA256 6f0c0cf6f9c4d8d9d7fcd61433a31d51a4bf2653d5c22331669d4b56d3a0f88c SHA512 e85d7f61dd84c2b92193e05739b3309a827d7193e87d594e6cbfcec0ca6fa85ca17b5cca61ce859ce4426cbc6dd852d8209ba6ca6e02ddcac2343304df57e1b5 WHIRLPOOL 6b5f5337772cb56e96318f5029d72ac7d767a1ef85c719184cd4bf979d57fc6cf90e99dc327f6a35165493083bd61d01f4096c2a8fc7d1961e4a40240781619e
 EBUILD p1_pgsql-1.1.1.ebuild 471 SHA256 6035300f698f3e76ad7f5e4768879f20296bd58605a88ef808202955221e6f67 SHA512 11b25a76eadebe85b5fa9ebf0c2c3bd7092bad426d80e6a9656bb6e078bab5f5eabc892b222e67806cf3378a78f0b99916e5449cfdffed76256f52c4eb959ecb WHIRLPOOL e3add45f692d84a9a428aef98afa55241be22c04ec1afd4389324bc2510dc4902f1d0117b4b3e8df8932446ee0899418feac04e92fd94210be8cae3783a56021
-EBUILD p1_pgsql-1.1.2.ebuild 471 SHA256 8ab2e6aac496fe7f75f7fe0805754f99eded4e695ecb8d690d19cefb44651850 SHA512 1e094a7e34a40565e192ba97ef354d57dc2e1ef06d9e3fa6a34cabb35ad95ba73e553eb80aff967fe5c0b07e8bc4e9a6269cd80d11fc69f0d3e7bf0e33c15e68 WHIRLPOOL 9125be7a129463a93d41ff6591880adebf4d0b34100247d5cf7262275007d082bee800b5f0e31896a54d9c18a19970f6f9c4071c13e9e3d6d787d0e2c2fca3af
+EBUILD p1_pgsql-1.1.2.ebuild 470 SHA256 805be5b6804ee05ef3948827461f6bcd7332c49a6512af1bdd847a37da51b4b6 SHA512 312be384559386e30bffc47d70f46873133d0c6d310f69262c06e84f1405b58196a252412d74b2db1af32547e8ae0f88ceffd67a563ec1d39e7ebbdadfd7f72e WHIRLPOOL 8fcae509011b51706e9d0c42a30c937aa62ad2db63b40010d51c20d8e40419f61c271ce60f0a9bef3aff5be31679c437986c7870adb855a52a081529f120eff2
 MISC ChangeLog 1202 SHA256 6e83ea0ae16c45009d3552b3f407262ebf7e6a5e7104f61c3693a6308c568c95 SHA512 7e33383230c479486488e39c8d0428ce9e02c9c014aa9fe563106cd6f04ba90c74fcc4b889d180f55141972b33e6d8263d2ba1dc66f17c0a06534e12afa13271 WHIRLPOOL 45850073ba0970bcd1c730503b39559493c3b42284909eaee96954d341f55d7004a7750087f1ec7d80d6a432da01193054ecc372f6f16afb31459cae3d071cf0
 MISC metadata.xml 338 SHA256 6654fcfd53354d79c0d9a6ae0cdc667211ecd02b26a6091e17286237fe757fe4 SHA512 e14ab48a0c69cf8ac8128fb14c97a00a18add10ca430baed587829435c94a333aee71a65db9438240cf9cc0f6399d571741874b0b9716b18d63a79e0adae693e WHIRLPOOL 46ce64d49ee4010a7644e8f1924270bbcaea0e4aa72fb7ca15c7d2e0d20bcb7ca98fe2241c3b228de124e4b966fb8c0fe2d241cc7c03da7f6cce4eca1e4e396f
diff --git a/dev-erlang/p1_pgsql/p1_pgsql-1.1.2.ebuild b/dev-erlang/p1_pgsql/p1_pgsql-1.1.2.ebuild
index 1418ac2764d6..199d7bba7e52 100644
--- a/dev-erlang/p1_pgsql/p1_pgsql-1.1.2.ebuild
+++ b/dev-erlang/p1_pgsql/p1_pgsql-1.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
 
 LICENSE="ErlPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc x86"
 
 DEPEND=">=dev-lang/erlang-17.1"
 RDEPEND="${DEPEND}"
diff --git a/dev-erlang/p1_utils/Manifest b/dev-erlang/p1_utils/Manifest
index c67fa2be6f57..46f44da445ec 100644
--- a/dev-erlang/p1_utils/Manifest
+++ b/dev-erlang/p1_utils/Manifest
@@ -6,7 +6,7 @@ DIST p1_utils-1.0.8.tar.gz 53349 SHA256 9b43e025b923221cfe6a6efc76790d97b1c233e3
 EBUILD p1_utils-1.0.4.ebuild 478 SHA256 04cc2b67057a473922d2b4be74141b58de034ba532f60e31f549545684f0695a SHA512 cef6f78cb649a4fa1187dfe7762b4427d9f3e9ccfbd321cf7a39c11710ed8fc5d1c530d9712e62562a2b35547bcb61731c49cbb11be2710bd2165e88df0ce015 WHIRLPOOL f05f9f069153cc7a230baa0d5a06c841abf223a196d848ae2d6846b8f62f44a9a15e107ac183b2f608f054a6ff99a237633bd22e599d7b140f86beb54e12475e
 EBUILD p1_utils-1.0.5.ebuild 478 SHA256 18cf88f251906435bded1c22df500c25d9a146043e638947d8027780447fa8f9 SHA512 737e0078fa394041ee50a18f2fb4a31610decaaacf0da60043a7c71be0bef18915098e99cbafe4e7ffe46fb0286ee77e8c89a52a134752b5a3011a2cab660f32 WHIRLPOOL dfd0eb33ea7b3abd8355befdbedeea7eba217e3174a03db3b9c49784f6c8ebbb6ee891d0a0639a2f7f8fce0c63f78d0ad7234337ebc52baa65f3a3b7588f8484
 EBUILD p1_utils-1.0.6.ebuild 481 SHA256 0fdca19e94732dc47e5a3785b0af56571c07d198a8147b0cfb103efcb76d8eb3 SHA512 e2e73bc6e528c443c5387c9fcf21efdb9021d701431f4ace69f34056d77a440462862aa414fa51eec8b90e6884b0cde054053525b3a07d4b4c94e77c0b9ce56c WHIRLPOOL a792cc1748b46a24baf0b68d246feffa59bd3c0dd85859edc5d30bc50c8fbe23bdfc4b9d9e54d9a36f3c295e274fc24888b5c1e4c10b727fa0dc5fe4d3c1f407
-EBUILD p1_utils-1.0.7.ebuild 481 SHA256 0fdca19e94732dc47e5a3785b0af56571c07d198a8147b0cfb103efcb76d8eb3 SHA512 e2e73bc6e528c443c5387c9fcf21efdb9021d701431f4ace69f34056d77a440462862aa414fa51eec8b90e6884b0cde054053525b3a07d4b4c94e77c0b9ce56c WHIRLPOOL a792cc1748b46a24baf0b68d246feffa59bd3c0dd85859edc5d30bc50c8fbe23bdfc4b9d9e54d9a36f3c295e274fc24888b5c1e4c10b727fa0dc5fe4d3c1f407
+EBUILD p1_utils-1.0.7.ebuild 480 SHA256 028f2212dbc3def5b124ca0ef81218139ce3b277c38ea69e5599863f6a934f5f SHA512 168141e31a7866a046cb853f1668cf665ba530ac8d6393e7373c2ca040c87275bbdb235d19b417afe3fac5b1590b1c487a5902819e165f4779aa98aeb031e699 WHIRLPOOL b1d10ac021fb9331f6decd9ddd2fd90ee085e91ba6994cc5a7a8ac50c40096fcbde15f32fb8b4059b41dee10eb61e958836e7cb085bd8c1aed4b7b68fb3e6344
 EBUILD p1_utils-1.0.8.ebuild 481 SHA256 02f3e1001a818b73498c8ea22bd43ad5b8df04706324e84a81de57ff8999ae3f SHA512 2d056b4abd29e0141cf6042f058fc10e8add984664df3a9efc3dae82b6b95b230d537613e3e17f59997f010dc15fb03c52d5c399971b9f6e36c39a43a671d687 WHIRLPOOL bcd82f8d726df9332872db87ff0c02893d2ac801d6e867724fffafe278e9cea02d4de2470c298b3ac42742f2a67f9556d5f7bb74cd98bf6606527617b5d91215
 MISC ChangeLog 1373 SHA256 5fc330013a7a70f2caaaff914660c7209d8713d9fe4311b79e6862d0b04183fe SHA512 2c1652212098f7c8fd8a74c974cec416430a70abadb5c1394f52d7a3e8b6a8d99a962bbe922768c1ecc93be61c770d7b62cc6c300e2898225ed1f47b7912a4fb WHIRLPOOL 9f1961c0cf7d5b77b65f48a80a0758ad30d6ffc7849334e7f6855fbecbbb15f7622691ddf4956db4bd96bde4bd2b635fb1e3f0d705b4ee2ae966cfbcc891dcdd
 MISC metadata.xml 508 SHA256 55ac3296e27cc20626174e2dd661bca4a66fc6358a5e31b982573abb6f1fc1c3 SHA512 4ee4911a73eda052e2b106c8382d9bc8e2c357568a79daa540ae0b7bd5a1b0ec5185de56e5faf59c1c2743dbcedb2f24077e61844b8df979a3a007d7b50df9f3 WHIRLPOOL 91e53fc9baeb9b53fb7d55fee707e9aaef29458aa1616f37df8c631915ba74735a2cb14971cdf7da681e122e0a823ef320461dad4edecbe98c041a84929050db
diff --git a/dev-erlang/p1_utils/p1_utils-1.0.7.ebuild b/dev-erlang/p1_utils/p1_utils-1.0.7.ebuild
index df7fa6c555ad..24836d2fd289 100644
--- a/dev-erlang/p1_utils/p1_utils-1.0.7.ebuild
+++ b/dev-erlang/p1_utils/p1_utils-1.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc x86"
 
 DEPEND=">=dev-lang/erlang-17.1"
 RDEPEND="${DEPEND}"
diff --git a/dev-erlang/riak_pb/Manifest b/dev-erlang/riak_pb/Manifest
index 030f80cdb4d6..199962f6e9b2 100644
--- a/dev-erlang/riak_pb/Manifest
+++ b/dev-erlang/riak_pb/Manifest
@@ -7,6 +7,6 @@ EBUILD riak_pb-2.1.0.7.ebuild 476 SHA256 ee707d1cdcbb74f625ce3cbe806bcc2f2efbc98
 EBUILD riak_pb-2.1.4.2.ebuild 527 SHA256 7adeece21329039c976733e37fb7f8089dc5a203a2aab7e17ba5cfcfe778f4ac SHA512 b9d6417cb833754cdfbc71adf0f3cbd20d6b5ebe5fc9392eaa5bed5119df376d00c672ce68793d83221c2547c50fd0134fcd5420386fb956e26b1fc7455e548b WHIRLPOOL 44fae97236d44e85bf70166e5aa877cef331f6a36312a44d0a820f68f20dbf424ea23b5110686d2f592095ac65f658c6d9912b2c3a1f22a791cd5fca6a16538c
 EBUILD riak_pb-2.2.0.0.ebuild 528 SHA256 55f93ab68753fa61dd8d35966891a9f269e890fed6d26b1f8383ca844ba347f0 SHA512 9a1659ef8dc43898233878365d7163fc0401ceeeb6645c480d9305da3462c8a14346c90afc4e1f5b011cf3c6d0594e8c972f581cfa1c41ff0818dc2351d38ddd WHIRLPOOL b2e6adc3c2f305a6b9d0cfbe610ebd5823069f90e03e0e4d887e4a986b218fa809cced58e9aaebda65ca8d39053f837b56d41711274896b6e90d03dfb0813cb7
 EBUILD riak_pb-2.2.0.1.ebuild 530 SHA256 d2a3da20691fca77d36d1dd743105af11e7115ddd09108aa3d1fbe990c923e1b SHA512 78f327e28e1fde1c9517a52c4023c18b5155e243f5f07f05a440f17561e86de17816733d6372ef20081c8129b4c626e8aae8c6b1a541debcfd8df734b2de4878 WHIRLPOOL 2f62917bd3e44c48f18f3a4609f629574afe09f6d918ada3d8f0abf49284515372397cc2fb083c9bd99f2714bb4870a9bfc30af570c5231dd1d2d2cb7809dccb
-EBUILD riak_pb-2.2.0.2.ebuild 530 SHA256 7ea9c15a2a43037c9e34edd68bd170f637eedaa0d1603db32c5373e8ea8d859d SHA512 c76211b0fc51942ce20a018d70b1f9015725888631dac87fa1732a447ffe99bfa0e69a230eb58eb5ea4a4a2eb7976094bcacf163b10408fe3aac4407d99d4c65 WHIRLPOOL e0c1efd8c9c13e8620243a40273aad3a7bb2710c9240ba35cc88cfe805bab328291261597ecbe86036ad5157dee1b9b58960de8d40afa6594dcacd7a8941b31e
+EBUILD riak_pb-2.2.0.2.ebuild 529 SHA256 5667c063145dc5069b024a37262fb80828431cda07cd354b1d1cfb8f24c221dd SHA512 77f204aaab92330cebb48d1d6e3a73b49caa2630fb4e363647ce942aa568aa6210a90db5e1ff393349f176dbc0fc32e1f2be165242e76c0c6b697798d5e2cff2 WHIRLPOOL 46ce5e47c10054a4137ce5bca3cb6faa76d6cd95a1753a5540473a36eeb03d9ef6f97c235effe7dc4e7017ed13ba018e42aea57d7505f5a9f51308b965943cbb
 MISC ChangeLog 1564 SHA256 538a12312d8ff69c9f4ba29a24fb7c68cc12592d0db613dad184ff6890ee7fdf SHA512 1cc0ebbe1c66f939707186efe86d9ccbc0fbcd1edde15e5c4b142480f40d7541fce1dfd326ac5492479512ca66ad1e7f80a2fce9153d12b8e3b4d8809c09f540 WHIRLPOOL e4f1ea825220ef83900728245e8b21ca44be3463dbbdbf1d14d989f6dba365961910341662b8d00c4f5bef1caa5acc7ca56a751989fceae887f75c95e574de00
 MISC metadata.xml 332 SHA256 09adcb8d2e91005e81a323de2694d86e3a6e179b0c18c40eebf2a793e7033419 SHA512 f5e143475ee3cfad3574b3831631fbbb8b4ca5ee46ba5e45f4e03c171f4c3c37def886a4267c9715c628b3afd2361ab4da8b2efc7bad0d3040e31fc41d2e9382 WHIRLPOOL 7a583b97124dd73d45da5ec72110b5a02b2f06c9e959a298d1a1171fd12e9c4b05153f771473f19227d626e9e4ece02c13157e6977d7fcb0fe6b1e4aec275dd7
diff --git a/dev-erlang/riak_pb/riak_pb-2.2.0.2.ebuild b/dev-erlang/riak_pb/riak_pb-2.2.0.2.ebuild
index acbd306354c5..7aa99578e1b9 100644
--- a/dev-erlang/riak_pb/riak_pb-2.2.0.2.ebuild
+++ b/dev-erlang/riak_pb/riak_pb-2.2.0.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/basho/${PN}/archive/${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc x86"
 
 DEPEND=">=dev-erlang/protobuffs-0.9.0
 	>=dev-erlang/hamcrest-0.1.0_p20160709
diff --git a/dev-erlang/stringprep/Manifest b/dev-erlang/stringprep/Manifest
index d521752c8046..c3cef5a7ef9b 100644
--- a/dev-erlang/stringprep/Manifest
+++ b/dev-erlang/stringprep/Manifest
@@ -7,6 +7,6 @@ EBUILD stringprep-1.0.3.ebuild 528 SHA256 4b12d5f37e9cadd0bc1b6279857c532cb6e1d3
 EBUILD stringprep-1.0.5.ebuild 530 SHA256 03350e8a28f4118fec22eff3f16b845adfa1c180744e70a44ccad4d23795dc7e SHA512 2b29cb157e3f2136939642e25a5bb7b27722480ceb2ba390f51c945df87ae3a18d0290986e022197f43d07dd55dbb5afa7de8afac04ebda06860a20302676256 WHIRLPOOL 7d8acfe90ada3c1105eaafccaef7d71055e6168812d356630bde4382d9c881f8c1669aa9bd6831b7b5e7716991cee13421df004385ba55b503f98c99d8b7b2f0
 EBUILD stringprep-1.0.6.ebuild 528 SHA256 90a8acb948307a52992fca5909c83ac02891bbd3a3cfd8766c385f95f429234a SHA512 3053c458afb02e79f379dfeb14f02f2f9ef24a6aedfda6e51ec5cac4843becb4b20d0128ac08925bd3fb017a59952ee7c949676d801947eb0c3d83321c7b2fa6 WHIRLPOOL ecf72578a985a292da5d618e58d33d9b98468c84edcf588c7abaf1b859982e0b4d13dfe0f19c6cf3abeebf8a59b55487b8cbd889686d56adb5af132af75a7b9c
 EBUILD stringprep-1.0.7.ebuild 531 SHA256 39cccec3ea5f62e8eba1832f96a9ea5b5a8219f1f8de08f1e47eeb9681feb774 SHA512 29cb51f2c5b8bb54492a2f04bb7b4150fbeb19f8784eb1ec13f4ea38def180e5f407771a0a9437aa00dd7e8c828c46fa4095e889806fa70b8d248d76d3b8f60a WHIRLPOOL 5ccb921ae46d3d6464f61bd1534bc2f30a8585aeb81453c3b85ee8420e53b847e64ee9f0d204bf99ce8d5bca460456de8e92cb34b519295f0b342b4510b84264
-EBUILD stringprep-1.0.8.ebuild 531 SHA256 d2c9b47de20d81552bec747e7debdcb0c7fc7ed1d60487ff534bb68551241572 SHA512 fbcf3a36d15a17e02570e9a14a51c2cbcda3ad35409de12c98e35eb68e6c9b0a3c4ab2b19b2ca767dca8647c8be5b981ede361c9f4c7fb16ac214d46a276e49b WHIRLPOOL 022b23b06270506a7b3f890e90f3d3d0b5c194b9b3ebda21b857d11f92fc823251a9957f4ecda8db574b924ff68c9152934d62b072078d6d06be1db3729a0fa6
+EBUILD stringprep-1.0.8.ebuild 530 SHA256 299789ba7af0ea2226f5652f0a791e173a6a3d80ba9b998bd496a949453a86f2 SHA512 a6a4148ea701f2728bd710377fcc229cac3afd5737d099ecf588052da413d726521268fc1836df948d07da0630757fb6f7e4d1830c69400fe2eee46cbe4ffb67 WHIRLPOOL ebd3d6b61bdc17af18ba7b76d99a2a17f5a8d5cdc3db1af5d261c82294fdc7b29466edfcea2bcddc0e44a387d32182a62f50a83d9dec1f21a2958ef613a905d1
 MISC ChangeLog 1572 SHA256 9cddeedfd9896db2038ae70c0b16712e2ccea6a196a010095c64f6ee63a447f2 SHA512 41b9430417b6d34d3d8ca011cbfd2de01cb60de0b365592f72c83ae3693e84d30ae03e1d87c35b0bbaf5bc8e61b41a4571f1bab10e169404dd406c2aae8610fa WHIRLPOOL 7bea7a3e7ae695dc4bccdb564703c25b2cc9bfc2f9c642474fa62add1fec1e4401e9a5477401ef3a9e2095e8c0a4050880b2c7da781f738c767f52322c9372ff
 MISC metadata.xml 538 SHA256 8ad1a7e3745cbc4b02699b3ed786630e6ea62ebdd34e34bb8d0f33d15cdc7578 SHA512 ea706236fba52e8e1f66ea2fb517f1af2bef023050fa16ff9500a4b723684dcae25df6fdc829cf684f1bb862e87a9df8a44d1e1bd1ab357b3d54ef69ba2bd60e WHIRLPOOL 3a4ac8141ae1c96bda7cc7897f10e24f93fa347f057415dd2036eba8a1a3500b5d5a5eeb71f5c08443667c7e95126d0645d673ba73473e7209ae59d73d43cdde
diff --git a/dev-erlang/stringprep/stringprep-1.0.8.ebuild b/dev-erlang/stringprep/stringprep-1.0.8.ebuild
index a49c3e8c996f..7058a27936b6 100644
--- a/dev-erlang/stringprep/stringprep-1.0.8.ebuild
+++ b/dev-erlang/stringprep/stringprep-1.0.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
 
 LICENSE="Apache-2.0 tcltk"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc x86"
 
 DEPEND=">=dev-erlang/p1_utils-1.0.7
 	>=dev-lang/erlang-17.1"
diff --git a/dev-erlang/stun/Manifest b/dev-erlang/stun/Manifest
index c1e85d6782e1..8db3519c29d5 100644
--- a/dev-erlang/stun/Manifest
+++ b/dev-erlang/stun/Manifest
@@ -3,7 +3,7 @@ DIST stun-1.0.3.tar.gz 28646 SHA256 aae567e4322c8bce604b50cdd41e7634d6047300ef67
 DIST stun-1.0.6.tar.gz 28681 SHA256 21a25d0ec6292c13bc77e3225bd3f0b2b26d70f815c6e8904c825028629e70cd SHA512 30a34a660d246ed33015e2f4b890203a2648553ed6e2dced87e30bca2eb9d09486684947332f7239d535ce19a36028a0642136e5b574f3c5b867f598341bcaf9 WHIRLPOOL f27e281f21156859533d39524537e8327a58523e38e0114a00af1e6f16769fc6875b0547421cd65c190e812716105842880bd6ad435b297077d2c58be725ddb6
 DIST stun-1.0.7.tar.gz 28689 SHA256 c5835325523e9800dc1279750f9994ae4b6409e68f36b07e6b01b2f7314d2cca SHA512 d494e020741e3e098c2ff9221a03cdb6f26a474a859e8e7dc41221050d7a99e8e7285b812556b95fd3f1e30ace45feb2e5613eccfc08bc99f9bbdcfd2d82687a WHIRLPOOL aec3f89bfb0c841c3d658042e378314020b8a67a0b7858d151bd9e40b8c12666696f1fa3df0f94779307963c82dcfda2c7840020854e86d816ce97e3277e2baf
 DIST stun-1.0.9.tar.gz 28709 SHA256 a960b320d17c10dd768fb9af0a48dfda4eea0f3cf5520020566581bda716572e SHA512 0ce53920194c4d020b1e0e302353eda24cbdab27ff45b1247d2aa7ab973944f89a0f3498508966daec43a0dc40a64cff15a31cab7837f7b105ebcbba8df63754 WHIRLPOOL 39b58e91b9325a3c905894cf0e9f56e51506acee083444672208fc3baba6afa90b1008c3aba2904c909506d32bf1ea30f6fd02359de3c19b995fc0dc9531f130
-EBUILD stun-1.0.10.ebuild 533 SHA256 a55c72d423a169df038f5f19fec6df1eddfebb1ccdc7ca54f7336da1b8315069 SHA512 66472a7cdad650ae8287198297d67f20a62631aa2e71d1cc6054148957f03d4a5483d63a5bba800a0d732f571bd57045a510e42f41790e1abb8a5e2d0c07692e WHIRLPOOL 0b740d7ad332a95341c1bb703bf6c2a9ab3903281e31cdf80544762216dec119bf8b623f5fe88b40932a49df8ea372c00e39d820eb513221d90654510d358153
+EBUILD stun-1.0.10.ebuild 532 SHA256 e1c243612c6baf76ad02a32cd6ed3771586df64824f687e21903b1f77883b80c SHA512 01f111b9c3168915e80fe99b1f9948e4eaa5b563e0ab2ece8777e62851fc1f09c86ca700831286bdad8627bb9e39782f27db6976e48c5323040e75b7ad7207dc WHIRLPOOL fd056dbf82e2b8fddda2db5433aecca423ffd0e966689204df9bfb1cab3b5bbd439cf031b41dfedc66068b1a9e4842e68aa88eae1ad28a8c72b0e24e21eb6be8
 EBUILD stun-1.0.3.ebuild 529 SHA256 5550bf61b5392b55548a65d582ea335ad05db2d225660b4108f23dea4d7cf2b6 SHA512 34f189f5b2c82cdc778c05c88396d780bc5bdd27432b609c2f6fb2acdb4f71135bb1ad8eedbfe2ca1274ed774df895251d5e41e64c28b2646a3277690834ae1c WHIRLPOOL f40bc67caf76aa79d6454a56230ec9b8d2f66aa84118c92d1d8833f2881631c0733827dc36fa2056599549862d771dea8666c241ea67e5447fd64a1655de91bc
 EBUILD stun-1.0.6.ebuild 531 SHA256 3d563a5baf4ba40f23669bf0751b7e1105c9a9714b154a0cb24b31fa298fb3cd SHA512 e18819e6d67c4369fe403c46b27bb14b81c57c90265df4c458a85990f3a64fadbf7ef4185511ef28e712543a24615d3a3aec664522c38d31dcc81997d3fd9e58 WHIRLPOOL 5ed16022ff3339fc3276758f30a6d902ca510da0d97f078d501a603e4a3fe337be620cdf60968fbdc6509a50de7136b564ef3c3e76c3f1bb71a1c6f0e58f0201
 EBUILD stun-1.0.7.ebuild 529 SHA256 70fe140ec0e9f76edcfb4dca0c6106ffd3f5d57e241828db0b8619ed5890f949 SHA512 7e7ced8943afaee99d256e4d1ab309ce18c5b537ffa7601e4beb1eda95a25b8e5538d94d720ecf6d0ab9e0bc38667a2c5c8eb8c110dd7ff6830d573067222eae WHIRLPOOL d08ac78371d41b9d0a288f675d8e3ad49408d84d1f1c0c67ae954b77d948ec562f05b3f4437676d7ae8e2a49d425dd2d9a2dc55dcc28cd896c9c67de76493f60
diff --git a/dev-erlang/stun/stun-1.0.10.ebuild b/dev-erlang/stun/stun-1.0.10.ebuild
index a16037a44974..226fd8cb5aa2 100644
--- a/dev-erlang/stun/stun-1.0.10.ebuild
+++ b/dev-erlang/stun/stun-1.0.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc x86"
 
 DEPEND=">=dev-erlang/fast_tls-1.0.11
 	>=dev-erlang/p1_utils-1.0.7
diff --git a/dev-erlang/xmpp/Manifest b/dev-erlang/xmpp/Manifest
index 34dcc67657ff..04f862c05c16 100644
--- a/dev-erlang/xmpp/Manifest
+++ b/dev-erlang/xmpp/Manifest
@@ -1,3 +1,3 @@
 DIST xmpp-1.1.9.tar.gz 370926 SHA256 e7b5db5ab6204f5bc6ebf91a183ebeae2b43ca6372dd2506599a8e8168a99c50 SHA512 13af5699966c8e9c0568356a3620ce6861549b0091e1889c957a91b4384ed24dd98a04422fcfed07470fc94ad9e49459e7942fc5aa9c5e5fd1a20f3efd5fdd1f WHIRLPOOL e15fc35c5bebdf88c09bba98a30b54328313b2adf578066a151d10310855a5c149276294ea592e927762d28872d4caf34e5506f13c83a58c274251344d39ced4
-EBUILD xmpp-1.1.9.ebuild 630 SHA256 6ec92b38a9bba94af2933a7aee26fade1f23b9142e7d18e3583864706cb8cc24 SHA512 3652f6c23a673661792cd604d3ec829861e4526970348f51378255ce5acc087a7018dc9dd1b1d2c96460a91eaf3b4f3f5ab5a4485a459ee470ec6280a14dbc95 WHIRLPOOL b2dd7fb4e03acae89de66fcd513a9be324bc5d20b0617e9dd1b2957814a058be52f8cb306817d351821fc5839caf1d61ba667775ba6727d5df638205ad2cf1bc
+EBUILD xmpp-1.1.9.ebuild 629 SHA256 2e89da1bb3fb4063e400f4256ff7b64d0cb5516fd32ac50786966fd12083ee80 SHA512 7a56a9a9658a46fc078452f77d69b09bafc25ee5d0d2cd0f759141fbf9126528b171e7f4ffa0bad74394d49dd9e67a926938dd42d786b3ff91ac82c077450d82 WHIRLPOOL 6ea878b742021d980c6c43222dbf25d0c7dc89e014fcc91ec65e033c5484cfd941d1a3efe75c2dfb6031427cf4ffa51f140fe8993b638c395d6658f9dd736d06
 MISC metadata.xml 334 SHA256 e89d3ac8d4e926422d4007fcee84ee1ef59d1bc899b9d78ca626f28b1d90174d SHA512 fd0bf5b44e2e5696a45baba917e4c41a932c8e13bfe0d41ef89571685c62a7b8cb8c757f916fc8a8baa68385eb8842f613e5300e134711c36434a566b5706174 WHIRLPOOL cb49dbb16df603ccd9ce76cc578718d5d3b471884508f0fa2c2073558c80bcd62ad2460eb25d7a7d9cd443376f9cde98eb74eaad9d0e183e6a4dbed39f1ec4bd
diff --git a/dev-erlang/xmpp/xmpp-1.1.9.ebuild b/dev-erlang/xmpp/xmpp-1.1.9.ebuild
index 6bb7d805dfde..4aad486b012a 100644
--- a/dev-erlang/xmpp/xmpp-1.1.9.ebuild
+++ b/dev-erlang/xmpp/xmpp-1.1.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc x86"
 IUSE="test"
 
 RDEPEND=">=dev-erlang/fast_xml-1.1.22
diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index 4dfd4e2d313b..ca15fe24798f 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1,7 +1,6 @@
-DIST batik-src-1.8.tar.gz 14970684 SHA256 0f1175146d45445fc4940e214c3e1e5cfa0294ae6a9787859bda00964f97c2bd SHA512 352843fd0cec43c6d9d54426fe1c20a9bd2234798404b101f2e8d43f6089c0bf6bb5102cb5674de11d37a0d820a8bb79fe9dd854030b23fd8c68f3931eb12f1b WHIRLPOOL fa50d1f87257c6018f99076bf759066b2311f483d424ef743e45fe17c74c646a215c1211c5431b2a522913f23ff5f53934a1606d4d4a223e8298abd6ce94bb46
+AUX batik-1.9-ImportInfo.patch 439 SHA256 ee49a43fc6bdc8e47cd3d8fd6c3a5b5a3cfda9b40243ecd2a173331f1730fd0a SHA512 ff390670537fd631dbd0041a4496e0a33daa1bbd9390867285d2a817ee7794d19c0d634dbfcf4a1e777db072a0f1b6bc2b68e475bbe590bce825aa7b7d76f643 WHIRLPOOL 561a42cef0363a692d530b675d27252e5b0b693d8243d3eb50ca866043e20f098ee8c398c10cb5bdc1fb703e5f32c68264fa84ad58a62a9d05b1df0d2a7fdb6c
 DIST batik-src-1.9.tar.gz 16748072 SHA256 bef436c0b4ac9a499274a8df9a2769f42ddc6553451dac9a9514b4f55d06c6a3 SHA512 96a5c16bd3d61ea33ed5013fd0b00f1724470d9b667f0f84ef4a29dcaaa19b1cc8ffcc92dc49767f4e29d77a47f99df5afca479336ac5619778b51a6fb6cd952 WHIRLPOOL b389ec0d38e16d4619f0a1e933c357a018e0ae2a0c04900caf53f398180c5a2ca031bd8909ef50aeb2db5c12dd6981cb5d1ec466e4c5fbc0379d0c325f039b25
-EBUILD batik-1.8-r3.ebuild 3221 SHA256 8bcbd2978bed6caddcda654d446fa1d948f3bea289eb405be6a1ed9db08ceaa4 SHA512 b2525a0cf675fc161642c759dcf149dba654a683af50f6b931845cc6021495485b2a405bbc78238720c5fe140a35aa4e88902d907e2a5b0444989b3e2e6ec612 WHIRLPOOL d270887b84758d88e1622d3899e700ad0f8e4ba8dc4d55294e45032cf7f2af6d256711775b56924d33b63d1bf609d68703c4029ac2b2bcd45d6c56dd12914b91
-EBUILD batik-1.9.ebuild 2481 SHA256 79728ec12084bcb504a551214092df4243dfe5f340d6754e02c7f7954525d4d5 SHA512 838618876d2b74a71e2ee13473d156eb636d4b4e7ca20c5d7dbdecb6b49d83f073b0cecbdc0f7ff2815bdd0d5a7466220056664c0055c367a6e124b2ead58ab5 WHIRLPOOL 7aeef998737ffc9b310d024acb1e6486ad4d89baf7915d43d568d0f70f5be166789cff49d9e0cdab8dcb0eca0ef01a402d04698181142f15b0d8d67a156e0870
+EBUILD batik-1.9.ebuild 2608 SHA256 c58a4914f6a0be5ae24c48605c4643a51778c40f263c42aaa590f9741a26cedb SHA512 6dee45bb334ede236b28e376b68526d30c5347441c62687c9f2f062f888174ca59ebe382075df5d14e860384ccc103d1ebdc907dfd40d25d5e87fc78f05834b7 WHIRLPOOL 2f91b0d6cb53e4f1928adff59f961ea5a1da4318086c4da922fc8e26e26d6b7153398a0772474264afa7f8d02c38f46835adfd4335b8a89bc1fa7b35c6d38709
 MISC ChangeLog 3620 SHA256 0b43cc1247da402248b67498fb9df4f36a0f605af8038570928295badbd45cde SHA512 c146c21cda7a3aeb594c8faa07700e4f00abe9fc09cf93684387f636b1a5a8f0f853c38b963d31ba0807887c4d8c8f0b48ad521304d46c3d91542f3357e3533f WHIRLPOOL cf2e350c01e7509de30d04a445201bbd05532924f6bc29e213e36f3508f1c24d2aab07a8f757915dfda78f5f27a0b07fbc9313627b3001cfeaa13f5ac9e30f3e
 MISC ChangeLog-2015 11934 SHA256 b4e2e276895ae399799cbd0b38c7f0e6cdf25d36f2edb18a18f7204d116544d0 SHA512 6360dd5b278ba7904c01f65b5d9a9d972d319619eb4b072f8d240300465818ef7970781481689eea1b68f2a074022f615017db63ccf35fad4eeeee3fedbb7112 WHIRLPOOL 4415633e4890b6ae8586143d4b35fc264ce4f47d3ea7fcd8d36c7fb6e0027ce096ab17da6bdb3982cfdffc16aa898db2489f5270513d8f5d4880209d0ee12e93
 MISC metadata.xml 449 SHA256 959a37e00aaddd59eefd32174bb0673c788c6584b1db2efafda815e1b8122217 SHA512 e437217b578831129aa80be572fd1044db0ee1c0afb0af0538dbed3e7d2ba739062eca68053426c79433ec03128ea0116a4a92be4d1946e20968be3fe89a4e02 WHIRLPOOL e09cb97ce753b75a0d7e8533ceb8e09a84faa460b18cf59ae64558815424f9221388e6c223b0ede50efc4d8c5b5d5870e345c1ebd0c069446a5b5a17a5812d00
diff --git a/dev-java/batik/batik-1.8-r3.ebuild b/dev-java/batik/batik-1.8-r3.ebuild
deleted file mode 100644
index 68d9e0c96d64..000000000000
--- a/dev-java/batik/batik-1.8-r3.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="Java based SVG toolkit"
-HOMEPAGE="https://xmlgraphics.apache.org/batik/"
-SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/${PN}/source/${PN}-src-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1.8"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc python tcl"
-
-CDEPEND="
-	dev-java/xalan:0
-	dev-java/rhino:1.6
-	dev-java/xml-commons-external:1.3
-	dev-java/xmlgraphics-commons:2
-	python? (
-		dev-java/jython:2.7
-	)
-	tcl? (
-		dev-java/jacl:0
-	)
-	dev-java/ant-core:0"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	${CDEPEND}"
-
-RDEPEND="
-	>=virtual/jre-1.6
-	${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="
-	xml-commons-external-1.3
-	xmlgraphics-commons-2
-	xalan
-	rhino-1.6
-"
-
-java_prepare() {
-	# bug #318323
-	for file in build.xml contrib/rasterizertask/build.xml; do
-		java-ant_xml-rewrite -f ${file} -c -e javadoc -a failonerror -v no -a maxmemory -v 512m
-	done
-
-	# Add some missing imports to avoid a compiling issue.
-	# https://bugs.gentoo.org/show_bug.cgi?id=551952
-	# https://issues.apache.org/jira/browse/BATIK-1123
-	local imports=()
-	imports+=(sources/org/apache/batik/script/jpython/JPythonInterpreterFactory.java)
-	imports+=(sources/org/apache/batik/script/jacl/JaclInterpreterFactory.java)
-	for import in ${imports[@]}; do
-		einfo "Fixing missing import in ${import}"
-		sed -i '23i import org.apache.batik.script.ImportInfo;' ${import} || die
-		eend $?
-	done
-
-	cd lib || die
-	rm -v *.jar build/*.jar || die
-	use python && java-pkg_jar-from jython-2.7
-	use tcl && java-pkg_jar-from jacl
-}
-
-src_compile() {
-	# Fails to build on amd64 without this
-	if use amd64 ; then
-		export ANT_OPTS="-Xmx1g"
-	else
-		export ANT_OPTS="-Xmx256m"
-	fi
-
-	eant jars all-jar $(use_doc)
-	cd contrib/rasterizertask || die
-	eant -Dgentoo.classpath="$(java-pkg_getjar ant-core ant.jar):../../classes" jar $(use_doc)
-
-	# batik-all-1.8.jar is a all-in-one jar that contains all other jars.
-	# We don't want to package it.
-	# No actually we do. See bug 556062.
-	# cd "${S}"/"${P}/lib" || die
-	# rm -v ${PN}-all-${PV}.jar || die
-}
-
-src_install() {
-	batik_unversion_jars() {
-		for jar in batik-*.jar; do
-			newj="${jar%-*}.jar"
-			java-pkg_newjar ${jar} ${newj}
-		done
-	}
-
-	# First unversion jars in ${P}/lib
-	cd "${S}"/"${P}"/lib || die
-	batik_unversion_jars
-
-	# Then, only those in ${P}
-	cd "${S}"/"${P}" || die
-	batik_unversion_jars
-
-	# Proceed with documentation installation
-	cd "${S}" || die
-	dodoc README CHANGES
-	use doc && java-pkg_dojavadoc ${P}/docs/javadoc
-
-	# pwd fixes bug #116976
-	java-pkg_dolauncher batik-${SLOT} --pwd "${EPREFIX}/usr/share/${PN}-${SLOT}/" \
-		--main org.apache.batik.apps.svgbrowser.Main
-
-	# To find these lsjar batik-${SLOT} | grep Main.class
-	for launcher in ttf2svg slideshow svgpp rasterizer; do
-		java-pkg_dolauncher batik-${launcher}-${SLOT} \
-			--main org.apache.batik.apps.${launcher}.Main
-	done
-
-	# Install and register the ant task.
-	java-pkg_dojar contrib/rasterizertask/build/lib/RasterizerTask.jar
-	java-pkg_register-ant-task
-}
diff --git a/dev-java/batik/batik-1.9.ebuild b/dev-java/batik/batik-1.9.ebuild
index 19ae6d955c94..ab95a4c9432a 100644
--- a/dev-java/batik/batik-1.9.ebuild
+++ b/dev-java/batik/batik-1.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/${PN}/sou
 
 LICENSE="Apache-2.0"
 SLOT="1.9"
-KEYWORDS="~amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc python tcl"
 
 CDEPEND="
@@ -26,28 +26,33 @@ CDEPEND="
 	dev-java/xml-commons-external:1.3"
 
 DEPEND="
-	>=virtual/jdk-1.6
-	${CDEPEND}"
+	${CDEPEND}
+	>=virtual/jdk-1.6"
 
 RDEPEND="
-	>=virtual/jre-1.6
-	${CDEPEND}"
+	${CDEPEND}
+	>=virtual/jre-1.6"
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
 
 EANT_GENTOO_CLASSPATH="
 	xml-commons-external-1.3
 	xmlgraphics-commons-2
-	xalan
 	rhino-1.6
-"
+	xalan"
 
-java_prepare() {
-	# bug #318323
+src_prepare() {
+	default
+
+	# See bug 318323.
+	local file
 	for file in build.xml contrib/rasterizertask/build.xml; do
 		java-ant_xml-rewrite -f ${file} -c -e javadoc -a failonerror -v no -a maxmemory -v 512m
 	done
 
+	# See bug 628812.
+	use tcl && epatch "${FILESDIR}/${P}-ImportInfo.patch"
+
 	cd lib || die
 	rm -v *.jar build/*.jar || die
 	use python && java-pkg_jar-from jython-2.7
@@ -66,6 +71,7 @@ src_compile() {
 
 src_install() {
 	batik_unversion_jars() {
+		local jar
 		for jar in batik-*.jar; do
 			newj="${jar%-*}.jar"
 			java-pkg_newjar ${jar} ${newj}
@@ -85,11 +91,13 @@ src_install() {
 	dodoc README CHANGES
 	use doc && java-pkg_dojavadoc "${P}/docs/javadoc"
 
-	# pwd fixes bug #116976
-	java-pkg_dolauncher batik-${SLOT} --pwd "${EPREFIX}/usr/share/${PN}-${SLOT}/" \
+	# See bug #116976.
+	java-pkg_dolauncher "batik-${SLOT}" \
+		--pwd "${EPREFIX}/usr/share/${PN}-${SLOT}/" \
 		--main org.apache.batik.apps.svgbrowser.Main
 
 	# To find these lsjar batik-${SLOT} | grep Main.class
+	local launcher
 	for launcher in ttf2svg slideshow svgpp rasterizer; do
 		java-pkg_dolauncher batik-${launcher}-${SLOT} \
 			--main org.apache.batik.apps.${launcher}.Main
diff --git a/dev-java/batik/files/batik-1.9-ImportInfo.patch b/dev-java/batik/files/batik-1.9-ImportInfo.patch
new file mode 100644
index 000000000000..103b99e1b967
--- /dev/null
+++ b/dev-java/batik/files/batik-1.9-ImportInfo.patch
@@ -0,0 +1,10 @@
+--- a/batik-script/src/main/java/org/apache/batik/script/jacl/JaclInterpreterFactory.java	2017-10-28 17:24:11.401276868 +0000
++++ b/batik-script/src/main/java/org/apache/batik/script/jacl/JaclInterpreterFactory.java	2017-10-28 17:27:13.314255999 +0000
+@@ -20,6 +20,7 @@
+ 
+ import java.net.URL;
+ 
++import org.apache.batik.script.ImportInfo;
+ import org.apache.batik.script.Interpreter;
+ import org.apache.batik.script.InterpreterFactory;
+ 
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index ff8c03e2c6bd..1c2b609ae663 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -1,6 +1,6 @@
 AUX headless-launcher.bash 67 SHA256 aaa990229cbb46d8b290d1629d5ae2c6e99a0cb9e73f7761fbf32faa927d1319 SHA512 d3a6635105ea62a62f1ff690a457bfbdebe3d15f8fd220f5508a4ec20b8a5c46e66bf9189562661d5053c6ac31a6998d1f4a117e0ac6087b336a0475635d7d3a WHIRLPOOL b8b42ad063f00b67c12500e6eb76e9cc81c66ea7105d3e1db9e26e9d45d1ece90b1c25e85ab66bdbb0504b247a4926fb5b4ff4487b3ee43c0914866d58bcc7e6
 DIST fop-2.0-src.zip 26381859 SHA256 70da9622ce25891d989b8ab25692738c5dd6eb2de6ee9b9300d5487f0378d2ec SHA512 428793303fcf143cffaecadc22cfdb8a065bad0108cceebcabc479d92dbe9834b4f81fd27f3e0314546d848e1960b2fe1a9d443999d8f336f7e87fce771beb7a WHIRLPOOL cfd0ec06fba6fe089fb0bea803668e8c89f80eddd198efda20573274ea0cfa750248f12b50827ab89571a4923f51b307d241ff0a4f236cf4a6e28ea49c8d1ac7
-EBUILD fop-2.0-r2.ebuild 3076 SHA256 6479f5d8103d4802f976ff9b0b73f4c63377ee242bbb13ba61bf12a42ad52f2e SHA512 0be6bbbec5683edfcba7fca5742f25a599ce52fa3f654ace7321d376220726de7ed21cb9ae36cb078c1e2fb275b06b9ca0663deb4a001cbd403bd3e0487edec2 WHIRLPOOL 111d4e50105462ce1296ff6976576acc4e868bd15f2cd7f6e81321e61c29f33e32db28c4d04f5fc8394a92f1aebaec03259a0abc571c28c2e3d231556f778ab2
+EBUILD fop-2.0-r3.ebuild 3071 SHA256 e331df9b297c0772a6455cc067a29d78a16d0ed02e6b9b20baed8e0bc8acc99a SHA512 2c8379748ea5a75274037011089863951d3fbe23d95ac37d22c784f5432774d3f7addb877f21aeafeb73cce21e0a0b5720a82761033c0a69230ba7faf1046e98 WHIRLPOOL 86a169a76935013865f63debe6fe0852e4b5ce9a6472148e5ccc79b4d63619019626f5c69c32d792f2cb85ba11789af0429215a61601d1c1dc67d42f8fdd8ecb
 MISC ChangeLog 3308 SHA256 8430041148bf1688c89fa0cbf861503492ff9c9856e9277a24e52a82891eed86 SHA512 2235349e31d3b2f97fcba0109a1e51ab81dfde399b52407a63bebf9e6fdd847ebe521ecaaa1f8f6e164151164e23dac710f761bcdc3ede1ab4ccdcd86f69cda6 WHIRLPOOL 98618190307c6654134596eb9845ae978d324fe06f3fc0fe1b783a441ec21282a7e51e2ab05ddac5fd49932ceb004e8cb3bf8b28bfc3216550b0e83eca40011a
 MISC ChangeLog-2015 11496 SHA256 d8a6ae1439146b760f5086667b69ac8a5982fdaced5dee57fc7f37c5e48720fc SHA512 e3419f68bc302d6cc3fb77d9f39f99bbaba656b361aad14add3bbc92001087ffd3ab2789efb3e7bcd59b125df16e95911778c7c20b65b3d393cf84bd0cad6e9a WHIRLPOOL 27413d61ba3cd257e87ecd2a3e1c17ee3f857af23259ffac5f412b7c18145e737f94069cf9d345c7ee9d0f1021fe9865b9b13c385b4a2193091479a50266213e
 MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
diff --git a/dev-java/fop/fop-2.0-r2.ebuild b/dev-java/fop/fop-2.0-r2.ebuild
deleted file mode 100644
index b24807e14b2a..000000000000
--- a/dev-java/fop/fop-2.0-r2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: if 'doc' use flag is used then should build also extra docs ('docs' ant target), currently it cannot
-#       be built as it needs forrest which we do not have
-# TODO: package and use optional dependency jeuclid
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL"
-HOMEPAGE="http://xmlgraphics.apache.org/fop/"
-SRC_URI="mirror://apache/xmlgraphics/${PN}/source/${P}-src.zip"
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-# Tests are broken even in 2.0
-RESTRICT="test"
-
-CDEPEND="dev-java/batik:1.8
-	dev-java/ant-core:0
-	dev-java/fontbox:1.7
-	dev-java/commons-io:1
-	dev-java/commons-logging:0
-	java-virtuals/servlet-api:3.0
-	dev-java/avalon-framework:4.2
-	dev-java/xmlgraphics-commons:2
-	dev-java/xml-commons-external:1.3
-	dev-java/qdox:1.12"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
-
-#	test? (
-#		dev-java/ant-junit:0
-#		dev-java/junit:4
-#		dev-java/xmlunit:1
-#		dev-java/mockito:0
-#	)"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_GENTOO_CLASSPATH="
-	ant-core
-	batik-1.8
-	fontbox-1.7
-	commons-io-1
-	commons-logging
-	servlet-api-3.0
-	avalon-framework-4.2
-	xmlgraphics-commons-2
-	xml-commons-external-1.3
-"
-
-TARGETS=(
-	resourcegen
-	jar-hyphenation
-	jar-sandbox
-	jar-main
-)
-
-java_prepare() {
-	find "${S}"/lib -type f | xargs rm -v
-}
-
-src_compile() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=554386
-	# http://wiki.apache.org/xmlgraphics-fop/HowTo/BuildFOPAlternatively
-	java-pkg_jar-from --into lib qdox-1.12 qdox.jar
-	java-pkg_jar-from --into lib xmlgraphics-commons-2 xmlgraphics-commons.jar
-	java-pkg_jar-from --into lib commons-logging commons-logging.jar
-	java-pkg_jar-from --into lib commons-io-1 commons-io.jar
-	java-pkg_jar-from --into lib fontbox-1.7 fontbox.jar
-	java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis-ext.jar
-	java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis.jar
-	java-pkg_jar-from --into lib avalon-framework-4.2 avalon-framework.jar
-	java-pkg_jar-from --virtual --into lib servlet-api-3.0 servlet-api.jar
-
-	for target in ${TARGETS[@]}; do
-		EANT_BUILD_TARGET="${target}" \
-			java-pkg-2_src_compile
-	done
-
-	if use doc; then
-		sed -i -e 's/failonerror=\"true\"/failonerror=\"false\"/;' ./build.xml
-		EANT_BUILD_TARGET="javadocs" \
-			java-pkg-2_src_compile
-	fi
-}
-
-src_install() {
-	java-pkg_dojar \
-		build/${PN}.jar \
-		build/${PN}-sandbox.jar \
-		build/${PN}-hyph.jar
-
-	java-pkg_dolauncher \
-		${PN} --main org.apache.fop.cli.Main \
-		-pre "${FILESDIR}/headless-launcher.bash"
-
-	dodoc NOTICE README
-
-	if use doc; then
-		java-pkg_dojavadoc \
-			build/javadocs
-	fi
-
-	if use examples; then
-		java-pkg_doexamples \
-			examples/* conf
-	fi
-
-	if use source; then
-		java-pkg_dosrc \
-			src/java/org \
-			src/sandbox/org
-	fi
-}
diff --git a/dev-java/fop/fop-2.0-r3.ebuild b/dev-java/fop/fop-2.0-r3.ebuild
new file mode 100644
index 000000000000..308735bc50b0
--- /dev/null
+++ b/dev-java/fop/fop-2.0-r3.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: if 'doc' use flag is used then should build also extra docs ('docs' ant target), currently it cannot
+#       be built as it needs forrest which we do not have
+# TODO: package and use optional dependency jeuclid
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL"
+HOMEPAGE="https://xmlgraphics.apache.org/fop/"
+SRC_URI="mirror://apache/xmlgraphics/${PN}/source/${P}-src.zip"
+
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+# Tests are broken even in 2.0
+RESTRICT="test"
+
+CDEPEND="
+	dev-java/batik:1.9
+	dev-java/ant-core:0
+	dev-java/fontbox:1.7
+	dev-java/commons-io:1
+	dev-java/commons-logging:0
+	java-virtuals/servlet-api:3.0
+	dev-java/avalon-framework:4.2
+	dev-java/xmlgraphics-commons:2
+	dev-java/xml-commons-external:1.3
+	dev-java/qdox:1.12"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+#	test? (
+#		dev-java/ant-junit:0
+#		dev-java/junit:4
+#		dev-java/xmlunit:1
+#		dev-java/mockito:0
+#	)"
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_GENTOO_CLASSPATH="
+	ant-core
+	batik-1.9
+	fontbox-1.7
+	commons-io-1
+	commons-logging
+	servlet-api-3.0
+	avalon-framework-4.2
+	xmlgraphics-commons-2
+	xml-commons-external-1.3
+"
+
+TARGETS=(
+	resourcegen
+	jar-hyphenation
+	jar-sandbox
+	jar-main
+)
+
+java_prepare() {
+	find "${S}"/lib -type f | xargs rm -v
+}
+
+src_compile() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=554386
+	# http://wiki.apache.org/xmlgraphics-fop/HowTo/BuildFOPAlternatively
+	java-pkg_jar-from --into lib qdox-1.12 qdox.jar
+	java-pkg_jar-from --into lib xmlgraphics-commons-2 xmlgraphics-commons.jar
+	java-pkg_jar-from --into lib commons-logging commons-logging.jar
+	java-pkg_jar-from --into lib commons-io-1 commons-io.jar
+	java-pkg_jar-from --into lib fontbox-1.7 fontbox.jar
+	java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis-ext.jar
+	java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis.jar
+	java-pkg_jar-from --into lib avalon-framework-4.2 avalon-framework.jar
+	java-pkg_jar-from --virtual --into lib servlet-api-3.0 servlet-api.jar
+
+	for target in ${TARGETS[@]}; do
+		EANT_BUILD_TARGET="${target}" \
+			java-pkg-2_src_compile
+	done
+
+	if use doc; then
+		sed -i -e 's/failonerror=\"true\"/failonerror=\"false\"/;' ./build.xml
+		EANT_BUILD_TARGET="javadocs" \
+			java-pkg-2_src_compile
+	fi
+}
+
+src_install() {
+	java-pkg_dojar \
+		build/${PN}.jar \
+		build/${PN}-sandbox.jar \
+		build/${PN}-hyph.jar
+
+	java-pkg_dolauncher \
+		${PN} --main org.apache.fop.cli.Main \
+		-pre "${FILESDIR}/headless-launcher.bash"
+
+	dodoc NOTICE README
+
+	if use doc; then
+		java-pkg_dojavadoc \
+			build/javadocs
+	fi
+
+	if use examples; then
+		java-pkg_doexamples \
+			examples/* conf
+	fi
+
+	if use source; then
+		java-pkg_dosrc \
+			src/java/org \
+			src/sandbox/org
+	fi
+}
diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest
index b34abea83ffb..0f5bda888d8e 100644
--- a/dev-java/java-sdk-docs/Manifest
+++ b/dev-java/java-sdk-docs/Manifest
@@ -1,7 +1,7 @@
 DIST jdk-7u80-docs-all.zip 61168809 SHA256 0494bd49bc9cb3cbe3203120ae8b2c8e0aeb1579cb15c0fbd3cd780d19aa200a SHA512 c673c00e55c9a19938c42512cb9c6ae65de9803a1307d11a2043903d87cc36d9ed1f5a1e287040d8570e430cfe55f496354c1242fe6e242f1245f8271394ea1a WHIRLPOOL ad18886c401ec42735665081a0dd5ba3dc7678de0171f3aa8151c2e4ce3392e467be65c602f393da38373e589fa9800ed1afd3601d2cef4e48b06e57f491698e
-DIST jdk-8u144-docs-all.zip 93446459 SHA256 ae2b2fdb162ca5716fe60d8fddbe7b0d2059d2b571311d27d488a20a40c6b3be SHA512 28b4aa92453e61693fd72f190326c69956ab022400031b54490e11d81fb16b847eab8308e51126980d04b7ac21e1ea10c3446e621fef2293bc6e5f6ec9acf970 WHIRLPOOL ac12d6a2d83e6106e30d78ce50091c0f92cdbaefaaf94d61ac21b82e472ce606729a02c0ed9362098bc121ace16f149048df2b9d61640bda685a0d32dfea7555
+DIST jdk-8u152-docs-all.zip 93495668 SHA256 68d1f0f7827d86c6309b04c0f089c219f203158e993a88b47a6acaa0e4b40823 SHA512 5aa49103685fc466bf2c5ff32aeee9ccf5b51359bb8e558bc8f23dc399fb108cba7fd282b669ce3b8062865fc4507afc809f8fb0ca844587eb168ad44c69ad77 WHIRLPOOL a0eff7c33c37c286a69e03340e1ccf5f4c59be40f0a03ff9c800960c2a26971cee22b94829bd1b064b77332b17590969cbcc31f291b7f8da0eebd63e5009aeeb
 EBUILD java-sdk-docs-1.7.0.80.ebuild 1426 SHA256 6c884a3c55040f7da0c974404e26e89c4c28bf9d98ceb6329e8ee74d043d3a4f SHA512 f7e85f9d5f99970e2d122e2e73f80f440e32ce74ce439c3ff2b540b5fd7bc83d7c3881622658342b5ee5a5adb2e451d22fc7dd63cf20eccc7a0d76dbed319c89 WHIRLPOOL 8adb893c98f2f3a076c8c39306c56fb5af106e940ab23cbed92eceff692c18c40d97a30acce4dc001dcf985157e8633102122ee94f756b24d936cf08de93c7e4
-EBUILD java-sdk-docs-1.8.0.144.ebuild 1425 SHA256 255c37678760fa7ee4f8dd69bc3efdffccf27db19740f0ebb80a474ca16468c8 SHA512 940af01d8aad45e3bb0de48414d0efe104432459074590d975c599fca4f9f036a0a256a08e8d2dc94cd1c0d45a3902515c894377ed10a145bcdb470d990fda90 WHIRLPOOL 14a774bd99a92b900ac197e85a2a9a73d384bb02aa4a32d31a0b6c96d7320f15a64faace70ec1cd816b0453e057f0b6e4b5e835d716e179654737d81e404e283
+EBUILD java-sdk-docs-1.8.0.152.ebuild 1425 SHA256 255c37678760fa7ee4f8dd69bc3efdffccf27db19740f0ebb80a474ca16468c8 SHA512 940af01d8aad45e3bb0de48414d0efe104432459074590d975c599fca4f9f036a0a256a08e8d2dc94cd1c0d45a3902515c894377ed10a145bcdb470d990fda90 WHIRLPOOL 14a774bd99a92b900ac197e85a2a9a73d384bb02aa4a32d31a0b6c96d7320f15a64faace70ec1cd816b0453e057f0b6e4b5e835d716e179654737d81e404e283
 MISC ChangeLog 5635 SHA256 95e0680393ed956d8dc3f242772c097a1197251811ef2b1f70eb090d00e40da3 SHA512 5539614479d9c2f4cdcdf0d4f9a63831f4e3b6097726d2755acb14c5fbf4ee08654693a0e77ecff758cc1b14b36ca54b4d0798f8256fdd968715e885ea138886 WHIRLPOOL b86a49860be3ab92ef409603702b9b341c931c1fd0f783e923015039f048be84b7989028f46de59f9bab4e92767d7773a65b721b70b24310e5d9c9fdd8f16e7c
 MISC ChangeLog-2015 19879 SHA256 2c9ffcdd9b85a1bb56678499d00805d39624e639277438a72b8b409a0a17c4e8 SHA512 e79cd5a4c6eee9da7e4561989847281d1d103ed211146845c2a118ffbb8cb6e785bbb655de5a16d76d307d6cc00005282a440ef8c0eb36044eed95962993c220 WHIRLPOOL 1a89b07b0f1b1107930aa5f1afa0beab1795ce1140b4ed45529a25f31d19268a2fedd909ae15f1d0d3f3b10321b7fbf79960617e31970df5a3a1bf8295b66388
 MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.144.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.152.ebuild
index 823be122dc21..823be122dc21 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.144.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.152.ebuild
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index fd94924addfa..0ee5a4bcfbd9 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -6,8 +6,7 @@ AUX jython-2.7_beta1-ant.patch 996 SHA256 4162eb543c70071cac05c4220047296809733f
 AUX jython-2.7_beta1-dont-always-recompile-classes.patch 309 SHA256 323b52653b511d3d4a299d0414716aa3d6e7bfa21094b6090363878f244d7af2 SHA512 75b25d98d8df13d0b9947cbc70a7da59097b89731210504cc26ab18680b93d9ce2cd177480870f985a87d3634d9034b8d9f1bac2c431f4cfe09ab0b54db78b18 WHIRLPOOL 76300b03adaad2d979e4a5a705088ef3410d93643fac0c87b333f88181d4f93c8185630467a272d7fd5f2439784e907814084f5a18f11715d9bc4ce102d03bc5
 AUX jython-2.7_beta2-maxrepeat-import.patch 457 SHA256 0840c1039c0e5821d0ceeb44bdfe1bda52fc2b9da00330c52c2056def2e09a24 SHA512 e06ddb36805e2545f351d9d5df651fa90b0b39d340e4772cbb24910f1e1c999463a21fbe4a62c9cc73f9ccdc0047f8900e6300602cb8d5b70cef7cacf1bd46d0 WHIRLPOOL dc685f8cd5d684a9ea72f3315d9d74b1e51712fb6ef46fb2dec24ec1cb1a1d0094d28c06e32a0089ff659b7a0c402e35b77725e7c971db46bd90767d0eaff3ad
 DIST jython-2.7.0-sources.jar 15371691 SHA256 2b534595d4a08059ebb71b881c58ee830499bb6e9daba7c828a7f1f6c8943f7a SHA512 7583810245d694fd1d99a57ad504fcefdfbc1183def2cbb93ae3660f341104205c73041d846bdcf2b564b3cf4b770b481703c1dcdb1458396812c92d30ee9fa6 WHIRLPOOL e0dbd289c522b41ef2d3f54b01a2f6d44de8755e2eeb7863c8b807d1b179839f20d925e102db324cf85cd82503cd03106b5287ffa7a322a3902d6f24e9cd2a41
-EBUILD jython-2.7.0-r2.ebuild 4299 SHA256 e5d72b08a405a1f69ed621cd9b072102b0900f9cee95fe4fe55a553aaaa1b7d7 SHA512 433cfb7397f96a7e0e7673dab0f788d459d9fa490266d9434c0c0e82f0ecb1d28ed3276276fd3196f865e9a9a456ca75dc259060afddae8ada53700bddfc887e WHIRLPOOL eda646073b481c76fdd96163cfb8549753da2cd02f9a6b1eb8613d8129181db6ba8473d0f977c4359fd231a8673b13ff96d6147c402a85627b91313cfbf1f169
-EBUILD jython-2.7.0.ebuild 5666 SHA256 49b2ac3c6eafee7037c3f6b165f24810d4c0d403e634186be4342f90b728dbf3 SHA512 f8fa49e48f06ac9ecdcba3800d0e9050bd379df36058b0e7ee47a6d978dafdd3aaac8c03db28a80de12b7141259d9297827bc2d7de044a702864a9ed81bdf701 WHIRLPOOL c36b743cad1cc908e4185af8ce12287da9808cc5f56157872d57d906dc0a5bec4969bbd681fd2f013b873f5bcabf1789f0c77f4f06b80872d60b6314729c321e
+EBUILD jython-2.7.0-r2.ebuild 4298 SHA256 5105c65e6b72c315a155c880e231e44d948005fbdec96839cf66b83fb538f69c SHA512 8ff019b22a9a7abac0f96dd4466654333de3f60c72764053f4f26ce995e1200084348aa223edcd3806037cfade26d956f57512d38d733f37652a4cdb590c7e01 WHIRLPOOL 6e3f64a34ffaa5e3d4a952771396f467dcf8a771db61d524727eeff35ba9aade417e2597054cfc53affa56e32ff6737259603b6c82949f81f2db7b49ca7a507d
 MISC ChangeLog 6493 SHA256 db425c5e8ab43a03c932063d59e827148f0a3b48367c77f0a361b8594e515688 SHA512 70d8319bca8e3a4faec942dd16c88ca7a2441ea1b896f17b4559d645abcd62b1d3d78df78621556c6dbfb5b58d18c87ed99240b7dd3ba74c847a79bdd9bbe5f5 WHIRLPOOL 6c3b155f81af4cdf1f18b6290caa248e1a706dc943d730be7693711269b954cf33bd8909aa241890362d2c088f0d5f21610f77c11fcf9eb7dbc3541a86c03952
 MISC ChangeLog-2015 16851 SHA256 19dc522aedb70b79948459e970080a6d8a3a10303079a273586eb2a967b81380 SHA512 5e125a0a005ceb0fdcccd283b4f9dfd310af0e90e4b9be4901e47702a35db5f846373f3a27129020afb1659fe22406c89250bf610a95470d76ff82fe062c8b29 WHIRLPOOL 15b10f7f076cc1eb6d866320c2ffc1159adbba022e006a6ae308cd3ab38603cb81d91debf8950f48e0ee4e6a00736116e9447f8658b377884e093b3d5e06d1fd
-MISC metadata.xml 406 SHA256 aa24488b1d0d7c1227a27148d330f242ddd8c6a65602c8a21a4e3ecf42b5a6b3 SHA512 9f2143723240241788a922cba2adbb5917114bc052b2590eb76777c5db4140ab0360c55cadb17fc5b2006d1947f37e91f5ce88d6abba500e6cb9419854014dac WHIRLPOOL 49104dcd67ccc7794af5b0bb38ce1a5dab51c6bcb40350dfcf4e98d67b2445a05d512184eca3e5f72b7b377bc2ecb6fb6824893fdb3aed6d8f08ba63d790c99c
+MISC metadata.xml 322 SHA256 eb62cf2746f3155986092af544a3be47f79c89ef32d1c7ec8c9e05a3b65cca62 SHA512 e8a44ffb98b2da1c2d60f478d89e45879c3f4516042afed922ee522ded157243381e51b198fd638845e45ceb2255535e25df8a7ce61f267b6222dd94525b2342 WHIRLPOOL 84ae079b74216433e005f2ed2f1abd94e8bad3e067c8fb0c9abbf47ed268dbbdbb96bba531ca7c27466288a3cebd7e380517c2186e7e4608a59feaa73603f4f7
diff --git a/dev-java/jython/jython-2.7.0-r2.ebuild b/dev-java/jython/jython-2.7.0-r2.ebuild
index 852db859cfd4..d8fb023be8a9 100644
--- a/dev-java/jython/jython-2.7.0-r2.ebuild
+++ b/dev-java/jython/jython-2.7.0-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_PV
 
 LICENSE="PSF-2"
 SLOT="2.7"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="examples test"
 
 CP_DEPEND="dev-java/antlr:3
diff --git a/dev-java/jython/jython-2.7.0.ebuild b/dev-java/jython/jython-2.7.0.ebuild
deleted file mode 100644
index 18b533ce3672..000000000000
--- a/dev-java/jython/jython-2.7.0.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc examples source"
-
-inherit eutils java-pkg-2 java-ant-2 python-utils-r1 flag-o-matic
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="An implementation of Python written in Java"
-HOMEPAGE="http://www.jython.org"
-SRC_URI="http://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_PV}/${MY_P}-sources.jar"
-
-LICENSE="PSF-2"
-SLOT="2.7"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="+readline test"
-REQUIRED_USE="test? ( readline )"
-
-CDEPEND="dev-java/ant-core:0
-	dev-java/antlr:3
-	dev-java/netty-transport:0
-	=dev-java/asm-5.0.3:4
-	dev-java/commons-compress:0
-	dev-java/guava:13
-	>=dev-java/java-config-2.1.11-r3
-	dev-java/jffi:1.2
-	dev-java/jline:2
-	dev-java/icu4j:52
-	dev-java/jnr-constants:0
-	dev-java/jnr-posix:3.0
-	dev-java/jnr-netdb:1.0
-	dev-java/stringtemplate:0
-	dev-java/xerces:2
-	java-virtuals/script-api:0
-	java-virtuals/servlet-api:3.0
-	readline? ( >=dev-java/libreadline-java-0.8.0:0 )"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.7"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.7
-	app-arch/unzip
-	test? (
-		dev-java/junit:4
-		dev-java/ant-junit:0
-	)"
-
-S=${WORKDIR}
-
-RESTRICT="test"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="asm-4,commons-compress,guava-13,jffi-1.2,jline-2,"
-EANT_GENTOO_CLASSPATH+="jnr-constants,script-api,servlet-api-3.0,"
-EANT_GENTOO_CLASSPATH+="stringtemplate,xerces-2,icu4j-52,netty-transport,jnr-posix-3.0"
-
-JAVA_ANT_CLASSPATH_TAGS+=" java"
-
-EANT_BUILD_TARGET="developer-build"
-EANT_TEST_EXTRA_ARGS="-Dpython.home=dist"
-
-# jdbc-informix and jdbc-oracle-bin (requires registration) aren't exposed.
-# Uncomment and add to CDEPEND if you want either of them
-#EANT_GENTOO_CLASSPATH+=",jdbc-informix"   EANT_EXTRA_ARGS+=" -Dinformix.present"
-#EANT_GENTOO_CLASSPATH+=",jdbc-oracle-bin" EANT_EXTRA_ARGS+=" -Doracle.present"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.2-distutils_scripts_location.patch
-	"${FILESDIR}"/${PN}-2.5.2-respect_PYTHONPATH.patch
-	"${FILESDIR}"/${PN}-2.7_beta1-ant.patch
-	"${FILESDIR}"/${PN}-2.7_beta1-dont-always-recompile-classes.patch
-	"${FILESDIR}"/${PN}-2.7_beta2-maxrepeat-import.patch
-	"${FILESDIR}"/${PN}-2.7.0-build.xml.patch
-)
-
-java_prepare() {
-	find \( -name '*.jar' -o -name '*.class' \
-		-o -name '*.pyc' -o -name '*.exe' \) -delete
-
-	epatch "${PATCHES[@]}"
-
-	if ! use readline; then
-		rm -v src/org/python/util/ReadlineConsole.java || die
-	fi
-
-	# needed for launchertest
-	chmod +x tests/shell/test-jython.sh || die
-
-	# apparently this can cause problems
-	append-flags -fno-stack-protector
-}
-
-src_compile() {
-	use readline && EANT_GENTOO_CLASSPATH+=",libreadline-java"
-
-	EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --with-dependencies antlr-3,jnr-posix-3.0)"
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only ant-core)"
-
-	sed -i -e "1 a\
-		CLASSPATH=\"$(java-pkg_getjars "${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}\"" \
-		src/shell/jython || die
-
-	java-pkg-2_src_compile
-}
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local instdir=/usr/share/${PN}-${SLOT}
-
-	java-pkg_newjar dist/${PN}-dev.jar
-
-	java-pkg_register-optional-dependency jdbc-mysql
-	java-pkg_register-optional-dependency jdbc-postgresql
-
-	insinto ${instdir}
-	doins -r dist/{Lib,registry}
-
-	dodoc ACKNOWLEDGMENTS NEWS README.txt
-
-	use doc && java-pkg_dohtml -r dist/Doc/javadoc
-	use source && java-pkg_dosrc src/*
-	use examples && java-pkg_doexamples Demo/*
-
-	local java_args=(
-		-Dpython.home="${EPREFIX}"/usr/share/${PN}-${SLOT}
-		-Dpython.executable="${EPREFIX}"/usr/bin/jython${SLOT}
-		-Dpython.cachedir="\${HOME}/.jythoncachedir"
-	)
-
-	java-pkg_dolauncher jython${SLOT} \
-		--main org.python.util.jython \
-		--java_args "${java_args[*]}"
-
-	if use readline; then
-		sed \
-			-e "s/#\(python.console=org.python.util.ReadlineConsole\)/\1/" \
-			-e "/#python.console.readlinelib=JavaReadline/a python.console.readlinelib=GnuReadline" \
-			-i "${ED}"/usr/share/${PN}-${SLOT}/registry || die
-	fi
-
-	# we need a wrapper to help python_optimize
-	cat <<-EOF > "${T}"/jython
-		exec java -cp "$(java-pkg_getjars "${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}:dist/${PN}-dev.jar" \
-			-Dpython.home="${ED}${instdir}" \
-			-Dpython.cachedir="${T}/.jythoncachedir" \
-			-Duser.home="${T}" \
-			org.python.util.jython "\${@}"
-	EOF
-	chmod +x "${T}"/jython || die
-
-	local -x PYTHON="${T}"/jython
-	# we can't get the path from the interpreter since it does some
-	# magic that fails on non-installed copy...
-	local PYTHON_SITEDIR=${EPREFIX}/usr/share/jython-${SLOT}/Lib/site-packages
-	python_export jython${SLOT} EPYTHON
-
-	# compile tests (everything else is compiled already)
-	# we're keeping it quiet since jython reports errors verbosely
-	# and some of the tests are supposed to trigger compile errors
-	python_optimize "${ED}${instdir}"/Lib/test &>/dev/null
-
-	# for python-exec
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# some of the class files end up with newer timestamps than the files they
-	# were generated from, make sure this doesn't happen
-	find "${ED}${instdir}"/Lib/ -name '*.class' | xargs touch
-}
-
-pkg_postinst() {
-	if ! has_version dev-java/jython ; then
-		elog
-		elog "readline can be configured in the registry:"
-		elog
-		elog "python.console=org.python.util.ReadlineConsole"
-		elog "python.console.readlinelib=GnuReadline"
-		elog
-		elog "Global registry: '${EROOT}usr/share/${PN}-${SLOT}/registry'"
-		elog "User registry: '~/.jython'"
-		elog "See http://www.jython.org/docs/registry.html for more information."
-		elog
-	fi
-}
diff --git a/dev-java/jython/metadata.xml b/dev-java/jython/metadata.xml
index 6034fcc96aab..d20250bf86a6 100644
--- a/dev-java/jython/metadata.xml
+++ b/dev-java/jython/metadata.xml
@@ -5,9 +5,6 @@
     <email>java@gentoo.org</email>
     <name>Java</name>
   </maintainer>
-  <use>
-    <flag name="readline">Use GNU readline instead of jline</flag>
-  </use>
   <upstream>
     <remote-id type="sourceforge">jython</remote-id>
   </upstream>
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index 4e9dca7f149d..ac512e3ae9ec 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -1,21 +1,20 @@
 AUX fontconfig.Gentoo.properties 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6
 AUX oracle-jdk-bin.env.sh 833 SHA256 cef5b8196f18b4c7bd195fbe5084dde6e38b693accfc68859f48cb1460bee4fb SHA512 8d41679b4631016dbe98b15368ed027df9e6f4d96db17133c56bbf16b9a81be908d139617bc5350aa6b0e51bddc56bb1ce1abc5a8a4fad74868172cfdde6ffd8 WHIRLPOOL 0fa41d4b45e7b85628feffb55a8ca5ccb99c8a3e8d59907e42947135ac5cbc39564e609be7901e321ec5a0de8f0b6705e02333a771fa738434774cd198c32770
-DIST jce_policy-8.zip 8409 SHA256 f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59 SHA512 abbaa81a35f904ec61b4cf3c2d1ca8c8d49e53bb248e698185eea906939d68f5063412800585ec74027aab1012ef189aebe1dc99fe8ef4230a0ecb0b527f88e5 WHIRLPOOL 8c9ce1ea4673b75fa6271b74e598880f98361d5d2c9c25439fa0af3d07cfeb871b39682dae4e38160f49770b1fec953162e451b9b2cf44d2c72a226944212bcc
-DIST jdk-8u144-linux-arm32-vfp-hflt-demos.tar.gz 10431600 SHA256 b113da60e5b0d30e58723a1bd56d46d25767b6c893910ab8bad08f43e463ee86 SHA512 36bc18b6d8d028fc9737803cdf913378c7501aede301c6013567f7eff1b326f44381522a3c5c38869799df6ef4aa4d83912332c3787a305fe6cfe6746a0f906b WHIRLPOOL 8f9da8cdee641320ee86c130db0010bbfc0823cc8e1ecf68e4698d7470b709251c8af56a617ffe3bdd567b77de5a3c0c29caefb8d52a75799d533316cf42ac13
-DIST jdk-8u144-linux-arm32-vfp-hflt.tar.gz 81674263 SHA256 cbbd390e19ab4c473e05f60602ce2804db25e4e35be5ab95f4f1a2aeb5b72383 SHA512 673a2ec7704a921db19e904bf8e8594b003b855de5cecab4419c502b235156a28262643ac235401c96014792897bbc1a51f78ced30e09439628ecd16d841377c WHIRLPOOL feb03cf10b692edf0b94cd46a1fb9cca9e9b1361efb1786d492a52c3ace889c3f294a163ec8bd617be87525957b62d6f1a1383b815ec65b732b70b6a327c5793
-DIST jdk-8u144-linux-arm64-vfp-hflt-demos.tar.gz 10427473 SHA256 ec66001b2f6a6814c4cf6d28f7c59ee5d335cbf50d8a3557c5e9eb46adf09630 SHA512 cbe861d234ca95e542c38ac72a1d84cd36ed895f4c72fbc45e1d4e5e4e73dd10f4b28f2bddb86a9b848b0edf304cc18b8e9b605ac1b94a1d35117fc75dd00748 WHIRLPOOL 39567c138d9c099a7c0e0b642a550d4ad9b53e533520601a1dec0d51a9bff45aa9afe5b31b1b015db8648b2648a609f9e284036b2db98f145b57c5a3a477e43f
-DIST jdk-8u144-linux-arm64-vfp-hflt.tar.gz 78463505 SHA256 bbcf4a0805f9bcead32fd988b74cee61ef6ad90e6d1b4e0dce432ac3fd8e0168 SHA512 42d3db36d7adf5461024202260b940d824c58c35edeb89b7be6f98147f1d556e95ee2f37b35c4468fd4d175f3381ce5bda9d9c2f730d054a7b8e669b469e18d0 WHIRLPOOL 7a0d15c8c5512de0cce0deade9b5f87f505e351c903d04152e860261f4d790e8e656aeb0740bfa9f69f0c2b80fc55a701d8f49ed3d7e1edfcb5293e95a22504e
-DIST jdk-8u144-linux-i586-demos.tar.gz 55071167 SHA256 3e8f02f32b129d681f5f2a0178373d750f4c2352acf55785fdca70c8f9aaf595 SHA512 4f3d5f8ecd56a7955e30cfea12dea4dadad0e955c3b160fddec59e759a9a6653bcb009bccae289fa022dba931fcede8a98d18770a8c18cc49d9da4f8ea0980d6 WHIRLPOOL aed2d4bdcebbaa0ae4adfd3e4eb000ef1499fef1ccc76f4bf00ce63fe5f695777fc3e8c2fd75b852fde8cfa1b06cb5c41c870b802074ec38f6512d296a67da96
-DIST jdk-8u144-linux-i586.tar.gz 188157665 SHA256 624c090647629394ef0ee08d9d8ac5d3d5a9a60fa245fefb2eb417c36c7cb7c4 SHA512 06e08a512af60bafdf3220ab916461c3bac61a3cac19877e9dd0c004c28168243c5f92f3104da1dcfd5eae98e882b224929f72692603455815c0ce8615f5ae9c WHIRLPOOL 79859bb345787155935885b872b6f072b68e81fb0008661344502d461ffd7aac88fe4cc9a2ff03f241ffcd41c0880907cd5353bcaf2f5bf7112dde1057209f85
-DIST jdk-8u144-linux-x64-demos.tar.gz 55093539 SHA256 67fcbd3b54aea3791d10eb3cd74a8fe42c286f0854b6a984b768f9c9c7513ffc SHA512 7f49d29e323237f0144e00883634779809bf41ab0b50875a3a36020521f716149cb38db522763a56249d34a1c3ee6f778b6ecf45b06b492064cc1fce854f9d24 WHIRLPOOL 74db7026f97ed61134313ed6b853d609684e7316d68b3f4880e12fadd9c6d267e79c0b8e10f69fb3f21af29d910cf2ab423b7c23a5f80dfce51389832bdc1aae
-DIST jdk-8u144-linux-x64.tar.gz 185515842 SHA256 e8a341ce566f32c3d06f6d0f0eeea9a0f434f538d22af949ae58bc86f2eeaae4 SHA512 e84bd22105586b4f1cb770942755c3b4ee7e2ca2a94bf0e7d48e5d44586a103dd28432664fd84b260b8bf1d64a1e9dbf49549f194e7202015e603865f4ae1e69 WHIRLPOOL 832b2b2b4790a9ed7499192248f30c9e56d357d52549c39314f992c3757b69ba9cc725356966ad0229c4053b63a56362a26d1a9b2f447c00b5f3d927e1926d8f
-DIST jdk-8u144-macosx-x64.dmg 237607747 SHA256 2450b35e10295ccf3fb1596bdea6f8f5670f7200ae3ac592eb6a54cc030cf94b SHA512 7eab6126044e230bebb1a5817b046bd64d3f57a3dbd3efc6c77411008b2aff7d4bee190906cb19a5ed330a8220b8b6dc47c9fc193eaa9a3c1f74ebbffcee0d6f WHIRLPOOL 7477673f2380a22b8ae9a7381d6b86611c0fbb32a3d94d81247d86924599b2317a7d598521aea51a729a9f553b7e4065799bd935fb0a3c0f53732cd448dcd5f6
-DIST jdk-8u144-macosx-x86_64-demos.zip 55667110 SHA256 d665713ddca2d771a56cef17fe16b9972ad6fed3fe716b18b690cbd8e0e99475 SHA512 252138155cce08eb8c68f1b3e10c621edca1292d69a69d3022bd32d45cb6c2095329cc3ece375124bdd1774e9e7dbae5f47a608f457a0655e2408614965c36bf WHIRLPOOL 86fa1e5b99c1beff5e7f6dd139629bd2f49700e8975be50c88f44d66bc5124bebfa42b487329e805aa79819f339405247750f6c55691af0c748ecdb555c0bf87
-DIST jdk-8u144-solaris-amd64-demos.tar.gz 9765361 SHA256 33f76fb0bec3f554aeb15c02e84c52cdeec77ac72f99f5247cee07035c7779b3 SHA512 a22e58c8a905d87e25184ea020c24dfe8afa4aa314093135643926ecbc734ca06ee58efbfffefc7dcbd013dbf0023ab515448fd48d4a731b656e2f47d22b98cb WHIRLPOOL 82cf282ecbb064567c96f4ee81560588d71e257504eb6b926d6fee8b114781eb5e3881035b250db2436b0a2579bb47309fb51e89f946f61c5b5e27e727749f33
-DIST jdk-8u144-solaris-sparcv9-demos.tar.gz 9793649 SHA256 ceea29533ceb76ed1ee7f65b5935ef0fc53b0afee7c5f4ddb08d4face3b0838e SHA512 ba14fe455acc52f2f6da0c3d419d491f3a3123c7a0f80ce4d130e68a0492e7509e34709ca5921c6f266c468ba085f78d203d8018f1d9df26982e3d2dea72c1c5 WHIRLPOOL 5fe028f3959d2337416f8cb3b9b101dbba4ec42db18abec7641cac3133da44d0938f0429d43be3e2c159957fe5c351a6db81d6b08fddb55cb5abf7ef36e1885c
-DIST jdk-8u144-solaris-sparcv9.tar.gz 103999213 SHA256 fe8e6d12cac940569c5b2270d2d40ed57d6a0861d15d512e4d1cbc55277a2d2d SHA512 0a9ed86237ec253c009f68a3d6832610595623437d25d68c157ef2b5d59e0556acbe229be7b9a1713565b76604bd15474d2ce50ab7c593bf568226e9c1f6f6c7 WHIRLPOOL 24cee16e12c622cc675226842c28211b9d1a7e6079e0e0c0721e7f2cc2fe822e033ffbd405f7d509b5068531d7b9ce525a6628ee4cc3642400f33f7d8f86a8c3
-DIST jdk-8u144-solaris-x64.tar.gz 101700929 SHA256 9eea0096784e6c876aae6918bf4692096bd738200e717da09b4471bd1e706cf1 SHA512 fcd65f556d8565a29d4b7d3d5dec5c52c669c64db536c8ab01749f1f320232e8d42ba3d7012802033d9d7344b9abddd52140e345e4f95a025f00069901726f6b WHIRLPOOL f3ddd659003c5f2d39112132050bc441630c73208900babed8c1ec814c3d73271f8774e9411c8fc3e2eeae31f5312d6731520963c82f1c148d461eab0a355972
-EBUILD oracle-jdk-bin-1.8.0.144.ebuild 11217 SHA256 7d38b9ce9b427217e4eb72114fb47e4ba2abcaf0f85a8681710aa620e3e76c2b SHA512 1f43ffdd08c0e41940f6bd5a535a01f8ba41173bfdaf04f501eb89d05df32c3b8f06fcf78d656836c4ba5f64472e9e31f04224c87f9b47c97d78e61abc2b1ede WHIRLPOOL 5f79d1cc41f28e5c5df2b8211fcacf58764e047d4cc15b8ae0dbc1d69e546f37479ccaaf096075407e2716413c372dd8f598ed6c82e303e0f3b596ba943f62ed
+DIST jdk-8u152-linux-arm32-vfp-hflt-demos.tar.gz 10405226 SHA256 5dba4af988562661f4543f210e0e16be9f4e11885e8addd9b7f8f6e2aa18741b SHA512 774b1957142ca489e362ef6ab48ce152196b64c00d779d051f76421fdf4a52cd7a741cfe3336b02c05f432fd2cb95728cdfd992f4ea3fee56047b40e7ce95053 WHIRLPOOL 1196d099f307f21b22e08c3b4badba33ee0475ebd70091ed98510730f7c492032e02a8dd475bd72b380eb9ceb8980e5a012c0be906d76afd2073e048d94f5909
+DIST jdk-8u152-linux-arm32-vfp-hflt.tar.gz 81729798 SHA256 35ab532355c72310c4c7add2b7c7f9d1eb0e045cf59d3fd69ee08fa6a9e610f0 SHA512 c548c18e2e2c9e2c87ad24841348b676628a33023a70aa0a5dab56d031c1d9c7a4813240a046db96631025d034ed333fec81c8099f02a7c9efd39fecd4592e32 WHIRLPOOL 32119379086fc008957bb6a00012d17e2f7d2a22ebd26f8b6e04a3d6476ab5d98a25bcc51cd5ce3c0eba6422581a050b809ffed2539819295aadef37d6e79383
+DIST jdk-8u152-linux-arm64-vfp-hflt-demos.tar.gz 10434504 SHA256 59c1787ad8b5f604293b09576fc8e872ad3fe32c0df3f3a62c9149dddfe25b24 SHA512 c41cb3f8394f98516e7dce52d8aaaea87d0e1675560292009eba0b4b3e993d1aaef7a7895dd83af2570486af6ca8913f280940d5f7e0051c3cc198a6387d9cd7 WHIRLPOOL ae3189cb9393ae9039ddb7a0c87db4ed30defc9cea5cc7d86de8bc32003f5d33c4200c20a3a10658c21f3099c2d455c3660fd1b4d0b222398cf084d776e36ae6
+DIST jdk-8u152-linux-arm64-vfp-hflt.tar.gz 78513081 SHA256 732609dd090a7d20e09b48b90f8f447497879bb6da1b786a9dd1ea6e91ea178f SHA512 fe35360a9ffa73e9745360560db6a5dee9665d31801ea58bd8be676588c93955f47077dbcb5a415c0074f9759a9cace77916e3b322c572b4d3b23a1d99f16578 WHIRLPOOL 9b1abcfa123d783b4caeaab8f469084647fa8deea3056aba910710e525dc7a89a096909111c24e869557d26db2a363be7008b1bddfaff7f9123b168767b78bf7
+DIST jdk-8u152-linux-i586-demos.tar.gz 55096721 SHA256 0a12f9f08e863a75685b11a66f31e990140777b1a8762cb30d9d617a3a0144a5 SHA512 44776eafd70306a392fae5cf269036d7500c7cbaee13a9fcda14b9f7191376dbfcbb03262693e3114a08f5d4ff27ede1ef570fa6008c9ef71ab3b24d44f9ad2c WHIRLPOOL a4b63c7d05a7b69d0525a1ee743e571ecc289c9abbf283c42ffa99dfa17ac98e822a523ca8d021d4fe3d89b51cfa6072ebed4ed272b772aadbab26cc2e479d8d
+DIST jdk-8u152-linux-i586.tar.gz 192699649 SHA256 fc60b121d4b194fa70084fd0ca0d69e8b78e5db01a071efe200e90eed83c4c3e SHA512 6b7576ec40b0ddd0a54fbcd61c22b95f472192be5855d143387f1b56220dd68e851a8b87894802c181b1039c14f5a278d950f100c4bd10b862fe4049d9294ce2 WHIRLPOOL a4bd3b3eed55c42ae51599783c6a2743edb9aaa090e84dd49708930ea712b9d262c565fcaf1e59d5b48f362ec84cca22da920699b9ef8abfd6e9ec93025bbce5
+DIST jdk-8u152-linux-x64-demos.tar.gz 55162003 SHA256 7f0858d204c952fddc402379c187952fcf75dbe5a02b31e51b8a961320f24afa SHA512 51303580a702c1fd1227d8f57c546b6e11de6a87d3ba32123a3e001688c5ff308efa1feaa6da8d2bcff8143fa61726ba9e4aec959a70e82817d628480b0a576f WHIRLPOOL a42cd6a7f0e3619f6408e7f9a923a48cf05c749b945b2e29999344375f146dd408abc774ca153f2d6ec659ebc14229255bee9b850fe182ad5b6f4394313e3a2f
+DIST jdk-8u152-linux-x64.tar.gz 189784266 SHA256 218b3b340c3f6d05d940b817d0270dfe0cfd657a636bad074dcabe0c111961bf SHA512 b0851d46bf0385b7595f8d60da0f06ccdcd59aac75efa9b48635ba77a3e4eb557cbda5585fa5886787a0e549d9e5cfa4a992741349cfc224b36f180907838321 WHIRLPOOL c1d7030f94585725ae4bbf65893456a376ebd5d8ad9cbd63ef7dc86c0b7b6103c98140bbe955234cf8605b422c00d213f9089b56d36f1c920fdb25835ff45e62
+DIST jdk-8u152-macosx-x64.dmg 259130998 SHA256 9f9008e2b05e431838c8ee5f0d54f7715da386bc70b14d4910766c71e9f7923f SHA512 9b3b8ea5119a2f5d3e221244ec07e6da6405041a65fec6299643133a89434d44719e4ccea35498749c00bc400c125dae7a1f4f41fc44d0d6748235bf92601eb8 WHIRLPOOL 0abda8fa87e1b2d525ba401b6b842fc30728c936d05372bb0e2680b602dcd3cc15fc293a1932c716e9904c4d97b9e57a8f7ac66c8ac4080ea342800f4c57542e
+DIST jdk-8u152-macosx-x86_64-demos.zip 55705509 SHA256 3d05061a5c58da669797cd9f8583412eca34e8b0f8779aa6a45b93daac2d2b43 SHA512 5b17f84aeda22a145d8171c8789a8fa1127d1e9b3b6acabdc9e2ad42e4ac5b8c95f2afc0e1736096bec246ca87a22908a5ede492fde34a081984a02382c19ac3 WHIRLPOOL 261e6b89dbb73aa94f4d3d4dacf2353d11a4bae66d446315c0d588de995dee76d7cda9f89fa325656bc8e39657f4d4faafac6f9a06843a12b3045416f93e9969
+DIST jdk-8u152-solaris-sparcv9-demos.tar.gz 9769313 SHA256 2675ad1157ba9a2db3e5d72e8aa658e0f3388731a435b01f890091aaf509f326 SHA512 32e35cb2b3f9e3cb5b5d77a84612fe37f90879e7eb38578af6a922157f12878d1b5f893a3119df055facf7457a5516f502a7da5cb93fa3d5614fdf1f855ecfb8 WHIRLPOOL d38bf520351be78a9eeae4de8696a5fccabb8fd09a9196f14cdd91db457441c341de6854d922e1bcc4d89e1635ac0912e3bd68c166c457b0b86265a617211c0a
+DIST jdk-8u152-solaris-sparcv9.tar.gz 104117809 SHA256 bb23f8813c99b99130e2a7bc076b22712801f19aa600832cd7ce590995ed0ba2 SHA512 9b87d11325e22bfb5f8e852ef4dcd182f091dcedfe71e5b19cc5a7d82f9f7ccb060b53512bc938d0e617648a8aa766bb722690751521b9a2cc3820507342548d WHIRLPOOL 33a11de9b2969eea74251c1dbe217d311ae0db9ff7190c1c9713898212b9c5b537ff5382d15ce27f45bc362901809f2ad7b8a50a3f01904454c9f6be262743d4
+DIST jdk-8u152-solaris-x64-demos.tar.gz 9756596 SHA256 ea6468eca72d715db7e3e4494fb316b25872b91276b156a598a5ea0bd9baf919 SHA512 1aeaf732ad3956ede4baa005f34024750e03919ef81b608229a3df556b47db1255ce027e4278891644433db0c360225a3e81e9a547d298a4b958beb8691f8ff2 WHIRLPOOL f56dec7bc4e156a5058aec0ed7e6274a043dd8069a0b5f95592155a062e133c04dbbe98e1d91ff7e30f71abd863a90022f3fa4363b4fbffd6bb41f5e0701c7e5
+DIST jdk-8u152-solaris-x64.tar.gz 101758540 SHA256 2bf02d98d0eca1ed55fcf274e6254c3e6e71d8e07700fd1ff9e82c44006abace SHA512 4dd9606be347a61a03c0f670915c4e790d4f5eef80a67922342b539dcae7132b3157df04cd33e5f72fdc7e6fcb43e21b3b387e2da159cdfea0feb01183c68aa0 WHIRLPOOL 476c5af0b835643b4d8605deb8f67ef7448bfb0887088cb632a7464d28863b92a9fae2315ef9e454cbd6e1f693910f329dae84acca0d9cb42b4a986e834a1e1e
+EBUILD oracle-jdk-bin-1.8.0.152-r1.ebuild 10432 SHA256 f2c411c6b77216bb31d755c7eac03c844662c0662aac28178c2d5f8ecd233234 SHA512 9530367083792aceb6a0264a9b1df4268b3221f5061624be9d343fe193def4c56b57d503d29543127f64474f3a03c4f1ce4ecdfd20a468ba6c193feaadcda8e6 WHIRLPOOL fd81b7ed4289f962d9e68565c39aaed01896e4b79edcfc70092232e9ced470d1d32f36ad1514ebe01c8fa36edc40d675fac3cb8d40888cc7867ebbf6f90adc6c
 MISC ChangeLog 13800 SHA256 3649ca9854afa818a93a26b740810cfcb6ce7f5aea15edb3b55cf52a8a3939cb SHA512 cf6f333bd218ed574b9916d02354999de051c0fb8a5882c750b75f83e55593a6d72e218ffb1f8cca59b222df04e8501608d4bdeb6e3489fe021a063fd8f49cb2 WHIRLPOOL 6f1bc3d6a22ffc0eb389e4639f7da0066fa676f726d236aea08db38bb2a7969d55a7de2ca36d821ed7fefef69958f6d766f6bf2ea1770dc9e1c8b4978a230083
 MISC ChangeLog-2015 17787 SHA256 37e99da4dfec1171c0701781550ce770f4efa1b32d5af9424bea788b1bbc3139 SHA512 99879d5ef9201cd716ab2f427a2d0e51c33ad255f49b0b995c7b4a128cefb8dcf7af43915ef593672b67cf8d9691fa94af7355d982893465d6e913599f5fcc1c WHIRLPOOL c3a6bde6dbaea52bb0c84d874460742c84341da0239c43ef36e7a58542b854d55c12157ba9b4746444d3128ce149254dcd7ffd80c28457ad5f5a44a9db936a40
 MISC metadata.xml 947 SHA256 381e51e4a062f891dc9df4efc6e8b0e95fcf6ea735b7b5d886f8e8cc2241e8bb SHA512 e75227c3209a5b85ac0d8f3e0f26752bbe88eca1575e00e75be80beedd65b78765a420fefe33571c6ac90412cf1b3db5768f75e8d6e478714d4f177f100fd815 WHIRLPOOL aecb59d7c2554db8493fa01c1fefe639649d064a42b86e97803fee9206fc81391f93317e96de75921d086e1170f1818df334a17d157d0fbdbc19d7ee4feeaf9b
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.144.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.144.ebuild
deleted file mode 100644
index 1e25bc987cec..000000000000
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.144.ebuild
+++ /dev/null
@@ -1,355 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils java-vm-2 prefix versionator
-
-# This URIs need to be updated when bumping!
-JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"
-JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"
-
-# This is a list of archs supported by this update.
-# Currently arm comes and goes.
-AT_AVAILABLE=( amd64 arm arm64 x86 x64-solaris sparc64-solaris x64-macos )
-
-# Sometimes some or all of the demos are missing, this is to not have to rewrite half
-# the ebuild when it happens.
-DEMOS_AVAILABLE=( amd64 arm arm64 x86 x64-solaris sparc64-solaris x64-macos )
-
-if [[ "$(get_version_component_range 4)" == 0 ]] ; then
-	S_PV="$(get_version_component_range 1-3)"
-else
-	MY_PV_EXT="u$(get_version_component_range 4)"
-	S_PV="$(get_version_component_range 1-4)"
-fi
-
-MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
-
-AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz"
-AT_arm="jdk-${MY_PV}-linux-arm32-vfp-hflt.tar.gz"
-AT_arm64="jdk-${MY_PV}-linux-arm64-vfp-hflt.tar.gz"
-AT_x86="jdk-${MY_PV}-linux-i586.tar.gz"
-AT_x64_solaris="jdk-${MY_PV}-solaris-x64.tar.gz"
-AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.tar.gz"
-AT_x64_macos="jdk-${MY_PV}-macosx-x64.dmg"
-
-DEMOS_amd64="jdk-${MY_PV}-linux-x64-demos.tar.gz"
-DEMOS_arm="jdk-${MY_PV}-linux-arm32-vfp-hflt-demos.tar.gz"
-DEMOS_arm64="jdk-${MY_PV}-linux-arm64-vfp-hflt-demos.tar.gz"
-DEMOS_x86="jdk-${MY_PV}-linux-i586-demos.tar.gz"
-DEMOS_x64_solaris="jdk-${MY_PV}-solaris-amd64-demos.tar.gz"
-DEMOS_sparc64_solaris="jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz"
-DEMOS_x64_macos="jdk-${MY_PV}-macosx-x86_64-demos.zip"
-
-JCE_DIR="UnlimitedJCEPolicyJDK8"
-JCE_FILE="jce_policy-8.zip"
-
-DESCRIPTION="Oracle's Java SE Development Kit"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-for d in "${AT_AVAILABLE[@]}"; do
-	SRC_URI+=" ${d}? ( $(eval "echo \${$(echo AT_${d/-/_})}")"
-	if has ${d} "${DEMOS_AVAILABLE[@]}"; then
-		SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )"
-	fi
-	SRC_URI+=" )"
-done
-unset d
-SRC_URI+=" jce? ( ${JCE_FILE} )"
-
-LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
-SLOT="1.8"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
-IUSE="alsa commercial cups derby doc examples +fontconfig headless-awt javafx jce nsplugin selinux source visualvm"
-REQUIRED_USE="javafx? ( alsa fontconfig )"
-
-RESTRICT="fetch preserve-libs strip"
-QA_PREBUILT="*"
-
-# NOTES:
-#
-# * cups is dlopened.
-#
-# * libpng is also dlopened but only by libsplashscreen, which isn't
-#   important, so we can exclude that.
-#
-# * We still need to work out the exact AWT and JavaFX dependencies
-#   under MacOS. It doesn't appear to use many, if any, of the
-#   dependencies below.
-#
-RDEPEND="!x64-macos? (
-		!headless-awt? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-			x11-libs/libXtst
-		)
-		javafx? (
-			dev-libs/glib:2
-			dev-libs/libxml2:2
-			dev-libs/libxslt
-			media-libs/freetype:2
-			x11-libs/cairo
-			x11-libs/gtk+:2
-			x11-libs/libX11
-			x11-libs/libXtst
-			x11-libs/libXxf86vm
-			x11-libs/pango
-			virtual/opengl
-		)
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	doc? ( dev-java/java-sdk-docs:${SLOT} )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	!prefix? ( sys-libs/glibc:* )
-	selinux? ( sec-policy/selinux-java )"
-
-DEPEND="app-arch/zip
-	jce? ( app-arch/unzip )
-	examples? ( x64-macos? ( app-arch/unzip ) )"
-
-S="${WORKDIR}/jdk"
-
-check_tarballs_available() {
-	local uri=$1; shift
-	local dl= unavailable=
-	for dl in "${@}" ; do
-		[[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}"
-	done
-
-	if [[ -n "${unavailable}" ]] ; then
-		if [[ -z ${_check_tarballs_available_once} ]] ; then
-			einfo
-			einfo "Oracle requires you to download the needed files manually after"
-			einfo "accepting their license through a javascript capable web browser."
-			einfo
-			_check_tarballs_available_once=1
-		fi
-		einfo "Download the following files:"
-		for dl in ${unavailable}; do
-			einfo "  ${dl}"
-		done
-		einfo "at '${uri}'"
-		einfo "and move them to '${DISTDIR}'"
-		einfo
-		einfo "If the above mentioned urls do not point to the correct version anymore,"
-		einfo "please download the files from Oracle's java download archive:"
-		einfo
-		einfo "   http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html#jdk-${MY_PV}-oth-JPR"
-		einfo
-	fi
-}
-
-pkg_nofetch() {
-	local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") )
-	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
-		distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") )
-	fi
-	check_tarballs_available "${JDK_URI}" "${distfiles[@]}"
-	use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}"
-}
-
-src_unpack() {
-	if use x64-macos ; then
-		pushd "${T}" > /dev/null || die
-		mkdir dmgmount || die
-		hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
-			-mountpoint "${T}"/dmgmount || die
-		printf -v update "%02d" $(get_version_component_range 4) || die
-		xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ ${update}.pkg || die
-		hdiutil detach "${T}"/dmgmount || die
-		zcat jdk1${MY_PV%u*}0${update}.pkg/Payload | cpio -idv || die
-		mv Contents/Home "${WORKDIR}"/jdk${MY_PV} || die
-		popd > /dev/null || die
-		use jce && unpack "${JCE_FILE}"
-	else
-		default
-	fi
-
-	# Upstream is changing their versioning scheme every release around 1.8.0.*;
-	# to stop having to change it over and over again, just wildcard match and
-	# live a happy life instead of trying to get this new jdk1.8.0_05 to work.
-	mv "${WORKDIR}"/jdk* "${S}" || die
-}
-
-src_prepare() {
-	if use jce ; then
-		mv "${WORKDIR}"/${JCE_DIR} jre/lib/security/ || die
-	fi
-
-	default
-
-	if [[ -n ${JAVA_PKG_STRICT} ]] ; then
-		# Mark this binary early to run it now.
-		pax-mark m ./bin/javap
-
-		eqawarn "Ensure that this only calls trackJavaUsage(). If not, see bug #559936."
-		eqawarn
-		eqawarn "$(./bin/javap -J-Duser.home=${T} -c sun.misc.PostVMInitHook || die)"
-	fi
-
-	# Remove the hook that calls Oracle's evil usage tracker. Not just
-	# because it's evil but because it breaks the sandbox during builds
-	# and we can't find any other feasible way to disable it or make it
-	# write somewhere else. See bug #559936 for details.
-	zip -d jre/lib/rt.jar sun/misc/PostVMInitHook.class || die
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
-
-	# Create files used as storage for system preferences.
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || die
-
-	if ! use alsa ; then
-		rm -vf jre/lib/*/libjsoundalsa.* || die
-	fi
-
-	if ! use commercial; then
-		rm -vfr lib/missioncontrol jre/lib/jfr* || die
-	fi
-
-	if use headless-awt ; then
-		rm -vf {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
-		   {,jre/}bin/{javaws,policytool} \
-		   bin/appletviewer || die
-	fi
-
-	if ! use javafx ; then
-		rm -vf jre/lib/*/lib*{decora,fx,glass,prism}* \
-		   jre/lib/*/libgstreamer-lite.* {,jre/}lib/{,ext/}*fx* \
-		   bin/*javafx* bin/javapackager || die
-	fi
-
-	if ! use nsplugin ; then
-		rm -vf jre/lib/*/libnpjp2.* || die
-	else
-		local nsplugin=$(echo jre/lib/*/libnpjp2.*)
-	fi
-
-	# Even though plugins linked against multiple ffmpeg versions are
-	# provided, they generally lag behind what Gentoo has available.
-	rm -vf jre/lib/*/libavplugin* || die
-
-	# Packaged as dev-util/visualvm but some users prefer this version.
-	use visualvm || find -name "*visualvm*" -exec rm -vfr {} + || die
-
-	dodoc COPYRIGHT
-	dodir "${dest}"
-	cp -pPR bin include jre lib man "${ddest}" || die
-
-	if use derby ; then
-		cp -pPR	db "${ddest}" || die
-	fi
-
-	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}" ; then
-		cp -pPR demo sample "${ddest}" || die
-	fi
-
-	if use jce ; then
-		dodir "${dest}"/jre/lib/security/strong-jce
-		mv "${ddest}"/jre/lib/security/US_export_policy.jar \
-			"${ddest}"/jre/lib/security/strong-jce || die
-		mv "${ddest}"/jre/lib/security/local_policy.jar \
-			"${ddest}"/jre/lib/security/strong-jce || die
-		dosym "${dest}"/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
-			"${dest}"/jre/lib/security/US_export_policy.jar
-		dosym "${dest}"/jre/lib/security/${JCE_DIR}/local_policy.jar \
-			"${dest}"/jre/lib/security/local_policy.jar
-	fi
-
-	if use nsplugin ; then
-		local nsplugin_link=${nsplugin##*/}
-		nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
-		dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
-	fi
-
-	if use source ; then
-		cp -v src.zip "${ddest}" || die
-
-		if use javafx ; then
-			cp -v javafx-src.zip "${ddest}" || die
-		fi
-	fi
-
-	if [[ -d jre/lib/desktop ]] ; then
-		# Install desktop file for the Java Control Panel.
-		# Using ${PN}-${SLOT} to prevent file collision with jre and or
-		# other slots.  make_desktop_entry can't be used as ${P} would
-		# end up in filename.
-		newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
-			sun-jcontrol-${PN}-${SLOT}.png || die
-		sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \
-			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
-			-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
-			-e "s#Application;##" \
-			-e "/Encoding/d" \
-			jre/lib/desktop/applications/sun_java.desktop \
-			> "${T}"/jcontrol-${PN}-${SLOT}.desktop || die
-		domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
-	fi
-
-	# Prune all fontconfig files so libfontconfig will be used and only install
-	# a Gentoo specific one if fontconfig is disabled.
-	# http://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
-	rm "${ddest}"/jre/lib/fontconfig.* || die
-	if ! use fontconfig ; then
-		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
-		eprefixify "${T}"/fontconfig.properties
-		insinto "${dest}"/jre/lib/
-		doins "${T}"/fontconfig.properties
-	fi
-
-	# This needs to be done before CDS - #215225
-	java-vm_set-pax-markings "${ddest}"
-
-	# see bug #207282
-	einfo "Creating the Class Data Sharing archives"
-	case ${ARCH} in
-		arm|ia64)
-			${ddest}/bin/java -client -Xshare:dump || die
-			;;
-		x86)
-			${ddest}/bin/java -client -Xshare:dump || die
-			# limit heap size for large memory on x86 #467518
-			# this is a workaround and shouldn't be needed.
-			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
-			;;
-		*)
-			${ddest}/bin/java -server -Xshare:dump || die
-			;;
-	esac
-
-	# Remove empty dirs we might have copied.
-	find "${D}" -type d -empty -exec rmdir -v {} + || die
-
-	if use x64-macos ; then
-		# Fix miscellaneous install_name issues.
-		local lib
-		for lib in decora_sse glass prism_{common,es2,sw} ; do
-			lib=lib${lib}.dylib
-			einfo "Fixing self-reference of ${lib}"
-			install_name_tool \
-				-id "${EPREFIX}${dest}/jre/lib/${lib}" \
-				"${ddest}"/jre/lib/${lib} || die
-		done
-	fi
-
-	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if ! use headless-awt && ! use javafx; then
-		ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
-		ewarn "require this and they may fail with a confusing error message."
-	fi
-}
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.152-r1.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.152-r1.ebuild
new file mode 100644
index 000000000000..96e7ab522852
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.152-r1.ebuild
@@ -0,0 +1,334 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils java-vm-2 prefix versionator
+
+# This URI needs to be updated when bumping!
+JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"
+
+# This is a list of archs supported by this update.
+# Currently arm comes and goes.
+AT_AVAILABLE=( amd64 arm arm64 x86 x64-solaris sparc64-solaris x64-macos )
+
+# Sometimes some or all of the demos are missing, this is to not have to rewrite half
+# the ebuild when it happens.
+DEMOS_AVAILABLE=( amd64 arm arm64 x86 x64-solaris sparc64-solaris x64-macos )
+
+if [[ "$(get_version_component_range 4)" == 0 ]] ; then
+	S_PV="$(get_version_component_range 1-3)"
+else
+	MY_PV_EXT="u$(get_version_component_range 4)"
+	S_PV="$(get_version_component_range 1-4)"
+fi
+
+MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
+
+AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz"
+AT_arm="jdk-${MY_PV}-linux-arm32-vfp-hflt.tar.gz"
+AT_arm64="jdk-${MY_PV}-linux-arm64-vfp-hflt.tar.gz"
+AT_x86="jdk-${MY_PV}-linux-i586.tar.gz"
+AT_x64_solaris="jdk-${MY_PV}-solaris-x64.tar.gz"
+AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.tar.gz"
+AT_x64_macos="jdk-${MY_PV}-macosx-x64.dmg"
+
+DEMOS_amd64="jdk-${MY_PV}-linux-x64-demos.tar.gz"
+DEMOS_arm="jdk-${MY_PV}-linux-arm32-vfp-hflt-demos.tar.gz"
+DEMOS_arm64="jdk-${MY_PV}-linux-arm64-vfp-hflt-demos.tar.gz"
+DEMOS_x86="jdk-${MY_PV}-linux-i586-demos.tar.gz"
+DEMOS_x64_solaris="jdk-${MY_PV}-solaris-x64-demos.tar.gz"
+DEMOS_sparc64_solaris="jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz"
+DEMOS_x64_macos="jdk-${MY_PV}-macosx-x86_64-demos.zip"
+
+DESCRIPTION="Oracle's Java SE Development Kit"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+for d in "${AT_AVAILABLE[@]}"; do
+	SRC_URI+=" ${d}? ( $(eval "echo \${$(echo AT_${d/-/_})}")"
+	if has ${d} "${DEMOS_AVAILABLE[@]}"; then
+		SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )"
+	fi
+	SRC_URI+=" )"
+done
+unset d
+
+LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
+SLOT="1.8"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
+IUSE="alsa commercial cups derby doc examples +fontconfig headless-awt javafx jce nsplugin selinux source visualvm"
+REQUIRED_USE="javafx? ( alsa fontconfig )"
+
+RESTRICT="fetch preserve-libs strip"
+QA_PREBUILT="*"
+
+# NOTES:
+#
+# * cups is dlopened.
+#
+# * libpng is also dlopened but only by libsplashscreen, which isn't
+#   important, so we can exclude that.
+#
+# * We still need to work out the exact AWT and JavaFX dependencies
+#   under MacOS. It doesn't appear to use many, if any, of the
+#   dependencies below.
+#
+RDEPEND="!x64-macos? (
+		!headless-awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			x11-libs/libXtst
+		)
+		javafx? (
+			dev-libs/glib:2
+			dev-libs/libxml2:2
+			dev-libs/libxslt
+			media-libs/freetype:2
+			x11-libs/cairo
+			x11-libs/gtk+:2
+			x11-libs/libX11
+			x11-libs/libXtst
+			x11-libs/libXxf86vm
+			x11-libs/pango
+			virtual/opengl
+		)
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	doc? ( dev-java/java-sdk-docs:${SLOT} )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	!prefix? ( sys-libs/glibc:* )
+	selinux? ( sec-policy/selinux-java )"
+
+DEPEND="app-arch/zip
+	examples? ( x64-macos? ( app-arch/unzip ) )"
+
+S="${WORKDIR}/jdk"
+
+check_tarballs_available() {
+	local uri=$1; shift
+	local dl= unavailable=
+	for dl in "${@}" ; do
+		[[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}"
+	done
+
+	if [[ -n "${unavailable}" ]] ; then
+		if [[ -z ${_check_tarballs_available_once} ]] ; then
+			einfo
+			einfo "Oracle requires you to download the needed files manually after"
+			einfo "accepting their license through a javascript capable web browser."
+			einfo
+			_check_tarballs_available_once=1
+		fi
+		einfo "Download the following files:"
+		for dl in ${unavailable}; do
+			einfo "  ${dl}"
+		done
+		einfo "at '${uri}'"
+		einfo "and move them to '${DISTDIR}'"
+		einfo
+		einfo "If the above mentioned urls do not point to the correct version anymore,"
+		einfo "please download the files from Oracle's java download archive:"
+		einfo
+		einfo "   http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html#jdk-${MY_PV}-oth-JPR"
+		einfo
+	fi
+}
+
+pkg_nofetch() {
+	local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") )
+	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
+		distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") )
+	fi
+	check_tarballs_available "${JDK_URI}" "${distfiles[@]}"
+}
+
+src_unpack() {
+	if use x64-macos ; then
+		pushd "${T}" > /dev/null || die
+		mkdir dmgmount || die
+		hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
+			-mountpoint "${T}"/dmgmount || die
+		printf -v update "%02d" $(get_version_component_range 4) || die
+		xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ ${update}.pkg || die
+		hdiutil detach "${T}"/dmgmount || die
+		zcat jdk1${MY_PV%u*}0${update}.pkg/Payload | cpio -idv || die
+		mv Contents/Home "${WORKDIR}"/jdk${MY_PV} || die
+		popd > /dev/null || die
+	else
+		default
+	fi
+
+	# Upstream is changing their versioning scheme every release around 1.8.0.*;
+	# to stop having to change it over and over again, just wildcard match and
+	# live a happy life instead of trying to get this new jdk1.8.0_05 to work.
+	mv "${WORKDIR}"/jdk* "${S}" || die
+}
+
+src_prepare() {
+	default
+
+	if [[ -n ${JAVA_PKG_STRICT} ]] ; then
+		# Mark this binary early to run it now.
+		pax-mark m ./bin/javap
+
+		eqawarn "Ensure that this only calls trackJavaUsage(). If not, see bug #559936."
+		eqawarn
+		eqawarn "$(./bin/javap -J-Duser.home=${T} -c sun.misc.PostVMInitHook || die)"
+	fi
+
+	# Remove the hook that calls Oracle's evil usage tracker. Not just
+	# because it's evil but because it breaks the sandbox during builds
+	# and we can't find any other feasible way to disable it or make it
+	# write somewhere else. See bug #559936 for details.
+	zip -d jre/lib/rt.jar sun/misc/PostVMInitHook.class || die
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+
+	# Create files used as storage for system preferences.
+	mkdir jre/.systemPrefs || die
+	touch jre/.systemPrefs/.system.lock || die
+	touch jre/.systemPrefs/.systemRootModFile || die
+
+	if ! use alsa ; then
+		rm -vf jre/lib/*/libjsoundalsa.* || die
+	fi
+
+	if ! use commercial; then
+		rm -vfr lib/missioncontrol jre/lib/jfr* || die
+	fi
+
+	if use headless-awt ; then
+		rm -vf {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
+		   {,jre/}bin/{javaws,policytool} \
+		   bin/appletviewer || die
+	fi
+
+	if ! use javafx ; then
+		rm -vf jre/lib/*/lib*{decora,fx,glass,prism}* \
+		   jre/lib/*/libgstreamer-lite.* {,jre/}lib/{,ext/}*fx* \
+		   bin/*javafx* bin/javapackager || die
+	fi
+
+	if ! use nsplugin ; then
+		rm -vf jre/lib/*/libnpjp2.* || die
+	else
+		local nsplugin=$(echo jre/lib/*/libnpjp2.*)
+	fi
+
+	# Even though plugins linked against multiple ffmpeg versions are
+	# provided, they generally lag behind what Gentoo has available.
+	rm -vf jre/lib/*/libavplugin* || die
+
+	# Packaged as dev-util/visualvm but some users prefer this version.
+	use visualvm || find -name "*visualvm*" -exec rm -vfr {} + || die
+
+	dodoc COPYRIGHT
+	dodir "${dest}"
+	cp -pPR bin include jre lib man "${ddest}" || die
+
+	if use derby ; then
+		cp -pPR	db "${ddest}" || die
+	fi
+
+	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}" ; then
+		cp -pPR demo sample "${ddest}" || die
+	fi
+
+	ln -s policy/$(usex jce unlimited limited)/{US_export,local}_policy.jar \
+		"${ddest}"/jre/lib/security/ || die
+
+	if use nsplugin ; then
+		local nsplugin_link=${nsplugin##*/}
+		nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
+		dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
+	fi
+
+	if use source ; then
+		cp -v src.zip "${ddest}" || die
+
+		if use javafx ; then
+			cp -v javafx-src.zip "${ddest}" || die
+		fi
+	fi
+
+	if [[ -d jre/lib/desktop ]] ; then
+		# Install desktop file for the Java Control Panel.
+		# Using ${PN}-${SLOT} to prevent file collision with jre and or
+		# other slots.  make_desktop_entry can't be used as ${P} would
+		# end up in filename.
+		newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
+			sun-jcontrol-${PN}-${SLOT}.png || die
+		sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \
+			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
+			-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
+			-e "s#Application;##" \
+			-e "/Encoding/d" \
+			jre/lib/desktop/applications/sun_java.desktop \
+			> "${T}"/jcontrol-${PN}-${SLOT}.desktop || die
+		domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
+	fi
+
+	# Prune all fontconfig files so libfontconfig will be used and only install
+	# a Gentoo specific one if fontconfig is disabled.
+	# http://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
+	rm "${ddest}"/jre/lib/fontconfig.* || die
+	if ! use fontconfig ; then
+		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
+		eprefixify "${T}"/fontconfig.properties
+		insinto "${dest}"/jre/lib/
+		doins "${T}"/fontconfig.properties
+	fi
+
+	# This needs to be done before CDS - #215225
+	java-vm_set-pax-markings "${ddest}"
+
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	case ${ARCH} in
+		arm|ia64)
+			${ddest}/bin/java -client -Xshare:dump || die
+			;;
+		x86)
+			${ddest}/bin/java -client -Xshare:dump || die
+			# limit heap size for large memory on x86 #467518
+			# this is a workaround and shouldn't be needed.
+			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
+			;;
+		*)
+			${ddest}/bin/java -server -Xshare:dump || die
+			;;
+	esac
+
+	# Remove empty dirs we might have copied.
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	if use x64-macos ; then
+		# Fix miscellaneous install_name issues.
+		local lib
+		for lib in decora_sse glass prism_{common,es2,sw} ; do
+			lib=lib${lib}.dylib
+			einfo "Fixing self-reference of ${lib}"
+			install_name_tool \
+				-id "${EPREFIX}${dest}/jre/lib/${lib}" \
+				"${ddest}"/jre/lib/${lib} || die
+		done
+	fi
+
+	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+
+	if ! use headless-awt && ! use javafx; then
+		ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
+		ewarn "require this and they may fail with a confusing error message."
+	fi
+}
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index e2edb93607e2..42af440de73a 100644
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -1,9 +1,8 @@
 AUX fontconfig.Gentoo.properties 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6
 AUX oracle-jre-bin.env.sh 785 SHA256 77cc6b99e02f7f2837b649d002129d3a1ef90ac047afaebbcdb2925e5895e747 SHA512 fee30a728d97822e0189e6687ac285e72270207d43ae2859159cbd212b3897cfa153aa27f66b06ee704ac24637f2d88b579c3aedc4026fd8508d59622e68b0e6 WHIRLPOOL fa163eedb0139bbe01644739609b7678ca6050c890233c5d5deed7e0810714d529e033bc5615f634a2d60b49365d9981a928c05c1a699a6a0c8996b296c98249
-DIST jce_policy-8.zip 8409 SHA256 f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59 SHA512 abbaa81a35f904ec61b4cf3c2d1ca8c8d49e53bb248e698185eea906939d68f5063412800585ec74027aab1012ef189aebe1dc99fe8ef4230a0ecb0b527f88e5 WHIRLPOOL 8c9ce1ea4673b75fa6271b74e598880f98361d5d2c9c25439fa0af3d07cfeb871b39682dae4e38160f49770b1fec953162e451b9b2cf44d2c72a226944212bcc
-DIST jre-8u144-linux-i586.tar.gz 78658631 SHA256 9ac5b0d6cda9279a4959a6eb635d849d745a37dafc24666539d1c8f7d76ab77a SHA512 038e367fb00007e6b0f70ed3e48f318cfcb4144ef88b3a33d6c152cb186ede43622bc5d2fb40b39c695fdbe1fa735ab97f501a6ad0ed0a6cf48b286cc08e9ceb WHIRLPOOL 0bac95fc572bb1466b3f69c7e3dd03a77611366bc7c8076eb2feac41ecfde9a4aea6bb60b52b9db1dc0ec2bffcf553abe4ac4b1ffd28f7f3e1b6b71cd8ffc2fb
-DIST jre-8u144-linux-x64.tar.gz 75922776 SHA256 4e6e11aad54ae3c716a5607ee88d81f3f1e8b5b23ee474b0272dba351ee9f28a SHA512 fba5a5f5959746cb76a71847f5c6e3142816940d18c0022c0baf59611d43b24fae1052eeb217f09e840b5c393118260fb99dd38d1db7e74bb07ab0c34c2e1d60 WHIRLPOOL ac1921780076ff7ab5be5b942d5be0bab7fe12c027f1564b91734086d14c5a0da6b66d137034d7ee0318c4f72cb843013488591d1066a5f55c66dd4f53561a6f
-EBUILD oracle-jre-bin-1.8.0.144.ebuild 7192 SHA256 42b4605835176fc8e924d3b57688daaff1ab892c9e39ff0fcd6e9f5a867c7cd8 SHA512 8fb779937cb7cf443ca8c22230e98e5f2116ce8b5e6616239ee52f6f615c1c8f348dfcb96b5ff2cbde12885f1765a8049c265e3190776f3e7fb0ccc38d4eae5b WHIRLPOOL bff60b6fce8bcf801cb900edaa8fbaa5555df58a85a6eb6d56955b926187151663b6ee68fe44cf6555496aecc8a2b28e1c0862794417229324d1f5a0418c227d
+DIST jre-8u152-linux-i586.tar.gz 83131659 SHA256 1d0c9202fbed3136d46674547b92d467e28b6256dce5d1793c55c284c285a14d SHA512 8bd655ae97c333ed57991ed6d13d2c2647f85e5a1c853dd76031b8e7689db9a1b183bc665acc5b9f989139b34300ac65ab65c80e18234d6d1b06a4512fc4e542 WHIRLPOOL ea908a4efed078433cfb21ae6f015292ad0910e716e3f1a8748336e44484f0848dc317518e4fac04fd38aa6338f43b389c586b1cb6164639830f0024313688b7
+DIST jre-8u152-linux-x64.tar.gz 80061016 SHA256 ed04ffbf8050a69b15f02c51a2cae8e0de9362e7f6fe8995b1c39c613fc20ede SHA512 7c58ff2c3ac9af423ffab0ebfbfa7b4842072f6554569d76a99f8c82fa6935e36dbcf811f9c5510d71fc87db9520e684d877d99cae95f4874578ba42157ce85d WHIRLPOOL 7a3f4e34d70b4ccc850df754084448065c844973d77dec98ff57c2c8fa6338417b4e3f732995fcbc4e66cd8cbc34a2306aff11c4579749d66e33538c0d724682
+EBUILD oracle-jre-bin-1.8.0.152-r1.ebuild 6433 SHA256 ed549ed2892862187e85e3a298e0c51788e8939dcc717a140d875aec7fbcb57a SHA512 2b26c0a9250fa719b1da5370b8cb632a6bcf6f2336cabe21d086ed73030757776d94de13e3be8a64b1002dfcf3af61501f6a08eb6e903b79888df0e9b96c9908 WHIRLPOOL a980ec648242f82885f84fe576b1d370fa086d3d6d7e414691ce08e9d9190bb5dc970ee615a843bb9b6a09e6379fdf1af0dc95d31402ef72606eee2070935053
 MISC ChangeLog 11392 SHA256 39a831c8202ef166f0d803392aaf33a5a6601418ca79f8ecaa6c83b68d9502a7 SHA512 0ddcfde062ed95e4a63eab563ea82e8d3056ecae7a6846932cebc632678ecd67471642f4855034eeeff1576309d7980f0b29a5ef7258b403803e39cf581d0ec5 WHIRLPOOL c35c02a9ec841f374ee9ab380945c7a9fb3368a9383191e20e0ec790b16a68d704641be1c5793a25fcd6a91803ea6039ce34d194851fa8ce8238832d2d8375c6
 MISC ChangeLog-2015 14832 SHA256 8c74c97192cc9a77e2b2b78a095c8dc32cf08bf6237e2258d5cd130ed763d2fa SHA512 f48a6130827e7069f75f02aaf80121b8c0b7610dfff47b23e99e373222dd6cfcd45281efa5ec7e9a216af5d6119b261585a3071d21d3cb0156acfaf240017d20 WHIRLPOOL ddc5ae2510ec21d4ab0e197a6bfef8d84f803312bcb8a95df409f8bbbd3cc2e8f7f004bbe54419c2841386ae67fe5651645cb326f590f95c7cd34d04d1beab78
 MISC metadata.xml 743 SHA256 d3a8894bd17fccb6162d8d164bae71ca97c90f60ff1ecc64cc414d1daf7d15c0 SHA512 31515728907e1fdc96fe6a27f62585c528370a544a306b4a3a26cf86d8a248211e3852e4a532d9a59be0e534393e6f11bd46df39b439084eb1234d7a6bea4d42 WHIRLPOOL 92faa7971ee6177414168ce1c8a12c9af87653e30f51b98d2d0a16e63f7d35fbb3467a83547f0c59a7f3665aee9ed915a806539b4b0501babb3e8de210b28207
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.144.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.144.ebuild
deleted file mode 100644
index 0829cfb55ff3..000000000000
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.144.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils java-vm-2 prefix versionator
-
-# This URIs need updating when bumping!
-JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html"
-JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"
-
-if [[ "$(get_version_component_range 4)" == 0 ]] ; then
-	S_PV="$(get_version_component_range 1-3)"
-else
-	MY_PV_EXT="u$(get_version_component_range 4)"
-	S_PV="$(get_version_component_range 1-4)"
-fi
-
-MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
-
-AT_amd64="jre-${MY_PV}-linux-x64.tar.gz"
-AT_x86="jre-${MY_PV}-linux-i586.tar.gz"
-
-JCE_DIR="UnlimitedJCEPolicyJDK8"
-JCE_FILE="jce_policy-8.zip"
-
-DESCRIPTION="Oracle's Java SE Runtime Environment"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-SRC_URI="
-	amd64? ( ${AT_amd64} )
-	x86? ( ${AT_x86} )
-	jce? ( ${JCE_FILE} )"
-
-LICENSE="Oracle-BCLA-JavaSE"
-SLOT="1.8"
-KEYWORDS="amd64 x86"
-IUSE="alsa commercial cups +fontconfig headless-awt javafx jce nsplugin selinux"
-
-RESTRICT="fetch preserve-libs strip"
-QA_PREBUILT="*"
-
-# NOTES:
-#
-# * cups is dlopened.
-#
-# * libpng is also dlopened but only by libsplashscreen, which isn't
-#   important, so we can exclude that.
-#
-# * We still need to work out the exact AWT and JavaFX dependencies
-#   under MacOS. It doesn't appear to use many, if any, of the
-#   dependencies below.
-#
-RDEPEND="!x64-macos? (
-		!headless-awt? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-			x11-libs/libXtst
-		)
-		javafx? (
-			dev-libs/glib:2
-			dev-libs/libxml2:2
-			dev-libs/libxslt
-			media-libs/freetype:2
-			x11-libs/cairo
-			x11-libs/gtk+:2
-			x11-libs/libX11
-			x11-libs/libXtst
-			x11-libs/libXxf86vm
-			x11-libs/pango
-			virtual/opengl
-		)
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	!prefix? ( sys-libs/glibc:* )
-	selinux? ( sec-policy/selinux-java )"
-
-DEPEND="app-arch/zip
-	jce? ( app-arch/unzip )"
-
-S="${WORKDIR}/jre"
-
-pkg_nofetch() {
-	local AT_ARCH="AT_${ARCH}"
-	local AT="${!AT_ARCH}"
-
-	einfo "Please download '${AT}' from:"
-	einfo "'${JRE_URI}'"
-	einfo "and move it to '${DISTDIR}'"
-
-	if use jce; then
-		einfo "Also download '${JCE_FILE}' from:"
-		einfo "'${JCE_URI}'"
-		einfo "and move it to '${DISTDIR}'"
-	fi
-
-	einfo
-	einfo "If the above mentioned urls do not point to the correct version anymore,"
-	einfo "please download the files from Oracle's java download archive:"
-	einfo
-	einfo "   http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html#jre-${MY_PV}-oth-JPR"
-	einfo
-
-}
-
-src_unpack() {
-	default
-
-	# Upstream is changing their versioning scheme every release around 1.8.0.*;
-	# to stop having to change it over and over again, just wildcard match and
-	# live a happy life instead of trying to get this new jre1.8.0_05 to work.
-	mv "${WORKDIR}"/jre* "${S}" || die
-}
-
-src_prepare() {
-	if use jce ; then
-		mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die
-	fi
-
-	default
-
-	# Remove the hook that calls Oracle's evil usage tracker. Not just
-	# because it's evil but because it breaks the sandbox during builds
-	# and we can't find any other feasible way to disable it or make it
-	# write somewhere else. See bug #559936 for details.
-	zip -d lib/rt.jar sun/misc/PostVMInitHook.class || die
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
-
-	# Create files used as storage for system preferences.
-	mkdir .systemPrefs || die
-	touch .systemPrefs/.system.lock || die
-	touch .systemPrefs/.systemRootModFile || die
-
-	if ! use alsa ; then
-		rm -vf lib/*/libjsoundalsa.* || die
-	fi
-
-	if ! use commercial; then
-		rm -vfr lib/jfr* || die
-	fi
-
-	if use headless-awt ; then
-		rm -vf lib/*/lib*{[jx]awt,splashscreen}* \
-		   bin/{javaws,policytool} || die
-	fi
-
-	if ! use javafx ; then
-		rm -vf lib/*/lib*{decora,fx,glass,prism}* \
-		   lib/*/libgstreamer-lite.* lib/{,ext/}*fx* || die
-	fi
-
-	if ! use nsplugin ; then
-		rm -vf lib/*/libnpjp2.* || die
-	else
-		local nsplugin=$(echo lib/*/libnpjp2.*)
-	fi
-
-	# Even though plugins linked against multiple ffmpeg versions are
-	# provided, they generally lag behind what Gentoo has available.
-	rm -vf lib/*/libavplugin* || die
-
-	dodoc COPYRIGHT
-	dodir "${dest}"
-	cp -pPR	bin lib man "${ddest}" || die
-
-	if use jce ; then
-		dodir ${dest}/lib/security/strong-jce
-		mv "${ddest}"/lib/security/US_export_policy.jar \
-			"${ddest}"/lib/security/strong-jce || die
-		mv "${ddest}"/lib/security/local_policy.jar \
-			"${ddest}"/lib/security/strong-jce || die
-		dosym "${dest}"/lib/security/${JCE_DIR}/US_export_policy.jar \
-			"${dest}"/lib/security/US_export_policy.jar
-		dosym "${dest}"/lib/security/${JCE_DIR}/local_policy.jar \
-			"${dest}"/lib/security/local_policy.jar
-	fi
-
-	if use nsplugin ; then
-		local nsplugin_link=${nsplugin##*/}
-		nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
-		dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
-	fi
-
-	# Install desktop file for the Java Control Panel.
-	# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
-	# make_desktop_entry can't be used as ${P} would end up in filename.
-	newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
-		sun-jcontrol-${PN}-${SLOT}.png || die
-	sed -e "s#Name=.*#Name=Java Control Panel for Oracle JRE ${SLOT}#" \
-		-e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \
-		-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
-		-e "s#Application;##" \
-		-e "/Encoding/d" \
-		lib/desktop/applications/sun_java.desktop > \
-		"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
-	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
-
-	# Prune all fontconfig files so libfontconfig will be used and only install
-	# a Gentoo specific one if fontconfig is disabled.
-	# http://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
-	rm "${ddest}"/lib/fontconfig.* || die
-	if ! use fontconfig ; then
-		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
-		eprefixify "${T}"/fontconfig.properties
-		insinto "${dest}"/lib/
-		doins "${T}"/fontconfig.properties
-	fi
-
-	# This needs to be done before CDS - #215225
-	java-vm_set-pax-markings "${ddest}"
-
-	# see bug #207282
-	einfo "Creating the Class Data Sharing archives"
-	case ${ARCH} in
-		arm|ia64)
-			${ddest}/bin/java -client -Xshare:dump || die
-			;;
-		x86)
-			${ddest}/bin/java -client -Xshare:dump || die
-			# limit heap size for large memory on x86 #467518
-			# this is a workaround and shouldn't be needed.
-			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
-			;;
-		*)
-			${ddest}/bin/java -server -Xshare:dump || die
-			;;
-	esac
-
-	# Remove empty dirs we might have copied.
-	find "${D}" -type d -empty -exec rmdir -v {} + || die
-
-	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if ! use headless-awt && ! use javafx; then
-		ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
-		ewarn "require this and they may fail with a confusing error message."
-	fi
-}
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.152-r1.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.152-r1.ebuild
new file mode 100644
index 000000000000..cdc8dfd0e2db
--- /dev/null
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.152-r1.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils java-vm-2 prefix versionator
+
+# This URI needs to be updated when bumping!
+JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html"
+
+if [[ "$(get_version_component_range 4)" == 0 ]] ; then
+	S_PV="$(get_version_component_range 1-3)"
+else
+	MY_PV_EXT="u$(get_version_component_range 4)"
+	S_PV="$(get_version_component_range 1-4)"
+fi
+
+MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
+
+AT_amd64="jre-${MY_PV}-linux-x64.tar.gz"
+AT_x86="jre-${MY_PV}-linux-i586.tar.gz"
+
+DESCRIPTION="Oracle's Java SE Runtime Environment"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+SRC_URI="
+	amd64? ( ${AT_amd64} )
+	x86? ( ${AT_x86} )"
+
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="1.8"
+KEYWORDS="amd64 x86"
+IUSE="alsa commercial cups +fontconfig headless-awt javafx jce nsplugin selinux"
+
+RESTRICT="fetch preserve-libs strip"
+QA_PREBUILT="*"
+
+# NOTES:
+#
+# * cups is dlopened.
+#
+# * libpng is also dlopened but only by libsplashscreen, which isn't
+#   important, so we can exclude that.
+#
+# * We still need to work out the exact AWT and JavaFX dependencies
+#   under MacOS. It doesn't appear to use many, if any, of the
+#   dependencies below.
+#
+RDEPEND="!x64-macos? (
+		!headless-awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			x11-libs/libXtst
+		)
+		javafx? (
+			dev-libs/glib:2
+			dev-libs/libxml2:2
+			dev-libs/libxslt
+			media-libs/freetype:2
+			x11-libs/cairo
+			x11-libs/gtk+:2
+			x11-libs/libX11
+			x11-libs/libXtst
+			x11-libs/libXxf86vm
+			x11-libs/pango
+			virtual/opengl
+		)
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	!prefix? ( sys-libs/glibc:* )
+	selinux? ( sec-policy/selinux-java )"
+
+DEPEND="app-arch/zip"
+
+S="${WORKDIR}/jre"
+
+pkg_nofetch() {
+	local AT_ARCH="AT_${ARCH}"
+	local AT="${!AT_ARCH}"
+
+	einfo "Please download '${AT}' from:"
+	einfo "'${JRE_URI}'"
+	einfo "and move it to '${DISTDIR}'"
+
+	einfo
+	einfo "If the above mentioned urls do not point to the correct version anymore,"
+	einfo "please download the files from Oracle's java download archive:"
+	einfo
+	einfo "   http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html#jre-${MY_PV}-oth-JPR"
+	einfo
+
+}
+
+src_unpack() {
+	default
+
+	# Upstream is changing their versioning scheme every release around 1.8.0.*;
+	# to stop having to change it over and over again, just wildcard match and
+	# live a happy life instead of trying to get this new jre1.8.0_05 to work.
+	mv "${WORKDIR}"/jre* "${S}" || die
+}
+
+src_prepare() {
+	default
+
+	# Remove the hook that calls Oracle's evil usage tracker. Not just
+	# because it's evil but because it breaks the sandbox during builds
+	# and we can't find any other feasible way to disable it or make it
+	# write somewhere else. See bug #559936 for details.
+	zip -d lib/rt.jar sun/misc/PostVMInitHook.class || die
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+
+	# Create files used as storage for system preferences.
+	mkdir .systemPrefs || die
+	touch .systemPrefs/.system.lock || die
+	touch .systemPrefs/.systemRootModFile || die
+
+	if ! use alsa ; then
+		rm -vf lib/*/libjsoundalsa.* || die
+	fi
+
+	if ! use commercial; then
+		rm -vfr lib/jfr* || die
+	fi
+
+	if use headless-awt ; then
+		rm -vf lib/*/lib*{[jx]awt,splashscreen}* \
+		   bin/{javaws,policytool} || die
+	fi
+
+	if ! use javafx ; then
+		rm -vf lib/*/lib*{decora,fx,glass,prism}* \
+		   lib/*/libgstreamer-lite.* lib/{,ext/}*fx* || die
+	fi
+
+	if ! use nsplugin ; then
+		rm -vf lib/*/libnpjp2.* || die
+	else
+		local nsplugin=$(echo lib/*/libnpjp2.*)
+	fi
+
+	# Even though plugins linked against multiple ffmpeg versions are
+	# provided, they generally lag behind what Gentoo has available.
+	rm -vf lib/*/libavplugin* || die
+
+	dodoc COPYRIGHT
+	dodir "${dest}"
+	cp -pPR	bin lib man "${ddest}" || die
+
+	ln -s policy/$(usex jce unlimited limited)/{US_export,local}_policy.jar \
+		"${ddest}"/lib/security/ || die
+
+	if use nsplugin ; then
+		local nsplugin_link=${nsplugin##*/}
+		nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
+		dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
+	fi
+
+	# Install desktop file for the Java Control Panel.
+	# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
+	# make_desktop_entry can't be used as ${P} would end up in filename.
+	newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
+		sun-jcontrol-${PN}-${SLOT}.png || die
+	sed -e "s#Name=.*#Name=Java Control Panel for Oracle JRE ${SLOT}#" \
+		-e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \
+		-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
+		-e "s#Application;##" \
+		-e "/Encoding/d" \
+		lib/desktop/applications/sun_java.desktop > \
+		"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
+	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
+
+	# Prune all fontconfig files so libfontconfig will be used and only install
+	# a Gentoo specific one if fontconfig is disabled.
+	# http://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
+	rm "${ddest}"/lib/fontconfig.* || die
+	if ! use fontconfig ; then
+		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
+		eprefixify "${T}"/fontconfig.properties
+		insinto "${dest}"/lib/
+		doins "${T}"/fontconfig.properties
+	fi
+
+	# This needs to be done before CDS - #215225
+	java-vm_set-pax-markings "${ddest}"
+
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	case ${ARCH} in
+		arm|ia64)
+			${ddest}/bin/java -client -Xshare:dump || die
+			;;
+		x86)
+			${ddest}/bin/java -client -Xshare:dump || die
+			# limit heap size for large memory on x86 #467518
+			# this is a workaround and shouldn't be needed.
+			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
+			;;
+		*)
+			${ddest}/bin/java -server -Xshare:dump || die
+			;;
+	esac
+
+	# Remove empty dirs we might have copied.
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+
+	if ! use headless-awt && ! use javafx; then
+		ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
+		ewarn "require this and they may fail with a confusing error message."
+	fi
+}
diff --git a/dev-java/xp/Manifest b/dev-java/xp/Manifest
index 67fdfbc8e189..a70d2915aadd 100644
--- a/dev-java/xp/Manifest
+++ b/dev-java/xp/Manifest
@@ -1,6 +1,7 @@
 AUX xp-0.5-fix-jdk-1.7-enum.patch 1320 SHA256 0175fb1eb3b55b5c445a331a68c92ad326ccc6cf908939a265c4d7e83b0d2eaf SHA512 37f9b6969edb07d8b824aabcf07b182f77cd0cdac1bec2e84133526fe48fc2cc5fc15d050ee16e7ab46def72a9d1fcb627d426049b258d2bf063feed9928ca14 WHIRLPOOL b83f3c750dcf2b7b48f3563312a804ee4c53738d7df2551c8903441184af1eaf7f83343d00af38bbc32eb2c1cb03a683a4523fa08203087983e8b8e61b2ea701
 DIST xp-0.5.zip 281324 SHA256 38b35ca80627afafdaa2140f7df339164abb5fceffe8b5783dadc75a05662a1d SHA512 5bf354967a1135209d5c6b3be979a311aa5c909493dea16a0efd31a1838dda12be4005ac7e919620ed68266a333fdc93a07853ec1e0af0e83b329bd40bda74b6 WHIRLPOOL 677a8a52ed3d656a1924cf54c82b4c0688c5736771b4add8e878c0e8ecd049efcc85e7f15b883004e4b7d469bbfc207585860e1c2ccfcaa6c4e2fc81cf05d6a5
 EBUILD xp-0.5-r3.ebuild 591 SHA256 5dfe9e406ea8c1247a5ad5e6a451e4e3fe65a13b9a6185c1f1093d958a1ce609 SHA512 f144d37b576906b7533037b0b0226387319128119cc647cdf7aab06f386c6ad2e435bee0bf917bd16958ed36d2644913ebfd6e8be7f92df74359bed96385eedc WHIRLPOOL 20cfe9456f802e2d2d491f2cd70216198bbd2bc467a7420410563769cc6f0e4610744f395464d4db0cc12e4f2cf6ef7352eb4b0a19736896aaf1d138bd22dc31
+EBUILD xp-0.5-r4.ebuild 538 SHA256 1407bbdbe34dec64d1445e7581fd4f9d531cb34d54650c2c0ceccb86c248ef7c SHA512 65e1ee63ecbd0379baad23f7b66fc5b3fef178cb544b7d7ce5d9cda5cd4418f01105f50625e7cdc9a6ad10e790c577e7339e87cae48bff549ce43fe2f7624185 WHIRLPOOL 79c31b3ea36746fb55fb4584d0b823d3b06f03b89623284df391d8d4946758386fffd5417952e9bf0ea35b43fc79877ca90ccdd0fc395b4fe04b0b74db7c480e
 MISC ChangeLog 3119 SHA256 5e63fc915dae4a9f020bb2631bdfae8ed1d47386bb3521d56e3ff67e7d323c69 SHA512 525bb8ecb0080ad084424a681bfa87a5c64a0539fba23ac650ab53313b71b353f0d2cffe031c47719f09ab09249a4441065b0c32b88a291372d51fee95df7d59 WHIRLPOOL 4553dd5e54f16d5bc89bb99672fb7ab3444e6d7de29411e24ed0068d528be6a2bc27d55954969c687c8bcc92ada84d711b08c587572abc4fb1ffdbb1333a5356
 MISC ChangeLog-2015 2102 SHA256 85c1e98c95f9466a989272bdee1d2f2b7c7a367531fbfbc114e48c75e57c37c7 SHA512 a808bfa29ccf76ba6549f8539ac98740b4b8675da0b9b51efa620d8f893966517f39abc6e8d5bda4fa5a1ec60652124e8c450a30f58076642b805bfe989c6ab5 WHIRLPOOL d8be9ca099b5c1c595bb9383c2e75844251cbc6fadb03c150c867c256fd8ee0b37522d52c1c62ce6a6a7d29758b4301f0214f6c24db0fb7bcf98bec55d2eeb14
 MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
diff --git a/dev-java/xp/xp-0.5-r4.ebuild b/dev-java/xp/xp-0.5-r4.ebuild
new file mode 100644
index 000000000000..0792ca0805bf
--- /dev/null
+++ b/dev-java/xp/xp-0.5-r4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="XP is an XML 1.0 parser written in Java"
+HOMEPAGE="http://www.jclark.com/xml/xp"
+SRC_URI="ftp://ftp.jclark.com/pub/xml/${PN}.zip -> ${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-jdk-1.7-enum.patch"
+)
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 077ae04ab840..255db0c5619d 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -9,12 +9,8 @@ DIST go-linux-ppc64-bootstrap-1.8.tbz 52315782 SHA256 19eb3674c07a17dacec9620bc5
 DIST go-linux-ppc64le-bootstrap-1.8.tbz 52211575 SHA256 4e05b8830a473756cfee3fc27a17e09b38ccfca4e2335a485b41d3fb9c342066 SHA512 6931d999dd0ee1ff44c4cec48acb27af061f57f87aa74802dcebab78553b46bc8ac732f07fe91e5074dbdd32c55b707994875934bfb12bb4276d71eb1d06c4ba WHIRLPOOL cdc392fc51b7bfdd28e1c29bffce88139b9447261c9dbffefb3910b9c7406505bd250309618bd6a8430dcfcecc9155f8d5fe94f9e848cc2e721776ba34c22c3a
 DIST go-linux-s390x-bootstrap-1.8.tbz 57124869 SHA256 70bb859e80268b3421587d85189a807b14449b8c5e7b23606b87dfab54189634 SHA512 d429cae870d66217ab2e07c74209d3031d97baa4f899b4d70ae6283a1a5b1434b037904c4cfca0b2bc798d5ba0b358c3739e000eccbc74809baf564c5686df5a WHIRLPOOL d0475efcbc2c1cbb3c6db452dbeb2a5fe709fa56b65eba2fbbcce2296b6a04ba89b9e33579d6eab192cd63b45ad78a0d7afd458229e4b252e80bd2db260abf11
 DIST go-solaris-amd64-bootstrap-1.8.tbz 54926326 SHA256 83053f333d56d72ddbe9a8f293f8afeff31739806d49ebaa144811a5438b17bc SHA512 52b849e5b9a940e10de7ba3df0ebdf6e1c5d631de9581d936c9edf8f38e6bb3314acbc2b2d5202b0528fde2a359d52bc0c6f39acf9b1b614725e4b4a947ed10d WHIRLPOOL 2d58085d88fa612a7dfb087df33d2c5ee6b6d4c0b0c0363d5dcef014a6e3e9703816e8a111d1348e1e1a4ebcdde58694a869a27ae42e0deec154529f1a794991
-DIST go1.8.3.src.tar.gz 15345996 SHA256 5f5dea2447e7dcfdc50fa6b94c512e58bfba5673c039259fd843f68829d99fa6 SHA512 c6e67dd9e3acdf2aa776d920f91f3fb1802d624ba5d51e06b2c7c6b71bcfaf91f4024f7a442cecde69175c589f7f1163f0ae86d887e15ddde710e53ce0961284 WHIRLPOOL 918a13b5323c77093428890ac4759daa3f40bd9379df0b862f9ba0fcf7f0f99eb83e37294dec25329a792573b97ddccb417a43dc8cccbd41bf17df6b01ea77f2
 DIST go1.9.1.src.tar.gz 16377700 SHA256 a84afc9dc7d64fe0fa84d4d735e2ece23831a22117b50dafc75c1484f1cb550e SHA512 3c5d11089a54c61acd1a4fad9618ddb2058cc783a54564407ee50e37c864deaadfd5effeab623080c136a599096f448aae091ef41d0afca1abfcdb98adf4a793 WHIRLPOOL 1cdfddfbe2b432a783d821bf6caf6615868de7eeb71667fd38d77a115b87c0d5321d6928f271bbe7edd6e05d56f5a0e05b6fceeec5dd025673c0a0ad9224ad3e
-DIST go1.9.src.tar.gz 16377363 SHA256 a4ab229028ed167ba1986825751463605264e44868362ca8e7accc8be057e993 SHA512 70c4b892b6883fb21fc1a547a2b8d174df8c7aca282a3906e3816b4442b16c5da578b69c19443122a4a45e66fc95d170528d826b70932af09f4afd2a46615d74 WHIRLPOOL ffd7c37ac49ac55546f0712cdfae9eda83c6cbc10a6b495b021d7a5076bac1063f0a322622692f1b67142a995da2de7e297a43727502331788adac43163848a2
-EBUILD go-1.8.3.ebuild 5581 SHA256 0f93c5167e263e8029621377972b4be9f94187d325d459bda30268935bff3b8d SHA512 f45cfc64b0671b7089cf6e802b4963598e3c47b338ebf8ee6f741ddc4979ba1fe3306d7ef02e7625af2b4b8c4108e8b6ec8f820a2ba75560d04a4c37960d4997 WHIRLPOOL 086b7c4b0ac20a17822d704451f258966921103a297d8038a71183895c6fb645a18edaaaf0d90c34ed0c0b7fcc74d069cfdb62d5d530b71d5967a2b7ddc59ae8
 EBUILD go-1.9.1.ebuild 5581 SHA256 0f93c5167e263e8029621377972b4be9f94187d325d459bda30268935bff3b8d SHA512 f45cfc64b0671b7089cf6e802b4963598e3c47b338ebf8ee6f741ddc4979ba1fe3306d7ef02e7625af2b4b8c4108e8b6ec8f820a2ba75560d04a4c37960d4997 WHIRLPOOL 086b7c4b0ac20a17822d704451f258966921103a297d8038a71183895c6fb645a18edaaaf0d90c34ed0c0b7fcc74d069cfdb62d5d530b71d5967a2b7ddc59ae8
-EBUILD go-1.9.ebuild 5583 SHA256 ed61ef48faff64b18806aa7a2e485f2b350dda25aa28d5c7c412f9e3aadb87c1 SHA512 635afcc0254342631b895b867785d390cad7a671e2dafb2e6a7d9e8c73cd1c951b6b5b1781f6e6b805f7ecba0784c66f574848823c24517a3c8aa1679867dbd8 WHIRLPOOL 9a57db77f411080d78763191fca1b3aec435127e5f752b47e596f3f2ac9e593070073aad9f620ad5395739bceebd3051de2024c543c9abf9390c8c834826c3c2
 EBUILD go-9999.ebuild 5584 SHA256 3854f126a7b2d76ed3dfde8cff697d6c033d6d60e063b07239485a5410666504 SHA512 9b009525bda054f8451d1a202a7dfd7087de6e9d57633f7a8c9c74bdae6407e420237a0c80c58e5650c5beb9c01cef29052ec8e182129f23d2cbcbbdf2efbed7 WHIRLPOOL dcb1f48b08de50e1ba456c81676bc0c8b2817d73faaa5ce188d9508bb1376833d754cd3391f254fd353ca6100f8fdee5e18d20e0d6b223a7b09790d1e50f9ab0
 MISC ChangeLog 15550 SHA256 1e804542720fb0000c4ae8ed1d840415527ec25a16f77aafd7eceeefbe446377 SHA512 3e8c4083b1a7ee877c55283f3463aaec0144d090b5ffc5be7258a29de69d88ae3ecd2fe69f4ff118667796d8a79235870d47855f033d7e67e1da78fc466df638 WHIRLPOOL 8d80ee3abbf55b198e82d911983ed5155da45e72d2b4d2aa39f71837857c61a02797e5a3b9b776f2f93af5ad81babc8e2d5fc7e9a7405d07b069755333479b9f
 MISC ChangeLog-2015 9934 SHA256 5c5375109d9de6edbdf782c355e7f28a8ac4c97d84ca4257a65f12d112fd6a9b SHA512 879f50097cd760b2e96c8ad06ff092f51797181a241361c4897b48abffbad8224331a1bcc614d525e548f7001d3ad664a103ba557a819f0d1cb3c23d67b4019c WHIRLPOOL f11ad28c4f0e811ba70c3b6a8314622d7ab4b064151cb94e62f461fc24c9e62c821571ee771578a20da18ea143d06518a5835f9deedea2a3098a5e83bd6eb5be
diff --git a/dev-lang/go/go-1.8.3.ebuild b/dev-lang/go/go-1.8.3.ebuild
deleted file mode 100644
index 6b538a0be4e7..000000000000
--- a/dev-lang/go/go-1.8.3.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
-BOOTSTRAP_VERSION="bootstrap-1.8"
-BOOTSTRAP_URI="
-amd64? ( ${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz )
-arm? ( ${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz )
-arm64? ( ${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz )
-ppc64? (
-	${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz
-)
-s390? ( ${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz )
-x86? ( ${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz )
-amd64-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz )
-x86-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz )
-x64-macos? ( ${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz )
-x64-solaris? ( ${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 x86 ~amd64-fbsd ~x86-fbsd ~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
-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"
-
-DEPEND="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/go/internal/gccgoimporter/testdata/unicode.gox
-	usr/lib/go/src/go/internal/gccgoimporter/testdata/time.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)-$(go_arch)-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
-	einfo "GOROOT_BOOTSTRAP is ${GOROOT_BOOTSTRAP}"
-
-	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
-}
diff --git a/dev-lang/go/go-1.9.ebuild b/dev-lang/go/go-1.9.ebuild
deleted file mode 100644
index b22bdb390153..000000000000
--- a/dev-lang/go/go-1.9.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
-BOOTSTRAP_VERSION="bootstrap-1.8"
-BOOTSTRAP_URI="
-amd64? ( ${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz )
-arm? ( ${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz )
-arm64? ( ${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz )
-ppc64? (
-	${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz
-	${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz
-)
-s390? ( ${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz )
-x86? ( ${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz )
-amd64-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz )
-x86-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz )
-x64-macos? ( ${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz )
-x64-solaris? ( ${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 ~x86 ~amd64-fbsd ~x86-fbsd ~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
-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"
-
-DEPEND="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/go/internal/gccgoimporter/testdata/unicode.gox
-	usr/lib/go/src/go/internal/gccgoimporter/testdata/time.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)-$(go_arch)-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
-	einfo "GOROOT_BOOTSTRAP is ${GOROOT_BOOTSTRAP}"
-
-	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
-}
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index d3eb9ef41375..b36e3f75392f 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -16,7 +16,7 @@ DIST perl-cross-1.1.6.tar.gz 96075 SHA256 2b3b88f54d85beb438bd2dddd948e2d89461db
 DIST perl-cross-1.1.7.tar.gz 97622 SHA256 b79ce9d766b5f527ad7e73cb86d541da88ecbb69a443ee5f14658dd8f9e9415f SHA512 b64d487129b295ec6d996606b8b8559de681e1cf7c3e3167d6d646d5d7a848d7929b1ab698d1f950e265213749772fc74d209cea5020b61e133c8f8851b7cfa0 WHIRLPOOL 92b4c77e9cefeab026c246fc82abbe20a98c7ba20a4cde2e6f32423dbc98777601b39ca147d4bfa03e42530ad5e1fe7e1d18ca10a407bfd258318934a4a93998
 EBUILD perl-5.24.1-r2.ebuild 17089 SHA256 81c1cce8e4c80c26fa7d176380ec0174265a9f35871d6e0d586dd246eaac7df1 SHA512 2b05056724d99216e116b8fce6fb7f935bce683454a004b85131a815a770d327d67dd762e5111396a34ad0d219a4b42fbb4108d8f52f17fbfd2aa34284ea963d WHIRLPOOL 4a025854d65d5a5a58728b17d53ab9fd18fc490d69d61a71d7ccfe63b97caa9893c0aa99740a1aadb06f88d6f739d881a38c664df913ee7f1b6febffa843b7ea
 EBUILD perl-5.24.2.ebuild 17084 SHA256 e81935c7bfe52f0e636e8ec290bb76b9da326d3ee401cfcf52574b0c9f4c6e93 SHA512 148573132f49a2f46853e3fe171b6d07a72dc50c3b80d2d5c54b7c87833089b366dd0137637160e053f26dfc39dd4b3564d08e0a3891a6822950688cd1844aa8 WHIRLPOOL 2afce33fb37ce2517cbeec1b29688300516c185ed5bc4da9ae7af9eff44ad976b8c1fe713e21eabe1bd7bea69ffcf21fbcb115aa2ef76ffb2877540346d5a7b9
-EBUILD perl-5.24.3.ebuild 17083 SHA256 05268aaf4e8e015cd5adbe1afaad2d778fd88dd8393e02e31c51e77f6a1bc9ce SHA512 7bfa3b0b3a4cf07aa981f6c43ee8b53b3f6cc09eed7d6fec56412933017f77fcaa7c30f8196f71b7181458f781bd6c4d1efbbb2ccdb00d2a198415a054a0bda0 WHIRLPOOL 336dd51a20f6b653bab1ea43c1e40df25feed77c36f05a7e9f0dd16fe69782dcc4beacfbc3ac0bede83857d8998f9ed15ef07ac740f253ffedfc781c00bc40d9
+EBUILD perl-5.24.3.ebuild 17082 SHA256 b7393c3058b466dd250131925ca1fd3ee865fd4b177cd11dd2c9f37bda57f8ae SHA512 bff51a7b03afae6534d63a71622fb8c29624749434ad6abfe73bfd727a5f1f8d6a95ffac2a353000e7b8cf57d97b378c2d0272840b8685b825f5f605c7237900 WHIRLPOOL 7fbbfee8f1321b7ca2f17d2a2d49b27d0901ba0eeb4bba1adc52ae81b1e097da70782d3345b843c7683fa68c487176affb658495a6a54fd4fe6b1a9d0d0ca616
 EBUILD perl-5.26.0.ebuild 17993 SHA256 73c71a10fa481c983b3dc4d81bd3db8ed957901c3aac10e39064ec664015c2c1 SHA512 3a9d54c89c428ba1033228287a466e5ab4b3e4b3c8207885491c3f04d8608074609e18fff913def5eeead0a100a3b7ee1569b5c5b318c8f959bb36578eed1f4a WHIRLPOOL 02e2d21535e5f8e55b952c725398cb3ddcae7759a5b17ee953eceadf11ec77d04a67ed6948cbf23612e0c3d0fac84be42de6b6ec711fef982a09ee0944f1fda3
 EBUILD perl-5.26.1.ebuild 19098 SHA256 e9f7efce9624a3e103e0a1b637b28705993d73935a5dd723a95b1b5bbe7be769 SHA512 5e1ff08063a003a0dae392b1b6a7f0fb24838b658ebee2643e2c833ba8b05f1eec9a5bad4e1ba9f97dff542832b372b67104ff0a91044dd4fcf40711308898ea WHIRLPOOL 9f1e65828a2fe55c126750c69bcc7cb35bc17ca25c98b8a4dd97489a1b876a6e99af6d56111c9ba21d6149813bd31bdef480736a84f66d78fbcb9e1789a83073
 EBUILD perl-5.26.9999.ebuild 19091 SHA256 5817274e7388b5c76acfb6751611d50d32522486bb07863932254e0ecbfc2577 SHA512 1d432daec869ffddbf7dd9cd845a8a48a4e942b500ebaae80f80fbdfdf2cc5147fe58f305801688549f071ae1ec3126b828f1b6f95ba109f72bab1584afe3f56 WHIRLPOOL 90e3b0b41d5a48b607c1931a30a2270f61a568076f80d1884359ed1961897f20ceee44efe10408688c64f8bb3ced288ec6df7644e30d22a96a8f0a9c43ffa9d6
diff --git a/dev-lang/perl/perl-5.24.3.ebuild b/dev-lang/perl/perl-5.24.3.ebuild
index a5921322d0cf..e36cec59f279 100644
--- a/dev-lang/perl/perl-5.24.3.ebuild
+++ b/dev-lang/perl/perl-5.24.3.ebuild
@@ -30,7 +30,7 @@ HOMEPAGE="http://www.perl.org/"
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SHORT_PV}"
-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="berkdb debug doc gdbm ithreads"
 
 RDEPEND="
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 88a2d4bf0c9d..957e12621412 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -3,19 +3,17 @@ AUX php-5.6-no-bison-warnings.patch 1428 SHA256 c7a91229d19a2a08db750f440ca4e8a5
 AUX php-fpm_at-simple.service 316 SHA256 c11d3bb213993ad27642abf2fb13ab8d9bd3fd8ffb6c863ca0baa057555a2fa6 SHA512 7367a3f8d3874f8e0c76f331ba613a0250db02f60ad9f87affaf448dcb5bc34bcecb91d88f415764a12b24b46ae3d1b738a002af9f77a4b707e916e83a0021fd WHIRLPOOL bf78a0e1bc22525de1bfa6896ceeb39932f4a1507820667f5216af10f8de205436a82abefe55d4776d911de99070e6f6ed3dacc1708288323d8ad789dab57fb9
 AUX php-fpm_at.service 317 SHA256 6bbbbd7b6501305c17b7290bb2a83b0ebe492d421adaac8f394e387ed52e0d25 SHA512 27982f9e2d958bfa75c89c7d3531e48d17fc388b1cdcbc8e09051b236b1184ee2baabdfcc567c19d9fcd067d4b3b86f171015616d8da42fccdabd89432d865e8 WHIRLPOOL c101ad8eb7446a6fcb3dba6ec6caae12bd6c0a9d251e222c392abb37314fbc252321bdc7db1696480050ce543a154b7257e503d3065d9e238d1c5c76a74d65ff
 DIST php-5.6.31.tar.xz 12461268 SHA256 c464af61240a9b7729fabe0314cdbdd5a000a4f0c9bd201f89f8628732fe4ae4 SHA512 b5d3bc306167c851460036aa21194a2f74a50a26aa5c46159394bddbff94e4a418b557d68d5e1315672b3571b13a231ef7810d5346f57c0094acfe29c2e70495 WHIRLPOOL 2cd74a9cfe82b9363b4fbad37b13a8f7cc9571d2493a95b52cdaeeafe2d04255a29b31792dce2db0c41696539ed6b203446a2a6a8ea0319d82066fe9622bfcb9
+DIST php-5.6.32.tar.xz 12464512 SHA256 8c2b4f721c7475fb9eabda2495209e91ea933082e6f34299d11cba88cd76e64b SHA512 f0556a23f2a2711cda25dd25e63996c9315e7da13555a7169ee701406454e4d372ffca82476b4a474a96b2f3d3b783f6827042df71bb245514884d7c3d23530b WHIRLPOOL eae1a493ddb2c01166fb2364d31248f0d68eadb53aa0802cec336833ee7d76f30c161ae36d0984f5b9386a3e1ace33c0d8bc02153d0c0da49a7a2d5f489b8624
 DIST php-7.0.23.tar.xz 11953100 SHA256 8e526e3551a58e00c8055fa4a72804aa1bd3ee1c0411b25bf1504cc4992609df SHA512 62201592fca88fb1c302badf7e73e5d417e9a062300e0d32fdfcb346d300cd86bf957b880a73795037a332fe148b64589bb15204bdd6b0ddcbbddc5a12e6d042 WHIRLPOOL 5d6131b5d7701b01c1aa849c6b5e3b133b4276999354eccecf847675552eb0be79a68cd0a10595c64bda2594489d3699868b4ed9a1fe3c5cdcc4fda45be32493
-DIST php-7.0.24.tar.xz 11959232 SHA256 4dba7aa365193c9229f89f1975fad4c01135d29922a338ffb4a27e840d6f1c98 SHA512 7ae7795ff89924adc5f989bcf438a372684c7fc041ec10db96369f12faaeb90a23e7a7b5253f2a1022059f7464e6c11ee46a164a7f873b0b44a5317c3a3a49e7 WHIRLPOOL c5d8cdc684738610f520df0f46042625cfa0a5530e84e4c813493f755f03656f8ba71de630769f6381b9b729feb161b06eae7d44dcf21f79bec67fd5b9c23c26
-DIST php-7.1.10.tar.xz 12166036 SHA256 2b8efa771a2ead0bb3ae67b530ca505b5b286adc873cca9ce97a6e1d6815c50b SHA512 64f03d7a8928283e2f4f0958168610780553765ac20cf558cd6452ba4474461e74366c41b9bfdaf08b25195ca9c0059a94b77f06d8de3512d251cb2a84113d30 WHIRLPOOL 9ec9b6a93e95f23b15c8816de0384b62297ae06cec9b4c8cabeef8ecbefcd7c14b751c7310fa13a1326028a61c4f7206b5c0ce3388e0b40e44fffa0de6129721
-DIST php-7.1.9.tar.xz 12157172 SHA256 ec9ca348dd51f19a84dc5d33acfff1fba1f977300604bdac08ed46ae2c281e8c SHA512 feefaae7edda115c9c10d6a07a9d897343ca972e4e5ec327f383cb28f204ac10956653fc120f0474901e59f32f105dc1a7afe64d49a3ea8bf486377837618013 WHIRLPOOL 5179ca1adddb099a3d8dccc009a96202f6d69edeea3126a5f861498475f36413f0a17a6a501b1b0eadba3acfb4ff262a8a5a7ee324043f03d74e857d1dc7c6a8
-DIST php-7.2.0RC2.tar.xz 12051048 SHA256 0406366fcd5be4ee5e76e3c6a4279e04f93a1827a44d27c4f57fbed9e01cd281 SHA512 aa7e3632381677db995a72dcf0276a3be0d40c32138743a225d8e41e791a6fe00859e27ed7699be90e3843d3eb4da90af6a31aab65dc790c402863d09f409a48 WHIRLPOOL fc8c39b8b4a6184fa8e460dd91b0afbb62c5321effd5c5227eb276adb46857acf05e0fa5749279b0f26fe2c08d9f8001f0132507ab778dd1f7df7237da74b623
-DIST php-7.2.0RC3.tar.xz 11973876 SHA256 abe0a237f94837854f2cfd9c7dc99fbca2c817ae1d6194a514f29b463db36853 SHA512 a33e72e458e7e9fef59db5c147da9efdbd6d2987610216d99fd6c8bb25927153573614bdf3ca3b4e3278c5e6657fbd30665e3a895448afb0d6951af65e8e5b55 WHIRLPOOL 128ff4e663dfca3ad60c7ba2fa789a394a607ae6e93bb1e2b371972179c5fcecf13504cab0f6ec20bbf08c4040a6bfba8388bed9f60ddbc226dd9b9c241e555f
-EBUILD php-5.6.31.ebuild 22491 SHA256 7eb270d7f56f0c3e6ab6bb2df8d7c9d96928dc898e2c90fb46760e0201a6b858 SHA512 589cc6f6a7a9321b1c8dc3aad2766260ddb026748c88e5bcfb097e786e66809c74506391157290e5693523f211150e5e5ef80ed7e3d49e09c750c3da2b115dd6 WHIRLPOOL 328641a0ec7e8a273dcb09584ce03a61b0c06b97459d39ec30252f45e3b79448026043129afd8aba354bb2e04a027fc6a049e8cdf230f1220c5520c868582a32
-EBUILD php-7.0.23.ebuild 21544 SHA256 db72c83e1ceebbd5a0aed067ef82bcea57a071d97605f1730556d98eb484cd02 SHA512 39980f3bb7ab572abde353959e1c0b6eb2f1d8dc1ff35c6cd9ae86abd19437d4fcd8aabb12680f028a4973f2ef93e8eeceb0e8c678803d895979027930d62f14 WHIRLPOOL f1eb20ccc67608952d7c55e1957885bc612f5b4f9b3e796d3d4262925465a077e74bd062f9af7a514a8e4e8f702cb368e18e70fc9542c9ea8b081f1492f4109e
-EBUILD php-7.0.24.ebuild 21553 SHA256 593148d92b4a046e9c386448bba422fffda6236c0469a7df1221c734bcba9dfb SHA512 ada7473b6a62fb16ae5521cf37e241a322504230a4704f7689d3046fb62023359a73bdbd459f152ba8204a0b063020d7b8850823a336f12beb7d93e48d40d7f2 WHIRLPOOL 4c7b98a6d32444ed28321cabb0917572c297a45f88bb8bf4b6e058b631e40e4be6fb7a29a503152d06d3623cc7c3873d7957ab5191178badf0500cb1861bf498
-EBUILD php-7.1.10.ebuild 21434 SHA256 00abe4a22847589288fbc8d29de8023dc2e8f26d99dbc51e2ffa9741f24f6b09 SHA512 6ddb45c70d32eda82ae6b171033178f7de61152f71c293b6bf625c8fd6c46cbd39505d6c7590ce3c1d9f0a5e7eb56deb0a89d155d48cdad42785835b93e5ea38 WHIRLPOOL 8f91816fe9249e0b0f2649c9d8db43ff2849ec4b7f3249eb7605f3407488c1231e0aea760a136f2bb0c3fbac036fa3fc67d708fcfe44dd6eb9aac4175b271ae7
-EBUILD php-7.1.9.ebuild 21434 SHA256 00abe4a22847589288fbc8d29de8023dc2e8f26d99dbc51e2ffa9741f24f6b09 SHA512 6ddb45c70d32eda82ae6b171033178f7de61152f71c293b6bf625c8fd6c46cbd39505d6c7590ce3c1d9f0a5e7eb56deb0a89d155d48cdad42785835b93e5ea38 WHIRLPOOL 8f91816fe9249e0b0f2649c9d8db43ff2849ec4b7f3249eb7605f3407488c1231e0aea760a136f2bb0c3fbac036fa3fc67d708fcfe44dd6eb9aac4175b271ae7
-EBUILD php-7.2.0_rc2.ebuild 22005 SHA256 18e9efb4ca41b4b276b184edca8d9b96552f88696358e2303d9d079d4560f59a SHA512 9d97d88cf5ecedbaf342df5b0de77c511abeed84c7ae7ef7954613f2973837993511a2f5626161f6e6c874ba958d30e2dc94f179b4a635e54e533ebc1b710ec0 WHIRLPOOL 6989a8ae080ea2a1e44a3dfd8c850bb086297d38c7a301d6f0ae9989acfaf2b4a6795b3694c59206781b7ddb6bc693864ac2c6281c74c63a68c62329e973701f
-EBUILD php-7.2.0_rc3.ebuild 22002 SHA256 b5bbf7d10a4e8f11a3120c85da080920c875d584cf8055d536b742e0e8e61d39 SHA512 167325c9697beca190fe83a23e1d683ea3e42750f8b537c572de3829e8c157a9b2e3a015965e29905086bf2cdb4642a47709983c2fc27b810048f18030c020c2 WHIRLPOOL 9dd5f5fe0d8ae518f7220a31a26832309c4405c843d0b30abf2319323bdb0596bb458868da67a9871928e1e5274618659520b3c3bd5ed785a6916168d026ce8e
+DIST php-7.0.25.tar.xz 11963668 SHA256 5cc14bd20fb2226f6d34465662425cd100441bde9042ea1cef2e4506d6ded8cc SHA512 7a31fe48f3843a5380a7ab7b04ba2006e739f96d314b662beb337a8e76fbb2f3c1e1e22a8c9d5209bad61deb0ccc21706f0dedd12d15766f7795497549b4cae4 WHIRLPOOL 3998e5d6dcded72feb38ffdfd3c1e0b467151f5b9c0ff111ab4b6a90e2ad29a4a4929641f7af1c983b9a5df0a8a2d54af17d2eeb82a9b7efe8e6cbb199334440
+DIST php-7.1.11.tar.xz 12169884 SHA256 074093e9d7d21afedc5106904218a80a47b854abe368d2728ed22184c884893e SHA512 400bc75d938f49754586d2b14b8f300c5a1e961489c02c968c7560ea0edc3765992580306c6185ecee57734775f8abaf7525a2aaa5110db2d8efacf2701c0101 WHIRLPOOL 8d5414b31838e10524a34facbab9a6e749d84f03752c2ec5a2d82f3dcab2b6e804d691101610398a136c68e1002eb6a9294d818166eecebb706d7f7d343f9620
+DIST php-7.2.0RC5.tar.xz 12074000 SHA256 92a745048912beb3f6c2a3c188ce695a51852c67201fdf9a21dafe59f51aecc1 SHA512 c78bf3b05658ddd053cf8bd696f22bea4c0d1f94659e3821aed5fbd73cea9b953ca2c1b565e99e60034fbe4a98764cd596ee67cc0108d73f8adc0bb889899f3a WHIRLPOOL a851ca6d57b88bbf8a0838c697accce6679640fbc3ec44d25b64a14daa53c399c11d5636c2cf032ce96b99b6cf48b1cc81cf15022c0618919abc201f885329f6
+EBUILD php-5.6.31.ebuild 22507 SHA256 04a6c10978c69cdbc88eb36a07390c6868e0d08db9dfce8839d3da51f79ea5aa SHA512 72f7e4e1a1b27d5d407bc692e399a2470ce25f4db3d413eca2e9e7b3d8b795f3aac316b45fa1fc0a22fb44eef58d9784d345138868740b8170fa28af3336036e WHIRLPOOL 863e911f331533193f2953d6eb6bff1e7fa804c6db35ea3304c4cf961af1d5fbc0ee661c36e2bf2f412b825bf4b9d070429b00709440d7c22aa14ce32ae84ea3
+EBUILD php-5.6.32.ebuild 22509 SHA256 071bec01108a601f6e8d6e5c161b059c528349f128aefecefbac25a19299f352 SHA512 eb4cab7452888dedb6ceb4a618f1a1325f18baf0368b727cd4809947044485666e854c3cfd851d8866fba28c859839e26a3043b7cbeac71732a0021c61453e8b WHIRLPOOL aa2d2d8f025e44371cc2f998a0eebd015aaa40f8b5adeac3668e7326ec78f8b8e72889d1533266cfb752ce290df6ab93402e9d635e4f084c1fdaae1fe25b4291
+EBUILD php-7.0.23.ebuild 21560 SHA256 c9f25c5f84c07b915f0bd7455f9b3bba87c80258ec168576d1e6f16ac0c65191 SHA512 38d1f2d063044db2f4500e99a323f54d992413db26b99926f4d0338190fd481964e1a1573e9ebf06ea315b66d3d1207cd620fcd487745e81739e03c34afe6230 WHIRLPOOL 4f2acc320119674d3aa23c8ea12d2b853a6763a615f241f6a214c8ad60dcf528fcc0e93886924c2a7721a276e7f495611c7247631666974c58dc9e2118c07201
+EBUILD php-7.0.25.ebuild 21569 SHA256 649463a7eefb668f015df238d2899e455572d51ebbe6634106b907e8373ab222 SHA512 73e213711ad2c1aceed3656978f4ab185197bf1632462b2737154701342e12d67534da445f48192c617c3f94ad7cfb465101a2550541a09a65bab2d7e7706373 WHIRLPOOL e8269f62602a8759a0cf92b00a5a94a389ced6fc40a959d7aacd5b8567c502dfb3afb6c7ec304106a2cd5254f380264222e65f4298e4aee27dbcbaefc1d7ff09
+EBUILD php-7.1.11.ebuild 21450 SHA256 0928afa7ddfc675fffee996bedffeb80ed94ef46194a576b3652fa4dde413937 SHA512 c9a1438f5f997bacd9058c564ca07aaa072fa4171fb48787cd3cac144607628589e136d9978548c03753deec7b17ed8e11603536feeb88891fcbe91cb731c117 WHIRLPOOL 46e182dba20fde4a6ead7b9ac798d367c4b702861a71bae60bb305b291a05c448601447222dd43ec48c2aa86f65b5c01017a603c56b209b47698f2dc77b9e6da
+EBUILD php-7.2.0_rc5.ebuild 22039 SHA256 f6de47ce93d1b4773810455af0f3a81e6f9d6472954d6a3462fd752b8806a706 SHA512 a9e77ee6ba56fe848e65a6a1b5515e962795abbf81b9efc8a56ce55dc0b3e61ac058740e63f0c80055b7209a3e3f18e7660014dbb7e01e51370c1df6547050c6 WHIRLPOOL e8d851acf37d456c0991cc5c96a8ac668a1aa66894cae38bf026a79dc2a2280d68b7ef5eb396714e9f06752d34cb021b05b20bf77aeb95b6ea37f34c2e44c80f
 MISC ChangeLog 69520 SHA256 e57a249703e1b70ac99f6762ce37b0499e73067ad5b5c80f1ec1ca1d4043713f SHA512 3b425f7863e0835a8542aa70ff910cf46e65124d62e78912de313a6e04b82cb6954a8590a00b12099a6e114c0ea1f4f64baa1a533ed2e9eb4f5b30a281592889 WHIRLPOOL b50c0f02494945d674a64111493ba4bcbb0aa47b1a3229308b612e756020ac051f506228ce7671e50cdf8d8a75ad785d6b6c3eb6f38d8cea12a4aa7f6498b998
 MISC ChangeLog-2012 108488 SHA256 c2eea36502d34eadc7995d546f78aaa553ba07beeb51ea738715ad7f2e51b08d SHA512 eb25224993eff1ea42ea133302991a3ffad3adda0bc524cfa4fae49574230a8e65b35b08750d780c11cc9c152435fadbf2c416241fac28dcbb025e060e96cd7a WHIRLPOOL 82f627853fa961f3f3707fb2c8757acbc8fc644e89121d78703b40ff0f668aa7d0f1aa26c77f8f503e4f6da22ed865e4cb7c02d5d112c89488b12aa6b0d80568
 MISC ChangeLog-2015 48694 SHA256 0dc57defe0e591303069f037d3dfb54d74cec2d2ab35504b8d43200910dfa056 SHA512 2e71df8e73b0db5c70c817e235f2b7998d07dc73c64affddc7d21e062a3bce0de8e5537239536619be8f8bf6163065a06082a26d34e90d22fe2bd5de1cdd5e3e WHIRLPOOL 5e90f2584f49e8a0be2fe0f611ee2d451d755f0c75aaab8bbed2083d9b5d42074685d0f8d6c4bf3a2ff098f0a845d89b9435ab8cab0cfc56aecb44ddf9e92d14
diff --git a/dev-lang/php/php-5.6.31.ebuild b/dev-lang/php/php-5.6.31.ebuild
index 99350669e42b..48988cf51f24 100644
--- a/dev-lang/php/php-5.6.31.ebuild
+++ b/dev-lang/php/php-5.6.31.ebuild
@@ -6,8 +6,8 @@ EAPI=6
 inherit autotools flag-o-matic versionator systemd
 
 DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="http://php.net/"
-SRC_URI="http://php.net/distributions/${P}.tar.xz"
+HOMEPAGE="https://secure.php.net/"
+SRC_URI="https://secure.php.net/distributions/${P}.tar.xz"
 
 LICENSE="PHP-3.01
 	BSD
diff --git a/dev-lang/php/php-5.6.32.ebuild b/dev-lang/php/php-5.6.32.ebuild
new file mode 100644
index 000000000000..b4f19e0d0e18
--- /dev/null
+++ b/dev-lang/php/php-5.6.32.ebuild
@@ -0,0 +1,771 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic versionator systemd
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://secure.php.net/"
+SRC_URI="https://php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(get_version_component_range 1-2)"
+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"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
+	coverage crypt +ctype curl debug
+	enchant exif +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
+	mhash mssql mysql libmysqlclient mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	acl? ( sys-apps/acl )
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	berkdb? ( || ( 	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	coverage? ( dev-util/lcov )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( dev-libs/gmp:0 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	libmysqlclient? (
+		mysql? ( virtual/libmysqlclient:= )
+		mysqli? ( virtual/libmysqlclient:= )
+	)
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)
+	sybase-ct? ( dev-db/freetds )
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		>=media-libs/t1lib-5.0.0
+		!gd? (
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	)
+	unicode? ( dev-libs/oniguruma:= )
+	vpx? ( media-libs/libvpx )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg:0
+		media-libs/libpng:0= sys-libs/zlib
+	)
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed )
+	cli? ( ^^ ( readline libedit ) )
+	truetype? ( gd )
+	vpx? ( gd )
+	cjk? ( gd )
+	exif? ( gd )
+	xpm? ( gd )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	recode? ( !imap !mysql !mysqli !libmysqlclient )
+	libmysqlclient? ( || (
+		mysql
+		mysqli
+		pdo
+	) )
+
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	sharedmem? ( !threads )
+"
+
+PHP_MV="$(get_major_version)"
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config file php-fpm.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/php-${SLOT}-no-bison-warnings.patch"
+
+	# Change PHP branding
+	# Get the alpha/beta/rc version
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# Patch PHP to show Gentoo as the server platform
+	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+		-i configure.in || die "Failed to fix server platform name"
+
+	# Prevent PHP from activating the Apache config,
+	# as we will do that ourselves
+	sed -i \
+		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 \
+		|| die
+
+	# Patch PHP to support heimdal instead of mit-krb5
+	if has_version "app-crypt/heimdal" ; then
+		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal crypt library reference"
+	fi
+
+	eapply_user
+
+	# Force rebuilding aclocal.m4
+	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# http://bugs.php.net/bug.php?id=48795, bug #343481
+		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+	fi
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_with acl fpm-acl)
+		$(use_enable bcmath bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype ctype)
+		$(use_with curl curl "${EPREFIX}/usr")
+		$(use_enable xml dom)
+		$(use_with enchant enchant "${EPREFIX}/usr")
+		$(use_enable exif exif)
+		$(use_enable fileinfo fileinfo)
+		$(use_enable filter filter)
+		$(use_enable ftp ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_enable hash hash)
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
+		$(use_enable intl intl)
+		$(use_enable ipv6 ipv6)
+		$(use_enable json json)
+		$(use_with kerberos kerberos "${EPREFIX}/usr")
+		$(use_enable xml libxml)
+		$(use_with xml libxml-dir "${EPREFIX}/usr")
+		$(use_enable unicode mbstring)
+		$(use_with crypt mcrypt "${EPREFIX}/usr")
+		$(use_with mssql mssql "${EPREFIX}/usr")
+		$(use_with unicode onig "${EPREFIX}/usr")
+		$(use_with ssl openssl "${EPREFIX}/usr")
+		$(use_with ssl openssl-dir "${EPREFIX}/usr")
+		$(use_enable pcntl pcntl)
+		$(use_enable phar phar)
+		$(use_enable pdo pdo)
+		$(use_enable opcache opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_with recode recode "${EPREFIX}/usr")
+		$(use_enable simplexml simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap soap)
+		$(use_enable sockets sockets)
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
+		$(use_with sybase-ct sybase-ct "${EPREFIX}/usr")
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with systemd fpm-systemd)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer tokenizer)
+		$(use_enable wddx wddx)
+		$(use_enable xml xml)
+		$(use_enable xmlreader xmlreader)
+		$(use_enable xmlwriter xmlwriter)
+		$(use_with xmlrpc xmlrpc)
+		$(use_with xslt xsl "${EPREFIX}/usr")
+		$(use_enable zip zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		our_conf+=( "--enable-dba${shared}" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype-dir "${EPREFIX}/usr")
+		$(use_with truetype t1lib "${EPREFIX}/usr")
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg-dir "${EPREFIX}/usr")
+		$(use_with gd png-dir "${EPREFIX}/usr")
+		$(use_with xpm xpm-dir "${EPREFIX}/usr")
+		$(use_with vpx vpx-dir "${EPREFIX}/usr")
+	)
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_with gd gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# Interbase/firebird support
+	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+	use libmysqlclient && mysqllib="${EPREFIX}/usr"
+	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
+
+	our_conf+=( $(use_with mysql mysql "${mysqllib}") )
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	our_conf+=(
+		$(use_with odbc unixODBC "${EPREFIX}/usr")
+		$(use_with iodbc iodbc "${EPREFIX}/usr")
+	)
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib)
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit libedit "${EPREFIX}/usr")
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	our_conf+=(
+		--with-pcre-regex="${EPREFIX}/usr"
+		--with-pcre-dir="${EPREFIX}/usr"
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp5$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-7.0.23.ebuild b/dev-lang/php/php-7.0.23.ebuild
index 547d2e86efc6..556533105ba9 100644
--- a/dev-lang/php/php-7.0.23.ebuild
+++ b/dev-lang/php/php-7.0.23.ebuild
@@ -6,8 +6,8 @@ EAPI=6
 inherit flag-o-matic versionator systemd
 
 DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="http://php.net/"
-SRC_URI="http://php.net/distributions/${P}.tar.xz"
+HOMEPAGE="https://secure.php.net/"
+SRC_URI="https://secure.php.net/distributions/${P}.tar.xz"
 
 LICENSE="PHP-3.01
 	BSD
diff --git a/dev-lang/php/php-7.0.24.ebuild b/dev-lang/php/php-7.0.24.ebuild
deleted file mode 100644
index 8201c7b7d40c..000000000000
--- a/dev-lang/php/php-7.0.24.ebuild
+++ /dev/null
@@ -1,739 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic versionator systemd
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="http://php.net/"
-SRC_URI="http://php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(get_version_component_range 1-2)"
-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"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
-	coverage crypt +ctype curl debug
-	enchant exif +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session sharedmem
-	+simplexml snmp soap sockets spell sqlite ssl
-	sysvipc systemd tidy +tokenizer truetype unicode wddx webp
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	acl? ( sys-apps/acl )
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	berkdb? ( || ( sys-libs/db:5.3
-					sys-libs/db:5.1
-					sys-libs/db:4.8
-					sys-libs/db:4.7
-					sys-libs/db:4.6
-					sys-libs/db:4.5 ) )
-	bzip2? ( app-arch/bzip2 )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	cjk? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib
-	) )
-	coverage? ( dev-util/lcov )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( app-text/enchant )
-	exif? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib
-	) )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	gmp? ( dev-libs/gmp:0 )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	recode? ( app-text/recode )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	tidy? ( app-text/htmltidy )
-	truetype? (
-		=media-libs/freetype-2*
-		!gd? (
-			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	)
-	unicode? ( dev-libs/oniguruma:= )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	webp? ( media-libs/libwebp )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? (
-		x11-libs/libXpm
-		virtual/jpeg:0
-		media-libs/libpng:0= sys-libs/zlib
-	)
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib )
-	zlib? ( sys-libs/zlib )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1
-	sys-devel/flex
-	>=sys-devel/m4-1.4.3
-	>=sys-devel/libtool-1.5.18"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd )
-	webp? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-	xpm? ( gd )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysqli !mysql )
-	sharedmem? ( !threads )
-	mysql? ( || ( mysqli pdo ) )
-"
-
-PHP_MV="$(get_major_version)"
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		$(use_enable threads maintainer-zts)
-	)
-
-	our_conf+=(
-		$(use_with acl fpm-acl)
-		$(use_enable bcmath bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype ctype)
-		$(use_with curl curl "${EPREFIX}/usr")
-		$(use_enable xml dom)
-		$(use_with enchant enchant "${EPREFIX}/usr")
-		$(use_enable exif exif)
-		$(use_enable fileinfo fileinfo)
-		$(use_enable filter filter)
-		$(use_enable ftp ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_enable hash hash)
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
-		$(use_enable intl intl)
-		$(use_enable ipv6 ipv6)
-		$(use_enable json json)
-		$(use_with kerberos kerberos "${EPREFIX}/usr")
-		$(use_enable xml libxml)
-		$(use_with xml libxml-dir "${EPREFIX}/usr")
-		$(use_enable unicode mbstring)
-		$(use_with crypt mcrypt "${EPREFIX}/usr")
-		$(use_with unicode onig "${EPREFIX}/usr")
-		$(use_with ssl openssl "${EPREFIX}/usr")
-		$(use_with ssl openssl-dir "${EPREFIX}/usr")
-		$(use_enable pcntl pcntl)
-		$(use_enable phar phar)
-		$(use_enable pdo pdo)
-		$(use_enable opcache opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_with recode recode "${EPREFIX}/usr")
-		$(use_enable simplexml simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap soap)
-		$(use_enable sockets sockets)
-		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with systemd fpm-systemd)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer tokenizer)
-		$(use_enable wddx wddx)
-		$(use_enable xml xml)
-		$(use_enable xmlreader xmlreader)
-		$(use_enable xmlwriter xmlwriter)
-		$(use_with xmlrpc xmlrpc)
-		$(use_with xslt xsl "${EPREFIX}/usr")
-		$(use_enable zip zip)
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm ; then
-		our_conf+=( "--enable-dba${shared}" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype-dir "${EPREFIX}/usr")
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg-dir "${EPREFIX}/usr")
-		$(use_with gd png-dir "${EPREFIX}/usr")
-		$(use_with xpm xpm-dir "${EPREFIX}/usr")
-	)
-	if use webp; then
-		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
-	fi
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_with gd gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# Interbase/firebird support
-	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
-		)
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-
-	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	our_conf+=(
-		$(use_with odbc unixODBC "${EPREFIX}/usr")
-		$(use_with iodbc iodbc "${EPREFIX}/usr")
-	)
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "${mysqllib}")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit libedit "${EPREFIX}/usr")
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	our_conf+=(
-		--with-pcre-regex="${EPREFIX}/usr"
-		--with-pcre-dir="${EPREFIX}/usr"
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp${PHP_MV}$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-7.0.25.ebuild b/dev-lang/php/php-7.0.25.ebuild
new file mode 100644
index 000000000000..947d712ca812
--- /dev/null
+++ b/dev-lang/php/php-7.0.25.ebuild
@@ -0,0 +1,739 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic versionator systemd
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://secure.php.net/"
+SRC_URI="https://secure.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(get_version_component_range 1-2)"
+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"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
+	coverage crypt +ctype curl debug
+	enchant exif +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sysvipc systemd tidy +tokenizer truetype unicode wddx webp
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	acl? ( sys-apps/acl )
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	berkdb? ( || ( sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	coverage? ( dev-util/lcov )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( dev-libs/gmp:0 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		!gd? (
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	)
+	unicode? ( dev-libs/oniguruma:= )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	webp? ( media-libs/libwebp )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg:0
+		media-libs/libpng:0= sys-libs/zlib
+	)
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	truetype? ( gd )
+	webp? ( gd )
+	cjk? ( gd )
+	exif? ( gd )
+	xpm? ( gd )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysqli !mysql )
+	sharedmem? ( !threads )
+	mysql? ( || ( mysqli pdo ) )
+"
+
+PHP_MV="$(get_major_version)"
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_with acl fpm-acl)
+		$(use_enable bcmath bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype ctype)
+		$(use_with curl curl "${EPREFIX}/usr")
+		$(use_enable xml dom)
+		$(use_with enchant enchant "${EPREFIX}/usr")
+		$(use_enable exif exif)
+		$(use_enable fileinfo fileinfo)
+		$(use_enable filter filter)
+		$(use_enable ftp ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_enable hash hash)
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
+		$(use_enable intl intl)
+		$(use_enable ipv6 ipv6)
+		$(use_enable json json)
+		$(use_with kerberos kerberos "${EPREFIX}/usr")
+		$(use_enable xml libxml)
+		$(use_with xml libxml-dir "${EPREFIX}/usr")
+		$(use_enable unicode mbstring)
+		$(use_with crypt mcrypt "${EPREFIX}/usr")
+		$(use_with unicode onig "${EPREFIX}/usr")
+		$(use_with ssl openssl "${EPREFIX}/usr")
+		$(use_with ssl openssl-dir "${EPREFIX}/usr")
+		$(use_enable pcntl pcntl)
+		$(use_enable phar phar)
+		$(use_enable pdo pdo)
+		$(use_enable opcache opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_with recode recode "${EPREFIX}/usr")
+		$(use_enable simplexml simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap soap)
+		$(use_enable sockets sockets)
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with systemd fpm-systemd)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer tokenizer)
+		$(use_enable wddx wddx)
+		$(use_enable xml xml)
+		$(use_enable xmlreader xmlreader)
+		$(use_enable xmlwriter xmlwriter)
+		$(use_with xmlrpc xmlrpc)
+		$(use_with xslt xsl "${EPREFIX}/usr")
+		$(use_enable zip zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		our_conf+=( "--enable-dba${shared}" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype-dir "${EPREFIX}/usr")
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg-dir "${EPREFIX}/usr")
+		$(use_with gd png-dir "${EPREFIX}/usr")
+		$(use_with xpm xpm-dir "${EPREFIX}/usr")
+	)
+	if use webp; then
+		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
+	fi
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_with gd gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# Interbase/firebird support
+	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	our_conf+=(
+		$(use_with odbc unixODBC "${EPREFIX}/usr")
+		$(use_with iodbc iodbc "${EPREFIX}/usr")
+	)
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit libedit "${EPREFIX}/usr")
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	our_conf+=(
+		--with-pcre-regex="${EPREFIX}/usr"
+		--with-pcre-dir="${EPREFIX}/usr"
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp${PHP_MV}$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-7.1.10.ebuild b/dev-lang/php/php-7.1.10.ebuild
deleted file mode 100644
index 054f5bdb63e5..000000000000
--- a/dev-lang/php/php-7.1.10.ebuild
+++ /dev/null
@@ -1,721 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic versionator systemd
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="http://php.net/"
-SRC_URI="http://php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(get_version_component_range 1-2)"
-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"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
-	coverage crypt +ctype curl debug
-	enchant exif +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session sharedmem
-	+simplexml snmp soap sockets spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer truetype unicode wddx webp
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	acl? ( sys-apps/acl )
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	berkdb? ( || (	sys-libs/db:5.3
-					sys-libs/db:5.1
-					sys-libs/db:4.8
-					sys-libs/db:4.7
-					sys-libs/db:4.6
-					sys-libs/db:4.5 ) )
-	bzip2? ( app-arch/bzip2 )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	coverage? ( dev-util/lcov )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( app-text/enchant )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	gmp? ( dev-libs/gmp:0 )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	recode? ( app-text/recode )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
-	truetype? ( =media-libs/freetype-2* )
-	unicode? ( dev-libs/oniguruma:= )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	webp? ( media-libs/libwebp )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? ( x11-libs/libXpm )
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib )
-	zlib? ( sys-libs/zlib )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd )
-	webp? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-	xpm? ( gd )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysqli !mysql )
-	sharedmem? ( !threads )
-	mysql? ( || ( mysqli pdo ) )
-"
-
-PHP_MV="$(get_major_version)"
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		$(use_enable threads maintainer-zts)
-	)
-
-	our_conf+=(
-		$(use_with acl fpm-acl)
-		$(use_enable bcmath bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype ctype)
-		$(use_with curl curl "${EPREFIX}/usr")
-		$(use_enable xml dom)
-		$(use_with enchant enchant "${EPREFIX}/usr")
-		$(use_enable exif exif)
-		$(use_enable fileinfo fileinfo)
-		$(use_enable filter filter)
-		$(use_enable ftp ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_enable hash hash)
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
-		$(use_enable intl intl)
-		$(use_enable ipv6 ipv6)
-		$(use_enable json json)
-		$(use_with kerberos kerberos "${EPREFIX}/usr")
-		$(use_enable xml libxml)
-		$(use_with xml libxml-dir "${EPREFIX}/usr")
-		$(use_enable unicode mbstring)
-		$(use_with crypt mcrypt "${EPREFIX}/usr")
-		$(use_with unicode onig "${EPREFIX}/usr")
-		$(use_with ssl openssl "${EPREFIX}/usr")
-		$(use_with ssl openssl-dir "${EPREFIX}/usr")
-		$(use_enable pcntl pcntl)
-		$(use_enable phar phar)
-		$(use_enable pdo pdo)
-		$(use_enable opcache opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_with recode recode "${EPREFIX}/usr")
-		$(use_enable simplexml simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap soap)
-		$(use_enable sockets sockets)
-		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with systemd fpm-systemd)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer tokenizer)
-		$(use_enable wddx wddx)
-		$(use_enable xml xml)
-		$(use_enable xmlreader xmlreader)
-		$(use_enable xmlwriter xmlwriter)
-		$(use_with xmlrpc xmlrpc)
-		$(use_with xslt xsl "${EPREFIX}/usr")
-		$(use_enable zip zip)
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm ; then
-		our_conf+=( "--enable-dba${shared}" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype-dir "${EPREFIX}/usr")
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg-dir "${EPREFIX}/usr")
-		$(use_with gd png-dir "${EPREFIX}/usr")
-		$(use_with xpm xpm-dir "${EPREFIX}/usr")
-	)
-	if use webp; then
-		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
-	fi
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_with gd gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# Interbase/firebird support
-	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
-		)
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-
-	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	our_conf+=(
-		$(use_with odbc unixODBC "${EPREFIX}/usr")
-		$(use_with iodbc iodbc "${EPREFIX}/usr")
-	)
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "${mysqllib}")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit libedit "${EPREFIX}/usr")
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	our_conf+=(
-		--with-pcre-regex="${EPREFIX}/usr"
-		--with-pcre-dir="${EPREFIX}/usr"
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp${PHP_MV}$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-7.1.11.ebuild b/dev-lang/php/php-7.1.11.ebuild
new file mode 100644
index 000000000000..36bff5fe6f12
--- /dev/null
+++ b/dev-lang/php/php-7.1.11.ebuild
@@ -0,0 +1,721 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic versionator systemd
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://secure.php.net/"
+SRC_URI="https://secure.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(get_version_component_range 1-2)"
+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"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
+	coverage crypt +ctype curl debug
+	enchant exif +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer truetype unicode wddx webp
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	acl? ( sys-apps/acl )
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( dev-libs/gmp:0 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	webp? ( media-libs/libwebp )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	truetype? ( gd )
+	webp? ( gd )
+	cjk? ( gd )
+	exif? ( gd )
+	xpm? ( gd )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysqli !mysql )
+	sharedmem? ( !threads )
+	mysql? ( || ( mysqli pdo ) )
+"
+
+PHP_MV="$(get_major_version)"
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_with acl fpm-acl)
+		$(use_enable bcmath bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype ctype)
+		$(use_with curl curl "${EPREFIX}/usr")
+		$(use_enable xml dom)
+		$(use_with enchant enchant "${EPREFIX}/usr")
+		$(use_enable exif exif)
+		$(use_enable fileinfo fileinfo)
+		$(use_enable filter filter)
+		$(use_enable ftp ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_enable hash hash)
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
+		$(use_enable intl intl)
+		$(use_enable ipv6 ipv6)
+		$(use_enable json json)
+		$(use_with kerberos kerberos "${EPREFIX}/usr")
+		$(use_enable xml libxml)
+		$(use_with xml libxml-dir "${EPREFIX}/usr")
+		$(use_enable unicode mbstring)
+		$(use_with crypt mcrypt "${EPREFIX}/usr")
+		$(use_with unicode onig "${EPREFIX}/usr")
+		$(use_with ssl openssl "${EPREFIX}/usr")
+		$(use_with ssl openssl-dir "${EPREFIX}/usr")
+		$(use_enable pcntl pcntl)
+		$(use_enable phar phar)
+		$(use_enable pdo pdo)
+		$(use_enable opcache opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_with recode recode "${EPREFIX}/usr")
+		$(use_enable simplexml simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap soap)
+		$(use_enable sockets sockets)
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with systemd fpm-systemd)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer tokenizer)
+		$(use_enable wddx wddx)
+		$(use_enable xml xml)
+		$(use_enable xmlreader xmlreader)
+		$(use_enable xmlwriter xmlwriter)
+		$(use_with xmlrpc xmlrpc)
+		$(use_with xslt xsl "${EPREFIX}/usr")
+		$(use_enable zip zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		our_conf+=( "--enable-dba${shared}" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype-dir "${EPREFIX}/usr")
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg-dir "${EPREFIX}/usr")
+		$(use_with gd png-dir "${EPREFIX}/usr")
+		$(use_with xpm xpm-dir "${EPREFIX}/usr")
+	)
+	if use webp; then
+		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
+	fi
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_with gd gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# Interbase/firebird support
+	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	our_conf+=(
+		$(use_with odbc unixODBC "${EPREFIX}/usr")
+		$(use_with iodbc iodbc "${EPREFIX}/usr")
+	)
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit libedit "${EPREFIX}/usr")
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	our_conf+=(
+		--with-pcre-regex="${EPREFIX}/usr"
+		--with-pcre-dir="${EPREFIX}/usr"
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp${PHP_MV}$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-7.1.9.ebuild b/dev-lang/php/php-7.1.9.ebuild
deleted file mode 100644
index 054f5bdb63e5..000000000000
--- a/dev-lang/php/php-7.1.9.ebuild
+++ /dev/null
@@ -1,721 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic versionator systemd
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="http://php.net/"
-SRC_URI="http://php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(get_version_component_range 1-2)"
-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"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
-	coverage crypt +ctype curl debug
-	enchant exif +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session sharedmem
-	+simplexml snmp soap sockets spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer truetype unicode wddx webp
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	acl? ( sys-apps/acl )
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	berkdb? ( || (	sys-libs/db:5.3
-					sys-libs/db:5.1
-					sys-libs/db:4.8
-					sys-libs/db:4.7
-					sys-libs/db:4.6
-					sys-libs/db:4.5 ) )
-	bzip2? ( app-arch/bzip2 )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	coverage? ( dev-util/lcov )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( app-text/enchant )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	gmp? ( dev-libs/gmp:0 )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	recode? ( app-text/recode )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
-	truetype? ( =media-libs/freetype-2* )
-	unicode? ( dev-libs/oniguruma:= )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	webp? ( media-libs/libwebp )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? ( x11-libs/libXpm )
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib )
-	zlib? ( sys-libs/zlib )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd )
-	webp? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-	xpm? ( gd )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysqli !mysql )
-	sharedmem? ( !threads )
-	mysql? ( || ( mysqli pdo ) )
-"
-
-PHP_MV="$(get_major_version)"
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		$(use_enable threads maintainer-zts)
-	)
-
-	our_conf+=(
-		$(use_with acl fpm-acl)
-		$(use_enable bcmath bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype ctype)
-		$(use_with curl curl "${EPREFIX}/usr")
-		$(use_enable xml dom)
-		$(use_with enchant enchant "${EPREFIX}/usr")
-		$(use_enable exif exif)
-		$(use_enable fileinfo fileinfo)
-		$(use_enable filter filter)
-		$(use_enable ftp ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_enable hash hash)
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
-		$(use_enable intl intl)
-		$(use_enable ipv6 ipv6)
-		$(use_enable json json)
-		$(use_with kerberos kerberos "${EPREFIX}/usr")
-		$(use_enable xml libxml)
-		$(use_with xml libxml-dir "${EPREFIX}/usr")
-		$(use_enable unicode mbstring)
-		$(use_with crypt mcrypt "${EPREFIX}/usr")
-		$(use_with unicode onig "${EPREFIX}/usr")
-		$(use_with ssl openssl "${EPREFIX}/usr")
-		$(use_with ssl openssl-dir "${EPREFIX}/usr")
-		$(use_enable pcntl pcntl)
-		$(use_enable phar phar)
-		$(use_enable pdo pdo)
-		$(use_enable opcache opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_with recode recode "${EPREFIX}/usr")
-		$(use_enable simplexml simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap soap)
-		$(use_enable sockets sockets)
-		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with systemd fpm-systemd)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer tokenizer)
-		$(use_enable wddx wddx)
-		$(use_enable xml xml)
-		$(use_enable xmlreader xmlreader)
-		$(use_enable xmlwriter xmlwriter)
-		$(use_with xmlrpc xmlrpc)
-		$(use_with xslt xsl "${EPREFIX}/usr")
-		$(use_enable zip zip)
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm ; then
-		our_conf+=( "--enable-dba${shared}" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype-dir "${EPREFIX}/usr")
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg-dir "${EPREFIX}/usr")
-		$(use_with gd png-dir "${EPREFIX}/usr")
-		$(use_with xpm xpm-dir "${EPREFIX}/usr")
-	)
-	if use webp; then
-		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
-	fi
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_with gd gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# Interbase/firebird support
-	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
-		)
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-
-	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	our_conf+=(
-		$(use_with odbc unixODBC "${EPREFIX}/usr")
-		$(use_with iodbc iodbc "${EPREFIX}/usr")
-	)
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "${mysqllib}")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit libedit "${EPREFIX}/usr")
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	our_conf+=(
-		--with-pcre-regex="${EPREFIX}/usr"
-		--with-pcre-dir="${EPREFIX}/usr"
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp${PHP_MV}$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-7.2.0_rc2.ebuild b/dev-lang/php/php-7.2.0_rc2.ebuild
deleted file mode 100644
index a71b39c0e0b1..000000000000
--- a/dev-lang/php/php-7.2.0_rc2.ebuild
+++ /dev/null
@@ -1,734 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic versionator systemd
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="http://php.net/"
-SRC_URI="https://downloads.php.net/~pollita/php-7.2.0RC2.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(get_version_component_range 1-2)"
-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"
-
-S="${WORKDIR}/php-7.2.0RC2"
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
-	coverage +ctype curl debug
-	enchant exif +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session sharedmem
-	+simplexml snmp soap sockets sodium spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	acl? ( sys-apps/acl )
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	argon2? ( app-crypt/argon2 )
-	berkdb? ( || (	sys-libs/db:5.3
-					sys-libs/db:5.1
-					sys-libs/db:4.8
-					sys-libs/db:4.7
-					sys-libs/db:4.6
-					sys-libs/db:4.5 ) )
-	bzip2? ( app-arch/bzip2 )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	coverage? ( dev-util/lcov )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( app-text/enchant )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	gmp? ( dev-libs/gmp:0 )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	lmdb? ( dev-db/lmdb:= )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	recode? ( app-text/recode )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	sodium? ( dev-libs/libsodium:= )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	truetype? ( =media-libs/freetype-2* )
-	unicode? ( dev-libs/oniguruma:= )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	webp? ( media-libs/libwebp )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? ( x11-libs/libXpm )
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib )
-	zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
-	zlib? ( sys-libs/zlib )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd )
-	webp? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-	xpm? ( gd )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysqli !mysql )
-	sharedmem? ( !threads )
-	mysql? ( || ( mysqli pdo ) )
-	zip-encryption? ( zip )
-"
-
-PHP_MV="$(get_major_version)"
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		$(use_enable threads maintainer-zts)
-	)
-
-	our_conf+=(
-		$(use_with acl fpm-acl)
-		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
-		$(use_enable bcmath bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype ctype)
-		$(use_with curl curl "${EPREFIX}/usr")
-		$(use_enable xml dom)
-		$(use_with enchant enchant "${EPREFIX}/usr")
-		$(use_enable exif exif)
-		$(use_enable fileinfo fileinfo)
-		$(use_enable filter filter)
-		$(use_enable ftp ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_enable hash hash)
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
-		$(use_enable intl intl)
-		$(use_enable ipv6 ipv6)
-		$(use_enable json json)
-		$(use_with kerberos kerberos "${EPREFIX}/usr")
-		$(use_enable xml libxml)
-		$(use_with xml libxml-dir "${EPREFIX}/usr")
-		$(use_enable unicode mbstring)
-		$(use_with unicode onig "${EPREFIX}/usr")
-		$(use_with ssl openssl "${EPREFIX}/usr")
-		$(use_with ssl openssl-dir "${EPREFIX}/usr")
-		$(use_enable pcntl pcntl)
-		$(use_enable phar phar)
-		$(use_enable pdo pdo)
-		$(use_enable opcache opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_with recode recode "${EPREFIX}/usr")
-		$(use_enable simplexml simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap soap)
-		$(use_enable sockets sockets)
-		$(use_with sodium sodium "${EPREFIX}/usr")
-		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with systemd fpm-systemd)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer tokenizer)
-		$(use_enable wddx wddx)
-		$(use_enable xml xml)
-		$(use_enable xmlreader xmlreader)
-		$(use_enable xmlwriter xmlwriter)
-		$(use_with xmlrpc xmlrpc)
-		$(use_with xslt xsl "${EPREFIX}/usr")
-		$(use_enable zip zip)
-		$(use_with zip-encryption libzip "${EPREFIX}/usr")
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm || use lmdb || use tokyocabinet ; then
-		our_conf+=( "--enable-dba${shared}" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-		$(use_with lmdb lmdb "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype-dir "${EPREFIX}/usr")
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg-dir "${EPREFIX}/usr")
-		$(use_with gd png-dir "${EPREFIX}/usr")
-		$(use_with xpm xpm-dir "${EPREFIX}/usr")
-	)
-	if use webp; then
-		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
-	fi
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_with gd gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# Interbase/firebird support
-	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
-		)
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-
-	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	our_conf+=(
-		$(use_with odbc unixODBC "${EPREFIX}/usr")
-		$(use_with iodbc iodbc "${EPREFIX}/usr")
-	)
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "${mysqllib}")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit libedit "${EPREFIX}/usr")
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	# --with-pcre-valgrind cannot be enabled with system pcre
-	# Many arches don't support pcre-jit
-	our_conf+=(
-		--with-pcre-regex="${EPREFIX}/usr"
-		--with-pcre-dir="${EPREFIX}/usr"
-		--without-pcre-valgrind
-		--without-pcre-jit
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp${PHP_MV}$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-7.2.0_rc3.ebuild b/dev-lang/php/php-7.2.0_rc3.ebuild
deleted file mode 100644
index 6df349856b30..000000000000
--- a/dev-lang/php/php-7.2.0_rc3.ebuild
+++ /dev/null
@@ -1,734 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic versionator systemd
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="http://php.net/"
-SRC_URI="https://downloads.php.net/~remi/php-7.2.0RC3.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(get_version_component_range 1-2)"
-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"
-
-S="${WORKDIR}/php-7.2.0RC3"
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
-	coverage +ctype curl debug
-	enchant exif +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session sharedmem
-	+simplexml snmp soap sockets sodium spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	acl? ( sys-apps/acl )
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	argon2? ( app-crypt/argon2 )
-	berkdb? ( || (	sys-libs/db:5.3
-					sys-libs/db:5.1
-					sys-libs/db:4.8
-					sys-libs/db:4.7
-					sys-libs/db:4.6
-					sys-libs/db:4.5 ) )
-	bzip2? ( app-arch/bzip2 )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	coverage? ( dev-util/lcov )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( app-text/enchant )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	gmp? ( dev-libs/gmp:0 )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	lmdb? ( dev-db/lmdb:= )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	recode? ( app-text/recode )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	sodium? ( dev-libs/libsodium:= )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	truetype? ( =media-libs/freetype-2* )
-	unicode? ( dev-libs/oniguruma:= )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	webp? ( media-libs/libwebp )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? ( x11-libs/libXpm )
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib )
-	zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
-	zlib? ( sys-libs/zlib )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd )
-	webp? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-	xpm? ( gd )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysqli !mysql )
-	sharedmem? ( !threads )
-	mysql? ( || ( mysqli pdo ) )
-	zip-encryption? ( zip )
-"
-
-PHP_MV="$(get_major_version)"
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		$(use_enable threads maintainer-zts)
-	)
-
-	our_conf+=(
-		$(use_with acl fpm-acl)
-		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
-		$(use_enable bcmath bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype ctype)
-		$(use_with curl curl "${EPREFIX}/usr")
-		$(use_enable xml dom)
-		$(use_with enchant enchant "${EPREFIX}/usr")
-		$(use_enable exif exif)
-		$(use_enable fileinfo fileinfo)
-		$(use_enable filter filter)
-		$(use_enable ftp ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_enable hash hash)
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
-		$(use_enable intl intl)
-		$(use_enable ipv6 ipv6)
-		$(use_enable json json)
-		$(use_with kerberos kerberos "${EPREFIX}/usr")
-		$(use_enable xml libxml)
-		$(use_with xml libxml-dir "${EPREFIX}/usr")
-		$(use_enable unicode mbstring)
-		$(use_with unicode onig "${EPREFIX}/usr")
-		$(use_with ssl openssl "${EPREFIX}/usr")
-		$(use_with ssl openssl-dir "${EPREFIX}/usr")
-		$(use_enable pcntl pcntl)
-		$(use_enable phar phar)
-		$(use_enable pdo pdo)
-		$(use_enable opcache opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_with recode recode "${EPREFIX}/usr")
-		$(use_enable simplexml simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap soap)
-		$(use_enable sockets sockets)
-		$(use_with sodium sodium "${EPREFIX}/usr")
-		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with systemd fpm-systemd)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer tokenizer)
-		$(use_enable wddx wddx)
-		$(use_enable xml xml)
-		$(use_enable xmlreader xmlreader)
-		$(use_enable xmlwriter xmlwriter)
-		$(use_with xmlrpc xmlrpc)
-		$(use_with xslt xsl "${EPREFIX}/usr")
-		$(use_enable zip zip)
-		$(use_with zip-encryption libzip "${EPREFIX}/usr")
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm || use lmdb || use tokyocabinet ; then
-		our_conf+=( "--enable-dba${shared}" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-		$(use_with lmdb lmdb "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype-dir "${EPREFIX}/usr")
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg-dir "${EPREFIX}/usr")
-		$(use_with gd png-dir "${EPREFIX}/usr")
-		$(use_with xpm xpm-dir "${EPREFIX}/usr")
-	)
-	if use webp; then
-		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
-	fi
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_with gd gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# Interbase/firebird support
-	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
-		)
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-
-	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	our_conf+=(
-		$(use_with odbc unixODBC "${EPREFIX}/usr")
-		$(use_with iodbc iodbc "${EPREFIX}/usr")
-	)
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "${mysqllib}")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit libedit "${EPREFIX}/usr")
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	# --with-pcre-valgrind cannot be enabled with system pcre
-	# Many arches don't support pcre-jit
-	our_conf+=(
-		--with-pcre-regex="${EPREFIX}/usr"
-		--with-pcre-dir="${EPREFIX}/usr"
-		--without-pcre-valgrind
-		--without-pcre-jit
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp${PHP_MV}$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-7.2.0_rc5.ebuild b/dev-lang/php/php-7.2.0_rc5.ebuild
new file mode 100644
index 000000000000..1d273a120834
--- /dev/null
+++ b/dev-lang/php/php-7.2.0_rc5.ebuild
@@ -0,0 +1,736 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic versionator systemd
+
+MY_PV="${PV/_rc/RC}"
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://secure.php.net/"
+SRC_URI="https://downloads.php.net/~pollita/${PN}-${MY_PV}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(get_version_component_range 1-2)"
+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"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+	coverage +ctype curl debug
+	enchant exif +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	acl? ( sys-apps/acl )
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	argon2? ( app-crypt/argon2 )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( dev-libs/gmp:0 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	sodium? ( dev-libs/libsodium:= )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	webp? ( media-libs/libwebp )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( sys-libs/zlib )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	truetype? ( gd )
+	webp? ( gd )
+	cjk? ( gd )
+	exif? ( gd )
+	xpm? ( gd )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysqli !mysql )
+	sharedmem? ( !threads )
+	mysql? ( || ( mysqli pdo ) )
+	zip-encryption? ( zip )
+"
+
+PHP_MV="$(get_major_version)"
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_with acl fpm-acl)
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype ctype)
+		$(use_with curl curl "${EPREFIX}/usr")
+		$(use_enable xml dom)
+		$(use_with enchant enchant "${EPREFIX}/usr")
+		$(use_enable exif exif)
+		$(use_enable fileinfo fileinfo)
+		$(use_enable filter filter)
+		$(use_enable ftp ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_enable hash hash)
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
+		$(use_enable intl intl)
+		$(use_enable ipv6 ipv6)
+		$(use_enable json json)
+		$(use_with kerberos kerberos "${EPREFIX}/usr")
+		$(use_enable xml libxml)
+		$(use_with xml libxml-dir "${EPREFIX}/usr")
+		$(use_enable unicode mbstring)
+		$(use_with unicode onig "${EPREFIX}/usr")
+		$(use_with ssl openssl "${EPREFIX}/usr")
+		$(use_with ssl openssl-dir "${EPREFIX}/usr")
+		$(use_enable pcntl pcntl)
+		$(use_enable phar phar)
+		$(use_enable pdo pdo)
+		$(use_enable opcache opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_with recode recode "${EPREFIX}/usr")
+		$(use_enable simplexml simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap soap)
+		$(use_enable sockets sockets)
+		$(use_with sodium sodium "${EPREFIX}/usr")
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with systemd fpm-systemd)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer tokenizer)
+		$(use_enable wddx wddx)
+		$(use_enable xml xml)
+		$(use_enable xmlreader xmlreader)
+		$(use_enable xmlwriter xmlwriter)
+		$(use_with xmlrpc xmlrpc)
+		$(use_with xslt xsl "${EPREFIX}/usr")
+		$(use_enable zip zip)
+		$(use_with zip-encryption libzip "${EPREFIX}/usr")
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba${shared}" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype-dir "${EPREFIX}/usr")
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg-dir "${EPREFIX}/usr")
+		$(use_with gd png-dir "${EPREFIX}/usr")
+		$(use_with xpm xpm-dir "${EPREFIX}/usr")
+	)
+	if use webp; then
+		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
+	fi
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_with gd gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# Interbase/firebird support
+	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	our_conf+=(
+		$(use_with odbc unixODBC "${EPREFIX}/usr")
+		$(use_with iodbc iodbc "${EPREFIX}/usr")
+	)
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit libedit "${EPREFIX}/usr")
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	# --with-pcre-valgrind cannot be enabled with system pcre
+	# Many arches don't support pcre-jit
+	our_conf+=(
+		--with-pcre-regex="${EPREFIX}/usr"
+		--with-pcre-dir="${EPREFIX}/usr"
+		--without-pcre-valgrind
+		--without-pcre-jit
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp${PHP_MV}$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index dcb23547abb2..66e7b6853cd8 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -33,7 +33,7 @@ EBUILD python-2.7.14.ebuild 10760 SHA256 5c3a40aa1102d2c8f1ba14700ff13065eed95d9
 EBUILD python-3.4.5.ebuild 10493 SHA256 5e4fd02ad09f1ef78176f8f897a81d65a3a375c4bdd47bf220663d97996c53e1 SHA512 77559e269f8995fc93ea68824931c07b4be566ffd4775d4d30afd48e66a5fb34191d252ad5426c6cd2fcfa3c5176f50faf370b416ded6b8f2ea3957947d69448 WHIRLPOOL f8b532976b40049a5d139f060d614f6ea7d63b3a93e6d701826fb9ce724d4a9f37f14e8695ac5493e3addfc772c94ac682caf4ff13c71f6cc0a569cb9a950349
 EBUILD python-3.4.6.ebuild 10506 SHA256 62bef130a04d9a236da5daed8815af7cf4029ef69b62b41509b550b332d2b3c3 SHA512 aa7fd91eb9f7ded16cca1704dd69c7f99ec047cf98b5f2f6d40440d3774c784fa325f0e23d293d7aa9c3cc1d2da1c4bda673e87df207511e430892cac79336b7 WHIRLPOOL 26da088583376ea9977a89fb03409a8a1692f39dcc9b2bdcf1a7a7f5545d51850461f2ab46ea045b2722e35a41e91b4b795160aaaf4b3090ad1665409708ca14
 EBUILD python-3.5.3.ebuild 10616 SHA256 845df029dde963bc6c775456a99228d3dc68274e2fc2f02db821476a61a4ec29 SHA512 5f1126b0c265bed49c154e93be42c7e9f9fa2f9f1dccec36a66563ebc04dcdd7fb1e13c97dce7abc6e8645cbb3d9a46bddf0e6c11ce02d1d6ed1ed22c7622f04 WHIRLPOOL c66db283c54d200f7e603dc2694d34d433ac98f49fd081f1eada45848d841797f5ce4dd2a614653169eeb6e5f8eec02e5bacc052eb238477815f3cdb92fd7af1
-EBUILD python-3.5.4.ebuild 10616 SHA256 550dbb155008d6f261ae983275c97ada1602ffbba9b647e94a3c17b22322ac8c SHA512 71bd2471c429ffb24b733b30796faca1c71d90ff715fb74f8e65aa4c8647fc38900841f069362a50794938d2a055f9eac79b1e348ed5ffaa1dee9e486a4ac783 WHIRLPOOL d1f40206887f33e98a15e098dbacfa59ed50e21e825c7d5d7c0154ba630dee04ae08ece50a152dcc7f008bce7ea5bb756432b84b4699bc7ea4bb269bdc28491f
+EBUILD python-3.5.4.ebuild 10612 SHA256 eb95fecd60e08a4720e2f680503c823dd2b13f04871c85f3062a1fd74370af62 SHA512 acff8d4eb81fb1264b26e62eda25a90faf099fad3e046a7bd85c81a7926d45ba943131e0c404f88d198ae558eb29d65ef2f651483da686d56c4452a6248398fc WHIRLPOOL 8810dde1acc2df36b9e9434a77e9658c869e839d732bb795d9ad44b8ada175116255a466788f8e5bc8d31d5eac66d87cc7f57dd040d552a2068a26c1526f2e42
 EBUILD python-3.6.1-r1.ebuild 10099 SHA256 1ff374b0563ce797b936cb46169fb900023eb159f0508309fc8d1fe92165e714 SHA512 a3c0cd7ed326371124d5dbf28e53123200d7455e69d7b0d455ed5bb7a6229d5fc84f68f0307f7a1ac776770f7e920ee15e0ecba074aadc2f1f53a306efbafedd WHIRLPOOL b66f8ee06fe6f7516cd2f0008b524143cb81da424999cbfc7ee15670737969c1f28d8b782b612f6ae5fe7cb461b167fed4397424d40cc7c4403425a42145f44a
 EBUILD python-3.6.3.ebuild 10048 SHA256 65923d2c2bf9e3ac0059fc2d2c8b5ca85746f6d286ea71e887ad78da4cc068a0 SHA512 7ad64bef5a87331cf9e85e0c6713953632b80ad377cc9fadb278fd615a4cd2bfd0ade8ef812fca2c64fd42eb0e2f05f344b9c3503de6b13ac30c99ef125da041 WHIRLPOOL 583c1e37f9192788f1b7739e3b244dad9acf917f3579e87eb9740bda9f2c5adf1570bd28043dff2cbb9925ec48e6bfa080354a890af53af8ee9b01ae1352c5f7
 MISC ChangeLog 26323 SHA256 942a60afe8ad4d69f054645a4220ad8dc2eae24225f3c25acb6f71dead64fb82 SHA512 77a389f32babcce473a772076c963471c07c5c6dd6587d6df9c8a24384076b384ffcc3483848a08fa34032e61845bdfc17ddd2e15073cc68a66db8563470fc76 WHIRLPOOL 89485d421006e31d992195eb23af7cf0ddb37788550741b8f38a5fef97d003b59802f55c950128c06404d777a5dbf7a87e01eabe6554e19c17ada4bb713c696b
diff --git a/dev-lang/python/python-3.5.4.ebuild b/dev-lang/python/python-3.5.4.ebuild
index de48bc67184a..6c3ebff859ad 100644
--- a/dev-lang/python/python-3.5.4.ebuild
+++ b/dev-lang/python/python-3.5.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz
 
 LICENSE="PSF-2"
 SLOT="3.5/3.5m"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index e46af97f7798..06fc6d8bd5c4 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -17,9 +17,9 @@ EBUILD spidermonkey-1.7.0-r3.ebuild 1543 SHA256 9063521f6e069bff96a1972c188e75a9
 EBUILD spidermonkey-1.8.5-r4.ebuild 4182 SHA256 553d7f01d595a2c1ede9f998850d3d1ab9e56a19506b1e4aaf11497d9d5d764e SHA512 1fd10dcdd72d10bad6f91ba4c45a3368e8f07d15d27f37433773d630f38a953bac3b88a4af12b6bf40efe12850f082684a449b82a76c9773587c6b81b2506c47 WHIRLPOOL e24913445fb072624a1fc995666d07d19ae70d7b1ad3aa8d32208241f2f145bfa003b7b651a0dcee6d81c5711ce0f8b702d5aa409ff80e93ea4b581400ee576a
 EBUILD spidermonkey-1.8.5-r6.ebuild 4380 SHA256 9be340ecd5e8abde01f944cbe594f3cbbc2b770c27db416c52de2729a3a47772 SHA512 7ccbd24ebece87dcee4f1311758ff246dbe6531fd64e479382298e5f78c51f3b2e114c807308a3e52894b9e67a0441bb768d7a0023a96071766f971f1f7bb972 WHIRLPOOL de2cd7291c3ac241a276a0febed5caa6373add3dc965eae7bf26c1dd8e925877bf132ccf2da2aea6aa9f2844d7abdfb534bc7d5d40a77c7b488759bba5eff890
 EBUILD spidermonkey-17.0.0-r4.ebuild 3546 SHA256 c2ac4c27422f2ec41ca901f13749a71ba8505e9f17dbd53c6c1c501271ea5b09 SHA512 bdb32474452a0d7b5ab681c27a46de05cb61bc89fac3aaa00e1289a35676bddd7de9e51eb02bed992535a82f75e1dec74c014e900787f356ea8ada58d5b066d0 WHIRLPOOL 686fe55521c472a69152b518ec3ffcacdb0aaf5cfaf7499ca68bf5d921f8d20b644fd7e6c0c512a3e33cc1761d26016f23d8b72d6104ba4802f9857765ccb0c9
-EBUILD spidermonkey-17.0.0-r5.ebuild 3567 SHA256 fb1492a9eccfa2ffffbf3ce96ba6b93e5a34e684a2df1d17d132cf44b72b2ef6 SHA512 548ec293a1d32986e5cdf72c5cdf68b38494600b8ca3fa6b21281fabf1a2fc5e7c9fa224c1b1e9c4d857f9c68c37041c9eb46e7dd11d31da69adae8fa6f562d2 WHIRLPOOL 63d0bc180866925fb5994e9d2543f319c9d5d2deb5aaedb8c226f853194298a44b5631d9976d99b5a564ba4f74ffccb4c1b7cc71a64523bcf16bd0736f46a2e6
+EBUILD spidermonkey-17.0.0-r5.ebuild 3565 SHA256 fd5aa0e25a563fee6cceb5e1e831db39484929657af26def5a4e5e4e2028676b SHA512 6894f05e9e300ba8f121c034fb7ed00d5425c9d796e0c9997737766e18b88b7ffa342b85530136bcc57bb65d7abe1c3968770f1a1a47e6a87954c5b302e57102 WHIRLPOOL c95593f9582d6df15eaaae6d305c6bb574b826bf4fd46c4aa9293320234c441230a5cd04d0c33c9e4309dabc8cafff6bc6119debbd1e6d158d63d22def8d9eb2
 EBUILD spidermonkey-24.2.0-r3.ebuild 4015 SHA256 f27482f8101a3698168c06489012fea2817bf596810d4ca9ece007ae5a66bf8b SHA512 d715cf8f6ceb2139c14502ebe4c01a5a949fa59937737529dd9a5074444e1c25a2379018d740af2bb2cf99bbb3e35280bc88e68a44fa95d49d24e73f1843f003 WHIRLPOOL 2421fc40db3f21d7fc958b92e0f600bee4fa2daea0fd710fed284339cf8a191d15331b52ca5a20e6c5cd5c549a61c6e6538a70abf89ab25b6cd87e396671ad0f
-EBUILD spidermonkey-24.2.0-r4.ebuild 3994 SHA256 96b800b12661bf6dc91199974d16ef60b41695360b09e002166615f9a699cc80 SHA512 b229c12038ad8ba8b1afba0e194696b25476da8985a443a446dc841180653457337b7bae7769749efe6006c547e723069a3ef00507a5300dfecaa4cb30832371 WHIRLPOOL 45d8abd79819361b893f34f87d4d894ecea945a9053849580fb750b5eb1df11c5124a537fb291038641febb2ada594d310ff6b69fd3bffc274558c2d8591fc11
+EBUILD spidermonkey-24.2.0-r4.ebuild 3992 SHA256 13a020bbfba603fcd12027f2c7d2199c31f3500890187d0819b5be39042fbd36 SHA512 6b687ab4d02139130076395dc17fee24c83766651ceaa6db758ac74c12a8bca64ea93ea4c74441e6265d652020fc18fd0d98e74afac8ec5d611b8927b1d2d929 WHIRLPOOL f9e926a21ad747d4fe81756c53abc0f1a7ef380afe4da6623b1de4b5011a91e5c0a0f3a959cc6844c8e0ca7a1cad4a4802952219b07b9783721f31d3eb9c7fdf
 EBUILD spidermonkey-38.2.1_rc0.ebuild 3814 SHA256 93db7bea9b303087714562b6fc4720ab6e4749c45e9311962581e62fb04f10f4 SHA512 48c711825885f17617ce60119b9421b8d4cefae43f95eb9b9be9363bdcdab7edd2196795e2b371e3b32ea4b2dc353f94b28cec58a6802f4951a821ebce386794 WHIRLPOOL da437527edc032efa52398c2c6ab89a93c58d17d0e9b587dd2b255f103694fe0009f9d1380a217d9639226d9da3216d8f0392451163eee2c77d87493d81d91b7
 EBUILD spidermonkey-45.0.2.ebuild 3905 SHA256 66063c7090222478796a6900f514f76d7d412c26f406c63c9781d01ebecf9976 SHA512 a9a39994674ecdf1a974fbcc20f8c94e1f1f168db4095ba8c21a9d2fd01a6dbd0a59c932419c6b5f6c42b9bd7cc8b2aeaeb81973663a44b23372ea331b65d5db WHIRLPOOL ecb3e2a37d411571c2887f6db428f00baa501c128a3c748a2f46dd35cac6a755452bc591cfbe511520b065ab10a0e16b18fd50f99d8ec85779ca772e7adab5bb
 EBUILD spidermonkey-52.4.0_pre20171003-r1.ebuild 3868 SHA256 c86c0bfb096cf57a287733d4f5f708e3ff6ab51a610341a53c7e2520452f7aed SHA512 5dcddaf5debdee01c4dab41b5088cf4f5375ba7c2f35f35c91f65dce0c3d1db74ce17955effc5002c8147e37fbb873b6a7d2242c0794ee98052e40e9c68b4f11 WHIRLPOOL bc0e7cd509197173849425bed16e450469a044ae4e136ad306c312f9d021bef7439a3a2d65da548b6505bd866cd7e13d6aea6c553d06cc3bb806d323912f3bd3
diff --git a/dev-lang/spidermonkey/spidermonkey-17.0.0-r5.ebuild b/dev-lang/spidermonkey/spidermonkey-17.0.0-r5.ebuild
index 4bdd3449d2aa..243b4a12be64 100644
--- a/dev-lang/spidermonkey/spidermonkey-17.0.0-r5.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-17.0.0-r5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://archive.mozilla.org/pub/js/${MY_PN}${PV}.tar.gz
 LICENSE="NPL-1.1"
 SLOT="17"
 # "MIPS, MacroAssembler is not supported" wrt #491294 for -mips
-KEYWORDS="~alpha ~amd64 ~arm -hppa ia64 -mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ~arm -hppa ia64 -mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="debug jit minimal static-libs test"
 
 REQUIRED_USE="debug? ( jit )"
diff --git a/dev-lang/spidermonkey/spidermonkey-24.2.0-r4.ebuild b/dev-lang/spidermonkey/spidermonkey-24.2.0-r4.ebuild
index ec3b7c3f33f1..86a134c79de6 100644
--- a/dev-lang/spidermonkey/spidermonkey-24.2.0-r4.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-24.2.0-r4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://archive.mozilla.org/pub/js/${MY_P}.tar.bz2
 
 LICENSE="NPL-1.1"
 SLOT="24"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="debug icu jit minimal static-libs +system-icu test"
 
 RESTRICT="ia64? ( test )"
diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index 02dbd93bb880..7c75cf0a0cc6 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -1,6 +1,6 @@
 DIST appstream-glib-0.6.13.tar.xz 1974864 SHA256 1a3734b2cdaab55ad63c6e3ee31026fdceb122cecae39f9f7126a0305e8836bf SHA512 d7e95a31d3f6fba974af2fab423282c7b0291d1325a634d8040fe2c2c2fcde49981be18900415251b3d71f20bb9e945e16d7c00fa830b27deac2e5547ec4c8b0 WHIRLPOOL 91e8209ff79b564c51328d84ef34301872865ade73d2c85b71ba5dbfddffcd81ad30bce9867d44282822df566a3fa028cd291ee1a896b52612bb80d2f435251c
 DIST appstream-glib-0.6.8.tar.xz 1962132 SHA256 23f009233a96d1246c4c46c9746be126ae9d422753399621445d07bff49cae41 SHA512 dac9e0cc6dd8dfb81cbcdb6796d6890b61d5ede634cbe31768d1cf5746ada3beaf8b46918bab24e72604d52cbf6c6602efa6aedbdf9379f4c10528929f926fe5 WHIRLPOOL d2f2dd1607f4cb03ab501e4e189862cbb5c58b0bc3e63af153d72c7a714e791509dc2981921b1414f11282f7681277b690cb3142ce71c2bacd2799a935bdfdc2
-EBUILD appstream-glib-0.6.13.ebuild 1609 SHA256 689ca6f3e3e40a67965b5c0ec1a44f75a7ad2d71a29bfb8de4a42f6cacc918c3 SHA512 8f3a699c917d31ea5b7a0ec5245c55423e54583a9a74c879927c891966b6f7584730177bafd4f4eae6a1b4d290b9328bdb86054e6eef529947719d57fb488a5a WHIRLPOOL 2bb0748cc20075f79c8568b6a740a2b33fb1b972595244bb686a94d974f7b0368f04aa1bccffcc9b1405d6c22cf8a9d570c576b9ab05fef9d6ec809ad16b6a59
+EBUILD appstream-glib-0.6.13.ebuild 1608 SHA256 207d99d95aeb856fbc93ed26b2b3591bf18d0b0fafbd8c5927dab0bd0dd9df3b SHA512 3aa6ee93f8945248e3311afbd926f246815cc2d1cf83ec9740a1b35907c7eb711c70fad3742bb10f37a61f1109893b984d14686c5295e5bbab1b68180f0f9f5b WHIRLPOOL b7a97f821a0fe7934e5596a634143d0d927dbcefde10c1e33aeb4ef08b050719a6bfd013a9ce511659c2bce8380ba31676bb38415983018d43157716c7f9b70f
 EBUILD appstream-glib-0.6.8.ebuild 1605 SHA256 5ac4f37114ab3e4eb4e1f1bfbf4c2e3cfc3bcd8e6e2dc602ad0c572d196f0b18 SHA512 a068a048dea1e3ee462f86b1597b2f22068f70f7e30ac1fc6cf407a2a0853b1d021c5d985fc670dbb6e3b8773d0a9be9f83d6edef888d8c151b6a49334c2a0ef WHIRLPOOL 5bc9afbda1d2176a5ce7d2d94486bcaa068c734bd1bfd60a388791afbca168d1efe1784512a0c5d52828d1c3d58ac86bbfc1255dc2d6d287570826dae701af74
 MISC ChangeLog 11400 SHA256 69f7c01c5a677fa167ba0cad02289aab64957fa50f34144f575db076656a68a2 SHA512 1aaa5ef4048d403fb842d7069a5cbe0a913c945ec79a162a31f39e4010de15df23820d83ca0eb667182fa12b4ba3c6730f8871d67eca4a56ba1e2906dbaf8408 WHIRLPOOL 8d60db7a5a67571100a206afb9bf6b1091be35e0ae90248ca3f5397056914453e7abffa6a91404943b75782f305862bf4411a5b298bc721e35adfe04efc08ebd
 MISC ChangeLog-2015 3598 SHA256 4577c0ae171b2ae0c896a619c05a6d9e78c4f66d4df3c8afd1ab9d9f37910fdc SHA512 a79b0340662e00790d084e1f6e1b969046ac39297cd589fdc021546ab67835fff0343b40d2df65555c2d33ef6973000c1a7fadf1d15871f3a9d020f1e2f40de6 WHIRLPOOL 412a5af8f8784a4f569703976337824e26d19c777c9509ae31c9dd76092c227562fb5cabcc09cc0f139186dec6c09f27ad8bb289dd98bc5c14091a024ca7e373
diff --git a/dev-libs/appstream-glib/appstream-glib-0.6.13.ebuild b/dev-libs/appstream-glib/appstream-glib-0.6.13.ebuild
index 7f35b95da11c..46e2ccfca385 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.6.13.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.6.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/8" # soname version
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
 IUSE="+introspection nls stemmer"
 
 RDEPEND="
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index 5e6423eab95c..e5603475b50d 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -1,10 +1,11 @@
 AUX apr-util-1.5.3-sysroot.patch 1234 SHA256 752ee44d3e9e39e4cba824556f829776a46e4f5e64d4f359de781d3bfd3a414f SHA512 44ee2a9cf61587f05d43976d40023f6313b310c3eeb37299840445e3faec7f0352367875f515b21d3b1fcdc8c082d8584a21cf8187deb1f6f69187c14f84f0b7 WHIRLPOOL 2017ccccfade6e99a490781100a7ca2ee1901a93b791db78291e3d7850e9916d183084abc6f46b2a80ffb451dfb5f1e999189f9ce6f994b51146563bef52a7af
 DIST apr-util-1.5.4.tar.bz2 694427 SHA256 a6cf327189ca0df2fb9d5633d7326c460fe2b61684745fd7963e79a6dd0dc82e SHA512 ca877d8e444218c4ba0f28063ee075ddcd6c0a487b692dc80ef442fe775ec4eeb337c6957853772e8082e27edcb450d7e909c2c6c3ab4a95bbf0a5ee5ea4a2d1 WHIRLPOOL bc4ce82785513f4bf2207bb26758abc79e6bfef62a57d3e2ead570abc618b321c302390b9dcd8eab1ec44a9e5d398c2cc4d35af2549636e20d7c20678725ac2e
 DIST apr-util-1.6.0.tar.bz2 428750 SHA256 8474c93fa74b56ac6ca87449abe3e155723d5f534727f3f33283f6631a48ca4c SHA512 dc88c13ef6116ed1c67584436cb8ca94ef77d358cb60c7cafab953d36d00564776414faed43397755e79bcf1b14dfca81cad2e280a2dd4c31f6e4559583effd0 WHIRLPOOL a41e90c781d6fd0792ba4d4941744d61bee2289b72529ccca92fbcb671234e80d7faee7e6fa8cf86e6f2d822e6429cff17721a96fdb6527f0802cbd6ed4c1284
-EBUILD apr-util-1.5.4-r1.ebuild 3351 SHA256 9d1e9007dcce45d0e9d0325f4bcb3b28bc540c7c63b07e2767d8a6d1cac1053e SHA512 d56ced2e56d2dcb9b1aa53b426f3e0ba03d4f12076731e808630d9d58917f31320c2d2435bee645be8768b3663ba2af8664f0824a17e90a26f7927a0fae37732 WHIRLPOOL a76001edc4d72768a6c1cb096821ac76139138e75f2f60a8378daf86beee3bcd4d324de0f00d03669b33bde0afd43ca7b1526548d0bb192bc41a08352f4d7b66
+DIST apr-util-1.6.1.tar.bz2 428595 SHA256 d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d WHIRLPOOL 66ec9e7f5c596c0eba93329d61b565013bd16388e958bf50f947d977e11ef0a562cf72aa6cce3f24d0748f0f296a011ecbf2a61b6ee5333e0baf3e91ea429fa7
 EBUILD apr-util-1.5.4-r3.ebuild 3705 SHA256 e70cda306e07030e975e11e99d3f62e29a93d25dc75647dcd6bb9a48155ae53d SHA512 6fcb294154753d569e3cad05c6e293c85ea49aab64f8fa2542577624b6c4349f80e06376f021d953b22e59ff8bd6b97c5e6e31106971a1333594572a8ef759c0 WHIRLPOOL 24d6411cde7b0926950952b999b37869ef152fd5444361d6faa2aa8e78fe4bdbce7d79af8d2108ee419605ccec1ed384443e3ea89eebd4c346f95a5a1ac61ae0
 EBUILD apr-util-1.5.4.ebuild 3238 SHA256 b5dd4d0dd26da87d7167edbadff9ac9d2d6c3cd4919572bc7aa0471dbd29229f SHA512 c018c7088ffac68d91aa0c8e8089dd7a0dd9219b21cbd95db63c8a9980067e1f841a64bb4a1de6fbd3438b4a95edaca838284b85c20095e138fc92f6fbd9d664 WHIRLPOOL bdff04ea43a4c4fc4f4872e41d581c415c00d532267c449a3a68e23b7a5f071401423834b273cdbc188dc9f79c81181088eb6fd68b51aab448213e452a3c2612
 EBUILD apr-util-1.6.0.ebuild 3611 SHA256 cc06598079caf57e6c580c1b2f66bf2d137bbfc27d321ae6710693b8186127ca SHA512 9cfd1e467bf2ead57335c561de29851a3bc72e759c0d515223a35b60acebf90ee473846862942c86e5d921acbb9f04e2654a33d27c36ffa6568d354bab871ad8 WHIRLPOOL 2e7da9047abbcbd1cd3a9af434677f6525a7da23276ce3e9eb469b36dd3122199b9412d3bb6d701f01b21a17291205f2c2d6e16b501772a0350ace25777be421
+EBUILD apr-util-1.6.1.ebuild 3611 SHA256 cc06598079caf57e6c580c1b2f66bf2d137bbfc27d321ae6710693b8186127ca SHA512 9cfd1e467bf2ead57335c561de29851a3bc72e759c0d515223a35b60acebf90ee473846862942c86e5d921acbb9f04e2654a33d27c36ffa6568d354bab871ad8 WHIRLPOOL 2e7da9047abbcbd1cd3a9af434677f6525a7da23276ce3e9eb469b36dd3122199b9412d3bb6d701f01b21a17291205f2c2d6e16b501772a0350ace25777be421
 MISC ChangeLog 2789 SHA256 7545011cfeb5878c8cf91df048ab98a188e0afbfbb9e6f3b551d7d064abac5c4 SHA512 17c82c556c5c82adbbedd8483c499892adf7d5f6835cc08aa436b6de1d88ce4713c37b08ff1142f15a0d00914cca548447fde08773c58fa8ce56aac3882ab125 WHIRLPOOL 32a8df43ce713e721bac5c6f5c412ef41145d268f5f281dfa3181aa7d3492cd0f4ad1b8ebcb72fd248da07071b594adf0e13eca9afc3b5b0bc1d22048d016d3c
 MISC ChangeLog-2015 28596 SHA256 4bf952fa4e066f230ef1d23955c7854a88560e3888938a1e8ef83823adde249b SHA512 87078eb359eff08fc32b698a4c9a43003b83e2f501b0728a2e16978e38c80621a9279624489260c813732281ef59c851e8a2130736cde0eacdf16bb804cafc66 WHIRLPOOL ac08e462b2b6288e93e7a882205acfbe164e28126aea0fcd3f7e293f7c35f5ca1e43b85e7a8222a5905a83d2521c5627b1ebca5b7e9f5191dbbbc7a09062ec93
 MISC metadata.xml 515 SHA256 d5226f9f0b532aa0adf1cbc7e4b5333dae3411f0c12e6df483a4036d7150133a SHA512 af8e2bbded13ef475d1577eb4faa27e17a045804f1de3e79c4c3d736871db304872fc65db0d606c243292392fb4ac773711ad9e153369714689138249d469158 WHIRLPOOL 0d9a6906df5f22918414a41f8a0806e502ef38696d9c5fc5c9949c13c988fa57d3acae1c99ef1ca2279ca7ec970044bf3e1c704c460cd397262b1a6e34f0de7b
diff --git a/dev-libs/apr-util/apr-util-1.5.4-r1.ebuild b/dev-libs/apr-util/apr-util-1.5.4-r1.ebuild
deleted file mode 100644
index 9fa270a7f21f..000000000000
--- a/dev-libs/apr-util/apr-util-1.5.4-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-# Usually apr-util has the same PV as apr, but in case of security fixes, this may change.
-# APR_PV="${PV}"
-APR_PV="1.4.6"
-
-inherit autotools db-use eutils libtool multilib toolchain-funcs
-
-DESCRIPTION="Apache Portable Runtime Utility Library"
-HOMEPAGE="http://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="berkdb doc freetds gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs"
-#RESTRICT="test"
-
-RDEPEND="dev-libs/expat
-	>=dev-libs/apr-${APR_PV}:1
-	berkdb? ( >=sys-libs/db-4 )
-	freetds? ( dev-db/freetds )
-	gdbm? ( sys-libs/gdbm )
-	ldap? ( =net-nds/openldap-2* )
-	mysql? ( =virtual/mysql-5* )
-	nss? ( dev-libs/nss )
-	odbc? ( dev-db/unixODBC )
-	openssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	postgres? ( dev-db/postgresql )
-	sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.4.2
-	doc? ( app-doc/doxygen )"
-
-DOCS=(CHANGES NOTICE README)
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5.3-sysroot.patch #385775
-	eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	local myconf=()
-
-	tc-is-static-only && myconf+=( --disable-util-dso )
-
-	if use berkdb; then
-		local db_version
-		db_version="$(db_findver sys-libs/db)" || die "Unable to find Berkeley DB version"
-		db_version="$(db_ver_to_slot "${db_version}")"
-		db_version="${db_version/\./}"
-		myconf+=(
-			--with-dbm=db${db_version}
-			# We use $T for the libdir because otherwise it'd simply be the normal
-			# system libdir.  That's pointless as the compiler will search it for
-			# us already.  This makes cross-compiling and such easier.
-			--with-berkeley-db="${SYSROOT}$(db_includedir 2>/dev/null):${T}"
-		)
-	else
-		myconf+=( --without-berkeley-db )
-	fi
-
-	if use nss || use openssl ; then
-		myconf+=( --with-crypto ) # 518708
-	fi
-
-	econf \
-		--datadir="${EPREFIX}"/usr/share/apr-util-1 \
-		--with-apr="${SYSROOT}${EPREFIX}"/usr \
-		--with-expat="${EPREFIX}"/usr \
-		--without-sqlite2 \
-		$(use_with freetds) \
-		$(use_with gdbm) \
-		$(use_with ldap) \
-		$(use_with mysql) \
-		$(use_with nss) \
-		$(use_with odbc) \
-		$(use_with openssl) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite sqlite3) \
-		"${myconf[@]}"
-	# Use the current env build settings rather than whatever apr was built with.
-	sed -i -r \
-		-e "/^(apr_builddir|apr_builders|top_builddir)=/s:=:=${SYSROOT}:" \
-		-e "/^CC=/s:=.*:=$(tc-getCC):" \
-		-e '/^(C|CPP|CXX|LD)FLAGS=/d' \
-		-e '/^LTFLAGS/s:--silent::' \
-		build/rules.mk || die
-}
-
-src_compile() {
-	emake
-	use doc && emake dox
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name "*.la" -delete
-	find "${ED}usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete
-	use static-libs || find "${ED}" -name "*.a" -not -name "*$(get_libname)" -delete
-
-	use doc && dohtml -r docs/dox/html/*
-
-	# This file is only used on AIX systems, which Gentoo is not,
-	# and causes collisions between the SLOTs, so remove it.
-	rm -f "${ED}usr/$(get_libdir)/aprutil.exp"
-}
diff --git a/dev-libs/apr-util/apr-util-1.6.1.ebuild b/dev-libs/apr-util/apr-util-1.6.1.ebuild
new file mode 100644
index 000000000000..ec528c173dd8
--- /dev/null
+++ b/dev-libs/apr-util/apr-util-1.6.1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Usually apr-util has the same PV as apr, but in case of security fixes, this may change.
+# APR_PV="${PV}"
+APR_PV="1.6.2"
+
+inherit autotools db-use eutils libtool multilib toolchain-funcs
+
+DESCRIPTION="Apache Portable Runtime Utility Library"
+HOMEPAGE="http://apr.apache.org/"
+SRC_URI="mirror://apache/apr/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="berkdb doc gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs"
+#RESTRICT="test"
+
+RDEPEND="
+	dev-libs/expat
+	>=dev-libs/apr-${APR_PV}:1
+	berkdb? ( >=sys-libs/db-4:= )
+	gdbm? ( sys-libs/gdbm )
+	ldap? ( =net-nds/openldap-2* )
+	mysql? ( =virtual/mysql-5* )
+	nss? ( dev-libs/nss )
+	odbc? ( dev-db/unixODBC )
+	openssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="
+	${RDEPEND}
+	>=sys-devel/libtool-2.4.2
+	doc? ( app-doc/doxygen )
+"
+
+DOCS=(CHANGES NOTICE README)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.3-sysroot.patch #385775
+)
+
+src_prepare() {
+	default
+
+	# Fix usage of libmysqlclient (bug #620230)
+	grep -lrF "libmysqlclient_r" "${S}" \
+		| xargs sed 's@libmysqlclient_r@libmysqlclient@g' -i \
+		|| die
+
+	mv configure.{in,ac} || die
+	eautoreconf
+	elibtoolize
+}
+
+src_configure() {
+	local myconf=(
+		--datadir="${EPREFIX}"/usr/share/apr-util-1
+		--with-apr="${SYSROOT}${EPREFIX}"/usr
+		--with-expat="${EPREFIX}"/usr
+		--without-sqlite2
+		$(use_with gdbm)
+		$(use_with ldap)
+		$(use_with mysql)
+		$(use_with nss)
+		$(use_with odbc)
+		$(use_with openssl)
+		$(use_with postgres pgsql)
+		$(use_with sqlite sqlite3)
+	)
+
+	tc-is-static-only && myconf+=( --disable-util-dso )
+
+	if use berkdb; then
+		local db_version
+		db_version="$(db_findver sys-libs/db)" || die "Unable to find Berkeley DB version"
+		db_version="$(db_ver_to_slot "${db_version}")"
+		db_version="${db_version/\./}"
+		myconf+=(
+			--with-dbm=db${db_version}
+			# We use $T for the libdir because otherwise it'd simply be the normal
+			# system libdir.  That's pointless as the compiler will search it for
+			# us already.  This makes cross-compiling and such easier.
+			--with-berkeley-db="${SYSROOT}$(db_includedir 2>/dev/null):${T}"
+		)
+	else
+		myconf+=( --without-berkeley-db )
+	fi
+
+	if use nss || use openssl ; then
+		myconf+=( --with-crypto ) # 518708
+	fi
+
+	econf "${myconf[@]}"
+	# Use the current env build settings rather than whatever apr was built with.
+	sed -i -r \
+		-e "/^(apr_builddir|apr_builders|top_builddir)=/s:=:=${SYSROOT}:" \
+		-e "/^CC=/s:=.*:=$(tc-getCC):" \
+		-e '/^(C|CPP|CXX|LD)FLAGS=/d' \
+		-e '/^LTFLAGS/s:--silent::' \
+		build/rules.mk || die
+}
+
+src_compile() {
+	emake
+	use doc && emake dox
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name "*.la" -delete || die
+	if [[ -d "${ED%/}/usr/$(get_libdir)/apr-util-${SLOT}" ]] ; then
+		find "${ED%/}/usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete || die
+	fi
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -not -name "*$(get_libname)" -delete || die
+	fi
+
+	if use doc ; then
+		docinto html
+		dodoc -r docs/dox/html/*
+	fi
+
+	# This file is only used on AIX systems, which Gentoo is not,
+	# and causes collisions between the SLOTs, so remove it.
+	rm "${ED%/}/usr/$(get_libdir)/aprutil.exp" || die
+}
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 79fbd93a9c54..878541caf777 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -5,8 +5,10 @@ AUX apr-1.5.0-sysroot.patch 1309 SHA256 6ebfe28e672084747cf1ee88acec7394de96302f
 AUX config.layout.patch 745 SHA256 29d224f052c378f0130b59625120507d3f7d8d83fb3d7ec9c2b806b7abeec2fa SHA512 3a87e718859c8f95793f828b764d240907d65c21fe2c99143815ab835f8b657154092c4ad496e86d79490bd85ef03d394d3acb57a15186f2f06a518b32d77fdf WHIRLPOOL 5e76166dc535ecf56b601de7c8dffb92410a6677d077b66589a49d69262e41d652a6b17ab931fcd01a1b905f13b9cfe07c414179f37f75bf465effdc5dc3c8b3
 DIST apr-1.5.2.tar.bz2 826885 SHA256 7d03ed29c22a7152be45b8e50431063736df9e1daa1ddf93f6a547ba7a28f67a SHA512 d1156ad16abf07887797777b56c2147c890f16d8445829b3e3b4917950d24c5fd2f8febd439992467a5ea0511da562c0fb4a7cfd8a235ab55882388bfa2b919d WHIRLPOOL 3f6fbb9410f7cd3ace2f80f361a02b190e14d744f38dbd6f87a5c60b4b1c4a99cd902ba9351a235d9f3bab044a981de21fb6c193d3ab3caba2448bf6c4e1bd1b
 DIST apr-1.6.2.tar.bz2 853363 SHA256 09109cea377bab0028bba19a92b5b0e89603df9eab05c0f7dbd4dd83d48dcebd SHA512 20f449fde522f186b919b64ce6f90073b267557e17438607d31af917eca7941222dd7a7379d66f1430ff68f7e28fbccd140d24f3ca7aae8a876a550b19de284a WHIRLPOOL 4fd43497ed091f9da2a8c8a57017344dc7492b18793e8a16eae480ddbba8f18ebc66925418d8b5fa8fa6fa023b59a482d62c8ba1ee49a575aa6f7918b703ea30
+DIST apr-1.6.3.tar.bz2 854100 SHA256 131f06d16d7aabd097fa992a33eec2b6af3962f93e6d570a9bd4d85e95993172 SHA512 f6b8679ae7fafff793c825c78775c84a646267c441710a50664589850e13148719b4eab48ab6e7c95b7aed085cff831115687434a7b160dcc2faa0eae63ac996 WHIRLPOOL b17edd2b8fed082f8e25e56728fec3d3629debdb7bcc78dab94aa6665371a97ece5b321d37caf717106abd03740b5724108364553106055ce7fa7c9b50a196ed
 EBUILD apr-1.5.2.ebuild 4100 SHA256 f7054cbfd1f8115687c2652489eca6d6b8bd3bdb2b2e6094fe116017c1057bfe SHA512 c57fe4d819a172fa9a528d75eabfbd1ce129d71cec30f79c8870f3e9dbc5a08772de5a91af9497cf8b33492439196b36b5f3b3b9dcd4a347d8a1380b5e5a5192 WHIRLPOOL 3f0127305c6590004910ae7ea01d5cf8a4e8dad506eb1b661043b769045d9efd418162f5ef32a5903e3a1bfa5dd46640d7cde3c2305dc0b7cc4182cbacae5016
 EBUILD apr-1.6.2.ebuild 4091 SHA256 9d4704c571d777db52f807de64fdd1f251b134cade293749a2d5b4b22ce84a6a SHA512 7e16c2e12137ad6fd8b88e84a3c6c364aaa4396b53b1c9905fcc6eb7a1713e90fc9006d900235742d003ea59708f278720ed3487ddebdc2fb2d2b59ea502e1be WHIRLPOOL d1edd9ece467d074b9d733544d382b0369fcfce8a0bb7df33d69adcda6172e26167a5629f43a7b01523907e062c087b812d9c0dedab20dd6077e616966a491b9
+EBUILD apr-1.6.3.ebuild 4091 SHA256 9d4704c571d777db52f807de64fdd1f251b134cade293749a2d5b4b22ce84a6a SHA512 7e16c2e12137ad6fd8b88e84a3c6c364aaa4396b53b1c9905fcc6eb7a1713e90fc9006d900235742d003ea59708f278720ed3487ddebdc2fb2d2b59ea502e1be WHIRLPOOL d1edd9ece467d074b9d733544d382b0369fcfce8a0bb7df33d69adcda6172e26167a5629f43a7b01523907e062c087b812d9c0dedab20dd6077e616966a491b9
 MISC ChangeLog 2475 SHA256 eb94693c6b92297fdd0ba293d6a8bf0ed8889a886170e3eb0416991d54fe4634 SHA512 4367f487f70f6ad6a35b305af3ba446f18616c990bbd06e5aa2efd90a614f97128dc5c5e54cae76346f1e9f20808623a9b95cc70db65540928de419d74cb3e05 WHIRLPOOL cbd1495333efe779974079ba8b65e53bd185419a68fe84d95dde59cf0b02a7bf5c17058e638043e7664136f746205125608add667676c7645f0e063a76947b6f
 MISC ChangeLog-2015 28918 SHA256 36d001de47bfb90a8a8a80cdf7ee9a8d86000c94d58df95579c921bf6997c424 SHA512 876d679eaa9627bda13d9e2e350681ff40ec0f7978165823a33196fe7be90a244540659720ad323476ef2a02aca244415063ce94c23251f43f25841d872fc585 WHIRLPOOL df7fc5a927d5fe0b12e977ac9a6684eb779ae5ba95ab6350f3f7fac9493ca28de8786da833315f8d71240b5044cf74483a7a5967caa23cead8367492b1a3d2d8
 MISC metadata.xml 433 SHA256 e65d577b56d477a35f0cd4d2f400f48d1054e3aacd74353c432f91138be8ee01 SHA512 7a1b6a73160b108816332f90e4e540f555e748584925ac3c7bb303ce5b6328abf255fc3f1c2b0e13f3c5d763841e847e400e781764083e3e96bc3809871a0df6 WHIRLPOOL d2e07c994cbb20905b692c729e5ec80b1e2b6085c4939245a5848994e9d250344d21b133d705e2d40cf1b860333e8bc0017bf0944d7e8bf78dcab891b66166d8
diff --git a/dev-libs/apr/apr-1.6.3.ebuild b/dev-libs/apr/apr-1.6.3.ebuild
new file mode 100644
index 000000000000..cc08f2934308
--- /dev/null
+++ b/dev-libs/apr/apr-1.6.3.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools libtool ltprune multilib toolchain-funcs
+
+DESCRIPTION="Apache Portable Runtime Library"
+HOMEPAGE="https://apr.apache.org/"
+SRC_URI="mirror://apache/apr/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
+
+CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
+	elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-apache )"
+DEPEND="${CDEPEND}
+	>=sys-devel/libtool-2.4.2
+	doc? ( app-doc/doxygen )"
+
+DOCS=( CHANGES NOTICE README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.0-mint.patch
+	"${FILESDIR}"/${PN}-1.5.0-libtool.patch
+	"${FILESDIR}"/${PN}-1.5.0-cross-types.patch
+	"${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
+)
+
+src_prepare() {
+	default
+
+	AT_M4DIR="build" eautoreconf
+	elibtoolize
+
+	eapply "${FILESDIR}/config.layout.patch"
+}
+
+src_configure() {
+	local myconf=(
+		--enable-layout=gentoo
+		--enable-nonportable-atomics
+		--enable-posix-shm
+		--enable-threads
+		$(use_enable static-libs static)
+	)
+
+	[[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
+
+	if use older-kernels-compatibility; then
+		local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
+		export apr_cv_accept4="no"
+		export apr_cv_dup3="no"
+		export apr_cv_epoll_create1="no"
+		export apr_cv_sock_cloexec="no"
+	fi
+	if tc-is-cross-compiler; then
+		# The apache project relies heavily on AC_TRY_RUN and doesn't
+		# have any sane cross-compiling fallback logic.
+		export \
+			ac_cv_file__dev_zero="yes" \
+			ac_cv_func_sem_open="yes" \
+			ac_cv_negative_eai="yes" \
+			ac_cv_o_nonblock_inherited="no" \
+			ac_cv_struct_rlimit="yes" \
+			ap_cv_atomic_builtins="yes" \
+			apr_cv_accept4="yes" \
+			apr_cv_dup3="yes" \
+			apr_cv_epoll="yes" \
+			apr_cv_epoll_create1="yes" \
+			apr_cv_gai_addrconfig="yes" \
+			apr_cv_mutex_recursive="yes" \
+			apr_cv_mutex_robust_shared="yes" \
+			apr_cv_process_shared_works="yes" \
+			apr_cv_pthreads_lib="-pthread" \
+			apr_cv_sock_cloexec="yes" \
+			apr_cv_tcp_nodelay_with_cork="yes"
+	fi
+
+	if use urandom; then
+		myconf+=( --with-devrandom=/dev/urandom )
+	elif (( ${CHOST#*-hpux11.} <= 11 )); then
+		: # no /dev/*random on hpux11.11 and before, $PN detects this.
+	else
+		myconf+=( --with-devrandom=/dev/random )
+	fi
+
+	tc-is-static-only && myconf+=( --disable-dso )
+
+	# shl_load does not search runpath, but hpux11 supports dlopen
+	[[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn )
+
+	if [[ ${CHOST} == *-solaris2.10 ]]; then
+		case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in
+		*atomic_cas_ptr*) ;;
+		*)
+			elog "You do not have Solaris Patch ID "$(
+				[[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885
+			)" (Problem 4954703) installed on your host ($(hostname)),"
+			elog "using generic atomic operations instead."
+			myconf+=( --disable-nonportable-atomics )
+			;;
+		esac
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if tc-is-cross-compiler; then
+		# This header is the same across targets, so use the build compiler.
+		emake tools/gen_test_char
+		tc-export_build_env BUILD_CC
+		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
+			tools/gen_test_char.c -o tools/gen_test_char || die
+	fi
+
+	emake
+
+	if use doc; then
+		emake dox
+	fi
+}
+
+src_install() {
+	default
+
+	# Prallel install breaks since apr-1.5.1
+	#make -j1 DESTDIR="${D}" install || die
+
+	prune_libtool_files --all
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/dox/html/*
+	fi
+
+	# This file is only used on AIX systems, which Gentoo is not,
+	# and causes collisions between the SLOTs, so remove it.
+	# Even in Prefix, we don't need this on AIX.
+	rm -f "${ED%/}/usr/$(get_libdir)/apr.exp"
+}
diff --git a/dev-libs/cgicc/Manifest b/dev-libs/cgicc/Manifest
index 5092c7fa2f32..9f0ef369727a 100644
--- a/dev-libs/cgicc/Manifest
+++ b/dev-libs/cgicc/Manifest
@@ -2,7 +2,7 @@ AUX 3.2.10-fix-pkgconfig.patch 419 SHA256 825559a99380f35e634cd634b6549cc6f65fbf
 AUX cgicc-3.2.16-fix-doc-building.patch 812 SHA256 c23165b1d5936787fad76988c700239980df5bd325198a3ba6330bc9f3b88aed SHA512 c31d72d32dc0df5ec5b5d2286865e969d4ec432b3551c533d2b23c1acae8c4a821ea7891980f2af22da16c71f0561a19a38070a4394f43b4cfc4ec9ec5ed51e1 WHIRLPOOL 33df4d299c1bee3359e2e651066be908864391d1722f7b6b06deb1f82719badebe3e7627c4598ed31fcd3fde9c616ff7f64a100d1956e4e30c957f931202027b
 DIST cgicc-3.2.16.tar.gz 1409037 SHA256 9dceb36d2da52791ee11f2fb5bb6435c22e69ef50f38073c4329386b883d5aaa SHA512 3334777204f3de57e80f759503db08076fe8e7a12cf779bb50345e7d06c6be4cc612b473bd74eded5debd79684b49c5bb79bcfff1b631a815c7fe9d14960d537 WHIRLPOOL d55900ff650c5f42ec385eb4b20d41b8ee131ecd1ba3e1a27dc21326633281651e5ea4e0e7bde71f11ed2440282e7f1d52bbe9e1cae754f5afa2de358a38bdc5
 DIST cgicc-3.2.9.tar.gz 2087796 SHA256 7bf392da75787e848ddf04395a5ed08fc472411deaa07cbae2c3edbea8fbeed4 SHA512 bd02750a0ad81a64c017e8ccf6cee0c6801506bdc00ea4b0a5e4ea28e35e453122e3e25b3578cb1cb7b22011d5147b99ed79bf7c4702d4c7ab404096aabca623 WHIRLPOOL 01f0da6ca0c28415ed44ab37f3ea56892d18c1dd57a9724bbc0c86bac20e6954bb29b826c96a72cbe8ea99bddcba12b18f9d21c17e5216a20406d931224b6a07
-EBUILD cgicc-3.2.16.ebuild 939 SHA256 6c9e229a2a3a755ee2ac7528c9d785fcf3e6b7e7391286a7af5637d6c531ba8d SHA512 9b0197404e270b1c92d468c0caaa376071e654ff0661598d5d1c7eab337ac2f5a8988ec54b6e17c610df1034b23a52d20d18ebb0657f47ace2c1bda64cf742d5 WHIRLPOOL 3aeee50b3e2091ab9c1ba9545e4c2074ee244c30e559010f95aab46965f80434e8f4b2eef7f5829680eeb02c4a5eeb5a3dbf089d8bea4503904b6e3cdf465bb0
+EBUILD cgicc-3.2.16.ebuild 938 SHA256 b977d2089a63f2ebafc9717af9dadb73f5af0da8df932e803e02cbf6c316890b SHA512 11c565ab5c775d6c4f275c2aae841ca87850e2127fa87918f34621cf27482ceeb26160cfe35365379a91e0d17ad73b0fa506e85331abe8b53fe39e6b4402d553 WHIRLPOOL 7e0c5f2431f3b7a5973fde0fee954a0d79062f503915e8f8a232c80df58a97e57a6ae10218cf68ee25b903da1651fa0b61e1aa7ebaae0698f8d942bd760540e7
 EBUILD cgicc-3.2.9.ebuild 898 SHA256 0fc0b90e8c383f1d279aa36031b9580e3779265bb8a4a8ab5a9ae06395c68798 SHA512 429e72a2428969da7d93ef99f6be25148cc25f980305bb929957ff8775a2dc1308f31d972e48dd653fe74bba83a09b23749e663a2d83a427f3c58ef42c97f77f WHIRLPOOL c070514cf4ec0fc30ecc26c85b5f6095db638000a2d14769cff967b2c6fe8261eb4407e8a192570a4e16990b36037499350da622729247c5b65ce674ab6c4f35
 MISC ChangeLog 3490 SHA256 633a3e0f0c67454df9b9e75306508a55593aa20a248464250f01c175be382d7d SHA512 dd71691a348ac3965609000a3032f13dbb3d1c91ae58d3c3e75136ec6a9333d41f1ac13cc616d82990333f9caa99cd4d293b4e835d0a25a82cfbf69ed2795f93 WHIRLPOOL 761f8143a875d934e3221bf79da01c591ca29882281a3e7189a83c1e62a9b5ca88ebb4305e3cecfff2c653c26e9aa1a4089282e7582cd284635970699ce1ba06
 MISC ChangeLog-2015 2149 SHA256 bfda7a38489326eea7e10ae6ac11e5927c8aaaa001b0824f9b92ed2dcfb403ed SHA512 267c08eb4168621f5c5ba2691d98782e6c283929ed3f0c91f6df6497ee31c254a77780f1e372f38e4e3d803eca256150c999fec7a4dddd35bedd60281bcf842e WHIRLPOOL de34cf8137754f365de270af7bfde5da490a93884712b684e26b7a88f0974ca612a9f8517027ecf5a02807cec49aeb0b39273f7a9e006392aeafd1c9cc434d3f
diff --git a/dev-libs/cgicc/cgicc-3.2.16.ebuild b/dev-libs/cgicc/cgicc-3.2.16.ebuild
index 84c5498b2c95..6cb68b3529f2 100644
--- a/dev-libs/cgicc/cgicc-3.2.16.ebuild
+++ b/dev-libs/cgicc/cgicc-3.2.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3 doc? ( FDL-1.2 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="doc examples static-libs"
 
 RDEPEND=""
diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest
index 335fa66589b1..f1b7566e081b 100644
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@@ -2,10 +2,12 @@ AUX check-0.9.10-AM_PATH_CHECK.patch 1287 SHA256 7da055a54dfdb5cb7f3d413d05e1561
 DIST check-0.10.0-github.tar.gz 257887 SHA256 38daf46cc8bf9081d63970b6ea371e8462beb5e77c03443f275cf4b10ac3a0c2 SHA512 d4a5881e07c9285a5ca4eff6f63172b19c968bab3cd5cfc06c2be54fd25ef71d63b0bd6b425c7af5cfe89d7bc3fae17e56b8648cad1db58a9972e6de1b6fd96f WHIRLPOOL f254b3cd77db9735388f482aaf0d93be24a6bbea08558632d28eeb9d0573ea73ef4d9c36b2e0571fa7c938e288d8261a51dede5bb0ccd8a2671f5788512a230a
 DIST check-0.10.0.tar.gz 769119 SHA256 f5f50766aa6f8fe5a2df752666ca01a950add45079aa06416b83765b1cf71052 SHA512 82103a98382c41cf16f172ded66c0399d3da6eceb6728aab11120c028e8796f6d545a98dc4aa5f76ee68c0bfd1f842a4dd371f5d670c8ba84ce4209812bf1ac5 WHIRLPOOL d3399a2500a4a1f6fa8865fe75af67e98a22587edd2525d144f4f403dd313cc59b7622cd77cfd885b9e3dfd737e2bef5366d28062b2975c882ffac6253b02b29
 DIST check-0.11.0-github.tar.gz 275579 SHA256 df18bb72ba31eed2e06c21dd97402174500a211645e4b3748e9e277551acc97d SHA512 829adee2a5793dda6ac88162e355268019dd82e7a8ad95f1287bd262c3a7764425fba6a8347f1aeebdad642a972043b70aa59d54c87b3c46e1b5b569290dc359 WHIRLPOOL a37225f70a27bf78e6d6d1eb27596f9778ef809aaee834d0a75de407daa160d8c98ab6aaebc98fa18dddf332a0d110faff073c62dc37f037ed7923ea6507b563
+DIST check-0.12.0-github.tar.gz 281127 SHA256 7816b4c38f6e23ff873786f18d966e552837677bfae144041e0587e7c39e04e8 SHA512 f7b6452b69f999a90e86a8582d980c0c1b74ba5629ee34455724463ba62bfe3501ad0415aa771170f5c638a7a253f123bf87cbef25aadc6569a7a3a4d10fce90 WHIRLPOOL b3ef728b1f442a2eafd5cc431de204a6f32d28463543693d25d49e57c53b5c062786b5eae11752515f6d5b4eff35892d483d7b54705354bcea985a58c90b2266
 DIST check-0.9.11.tar.gz 691146 SHA256 ea4e8c7ffb00bb4ffb3f59f11744a71f1cc4212c79f3083c7d9a4b0953976936 SHA512 10883709463b76f6650197db989c348d9d07ccaa2cacc0bd6bd177bbcc1e9e0d88746c2e110e620ab18c23cb5f41b95797d60d77de279af1a810a42b355b742e WHIRLPOOL 9559104a68b2f1215e9b00affb4711a69bf3e4e94e0ec894de66f0f77b5637187bb183560e29d0a889ff04d0e07f2785fc407128dee1ba74d584ce9a0ff9a3b1
 EBUILD check-0.10.0-r1.ebuild 1798 SHA256 5bc1f705487f976c74d5f867e176770969079fa58caa08ae9bdf9efce0d3e8ed SHA512 ab0c17c8cebc36734e0fc59a1fc9c8683bb383bedafe1891beb6cb38d5ff816143c1ef2ecc7b5308ba516e23b416982eea880780eae7028a24e16a7790e16017 WHIRLPOOL f2d748a489c69098a51e1b7916a03e92c52ea22e49de3d8d52580d3bf5ade6704b7a9a0cc4701955fc449edc30f33a86ece7eef6153bd6a02617c252b9d7b271
 EBUILD check-0.10.0-r2.ebuild 1683 SHA256 c850cb06502e7475295bd63e11912b46ec5c753dc3b745900d8aaa1c7bf1e584 SHA512 6e4671a3ad2a6ea6367b61ed0b935771007d12c09d1d47f95f2aaebfcf984f4823c252f8751a64df05093f87df4bbba29e0654a44e5dbd64f80a447acaa8e59b WHIRLPOOL 9ebb12d84a1500c6473fe71b2ba973d87be94dc866b8214b071c910e88a48fa47c524862670b44e7e2423062d2cc6e1692d01f6a2832c33a0dae8624c437c089
 EBUILD check-0.11.0.ebuild 1693 SHA256 0c84723c0be1ef56f334f6e7e5b10bd96b67d09a3fa3bd4e7ab983f3e6715fd1 SHA512 cbb7df0b56cb70d2f50333419fec040d49aebf08c2ed60e247d26305e66b6bae15f969faa848da0cd5c428bcb7cd68d0ee84182ddbb3424e445d71cb7ef74414 WHIRLPOOL 418b8dc03cc128d0923a3ffea1796e9b9450478c98d1c91992d6bcf63405bb59b721e3eaf3ef12a2b0b299459c8dc1ddbf51d98908cc6c7fe5c79f089b5f6ee4
+EBUILD check-0.12.0.ebuild 1690 SHA256 0d336490b3ee076b62b841c04e7f281b66a0930a0765295fe6decd21b4680f1b SHA512 781f2f097f11f462e6070c095d8366e02ecb11f5f73e8f274826192171ad715d4b7e903b71630d0b8ab1b2613c9304345703052dc72c4f83dbe2a033dab453bb WHIRLPOOL f03c189c0fa7d4b19cfe7f2ca626d6762a5b7656ea1c3dfb6a4e1c8d0f9a1c695562083e9d0def509aa7755e1b916d0386bad3d0d4f1f1065b2943a5ccfc031b
 EBUILD check-0.9.11.ebuild 1392 SHA256 f8298ab896666739b2ddd2139ffd2ee05e7d04007f94ecb8b6d389052fdb8d38 SHA512 22f33ad3999c3ce2d9279f214e15c711ec0ce01f50005d6beb5bb6662d04f114a2faa8d295ba31c173755262e10251e6b064fc3815abf299f5153fa0e84304d8 WHIRLPOOL 1bdd6565f3dc0bb7e3e9cffee025c90d155a84e466011e8205ccdc548e25c204e3bb76376397648d1fd9832b62e7440d921ca7affb7123ec8c52593556d748d3
 MISC ChangeLog 3979 SHA256 1202da3ac2cb2736da6f82a36d0b9fee00a8ee7f96879056d446d901c841465b SHA512 514910be30832ddfb3f43f0cd562093a560a2a7d883d6e7c4ae20f51ba875728eb3f75d5cbd3ebfdbd525037b7a3769574f80b4bee046218e2fe63656f036864 WHIRLPOOL 7a362d4bf332c192aa1aa7198c9b8530f65db727a77cc8c872b9ebbb0bf3de8a41b7601e9aceaea2ff358c391cd5047a3e1af8476100949a228a7d7b8a918199
 MISC ChangeLog-2015 11960 SHA256 b3e62fc21ea12728d11cad15cbba7ee0365015c94fbdbdc161929f0dfbe31069 SHA512 42263c3cd16cdee1bf65d09691d1c9b300f5c921cf184ee58d7b2313df5dd03d9070b0d84951e8d66d52b789b1d0b1755cd188694918f2ae99a4e165912fd190 WHIRLPOOL 2a8386fd20378b4acc2a5ac79bbcc479dfcbbf1286983617c1a17a0ad07824eb404058bd5c307a0447b9a100757eb73278f4843bd637b531a3db48978854241f
diff --git a/dev-libs/check/check-0.12.0.ebuild b/dev-libs/check/check-0.12.0.ebuild
new file mode 100644
index 000000000000..6f9ee0d01c50
--- /dev/null
+++ b/dev-libs/check/check-0.12.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="A unit test framework for C"
+HOMEPAGE="https://libcheck.github.io/check/"
+SRC_URI="https://github.com/lib${PN}/${PN}/archive/${PV}.tar.gz -> ${P}-github.tar.gz"
+
+LICENSE="LGPL-2.1"
+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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs subunit"
+
+RDEPEND="subunit? ( >=dev-python/subunit-0.0.10-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	sys-apps/texinfo
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md THANKS TODO )
+
+pkg_setup() {
+	# See multilib_src_test(), disable sleep()-based tests because they
+	# just take a long time doing pretty much nothing.
+	export CPPFLAGS="-DTIMEOUT_TESTS_ENABLED=0 ${CPPFLAGS}"
+}
+
+src_prepare() {
+	default
+
+	sed -i -e '/^docdir =/d' {.,doc}/Makefile.am \
+		|| die 'failed to unset docdir in Makefile.am'
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-dependency-tracking
+		$(use_enable subunit)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	default
+
+	rm -f "${ED}/usr/share/doc/${PF}"/COPYING* || \
+		die 'failed to remove COPYING files'
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
+
+multilib_src_test() {
+	elog "-DTIMEOUT_TESTS_ENABLED=0 has been prepended to CPPFLAGS. To run the"
+	elog "entire testsuite for dev-libs/check, ensure that"
+	elog "-DTIMEOUT_TESTS_ENABLED=1 is in your CPPFLAGS."
+	default_src_test
+}
diff --git a/dev-libs/ffcall/Manifest b/dev-libs/ffcall/Manifest
index 87cf6e391c15..28e4704a1786 100644
--- a/dev-libs/ffcall/Manifest
+++ b/dev-libs/ffcall/Manifest
@@ -7,7 +7,7 @@ EBUILD ffcall-1.10-r2.ebuild 1260 SHA256 3e26e8f50b34f0915cc1e045a4f5441c581cd38
 EBUILD ffcall-1.10-r5.ebuild 2007 SHA256 8f4b4650322c6724197c57c811e1674324c4f16bcbe91e6ea9091ff3b9d7e87f SHA512 f71390ff4d83dc72139c53b998316bf614ac6587c182e3ea51d7fbed26f8a468d00e0211623c68a9b0e636bcbf5321e0e1c02b46bda8a1f7a684133f5e357ba3 WHIRLPOOL 7dc9416aa1618b2f3f55c8ac475ab3c1db132d1e6ae36b4bfd50655a5a3eb6872e08da9cba9b7aedaa5b83a1953e4f6f2d6472c0cfd6d88dd06b2aac36b6ec10
 EBUILD ffcall-1.10.ebuild 1622 SHA256 5d50fd5fbbccbf05a90bf710eb73bfa8acf3f32af586ec0e96ddf81ce52f2fe1 SHA512 2ef41a0ec232346b4ebb118f953da2f8de54cbf0d8495e2897261cc56450aaf366e806707c95649429bb9e575c697e3b3c55c6c63746c27abbaeddfc77ec1a8b WHIRLPOOL dcc1822f32f779b90e7914bfd6a8c6f8bd6c42d317b50529cd3e5fb882e0a165633f386d1472c2a9add4eb3a2090c3c650c24445c00d3e87d2a5bc27168ddc90
 EBUILD ffcall-1.13.ebuild 1485 SHA256 38067cc39a4488cb70431b874c0aa448e3555e756504f7721b36d766a129729b SHA512 cd06188825a8ceaa04adca8bb532b429faf7d2c25a66c09e51a1ebbe5f9b204bbb9fa470363044e795fb9aed9c135b31e05456fe613da181b41618dfa828c69d WHIRLPOOL cd66bb1d64078ad1db8f2945f007026756fe03b00a5c64fe34025ce2313b995834678acbc713de8e8fc146ed203129e9b6158bff9913d540457b4c45fff4328b
-EBUILD ffcall-2.0.ebuild 1489 SHA256 ce384de92a78e6fa7bad87c2fecf4086f76019073e049bd7258917cd9a0b3775 SHA512 4b1409ffc9a41b3f3639125d34bdd4006a29349f095d2f0fbf90d5191196d98129ee49163cbbe2ea4173aeb24176e17adfb06d6e8d781f77e6b70d3b9f37b785 WHIRLPOOL 580cecc0cace265c9f9e417c8f3756a502e371d73bd0b393b740b5221433792e72662c7565b1db18468aff438073a7f50b84b56caaa866ea874a7d0e8df0bcd1
+EBUILD ffcall-2.0.ebuild 1487 SHA256 92d7aea189a0e5ef2e71bd031ba68d6a265cd4a508b846fcb0af28f6b909b24b SHA512 395739f7d5300ae7b12c77b4c7b411930e09ac087993c1089a31ca8fd1373370af5b7c50cced9aadcdff3923e3db53a5bdaa30aa1d5b3a92a70a6e2ba4aa9dda WHIRLPOOL a670ead65c929f1f942f393a33cbd3a4e6cc1ec3dd7bcdae6c1bf67b3a8b11b4ec52930bcb4d7645d1a33b0e49e938b7af4c6afb3beea616ebc9b3f3edaed114
 MISC ChangeLog 2656 SHA256 5add85d025118d2a7fdad19b45ae0e0f3f52622f74780d7b83aa1069291a4388 SHA512 25e7fd119335582f426e31b67a892e031730f944d6848faa7967bfa9ba1dab6296418893819c420df226ade32f32832154e4326fe8ff5b3b31d82279a52b8c44 WHIRLPOOL 60b83d1e7b058b700eda9f99c36d56c233035aa99724be09b72bd403498317c552783519cdee8d3b1c9385b74ff94a2edf2cf269b7bc88c18df196ed6d52549c
 MISC ChangeLog-2015 5393 SHA256 ebd69c93d3f0ac7e75b68cfb3ae079cddb3bc43fb96f4a61cdf58d1c3c5b37b9 SHA512 9a45eb0c33d64e6dcc51672bcdd2416b077b1cf1b78a146d8dd8f66f55bfbfeee1abace360ab06df70083c41f95c5d3b107ad69e51179587cd18103bad347ae0 WHIRLPOOL b50648963d06c1466f4bf892e285068044cbd70d86e15835c239c884c99d7f73e536f42f4a85a220ff7f43a9e0ea9040d0c572b9c9683f672427b90a429a2f44
 MISC metadata.xml 858 SHA256 1c048c75ac311016b9c59909a71a48571e31371284007ad4244802c59e36f001 SHA512 e64e471f2fdcc289c678bfc4fe3d2f652062907f9ff18d0350c0907b3d9bfa4e92c76bf04d1b2f0fb3f820f917ec4e3bd7d997a0d5e2eb270ac10516cb58f971 WHIRLPOOL 910dcd051c99f33a78d8b981c6989b340e582df4df6661b575c9c29ab2303ca96037b7e192ad6563f5ab793ad4212d300bc60c25f0cb5b039052acf51ef6a171
diff --git a/dev-libs/ffcall/ffcall-2.0.ebuild b/dev-libs/ffcall/ffcall-2.0.ebuild
index 199a208a913b..ecd3a418fe8a 100644
--- a/dev-libs/ffcall/ffcall-2.0.ebuild
+++ b/dev-libs/ffcall/ffcall-2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/libffcall/${MY_PV}.tar.gz"
 # under GNU LGPL." -ffcall author
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ia64 ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm64 ~hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 S=${WORKDIR}/${MY_PV}
diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest
index 5139668c4452..805c5708cc14 100644
--- a/dev-libs/jansson/Manifest
+++ b/dev-libs/jansson/Manifest
@@ -1,6 +1,6 @@
 DIST jansson-2.10.tar.gz 487855 SHA256 78215ad1e277b42681404c1d66870097a50eb084be9d771b1d15576575cf6447 SHA512 e331d5c097b4acb0b1df7d90d1d3453c26bd34bfe2e06af0027665bee9efecc2bc61cc7ab5b70dab1262bf80a3315ffb53b4176874fe07e20eee4b9ea7071d44 WHIRLPOOL 07ccf532f0ff27ac5063fafe0f2a33f4117909365c2dc7dfea6331457712efc5b8b93d519ebfae56fc46fb98b2fc95d858e2efa407bd4dd61935b9cf4cbc00bc
 DIST jansson-2.9.tar.gz 485095 SHA256 0ad0d074ca049a36637e7abef755d40849ad73e926b93914ce294927b97bd2a5 SHA512 ae239e1a825c252d7a3b0ee97004c129a0968f7e9da8679dc665a8e54a34c073b0c274bd5af004700b442f7b703bcc76f5e3360ab82172da7203b3458a5e9cb9 WHIRLPOOL 2b9103702680f0e03f5220530938dfcd8fb1b793383bf459200e0e05fffcfd5ec7cecd904ba7fc3c55f237d98f94b6a97c26c3f89b5b26ebcaa830e2eecd4b1f
-EBUILD jansson-2.10.ebuild 852 SHA256 e9c29246a551b57ecd5c6f099c28d003a22865966567ada2cc9bf0f4d47fceef SHA512 9e02a303408baf673d4cc9fd57c895044fed39b573d56f677b2e0475d02a3b73cb7cf052fa458a21af14ec4133e4c862a74d09caf1729bce51e1d3f0bb6f14fa WHIRLPOOL 1bb274b84ee228001f52d80d5ba22e1fdf2b585c7227944d42bd4b33558e16f3471cea4b13797eb78d5f4e7135fc66655499fdff46892c7500a93f68c38442a8
+EBUILD jansson-2.10.ebuild 850 SHA256 9c550d2208073961881232a54dee40e1a8e48c4f2fa3909e01d957700256d431 SHA512 1fccd4edfae702cad97dd431150db76218e136bab31d056848394f6e6fd893bc5737601e53651382498d7b99907aa1b890ab45480099141f33ebd31a2b23940b WHIRLPOOL 4aa8c2d027855cbc8517ae322fe26e85c6174e00cfe0b5e6ab45d2b78ebc4d332d3e27921ee26a06009621498e4234810d32f3e4351f45702bdf4b7d74d037eb
 EBUILD jansson-2.9.ebuild 849 SHA256 008c290631f55f6019a9627c1fab8db129e7ba22d1f4d0e9cd999c2792023037 SHA512 1882a3cece74d76e1481d369fabf7091c9909cb2a460fbc7e08a47631f8dbd7c0f29e1ecd071339e911226cf25927e527d83910e1e0d95cd918d8667ae0cb156 WHIRLPOOL 6d9fc09638df5036eec9a8911f041be3586082597918086e75da7633ae1d4daaddb57b7fced8f19a9567477e103e7cac0d66011f5b4c56acf2a98f4fa04f9dce
 MISC ChangeLog 5079 SHA256 16cec7fa836f33b3c4cee9dfbe305b6d38f1f6a464956f1388e7a15b1027b2c6 SHA512 b24bad11acb9cdba05900b24190afe8a481fca6a668b8dec8c555b0728b6ae692825b145d7df64ae816dfe403211e3e5fd453a0a732e67066f7cb5dca99ede5b WHIRLPOOL 9389659172f6bdc2a542a43920260772b103e1b1bd59229b8ad4ffc7b2897ae348810671f7c4e0da473aef13758b0d31613e79792404ccb30e5df0ca34ec449f
 MISC ChangeLog-2015 2909 SHA256 578c66228c3f4dfb084552d5771d8ace5ae9bc27cbfd17882228cf3ebaf13fbe SHA512 8e54581c5be6012dcd81c371a96ba201616f9b14975c867515816823afc58b4e345f122ee36604e2c315e37f5c953db8be9dff96d6d054a006342fe5757ca4f4 WHIRLPOOL 99baac29b01e9647e0cfd16556ab4079238eefa58d2d1af889ccefbd94ddf7d6d24af0f4a4bca7cef3e66b674eec9e96a24785a81e9d96aa5626790b4f308d46
diff --git a/dev-libs/jansson/jansson-2.10.ebuild b/dev-libs/jansson/jansson-2.10.ebuild
index 64239d07a0ac..87de9efc93f9 100644
--- a/dev-libs/jansson/jansson-2.10.ebuild
+++ b/dev-libs/jansson/jansson-2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.digip.org/jansson/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="doc static-libs"
 
 DEPEND="doc? ( >=dev-python/sphinx-1.0.4 )"
diff --git a/dev-libs/libatasmart/Manifest b/dev-libs/libatasmart/Manifest
index 4df1a2999f11..682ddbf73112 100644
--- a/dev-libs/libatasmart/Manifest
+++ b/dev-libs/libatasmart/Manifest
@@ -1,7 +1,7 @@
 DIST libatasmart-0.19.tar.xz 251204 SHA256 61f0ea345f63d28ab2ff0dc352c22271661b66bf09642db3a4049ac9dbdb0f8d SHA512 ec9edb019c477873b01289ba365ad0ed0946505d651c1f6f83a63ef61b3976a5db6439c8a0c74d9a55325db9a3a587ad6f655f8d1af9387b0d08356eccabdb62 WHIRLPOOL edb1296494806bbc83054110a12f703e428cfe4f340936b4393d226c702a15e97e5c6c82310fbb745d288202a9036d15eed7dd8b1ef982391dc579814db2669e
 DIST libatasmart_0.19-2.debian.tar.gz 6511 SHA256 dcfe568cd42d952b1eb633894e213f913564a0e0e62e24ae37a4578bc420ac25 SHA512 78e86b0c1d2a56dddc8d9ac97ee325871e319ad2226f1fbd5a048d792cd05e5d8162d282c1f767086da5329cd1ee67b37fbb5a2fd3c950f84e9efab11abcf754 WHIRLPOOL 127e381b100076b9c343603d4ea76cd98264643db2f3240da4a3005a3514365ff0d15f1994e99c2b06c133640f04cc68f9fdb17e7f814a3520cb9b5591a0f8a6
 EBUILD libatasmart-0.19-r1.ebuild 947 SHA256 e4d58848c79c9d719d5a35df4465bd5f4873d7aa76eeb431d950fd5912e80f85 SHA512 9f01383cfd7db79cfa99d76f9a8b8c6fd2eb91d329c1b99ef32103c107fe731286b6103fa4748e304787ef16ff41e10d16db2b29788966b1854a19e7f6e478b0 WHIRLPOOL 14b4ad1a64d2c7366e9dc80e9984744e1c321ce43c646878543f9a4d6110b8bae3535426fb9314737712097c7ad606139ebd2885bf9ceefc46c31f994f870937
-EBUILD libatasmart-0.19-r2.ebuild 967 SHA256 5c56a675c1848c9f69988325dbf19039ebf3bb55b433c594fdd8a1579cf9cd06 SHA512 0803a8d5ba3e4a35889176fb709383e2aa344e08c898a952fb58042a3ce92b4ad2fcb050a92cfbb149f51b69ceb5ac56603c5406c0062bb85b9510a34c083500 WHIRLPOOL 9a021f54bc84acb06099a9222b49e221beb5765c325615081ddc87efc471ff9219f1af573a1b951ad956cc3c90ac13488551bca7aed08bcf9a6de0d95f2242f0
+EBUILD libatasmart-0.19-r2.ebuild 965 SHA256 c8dd594172ace7f91c704aa9ac8405f814f26c6a4591f2f5cab09de2fa61da6d SHA512 8bf4826075ee4e72c5409fa28215c8dab835648e63380b771288e371ba067fa3ca3ab0ee39498f10f3a2595c31d65ca67c36afb4e87faed3467733330ddb6c5b WHIRLPOOL 1c6ec71a69df927923d37a7231c4b25aa2b7ffc7a00eebf14df9bebf3fbd225686d210b77eebc8dd3b656955ea044394e6c6a0950fbce3de324f5abb6f8fb6ab
 MISC ChangeLog 3267 SHA256 4ec50624502888be40b259e36c00bf3cb6e38727bb86d40c4e21eca4f5bae34e SHA512 2dae7f524871fe7a52abec8bcccb9c85df9f9d04ca7330c0f54f1256a118f9a57751612dcb864e8f6ad61d7bdb18c394bd14fdd0222fdaca3a31e988c6341863 WHIRLPOOL ea90a355df96ff1f493ee92bb8ffa7f0e8994560ff5f46dfcd0db89f37d200a4d3240fa62e28763e92f97d680d41629de613ccafd0909f22c1be26cbcf8fd10e
 MISC ChangeLog-2015 6106 SHA256 338faee31bf33c444c9a0d7f1d6555bf444d408d07942857a2c025e521c5ed86 SHA512 f397e11b91b81010bba91d88f5bb1b5bb00ae9ba28078e0d28400810ed6eea67ddcaa704b5b24db606bc79fdf6dd2489972a55fd8f8ff28d0c9eca86751e8ba0 WHIRLPOOL 748a7eabc16539660d7da2e49ef33cdf9ca3dc9f9c5b105a8781847c630daffa3c1776115f5785f72192d4f4b885dd0c7064f357791014558d035bd24e3da550
 MISC metadata.xml 232 SHA256 6f828dfe6278daec9b0b3a9eeb589d072d79dba873dca6a50422e554c2f3582c SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4 WHIRLPOOL 95b029eb4fea616dbf4f41cb372a67a13b7f5d67d9dad52bc27b4597bd1cf73b00fa34ddd8637495337a469162e3086075e8e69734a2147eb89d940fe048159a
diff --git a/dev-libs/libatasmart/libatasmart-0.19-r2.ebuild b/dev-libs/libatasmart/libatasmart-0.19-r2.ebuild
index c1f7c6738d18..49c61709c625 100644
--- a/dev-libs/libatasmart/libatasmart-0.19-r2.ebuild
+++ b/dev-libs/libatasmart/libatasmart-0.19-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://0pointer.de/public/${P}.tar.xz
 
 LICENSE="LGPL-2.1"
 SLOT="0/4"
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
 IUSE="static-libs"
 
 RDEPEND="virtual/libudev:="
diff --git a/dev-libs/libburn/Manifest b/dev-libs/libburn/Manifest
index 73924099fcb1..499134af3272 100644
--- a/dev-libs/libburn/Manifest
+++ b/dev-libs/libburn/Manifest
@@ -1,7 +1,7 @@
 DIST libburn-1.4.6.tar.gz 975088 SHA256 9d36faab25478c01122a65873133b7fc60eb5ffbe12710d5757a7c3574227071 SHA512 2bdbe832168ed430a66d8f733e9f28bf0c2fc8180673da383c4aa014448569614b9f0680d9f0ea5d61b2ed76bd8b9ecc38bd5a63788fc6b32ba0f4bdac2cee78 WHIRLPOOL 59e05928d2b5df73cac0514eef0f9d7fc133fa0d7256b0201daf702422b0d2b0a0e3c4ae0772faf681c5a17583d8d778501da048ea040deabdd49c19f5fd530b
 DIST libburn-1.4.8.tar.gz 977757 SHA256 3e81a2e359376c38d96239a9c9967be715f706d150d89c337de0fc85ecb79da6 SHA512 e02c08078313abb19108bb394741d4bde1c5098c1a200129940744e03078d8350b6ac951bf5523872a343b3f9b7a4954dda60a3336997f975abdee6dbae9b87c WHIRLPOOL ee7367b0bb4f182f55094db481182d4f9ab29debcc24a1ce5a985c9d99c64b5f2f7dcf1bfc0a3a147a493ec85cf06e6c375097b967c6f0d43a0906e66ef289b0
 EBUILD libburn-1.4.6.ebuild 975 SHA256 506f7dd46b7c54a9d16ec0717b9bd02633bab7017e292408480a32dbb7bdbc16 SHA512 1615f45043102505df42f4d92fdd4a2b3aa0b88e3e0f94b022ee4441051171680c8cb38f0a8d802d3ef5f72b352f008c5a81160fb2c0a458e12fa55dc9a2fc9b WHIRLPOOL 9d1497e8b8ae717cbecb07c819aa56a9d6a1e537370276666d7ca0b0935addeaa2b4b14be8c1cd4a44d37cbbd3216f27e77f2769004ff38b781b7e81413da722
-EBUILD libburn-1.4.8.ebuild 984 SHA256 6d6b289d92d01bebcaf1765c0bfd920ff7727b39234c85d8b498fe849f093053 SHA512 16119f1664d1df8a2c022bd484b4e990bba845b68d06b7e72bc30b2f0793b38016d667c05e30520ae0b4a48c079726372ddeb42af356b165c01da7a2fdaca2d9 WHIRLPOOL f61d19a3b1ea06316d16a5f433bcdb3eee7a1d9fbae61978ff627b7681027855a4ed592c9b788c3b1c191809d0549aa27b32038ce0a8504daa799f0849f56946
+EBUILD libburn-1.4.8-r1.ebuild 886 SHA256 97f665cf72302738bcc6386379cb5394a6ba1910026c4ecad826752c248613ad SHA512 b5175d6da766cd7e498a575660b71bee377ee6af7d83a49eda6597ef1bf7eb23a28711b257ab7c66370039573a5496cfc7ced66fdd4a8c586309576d8cbb8c7c WHIRLPOOL 9e2440fb692fe63df132bbbdb88165c29ee01ed6357fbf91a0014ccddec0daad6de5b4e9cc654adb8c461315fae1ce67f5e85e3670fa03726df42c7f95ec2909
 MISC ChangeLog 4021 SHA256 7c825852c1423d43b34410b4553cc2cd5f5d92605f0554d83061f95d0cd39ce7 SHA512 835f6e3a60f682717177b36d70d25d951a7c1e8ceb92673df774db71650eb79d24da852b4a825d4ff058c6cbbd3d0034e533dded3596e61adcd9fbe0a9af1287 WHIRLPOOL 63b5bfa27a4256e5895d6fde4b375af0d7217ad6d418cf3ec80851546d438387c439f60d36f2cd430cfac3e165c4d4d4f367a169a0c2c70e6c46e5402bc5daa7
 MISC ChangeLog-2015 23627 SHA256 aaa370c118fd2cf665bfe90aa472d0ff632793be99d3f21695737b1abb039b66 SHA512 641cae02debe1764297dd000798d73654901e3df07129647d0dbed0b8760cf53aca780953a5c142ae2045f129ebd81bea9ac4a7b9a2a10032e4e39b460a09f25 WHIRLPOOL f7dca4680f36dacbb80c00fe619b5827b1e97b620c79cf1f16c0f5ec5734d044cb95d609766a16700f04d6fdab587ad0df95b944ad00cc480161dd4d3408fb32
 MISC metadata.xml 616 SHA256 b5c0bda0f52ade3fead4550a14550cc7eea3053bdb0323e57feb28c3aef0f4a9 SHA512 c46af3cbfbecbe5303a3a1c6f3c98e5c7a1dfc6aae2f6873360bd1704f58f1368592d9b5a4d8698059ef8954a7994fcd5902280d4a44cf390c7d5242fa112101 WHIRLPOOL bf2b25dfca2d58743a7275f18adfc0bcf98cd0a8cebd597a1f7775af4e1dbf3a549941752de6f7595bda05867c6f5aa82161a159f5bb21ea6a7651fcc3c0e0c9
diff --git a/dev-libs/libburn/libburn-1.4.8-r1.ebuild b/dev-libs/libburn/libburn-1.4.8-r1.ebuild
new file mode 100644
index 000000000000..f07d9a34228b
--- /dev/null
+++ b/dev-libs/libburn/libburn-1.4.8-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Open-source library for reading, mastering and writing optical discs"
+HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wikis/home"
+SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug static-libs track-src-odirect"
+
+RDEPEND=""
+DEPEND="$RDEPEND
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+	$(use_enable static-libs static) \
+	$(use_enable track-src-odirect) \
+	--disable-ldconfig-at-install \
+	$(use_enable debug)
+}
+
+src_install() {
+	default
+
+	dodoc CONTRIBUTORS doc/{comments,*.txt}
+
+	docinto cdrskin
+	dodoc cdrskin/{*.txt,README}
+	docinto cdrskin/html
+	dodoc cdrskin/cdrskin_eng.html
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libburn/libburn-1.4.8.ebuild b/dev-libs/libburn/libburn-1.4.8.ebuild
deleted file mode 100644
index 930793107d08..000000000000
--- a/dev-libs/libburn/libburn-1.4.8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Open-source library for reading, mastering and writing optical discs"
-HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wikis/home"
-SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cdio debug static-libs track-src-odirect"
-
-RDEPEND="cdio? ( >=dev-libs/libcdio-0.83 )"
-DEPEND="$RDEPEND
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-	$(use_enable static-libs static) \
-	$(use_enable track-src-odirect) \
-	--enable-pkg-check-modules \
-	$(use_enable cdio libcdio) \
-	--disable-ldconfig-at-install \
-	$(use_enable debug)
-}
-
-src_install() {
-	default
-
-	dodoc CONTRIBUTORS doc/{comments,*.txt}
-
-	docinto cdrskin
-	dodoc cdrskin/{*.txt,README}
-	docinto cdrskin/html
-	dodoc cdrskin/cdrskin_eng.html
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libgudev/Manifest b/dev-libs/libgudev/Manifest
index cbb5d2cba9d9..374690f6cd0a 100644
--- a/dev-libs/libgudev/Manifest
+++ b/dev-libs/libgudev/Manifest
@@ -2,7 +2,7 @@ DIST libgudev-230.tar.xz 257528 SHA256 a2e77faced0c66d7498403adefcc0707105e03db7
 DIST libgudev-231.tar.xz 270088 SHA256 3b1ef99d4a8984c35044103d8ddfc3cc52c80035c36abab2bcc5e3532e063f96 SHA512 3989025168c9e7e5e3f7813ee903a63f697ad390d3060121d0f45ee31031014c23a26f4287f3e6ad97d582131d0d568be31baa0b68f6f64ae337e926b3fe2625 WHIRLPOOL e32bb6506604c79876cbe6a3cebb6e784e98a2e39d84f7871e8342af59ed729a80989b99ee48bde5c342b96ad4e4f6524fe72135531033015f86b7488d8442f6
 DIST libgudev-232.tar.xz 270904 SHA256 ee4cb2b9c573cdf354f6ed744f01b111d4b5bed3503ffa956cefff50489c7860 SHA512 f648a41e2a6af7e26634c7cc259fdc47bb6e6ffb329324d157f340e42928e28c2059a0e923b9b0aaecd1ee3ecafbc7b55e5652f1f77bc1b88367b97057a1bedc WHIRLPOOL 73acd3c3597ffe265ebb2e3f9e650c04187c72ee632f661d236f17c04b2ccfb9ef94f1c0c0b926f4fa40b64d355fd245d7470c1a2d9dfe9c209940cd5c272308
 EBUILD libgudev-230-r1.ebuild 981 SHA256 bc7eeafcd322acc4205f6f24a560996404d26cdfcb8303d914986b09400f77cc SHA512 21e41267b5eebd63d9d7417634129988ae780ad8f7563de68466b18841699201b471d92b6566d1bbbd460455214bfc42d7156cd80601af6142585ec963e0985d WHIRLPOOL c00a4271ef45866540bb6cfebca011ba459dbc5f24bd80d64be4b2c48cdce9486f087f3979f17abd8f51193c19177f093f9928ded9b2fc6f3facdc0d05df54ce
-EBUILD libgudev-231.ebuild 1093 SHA256 aed245439c34104d46d695d06a602750e5aa493ad4038485f7cb1e49e6667871 SHA512 eb4af43258a9cb3fd1da9fc4190aa86dcb5551e400edda428ce26bb334a798edd6656a42038e6ad3772e7e5adaebbfcc5c0bb19e2e60b1177f4dd1a103b38e94 WHIRLPOOL 1cf5a8b2bf394522a04ab16f37402d31f78c4e57573598c87bd65535666ebd32ab10e991d739017389ad3a1ba53676230a96bbc14cecb56f36c0ca8f8465fce4
+EBUILD libgudev-231.ebuild 1092 SHA256 0c2452efc9785e8b37ef4ab044279feff3535e672ced0193985997e575641efd SHA512 737483f441c25cdb6ab8c8d3fe773b840a4db491b6cac6a19d06048be48fb7114c846dcb5334422b0a57172e2495d93d9335aa01792b8b4c2011f4dedf5afad1 WHIRLPOOL c7f1bd5da68805262adc47ad06b95d16369c2ad3aac1fe90ac189e21eb877ab4efa81fff1d58688290f56860941894c73d67c5abd1cce0fcbfed8966bdeaae01
 EBUILD libgudev-232.ebuild 1098 SHA256 53f3982fbb2a3a384bf529744201d608daab31eccbd1ded525156165478e59ed SHA512 0615cb78d860a0f23826c42f3d62c470507eb7f6109c2c0d9fd078c0ed55bdfd7d6e9d177535dbf47542bc13e44d313673ce3d47df1009a5e1ca97bd56c1774d WHIRLPOOL fe25ce74954842a189f41a145accb4b3159b381443aeeb582d6982775bad2433d685757aef93447d0f25c01bcf4b1ad046ff5603641836c663b45c3f46485a96
 MISC ChangeLog 5280 SHA256 6affc6fc955d3e616df90aa3c55e8c5d6a6da8cb5765922e1a621e4a40e097eb SHA512 902ba670bb843b88af78276129882319f82ec54e3fb942549ca07029a6eee0530d5863e558bba701c461cfb1f602a330fcf8c2a0a6a5a8c50205558bbdb57ec5 WHIRLPOOL 8ebf5e7259b14f4dcc945955bdde499d1c66c6cc3374aa529b00cad818464d11fa864cc20e042c6a2c0c2a972aac971b202eeaffa5363ddd94fdcf08d9c28990
 MISC ChangeLog-2015 1583 SHA256 d0dff8d937023d484a662b6f506967444acb670c66624e4d292356fa32cc7e18 SHA512 28b8344cdd7b64503dbbe30d3ce9c63225abd7e95a59a754c179d808de2cc8312dd58c9da0a83f5da6a806c37a077d36b2c4213a524643f0ddf6c636971a7414 WHIRLPOOL f4890968f3746f62a9a22d020fe69d9d3584a3b01c646078fba9049b4ea56ea2fb1e6e5c34893902df1ffd0aa569b5f3fbda22fb6d139ea9fd33813db369c259
diff --git a/dev-libs/libgudev/libgudev-231.ebuild b/dev-libs/libgudev/libgudev-231.ebuild
index f58d47d099ba..f1edf3266b63 100644
--- a/dev-libs/libgudev/libgudev-231.ebuild
+++ b/dev-libs/libgudev/libgudev-231.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgudev"
 
 LICENSE="LGPL-2.1"
 SLOT="0/0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sparc x86"
 IUSE="introspection static-libs"
 
 COMMON_DEPEND="
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index bbdcd61b6fe1..840ac061abc8 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -3,11 +3,13 @@ DIST libinput-1.7.2.tar.xz 923720 SHA256 0b1e5a6c106ccc609ccececd9e33e6b27c8b01f
 DIST libinput-1.7.3.tar.xz 922464 SHA256 096d612d2711f0caa2de544976ff3729e6233511ab373808644cc2dd5affcb1d SHA512 2262dc56d213a4d3ea765e870af200e2c336a166baa1bbdf5205e3ce70faefc777429ba09563c5dd79feb5442f53abc84e04a0f32a06bb622d6e120bb8ad152b WHIRLPOOL 06ea9038f7b3127b3238fc863b1ec862647a08b1ab4956fcfd433093dc3c68585ba3b166515370681ed158a48ce6a5670c6b8dcb6d536af25f8bda2c84c74286
 DIST libinput-1.8.2.tar.xz 939664 SHA256 013518ee0adb2287e6e1f08412efba2137320738cadb5399b783738f04cbab38 SHA512 555a7680cc8aaf62c5370a865f3aff0a933d42d94a3d8861c072666b02c9e1be45ea39de9a749a9575cdfb613b6150e412e18559d94d4919f21ca4680a3c76a7 WHIRLPOOL c897c788fe29085f2f8f79f0441f4543d4cfa2f5c4af2357539c9ef49662d7eed2e46fa904bc3291a559a5effd091584da71a6e05ab5c11cb03970a27afd7366
 DIST libinput-1.8.3.tar.xz 941832 SHA256 2fe2e2f52f0971a9c43541b8f26582ca8df6ed4bb9050e85eb40d4ff6b13142d SHA512 88006d217e3507858fa6b9ac1f25c267255fb51d1bcf1208d2afd423bf2a9292944bc5526ea91f27fad3ff04c2f9f43ab3aa25fd9fb7ace1231ecd33ddf18de6 WHIRLPOOL ebe128f8e9bce71dc7e878cd7dd7815cb0a358f91945ea47945568a1994f1a80c2d6f8db7d5f8f9c5e554c22fcc13733ca4bdcb68b47a72e16e55098904a93e2
+DIST libinput-1.9.0.tar.xz 455248 SHA256 fd717b1f9cf867b2ca1763a5a4638423af178f3a70aa34d278e8bf42777d108e SHA512 4111dd02ef7778c246da28ead284a77014f6eaa4b7f90f36ee124af809e31c70ac065216ef5648d1d2dc525355176e2aa22788bfbb19f5f6d25276fbba42e150 WHIRLPOOL 7a6da661226ef8721bbad446a75be75a3d556d9e886cf44d2296a0fe17207ac181ebd4a4f25dca7ae4072d97cb9759d626d26a1572f007c6b1e9499a0d71beaf
 EBUILD libinput-1.6.2.ebuild 1535 SHA256 9339885a8bce38fed69defce769b1f337a36be302f37d88881ff0b0ab512b13c SHA512 00505995c95da87e936d1473548efb1d52fd1a593e659aec308e38f937fa391a3a092f2b7e2c1c564e9be9ce506cc021f1c3f590bc5bc39623dabd1e6758187c WHIRLPOOL 4af465c12c12727dba2168f9f2544fe38d9787ad2b343c86eb5734d7e96913dbb8cb485cfbbbaa8f30e02108a32ee813475f45180b74b60fd610b38b8b4d77f6
 EBUILD libinput-1.7.2.ebuild 1536 SHA256 337794ed1591e62bfdc55114724cfb80eea11c7c95086ae290241b1f58a7bf7f SHA512 c5bebcd1026c988bd5b517b76351c0a1326f5e60754a53d25aa73f3c2b7c034623336b0861d8e62254808649fae94bede58a2afd8df415b11327c31bac5e0621 WHIRLPOOL 6259933edd90fb2d2d33d1e1d236958fa85f24588ec29469462db2f4567022bfc8ccce8515660ce3b1cde35e4664e9a17e3778e9a33b27fbd727352d73cdad56
-EBUILD libinput-1.7.3.ebuild 1539 SHA256 be0fd49aa36c59190468ce18b14c8f2a8a361854bf2f7ae0f11babf59c3bd424 SHA512 fcc10549023f7cb9e5b250f20e2e748c014da535d43ffdaaa2edad5710f7fa5378a841b9dc110f17865950d8f0eadb1cb1d8dafe18f4fa062e34926f985b7157 WHIRLPOOL bd8ae01453bf4747b6817a53f72be312d029fe46a589f1c23626dadadfb2cde24a0d12dea77b5a6278eb373feeef6cb679a2f1e3c9dc887d72683f0afdd2552d
+EBUILD libinput-1.7.3.ebuild 1538 SHA256 2fef147c954ffafa1c03b8324a87d3fd3a94b67a6ebf29d91bd7036dec20f337 SHA512 e00dc31f89694372b911a09e6190137d3ce525ec1a254b4fd4698e7f7f0c678e5c9482d2e314700aa5b8241b9a545695ba9db75804e09f268c86637d3d37426a WHIRLPOOL b760a260dd376d34f7fc9c41a51061ceb37d16cbfbf269d18436456620b38ebaf86cbd407f4a40b0f367096b37c96fd80d5fee758ff32aad76a9baa9d37371b8
 EBUILD libinput-1.8.2.ebuild 1544 SHA256 8b0355468b5985e8b13f94ac0bf2e7812d70e2ec5f4fa696a6424ee37649bc2b SHA512 a0a3a0aaab446d72eda57a04d8af10d5d35f54f4c47e6ee5f9c209fac3682d3d83392ef546255026b5ce774d76d33d06bf940c55da4ade4fe33ae10e9dc0968a WHIRLPOOL f8cec31887f88d7e5c0fdb67a872eb05a2885a6f284aa5143408c77347aac9d49574d622a7cfa6c93bb2020caf0d52c170cd393044d525be62c1a0937924ec42
 EBUILD libinput-1.8.3.ebuild 1544 SHA256 8b0355468b5985e8b13f94ac0bf2e7812d70e2ec5f4fa696a6424ee37649bc2b SHA512 a0a3a0aaab446d72eda57a04d8af10d5d35f54f4c47e6ee5f9c209fac3682d3d83392ef546255026b5ce774d76d33d06bf940c55da4ade4fe33ae10e9dc0968a WHIRLPOOL f8cec31887f88d7e5c0fdb67a872eb05a2885a6f284aa5143408c77347aac9d49574d622a7cfa6c93bb2020caf0d52c170cd393044d525be62c1a0937924ec42
+EBUILD libinput-1.9.0.ebuild 1444 SHA256 76962de08b8ffb60dcb7db8191721b4a56ff43bb48c7539692997982b3fb58e0 SHA512 93f60d74e38dbaa5e075348c7ed7174a61c1461af11d29ce63c82c6bb67a2cb65be454d9a843ffed3f9adbb4c231cad13b312a4ec5bb9e24131885b7db732e6d WHIRLPOOL e88296dcdb2e2bce743815258e91c9bddb0b0e9199515c2cf287af94454bf175d6fd290346c2952c8eeee68885bf4e4cb3ad7bf404e7ac423e24679be04c3531
 MISC ChangeLog 14704 SHA256 90bfde16dec6889083dc8f8a9b741e2ef9333ba05a1f38fa7ae990c257952d23 SHA512 8e45d452518032caa5c130be088e498409c11599298fef9a718368a77cd0b55d08406b0c1b31f36dbb1ddf3030ebe91bbbd91715602f0acc1bf816514388d689 WHIRLPOOL 7838c6e8eef6544342ea963e7abaa2bc4df3c70fe1f4f6daed06274f5456d4e358a80daac308eb0fefd7d33caf92972dcf14c963ec23ae1b5e6063386bae73c0
 MISC ChangeLog-2015 4085 SHA256 3316c764e3b7915215642529f9cf317e25dac5ddd889c1af4ae063fdce21bc76 SHA512 f368002ee0fc4984ef107e3522b24110a6694fd38baa30e353748f20ef71aae09c7c43b0d5837f9c795e2858b1904e63da2737dffa1084e934315e09f1e0583e WHIRLPOOL bdc6c89707548d4336ab365a1afee2bdca7d5689fe5f8b8db4cf252f0cb158aacdc1c9d29de9952302d32f77fc7e6def57cf7de33410e6889509dde51607c553
 MISC metadata.xml 340 SHA256 aec9631d3779808069d2ea623ad89d68d982b1ce2d5b583dbceea573d38edbcb SHA512 04b1dc52c0db95a09aeb061ea0bc579f83ad5971dcdb20cf61bb08ed37bf56999f784db75e6ec2b6cd47e57976c7e0651ffb040b052dd0f5ac8e1a679bee8c09 WHIRLPOOL d7c62ee9f95afc2180efeebd0bc8e40400685721be71516e2f31748abcc6b826a6104ea0cc8611221646b6cdf1e6e41948669a3c43ad362fed3aa82e444c8d60
diff --git a/dev-libs/libinput/libinput-1.7.3.ebuild b/dev-libs/libinput/libinput-1.7.3.ebuild
index 1c061c33d3db..ab1e9417d500 100644
--- a/dev-libs/libinput/libinput-1.7.3.ebuild
+++ b/dev-libs/libinput/libinput-1.7.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/10"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="input_devices_wacom test"
 # Tests require write access to udev rules directory which is a no-no for live system.
 # Other tests are just about logs, exported symbols and autotest of the test library.
diff --git a/dev-libs/libinput/libinput-1.9.0.ebuild b/dev-libs/libinput/libinput-1.9.0.ebuild
new file mode 100644
index 000000000000..89bf24d7c505
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.9.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit meson udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/10"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc input_devices_wacom test"
+# Tests require write access to udev rules directory which is a no-no for live system.
+# Other tests are just about logs, exported symbols and autotest of the test library.
+RESTRICT="test"
+
+RDEPEND="
+	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
+	>=dev-libs/libevdev-1.3
+	>=sys-libs/mtdev-1.1
+	virtual/libudev
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.8.3
+		>=media-gfx/graphviz-2.38.0
+	)
+"
+#	test? (
+#		>=dev-libs/check-0.9.10
+#		dev-util/valgrind
+#		sys-libs/libunwind )
+
+src_configure() {
+	# gui can be built but will not be installed
+	local emesonargs=(
+		-Ddebug-gui=false
+		-Ddocumentation="$(usex doc true false)"
+		-Dlibwacom="$(usex input_devices_wacom true false)"
+		-Dtests="$(usex test true false)"
+		-Dudev-dir="$(get_udevdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use doc ; then
+		docinto html
+		dodoc -r "${BUILD_DIR}"/html/.
+	fi
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/dev-libs/libisoburn/Manifest b/dev-libs/libisoburn/Manifest
index 997de3ab5478..d3dc00d968f7 100644
--- a/dev-libs/libisoburn/Manifest
+++ b/dev-libs/libisoburn/Manifest
@@ -1,7 +1,7 @@
 DIST libisoburn-1.4.6.tar.gz 1528141 SHA256 69efe9490e9ed6dbb1d8cad387ccaf5dcc5bb39dd466eef208a6b77a48584def SHA512 329d3234e8ae31abcab8d8a61a6531ab7ccdd8340148f84a6c77a23bbe16b303bf1dc95cafc751bf13f83e855f158b59ddd9e93c3dd1fe6046c1b5ea27eefb69 WHIRLPOOL 2b325541fe72e32acbd19c261a82b2c1475046467e33f5e1dd47d4aa64ed73f1a9f5d69281acd5978d65c046ff4c70dd7a4b6f3ef713f971e646cc5d12b7eb20
 DIST libisoburn-1.4.8.tar.gz 1537097 SHA256 91cf50473f0f19400629515974bda441545aaae29862dcbbdb28d87b821ca5a5 SHA512 26dd6f6884d98d9d3f54bf18b529a688d28aa0ff54b7fe6fe7926c7765755a1c7f7b2d0ef02ca6ea2bdac9ddf6f928c01c89a3547aea1e9f0b47346b160d0d46 WHIRLPOOL 88f2337bac0401f75a89e0ccfa5b259a87a282e7ce3594d02fc03da8765e3e164a77cdce38d959cbc31ad05798a7d0ad8887b601be0bfaf640adf39dd1378021
 EBUILD libisoburn-1.4.6.ebuild 1887 SHA256 3e41590da409c90f1df0d454bfd8151a90f7a36f2065fb11a4462989d007f3b6 SHA512 d1e70e25a18ca89b4cf5b767c2129a77e91a02a1eb0bc51078c3a80670c9be6dadaabbd2d579ebb18770c0194789e0e091b2baec4fb58d4ae849de34ee0b6a4c WHIRLPOOL 0e4421b683c43c58255e8cc0ea1a82699db526f9f191f76e188283ac8dbbaffcd6955c888a385e12054a9a4dfdde9d639c19898346425b13e5aabefdcf1700ab
-EBUILD libisoburn-1.4.8.ebuild 1895 SHA256 87228fc77b7e5f3c4d44e525def319c77c08f62b933b27725bfbbb36cc7da3bd SHA512 3a76296a1b0fc381f76f3dbb330b2cfc61f4708b3559feff3e01db2fd8c3f1bbce60832d65c67433b1614581d60d9543a0cbf04d6ba191031f1db720fda31a34 WHIRLPOOL 282a7fde45ddf0f2e72b2666fabcd000cb2695c3c26b033d7d9a38a7229da28cc5f973d6d603a6758a0242ccbdeb80e55638e1e859b2546c5cd7d9e685a04d4e
+EBUILD libisoburn-1.4.8-r1.ebuild 1825 SHA256 9d626c77c6478b398852bdc73f805661bc244289c042555866d3341bab52f2c7 SHA512 a4326669e2e634728329dbde6a02e2bc6283c1b32e9757ded8964bd62718ce2b372e7e82a4274fdea1233b66cba100555ecbec39c7cd667ef117340a1c3a4b6a WHIRLPOOL def157a29d26b3a695eb25d679b69f8c24a15b9c3a24c5f73bdc68d6fae8f9430f32a369e4c8dc07891c299490359e3d7e6f09c466508dd771ecba532d4f6d40
 MISC ChangeLog 4044 SHA256 b554a28c47696b5312dda0b6c674fd0b3c6cd1b43c3c8c17a7b981911f73abdc SHA512 7ab649672f1f1acd90a3bde27b85cea8362adb677cdf2150d1a371d9576f8e74163c83e89a5df22698fbf414891637309aaea20646af9d84bc7e622f6d8a0446 WHIRLPOOL b5134dfb9f0dffc3946660ba538571c9502576b373cdf3fd95366088977cfef63b4a0b3f2767ecf6df4e2bafd42fe49f5200d6099e82b98b264e5f9303db5f60
 MISC ChangeLog-2015 19756 SHA256 a88c2f337c4f13d65336b7819b54fd16b63a4931b20c259690b54f75d13ccd88 SHA512 56f49d9d6c4662fde951a886b061ce5c810160e8b9a332f7d6702e99c9e05bd67ce6f16c517da2b055a91beebcc21bb5394d30f91df43ccd0ff04af67e7b9026 WHIRLPOOL 46c977c1f9ba259870ef03c686caa96e084ef331b474b4867f87747b245443ef09991f6d112cc6a6692e8c5c9583e602caf2f77b725650a17a06689d5adc15a8
 MISC metadata.xml 907 SHA256 8c2fbd939f6fdd98d3a0e708dbfd7b270879559a91b09a80c256ed1b38004353 SHA512 a1ef1aaf1bb3f0250a3a73bd9420a24ad1f34ad0ff4fbf2a075284eed10430c8b3c989b932b5061439212001b76b483b7b5de7ed1e708e1c6fe14a0d80dd5166 WHIRLPOOL 5a55549344819908ada86fba9b5b0be90795dd0ee12aa49775aaecce08fd6d3e1034109abaac52a66de5387fe455e4bb4f55306afa14da48e53a434b9bc3b42d
diff --git a/dev-libs/libisoburn/libisoburn-1.4.8-r1.ebuild b/dev-libs/libisoburn/libisoburn-1.4.8-r1.ebuild
new file mode 100644
index 000000000000..a6dd1dac39ea
--- /dev/null
+++ b/dev-libs/libisoburn/libisoburn-1.4.8-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Creation/expansion of ISO-9660 filesystems on CD/DVD media supported by libburn"
+HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wikis/home"
+SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl debug external-filters external-filters-setuid frontend-optional
+	launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib"
+
+REQUIRED_USE="frontend-optional? ( || ( launch-frontend launch-frontend-setuid ) )"
+
+RDEPEND=">=dev-libs/libburn-1.4.8
+	>=dev-libs/libisofs-1.4.8
+	readline? ( sys-libs/readline:0= )
+	!readline? ( libedit? ( dev-libs/libedit ) )
+	acl? ( virtual/acl )
+	xattr? ( sys-apps/attr )
+	zlib? ( sys-libs/zlib )
+	launch-frontend? ( dev-lang/tcl:0 dev-lang/tk:0 )
+	launch-frontend-setuid? ( dev-lang/tcl:0 dev-lang/tk:0 )
+	frontend-optional? ( dev-tcltk/bwidget )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+	$(use_enable static-libs static) \
+	$(use_enable readline libreadline) \
+	$(usex readline --disable-libedit $(use_enable libedit)) \
+	$(use_enable acl libacl) \
+	$(use_enable xattr) \
+	$(use_enable zlib) \
+	--disable-libjte \
+	$(use_enable external-filters) \
+	$(use_enable external-filters-setuid) \
+	$(use_enable launch-frontend) \
+	$(use_enable launch-frontend-setuid) \
+	--disable-ldconfig-at-install \
+	--enable-pkg-check-modules \
+	$(use_enable debug)
+}
+
+src_install() {
+	default
+
+	dodoc CONTRIBUTORS doc/{comments,*.wiki,startup_file.txt}
+
+	docinto frontend
+	dodoc frontend/README-tcltk
+	docinto xorriso
+	dodoc xorriso/{changelog.txt,README_gnu_xorriso}
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libisoburn/libisoburn-1.4.8.ebuild b/dev-libs/libisoburn/libisoburn-1.4.8.ebuild
deleted file mode 100644
index ed2e3658e505..000000000000
--- a/dev-libs/libisoburn/libisoburn-1.4.8.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Creation/expansion of ISO-9660 filesystems on CD/DVD media supported by libburn"
-HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wikis/home"
-SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="acl cdio debug external-filters external-filters-setuid frontend-optional
-	launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib"
-
-REQUIRED_USE="frontend-optional? ( || ( launch-frontend launch-frontend-setuid ) )"
-
-RDEPEND=">=dev-libs/libburn-1.4.8
-	>=dev-libs/libisofs-1.4.8
-	readline? ( sys-libs/readline:0= )
-	!readline? ( libedit? ( dev-libs/libedit ) )
-	acl? ( virtual/acl )
-	xattr? ( sys-apps/attr )
-	zlib? ( sys-libs/zlib )
-	cdio? ( >=dev-libs/libcdio-0.83 )
-	launch-frontend? ( dev-lang/tcl:0 dev-lang/tk:0 )
-	launch-frontend-setuid? ( dev-lang/tcl:0 dev-lang/tk:0 )
-	frontend-optional? ( dev-tcltk/bwidget )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-	$(use_enable static-libs static) \
-	$(use_enable readline libreadline) \
-	$(usex readline --disable-libedit $(use_enable libedit)) \
-	$(use_enable acl libacl) \
-	$(use_enable xattr) \
-	$(use_enable zlib) \
-	--disable-libjte \
-	$(use_enable cdio libcdio) \
-	$(use_enable external-filters) \
-	$(use_enable external-filters-setuid) \
-	$(use_enable launch-frontend) \
-	$(use_enable launch-frontend-setuid) \
-	--disable-ldconfig-at-install \
-	--enable-pkg-check-modules \
-	$(use_enable debug)
-}
-
-src_install() {
-	default
-
-	dodoc CONTRIBUTORS doc/{comments,*.wiki,startup_file.txt}
-
-	docinto frontend
-	dodoc frontend/README-tcltk
-	docinto xorriso
-	dodoc xorriso/{changelog.txt,README_gnu_xorriso}
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index bd37ef6af42d..2f773bd7fb45 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -5,7 +5,7 @@ AUX libpcre-8.41-sljit_mips-label-statement-fix.patch 584 SHA256 d91c7b3f71e1e09
 DIST pcre-8.40.tar.bz2 1560119 SHA256 00e27a29ead4267e3de8111fcaa59b132d0533cdfdbdddf4b0604279acbcf4f4 SHA512 b4c27eafbdf33bd7a1384655b1936f4be3bc6745c072347eb26e988896c52664bd85ac42444da1be78b6e20f45b6c7e5921f5f20f5b0741b5bd3d9844e5bd4e2 WHIRLPOOL 6711688972b3db4b98902d548b84e8b03b61c3a12d24a4e42fc49ddc5e2b4be51f98f91873166e550866e88b6cd55092ea27704a3b7e71d58a2af21148ad3340
 DIST pcre-8.41.tar.bz2 1561874 SHA256 e62c7eac5ae7c0e7286db61ff82912e1c0b7a0c13706616e94a7dd729321b530 SHA512 cc9cdbeb98c010fe4f093a019bebfb91965dae4c6a48f8e49c38ec8df7d9da7f0d32c12fc58f22c51f1c2f010e72b65bcbf8bbf180060e93edf464fa9a7c3551 WHIRLPOOL 24d891c4f6580af20aa07a166038a2bacb52cdb305987f8b91b2fecae65e7b5277d3ef0b26ddbb3a33fd34794e6340e77df6a321e770b3aca4393d1ed144cf64
 EBUILD libpcre-8.40-r1.ebuild 2849 SHA256 71b6ae4b11f222072bf9776f4e701cd17e7819b82ce58d62c65a6380fa87f364 SHA512 b6969ee98be6c15c5e698a03c78956159f147a08fa9646711e75122ebae03df3e154d8a394a033a70ac2d5658b02b67626396433993639491b8753cc03fdd02f WHIRLPOOL 99012339d40a2857e83602e58b7b23f89d9385537df57a84b9ff38492ea443d48445d1151c9a442debee19e3fcfda14ae66ac11c50c702640ef18afc05dc8252
-EBUILD libpcre-8.41.ebuild 2846 SHA256 f41ed4166ce3157850fef339a2f1ff43b262fbd44919e5206a6ae773a2f69a7c SHA512 96f8b9c21755b2b796a203792143e0b8d837427c494991835ea2ec54fda43695a6821adc45744764161ed2bea1ef1385d672585acc2034f67fe4318c6e3f9ace WHIRLPOOL 4ab81d4a5928d779fe079bdb5c4e52cf8286653319f7028eb4763abd466f1f0673701865bbf35f10684a1285b1eb3ef854b2469a0d748dcc84be61f0832a8bf7
+EBUILD libpcre-8.41.ebuild 2845 SHA256 5f2b52ec408b03e9a548ab2b58a9fa31429c5e40dd75ee39238b5a01df7f202d SHA512 7b12d7fa5da2b152a3ba581cebe3d2f5535f3bd810887b17acff16271441d0d5350853fb0e8f3b407019c7d2e0910dab01b7b9dab0f16426a909b73f6f6b49cf WHIRLPOOL b68769e948d00c3d7b78026c03987476089cea3f77cd85b887ff5b1d4e9a7d4483bd1a06d189fa73f1f9b85761136698711646fff590da7765fa96bac779570b
 MISC ChangeLog 9358 SHA256 6d71cdef5ca28f5d0c3af958daa73122d374a64088bf960961f9eec235572595 SHA512 ad1c6ff26e6198bda9f8c5d31d03a5337b0bd7c620f564b31b98117982d12677426ec4d703325028c44ea371dc15c3b2530d0c91ccd9e8b40b5710761a2e7ef0 WHIRLPOOL c8f1726ad29d83ee380eeeaae0a385a7de8db1e99751357bbf59dcf0af751e4f6ddb8f88d836dda0d0d6e132ef4db126fa3e64610491ceadce550b3017b2ee5d
 MISC ChangeLog-2015 35335 SHA256 dfdfc43bcff86898d74db532baf46e6d88c70a3e62e82ceab69c285934f802b5 SHA512 94411b185f75967d240777124272d04b13f3cb3e43de6f751baa9944e07086f9fa2972e4854514fb39f85d69422a07fd1ee1cc7fc587dacf54b777bdf68439ea WHIRLPOOL ec71b8c06e85b5ec0a4040def4447e6aa2589bbaf9bd4b5d7479a2b968357a2b5c4a30e7c2739bd1b4607e074cdc9d15e0f730ed1a69cb936d514056d53578e0
 MISC metadata.xml 1112 SHA256 fa2a7f9e7f1ee1c432907cbc5cc0dd23f9636b5f4c51836dbcdbf24f72975c2a SHA512 eb7e2db9932c108442e69bd3ddf04d8d753dede44f7453b1fa33730ec9cda89e618f4444a0adf3f9e7d09baf8c97ff19831906ad7148a26674269f1efd427e6b WHIRLPOOL 7b675f34fbd1f58f42d7ad5c4e39e1d80922474624047165b30d85ecdbbffd1246d68b0dad4d7553c0d2fc900249e3425fc04f9b3821f189b30ebb2d2615dbad
diff --git a/dev-libs/libpcre/libpcre-8.41.ebuild b/dev-libs/libpcre/libpcre-8.41.ebuild
index 96c3c8993de6..c62f7c4cccae 100644
--- a/dev-libs/libpcre/libpcre-8.41.ebuild
+++ b/dev-libs/libpcre/libpcre-8.41.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="readline? ( !libedit )
 	libedit? ( !readline )"
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index cc0c325a71ec..67dde8bc8f5f 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -2,7 +2,7 @@ DIST libwacom-0.24.tar.bz2 488313 SHA256 2905a0ee5cc85eceb9f5bd06109e66a051b0ed1
 DIST libwacom-0.25.tar.bz2 478780 SHA256 29d0862cd008a82e19f4b74a35ca9da49dfdb994a1bc761bc87e503c9de040cc SHA512 080d12706c3b685ee1cb963b79068e0e7c08e47296c1535cde4d2280239758d6bccbd38982a63d366cab1a77a4db287cc5bb329abaee6dbb285c4b8e010eaf67 WHIRLPOOL c99d62a2b26964c84dcbfca9e5136a89c397360025028cc23e54bd1413b15ece58c5948b516e7cdc5d2e3a4592dfd0e46851f9cb4528a596448886e216864373
 DIST libwacom-0.26.tar.bz2 479348 SHA256 c3e4109c8aa675ca42cafbf39992dcd1fd6582314441c42ba32b49f5b79cfb76 SHA512 4250a9c3481580d88b76f0dbcc9bff39bbe88bf3c874e0d7776d604980481ef7f3bf6d550a46c4bcb9690fb589e955cb416a0724dae200ba027bc129b3cd3100 WHIRLPOOL ac1080a2f402cdb35a390f6a1958300b5e0c23eea9062521f48d4b05f93db4512dc4bc0a8c84a85e85b0406b76456785415afc50c48eed1f1ba01eedc6f26019
 EBUILD libwacom-0.24.ebuild 1079 SHA256 33d294814c85115811834f7054c7628d77980ca6e076fb2c76873b2796faeb59 SHA512 b538779a85fec5a6b63ae0e0269c96e84fc74e1bb8a651a637eedeb57dee1195d2e12dbf165f030b88a5f1ff3b47e2632c0b1b901812850a41cb5f585923ef37 WHIRLPOOL 083622f97d82d2909d3d17745874f295cb36383bbcf67299d8908ce46270f6a8711c1691b6ea944d62533a90a92627f808fee1c6ddb98be8e1f425f78d0bce2e
-EBUILD libwacom-0.25.ebuild 1092 SHA256 11f97590c3058f211aaf12b218188f8880fababd4f850c13943ef7d45c9e8e60 SHA512 376904bf74ed2623afc19ca5c0e7eb402a558e506f01ace86bfaad60d3bdc7ec04fe9fbd4a47fdad1006db9b60c10b93f928af939af0fc3c4bb068f0971acad3 WHIRLPOOL 3cd9f5dcf06fc6740c66ffd9f6891539970ed141afe27197da713324405f5cc9eed902bb2271bd191160f5460dd773a49f28660f7529531548382498b6137f08
+EBUILD libwacom-0.25.ebuild 1091 SHA256 2615b0a237b81dd25816cb31eff683dc596477a1cc654ac79f40a24f7123aafa SHA512 d0e2c7abd09b66fe30ca1a5eefc9cf1a709b0477b0c781a7192ba78061b5674ec407d593e30f8ee518d0015c501d35ba6f0701a9f5f7ee07c7033c001544e2ff WHIRLPOOL 485182a61dd231b31be672525b221e7b63c01e086f61f143910846c45f83ceb388f2fd0ce49d1e0a93e4f1f46d76424220804b914827a37f9b8b963840938bcd
 EBUILD libwacom-0.26.ebuild 1096 SHA256 f2828fbd5ad507b80f87a96c974de8867b55b19b6846ac43cbd117e48bea8d6b SHA512 a33a370fb8938c7b4676a580cd821c6647096f7111b2dcc15b1d44b016f29425059155eb42e004a337af36c827151ed35fd6a8d4f35f107a7dce0974aaed907f WHIRLPOOL 5c05653bc899bd2ad39e09bd020156f1ec3a936694dc389b590918a6c75bc5ab66a3ea1664eaed0da3c6dad30c28d3cde8137a822c0c202e783c87e27be630e1
 MISC ChangeLog 4728 SHA256 d8481bb51417ff469b609f94ae319ffa2037e6c4994b38b7b48b8a4ff30973b7 SHA512 651a007ed3a9f070be83407685c7a2a8d821d4ecf91a1d19eee2b488a5f0bebff2a74d17cdf8e319eb82b3941b5983234160fcbf9e18034c40c9ca5100ca6a8d WHIRLPOOL eae4a83a496de5eecef95444999feeae039c39c7a3208a51de78c1a4fb11ac6d551f1bdedbee536b575458b24ff928019542b653c41334b89702b8d01d325091
 MISC ChangeLog-2015 5109 SHA256 c299064886120840e6df6275f6b969a0e0aa74266096b8666f69724a4e03c3a3 SHA512 ca182eb23dd17d67bcfbec3d8850fe40853026adc253fd1df838daafd9e645eed21c8d35e9cc272f7aef9729485c246fce2ac4a988612cdff1e42ec453fabc18 WHIRLPOOL 5f3532aa1d0e2f3bd770a9f653c6eb6509134827e62a431ed635d1695b850c91357ea96eae14635ba17086c7ad941564d3b87b00c3fcfd034a75a3a2b1da8737
diff --git a/dev-libs/libwacom/libwacom-0.25.ebuild b/dev-libs/libwacom/libwacom-0.25.ebuild
index ff90b321b005..1f146613a414 100644
--- a/dev-libs/libwacom/libwacom-0.25.ebuild
+++ b/dev-libs/libwacom/libwacom-0.25.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~ia64 ppc ppc64 ~sparc ~x86"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 8ae5c0a98529..42a6af1f4005 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -2,12 +2,14 @@ AUX 1.1.30-unbreak-xslt-config.patch 791 SHA256 e7b85942dae4da41ac1ae20d9b335b57
 AUX libxslt-1.1.28-disable-static-modules.patch 1109 SHA256 706fab8fb584bc6ce2452423847d0484b9499455cf63a492a6d39d0f649048fb SHA512 d7a091d2b303450d46e94ca53df630ec6cdee8707ffd7d7d2920a56a624f1f8f53d2c1753768b49786c0ce17b6512f8de7740b54bf1c3cdbc5e8a5f3d052b1d1 WHIRLPOOL 1dd8eee2fb5d47baefde89d73912f1416c76b6224a1326fecbaafd6060002d8c842346d29ca8b2dd7d8e59c136509760b5ec353e4735cefb337cbc91eb2cc2e4
 AUX libxslt-1.1.28-simplify-python.patch 7468 SHA256 a06baa32549f17ed0595404125c8d3347d153b51beac37a34551390457c56737 SHA512 434000c035fe5427dd3d63fcb717f5e2b8863ed734d5451d54092b21ce5074b137299378c03d5130e18064d89be4ae942702eb8bc3295bd39287f353655c47c4 WHIRLPOOL 8a2079ddd6c5dc3c7e2b8adbe00ff65382a23aa0d91c36b68484575488068e847475f569811f4b612656d1f77ff7a1eb3242267a03b6c9a5b1c1d1b98e6b726a
 AUX libxslt-1.1.29-cygwin.patch 1148 SHA256 f0b3271faf0a7bd201964642d6b018e2909d20dd356dd13c08fc9fbe6757dc58 SHA512 9d24169d749356b6887bdd6c3dc3d4b34c455569fc79bd7235cea7d9e1ee3114b135ca79ac6f4b8c3ad2cf467c119316d8c934bb27c9d041312d0b0a19b635e8 WHIRLPOOL cec857824be7fc7d39093892c1f6411a8219bb0698931e9df709a5582d36a56a72db9374fc033f0f54648bc19265a885e4b96583ce002786079d68ddf6a4cdf2
+AUX libxslt-1.1.30-glibc226.patch 908 SHA256 02a57690c9e2d6c941877304a16f14e3bc6c82d002b7a043fa7461a5562f070e SHA512 9e13920ddfecd0cd634c009e5d117a4f9985d728df24ea0f11fbe5fb8a976664713b3d4166d0df4f5d2ce6f44dd39bdfde632fd0bc039c4dd375aca0ff1bd326 WHIRLPOOL f8859ed188205b8b05db6f0ad1ce976c3c7f129b2379563bc38516276d9bbb2f0883fd01b06ab4f2f6fb0d5cae409910dc253a53a75df4dbabada40b6447f4e3
 AUX libxslt-1.1.30-simplify-python.patch 7487 SHA256 899c40e3fcf5cd45f6dbf56154ff81b7dffc60a20d1a725751e3d49da7f318bc SHA512 4b0b622aff880de8ca2fbdd9e61cbea117f1f497767caabcc4ab4e6532145683b08d127f497bdd41035dc7b3fa6d3ab5b53c2d8674e87f5193c652858ee31586 WHIRLPOOL 69201905f868669bcd9b4810d4ab601431136cc8607c06f377ea3576ae95ba37a49123e40bd8d426ab1e7e685d737a3d1043533ab6db1a1a11c0d55c2243ce32
 AUX libxslt.m4-libxslt-1.1.26.patch 1421 SHA256 c02cd8437064db0921c08e63245c403dad12410d2997715aa7aa36600bfaa895 SHA512 78cfb6bd823805f660c9d07c4f6f83a87cf2385c48fcb11bff82792101f06b36d08f851089497f0c019f5743f31248cbabe341f78f4ca7e7617c86c4e5a8404a WHIRLPOOL 0b4da6d1ce77e653a6c175fc203f5fecd0c831a018a5063e66e5ff0cc19d9a19d8938b06e4318938a35f665f91442290f267bb3fc86b9268c2455ac9616caeff
 DIST libxslt-1.1.29.tar.gz 3428524 SHA256 b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce SHA512 a1ce555a74a9dabe65e8f64bb66e27e77760fd76940d88f2d59f58dd63ca73c8ae59f3fcbd8e76c8f92ff992fb0c09328528c20ea38ccac83e63252106bf5f31 WHIRLPOOL 874dca166a147e3928207b0dea720b92a3657406363536be0cc3c904dcea7bad0af48536a722d1570743908a7e730073a13440f41885b8fbaeba919b1e99521b
 DIST libxslt-1.1.30.tar.gz 3444029 SHA256 ba65236116de8326d83378b2bd929879fa185195bc530b9d1aba72107910b6b3 SHA512 d24e37398503b6bc29245a993738df51bf3948c4a8f052eedd7eac0a9fcff2d5b54220f37070c46f763e073c34bdb3153c9f129aa0df60c3d7cf7eadbbf15986 WHIRLPOOL 7a346a1cdd340f6ee39b4d8d426dd894164ce4b8c55ee74b832cdcc9e7bb7bd2e13fdabb57a50a206c40be8bf238a57132bd1cf6fe48e77c710d8ec75f1aaffc
 EBUILD libxslt-1.1.29-r1.ebuild 3496 SHA256 646933711df2c10425193358e01f4a2277c1e537a8b3d0091e3f8e92ea118733 SHA512 8881813ff55064e4d37308de04fa30750a54bcc3c0c932954d0930542435241b84f6300655eaf715c2e784086ef6cc400bfa5cf0f5ba256edc38c13d06fea372 WHIRLPOOL 74ae64d1646874adcfab060728c4b13e9482c5a8982d198548dbd624efc02ec857d5498e2fc731dead0e09b33294c77adfd2797b706bd791131d96363553f40a
 EBUILD libxslt-1.1.30-r1.ebuild 3570 SHA256 34e5f78b59d8c0e0215169c99635bdf4524f7a0b4dca5ecebf10a35f3b582b98 SHA512 7899c43b5a0c4933cf44dd583e3c67f34a369a3e7909458545e3c63bc67c36a46389877583e35720ad384014668e5d336ca36eaa105523e1e8643328d8f19bad WHIRLPOOL 7fdabda4d6230f26c62856030957fc41252c01e14dce6552ebea4497c82044e64daf6cb2d9b1e863113d9054eae7ea299f10bbd2fad363d4a20a184e3701237c
+EBUILD libxslt-1.1.30-r2.ebuild 3674 SHA256 2569237c3c19a092a1f04d88732e08b38c62cc93e9b226ec607fa2fa55da113e SHA512 37358f9c889b0e9c62237c48e94b364887fa95b102a139e45f79ef07b48ecadc9c168a577e414e0b0724eb37dbb5dd2d7f8f615da34dacd5d4961e3f4ee10214 WHIRLPOOL 9f7764cee24e75bd80cdea77618c16718cf1c7ac80938428bd36cbec6d5b152094bd9810d0a2920f6775009ea0211a15b26e1dd8cf8041b6c2fdfa7a1d58d9e9
 EBUILD libxslt-1.1.30.ebuild 3461 SHA256 39915675e1deb05a107e8d90aa38e5cf68701dfe657406309b5663d69f17071b SHA512 b44d3c1f72cfded5bbdbd2ac0de4bec9b5d51945e9697f5fe7d71c01a507e005b77828312634e4095e9433e733a5ede58f4b822e0b2ef34027a3cd6e66542fc0 WHIRLPOOL adde0aa2a69d73c878c18073d15194e6b6f25247371aeff0a434325879f205141c436782832e4c801ca8bace4d1dfa4fe7d08b8201a10d70e6fbf5328aafee37
 MISC ChangeLog 8365 SHA256 b65a2f465bb43a077d88e2d6a9b519f298b0c00ff5332f071fb30ae97509440f SHA512 d6e29b3b6c1fda15a020b17728315bf11b6c208ddd7415d4c107c5777307ed37e43864e9b1feb9772c5257cd5f1df90051fce85944308d9e0a1afcb3d0147664 WHIRLPOOL 13da17ac13ee9bdda67134a6bc9bcb7f6127ced0a8cd8c35ce7df0284f107c079733170915bd73620bffbc3754fd477d907bc120ba8e328e833362aaa4d56d34
 MISC ChangeLog-2015 38221 SHA256 3ac8ca41025991ec887baeb5ad276a1a6fcc5f5a9e0014a50a5ba7c9dae878ec SHA512 d7a28c1e8f8884ae84d5fe11fb150edaadeffb2a3b7e3453a9276a9eb3bda47d529f0b0064ff23a45bd648652b8d82a505fa6f6c358e47bd583f1df8018205cc WHIRLPOOL d0a81a32dd6cb3f975bf3e52cab952531bd5eed4e0460a35c1c2ba2fd950d2b2800ca4bf7db526123d846b7d6b440e8b57285f4e34e41fcdc14c3ad527c7714e
diff --git a/dev-libs/libxslt/files/libxslt-1.1.30-glibc226.patch b/dev-libs/libxslt/files/libxslt-1.1.30-glibc226.patch
new file mode 100644
index 000000000000..e1e97229d60f
--- /dev/null
+++ b/dev-libs/libxslt/files/libxslt-1.1.30-glibc226.patch
@@ -0,0 +1,32 @@
+diff --git a/configure.in b/configure.in
+index d6aa366..20aafb8 100644
+--- a/configure.in
++++ b/configure.in
+@@ -165,11 +165,11 @@ XSLT_LOCALE_XLOCALE=0
+ XSLT_LOCALE_WINAPI=0
+ 
+ AC_CHECK_HEADERS([locale.h xlocale.h])
+-if test $ac_cv_header_xlocale_h = yes; then
++if test $ac_cv_header_locale_h = yes; then
+ dnl
+ dnl Check for generic locale_t declaration
+ dnl
+-AC_MSG_CHECKING([if xlocale program link])
++AC_MSG_CHECKING([if locale program link])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #ifdef HAVE_LOCALE_H
+ #include <locale.h>
+diff --git a/libxslt/xsltlocale.h b/libxslt/xsltlocale.h
+index 8a9ca15..2f64424 100644
+--- a/libxslt/xsltlocale.h
++++ b/libxslt/xsltlocale.h
+@@ -17,7 +17,9 @@
+ #ifdef XSLT_LOCALE_XLOCALE
+ 
+ #include <locale.h>
++#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 26
+ #include <xlocale.h>
++#endif
+ 
+ #ifdef __GLIBC__
+ /*locale_t is defined only if _GNU_SOURCE is defined*/
diff --git a/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild b/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild
new file mode 100644
index 000000000000..8e852aaf2c52
--- /dev/null
+++ b/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit autotools ltprune python-r1 toolchain-funcs multilib-minimal
+
+DESCRIPTION="XSLT libraries and tools"
+HOMEPAGE="http://www.xmlsoft.org/"
+SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="crypt debug examples python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/libxml2-2.9.1-r5:2[${MULTILIB_USEDEP}]
+	crypt?  ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/libxml2:2[python,${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/xslt-config
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libxslt/xsltconfig.h
+)
+
+src_prepare() {
+	default
+
+	DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO )
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=684621
+	eapply "${FILESDIR}"/${PN}.m4-${PN}-1.1.26.patch
+
+	# Simplify python setup
+	# https://bugzilla.gnome.org/show_bug.cgi?id=758095
+	eapply "${FILESDIR}"/${PN}-1.1.30-simplify-python.patch
+	eapply "${FILESDIR}"/${PN}-1.1.28-disable-static-modules.patch
+
+	# Fix xslt-config
+	# https://bugs.gentoo.org/630784
+	eapply "${FILESDIR}"/1.1.30-unbreak-xslt-config.patch
+
+	# Fix build and headers with glibc-2.26, bug 632214
+	eapply "${FILESDIR}"/${PN}-1.1.30-glibc226.patch
+
+	mv configure.{in,ac} || die
+
+	eautoreconf
+	# If eautoreconf'd with new autoconf, then epunt_cxx is not necessary
+	# and it is propably otherwise too if upstream generated with new
+	# autoconf
+#	epunt_cxx
+	# But Prefix always needs elibtoolize if not eautoreconf'd.
+#	elibtoolize
+}
+
+multilib_src_configure() {
+	libxslt_configure() {
+		ECONF_SOURCE="${S}" econf \
+			--with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \
+			--with-html-subdir=html \
+			$(use_with crypt crypto) \
+			$(use_with debug) \
+			$(use_with debug mem-debug) \
+			$(use_enable static-libs static) \
+			"$@"
+	}
+
+	libxslt_py_configure() {
+		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
+		run_in_build_dir libxslt_configure --with-python
+	}
+
+	libxslt_configure --without-python # build python bindings separately
+
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl libxslt_py_configure
+	fi
+}
+
+multilib_src_compile() {
+	default
+	multilib_is_native_abi && use python && libxslt_foreach_py_emake all
+}
+
+multilib_src_test() {
+	default
+	multilib_is_native_abi && use python && libxslt_foreach_py_emake test
+}
+
+multilib_src_install() {
+	# "default" does not work here - docs are installed by multilib_src_install_all
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use python; then
+		libxslt_foreach_py_emake \
+			DESTDIR="${D}" \
+			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
+			EXAMPLE_DIR="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
+			install
+		python_foreach_impl python_optimize
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use examples; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples
+		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
+	fi
+
+	prune_libtool_files --modules
+}
+
+libxslt_foreach_py_emake() {
+	libxslt_py_emake() {
+		pushd "${BUILD_DIR}/python" > /dev/null || die
+		emake "$@"
+		popd > /dev/null
+	}
+	local native_builddir=${BUILD_DIR}
+	python_foreach_impl libxslt_py_emake top_builddir="${native_builddir}" "$@"
+}
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index fc1c65665ba2..16a734896087 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,13 +1,7 @@
-AUX libzip-1.2.0-CVE-2017-12858.patch 1114 SHA256 c68edeac709c69e67ab94117ce98115d961cbbc1dd0311a133398bdaef79591c SHA512 f79af2fc90c35aae5586496ae06552762b7bbcfcb358df656f2cba21e3bb1ce1c63781cad3fc56f1e438099fbcb1b4692d14203d434d8f7150d78819e21c1127 WHIRLPOOL 7a13a95c5c18ade2d6f8c99d7577161a13c542add5d919a3b9f2667607193d7a5cf853036341e91abd98c6b624d16f380c63370ea9300484f379761d52ec9dd4
-AUX libzip-1.2.0-CVE-2017-14107.patch 967 SHA256 74753366f1b3f76228ae6c7b986eec53fa66186bd2f2093e292f2abb4ed95583 SHA512 ca7123edd1016e5f63922676a826a699cc392ddc634a0efb97d2c66fa8e689ec1cda4482473284d508571b16b03d28f4bae6b44c377b9b69e6e6142ce8dda1be WHIRLPOOL c63a7f7ecd29ae100c81378704d89ef6780fb8097715852924157e441be10364091fd68b742554895f7ba0711beb0feeb103aaafc778b72b0a178c171f8cde60
 AUX libzip-1.2.0-fts.patch 393 SHA256 7c63adb61afda45105bb948f32dee94ba2981e66887236b195c5b93bcbec57ff SHA512 ae3fbad5122a6d4089db1bdfaa11882e5e5f5b7f17d13dc24b17c178236167ce364efbe87ef28970ddd5fa262fd8dc48b5a92e091a365ff92e39254319f79a89 WHIRLPOOL 84de688481e3cf56ef7830dd86e32735b355d692d9c9ad140f07f56f5af4ec132a0c437f258bcbaf4bc78bb9b6c29f833e90bf3534d07bcca119931170948398
 AUX libzip-1.2.0-headers.patch 341 SHA256 08c2c3b24a4eb2050f5e3ce03d0f84baa25801669db5d1917e9e1aae0f75e687 SHA512 25a54a4901e45d78263c35ea788c9ae84760c4e2cbb7e09f0dd33b35eefb47165a1788ab33a7f306d112ffdfa35a3f3ab65c1f50463d5a30ffd265a2be6208f9 WHIRLPOOL 359f3820ac71295eea0be7e2681b539f4f41e6e306a99ba49b153f349e5670f903dfe2d771591c8fa5a1c3935871fc931c263d8ba1e100cdb7b32658b384e4d8
-DIST libzip-1.2.0.tar.xz 938284 SHA256 ffc0764395fba3d45dc5a6e32282788854618b9e9838337f8218b596007f1376 SHA512 1ba8626d72e6b47f735568afaf007d1e18beb3ebedf6b69a6b575f9e04d3b84550371191a89be153f8fcedb4a8eac2f996e141da95cdbb52380b6283cc99cf8b WHIRLPOOL 794a462fc4d1529008fccbe6df41c5616b34712ef34721e0cbe555aa12ada7928d22f6e9421de210efdf7b460188a4d6a9a6e53fc0266bcf52d47d6a7e30a5f6
 DIST libzip-1.3.0.tar.xz 955876 SHA256 aa936efe34911be7acac2ab07fb5c8efa53ed9bb4d44ad1fe8bff19630e0d373 SHA512 8e12a23fe62b993ff4592e1b9da152533a363b0603fc1f65e6cbb6121d4260c45f98171effbccb76dec4030b0fcdcd273919755a2496ab462431646ac83bb900 WHIRLPOOL eca44e4c7e3a09d90f7a9c694de01c97fdc97ce7989bd8ccf9acb8e33e10145f6860c4dd5bb282d2ab0a708d9ddb6b7ecde88bf5276365179057c02f534e182d
-EBUILD libzip-1.2.0-r1.ebuild 881 SHA256 e63e661b728479000058d36d6241b377ffb12717d93f98fa624eadd35e64914c SHA512 4c4fa54a34f14c9c17ecca101f73df74299eef020e64799f3bcd71f34b9db50d54d233ac64aa9f003e49d6df2432785c9c1802977320c607d2f3f837c0935010 WHIRLPOOL 048118656d2c2d9a566cdb8a99f3912869ab51f91e573a89200876f4c6a3cb212a08f5f349aa361c0bf52d3ffed5ffed388245c7b188807c2ac9b6b5e0751eb1
-EBUILD libzip-1.2.0-r2.ebuild 920 SHA256 8a2ca325b548e66b830f8c7446de97fe5f90ccefb79651dd63ff034a98ff51cf SHA512 9c08d7821ed48459105151ba0003e1371b856b30b5d71e23ff4a71e4671af7cadcb2a289015c9ef39cf4382c2a74791c0e7ce5867499f65671ca2e1662c939e7 WHIRLPOOL 3c01823e370f18f7763525ad42c12edc788e7e5ef9592e708e4a1e95371db749dafae29baa1ee3ba932983ffa6ad1265d547579b6299ed83c6982703746c41d3
-EBUILD libzip-1.2.0.ebuild 833 SHA256 a371a41b26f0c5c9f07ab28239d71fdf0bfe5b636c82c87f01354253d2fd5dd4 SHA512 29ea3d528b6f212813a393fbc9f1ec0407aa57055e2efaa90ea19392584d0b510e30c14b8654d8d89ef713d0936a31db881a876005dc9df1bf22ace6fc5d7b03 WHIRLPOOL 57e985367e2f12fb9c1958497f0d8b74cc50eb05ba4183e95daa0deef1a756cc8b35572f6a9f6a9f77974e93e8814954b721144aae536ec7f28cee80bed19617
-EBUILD libzip-1.3.0.ebuild 1035 SHA256 db633d4eddd7ddcd1d29a441b3cc97f1d687797ac24be72984d63498cafb6955 SHA512 12c45fd0bf3958e8bfad3368ca14b7534b53138398d06330ab303665f9320f938e3b34aa589eaa5d646b52a984e7cd61acc30d7ff44d7a70afe088daa73bdb2c WHIRLPOOL 0caf148d65cd20fa8f69f28dc6a521669ef6f6a1ee845a9e88ae3060a592a7a74d150d5957472119acdb13ccece3f7b575d2bae71553f42375d96feee3bd7e33
+EBUILD libzip-1.3.0.ebuild 1033 SHA256 fb9c43ca90a74fbfbdab28dd2772fdf88c8ca5a6df312682aabb48a8a0680ae1 SHA512 11169b25036691b911ea704e46bcf6256eef23a4ce18bfc734d8ee86e6c3544484c381dad972008b1df157b1e65d3bf4dd2a61eec7707ae2182e6863a8170a76 WHIRLPOOL 1d0d814e8636cff4390d0889065e54ba716d8f0ad83b127f132a76c78c58c2e6d13b3104e6c0cd525a0719e0a372ea058184ce2e3d19a073604a0ad61450508f
 MISC ChangeLog 3669 SHA256 135911502b4bc23d3d368b709c273cf03a532ed34e988d07b6e55f53e52ba0e7 SHA512 ed316b1a3789ba998885c080996513c01dd929299195bf22ac3209bbdb3d86ba9b32fada27d631adb49ffe82c412771b81f1ce15b00be5ff31d8b7b425acb3d6 WHIRLPOOL e3a08a5c325d64911f7acbdd92105960f52607478ad4a5e9a9cfd320eb520415574f475b875ec249eb29b30ac352c3e6afb913836124dec77f4c8b7619f35c30
 MISC ChangeLog-2015 10946 SHA256 b7631a82f738eb83c6fbb463d673e7446b99d1119347eadb5e20b393e6481c25 SHA512 e1fcbe88fbfcb1fa7b600cb069160b81295433a0d1ffe566d8a39d4bef69ef80947bccead3fcc49a753e2a46d6b4fc79a6cd345f338229086240d86fed69b01d WHIRLPOOL 1737a7e0c371a8fbe7c3d5e593c58899a43f0a79353ba76dc0188ad5cfd568a4d876205787b4fc51792e9307a2c7de99daef40899ee1de23dfbd9bce17a13ee1
 MISC metadata.xml 350 SHA256 b6b15cc99da47d9919708f4b1c1c56fefe6114610ddee8fe46bb489ae8efc175 SHA512 8a4e76c7530802e09662da3b6e5131baa2d58bd657f69c776e48e18fd93d3db6262d06916ce86d28b5685bb2be74e1357e1a9eb1764e524ca95887c35e4ed401 WHIRLPOOL 2278e0eb621803ddc76352d3b37f26f347182bc21a0e1aea4d310f6869e48f483bbb73c1cc26a09023ba6fa66ad49d4805cf360cdb9cb8e403f1f08cf8d72256
diff --git a/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-12858.patch b/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-12858.patch
deleted file mode 100644
index 26236510fee8..000000000000
--- a/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-12858.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 2217022b7d1142738656d891e00b3d2d9179b796 Mon Sep 17 00:00:00 2001
-From: Thomas Klausner <tk@giga.or.at>
-Date: Mon, 14 Aug 2017 10:55:44 +0200
-Subject: [PATCH] Fix double free().
-
-Found by Brian 'geeknik' Carpenter using AFL.
----
- THANKS           | 1 +
- lib/zip_dirent.c | 3 ---
- 2 files changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/THANKS b/THANKS
-index be0cca9..a80ee1d 100644
---- a/THANKS
-+++ b/THANKS
-@@ -12,6 +12,7 @@ BALATON Zoltan <balaton@eik.bme.hu>
- Benjamin Gilbert <bgilbert@backtick.net>
- Boaz Stolk <bstolk@aweta.nl>
- Bogdan <bogiebog@gmail.com>
-+Brian 'geeknik' Carpenter <geeknik@protonmail.ch>
- Chris Nehren <cnehren+libzip@pobox.com>
- Coverity <info@coverity.com>
- Dane Springmeyer <dane.springmeyer@gmail.com>
-diff --git a/lib/zip_dirent.c b/lib/zip_dirent.c
-index a369900..e5a7cc9 100644
---- a/lib/zip_dirent.c
-+++ b/lib/zip_dirent.c
-@@ -579,9 +579,6 @@ _zip_dirent_read(zip_dirent_t *zde, zip_source_t *src, zip_buffer_t *buffer, boo
-     }
- 
-     if (!_zip_dirent_process_winzip_aes(zde, error)) {
--	if (!from_buffer) {
--	    _zip_buffer_free(buffer);
--	}
- 	return -1;
-     }
- 
diff --git a/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-14107.patch b/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-14107.patch
deleted file mode 100644
index 3d1f9a0aabc3..000000000000
--- a/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-14107.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 9b46957ec98d85a572e9ef98301247f39338a3b5 Mon Sep 17 00:00:00 2001
-From: Thomas Klausner <tk@giga.or.at>
-Date: Tue, 29 Aug 2017 10:25:03 +0200
-Subject: [PATCH] Make eocd checks more consistent between zip and zip64 cases.
-
----
- lib/zip_open.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/lib/zip_open.c b/lib/zip_open.c
-index 3bd593b..9d3a4cb 100644
---- a/lib/zip_open.c
-+++ b/lib/zip_open.c
-@@ -847,7 +847,12 @@ _zip_read_eocd64(zip_source_t *src, zip_buffer_t *buffer, zip_uint64_t buf_offse
-         zip_error_set(error, ZIP_ER_SEEK, EFBIG);
-         return NULL;
-     }
--    if ((flags & ZIP_CHECKCONS) && offset+size != eocd_offset) {
-+    if (offset+size > buf_offset + eocd_offset) {
-+	/* cdir spans past EOCD record */
-+	zip_error_set(error, ZIP_ER_INCONS, 0);
-+	return NULL;
-+    }
-+    if ((flags & ZIP_CHECKCONS) && offset+size != buf_offset + eocd_offset) {
- 	zip_error_set(error, ZIP_ER_INCONS, 0);
- 	return NULL;
-     }
diff --git a/dev-libs/libzip/libzip-1.2.0-r1.ebuild b/dev-libs/libzip/libzip-1.2.0-r1.ebuild
deleted file mode 100644
index 61f933dcd36c..000000000000
--- a/dev-libs/libzip/libzip-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Library for manipulating zip archives"
-HOMEPAGE="http://www.nih.at/libzip/"
-SRC_URI="http://www.nih.at/libzip/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="static-libs"
-
-RDEPEND="
-	sys-libs/zlib
-	elibc_musl? ( sys-libs/fts-standalone )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS NEWS.md API-CHANGES THANKS )
-
-PATCHES=(
-	"${FILESDIR}/${P}-headers.patch"
-	"${FILESDIR}/${P}-fts.patch"
-	"${FILESDIR}/${P}-CVE-2017-12858.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	use static-libs || rm "${ED%/}"/usr/$(get_libdir)/libzip.a || die
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libzip/libzip-1.2.0-r2.ebuild b/dev-libs/libzip/libzip-1.2.0-r2.ebuild
deleted file mode 100644
index 524782f42c3f..000000000000
--- a/dev-libs/libzip/libzip-1.2.0-r2.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
-
-inherit autotools
-
-DESCRIPTION="Library for manipulating zip archives"
-HOMEPAGE="https://nih.at/libzip/"
-SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="static-libs"
-
-RDEPEND="
-	sys-libs/zlib
-	elibc_musl? ( sys-libs/fts-standalone )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS NEWS.md API-CHANGES THANKS )
-
-PATCHES=(
-	"${FILESDIR}/${P}-headers.patch"
-	"${FILESDIR}/${P}-fts.patch"
-	"${FILESDIR}/${P}-CVE-2017-12858.patch"
-	"${FILESDIR}/${P}-CVE-2017-14107.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	use static-libs || rm "${ED%/}"/usr/$(get_libdir)/libzip.a || die
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libzip/libzip-1.2.0.ebuild b/dev-libs/libzip/libzip-1.2.0.ebuild
deleted file mode 100644
index d51ce7650816..000000000000
--- a/dev-libs/libzip/libzip-1.2.0.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
-
-inherit autotools
-
-DESCRIPTION="Library for manipulating zip archives"
-HOMEPAGE="http://www.nih.at/libzip/"
-SRC_URI="http://www.nih.at/libzip/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0/5"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="static-libs"
-
-RDEPEND="
-	sys-libs/zlib
-	elibc_musl? ( sys-libs/fts-standalone )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS NEWS.md API-CHANGES THANKS )
-
-PATCHES=(
-	"${FILESDIR}/${P}-headers.patch"
-	"${FILESDIR}/${P}-fts.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	use static-libs || rm "${ED%/}"/usr/$(get_libdir)/libzip.a || die
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libzip/libzip-1.3.0.ebuild b/dev-libs/libzip/libzip-1.3.0.ebuild
index 7b78428aaf6b..f7fdc6738e80 100644
--- a/dev-libs/libzip/libzip-1.3.0.ebuild
+++ b/dev-libs/libzip/libzip-1.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="bzip2 static-libs"
 
 RDEPEND="
diff --git a/dev-libs/marisa/Manifest b/dev-libs/marisa/Manifest
index b6ec5695ab1e..98f928ee4ad7 100644
--- a/dev-libs/marisa/Manifest
+++ b/dev-libs/marisa/Manifest
@@ -1,6 +1,6 @@
 AUX marisa-0.2.4-python.patch 683 SHA256 f04c4cd3fb7c24d5b1879cc39419d99a13eddc3e4563998aacc1355e3f469324 SHA512 fa718a385cfef196833f5a9aa23c31839505a0101df3d25a73616942845668891f818213b89a36689ec93e678289128add1f6450e15fb995233621faaa76d700 WHIRLPOOL 37252e462eb368f86a1b6d844dc53f536b40c9ef78bbf555a7810d4f2090eb9237e906d815402baeada75114db4fa2bc36bc96e0b1d6322bc18e3a5763c0d3a6
 DIST marisa-0.2.4.tar.gz 502552 SHA256 67a7a4f70d3cc7b0a85eb08f10bc3eaf6763419f0c031f278c1f919121729fb3 SHA512 71aee3ae034d1ce725d986bef43472d61bd64f0af3ccda01bb019cce03f0872629b6a1b305e717056bef06e036372323b2a67e5dc69705d6a74e028b5e2553e4 WHIRLPOOL bf902c90b70bf81209e6e86fd15962c8ff7f811fb168fba0688200ab11f29c36199223311ea8d15a891fcb170745587cce7c2e3e4d2ed7e158af9d1d9841b3e4
-EBUILD marisa-0.2.4.ebuild 2264 SHA256 b931b3a0443be935ed5dc040696d93d1b6b496ddbd56476859f40af51d97dab7 SHA512 87356bd9ab7d3f1908ccffa55a6b8e3de6bb1c2ebeb7df56d7d53315988ecc9f860ef9c0ee9d196746fbc47b0fd9b55d23bd485ccc45aa951739a916cb980afc WHIRLPOOL ece5975adf20f34afede568e24a9d9989bebaa8f370068d3a6180badd1ebdb9f703c2447116c649e736bf2313daea488b3ceddf72d241c6e79811872628bd608
+EBUILD marisa-0.2.4.ebuild 2310 SHA256 b33dc6dc6f1125cbadf614286b086af9a35344b047cf38a48658f0cbc3ec636e SHA512 b0eaef135689715cbff3030f8d8b9ea8d8e855e03a70d66f7ba2859a2ab36f39137691a36d0ec576e1603442068bb40c4d04ad2285c0789ffe39dc0a7321a38b WHIRLPOOL 9c26973675852e2f843613e5ee46848c866993e653d6381ef8b34fb8256659ed383221301bab112f6bad0875008431b10251e2428f13a1947da51226d8e0017f
 MISC ChangeLog 2771 SHA256 02c3b5d8b6dc8352e3d0cf0fb64cc66cfc1b4a0bcf20b56cb69e6b54f251473a SHA512 cf4336bd5f64b3369570e9f49cb6e095c18057459166bcbc34e53e9417ab2a06895f1ba74ed2d5e7cee1605d0fc05dfcf7226e770690557f02fb19f3bf41d5c7 WHIRLPOOL ca0e1d6973d2eb6cab208e0e9881e8bbba5ed18d22113a6085ef7aeefedf7ef9d258c9fa4c852e809f852ff317b129db724c5bd1e2a26a4c1ad48db2c32a4964
 MISC ChangeLog-2015 1068 SHA256 5a0f0a0b16e41848efa400579a1844e8a71b7098120703f5e660a6432453e0a9 SHA512 c7923afe4e556de9b9507fcc26910a226a45af5c5c0d78ac686f9f252dc6ed5b4d20ef2becda01cd2f9db6aa78537dab813709b998e574211541f695fab2af3c WHIRLPOOL deb9cae89baefdfc4b1dab18870130b6c16ea13692130b20f24b9cc47fd7e6e615076dc9057bd857587ae17908fdd1aeecb5e15c66894921623bfd7e2e46e456
-MISC metadata.xml 230 SHA256 5fc421627b578ee2d1317320525119c0b406026597bb1d054f96254a241bf96a SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1 WHIRLPOOL b3c1363540645200abd5bf0b5b7fb3cae0b738bfd359f7b13b56d97650f9381fccede1e3f867dbc736461ee7c7906725a3c53eabd9ac99929d5c7c520a831082
+MISC metadata.xml 317 SHA256 daf47e5bc6304a315709c8a34e9f56562078de15613b91f94855a222bd6334d9 SHA512 0e782fba322f87cfc0f180f812d0e33630c4295df1f434d497aba1a7f9d922e9674a3c23a821211cbe11d419eee70c25dbabb7508abc7bd56267e9648a1e721c WHIRLPOOL 332efacb5049da48eb5f62a4b3647702dae3b3bb29dda9058f74599a6cacf88b269cbe7a9fdf9c53aab769e69b7ec73838f5029bae5757304888cd207738f85d
diff --git a/dev-libs/marisa/marisa-0.2.4.ebuild b/dev-libs/marisa/marisa-0.2.4.ebuild
index 36c191d1005b..8a65a67a5593 100644
--- a/dev-libs/marisa/marisa-0.2.4.ebuild
+++ b/dev-libs/marisa/marisa-0.2.4.ebuild
@@ -9,7 +9,7 @@ DISTUTILS_OPTIONAL=1
 inherit distutils-r1 eutils
 
 DESCRIPTION="Matching Algorithm with Recursively Implemented StorAge"
-HOMEPAGE="https://code.google.com/p/marisa-trie/"
+HOMEPAGE="https://github.com/s-yata/marisa-trie https://code.google.com/archive/p/marisa-trie/"
 SRC_URI="https://marisa-trie.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-libs/marisa/metadata.xml b/dev-libs/marisa/metadata.xml
index c921b96adf6c..4aa8461d2b54 100644
--- a/dev-libs/marisa/metadata.xml
+++ b/dev-libs/marisa/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 type="project">
-	<email>cjk@gentoo.org</email>
-	<name>Cjk</name>
-</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">s-yata/marisa-trie</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/nanomsg/Manifest b/dev-libs/nanomsg/Manifest
index b28d209aa5cc..41aa26813986 100644
--- a/dev-libs/nanomsg/Manifest
+++ b/dev-libs/nanomsg/Manifest
@@ -1,9 +1,11 @@
 DIST nanomsg-0.8-beta.tar.gz 589221 SHA256 75ce0c68a50cc68070d899035d5bb1e2bd75a5e01cbdd86ba8af62a84df3a947 SHA512 457e99e2b2568370bf052a20e2abb38faad9afa9019d38aa35df6cf49d1d3f50e3a0b26a64089e823b7d907041e8069c99a06706678b070a26e0cbe2e26588d2 WHIRLPOOL a0c00848b8ca2178588047aaaedb9e3b10a993e5ae5d2c0da6716b861003deaf1ce3891850919db73202de8d1aa36e21c1f440600ce2be852189988fae4994fd
 DIST nanomsg-0.9-beta.tar.gz 310601 SHA256 4c15248baa594523fc34368166cdb42e766e50c58b41a73f925879f6d87ba601 SHA512 3a7141dda6152e5192faaa9354116a9dc43636dbc03ebff0598796210c310756d3841cf7bb6857be46722d8952894f5bebe192ec538511825f72e700ac4e03cb WHIRLPOOL c2150f1a71b8e35e2258a4f3b264e4356553312f07ef079d2bfd5279cf52df4ffa3a7bb4738f85d86945ab17ee04a7f1d2c17d8011bb6ae396be2b689282e8d0
 DIST nanomsg-1.0.0.tar.gz 305040 SHA256 24afdeb71b2e362e8a003a7ecc906e1b84fd9f56ce15ec567481d1bb33132cc7 SHA512 06fc4eadac29439024bd24230c73f43ddc46e6b6848ad75952b67bf301066be5752a844173597c1b42e55c1ebb66a2d2cb7693e4cbfc07584b4398597cbc9200 WHIRLPOOL 97ac9ff5170ee649c7803f7ea22713889506ce54a1fb0a55c5d2ac82a1359e8367189d9e3d8d8ecb85193ec8770c78365aa7a9daeefe5705fc3049c27558a52d
+DIST nanomsg-1.1.0.tar.gz 308801 SHA256 e81b79e073f5388a5070623136c7896244f8bbc24fd5f5255da8d5aa2e2a50e3 SHA512 2d7d4b36e5c50cb7590e7dec0c271a021f05478cadeced6b5c9e27b76c3c5b59a11318c70b51e10efed6be2681dea7881a2f883f576fa5343c2aecfa18cbee50 WHIRLPOOL e56ed012b6f6f1aa9951f4ba190158c911586e09ec4933c39de2392a8e280090503656891af625dc4b09562eae3b71b84322bc8fe18460496f8fce7c71e4316b
 EBUILD nanomsg-0.8.ebuild 965 SHA256 cf8cbaefbb8680bf6908613f92cc1562d1088427470cf20236db17e545b6086c SHA512 ef10e05e8c4ab7119f7561bc59c61c716bcfc15c2d5e25c2bb005f4347d408e36063873963ec5f4584fa7d248011524d719e4d88ea83b6ab5b0455d817afbeda WHIRLPOOL 76961b8819de116dff9cbede521c232377bcf70c1b4b03036e4ddd4ce60cec351773cca85627c481dffcd60bc4b0a2d77be394a243344506e550f3fffbffdad2
 EBUILD nanomsg-0.9.ebuild 814 SHA256 4dd4017930ef51cb96eecb9f523da8ca76385b6254c33e183f67d738b30ab589 SHA512 71edb0ea498be768e753478986429e67b47c13333444d27bdb7c974970590b6ebf27ed6dcc1172916e7fb97216f181df562d384f15f8e3af717abc1eea2208ae WHIRLPOOL afabc00bfd0ce38748d88083fda7288ac52aa3da3c71b93a5ababa2ac2eea97cd82291c9e33c6b281e64ac62c24e54083b2a80308791b59fe7b62222e8759f57
 EBUILD nanomsg-1.0.0.ebuild 790 SHA256 1203fa290eb7e07704a99232a3f610dba85d6f2a205074223399bf2a2906f257 SHA512 0865e73cb6042f5fc57b2bfe456b9608536bb5869fd63ac5c534ea11c99cfaa854bf1ebc3d0167eacfb4b8b71e24f0cfb7c3546d4c61cc3b90d4629750cf06d6 WHIRLPOOL 0e5904f3699a1f5e63e2a2a41cda37d5eca11551ddae85ef69fa1c472a990544b849c13ab7779ceba74f8190527dda58d2a167bba7f8d103244ffb779310a2d7
+EBUILD nanomsg-1.1.0.ebuild 790 SHA256 1203fa290eb7e07704a99232a3f610dba85d6f2a205074223399bf2a2906f257 SHA512 0865e73cb6042f5fc57b2bfe456b9608536bb5869fd63ac5c534ea11c99cfaa854bf1ebc3d0167eacfb4b8b71e24f0cfb7c3546d4c61cc3b90d4629750cf06d6 WHIRLPOOL 0e5904f3699a1f5e63e2a2a41cda37d5eca11551ddae85ef69fa1c472a990544b849c13ab7779ceba74f8190527dda58d2a167bba7f8d103244ffb779310a2d7
 MISC ChangeLog 3290 SHA256 4c00b87d4b01b9f7c374904ac56cf971be6537d1c3dbe23f8ee0c7ca979cf45a SHA512 9ed656df71e833cdcf4f49d2203e6755edf74977ccdc3c34f5ae7807e8b528dc39362a7a423012843e2fc999203f630c89ed1089b82808f36202233e4c0a6e9e WHIRLPOOL 943524c799b2fa0f7db27bccdd3c01e41bf005dd05b11316472459fd9b917c1de00dc054ee79a9bda4b754bf7f7a6754203dff954b89ef21c47cad891582cc68
 MISC ChangeLog-2015 2189 SHA256 b4772ba5000ab7e3c3a936c8ab39f7e068b74b9ced84d5aa1f555bd17c86db55 SHA512 66f2bed36276fd25cb6846e64a884f3bd96ec6253e60e3a2749f05ba3e4f3e9d3ae47c546e405e288ee22d3faed24a314b71dd29f0e4d6a2312dc8b1f7c486a4 WHIRLPOOL 6cc3f2e670d53dd86df57c33d8cfdcf9e180c27ff392ae4b7e410ce7d994f9eddcac30b81fc4f834a0aad195a32418ec87770ba131f284ae77e7c6a8df6bdc59
 MISC metadata.xml 433 SHA256 699f2e4da7f454f8ba0cd3e296ef58afc2c535cbcc004518c953f0c0b96f4888 SHA512 3fd07647af6e9d7c4b3996674b0376a22ec9727a86b9e1af89a3a9695d547f36a745b9c448aa1cc57c37f094965ca64524f1ba465b6cf1938f731b0d0caa9d6d WHIRLPOOL 01b4d60493bfa6fe489970e2b748fae7e848c88490cab4f801d5b8103c2c4aeb918a36d5cdace3ebb0d13211c3a0e84c73f092a0271f22782494db72c7164221
diff --git a/dev-libs/nanomsg/nanomsg-1.1.0.ebuild b/dev-libs/nanomsg/nanomsg-1.1.0.ebuild
new file mode 100644
index 000000000000..b2e2b2fb1d47
--- /dev/null
+++ b/dev-libs/nanomsg/nanomsg-1.1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-multilib
+
+DESCRIPTION="High-performance messaging interface for distributed applications"
+HOMEPAGE="http://nanomsg.org/"
+SRC_URI="https://github.com/nanomsg/nanomsg/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/5.0.0"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="doc static-libs"
+
+DEPEND="doc? ( dev-ruby/asciidoctor )"
+RDEPEND=""
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DNN_STATIC_LIB=$(usex static-libs ON OFF)
+	)
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DNN_ENABLE_DOC=$(usex doc ON OFF)
+		)
+	else
+		mycmakeargs+=(
+			-DNN_ENABLE_DOC=OFF
+			-DNN_ENABLE_TOOLS=OFF
+			-DNN_ENABLE-NANOCAT=OFF
+		)
+	fi
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/onigmo/Manifest b/dev-libs/onigmo/Manifest
new file mode 100644
index 000000000000..aa0082460dc4
--- /dev/null
+++ b/dev-libs/onigmo/Manifest
@@ -0,0 +1,3 @@
+DIST onigmo-6.1.3.tar.gz 834303 SHA256 3e65b134e415daf71f950b30549cf6bf258425af205c737f64525e3791079495 SHA512 dbae545ca79f8976b5e7f90f08301eb53a2c2f36c1ea62492badfbcfdd61679b68e3197765a2f9753bc033829c15d7fb24db307654b0ddb65774c88d122476fe WHIRLPOOL 1a8775f1b409039f8d6e1c1e520a0a4c2af4f42f60998d91cc704aba9c228181709c2bcedbe3f8e15f0f4fada6fdbf1d6c07026813b6b0e18c4e4e9aa890e004
+EBUILD onigmo-6.1.3.ebuild 875 SHA256 2986f0c6d41662a4baac1d67264c8202fe07ecfb56be9384248dedfd57276dce SHA512 f27cca6aeb43f983898fc66a675c2d417e4a45d3d3ba46444f2ec4f0fc8d239fcf2dd7cda84cc47e0ca66f4bb26126dc3e596e7c0c00f5d11274123edd802e7e WHIRLPOOL 2ff3d6f058c0fed38a995e201327d2d7c65dd31f1bb6a4bce9f69df44b4d999c10bec3e53fd9990609f75c77313fb6cefc9f44f2baf258ba6eab282a299e891d
+MISC metadata.xml 618 SHA256 c1166eefc1cfaf558420983835fe4eafc7a8997808056f7fc94f21a1b8838394 SHA512 02cb2407a4b5583bd40729731a6039ff673e63fd1ee5b97d8b69f307d34f37c2adf47ee178819483f4c13f4cdf93ddaf7d14c7648885205866f8cad979bf8223 WHIRLPOOL 0b6cc0096b48086d42b2a1f404d5585636f5a0c3bd9155a45dca19d14a38c48ec402d78dd5bb74d1ec17331b2eff204543ba666f424585626b1cab29384e3ea1
diff --git a/dev-libs/onigmo/metadata.xml b/dev-libs/onigmo/metadata.xml
new file mode 100644
index 000000000000..13d462e45dc0
--- /dev/null
+++ b/dev-libs/onigmo/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mrueg@gentoo.org</email>
+    <name>Manuel Rüger</name>
+  </maintainer>
+  <slots>
+    <subslots>Reflect ABI of libonigmo.so.</subslots>
+  </slots>
+  <use>
+    <flag name="combination-explosion-check">
+      enable combination explosion check
+    </flag>
+    <flag name="crnl-as-line-terminator">
+      enable CR+NL as line terminator
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="github">k-takata/Onigmo</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-libs/onigmo/onigmo-6.1.3.ebuild b/dev-libs/onigmo/onigmo-6.1.3.ebuild
new file mode 100644
index 000000000000..559e33955305
--- /dev/null
+++ b/dev-libs/onigmo/onigmo-6.1.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Onigmo is a regular expressions library forked from Oniguruma"
+HOMEPAGE="https://github.com/k-takata/onigmo"
+SRC_URI="https://github.com/k-takata/${PN}/archive/Onigmo-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/6"
+KEYWORDS="~amd64"
+IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
+
+S="${WORKDIR}/Onigmo-Onigmo-${PV}"
+
+DOCS=(AUTHORS HISTORY README{,.ja} doc/{API,FAQ,RE}{,.ja} doc/UnicodeProps.txt)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable combination-explosion-check) \
+		$(use_enable crnl-as-line-terminator) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	einstalldocs
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 2dff4c2c3c72..4ced2920bb80 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -14,11 +14,21 @@ AUX openssl-1.0.2i-parallel-build.patch 10065 SHA256 264233dd15fb73ccb8cd8dd2b09
 DIST openssl-0.9.8zh.tar.gz 3818524 SHA256 f1d9f3ed1b85a82ecf80d0e2d389e1fda3fca9a4dba0bf07adbf231e1a5e2fd6 SHA512 b97fa2468211f86c0719c68ad1781eff84f772c479ed5193d6da14bac086b4ca706e7d851209d9df3f0962943b5e5333ab0def00110fb2e517caa73c0c6674c6 WHIRLPOOL 8ed3362e6aed89cd6ae02438bc3fb58ff3a91afb8a2d401d1d66c1ee4fd96f4befb50558131dd03a60fc15b588172fc1ede5d56bb1f68e184453bfe3b34f9abf
 DIST openssl-1.0.2k.tar.gz 5309236 SHA256 6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 SHA512 0d314b42352f4b1df2c40ca1094abc7e9ad684c5c35ea997efdd58204c70f22a1abcb17291820f0fff3769620a4e06906034203d31eb1a4d540df3e0db294016 WHIRLPOOL ffa3d89a078db6829f1fff21779a19c87e059600162e6d7d3114b8440ba5fa7d1a08e04594b6ed8ab47e148782de299d7ec338f2ba2d466bf7737b0749f590cd
 DIST openssl-1.0.2l.tar.gz 5365054 SHA256 ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c SHA512 047d964508ad6025c79caabd8965efd2416dc026a56183d0ef4de7a0a6769ce8e0b4608a3f8393d326f6d03b26a2b067e6e0c750f35b20be190e595e8290c0e3 WHIRLPOOL fa5b303fd7007eb2b7afe0b6a7d90a6676b738bf39addc1005f15a4664e61e72f9465d5020477abcf6b3e420d46a618e44751ad9e21671c70e5dbe8cdc768bfc
+DIST openssl-1.0.2l_ec_curve.c 17254 SHA256 43ad99527a9f494c97c1efd4a87b49508455437da5de1b9ecd89b0d36fb764c8 SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15 WHIRLPOOL 5a43777a2886a2e7bd41eeb3a96c90c62b0eaa771249a50eb5996993f43384dca5f24993ed6a6deede2c4f119f896fb11dbc26b72650c909c856bd8c313501f0
+DIST openssl-1.0.2l_ectest.c 30735 SHA256 14f12b1db5121f3f58466f52ad10555c038c281e90e53c0a2f7940a754bb4d80 SHA512 f2e4d34327b490bc8371f0845c69df3f9fc51ea16f0ea0de0411a0c1fa9d49bb2b6fafc363eb3b3cd919dc7c24e4a0d075c6ff878c01d70dae918f2540874c19 WHIRLPOOL 0d708b382d97e1f20a03e695f0a990fb9fd6cd8ab8ced29e072d52ca3f09f87d18c287d6134fd5ac2243ca541982f4d9eaa2fa8964d62b6b8f1a4b879e8fd997
+DIST openssl-1.0.2l_hobble-openssl 1302 SHA256 7ec32aab6a1db2124de52c3918cc7f7e487972581e30235447eed15d59415384 SHA512 3d757a4708e74a03dd5cb9b8114dfe442ed9520739a6eca693be4c4265771696f1449ea06d1c9bcfc6e94fc9b0dd0c10e153f1c3b0334831c0550b36cd63326e WHIRLPOOL b9630ce76492bff481d0bd48b72449d1e1d4fbb98c2387c4824d84833796adaba716e10976b3130eed9fd9442511a71604d9944600ba6be5253087f865cefe8c
+DIST openssl-1.1.0-build.patch 3028 SHA256 c626ac8b34df5d55a7272a741f87f06dc06cc20ac80085048788a2c76c08c25f SHA512 b19a912900970052f80c67f28975e793ae9e70ebfc62efae0544e09931079e98c4cd29ce1cc8d937ceca97aff9a12fdc1ff9ce6c2b47fea68c79e7065464a0f0 WHIRLPOOL 950febb159139b145eb7de5bda1115465fa8551234182e6d15459ab5519213f515b4c3e3a3136d05c440d3eec04a7247461d36c2d45136a6f1963613d5896b3e
+DIST openssl-1.1.0-ec-curves.patch 2967 SHA256 da60dfa01ed244cd3f77f60cc2ef479a36e64a58fa5e242aa03647c698cc1a42 SHA512 8fb9c6759ae2077ad3697ba77e85ab3970fd8b3f64b21eb260b4f6333b7ebf2f5a53c7eee311229edfbd96a2b904ec5e5e00dfa5b62cf1105fece13069077bd2 WHIRLPOOL e7293ef84f6c36e8e5f5ec8158023fdca484bc9082e73956bd0cc74a17c880350a49799146c855a37f116d743e7c93e54cbe4aa7f70483e235d03687a15a46a5
 DIST openssl-1.1.0f.tar.gz 5278176 SHA256 12f746f3f2493b2f39da7ecf63d7ee19c6ac9ec6a4fcd8c229da8a522cb12765 SHA512 340ab3f38c90dea346e543b58bc0eff0adede15be212ad20b7cf38718a7f94fab51996da414855c180540f7488b8bd31d8b9a0d04bb19159f735c46d8f6df22c WHIRLPOOL bb4ce1d100c5eb567de0139e4a1c0a2bb1cd308bd014704d6bb796d3fcfc16b91fe69839068944831746e0b937a6ccb234b5cea3b4911fab4283500ed380f0b6
+DIST openssl-1.1.0f_ec_curve.c 18393 SHA256 9dd0e1f422116da45eb16936fbbbe4e4e05e7a8fc0f359594af76e935c37716e SHA512 ee3e576825bccdf02cede4205ab92c42ae9dd3a8e75ce58617a3a5980a61d144eb3c5197d9dcd378a5d49bf34c4b2f591aa6a619fee92b7a22825d72681ab879 WHIRLPOOL 6f43f3b8037f5edf323ea865d1150eaa63ee60f60b512b52e37b752b328855e57eae70c812071caba0f91eeeb379c4dd9574806ba50d5bee38ad3b0e3fe03f55
+DIST openssl-1.1.0f_ectest.c 29907 SHA256 37682adb07ba260339fad3fead87b186fc8c26321a0aad45deefed4c25ad87cb SHA512 90cec9d46326cb7216236811c8e963032b6fa7500117cea36f28534eb50a5ab1260c7f9a5c8c490d845236b0769576a8d97bc7471f970e9c5e70cb3408c20dae WHIRLPOOL f39da1830f5a6492add40f460af9d85b2fbfac0d5d8ff4eb4ba3cb16e6ff50a030aee38c518d7a06d1167f59030ded5496000793ad4cf2de7ff36f22eeefe7c7
+DIST openssl-1.1.0f_hobble-openssl 1117 SHA256 ab168bd8bf578f7361524f9a12eecbbaf41fd7e2c852a0158aafd3bce9cac569 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826 WHIRLPOOL 94537166ad8f5cacba2d30d0b6e4676d896cab157be5891fbeecdb2efa10a322d77e2b35a44ff1d474e860dcece63a8688f9df5edf8fe859bf67b410148ea64a
 EBUILD openssl-0.9.8z_p8.ebuild 4997 SHA256 68825bbb48e4862340690badf5f4fdffb671e29030ec2a142c707486fb3dae6d SHA512 15767d6ed531a7b27a37e9276f3ae02b1d3a57103db2bc256dad4ac9af8d1797f078731ac6a7325a36ca7b9cec34840dac2e3723343dca69050a524c300e7059 WHIRLPOOL 39d5304c4bfe18f974c7aba3d6180bfb9cd3a76e1684cd83b36d985d49c81fe80a552ad41244e280b2fceff718c4378fbda9bf59dbf6b40e06378c3f6ccbdc95
 EBUILD openssl-1.0.2k.ebuild 8334 SHA256 81be072ce297e7426353f5fc5e1021b464aab6c08317ab0798b3f2f3511e25b9 SHA512 69041d575f7542984cdbc9ef32aa04af49610e1e5752ce77e2566b63d0c60d0cfde6aab808d9c32390ca986911de3b67de057d09c1e036204bf119136e386efb WHIRLPOOL 8b5445b07d05613e3003348c5518d1fdd5fdce4415739b0cfbd3589f5a2801747dcbd5bad2c034cc28b6f8bb73916aeeec4d3d3c591462d024147f494180f2b5
+EBUILD openssl-1.0.2l-r1.ebuild 9930 SHA256 78d0509140e5187d636f21320a6bf125d4a1a03d797bf545c7741d31d7ea7864 SHA512 86ffa8e9d2ad2e69fdfdf7888cdc3f885ee3b5fb7bae6af3a9dbcf977d4fe00d1f4fce1642b7c1bc5eab0f7d8a3c2247beb2d80a731d0b14e6aa0b545e323c23 WHIRLPOOL 5765b2ac767c04ccfd1ceb7e5998513aab7e18a80e77124eec63f729f054fc479318612a567b6a8141afabc9e4bdc65101b0811bc25f266960580465e0de0513
 EBUILD openssl-1.0.2l.ebuild 8338 SHA256 072d91bb6cdf1e356a450d995e1a43026f6a86800a601b853f17ab7da1f17c44 SHA512 2435e1f4b4b8f766d1ea5ed0a21fece5109559e16c9d4260d2ef052ab82795bb7005d3f2777bed3978f0f4940521eeb5bd10c85ab2e2037ac2d053f501646f3d WHIRLPOOL bfaedc69471ef1ef1496c2f87de036b29496d903967a66f6a13154aca7b4ecb85eb7abd668dd4652bccee7a8bb6a1a0ab9d5492b19db8ed0e9360f7fbf67b775
+EBUILD openssl-1.1.0f-r1.ebuild 8960 SHA256 59b50a19926a7cef6c0d366e40c4e2ee36cf9f8349c3a5be511f974ad1d7036c SHA512 5d7c628faa89d56a58f5d732f30d495743e6cfa94962e036042f396902aeb71d6e997a2ee2db904f7e04e21a6c2d75e879fdb172f74f28d51b0e2569d532d33e WHIRLPOOL ca550601ac03f73ac41e1c10b882b93c3b351a65fddfc6febcee3e5a3a3b545e04cb38bfb3fca8a8b3d32cc36149933772cba764b731141f1a8f4c5a832aa934
 EBUILD openssl-1.1.0f.ebuild 7419 SHA256 553325ec8be13740869ef1416fb62654c7ec6ea1755a55f2eec81db6797d0950 SHA512 30d243d3d3e13571c8b55f9b13abc8b39ad0e719bd482b54d22ee7cb01217e8288cf2594dca1511bd5bd3945acf4e2963a16d3a172c59c11af93008a7a8874b2 WHIRLPOOL 1248a75677f564b74c2f0e575994fe00a8421c12b6a420a5782c3c3646eeb249dc391cc5b3838ee5d5040a9b0d0a4ec281a3af79a1392aefb9455607a21656c5
 MISC ChangeLog 27134 SHA256 73f6780806505aea9831be5f3b6f45b68a0520bff223e7306988b89bdd5b0762 SHA512 4529bfdc72026bdff344610f7e64c56deeb14711f7dc3d522340e37c264498db57c8e0e10615b5437dc80613b54c4f39c5027797e6893f5283c3fb4eae54939c WHIRLPOOL 32420b6acefa4db82b392a0505c032c3ca8adfb0731f3767b9a10ad6bc0288f07d999d832e053d93ed6265ed971143f8f0b995841b0e0b0168defb65cbae68ae
 MISC ChangeLog-2015 105012 SHA256 78da8e54f925dd55fa0e87800ab2e3ad9833cb33f6c334a4364339195d44a8a8 SHA512 fa8deec570b40406f273a5ea929f10113d81d828815c67f225968bbbaa6737f6c4832502a100b06fe6c8cf124529fedaa04cbaf7a70f037680a420ce244be1e5 WHIRLPOOL a2acbfb3283a9521492b4b96d9d2283aefc3445df87e47e584c66f87547cfa954914beaddd040c7097fded7029897f9481cded1d1f2d1ad7fa7b2e5425b285ba
-MISC metadata.xml 1264 SHA256 a592ac3e0dfafaf2cc5feb9d582332caf2fd92c9e48ebe261e7859fe6e377abb SHA512 573f280724e4c5a176d2f624b83b780f936e71cf960cd0cbbad417b6aa2e6c5b1886fb8b732a561f40e2360c4d750d57a281ee1c1bd242dc2d3001a8f229b271 WHIRLPOOL 10cd6b0c28bfa8948c16259ecf8e009c8c227e4762eae8da50aa2b0e6959ca985697be123bc5a1ec42be6691c413a4cef9f55d5aace93fae440eeaa4fd8fe3ee
+MISC metadata.xml 1273 SHA256 646c1ff4166a6b20b195c071538100f7256be005e6dfdf8d49420a0b901e2da3 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7 WHIRLPOOL 2d857186235676ad66a7a29b2db28396e7163bc7cc25ed0507a52d0ea2a108237bd1d16e73acdc19415d08741b22d51402ac8a49f7e515f803806a2331207f36
diff --git a/dev-libs/openssl/metadata.xml b/dev-libs/openssl/metadata.xml
index 0ee764ebd0e5..5ca8d93d2f67 100644
--- a/dev-libs/openssl/metadata.xml
+++ b/dev-libs/openssl/metadata.xml
@@ -7,7 +7,7 @@
 </maintainer>
 <use>
  <flag name="asm">Support assembly hand optimized crypto functions (i.e. faster run time)</flag>
- <flag name="bindist">Disable EC algorithms (as they seem to be patented) -- note: changes the ABI</flag>
+ <flag name="bindist">Disable/Restrict EC algorithms (as they seem to be patented) -- note: changes the ABI</flag>
  <flag name="rfc3779">Enable support for RFC 3779 (X.509 Extensions for IP Addresses and AS Identifiers)</flag>
  <flag name="sslv2">Support for the old/insecure SSLv2 protocol -- note: not required for TLS/https</flag>
  <flag name="sslv3">Support for the old/insecure SSLv3 protocol -- note: not required for TLS/https</flag>
diff --git a/dev-libs/openssl/openssl-1.0.2l-r1.ebuild b/dev-libs/openssl/openssl-1.0.2l-r1.ebuild
new file mode 100644
index 000000000000..4c78a177bf6b
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.0.2l-r1.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
+
+MY_P=${P/_/-}
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="http://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+# This does not copy the entire Fedora patchset, but JUST the parts that
+# are needed to make it safe to use EC with RESTRICT=bindist.
+# See openssl.spec for the matching numbering of SourceNNN, PatchNNN
+SOURCE1=hobble-openssl
+SOURCE12=ec_curve.c
+SOURCE13=ectest.c
+#PATCH1=openssl-1.1.0-build.patch # Fixes EVP testcase for EC
+#PATCH37=openssl-1.1.0-ec-curves.patch
+FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/'
+FEDORA_GIT_BRANCH='f25'
+FEDORA_SRC_URI=()
+FEDORA_SOURCE=( $SOURCE1 $SOURCE12 $SOURCE13 )
+FEDORA_PATCH=( $PATCH1 $PATCH37 )
+for i in "${FEDORA_SOURCE[@]}" ; do
+	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${P}_${i}" )
+done
+for i in "${FEDORA_PATCH[@]}" ; do # Already have a version prefix
+	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${i}" )
+done
+SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+src_prepare() {
+	if use bindist; then
+		# This just removes the prefix, and puts it into WORKDIR like the RPM.
+		for i in "${FEDORA_SOURCE[@]}" ; do
+			cp -f "${DISTDIR}"/"${P}_${i}" "${WORKDIR}"/"${i}" || die
+		done
+		# .spec %prep
+		bash "${WORKDIR}"/"${SOURCE1}" || die
+		cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/crypto/ec/ || die # Moves to test/ in OpenSSL-1.1
+		for i in "${FEDORA_PATCH[@]}" ; do
+			epatch "${DISTDIR}"/"${i}"
+		done
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+		# $(use_ssl !bindist srp) \
+
+	fi
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421
+		epatch "${FILESDIR}"/${PN}-1.0.2i-parallel-build.patch
+		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-obj-headers.patch
+		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-install-dirs.patch
+		epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-symlinking.patch #545028
+		epatch "${FILESDIR}"/${PN}-1.0.2-ipv6.patch
+		epatch "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
+		epatch "${FILESDIR}"/${PN}-1.0.1p-default-source.patch #554338
+
+		epatch_user #332661
+	fi
+
+	# disable fips in the build
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	sed -i \
+		-e '/DIRS/s: fips : :g' \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		Makefile.org \
+		|| die
+	# show the actual commands in the log
+	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
+
+	# since we're forcing $(CC) as makedep anyway, just fix
+	# the conditional as always-on
+	# helps clang (#417795), and versioned gcc (#499818)
+	sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            http://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 http://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 http://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	# https://github.com/openssl/openssl/issues/2286
+	if use ia64 ; then
+		replace-flags -g3 -g2
+		replace-flags -ggdb3 -ggdb2
+	fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m', 'no-srp'
+	echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		$(use_ssl !bindist srp) \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		enable-tlsext \
+		$(use_ssl asm) \
+		$(use_ssl gmp gmp -lgmp) \
+		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl sslv2 ssl2) \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAG=::' \
+		-e 's:-fomit-frame-pointer ::g' \
+		-e 's:-O[0-9] ::g' \
+		-e 's:-march=[-a-z0-9]* ::g' \
+		-e 's:-mcpu=[-a-z0-9]* ::g' \
+		-e 's:-m[a-z0-9]* ::g' \
+	)
+	sed -i \
+		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
+		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+	# rehash is needed to prep the certs/ dir; do this
+	# separately to avoid parallel build issues.
+	emake rehash
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	emake INSTALL_PREFIX="${D}" install
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
+	dohtml -r doc/*
+	use rfc3779 && dodoc engines/ccgost/README.gost
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
+
+	# create the certs directory
+	dodir ${SSL_CNF_DIR}/certs
+	cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
+	rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/openssl/openssl-1.1.0f-r1.ebuild b/dev-libs/openssl/openssl-1.1.0f-r1.ebuild
new file mode 100644
index 000000000000..151632bbbcb2
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.1.0f-r1.ebuild
@@ -0,0 +1,282 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
+
+MY_P=${P/_/-}
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="http://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
+
+LICENSE="openssl"
+SLOT="0/1.1" # .so version of libssl/libcrypto
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="+asm bindist rfc3779 sctp cpu_flags_x86_sse2 static-libs test tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+# This does not copy the entire Fedora patchset, but JUST the parts that
+# are needed to make it safe to use EC with RESTRICT=bindist.
+# See openssl.spec for the matching numbering of SourceNNN, PatchNNN
+SOURCE1=hobble-openssl
+SOURCE12=ec_curve.c
+SOURCE13=ectest.c
+PATCH1=openssl-1.1.0-build.patch # Fixes EVP testcase for EC
+PATCH37=openssl-1.1.0-ec-curves.patch
+FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/'
+FEDORA_GIT_BRANCH='f27'
+FEDORA_SRC_URI=()
+FEDORA_SOURCE=( $SOURCE1 $SOURCE12 $SOURCE13 )
+FEDORA_PATCH=( $PATCH1 $PATCH37 )
+for i in "${FEDORA_SOURCE[@]}" ; do
+	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${P}_${i}" )
+done
+for i in "${FEDORA_PATCH[@]}" ; do # Already have a version prefix
+	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${i}" )
+done
+SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
+)
+
+src_prepare() {
+	if use bindist; then
+		# This just removes the prefix, and puts it into WORKDIR like the RPM.
+		for i in "${FEDORA_SOURCE[@]}" ; do
+			cp -f "${DISTDIR}"/"${P}_${i}" "${WORKDIR}"/"${i}" || die
+		done
+		# .spec %prep
+		bash "${WORKDIR}"/"${SOURCE1}" || die
+		cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/test/ || die
+		for i in "${FEDORA_PATCH[@]}" ; do
+			epatch "${DISTDIR}"/"${i}"
+		done
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+
+	fi
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		epatch "${PATCHES[@]}"
+		epatch_user #332661
+	fi
+
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	# Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PF}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# show the actual commands in the log
+	sed -i '/^SET_X/s@=.*@=set -x@' Makefile.shared
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	# Prefixify Configure shebang (#141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            http://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 http://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 http://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m'
+	# 'srp' was restricted until early 2017 as well.
+	echoit \
+	./${config} \
+		${sslout} \
+		--api=1.0.0 \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		disable-deprecated \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		enable-srp \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		$(use_ssl asm) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	# Fix quoting for sed
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:-fomit-frame-pointer ::g' \
+		-e 's:-O[0-9] ::g' \
+		-e 's:-march=[-a-z0-9]* ::g' \
+		-e 's:-mcpu=[-a-z0-9]* ::g' \
+		-e 's:-m[a-z0-9]* ::g' \
+		-e 's:\\:\\\\:g' \
+	)
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
+	dohtml -r doc/*
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
+
+	# create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/ppl/Manifest b/dev-libs/ppl/Manifest
index 2341a4c68294..e28ecda108cf 100644
--- a/dev-libs/ppl/Manifest
+++ b/dev-libs/ppl/Manifest
@@ -4,7 +4,7 @@ DIST ppl-1.1.tar.xz 14734820 SHA256 c48ccd74664ec2cd3cdb5e37f287974ccb062f0384dc
 DIST ppl-1.2.tar.xz 14136236 SHA256 691f0d5a4fb0e206f4e132fc9132c71d6e33cdda168470d40ac3cf62340e9a60 SHA512 b509ed85fa6aedd40119bd4c980b17f33072c56c2acd923da3445b6bc80d48051cfa4c04cce96f6974711f5279c24b31cb3869f87b2eb6a2a1b30a058c809350 WHIRLPOOL cf2d5895d7d740c650707840caadd45d785411875b1c55db141928a288a1475f50d4f1e6ac829062ab021a920e9581be7822679e9cf2ea11dc64ac70cfa2e5dd
 EBUILD ppl-0.12.1-r1.ebuild 2265 SHA256 78e2f4c484dc27a1e52639c3151788d275c195af41b3a193030f8194521b55b8 SHA512 bf6d21742f2e910424e8dfcefd37c97eed7b1de00b484abb08093c6988578646845cd3357a72adf190700bde0ad39bfcedb16369fe675f12506960c799a79d63 WHIRLPOOL 5b1a2d4a6edfef45ff223e010e3b86e9bbe28c9406fcdf8de0c5b35f08e34c05fe9e49a1b73f5a22ca3f869f21b085e9614dbb3ace13d90ec86c04382896b77c
 EBUILD ppl-1.1.ebuild 1622 SHA256 5663fabe7ec8e81c898dc2239145d0f1fc395aeb53276f15e1ff565e65f3fa98 SHA512 f3f2197f3b3354f04af2a4daaaf05198d6418bd9defb947efa9d789001d5c157007c56ffdf59c484fe4eadccc5d79ddd20046e3d58f24a8a51e26a97d99447b3 WHIRLPOOL 3b4f38af20a9fcaf35354daa96a4d74af4c7eec8cead0e074afd7849dbfee9a91442ebd3e3797516751ea0b9f95883aef6c74cf41bcff32b2234a06e5fe14dc7
-EBUILD ppl-1.2.ebuild 1630 SHA256 f457a907d0827366b190a35d7edfaf9566ca3e657adf2aa16116a9a24e45e8cf SHA512 bb7fbda5fa16090bdffcb8588b6e9079ee460ffdbf17bb0a600e410494b6d8b7118d27348450cf989fe5c75cb22959e291a57de3da91904da9d00dac563c0284 WHIRLPOOL 02b445cc2d4115a0ea79f5e03a2f6c92fb827e14aad361138dc6344a7e7a1f75c6de2e8d9fd56860dda4668c1f2e4cc8a4ccdc4cf63fe02d01e95f7d7257261e
+EBUILD ppl-1.2.ebuild 1627 SHA256 86248174a59e6e9873942649f4a2d3866c8c581936f81c7374c113139ead4288 SHA512 256bd444e49233b42b40c9e72f1df67462a2ceaa809002d3d720979ceb693459ef101ebdd0aa24ce84d06fd9f8990f65f8ba35175ed6b5109e1cb0b3468368f8 WHIRLPOOL a77d68f186cc0fcf78bb3de5f3be5aff9fbc78e1e9e4719d43eb21dfcd976412c5e4d3d0c90bee171a4c11a4b4cadfdd264c722d186b56a4db576d846d4f2964
 MISC ChangeLog 4213 SHA256 ae18f4ef1f00bc3da945361c9255fd3ffb156e71ab34c9d2b9e1c0cf334b68c3 SHA512 5edaae8716aa32d992c72ca74633657885e7ee61dad49b16fffdd756abe76affec1ee89f2c6428b092358df2cd7560e81aa472d2c8c4956c20db31893a6bce0d WHIRLPOOL a54881e6d034be5c86989ac5fb428f2f3587b0c16456d3849787068baa21c117692e08585165c4fd78a68fc1a41e567aef9d82a7b523c8ead0396dc4d1922406
 MISC ChangeLog-2015 9468 SHA256 645b8f75023e5e94f40c4b5d294a3641fa92a1439029329a387fba377ef754a9 SHA512 ef6f76ccd17348adb6a1dac620403ead41363ad2aed66bedff6e86a9c9e35c9f4b9bd93cb9c8ddb6b8cdade93504e6b5bc6fa078fbaf736bd48cfbdfacd0a4d9 WHIRLPOOL 65446623ce60576942784a384bbc025cd58feb1e01ec5542754a1b87e1ae0c5dc00a3e70fdb91eeba1a484ed28d6e8331a77c86f6b2f84c86f01e424fbb2ef70
 MISC metadata.xml 354 SHA256 21ff706759de3e5d34dd99eaad897bd594218106f3e9d5319a29e6a4013a1752 SHA512 5f42b5399f8961160bd6ed9db93c11e2f7c7f1e750c227068fb828ac7519c927b55786d7cf60481d21813d48af51e7cae7e1c8baca12f8fbe6a1f4e701377a50 WHIRLPOOL 8c79521e05e412362ed33fd3e08d84698e925540d8edfd49193aed6d5f55868240455ae281bc814acca2fab473981cc962bc666d69037aa5e9b0e3182cbe1160
diff --git a/dev-libs/ppl/ppl-1.2.ebuild b/dev-libs/ppl/ppl-1.2.ebuild
index c870f44cd234..e8ab746f7223 100644
--- a/dev-libs/ppl/ppl-1.2.ebuild
+++ b/dev-libs/ppl/ppl-1.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0/4.14" # SONAMEs
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris"
 IUSE="+cxx doc lpsol pch static-libs test"
 
 RDEPEND=">=dev-libs/gmp-6[cxx]
diff --git a/dev-libs/protobuf-c/Manifest b/dev-libs/protobuf-c/Manifest
index 82605329518c..fd39670c6f34 100644
--- a/dev-libs/protobuf-c/Manifest
+++ b/dev-libs/protobuf-c/Manifest
@@ -9,7 +9,7 @@ DIST protobuf-c-1.3.0.tar.gz 488443 SHA256 5dc9ad7a9b889cf7c8ff6bf72215f1874a902
 EBUILD protobuf-c-1.0.2-r1.ebuild 590 SHA256 ad78642e709931e6be731df9a63a5a8226bd7bd1b13adafb50a80a83b8321362 SHA512 947afcdeb6d9c563d38cd163c01f0a37ed5a0c10643648732de09717458640bddb024d927fd290bffbb320cf50aba7633e0008decf3959a9ba39e1cbaf819e67 WHIRLPOOL 6e4d1b01e86bccebaf56e6cffeebb6e5fc833d8f48cb2573ff33ab1cd0b7077a4e68fda89203085b0fa732593c6e7003dec88b693f5d28bbfb155c8bf503432e
 EBUILD protobuf-c-1.1.1.ebuild 818 SHA256 9c3e58ce43ecb8ef63e826f08bc812f35ccd7343bb5cd7d8fc9aef40536f51ce SHA512 9d00a07f79210aba5879f9c8691f3398de1062ee403fbd289a5a642994ad1ea60de80f58da3a21437defb6ed4244965c781b07d569ddd018ae45adc5bfe9db6d WHIRLPOOL 01f440a95eb8d3ff7019df93154b158a08837b7ff1da98952125ed1d506f3c2ebae83be062f48b2fff7a360a7d270a8e37d2735e2e3a968fdd3eefafe621dd3c
 EBUILD protobuf-c-1.2.1-r1.ebuild 916 SHA256 aae2c9ebe375b5d5981ff1ea8dd790208622e32bef8f0f231c2d674e9214a8bb SHA512 e81103c60409ee2d448c1c136d8d987948107e23f8e8e568dd882d054f225ed207d815cfe3ccf1befdf8363a010e90520f76b33c5daa9830f8121749acc07620 WHIRLPOOL e149d144b697a55886122724a7f9fe00efef96fe43e0b5cc8537347481bd22d20a8d4fc4d0db0c3a49a6edde2eee7190ebc5a0d5763d323c5f80048c4203e29a
-EBUILD protobuf-c-1.3.0-r1.ebuild 994 SHA256 0b8b98e791ccf22496e28529561e09a876b8384ea9dfedc0b65040e5eb65a10d SHA512 4f967920142737bdc1932ed2fb3f7e20758888d773c9488e9a5ceb98d3a75459927da70a6964737492a0b3a68abe35483bab72edca4079d47f8429a788d66a32 WHIRLPOOL f0e9f89343f5418193c6982834d63eed1dcc0780693e9b66ba063ef59be933abaf5b0fa48cd359af19bd4b0a05b45ca96ee6cdcda5af0dcb14b5e8ffc59b853a
+EBUILD protobuf-c-1.3.0-r1.ebuild 992 SHA256 df00a51fbb1c0e6ef39efbc55fb5074307f0aab07b9b6dc18cd7b1f996f73628 SHA512 9059d7f1d06b0db490ce3afe960af98506ba086ee412b87b0b863db60a47cd0fa6c882d6fe0055c2c1077d7e9759cd1720a8e92ac350092e9ccc492bce16aace WHIRLPOOL 59563d59c7a55ad8a6d411454a9e15e38c56b36269d60e6de68ad03591696f6fc504daee0f2fb41cc6fd2470f19e81fca279420abe074fa309fc03756951ab03
 EBUILD protobuf-c-1.3.0.ebuild 922 SHA256 d8d8525050a92ae1021cdeecc96b158748992f9e0b2e7d26b6d8956002258948 SHA512 ba060b39dbce6fa37ecbc940b5540bdfd81840d4f3c4bca2fd4e5830eb3f912a29bc49dc13e76d46fbe17e05be6543c892b7957d6a7e6c15ae71da84a87d5506 WHIRLPOOL cd72735ce66e505629e6d1acbb7308e0ac0b398dff1acf346d22b5a3a504ebeabfc5ce63c8d87415853c22999f68afe1aea67b4c1b7b2d2570062dd5adaf978e
 MISC ChangeLog 4497 SHA256 ab298f2c999c1f0028644b06dd65aa9225aef6c73c57a0f34e0182cc6916f87e SHA512 8e7eb73794fb593c1d1f8dabcc79918dbe66b5f492b597fc698a342b537f2c0ed100904ed17432e42c553e7d91ce4db53ac0f78fb789fd25dd52f2bf84fdb23f WHIRLPOOL 69d84b141f24bcdf2b6ff1e443709761be2b7dc7eab1191f5691fff157d552daf68de5321af2f45c6a80c2bdabdc3d98e5ba47aa52059c61407a3485d2993aaf
 MISC ChangeLog-2015 3651 SHA256 8b60d31f7f97b271a80ac15bd38386aabf615f08ef089c1b112b595dacb9fcae SHA512 bfc72890482df31bbe9ddd1be5114d8068e95650bec4a054ec9441c952fe86b7727656e770b7520d259f58e0e6cd927ce029c92cd09fb887554dacdc4b5e42aa WHIRLPOOL bbea1a0839ae0fedaec7f1f72b996a85827ecbad4a2710b725d47a827ccac9c56a9202fad463d4a62179799e7778836b06372d6e175d54ae06012958d3ece9e7
diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild
index 9a8adfbe00b3..6a8df5554643 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.
 LICENSE="BSD-2"
 # Subslot == SONAME version
 SLOT="0/1.0.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="static-libs test"
 
 RDEPEND=">=dev-libs/protobuf-2.6.0:0=[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/purpose/Manifest b/dev-libs/purpose/Manifest
index 0e6ce6880846..34731e5c6b00 100644
--- a/dev-libs/purpose/Manifest
+++ b/dev-libs/purpose/Manifest
@@ -1,4 +1,6 @@
 DIST purpose-1.1.tar.xz 84980 SHA256 7a6030212104582ccf19ad2fb765d441fb1eea7ae08368e04ce9603ea6ea1040 SHA512 681a081e8737a610343ce6ebefaf0bb8b148f88eac20f08ec4138d824f525cae9daacdb41dc71a28edabca2245a62fe11501d6ca9d7c7277e9dd132af62cfff9 WHIRLPOOL 3c2b95477b48d8decdce98df69aeaa65023afc6cde64ce5d3c7293ec727a4f4aa93fddc80c388176e0b3067fd7a9a8dbf199d4f684e007c4b1e0cede2bdc6c82
+DIST purpose-1.2.1.tar.xz 114408 SHA256 62c4120074d5663abe133134cd2854b39642846621b69690a2f8390e1a5ca31b SHA512 39747f5043e09f198bbec25d011a45c54cb681fd564ade25016f1b898a3fa4d545f29dc96ca421c266414d375d6b95259f59292255dfb73af777ff62a96ba249 WHIRLPOOL b44748beac8640c1895cd3df0095105ea396ef3e3804c073372dd637acaa12b2dc5109ecdacbecf22fd83290679b74e62c43a425c8e47beac53ff929139ec3f0
 EBUILD purpose-1.1-r1.ebuild 775 SHA256 1424f86fb4bafb949cc23f4d649952cb29a12e00e580de49c0f480e7a401906a SHA512 fb9343b77a9f74872f3ac736df1990849173b2128b2cd1b5919056905d129e65155b9a2f1734c263127bab3bbf5496ac76a0a79df2942ccb8bf5e51e84cfe84f WHIRLPOOL e7b3c8864cbb19cd400b3432837ed90989007f711b7bff424f9257019413f154ccc6705705261883a49fcf03f14bec202a294d0e1c88119f6258d6f7ad236055
+EBUILD purpose-1.2.1.ebuild 1045 SHA256 5a2a5ab23cdced9326c58b68283c4f5e4635d759c01456ddedd119da1c5762f0 SHA512 e5ad063aeb51cd0ff41c937bfb844e77e07ba08db48dc979ab60ffc2cca7a629a0d3ddbc9a7080b927978aadef68cad0d45fb0c7293d8b5700205b17e7260e5b WHIRLPOOL 594fb3d183b6ced4ec00cd71b2acf2faee3a8a3effad809e6fe5f14cf09c7b149f0f187558baa574ec08e2e2ed59a40c4a0d072b4725f18c244316aaedf40549
 MISC ChangeLog 1932 SHA256 afbad7ff65d1d37e9e61a32a3249fdc4c82503cf9f78a56337a4acbd28852d06 SHA512 0a251e5580baf251b085e1427176bf099a83b1c33b3316c12035a20ebfd304812edd0a1e88df185118c22b775229a96b9593f2666abbe853df7fd5ac7f50310c WHIRLPOOL c7da56c63863ed881a6d3605c8432abe4fce7210e08ea0e9e6e9f48c8f8b4eeeb02529a364d13583b44df6a74e63502b34dfc77ea786504375d86cc0b0126652
-MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
+MISC metadata.xml 345 SHA256 9ba44e51afdbf8e5f2f65de3ccd14932d227b59a0b50e8fa5b3e605c2a5d21cb SHA512 cee07f4f8ede80430680300afba2bbbba3f38559fec0b3d0dac805beaadf9605f94d4cc23a0f213bc56f6bd48aa5f4f39f010b87453351211ef1c6d53393f26d WHIRLPOOL 000943a9ee9d1829876bad5578eb72f3e7b9dcde37cae6ac8f33837f2e095743bc1cb3380881461a64dfc9655ea76b6b8f7551536701f4ccc3d7cf51d843f3d6
diff --git a/dev-libs/purpose/metadata.xml b/dev-libs/purpose/metadata.xml
index 2fdbf33d963d..69186b245f38 100644
--- a/dev-libs/purpose/metadata.xml
+++ b/dev-libs/purpose/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="kaccounts">Enable support for system-wide defined KAccounts</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-libs/purpose/purpose-1.2.1.ebuild b/dev-libs/purpose/purpose-1.2.1.ebuild
new file mode 100644
index 000000000000..44752dba3be6
--- /dev/null
+++ b/dev-libs/purpose/purpose-1.2.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
+SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+kaccounts"
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	kaccounts? (
+		$(add_kdeapps_dep kaccounts-integration)
+		net-libs/accounts-qt
+	)
+"
+RDEPEND="${DEPEND}"
+
+# requires running environment
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package kaccounts KAccounts)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst(){
+	kde5_pkg_postinst
+
+	if ! has_version "kde-misc/kdeconnect[app]" ; then
+		elog
+		elog "Optional runtime dependency:"
+		elog "kde-misc/kdeconnect[app] (send through KDE Connect)"
+		elog
+	fi
+}
diff --git a/dev-libs/sway/Manifest b/dev-libs/sway/Manifest
index 6e110fe12ec5..2d3e13149346 100644
--- a/dev-libs/sway/Manifest
+++ b/dev-libs/sway/Manifest
@@ -2,6 +2,6 @@ DIST sway-0.13.0.tar.gz 5355130 SHA256 56a20c9d28d92777bf99381edd09078f72bf39b8a
 DIST sway-0.14.0.tar.gz 5376243 SHA256 e63efee81cd3952ee00c7bd379cf90b065530b03423f593895584aa51e9c7f1b SHA512 2c2e45ddc935504bd240288386662d05f284eb0d540e05b6e56ca577e9b1f2303929b9659eaa3cb99b8cdadb60bd1bfa4104624bf2574e41365e1b3df5361410 WHIRLPOOL d9a5ce41e3063d041cf1f22ebbb48ffc966b34b7d2e23caa77528035176dd9b5d74a8e6cdb238be3191849a349102562becb797835240309b245d554b63753cd
 EBUILD sway-0.13.0.ebuild 1703 SHA256 d5acb682eb6379ce4f35f127de24e7d341c09c006f32ba2d55df77be9d928794 SHA512 5d8ad99a05870f33d5d662fcf8bbfdad900c3f806f2eff2dbebf61910204da06f31b29cfa12d694ff50fbfc8bd52dee66f5c93e1060a64eb7f918796c6edd943 WHIRLPOOL 31432b3d32d8a13e04ea8669c4e9ad11aced244e93396364390d3582976912aa49bb2883461d8244f41958f2cdff3056456e3b4c24e17c834efb8dd33dae6252
 EBUILD sway-0.14.0.ebuild 1904 SHA256 20823a498ab1e3b95cec799ce2aa4ea34d41a7762957031912b3f3a1050068b7 SHA512 5361fccc2b5bf411c899734eeda8895df59eff760459e6133a5af12e2e16f1af70e0bd9af50eb8b1f9775b2d9673bfd14e2f6cdcc2da8e77391dea5d419230c6 WHIRLPOOL 889e07a44a6e1b6bfe71dc671911d3338825374b18ffd48f4a23c8d29387844b2ba9e379e4403acb3358fc238509be5b95b993c87d7c2c80d7c02207dcff0709
-EBUILD sway-9999.ebuild 1852 SHA256 f72a00f3be928953b73260ca5a524c99fd441a347049d18e1b6a7cac1c071e98 SHA512 a9b5a1025b79604e01d7e963a4ca8a6cb83baddd6eac5130ec8728fb368a5a22e9c5d9febeb7ab462904cf0336b2549b604bef9437cd5c3fb26ba69f4c6ec9a9 WHIRLPOOL 436899707620d2e28005f0da5deadea72e31297675b093050626cf39a3c443f676275556fe805cc7598f62e26138f0b5c96286e0990eb4bb23fd182b35ca93ae
+EBUILD sway-9999.ebuild 1867 SHA256 e509919884787474c06503c8aa693edf2ce73962660b9658c05eca45570e2810 SHA512 2458d1782660153ac869133226574276c2f848338f431c2dceac3fd4100327f284d7d1663873547478289849e5911812ceb95eddf9ef3626f8214c90ec52499a WHIRLPOOL ad5e1882da0451afb844b309d52d77b938b87db9adb37738bb35311e41468c79483e215388ee0f9a8fc448422e569ff21fa3c1f618c7718d4fba5cd6a048a72b
 MISC ChangeLog 2577 SHA256 3f9ddde6363f683d67f1146bac3901bc1f44d5ec4088e39f491362249606a65e SHA512 9813bd79d9dbb3d242efda06422132311b9f727c6fb7ce2eec44ab782a8761034ec3a31d79839e097790757eca9ad9ea448018c1d02ad95a46e031f457a6c62b WHIRLPOOL 238d79212a4899d1d9e60d36b7d00267864f48a48d0029a787e1876f174e9f7510fd0ce6e1a4cad8ca7e71b53798ebf531aff3371927863b6a5e585680511dc6
 MISC metadata.xml 1756 SHA256 02fcb175316df7192618463e4ea220e9b8994b666b4964bd5714220a4f158599 SHA512 c66066c76ea1c1cbbdf79664fdd123d22a681e82bfa5c3ffe92ae12fd6fd4adaf51d12767b3ca4e2f88405df59a386e7dfe8f9f5a8fd382918b7566f6461d27a WHIRLPOOL 71dcced2d90adf8323f76aefd714b24af28afd0f5b19e1180bba20e0072c9b8bca09b1ac4158567dd30ccccd516a874a4fb85b97784fdc032a1cc657f9a685b0
diff --git a/dev-libs/sway/sway-9999.ebuild b/dev-libs/sway/sway-9999.ebuild
index c6a223d2e275..8961800a2b13 100644
--- a/dev-libs/sway/sway-9999.ebuild
+++ b/dev-libs/sway/sway-9999.ebuild
@@ -38,7 +38,7 @@ src_prepare() {
 	cmake-utils_src_prepare
 
 	# remove bad CFLAGS that upstream is trying to add
-	sed -i -e '/FLAGS.*-Werror/d' CMakeLists.txt || die
+	sed -i -e '/add_compile_options/s/-Werror//' CMakeLists.txt || die
 }
 
 src_configure() {
diff --git a/dev-lisp/asdf/Manifest b/dev-lisp/asdf/Manifest
index 7bd59e130205..03702721b544 100644
--- a/dev-lisp/asdf/Manifest
+++ b/dev-lisp/asdf/Manifest
@@ -18,7 +18,7 @@ EBUILD asdf-3.2.0-r1.ebuild 1217 SHA256 6a330421ea7a4186943f46a1bdff008dd5ac563a
 EBUILD asdf-3.2.0.ebuild 1180 SHA256 dca374f2f464fb8128062d9a4a7cfd29ca20f805c5a63ba137660db9ee3233e9 SHA512 7b8ba0ddf907f715c34f296f88fe0332cbe69b051304b5a61647411c7c3ca9d0fb8267d18d8301472a4152e10d3e65281cd616f92746dbd888ed379cd0dc1cb8 WHIRLPOOL 2502ab62e7dce45b06f0cc378a464ea1d83b82c68451b940d7e7c4df8e47b53e481f50caafe4dace57784789344b3cf2debc6939299afba3649216f294227dcc
 EBUILD asdf-3.2.1-r1.ebuild 1565 SHA256 6574c1e0c4d265433f4e5ab4252fa5a8f72e61ed57081bbf0818b578a0ffef58 SHA512 3832123b0ae4f5e99aa8603aa3165a61537ebd807ab9755dd7136d1adbe1fe593bfe2988f4e26814171909dd16923b77e1f445a42b5e2739e15cec0869076617 WHIRLPOOL cf1a07dd31d80e4e87d1efa0ff668adf030cfbf52ed8833550e82d2744a336e4547bbc682a742ff94a9a8ebf687a7492c8871c4b6b9b57361d22f1d51c197655
 EBUILD asdf-3.2.1.ebuild 1217 SHA256 6a330421ea7a4186943f46a1bdff008dd5ac563a94f3e038dc8ae2b4bcbba154 SHA512 324b8406d9955edda267ab00f34d6e97fd490d48184d8c8bc925b63f73737d207b85a7b29770eb02388bdb07a9ef8d77fb7633b8cccc48dea43bcf1b4067725b WHIRLPOOL ade6a3f2c7f86f3700f392de58fd46ca9a049185a9d53d0e19cd8ab8f6c37960485ed24c81dab4f1b5bdd995aaf44633cc0354237f7c03eb6e33c79dbfa06cc6
-EBUILD asdf-3.3.0.ebuild 1356 SHA256 f606e58088abdb478bef9ea4dacf7c9fad829eaafe2ef04e4fdd6cf9dd146523 SHA512 00e051520132161f72d3df0ace9d71871416363d81d393c7e78eb6119833a5c84422665fdb0554e336d5b30ee651bdce0d55d1f80b877af567cb992fa3587c89 WHIRLPOOL 1a72e5e8aa3f4aec8c756dae0d02631e5373a0837854b4bd4797b594a5d80eedeb0138ad75e9f8088dc09de3bf57c2abda935526eeb23b886fe6a9b7975af62f
+EBUILD asdf-3.3.0.ebuild 1374 SHA256 359d77737db1908e170c9c6a4e8f25082919904ca2727888f6f92cbdeb82d98f SHA512 e2dd74be50a34642d3cf6199ea6513254e6416c2a8399d13f273632953691728d7cb50c597891a375aef82d04ac2c680a854c816b976d6bba34f66eec49afdf1 WHIRLPOOL d8b5af5249f60205554bb17165241a68a5ff96b5df6f72f03b972037f48f7036074ae111b925ad226bdfcbf3f4d6334913e9b08c751e048265520f8a57545090
 MISC ChangeLog 3794 SHA256 8dd8375a341d0887e5e5f7c698b8f4483fd9da73927cdbb11a3093a04fac167d SHA512 ea5e83f11849e64b1390f0f33dbe9e5a2ee4266aa90cd94a188bb9cf9a4fc9044b483d4c0879e81bcbe2199027ceed46a2522e7b486484143cc9f6c8fe92a38e WHIRLPOOL ba5b6e9222b3b912c5f86c8ebd572fafdcb92ae82125d05d0c1c78c56620d4aab0824161eb4da711a232a71fc93bcdc17e44732d731471b9e090b59003074291
 MISC ChangeLog-2015 7148 SHA256 7e32561a57899ee6e5bb5f43d6db4d9a208a6aaabf018e233edfa8adb009d83e SHA512 0c0d65ecbd4b82f4c82fa52370cb2d6813eda9ef8ed2f9a956340da7e19e947eb181e5ac4297903b2c4fbfea099970a4c2b8a24446ab50b96ca6e0d626afed8d WHIRLPOOL 73084a5ac71679827d448b98497b6c78026aef4056a649724c2c9a08bfb8c1f6b1fe5608644d6bb76927d4c359db5da36c3c17a68c4ce7dcbe5bd2b04a40ef1f
 MISC metadata.xml 261 SHA256 627a8fb846aff40f2f1e29e77040baa5b21fd7663158ab97b84012e0b5e2f742 SHA512 fb754c4ed3579db5dbe303197a05647b7cfab0a3fe47fd2140d5f77641be752d10ccf49a9c267406a0f3ba3dcda8831f778b9596d723f65aff10142bfad60d3d WHIRLPOOL 02fb9a9a64cd705025462ef7601b9b452954c62e41f57422a5a74e6e0c84695aca510635335b0cf35031dfbe75142c0feb06ce1ba4f2794c6230378d772c3ae3
diff --git a/dev-lisp/asdf/asdf-3.3.0.ebuild b/dev-lisp/asdf/asdf-3.3.0.ebuild
index c0f4d13930f9..7e5f5cda6229 100644
--- a/dev-lisp/asdf/asdf-3.3.0.ebuild
+++ b/dev-lisp/asdf/asdf-3.3.0.ebuild
@@ -21,7 +21,7 @@ DEPEND="!dev-lisp/cl-${PN}
 		!dev-lisp/gentoo-init
 		!<dev-lisp/asdf-2.33-r3
 		doc? ( virtual/texi2dvi )"
-RDEPEND=""
+RDEPEND="virtual/commonlisp"
 PDEPEND="~dev-lisp/uiop-${PV}"
 
 install_docs() {
diff --git a/dev-lisp/clisp/Manifest b/dev-lisp/clisp/Manifest
index dcac5fbd8436..9105482ffd69 100644
--- a/dev-lisp/clisp/Manifest
+++ b/dev-lisp/clisp/Manifest
@@ -8,7 +8,9 @@ DIST clisp-2.49.tar.bz2 8091011 SHA256 8132ff353afaa70e6b19367a25ae3d5a43627279c
 EBUILD clisp-2.48-r1.ebuild 4797 SHA256 30900bce239fdbe966353ff355f55404c88daeaf617d2b538c803f3b19e85e1e SHA512 130ffc47b63c934aa8556ea3e5d5eb8a81300d98bbbff503bdb84a1c7ad1dcbf97b092124bd841bd9b2009df5588aa78c2bda7cea34a461526199957cf44862d WHIRLPOOL e45d1a07ec78c5151ea5fe4a173ce63944dc49134a5fe6fdd7084aa2fd5cc1efdaa1d8e093a315bb2714084d7fdfe58215fab8d77a9c3e8ec201b763d42d36f0
 EBUILD clisp-2.48-r2.ebuild 4726 SHA256 9ec46a4abd0bff90d85348f6593d6fe99817215f7246b6c1011d1639cfddf179 SHA512 afce7666a82e947f48e2eeed5ceba5f4cbe981e8f37d6e35beab4dc973a6077b8eecfebb2d1336f2476b6cfc252f5aaef552354d8dfc153920ac2d3291f76de3 WHIRLPOOL 7e3d38247b1c2d7cb18f4eda5f5a853540e03d8f5a04273b63d4fecc5d8089fb67d50c8ca48243f2ddc7e3d0d9edbe31d823bc20588129effd5b842663634aba
 EBUILD clisp-2.49-r100.ebuild 4495 SHA256 34088fb45660f30dccb1960fdfb577566c8970480cb591a37a96c237a2638d5c SHA512 c022a0b1c704d9d252fdbc741ef6fe6a44ae26b1047c7e8d334aeb171f4bfa836b043432294d508725d429a43bfbca3c413be35b6a38fd02ab8be79506c43dd0 WHIRLPOOL 2320eaa519d90878e2eb23f27d9409778cb08bdee5c528fe917a4ac7e51aad1e2e838cf23282091eab3496d5a008586f42aa0bf9305d3c2420d6ff78dacb48c8
+EBUILD clisp-2.49-r101.ebuild 4565 SHA256 44e4eeff3ef084ea40e72265275dbe6feb204e8612fb154e9183575bea1ddefe SHA512 3d8ee8697b8faed8df82f151cc947bc0e3b689e4710f418b9ee31b1803d59928d0ca4a087f48f77240b06c24527a003a9d9141489ff37fcb778f3c024343e480 WHIRLPOOL 5d483e7db20f49628b5d911ab70755b3e5e9eb05913e84bee53e36a16263c0495ab91f6533dfa801519cf857ca8c24df54e1567e85827eec2311c755658b1135
 EBUILD clisp-2.49-r8.ebuild 4394 SHA256 f211b05b2bc503e85fa63f36837b1f377baa44102925ef40b08e9a8372a05b19 SHA512 7548cca817b47bfb9b09812c9564e86f2b5092d1263919d563172555d1371c86bdd0aa7f2f4b3315237a154b911f8c025f62917f434973a608f86728873e97f5 WHIRLPOOL ed75d54fa125ec188a6e7384fd83f70be3e546de62c342609d34e2d37ab0775731c0824ad9bfce0e290c1ec36ef3b7af64dde9dbbdf9ed3722aa87a634af0af5
+EBUILD clisp-2.49-r9.ebuild 4464 SHA256 fc795fcba9c0cf7fb03addb855021d5ca6dee79786e10bf7f4628fb32ce8e51e SHA512 ba4afa4101c4581ae1a866f70d8f3ed903e81f95c03c26b492296dd4cd6b997d04d8f7235c1272dece85f52e2fdda427f2df65eae67cf2c65f9171b1476af0a5 WHIRLPOOL 62bb88da89397ffa52d778618285c7ac39fb114b32f2ef22c33fd611b9cf224fc57c5321ccd6ba5eeae35a7b3a4356d376284a5e389e8357afc58b5d3b0f7fd7
 MISC ChangeLog 3546 SHA256 a4173a4dbce808c75b45c4c8bc5174500f264612abaa2af2bb1f1e511d4b8bf1 SHA512 200c94a4f5849a27b742feb527b1ab36d26d073f657f56d72251b2f554699ce9bca5d700c056a7f1eecfe98cc144fccfda38637f98c8ae07697989e79a64d5d4 WHIRLPOOL e49c5859b17305001fb5be8bfc315130e910dd0b2c654285de708ed2f8def534b29767ad124b96a63d2c94956d527a1be103c87015ede2820c61d5fe760e9689
 MISC ChangeLog-2015 26951 SHA256 9fee24e373f2de40091b6d14d75fb41151f9ccbfb3d30065e65eaa0b865785a0 SHA512 2b915208866c9e4b96c08dfa8aaab597c0fa71f047a6ee211556d457c25c295ae1655e84613ec059d546c3a5d4ef7ac67b29ea9ac9a9bb344ab301630fd52e0e WHIRLPOOL 7ce9f07c527d2f1d2aa8ec029eced4670582d94e76dd451b4d2da9216f3511b3c39f1f90f41d73dfc5601b967bc901038b47f9e71d7b536e1679b53f77fbbd4e
 MISC metadata.xml 1450 SHA256 fb1beffc987511752c3c92551952b01d80bda8c5290046f8f73b55013278b011 SHA512 08cd4868b9d6f2600b13add32c2fffda8d59be7190779ef4d3bfc64ab10f13c2644b925cef0ca8f3aa06cd5c8473ef399dfaa3c3ac2cae88d627a6ad83e54128 WHIRLPOOL 7898b56232188707a5ce46434eb69351022c7175fc9b678cf932d8766dd1b68d3680d07f33baf37d24e8d060f8d28797837ca728dd1998b526a04e787229d5b3
diff --git a/dev-lisp/clisp/clisp-2.49-r101.ebuild b/dev-lisp/clisp/clisp-2.49-r101.ebuild
new file mode 100644
index 000000000000..8948b19aea61
--- /dev/null
+++ b/dev-lisp/clisp/clisp-2.49-r101.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="A portable, bytecode-compiled implementation of Common Lisp"
+HOMEPAGE="http://clisp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/clisp/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2/7"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="hyperspec X berkdb dbus fastcgi gdbm gtk pari +pcre postgres +readline svm -threads +unicode +zlib"
+# "jit" disabled ATM
+
+RDEPEND=">=dev-lisp/asdf-2.33-r3
+		 virtual/libiconv
+		 >=dev-libs/libsigsegv-2.4
+		 >=dev-libs/ffcall-1.10
+		 dbus? ( sys-apps/dbus )
+		 fastcgi? ( dev-libs/fcgi )
+		 gdbm? ( sys-libs/gdbm )
+		 gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6 )
+		 pari? ( <sci-mathematics/pari-2.5.0 )
+		 postgres? ( >=dev-db/postgresql-8.0:* )
+		 readline? ( >=sys-libs/readline-7.0:0= )
+		 pcre? ( dev-libs/libpcre:3 )
+		 svm? ( sci-libs/libsvm )
+		 zlib? ( sys-libs/zlib )
+		 X? ( x11-libs/libXpm )
+		 hyperspec? ( dev-lisp/hyperspec )
+		 berkdb? ( sys-libs/db:4.8 )"
+#		 jit? ( >=dev-libs/lightning-1.2 )
+
+DEPEND="${RDEPEND}
+	X? ( x11-misc/imake x11-proto/xextproto )"
+
+enable_modules() {
+	[[ $# = 0 ]] && die "${FUNCNAME[0]} must receive at least one argument"
+	for m in "$@" ; do
+		einfo "enabling module $m"
+		myconf+=" --with-module=${m}"
+	done
+}
+
+BUILDDIR="builddir"
+
+# modules not enabled:
+#  * berkdb: must figure out a way to make the configure script pick up the
+#            currect version of the library and headers
+#  * dirkey: fails to compile, requiring windows.h, possibly wrong #ifdefs
+#  * matlab, netica: not in portage
+#  * oracle: can't install oracle-instantclient
+
+src_prepare() {
+	# More than -O1 breaks alpha/ia64
+	if use alpha || use ia64; then
+		sed -i -e 's/-O2//g' src/makemake.in || die
+	fi
+	epatch "${FILESDIR}"/${P}-bits_ipctypes_to_sys_ipc.patch
+	epatch "${FILESDIR}"/${P}-get_hostname.patch
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+	# bug #594552
+	epatch "${FILESDIR}"/${P}-readline-7.patch
+}
+
+src_configure() {
+	# Bug 618170. If anyone has a better idea...
+	append-flags -fno-pie
+
+	# We need this to build on alpha/ia64
+	if use alpha || use ia64; then
+		replace-flags -O? -O1
+		append-flags '-D NO_MULTIMAP_SHM -D NO_MULTIMAP_FILE -D NO_SINGLEMAP -D NO_TRIVIALMAP'
+	fi
+
+	if use x86; then
+		append-flags -falign-functions=4
+	fi
+
+	# QA issue with lisp.run
+	append-flags -Wa,--noexecstack
+
+	# built-in features
+	local myconf="--with-ffcall --without-dynamic-modules"
+#    There's a problem with jit_allocai function
+#    if use jit; then
+#        myconf+=" --with-jitc=lightning"
+#    fi
+	if use threads; then
+		myconf+=" --with-threads=POSIX_THREADS"
+	fi
+
+	# default modules
+	enable_modules wildcard rawsock
+	# optional modules
+	use elibc_glibc && enable_modules bindings/glibc
+	use X && enable_modules clx/new-clx
+	if use postgres; then
+		enable_modules postgresql
+		append-cppflags -I$(pg_config --includedir)
+	fi
+	if use berkdb; then
+		enable_modules berkeley-db
+		append-cppflags -I/usr/include/db4.8
+	fi
+	use dbus && enable_modules dbus
+	use fastcgi && enable_modules fastcgi
+	use gdbm && enable_modules gdbm
+	use gtk && enable_modules gtk2
+	use pari && enable_modules pari
+	use pcre && enable_modules pcre
+	use svm && enable_modules libsvm
+	use zlib && enable_modules zlib
+
+	if use hyperspec; then
+		CLHSROOT="file:///usr/share/doc/hyperspec/HyperSpec/"
+	else
+		CLHSROOT="http://www.lispworks.com/reference/HyperSpec/"
+	fi
+
+	# configure chokes on --sysconfdir option
+	local configure="./configure --prefix=/usr --libdir=/usr/$(get_libdir) \
+		$(use_with readline) $(use_with unicode) \
+		${myconf} --hyperspec=${CLHSROOT} ${BUILDDIR}"
+	einfo "${configure}"
+	${configure} || die "./configure failed"
+
+	IMPNOTES="file://${ROOT%/}/usr/share/doc/${PN}-${PVR}/html/impnotes.html"
+	sed -i "s,http://clisp.cons.org/impnotes/,${IMPNOTES},g" \
+		"${BUILDDIR}"/config.lisp || die "Cannot fix link to implementation notes"
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}"/fonts
+	cd "${BUILDDIR}"
+	# parallel build fails
+	emake -j1
+}
+
+src_install() {
+	pushd "${BUILDDIR}"
+	make DESTDIR="${D}" prefix=/usr install-bin || die "Installation failed"
+	doman clisp.1
+	dodoc ../SUMMARY README* ../src/NEWS ../unix/MAGIC.add ../ANNOUNCE
+	# stripping them removes common symbols (defined but uninitialised variables)
+	# which are then needed to build modules...
+	export STRIP_MASK="*/usr/$(get_libdir)/clisp-${PV}/*/*"
+	popd
+	dohtml doc/impnotes.{css,html} doc/regexp.html doc/clisp.png
+	dodoc doc/{CLOS-guide,LISP-tutorial}.txt
+}
diff --git a/dev-lisp/clisp/clisp-2.49-r9.ebuild b/dev-lisp/clisp/clisp-2.49-r9.ebuild
new file mode 100644
index 000000000000..d811dd150264
--- /dev/null
+++ b/dev-lisp/clisp/clisp-2.49-r9.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="A portable, bytecode-compiled implementation of Common Lisp"
+HOMEPAGE="http://clisp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/clisp/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2/${PV}"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE="hyperspec X berkdb dbus fastcgi gdbm gtk pari +pcre postgres +readline svm -threads +unicode +zlib"
+# "jit" disabled ATM
+
+RDEPEND=">=dev-lisp/asdf-2.33-r3
+		 virtual/libiconv
+		 >=dev-libs/libsigsegv-2.4
+		 >=dev-libs/ffcall-1.10
+		 dbus? ( sys-apps/dbus )
+		 fastcgi? ( dev-libs/fcgi )
+		 gdbm? ( sys-libs/gdbm )
+		 gtk? ( >=x11-libs/gtk+-2.10 >=gnome-base/libglade-2.6 )
+		 pari? ( <sci-mathematics/pari-2.5.0 )
+		 postgres? ( >=dev-db/postgresql-8.0 )
+		 readline? ( >=sys-libs/readline-5.0 <sys-libs/readline-7.0 )
+		 pcre? ( dev-libs/libpcre )
+		 svm? ( sci-libs/libsvm )
+		 zlib? ( sys-libs/zlib )
+		 X? ( x11-libs/libXpm )
+		 hyperspec? ( dev-lisp/hyperspec )
+		 berkdb? ( sys-libs/db:4.8 )"
+#		 jit? ( >=dev-libs/lightning-1.2 )
+
+DEPEND="${RDEPEND}
+	X? ( x11-misc/imake x11-proto/xextproto )"
+
+enable_modules() {
+	[[ $# = 0 ]] && die "${FUNCNAME[0]} must receive at least one argument"
+	for m in "$@" ; do
+		einfo "enabling module $m"
+		myconf+=" --with-module=${m}"
+	done
+}
+
+BUILDDIR="builddir"
+
+# modules not enabled:
+#  * berkdb: must figure out a way to make the configure script pick up the
+#            currect version of the library and headers
+#  * dirkey: fails to compile, requiring windows.h, possibly wrong #ifdefs
+#  * matlab, netica: not in portage
+#  * oracle: can't install oracle-instantclient
+
+src_prepare() {
+	# More than -O1 breaks alpha/ia64
+	if use alpha || use ia64; then
+		sed -i -e 's/-O2//g' src/makemake.in || die
+	fi
+	epatch "${FILESDIR}"/${P}-bits_ipctypes_to_sys_ipc.patch
+	epatch "${FILESDIR}"/${P}-get_hostname.patch
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+}
+
+src_configure() {
+	# Bug 618170. If anyone has a better idea...
+	append-flags -fno-pie
+
+	# We need this to build on alpha/ia64
+	if use alpha || use ia64; then
+		replace-flags -O? -O1
+		append-flags '-D NO_MULTIMAP_SHM -D NO_MULTIMAP_FILE -D NO_SINGLEMAP -D NO_TRIVIALMAP'
+	fi
+
+	# QA issue with lisp.run
+	append-flags -Wa,--noexecstack
+
+	# built-in features
+	local myconf="--with-ffcall --without-dynamic-modules"
+#    There's a problem with jit_allocai function
+#    if use jit; then
+#        myconf+=" --with-jitc=lightning"
+#    fi
+	if use threads; then
+		myconf+=" --with-threads=POSIX_THREADS"
+	fi
+
+	# default modules
+	enable_modules wildcard rawsock
+	# optional modules
+	use elibc_glibc && enable_modules bindings/glibc
+	use X && enable_modules clx/new-clx
+	if use postgres; then
+		enable_modules postgresql
+		append-cppflags -I$(pg_config --includedir)
+	fi
+	if use berkdb; then
+		enable_modules berkeley-db
+		append-cppflags -I/usr/include/db4.8
+	fi
+	use dbus && enable_modules dbus
+	use fastcgi && enable_modules fastcgi
+	use gdbm && enable_modules gdbm
+	use gtk && enable_modules gtk2
+	use pari && enable_modules pari
+	use pcre && enable_modules pcre
+	use svm && enable_modules libsvm
+	use zlib && enable_modules zlib
+
+	if use hyperspec; then
+		CLHSROOT="file:///usr/share/doc/hyperspec/HyperSpec/"
+	else
+		CLHSROOT="http://www.lispworks.com/reference/HyperSpec/"
+	fi
+
+	# configure chokes on --sysconfdir option
+	local configure="./configure --prefix=/usr --libdir=/usr/$(get_libdir) \
+		$(use_with readline) $(use_with unicode) \
+		${myconf} --hyperspec=${CLHSROOT} ${BUILDDIR}"
+	einfo "${configure}"
+	${configure} || die "./configure failed"
+
+	IMPNOTES="file://${ROOT%/}/usr/share/doc/${PN}-${PVR}/html/impnotes.html"
+	sed -i "s,http://clisp.cons.org/impnotes/,${IMPNOTES},g" \
+		"${BUILDDIR}"/config.lisp || die "Cannot fix link to implementation notes"
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}"/fonts
+	cd "${BUILDDIR}"
+	# parallel build fails
+	emake -j1
+}
+
+src_install() {
+	pushd "${BUILDDIR}"
+	make DESTDIR="${D}" prefix=/usr install-bin || die "Installation failed"
+	doman clisp.1
+	dodoc ../SUMMARY README* ../src/NEWS ../unix/MAGIC.add ../ANNOUNCE
+	# stripping them removes common symbols (defined but uninitialised variables)
+	# which are then needed to build modules...
+	export STRIP_MASK="*/usr/$(get_libdir)/clisp-${PV}/*/*"
+	popd
+	dohtml doc/impnotes.{css,html} doc/regexp.html doc/clisp.png
+	dodoc doc/{CLOS-guide,LISP-tutorial}.txt
+}
diff --git a/dev-perl/Convert-UUlib/Manifest b/dev-perl/Convert-UUlib/Manifest
index c7abb78f12b1..53f772a25829 100644
--- a/dev-perl/Convert-UUlib/Manifest
+++ b/dev-perl/Convert-UUlib/Manifest
@@ -1,4 +1,3 @@
-AUX Convert-UUlib-1.400.0-unbundle.patch 953 SHA256 5efd65e15121f5e483836c241612fe0ca240fe1dfc066795cba711e918b32783 SHA512 7055c7367ea83d3e69e9236aa11de9fbf7505d68b4741a0167b3166533e1f756764acfddaea4ba05702d66c32dbd838ab8b80757f8e421cefa2a28899fb45c53 WHIRLPOOL 36eac6ff94b8cdcf823a5266920d438817be5a4933c42ed51ae13264fc7b95659b8497a0228a001e726dd6ef10e02390f7d02e7a2fb100c202c222214a0dae55
 AUX Convert-UUlib-1.500.0-unbundle.patch 1013 SHA256 48672bc3a11c1facd0e44f0b29db8996c117c360a3747ee39b448cbfff10792a SHA512 1a16a3e6286bf0632b71e970eec1449bd31001975d4a9cabfe5e026eaf082790898c45c056b5aacc87cd2943f97e6e216d24db107c475a84ad2e75fbde8a1107 WHIRLPOOL 313b080595b876f91669dd99f8e912056aab2530e4448d27801c0b7680c13cd84f991114fd0309a1d898a526330c1621b86e09d953b8cc2a4f8f7b6b5d7332a8
 DIST Convert-UUlib-1.4.tar.gz 232006 SHA256 a85fe375bad0b7b8411719b27ac395ba804356d2fc528e9f127e1018cd95efcf SHA512 97dae96b173cfdaf35126f70a883b3462977c3bfb281334f2e54c66ba518ce936ae3046d911ed0a39974df47d0b46bc286afb01faa0d934895402049b3f79cfd WHIRLPOOL d195a34fc1dec5dfd971d6908afef9f7e68856ca82104dea92514132ff1dbf846e322265a17c531746cf76e8892aa2ea5f8c694d10aa6ed7eec3262a5058489b
 DIST Convert-UUlib-1.5.tar.gz 236213 SHA256 0cd81bc21377fad191f89aa427733efe5b7e75ca1889e9317945ad448c6388ea SHA512 92c8b6f3a72546dca21018ddf2863113904f550e3ed950a1898ed4abfcc48738e9ca374f5adbc3226df2db6beeb0e12879ae52cdd067a030c199766d53603ec1 WHIRLPOOL 59faba3ce22e4e9c7f464f2e1980524cb29cb0cf6b145765f4f2291e545ec74a27955b63375a3b9dad69a085800ed18bcc8f494dcfdbb0bce2b7363e356978ec
diff --git a/dev-perl/Convert-UUlib/files/Convert-UUlib-1.400.0-unbundle.patch b/dev-perl/Convert-UUlib/files/Convert-UUlib-1.400.0-unbundle.patch
deleted file mode 100644
index a7c5cfa81ade..000000000000
--- a/dev-perl/Convert-UUlib/files/Convert-UUlib-1.400.0-unbundle.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ruN Convert-UUlib-1.4.orig/Makefile.PL Convert-UUlib-1.4/Makefile.PL
---- Convert-UUlib-1.4.orig/Makefile.PL	2009-07-10 22:44:52.000000000 +0200
-+++ Convert-UUlib-1.4/Makefile.PL	2014-10-11 19:06:36.816968279 +0200
-@@ -1,22 +1,5 @@
- use ExtUtils::MakeMaker;
- 
--sub MY::postamble {
--    my $postamble =<<'END';
--
--uulib/Makefile:
--	cd uulib && CC="$(CC)" CFLAGS="$(OPTIMIZE) $(CFLAGS) $(CCCDLFLAGS)" ./configure
--
--clean::
--	-cd uulib && make distclean
--
--force:
--
--$(MYEXTLIB): uulib/Makefile uulib/uulib.c force
--	cd uulib && $(MAKE) all
--
--END
--}
--
- WriteMakefile(
-     'dist'	=> {
- 	            PREOP	=> 'pod2text UUlib.pm | tee README >$(DISTVNAME)/README; chmod -R u=rwX,go=rX . ; chmod -R u=rwX,go=rX . ;',
-@@ -25,8 +8,7 @@
- 	           },
-     'NAME'	=> 'Convert::UUlib',
-     'VERSION_FROM' => 'UUlib.pm',
--    'MYEXTLIB'  => 'uulib/libuu$(LIB_EXT)',
--    'LIBS'	=> [''],
-+    'LIBS'	=> ['-luu'],
-     'DEFINE'	=> '',
-     'INC'	=> '',
- );
diff --git a/dev-perl/Data-Float/Data-Float-0.13.0.ebuild b/dev-perl/Data-Float/Data-Float-0.13.0.ebuild
index 14f015f34f82..b40cd0e4015e 100644
--- a/dev-perl/Data-Float/Data-Float-0.13.0.ebuild
+++ b/dev-perl/Data-Float/Data-Float-0.13.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="details of the floating point data type"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 
 RDEPEND="virtual/perl-Carp
diff --git a/dev-perl/Data-Float/Manifest b/dev-perl/Data-Float/Manifest
index 037f0b18d3a2..ae9a54b8074d 100644
--- a/dev-perl/Data-Float/Manifest
+++ b/dev-perl/Data-Float/Manifest
@@ -1,6 +1,6 @@
 DIST Data-Float-0.012.tar.gz 26213 SHA256 698ecb092a3284e260cd3c3208408feb791d7d0f06a02673f9125ab2d51cc2d8 SHA512 2ea314a1ee94189200262dcd15e6786d27bb010b8ca6e56e3214b4c2f80932f92d4227b2209a981fc7d3e7a8927624ced49d703349933d24c0f66b2a48c3d7f4 WHIRLPOOL 3154c87b39e80415b078ae073d2dcf8c10f291e764bf80c21b946fe4b369768f46825125fb52e64eabcfcde5a3f1009d8a11cb4cd84326a72c070d608adaf802
 DIST Data-Float-0.013.tar.gz 25939 SHA256 e2b1523d858930b8bbdbd196f08235f5e678b84919ba87712e26313b9c27518a SHA512 7e3be7843df30e581bd8937fde226ac6f24100206a376e1dbed2d4699c95d3f39a25cd1485f5871c46adba88d2fb1899efcd326f908797cdc985ec713cd9a90f WHIRLPOOL a1462aa498c727a339ca34d7bda5bf90d5bf862b740d4cb3194c7730fc93cf384a64506a21aca6cbd831911f8a1b1bbde36e8519bbb5cb6d873e244b97d19cff
 EBUILD Data-Float-0.12.0.ebuild 509 SHA256 ea59b8fe67ccf006e472cbcd2cb748389943a472f7679a32d03d6aba482e0a76 SHA512 d9fa5faf1dc04e5cbbc6ff0303010f16ea8ce7d2633890187854cd07b183671d323d50b25a8515be67e7c85d39146e9bb253bc84b67b96225fdfb31763b4fe88 WHIRLPOOL ffd067a77fc049aa7d92e3a5517de98288d145bc7830d73e662c6aaad3fc995122cfe329741f8f971dd110977b12e1691e9989c9af773ebfa4a2fd2be0b34f71
-EBUILD Data-Float-0.13.0.ebuild 507 SHA256 6f0788c3262aa50edd5bad2ecd116382efeb7da9ba6eaaae5c5828e6f256fb0a SHA512 42b61d7e991e881e21885befc886b89cd473f7c2629c5823b4a62779675c19d0e1ee2595de98033c7eec21f495632c8ce43ec6beb7a681dd188a7e57f92ca91a WHIRLPOOL 48c0243390e37a3a03e692749666c583ec07a1c20481558a231cda6d2a210fd9c457ab6445156beff4643dd441d8e773dade4a533f4e5aaa0fcb7e031bca51a2
+EBUILD Data-Float-0.13.0.ebuild 506 SHA256 4ce5dbcc5542243cbc0456977c8d5fc3311cef71190b0436cf9fe1b72903962c SHA512 de919ee7dd015f7cb4354ae3ced61f48ad2e59c949fe0b8058c03e9e057c3e624d8ae30afafbaa48bd3c76dbd68e43d465e28df0e43d87d7083ea2f29948c4e0 WHIRLPOOL 26b8ccb396d16bd89ab6adaa4775540e2d359c6eb3751d56d278699f94f89279e3b988336798857d3219799574aa21afa585318474d33175297ded6660a21f2a
 MISC ChangeLog 378 SHA256 b3f81960e4b00645dc1a1bc85f1f805a5ae9fe13b50c68dee2ff52c4f1804c3e SHA512 bba5df12dc811eb6fd29d79e1b47470dc079f7e3c1fe18df6207c995ffe53b199024d823bb2c5f13794e745fd5a98f60f37186a6807fe90e1e3b3056cabdd830 WHIRLPOOL fe7df9ca4184ffd7f87be1319eeadc06a25ecf2a98eddf7c3e14a73340f0f9d68a526bdba345a59a766861ffd2424d6c9f5f947097cb43002b3cc224745e37cf
 MISC metadata.xml 649 SHA256 c1028cc9ef39ca9d5e0bb557fecb562a3ac39218163923353f13f6f2a3987fdf SHA512 b42abd320adfe5182b6f80277572e54b27083a4ef03188b90ad09bf4d20a3ba502fab88316d13bab02729a71f7a7a1fc78785c04cf24d4fefa6552dfd5d75384 WHIRLPOOL 44595b0e7bd83982d95dc2010bf9f593e7e70ea69504cf00387446eb89c23033097a44d1c27afdda1b68f9b42c981f4dcf1b13481beb789a64b2ea34026c27f0
diff --git a/dev-perl/Encode-Locale/Encode-Locale-1.50.0.ebuild b/dev-perl/Encode-Locale/Encode-Locale-1.50.0.ebuild
index 96019caff5e5..092337b799c4 100644
--- a/dev-perl/Encode-Locale/Encode-Locale-1.50.0.ebuild
+++ b/dev-perl/Encode-Locale/Encode-Locale-1.50.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Determine the locale encoding"
 
 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 ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=virtual/perl-Encode-2.0.0"
diff --git a/dev-perl/Encode-Locale/Manifest b/dev-perl/Encode-Locale/Manifest
index 6affcbbbed7d..aec7cadf9fd6 100644
--- a/dev-perl/Encode-Locale/Manifest
+++ b/dev-perl/Encode-Locale/Manifest
@@ -1,7 +1,7 @@
 DIST Encode-Locale-1.03.tar.gz 6846 SHA256 f76337e0933225914111fcc3319ff4db359b1abfd1aa56dff2df5378db0e2d55 SHA512 f236a8d8dbf9c3af8cc382cb963e82bea289aa6ea57d5c36bf71c7cc0ba498ef1237357512418b7859723f865094057a827bd8043ad74b41a96e611a8ffebc0a WHIRLPOOL 159fbd4a3975c73aac1c353b0e3ba275f611e26c5f987df3364c05bfab44fb02b5f88d013d1f6bf449af890c6de483d0ed924a1db6f6f72e6e5e4f25f0a3c63a
 DIST Encode-Locale-1.05.tar.gz 8355 SHA256 176fa02771f542a4efb1dbc2a4c928e8f4391bf4078473bd6040d8f11adb0ec1 SHA512 68ed5732fd3645eca2ea54080067677a48f90fc5a594a1b453a322f3127e67a984d539cb5fd41ac63a03b9dab693c070b65e3c70a2a677dc61b4634f3e212d06 WHIRLPOOL 7cc9e4f5611d352a4e8824dcffd2fcdf328ec9f2b54b63ca9f2fd8b5b8cd2f3824e3e7761f044215716c50cab4b64a7569b2afb0f54462ad5495c33db448ce60
 EBUILD Encode-Locale-1.30.0-r1.ebuild 490 SHA256 8eaa93f8603b3dbf2ae50eea73e4cb5625cdeb8ca9da3037c6db44cba3ee5d67 SHA512 3247a852919d07a98f2aecae72a3dade39c9053087ced50f8ba8aa6016a5703654bb42df661d92be1bd6964106f838ccbd5a87a94c49aeca0ce750404d347cbb WHIRLPOOL 5cb8d9c18670765fed04b996b07a97482e47311906684c3baa3a237cb33001c4e96b2de94eecf8deeece72d18614af21b2c2344992a16151dc2b024eaf167a20
-EBUILD Encode-Locale-1.50.0.ebuild 630 SHA256 4c875156958654a86a4e16dbf7bc38d73f527c54c9c5c731c76f2725121c66b4 SHA512 e71b5acae604bc766e5f09479415dd40af845270360653f2dfbd502c74b93a8fba7c944bbbaefa71612fdb81917be4b1a75ffae739fc567462d6ae8be7878de4 WHIRLPOOL b08fc8e0e9f9d5e21fc461a97ce90c0a7e386741a02d54ddeadac94823349ea538ed1c68fe961054bd1028321f269c98ef9926a8c18f7cb9bce8e79814da2d0a
+EBUILD Encode-Locale-1.50.0.ebuild 629 SHA256 06c8f5bc807a1ea694748edc44a725d9bb5529828ae68fa87c79c1ff098b45f5 SHA512 8908e8d829cabcf22272d2d29772947ba114bcd69317680492cac77ad5749d5eee9593ab5ba629213ecc40952e72b2ba92185d1ba05a320f9339017fe2f89708 WHIRLPOOL 97d6aecf4f436e16825fd1a95151bc4aef565d84468e81bfff9365f9a970c1c22f64f4b9c0ae2d6b7cfcad29c50cb9ea7193c6274613ed71da89d4ce282029c8
 MISC ChangeLog 2673 SHA256 2d48c24d5e45f7183dfcdb617a445f62c140d006e2197f6946ad9173582301d9 SHA512 90134f531e0275d1bd5f274948e60bc9fce613d10cd7371e43da866901a9292ce971645413bcabb5ec9971199aa2adc99cc0d7d0faf753059b664fd6e546a537 WHIRLPOOL a87667a9f1b46388dd91efabe12423c2ec446f2cbd7aadd73d62a6e55cea40ac328a0cc44007cb6ff515cc8c65d549bbcf3f427e92f3bdce14f803fe40e19ae3
 MISC ChangeLog-2015 4445 SHA256 ee4aaef3e3cfec7fabfe87e5ca01dde7e5d0235d59335d19e90554f1b92f0bc8 SHA512 6a41cffaff12b0fe53bd1513f7cd8aa0b4a1de04a81260f47757c2149e18496bc0d275074c72886be6855b5974dd24a609163fbcbf22333962a0c1e284ce4296 WHIRLPOOL ad2ec30ab760b60727a16e5079c4c08cff59c7d51d5c04481070a972789f36654b11509fccc36a4b8085bfc48570be95b40155da411feefcf8ba53c6eea9c825
 MISC metadata.xml 386 SHA256 fc834fba0ad279f4c760cb374c82f6c620fd24ab6796005817c50ad526b15477 SHA512 ed2b99d5da811c6e2d442fd1ee31f7806b0c16eb0172f8fba0af2fc23da22a53393dabb757dd963b6dea4ca2dbdf3be6819c4b2774dc710e723239327c0a156b WHIRLPOOL bc273bfe28c878286254aa8477acd0327891bb55fc2ca23a9581df89df0daf71a7a3bbff250af215b9453ac7df3bcb9c2db55c5f57af21bce678f83d685e5b2b
diff --git a/dev-perl/ExtUtils-CppGuess/ExtUtils-CppGuess-0.110.0.ebuild b/dev-perl/ExtUtils-CppGuess/ExtUtils-CppGuess-0.110.0.ebuild
index 1a45d3e0efba..2b2c4e634210 100644
--- a/dev-perl/ExtUtils-CppGuess/ExtUtils-CppGuess-0.110.0.ebuild
+++ b/dev-perl/ExtUtils-CppGuess/ExtUtils-CppGuess-0.110.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Guess C++ compiler and flags"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/ExtUtils-CppGuess/Manifest b/dev-perl/ExtUtils-CppGuess/Manifest
index 1b9f391adf54..8629e02a558d 100644
--- a/dev-perl/ExtUtils-CppGuess/Manifest
+++ b/dev-perl/ExtUtils-CppGuess/Manifest
@@ -1,5 +1,5 @@
 AUX ExtUtils-CppGuess-0.110.0-no-dot-inc.patch 1311 SHA256 539296a189ad6ddfddb63ecc78c4c7140d29716f935c9809b7a86b17288992de SHA512 b75865b0f95137389d86ac2b277ae843d8f65075784df73a2de4408ccb9614809b9055798a3ead088fcb17884b1306f4238f817f13b012ea7a913a26e6b8e191 WHIRLPOOL 1f4bf7d5942e463a8397286fe4114f0e64b87a319b552b885b834f6552ada3edea5614edf5b3d46659f8d8eec25a9894ec37c98e80b82c21e1351a8cf5886ec9
 DIST ExtUtils-CppGuess-0.11.tar.gz 6794 SHA256 c70ce0d29476d76d9dea310850a270721e312eb79eb9bfd0a842c510b2855273 SHA512 68039779106386efb20cd6e9125d5882e20257f6a1b1f830b32c9f4df70f66a0cf1706f573e4c80159488526656732ede844b37edbf3f1d4a111898eca66fa9e WHIRLPOOL 265e29e8b3a92078e46f64c8f3aea758bcd566d0dc373e1262799ffa24a24755a184add912a64c197424fb645964699cccd200e21f1aea3c3f94cb77ff6ffa46
-EBUILD ExtUtils-CppGuess-0.110.0.ebuild 573 SHA256 18c4fd0767a5b8677d5a5661706ae45fe004cb78f1c7df03ff355deac2ef49d7 SHA512 3ba95be6db58e59ee59421bf7dae9379ec3de567d28d025e68ea9ada996985ac18132cd5a0604073ba6e9586ee563404dfddbf2c75f991bb5dc0d01aaacc34a4 WHIRLPOOL 6b6e3c3c9f897d4c11573486942e0c9d2d574aeb000dfe5511c6b50dabb6a348950f25d820cb79aee34361eb3eb65b4c844aa809e64da19054c1ef79942293d2
+EBUILD ExtUtils-CppGuess-0.110.0.ebuild 572 SHA256 3aafc4020e3dd3bbe91bf0393c62300f697353976c48b53317d5350a1e2ac8a4 SHA512 d92d13f20452f6267f1ba068a4c358f39c27df8aa6fa8bd91b21aebd6749281e1de8dfab9c4f3ce6ab5f5d6f8cd92bc952e1882c9ca466e3d14f9d02b576d1d4 WHIRLPOOL f9e39306ea11d7bb359b1f8f92f1d6ef3162e320133bcd2abe8d7322c2604dc2c9ade7c355f9f9cc07091fa4f169961c1bb675556fa8a1083a005529513bb7f5
 MISC ChangeLog 620 SHA256 8b4b8f9c4d892d72f42ac1832ed6d884c4b47069230aad38d3fd09e3d453c2c6 SHA512 d5d11048c63dc17c8f015016307ab7d5ac0807da172d2c0907c570cac53545783d3364c613ee704469b322683a28570f61ab9079ce030c75443417a45137c2ea WHIRLPOOL 33a42091be4352bd2885fb94cfc33779c22373aad907f8810b1ac3b9704b74eeff64dc52604b7724adeeeb3d57984b0ddabf12741fb975cb26363e4a0b3c5604
 MISC metadata.xml 663 SHA256 e26478be18d565cb31e3851f2d429bfae16520de0e5394d532c2c421326316c7 SHA512 35be16e7b84c4bae39ac4f450b85593e026104e6feebf146d45e94b4583cc7342f0094e89a6ea82a7a06afbb2104fd6d5de99c171dc5a20005c67a30bff43895 WHIRLPOOL a142731ded7a857c2a06ff45b3aa821cb452b436bb820ad50288836a76aeaae93409adedc16b0f59db97a28c7f3e69480ae5424cd66f7337d92cf7d8eb16dc3e
diff --git a/dev-perl/ExtUtils-Typemaps-Default/ExtUtils-Typemaps-Default-1.50.0.ebuild b/dev-perl/ExtUtils-Typemaps-Default/ExtUtils-Typemaps-Default-1.50.0.ebuild
index da97cf1a4098..e717606cfee1 100644
--- a/dev-perl/ExtUtils-Typemaps-Default/ExtUtils-Typemaps-Default-1.50.0.ebuild
+++ b/dev-perl/ExtUtils-Typemaps-Default/ExtUtils-Typemaps-Default-1.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A set of useful typemaps"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 
 RDEPEND=">=virtual/perl-ExtUtils-ParseXS-3.180.300"
diff --git a/dev-perl/ExtUtils-Typemaps-Default/Manifest b/dev-perl/ExtUtils-Typemaps-Default/Manifest
index 85b23f986779..01b3acdbc120 100644
--- a/dev-perl/ExtUtils-Typemaps-Default/Manifest
+++ b/dev-perl/ExtUtils-Typemaps-Default/Manifest
@@ -1,4 +1,4 @@
 DIST ExtUtils-Typemaps-Default-1.05.tar.gz 9327 SHA256 3dfaf5837ebfdc007895bfca84c3c2e76d589a7d336400e8dfb3243d818215de SHA512 91f3f5e3abfe2532a38bfb097d06e5a4145c84729a906af5269353f92b19bfcb86ac5c664067dc3adad405bbc8d0b43071180da4e6575e468b7b946d6c44e949 WHIRLPOOL e33d47c237e1501492e3c25b0e5026a829bc4f1558ecc90289a231ed78c7862f1b4abaf77a3454016c7e86ef54bbc4849b431a82bff32a9bbc9c3c288da7cc1e
-EBUILD ExtUtils-Typemaps-Default-1.50.0.ebuild 402 SHA256 6772b6269123543a34eb852c3897fc17dd7b4b188e8ca6abbec96ba95839900f SHA512 0f5cb1cabd42b65e55c436e48365a2b13805c81bf46fc606ca69014d7fdfc711932cb063f2245c8d85dd6a95eb0321b99433c04faaf1a93eaf5823e955a880bf WHIRLPOOL 88b7089ee0091a608a9f82fdc6a3432bee1a019500d5325157494473af7ae99e5d9dd7e1588a6563b5dc016596b418fc6168ec36fac21273a3484f94aba2c681
+EBUILD ExtUtils-Typemaps-Default-1.50.0.ebuild 401 SHA256 a5399a2cd9131e38275a8ddba533b2bd43d3091777db83f93245afbc888d11f3 SHA512 bafb3e94995b4ad96c1d68de2b1b336073a28609b1d5a5855c83841d900477384972526c1f42cd1edd0467926d25037549acd35280be68b5e34593ed1e99cdde WHIRLPOOL c9cf7d8891244ac5c91cc05dd159268c7e50cafe8ee7d566896d3b27340fc58d70505788187018c325a7f38450fbb1d3fdd7f74bef33cb0c32712a7a81817877
 MISC ChangeLog 423 SHA256 8e2610a015f491cc20924113024361f41c8c621869202811281912203da2cce9 SHA512 a9be0c9c0df5ae6ef5217dca44ed2952f692d6aed164a8017c9f732b0e66ded03f8a041829281eba015c09d7938aac9f679f68b34331576fb9a7602e0eb59e3c WHIRLPOOL 57a22bd432021ba7718c52b50ee3ccab50c2303f49fa59a90ab5e473db9014dae4b257314745427bb3a67106315b9c69ac1cb1702076e10716a760af667d4b06
 MISC metadata.xml 1118 SHA256 9d2fe0ea8d4162f0c151034d0e6398fe42b9556524a0358b47e9f5d7b3e39683 SHA512 d03f68384d959478959b58dce68aeb4dbbacf13ed66ff4149d7340d2c26a815a615d7f59caad08d01ad74a6f20133156683360c80a4770871118515af1b882ff WHIRLPOOL af45a1d30554de88c54fe3327fa3ebb3d75c2f6341c2c98c1ffd8c0cbc29121c3d40507c4f5e49a8c9c014c76a833e48451146393841e8a45219192108ffea4d
diff --git a/dev-perl/GD-Graph3d/GD-Graph3d-0.630.0-r2.ebuild b/dev-perl/GD-Graph3d/GD-Graph3d-0.630.0-r2.ebuild
new file mode 100644
index 000000000000..8902798fd270
--- /dev/null
+++ b/dev-perl/GD-Graph3d/GD-Graph3d-0.630.0-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=WADG
+DIST_VERSION=0.63
+inherit perl-module
+
+DESCRIPTION="Create 3D Graphs with GD and GD::Graph"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-perl/GD-1.18
+	>=dev-perl/GDGraph-1.30
+	dev-perl/GDTextUtil"
+DEPEND="${RDEPEND}"
diff --git a/dev-perl/GD-Graph3d/Manifest b/dev-perl/GD-Graph3d/Manifest
index 8e1b804aa8d3..2cf49f43db14 100644
--- a/dev-perl/GD-Graph3d/Manifest
+++ b/dev-perl/GD-Graph3d/Manifest
@@ -1,5 +1,6 @@
 DIST GD-Graph3d-0.63.tar.gz 97855 SHA256 d1784461b86f00f564d29c4926e409a0a2ed087e6154f7a14341d53c3bb55259 SHA512 4792461322e7f37a671c1ec87bceb4591f69a90d328d816b19b7fc1013c053c1d66de2f94511c010bed0a8cc6363ee46f928c864614703d399231e149012d559 WHIRLPOOL ea951a0e7661126f399bfb8939141c307d7a685ba0a243ed266eb855fc4d9c04a51a3ab318820739479f028546d4ad75153eb2fb785caf579321e62ece97f693
 EBUILD GD-Graph3d-0.630.0-r1.ebuild 419 SHA256 9261d9ac1bb251f408c3149664a04451ffe59d8be72142e6e836af5d364dbf66 SHA512 99018576c2665a3700ffaf7159ed5b37b0e7803e5fa7ca76fe576ce2671ac798e739b63b285be3b0990c63f627580e32225f179f4ddb3a7a5fc86f2cbf924628 WHIRLPOOL 9fe023e0f1643540b16bf9148ec2756af3ff25a95a254e339d4c14256e28e3827efab83d57afa256b5f30ce316919205e72cbb90f4da40b948161bb60604acd7
+EBUILD GD-Graph3d-0.630.0-r2.ebuild 422 SHA256 3de99ea38e8fb794de771600a763e400f202762530dff0e0cb82cfb2f21e6923 SHA512 17b5113c2880d92134edcb840d5c87b143bca035ab52960cc5c9a8b1d3c0d55621896a605fe1b0348d246ee93316ccbf02c01aeaf4f75e7b8ea4b15f16d774e4 WHIRLPOOL 04b72b290fd8ff1e43a1726c6e79e5fb8117add496cac42ce3b0c03e3685bbd7c7fa292ab0b7f3b02caf7e77501f4904ba9386aa8319441283ee11b070cc46a2
 MISC ChangeLog 2446 SHA256 bc70472118ee7f6922728007cc1d1a80dca35a5a37d9a282c80c6d4126b01ac7 SHA512 f82fe9cd1a2634f868c84654e21bf32db671ee4db620ce5ecee984912df0d68795adf5f7d052f72663066037ff3bcb3e4b3af701bab31547db40d6842439ff59 WHIRLPOOL 33ea4d45f48f032421215bca1ab945bc0080271e817984c97b7bd06caa214371ef576cf7ac331dcd776750831a4258664687333a29ef70a380d302393d4b3ae6
 MISC ChangeLog-2015 2945 SHA256 7e29073d26b3b742cacd98354c0b9bb881931fcd7b4a709a13594c71c960e007 SHA512 e742a7a50b638b07453b65c953ec99feabd042c223e9d83272f385b61cac85a311e1f1906972445b75eda234fd2c81d726e911b88486285466884314634ca89b WHIRLPOOL 9f45d89b865ac25820d8fdac5164af1d3cf847b680d8a5ddd965b100376ce56db08cd4cc836c7f111f8435f7130c49ff96ec63e9bf0e5c238d7ad8d12cd24ee3
 MISC metadata.xml 786 SHA256 3afcaf75a1d72fb1a94bac37e9888b17059befb6d7edb1227e009ae7636b72a7 SHA512 cbbea768f087b71d77f412542d2d7eaa85473b83ab39e01d1d21d77fda2efe928052384c88d53fa901b4cb226c0dccb61a26225c32c6879fdf2b4730f3eae6d1 WHIRLPOOL 849e367c8069de9fa72b179cd5232604082bb86bf54cb6be055344a40956c3fa030106980c8169e3421eccd51f4f424d288fdf9bc9e704211c20f385f34f1ada
diff --git a/dev-perl/GDTextUtil/GDTextUtil-0.860.0-r2.ebuild b/dev-perl/GDTextUtil/GDTextUtil-0.860.0-r2.ebuild
new file mode 100644
index 000000000000..84f6fafad6b9
--- /dev/null
+++ b/dev-perl/GDTextUtil/GDTextUtil-0.860.0-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MVERB
+DIST_VERSION=0.86
+DIST_EXAMPLES=( "demo/*" )
+inherit perl-module
+
+DESCRIPTION="Text utilities for use with GD"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
+IUSE=""
+
+RDEPEND="dev-perl/GD"
+DEPEND="${RDEPEND}"
diff --git a/dev-perl/GDTextUtil/Manifest b/dev-perl/GDTextUtil/Manifest
index 8a018bb84112..7b3a55890084 100644
--- a/dev-perl/GDTextUtil/Manifest
+++ b/dev-perl/GDTextUtil/Manifest
@@ -1,5 +1,6 @@
 DIST GDTextUtil-0.86.tar.gz 64698 SHA256 886ecbf85cfe94f4135ee5689c4847a9ae783ecb99e6759e12c734f2dd6116bc SHA512 0c503df81249b0b53a8e87d65f684cf7ff01184ef1fc0166d2f295332d4cb553b6b714f42d6915cd0798f899213cd9cffef12bd30f5fcab0abfa4d0be97c8b18 WHIRLPOOL 7e3c98a2029778a21c5c8a71dc449a2c5db27f96f947fb6598fa814dd0f21cd167e7548e9a98bce68227658150f769158c0a15a87f989d6d443662ab4fb07849
 EBUILD GDTextUtil-0.860.0-r1.ebuild 359 SHA256 120c6b3b0b6283165fa988d30af4ab25a50ba8be35874c753c5cd19d5f26856d SHA512 b338963541fbe18d6c2af0dd54c25e9b1a9f2c78915026e97d1e748092baf2b1ae44d968a8cd5e11ae7e61b3b83b0df5a3cfaf5a22f2c7f27d9b92d6c91432f3 WHIRLPOOL c751e51f7dd7d42af16b1c7e202b1c383180e4253a4747717e69d5432350dda2be668b711d0742f3fa25073755d66b30a8af5435732c8d8e3b11a6d5dd7de32b
+EBUILD GDTextUtil-0.860.0-r2.ebuild 389 SHA256 9ab4b8f80e7f2a848e5822ad442707acfaa0acb8ca3bebf7da53f4ba3abb93e1 SHA512 ddb6c4341ffedc5c5ffefff17122c1383794535c6ef10d2fb13aa594731748b380dc051aac29de4b628a88ee65ed78c7731213d125517d65f3ddeaa55e076485 WHIRLPOOL c8084538c0e7d9d205d475fb15a62990ba5af45050f950bc54ed8702e20a0a0deb31eef20288e2296f2de5c8b226d7af48dc5657da1d9f3249d261d686e4913b
 MISC ChangeLog 2446 SHA256 fd970de2bfdf8aa55a326895d2867955de6afee5ee1edb03aff85665c6b3e7da SHA512 ca9ac13dddeed2cde1256da1f5e544e96bbbee539e25909576877e596fe323fe8e6e37ee93d454dd5208e463f4a2cf303ba4f14e182a174ade79456a04492813 WHIRLPOOL da3e38e011fb69a49fedd5d9a2393550c7845bfb240fefdeae74fff925372422f2e046573fe3fc4131afa2c6f3fc51226f05216fc785e4dbc8810647e8462069
 MISC ChangeLog-2015 2706 SHA256 aa7dbff10a2a31845431ed5bfa1b4aaf8e27da0c38e986e48d68342faca73741 SHA512 1d26fdab03399e69bf9a104a56dfd0cbf550d4fe6875602d73d342f1c253d1a85b66185e736a0327f0514544fa50ef5429356e02a64768c485c2cd4b971ed155 WHIRLPOOL 73ac046aff8833afeb19ac5b571503133dedff4a7dd4c2dbd8c67061135a584829e82e9ceeb17fc1b874863aa2ddb2ddf3a2684e742846fd99eebadd209b199e
 MISC metadata.xml 512 SHA256 9150012b1f1625fa3035aa8c0d844a18bdf9d966d52ffbd75df83e56f0e0b3f2 SHA512 0b5b05138d46b8181598fe3a875ef4d3abe7b1a80203b10952bef84301d0850c79473f6019e7045bc342c78bc99cf1ffd8bea46ecf8dc06720fbb6cdbd75b158 WHIRLPOOL 929b01eed963de6cb5fe02aeff7a233af717d181272f3d32472923cad7462be9a67b514bd1c00896d1363187678df87c75bfa8b936e0c7ee88e8f661961c80a9
diff --git a/dev-perl/Gearman-Client-Async/Gearman-Client-Async-0.940.0-r2.ebuild b/dev-perl/Gearman-Client-Async/Gearman-Client-Async-0.940.0-r2.ebuild
new file mode 100644
index 000000000000..642aa1a6bff7
--- /dev/null
+++ b/dev-perl/Gearman-Client-Async/Gearman-Client-Async-0.940.0-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=BRADFITZ
+DIST_VERSION=0.94
+inherit perl-module
+
+DESCRIPTION="Asynchronous client module for Gearman for Danga::Socket applications"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-perl/Gearman-1.07
+	>=dev-perl/Danga-Socket-1.57"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/Gearman-Server )
+"
+
+DIST_TEST="do"
+src_test() {
+	local BADTESTS=(
+		# blocks forever
+		t/err1.t
+		# https://rt.cpan.org/Public/Bug/Display.html?id=87063
+		t/err3.t
+	)
+	perl_rm_files "${BADTESTS[@]}"
+	perl-module_src_test
+}
diff --git a/dev-perl/Gearman-Client-Async/Manifest b/dev-perl/Gearman-Client-Async/Manifest
index 9721e3039ae9..8e471aa87e0e 100644
--- a/dev-perl/Gearman-Client-Async/Manifest
+++ b/dev-perl/Gearman-Client-Async/Manifest
@@ -1,5 +1,6 @@
 DIST Gearman-Client-Async-0.94.tar.gz 9727 SHA256 8f8fa7722c82a27130224828629b8c680eb99e15e562d17e02d57c3f097826ea SHA512 6f87ced7f39eb1e170e528bca85a26632a12166ce62c80e37e3c735de83d18154eaf30bd39588c79d13df113776d75fd16d18e5ecd0de1f3f54be870774e45a1 WHIRLPOOL 3e4d7497cd7c5de01b63817e79df1ae73410c2b20a16cff6ec47ac6360cdd5752ff537e0222e780db49991b1769aa460829a701590367865f997c4c6a63a3a42
 EBUILD Gearman-Client-Async-0.940.0-r1.ebuild 429 SHA256 746b33c06c4cceb0d8fc7360f647cbfd8a8c29e37c242ae957be91f9aa84ddfe SHA512 a17a8472be6651886ac580af7fae17a38091d95ac88ba5fe6486b721bc2f9945aed744bec082120335d64b17f855f43b7da005224b3b9e30831ec85ab7a04602 WHIRLPOOL ba4a87dd1b1cf8c4e7a27a120d617a570be6311b5277641e4af76fe614a5812eb36f8a969c50c2ff161471c583c0c327e50d3cf7b3ac676de9ca335663b2a7cf
+EBUILD Gearman-Client-Async-0.940.0-r2.ebuild 635 SHA256 ed5cb00c66e0273ef8cdf6e48521d6f21935ce64a5c8994ce6c2426867c913bc SHA512 aeeba3ad9614b973f90dc6373aada910cb790b84079f5113ae13a940ae71ae182396ea1a421ffe047a4c329fd5d12c25ce00a6cbcdc65952de037ba8ac1674b7 WHIRLPOOL 510754f1412d05204cb4f1b217736b4e635e353a9d2ca8763b1c38e5db12efae8abc808dac7bb2ae276c47acd98b466085469c0edb4b687479f177951448588e
 MISC ChangeLog 2476 SHA256 d54c2615ea6fb69450b18fd7008fb9b17d32a2f9c10499606b3ccfce038a8a4a SHA512 d54bd5047bb71f80f687a24ed0a43e41f1ac826996c322d5407c188e02f7f1f95bfa2ca4e32aa52ceed03a5d588809d73601b114f1ad6f6237026500ad9a936c WHIRLPOOL fb000d3e1703e3104b8228bbffae953619a1bee55b9f63c40a4ad41fb6e266914dd587397156250b12843f124e09478e778ce960b5beb7b2c97e52a240a1372b
 MISC ChangeLog-2015 1525 SHA256 fcbf5b1228534b92fa5a12a6e9bb5a73597939b08286a909d6a3eb6eb88af635 SHA512 a8433cdfc35d22024a3258c5e0e323f997016121b8cc95adb9dd8a1bb91679530fd2d99fbae070e13572df100852c6535de42d9b4f8c811fec92bb5868d06fa6 WHIRLPOOL 2e0009ce4f79cdce8e10aa632d46190423072afa63827b3bbe8ee9c463c35b0b4498822ea05ea35e3e9f7bbae9eb324c41afe4bf0daec3805086c4479555273e
 MISC metadata.xml 704 SHA256 b1ee2f74bf25ab4fae104b392d7363758035f2e726409b4ce5d4f5b9a01b4c88 SHA512 c1529854a305d0c80b86ecbc06267d81771031ca837bccccfa461ed11528eb8593eae0c64daad513c7646b3c70bc6956fa4321325c48c58574c17bfe0861302a WHIRLPOOL d000b945198ef7610d512e31b199befb742c86b4094a6d1acc87b23e1819a52fd1bf335747bf47e28c4960c3debb25fbe92d5cf419801c8d4ef9e0c52a496a6d
diff --git a/dev-perl/Gearman-Server/Gearman-Server-1.120.0-r1.ebuild b/dev-perl/Gearman-Server/Gearman-Server-1.120.0-r1.ebuild
new file mode 100644
index 000000000000..9c735ba364d6
--- /dev/null
+++ b/dev-perl/Gearman-Server/Gearman-Server-1.120.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MODULE_AUTHOR=DORMANDO
+MODULE_VERSION=1.12
+inherit perl-module
+
+DESCRIPTION="Gearman distributed job system - worker/client connector"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-perl/Danga-Socket-1.520.0
+	>=dev-perl/Gearman-1.07
+	!!sys-cluster/gearmand
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+
+PATCHES=( "${FILESDIR}/$PN-1.09-Use-saner-name-in-process-listing.patch" )
+
+src_install() {
+	perl-module_src_install
+	newinitd "${FILESDIR}"/gearmand-init.d-1.09 gearmand
+	newconfd "${FILESDIR}"/gearmand-conf.d-1.09 gearmand
+}
diff --git a/dev-perl/Gearman-Server/Gearman-Server-1.120.0.ebuild b/dev-perl/Gearman-Server/Gearman-Server-1.120.0.ebuild
deleted file mode 100644
index 14f424efa246..000000000000
--- a/dev-perl/Gearman-Server/Gearman-Server-1.120.0.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
-
-MODULE_AUTHOR=DORMANDO
-MODULE_VERSION=1.12
-inherit perl-module
-
-DESCRIPTION="Gearman distributed job system - worker/client connector"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-perl/Danga-Socket-1.520.0
-	>=dev-perl/Gearman-1.07
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-
-PATCHES=( "${FILESDIR}/$PN-1.09-Use-saner-name-in-process-listing.patch" )
-
-src_install() {
-	perl-module_src_install
-	newinitd "${FILESDIR}"/gearmand-init.d-1.09 gearmand
-	newconfd "${FILESDIR}"/gearmand-conf.d-1.09 gearmand
-}
diff --git a/dev-perl/Gearman-Server/Gearman-Server-1.130.1-r1.ebuild b/dev-perl/Gearman-Server/Gearman-Server-1.130.1-r1.ebuild
new file mode 100644
index 000000000000..8e86814b9727
--- /dev/null
+++ b/dev-perl/Gearman-Server/Gearman-Server-1.130.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=PALIK
+DIST_VERSION=v1.130.1
+inherit perl-module
+
+DESCRIPTION="Gearman distributed job system - worker/client connector"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/Danga-Socket-1.520.0
+	>=dev-perl/Gearman-1.07
+	!!sys-cluster/gearmand
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/Test-Script
+	)
+"
+
+PATCHES=( "${FILESDIR}/${P}-Use-saner-name-in-process-listing.patch" )
+
+src_install() {
+	perl-module_src_install
+	newinitd "${FILESDIR}"/gearmand-init.d-1.09 gearmand
+	newconfd "${FILESDIR}"/gearmand-conf.d-1.09 gearmand
+}
diff --git a/dev-perl/Gearman-Server/Manifest b/dev-perl/Gearman-Server/Manifest
index 450c8da753e1..3b8dbd89d356 100644
--- a/dev-perl/Gearman-Server/Manifest
+++ b/dev-perl/Gearman-Server/Manifest
@@ -1,8 +1,11 @@
 AUX Gearman-Server-1.09-Use-saner-name-in-process-listing.patch 966 SHA256 9bef8c50c1d3aa4d272c4cfb13c7459bf5712a8f774c0b6963eacebd90daa59c SHA512 84b0dc87510e5d4c21db8bbe95e718fcf33f6fcc87ed828a228c2a6b41144a4177746676a060a7a2c18a9f6307f0d06362d4e14c93134da9fb87f400a60c0298 WHIRLPOOL 3a0bd056b5e67c863176001061dc8a5458922009903c0538926ecc46613e7dfd950c6a95f73d59b8f477524ef65b81c334e6e0c9a97208e53b0c08c8cbf5948a
+AUX Gearman-Server-1.130.1-Use-saner-name-in-process-listing.patch 973 SHA256 d0f46a908e4e7be329e1e2448d561d561ea64f6b698ba9b086993ecd9f8b9fe8 SHA512 fc3a62255c9483ca507e82b185673f90e68ee549d137872cfe5b06ca3d97c3445fbea1c95e02fc3ded3769469becd1b095922580c9c45316cd95a2cbedd909e0 WHIRLPOOL cd04b5477834bd4f6228579cce62b1cbb4d1c40cece6c8b91d8b0d281ee9ad0faa47dc7c1b6e3b7f84bf674f6c9742e6d7f78866ce7b22e31d17d19fa237686d
 AUX gearmand-conf.d-1.09 118 SHA256 1641452a23bb04e638eab4c78aa6c74de237db2d36e9ee20aceba3ee9ac45af8 SHA512 7edfb51212727b933cf5ca46a8ac72db2fe3f49e04bc856a69eeb77874e35b160ba85844b794f944d3b308624d6c51126bbb721a53b64b1d017a57ed43f9423b WHIRLPOOL 4c9f6df81ff1250e0e443931fd07b1d232a668db903e6a7006a4a0ffb1c7ebca3fb5df23c31223225ceda3d5ad8a8948e2d04c2345b20de0d6f21b532225fba1
 AUX gearmand-init.d-1.09 464 SHA256 775ce0f7dd3d569b3c30a4fcb23d558d230f1d60e35297f348a26102aec4cde7 SHA512 336eabd6018459f6dff5d9e9fab0d4122ffde4f8d9f65d60c0eabf4dfd431fb8417fde0be58db900ad25137719dd5766e086e69247b17bc0d55e110cea9ce823 WHIRLPOOL 3df890ef65a302ffd14b09e8c09c418b7d4d97f9642e239c173c52a7abb86811d8e82e60506ecc79bb79bc56ddad97b53168febf224984fcc94649776d72b912
 DIST Gearman-Server-1.12.tar.gz 16399 SHA256 d2270b76d250ce49c25a88fcb696bda4fce4a1025ec34292f40f194ca243ee29 SHA512 4a845db0bd981f20fe59cce26840f235379f33603d9f7e445e678fef97c20943ce237a6a8c5f3c8219a6548e24c6347f9aa1e3bfda9033d0afe8ffdaefe9f826 WHIRLPOOL c1fbfee799efb66f837882d6400e6f8a7d7171a6ef5c027d167e7e34af1686949f9064403f253aef4bfb7b5b9fc9396af7360f4d53f9a1273ed2d715fd562ecf
-EBUILD Gearman-Server-1.120.0.ebuild 650 SHA256 b65799104b96fda8c6cc9dcef7fb8f3632e054902ba6f6a3731e97fce7c4c5b0 SHA512 ac4ec0e926575d49e1d00019d192ecec0376cef4aa972e4cb0d681368a670853ca86bf758c46248846c3f86d7bdc387e6fe61985ed6729125e06972cb66d04f9 WHIRLPOOL 8dc6ef69ab1b417b4c7445c107d7868e6da4ae36f19b1cd444620c031571073e485c00f0441ae37600056df09ed114d2daf707945641b6c64d946dd1004e5f3c
+DIST Gearman-Server-v1.130.1.tar.gz 17585 SHA256 be1b6f5a3eef125a44e5daf2bfdf05d4f1b4161badc7dc82bcc84b8c8231535e SHA512 e8ed734ab7b2afb7e173397f91c58d990bdd223518234ebed77ba46dfd475afdf5aa90f805e26f7642aa7ec1429cf8766145344777e2af8912c2e02add57d033 WHIRLPOOL fae314160459b95674932845b4c582eca14d7fc14ba9d2e525dbd93e19c883161c391cb2c6c3b9c62a494a60e1bc7d3d842c6df9ef5d7f535f0c2474d6a26050
+EBUILD Gearman-Server-1.120.0-r1.ebuild 674 SHA256 0f054197c797180c29fdfcf3b97014ab110fe10e9643cc89c4069c279a515893 SHA512 f65884e8094844dc1564965e42e48c61866cfd5b6f607175489305e40e745a3d3f419d2bf2b8baa2098f293f1d7bcea6df98921df641889502c29c572688b7a4 WHIRLPOOL 45c5a8a0ca74bf18a870c46f874e030f292a964429518795e94f771cb50c795b20f37f9dc8a5f5c4f1f2c8916862b826d612d2b92b2132819de436a078b09405
+EBUILD Gearman-Server-1.130.1-r1.ebuild 706 SHA256 5397b1b8a66ebfdf46651dadfde072c6f5b21ec72db0da1f3894bd4b58e4d9ae SHA512 76a6781aa2b136a42b2a0d1347b9b5b3427230d6944a61f4c2ce790a7601a0f9bd94f7a103237daa506fe9714c51c8d19ede21d3c0b48b8061cf915731919d01 WHIRLPOOL fd2fd8d158e5e1817edf8c9452f794dd9ea6ffeeca38545ff26d256121a86511a696df4aeef63f2db05aeb19003fb5620348b8f3460754046436b725328d66d7
 MISC ChangeLog 2940 SHA256 6c07c4775eeff1ca56dbb1edabf0a89d166a5dcacb443414ef63ab59810e0fd4 SHA512 1ae7731ec27f854a4e570d27ff9552bf2a7db9020b6659ff2ae437f997d844205da137192b5d04f08bcbecc1b7d0835482010d192497d7fa329a6f1451880bc9 WHIRLPOOL 7abbdee11a2cd14def0e4d4ce5fcac5ed437a0e3c4b5bb2bf8216e9ae66e1ca55322f49c37eec0655751702e1cfe40dcdc63a8a9a34113a46e76fad7c2fbff1e
 MISC ChangeLog-2015 2294 SHA256 b91abdc8622b5bbc7cd079b33845f11665f7d3764711ee78fa1bdd409e885179 SHA512 a2386c8a7c1b3af523f5ab658c0d301a83b0bf408248e1cdc13cfb46f14d3f075830bd08006af4122a2307bc440ed010f4e4cf9735b39a0ef74ca57b1922596a WHIRLPOOL 69fd8c116aeab82a66d3208f0908762a1fb901b06363d34e6fa0b7c09030532e45575e03c43a2f6e1023ddd32002e9dcd827cf96aff2cc371ac2bc4ebedfe90e
 MISC metadata.xml 742 SHA256 5fd7cde6d7d7232e1fee4efc8e0fccffa1d723536a0ae806d23a4c9215ed4cd5 SHA512 2a195708b7bd56bd4ce12c5a17bec5794047bacdfe762819af0b33c72b3cb4faef6b7e420e69b4935b81cde63d9144275e92745feab9de7da1a24926858ea11b WHIRLPOOL 019da7eecd4b8cf63feda0781773367fb1adb3ea2c8f3faf156ab18f7d8a111f0721a7ea1e7ebca881af3b63d99fc4c5f401fc99ae8b82a9a28fccb0c47817a6
diff --git a/dev-perl/Gearman-Server/files/Gearman-Server-1.130.1-Use-saner-name-in-process-listing.patch b/dev-perl/Gearman-Server/files/Gearman-Server-1.130.1-Use-saner-name-in-process-listing.patch
new file mode 100644
index 000000000000..c46ac0ecef59
--- /dev/null
+++ b/dev-perl/Gearman-Server/files/Gearman-Server-1.130.1-Use-saner-name-in-process-listing.patch
@@ -0,0 +1,33 @@
+From acd6722c16e17ddbdf6c73c99c693b7674f0fea7 Mon Sep 17 00:00:00 2001
+From: "Robin H. Johnson" <robbat2@gentoo.org>
+Date: Sat, 12 May 2007 22:16:37 -0700
+Subject: Use saner name in process listing.
+
+Normally the binary will turn up in the process list as:
+/usr/bin/perl $SCRIPTNAME
+
+By adding a single line, we can make it be simply '$SCRIPTNAME'.
+This makes writing init.d scripts signficently easier.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+---
+ bin/gearmand | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/bin/gearmand b/bin/gearmand
+index 6046a99..68d1bcf 100755
+--- a/bin/gearmand
++++ b/bin/gearmand
+@@ -130,6 +130,9 @@ my ($daemonize, $nokeepalive, $notify_pid, $opt_pidfile, $accept, $wakeup,
+     $wakeup_delay, $conf_host,);
+ my $conf_port = 4730;
+ 
++# Rename binary in process list to make init scripts saner
++$0 = $_ = $0;
++
+ Getopt::Long::GetOptions(
+     'd|daemonize'    => \$daemonize,
+     'p|port=i'       => \$conf_port,
+-- 
+2.14.2
+
diff --git a/dev-perl/Gearman/Gearman-2.4.9.ebuild b/dev-perl/Gearman/Gearman-2.4.9.ebuild
new file mode 100644
index 000000000000..b118d714ddbb
--- /dev/null
+++ b/dev-perl/Gearman/Gearman-2.4.9.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=PALIK
+DIST_VERSION=2.004.009
+inherit perl-module
+
+DESCRIPTION="Gearman distributed job system, client and worker libraries"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-IO
+	virtual/perl-IO-Socket-IP
+	dev-perl/IO-Socket-SSL
+	dev-perl/List-MoreUtils
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Socket
+	virtual/perl-Storable
+	dev-perl/String-CRC32
+	virtual/perl-Time-HiRes
+	>=virtual/perl-version-0.770.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/File-Which
+		virtual/perl-Perl-OSType
+		>=dev-perl/Proc-Guard-0.70.0
+		dev-perl/Test-Exception
+		virtual/perl-Test-Simple
+		>=dev-perl/Test-TCP-2.170.0
+		dev-perl/Test-Timer
+	)
+"
+
+mydoc="CHANGES HACKING TODO"
diff --git a/dev-perl/Gearman/Manifest b/dev-perl/Gearman/Manifest
index 7d88ff415590..2807d217ac81 100644
--- a/dev-perl/Gearman/Manifest
+++ b/dev-perl/Gearman/Manifest
@@ -3,11 +3,13 @@ DIST Gearman-2.004.002.tar.gz 46165 SHA256 b520d3aefc989164e8e023b978abb926207a7
 DIST Gearman-2.004.003.tar.gz 46222 SHA256 34441d73e26556065362ba02ba9921b001cca603762b7d846fcd29ae169f2d2e SHA512 6860e1795f795ab5d08098ba6b9fa96ef5ce1893041971e29757ce6d0a27e385cab5e9ea670ae6522a092a414bd108894c4f0e91f885b66341ade37c22be24a9 WHIRLPOOL e99e866eca2830c169485912f2f02bc952c1c450de077d7f26a588615d3bd2096a07fad48f356cb26ef83dc2a3eb5f2ac437fb58e27c0c2982a1e27a7c0db2e2
 DIST Gearman-2.004.006.tar.gz 46875 SHA256 caff2baaaa53b21520c4960b502533519d067167f8249f4f004695e7fa794990 SHA512 e2d4f1c70eeea985d7b437bfd01f7b560b576f61e6f82638cb7c93c8a0f45819ba6477d0fb4edd4f12f19d1667896b4165195c72531bf3856368aac174cb66c4 WHIRLPOOL a94ae2fcf5ba7bd8135f15987d9d541024d9c3716ca1b70b5a16ae2d74cc598eb17ad74d2f1e6f0f462004884ec6405deabd0396a15b7cd0c214687e9d3926bf
 DIST Gearman-2.004.007.tar.gz 46892 SHA256 b8284531a40d660901d44fa9b6f670ff738ef4d766ea6e12c3a963eab153f34d SHA512 fcfdaa9b0c7a8699639833d1d9d424a6b8784aed8c37930f8d329dae5e2ae9b5ddd1f33c7f1fa379132300fc99dcb1b2df2af56d2110fecf64a84115b3dda5bc WHIRLPOOL e5b68e3e3a9f7ee357349b02ac47feb5763bfa6851280e9c5d29c44197ad207bdedb633316138872ce98dc1597ccdded901060fd470e82fe7242d070ff825f75
+DIST Gearman-2.004.009.tar.gz 47063 SHA256 6990f04b520227d32262a786604ff44da7d3b316e5ef4c5bad78a42b8f8ca048 SHA512 4c0ad8dfa8af1200f29b61954efba03fa0d629a40bfea379025b5f01b2f8305394a516680fa7564d68c0231359ed5866daff9278b4350fbdc1a0b20bdb34eeed WHIRLPOOL b5eb08aa99b096659ec8d02d65570f91b792a7155ddcf05434c57bb37c4bee7f2a382f48e8d0de8354c10557cb9d32f25c7a52e3581cb79c8abc9c652fadabc4
 EBUILD Gearman-2.3.2.ebuild 892 SHA256 5b30059b5e87ff49893405e21a09841abfe1791359f8f8857071de7c37b2bd96 SHA512 bf6ef8535c3a0e714f62cc5efdc3647c3b0d721ba62da48c02e9fc8e704a11e1d869918d4cfb26c733a95cc78e0fc20953e86f8061110d4164c4f222968b30e0 WHIRLPOOL f483c6846f986385edc360d52ac54353a9028be1c9fc3b8c653cce65ff94090b4eabff3def5d1029196cf9d724a9edffd153bf46f2b5b4fa598b68104b5a0831
 EBUILD Gearman-2.4.2.ebuild 892 SHA256 54e72d3415e457a175ee24b22dee3969fe0e74cc9f7fce66853dd2312f7f170a SHA512 f0c5193f9a83189dfa15d80b00f248d1193df80fe6a4cf05205d032dad3789a7d42608366e8910a3aed1fba5785148e36ba95760abac1c221bd19da7aebf54b3 WHIRLPOOL a73e06a250b8fab284b8d8dcfb3eb25209be5085c726f2d1a5b0fd7fd16733825d3b2d1e52737f06fdeb4d305013e1b18b0ed5f05e139627a9c1d7aab444a4f7
 EBUILD Gearman-2.4.3.ebuild 892 SHA256 698630e7134113e6fbafb0746b6af97a0fd4c5fdc06eec6450daf1bfb84be252 SHA512 2aa43f8d70bb778ae5a1189526b73aa9729ac3c64f21df1f447713a6aad71bc98725b184f0c0dc060af175ae1a6f443a2733a13919c19ecf7ad98c86cef16477 WHIRLPOOL 775ae63bf84f3d9bf9078ea3fd14d2e04fc39981ab6076ce80ea47373a4a381366064889ec16d9e61235f3e47a55141183754409dd9252c7ec5d7bc5a73ff2ca
 EBUILD Gearman-2.4.6.ebuild 892 SHA256 6cd7eaa90c2119514b5d873bbdacca00efcfa1a981ef1dc2fe9ff723e269315b SHA512 3725568d7b49ef7505b1ccb4d659b182c6f779bfd035e6e204cfd8edbe6255644abde1619ceae8cd7270881ace8f8ea20dd56e086ec790f34c7a045fce0dab85 WHIRLPOOL 68552426527a9437f8eeff2a41b0b7e4a7fa8672460c182fd6addd52718414d39a7ae45db2a653574b9020993e3d4c3ed4e020659e5cea0c852e06f8b2c37c36
 EBUILD Gearman-2.4.7.ebuild 892 SHA256 c851b93fac629f20a4933423b426275d1dd5f6e4533ed5d604f2a1c8a519fab9 SHA512 c2e74ae882934b11bb43d59af7476ba730cf7b1e1d6845eab0482a130eacd5b3b183b3d926bab93fb9696d24b48e030f661008a8058c4ad0380613cdc6e085e3 WHIRLPOOL 598d9e4ed91918b0fda58925fd4df4e680fd5fc8bb0b0ec89f96e61fd6ce4bdea2f5efcbe755c67ed360be486e6ccdf676738c8817b658114f1c7606326739c6
+EBUILD Gearman-2.4.9.ebuild 864 SHA256 13f44f31156ea99983c62cdb999ffb36390eb9402d26f7a6c263e9cc3c2e4cfd SHA512 93c9cf019e4e23a82ffbbe962680b617bd4cb02a8616685ceba63d2468c56c4a325f8cfc506b2dff6d3afd75770c7bda2974bf136fd0988f5963454f7526f578 WHIRLPOOL 1517c724b0b41bf40ab900b6e58b51443e48c3e798686a39b0e9b48b2792e413e42433e07a43f7ce65c10dc4bd1e2ac896883769a6c7b128c319a22c366922f0
 MISC ChangeLog 3185 SHA256 b1465905271e4197945a07e889cf674cc1a07b8828231dbcccc3f31db65f319c SHA512 8738e0d201f8f0f43de3a042199f501b7e8116fd0a48631bd809dc7dafc069df7148d3c5f2c11eb68c19ea3080f4bd6a59ce7b0899718fa9a0ce5c8d391e7e14 WHIRLPOOL 3d36b35b8b6eb9edab8a0419b21775f6ec85b10fc2af30e0efe383133f6916c04f26d298388021591e7955289ee5f7e60c86d4f2232790c487604fef41e9cb0f
 MISC ChangeLog-2015 1900 SHA256 25a61f9e93f4ae3a60e5486b6e10d30df215937d8d9fc7a152cad200e9a16957 SHA512 1a2105b7ca22ddd38a09024a66b424b44d981c81e8d3c25111677888e0f386c85b58be144fb94b4d783c3183a41976bbf51f63c1910710c7788266cc676d89aa WHIRLPOOL 8f7f4f7cfbfd21022cf024524179be0f0b565200717ec3233ff9b79acfcf84288e460d1c9fd0dd66d53ecc6084b47cb3468703af7d4ab367a1eea8a9e181df21
 MISC metadata.xml 1107 SHA256 f14ea36b4b462b933ffb7ad5431cbe6216718dcd72fa8c6f95b0ffb5f0da37d4 SHA512 14a5ef5d6aea894adb5d590cb2b4769f126cc750a52da648ded1be124865e23b3ca8d183f8432f83beb562a9bf93d204309cd9807609622307e6f88457549094 WHIRLPOOL 0866e0d7b60983f6997be76a33cb5b4e2fb2cb9148a8c6707948eda1f6c28bf03d91e39e6f236117d23085c2faed27df0f03b6b8f948963a4d0581ecc9f8e53c
diff --git a/dev-perl/Getopt-GUI-Long/Getopt-GUI-Long-0.930.0-r1.ebuild b/dev-perl/Getopt-GUI-Long/Getopt-GUI-Long-0.930.0-r1.ebuild
index 297985ddd81e..08d9b39ab9ac 100644
--- a/dev-perl/Getopt-GUI-Long/Getopt-GUI-Long-0.930.0-r1.ebuild
+++ b/dev-perl/Getopt-GUI-Long/Getopt-GUI-Long-0.930.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Auto-GUI extending Getopt::Long"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="virtual/perl-File-Temp
diff --git a/dev-perl/Getopt-GUI-Long/Getopt-GUI-Long-0.930.0-r2.ebuild b/dev-perl/Getopt-GUI-Long/Getopt-GUI-Long-0.930.0-r2.ebuild
new file mode 100644
index 000000000000..1a39061a421e
--- /dev/null
+++ b/dev-perl/Getopt-GUI-Long/Getopt-GUI-Long-0.930.0-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=HARDAKER
+DIST_VERSION=0.93
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Auto-GUI extending Getopt::Long"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="virtual/perl-File-Temp
+	virtual/perl-Getopt-Long"
+
+src_test() {
+	local MODULES=(
+		"Getopt::GUI::Long ${DIST_VERSION}"
+	)
+	local failed=()
+	for dep in "${MODULES[@]}"; do
+		ebegin "Compile testing ${dep}"
+			perl -Mblib="${S}" -M"${dep} ()" -e1
+		eend $? || failed+=( "$dep" )
+	done
+	if [[ ${failed[@]} ]]; then
+		echo
+		eerror "One or more modules failed compile:";
+		for dep in "${failed[@]}"; do
+			eerror "  ${dep}"
+		done
+		die "Failing due to module compilation errors";
+	fi
+	perl-module_src_test
+}
diff --git a/dev-perl/Getopt-GUI-Long/Manifest b/dev-perl/Getopt-GUI-Long/Manifest
index 758e153e87e4..208a595e4236 100644
--- a/dev-perl/Getopt-GUI-Long/Manifest
+++ b/dev-perl/Getopt-GUI-Long/Manifest
@@ -1,5 +1,6 @@
 DIST Getopt-GUI-Long-0.93.tar.gz 14086 SHA256 a7268e49773a2c367ec9a0d268b15a57073c4b98f7d7a1be93400d663de35044 SHA512 ae0880eb339ce607abe2ca16ccc5176c844531ef6dd0b09afe91f2e3501c73f4383e8f90136e46748b6c93fdd65b7c4936addf496261a2a25c0011cc555961f5 WHIRLPOOL 25e50a67e07a383a1ecf5ef1f4e741c6601ea9d6ce69095fa5db4f0ae0f36cae196c6400fc2acf0c0d04357fdbcd8e41847586fc5f1788a164f7025fb0bb5890
-EBUILD Getopt-GUI-Long-0.930.0-r1.ebuild 329 SHA256 e2f5f62d61c4729bb2ffb4b86ce98a7a6028c844b1eb30ff24f6fa8107b86a53 SHA512 0ad2d9de3faf204f025b36764beadb03a2be644d6246607a676f158d28c453fed78329af0d97b8a4b616368c0ee6aef2db8177232c5b279ae83fb368cfd3f514 WHIRLPOOL e5b158ff89da797d304f5b7f46a9e4c706602c71d672dd832fa9a759f25e12c09d52195648fee902ff9342dd50b5004adc2809a49bbb2b50f6125f9fa4f86f09
+EBUILD Getopt-GUI-Long-0.930.0-r1.ebuild 334 SHA256 739b26dd3728ad86c364ac5fa367faff631587f10515487461a280a55482c7c5 SHA512 348068fa1b2519aaf3b24d18eeb70025c9f151527ac6785637256efa82319d867b0a5fc27590920f1be48b89b421707ecda990c647d7c5c94e1c6d10f316f542 WHIRLPOOL cd9b1e0729944fcaa2069c56a334056a77e682281f02376bd9c774fa7eb0e3c038d8c6305bc1ffbbf619373b618e2e740c3d7023f3bc5acf82b973fe307f4c4a
+EBUILD Getopt-GUI-Long-0.930.0-r2.ebuild 812 SHA256 1b335cdfd2ddbe90ee42f13ec81893ea17a46efcac14450b9e86670347ff95d4 SHA512 9f91ed55937f78d4c9abfec0c561fb2395016d94ac1602d24c77e31cb502409ef511de74be7fb232b18a71c95b18de9916e87575cc7eec330a499015dfb1118a WHIRLPOOL b194cc36d64beb457a4541ad5bc33338fb0ddead214a3183983d505c0e31713113fbd98df0ead4810292076855e26fdc07a85aec6a4c1031ddb9ce319d58fc45
 MISC ChangeLog 2461 SHA256 dcd20789fe986b5a71b5962d5295c1af3e49097d843ccd5857815af073ede282 SHA512 2ec65d3fc9ff386f2594cc585a45b6516bd103379f4b423bf128b8ac450f3974c04042dca53fcfd9d0fa10a3dee25b4b29ac0368a127042a45b46e7d9d29dc6a WHIRLPOOL a46ab0526830b91ec325e056544e0a295fafa3e919d993fd059329f69e8909eefc6d81a058b0969ccd84b49eb6f34bce2d6874dab53ca9d6b53ff33ab304cfe8
 MISC ChangeLog-2015 1169 SHA256 b8be58ddb08dd32b3e8d66197850174d6c38838f5da1deb15629ccd7b16c6c76 SHA512 b47cb07e8e99ebf65b215a93d8135cd6522c61082aa27636ea44d202156d06e58964602a2e99551911d085557dd03be7901e0503cb27f1376a5df26585ec99ed WHIRLPOOL a86b74dfa96bc1b72c84a71771dfbe1481b27562e08b7457ecd23eafabf5cc369cb87e604f17384804fd8049cf7ee98a67c88e175e2f850ce1fee488f11b9f9e
 MISC metadata.xml 483 SHA256 3f93b7db7c76bfdceb59b065c27723a20de305bda5705941dbcf2bf4f78a5a85 SHA512 c3445d5e9eb0ea0898b2c92206433b260da535b33055bd36e1d7e4635b80baca8b34488d18d7801174ce22fb314584401a710f05e30f53672ca249cf2acecb10 WHIRLPOOL cb738ec19380b33b9885769b9181159824a8b3a97cd65bb82be7ce81699b72501b64100d6dd59e291ecf41c4b7ad31c7aef2c88fff0e667286f23ddc5212277c
diff --git a/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.100.0.ebuild b/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.100.0.ebuild
new file mode 100644
index 000000000000..6f0d25ae0151
--- /dev/null
+++ b/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.100.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=0.100
+inherit perl-module
+
+DESCRIPTION="Getopt::Long with usage text"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~ppc-aix ~ppc-macos ~x86-solaris"
+IUSE="test minimal"
+
+CONFLICTS="!<dev-perl/MooseX-Getopt-0.660.0"
+# File::Basename -> perl
+# List::Util, Scalar::Util -> perl-Scalar-List-Utils
+# Sub::Exporter::Util -> Sub-Exporter
+RDEPEND="${CONFLICTS}
+	virtual/perl-Carp
+	>=virtual/perl-Getopt-Long-2.330.0
+	>=dev-perl/Params-Validate-0.970.0
+	virtual/perl-Scalar-List-Utils
+	>=dev-perl/Sub-Exporter-0.972.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		!minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 )
+		>=dev-perl/CPAN-Meta-Check-0.11.0
+		virtual/perl-File-Spec
+		dev-perl/Test-Fatal
+		>=virtual/perl-Test-Simple-0.960.0
+		>=dev-perl/Test-Warnings-0.5.0
+	)
+"
diff --git a/dev-perl/Getopt-Long-Descriptive/Manifest b/dev-perl/Getopt-Long-Descriptive/Manifest
index 19a62a70a2b8..2e8d8a8050e7 100644
--- a/dev-perl/Getopt-Long-Descriptive/Manifest
+++ b/dev-perl/Getopt-Long-Descriptive/Manifest
@@ -1,5 +1,7 @@
 DIST Getopt-Long-Descriptive-0.097.tar.gz 26399 SHA256 a6e484962727ae2d882d5d35c5bedd48bc13730a7e4c739a7daa74f525422883 SHA512 9b1a11bce5a64b0dbae93d410593c6411790db8eac1169eb1703fdd4b0bffc0cb0ce12fd02c3de0b4fea98151bcc98af55cf46d84d658c8292291bf3baf5d28d WHIRLPOOL 19c2185574a3cadc8d1ca01ca4ab7c9dbb5c7938573a471f464fa5f937379248fc0ff3da71ef23b0a14fc67409e3268858b4e5ea65e71798b042802ef6e81854
 DIST Getopt-Long-Descriptive-0.099.tar.gz 29651 SHA256 fc4d1ed0bf12abc3d01ba38b0376c1b0fe6c6e59152b61b5f500a1e3f7c8c5e9 SHA512 3b6fdf06eab25f53c5624e42a8024d059d1ee1c33361184a1d45fc5f0f9b521ad0749916ca7ec7d9561bc2c297adba520ff1fd5efa6706ca480697fad71290da WHIRLPOOL 938e7585b014fd08b88e492b1168aaef4810f7e1906bf0a2825c47048e0f92237ed6bd55bd4f0deb2244b0b3f25c8495add77a3a33a6c43503087beab3a902cb
+DIST Getopt-Long-Descriptive-0.100.tar.gz 31366 SHA256 1451e79310d1630de37690e3aba5c38ea5f01a486c5a43f0cd95bef2a02dffb6 SHA512 0efd6f707487b9b44d5c3b5c9e46c3718546e44bf1b66c198be6ebfc922e7bdb23a9c57c5a9c0985dc3769617141696750e1bd982457247b679e3bdb5f9f16c7 WHIRLPOOL 48f3518025cb538cec37b4a88f5618b4ad8335261a479294d684aca2f781c3f5f5f92258993e978e6852c84d60964ee92494973acb0f8b725ecbd51775190653
+EBUILD Getopt-Long-Descriptive-0.100.0.ebuild 924 SHA256 ba3db5184f0c779f94238f9b410e8fdb733452140870f9b946a5de8da72c0617 SHA512 83a66ac5f284e236b3bcd99c2812cce32af96e555ba580c1c379cb099dfe4892cc3fccf68150a998d6a8b18aec27ae5da5ad8c8129b845973ee4143dad5db046 WHIRLPOOL 8bb55ba78732489d7098e9d511b9d08f619a53f6cf787ba1b2c342286f00e06a41fa92b5b40f55a4805acbf1ab41982078a8e28b274581667714c37c9d4e72ae
 EBUILD Getopt-Long-Descriptive-0.97.0.ebuild 496 SHA256 de9b48f73e7e47431c5fae6dbf4cf24e30488555f2e6d686a4f05d7cedd00e48 SHA512 9979eb9461a10fb72668276126db56bd5cb3daabe766b7cc6cade4cf532a180425bd95c6b0e1fa4019ee1670c052b3e5e1803fc6764aeb479915b44d9ce4d0a1 WHIRLPOOL 8066d944dec0f5a9e44112b0f50ea63bc881f7f88f500bc36414901029f94a66de807f3e593b7213c97f4d20e6054f0f72cb998de3de80d97762f58e8d4b2cf0
 EBUILD Getopt-Long-Descriptive-0.99.0.ebuild 831 SHA256 e734d1c7d31fbe6072afa3a0c0651e4e8b38be0d42b6ec9f619b2622e9ff6ed4 SHA512 121c9f03e4f8da125c3f42b3b01320c6ac4a3ed108ccda8dd674051977130b6263a05a78d87990287f4a71d7f77e613fab8f2513cece285eeff40ee6916f4e7c WHIRLPOOL 8907408c5c87484afb6f75636a31de2c06313f2a1eba08fc6864982f9e5371c57fae9ba5dd99341f3d9791706e97df165f7bf64417baeebf61a1fb9b78e3b5fe
 MISC ChangeLog 3889 SHA256 51f759f7f34bd1cb0471adb1888e592641a110178a5c31664d91486ede68661c SHA512 8ece061d4b49c4a834e8fff58e66fe0f079ab8b951eb0beaee6bef273412c212462e5e5ce8efebac8c402e2c0e034b87b1659c00ff538956ee0c2c8bc1ad198f WHIRLPOOL 2838a61e90b68f8a69ec2829049da185a3c817e8ff911cc3756974468b50e4a391ee9dd9b979413b8b6915dde06770a78fc06c9b9863dbeb9b8380db200738a5
diff --git a/dev-perl/Getopt-Tabular/Getopt-Tabular-0.300.0-r1.ebuild b/dev-perl/Getopt-Tabular/Getopt-Tabular-0.300.0-r1.ebuild
new file mode 100644
index 000000000000..4d4d8421af98
--- /dev/null
+++ b/dev-perl/Getopt-Tabular/Getopt-Tabular-0.300.0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=GWARD
+DIST_VERSION="0.3"
+DIST_EXAMPLES=("demo")
+inherit perl-module
+
+DESCRIPTION="Table-driven argument parsing with help text"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
diff --git a/dev-perl/Getopt-Tabular/Manifest b/dev-perl/Getopt-Tabular/Manifest
index 062a9ee8f54e..a0d46f98e195 100644
--- a/dev-perl/Getopt-Tabular/Manifest
+++ b/dev-perl/Getopt-Tabular/Manifest
@@ -1,5 +1,6 @@
 DIST Getopt-Tabular-0.3.tar.gz 26453 SHA256 9bdf067633b5913127820f4e8035edc53d08372faace56ba6bfa00c968a25377 SHA512 a289d4861538ae542f7549364573cadd740538f73862d89dd49eaf6bed6f787ba2848246add171aed6aef4d7d36411d00bef70b76885aa948ce0e7fc8801652b WHIRLPOOL 5dea58a3e29cd92b8c5a14020692589bfabce16fdb94b8dbaf392db3ee6dce536115fd2ed8f92e024c62c3d4bc5cc072bbbc34f3764f374ab0500154b1116ae1
 EBUILD Getopt-Tabular-0.3.ebuild 332 SHA256 bb99e7976dbab0a3e77302b829f33d07b5cb2e4be9df933a59216fcf605f7208 SHA512 a3fe0b740ef7f38c829196e065adec5b51087c6a0f393c1b02d8ea02dc8650c90e1fa9ceafc2d43e1405970a824933bb2c54d725dc100c0901b51f821b83c19d WHIRLPOOL bc6eb2bcdf5eafdd61df720311a7259baa02a263ccf50c5f1bd47100ee40de2e64dff3f1cd173827d1fe17102b6f507abed8faaf6dfc95d5b432d6de5688ba31
+EBUILD Getopt-Tabular-0.300.0-r1.ebuild 302 SHA256 411a837481ca99c36fda78b173780f6e29b8e0ba5462ad73d1a332a886a520c6 SHA512 099775178246bbf3bb30142ee6c6b5b845819d0066e257d4daed50712965992176379644b66ac53fad08e1dec944c4ea8f124c5a52536b1ff6b575d1072111b0 WHIRLPOOL b510e118f8f9b049c6ae7797f2c21bce8a660df55ef92d7ddae6bc48af774cf25654f84dcf36a7b80af67190324ecf10f3e1495df0e33521081baeb10a1622db
 MISC ChangeLog 2444 SHA256 20ebe845b01df9839795022ab0571bf393dccbf293bed1f2d9224e16a963a9a2 SHA512 bba68002ebf233a28230f4b8b5d3650c21ad9386220bd6d9610dc87de3a39921fba682d1933f08e62b0731c33c495d5518079a07123c975b6155ba1b565e8163 WHIRLPOOL 8d55074c9b04da49ae88b610aaea37cc87b7a44a87f8d92a0292c1703db3b420fc7422fdea1256b509f2f47c3e77d551c8afa670c6c15f1967e792acebc62d2e
 MISC ChangeLog-2015 574 SHA256 79e45a788b82b9522fedf5152a7432e5970f61f02b17d10105b06043850baf6e SHA512 8e2539fa83142b017e9ed256f8f104277882058848055fcf5e68b0b39e471875c87224f01a24d19d0c68bd57ccf427ffa5853d918e60d57bb80b8da51a25a798 WHIRLPOOL 99e0898a5c979f99d25bf03e668f65d369cc6d3d2a6575984384e5b3ca4bd4f0023e72edd7fe34d496ac043e4e04961f638a7a4829bd07009040ee3999ff642f
 MISC metadata.xml 400 SHA256 d811cfb59ca79c143d031580cd8b2397e0122c5bb0f3440a0194ae01f2c9393c SHA512 a0e84eaaa15702cddabf9e9449c1239f16001723277358d78a86167befac4b820169c5bab58e0c4d8969ad708835b355e06b9394339488af8e0ce08931093501 WHIRLPOOL 112da240d284e1445cd51509f6c49eb9a6039143c84de6684dfa8f5f2e1607ad3d0c31c3dba429f61fb9a4b00e6abb8f09db137ac35c1da419752f2e966e95fe
diff --git a/dev-perl/Git-Wrapper/Manifest b/dev-perl/Git-Wrapper/Manifest
index 359767072b0e..2e08ddc0d985 100644
--- a/dev-perl/Git-Wrapper/Manifest
+++ b/dev-perl/Git-Wrapper/Manifest
@@ -1,3 +1,3 @@
 DIST Git-Wrapper-0.047.tar.gz 30416 SHA256 6f16a48fd1d9ad62c9375dca552b60f7cba855764a0b7667d27a973ee5bb1630 SHA512 9a2c9bf30a9b803170adfeae9bbe41e1b0fc9e67fe477d4fdf1d20a57917c69c1c6be2a90fbc382f85cf83a209b39a9a3431276b33a6e7655b8cd240d1a68e78 WHIRLPOOL 8e72ce2876faf15cf3ce3234264dce75fa2e73b4dc1cb5fca75ad5a60eca3206af9e689153f68bb0b0eaaeeadef603b41fc8cc20e84ad76c43ffe110c423ddf0
 EBUILD Git-Wrapper-0.47.0-r1.ebuild 909 SHA256 c025e83b851f16a4c1b752ddeb240285daea76deada8253f6158f299283c67b5 SHA512 a6a7ce27e3114912da0e20c2cb3141c86760162842a6618ee24b670ed948fe70edee2d94bd6e4c1d6389eb39a98f7e31ba9c67674a03e51a9f4ceb8a46ea78d7 WHIRLPOOL c6de734a89f1d693a6671d43255d56173298477ab3e5b5df61a0c520c28c82f3fa7911929f10edabe28a97dfa227c5c59d8db4a784a8cb42b45ce3b95d9037c3
-MISC metadata.xml 257 SHA256 4d43e70b770d0898a99af64a8454a6116e4a86500c23290655c8371265010427 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e WHIRLPOOL 87039765046556cdc2f7d76ce4192945117bfd5bb684220ea8fb72be310673a5b729ea428666ff1ceb1e6c21fb585a3a7dd72bd94dab89cf076a895e6a7677f0
+MISC metadata.xml 746 SHA256 7e0981da9ddbb74fbf1558dcb456591853ab903d6176cfdbf5472565fadce929 SHA512 e6bf1104078cada85479ce7570723e369f5f049d1c10c16745453d579c99270d69fb6634e5f88af4c138968641e94da3f554833fa985ba60d5dbda49749a9f74 WHIRLPOOL b14020f906289354b7a75f93d0f0ae14f24f500c18ba0af7894c0c3d6bb65410d3121372d1d382671e990c406e56a8bde9485cc7a01e439adb151629747350a2
diff --git a/dev-perl/Git-Wrapper/metadata.xml b/dev-perl/Git-Wrapper/metadata.xml
index 2b9a936fc0a1..71079026df95 100644
--- a/dev-perl/Git-Wrapper/metadata.xml
+++ b/dev-perl/Git-Wrapper/metadata.xml
@@ -5,4 +5,13 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="cpan">Git-Wrapper</remote-id>
+    <remote-id type="cpan-module">Git::Wrapper</remote-id>
+    <remote-id type="cpan-module">Git::Wrapper::Exception</remote-id>
+    <remote-id type="cpan-module">Git::Wrapper::File::RawModification</remote-id>
+    <remote-id type="cpan-module">Git::Wrapper::Log</remote-id>
+    <remote-id type="cpan-module">Git::Wrapper::Status</remote-id>
+    <remote-id type="cpan-module">Git::Wrapper::Statuses</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/GnuPG-Interface/GnuPG-Interface-0.520.0-r3.ebuild b/dev-perl/GnuPG-Interface/GnuPG-Interface-0.520.0-r3.ebuild
new file mode 100644
index 000000000000..113f6288c3f8
--- /dev/null
+++ b/dev-perl/GnuPG-Interface/GnuPG-Interface-0.520.0-r3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=ALEXMV
+DIST_VERSION=0.52
+inherit perl-module
+
+DESCRIPTION="Perl module interface to interacting with GnuPG"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=app-crypt/gnupg-1.2.1-r1
+	virtual/perl-autodie
+	>=virtual/perl-Math-BigInt-1.780.0
+	>=dev-perl/Moo-0.91.11
+	>=dev-perl/MooX-HandlesVia-0.1.4
+	>=dev-perl/MooX-late-0.14.0
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.360.0
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}"-0001-fix-spelling-error-settting-should-be-setting.patch
+	"${FILESDIR}/${P}"-0002-Generalize-the-test-suite.patch
+	"${FILESDIR}/${P}"-0003-subkey-validity-of-an-key-when-we-have-established-n.patch
+	"${FILESDIR}/${P}"-0004-ensure-that-test-covers-all-signatures.patch
+	"${FILESDIR}/${P}"-0005-add-gpg_is_modern-to-test-suite.patch
+	"${FILESDIR}/${P}"-0006-Modern-GnuPG-2.1-reports-more-detail-about-secret-ke.patch
+	"${FILESDIR}/${P}"-0007-test-suite-match-plaintext-output-across-versions-of.patch
+	"${FILESDIR}/${P}"-0008-fix-test_default_key_passphrase-when-passphrase-come.patch
+	"${FILESDIR}/${P}"-0009-clean-up-trailing-whitespace.patch
+	"${FILESDIR}/${P}"-0010-fix-capitalization-of-GnuPG.patch
+	"${FILESDIR}/${P}"-0011-ommand_args-should-be-command_args.patch
+	"${FILESDIR}/${P}"-0012-use-fingerprints-as-inputs-during-tests-to-demonstra.patch
+	"${FILESDIR}/${P}"-0013-move-key-files-to-generic-names.patch
+	"${FILESDIR}/${P}"-0014-fix-spelling-s-convience-convenience.patch
+	"${FILESDIR}/${P}"-0015-added-new-secret-key-with-different-passphrase.patch
+	"${FILESDIR}/${P}"-0016-Test-use-of-gpg-without-explicit-passphrase-agent-pi.patch
+	"${FILESDIR}/${P}"-0017-Kill-any-GnuPG-agent-before-and-after-the-test-suite.patch
+	"${FILESDIR}/${P}"-0018-Use-a-short-temporary-homedir-during-the-test-suite.patch
+	"${FILESDIR}/${P}"-0019-Make-things-work-with-gpg1-assuming-plain-gpg-is-mod.patch
+)
+
+src_prepare() {
+	sed -i -e 's/use inc::Module::Install;/use lib q[.];\nuse inc::Module::Install;/' Makefile.PL ||
+		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
+	perl-module_src_prepare
+}
+
+src_test() {
+# Nearly all tests succeed with this patchset and GnuPG 2.1 when running outside the
+# emerge sandbox. However, the agent architecture is not really sandbox-friendly, so...
+#
+# Test Summary Report
+# -------------------
+# t/decrypt.t              (Wstat: 0 Tests: 6 Failed: 2)
+#  Failed tests:  5-6
+# Failed 1/22 test programs. 2/56 subtests failed.
+	perl_rm_files t/decrypt.t
+# Needs to run a setup test that spawns a persistent daemon
+	DIST_TEST="do"
+	perl-module_src_test
+}
diff --git a/dev-perl/GnuPG-Interface/Manifest b/dev-perl/GnuPG-Interface/Manifest
index b22b4d525feb..5df8a808576f 100644
--- a/dev-perl/GnuPG-Interface/Manifest
+++ b/dev-perl/GnuPG-Interface/Manifest
@@ -20,6 +20,7 @@ AUX GnuPG-Interface-0.520.0-0019-Make-things-work-with-gpg1-assuming-plain-gpg-i
 DIST GnuPG-Interface-0.52.tar.gz 63733 SHA256 247a9f5a88bb6745281c00d0f7d5d94e8599a92396849fd9571356dda047fd35 SHA512 911f47a3b52249e8b39133d4040b86147793d9dd6a78d2b279674d6bba0cd38de5c919bf12b241b0e977790575502531afab6b1d2c05739d050c16d05d52fc49 WHIRLPOOL f9bd6e4ed26802739071127e12e0540d1b7d2880c85a9dda9c91cc4bd18c39734fb308feaf190a1822201048e2c8c8d7714a88210d1e118d38b5e9480c262476
 EBUILD GnuPG-Interface-0.520.0-r1.ebuild 750 SHA256 4397fe86912119c664f89d64d3783ad1d9b24e78fee78e8ff0262e7da7223d39 SHA512 12a666502da35e346a6503a040d37033daefda889df50a6efb880097d47798699956b84c3bd56d2fae1892d7fd29da073d0ee9ab62f611fb39b240d11e665389 WHIRLPOOL d42304cd5335d8626e3d65f2da0fe1565452cabccc1279d43b9c88eb97b1bce2b242ea15f41c79abe4b9fe2b72a8ef2c84c935dcdf225ce93f1e56d1adaa6752
 EBUILD GnuPG-Interface-0.520.0-r2.ebuild 2527 SHA256 7a3a155088c1e79c45e59e94b7d7fb2e16bb4efc76015879dff6bbb2c2cf32ec SHA512 7d95957a48bd7af9aa80e2fd8be5c4cac7a581dc3082a0d3be5d31393f69274abdcb89c1aba235d229c3c02a8c89ea7bbb02af5cb68a6dac34ffd0861635dfab WHIRLPOOL fa552e7f5e1ef9f5b7cfe9f35f68e0a186d3818d4579ce0dd3a4d2943349fb1599570ef0e60fe33140838cd34c5929f72c326d952f0da40bc86291ca49567d90
+EBUILD GnuPG-Interface-0.520.0-r3.ebuild 2655 SHA256 fcb9b6d538ede4ab51bdd5c5a51262cf335cc51d96dde654b3bad96f2fff7a84 SHA512 8682d6945c4564b9c788e30c35335282a2c61ba417cf5968f612bd4217c9705044a4625ba6704c961f4616982cf97580807133a0cbef22990cc1fa517a93eed4 WHIRLPOOL 195d87cfec706f9a1c38b309652da81062827939ad8e99546630a36d656c3ae2c8c66db8d2f7a64c69fd9038edea021fc071cb9774ac059e89a01b552ce6055e
 MISC ChangeLog 4026 SHA256 31e95e4f115ac27d965427bbc6a0f243369da78140b356641a7c48bec27aba11 SHA512 af2f7d8edf3f5e6b3d1ea4e0b5ef21b2d3104ec8141b8755d6f7edd13c8728124003e516c9e3e793e298c79ca014bf098f04405a9560f1c31605f65d98019b5d WHIRLPOOL c41666cf2b9632bb69cc057f1380b7ea0142f0fda8647f56c439a7e6d4efaa53e393e1d59d9e2e92f539b279a7475011e3184f1f5b5781704d97568fc6894514
 MISC ChangeLog-2015 7418 SHA256 680ee03b767eb1df0c17234e1e05ea92c97e8bc74533bed98407450fe353b908 SHA512 79680d12cd975eeeedd3cb4675eef2f7edef94a4e181e21abe364ac289a921ca61de75a19f1e65da556d2efb48d716f377abc5602f67e5fccd617f6d69303ff5 WHIRLPOOL d80daa6a2a0667cbf4fc8c1f794696d498233e7c5f1b29b2e2668522f9f8fcfdd64ff2820ef0408c35e8bc0f13bfb0946b31dfbe26145b9cb3979668352ec342
 MISC metadata.xml 1209 SHA256 a3e363956e598f588fc92f9bbb85ad84bd8e87f8402ffd9c74acb4b37bcbb596 SHA512 3589a6d227ccde1efd9a0842e98b7f4c3d4f5434a9e62feba4a6764d1fdc4c0dc7390bba15bb52053520931c4ed4ff05235ec98efbe0239a4a9da12b30092cfb WHIRLPOOL d8e41f5bc53a66d5521e713363c0404f83bda8ae1100cea32fba6aec4b91754515bbca617e4b42bc4c6eeff972ba78adf71a9a69dd40a5debebb05f5f9ec4fcd
diff --git a/dev-perl/Goo-Canvas/Goo-Canvas-0.60.0-r2.ebuild b/dev-perl/Goo-Canvas/Goo-Canvas-0.60.0-r2.ebuild
new file mode 100644
index 000000000000..27f56028de07
--- /dev/null
+++ b/dev-perl/Goo-Canvas/Goo-Canvas-0.60.0-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=YEWENBIN
+DIST_VERSION=0.06
+DIST_EXAMPLES=("demo/*")
+inherit perl-module
+
+DESCRIPTION="Perl interface to the GooCanvas"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/goocanvas:0
+	dev-perl/Gtk2
+	dev-perl/glib-perl
+	dev-perl/Cairo"
+DEPEND="${RDEPEND}
+	dev-perl/ExtUtils-Depends
+	dev-perl/ExtUtils-PkgConfig"
+
+PATCHES=(
+	# this patch fixes segfaults on amd64 platforms
+	"${FILESDIR}"/fix_implicit_pointer_declaration.patch
+)
diff --git a/dev-perl/Goo-Canvas/Manifest b/dev-perl/Goo-Canvas/Manifest
index ad49142397f5..1afb3c9dd6fc 100644
--- a/dev-perl/Goo-Canvas/Manifest
+++ b/dev-perl/Goo-Canvas/Manifest
@@ -1,6 +1,7 @@
 AUX fix_implicit_pointer_declaration.patch 542 SHA256 a858eb9e05651ff0e3dfd8fe6a0e7309c1104af6f6dacd9254f9fa752a0bba01 SHA512 37c7c31713027488c5cfaf165142af593e727618f8658fe7875559d0e306f6e5ba9878b60ff63b0db1bb1bd839004a2dfd2dcc10a3ec045cef579da9c9b15898 WHIRLPOOL 96a36e5132290a8f4ed51ef1ec419e9029dbcfd799e886ddf609057d71e628241e9adee5466b7025ba23b8247514c240d5ba510824cdf1a5187efe24e643784d
 DIST Goo-Canvas-0.06.tar.gz 106070 SHA256 0c588c507eed5e62d12ed1cc1e491c6ff3a1f59c4fb3d435e14214b37ab39251 SHA512 4fee648dbbf76592bfc0676c2d4294c13a5b48e5608ec633a6786d79e06bc866f8e48cbeabeeb19836695f78573996321dbf0820030324ebebeb9d259ba1b660 WHIRLPOOL 337761dec6b464d162e74f1083f040cde78850cfb03de7b25f74c7ea2cdd16e1f5237556fe60267fe78b0555d80a680f172874bf5afb2f894d19e79ab6b8c120
 EBUILD Goo-Canvas-0.60.0-r1.ebuild 540 SHA256 16dde541aa22c4eaf70444199a8a40f847fe8201c4e192ef900c2524244c4bbb SHA512 00bb3a2624a1d6a8fb2aa5318deda4d3e8803d553789f615c73e6fd66c5156330e59ec70177a880047a256e9a07c437fd94bc2a6923730e4a38ab0b7e69daf7a WHIRLPOOL 2b9e9bae88766da2b2128b5fb4c79b6d4c081ae72a2c9e71405657bede975b5c090b6516f2b4462a456a5f6aa278f07378aca49bc662088427ad1f52f8430344
+EBUILD Goo-Canvas-0.60.0-r2.ebuild 563 SHA256 a6b4ab0b6c1128baef33f238b3e21712cec40435207b2aa8a85437ac495bb19b SHA512 89939e2bcc165732f5a25432e4176c607baa8ea5d16bcfb6028d0700dea438b46f5efadf3b5d50009916c324510fa7b5c119d6ab08720eeed41983aa1582e2bc WHIRLPOOL 7ab015695435cbd73a7ba7894f5d6e11afe346b09f69cff1e2447668afde60dfb6390c6292d331278ec5fd306a91788053b223f8a3ea61a26bca96f5e6f179ff
 MISC ChangeLog 2646 SHA256 54d0d4a897afcd2dcb52b6227c0e38fdc090ee92505ae4f0d27af20352880d70 SHA512 2eacc57c2c4c13c97cd14d55a1505b5744d9e3fac26d55e56bafeff478eb3342ecbd10dccf6cc4772287cdd9bae573ec10082de5f159ffcc008a0dba439c94bc WHIRLPOOL 3f38338847693dd55bb1e02cde4dd543cbe881c9fb989302612970dbbd71417718c0b187559721d810546a8e01a5ae69f1db89575754df926fbac9de6fa643a3
 MISC ChangeLog-2015 1844 SHA256 51c539410567fb5d715d99e450827cb38d5fd324edfcb8b525d22ff4f9faf9fe SHA512 a695db608f1f1c6559a2abee88bad95f38e0551f8cdbb162b4ebb9b35f835ebfe3130de64fc362e91dab7a18be3df866843fae9d84039befcc4ae67442d34b2b WHIRLPOOL 3c8c4dde9f8ff68665caec3f7ba606771717124a978ebc03eda1bf6da6cdf981dfb3ec6c97d33395f535d25485e11479fdc92d3cfa5d70548a8b8e3549ecdd3f
 MISC metadata.xml 601 SHA256 b46de9fff48416e666c3f065b2475be48b97b434cd14520527796c86ae2f0ce4 SHA512 7fd666e80184d580628d375cef0356d263a365910a634f8ba40281219064b46e2f61500d248f4beabd10427da179f0e96b6d02eecd1829286d6df5852ad3ba25 WHIRLPOOL dd16147cf3a2ec7c60101eb4834105d183a62468d401ec5cf0aa81564967f41da30f88309b4e78a5200b312a540fa83003f17ea7aed15cda14420ca4085df7a2
diff --git a/dev-perl/Google-Ads-AdWords-Client/Google-Ads-AdWords-Client-4.18.0.ebuild b/dev-perl/Google-Ads-AdWords-Client/Google-Ads-AdWords-Client-4.18.0.ebuild
new file mode 100644
index 000000000000..6e8ded53ff39
--- /dev/null
+++ b/dev-perl/Google-Ads-AdWords-Client/Google-Ads-AdWords-Client-4.18.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+DIST_AUTHOR=SUNDQUIST
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Google AdWords API Perl Client Library"
+HOMEPAGE="https://github.com/googleads/googleads-perl-lib"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+PATCHES=(
+	"${FILESDIR}/4.14.0-no-dot-in-inc.patch"
+	"${FILESDIR}/4.14.0-unescaped-lbracket.patch"
+)
+RDEPEND="
+	dev-perl/Class-Load
+	>=dev-perl/Class-Std-Fast-0.0.5
+	dev-perl/Crypt-OpenSSL-RSA
+	dev-perl/File-HomeDir
+	virtual/perl-File-Spec
+	dev-perl/IO-Socket-SSL
+	dev-perl/JSON-Parse
+	dev-perl/LWP-Protocol-https
+	dev-perl/libwww-perl
+	dev-perl/Log-Log4perl
+	>=dev-perl/SOAP-WSDL-2.00.10
+	virtual/perl-Scalar-List-Utils
+	dev-perl/Template-Toolkit
+	dev-perl/URI
+	dev-perl/XML-Simple
+	dev-perl/XML-XPath
+	examples? (
+		virtual/perl-Digest-SHA
+		virtual/perl-File-Temp
+		dev-perl/HTTP-Server-Simple
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.400.0
+	test? (
+		dev-perl/Config-Properties
+		dev-perl/Data-Uniqid
+		virtual/perl-File-Temp
+		dev-perl/Test-Deep
+		dev-perl/Test-Exception
+		dev-perl/Test-MockObject
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/Google-Ads-AdWords-Client/Manifest b/dev-perl/Google-Ads-AdWords-Client/Manifest
index e8b568d3eb45..95f711afdad5 100644
--- a/dev-perl/Google-Ads-AdWords-Client/Manifest
+++ b/dev-perl/Google-Ads-AdWords-Client/Manifest
@@ -1,6 +1,8 @@
 AUX 4.14.0-no-dot-in-inc.patch 2576 SHA256 06b5bedd42737a54c5de9404d2d26150687ecf18dbac46fa7fda706514f8acb7 SHA512 1fb62aee9081303c1d1186a1fd388e698f519ea5856fdf86e65af2044945b85952c2dcd96b0a0a5ec4234fe82361b2e076143918193218f54934c93120b54ccf WHIRLPOOL 50844cf587132e80f9fa1df33ca3142d51fb13fd463136d0b6b3923943e263c5506c45c097089be3a03f8af6dab82978f2fcd931c2f4f6fec94e8bf678ebd237
 AUX 4.14.0-unescaped-lbracket.patch 1656 SHA256 922bbd2b823a73bb2dbeda3ec75dc3c7eb60ebae4d9fd5883eb4f4932b9e452a SHA512 8ba173dff927bf5dd7193d88fe110bdaf71b44b54e3e5a3a0d8ff161ce492a36324c5e69dfca268577ecbbf81d3b99247f7fe305bd4bd2f172e59ea52b9146c1 WHIRLPOOL 945fc3fca4a0b5894e0eebb16b156d9d4f61e21db4d75330e7c8c2142a46dee9ba47aa6d413c52cf577dd9a877f490d56081baa66bdcc9fe1abf71ddaf75ebdb
 DIST Google-Ads-AdWords-Client-4.14.0.tar.gz 7757731 SHA256 dfe96f306631fa50db95fa4e43e07da1e888e539a697ce7c7af3372f75bfa55d SHA512 e9a90400620a14062b97b14752f5f28df9fe16c84efd09bc6fa9968c4d97672d31bbe9737efc965a7c7321825a52bb1d8e8c4c415f51c6794f7da83bfb71f3c6 WHIRLPOOL 68b6b625fe6f1a6c9e5945ec355225fb95035f1554724448500b527599eb330323dadc3f18f8f162e4c09b0f29b7169623e037bff657005661cbeda6d40b32c0
+DIST Google-Ads-AdWords-Client-4.18.0.tar.gz 8921326 SHA256 dbcef5aa6c7c0407e6b8ee8df839c38c2290b81cc3c8272e40b15662856f6120 SHA512 b0905c69f52909f160e563fd4e24413256d14797d7d9bf40bb1193d7bb42deb65c4030a6d117a9c6a3b1fa6bcbb20ac6a5922dcfc4ba7c67566157e4097d5391 WHIRLPOOL cb47ec5ff14ef8a7d871e0bab54ea120a935ce92cd66b17388ec913397ebe2fdda2544973a24edd3b07dcfa3380916df55d55f928151000f47ddf75d1655b3f4
 EBUILD Google-Ads-AdWords-Client-4.14.0.ebuild 1206 SHA256 371a06b9c1f1ce2106df41d80510b486cd39ae3bb8a58ab21f70e8bd20188324 SHA512 eadf3dedb6eb54fdb888f559b8e35f7d6ce393a9a25a53d0519005d2129fdd29b2012529d97fe5caee12ed20ac96af014d4237e8acceaebcf39a4212f6cb0c93 WHIRLPOOL a9133a913f5eb934941d066bbff110f95a2847cfaddfaf71dc3b9fae1e94c9a5cd70ad2165813903ccb5c0ca5eb5fcb6e19af2bd56359c96152065d433ddaad6
+EBUILD Google-Ads-AdWords-Client-4.18.0.ebuild 1206 SHA256 371a06b9c1f1ce2106df41d80510b486cd39ae3bb8a58ab21f70e8bd20188324 SHA512 eadf3dedb6eb54fdb888f559b8e35f7d6ce393a9a25a53d0519005d2129fdd29b2012529d97fe5caee12ed20ac96af014d4237e8acceaebcf39a4212f6cb0c93 WHIRLPOOL a9133a913f5eb934941d066bbff110f95a2847cfaddfaf71dc3b9fae1e94c9a5cd70ad2165813903ccb5c0ca5eb5fcb6e19af2bd56359c96152065d433ddaad6
 MISC ChangeLog 801 SHA256 ae6e6a1b8dcde6e0ce7d8037fbe53c8860f8a30c91de3bb383b311dd44d8d86b SHA512 4d9beb5690ba187b785a089446a46537305192472c03b558a792fb71618720ef89fc73c5953558c840ef0328706433524d40f80973c11b877b08696dc84ec8b7 WHIRLPOOL 3d97c3e185aa47b00bd9308b7810baacd16e1341bad4e4549ea972a368fb2f7beb96bd622a00f4531edcd9146264418052c71190690c0a9404d5d456b2bfbcc6
-MISC metadata.xml 542745 SHA256 3bf8161955958452411d51e5d4315fd7894059e9c800a1a0a69ce60a2084861b SHA512 bd08cf8b569877aa7fa09e328e0579d05135d48c3e43bf45ddf8dfe259bfe9cde8af11f23f2cd74419eb33e8a8cb83b7dcf753c8aa20e0b91fb4842411fa1c3a WHIRLPOOL 970d5420ab66067ca6b38c34c4c0720e36586287d2ff9501dc7d7d6397081152c4693a1a1e25f3c53096110f93c61719005c086ebf4a722862a87c216e3cfa00
+MISC metadata.xml 4424 SHA256 c57b8d494a52246b12408b80d8b6bb3c1b48df9336c9f20d0f35b7bbd8739ead SHA512 a561f60bdeec595bd9bd11b80aca2c457aa652f01260fd49602c2568f8cbab269d7d49a71466726dedc2cbc5e789aa693c1856995c73a7239f6bf5d5cbbeff50 WHIRLPOOL 6b4be4a67e26af69209bcd1970d22ca9e97a160b7b3b30f94541666caa1fd6c9e547ff1e75a5e7710813dbd30daba8e834783a4ddd74f4040d613fb5bc35f7ff
diff --git a/dev-perl/Google-Ads-AdWords-Client/metadata.xml b/dev-perl/Google-Ads-AdWords-Client/metadata.xml
index 57765fd8a784..d1774500bbac 100644
--- a/dev-perl/Google-Ads-AdWords-Client/metadata.xml
+++ b/dev-perl/Google-Ads-AdWords-Client/metadata.xml
@@ -33,5217 +33,6 @@
     <remote-id type="cpan-module">Google::Ads::AdWords::Utilities::BatchJobHandlerError</remote-id>
     <remote-id type="cpan-module">Google::Ads::AdWords::Utilities::BatchJobHandlerStatus</remote-id>
     <remote-id type="cpan-module">Google::Ads::AdWords::Utilities::PageProcessor</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AccessReason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AccountLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AccountLabelOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AccountLabelPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AccountLabelReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AccountLabelService::AccountLabelServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AccountLabelService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AccountLabelService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AccountLabelService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AccountLabelService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AccountLabelService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AccountLabelService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AccountLabelService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AccountUserListStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Ad</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Ad::Type</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdCallMetricsConversion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdCustomizerError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdCustomizerError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdCustomizerFeed</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdCustomizerFeedAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdCustomizerFeedAttribute::Type</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdCustomizerFeedError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdCustomizerFeedError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdCustomizerFeedOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdCustomizerFeedPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdCustomizerFeedReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdCustomizerFeedService::AdCustomizerFeedServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdCustomizerFeedService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdCustomizerFeedService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdCustomizerFeedService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdCustomizerFeedService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdCustomizerFeedService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdCustomizerFeedService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdCustomizerFeedService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroup</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroup::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupAd::ApprovalStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupAd::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupAdCountLimitExceeded</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupAdError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupAdError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupAdExperimentData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupAdLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupAdLabelOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupAdLabelReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupAdOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupAdPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupAdReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupAdService::AdGroupAdServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupAdService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupAdService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupAdService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupAdService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupAdService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupAdService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupAdService::mutateLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupAdService::mutateLabelResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupAdService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupAdService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupAdService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupAdService::upgradeUrl</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupAdService::upgradeUrlResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupBidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupBidLandscape::Type</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupBidLandscapePage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupBidModifier</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupBidModifierOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupBidModifierPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupBidModifierReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupBidModifierService::AdGroupBidModifierServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupBidModifierService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupBidModifierService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupBidModifierService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupBidModifierService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupBidModifierService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupBidModifierService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupBidModifierService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupBidModifierService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupBidModifierService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupChangeData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupCriterionError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupCriterionError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupCriterionExperimentBidMultiplier</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupCriterionLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupCriterionLabelOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupCriterionLabelReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupCriterionLimitExceeded</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupCriterionLimitExceeded::CriteriaLimitType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupCriterionOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupCriterionPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupCriterionReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupCriterionService::AdGroupCriterionServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupCriterionService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupCriterionService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupCriterionService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupCriterionService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupCriterionService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupCriterionService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupCriterionService::mutateLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupCriterionService::mutateLabelResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupCriterionService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupCriterionService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupCriterionService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupEstimate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupEstimateRequest</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupExperimentBidMultipliers</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupExperimentData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupExtensionSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupExtensionSettingOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupExtensionSettingPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupExtensionSettingReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupExtensionSettingService::AdGroupExtensionSettingServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupExtensionSettingService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupExtensionSettingService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupExtensionSettingService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupExtensionSettingService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupExtensionSettingService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupExtensionSettingService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupExtensionSettingService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupExtensionSettingService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupExtensionSettingService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupFeed</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupFeed::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupFeedError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupFeedError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupFeedOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupFeedPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupFeedReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupFeedService::AdGroupFeedServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupFeedService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupFeedService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupFeedService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupFeedService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupFeedService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupFeedService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupFeedService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupFeedService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupFeedService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupLabelOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupLabelReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupService::AdGroupServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupService::mutateLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupService::mutateLabelResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupServiceError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdGroupServiceError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdParam</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdParamError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdParamError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdParamOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdParamPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdParamPolicyError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdParamService::AdParamServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdParamService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdParamService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdParamService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdParamService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdParamService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdParamService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdParamService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdSchedule</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdServingOptimizationStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdUnionId</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdUrlUpgrade</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdWordsConversionTracker</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdWordsConversionTracker::TextFormat</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdWordsConversionTracker::TrackingCodeType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Address</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdvertisingChannelSubType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdvertisingChannelType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdwordsUserListService::AdwordsUserListServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdwordsUserListService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdwordsUserListService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdwordsUserListService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdwordsUserListService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdwordsUserListService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdwordsUserListService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdwordsUserListService::mutateMembers</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdwordsUserListService::mutateMembersResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdwordsUserListService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdwordsUserListService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdwordsUserListService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdxError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AdxError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AgeRange</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AgeRange::AgeRangeType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ApiError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ApiException</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AppConversion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AppConversion::AppConversionType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AppConversion::AppPlatform</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AppFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AppFeedItem::AppStore</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AppPaymentModel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AppPaymentModel::AppPaymentModelType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AppPostbackUrlError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AppPostbackUrlError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AppUrl</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AppUrl::OsType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AppUrlList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ApplicationException</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ApprovalStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Attribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AttributeFieldMapping</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AttributeType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Audio</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AudioError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AudioError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AuthenticationError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AuthenticationError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AuthorizationError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::AuthorizationError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BasicUserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BatchJob</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BatchJobError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BatchJobError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BatchJobOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BatchJobOpsService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BatchJobOpsService::BatchJobOpsServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BatchJobOpsService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BatchJobOpsService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BatchJobPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BatchJobProcessingError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BatchJobProcessingError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BatchJobReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BatchJobService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BatchJobService::BatchJobServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BatchJobService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BatchJobService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BatchJobService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BatchJobService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BatchJobService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BatchJobService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BatchJobService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BatchJobService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BatchJobStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Bid</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BidLandscape::LandscapePoint</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BidModifierSource</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BidMultiplier</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BidSource</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BiddableAdGroupCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BiddableAdGroupCriterionExperimentData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BiddingErrors</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BiddingErrors::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BiddingStrategyConfiguration</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BiddingStrategyError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BiddingStrategyError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BiddingStrategyOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BiddingStrategyPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BiddingStrategyReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BiddingStrategyService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BiddingStrategyService::BiddingStrategyServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BiddingStrategyService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BiddingStrategyService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BiddingStrategyService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BiddingStrategyService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BiddingStrategyService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BiddingStrategyService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BiddingStrategyService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BiddingStrategyService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BiddingStrategySource</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BiddingStrategySystemStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BiddingStrategyType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Bids</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BillingAccount</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BooleanAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Budget</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Budget::BudgetDeliveryMethod</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Budget::BudgetStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetOptimizerBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetOrder</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetOrderError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetOrderError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetOrderOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetOrderPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetOrderRequest</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetOrderRequest::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetOrderReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetOrderService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetOrderService::BudgetOrderServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetOrderService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetOrderService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetOrderService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetOrderService::getBillingAccounts</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetOrderService::getBillingAccountsResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetOrderService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetOrderService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetOrderService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetService::BudgetServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::BudgetService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CallConversionType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CallFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CallOnlyAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CalloutFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Campaign</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignChangeData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignCriterionError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignCriterionError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignCriterionOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignCriterionPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignCriterionReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignCriterionService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignCriterionService::CampaignCriterionServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignCriterionService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignCriterionService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignCriterionService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignCriterionService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignCriterionService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignCriterionService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignCriterionService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignCriterionService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignEstimate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignEstimateRequest</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignExtensionSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignExtensionSettingOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignExtensionSettingPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignExtensionSettingReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignExtensionSettingService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignExtensionSettingService::CampaignExtensionSettingServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignExtensionSettingService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignExtensionSettingService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignExtensionSettingService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignExtensionSettingService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignExtensionSettingService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignExtensionSettingService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignExtensionSettingService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignExtensionSettingService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignFeed</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignFeed::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignFeedError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignFeedError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignFeedOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignFeedPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignFeedReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignFeedService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignFeedService::CampaignFeedServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignFeedService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignFeedService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignFeedService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignFeedService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignFeedService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignFeedService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignFeedService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignFeedService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignLabelOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignLabelReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignPreferenceError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignPreferenceError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignService::CampaignServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignService::mutateLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignService::mutateLabelResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignSharedSet</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignSharedSet::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignSharedSetError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignSharedSetError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignSharedSetOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignSharedSetPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignSharedSetReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignSharedSetService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignSharedSetService::CampaignSharedSetServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignSharedSetService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignSharedSetService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignSharedSetService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignSharedSetService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignSharedSetService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignSharedSetService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignSharedSetService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignSharedSetService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CampaignTrialType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Carrier</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CategoryProductsAndServicesSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ChangeStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ClientTermsError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ClientTermsError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CollectionSizeError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CollectionSizeError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ComparableValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CompetitionSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CompetitionSearchParameter::Level</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConstantData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConstantDataService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConstantDataService::ConstantDataServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConstantDataService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConstantDataService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConstantDataService::UserInterestTaxonomyType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConstantDataService::getAgeRangeCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConstantDataService::getAgeRangeCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConstantDataService::getCarrierCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConstantDataService::getCarrierCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConstantDataService::getGenderCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConstantDataService::getGenderCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConstantDataService::getLanguageCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConstantDataService::getLanguageCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConstantDataService::getMobileAppCategoryCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConstantDataService::getMobileAppCategoryCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConstantDataService::getMobileDeviceCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConstantDataService::getMobileDeviceCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConstantDataService::getOperatingSystemVersionCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConstantDataService::getOperatingSystemVersionCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConstantDataService::getProductBiddingCategoryData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConstantDataService::getProductBiddingCategoryDataResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConstantDataService::getUserInterestCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConstantDataService::getUserInterestCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConstantDataService::getVerticalCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConstantDataService::getVerticalCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConstantOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConstantOperand::ConstantType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConstantOperand::Unit</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ContentLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ContentLabelType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConversionDeduplicationMode</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConversionOptimizerBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConversionOptimizerBiddingScheme::BidType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConversionOptimizerBiddingScheme::PricingMode</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConversionOptimizerEligibility</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConversionOptimizerEligibility::RejectionReason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConversionTracker</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConversionTracker::Category</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConversionTracker::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConversionTrackerOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConversionTrackerPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConversionTrackerReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConversionTrackerService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConversionTrackerService::ConversionTrackerServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConversionTrackerService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConversionTrackerService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConversionTrackerService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConversionTrackerService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConversionTrackerService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConversionTrackerService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConversionTrackerService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConversionTrackerService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConversionTrackingError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConversionTrackingError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ConversionTrackingSettings</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CpaBid</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CpcBid</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CpmBid</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Criterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Criterion::Type</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CriterionAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CriterionBidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CriterionBidLandscapePage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CriterionError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CriterionError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CriterionParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CriterionPolicyError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CriterionTypeGroup</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CriterionUse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CriterionUserInterest</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CriterionUserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CriterionUserList::MembershipStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CrmBasedUserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CurrencyCodeError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CurrencyCodeError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomParameters</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Customer</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerChangeData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerExtensionSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerExtensionSettingOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerExtensionSettingPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerExtensionSettingReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerExtensionSettingService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerExtensionSettingService::CustomerExtensionSettingServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerExtensionSettingService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerExtensionSettingService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerExtensionSettingService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerExtensionSettingService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerExtensionSettingService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerExtensionSettingService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerExtensionSettingService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerExtensionSettingService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerFeed</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerFeed::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerFeedError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerFeedError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerFeedOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerFeedPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerFeedReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerFeedService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerFeedService::CustomerFeedServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerFeedService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerFeedService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerFeedService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerFeedService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerFeedService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerFeedService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerFeedService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerFeedService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerOrderLineError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerOrderLineError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerService::CustomerServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerService::getCustomers</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerService::getCustomersResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerSyncError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerSyncError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerSyncSelector</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerSyncService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerSyncService::CustomerSyncServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerSyncService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerSyncService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerSyncService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::CustomerSyncService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DataEntry</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DataError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DataError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DataService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DataService::DataServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DataService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DataService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DataService::getAdGroupBidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DataService::getAdGroupBidLandscapeResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DataService::getCampaignCriterionBidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DataService::getCampaignCriterionBidLandscapeResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DataService::getCriterionBidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DataService::getCriterionBidLandscapeResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DataService::getDomainCategory</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DataService::getDomainCategoryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DataService::queryAdGroupBidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DataService::queryAdGroupBidLandscapeResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DataService::queryCampaignCriterionBidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DataService::queryCampaignCriterionBidLandscapeResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DataService::queryCriterionBidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DataService::queryCriterionBidLandscapeResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DataService::queryDomainCategory</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DataService::queryDomainCategoryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DatabaseError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DatabaseError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Date</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DateError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DateError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DateKey</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DateRange</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DateRangeError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DateRangeError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DateRuleItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DateRuleItem::DateOperator</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DateSpecificRuleUserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DateTimeRange</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DayOfWeek</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DeprecatedAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DeprecatedAd::Type</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DimensionProperties</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Dimensions</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DisapprovalReason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DisplayAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DistinctError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DistinctError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DomainCategory</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DomainCategoryPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DoubleAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DoubleValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Draft</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DraftAsyncError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DraftAsyncErrorPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DraftAsyncErrorService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DraftAsyncErrorService::DraftAsyncErrorServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DraftAsyncErrorService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DraftAsyncErrorService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DraftAsyncErrorService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DraftAsyncErrorService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DraftAsyncErrorService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DraftAsyncErrorService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DraftError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DraftError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DraftOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DraftPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DraftReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DraftService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DraftService::DraftServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DraftService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DraftService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DraftService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DraftService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DraftService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DraftService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DraftService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DraftService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DraftStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DynamicSearchAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::DynamicSearchAdsSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::EnhancedCpcBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::EntityAccessDenied</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::EntityAccessDenied::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::EntityCountLimitExceeded</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::EntityCountLimitExceeded::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::EntityNotFound</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::EntityNotFound::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::EnumValuePair</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ErrorList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Estimate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::EstimateRequest</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ExemptionRequest</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ExpandedTextAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Experiment</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ExperimentDataStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ExperimentDeltaStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ExperimentError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ExperimentError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ExperimentOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ExperimentPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ExperimentReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ExperimentService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ExperimentService::ExperimentServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ExperimentService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ExperimentService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ExperimentService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ExperimentService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ExperimentService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ExperimentService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ExperimentServiceError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ExperimentServiceError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ExperimentServingStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ExperimentStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ExperimentSummaryStats</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ExplorerAutoOptimizerSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ExpressionRuleUserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ExtensionFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ExtensionSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ExtensionSetting::Platform</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ExtensionSettingError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ExtensionSettingError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Feed</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Feed::Origin</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Feed::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Feed::Type</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedAttribute::Type</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedAttributeOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedAttributeReferenceError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedAttributeReferenceError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedChangeData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedItem::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedItemAdGroupTargeting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedItemApprovalStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedItemAttributeError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedItemAttributeValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedItemCampaignTargeting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedItemDevicePreference</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedItemError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedItemError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedItemGeoRestriction</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedItemOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedItemPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedItemPolicyData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedItemQualityApprovalStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedItemQualityDisapprovalReasons</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedItemReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedItemSchedule</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedItemScheduling</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedItemService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedItemService::FeedItemServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedItemService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedItemService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedItemService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedItemService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedItemService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedItemService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedItemService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedItemService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedItemValidationStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedMapping</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedMapping::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedMappingError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedMappingError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedMappingOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedMappingPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedMappingReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedMappingService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedMappingService::FeedMappingServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedMappingService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedMappingService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedMappingService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedMappingService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedMappingService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedMappingService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedMappingService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedMappingService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedService::FeedServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FeedService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ForwardCompatibilityError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ForwardCompatibilityError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FrequencyCap</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Function</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Function::Operator</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FunctionArgumentOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FunctionError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FunctionError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FunctionOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FunctionParsingError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::FunctionParsingError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Gender</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Gender::GenderType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::GeoPoint</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::GeoRestriction</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::GeoTargetOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::GeoTargetTypeSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::GeoTargetTypeSetting::NegativeGeoTargetType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::GeoTargetTypeSetting::PositiveGeoTargetType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::IdError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::IdError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::IdeaTextFilterSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::IdeaType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::IdeaTypeAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Image</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ImageAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ImageError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ImageError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::IncludeAdultContentSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::IncomeOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::IncomeTier</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::IntegerAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::IntegerSetAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::InternalApiError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::InternalApiError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::IpBlock</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Keyword</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::KeywordAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::KeywordEstimate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::KeywordEstimateRequest</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::KeywordMatchType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Label</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Label::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LabelAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LabelError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LabelError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LabelOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LabelPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LabelReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LabelService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LabelService::LabelServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LabelService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LabelService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LabelService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LabelService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LabelService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LabelService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LabelService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LabelService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LabelServiceError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LabelServiceError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Language</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LanguageSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Level</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LevelOfDetail</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LinkOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LinkStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ListReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Location</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LocationCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LocationCriterionService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LocationCriterionService::LocationCriterionServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LocationCriterionService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LocationCriterionService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LocationCriterionService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LocationCriterionService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LocationCriterionService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LocationCriterionService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LocationCriterionServiceError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LocationCriterionServiceError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LocationExtensionOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LocationGroups</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LocationSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LocationTargetingStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LogicalUserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LogicalUserListOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LongAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LongComparisonOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LongRangeAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::LongValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ManagedCustomer</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ManagedCustomerLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ManagedCustomerLabelOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ManagedCustomerLabelReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ManagedCustomerLink</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ManagedCustomerOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ManagedCustomerPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ManagedCustomerReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ManagedCustomerService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ManagedCustomerService::ManagedCustomerServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ManagedCustomerService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ManagedCustomerService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ManagedCustomerService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ManagedCustomerService::getPendingInvitations</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ManagedCustomerService::getPendingInvitationsResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ManagedCustomerService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ManagedCustomerService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ManagedCustomerService::mutateLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ManagedCustomerService::mutateLabelResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ManagedCustomerService::mutateLink</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ManagedCustomerService::mutateLinkResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ManagedCustomerService::mutateManager</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ManagedCustomerService::mutateManagerResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ManagedCustomerService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ManagedCustomerServiceError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ManagedCustomerServiceError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ManualCPCAdGroupCriterionExperimentBidMultiplier</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ManualCPCAdGroupExperimentBidMultipliers</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ManualCPMAdGroupExperimentBidMultipliers</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ManualCpcBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ManualCpmBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Media</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Media::MediaType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Media::MimeType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Media::Size</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MediaBundle</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MediaBundleError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MediaBundleError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MediaError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MediaError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MediaPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MediaService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MediaService::MediaServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MediaService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MediaService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MediaService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MediaService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MediaService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MediaService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MediaService::upload</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MediaService::uploadResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Media_Size_DimensionsMapEntry</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Media_Size_StringMapEntry</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MinuteOfHour</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MobileAppCategory</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MobileApplication</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MobileDevice</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MobileDevice::DeviceType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Money</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MoneyAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MoneyWithCurrency</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MonthlySearchVolume</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MonthlySearchVolumeAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MoveOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MultiplierError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MultiplierError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MultiplierSource</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MutateLinkResults</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MutateManagerResults</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MutateMembersError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MutateMembersError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MutateMembersOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MutateMembersOperand::DataType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MutateMembersOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MutateMembersReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::MutateResult</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::NegativeAdGroupCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::NegativeCampaignCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::NetworkSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::NetworkSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::NewEntityCreationError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::NewEntityCreationError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::NoStatsPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::NotEmptyError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::NotEmptyError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::NotWhitelistedError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::NotWhitelistedError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::NullError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::NullError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::NullStatsPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::NumberKey</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::NumberRuleItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::NumberRuleItem::NumberOperator</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::NumberValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::OAuthInfo</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::OfflineConversionError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::OfflineConversionError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::OfflineConversionFeed</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::OfflineConversionFeedOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::OfflineConversionFeedReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::OfflineConversionFeedService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::OfflineConversionFeedService::OfflineConversionFeedServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::OfflineConversionFeedService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::OfflineConversionFeedService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::OfflineConversionFeedService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::OfflineConversionFeedService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Operand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::OperatingSystemVersion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::OperatingSystemVersion::OperatorType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Operation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::OperationAccessDenied</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::OperationAccessDenied::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Operator</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::OperatorError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::OperatorError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::OrderBy</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Page</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::PageOnePromotedBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::PageOnePromotedBiddingScheme::StrategyGoal</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Paging</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::PagingError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::PagingError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Parent</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Parent::ParentType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::PendingInvitation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::PendingInvitationSelector</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Placement</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::PlacesLocationFeedData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::PlacesOfInterestOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::PlacesOfInterestOperand::Category</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Platform</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::PlatformCampaignEstimate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::PolicyData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::PolicyViolationError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::PolicyViolationError::Part</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::PolicyViolationKey</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Predicate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Predicate::Operator</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::PreferredContent</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::PriceExtensionPriceQualifier</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::PriceExtensionPriceUnit</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::PriceExtensionType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::PriceFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::PriceTableRow</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ProductAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ProductAdwordsGrouping</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ProductAdwordsLabels</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ProductBiddingCategory</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ProductBiddingCategoryData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ProductBrand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ProductCanonicalCondition</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ProductCanonicalCondition::Condition</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ProductChannel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ProductChannelExclusivity</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ProductCustomAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ProductDimension</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ProductDimensionType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ProductLegacyCondition</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ProductOfferId</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ProductPartition</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ProductPartitionType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ProductScope</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ProductType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ProductTypeFull</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ProgressStats</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Proximity</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Proximity::DistanceUnits</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::QualityInfo</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::QueryError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::QueryError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::QuotaCheckError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::QuotaCheckError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Range</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::RangeError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::RangeError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::RateExceededError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::RateExceededError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ReadOnlyError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ReadOnlyError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::RealTimeBiddingSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::RegionCodeError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::RegionCodeError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::RejectedError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::RejectedError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::RelatedToQuerySearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::RelatedToUrlSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::RemarketingSettings</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ReportDefinition::ReportType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ReportDefinitionError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ReportDefinitionError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ReportDefinitionField</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ReportDefinitionService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ReportDefinitionService::ReportDefinitionServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ReportDefinitionService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ReportDefinitionService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ReportDefinitionService::getReportFields</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ReportDefinitionService::getReportFieldsResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::RequestContextOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::RequestContextOperand::ContextType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::RequestError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::RequestError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::RequestType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::RequiredError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::RequiredError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ResponsiveDisplayAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ReviewFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::RichMediaAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::RichMediaAd::AdAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::RichMediaAd::RichMediaAdType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Rule</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::RuleBasedUserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::RuleItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::RuleItemGroup</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SearchVolumeSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SeedAdGroupIdSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Selector</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SelectorError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SelectorError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ServingStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Setting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SettingError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SettingError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedBiddingStrategy</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedBiddingStrategy::BiddingStrategyStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedCriterionError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedCriterionError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedCriterionOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedCriterionPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedCriterionReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedCriterionService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedCriterionService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedCriterionService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedCriterionService::SharedCriterionServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedCriterionService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedCriterionService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedCriterionService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedCriterionService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedCriterionService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedCriterionService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedSet</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedSet::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedSetError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedSetError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedSetOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedSetPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedSetReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedSetService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedSetService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedSetService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedSetService::SharedSetServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedSetService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedSetService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedSetService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedSetService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedSetService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedSetService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SharedSetType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ShoppingBiddingDimensionStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ShoppingProductChannel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ShoppingProductChannelExclusivity</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ShoppingSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SimilarUserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SitelinkFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SizeLimitError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SizeLimitError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SizeRange</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SoapHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SoapResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SortOrder</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::StatsEstimate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::StatsQueryError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::StatsQueryError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::StringAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::StringFormatError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::StringFormatError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::StringKey</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::StringLengthError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::StringLengthError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::StringRuleItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::StringRuleItem::StringOperator</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::String_StringMapEntry</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::StructuredSnippetFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SystemFeedGenerationData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::SystemServingStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TargetCpaBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TargetOutrankShareBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TargetRoasBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TargetSpendBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TargetingIdea</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TargetingIdeaError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TargetingIdeaError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TargetingIdeaPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TargetingIdeaSelector</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TargetingIdeaService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TargetingIdeaService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TargetingIdeaService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TargetingIdeaService::TargetingIdeaServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TargetingIdeaService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TargetingIdeaService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TargetingSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TargetingSettingDetail</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TempAdUnionId</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TemplateAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TemplateElement</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TemplateElementField</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TemplateElementField::Type</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TemporaryUrl</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TextAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TextLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ThirdPartyRedirectAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::ThirdPartyRedirectAd::ExpandingDirection</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TimeUnit</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrackingSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrafficEstimatorError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrafficEstimatorError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrafficEstimatorResult</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrafficEstimatorSelector</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrafficEstimatorService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrafficEstimatorService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrafficEstimatorService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrafficEstimatorService::TrafficEstimatorServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrafficEstimatorService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrafficEstimatorService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Trial</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrialAsyncError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrialAsyncErrorPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrialAsyncErrorService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrialAsyncErrorService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrialAsyncErrorService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrialAsyncErrorService::TrialAsyncErrorServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrialAsyncErrorService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrialAsyncErrorService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrialAsyncErrorService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrialAsyncErrorService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrialError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrialError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrialOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrialPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrialReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrialService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrialService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrialService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrialService::TrialServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrialService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrialService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrialService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrialService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrialService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrialService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TrialStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::AccountLabelService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::AdCustomizerFeedService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::AdGroupAdService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::AdGroupBidModifierService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::AdGroupCriterionService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::AdGroupExtensionSettingService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::AdGroupFeedService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::AdGroupService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::AdParamService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::AdwordsUserListService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::BatchJobOpsService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::BatchJobService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::BiddingStrategyService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::BudgetOrderService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::BudgetService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::CampaignCriterionService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::CampaignExtensionSettingService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::CampaignFeedService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::CampaignService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::CampaignSharedSetService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::ConstantDataService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::ConversionTrackerService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::CustomerExtensionSettingService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::CustomerFeedService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::CustomerService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::CustomerSyncService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::DataService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::DraftAsyncErrorService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::DraftService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::ExperimentService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::FeedItemService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::FeedMappingService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::FeedService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::LabelService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::LocationCriterionService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::ManagedCustomerService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::MediaService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::OfflineConversionFeedService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::ReportDefinitionService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::SharedCriterionService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::SharedSetService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::TargetingIdeaService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::TrafficEstimatorService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::TrialAsyncErrorService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::TypeMaps::TrialService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Type_AttributeMapEntry</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::UnknownProductDimension</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::UploadConversion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::UrlError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::UrlError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::UrlList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::UserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::UserListConversionType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::UserListConversionType::Category</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::UserListError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::UserListError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::UserListLogicalRule</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::UserListLogicalRule::Operator</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::UserListMembershipStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::UserListOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::UserListPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::UserListReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::UserListType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::UserStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::VanityPharma</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::VanityPharmaDisplayUrlMode</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::VanityPharmaText</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Vertical</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Video</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::VideoError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::VideoError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::VideoType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::Webpage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::WebpageCondition</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::WebpageConditionOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::WebpageDescriptor</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::WebpageDescriptorAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::WebpageParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::WebsiteCallMetricsConversion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::YouTubeChannel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201607::YouTubeVideo</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AccessReason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AccountLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AccountLabelOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AccountLabelPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AccountLabelReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AccountLabelService::AccountLabelServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AccountLabelService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AccountLabelService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AccountLabelService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AccountLabelService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AccountLabelService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AccountLabelService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AccountLabelService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AccountUserListStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Ad</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Ad::Type</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdCallMetricsConversion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdCustomizerError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdCustomizerError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdCustomizerFeed</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdCustomizerFeedAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdCustomizerFeedAttribute::Type</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdCustomizerFeedError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdCustomizerFeedError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdCustomizerFeedOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdCustomizerFeedPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdCustomizerFeedReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdCustomizerFeedService::AdCustomizerFeedServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdCustomizerFeedService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdCustomizerFeedService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdCustomizerFeedService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdCustomizerFeedService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdCustomizerFeedService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdCustomizerFeedService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdCustomizerFeedService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroup</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroup::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupAd::ApprovalStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupAd::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupAdCountLimitExceeded</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupAdError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupAdError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupAdLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupAdLabelOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupAdLabelReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupAdOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupAdPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupAdReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupAdService::AdGroupAdServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupAdService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupAdService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupAdService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupAdService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupAdService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupAdService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupAdService::mutateLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupAdService::mutateLabelResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupAdService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupAdService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupAdService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupAdService::upgradeUrl</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupAdService::upgradeUrlResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupBidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupBidLandscape::Type</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupBidLandscapePage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupBidModifier</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupBidModifierOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupBidModifierPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupBidModifierReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupBidModifierService::AdGroupBidModifierServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupBidModifierService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupBidModifierService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupBidModifierService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupBidModifierService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupBidModifierService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupBidModifierService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupBidModifierService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupBidModifierService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupBidModifierService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupChangeData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupCriterionError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupCriterionError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupCriterionLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupCriterionLabelOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupCriterionLabelReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupCriterionLimitExceeded</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupCriterionLimitExceeded::CriteriaLimitType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupCriterionOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupCriterionPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupCriterionReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupCriterionService::AdGroupCriterionServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupCriterionService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupCriterionService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupCriterionService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupCriterionService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupCriterionService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupCriterionService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupCriterionService::mutateLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupCriterionService::mutateLabelResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupCriterionService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupCriterionService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupCriterionService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupEstimate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupEstimateRequest</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupExtensionSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupExtensionSettingOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupExtensionSettingPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupExtensionSettingReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupExtensionSettingService::AdGroupExtensionSettingServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupExtensionSettingService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupExtensionSettingService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupExtensionSettingService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupExtensionSettingService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupExtensionSettingService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupExtensionSettingService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupExtensionSettingService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupExtensionSettingService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupExtensionSettingService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupFeed</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupFeed::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupFeedError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupFeedError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupFeedOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupFeedPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupFeedReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupFeedService::AdGroupFeedServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupFeedService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupFeedService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupFeedService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupFeedService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupFeedService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupFeedService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupFeedService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupFeedService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupFeedService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupLabelOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupLabelReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupService::AdGroupServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupService::mutateLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupService::mutateLabelResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupServiceError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdGroupServiceError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdParam</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdParamError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdParamError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdParamOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdParamPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdParamPolicyError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdParamService::AdParamServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdParamService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdParamService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdParamService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdParamService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdParamService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdParamService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdParamService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdSchedule</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdServingOptimizationStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdUnionId</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdUrlUpgrade</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdWordsConversionTracker</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdWordsConversionTracker::TextFormat</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdWordsConversionTracker::TrackingCodeType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Address</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdvertisingChannelSubType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdvertisingChannelType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdwordsUserListService::AdwordsUserListServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdwordsUserListService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdwordsUserListService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdwordsUserListService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdwordsUserListService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdwordsUserListService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdwordsUserListService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdwordsUserListService::mutateMembers</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdwordsUserListService::mutateMembersResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdwordsUserListService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdwordsUserListService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdwordsUserListService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdxError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AdxError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AgeRange</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AgeRange::AgeRangeType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ApiError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ApiException</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AppConversion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AppConversion::AppConversionType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AppConversion::AppPlatform</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AppFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AppFeedItem::AppStore</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AppPaymentModel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AppPaymentModel::AppPaymentModelType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AppPostbackUrlError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AppPostbackUrlError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AppUrl</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AppUrl::OsType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AppUrlList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ApplicationException</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ApprovalStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Attribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AttributeFieldMapping</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AttributeType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AttributionModelType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Audio</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AudioError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AudioError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AuthenticationError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AuthenticationError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AuthorizationError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::AuthorizationError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BasicUserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BatchJob</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BatchJobError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BatchJobError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BatchJobOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BatchJobOpsService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BatchJobOpsService::BatchJobOpsServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BatchJobOpsService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BatchJobOpsService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BatchJobPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BatchJobProcessingError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BatchJobProcessingError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BatchJobReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BatchJobService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BatchJobService::BatchJobServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BatchJobService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BatchJobService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BatchJobService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BatchJobService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BatchJobService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BatchJobService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BatchJobService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BatchJobService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BatchJobStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Bid</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BidLandscape::LandscapePoint</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BidModifierSource</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BidSource</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BiddableAdGroupCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BiddingErrors</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BiddingErrors::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BiddingStrategyConfiguration</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BiddingStrategyError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BiddingStrategyError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BiddingStrategyOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BiddingStrategyPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BiddingStrategyReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BiddingStrategyService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BiddingStrategyService::BiddingStrategyServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BiddingStrategyService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BiddingStrategyService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BiddingStrategyService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BiddingStrategyService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BiddingStrategyService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BiddingStrategyService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BiddingStrategyService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BiddingStrategyService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BiddingStrategySource</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BiddingStrategySystemStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BiddingStrategyType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Bids</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BillingAccount</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BooleanAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Budget</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Budget::BudgetDeliveryMethod</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Budget::BudgetStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetOptimizerBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetOrder</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetOrderError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetOrderError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetOrderOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetOrderPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetOrderRequest</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetOrderRequest::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetOrderReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetOrderService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetOrderService::BudgetOrderServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetOrderService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetOrderService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetOrderService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetOrderService::getBillingAccounts</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetOrderService::getBillingAccountsResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetOrderService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetOrderService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetOrderService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetService::BudgetServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::BudgetService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CallConversionType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CallFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CallOnlyAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CalloutFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Campaign</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignChangeData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignCriterion::CampaignCriterionStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignCriterionError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignCriterionError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignCriterionOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignCriterionPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignCriterionReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignCriterionService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignCriterionService::CampaignCriterionServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignCriterionService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignCriterionService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignCriterionService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignCriterionService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignCriterionService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignCriterionService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignCriterionService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignCriterionService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignEstimate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignEstimateRequest</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignExtensionSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignExtensionSettingOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignExtensionSettingPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignExtensionSettingReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignExtensionSettingService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignExtensionSettingService::CampaignExtensionSettingServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignExtensionSettingService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignExtensionSettingService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignExtensionSettingService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignExtensionSettingService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignExtensionSettingService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignExtensionSettingService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignExtensionSettingService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignExtensionSettingService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignFeed</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignFeed::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignFeedError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignFeedError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignFeedOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignFeedPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignFeedReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignFeedService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignFeedService::CampaignFeedServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignFeedService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignFeedService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignFeedService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignFeedService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignFeedService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignFeedService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignFeedService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignFeedService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignLabelOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignLabelReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignPreferenceError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignPreferenceError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignService::CampaignServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignService::mutateLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignService::mutateLabelResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignSharedSet</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignSharedSet::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignSharedSetError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignSharedSetError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignSharedSetOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignSharedSetPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignSharedSetReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignSharedSetService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignSharedSetService::CampaignSharedSetServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignSharedSetService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignSharedSetService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignSharedSetService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignSharedSetService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignSharedSetService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignSharedSetService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignSharedSetService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignSharedSetService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CampaignTrialType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Carrier</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CategoryProductsAndServicesSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ChangeStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ClientTermsError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ClientTermsError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CollectionSizeError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CollectionSizeError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ComparableValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CompetitionSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CompetitionSearchParameter::Level</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConstantData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConstantDataService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConstantDataService::ConstantDataServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConstantDataService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConstantDataService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConstantDataService::UserInterestTaxonomyType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConstantDataService::getAgeRangeCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConstantDataService::getAgeRangeCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConstantDataService::getCarrierCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConstantDataService::getCarrierCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConstantDataService::getGenderCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConstantDataService::getGenderCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConstantDataService::getLanguageCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConstantDataService::getLanguageCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConstantDataService::getMobileAppCategoryCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConstantDataService::getMobileAppCategoryCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConstantDataService::getMobileDeviceCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConstantDataService::getMobileDeviceCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConstantDataService::getOperatingSystemVersionCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConstantDataService::getOperatingSystemVersionCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConstantDataService::getProductBiddingCategoryData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConstantDataService::getProductBiddingCategoryDataResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConstantDataService::getUserInterestCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConstantDataService::getUserInterestCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConstantDataService::getVerticalCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConstantDataService::getVerticalCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConstantOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConstantOperand::ConstantType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConstantOperand::Unit</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ContentLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ContentLabelType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConversionDeduplicationMode</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConversionOptimizerBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConversionOptimizerBiddingScheme::BidType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConversionOptimizerBiddingScheme::PricingMode</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConversionOptimizerEligibility</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConversionOptimizerEligibility::RejectionReason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConversionTracker</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConversionTracker::Category</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConversionTracker::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConversionTrackerOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConversionTrackerPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConversionTrackerReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConversionTrackerService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConversionTrackerService::ConversionTrackerServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConversionTrackerService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConversionTrackerService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConversionTrackerService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConversionTrackerService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConversionTrackerService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConversionTrackerService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConversionTrackerService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConversionTrackerService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConversionTrackingError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConversionTrackingError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ConversionTrackingSettings</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CpaBid</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CpcBid</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CpmBid</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Criterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Criterion::Type</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CriterionAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CriterionBidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CriterionBidLandscapePage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CriterionError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CriterionError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CriterionParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CriterionPolicyError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CriterionTypeGroup</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CriterionUse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CriterionUserInterest</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CriterionUserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CriterionUserList::MembershipStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CrmBasedUserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CurrencyCodeError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CurrencyCodeError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomParameters</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Customer</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerChangeData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerExtensionSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerExtensionSettingOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerExtensionSettingPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerExtensionSettingReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerExtensionSettingService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerExtensionSettingService::CustomerExtensionSettingServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerExtensionSettingService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerExtensionSettingService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerExtensionSettingService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerExtensionSettingService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerExtensionSettingService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerExtensionSettingService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerExtensionSettingService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerExtensionSettingService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerFeed</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerFeed::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerFeedError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerFeedError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerFeedOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerFeedPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerFeedReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerFeedService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerFeedService::CustomerFeedServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerFeedService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerFeedService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerFeedService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerFeedService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerFeedService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerFeedService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerFeedService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerFeedService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerOrderLineError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerOrderLineError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerService::CustomerServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerService::getCustomers</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerService::getCustomersResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerService::getServiceLinks</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerService::getServiceLinksResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerService::mutateServiceLinks</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerService::mutateServiceLinksResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerSyncError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerSyncError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerSyncSelector</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerSyncService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerSyncService::CustomerSyncServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerSyncService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerSyncService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerSyncService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::CustomerSyncService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DataDrivenModelStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DataEntry</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DataError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DataError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DataService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DataService::DataServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DataService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DataService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DataService::getAdGroupBidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DataService::getAdGroupBidLandscapeResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DataService::getCampaignCriterionBidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DataService::getCampaignCriterionBidLandscapeResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DataService::getCriterionBidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DataService::getCriterionBidLandscapeResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DataService::getDomainCategory</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DataService::getDomainCategoryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DataService::queryAdGroupBidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DataService::queryAdGroupBidLandscapeResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DataService::queryCampaignCriterionBidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DataService::queryCampaignCriterionBidLandscapeResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DataService::queryCriterionBidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DataService::queryCriterionBidLandscapeResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DataService::queryDomainCategory</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DataService::queryDomainCategoryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DatabaseError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DatabaseError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Date</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DateError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DateError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DateKey</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DateRange</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DateRangeError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DateRangeError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DateRuleItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DateRuleItem::DateOperator</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DateSpecificRuleUserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DateTimeRange</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DayOfWeek</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DeprecatedAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DeprecatedAd::Type</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DimensionProperties</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Dimensions</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DisapprovalReason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DisplayAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DistinctError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DistinctError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DomainCategory</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DomainCategoryPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DoubleAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DoubleValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Draft</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DraftAsyncError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DraftAsyncErrorPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DraftAsyncErrorService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DraftAsyncErrorService::DraftAsyncErrorServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DraftAsyncErrorService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DraftAsyncErrorService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DraftAsyncErrorService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DraftAsyncErrorService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DraftAsyncErrorService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DraftAsyncErrorService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DraftError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DraftError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DraftOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DraftPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DraftReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DraftService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DraftService::DraftServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DraftService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DraftService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DraftService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DraftService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DraftService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DraftService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DraftService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DraftService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DraftStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DynamicSearchAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::DynamicSearchAdsSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::EnhancedCpcBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::EntityAccessDenied</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::EntityAccessDenied::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::EntityCountLimitExceeded</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::EntityCountLimitExceeded::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::EntityNotFound</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::EntityNotFound::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::EnumValuePair</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ErrorList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Estimate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::EstimateRequest</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ExemptionRequest</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ExpandedTextAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ExplorerAutoOptimizerSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ExpressionRuleUserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ExtensionFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ExtensionSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ExtensionSetting::Platform</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ExtensionSettingError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ExtensionSettingError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Feed</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Feed::Origin</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Feed::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Feed::Type</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedAttribute::Type</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedAttributeOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedAttributeReferenceError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedAttributeReferenceError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedChangeData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedItem::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedItemAdGroupTargeting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedItemApprovalStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedItemAttributeError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedItemAttributeValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedItemCampaignTargeting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedItemDevicePreference</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedItemError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedItemError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedItemGeoRestriction</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedItemOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedItemPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedItemPolicyData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedItemQualityApprovalStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedItemQualityDisapprovalReasons</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedItemReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedItemSchedule</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedItemScheduling</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedItemService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedItemService::FeedItemServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedItemService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedItemService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedItemService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedItemService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedItemService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedItemService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedItemService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedItemService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedItemValidationStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedMapping</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedMapping::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedMappingError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedMappingError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedMappingOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedMappingPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedMappingReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedMappingService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedMappingService::FeedMappingServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedMappingService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedMappingService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedMappingService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedMappingService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedMappingService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedMappingService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedMappingService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedMappingService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedService::FeedServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FeedService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ForwardCompatibilityError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ForwardCompatibilityError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FrequencyCap</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Function</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Function::Operator</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FunctionArgumentOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FunctionError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FunctionError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FunctionOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FunctionParsingError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::FunctionParsingError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Gender</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Gender::GenderType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::GeoPoint</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::GeoRestriction</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::GeoTargetOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::GeoTargetTypeSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::GeoTargetTypeSetting::NegativeGeoTargetType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::GeoTargetTypeSetting::PositiveGeoTargetType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::IdError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::IdError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::IdeaTextFilterSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::IdeaType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::IdeaTypeAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Image</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ImageAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ImageError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ImageError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::IncludeAdultContentSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::IncomeOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::IncomeTier</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::IntegerAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::IntegerSetAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::InternalApiError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::InternalApiError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::IpBlock</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Keyword</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::KeywordAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::KeywordEstimate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::KeywordEstimateRequest</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::KeywordMatchType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Label</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Label::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LabelAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LabelError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LabelError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LabelOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LabelPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LabelReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LabelService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LabelService::LabelServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LabelService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LabelService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LabelService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LabelService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LabelService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LabelService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LabelService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LabelService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LabelServiceError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LabelServiceError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Language</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LanguageSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Level</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LevelOfDetail</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LinkOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LinkStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ListError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ListError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ListOperations</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ListOperations::ListOperator</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ListReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Location</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LocationCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LocationCriterionService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LocationCriterionService::LocationCriterionServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LocationCriterionService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LocationCriterionService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LocationCriterionService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LocationCriterionService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LocationCriterionService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LocationCriterionService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LocationCriterionServiceError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LocationCriterionServiceError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LocationExtensionOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LocationGroups</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LocationSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LocationTargetingStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LogicalUserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LogicalUserListOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LongAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LongComparisonOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LongRangeAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::LongValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ManagedCustomer</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ManagedCustomerLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ManagedCustomerLabelOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ManagedCustomerLabelReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ManagedCustomerLink</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ManagedCustomerOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ManagedCustomerPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ManagedCustomerReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ManagedCustomerService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ManagedCustomerService::ManagedCustomerServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ManagedCustomerService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ManagedCustomerService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ManagedCustomerService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ManagedCustomerService::getPendingInvitations</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ManagedCustomerService::getPendingInvitationsResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ManagedCustomerService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ManagedCustomerService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ManagedCustomerService::mutateLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ManagedCustomerService::mutateLabelResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ManagedCustomerService::mutateLink</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ManagedCustomerService::mutateLinkResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ManagedCustomerService::mutateManager</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ManagedCustomerService::mutateManagerResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ManagedCustomerService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ManagedCustomerServiceError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ManagedCustomerServiceError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ManualCpcBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ManualCpmBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Media</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Media::MediaType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Media::MimeType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Media::Size</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MediaBundle</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MediaBundleError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MediaBundleError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MediaError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MediaError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MediaPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MediaService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MediaService::MediaServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MediaService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MediaService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MediaService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MediaService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MediaService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MediaService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MediaService::upload</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MediaService::uploadResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Media_Size_DimensionsMapEntry</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Media_Size_StringMapEntry</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MinuteOfHour</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MobileAppCategory</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MobileApplication</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MobileDevice</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MobileDevice::DeviceType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Money</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MoneyAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MoneyWithCurrency</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MonthlySearchVolume</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MonthlySearchVolumeAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MoveOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MultiplierError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MultiplierError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MutateLinkResults</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MutateManagerResults</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MutateMembersError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MutateMembersError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MutateMembersOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MutateMembersOperand::DataType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MutateMembersOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MutateMembersReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::MutateResult</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::NegativeAdGroupCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::NegativeCampaignCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::NetworkSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::NetworkSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::NewEntityCreationError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::NewEntityCreationError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::NoStatsPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::NotEmptyError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::NotEmptyError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::NotWhitelistedError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::NotWhitelistedError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::NullError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::NullError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::NullStatsPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::NumberKey</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::NumberRuleItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::NumberRuleItem::NumberOperator</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::NumberValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::OAuthInfo</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::OfflineCallConversionError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::OfflineCallConversionError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::OfflineCallConversionFeed</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::OfflineCallConversionFeedOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::OfflineCallConversionFeedReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::OfflineCallConversionFeedService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::OfflineCallConversionFeedService::OfflineCallConversionFeedServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::OfflineCallConversionFeedService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::OfflineCallConversionFeedService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::OfflineCallConversionFeedService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::OfflineCallConversionFeedService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::OfflineConversionError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::OfflineConversionError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::OfflineConversionFeed</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::OfflineConversionFeedOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::OfflineConversionFeedReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::OfflineConversionFeedService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::OfflineConversionFeedService::OfflineConversionFeedServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::OfflineConversionFeedService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::OfflineConversionFeedService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::OfflineConversionFeedService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::OfflineConversionFeedService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Operand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::OperatingSystemVersion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::OperatingSystemVersion::OperatorType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Operation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::OperationAccessDenied</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::OperationAccessDenied::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Operator</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::OperatorError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::OperatorError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::OrderBy</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Page</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::PageOnePromotedBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::PageOnePromotedBiddingScheme::StrategyGoal</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Paging</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::PagingError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::PagingError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Parent</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Parent::ParentType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::PendingInvitation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::PendingInvitationSelector</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Placement</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::PlacesLocationFeedData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::PlacesOfInterestOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::PlacesOfInterestOperand::Category</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Platform</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::PlatformCampaignEstimate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::PolicyData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::PolicyTopicEntry</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::PolicyTopicEntryType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::PolicyTopicEvidence</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::PolicyTopicEvidenceType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::PolicyViolationError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::PolicyViolationError::Part</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::PolicyViolationKey</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Predicate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Predicate::Operator</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::PreferredContent</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::PriceExtensionPriceQualifier</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::PriceExtensionPriceUnit</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::PriceExtensionType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::PriceFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::PriceTableRow</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ProductAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ProductAdwordsGrouping</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ProductAdwordsLabels</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ProductBiddingCategory</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ProductBiddingCategoryData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ProductBrand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ProductCanonicalCondition</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ProductCanonicalCondition::Condition</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ProductChannel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ProductChannelExclusivity</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ProductCustomAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ProductDimension</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ProductDimensionType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ProductLegacyCondition</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ProductOfferId</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ProductPartition</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ProductPartitionType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ProductScope</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ProductType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ProductTypeFull</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ProgressStats</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Proximity</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Proximity::DistanceUnits</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::QualityInfo</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::QueryError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::QueryError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::QuotaCheckError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::QuotaCheckError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Range</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::RangeError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::RangeError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::RateExceededError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::RateExceededError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ReadOnlyError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ReadOnlyError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::RealTimeBiddingSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::RegionCodeError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::RegionCodeError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::RejectedError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::RejectedError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::RelatedToQuerySearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::RelatedToUrlSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::RemarketingSettings</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ReportDefinition::ReportType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ReportDefinitionError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ReportDefinitionError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ReportDefinitionField</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ReportDefinitionService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ReportDefinitionService::ReportDefinitionServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ReportDefinitionService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ReportDefinitionService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ReportDefinitionService::getReportFields</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ReportDefinitionService::getReportFieldsResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::RequestContextOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::RequestContextOperand::ContextType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::RequestError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::RequestError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::RequestType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::RequiredError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::RequiredError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ResponsiveDisplayAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ReviewFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::RichMediaAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::RichMediaAd::AdAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::RichMediaAd::RichMediaAdType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Rule</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::RuleBasedUserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::RuleItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::RuleItemGroup</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SearchVolumeSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SeedAdGroupIdSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SelectiveOptimization</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Selector</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SelectorError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SelectorError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ServiceLink</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ServiceLink::LinkStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ServiceLinkOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ServiceType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ServingStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Setting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SettingError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SettingError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedBiddingStrategy</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedBiddingStrategy::BiddingStrategyStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedCriterionError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedCriterionError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedCriterionOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedCriterionPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedCriterionReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedCriterionService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedCriterionService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedCriterionService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedCriterionService::SharedCriterionServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedCriterionService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedCriterionService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedCriterionService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedCriterionService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedCriterionService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedCriterionService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedSet</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedSet::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedSetError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedSetError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedSetOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedSetPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedSetReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedSetService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedSetService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedSetService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedSetService::SharedSetServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedSetService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedSetService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedSetService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedSetService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedSetService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedSetService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SharedSetType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ShoppingBiddingDimensionStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ShoppingProductChannel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ShoppingProductChannelExclusivity</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ShoppingSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SimilarUserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SitelinkFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SizeLimitError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SizeLimitError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SizeRange</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SoapHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SoapResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SortOrder</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::StatsEstimate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::StatsQueryError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::StatsQueryError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::StringAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::StringFormatError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::StringFormatError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::StringKey</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::StringLengthError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::StringLengthError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::StringRuleItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::StringRuleItem::StringOperator</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::String_StringMapEntry</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::StructuredSnippetFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SystemFeedGenerationData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::SystemServingStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TargetCpaBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TargetOutrankShareBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TargetRoasBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TargetSpendBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TargetingIdea</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TargetingIdeaError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TargetingIdeaError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TargetingIdeaPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TargetingIdeaSelector</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TargetingIdeaService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TargetingIdeaService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TargetingIdeaService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TargetingIdeaService::TargetingIdeaServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TargetingIdeaService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TargetingIdeaService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TargetingSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TargetingSettingDetail</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TempAdUnionId</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TemplateAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TemplateElement</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TemplateElementField</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TemplateElementField::Type</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TemporaryUrl</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TextAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TextLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ThirdPartyRedirectAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::ThirdPartyRedirectAd::ExpandingDirection</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TimeUnit</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrackingSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrafficEstimatorError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrafficEstimatorError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrafficEstimatorResult</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrafficEstimatorSelector</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrafficEstimatorService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrafficEstimatorService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrafficEstimatorService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrafficEstimatorService::TrafficEstimatorServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrafficEstimatorService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrafficEstimatorService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Trial</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrialAsyncError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrialAsyncErrorPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrialAsyncErrorService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrialAsyncErrorService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrialAsyncErrorService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrialAsyncErrorService::TrialAsyncErrorServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrialAsyncErrorService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrialAsyncErrorService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrialAsyncErrorService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrialAsyncErrorService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrialError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrialError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrialOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrialPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrialReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrialService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrialService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrialService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrialService::TrialServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrialService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrialService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrialService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrialService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrialService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrialService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TrialStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::AccountLabelService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::AdCustomizerFeedService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::AdGroupAdService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::AdGroupBidModifierService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::AdGroupCriterionService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::AdGroupExtensionSettingService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::AdGroupFeedService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::AdGroupService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::AdParamService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::AdwordsUserListService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::BatchJobOpsService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::BatchJobService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::BiddingStrategyService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::BudgetOrderService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::BudgetService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::CampaignCriterionService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::CampaignExtensionSettingService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::CampaignFeedService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::CampaignService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::CampaignSharedSetService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::ConstantDataService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::ConversionTrackerService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::CustomerExtensionSettingService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::CustomerFeedService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::CustomerService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::CustomerSyncService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::DataService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::DraftAsyncErrorService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::DraftService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::FeedItemService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::FeedMappingService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::FeedService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::LabelService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::LocationCriterionService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::ManagedCustomerService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::MediaService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::OfflineCallConversionFeedService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::OfflineConversionFeedService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::ReportDefinitionService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::SharedCriterionService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::SharedSetService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::TargetingIdeaService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::TrafficEstimatorService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::TrialAsyncErrorService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::TypeMaps::TrialService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Type_AttributeMapEntry</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::UniversalAppBiddingStrategyGoalType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::UniversalAppCampaignAdsPolicyDecisions</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::UniversalAppCampaignAsset</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::UniversalAppCampaignSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::UnknownProductDimension</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::UploadCallConversion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::UploadConversion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::UrlError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::UrlError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::UrlList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::UserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::UserListConversionType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::UserListConversionType::Category</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::UserListError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::UserListError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::UserListLogicalRule</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::UserListLogicalRule::Operator</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::UserListMembershipStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::UserListOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::UserListPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::UserListReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::UserListType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::UserStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::VanityPharma</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::VanityPharmaDisplayUrlMode</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::VanityPharmaText</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Vertical</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Video</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::VideoError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::VideoError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::VideoType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::Webpage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::WebpageCondition</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::WebpageConditionOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::WebpageDescriptor</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::WebpageDescriptorAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::WebpageParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::WebsiteCallMetricsConversion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::YouTubeChannel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201609::YouTubeVideo</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AccessReason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AccountLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AccountLabelOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AccountLabelPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AccountLabelReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AccountLabelService::AccountLabelServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AccountLabelService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AccountLabelService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AccountLabelService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AccountLabelService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AccountLabelService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AccountLabelService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AccountLabelService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AccountUserListStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Ad</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Ad::Type</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdCallMetricsConversion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdCustomizerError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdCustomizerError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdCustomizerFeed</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdCustomizerFeedAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdCustomizerFeedAttribute::Type</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdCustomizerFeedError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdCustomizerFeedError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdCustomizerFeedOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdCustomizerFeedPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdCustomizerFeedReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdCustomizerFeedService::AdCustomizerFeedServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdCustomizerFeedService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdCustomizerFeedService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdCustomizerFeedService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdCustomizerFeedService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdCustomizerFeedService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdCustomizerFeedService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdCustomizerFeedService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroup</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroup::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupAd::ApprovalStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupAd::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupAdCountLimitExceeded</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupAdError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupAdError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupAdLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupAdLabelOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupAdLabelReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupAdOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupAdPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupAdPolicySummary</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupAdReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupAdService::AdGroupAdServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupAdService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupAdService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupAdService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupAdService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupAdService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupAdService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupAdService::mutateLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupAdService::mutateLabelResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupAdService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupAdService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupAdService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupAdService::upgradeUrl</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupAdService::upgradeUrlResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupBidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupBidLandscape::Type</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupBidLandscapePage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupBidModifier</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupBidModifierOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupBidModifierPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupBidModifierReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupBidModifierService::AdGroupBidModifierServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupBidModifierService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupBidModifierService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupBidModifierService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupBidModifierService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupBidModifierService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupBidModifierService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupBidModifierService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupBidModifierService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupBidModifierService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupChangeData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupCriterionError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupCriterionError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupCriterionLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupCriterionLabelOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupCriterionLabelReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupCriterionLimitExceeded</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupCriterionLimitExceeded::CriteriaLimitType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupCriterionOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupCriterionPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupCriterionReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupCriterionService::AdGroupCriterionServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupCriterionService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupCriterionService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupCriterionService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupCriterionService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupCriterionService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupCriterionService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupCriterionService::mutateLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupCriterionService::mutateLabelResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupCriterionService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupCriterionService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupCriterionService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupEstimate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupEstimateRequest</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupExtensionSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupExtensionSettingOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupExtensionSettingPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupExtensionSettingReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupExtensionSettingService::AdGroupExtensionSettingServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupExtensionSettingService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupExtensionSettingService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupExtensionSettingService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupExtensionSettingService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupExtensionSettingService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupExtensionSettingService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupExtensionSettingService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupExtensionSettingService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupExtensionSettingService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupFeed</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupFeed::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupFeedError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupFeedError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupFeedOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupFeedPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupFeedReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupFeedService::AdGroupFeedServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupFeedService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupFeedService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupFeedService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupFeedService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupFeedService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupFeedService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupFeedService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupFeedService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupFeedService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupLabelOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupLabelReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupService::AdGroupServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupService::mutateLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupService::mutateLabelResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupServiceError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupServiceError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdGroupType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdParam</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdParamError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdParamError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdParamOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdParamPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdParamPolicyError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdParamService::AdParamServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdParamService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdParamService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdParamService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdParamService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdParamService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdParamService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdParamService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdSchedule</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdServingOptimizationStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdSharingError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdSharingError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdUnionId</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdUrlUpgrade</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdWordsConversionTracker</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdWordsConversionTracker::TextFormat</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdWordsConversionTracker::TrackingCodeType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Address</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdvertisingChannelSubType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdvertisingChannelType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdwordsUserListService::AdwordsUserListServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdwordsUserListService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdwordsUserListService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdwordsUserListService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdwordsUserListService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdwordsUserListService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdwordsUserListService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdwordsUserListService::mutateMembers</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdwordsUserListService::mutateMembersResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdwordsUserListService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdwordsUserListService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdwordsUserListService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdxError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AdxError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AffiliateLocationFeedData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AgeRange</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AgeRange::AgeRangeType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ApiError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ApiException</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AppConversion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AppConversion::AppConversionType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AppConversion::AppPlatform</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AppFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AppFeedItem::AppStore</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AppPaymentModel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AppPaymentModel::AppPaymentModelType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AppPostbackUrlError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AppPostbackUrlError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AppUrl</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AppUrl::OsType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AppUrlList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ApplicationException</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ApprovalStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Attribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AttributeFieldMapping</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AttributeType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AttributionModelType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Audio</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AudioError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AudioError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AuthenticationError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AuthenticationError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AuthorizationError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::AuthorizationError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BasicUserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BatchJob</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BatchJobError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BatchJobError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BatchJobOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BatchJobOpsService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BatchJobOpsService::BatchJobOpsServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BatchJobOpsService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BatchJobOpsService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BatchJobPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BatchJobProcessingError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BatchJobProcessingError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BatchJobReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BatchJobService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BatchJobService::BatchJobServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BatchJobService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BatchJobService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BatchJobService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BatchJobService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BatchJobService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BatchJobService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BatchJobService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BatchJobService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BatchJobStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Bid</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BidLandscape::LandscapePoint</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BidModifierSource</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BidSource</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BiddableAdGroupCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BiddingErrors</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BiddingErrors::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BiddingStrategyConfiguration</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BiddingStrategyError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BiddingStrategyError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BiddingStrategyOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BiddingStrategyPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BiddingStrategyReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BiddingStrategyService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BiddingStrategyService::BiddingStrategyServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BiddingStrategyService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BiddingStrategyService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BiddingStrategyService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BiddingStrategyService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BiddingStrategyService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BiddingStrategyService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BiddingStrategyService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BiddingStrategyService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BiddingStrategySource</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BiddingStrategyType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Bids</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BillingAccount</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BooleanAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Budget</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Budget::BudgetDeliveryMethod</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Budget::BudgetStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetOptimizerBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetOrder</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetOrderError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetOrderError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetOrderOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetOrderPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetOrderRequest</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetOrderRequest::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetOrderReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetOrderService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetOrderService::BudgetOrderServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetOrderService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetOrderService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetOrderService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetOrderService::getBillingAccounts</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetOrderService::getBillingAccountsResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetOrderService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetOrderService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetOrderService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetService::BudgetServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::BudgetService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CallConversionType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CallFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CallOnlyAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CalloutFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Campaign</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignChangeData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignCriterion::CampaignCriterionStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignCriterionError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignCriterionError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignCriterionOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignCriterionPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignCriterionReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignCriterionService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignCriterionService::CampaignCriterionServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignCriterionService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignCriterionService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignCriterionService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignCriterionService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignCriterionService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignCriterionService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignCriterionService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignCriterionService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignEstimate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignEstimateRequest</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignExtensionSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignExtensionSettingOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignExtensionSettingPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignExtensionSettingReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignExtensionSettingService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignExtensionSettingService::CampaignExtensionSettingServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignExtensionSettingService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignExtensionSettingService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignExtensionSettingService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignExtensionSettingService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignExtensionSettingService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignExtensionSettingService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignExtensionSettingService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignExtensionSettingService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignFeed</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignFeed::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignFeedError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignFeedError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignFeedOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignFeedPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignFeedReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignFeedService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignFeedService::CampaignFeedServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignFeedService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignFeedService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignFeedService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignFeedService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignFeedService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignFeedService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignFeedService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignFeedService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignLabelOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignLabelReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignPreferenceError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignPreferenceError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignService::CampaignServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignService::mutateLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignService::mutateLabelResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignSharedSet</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignSharedSet::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignSharedSetError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignSharedSetError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignSharedSetOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignSharedSetPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignSharedSetReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignSharedSetService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignSharedSetService::CampaignSharedSetServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignSharedSetService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignSharedSetService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignSharedSetService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignSharedSetService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignSharedSetService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignSharedSetService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignSharedSetService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignSharedSetService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CampaignTrialType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Carrier</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CategoryProductsAndServicesSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Chain</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ChangeStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ClientTermsError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ClientTermsError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CollectionSizeError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CollectionSizeError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ComparableValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CompetitionSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CompetitionSearchParameter::Level</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConstantData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConstantDataService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConstantDataService::ConstantDataServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConstantDataService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConstantDataService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConstantDataService::UserInterestTaxonomyType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConstantDataService::getAgeRangeCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConstantDataService::getAgeRangeCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConstantDataService::getCarrierCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConstantDataService::getCarrierCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConstantDataService::getGenderCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConstantDataService::getGenderCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConstantDataService::getLanguageCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConstantDataService::getLanguageCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConstantDataService::getMobileAppCategoryCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConstantDataService::getMobileAppCategoryCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConstantDataService::getMobileDeviceCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConstantDataService::getMobileDeviceCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConstantDataService::getOperatingSystemVersionCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConstantDataService::getOperatingSystemVersionCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConstantDataService::getProductBiddingCategoryData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConstantDataService::getProductBiddingCategoryDataResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConstantDataService::getUserInterestCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConstantDataService::getUserInterestCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConstantDataService::getVerticalCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConstantDataService::getVerticalCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConstantOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConstantOperand::ConstantType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConstantOperand::Unit</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ContentLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ContentLabelType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConversionDeduplicationMode</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConversionOptimizerBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConversionOptimizerBiddingScheme::BidType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConversionOptimizerBiddingScheme::PricingMode</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConversionOptimizerEligibility</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConversionOptimizerEligibility::RejectionReason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConversionTracker</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConversionTracker::Category</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConversionTracker::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConversionTrackerOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConversionTrackerPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConversionTrackerReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConversionTrackerService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConversionTrackerService::ConversionTrackerServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConversionTrackerService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConversionTrackerService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConversionTrackerService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConversionTrackerService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConversionTrackerService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConversionTrackerService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConversionTrackerService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConversionTrackerService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConversionTrackingError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConversionTrackingError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ConversionTrackingSettings</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CpaBid</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CpcBid</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CpmBid</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Criterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Criterion::Type</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CriterionAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CriterionBidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CriterionBidLandscapePage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CriterionError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CriterionError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CriterionParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CriterionPolicyError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CriterionTypeGroup</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CriterionUse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CriterionUserInterest</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CriterionUserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CriterionUserList::MembershipStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CrmBasedUserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CurrencyCodeError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CurrencyCodeError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomParameters</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Customer</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerChangeData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerExtensionSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerExtensionSettingOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerExtensionSettingPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerExtensionSettingReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerExtensionSettingService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerExtensionSettingService::CustomerExtensionSettingServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerExtensionSettingService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerExtensionSettingService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerExtensionSettingService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerExtensionSettingService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerExtensionSettingService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerExtensionSettingService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerExtensionSettingService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerExtensionSettingService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerFeed</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerFeed::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerFeedError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerFeedError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerFeedOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerFeedPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerFeedReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerFeedService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerFeedService::CustomerFeedServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerFeedService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerFeedService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerFeedService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerFeedService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerFeedService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerFeedService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerFeedService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerFeedService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerOrderLineError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerOrderLineError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerService::CustomerServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerService::getCustomers</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerService::getCustomersResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerService::getServiceLinks</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerService::getServiceLinksResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerService::mutateServiceLinks</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerService::mutateServiceLinksResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerSyncError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerSyncError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerSyncSelector</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerSyncService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerSyncService::CustomerSyncServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerSyncService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerSyncService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerSyncService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::CustomerSyncService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DataDrivenModelStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DataEntry</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DataError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DataError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DataService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DataService::DataServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DataService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DataService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DataService::getAdGroupBidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DataService::getAdGroupBidLandscapeResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DataService::getCampaignCriterionBidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DataService::getCampaignCriterionBidLandscapeResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DataService::getCriterionBidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DataService::getCriterionBidLandscapeResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DataService::getDomainCategory</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DataService::getDomainCategoryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DataService::queryAdGroupBidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DataService::queryAdGroupBidLandscapeResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DataService::queryCampaignCriterionBidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DataService::queryCampaignCriterionBidLandscapeResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DataService::queryCriterionBidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DataService::queryCriterionBidLandscapeResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DataService::queryDomainCategory</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DataService::queryDomainCategoryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DataUploadResult</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DatabaseError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DatabaseError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Date</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DateError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DateError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DateKey</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DateRange</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DateRangeError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DateRangeError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DateRuleItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DateRuleItem::DateOperator</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DateSpecificRuleUserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DateTimeRange</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DayOfWeek</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DeprecatedAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DeprecatedAd::Type</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DimensionProperties</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Dimensions</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DisapprovalReason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DisplayAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DistinctError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DistinctError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DomainCategory</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DomainCategoryPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DoubleAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DoubleValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Draft</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DraftAsyncError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DraftAsyncErrorPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DraftAsyncErrorService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DraftAsyncErrorService::DraftAsyncErrorServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DraftAsyncErrorService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DraftAsyncErrorService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DraftAsyncErrorService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DraftAsyncErrorService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DraftAsyncErrorService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DraftAsyncErrorService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DraftError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DraftError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DraftOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DraftPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DraftReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DraftService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DraftService::DraftServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DraftService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DraftService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DraftService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DraftService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DraftService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DraftService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DraftService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DraftService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DraftStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DynamicSearchAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::DynamicSearchAdsSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::EnhancedCpcBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::EntityAccessDenied</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::EntityAccessDenied::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::EntityCountLimitExceeded</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::EntityCountLimitExceeded::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::EntityNotFound</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::EntityNotFound::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::EnumValuePair</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ErrorList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Estimate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::EstimateRequest</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ExemptionRequest</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ExpandedTextAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ExplorerAutoOptimizerSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ExpressionRuleUserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ExtensionFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ExtensionSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ExtensionSetting::Platform</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ExtensionSettingError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ExtensionSettingError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Feed</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Feed::Origin</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Feed::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Feed::Type</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedAttribute::Type</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedAttributeOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedAttributeReferenceError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedAttributeReferenceError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedChangeData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedItem::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedItemAdGroupTargeting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedItemApprovalStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedItemAttributeError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedItemAttributeValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedItemCampaignTargeting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedItemDevicePreference</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedItemError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedItemError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedItemGeoRestriction</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedItemOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedItemPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedItemPolicyData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedItemQualityApprovalStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedItemQualityDisapprovalReasons</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedItemReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedItemSchedule</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedItemScheduling</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedItemService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedItemService::FeedItemServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedItemService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedItemService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedItemService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedItemService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedItemService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedItemService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedItemService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedItemService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedItemValidationStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedMapping</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedMapping::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedMappingError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedMappingError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedMappingOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedMappingPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedMappingReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedMappingService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedMappingService::FeedMappingServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedMappingService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedMappingService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedMappingService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedMappingService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedMappingService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedMappingService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedMappingService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedMappingService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedService::FeedServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FeedService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FieldPathElement</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ForwardCompatibilityError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ForwardCompatibilityError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FrequencyCap</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Function</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Function::Operator</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FunctionArgumentOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FunctionError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FunctionError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FunctionOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FunctionParsingError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::FunctionParsingError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Gender</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Gender::GenderType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::GeoPoint</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::GeoRestriction</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::GeoTargetOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::GeoTargetTypeSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::GeoTargetTypeSetting::NegativeGeoTargetType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::GeoTargetTypeSetting::PositiveGeoTargetType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::IdError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::IdError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::IdeaTextFilterSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::IdeaType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::IdeaTypeAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Image</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ImageAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ImageError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ImageError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::IncludeAdultContentSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::IncomeOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::IncomeTier</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::IntegerAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::IntegerSetAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::InternalApiError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::InternalApiError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::IpBlock</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Keyword</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::KeywordAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::KeywordEstimate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::KeywordEstimateRequest</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::KeywordMatchType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Label</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Label::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LabelAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LabelError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LabelError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LabelOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LabelPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LabelReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LabelService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LabelService::LabelServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LabelService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LabelService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LabelService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LabelService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LabelService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LabelService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LabelService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LabelService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LabelServiceError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LabelServiceError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Language</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LanguageSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Level</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LevelOfDetail</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LinkOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LinkStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ListError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ListError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ListOperations</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ListOperations::ListOperator</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ListReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Location</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LocationCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LocationCriterionService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LocationCriterionService::LocationCriterionServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LocationCriterionService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LocationCriterionService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LocationCriterionService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LocationCriterionService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LocationCriterionService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LocationCriterionService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LocationCriterionServiceError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LocationCriterionServiceError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LocationExtensionOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LocationGroups</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LocationSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LocationTargetingStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LogicalUserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LogicalUserListOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LongAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LongComparisonOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LongRangeAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::LongValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ManagedCustomer</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ManagedCustomerLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ManagedCustomerLabelOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ManagedCustomerLabelReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ManagedCustomerLink</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ManagedCustomerOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ManagedCustomerPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ManagedCustomerReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ManagedCustomerService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ManagedCustomerService::ManagedCustomerServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ManagedCustomerService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ManagedCustomerService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ManagedCustomerService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ManagedCustomerService::getPendingInvitations</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ManagedCustomerService::getPendingInvitationsResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ManagedCustomerService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ManagedCustomerService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ManagedCustomerService::mutateLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ManagedCustomerService::mutateLabelResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ManagedCustomerService::mutateLink</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ManagedCustomerService::mutateLinkResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ManagedCustomerService::mutateManager</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ManagedCustomerService::mutateManagerResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ManagedCustomerService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ManagedCustomerServiceError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ManagedCustomerServiceError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ManualCpcBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ManualCpmBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Media</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Media::MediaType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Media::MimeType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Media::Size</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MediaBundle</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MediaBundleError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MediaBundleError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MediaError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MediaError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MediaPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MediaService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MediaService::MediaServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MediaService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MediaService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MediaService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MediaService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MediaService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MediaService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MediaService::upload</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MediaService::uploadResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Media_Size_DimensionsMapEntry</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Media_Size_StringMapEntry</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MessageFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MinuteOfHour</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MobileAppCategory</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MobileApplication</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MobileDevice</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MobileDevice::DeviceType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Money</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MoneyAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MoneyWithCurrency</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MonthlySearchVolume</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MonthlySearchVolumeAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MoveOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MultiplierError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MultiplierError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MutateLinkResults</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MutateManagerResults</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MutateMembersError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MutateMembersError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MutateMembersOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MutateMembersOperand::DataType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MutateMembersOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MutateMembersReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::MutateResult</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::NegativeAdGroupCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::NegativeCampaignCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::NetworkSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::NetworkSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::NewEntityCreationError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::NewEntityCreationError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::NoStatsPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::NotEmptyError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::NotEmptyError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::NotWhitelistedError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::NotWhitelistedError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::NullError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::NullError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::NullStatsPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::NumberKey</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::NumberRuleItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::NumberRuleItem::NumberOperator</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::NumberValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::OAuthInfo</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::OfflineCallConversionError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::OfflineCallConversionError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::OfflineCallConversionFeed</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::OfflineCallConversionFeedOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::OfflineCallConversionFeedReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::OfflineCallConversionFeedService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::OfflineCallConversionFeedService::OfflineCallConversionFeedServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::OfflineCallConversionFeedService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::OfflineCallConversionFeedService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::OfflineCallConversionFeedService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::OfflineCallConversionFeedService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::OfflineConversionError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::OfflineConversionError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::OfflineConversionFeed</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::OfflineConversionFeedOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::OfflineConversionFeedReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::OfflineConversionFeedService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::OfflineConversionFeedService::OfflineConversionFeedServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::OfflineConversionFeedService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::OfflineConversionFeedService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::OfflineConversionFeedService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::OfflineConversionFeedService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Operand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::OperatingSystemVersion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::OperatingSystemVersion::OperatorType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Operation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::OperationAccessDenied</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::OperationAccessDenied::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Operator</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::OperatorError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::OperatorError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::OrderBy</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Page</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::PageOnePromotedBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::PageOnePromotedBiddingScheme::StrategyGoal</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Paging</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::PagingError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::PagingError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Parent</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Parent::ParentType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::PendingInvitation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::PendingInvitationSelector</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Placement</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::PlacesLocationFeedData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::PlacesOfInterestOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::PlacesOfInterestOperand::Category</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Platform</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::PlatformCampaignEstimate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::PolicyApprovalStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::PolicyData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::PolicySummaryDenormalizedStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::PolicySummaryReviewState</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::PolicyTopicEntry</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::PolicyTopicEntryType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::PolicyTopicEvidence</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::PolicyTopicEvidenceType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::PolicyViolationError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::PolicyViolationError::Part</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::PolicyViolationKey</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Predicate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Predicate::Operator</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::PreferredContent</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::PriceExtensionPriceQualifier</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::PriceExtensionPriceUnit</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::PriceExtensionType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::PriceFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::PriceTableRow</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ProductAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ProductAdwordsGrouping</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ProductAdwordsLabels</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ProductBiddingCategory</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ProductBiddingCategoryData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ProductBrand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ProductCanonicalCondition</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ProductCanonicalCondition::Condition</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ProductChannel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ProductChannelExclusivity</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ProductCustomAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ProductDimension</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ProductDimensionType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ProductLegacyCondition</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ProductOfferId</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ProductPartition</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ProductPartitionType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ProductScope</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ProductType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ProductTypeFull</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ProgressStats</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Proximity</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Proximity::DistanceUnits</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::QualityInfo</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::QueryError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::QueryError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::QuotaCheckError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::QuotaCheckError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Range</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::RangeError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::RangeError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::RateExceededError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::RateExceededError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ReadOnlyError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ReadOnlyError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::RealTimeBiddingSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::RegionCodeError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::RegionCodeError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::RejectedError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::RejectedError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::RelatedToQuerySearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::RelatedToUrlSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::RelationshipType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::RelativeDate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::RemarketingSettings</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ReportDefinition::ReportType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ReportDefinitionError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ReportDefinitionError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ReportDefinitionField</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ReportDefinitionService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ReportDefinitionService::ReportDefinitionServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ReportDefinitionService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ReportDefinitionService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ReportDefinitionService::getReportFields</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ReportDefinitionService::getReportFieldsResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::RequestContextOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::RequestContextOperand::ContextType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::RequestError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::RequestError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::RequestType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::RequiredError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::RequiredError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ResponsiveDisplayAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ReviewFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::RichMediaAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::RichMediaAd::AdAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::RichMediaAd::RichMediaAdType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Rule</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::RuleBasedUserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::RuleBasedUserList::PrepopulationStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::RuleItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::RuleItemGroup</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SearchVolumeSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SeedAdGroupIdSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SelectiveOptimization</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Selector</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SelectorError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SelectorError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ServiceLink</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ServiceLink::LinkStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ServiceLinkOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ServiceType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ServingStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Setting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SettingError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SettingError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedBiddingStrategy</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedBiddingStrategy::BiddingStrategyStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedCriterionError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedCriterionError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedCriterionOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedCriterionPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedCriterionReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedCriterionService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedCriterionService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedCriterionService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedCriterionService::SharedCriterionServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedCriterionService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedCriterionService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedCriterionService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedCriterionService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedCriterionService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedCriterionService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedSet</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedSet::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedSetError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedSetError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedSetOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedSetPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedSetReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedSetService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedSetService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedSetService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedSetService::SharedSetServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedSetService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedSetService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedSetService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedSetService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedSetService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedSetService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SharedSetType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ShoppingBiddingDimensionStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ShoppingProductChannel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ShoppingProductChannelExclusivity</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ShoppingSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ShowcaseAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SimilarUserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SitelinkFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SizeLimitError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SizeLimitError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SizeRange</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SoapHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SoapResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SortOrder</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::StatsEstimate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::StatsQueryError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::StatsQueryError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::StringAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::StringFormatError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::StringFormatError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::StringKey</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::StringLengthError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::StringLengthError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::StringRuleItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::StringRuleItem::StringOperator</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::String_StringMapEntry</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::StructuredSnippetFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SystemFeedGenerationData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::SystemServingStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TargetCpaBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TargetOutrankShareBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TargetRoasBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TargetSpendBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TargetingIdea</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TargetingIdeaError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TargetingIdeaError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TargetingIdeaPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TargetingIdeaSelector</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TargetingIdeaService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TargetingIdeaService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TargetingIdeaService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TargetingIdeaService::TargetingIdeaServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TargetingIdeaService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TargetingIdeaService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TargetingSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TargetingSettingDetail</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TempAdUnionId</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TemplateAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TemplateElement</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TemplateElementField</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TemplateElementField::Type</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TemporaryUrl</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TextAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TextLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ThirdPartyRedirectAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::ThirdPartyRedirectAd::ExpandingDirection</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TimeUnit</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrackingSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrafficEstimatorError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrafficEstimatorError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrafficEstimatorResult</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrafficEstimatorSelector</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrafficEstimatorService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrafficEstimatorService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrafficEstimatorService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrafficEstimatorService::TrafficEstimatorServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrafficEstimatorService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrafficEstimatorService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Trial</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrialAsyncError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrialAsyncErrorPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrialAsyncErrorService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrialAsyncErrorService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrialAsyncErrorService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrialAsyncErrorService::TrialAsyncErrorServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrialAsyncErrorService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrialAsyncErrorService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrialAsyncErrorService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrialAsyncErrorService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrialError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrialError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrialOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrialPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrialReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrialService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrialService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrialService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrialService::TrialServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrialService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrialService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrialService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrialService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrialService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrialService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TrialStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::AccountLabelService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::AdCustomizerFeedService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::AdGroupAdService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::AdGroupBidModifierService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::AdGroupCriterionService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::AdGroupExtensionSettingService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::AdGroupFeedService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::AdGroupService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::AdParamService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::AdwordsUserListService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::BatchJobOpsService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::BatchJobService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::BiddingStrategyService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::BudgetOrderService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::BudgetService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::CampaignCriterionService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::CampaignExtensionSettingService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::CampaignFeedService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::CampaignService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::CampaignSharedSetService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::ConstantDataService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::ConversionTrackerService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::CustomerExtensionSettingService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::CustomerFeedService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::CustomerService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::CustomerSyncService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::DataService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::DraftAsyncErrorService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::DraftService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::FeedItemService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::FeedMappingService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::FeedService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::LabelService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::LocationCriterionService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::ManagedCustomerService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::MediaService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::OfflineCallConversionFeedService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::OfflineConversionFeedService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::ReportDefinitionService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::SharedCriterionService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::SharedSetService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::TargetingIdeaService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::TrafficEstimatorService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::TrialAsyncErrorService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::TypeMaps::TrialService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Type_AttributeMapEntry</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::UniversalAppBiddingStrategyGoalType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::UniversalAppCampaignAdsPolicyDecisions</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::UniversalAppCampaignAsset</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::UniversalAppCampaignSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::UnknownProductDimension</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::UploadCallConversion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::UploadConversion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::UrlData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::UrlError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::UrlError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::UrlList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::UserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::UserListClosingReason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::UserListConversionType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::UserListConversionType::Category</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::UserListError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::UserListError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::UserListLogicalRule</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::UserListLogicalRule::Operator</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::UserListMembershipStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::UserListOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::UserListPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::UserListReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::UserListType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::UserListUploadStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::UserStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::VanityPharma</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::VanityPharmaDisplayUrlMode</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::VanityPharmaText</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Vertical</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Video</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::VideoError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::VideoError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::VideoType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::Webpage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::WebpageCondition</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::WebpageConditionOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::WebpageDescriptor</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::WebpageDescriptorAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::WebpageParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::WebsiteCallMetricsConversion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::YouTubeChannel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201702::YouTubeVideo</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AccessReason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AccountLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AccountLabelOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AccountLabelPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AccountLabelReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AccountLabelService::AccountLabelServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AccountLabelService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AccountLabelService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AccountLabelService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AccountLabelService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AccountLabelService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AccountLabelService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AccountLabelService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AccountUserListStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Ad</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Ad::Type</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdCallMetricsConversion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdCustomizerError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdCustomizerError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdCustomizerFeed</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdCustomizerFeedAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdCustomizerFeedAttribute::Type</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdCustomizerFeedError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdCustomizerFeedError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdCustomizerFeedOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdCustomizerFeedPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdCustomizerFeedReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdCustomizerFeedService::AdCustomizerFeedServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdCustomizerFeedService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdCustomizerFeedService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdCustomizerFeedService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdCustomizerFeedService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdCustomizerFeedService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdCustomizerFeedService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdCustomizerFeedService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroup</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroup::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupAd::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupAdCountLimitExceeded</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupAdError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupAdError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupAdLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupAdLabelOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupAdLabelReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupAdOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupAdPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupAdPolicySummary</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupAdReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupAdService::AdGroupAdServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupAdService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupAdService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupAdService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupAdService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupAdService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupAdService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupAdService::mutateLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupAdService::mutateLabelResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupAdService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupAdService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupAdService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupAdService::upgradeUrl</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupAdService::upgradeUrlResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupBidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupBidLandscape::Type</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupBidLandscapePage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupBidModifier</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupBidModifierOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupBidModifierPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupBidModifierReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupBidModifierService::AdGroupBidModifierServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupBidModifierService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupBidModifierService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupBidModifierService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupBidModifierService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupBidModifierService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupBidModifierService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupBidModifierService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupBidModifierService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupBidModifierService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupChangeData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupCriterionError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupCriterionError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupCriterionLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupCriterionLabelOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupCriterionLabelReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupCriterionLimitExceeded</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupCriterionLimitExceeded::CriteriaLimitType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupCriterionOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupCriterionPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupCriterionReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupCriterionService::AdGroupCriterionServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupCriterionService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupCriterionService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupCriterionService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupCriterionService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupCriterionService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupCriterionService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupCriterionService::mutateLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupCriterionService::mutateLabelResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupCriterionService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupCriterionService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupCriterionService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupEstimate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupEstimateRequest</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupExtensionSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupExtensionSettingOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupExtensionSettingPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupExtensionSettingReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupExtensionSettingService::AdGroupExtensionSettingServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupExtensionSettingService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupExtensionSettingService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupExtensionSettingService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupExtensionSettingService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupExtensionSettingService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupExtensionSettingService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupExtensionSettingService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupExtensionSettingService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupExtensionSettingService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupFeed</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupFeed::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupFeedError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupFeedError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupFeedOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupFeedPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupFeedReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupFeedService::AdGroupFeedServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupFeedService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupFeedService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupFeedService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupFeedService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupFeedService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupFeedService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupFeedService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupFeedService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupFeedService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupLabelOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupLabelReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupService::AdGroupServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupService::mutateLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupService::mutateLabelResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupServiceError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupServiceError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdGroupType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdParam</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdParamError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdParamError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdParamOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdParamPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdParamPolicyError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdParamService::AdParamServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdParamService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdParamService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdParamService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdParamService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdParamService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdParamService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdParamService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdSchedule</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdServingOptimizationStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdSharingError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdSharingError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdUnionId</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdUrlUpgrade</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdWordsConversionTracker</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdWordsConversionTracker::TextFormat</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdWordsConversionTracker::TrackingCodeType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Address</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AddressInfo</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdvertisingChannelSubType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdvertisingChannelType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdwordsUserListService::AdwordsUserListServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdwordsUserListService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdwordsUserListService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdwordsUserListService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdwordsUserListService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdwordsUserListService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdwordsUserListService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdwordsUserListService::mutateMembers</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdwordsUserListService::mutateMembersResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdwordsUserListService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdwordsUserListService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdwordsUserListService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdxError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AdxError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AffiliateLocationFeedData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AgeRange</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AgeRange::AgeRangeType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ApiError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ApiException</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AppConversion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AppConversion::AppConversionType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AppConversion::AppPlatform</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AppFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AppFeedItem::AppStore</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AppPaymentModel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AppPaymentModel::AppPaymentModelType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AppPostbackUrlError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AppPostbackUrlError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AppUrl</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AppUrl::OsType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AppUrlList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ApplicationException</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ApprovalStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Attribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AttributeFieldMapping</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AttributeType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AttributionModelType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Audio</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AudioError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AudioError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AuthenticationError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AuthenticationError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AuthorizationError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::AuthorizationError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BasicUserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BatchJob</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BatchJobError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BatchJobError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BatchJobOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BatchJobOpsService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BatchJobOpsService::BatchJobOpsServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BatchJobOpsService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BatchJobOpsService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BatchJobPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BatchJobProcessingError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BatchJobProcessingError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BatchJobReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BatchJobService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BatchJobService::BatchJobServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BatchJobService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BatchJobService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BatchJobService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BatchJobService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BatchJobService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BatchJobService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BatchJobService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BatchJobService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BatchJobStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Bid</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BidLandscape::LandscapePoint</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BidModifierSource</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BidSource</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BiddableAdGroupCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BiddingErrors</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BiddingErrors::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BiddingStrategyConfiguration</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BiddingStrategyError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BiddingStrategyError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BiddingStrategyOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BiddingStrategyPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BiddingStrategyReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BiddingStrategyService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BiddingStrategyService::BiddingStrategyServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BiddingStrategyService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BiddingStrategyService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BiddingStrategyService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BiddingStrategyService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BiddingStrategyService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BiddingStrategyService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BiddingStrategyService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BiddingStrategyService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BiddingStrategySource</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BiddingStrategyType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Bids</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BillingAccount</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BooleanAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Budget</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Budget::BudgetDeliveryMethod</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Budget::BudgetStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetOrder</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetOrderError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetOrderError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetOrderOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetOrderPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetOrderRequest</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetOrderRequest::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetOrderReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetOrderService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetOrderService::BudgetOrderServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetOrderService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetOrderService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetOrderService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetOrderService::getBillingAccounts</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetOrderService::getBillingAccountsResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetOrderService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetOrderService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetOrderService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetService::BudgetServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::BudgetService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CallConversionType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CallFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CallOnlyAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CalloutFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Campaign</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignBidModifier</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignBidModifierError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignBidModifierError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignBidModifierOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignBidModifierPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignBidModifierReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignBidModifierService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignBidModifierService::CampaignBidModifierServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignBidModifierService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignBidModifierService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignBidModifierService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignBidModifierService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignBidModifierService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignBidModifierService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignChangeData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignCriterion::CampaignCriterionStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignCriterionError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignCriterionError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignCriterionOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignCriterionPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignCriterionReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignCriterionService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignCriterionService::CampaignCriterionServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignCriterionService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignCriterionService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignCriterionService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignCriterionService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignCriterionService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignCriterionService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignCriterionService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignCriterionService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignEstimate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignEstimateRequest</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignExtensionSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignExtensionSettingOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignExtensionSettingPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignExtensionSettingReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignExtensionSettingService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignExtensionSettingService::CampaignExtensionSettingServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignExtensionSettingService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignExtensionSettingService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignExtensionSettingService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignExtensionSettingService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignExtensionSettingService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignExtensionSettingService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignExtensionSettingService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignExtensionSettingService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignFeed</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignFeed::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignFeedError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignFeedError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignFeedOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignFeedPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignFeedReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignFeedService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignFeedService::CampaignFeedServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignFeedService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignFeedService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignFeedService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignFeedService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignFeedService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignFeedService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignFeedService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignFeedService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignGroup</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignGroupError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignGroupError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignGroupOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignGroupPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignGroupPerformanceTarget</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignGroupPerformanceTargetError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignGroupPerformanceTargetError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignGroupPerformanceTargetOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignGroupPerformanceTargetPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignGroupPerformanceTargetReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignGroupPerformanceTargetService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignGroupPerformanceTargetService::CampaignGroupPerformanceTargetServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignGroupPerformanceTargetService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignGroupPerformanceTargetService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignGroupPerformanceTargetService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignGroupPerformanceTargetService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignGroupPerformanceTargetService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignGroupPerformanceTargetService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignGroupReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignGroupService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignGroupService::CampaignGroupServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignGroupService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignGroupService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignGroupService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignGroupService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignGroupService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignGroupService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignGroupStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignLabelOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignLabelReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignPreferenceError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignPreferenceError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignService::CampaignServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignService::mutateLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignService::mutateLabelResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignSharedSet</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignSharedSet::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignSharedSetError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignSharedSetError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignSharedSetOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignSharedSetPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignSharedSetReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignSharedSetService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignSharedSetService::CampaignSharedSetServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignSharedSetService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignSharedSetService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignSharedSetService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignSharedSetService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignSharedSetService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignSharedSetService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignSharedSetService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignSharedSetService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CampaignTrialType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Carrier</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CategoryProductsAndServicesSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Chain</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ChangeStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ClientTermsError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ClientTermsError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CollectionSizeError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CollectionSizeError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ComparableValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CompetitionSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CompetitionSearchParameter::Level</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConstantData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConstantDataService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConstantDataService::ConstantDataServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConstantDataService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConstantDataService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConstantDataService::UserInterestTaxonomyType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConstantDataService::getAgeRangeCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConstantDataService::getAgeRangeCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConstantDataService::getCarrierCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConstantDataService::getCarrierCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConstantDataService::getGenderCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConstantDataService::getGenderCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConstantDataService::getLanguageCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConstantDataService::getLanguageCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConstantDataService::getMobileAppCategoryCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConstantDataService::getMobileAppCategoryCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConstantDataService::getMobileDeviceCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConstantDataService::getMobileDeviceCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConstantDataService::getOperatingSystemVersionCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConstantDataService::getOperatingSystemVersionCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConstantDataService::getProductBiddingCategoryData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConstantDataService::getProductBiddingCategoryDataResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConstantDataService::getUserInterestCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConstantDataService::getUserInterestCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConstantDataService::getVerticalCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConstantDataService::getVerticalCriterionResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConstantOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConstantOperand::ConstantType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConstantOperand::Unit</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ContentLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ContentLabelType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConversionDeduplicationMode</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConversionOptimizerEligibility</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConversionOptimizerEligibility::RejectionReason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConversionTracker</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConversionTracker::Category</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConversionTracker::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConversionTrackerOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConversionTrackerPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConversionTrackerReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConversionTrackerService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConversionTrackerService::ConversionTrackerServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConversionTrackerService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConversionTrackerService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConversionTrackerService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConversionTrackerService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConversionTrackerService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConversionTrackerService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConversionTrackerService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConversionTrackerService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConversionTrackingError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConversionTrackingError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ConversionTrackingSettings</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CountryConstraint</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CpaBid</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CpcBid</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CpmBid</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Criterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Criterion::Type</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CriterionAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CriterionBidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CriterionBidLandscapePage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CriterionError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CriterionError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CriterionParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CriterionPolicyError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CriterionTypeGroup</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CriterionUse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CriterionUserInterest</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CriterionUserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CriterionUserList::MembershipStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CrmBasedUserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CurrencyCodeError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CurrencyCodeError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomParameters</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Customer</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerChangeData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerExtensionSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerExtensionSettingOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerExtensionSettingPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerExtensionSettingReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerExtensionSettingService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerExtensionSettingService::CustomerExtensionSettingServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerExtensionSettingService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerExtensionSettingService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerExtensionSettingService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerExtensionSettingService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerExtensionSettingService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerExtensionSettingService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerExtensionSettingService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerExtensionSettingService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerFeed</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerFeed::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerFeedError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerFeedError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerFeedOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerFeedPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerFeedReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerFeedService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerFeedService::CustomerFeedServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerFeedService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerFeedService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerFeedService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerFeedService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerFeedService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerFeedService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerFeedService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerFeedService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerOrderLineError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerOrderLineError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerService::CustomerServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerService::getCustomers</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerService::getCustomersResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerService::getServiceLinks</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerService::getServiceLinksResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerService::mutateServiceLinks</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerService::mutateServiceLinksResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerSyncError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerSyncError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerSyncSelector</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerSyncService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerSyncService::CustomerSyncServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerSyncService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerSyncService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerSyncService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::CustomerSyncService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DataDrivenModelStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DataEntry</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DataError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DataError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DataService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DataService::DataServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DataService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DataService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DataService::getAdGroupBidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DataService::getAdGroupBidLandscapeResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DataService::getCampaignCriterionBidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DataService::getCampaignCriterionBidLandscapeResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DataService::getCriterionBidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DataService::getCriterionBidLandscapeResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DataService::getDomainCategory</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DataService::getDomainCategoryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DataService::queryAdGroupBidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DataService::queryAdGroupBidLandscapeResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DataService::queryCampaignCriterionBidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DataService::queryCampaignCriterionBidLandscapeResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DataService::queryCriterionBidLandscape</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DataService::queryCriterionBidLandscapeResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DataService::queryDomainCategory</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DataService::queryDomainCategoryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DataUploadResult</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DatabaseError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DatabaseError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Date</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DateError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DateError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DateKey</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DateRange</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DateRangeError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DateRangeError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DateRuleItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DateRuleItem::DateOperator</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DateSpecificRuleUserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DateTimeRange</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DayOfWeek</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DeprecatedAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DeprecatedAd::Type</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DimensionProperties</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Dimensions</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DisapprovalReason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DisplayAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DistinctError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DistinctError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DomainCategory</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DomainCategoryPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DoubleAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DoubleValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Draft</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DraftAsyncError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DraftAsyncErrorPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DraftAsyncErrorService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DraftAsyncErrorService::DraftAsyncErrorServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DraftAsyncErrorService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DraftAsyncErrorService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DraftAsyncErrorService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DraftAsyncErrorService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DraftAsyncErrorService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DraftAsyncErrorService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DraftError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DraftError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DraftOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DraftPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DraftReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DraftService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DraftService::DraftServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DraftService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DraftService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DraftService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DraftService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DraftService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DraftService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DraftService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DraftService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DraftStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DynamicSearchAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::DynamicSearchAdsSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::EfficiencyTargetType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::EnhancedCpcBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::EntityAccessDenied</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::EntityAccessDenied::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::EntityCountLimitExceeded</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::EntityCountLimitExceeded::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::EntityNotFound</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::EntityNotFound::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::EnumValuePair</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ErrorList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Estimate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::EstimateRequest</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ExemptionRequest</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ExpandedDynamicSearchAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ExpandedTextAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ExplorerAutoOptimizerSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ExpressionRuleUserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ExtensionFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ExtensionSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ExtensionSetting::Platform</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ExtensionSettingError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ExtensionSettingError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Feed</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Feed::Origin</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Feed::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Feed::Type</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedAttribute::Type</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedAttributeOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedAttributeReferenceError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedAttributeReferenceError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedChangeData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedItem::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedItemAdGroupTargeting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedItemApprovalStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedItemAttributeError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedItemAttributeValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedItemCampaignTargeting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedItemDevicePreference</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedItemError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedItemError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedItemGeoRestriction</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedItemOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedItemPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedItemPolicyData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedItemQualityApprovalStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedItemQualityDisapprovalReasons</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedItemReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedItemSchedule</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedItemScheduling</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedItemService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedItemService::FeedItemServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedItemService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedItemService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedItemService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedItemService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedItemService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedItemService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedItemService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedItemService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedItemValidationStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedMapping</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedMapping::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedMappingError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedMappingError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedMappingOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedMappingPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedMappingReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedMappingService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedMappingService::FeedMappingServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedMappingService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedMappingService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedMappingService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedMappingService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedMappingService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedMappingService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedMappingService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedMappingService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedService::FeedServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FeedService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FieldPathElement</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ForwardCompatibilityError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ForwardCompatibilityError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FrequencyCap</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Function</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Function::Operator</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FunctionArgumentOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FunctionError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FunctionError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FunctionOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FunctionParsingError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::FunctionParsingError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Gender</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Gender::GenderType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::GeoPoint</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::GeoRestriction</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::GeoTargetOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::GeoTargetTypeSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::GeoTargetTypeSetting::NegativeGeoTargetType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::GeoTargetTypeSetting::PositiveGeoTargetType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::IdError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::IdError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::IdeaTextFilterSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::IdeaType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::IdeaTypeAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Image</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ImageAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ImageError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ImageError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::IncludeAdultContentSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::IncomeOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::IncomeTier</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::IntegerAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::IntegerSetAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::InteractionType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::InternalApiError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::InternalApiError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::IpBlock</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Keyword</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::KeywordAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::KeywordEstimate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::KeywordEstimateRequest</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::KeywordMatchType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Label</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Label::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LabelAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LabelError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LabelError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LabelOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LabelPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LabelReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LabelService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LabelService::LabelServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LabelService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LabelService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LabelService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LabelService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LabelService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LabelService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LabelService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LabelService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LabelServiceError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LabelServiceError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Language</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LanguageSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Level</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LevelOfDetail</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LinkOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LinkStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ListError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ListError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ListOperations</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ListOperations::ListOperator</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ListReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Location</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LocationCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LocationCriterionService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LocationCriterionService::LocationCriterionServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LocationCriterionService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LocationCriterionService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LocationCriterionService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LocationCriterionService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LocationCriterionService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LocationCriterionService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LocationCriterionServiceError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LocationCriterionServiceError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LocationExtensionOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LocationGroups</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LocationSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LocationTargetingStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LogicalUserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LogicalUserListOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LongAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LongComparisonOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LongRangeAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::LongValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ManagedCustomer</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ManagedCustomerLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ManagedCustomerLabelOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ManagedCustomerLabelReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ManagedCustomerLink</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ManagedCustomerOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ManagedCustomerPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ManagedCustomerReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ManagedCustomerService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ManagedCustomerService::ManagedCustomerServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ManagedCustomerService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ManagedCustomerService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ManagedCustomerService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ManagedCustomerService::getPendingInvitations</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ManagedCustomerService::getPendingInvitationsResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ManagedCustomerService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ManagedCustomerService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ManagedCustomerService::mutateLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ManagedCustomerService::mutateLabelResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ManagedCustomerService::mutateLink</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ManagedCustomerService::mutateLinkResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ManagedCustomerService::mutateManager</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ManagedCustomerService::mutateManagerResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ManagedCustomerService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ManagedCustomerServiceError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ManagedCustomerServiceError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ManualCpcBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ManualCpmBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Media</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Media::MediaType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Media::MimeType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Media::Size</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MediaBundle</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MediaBundleError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MediaBundleError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MediaError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MediaError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MediaPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MediaService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MediaService::MediaServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MediaService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MediaService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MediaService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MediaService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MediaService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MediaService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MediaService::upload</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MediaService::uploadResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Media_Size_DimensionsMapEntry</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Media_Size_StringMapEntry</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Member</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MessageFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MinuteOfHour</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MobileAppCategory</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MobileApplication</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MobileDevice</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MobileDevice::DeviceType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Money</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MoneyAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MoneyWithCurrency</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MonthlySearchVolume</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MonthlySearchVolumeAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MoveOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MultiplierError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MultiplierError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MutateLinkResults</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MutateManagerResults</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MutateMembersError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MutateMembersError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MutateMembersOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MutateMembersOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MutateMembersReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::MutateResult</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::NegativeAdGroupCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::NegativeCampaignCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::NetworkSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::NetworkSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::NewEntityCreationError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::NewEntityCreationError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::NoStatsPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::NotEmptyError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::NotEmptyError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::NotWhitelistedError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::NotWhitelistedError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::NullError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::NullError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::NullStatsPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::NumberKey</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::NumberRuleItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::NumberRuleItem::NumberOperator</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::NumberValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::OAuthInfo</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::OfflineCallConversionError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::OfflineCallConversionError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::OfflineCallConversionFeed</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::OfflineCallConversionFeedOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::OfflineCallConversionFeedReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::OfflineCallConversionFeedService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::OfflineCallConversionFeedService::OfflineCallConversionFeedServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::OfflineCallConversionFeedService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::OfflineCallConversionFeedService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::OfflineCallConversionFeedService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::OfflineCallConversionFeedService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::OfflineConversionError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::OfflineConversionError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::OfflineConversionFeed</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::OfflineConversionFeedOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::OfflineConversionFeedReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::OfflineConversionFeedService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::OfflineConversionFeedService::OfflineConversionFeedServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::OfflineConversionFeedService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::OfflineConversionFeedService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::OfflineConversionFeedService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::OfflineConversionFeedService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Operand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::OperatingSystemVersion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::OperatingSystemVersion::OperatorType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Operation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::OperationAccessDenied</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::OperationAccessDenied::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Operator</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::OperatorError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::OperatorError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::OrderBy</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Page</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PageFeed</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PageOnePromotedBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PageOnePromotedBiddingScheme::StrategyGoal</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Paging</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PagingError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PagingError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Parent</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Parent::ParentType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PendingInvitation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PendingInvitationSelector</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PerformanceTarget</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PerformanceTargetError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PerformanceTargetError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PerformanceTargetStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Placement</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PlacesLocationFeedData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PlacesOfInterestOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PlacesOfInterestOperand::Category</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Platform</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PlatformCampaignEstimate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PolicyApprovalStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PolicyData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PolicySummaryDenormalizedStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PolicySummaryReviewState</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PolicyTopicConstraint</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PolicyTopicConstraint::PolicyTopicConstraintType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PolicyTopicEntry</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PolicyTopicEntryType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PolicyTopicEvidence</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PolicyTopicEvidenceType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PolicyViolationError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PolicyViolationError::Part</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PolicyViolationKey</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Predicate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Predicate::Operator</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PreferredContent</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PriceExtensionPriceQualifier</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PriceExtensionPriceUnit</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PriceExtensionType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PriceFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PriceTableRow</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ProductAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ProductAdwordsGrouping</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ProductAdwordsLabels</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ProductBiddingCategory</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ProductBiddingCategoryData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ProductBrand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ProductCanonicalCondition</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ProductCanonicalCondition::Condition</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ProductChannel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ProductChannelExclusivity</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ProductCustomAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ProductDimension</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ProductDimensionType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ProductLegacyCondition</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ProductOfferId</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ProductPartition</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ProductPartitionType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ProductScope</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ProductType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ProductTypeFull</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ProgressStats</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PromotionExtensionDiscountModifier</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PromotionExtensionOccasion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::PromotionFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Proximity</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Proximity::DistanceUnits</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::QualityInfo</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::QueryError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::QueryError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::QuotaCheckError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::QuotaCheckError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Range</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::RangeError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::RangeError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::RateExceededError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::RateExceededError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ReadOnlyError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ReadOnlyError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::RealTimeBiddingSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::RegionCodeError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::RegionCodeError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::RejectedError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::RejectedError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::RelatedToQuerySearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::RelatedToUrlSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::RelationshipType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::RelativeDate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::RemarketingSettings</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ReportDefinition::ReportType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ReportDefinitionError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ReportDefinitionError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ReportDefinitionField</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ReportDefinitionService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ReportDefinitionService::ReportDefinitionServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ReportDefinitionService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ReportDefinitionService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ReportDefinitionService::getReportFields</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ReportDefinitionService::getReportFieldsResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::RequestContextOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::RequestContextOperand::ContextType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::RequestError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::RequestError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::RequestType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::RequiredError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::RequiredError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ResponsiveDisplayAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ReviewFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::RichMediaAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::RichMediaAd::AdAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::RichMediaAd::RichMediaAdType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Rule</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::RuleBasedUserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::RuleBasedUserList::PrepopulationStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::RuleItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::RuleItemGroup</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SearchVolumeSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SeedAdGroupIdSearchParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SelectiveOptimization</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Selector</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SelectorError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SelectorError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ServiceLink</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ServiceLink::LinkStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ServiceLinkOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ServiceType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ServingStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Setting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SettingError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SettingError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedBiddingStrategy</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedBiddingStrategy::BiddingStrategyStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedCriterion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedCriterionError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedCriterionError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedCriterionOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedCriterionPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedCriterionReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedCriterionService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedCriterionService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedCriterionService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedCriterionService::SharedCriterionServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedCriterionService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedCriterionService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedCriterionService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedCriterionService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedCriterionService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedCriterionService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedSet</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedSet::Status</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedSetError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedSetError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedSetOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedSetPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedSetReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedSetService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedSetService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedSetService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedSetService::SharedSetServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedSetService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedSetService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedSetService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedSetService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedSetService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedSetService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SharedSetType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ShoppingBiddingDimensionStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ShoppingProductChannel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ShoppingProductChannelExclusivity</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ShoppingPurchasePlatform</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ShoppingSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ShowcaseAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SimilarUserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SitelinkFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SizeLimitError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SizeLimitError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SizeRange</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SoapHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SoapResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SortOrder</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SpendTargetType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::StatsEstimate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::StatsQueryError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::StatsQueryError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::StringAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::StringFormatError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::StringFormatError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::StringKey</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::StringLengthError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::StringLengthError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::StringRuleItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::StringRuleItem::StringOperator</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::String_StringMapEntry</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::StructuredSnippetFeedItem</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SystemFeedGenerationData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::SystemServingStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TargetCpaBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TargetOutrankShareBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TargetRoasBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TargetSpendBiddingScheme</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TargetingIdea</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TargetingIdeaError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TargetingIdeaError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TargetingIdeaPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TargetingIdeaSelector</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TargetingIdeaService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TargetingIdeaService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TargetingIdeaService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TargetingIdeaService::TargetingIdeaServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TargetingIdeaService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TargetingIdeaService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TargetingSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TargetingSettingDetail</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TempAdUnionId</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TemplateAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TemplateElement</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TemplateElementField</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TemplateElementField::Type</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TemporaryUrl</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TextAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TextLabel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ThirdPartyRedirectAd</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::ThirdPartyRedirectAd::ExpandingDirection</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TimeUnit</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrackingSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrafficEstimatorError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrafficEstimatorError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrafficEstimatorResult</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrafficEstimatorSelector</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrafficEstimatorService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrafficEstimatorService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrafficEstimatorService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrafficEstimatorService::TrafficEstimatorServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrafficEstimatorService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrafficEstimatorService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Trial</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrialAsyncError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrialAsyncErrorPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrialAsyncErrorService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrialAsyncErrorService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrialAsyncErrorService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrialAsyncErrorService::TrialAsyncErrorServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrialAsyncErrorService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrialAsyncErrorService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrialAsyncErrorService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrialAsyncErrorService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrialError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrialError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrialOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrialPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrialReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrialService::ApiExceptionFault</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrialService::RequestHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrialService::ResponseHeader</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrialService::TrialServiceInterfacePort</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrialService::get</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrialService::getResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrialService::mutate</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrialService::mutateResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrialService::query</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrialService::queryResponse</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TrialStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::AccountLabelService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::AdCustomizerFeedService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::AdGroupAdService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::AdGroupBidModifierService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::AdGroupCriterionService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::AdGroupExtensionSettingService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::AdGroupFeedService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::AdGroupService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::AdParamService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::AdwordsUserListService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::BatchJobOpsService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::BatchJobService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::BiddingStrategyService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::BudgetOrderService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::BudgetService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::CampaignBidModifierService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::CampaignCriterionService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::CampaignExtensionSettingService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::CampaignFeedService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::CampaignGroupPerformanceTargetService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::CampaignGroupService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::CampaignService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::CampaignSharedSetService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::ConstantDataService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::ConversionTrackerService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::CustomerExtensionSettingService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::CustomerFeedService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::CustomerService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::CustomerSyncService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::DataService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::DraftAsyncErrorService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::DraftService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::FeedItemService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::FeedMappingService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::FeedService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::LabelService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::LocationCriterionService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::ManagedCustomerService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::MediaService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::OfflineCallConversionFeedService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::OfflineConversionFeedService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::ReportDefinitionService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::SharedCriterionService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::SharedSetService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::TargetingIdeaService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::TrafficEstimatorService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::TrialAsyncErrorService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::TypeMaps::TrialService</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Type_AttributeMapEntry</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::UniversalAppBiddingStrategyGoalType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::UniversalAppCampaignAdsPolicyDecisions</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::UniversalAppCampaignAsset</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::UniversalAppCampaignSetting</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::UnknownProductDimension</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::UploadCallConversion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::UploadConversion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::UrlData</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::UrlError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::UrlError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::UrlList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::UserList</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::UserListClosingReason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::UserListConversionType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::UserListConversionType::Category</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::UserListError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::UserListError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::UserListLogicalRule</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::UserListLogicalRule::Operator</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::UserListMembershipStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::UserListOperation</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::UserListPage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::UserListReturnValue</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::UserListRuleTypeEnums::Enum</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::UserListType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::UserListUploadStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::UserStatus</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::VanityPharma</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::VanityPharmaDisplayUrlMode</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::VanityPharmaText</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Vertical</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Video</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::VideoError</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::VideoError::Reason</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::VideoType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::VolumeGoalType</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::Webpage</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::WebpageCondition</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::WebpageConditionOperand</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::WebpageDescriptor</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::WebpageDescriptorAttribute</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::WebpageParameter</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::WebsiteCallMetricsConversion</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::YouTubeChannel</remote-id>
-    <remote-id type="cpan-module">Google::Ads::AdWords::v201705::YouTubeVideo</remote-id>
     <remote-id type="cpan-module">Google::Ads::Common::AuthError</remote-id>
     <remote-id type="cpan-module">Google::Ads::Common::AuthHandlerInterface</remote-id>
     <remote-id type="cpan-module">Google::Ads::Common::CaptchaRequiredError</remote-id>
diff --git a/dev-perl/GraphViz/GraphViz-2.240.0.ebuild b/dev-perl/GraphViz/GraphViz-2.240.0.ebuild
index 22bc47cac93e..0f36e16d5818 100644
--- a/dev-perl/GraphViz/GraphViz-2.240.0.ebuild
+++ b/dev-perl/GraphViz/GraphViz-2.240.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Interface to AT&T's GraphViz"
 
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/GraphViz/Manifest b/dev-perl/GraphViz/Manifest
index f39da3f05550..7ddc16cac0bc 100644
--- a/dev-perl/GraphViz/Manifest
+++ b/dev-perl/GraphViz/Manifest
@@ -1,5 +1,5 @@
 DIST GraphViz-2.24.tgz 95475 SHA256 d95efac4cdeedb18283100efe3e00c59c1add524d9ce88c1c8a358359122f5ad SHA512 b37d1303c243a306443d5adf35d597f4e259cedaa7956d80bdb47cba811ce94e63da6b42a23d192fa9da628d999f1c023911f3f956a575aeabe673f77f3f01d9 WHIRLPOOL fb80ea2af412054e2c291ee5fc834cab9eb81c46301e26ba6c55b6b0187a36608ce26827cccb37b9da0a2054afa8c44c831b9a1db892862c9388b37452e915a9
-EBUILD GraphViz-2.240.0.ebuild 726 SHA256 1f3d65cdb483165bddbd3933a23b926ed9551103a3918790d163bacd779b4316 SHA512 81b8f0a42609398be7df3938dd50111e2aacd323d15f53ea13a3431db2b57a87a7fc60aca7cc27ed2d25324455df4a89f5cc95d08256fb3fef6e56f1a54cf297 WHIRLPOOL a5ca5aca1fdc452842071de99d541bf3c5802a7134e0234488fd03860ab60206fa6ed9a39d0d4428ee29cdc28c19b93734a520f05f83b79bd5551c41f16a1436
+EBUILD GraphViz-2.240.0.ebuild 731 SHA256 d7956978f6f45dc838b8df1174c72638ed11bf908ad631568feae13783f57e09 SHA512 f23e2a0702ace62d962bb5a3a335563792bcd3eeb7d812d8f465be7ef706c896c386f91004bb42cac222a9aaea11ae832b1d722c2bfa95592ebda1b3c880f186 WHIRLPOOL 12c55ee9b341fd280ce0f88fe43fc4f760b47743ecd72a1c6862d5d548a1250b0521306a6847b6f5cf48a30346773c001186b58a502790d6f28bc250f843f0a4
 MISC ChangeLog 3946 SHA256 9cc23fc78cee0c2fc6f6f354e6bc5a6cf6dd6bebe69e094cdf7782b0d235b3de SHA512 c1d0b49cea31b4e018d450778937127823672675706878d4c74113ffd4462b9538991605cb9769a223519722c7b09799ba61e82a43d19507f6861d22834dd6b1 WHIRLPOOL 65d1e288cd0797e93b0de35b47c583e457dfdc3720fcca4b3fcfa7b4afa7ed219d53679faf9af75e3ec1ab377cf934755be9f3fe6aff0fe8e01e5995a4319558
 MISC ChangeLog-2015 3605 SHA256 13e00d7fa652ae68858bcf1276d62aede518947c0c8597f656f1356155ddeb3b SHA512 a128feec5238eccfdce64928788d5854b1cbb8a72702dbf86568f2c25d553fa041c6b949c094d3f2d9dd917f23a8402d0eac184ad87ca4aab87c1e008917f486 WHIRLPOOL d092696411cf41def19635b3f67d75423d683d5fe518bd2f98e888ecead3b80c9e7a2295d77f4cee565aa6a374bc3a3eb2ca483d1968416df1c13c0a1191e744
 MISC metadata.xml 976 SHA256 a144588ce7eb50feaab0717e7d7ca0d3c23faf4567b1be895fc73d30d4894235 SHA512 e8d6b682c13fa944531371252ee4341936a7dd74786584a5594e712b431df8690d355145f533c2e6785dff55c4409f25481c0c2baa9edbe4a64937f8f19e407e WHIRLPOOL f123007e2117ee5d1c7c16cab558a2e77c2c19bbee2ba267b99aabc3e12798ca5c94734731a07820a240d0726a0f35e9056f54ab8d815891ea6a0a7f62c21109
diff --git a/dev-perl/Growl-GNTP/Growl-GNTP-0.210.0-r1.ebuild b/dev-perl/Growl-GNTP/Growl-GNTP-0.210.0-r1.ebuild
index 7fce672e57dc..516737c38aa5 100644
--- a/dev-perl/Growl-GNTP/Growl-GNTP-0.210.0-r1.ebuild
+++ b/dev-perl/Growl-GNTP/Growl-GNTP-0.210.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="Perl implementation of GNTP Protocol (Client Part)"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-perl/Growl-GNTP/Manifest b/dev-perl/Growl-GNTP/Manifest
index 550abc8dce9d..08edabc44d7d 100644
--- a/dev-perl/Growl-GNTP/Manifest
+++ b/dev-perl/Growl-GNTP/Manifest
@@ -1,6 +1,6 @@
 DIST Growl-GNTP-0.20.tar.gz 23374 SHA256 b1c9795b72c750ca6bb69cfa7e50e78e429a8e1972d7cb9ed7ee1ec769311d94 SHA512 a8acd7cd9a46a8c81bc34a7076f379735ca9712bedbb7c8451aea6049113c477310093ac39e5f83c9b4a0b31f0ae4df25bb5cf682e4a7f0e113edb15e84c1977 WHIRLPOOL dbe87d2149e60d167b55472145a0187d7ac2ff383bcf2f34ab93e3d4ab1736cce1288f15547e13d88337a08ddd4c56142ce5f1c8fd95227915520e4354a4a9f6
 DIST Growl-GNTP-0.21.tar.gz 15128 SHA256 28797f8e427406720584cafd10e780a78ec2b569c555a18743d74553d5f5083f SHA512 1c7d8ec81bac5e3bd6e7540be92cfb0ab27c5952a898397dce6eb1e81324cff2b926c55f2bfcae0ad6d3d3043ab898acea970a5283e7fb5faf9a58ebacbfc11f WHIRLPOOL 0c048ba271a4d937173bd6947437ff147f63c9687cbacad57c2bf7500d4adb71a796479fd210fb21e27786b4dbcfaad07e2394a8f4fd4961bc8bff44c9fa5bff
 EBUILD Growl-GNTP-0.200.0.ebuild 973 SHA256 ef5052069153bc2768a2441dd383771432d9230197e1888b79c48ca6f3840aec SHA512 006c4f53addb8ddb0d4da35ae6aa6ecf0c575ee17a1a378e59f7eab71fdd600168288b84f3b9f5b03832288a350ba2bd378694f24bf0c60cf1a7314ebf1c9e50 WHIRLPOOL 0468609f8bb515283368ed59a354e637f3ba79c3aa74e141729cfe76fa8652b2603aeb444e1682310f6a403767665c0f6e03411d53bbcc5dd80c98cfcc3dfe76
-EBUILD Growl-GNTP-0.210.0-r1.ebuild 789 SHA256 3002d415fb4276eb84d881c68f0144058796806a5bf4a31ca298e33cc2dc017e SHA512 a769169333a087195159dcb204f69f8ea48b42dfea4ce83556a79155cdc23a13144ff33111bb6de478e7d7dac23f978aab3d056c3113cf5dfd1db4c23b954ff6 WHIRLPOOL 2ec794d2b320f2429df6bdbeba50f8e6a698904b553f5a84b437e4e48dc5c2ef2e41b91a34b96444472cc7ebd657a375420961c972de7912a3b3fdfe9df05541
+EBUILD Growl-GNTP-0.210.0-r1.ebuild 788 SHA256 84d0345f598b209867e986abd58aa0ab7c4196c3d5badec8b402784cae3c9628 SHA512 6b993a80d9e4055e104688820ff15a8b0309d72498f955dea9865990806c0affc6fdf12efbe1e3b315101046ed25504d7cf5b678c8021547ffeeb17bc5b35ec5 WHIRLPOOL d4419e6e17c68f8952fea466eaef8b64d16909aa6a7ed5c9c6092a82e1f074c9cf1616971165c171a636b49808a38666876d08f4126401c9df4493f8dd4f7a1a
 MISC ChangeLog 1074 SHA256 f510621d533a995c62f9eedf3bcf0e23b7d6823cda54fc00801479aa2542807b SHA512 533f47c827194be90b5ff26ba0553ea7ef246b4b0c5eee5569bc2b88a401a4ce9f71e5ab3b8dbd5b077fc5d34f8a05951184ae3b7b75fc96bf8ece2819fa6069 WHIRLPOOL 3aa4a70e1ce645c543aabb4db9d235d88b272d6a66c46b8541532690fe3d4c8b186c49ab4e2df638edb596bc2a5712b0430057b7e27774692a7f6dffd56b542f
 MISC metadata.xml 649 SHA256 4c3e075a60c483fb9b67bec0173a7ed349af952af64c3959b332689a64000aa9 SHA512 db0da6df1625a77c68f7c8d18bfc4e6fc23fbdf45ca5bc5b8f86ce41b2e650b9bb3ffac70785ac30dca3d673e55b2c54765e90761f87f9379db4e45bca199c3b WHIRLPOOL 5c88d2cc5718f26c6e762e13ffc3da0ff9a6531c8587bb1029a6cf007fe4f571b0862825a61effed43cafe7eb17ae164dd8d21a8135a3dd47f1e9cdcd598e84f
diff --git a/dev-perl/Gtk2-AppIndicator/Gtk2-AppIndicator-0.150.0-r1.ebuild b/dev-perl/Gtk2-AppIndicator/Gtk2-AppIndicator-0.150.0-r1.ebuild
new file mode 100644
index 000000000000..3984a0708caf
--- /dev/null
+++ b/dev-perl/Gtk2-AppIndicator/Gtk2-AppIndicator-0.150.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=OESTERHOL
+DIST_VERSION=0.15
+inherit virtualx perl-module
+
+DESCRIPTION="Perl binding for the GTK2 AppIndicator"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-perl/Gtk2-1.200.0
+	dev-libs/libappindicator:2
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+src_test() {
+	virtx perl-module_src_test
+}
diff --git a/dev-perl/Gtk2-AppIndicator/Manifest b/dev-perl/Gtk2-AppIndicator/Manifest
index 098927c35661..23f632967a10 100644
--- a/dev-perl/Gtk2-AppIndicator/Manifest
+++ b/dev-perl/Gtk2-AppIndicator/Manifest
@@ -1,4 +1,5 @@
 DIST Gtk2-AppIndicator-0.15.tar.gz 15662 SHA256 a25cb071e214fb89b4450aa4605031eae89b7961e149b0d6e8f491c19c14a90a SHA512 16aaddf520ce720969775b49697b605e0dda7ed3b62bb7edeefbc2c48a1122656469068b179acbfd595ae9b1f0328747898a54e7afdaf71ae7445792afd9c4ea WHIRLPOOL 6caef7b6266e79e360706d698baaf07882945ce894739fb81c69e9e5944516143feec8e0359e4b04301bf80d920825a1a3fa0f84301b9cb1681696d13b085e35
+EBUILD Gtk2-AppIndicator-0.150.0-r1.ebuild 435 SHA256 2af5a747da85be77b52ef057d20721a165f3ba65a3a8275b84737f009df9c69f SHA512 a19441ceb062ec0fd36fb75be4727c7074781a515d96e289884e8982f5be8f18ae0ff09d743893d0d180b799aaf8ab57823f48346022a4257e3d8c4c02161f89 WHIRLPOOL 88aaca6f79415c899e366dad54ea383c4f2899dde6b450394c12c6f4ef7adbe69390458d6cd4c3e76b8306e6b250aa74879873d99a9e7024747b2ce1519af060
 EBUILD Gtk2-AppIndicator-0.150.0.ebuild 462 SHA256 d3240b11bca0c55e2e3d4c9e16ab6ea8e2c2d54361069a93d1edef86cc0d9d8e SHA512 f921c9da707bad9650d127080402f2d1353b7a9ddb5c9ae8943dd771fbde70574db5ad41d83a9dadbbf86976fac3a1f8bdb9942ec7608dc19469239f0ea3dc8d WHIRLPOOL 612822d22bf0aec15ee261ed80f6fe44a7252a8eefaa318ffaf0d647197685babd582a971a892ab39752ddd87da641b0063a2fdcd0992d8345580bc79602a394
 MISC ChangeLog 764 SHA256 8902f38b21a7bb21e015e9941d6b90e84f0335a141db0793f0ac26dccc9a3443 SHA512 3c14249eebb4f7c93efd383e452c27630c72307c4f29b6af20e3ecdbddf9dcc81762a5dba2456674f64a57f4d58111f8eedbe9b5a7559f1094e7b09350813c88 WHIRLPOOL 37f39c3f155a0c4769d77ed1ad6c85e2bafe1e275e52219d034ca85c6a2a24d72de265cf120c5231a739d1b6ceaf1978af56dabafe39d8c4e5f26e2c76fa2caa
-MISC metadata.xml 269 SHA256 84b65c1e72c439b7f5175ff684ae78fc7fc7a226eea4a884c91e73e90b1662f7 SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84 WHIRLPOOL 3da4987d361ac8c36e2c8fc914594d87b657765153dcf177a1dccffa9b088c0bbea71f6a9848bac35a92659455cba03f88f21fae9ffc6735b60512fb1a35982a
+MISC metadata.xml 430 SHA256 e34f4d538073efbd9b3108eea958205fbb89c95e73155b44e7787fb6e3c76e64 SHA512 15b16bb7e84825fee7e4219cef5c3a52eefe8e433599d49c42cdd929a69f37c31d44159387a28ff6027f3fa514ee92d6e298a4dbe1c597930a0334b138ddfd90 WHIRLPOOL be23878324bd1f33aa837c84160350284ca271062e8ba67d24de6357d714f72570126fa3dcbbf79fc9c5500309306b09ab5b7b2a9b3bf133a4f5338531e19a4a
diff --git a/dev-perl/Gtk2-AppIndicator/metadata.xml b/dev-perl/Gtk2-AppIndicator/metadata.xml
index f53c778e0d38..c893c255130b 100644
--- a/dev-perl/Gtk2-AppIndicator/metadata.xml
+++ b/dev-perl/Gtk2-AppIndicator/metadata.xml
@@ -5,4 +5,8 @@
         <email>perl@gentoo.org</email>
         <name>Gentoo Perl Project</name>
     </maintainer>
+    <upstream>
+        <remote-id type="cpan">Gtk2-AppIndicator</remote-id>
+        <remote-id type="cpan-module">Gtk2::AppIndicator</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Gtk2-Ex-PodViewer/Gtk2-Ex-PodViewer-0.180.0-r2.ebuild b/dev-perl/Gtk2-Ex-PodViewer/Gtk2-Ex-PodViewer-0.180.0-r2.ebuild
new file mode 100644
index 000000000000..7bc16b5c07e2
--- /dev/null
+++ b/dev-perl/Gtk2-Ex-PodViewer/Gtk2-Ex-PodViewer-0.180.0-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+DIST_AUTHOR=GBROWN
+DIST_VERSION=0.18
+inherit perl-module
+
+DESCRIPTION="a Gtk2 widget for displaying Plain old Documentation (POD)"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	dev-perl/Gtk2
+	dev-perl/IO-stringy
+	virtual/perl-Pod-Parser
+	virtual/perl-Pod-Simple
+	dev-perl/Gtk2-Ex-Simple-List
+	dev-perl/Locale-gettext"
+DEPEND="${RDEPEND}"
+
+src_test() {
+	local MODULES=(
+		"Gtk2::Ex::PodViewer ${DIST_VERSION}"
+		"Gtk2::Ex::PodViewer::Parser"
+	)
+	local failed=()
+	for dep in "${MODULES[@]}"; do
+		ebegin "Compile testing ${dep}"
+			perl -Mblib="${S}" -M"${dep} ()" -e1
+		eend $? || failed+=( "$dep" )
+	done
+	if [[ ${failed[@]} ]]; then
+		echo
+		eerror "One or more modules failed compile:";
+		for dep in "${failed[@]}"; do
+			eerror "  ${dep}"
+		done
+		die "Failing due to module compilation errors";
+	fi
+	perl-module_src_test
+}
diff --git a/dev-perl/Gtk2-Ex-PodViewer/Manifest b/dev-perl/Gtk2-Ex-PodViewer/Manifest
index 36b7fe39a354..3e9c4740d988 100644
--- a/dev-perl/Gtk2-Ex-PodViewer/Manifest
+++ b/dev-perl/Gtk2-Ex-PodViewer/Manifest
@@ -1,5 +1,6 @@
 DIST Gtk2-Ex-PodViewer-0.18.tar.gz 15417 SHA256 0bb895cd6f8d0a072f466972dff38743248c68df1dec9398bd944f002dbeeb60 SHA512 488c83a95776f0d54d92bc45abc7b1727d76930a16d16c203865ecd9e9274340f59fe2916ceb16fed0babc8b531cad625cfd549ff9914321440e14ea81c49893 WHIRLPOOL ed0549a9f8db73212ab916cbd77e0080d0b9f0205e6aee53b5aca7b2fc39a324a4ba27780de49bbf653fb79e4e4efc392f7d3c2c85f72bb465870a4d4a21d13b
 EBUILD Gtk2-Ex-PodViewer-0.180.0-r1.ebuild 493 SHA256 1462b60c40a71aaaae47758a23c428c5a3b7a35e07fb566c2473787a071561e3 SHA512 d8b895773a8bfebc398aa1fa7592a0e7a2e4280ba1b35e80362b362e3308b7ffc698c4851f2a5c21dae9c8e548cb5e819695e9040f1e001870d534026e538e68 WHIRLPOOL e5e7e20136b837e2f58ec59ec9dbef3be6d81a8f94ffb6c7ab870296a32e8c004faffacafde19d6af0fc1ebae82557cf77bf7eaeb5118e0b0861706bc4d513f5
+EBUILD Gtk2-Ex-PodViewer-0.180.0-r2.ebuild 964 SHA256 e24678df0d76e9af02d38ee3c1c77101f5fcaddc44c341cdc60309f9598d4f97 SHA512 dd876144541c99d08f01961ecd76d8a33a4ecd55a2b533ef83d3efeade44c073e4ba92381e6a35edf3661448c418b368e54be5f45b0e36effba310b052e9aa85 WHIRLPOOL a4fe1b7ce511acb97900b6935c99583530ffdd87b309f9e1b1d34d52d3341147b38ec4966a2f2d841f1aba846f79b8a2d7fb3cc210c9f74f4ba9f3dcbae0c3f0
 MISC ChangeLog 2467 SHA256 11981180726c75e78f2f8987b62e7d214d139b94e225c68ac5e559b2b89cb452 SHA512 e2f89e6bd49ac59dc2d6cdc31bb880f6451a1f54a1deeb09f6a92870143c6035c9284de198749af299da556d862570af88a50113218b95af2e6993ca9f770f76 WHIRLPOOL 1b41e97727e7c9005a76cd2f3490f1b7269653dbf53e8914207e8fd8c6d4b3170e1b5c43aafcc92bf25705b62dbefbcd65764649c36c7cae623b74e6fa687e99
 MISC ChangeLog-2015 5202 SHA256 d2cbcdfb971fcc56e50130a305c37c78c4435328c82c86130a2dd77546065956 SHA512 bce7980982a666d975dd2886e2b566b821b7b7e974e0ab2cef674b36e394db922880562f848ccdcbc17415fa83c5f9c8302db1e6a8ec465fbebd43078e0ff706 WHIRLPOOL a756f8747002099fbda9f45545398b9699dd5ae13c7019da9c2909afb26da459fa2266c26053e54b2ea9fb0c1ad545e0148fc1be24b5a644f1e20d6a703e3549
 MISC metadata.xml 481 SHA256 3c989202b4ee39f1a61017ac2f12393c54ad451c47dccd446a7087e45f2180ff SHA512 8a505188adae06fd9a45d11b075f599a0b744c68ff45d483ae39ef1dd076068acccef2bd6470c6e9cca7e4d00d5681e8c8fb98c878950828e95cc78633a3538b WHIRLPOOL 53cb933eacbb6189a0f9b5ffc11411d0ee0f33f6be938b66e696ff7c2a08e2509cd3e1d32bae42820add5e513fb82410b2173d89ff55e167cd4ad5dbe7162855
diff --git a/dev-perl/Gtk2-Ex-PrintDialog/Gtk2-Ex-PrintDialog-0.30.0-r2.ebuild b/dev-perl/Gtk2-Ex-PrintDialog/Gtk2-Ex-PrintDialog-0.30.0-r2.ebuild
new file mode 100644
index 000000000000..df3d96e84ed2
--- /dev/null
+++ b/dev-perl/Gtk2-Ex-PrintDialog/Gtk2-Ex-PrintDialog-0.30.0-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=GBROWN
+DIST_VERSION=0.03
+inherit perl-module
+
+DESCRIPTION="a simple, pure Perl dialog for printing PostScript data in GTK+ applications"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cups"
+
+RDEPEND="cups? ( dev-perl/Net-CUPS )
+	dev-perl/Gtk2
+	>=dev-perl/Locale-gettext-1.04"
+DEPEND="${RDEPEND}"
diff --git a/dev-perl/Gtk2-Ex-PrintDialog/Manifest b/dev-perl/Gtk2-Ex-PrintDialog/Manifest
index edfed21134c8..697e71500969 100644
--- a/dev-perl/Gtk2-Ex-PrintDialog/Manifest
+++ b/dev-perl/Gtk2-Ex-PrintDialog/Manifest
@@ -1,5 +1,6 @@
 DIST Gtk2-Ex-PrintDialog-0.03.tar.gz 6150 SHA256 192ba57414c681cffff33011027ed66264174f02553bc01fe82689bca8cb6c19 SHA512 b63d0f062e1556c4a5402850725ece4e727f7e9eb168bf3be1403a9b4db425cee762a1b1ca3bdff55d554b343deadd35f27f908d198979b64012f5d59c2a5d88 WHIRLPOOL 01f0669a06c252e01c82957aa3170abc098d36460804e81eb8516e4b1ec2b7b567b451d9c518943422e53fdfd3bb236508b08219cb143cf889e52acdb9b0dd73
 EBUILD Gtk2-Ex-PrintDialog-0.30.0-r1.ebuild 434 SHA256 beadad4d67527f6fe58f7f6d0bf9c460250e0805bfb3ccc2cb8c95b38d62f69a SHA512 7bd17878de7f193bc059a42a50c5697d8373a4c7d785434a65e4510e57b5a9033d400083b56355354298ded9f5f2dce0c03928dd5a6da2480d137b3cb1937a6a WHIRLPOOL 497dd95785aff9144f4e8d4bbf5e08b3e999aa5cc2921ad143f027e96ec37dd459cfbc2d44481cfb3a316df165d99c82fd61e9eb947a7b35bd52e1ed11a097f3
+EBUILD Gtk2-Ex-PrintDialog-0.30.0-r2.ebuild 416 SHA256 46a580ddd956852c5ff56369944e05618603107ef44316b4cac43c3722de12f7 SHA512 c23409e3ed61eb9db2b00ee7dcb9c4c3cd6067280268dd6e7c82b02242bed787968fa1f4d9a7d7e540b9d6fe169cfb59d792c62d44fd0008a867f612c021fa75 WHIRLPOOL dac3c76bd758d3b18c970432968c7b1364e49b688786fbc1f7056dd4aa49ae611d50d4dd35219e64f8c82893acac7dcc3d20d97f60eb98a5ce55ada2b18e74e0
 MISC ChangeLog 2471 SHA256 c3fbb5366ce9f23b3a4b886d56e810cad33ffb409f341d17b6e6d84f892280f1 SHA512 f63a9db8d606727b4f4dedb894d598ac85c5485187727dce51c54c0e550c6608a98a07d3e1fa555ba4ecd41fceb8ba3e3949ff24f88a440dad12bf1728616385 WHIRLPOOL dc0efa46b136f8a53dc42ab5f5a5721d171f2f546f9bbd2960b19536d72022c4d37518ca72f80cd1a183becce15a01c28c9ccaaaf12c66c22549526d5c7f068d
 MISC ChangeLog-2015 2974 SHA256 2c6f710419f2ed6c9f1ad3a22f157a6049dfd4cde5b820fbb0ca264ea6872129 SHA512 3216afebfdcae96a0ecd803694d5c9995eed40bf40de4e87b22b0d634451b81f38fe4d8cd1e292b36626b836ab825b104f253f1281ad0765f726eadc88806a9e WHIRLPOOL d848fbf9aa0dbccfd9e9a06c32ae964606626c6ace58f2549547c102877156e1e41e8f5bdeb0cabdf4d2dac7f5c22e9111da5eb796ae3428e3e0c805148324e0
 MISC metadata.xml 713 SHA256 1d28086f1f41fc090bfc0bcdc64ca3feecf9a9c430141de03c7d812b8eb5d8a1 SHA512 1843a720320eeb87ec5c3ba3ad4d4eed6a8d87fa0b90418e3bb1d1d1c03710cd156181fb2e0450dad0c0c8810858033a5950c928cfc0e1821af4a5a6a2254e18 WHIRLPOOL 2ce45483ddc11b2ccc0a47dd435747784dfe1ab6f64d756d1e0ac8bd0f15f400947267927802983848388e35f8bc1feb97e80b05d0c26c68a22596f374d5bfa6
diff --git a/dev-perl/Gtk2-Ex-Simple-List/Gtk2-Ex-Simple-List-0.500.0-r2.ebuild b/dev-perl/Gtk2-Ex-Simple-List/Gtk2-Ex-Simple-List-0.500.0-r2.ebuild
new file mode 100644
index 000000000000..ca999714796e
--- /dev/null
+++ b/dev-perl/Gtk2-Ex-Simple-List/Gtk2-Ex-Simple-List-0.500.0-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=RMCFARLA
+DIST_VERSION=0.50
+DIST_SECTION=Gtk2-Perl-Ex
+DIST_EXAMPLES=( "examples/*" )
+inherit perl-module virtualx
+
+DESCRIPTION="A simple interface to Gtk2's complex MVC list widget"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )" # LGPL-2.1+
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-perl/Gtk2-1.60.0
+	>=dev-perl/glib-perl-1.62.0
+"
+DEPEND="${RDEPEND}"
+
+src_test() {
+	virtx perl-module_src_test
+}
diff --git a/dev-perl/Gtk2-Ex-Simple-List/Manifest b/dev-perl/Gtk2-Ex-Simple-List/Manifest
index 44aab1a2d21c..e2a8362a7f02 100644
--- a/dev-perl/Gtk2-Ex-Simple-List/Manifest
+++ b/dev-perl/Gtk2-Ex-Simple-List/Manifest
@@ -1,5 +1,6 @@
 DIST Gtk2-Ex-Simple-List-0.50.tar.gz 13769 SHA256 62df53d0da396aba8e96aee06d869a77b8cf54af2ebd9df885b7aef2d5a207b5 SHA512 df57509eb386aff41630b7da2d9b810b1e9308dec407dbe792a4282f2d7331cb3639755af8232bf6312e0537784dab5f1d035c919909a53e584173ce24aa6a09 WHIRLPOOL 547517230ded2987f74fdee3cb4405ae4a3dba1674033054b6197e4dda290aab734155a1a8e3cfed0dfaf5cd4555a3811b98ddd3cd4eb29b9e7bd7b02826889e
 EBUILD Gtk2-Ex-Simple-List-0.500.0-r1.ebuild 481 SHA256 9f38b248567b3cab708ed0b98f4298488ad9d865d7e5118f89d619d81ff9b0cc SHA512 d383fd5b0f4846a0b2484484e67a579334192dcc710b955825a171b59bd9c54642012a0d65352b5188c160ad254e5b685978e9571e946fa77cb084c56527a634 WHIRLPOOL 7916346ce031e485dfbe9cddebb0c417db80458ca4979cd6ef3d5680d5e509b3168a4fb5aa40cec94cda4e40d08c94a562104c980f47bf9de8b16d96d2c362f4
+EBUILD Gtk2-Ex-Simple-List-0.500.0-r2.ebuild 538 SHA256 4ada49b96d02a4094e5a949a84444b320d82d96fca77850f5e3e3fecb3100937 SHA512 54c437b69193d20a750399c2a003f456a089b48f0b3ee0b25bbe24cb5303fcaede046cea88fdbc5d292653bc12354cbe42156f9f430bebfd43c5d054e85902c9 WHIRLPOOL e8d6427481ed9d4e79477cc1f4a3eeb5b271e9ce88223ba19e45ee2e19a16eb4a5032f2c35f325fd968edca8310a8863b5416e6faa6a2987ddbf5bb2a8af8dbf
 MISC ChangeLog 2473 SHA256 da444c8f03032ab70074f151c007e0db5595b9da7a3fcdbfe3f8fc976ebc09d7 SHA512 6a2f5fdc71073d7349740950026ac4945bf7bbd46e50656528ca447d9ab1f98aae3dba250356acffbf616b4ba8b3e78651358582c16a29c76d770f7e5aac9b08 WHIRLPOOL 378904fefed5d6763ebfcda355fa1813bc2f58acdcec939a48c04c6a7085d1706139c8ce46c8387e3de9a9acde07f2390f1ac3ca070b16fbfd20d9dd2e0bd028
 MISC ChangeLog-2015 2542 SHA256 302b8e3b21d0355c1d8d5ef4fcaedf1ef48b79e066f6aaddc8a0cbe5aec5d595 SHA512 23f46777d892f80e2ceffa07c0e6c8da33714d6953f77044c7cf2f139ba5d081f9a8849f37a957db07169e337ff82c9759019ec14b8457f4a8e0d27fa0ba32df WHIRLPOOL 83e5b4cfd63bfd7eef10d92369df43283703e05b555db806cf58e9431657e019a648433943a7a86ebdfe98c7f511ade73deb15ee6ebd171d069288be998ebf34
 MISC metadata.xml 632 SHA256 ac457b4ce78af6b3ea6ff2508a5f6d37c8a247d62521709e847479b65d0ce367 SHA512 5f963a62ffebe5f4d21c693c20c79aba9dc49d72ef39f1e804761bf55eb53df5bbdd20e47c7e1bacba1e05eb80de45de32b325da9f9ab1405742863b6da7beda WHIRLPOOL 11511e91e8ce0fad91fb8ad146bd4901a81dfcc56f1b7b0118b3ea5b2da17feec429c1b76fd01d91dd33f128d5632a705d0f52ab063ae94cfb09147281020670
diff --git a/dev-perl/Gtk2-ImageView/Gtk2-ImageView-0.50.0-r2.ebuild b/dev-perl/Gtk2-ImageView/Gtk2-ImageView-0.50.0-r2.ebuild
new file mode 100644
index 000000000000..fe51cef75158
--- /dev/null
+++ b/dev-perl/Gtk2-ImageView/Gtk2-ImageView-0.50.0-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=RATCLIFFE
+DIST_VERSION=0.05
+DIST_EXAMPLES=( "examples/*" )
+inherit perl-module virtualx
+
+DESCRIPTION="Perl binding for the GtkImageView image viewer widget"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-perl/Gtk2
+	>=media-gfx/gtkimageview-1.6.3"
+DEPEND="${RDEPEND}
+	dev-perl/glib-perl
+	>=dev-perl/ExtUtils-Depends-0.300
+	>=dev-perl/ExtUtils-PkgConfig-1.030"
+
+src_test(){
+	perl_rm_files t/pod.t
+	virtx perl-module_src_test
+}
diff --git a/dev-perl/Gtk2-ImageView/Manifest b/dev-perl/Gtk2-ImageView/Manifest
index aff0e4d589b3..ce4d392403c3 100644
--- a/dev-perl/Gtk2-ImageView/Manifest
+++ b/dev-perl/Gtk2-ImageView/Manifest
@@ -1,5 +1,6 @@
 DIST Gtk2-ImageView-0.05.tar.gz 43632 SHA256 087186c3693acf196451cf59cc8b7f5cf9a7b05abe20d32dcbcba0822953fb80 SHA512 ff8804e73655e9b3fad9e26860698726669063b5103732e589b5c93398a3a76ba79a55f41ce129fe59761a44cf3b317a15207f888432ec603cbdfbdd4ee5cd88 WHIRLPOOL 079b655974ba7d0c64f5f3b17444094ba2f23eaa45858586e3f08e97b61d3ba05becc192e9c86ea2d9259013f3de0512683b836df3a7ee7948393b2905390865
 EBUILD Gtk2-ImageView-0.50.0-r1.ebuild 542 SHA256 4e135bbb244ef13f9d4c8f4f0ba328350793c617dd6c946d722012fe6d7f9082 SHA512 a5bac4a90461994793637b19b5358a239e8326f7a13fb38c313a2cce29b21a163420292287a128e96947afd15ec644a8bd39ae0fef049e9cf3ff6041164cdf69 WHIRLPOOL 35c94074e77ed160c9609109327b4fcf3fbc1fa5eb0c41e19f1a1b36ccb2fa3917a11a4a06ae7bc2cdaa67ffe4e1311639a33d296f767b661cdfc696848111bf
+EBUILD Gtk2-ImageView-0.50.0-r2.ebuild 578 SHA256 e1d0a0274ad5396ecdbc806d2c7c59d7952e9d30d39ba61c0be08435e732f2e4 SHA512 3064dc37c23064b59ae5cc41d4ab3362b43ec410c2818da8a47229aebb5049ff50df4dc3b1419fd87bb8edf2ec660ad7d5a339dd2ee87a0cd0b07b1d3cd10d30 WHIRLPOOL 9d8a17188a743e5febd8990fbf2d4e8202e0b43d3752bca17c0881d8f55a37edeb20b7571a39ccf0ffa580c71910119de1a36434f6ef10386fdbd6a1c317c629
 MISC ChangeLog 2615 SHA256 c902b868a5e08bc78d730ac9fd65526a7c49debab85cd21ba7d8c7207838aac9 SHA512 430cc14cfeee712ba969db79d38ecb12479f5a92bfd3aec06e3ea8b67b44ade5a1ff9efb9ad829be63f1e9d40f4163d69706eb1a60378b7a0ff83d5a11860711 WHIRLPOOL 6016ecdbe14eb3ed377b508581c1e7f5d6b38f812f0dfcbec6fc4e10a0252e0cf9c836f2abe03a6aea9bd732e2dbd95246a0bd478d1650258c0f0eba83b10f78
 MISC ChangeLog-2015 1595 SHA256 9f6b51f7dbfdbb7c83f9177259dcd65481ed5fb7fc396425515418772ef31f32 SHA512 807bb627c7c292861ed165d762af3cfe498a8190507b15ba36681fdc0e466763c5b52d4d7f25dded44e05cf0857ab822c8a19348a1968af84e2ba4d1a8df3d4c WHIRLPOOL eb45a26fb8a905a9816d1bdf0e5371505d27c7cf36910849f51c7b6812fa13bfc4bc83f16300b15b928142c9b85c03209b75865a06800da1635a22067df2bc37
 MISC metadata.xml 400 SHA256 e7026cdc9604c429c2b83986db04eaf0462862a3bb5925f32f5237e5cb0e802b SHA512 064d53077438bb533eb1e3c4b715e397c29afb983bbb3f38b67b72ca5780b5e5867f6326c96ce2249e68a2bcd2abc6fa159e41d53884c9078e4aa459dfead2ba WHIRLPOOL 92fc951420db0caacdb59be265583e1289feaa57aec2d11359dbdfa61f1a5da624c9743e811a325d7c22e02b435e6f96b9a5d992701e178fab26679c6a6c98b5
diff --git a/dev-perl/Gtk2-SourceView2/Gtk2-SourceView2-0.100.0-r1.ebuild b/dev-perl/Gtk2-SourceView2/Gtk2-SourceView2-0.100.0-r1.ebuild
new file mode 100644
index 000000000000..2042b5ad212a
--- /dev/null
+++ b/dev-perl/Gtk2-SourceView2/Gtk2-SourceView2-0.100.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=POTYL
+DIST_VERSION=0.10
+DIST_A_EXT=tar.gz
+inherit perl-module virtualx
+
+DESCRIPTION="Perl binding for the C library gtksourceview"
+
+SLOT="0"
+LICENSE="|| ( GPL-2+  Artistic-2 )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-perl/Gtk2
+	>=dev-perl/glib-perl-1.160.0
+"
+DEPEND="${RDEPEND}
+	dev-perl/ExtUtils-Depends
+	dev-perl/ExtUtils-PkgConfig
+	virtual/perl-ExtUtils-MakeMaker
+	x11-libs/gtksourceview:2.0
+"
+src_test() {
+	virtx perl-module_src_test
+}
diff --git a/dev-perl/Gtk2-SourceView2/Manifest b/dev-perl/Gtk2-SourceView2/Manifest
index fae40b15e2e4..829a25d5bbdd 100644
--- a/dev-perl/Gtk2-SourceView2/Manifest
+++ b/dev-perl/Gtk2-SourceView2/Manifest
@@ -1,3 +1,4 @@
 DIST Gtk2-SourceView2-0.10.tar.gz 23420 SHA256 ba15f97fd6bd8c1481e8b06a8d6c7b1e450e5580d1584cbc23080ea3d626c0e5 SHA512 29e5ea143fb013d95638be10463f5b316dc38212481b720b15ee569a6c3a4ec432d0550128d1fcac5adc35df02e0180ff2a378bcfbab620f332fff78e078453f WHIRLPOOL 97a71063a6af869858372006259b12549987e96fa92952333c9c0e54531d4705b99f42c5e475e63ac207c522dde354c7d3236f261b9a85895a1826e05eb7854c
+EBUILD Gtk2-SourceView2-0.100.0-r1.ebuild 575 SHA256 c0644c18c8ae37fb123d200ace68ce6637539f95d8f538fac5f4db37b7193d53 SHA512 8eda896c1927651970893f628b5653220cafb2f3eae255d0b1442988d028014a19a60fc9f93f22d2f333165fa79710f7c8ec113f7ae40f2361743e9cf9078623 WHIRLPOOL 70b872ea6108dc84fe429a496fbf3d92fca235243e6c33ea5f6f2d0a43c00be28745fa22946f0477c3d37fe85acf10cc4bbbd5022f47502c517a0ba873b9582b
 EBUILD Gtk2-SourceView2-0.100.0.ebuild 523 SHA256 539b5ec77f0960d6b2302569fd0586544ff74611659cdc3d4d0c20780d946bcf SHA512 10892b509a295938cf2eaa4b366cebe0d0fcc1a3679479cc2e15fc0a4484e0d646f9a9d7711d511fddd213ac1691d7eca36a2f7d769993e416f533591d3b8fe7 WHIRLPOOL 3ee0744c6ef5cb960bc001806a53fe08d6b883adfc6cfb660c04b3c5b906df476b767f415f59556ddc5816f4d832fc08a7728b5bdf819f3fcda083fdabe0682e
-MISC metadata.xml 257 SHA256 4d43e70b770d0898a99af64a8454a6116e4a86500c23290655c8371265010427 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e WHIRLPOOL 87039765046556cdc2f7d76ce4192945117bfd5bb684220ea8fb72be310673a5b729ea428666ff1ceb1e6c21fb585a3a7dd72bd94dab89cf076a895e6a7677f0
+MISC metadata.xml 403 SHA256 04462f7f3cc1d4fd1e27ad6fb3a23108a447bb82dbf91cb65221024e5130d108 SHA512 b9f3c64f7936576df43769d466b475ea7708d7276cb9c1885b9229bdbb1b0e3815a8f06a2f9227c75597b228d6a62447c4e0729b7c3d82e3246e063ac3f455ce WHIRLPOOL 1d22890b0ee12aff322777e47a6f1e1cd5684d2581b56d7abd8e06bc4351541fd37fe19d2c5fc60dc5a21a3d3280a43555dc47d9aea4fc488b7106fe50b0b17f
diff --git a/dev-perl/Gtk2-SourceView2/metadata.xml b/dev-perl/Gtk2-SourceView2/metadata.xml
index 2b9a936fc0a1..4febf45a1ab1 100644
--- a/dev-perl/Gtk2-SourceView2/metadata.xml
+++ b/dev-perl/Gtk2-SourceView2/metadata.xml
@@ -5,4 +5,8 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="cpan">Gtk2-SourceView</remote-id>
+    <remote-id type="cpan-module">Gtk2::SourceView2</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Gtk2-Unique/Gtk2-Unique-0.50.0-r2.ebuild b/dev-perl/Gtk2-Unique/Gtk2-Unique-0.50.0-r2.ebuild
new file mode 100644
index 000000000000..782aba3410f2
--- /dev/null
+++ b/dev-perl/Gtk2-Unique/Gtk2-Unique-0.50.0-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=POTYL
+DIST_VERSION=0.05
+DIST_EXAMPLES=( "examples/*" )
+inherit perl-module virtualx
+
+DESCRIPTION="Perl binding for C libunique library"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/libunique:1
+	dev-perl/Gtk2
+"
+DEPEND="${RDEPEND}
+	dev-perl/glib-perl
+	dev-perl/ExtUtils-Depends
+	dev-perl/ExtUtils-PkgConfig
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.05-implicit-pointer.patch )
+
+src_test() {
+	virtx perl-module_src_test
+}
diff --git a/dev-perl/Gtk2-Unique/Manifest b/dev-perl/Gtk2-Unique/Manifest
index 1d14eb5c5876..ec2a13188960 100644
--- a/dev-perl/Gtk2-Unique/Manifest
+++ b/dev-perl/Gtk2-Unique/Manifest
@@ -1,6 +1,7 @@
 AUX Gtk2-Unique-0.05-implicit-pointer.patch 427 SHA256 6cf64b89f25408dfca1862194b5f9cf5dd354af1718dba4f334ecede9104b5ed SHA512 37b7ff60b49ff1e2cdac2d35538433df7be2d6232dbb1e9dad3a458ade36a2d083cab808120f064d6c851bee2ddfc4a919b46fbe8eae24d05e317290651c10d8 WHIRLPOOL 7360677add561818b841ca9f699b8c79bc69951449326f8af08fa72ade1f9419c8936cedc725f9674340609de95398817d9b892fdfe4dcde70566ebc7e618f44
 DIST Gtk2-Unique-0.05.tar.gz 11158 SHA256 ae8dfb0f6844ddaa2ce7b5b44553419490c8e83c24fd35c431406a58f6be0f4f SHA512 9ed700de45e6d7e5410ff4b4313869be9127b7933faf862f4f34f4330165dbda4b1d983efddedcd71487d0cdbf10982a7b76af7cf60339ae3359f57271177492 WHIRLPOOL 0e9fd1b0f2cd79ff24cfb435f89b0fdc9d39e536fff561b5d3950f60021369f9dddb5bce360db155b7cc8e7068a1a01e6b04e96b5082dd68a28c81aa6ecb08f6
 EBUILD Gtk2-Unique-0.50.0-r1.ebuild 475 SHA256 0f973516a620d012c500e73cf9bfe3911f43780ada12c7fbc8c58853df8428ff SHA512 42f1f2ad041b30bd36b1df2df745d3d4a5e6a2c127d9016b03bfa24057b97c381b38ec486863144c13a741865b6fdc0e440c5529bc3bdd91e952f687664c70bf WHIRLPOOL aad78f0dc226dcb7f2ac6ba252c6027ab1cb5a29a41e51235770a2c006ff95f1d6981f7105410dc64970e2f38608e2eb0f8833b830209978fb461edacf0a5b32
+EBUILD Gtk2-Unique-0.50.0-r2.ebuild 557 SHA256 41e05f8e371217c106815101747746c11e8ee7804e495df276729804f0c8cee9 SHA512 7447aa27dba3d8bcba2c8a0b705dde85684e6dac5977ac8794e3adea012ad2417892eed6da65f63473927369f27d9176f89dfb67a822eca8ab6abf11ba999201 WHIRLPOOL 3643c58aaca31804643d3cd9c1360c540e6d3cf66e8158420e289ff24ac4eacc8e1c96fa245201de8cb20f2aed79933b5ef9cf3292a9226d730cc8056b1b098f
 MISC ChangeLog 2651 SHA256 0e536bb3c6e91ef388b0bfe4de8332cf3d72476045f392511b3403b25fa442c3 SHA512 9acb19bc7c5c831bc3bf782b617a937b630cc72a1f5689f1f9d925b5ef8d4f5decf9464b00da3e5c5fe0b140c37fbb348e6961a6f6cdda4fc1ca8aab5072bbe2 WHIRLPOOL 6e0656902b8d9e4e9e7448382d37777509ec77a81d5b937f2cde47213f603010dec8d2bbc7504d733ccca654545ccc222fdebc6b9bfdfc075dbfe9ea8ee38ad3
 MISC ChangeLog-2015 2318 SHA256 e9219ca633b4925568d7ba56537edadba33ff119261c4133fba75f33f80a6a32 SHA512 6a399c5b80a4d75d9bead9bc8d44460a844287112e6c6dacd61c80bab5ddc1257c60479307edd2b688a20cd0435b36a374b319df0f6a07863e8263c49b9f7287 WHIRLPOOL 1c453bcdfbae239308561893c80d23239ba4c6f3e3806746bff6303c7392decff7e18a1efa58bd5f3404afcc246162ee2926258225c5212251a32892d5b2b4ac
-MISC metadata.xml 475 SHA256 4cf4c4bb7f1837f0fdf546085150f313105bc5c8969cd09b7767fbbb31d43f95 SHA512 525ca0261688fa871b35641c890c71b7dfec3fd154885fa1e50bdc03eff232cffba6c5ddfbc9eadf64122fd74ba01819a3643a419b7526bc638bdb367a2b14ba WHIRLPOOL c5ae1448c5a23ea3d15012427be998888aae42d78a14c35721c851ed877a65af9179f8a7eae090da00c2db932d84e5458c468c14604a85b291b599f666ea4af2
+MISC metadata.xml 511 SHA256 c4b6d94e8ee93935996d54b054b203fe67ebb5f4b443fdabf6481998d7a7d29e SHA512 dbbfebd674b4f08cec51b48c04be5eca8a6e42df69719ebcda7b2abbfda194f1a5d5b138fe791152692c1eaa7f63e3665907f6942db5ca34a4c822eb82f57014 WHIRLPOOL eaa8e9aff8f83ff89723b5239b3694dd1d8f866bdf21977bde1830071aee1a2bb42c0bd0be632fa3f051205ba4d2b69663ca0a24256582b59b0aa28e1726025c
diff --git a/dev-perl/Gtk2-Unique/metadata.xml b/dev-perl/Gtk2-Unique/metadata.xml
index 33b3c194520b..3a9e1ff13cd2 100644
--- a/dev-perl/Gtk2-Unique/metadata.xml
+++ b/dev-perl/Gtk2-Unique/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
-</maintainer>
-<maintainer type="project">
-<email>perl@gentoo.org</email>
-<name>Gentoo Perl Project</name>
-</maintainer>
-<upstream>
-<remote-id type="cpan">Gtk2-Unique</remote-id>
-<remote-id type="cpan-module">Gtk2::Unique</remote-id>
-</upstream>
+  <maintainer type="person">
+    <email>hwoarang@gentoo.org</email>
+    <name>Markos Chandras</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">Gtk2-Unique</remote-id>
+    <remote-id type="cpan-module">Gtk2::Unique</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTML-Clean/HTML-Clean-0.800.0-r2.ebuild b/dev-perl/HTML-Clean/HTML-Clean-0.800.0-r2.ebuild
new file mode 100644
index 000000000000..4c01d0862e24
--- /dev/null
+++ b/dev-perl/HTML-Clean/HTML-Clean-0.800.0-r2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=LINDNER
+DIST_VERSION=0.8
+inherit perl-module
+
+DESCRIPTION="Cleans up HTML code for web browsers, not humans"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="!<app-text/html-xml-utils-5.3"
+DEPEND="${RDEPEND}"
diff --git a/dev-perl/HTML-Clean/Manifest b/dev-perl/HTML-Clean/Manifest
index 715a69f95679..8ec18992b47c 100644
--- a/dev-perl/HTML-Clean/Manifest
+++ b/dev-perl/HTML-Clean/Manifest
@@ -1,5 +1,6 @@
 DIST HTML-Clean-0.8.tar.gz 48157 SHA256 ac20aba23afd4d64de2c98dc27593a37b45000ecb0eb4b3bd41792017aff0dc0 SHA512 5e9fdf49c1fccbb35c769394dac2013972bea070579983c5c2e99105b2f9a4ca6594966ae88770fc6ae1ee6b9388a07d61830d0451d6957197114d35dc5cc1e4 WHIRLPOOL 0ac0fd1a0c103ac24bc5f144d10bfd283c544053ab7f91855546a68e7989f7b62d2a17963f85e61f14c2b058d2d7373c2a5924f458faef4210f0c2f4296e8556
 EBUILD HTML-Clean-0.800.0-r1.ebuild 353 SHA256 acaff1f21c2503271f274e6c63764a8c89a1b18f068128db5f7613e795e95929 SHA512 ff3e8b1cdb145752c4cb4804997d84d855522bacfd36359e4489cb68d86d0f25cc22c043831c58652e2e1dcafe88f7b9758e8c258ebee229d28a8235a438acac WHIRLPOOL a2afe65a1647c3200f33c2821e34b571bb1296e31d39b611f3a7fcb2f883f08f4c6723ff712b7511458ed5c1746b616acfa0a6351b18e24463e8460f8b9d53f5
+EBUILD HTML-Clean-0.800.0-r2.ebuild 377 SHA256 86fb6c26bf9bc5a2fc1b34fb1dae593209c0f00611cb6fd8e5756b1bada94b74 SHA512 5ea6bc78cab06781d72d9fbe56f28a84db4c380d998c563a937b5acf82c34098c0c7e130a3a70563042839660b57e0bfa06e5ba3462a27f509e88d015bb0529a WHIRLPOOL 582352a342e091915faabf269586cc268a2734e6787170330f6876b50c23249b83ab642c908fbd6bf42a484c40e4c52798629c20fe18a96d41ce5ba80a90c6ff
 MISC ChangeLog 2446 SHA256 f3c4cd8af776116fe714f0a96480e6af77a6c4d883350d00a18bb1cafbf7c1ec SHA512 18a7ab3b95492fece9360a3df102416fc4dfb2c37764dde52ec1356fc3e1ec945ea00e0286020aa2fb85d8f7a4495de1b1a4a57751199b845670afe8f7bf438d WHIRLPOOL f35023f788320823056f45b2c6d0f75937025f67524a3f0c8735177183122785aa5bc47a71953f7ef0146e989fcc8e371c11e9702fa82c1aa0f61bf26be37b19
 MISC ChangeLog-2015 2618 SHA256 1ce8583cd3ff11ea00ffe6477f935f3b803c3d2f1f964adc992e336140b12cdd SHA512 c3eaae3cf6ca854016c96be2e6c4d3c9bcd9fe2fd46eb5810098fa39f520b8b37f060c002c173720df4c76e8496787d71c8c45f132ad21f3246a1fc82cb85626 WHIRLPOOL 19c6ca17160437bff0425f824d3ea06e77f7ccef6898b9401b93872e1b3c843baed219d9e8e55b4d2c41d8d2d7b2018d1957aae669cb41dbb988cb8d36ca9f85
 MISC metadata.xml 392 SHA256 884079f60370e3bc2420f39bd10b6cfe71e141fed59cc4d52c97d6c96b502301 SHA512 38f13304a42607e51a77ea2bd82c238d232c61b4ffe669c879fa71a538aca17d26a77a877269f4130736b2757bafb7cfca6f59298e04d26584ad322f37d626ee WHIRLPOOL b0a6697b76d58e336ef65f6f5b211d9d6b633b21a551742bf8404d16d16882a01212f5241a46a8283bbf2aa7e736acacba7be79a796e6ffb95be08eec57bd17d
diff --git a/dev-perl/HTML-Form/HTML-Form-6.30.0-r2.ebuild b/dev-perl/HTML-Form/HTML-Form-6.30.0-r2.ebuild
new file mode 100644
index 000000000000..ace9086e7b9a
--- /dev/null
+++ b/dev-perl/HTML-Form/HTML-Form-6.30.0-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=GAAS
+DIST_VERSION=6.03
+inherit perl-module
+
+DESCRIPTION="Class that represents an HTML form element"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	!<dev-perl/libwww-perl-6
+	>=dev-perl/HTTP-Message-6.30.0
+	>=dev-perl/URI-1.10
+	dev-perl/HTML-Parser
+	>=virtual/perl-Encode-2
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-perl/HTML-Form/Manifest b/dev-perl/HTML-Form/Manifest
index 5ba00121cb65..6244032e2e59 100644
--- a/dev-perl/HTML-Form/Manifest
+++ b/dev-perl/HTML-Form/Manifest
@@ -1,5 +1,6 @@
 DIST HTML-Form-6.03.tar.gz 23522 SHA256 68c01d94f005d5ca9c4d55ad2a1bf3a8d034a5fc6db187d91a4c42f3fdc9fc36 SHA512 d93644c9f440f1e0289fa708459e461721910d62c825f382cf913cfc4faa9934fb78ccd929385a4a36605cbc9512e50b56776c6562cb90b31cb1519c1abce7a8 WHIRLPOOL 142705d17eb66c6c24115c9987f77a4317e44d8075e68f165acddbbefb53c2e2ec5676b002f38b2bb106f0f3761467d18b13cdcb178e4f35ddd33133772e6e06
 EBUILD HTML-Form-6.30.0-r1.ebuild 605 SHA256 5d9abf7b2f21d6f7e904aa0c25b95a30e4adab47773831f37fe0fadcf95589ba SHA512 bc595d49a7dae2c9fb947299510bdecffe293763ca55c6143854f8a3a3fb511675fbd2bc97438c190e9085f5ffe9b81342a4e37e7ca3497cf872d32e92653603 WHIRLPOOL 28e49711299a10cd3c57c18cb4c2aa6fe32c536e635108cc7319dbdd2b43bd138e540d22ac061dfed7824261ba2f48f0d09785f59294f64c5ed0be2b14872163
+EBUILD HTML-Form-6.30.0-r2.ebuild 609 SHA256 4b3cc9e93971fd30749830ee7e127833d2189363fa92325b50092691aa9c245a SHA512 10658a29753fc1746ad32da1c1955b26419f282ee6cc921832de65d5b71343190151848d64a5bbe626262edd062b96ca21b94fd5ab600e2756907321a96a2972 WHIRLPOOL e1e7b96fc6e349d3ac74f50ed0fd3cbbccac9aa13a5a444e6cb941786f4957b4cbc4e830b086d98b17b2fad7171020086f807208efb3261dbb0c0a382fcac108
 MISC ChangeLog 2596 SHA256 14c5f43d2629497e61344347ca4d44e3e58460d03a89b46e9c6cb01c07a12510 SHA512 f087555f8292f463e2ed703fb4460460e8a4f4e52b540619239f6756f204b5a74ca524afac686c51cc5634d7db988aa7c3ba0f2442d619167c59e4e5f649185f WHIRLPOOL a0ef05769ade57819f30026a46e1636c8c168718c7da200cd0dbba6ddbfbc056aa218fdfbba7973c1b845a558f237d782a537a7c333998eeaf410bd0c137f607
 MISC ChangeLog-2015 3431 SHA256 d8c1d7985644a6aa88aecd0be1d6a69d8218250f7f234b1a8662b785dac25a49 SHA512 277eb68e6ee7120c3460346637727f7522da29d2cee82e9d9adff5dab348994b668c8543b3c43ab9c3d7c30232f0b033ec9e83a2dfa729cb9f31b2bd639a5c72 WHIRLPOOL c4281d7ed9a2c6353de1c7072876605b0388983a2f777e4d6b8e338017299feb89b6d287f543f70db50d651b149739a522dd098d8cbc579a91454cac7c007f61
 MISC metadata.xml 909 SHA256 a6f98aa0b8d1b338cb4da5a0a32a10173ca9c43be0ebeee573ba5fa0bdcb73ea SHA512 a8b0ec2f4a5c1951c8b4feb7502bb9dccc2f75bf2f40c29835993e25ca76640d14947237b6fcf5748b97d1c0051aa5cb68491471a0827cde0e3b3287606d4e14 WHIRLPOOL 2d85e6a703284649183e485486020372e5e27c0cfe2049f4c4d1c28fb4b180526724037b6a7c78c9113cd6cf91d1340fcd06727f418f17acb6771af6aa18290c
diff --git a/dev-perl/HTML-Format/HTML-Format-2.140.0.ebuild b/dev-perl/HTML-Format/HTML-Format-2.140.0.ebuild
deleted file mode 100644
index 3692d8ca7a3f..000000000000
--- a/dev-perl/HTML-Format/HTML-Format-2.140.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_NAME=HTML-Formatter
-DIST_AUTHOR=NIGELM
-DIST_VERSION=2.14
-inherit perl-module
-
-DESCRIPTION="HTML Formatter"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="test"
-
-RDEPEND="
-	virtual/perl-Carp
-	virtual/perl-Data-Dumper
-	virtual/perl-Encode
-	dev-perl/Font-AFM
-	dev-perl/HTML-Tree
-	virtual/perl-IO
-	virtual/perl-parent
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.280.0
-	test? (
-		dev-perl/File-Slurper
-		virtual/perl-File-Spec
-		virtual/perl-Scalar-List-Utils
-		>=virtual/perl-Test-Simple-0.960.0
-	)
-"
-src_test() {
-	local badfile
-	perl_rm_files t/author-* t/release-*
-	for badfile in t/000-report-versions.t META.yml; do
-		einfo "Stripping bad test dependencies from ${badfile}"
-		sed -i -r -e '/Test::(CPAN|EOL|Kwalitee|NoTabs|Pod|Port|YAML)/d' "${badfile}" || die "Can't fix bad deps in ${badfile}"
-	done
-	perl-module_src_test
-}
diff --git a/dev-perl/HTML-Format/Manifest b/dev-perl/HTML-Format/Manifest
deleted file mode 100644
index db7d5d2d0592..000000000000
--- a/dev-perl/HTML-Format/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST HTML-Formatter-2.14.tar.gz 51298 SHA256 d28eeeab48ab5f7bfcc73cc106b0f756073d98d48dfdb91ca2951f832f8e035e SHA512 616ee70f3a6038589d9348a1463bd9c1cac4d7fe00aff5dbb52968d0ef44129658ff6cdc114f2c389a1eed068a64f48ab34bb90b60d3f20a0a024750ddadda42 WHIRLPOOL fdf953e6115a1c0f82366707cab0bd7d80e1a1173e76e7231e9d702dfdad2b23b3d298859986e79304c4fd1b23d0481003f615cad8c802b8880999ee3f08700d
-EBUILD HTML-Format-2.140.0.ebuild 945 SHA256 ba62eb23ea13d94fdd012f7466e997e13b93a6f7122e0b48b5dd4e3fe7e99480 SHA512 b73c915ae4d93805a42efd5abc1ccdf661e3c6df63bfd23e5daeed9dcfd5b1a4df02c364257cd24ed8a0fa7b1400ec7f31a12bbd67436d476c7d7b1dfb04a342 WHIRLPOOL 303175063f9769d380f1fe0403110bba5036af7ac30b587c2ac139bb5aad8ebd7a5a16b3d018b21d388bc25032d066d45e2bc1023d6f68400a45a182afc0ec7f
-MISC ChangeLog 3955 SHA256 1c5cecad998ea3107038175f8923495b4c88610ddc879afb336bc69db278f209 SHA512 c9f6b7fb911f1fbe759839563509d7735d5e847209ef8f4cd08a122c20dffc72e2b1523f86076f4cb56c832860b015414eff6ff36353a088a6e476999e7b032c WHIRLPOOL 5175371265f984bfc08114665c4074dacda5edb13b415621779979589dae71553ba23635e3361b3548647b34500c3b482b2d4828cfe4255c6dd9c711af180fc9
-MISC ChangeLog-2015 3742 SHA256 8205cf021e1ef9968827274a2f5c2cb5e3c4bdc95dabaada62fd11ba2e2d9181 SHA512 6a761be11a01bbac377130086dcd55297753d13f0a5a6fcdc897bc633d8edcbbb19761ec154c544609092f91b692378438a68309f49ba4860caf782d1fee9da8 WHIRLPOOL 3fb793cea71f4c9d4d9499742c71e8742c0372826a52517ff842ada0f0e56224debf0c08185031e47eeeb9b15b0466159ab0800ce5316e732955ba83cd01d3c5
-MISC metadata.xml 583 SHA256 a7f8f01d6f469ba0982fda20f4ca9fd4b1411f8587e4bcea659dbf9ce2a1f5cc SHA512 2c0bcf62d194fe49cd6d5abfd5594c35a4653227c580d1d801c5c4238cea1457b65fd97e37fb83b65fef6abeb377cb7602807d9910f83a996d3ce3daeab082cd WHIRLPOOL 54e4e5b1f70ad60bbafe00221ed4756cc31ff2b729ec3b60c473082f056613beab8f844b819aea1c54a3c6e2b891a630a0c98bd0d42f523cb8ee9000ecffb164
diff --git a/dev-perl/HTML-Format/metadata.xml b/dev-perl/HTML-Format/metadata.xml
deleted file mode 100644
index 5e304e0df369..000000000000
--- a/dev-perl/HTML-Format/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>perl@gentoo.org</email>
-    <name>Gentoo Perl Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="cpan">HTML-Format</remote-id>
-    <remote-id type="cpan-module">HTML::FormatPS</remote-id>
-    <remote-id type="cpan-module">HTML::FormatRTF</remote-id>
-    <remote-id type="cpan-module">HTML::FormatText</remote-id>
-    <remote-id type="cpan-module">HTML::Formatter</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-perl/HTML-FormatText-WithLinks-AndTables/HTML-FormatText-WithLinks-AndTables-0.60.0-r1.ebuild b/dev-perl/HTML-FormatText-WithLinks-AndTables/HTML-FormatText-WithLinks-AndTables-0.60.0-r1.ebuild
new file mode 100644
index 000000000000..e198ce232fdc
--- /dev/null
+++ b/dev-perl/HTML-FormatText-WithLinks-AndTables/HTML-FormatText-WithLinks-AndTables-0.60.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MODULE_AUTHOR=DALEEVANS
+MODULE_VERSION=0.06
+inherit perl-module
+
+DESCRIPTION="Converts HTML to text with tables intact"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/HTML-Formatter
+	dev-perl/HTML-FormatText-WithLinks
+	dev-perl/HTML-Tree
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/HTML-FormatText-WithLinks-AndTables/HTML-FormatText-WithLinks-AndTables-0.60.0.ebuild b/dev-perl/HTML-FormatText-WithLinks-AndTables/HTML-FormatText-WithLinks-AndTables-0.60.0.ebuild
deleted file mode 100644
index 9e69584b7edb..000000000000
--- a/dev-perl/HTML-FormatText-WithLinks-AndTables/HTML-FormatText-WithLinks-AndTables-0.60.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=DALEEVANS
-MODULE_VERSION=0.06
-inherit perl-module
-
-DESCRIPTION="Converts HTML to text with tables intact"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
-	dev-perl/HTML-Format
-	dev-perl/HTML-FormatText-WithLinks
-	dev-perl/HTML-Tree
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/HTML-FormatText-WithLinks-AndTables/HTML-FormatText-WithLinks-AndTables-0.70.0-r1.ebuild b/dev-perl/HTML-FormatText-WithLinks-AndTables/HTML-FormatText-WithLinks-AndTables-0.70.0-r1.ebuild
new file mode 100644
index 000000000000..8ca660d0c0c8
--- /dev/null
+++ b/dev-perl/HTML-FormatText-WithLinks-AndTables/HTML-FormatText-WithLinks-AndTables-0.70.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=DALEEVANS
+DIST_VERSION=0.07
+inherit perl-module
+
+DESCRIPTION="Converts HTML to text with tables intact"
+
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="test"
+
+PATCHES=( "${FILESDIR}/README-INC.patch" )
+RDEPEND="
+	dev-perl/HTML-Formatter
+	dev-perl/HTML-FormatText-WithLinks
+	dev-perl/HTML-Tree
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
+
+src_test() {
+	perl_rm_files t/author-*.t t/pod.t t/boilerplate.t
+	perl-module_src_test
+}
diff --git a/dev-perl/HTML-FormatText-WithLinks-AndTables/HTML-FormatText-WithLinks-AndTables-0.70.0.ebuild b/dev-perl/HTML-FormatText-WithLinks-AndTables/HTML-FormatText-WithLinks-AndTables-0.70.0.ebuild
deleted file mode 100644
index a8037272faab..000000000000
--- a/dev-perl/HTML-FormatText-WithLinks-AndTables/HTML-FormatText-WithLinks-AndTables-0.70.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=DALEEVANS
-DIST_VERSION=0.07
-inherit perl-module
-
-DESCRIPTION="Converts HTML to text with tables intact"
-
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-
-PATCHES=( "${FILESDIR}/README-INC.patch" )
-RDEPEND="
-	dev-perl/HTML-Format
-	dev-perl/HTML-FormatText-WithLinks
-	dev-perl/HTML-Tree
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
-
-src_test() {
-	perl_rm_files t/author-*.t t/pod.t t/boilerplate.t
-	perl-module_src_test
-}
diff --git a/dev-perl/HTML-FormatText-WithLinks-AndTables/Manifest b/dev-perl/HTML-FormatText-WithLinks-AndTables/Manifest
index 8cfb0e70507b..538340f80e47 100644
--- a/dev-perl/HTML-FormatText-WithLinks-AndTables/Manifest
+++ b/dev-perl/HTML-FormatText-WithLinks-AndTables/Manifest
@@ -1,8 +1,8 @@
 AUX README-INC.patch 177 SHA256 4674eeabb576ec0c4b52b543d9d5ddfc3ada32fbfef20207a3d65dca432d33db SHA512 717e0b01f59e18e3656d1cd72b2482af753b57fda2f76cced6ae864d1b9126367886219ea4b8a3820b89b19ecca46021bc1a56c07626789dd3a73159384f3dc1 WHIRLPOOL eade3f1b3852e6512cf5c24b1c0865cbbc56a49c8182d3af27833c4cdde61b1056ab57b79248be86f3affcdfaaae815056f6d9629315698388447e30d6214fa1
 DIST HTML-FormatText-WithLinks-AndTables-0.06.tar.gz 299894 SHA256 e5b23f0475fb81fd6fed688bb914295a39542b3e5b43c8517494226a52d868fa SHA512 c930fcc5919d20a67a00826aec11d1d2416a3ae145cf30acee98aa45bc64523858ba49907957c5772b4bedaa1e79ed7a0afef3101c29f913fcf983ce1dddd4c2 WHIRLPOOL 6cf0c0053bc020448d73334ef7d5f2a8ef1ac99dee5eea15bfb75517d37e535863bb0f9f341fab65b09762592d6cb37ca14fc833a9fcc6e55faa96979baedc8f
 DIST HTML-FormatText-WithLinks-AndTables-0.07.tar.gz 11934 SHA256 809ee2f11705706b33c54312b5c7bee674838f2beaaedaf8cb945e702aae39b6 SHA512 3deea4406f7f9dd55d22d60c169d3889be7ef802a43507fb8b608c45ecdff52f743c9cb3a4703f1e44cdcf033c4c64b4c993192fe1a39efc9eae78c6fb66ff3e WHIRLPOOL 417ba74b6bc2f79f9d5bed199747d26569b086f200534fb650b235c25c22fc01acc0e94769c9ac9b223df91c6fd7937129b756153214689c2a27167c73b10056
-EBUILD HTML-FormatText-WithLinks-AndTables-0.60.0.ebuild 481 SHA256 8facaa4c8e7aa08c0940dac7ebfbb88d35dbcff72ffed3a448280a38a7c56902 SHA512 a6afbc2ad8797360ca710d9967c4585bf78756157a8fe10e393425b936b6b7a34fa1e99f34f73b53e158395298cef21fb544f4df2e81b4972942d19f3df96176 WHIRLPOOL c2bd0213f538ef7a606a1527660f51b0708a498c9893280c18c2d06c70f9b2c511f04fc72a717522ff1964ce185a61b3cfd77e349f71281c58d285c71a97dec7
-EBUILD HTML-FormatText-WithLinks-AndTables-0.70.0.ebuild 585 SHA256 3bc07bfd15963e8edcb64f2e53f7953cdba3f6910cfee3fff3e3a019528e4532 SHA512 2add1757339fd27c350e7b521813784185f89de55f6963bc99cc6ac06929193762f3176d79f042d599665eb79d9ff2e8aabebff5bcb0ee48488de3886dbb6d7d WHIRLPOOL 00766d680ba56fb49bd06715a49770b42b7d2bc15632df3d17e63d31dc053da103601f870331a5dc4f7a695f0fd6f3c0465842eeab9638f8ec4a9a844505ad54
+EBUILD HTML-FormatText-WithLinks-AndTables-0.60.0-r1.ebuild 484 SHA256 94a92d993d923787225bbb5614098c51da2007e2cc1c597910ae7495be5c612a SHA512 87700b519990313521b51e880a082e9e97c3f11e7a89b3145910fadbb549862439f326f1a06a92ad847cf5d39a19116712d40bb0d8a9834c7ef2e83870567aa8 WHIRLPOOL dc85e1fd2f7eda9eeab389f4f995f2c38b4c4d95cff614cd3df5511097c893ade95dca7eb9e5c4801b2a2f8e6d9150b2143d05dfa331fb5b599831c80721be60
+EBUILD HTML-FormatText-WithLinks-AndTables-0.70.0-r1.ebuild 588 SHA256 82a89e7a479e295e3e13609a2ea75d2c9b5cb154b85ea4ab40e04712e63cd5d4 SHA512 377c7c553acfc79d18605a06b026cdabf76cec493668333153773f81919273e01752f82b0dbd4d38a4402d0047746727290eef12f8512382d1daa2e7bbcb68a7 WHIRLPOOL 422c08d72bc4a3a6ebd18943dfc336379144f207db2f5d8bb6d2d12a6c4613502d7d1b95d2c6d4e8a14e3ce6daf1936d67f13a4492bd41da1190e015e558e728
 MISC ChangeLog 3134 SHA256 2267feadf639e8edfc2d2e8bd756a6424f91dabd2bf129034698c0467b9a5f1e SHA512 e015322ba921d8657f588ec63368a1e76f8745f4bb54620074d83393256ca7963dbe34bf7834b1dd513ff695d7dd746ffef176efe7bed2779e4805e1a1588731 WHIRLPOOL 4b52ff2ac9593124c5824bb531d235b6fb58e26182e186ff43e100ac02b92f5b686df9422682f33ab0aa9d13f5750c288401a64f08645de0cd35fb7ee0433aeb
 MISC ChangeLog-2015 1083 SHA256 9bd2d48579960b7f10ccb6445abefd5821684a9aeb1b9067900879f84a97cf36 SHA512 f63686141328fd5b9209aae5e279b088ea73f7507fec0d38b8c03d5e8fa1bf77cab037a3d38b280f90cc27aff4a45df0d0da61887ba5fa5ba9fdbb1fa5b353f1 WHIRLPOOL 53cb90509ef966fad27200917633c399c9ee2539f06d6b3581a85c41ee0275c46898191f20da9057e0de4958a6737502d96fdf613a47520a92c1d592521a3592
 MISC metadata.xml 600 SHA256 fa0de896bc246e7ee4f11cc5f8d02a4dd7d31ebf1307638699d0ba9506821550 SHA512 202891aef6175c631c8b7b598d96e479c42d60d23366cdb02689c3fef5efac860726f706fe945cb7bec556a16f81a7038a75daa395a678eeae772b86653779e5 WHIRLPOOL 4d15c1d8049af917ed11bc6c9b9c9fc6bb274845c10f3f7cd651ab96ae3def684379f70aea8d97a363d6460aa5cc098fb3d1df57b94f65da2a66fef8ebacd8f5
diff --git a/dev-perl/HTML-FormatText-WithLinks/HTML-FormatText-WithLinks-0.150.0-r1.ebuild b/dev-perl/HTML-FormatText-WithLinks/HTML-FormatText-WithLinks-0.150.0-r1.ebuild
new file mode 100644
index 000000000000..96ebf4416277
--- /dev/null
+++ b/dev-perl/HTML-FormatText-WithLinks/HTML-FormatText-WithLinks-0.150.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MODULE_AUTHOR=STRUAN
+MODULE_VERSION=0.15
+inherit perl-module
+
+DESCRIPTION="HTML to text conversion with links as footnotes"
+
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/HTML-Formatter-2
+	dev-perl/HTML-Tree
+	dev-perl/URI
+"
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.380.0
+	test? ( virtual/perl-Test-Simple )
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/HTML-FormatText-WithLinks/HTML-FormatText-WithLinks-0.150.0.ebuild b/dev-perl/HTML-FormatText-WithLinks/HTML-FormatText-WithLinks-0.150.0.ebuild
deleted file mode 100644
index 55626dfe37bc..000000000000
--- a/dev-perl/HTML-FormatText-WithLinks/HTML-FormatText-WithLinks-0.150.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=STRUAN
-MODULE_VERSION=0.15
-inherit perl-module
-
-DESCRIPTION="HTML to text conversion with links as footnotes"
-
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-
-RDEPEND="
-	>=dev-perl/HTML-Format-2
-	dev-perl/HTML-Tree
-	dev-perl/URI
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.380.0
-	test? ( virtual/perl-Test-Simple )
-"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/HTML-FormatText-WithLinks/Manifest b/dev-perl/HTML-FormatText-WithLinks/Manifest
index c098219460e8..93056287c44b 100644
--- a/dev-perl/HTML-FormatText-WithLinks/Manifest
+++ b/dev-perl/HTML-FormatText-WithLinks/Manifest
@@ -1,5 +1,5 @@
 DIST HTML-FormatText-WithLinks-0.15.tar.gz 11915 SHA256 7fcc1ab79eb58fb97d43e5bdd14e21791a250a204998918c62d6a171131833b1 SHA512 cdec4ba94c3f9dfd4e9c8b03be0e24068b23b634499bce062e0b281b26ad3a0288c0d4cc35b4db62fd81ad5f0a0f9ce42a59478af10a81ca2f5901ab79cdf550 WHIRLPOOL 85a90fb039273c390e8f395f48404313891f305588d2cec87d6f5552326caa18ecdc7e201e78243147ab80359d3bf081b082abef55eb160d536bb07982317cec
-EBUILD HTML-FormatText-WithLinks-0.150.0.ebuild 466 SHA256 195d31cce3711ddcba2a3d3b9927ef523ce10d1f776a3e14340f7684c5f0e7a3 SHA512 e3f2595357b521127e1acc5e94ff1f92b7deeb27f3cfabd3fd52bfb2a8e8a5a61e66fd3f7130de3c2a84eb3be5d953e3c36fa4898573fb72b7f146c7bd09bcf6 WHIRLPOOL 969f3df41619d1ae94eab792e82b929616293c353e3f9c5e22c63b92d34e904de8ff7d362db059226fa23b88e3017733fe4f96f9de4062800ea33445b8461b96
+EBUILD HTML-FormatText-WithLinks-0.150.0-r1.ebuild 469 SHA256 f5216f424a3a09539fa8dd4914b21a5eb84b01cdf0273dbd9982ffeb3e06b6e9 SHA512 c8bb9989fcde9b914883f8e56730d5eff34a3411df0bbd4be298d171a6312adaf59f5c4f0ca50c016c3235cba34060d62dc3781fea3930a677d0ad4fc83bc805 WHIRLPOOL cf84bec5396f6c54d7b50f6ed5afe2b7ec16df6a17270ed7c59717bafdf2f86ae7dbb6aed8fd1b5499f2fba22b0a645467979ecffcc8e957802adb04e555e8fd
 MISC ChangeLog 2730 SHA256 067cc93d36e2f2d2c9a96ec82475612d2ec534e6e872d166087afcc8af46bdd9 SHA512 db03378bc26fbe75532671af126af0a6b6bdb5b18642391b0128bb8192648022455130e21fae2a3df54a9cbc287a4c940086118d74a8a27211f2bcab6093afdc WHIRLPOOL 8752aeedb8b4bc736e90bd578f95ceca99b4a5a593c50390820c305ede8dca601fb50e5b932f4e919b3dfe257218b810d8e047e1f10df715699d53b461a28f1f
 MISC ChangeLog-2015 786 SHA256 b7a685d5fe59bb2bd7a0ceac4ab00dc229e81fe59de1f01dea6a08c9c288ef85 SHA512 049d9c89a55760cf5ed5e7dd3b7981dfe1f472ae0af66b4e0524343d0e8588c41dea4cd8f24102ac91e9760b983f51fbf1efa60ff49971b1e6a2a1f51ce9c832 WHIRLPOOL c5a02dd6a1874526e56e253d2562dd93c9e4bbce5e5c6981af3a74b4a0665c0cceb0285918cc4a80c3a05c2a3810184a084ca2bb0bbe5fa67f4cbe5fb36089b5
 MISC metadata.xml 579 SHA256 7b2d729bb171b4cb93ee40140f79e4c461e1a568b0c3e0842e4962e75d047465 SHA512 03899045487e0745216c249cc498b7d2e9d36d652297f3a5d5fb1ba5c142bb4903a64826bfdd7cb25c0ee22348fd74964a868c842a7a89aeacbe2a13a5d1bb15 WHIRLPOOL 2d2141d8ad623ada7812545353e2051ec66611e28f78b50fc92cd2a1186f871441ed6184f2279073966fc046d908915187bad538a6527b6247179cc1b772950e
diff --git a/dev-perl/HTML-Formatter/HTML-Formatter-2.140.0.ebuild b/dev-perl/HTML-Formatter/HTML-Formatter-2.140.0.ebuild
new file mode 100644
index 000000000000..0a54d6588078
--- /dev/null
+++ b/dev-perl/HTML-Formatter/HTML-Formatter-2.140.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=NIGELM
+DIST_VERSION=2.14
+inherit perl-module
+
+DESCRIPTION="HTML Formatter"
+
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Data-Dumper
+	virtual/perl-Encode
+	dev-perl/Font-AFM
+	dev-perl/HTML-Tree
+	virtual/perl-IO
+	virtual/perl-parent
+"
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.280.0
+	test? (
+		dev-perl/File-Slurper
+		virtual/perl-File-Spec
+		virtual/perl-Scalar-List-Utils
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
+src_test() {
+	local badfile
+	perl_rm_files t/author-* t/release-*
+	for badfile in t/000-report-versions.t META.yml; do
+		einfo "Stripping bad test dependencies from ${badfile}"
+		sed -i -r -e '/Test::(CPAN|EOL|Kwalitee|NoTabs|Pod|Port|YAML)/d' "${badfile}" || die "Can't fix bad deps in ${badfile}"
+	done
+	perl-module_src_test
+}
diff --git a/dev-perl/HTML-Formatter/HTML-Formatter-2.160.0.ebuild b/dev-perl/HTML-Formatter/HTML-Formatter-2.160.0.ebuild
new file mode 100644
index 000000000000..8a236d55303a
--- /dev/null
+++ b/dev-perl/HTML-Formatter/HTML-Formatter-2.160.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=NIGELM
+DIST_VERSION=2.16
+inherit perl-module
+
+DESCRIPTION="Base class for HTML Formatters"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Data-Dumper
+	virtual/perl-Encode
+	dev-perl/Font-AFM
+	dev-perl/HTML-Tree
+	virtual/perl-IO
+	virtual/perl-parent
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/File-Slurper
+		virtual/perl-File-Spec
+		>=virtual/perl-Test-Simple-0.960.0
+		dev-perl/Test-Warnings
+	)
+"
+src_test() {
+	perl_rm_files t/author-* t/release-*
+	perl-module_src_test
+}
diff --git a/dev-perl/HTML-Formatter/Manifest b/dev-perl/HTML-Formatter/Manifest
new file mode 100644
index 000000000000..60ab097be56c
--- /dev/null
+++ b/dev-perl/HTML-Formatter/Manifest
@@ -0,0 +1,5 @@
+DIST HTML-Formatter-2.14.tar.gz 51298 SHA256 d28eeeab48ab5f7bfcc73cc106b0f756073d98d48dfdb91ca2951f832f8e035e SHA512 616ee70f3a6038589d9348a1463bd9c1cac4d7fe00aff5dbb52968d0ef44129658ff6cdc114f2c389a1eed068a64f48ab34bb90b60d3f20a0a024750ddadda42 WHIRLPOOL fdf953e6115a1c0f82366707cab0bd7d80e1a1173e76e7231e9d702dfdad2b23b3d298859986e79304c4fd1b23d0481003f615cad8c802b8880999ee3f08700d
+DIST HTML-Formatter-2.16.tar.gz 54362 SHA256 cb0a0dd8aa5e8ba9ca214ce451bf4df33aa09c13e907e8d3082ddafeb30151cc SHA512 feb09ed5eefa36f1368f051aa077a8123b5c22a50feea10c09f3b7f826c78ac45868a3fde4f96a340bc922a9512afc9c4b02ca6d97d6e538e517e7f3797bd47c WHIRLPOOL 479d41503e64724cc028aa4baa6679d25fa64cca717cb0f52c6c2b3154debcb2912ad47ef75228de99dcd8f0ebcedf8836606ab81d2b7dd4da8db278105b6773
+EBUILD HTML-Formatter-2.140.0.ebuild 920 SHA256 11e528ecfd5dd1513f97eb7bc2f6e8218d14627478dc9f47ceefc3bcf4bada75 SHA512 287fccb6c91ce8a5c54200d628f8d423d969964eaa9a8ae52adceb678c1c5db11269edeabd72a9469afff42546d39a49e2fe6a31ce45cb7c81a7ffd7967410f6 WHIRLPOOL 32daafe8847635636f707fb3756dd87da6eed67d9595c226770b2ddb9d1960eb9022f518ba3056fa9dc5580da855b72649103dedfe365cf03744008782f6ded3
+EBUILD HTML-Formatter-2.160.0.ebuild 677 SHA256 b9c0efd39eb7d37d3cc364978dba8126d4ce7d113e2231085eea4aa9f1f092d3 SHA512 f27f28aa4d21b10d14bb3a44f3c26d88c2237ab924fb306606c68deb8fd02d964163fea1c1e2368670927b00396dd13084a001975fdd80a828e1795b4459c13f WHIRLPOOL 3d719aa336e49addbd8a07f3ec23479f9b08ad6ca5544611c9768db39aadddc6e59bc4847d9a28a2231f6b10793c421be78b9a715e05fa9e46fca8385ad2eec5
+MISC metadata.xml 653 SHA256 31100ffdb61f783ee6e0c646d8fe75d84494e527fe6a264508dcb8131f5d645e SHA512 54622e654f7e8de39018040ceab316bb0846215c4f8f8c4a0d479db71cee33054e18e2acece26ac4a6acf72151ffac3851227d85b8e12c9f66a232cf24a96c83 WHIRLPOOL 4c73b32b636eaac919cab830e8f9ea9528bee47997ac5de96529d73e639cca30ff5ff70edf67092e921ded26d7db20aff349d3bc78e811c9260b7f8438c7dd2b
diff --git a/dev-perl/HTML-Formatter/metadata.xml b/dev-perl/HTML-Formatter/metadata.xml
new file mode 100644
index 000000000000..aad8006899ff
--- /dev/null
+++ b/dev-perl/HTML-Formatter/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">HTML-Formatter</remote-id>
+    <remote-id type="cpan-module">HTML::FormatMarkdown</remote-id>
+    <remote-id type="cpan-module">HTML::FormatPS</remote-id>
+    <remote-id type="cpan-module">HTML::FormatRTF</remote-id>
+    <remote-id type="cpan-module">HTML::FormatText</remote-id>
+    <remote-id type="cpan-module">HTML::Formatter</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-perl/HTML-LinkExtractor/HTML-LinkExtractor-0.130.0-r2.ebuild b/dev-perl/HTML-LinkExtractor/HTML-LinkExtractor-0.130.0-r2.ebuild
new file mode 100644
index 000000000000..cf2e44ed0db1
--- /dev/null
+++ b/dev-perl/HTML-LinkExtractor/HTML-LinkExtractor-0.130.0-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=PODMASTER
+DIST_VERSION=0.13
+inherit perl-module
+
+DESCRIPTION="A bare-bone HTML parser, similar to HTML::Parser"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-perl/HTML-Parser"
+RDEPEND="${DEPEND}
+	dev-perl/URI"
diff --git a/dev-perl/HTML-LinkExtractor/Manifest b/dev-perl/HTML-LinkExtractor/Manifest
index 9c5b6bd41951..9c6e98ddf98e 100644
--- a/dev-perl/HTML-LinkExtractor/Manifest
+++ b/dev-perl/HTML-LinkExtractor/Manifest
@@ -1,5 +1,6 @@
 DIST HTML-LinkExtractor-0.13.tar.gz 15709 SHA256 8f42fd3838fe39b2ab02ebf098f43b15fa701c56b93aa317fe9f3aa006ad9fc1 SHA512 30d3f0688c6b13bd81b85ee9f1bb6987871d2718e051179fd2fc0c2d15190478f4c78a1a71b074ae444b45c1b7fb1ef05675645132fef1b4b892016b69a24fc3 WHIRLPOOL bffb8fef3b302d3e3a9477aaca252986af18a776515666b3c8f639fd077a6a5de4ca96f47441dd8e6504aafc8b43aefd506613c9873cc6403c7c7c7c65ed75b6
 EBUILD HTML-LinkExtractor-0.130.0-r1.ebuild 369 SHA256 7702a0e665fff2c0241ac99a062a95670695ada38d32bee933055189fc2a218a SHA512 8c607e8d089f05c0099fc3e62a18b71cf5787d7502f09141dcbb26e7153ce1d71167b315d77870830a93f61a17ac826023e11aca9430bec9c1dc76b3f33b413d WHIRLPOOL c7f69960b020f5bdbfa768989af4a04a1bc1d35c293b27615b15eba6d82c6c0f27455d46bdd9ac927c71fd9026f14ef6c7c1c438acfa97f54112f5f29c55b371
+EBUILD HTML-LinkExtractor-0.130.0-r2.ebuild 371 SHA256 b54f12a9df33a490c6c436fb2e6f8bd28616d9ed62093de8ffcb756f6bc4832b SHA512 2f57967cb76f071de7da5032310fa3c367fc55e6cc369f7b13cd05a87bc4c474f2233f289b961fce7088155c2a911c7a0142d47c73b8cc949b63c510587438a2 WHIRLPOOL bcf55760b86d218f6d3f2dd2b15e299644f2c8fba7916b4fcbf2f9fe0d9c118cabe29e2074f45b9aa064068e0da850c15e5c32576d2039bab282264b700175d0
 MISC ChangeLog 2470 SHA256 9763112008486b5107e9671976335f1857b9b62ef87d008e52bebbe5be654c0e SHA512 4beb8c754c37fc2ca86240e37aa0c87561889966eff51b924993cda9ff4a88e3dbd6165396940419d615540a3e6e3096e055fb33a65eeca77a1709f399127e92 WHIRLPOOL 17ff273028f0db41905cd22d6e104f2eccb8b9139c38a2d8193a46c04f6624d5d9ce0884ee9983dc546f1813dc3446a0fd0f244c9917a6e16f107ef313217d4e
 MISC ChangeLog-2015 4017 SHA256 8680f31c6b8cbd114b606579d9ba0f7dc8b7be3bd5775437c196d80d05237b90 SHA512 4a8b56d8ab43af2bb12f72c6024cf6807ccf25dec23daa5c9d89bdec7542eb5035cc0a8f79648efdd732edc6e42357aa1bccea4ecb6288dcb57c01ecbfbb28b5 WHIRLPOOL 3cb8d86e7cd9aa1efb07085c88edd04f66ea40c339b2f1fff09f39f83d62370ab8e7cecf8c9265d26bdaf8f2267edc70bc52bb60974377893e24302b1eaf5911
 MISC metadata.xml 408 SHA256 3088dfc1d676e0f481fb707c7fbcf447d651249e405912dacfebdc9a8650e152 SHA512 f294514eb82d6becc7e6e2ec471c96834194e052e65715e13049329f479f6e6cb746c7b3ab8e1b4563e2e0ec20654181f26078f0f9dca41c3f68b33a52cafb80 WHIRLPOOL 2d53f4ea73a5dc68fc9164596c2d7acac2c8ccef2cde9026b03854742538c8fce702626d86a2af1c5302352201020135af7e1e9868fed16245df2e1080add0fd
diff --git a/dev-perl/HTML-Mason/HTML-Mason-1.560.0.ebuild b/dev-perl/HTML-Mason/HTML-Mason-1.560.0.ebuild
index c6057a104d3e..522c6657af3b 100644
--- a/dev-perl/HTML-Mason/HTML-Mason-1.560.0.ebuild
+++ b/dev-perl/HTML-Mason/HTML-Mason-1.560.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -36,6 +36,7 @@ DEPEND="${RDEPEND}
 		dev-perl/Test-Deep
 	)
 "
+PATCHES=( "${FILESDIR}/${P}-no-dot-inc.patch" )
 
 want_apache2 modperl
 
diff --git a/dev-perl/HTML-Mason/Manifest b/dev-perl/HTML-Mason/Manifest
index 0b241129d7b5..36c034017e90 100644
--- a/dev-perl/HTML-Mason/Manifest
+++ b/dev-perl/HTML-Mason/Manifest
@@ -1,5 +1,6 @@
+AUX HTML-Mason-1.560.0-no-dot-inc.patch 802 SHA256 3119217469daea6dfa2cdbac5b1de44aee5d4d0aa375eaaa3f579bb152246731 SHA512 c3de6da1cf6f5a777833c9ea4b68e1dd3c920c766b8661eba4d0ef430604d102abc68bef0d2cfbf11bfaef776c101c1bf19de80f4a05091d9105620601b1b245 WHIRLPOOL 7f7254269d658b5565681bc56d73b5183dea5716cf48b6cb163d43b54e9a1b3a53a0baab403498684cacfe6b62f444316bfc43058198bdb19bb8badbcf1946a9
 DIST HTML-Mason-1.56.tar.gz 314167 SHA256 84ac24fb1d551f998145435265e5b6fd4a52ec61e4fadd3d7755eb648be2c4b2 SHA512 3492a37b8289209a2215b42be71db242ca150f4364d8422e46ca4762f2cdbddf96a56f44a3462d1f1eb23ef3bbe1cb36b8322106f4050404b988c6d90a05911c WHIRLPOOL bccf39f71a76fd54bf57a12f2da676611657fff7f28db73d5e7192f920ac5b3a124e0720ef094b697043e602ebf7320774cc0599944e2d00015a956e50b5f315
-EBUILD HTML-Mason-1.560.0.ebuild 1418 SHA256 fefe1cad56c4acbf670299266b620d77fac4e46391ff1d6f0dc76d2e4ae0f590 SHA512 82ea68766372fd8a6e3b458944af4e56c6aca46947d93f17952f85feaaf5e447043d3ae6297d2905a827dfd1ef1b710922a8b18406ca63b96fee7b434e8dc5cf WHIRLPOOL 41b5ab2623be325a2c3b2c49ca3845505149518c20375fdaa0a989e32ddcf19967d504075e92d50fd00ac0cfc099bebea7a3eeb8692fa5588793ff26fe10e2dd
+EBUILD HTML-Mason-1.560.0.ebuild 1466 SHA256 a280e9e2f2bf92c1650f4024e8e02160b9657bc2092b63fbc71acab5e9d5ea20 SHA512 63132d49f7c849d0e860c7dcbc88638fe8f081d5ba99827d920bdf326ad07b5dddc467bc3b50e094c4f3c39907a888010ba9330f3f0240fef21090cd4bf4681a WHIRLPOOL f62123e2834fb363fb15d88981b7c38fa7ecadb040db343a19a24c482d89d8b3137194ff043b3ba6081eb69404c66d4d89b2a46c5226e7338fc69198b92536c9
 MISC ChangeLog 2860 SHA256 e31b8bb9ebf0fef20d41843b849783bad1c6c1d82cde866c94ad9371ca959e73 SHA512 1142eae7d86d7499f34c3c50f9e2f64df87edb9cb3b9221d57212e35e187ba56f540531fe35ae77ced7237bf1939623bf78465bb2bea3f908f2227589b78467e WHIRLPOOL 8f2cf5e7811cd88121149e49e8ec9d972c744e8addc5c41bcb7a4e9d9be2efe8aff9d5a66572cf86606f8b194fe5b28949bd3748e9bc3529a08de7db4593e36c
 MISC ChangeLog-2015 16496 SHA256 b5a8734c9eeb852a6be1493203c5d84827fff0449068d1d4087abdb13bb775ee SHA512 5b6e3477946be742b5c42a12bcd7be3bc1419c42b302ae1f9082548bcfcc8a631dda38ce2860030b9bc0e224c82cb3dcf0c4bb6b4b36312ca7abc91e9c7aa091 WHIRLPOOL 0c584e4ee7af09c215e3fb2e70b795da4155c134a55e3efda75c770266f6e11d5bfef0eba505d2d7859dbd0f118b0c77dcb1133a638f5b20d668e14a73c7c1d0
 MISC metadata.xml 3212 SHA256 c5e12afb609f47e7c14e1096dd0a6eaf6569469a3c0ac55f77058ec6bd4e42ad SHA512 a24c5efe8884f82d4a925fdba27dbe710709c6a3347bde64313f9ce8e88e8439a96e2703050a2ca24e8cfab20e7fae36a1dda3b82f9cc3596d888ec85920f77f WHIRLPOOL d5f66464e8b735a1df158555c743065bb40edbc3cf46aadee34682613e14dfabdcf8ce57b6e87d2629c39fad26b47a170a71f22a50b75fcb7a6744c6f927f82b
diff --git a/dev-perl/HTML-Mason/files/HTML-Mason-1.560.0-no-dot-inc.patch b/dev-perl/HTML-Mason/files/HTML-Mason-1.560.0-no-dot-inc.patch
new file mode 100644
index 000000000000..6dda6205c86f
--- /dev/null
+++ b/dev-perl/HTML-Mason/files/HTML-Mason-1.560.0-no-dot-inc.patch
@@ -0,0 +1,28 @@
+From 07ed4ceef9d501d2ee455e589ae9075a9898ebdd Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Tue, 24 Oct 2017 17:40:13 +1300
+Subject: Fix t/13-errors.t failing w/o '.' in @INC
+
+Bug: https://bugs.gentoo.org/616966
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=121443
+Bug: https://github.com/houseabsolute/HTML-Mason/pull/6
+---
+ t/13-errors.t | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/t/13-errors.t b/t/13-errors.t
+index 716f2f02..78cfc6b0 100644
+--- a/t/13-errors.t
++++ b/t/13-errors.t
+@@ -417,7 +417,7 @@ EOF
+                       description => 'Require a module with an error in a once block',
+                       component => <<'EOF',
+ <%once>
+-require "t/lib/BadModule.pm";
++require "./t/lib/BadModule.pm";
+ </%once>
+ hi!
+ EOF
+-- 
+2.14.2
+
diff --git a/dev-perl/HTML-Packer/HTML-Packer-2.60.0.ebuild b/dev-perl/HTML-Packer/HTML-Packer-2.60.0.ebuild
new file mode 100644
index 000000000000..1d2f80698da5
--- /dev/null
+++ b/dev-perl/HTML-Packer/HTML-Packer-2.60.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=LEEJO
+DIST_VERSION=2.06
+inherit perl-module
+
+DESCRIPTION="Another HTML code cleaner"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/CSS-Packer-2.10.0
+	>=dev-perl/JavaScript-Packer-2.10.0
+	>=dev-perl/Regexp-RegGrp-1.1.1_rc
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
+src_test() {
+	perl_rm_files t/pod.t
+	perl-module_src_test
+}
diff --git a/dev-perl/HTML-Packer/Manifest b/dev-perl/HTML-Packer/Manifest
index 19abbbfeb0ca..b50b93155644 100644
--- a/dev-perl/HTML-Packer/Manifest
+++ b/dev-perl/HTML-Packer/Manifest
@@ -1,5 +1,7 @@
 DIST HTML-Packer-2.05.tar.gz 11426 SHA256 494108a8fab82a090cc49657fe7f5b2a64c96a013662c767e67b6ae624ef459a SHA512 b66e5c02f6a071aa8ddde58fb0e153e4c263165828545383828fea6ec1a62c38f977cdb7544a3fb9fd5ba0b46a69e5e6abbeaeea8b6f9ab8b769f38ba4669d25 WHIRLPOOL 058e847fe35b3331d1398e5d3e747dd18d17c202b53a690224ec2d1fc8e837a947d6fbbe1da15e47560a261cb61746cec1ec1fb53cc71b67375de11ce63501d5
+DIST HTML-Packer-2.06.tar.gz 11616 SHA256 6366f3aa20350a59dac93dd970833d2ca102153fd3c2f49c9884c4f2d4db3a8e SHA512 337cbf2206bcd85af693d04ab2bc4961b3b8780206d51709a5db849d7bdc8601b1f994096b1e6cbb77c798a2cc8b4737f5bcc208e06f062f9ca6296a31a79f5a WHIRLPOOL e2a642712a7ceabef767275afac63fbd18c5803a55a8776b32813800eb6bdde6468a36edea4da7a80ec92891fd54e2b0a2d17fe2cd21af7e6d32c64443191fb9
 EBUILD HTML-Packer-2.50.0.ebuild 522 SHA256 5f18ae1eece5f16030c78d265b30cd7dc03d7e18022e7c8860d6c7e3504fd539 SHA512 91c9208707551d0946c3c6d72825d96fa4ea86d7db415188a3a746402012e5e493d5d3757aa01cdf64039d66679f2d48d34df6edd79970a2cbc51dbacbff6bf8 WHIRLPOOL e073d3fbcaf2636e6f8786883ec0e8471cf8db9321e643020391f2e8fdc691277896a7a3644aa8052d2cd73266afb75807a5c5ecb6e98786345f410f7942238f
+EBUILD HTML-Packer-2.60.0.ebuild 522 SHA256 b83d580613e1b3614b06822dcd3b2e655c7baad7ee430bb1afe474731ce28bd6 SHA512 a362e63f994525a790c361b1aadd9b36587e0f8367b6e5132b9e3ae2cc2250f90d042680f159dc146841ed772e0a11b0ee94e74e95e0d9ee2b998e60e6b41bb6 WHIRLPOOL 952ad703e87301d08d9d2c05178f7868f4e34e4c42cdc039fff3725082ac081126e26abce6bdb1a34e228cd6971521639c3dad51d57f53519b8403b1928453f9
 MISC ChangeLog 2807 SHA256 eac7bcda4cd8c38fca2469182032b9df7dd5e08e319e6b80ffcfcf485b235e65 SHA512 a8ddff58c10c2c14a6942459ac22ef5ec8476709650e7dc2c7601c97fec227af1747d4f784f1bdb57c1a96865b703334f9d6d7aa437e17477ec808ad9552ea57 WHIRLPOOL 717e320128fedc55a562144b78cbc7ffe38d42f9c94fcce7a125605d272e326ef5ebe1d536dbccee39539cfcab069b286b9393e11d6d776f7b4073297ae7952d
 MISC ChangeLog-2015 541 SHA256 5cb2637c0a05a7547980d12c41d1b8c5df36eba26eafc1826b8703cfd82e14e9 SHA512 b448af347139aa4e42b7ce05a6b3ae4313c48b72b509837bf15d9326af06b74035e81467ffc636570332f56f809e1a7447c8dcfd03c3311c9f05d0c38a520103 WHIRLPOOL 0bb851a9d179550e65f1efbc96254fc4ec5cf8ec2126d74e0bde0a57b844f44b4881325bfd82f2bf2258fd13b9aef3eb3d8ff914c0a9b3f2c8e3febeb358b08b
 MISC metadata.xml 466 SHA256 c7c51c0127c2976a0334c755c85873b0ab5bc2acbb0f357d2f2ff300615536aa SHA512 7200b7dc2450308009f65a5c21de2e12c46ff8c4680b188bf5962ffe1fb56a68c119788eb5315506e9036decaf69f39b0d79c3dfcfb5ab8c2b8131ce2e8c0f8e WHIRLPOOL c704dc6292e95823e42e92481baa2578320ee589d3a37dc28c416775ec8f6b986d6c03b34efc13cbaaf6f083c5eab280057edeec0045b0fcea434c241129646a
diff --git a/dev-perl/HTML-Scrubber/HTML-Scrubber-0.170.0.ebuild b/dev-perl/HTML-Scrubber/HTML-Scrubber-0.170.0.ebuild
new file mode 100644
index 000000000000..3f5ca0fa373d
--- /dev/null
+++ b/dev-perl/HTML-Scrubber/HTML-Scrubber-0.170.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=NIGELM
+DIST_VERSION=0.17
+inherit perl-module
+
+DESCRIPTION="Perl extension for scrubbing/sanitizing html"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-perl/HTML-Parser"
+DEPEND="${REPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/Test-Differences
+		dev-perl/Test-Memory-Cycle
+	)"
diff --git a/dev-perl/HTML-Scrubber/Manifest b/dev-perl/HTML-Scrubber/Manifest
index 8c845522112b..546ed81edc6b 100644
--- a/dev-perl/HTML-Scrubber/Manifest
+++ b/dev-perl/HTML-Scrubber/Manifest
@@ -1,5 +1,7 @@
 DIST HTML-Scrubber-0.15.tar.gz 34250 SHA256 7133e317e5963168a445836d144f35c69fc9c4edad0025fb17c46729ea432ed4 SHA512 1c8fefdc686c6ae25f0eb11b02ef21b7960f72d48dc756e57cd0ea7cf40e26573c2229d13e9b58080c28a9a8a4a4f7edb74e6b335ac843708024526a2960a88e WHIRLPOOL 98bd78bc8355a4b1e89c0fcbcd3fdcceb1f3da50d53ef8c74fe8a933b960ceba79cabfcce2e1ccd61df08656decbc4c02e2f87c58f57eeb2f6fc3bda7e73b30f
+DIST HTML-Scrubber-0.17.tar.gz 37140 SHA256 558a7a1425c355f2e242117b37ecde95534024f69fd6400af46209d23ee1e71a SHA512 d6e04374d4da390d22cc4d51bfe2910078effc30d6d2ddc36dbc1b94ada12333c2f9c7acb1f444f777f9e268aed90ba8ea15c4c74a8b5ab955fe97ef04469ba7 WHIRLPOOL 88d4fbaff6540a96b0221afcde425d82a7021383ac01c2162be4db56f88e26c122cb07780b9222ad76cfd052f14e1f81dac02430253e566d8810bc7390158952
 EBUILD HTML-Scrubber-0.150.0.ebuild 785 SHA256 bc30683ab07a1a8c2013eec25e18aebdfbe09802b7422587bff43222468d5a8e SHA512 caf3a40ff5cb88ea0eb85c9bbc8c37e0bee57995bc61d9f68e99e38820179a92784a53d6f8242892292f317741ebae4feafb1abc71bdd7063c3ac453099460ed WHIRLPOOL 0b94c66f5259f46a2ab5c9b483df4433eb4964068239d4e8d23d8eb89ad13ecf6e105b7ca146fb47fec4a561fa8a8340f2be231b6add7443b6012f14d891409b
+EBUILD HTML-Scrubber-0.170.0.ebuild 443 SHA256 117869efdcc821220f8aa10fdcdf8dfb704ad3267f14a60fa602b5b6cd91aabf SHA512 6fafa09ea8ef200b9ff149e684895c69abee1f80bc05392a43457552424678c9448f234b90c587de969fe0a222ed4b3d7ebccee012a7ea42c335f48bd87b1b17 WHIRLPOOL 6b95385b3c508eddb35772753165311d339650f30deb5a0b7ab6d474031f72f35e594a33f461e0a1fc12446e25471b2818a52f58357731d58c381786b32ca65f
 MISC ChangeLog 4160 SHA256 128fba7477c4b966e8045c2ff2fb825eeee7279ba9df3941bc48d78f28e1ec37 SHA512 db2753106a51a4f407408867fb472c0b32730742f8762d1cd768e7f1ea734403ac9b9ec19cb0123fe15dd5213cdc7a5c24c0af765756755b4f82b961fe5df883 WHIRLPOOL 11d5081be4cf6636531a103bb53e3aa02e5745c65d810417b927e7888249bb75a6c89e83b53a1fac5212cd9872b22ae69d634b74f83eff592c5fd237e853640e
 MISC ChangeLog-2015 3565 SHA256 85b5e798c2c4a47dee66bdea11d9c4dfd581ccf3d9085adb057c2c472fd7a091 SHA512 ec32e5339b0485bdf45bce33f51d1acf3ab13f6f545d216e82df3f701b3f73c687a515333276d3f70eb43871c319e25f1a2fcfd92a4b1937bfbe1c731b7373a7 WHIRLPOOL 82b2083975e2adda21d6f673e970ecba1aaaf89be64b469826858d85d4316396ce16f1196a9d54bf4586457dcd5af0c59db360342ca7af70464bda6379a8fdea
 MISC metadata.xml 398 SHA256 cf9281c16a616d8fead836e8c9e311d7ed8b9a8a8098bb8d82be987c20f892cd SHA512 02bc1e16dc235554a1a12385ab28521e228e11299e55d2ceb71a9cb91f281d9169e5a977692d174073a27d1e2eb94529e3fcf41d3bbf45159921e2a0f09a4e6d WHIRLPOOL 7dd781e74f3fb5a09bb4694eff8b314e53dbb3c6781a0b5c22fbb6a5d4c64da174f7b8693b6fa1a5a473b9796d81c9703f526f295f697fec4ff4cc80de930541
diff --git a/dev-perl/HTML-SimpleParse/HTML-SimpleParse-0.120.0-r2.ebuild b/dev-perl/HTML-SimpleParse/HTML-SimpleParse-0.120.0-r2.ebuild
new file mode 100644
index 000000000000..ca7a3253bd07
--- /dev/null
+++ b/dev-perl/HTML-SimpleParse/HTML-SimpleParse-0.120.0-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=KWILLIAMS
+DIST_VERSION=0.12
+inherit perl-module
+
+DESCRIPTION="A bare-bones HTML parser, similar to HTML::Parser"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.28"
diff --git a/dev-perl/HTML-SimpleParse/Manifest b/dev-perl/HTML-SimpleParse/Manifest
index 690313daf27c..be98bee6b726 100644
--- a/dev-perl/HTML-SimpleParse/Manifest
+++ b/dev-perl/HTML-SimpleParse/Manifest
@@ -1,5 +1,6 @@
 DIST HTML-SimpleParse-0.12.tar.gz 8486 SHA256 c103a19cf99801489ce23e4da86a5f9df79f032f1f1c71b8130d0d3ff96e6304 SHA512 923927ba1053e34974bf95bb17156639df41b779cc01eb790aebc7ed89143b91fb2d2498763884e236c4220a71a41c34020a078afcff149c1a29d83dcabf67d4 WHIRLPOOL 66e4b9e56cd9fcc7a04efaa5299c624177cfc186c31f2250bdcf4399bbbc7add321b02f3f399cb23a063d7760ca9cd694bc06c9477b0ecd0b911e9dffb274b0f
 EBUILD HTML-SimpleParse-0.120.0-r1.ebuild 373 SHA256 76eac244931724ece543c38cd451742b2dcd8b121fce5bf072f3824d82b4c4af SHA512 4a89617fe05c92e86385b85b3860fc7ef27acc23f721b21c00d7b778617f07ff023d4327d6e4dd81ddb5de7291fea403152d944a0263b204f10fdd7b2919cd61 WHIRLPOOL 46060bded5767eb01a21a6d0eff312e48759e8200d86befd20e431fe10a84558678c0a97e6f1f45d9b441b4c33ab5f50aa1f47b3a14c94ce8a880547645924b9
+EBUILD HTML-SimpleParse-0.120.0-r2.ebuild 376 SHA256 bc7930772511da5a83c7daae5133532d421b96171c6f27c34284f51a04d85684 SHA512 b7a1da1d77a03bfe202e3043111adc622ea2e0633b02fbfcd16515eca7f1d4b0fa7005bb561e08c65fa00aa505af16f9757515ea63c631ec4606d96345d3b472 WHIRLPOOL ec4eb87f933341ec856f34548f8047d080887d9d7df7ab970f58818fc63e62770b6893e8391d8268c113a13502a2abe2bb84680e27251aa27321864244968038
 MISC ChangeLog 2464 SHA256 9648ed8bb7c416da78a9741b5a33c2676afc0a40e1a01f10b397a48b6ee75441 SHA512 26f4191eb4516d59aed6a29291121b9ab27b61f84879e874ec424671debf8553d094984c4196d3207332c0250edc0523320dc4c46784c311d4e080196d2968fd WHIRLPOOL aec616ae5179a2e7b76259c949478f6c524ab8f0071dd3067ebe32ab5e63ec4c71d914f2e0087430ce4a7aedfd460c18df3e8865a2510662a409ceb526c3a8a2
 MISC ChangeLog-2015 3407 SHA256 d9a3abe9476dbbe025a536d270973bc92c4872d78e6fc34bdd435d25c736a2ce SHA512 5837c57e2edc54644aef20bd82a35cc93b2737a5524d2376970272ce29f0ca29d548e8fb930e340d3e4f6a738c61ba906b2e5a5cd0a3e2f3448a605ea90b8d4c WHIRLPOOL 9bf0fafab2aa86f91e682aeb39e3ec9c12a8d4ad9ed64c870d12cbaadc414977f9955c581f127ab3b33cb80ce04c3b96b2ad71469a7a81039ae090569f41d955
 MISC metadata.xml 404 SHA256 822f1a6367b66ca32aa79aadf2eda9630d2cbf0e4f096de78584771aef1dbb4d SHA512 87f0d86185207e03d23179bbfb153d835b2caf368125cd8a6f40d3a623a0b6a4c498fe7ef6b74c995ea9033652973b2ae2a142256da441ed81918df31ae76559 WHIRLPOOL e9ff10977534d6c8961d1dce5c47a89ed90eb92dca2e33d2181eaa70e4cfe7f49185ad1a38aa8abca2683eec0545d4822f4249e4f6c2069f2e1b4488b19789a9
diff --git a/dev-perl/HTML-Strip/HTML-Strip-2.100.0.ebuild b/dev-perl/HTML-Strip/HTML-Strip-2.100.0.ebuild
new file mode 100644
index 000000000000..ddd3953339ae
--- /dev/null
+++ b/dev-perl/HTML-Strip/HTML-Strip-2.100.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=KILINRAX
+DIST_VERSION=2.10
+inherit perl-module
+
+DESCRIPTION="Extension for stripping HTML markup from text"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/Test-Exception
+		virtual/perl-Test-Simple
+	)
+"
+src_test() {
+	perl_rm_files t/400_kwalitee.t t/410_pod.t t/420_pod_coverage.t
+	perl-module_src_test
+}
diff --git a/dev-perl/HTML-Strip/Manifest b/dev-perl/HTML-Strip/Manifest
index 79f2da3c9f12..c7a144911325 100644
--- a/dev-perl/HTML-Strip/Manifest
+++ b/dev-perl/HTML-Strip/Manifest
@@ -1,4 +1,6 @@
 DIST HTML-Strip-2.09.tar.gz 15040 SHA256 3f310370d0a677d17ca539508afb054be869b68acaec9aea239a057aa04d81d7 SHA512 8dc1935b401a60b4ae510cfd492b103471d197f0820fb17bd37f5e5f30b0f110f99bc196c53bdfed65ebc3ba5068d4c8e4871020e6e97015a60b64ea38aecd5d WHIRLPOOL 3610570ba02744b0edc2107bda680f498b3d3af7a21eb0215e798d032a59f54793c09d9cc7d01f0c5ed22378601a6940e791723a6db4358f7531c957fb979b73
+DIST HTML-Strip-2.10.tar.gz 15333 SHA256 2af30a61f1ecc0bea983043c8078e48380ccb0319388a74483e09aa782f1ccfa SHA512 e5a5c7817e519542e39e3d27e6c113082188665f2f19c795d96aa841f8c35f3515880f1f0eab3a30d69377433311bb3164a8528c057fe331f28f29f8a18c9e05 WHIRLPOOL 94e343ef7d404868bd63c5cf9321a910a0b07a16bea0665d56c54b7e69fb8c4352fc10a8e6dedb92f77f8f770a5ea3a86e7ac27cb1b2f7a869646924d6fb061c
+EBUILD HTML-Strip-2.100.0.ebuild 559 SHA256 6a18cfab0e4a732e9befc7b2c8c27db8894f277c0bfac24b25e159f6a54c9025 SHA512 3e4282928fb0d9eb87dd224e05a8f802e3481bcdd51f8787acefa8f5c10f8c9e511f9674fcfad93c391bd7161b36a4b757a57270803f1f4697f5d467f128b168 WHIRLPOOL 38eeed86c597b60450ae4998d464830176eb1860dd2df24a6ec0275271856be87a1fa8676551ea6b75d115452b79eb3155c942db0e291d9c2f4da9f224f59a15
 EBUILD HTML-Strip-2.90.0.ebuild 480 SHA256 35fbcda9c659be5ad00c141b73361c9cd043ef44bd7da419eb4a8ab392f74e3f SHA512 827a4deb6178aa4a7e852160cb3fe5366f0619c25a0e3f8e635cb1bfabf35ccc66f842eda91dd132727d5cd91062b327587b7e16273f7819ff87f7e43f0a2c0d WHIRLPOOL a938c938343d488086ebadfce0386a7faf8601fffe217e3d2c252d113d3707a89e195f2c74aabf454241a578aa27d68ed3bc6dddd3a30d83289069c170c88451
 MISC ChangeLog 3821 SHA256 2f3e98bfcc7f5609776c115008a09223daa7d9cc59ad2a6cf1fa2928820d35f9 SHA512 e81c9b835af3d9b18c33dbe035c94d8719f341a3e228476695e9327e0642dcbb205c755e3b06d7f5ceefb0117f728281b579787c58dc1af199e849ac100e2152 WHIRLPOOL dbc67fe314ef6e952bd21f96acb8672d54635b88f894156a0f4b2cc01ec48c216383797aed207a5345e5b1566fdc25f93e69970f9586f48f2ffc0d1415da897f
 MISC ChangeLog-2015 3643 SHA256 d50da5809035eff4691c5a5d883b4de5c57265f7fda18ab2d98331d405034a0b SHA512 35a102447e8eb429a95bf3b51e9d98cc12198d0fb156562bc4d9bda4413084a00b504495c8ace4423ca816a43a8423f19101ee15112c073f1e84e65d8d971918 WHIRLPOOL 972ffdd281e005f842cfc76180ac235d7bbfbbad3976c28dfd42ffe6fb0e4919f8c37178673ed3541f9131c455a178677e4660fccec99c28a36e4828a067028b
diff --git a/dev-perl/HTML-StripScripts-Parser/Manifest b/dev-perl/HTML-StripScripts-Parser/Manifest
index db9cd8b68786..9c46883f8f2f 100644
--- a/dev-perl/HTML-StripScripts-Parser/Manifest
+++ b/dev-perl/HTML-StripScripts-Parser/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-StripScripts-Parser-1.03.tar.gz 9524 SHA256 478c1a4e46eb77fa7bce96ba288168f0b98c27f250e00dc6312365081aed3407 SHA512 3bc766ff738623191b23c5212751cad32b76160bf5e3dcdfad5e161288c906deb1357fc092a962da87525b7364ba924de9ef68b94966c003ee7cb23e8035dc15 WHIRLPOOL 4a85762c51076afbcacd6ab856c2e2cea5743ad12eb39aa731cd4a15d2e7e8ca21c03214d9537d1772d49787305a238a3ad7355244f8a9c5249940903674d219
 EBUILD HTML-StripScripts-Parser-1.30.0.ebuild 435 SHA256 5c9f726ba816267240086d4c21200cc548b10a7bd31236261c439757d38d8a6e SHA512 a6cab1a50af16a794ba74d9c7b516cdb458ea1f4f7c21507f3ef18450ff3d46f6c592622bac2a0e50efc474cd6032e9a1f1794b4c0143559c20169770efc0544 WHIRLPOOL 2dca17c98d7a28a118ef3981521e96d8aa02fe9748c5bf40ac6d7b74e28c7ba113240df394a4bedd0ca6dcef164f14d51e3306d148e71a49e8929b56d4b6f0b1
-MISC metadata.xml 257 SHA256 4d43e70b770d0898a99af64a8454a6116e4a86500c23290655c8371265010427 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e WHIRLPOOL 87039765046556cdc2f7d76ce4192945117bfd5bb684220ea8fb72be310673a5b729ea428666ff1ceb1e6c21fb585a3a7dd72bd94dab89cf076a895e6a7677f0
+MISC metadata.xml 421 SHA256 d1bea05ede2c401a3e6ea5b82d24c2cfdf0659244e6f9d16f5a84a72aa69abca SHA512 962185f51843abccc6e02bd51b4edcc4dd98600182fa96fb8f4efde68abb9d7d43e6a52625627626ba1ad875683c7efdf5a69c161363d887b40b8c1bdd43a3a8 WHIRLPOOL de90257c86064afe80dcd0b51daf69754e61cdbba93e592ce883e91751c685430f1012a2c55d07773bcf3807f51aaa0a4139dd2d2774e519c23d8e65672e4e29
diff --git a/dev-perl/HTML-StripScripts-Parser/metadata.xml b/dev-perl/HTML-StripScripts-Parser/metadata.xml
index 2b9a936fc0a1..9690061cc25a 100644
--- a/dev-perl/HTML-StripScripts-Parser/metadata.xml
+++ b/dev-perl/HTML-StripScripts-Parser/metadata.xml
@@ -5,4 +5,8 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="cpan">HTML-StripScripts-Parser</remote-id>
+    <remote-id type="cpan-module">HTML::StripScripts::Parser</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTML-StripScripts/Manifest b/dev-perl/HTML-StripScripts/Manifest
index de8fa9fd688f..39f67464d891 100644
--- a/dev-perl/HTML-StripScripts/Manifest
+++ b/dev-perl/HTML-StripScripts/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-StripScripts-1.06.tar.gz 44745 SHA256 222bfb7ec1fdfa465e32da3dc4abed2edc7364bbe19e8e3c513c7d585b0109ad SHA512 5d358997816653e32dba8916ac95967da345ec8c018ba7d21ef3bebca9bdda3131917b596dd25f51a3c63f85df7babfeab6133b46a7e15a0cd0409c055e2c589 WHIRLPOOL 9493c15384e29c5ad52a9ce75914615c39682678840402244d78e5f78e7b6fcfcc32b8a395929b521e2aa886219bb17a1c9e428ad359d8e1ba37d1b6cff604c1
 EBUILD HTML-StripScripts-1.60.0.ebuild 375 SHA256 1e9a2721261ddc5ce52e9ea750d8f5a6929b70a2f6603f5ded78c203157541bc SHA512 d22fe076f14cef44e0527933724db828188c51bbcd99442e113457cb95993617db8349924d9ac9265780fdfcb401576c5af665605932ba1e08fa312c5b9f5d3d WHIRLPOOL 473e1fcf30654650a1b53704d7b80f0ad876668c041db3552e4a236a8a3c170e80056b77cce748d1fc5b6dcdd5ebcf3783539db240a8974aec5c93cec9d76949
-MISC metadata.xml 257 SHA256 4d43e70b770d0898a99af64a8454a6116e4a86500c23290655c8371265010427 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e WHIRLPOOL 87039765046556cdc2f7d76ce4192945117bfd5bb684220ea8fb72be310673a5b729ea428666ff1ceb1e6c21fb585a3a7dd72bd94dab89cf076a895e6a7677f0
+MISC metadata.xml 406 SHA256 c1451f33864ecb98dc4c5380409d45999b4533af3a86ceac029c13af4fcff543 SHA512 4dd23d8427fddba7ef4146bf6cee3998c319e6eb5b068639314ce3b5c9cfafeaba405ed87bcae08348f174945618ea12c8a7853b0d7304dc805901b57c6d58e6 WHIRLPOOL a9cd225c1c005d2d1097cffab98ea9360679c3e228eb3624a3015dabdc8563304513ea6420f6115872ef7b937767816c8ada3a6312571973bbc4a194beb9cad8
diff --git a/dev-perl/HTML-StripScripts/metadata.xml b/dev-perl/HTML-StripScripts/metadata.xml
index 2b9a936fc0a1..d65baa09a290 100644
--- a/dev-perl/HTML-StripScripts/metadata.xml
+++ b/dev-perl/HTML-StripScripts/metadata.xml
@@ -5,4 +5,8 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="cpan">HTML-StripScripts</remote-id>
+    <remote-id type="cpan-module">HTML::StripScripts</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTML-TableExtract/HTML-TableExtract-2.150.0.ebuild b/dev-perl/HTML-TableExtract/HTML-TableExtract-2.150.0.ebuild
new file mode 100644
index 000000000000..50ed1105ea5b
--- /dev/null
+++ b/dev-perl/HTML-TableExtract/HTML-TableExtract-2.150.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MSISK
+DIST_VERSION=2.15
+inherit perl-module
+
+DESCRIPTION="The Perl Table-Extract Module"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=dev-perl/HTML-Element-Extended-1.160.0
+	dev-perl/HTML-Parser
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+
+mydoc="TODO"
+src_test() {
+	# https://rt.cpan.org/Ticket/Display.html?id=121920
+	perl_rm_files t/30_tree.t t/01_pod.t t/02_pod_coverage.t
+	perl-module_src_test
+}
diff --git a/dev-perl/HTML-TableExtract/Manifest b/dev-perl/HTML-TableExtract/Manifest
index 2db9f04ac299..15804100f40f 100644
--- a/dev-perl/HTML-TableExtract/Manifest
+++ b/dev-perl/HTML-TableExtract/Manifest
@@ -1,5 +1,7 @@
 DIST HTML-TableExtract-2.13.tar.gz 36417 SHA256 0a7d81a265d2d46aeeb277a9d7cd5f5e2c8e3765959b641252c8e0a175ad5106 SHA512 7a35952c37d6c2997e50901208cce06af97b597574f91a14d3e7700bef42df398721a6b42fe14bd3ed3733d248e80c2c8f0029c6e2caab4bc66a84474bdddf7c WHIRLPOOL e36d84401024643977d3fe05f2f0ae69e8b10ca2d1e539fbb4508ace3d0f47dea90675e3fc6939f2c99e3d49ffbe8ff665db682828ccdc71af58d2e2ccd13c45
+DIST HTML-TableExtract-2.15.tar.gz 36481 SHA256 86c59c9d58da3ca174da5e62f5a0fb02f4da02b1b1e01df9e5d14bb65e4c3ecf SHA512 54fe445bd4bfc55d244ba6ba9888ea556b1a93b384be1f935ae3e93dc6d9e07167fa0fa07365d7fbc89e0a4924a40ea10fdc63d2ebf55f8d5f0d2ed90848a607 WHIRLPOOL 3c3260577dd5b1eff16ef83261087c0c7d746f3017fb6d3677d31f02398e58924cb815b44f1a4d732d55dc432e06518071c19c9f632bfbee60e26dfbb16cef48
 EBUILD HTML-TableExtract-2.130.0.ebuild 456 SHA256 0e830a6e40d6e01be6f1f88a3475438a18e6788440baec0ea1e45472ea72d626 SHA512 cc313668ddcd2e348f5fa589d16c4c8be97298128b2a4e6229b8c748d646770d29c0596812f00aa37847cd136947dfa2dcae2518f37f557fd30abdee9077f445 WHIRLPOOL 846e751b7dbfa8089422dc3ab273581f6e91d49d486bbe9d920ec7e48e565a84ce7b401b860c13dc73736c9f3886c411b2370de186ff831fbe2f338262c94450
+EBUILD HTML-TableExtract-2.150.0.ebuild 581 SHA256 fddbcc9fd75047d7d410db70833791c630522e832833265d73fd28514793b95b SHA512 5f91ab3bc8d0e1fdc9a6cc63e7cc8a26c72a6e367b49c1267a9d30f268a38e2f8f13b3c8ddd8d2dae4797cb84a646f545f565f841b4f72713bff824fc9641a96 WHIRLPOOL 84acfb302ce49d7e4fbace1e7d0e7c0d1867447886597a5ea17e40f3932a22e9c0179a8be25a168e11aea216eacfbd3f50d3616933b5fe93ce3b69984e24ef91
 MISC ChangeLog 2846 SHA256 2c9f8bb8328e4763c0b18f36774761970e4afaa29251ec49858f001231174cef SHA512 32a0f1ee1be72139937874f60bd00a79641b8002493d7fc5c098627c8b1d5c70146a123b69448a0e50cd8036eafd2dd622d8cec10138a1b4194d312f68659484 WHIRLPOOL 758bb5b19936a631611fc436e9e943f248539c211c04a77107e044d58dd2ef0f80c682c54fb2175da60bf83d99362d933915b376978d290e6a55a02b45a93b13
 MISC ChangeLog-2015 7200 SHA256 049fbe9ae33ab76e281425b1115805824224d27fea58344a55fc140ec7a01e12 SHA512 bc3508cd35ff916f51709a15fdc8c82d866f24d9140583cbd889a4f25791f6f03f42e6fb57f08c653f5578472bb109c29e31d4aa8ab217ccba24a8ebcf1be4bf WHIRLPOOL c8816a5264a80b0fde78a7f0ae2ec6035b2aa4d1ae1c1858b9f6c3cc99cfefc22d3251e7c2e7fbb91aebcbf74b139f257958cb8dbca70e0a91204b905bc7c86b
 MISC metadata.xml 630 SHA256 308a457593069fb923e93eb9e6fe4f9905190e36737fd0a643dac5b04e37a490 SHA512 0228a0f3c81a3de3dcec2f472644a0e8443421a63548b1f943074086dd5caa5c07f3f3f23656288ea2b6d01e455be541d7816aaae61d34ec758eb7b5d89221e1 WHIRLPOOL 632f02613d665e5b22652f2fd55a5d096e439f5449159e5bba7166a9f44a07348ddfe2699d7576467876cf6dd3bf96e95678961efc2c49cd2d627a4fa8a96dd1
diff --git a/dev-perl/HTML-TagFilter/HTML-TagFilter-1.30.0.ebuild b/dev-perl/HTML-TagFilter/HTML-TagFilter-1.30.0.ebuild
index dfef44f4652f..731bc5bd494b 100644
--- a/dev-perl/HTML-TagFilter/HTML-TagFilter-1.30.0.ebuild
+++ b/dev-perl/HTML-TagFilter/HTML-TagFilter-1.30.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,5 +18,6 @@ RDEPEND="
 	dev-perl/URI
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/${P}-no-dot-inc.patch" )
 
 SRC_TEST="do"
diff --git a/dev-perl/HTML-TagFilter/Manifest b/dev-perl/HTML-TagFilter/Manifest
index 1531f62ef737..4f6457202ff7 100644
--- a/dev-perl/HTML-TagFilter/Manifest
+++ b/dev-perl/HTML-TagFilter/Manifest
@@ -1,5 +1,6 @@
+AUX HTML-TagFilter-1.30.0-no-dot-inc.patch 1068 SHA256 3bf085870523429555f684d2d288aac84e095704c31c63317236b8f30bccce11 SHA512 c9812b6e852759bce4331a72ef09b75c2f5bf38ab7b6f79db1f41589c64cfd76b855f8dfbf27bf0b500986e7c377c15f541885f45c6d3cc3c536a0a740881099 WHIRLPOOL ddc6da4db3d23f09615e0bc1aca2c55d95febeb592dd180e04a60b046d263ec4990d939342c0f51b23b3d52ef686d732d6205dbf50f01fa030327a1995d025cd
 DIST HTML-TagFilter-1.03.tar.gz 15977 SHA256 daf228b5f964d16b4f323eff3198955649e37217791de083ffc53d2f850537f5 SHA512 f8bed6d245420e1af1ab1fc09379263020527065dcae3b82a2273e3be62acbdf81b7439b9324962fa2ebc865c9db1077f600e8107c2892d702d1d8bf1d800ccd WHIRLPOOL 7978eb493afb58534f185f78aa587982300c89cb0255c99866f5e4b3abde22c63abfc27c00eee8e10b4f3380b2a64ea714a84b5ed06a1adc7de3e2d5205b0e41
-EBUILD HTML-TagFilter-1.30.0.ebuild 380 SHA256 32a072410bf0b65348564da3dd4b084e6d2786df5b1f4f646c6187b81f8fc773 SHA512 b5b2014bfce1bfea2f01633c0cc2d6df8c60562afbba08848c34bb13e0f7cd06bb589b7d233a08bc292cac7c43284eb2a07a6e88fcd838929bd1527bea058f2a WHIRLPOOL 6e2d42d93794536a67da1207b8f7fd78cd58bb148b8d266e96ffc45554242ecfce2354a153d07ad263b99c58b5d3f02dbea63182119a16edce6ed797c3378b9c
+EBUILD HTML-TagFilter-1.30.0.ebuild 428 SHA256 8c0ada30602bfac67fcb6f0c0613f55ecc84ee9969849bd1256612409f60b82c SHA512 fa64ba9140ffb793ca7320b4d4643f1355943c68354fd680148ae2b8b06586d83e8d602d48797de600ecf15e75bab2014a411a4fdae2bd13737ebf1e0661304c WHIRLPOOL fc7989e70e273999479a17495758c5d50a46b987c8824bd5f55b6fd062d7626c1b87f7b628a5ec3f021b7e195461026b86ce344e1d80b54fe9967f6620c11627
 MISC ChangeLog 2450 SHA256 64cd6fcbcc879e5fee612f2975bfd270a124dc8a7d6c3ae9510a32eae854349c SHA512 a20f5cc43663b6366fb1fc8e7f829e3c0db7aebd30285b43b1833adf06b377ae725eb0c39b42e8ed86007a259f8f1cc75656800bc368dfe537e43f295ac592ad WHIRLPOOL 400cc8dcd12dd65c595587128d10c3456c2f507d8cf125f3dbdce4f955a768ce914ed31f8618c16ade750050d327ddac39cdc1ec35f88bd21c4a987bf2207b08
 MISC ChangeLog-2015 420 SHA256 42b8d5c7ce463b11f8ad726bad9b11cda5716cd017b3f3b680e3cfb8f9735b62 SHA512 6afce261b2dfaf6394efe07aa84c89a9692d185edb953b315e7d2f01f296dea78459982245f2fca4894080696aec34d6329db1198af58b9e7e2ed242ad156b9e WHIRLPOOL c382db4db408da1af7c0f6536cda76aef9eb5f4616e62f38e9b7b20ef3f5caef0cb8d8c457f0b98e45ecf0e12eb667d903a7982949d8ca886dbf06ed91a1aeb3
 MISC metadata.xml 541 SHA256 3d2ec253185841cf413698a3a384c7c3f746de09d87e451ad080c7410218757a SHA512 02c2006aee0dfeefa611fad6105b57bda4c611db3bfe4ae9e91fb878bc59b4824bf5f05b9030e56863475c71debe3b49e1a0adbd682569be90f609a800f8bec5 WHIRLPOOL 3de4a7af1368011c4ef7ca73b06fc43a672d6eec485b1893f2f7b8abcae5eb611c70c99da780d05092066f52bff7815e67b78121e2a9f8a86808e8db4adb2d57
diff --git a/dev-perl/HTML-TagFilter/files/HTML-TagFilter-1.30.0-no-dot-inc.patch b/dev-perl/HTML-TagFilter/files/HTML-TagFilter-1.30.0-no-dot-inc.patch
new file mode 100644
index 000000000000..cc2f106182bb
--- /dev/null
+++ b/dev-perl/HTML-TagFilter/files/HTML-TagFilter-1.30.0-no-dot-inc.patch
@@ -0,0 +1,46 @@
+From 6b22ff73fac56cd405f021f5c9fd1cce6f62cff0 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Tue, 24 Oct 2017 18:44:46 +1300
+Subject: Fix tests for '.' in @INC
+
+Bug: https://bugs.gentoo.org/616992
+Bug: https://rt.cpan.org/Ticket/Display.html?id=121449
+---
+ MANIFEST                   | 2 +-
+ t/04-subclass.t            | 1 +
+ {My => t/lib/My}/Filter.pm | 0
+ 3 files changed, 2 insertions(+), 1 deletion(-)
+ rename {My => t/lib/My}/Filter.pm (100%)
+
+diff --git a/MANIFEST b/MANIFEST
+index 2ef9813..ef6a569 100644
+--- a/MANIFEST
++++ b/MANIFEST
+@@ -3,7 +3,7 @@ Makefile.PL
+ MANIFEST
+ README
+ TagFilter.pm
+-My/Filter.pm
++t/lib/My/Filter.pm
+ t/01-filter.t
+ t/02-xss.t
+ t/03-extension.t
+diff --git a/t/04-subclass.t b/t/04-subclass.t
+index ef2eb61..f8b3598 100644
+--- a/t/04-subclass.t
++++ b/t/04-subclass.t
+@@ -2,6 +2,7 @@ package main;
+ 
+ use strict;
+ use Test::More;
++use lib 't/lib';
+ use My::Filter;
+ 
+ BEGIN {
+diff --git a/My/Filter.pm b/t/lib/My/Filter.pm
+similarity index 100%
+rename from My/Filter.pm
+rename to t/lib/My/Filter.pm
+-- 
+2.14.2
+
diff --git a/dev-perl/HTML-Template-JIT/HTML-Template-JIT-0.50.0-r3.ebuild b/dev-perl/HTML-Template-JIT/HTML-Template-JIT-0.50.0-r3.ebuild
new file mode 100644
index 000000000000..f08524176309
--- /dev/null
+++ b/dev-perl/HTML-Template-JIT/HTML-Template-JIT-0.50.0-r3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=SAMTREGAR
+DIST_VERSION=0.05
+DIST_EXAMPLES=("script/benchmark.pl")
+inherit perl-module
+
+DESCRIPTION="a just-in-time compiler for HTML::Template"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-perl/HTML-Template-2.8
+	dev-perl/Inline
+	dev-perl/Inline-C
+"
+DEPEND="${RDEPEND}"
+PATCHES=("${FILESDIR}/${P}-no-dot-inc.patch")
diff --git a/dev-perl/HTML-Template-JIT/Manifest b/dev-perl/HTML-Template-JIT/Manifest
index 465ba7e70c27..231759fb2bbc 100644
--- a/dev-perl/HTML-Template-JIT/Manifest
+++ b/dev-perl/HTML-Template-JIT/Manifest
@@ -1,5 +1,7 @@
+AUX HTML-Template-JIT-0.50.0-no-dot-inc.patch 2096 SHA256 38de86b7a4db55c89386b8a8070eeb974ddc9ef4a0b2b032562cb8e959d9634b SHA512 00e8483f11fce29dd049eebe5379a7649572a81255265f77b544f043e0f11ac8024b765b168c522771081ccee40366bc20d9681db27083208fb1d57cddbcb51d WHIRLPOOL 9e8c60a73e5cc9658cfaca3f7684778403fde7145f2600532a0e63d25cc0fdfef2d42c1ceaf084c3d005439da68b616e12f6faab79dea8abf729bbe8ae3e4650
 DIST HTML-Template-JIT-0.05.tar.gz 30221 SHA256 a43601f70b28eef1ee99e7175efcb8925bc40b21d48b3b9ddd61f69513babca3 SHA512 bdcaf1e62c6bdb375ab89298de2a5be642ca45b8c1f68f5fa8b46159c4e4269589b772937c7818723b7c39c7a92694a1e4667b029201108d7fce2de3e61974e3 WHIRLPOOL ae5ef26f1993a12291d0ff857eb3cb5cc7ee3c46546b8a2d8874f80524e7d7a119155e9b589423969668845d75b28df96b78e2eea9aa4484dd9d13bdd6d87b0e
 EBUILD HTML-Template-JIT-0.50.0-r1.ebuild 354 SHA256 03f0ba462b522a02b3f8a1641cef5721bbc314df1272538144d1cd9c52595fbe SHA512 7049c8ce68d11f50a47444c5758a266f601dbbb5a12447771b55df63692a0287cdf394259f8fff48e6a5bf43341fe2d41ddc1832e0990272263370c3e1cf223e WHIRLPOOL a8b73eea538522b2062f24291b530050c74eefc065ce16141c04449f767371bc545f4fce33b41a0e5f4250e24035d98e247d57f068acf85654bb0a360ca7e15a
+EBUILD HTML-Template-JIT-0.50.0-r3.ebuild 456 SHA256 c5c6efc6191e5d8b6cbd0aa13ebdae8d6201669557d1f504ffb3fe2cc9a101e1 SHA512 227096d237679eca8f3b02feee6b27de0b55855cb1c277911b8d12eb9fb24b6d5bdaee0519ede8345397d6e950351b76cb56055cc14b5a486c92e1927f3c1f47 WHIRLPOOL c85384144aec6e887a520f55aaf74f6a7575e5c83ca28e4faa1b25b03673861047ba4ac8e33260292101ca0694c828f278b9c184252702d6b4c46f573fe0e39d
 MISC ChangeLog 2465 SHA256 e0340d3300c63d81bc8e4889680b783391fdf5c2f353df164bad475d12b3927a SHA512 37f55cb9c035a18f3a665b0ee2bf35f46cfc3bdf932f81b6950a9c345843bdedba563d42b11558f98c0fc92b82376eff9340a768df4822e2745df3ff4b698b5f WHIRLPOOL 08477c6163a721639593114ad0348c5de4667ccb6fd305766140dbec879c2e0057fa59917f509c9d73676560ce7c0b86bfcdb1e61eccabd88bcba3f393a4840f
 MISC ChangeLog-2015 2189 SHA256 327eff554d26edf05eb6a5b8f2181152f516e84d740a1985c8b7ad34d1a8f34c SHA512 7c34de59e3469f268a8b0221a938cc0e3cdb00e210b9796ff131b661916bc4c5891c92c31ee025be4742b84651c1d83923ac560e576d1bc8b535b94b235165d2 WHIRLPOOL 790a7746f0c5fdc742a6f2c734c7cef1f9a20f561ba12a607666b33d1f278723d430430efecfef784f54cb032df088d02baad0870406ad0f11db8d240a9f5fa3
 MISC metadata.xml 555 SHA256 33cd8165ffff015bd134032c6c6b20fa0f783fe3774e1eb9c35742a2ad715fb1 SHA512 e8ac444cbd1d70520593bdd0eae2e6689505f2f90234422d4ad847fe82af688c10fb3a9303e98d3b02da64847a75cdf7deadec53ef29aa7a089f5fb60c4421e3 WHIRLPOOL 1d1ea183c34d867ca86993bced99878c21fc5c64c5ec1ade7b1f8afe79eb12a9b991c6c3c92c13e63f63186cab4e44b2ce6a2a3bb662bbb7781c498ca62b37ca
diff --git a/dev-perl/HTML-Template-JIT/files/HTML-Template-JIT-0.50.0-no-dot-inc.patch b/dev-perl/HTML-Template-JIT/files/HTML-Template-JIT-0.50.0-no-dot-inc.patch
new file mode 100644
index 000000000000..624e579a6185
--- /dev/null
+++ b/dev-perl/HTML-Template-JIT/files/HTML-Template-JIT-0.50.0-no-dot-inc.patch
@@ -0,0 +1,61 @@
+From efbee2adfeb592240e1c84326ece8c90c239bbee Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Thu, 26 Oct 2017 08:26:53 +1300
+Subject: Fix compiling templates under Perl 5.26 without '.' in @INC
+
+Perl 5.26 changes the default contents of @INC to no longer include
+".", which is required for "require q[foo.tpl]" semantics.
+
+This breakage is invisible in tests  due to a workaround P5P put in
+place to avoid breaking tests, by setting PERL_USE_UNSAFE_INC=1 in
+Test::Harness and CPAN installers, which makes '.' re-appear in @INC
+during installation, while still being silently broken in production.
+
+This fix works by relying on the mechanic of require() to *NOT* consult
+@INC if $path is either an absolute, or a "./" prefixed relative path,
+by converting it to an absolute path just before requiring it.
+
+Bug: https://rt.cpan.org/Ticket/Display.html?id=123380
+Bug: https://bugs.gentoo.org/635464
+---
+ JIT.pm          | 2 +-
+ JIT/Compiler.pm | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/JIT.pm b/JIT.pm
+index 9e5a6be..1e2afc8 100644
+--- a/JIT.pm
++++ b/JIT.pm
+@@ -63,7 +63,7 @@ sub new {
+ 
+   # try to load the module and return package handle if successful
+   my $result;
+-  eval { $result = require $package_path; };
++  eval { $result = require File::Spec->rel2abs($package_path); };
+   if ($result) {
+     $package->clear_params(); # need to clear out params from prior run
+     return $package;
+diff --git a/JIT/Compiler.pm b/JIT/Compiler.pm
+index 6ef3e02..bc1e05f 100644
+--- a/JIT/Compiler.pm
++++ b/JIT/Compiler.pm
+@@ -9,6 +9,7 @@ our $VERSION = '0.01';
+ use HTML::Template;
+ use Carp qw(croak confess);
+ use File::Path qw(mkpath rmtree);
++use File::Spec;
+ 
+ sub compile {
+   my %args = @_;
+@@ -53,7 +54,7 @@ sub compile {
+ 
+   # try to load the module and return package handle if successful
+   my $result;
+-  eval { $result = require $self->{package_path}; };
++  eval { $result = require File::Spec->rel2abs($self->{package_path}); };
+   return 1 if $result;
+ 
+   # don't leave failed compiles lying around unless we're debuging
+-- 
+2.14.3
+
diff --git a/dev-perl/HTML-Tree/HTML-Tree-5.70.0.ebuild b/dev-perl/HTML-Tree/HTML-Tree-5.70.0.ebuild
new file mode 100644
index 000000000000..b503e090ba36
--- /dev/null
+++ b/dev-perl/HTML-Tree/HTML-Tree-5.70.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=KENTNL
+DIST_VERSION=5.07
+inherit perl-module
+
+DESCRIPTION="A library to manage HTML-Tree in PERL"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Exporter
+	>=dev-perl/HTML-Tagset-3.20.0
+	>=dev-perl/HTML-Parser-3.460.0
+	virtual/perl-Scalar-List-Utils
+"
+#	dev-perl/HTML-Format
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.280.800
+	test? (
+		virtual/perl-Encode
+		dev-perl/Test-Fatal
+		dev-perl/Test-LeakTrace
+		virtual/perl-Test-Simple
+		dev-perl/URI
+	)
+"
diff --git a/dev-perl/HTML-Tree/Manifest b/dev-perl/HTML-Tree/Manifest
index 86ea5f1df7cb..731aeea7654e 100644
--- a/dev-perl/HTML-Tree/Manifest
+++ b/dev-perl/HTML-Tree/Manifest
@@ -1,5 +1,7 @@
 DIST HTML-Tree-5.06.tar.gz 150067 SHA256 9c36eb19cbdf9a5906c858948ca51c35bd7561f52cc18c43281acbe57327536e SHA512 17590504fcb5cc9d68e76a4a63a5ec526b650d8c371777edb0d182599258b928cdae19e676a2815283434ed44605e3e2858db54c305a1fbbb226ce30e580336d WHIRLPOOL 1066c7beedfd3e9bf94e458be5c24c31e0afb83d3a0912d68a83ac725c81227076868828bb2abb6250bd1a71d67d0ba38170c3aca96530f326aa7998dfddd76e
+DIST HTML-Tree-5.07.tar.gz 150477 SHA256 f0374db84731c204b86c1d5b90975fef0d30a86bd9def919343e554e31a9dbbf SHA512 a1faaf547d7db323388d5f6b289ab96887de5a80add55aefd380e4b540948514550a86785bdccf0776dfff38085b6bd3e98228f96231264217adcfc2f132c5de WHIRLPOOL 76e591b61ec58fd5703b8f087bc08473e93a5270e1784f1a344bd4d0bf6aef2a39b5f2361a9bebe5c3cd6ac06377bc6ccd55932ff96591cf5568788aa361568c
 EBUILD HTML-Tree-5.60.0.ebuild 825 SHA256 415a0d7d3b35705c8ff7f091d3420443883775f311ae9630e2f8c0353747c4eb SHA512 9b7aed31942d886cbacca549526aa91430cf85aca7f333b7fb6877d29579a90976a40d9194f966d4821b3f528a1cee45d5bb148790c41e1058aa4b7e27b51545 WHIRLPOOL 6f73e161610071bed288ad0fd6a0ff8e227f74625529192917d495b28d68195f83111681152008ecfacf0f9045c0e15bed7d220017fe93676d59aa2c3c14b525
+EBUILD HTML-Tree-5.70.0.ebuild 834 SHA256 7818e57d6ad8613d48c6c2972d52f45e6368f61a738777570f8d13d605929137 SHA512 b5f16541b6924fbef556eb940180987f4f8e8dc7e1621b276cce1ced6ebc72346326cb35b145001e3f7692de3245f61719696d7dbf247f504acd64c831d20a53 WHIRLPOOL 0f061d0c8409c60c362869dfc8e1a42308e8ede7e3672f3328b2d3b61d3b4c67ffe6897d2ef5bf4b7180507d8f1e25cb4106587bd4a83e7b6a6dfda74b353a5e
 MISC ChangeLog 2507 SHA256 309413181ab89462961ec542102b95d7e0133691a6d5de950870bca647169202 SHA512 c76f133da581d9b3d0a109e43244769f83fb5b414f8fa55985492526a94f55ef556fc6018051edd97c8c96ee8e1641403ac2e8d251e36f5486a99ced5a0b56bc WHIRLPOOL 1c6eebb3df938c593dd8fc3041aca3b47cf2bc7ae03bc43f566924b195b562989cb51f4db11f9f42ba29752a53f63eea0ede961f680467b49b4ea211c367da72
 MISC ChangeLog-2015 9520 SHA256 e20842dd2c151d4adfbbe4450804626a867a1d531b46870024b9987bad3beb7b SHA512 627ece23322007ef249f38e50f6a9952a51eb3dfc7cac6580c318379dde61e3b3e24f7c28e0a2f071532a583f6c69f19722f1f6ac5c0a5516942734d6b54221a WHIRLPOOL c550acc03cfe4e2c5ac8910f49b8551ead62812a4431a80bc324f04fd8000515be35bee4d1ede377761ccca851eed382abfbad58489afa9c802df96146972af1
 MISC metadata.xml 701 SHA256 a2550a3a03332f18feb6284dcead9b617979feaa7528dac1f541b868422f7cfc SHA512 94ec1a09f4a5d8940cb65f2fbb540129907dcfa02bf53b57a455c1f0af93d9931f717c71389f60850a89fe10cbb85a7931cf7be7d43ce601ae52e34aff8464e3 WHIRLPOOL 43e3ee7b8547d32d5e4d19d39c5c588b920f6473a252d6d791e30f3281e929ad9065f0a46647b8a8d0def4a9bcd87a5551afba673e4060022bf0f363af4cbe0e
diff --git a/dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-3.140.0.ebuild b/dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-3.140.0.ebuild
new file mode 100644
index 000000000000..405c14cd3b75
--- /dev/null
+++ b/dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-3.140.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=OALDERS
+DIST_VERSION=3.14
+inherit perl-module
+
+DESCRIPTION="Determine Web browser, version, and platform from an HTTP user agent string"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	>=dev-perl/Module-Build-0.280.0
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-JSON-PP
+		dev-perl/Path-Tiny
+		dev-perl/Test-FailWarnings
+		virtual/perl-Test-Simple
+		dev-perl/Test-Most
+		dev-perl/Test-NoWarnings
+	)
+"
+src_test() {
+	perl_rm_files t/release-*.t
+	perl-module_src_test
+}
diff --git a/dev-perl/HTTP-BrowserDetect/Manifest b/dev-perl/HTTP-BrowserDetect/Manifest
index c947bb3cff1a..4ee0b08b59d5 100644
--- a/dev-perl/HTTP-BrowserDetect/Manifest
+++ b/dev-perl/HTTP-BrowserDetect/Manifest
@@ -2,10 +2,12 @@ DIST HTTP-BrowserDetect-1.50.tar.gz 40890 SHA256 8bc62a2e06cc22b7ade8fab11cad277
 DIST HTTP-BrowserDetect-1.77.tar.gz 57028 SHA256 5f93fa6f8a5b07fca7786fc7bfabdedd12535ae8aa303a030fec856228a3f7fd SHA512 4d9ecfbd9afda84910e58b2a8ad969f24f2b343d0d547bdbb327f33e41338591a0511ffa61244380329d2045db23ac2f203158bc9520e5099015e97e01a2bbf7 WHIRLPOOL 99a4cf09e7ca35df36e2cce3c13a360d356b8810b7e1e7463e4b07ad780d02c18b2e33cf432373d2427fdc49df2bac73fb3299c579c0c4d5625a0e4bf3597b61
 DIST HTTP-BrowserDetect-2.04.tar.gz 90485 SHA256 b21e0e4c9d81c37a12973e5857302dbcea54def1eea8bad9ca3ae39478a6879d SHA512 f8f957b02b33ba8cdfdab7c3b0b1975b6818fe58f47e344cc8f2b8475dfd7a0e101068c80cd38cb953ba74b43cfc44d7b295145bae252b10b088704169f3eca3 WHIRLPOOL c1d96df9140a779898f36668846b8e04b426d0537c3fa283991e06440567d53f301dbc17c340b5caccf28f4920be04c8be8d525c63d7c80eb12500f5402b997d
 DIST HTTP-BrowserDetect-2.08.tar.gz 86331 SHA256 2f0b2f3f9bceb57b19eea2306929ee5d12795978d8f589ebbd45db8d0576542f SHA512 109cfec695435b9803b1d5e424720967087a958276844a368e36815170aee5b1f98d870d33d1477b10e7e8a1290996b45fb0705afeca2e7ea280ecf1da3a9a86 WHIRLPOOL a02ab5331847473d76ea079f401f51dfe997ec7a8e17cd361c5bfd115a9ea3647a546f3602fc809c3b463cd4639e8e323c34fd0b3b4beea378040d883b438ab0
+DIST HTTP-BrowserDetect-3.14.tar.gz 95445 SHA256 7d0e0153946ea8ef3c4105d2bda80ae3b88adc11967246a1cc8a56707bf4be98 SHA512 cf05af60dbda462df81a9d38d5738826b820534c5fde52f41a290f6d3253783154a2e460042117be32e86dd95f7f1e0e6055b4ca549cb7972cd3c156200c09df WHIRLPOOL 2a06cbd82c57536a1bbe2eb7a268f299d125d625b9fd111b3f6a5cc71154a3b4172e812b1e7c5e5ccdef049ca12f0a2a1d1720bccfcf66e815b9cd1103db7449
 EBUILD HTTP-BrowserDetect-1.500.0.ebuild 439 SHA256 2d1c4f52611858d37d9e93691bc34edaed560c9dd6278cec7068676bbd733a1b SHA512 a613f522bf14c777d6bb6a84d6c5afa2ea242a8fa2de7704ae0a12e6a29ebf993d87b402732a5533d4a14534185f28477a01311511cd766413fb21d56ec27b12 WHIRLPOOL 21f6d4d1d40aa74ea02f92ac44ce183d7edeabbbe584dd8e242ddfe873d21679b430d9d76a7ff952e896ea14a24c70e86df2384d589ad22ff41c8153ebb45039
 EBUILD HTTP-BrowserDetect-1.770.0.ebuild 595 SHA256 27841e0dc5e9c7973cdf54665ce4f8e1173bb5a7c0d475430922a7b9342d7f74 SHA512 5921e00c640f28409cd22d5d8c1d8c1a7a26a608f215624d8a8227dc2cab92da4c3e15e58fb3db16707dda2edf7eb54ba0066fe890f25ae890509d7e4f054774 WHIRLPOOL 721291cbbd3c967217fb83cc13298cace43c0ddc5b5c95554de91929e45f83b5b07578321ee57de3aaac40250119fdcdd434877f3aaa1e52e5c8ef4e7718d8a2
 EBUILD HTTP-BrowserDetect-2.40.0.ebuild 604 SHA256 c1cc563bd1d0bcde5fe8d5a80dec71ee4b150ebe136e6c2153399737cae75ac3 SHA512 999290c5e88f91b42368f3e095ba8d887e87a63bbd18b2eed9b979c59f71818e19857f63bcf94026b03007f71b9af9b85bd937eb1ed8563192702354e4c061f3 WHIRLPOOL 3bb68267b8d36de9db5c20dab3641b287fcf94df9ad0be35e508a886d443454e2e04eaffdee9631e8c6fe02993fcdcfbb81813ecb7b384dcb401639fafce0e43
 EBUILD HTTP-BrowserDetect-2.80.0.ebuild 583 SHA256 40f5c9b75da87a4f9cbc6a9ff08386f42e729a32624d807c7171f597721667fa SHA512 780a05e65e4b71eeb7cf9c9f9a764a60e885e5feaf8923740588f7268a2e36d39ba83813187a8f9ac6343447e2ead6f9e837195e48f13a044c5e4783472570c9 WHIRLPOOL d30f1142d5b8222a50c857cca2221884eabd0d92c85c3fd591f341af0462ceb52420ecdbd4d288afc6eacd259c243db024a07d1f28cc9316be6b905ab240a28f
+EBUILD HTTP-BrowserDetect-3.140.0.ebuild 642 SHA256 cd5efca0f20c601fbd767c540c3af15728cd464a2cd7505ef82750bc7e443f46 SHA512 3d7655cb571eb1ad985648e923f491b2b0ea18fc4520aab577f2de71ced6c71c4a40b9ebee459d052b21c96daf77723bd8e63946fe6a50ef25d0be234b1b6640 WHIRLPOOL 38edabe443dfbb4d72ec5b14a62522052f2ae9871a18549628c60dc792105aa95166482fd2b03917fd59a619a4c909716de7ce32000617d285bfbb97dc014a4b
 MISC ChangeLog 3587 SHA256 c622b7433e3e8eaaa4044bcbbdaf024e9905e37149be97238f73285490168687 SHA512 42789e7f6bcfd8eee6592396e2259384525aa8b8e1efeba189ea6f96a971320e4bb0f91c17ec9b1ee823d44375d2e5fb48ecd4c20374f9f0dc6108d0d930cb19 WHIRLPOOL 15f4c06ebe054642ade8014dafddb79138e29e5fd6bb3989e26b8df2e1ba674fe787d8dec1374434369ac28a07660921ca0ab3848effa17287f8810a30dd9798
 MISC ChangeLog-2015 13759 SHA256 3571e344a30061411b2fc09f683c93aa1c9c697ef3801f287fe916a9c0a73a15 SHA512 855a3069a876179ddb04b9a275a91586315672144e7ef47ebffa151c30503e80755b4f7f454b447c94b32e4d68c9fe3d467cb43a13a3a7e07f19afabdf47220a WHIRLPOOL 3a9c4f4ef1d3e99329530982d1539faab63353206f6415ed5c72e103d9681e4ac1568d687f401c8cb0bacd50134f5e4a18cb1e37eb53316a5cc1e3769673ea19
 MISC metadata.xml 408 SHA256 e752326730b8ba197a64772c4eb7f7e35f09329d6b7a366d40d665f359fcea40 SHA512 39a7d6f17021b4ae4005592694496a84f8320f8d8afd4ba5404d5ccf6ae57e8541443358b109fc703bd22befb2da051cdfd3c1da899ac3b7d9da75940af68900 WHIRLPOOL 1982c2976b7080a42eff381c1409a4ce2671bbba71a9ff48249fc97ee997737170ed28cac961f9e94d7292d21e217f3521c26d6f6c1fc787cdefce2d7cf464b8
diff --git a/dev-perl/HTTP-Cookies/HTTP-Cookies-6.40.0.ebuild b/dev-perl/HTTP-Cookies/HTTP-Cookies-6.40.0.ebuild
new file mode 100644
index 000000000000..16d6a4318a8a
--- /dev/null
+++ b/dev-perl/HTTP-Cookies/HTTP-Cookies-6.40.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=OALDERS
+DIST_VERSION=6.04
+inherit perl-module
+
+DESCRIPTION="Storage of cookies"
+
+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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	!<dev-perl/libwww-perl-6
+	virtual/perl-Carp
+	>=dev-perl/HTTP-Date-6.0.0
+	virtual/perl-Time-Local
+	>=dev-perl/HTTP-Message-6.0.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test
+		virtual/perl-Test-Simple
+		dev-perl/URI
+	)
+"
diff --git a/dev-perl/HTTP-Cookies/Manifest b/dev-perl/HTTP-Cookies/Manifest
index 27c1686fa7db..b1fbe27607cf 100644
--- a/dev-perl/HTTP-Cookies/Manifest
+++ b/dev-perl/HTTP-Cookies/Manifest
@@ -1,7 +1,9 @@
 DIST HTTP-Cookies-6.01.tar.gz 18751 SHA256 f5d3ade383ce6389d80cb0d0356b643af80435bb036afd8edce335215ec5eb20 SHA512 64058cc23275c13533b1688068e7ecc6297ac696f3812c6d5c732185130d68ed6be0be6f4b604ef023a2b02bbb80a7f5bdb774335784be40261329a588cf5247 WHIRLPOOL ff722ea444c3d3a16e2f35a0901a2fcd84572b39ed87e4c182f8b7048fb8b151dc6afd12e0a407f39c7d7c84faf429154e0edb76ec5712c6c1742ad7576a0beb
 DIST HTTP-Cookies-6.03.tar.gz 33669 SHA256 05051f2761832317554b0be4b74012c35fd278f6af2c9d218f055e0de891457c SHA512 730cb63a2e21910929b0e43b8e34b9a2c259e12b4f2552f8382e95552fb50ead24c4865ca75e43dda6d38dfb0eaf417248aa7102a3b57d1404c24fb80ad8974f WHIRLPOOL ac32f6ccdb5ce7a23134c3fe61b035791df44e589cbd9a22be0068ffa5174150e475a85d009b4f905388e7486b467b051481d2461b6d62f091455df2a1f40613
+DIST HTTP-Cookies-6.04.tar.gz 39502 SHA256 0cc7f079079dcad8293fea36875ef58dd1bfd75ce1a6c244cd73ed9523eb13d4 SHA512 e8b24b96e6630f1238e828edfbf7074fb9186a391fd1d129fb65a82748a4cf7d71669fa658c31957560a6faac3e638c8dc7aa3182acaa6fd14f0d56f3968f5e4 WHIRLPOOL 3f940f95306ca3232875d4bc113d0b66cc1f57b89aaa514136cfc2e2aff75eb9c4afb3bf88e8eff9b1e24dcd632f6b1680704229886a481cb41f0b03eab901e4
 EBUILD HTTP-Cookies-6.10.0.ebuild 642 SHA256 925749876a9bae7826050882ba7092929761578915a074c407e5473e87539967 SHA512 6e05ba7647bc935a9d5a1e1220ed676b5474000dd0c195f3afd3054f268cc217bd826ce05ddc8a9d9cc7f6a087c2b41e56617eba3afaaac4b3cc5416c3c8f682 WHIRLPOOL a16fbf89ea3dc2043dfb817412c579c23a5d3edc6dff10c9d1f8d3d2752492f51609a0a1c54ad59d4b2e9da3ae9b23ccba39bfd2c6311753604974def30460d9
 EBUILD HTTP-Cookies-6.30.0.ebuild 843 SHA256 918091e016306d2f0ace8537b5d14731b5094cfac39ec3dd4fff2ca55d9fb03b SHA512 f3e75037ee5185eb7bf59b016b5e1dc94d91605b8d5b140f0899d342a0c95a193ba38726943d0e6449669ec5df9f7ad8e7edf4e8f09c6c3ebc844899333143c2 WHIRLPOOL 59326fc1debb49ff110546818bce22c565ba70ce75e6ba1d1e15c94ecf85fc7df842970ac1d30ca14d6a9b651945a113c88123658ed292ad9ae10bec3dfc0fe3
+EBUILD HTTP-Cookies-6.40.0.ebuild 764 SHA256 f82aa15381ea3c16d36c2a0085d93c4a0e11e25686c70e10d1bfc5062c1e2661 SHA512 c1175a121e33dd4b4f1ddccc6831b580339c12e399a96bb7e5d59aeb53e949c42e0259218f9900609d06c262859c5bf06c8b37bf849e32aedb7b901aa8ae89ed WHIRLPOOL 1a7c21cb84aec0dd17593b32217e97c031d22688e6481120ff9a38e2047152bbd0d9d477bfc445433e973500fca55d49c014d398eebc12b503bc3fb9a9fbab74
 MISC ChangeLog 2993 SHA256 ee40edb1bbc3b7f0251fc75546d7c9f6d113df936709c076ee3fa89cb45ba6c0 SHA512 8660bf466b0128b63ebd21db824c26f299366829c090ac24a95359aaf5ebf06322a9fa46802c84b8a23c91112065af5d915be7ff342c87c48249051fa0bebd47 WHIRLPOOL 7838960b98d815a21f0d85d61821d074adb019c816943e4fa6824b77a96980790da62b2d6521e12671224a6852382f91743135c8b28acf6ef4888197425a88b0
 MISC ChangeLog-2015 4141 SHA256 b83cdea9a6f0089bfdf4450daf9a438687a14f740ac1e9d54494b5e4edbddef8 SHA512 44f8f26a4e7369c2709dbb4b35de9b6e93e50d127eff4ccb01d0b50357e459deccba0a9bbe942c58d94714d5f05f5014448b8f99de00e22bb3747e98fd358dc0 WHIRLPOOL 07aef0ac503afb7ceed4eb250e911c49d903009b201493d414df8dda25a05f107681de51cf50b4296fc72c07e0ad70f70bad916d5f15545603c7fed5f06132a6
 MISC metadata.xml 537 SHA256 949625f5e4e794a47402e26343c4a2960d8d68a77dc63a1eaf4c5bca67854f22 SHA512 8bd8c5bffbca00990043526261a737dac89ed22624d171ff6c95f01a466e9ba6234d7cd64a86a091869f9446c5af8112bb532101b449dfac0c4e799cbae57aaf WHIRLPOOL 3ab1735ab4ec12fb7eca523a58aca7060c0fe39ed6d96aaced4a975cb13807eec01a895f3f20f8342b22aa13f181db65233fb8e230ebd5a4d9d504404a857021
diff --git a/dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.0-r2.ebuild b/dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.0-r2.ebuild
new file mode 100644
index 000000000000..a4c52f2ee103
--- /dev/null
+++ b/dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.0-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=GAAS
+DIST_VERSION=6.01
+inherit perl-module
+
+DESCRIPTION="Base class for simple HTTP servers"
+
+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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	!<dev-perl/libwww-perl-6
+	>=dev-perl/HTTP-Date-6.0.0
+	virtual/perl-IO
+	>=dev-perl/HTTP-Message-6.0.0
+	>=dev-perl/LWP-MediaTypes-6.0.0
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-perl/HTTP-Daemon/Manifest b/dev-perl/HTTP-Daemon/Manifest
index 748b835fa7ad..86b0d8953fe4 100644
--- a/dev-perl/HTTP-Daemon/Manifest
+++ b/dev-perl/HTTP-Daemon/Manifest
@@ -1,5 +1,6 @@
 DIST HTTP-Daemon-6.01.tar.gz 18628 SHA256 43fd867742701a3f9fcc7bd59838ab72c6490c0ebaf66901068ec6997514adc2 SHA512 8d2b8cd9c9386defb256457e160492d78cd6a7d962514522c62d6f8d3dd1cb6f7019b7a1a70b13f340ef54538eef02629a13861864f2f79306f1da7255fa887b WHIRLPOOL dd78f69ce37538d0fa1390520b062da83e108b4415479bf66af7e0505fb0b55e055dfdcd652575395ac3c55cd03e70a302850d14296154473879523e37610ec3
 EBUILD HTTP-Daemon-6.10.0-r1.ebuild 679 SHA256 d94f7075d0d0e286753da7677cd41888671dfb3e21a54875d980296431fbbd95 SHA512 51c970e71c26f140fde7191bf1714185ed1884cd75011821f8f8c8905f163bc6c14285d31d8d286dafbe9bfaee1f11ef0f6dd7639c8a6b85f9cd8950b3be9e1d WHIRLPOOL 9177bb2c14232a755ae144306c863f09f455193365a4f06c36f37c7d111e08e57a814a575641a6e37095d40a65b2c3944e3c6e68eb5e520bc5993b18e065ecea
+EBUILD HTTP-Daemon-6.10.0-r2.ebuild 671 SHA256 71f8495021644bdd7e9f36e464cf2a61edfbdcdcf38983e73b0fe8947ba9c80e SHA512 62879ea74698dcbdbf55ff534270151dd69ff70e39576e4605281e38d08981cf4acc8242ab6209379fdbe0f277d4c371f7e109c47e29234afd4daa57fee23c0f WHIRLPOOL b2bd53bd3c3a78233950db0e73822cd3fd6448aa7fd365df98ab671bdf85ee523c37c1b4cb148509bcfecad23a8b28fb49ea878215cc00e49ad82ee486345024
 MISC ChangeLog 2447 SHA256 a7202cea05660e521b481d72242b542033b4e772a337e2eb0cca660a125d9ba8 SHA512 bc80b86a10b505657f29ba16e6955b293bfa85479639c2800c617b80fc9fbf505b3d260469c72c4de07583b9079da4176d29455debabbff365fb8cd270d67119 WHIRLPOOL 6e67cd84caafcd439ef5f3421610a39a750ad138393c550bdb9b1d2c8d62a970496f3272eedcc80438cfbca69c5578982f0600de4610e3d784e2e3b36cb8f0fe
 MISC ChangeLog-2015 4005 SHA256 345e7e3e175ccffe6cf79fb53920b920216c4814d719722f0df15d2e89fec9e1 SHA512 8ab0243a0c31a61a4f7ce4cd9d433148fcccca464021581f8b3fcd82171d6a536ef809622a0a8108a627b6149ed5e0948cea677b2eb7ef0ce2895e2d8c108912 WHIRLPOOL 2ca19dcc4f5c2adb98d8fe49ff8e2936c5c71708ed39dbc5d8e01afe3cb0511a91cf209dcdc3b1e982ef5341dcbd6bcce86402721c103ef4a853f308597d9fc4
 MISC metadata.xml 451 SHA256 df4bae52e9bc26fa9d211a8d6c549dc9d93324f51d22d8fbd8d4c31157d4ea41 SHA512 9f53b47131f814087e0b5b359b248f45b18374ab96e5ec8497f7c2b990dcaa17938ac9ecfaf0717bac28ac60468334b6ca9ba5b4dd0e9bfe787d21cf83a59442 WHIRLPOOL b53789fdd0df2c1c72d9d83fb322fd6475cb896b5e21160aa8608a7ac8c603f21f802cabeb07502cfb92da7ddbda7a48ac42156f714cbea5d96af91bb10c5dee
diff --git a/dev-perl/HTTP-Entity-Parser/HTTP-Entity-Parser-0.200.0.ebuild b/dev-perl/HTTP-Entity-Parser/HTTP-Entity-Parser-0.200.0.ebuild
new file mode 100644
index 000000000000..e97fd03241ed
--- /dev/null
+++ b/dev-perl/HTTP-Entity-Parser/HTTP-Entity-Parser-0.200.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=KAZEBURO
+DIST_VERSION=0.20
+DIST_EXAMPLES=( "eg/*" )
+inherit perl-module
+
+DESCRIPTION="PSGI compliant HTTP Entity Parser"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test +xs"
+
+RDEPEND="
+	virtual/perl-Encode
+	virtual/perl-File-Temp
+	dev-perl/HTTP-MultiPartParser
+	dev-perl/Hash-MultiValue
+	>=dev-perl/JSON-MaybeXS-1.3.7
+	virtual/perl-Module-Load
+	dev-perl/Stream-Buffered
+	>=dev-perl/WWW-Form-UrlEncoded-0.230.0
+	xs? ( >=dev-perl/WWW-Form-UrlEncoded-XS-0.230.0 )
+"
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-Tiny-0.35.0
+	test? (
+		virtual/perl-File-Spec
+		>=dev-perl/HTTP-Message-6
+		>=virtual/perl-Test-Simple-0.980.0
+	)
+"
diff --git a/dev-perl/HTTP-Entity-Parser/Manifest b/dev-perl/HTTP-Entity-Parser/Manifest
index 6fe33a508662..93732897c301 100644
--- a/dev-perl/HTTP-Entity-Parser/Manifest
+++ b/dev-perl/HTTP-Entity-Parser/Manifest
@@ -1,3 +1,5 @@
 DIST HTTP-Entity-Parser-0.19.tar.gz 23506 SHA256 f46d94ad970e5ac4ad49503130644ebb53e22b23eb4f9fb73e95b3f36bd1c766 SHA512 2558706d0bbf3b5e2f3821bbf297e0d4a4ef5685c09bc952dea76f0a71af3712b7ce7cd3dacc068fc1cbb6b40be41a458db3ba2c3c89ffc6202025aac263ca0b WHIRLPOOL 73b17fb7a8a49e9d65ec762a47fa1d669f7fb2d397020b4d954092448fd69920b11ca1c9e46ca41fe4ce4d22e2acd9da2153201dcdba65a745d0a5b69920af3c
+DIST HTTP-Entity-Parser-0.20.tar.gz 23662 SHA256 ed5fda0933db03a40ed0912e2f0e1d24e71bbf7e327f970d960685f5f784c9aa SHA512 c80d9058b8682c51a0fe3669249cc219142e674959237d8ae6bd435afafc16c92a38328329e9b09a25af8a79fec5bf01050145d3c63dd81b15ad9d75946fdfc6 WHIRLPOOL 1bd7286c2d01d34cc7285bb14257a8a151e0ee172906e72b25cc5152ac6398a467fcad85bec38a25a3cb7ddc0f85489a5daaf251cc34b0ced5bd3a053e0b48fb
 EBUILD HTTP-Entity-Parser-0.190.0.ebuild 764 SHA256 e2aa8aa40d9d7a3a9fd7a0bfa1cb040b2df7456f235f9207970434695c36adfd SHA512 b51ea020ea1f4f782d75f802c5b65b9cc941093c138eeff7abed5b83a22e9be64ed42232746c4a164351f7881ab34e90e3ff2b9fdb0b9b41d8509130e3bd4412 WHIRLPOOL 75b1659d24c1c62ede91bb3b35501057f00b2ab39e7985c1cf57526de87d6aceb5264fc138ee966976c7c731cb97e9e99b73d746e61c13c8abc8ffa82f2b25ab
+EBUILD HTTP-Entity-Parser-0.200.0.ebuild 764 SHA256 26fae4720c3f31a5be0950d6e3e1d4e1ff527d67fdbec4104e95582858631c97 SHA512 fad2c0de45eae186a49f4a20229b67fe7fb054b3ec046101ec667f2a69f22102c407afaaf8eaa70d013b8cba768039c32e5543037e276a0faa07e8b7fd54c7c9 WHIRLPOOL 32e6455e04529942b856cec2c7156aa3d544561bec6a852e40d15b6d9976eab3c0ceb160136bb2273ad4b82a36e705f5840fecece368dd2429ffad4909131a95
 MISC metadata.xml 814 SHA256 bb21fd3a7f58b5bef380bd84426ba731cd8df8e1f5bcaf498584e50b8cbf042e SHA512 769ef47e6cfb110eef1f4e09cf49fc03a43352f48604da2466bf1793ef1a378c69cf25437ba3e26ed0a31c53f489d427504b1d71092cb8b82ab06c6672f7eab5 WHIRLPOOL 5669bfd3dab16f20de1ac7277959bbd254d96c02f84038504311bf824886cc1bcc8119556e9ea09e938d9a8ad21169938d960f9f6dbbf3532605927dd73e28cd
diff --git a/dev-perl/HTTP-Headers-Fast/Manifest b/dev-perl/HTTP-Headers-Fast/Manifest
index 87a540c337cd..6f673ffc0f05 100644
--- a/dev-perl/HTTP-Headers-Fast/Manifest
+++ b/dev-perl/HTTP-Headers-Fast/Manifest
@@ -3,4 +3,4 @@ DIST HTTP-Headers-Fast-0.21.tar.gz 19578 SHA256 5e68ed8e3e67531e1d43c6a2cdfd0ee2
 EBUILD HTTP-Headers-Fast-0.200.0.ebuild 467 SHA256 7390803da514b63ae4e1543fce0fcdfdfdbeef3cd8996c4771e2758d942a7211 SHA512 d89e1c758ae3f725eb9a127fec00c25ee197a896a2813b2c84a689109d17768ad8547263ac5029e100f83e7d610849d51e0d54913fcf02ebcf0901a03cc719ac WHIRLPOOL 73caafc7726bca654c64bcd4012c3b24f87139375083984d7cd28a09d84dba81a82f862dc247cd92594dedba62bf6a08889992f40ea8de167330c7caf6e67325
 EBUILD HTTP-Headers-Fast-0.210.0.ebuild 472 SHA256 8f6bd8228f4978d8a39c7e9c1520301d20b4808bbdfc077bcc019e0d54e97fb1 SHA512 ba6550258b1208f800bfd78b7eb68e00b94a28c5f8d157d01c761cc1951de3aaecea9857b9263c8809c0a5376a69269e36a7085c6ae9595d48950b7cf442c1fc WHIRLPOOL 136453b39ee434ae85eac885a695d29864a67b8399bb6ac8ae903198f61b709d341737a1e01454f8113ad9afb5d720d37cf1125df996edf50c315ba605643f86
 MISC ChangeLog 1116 SHA256 d788fd1b86f17baffff778e30a651b30697c3de3a93e2e0d530915aa03ed0ef2 SHA512 5c666ff369767453d92e85a6a3871d9ff4ae330ecca540212b86502847568ba0e384ec3549efb785c99aa1e07b84af388edf54cd0b977db0092687dd503ae493 WHIRLPOOL ac898b6d6144109aa9b0762cd624ceaa4e7d9507367ffad216ff725543a4644a26b75c5fff3677a9b7552b64a36d2c9e4b59343f052d84c1dabf7d9b18117734
-MISC metadata.xml 257 SHA256 4d43e70b770d0898a99af64a8454a6116e4a86500c23290655c8371265010427 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e WHIRLPOOL 87039765046556cdc2f7d76ce4192945117bfd5bb684220ea8fb72be310673a5b729ea428666ff1ceb1e6c21fb585a3a7dd72bd94dab89cf076a895e6a7677f0
+MISC metadata.xml 407 SHA256 6b178a77c8fc774a83e5b4defd2505a6f0599cf4e42ca99ffa76b4fd8b536457 SHA512 6280216989b056c6d099db3c260f0147badc0fc965ed73089f1fa44c5a0a2f7ee22ff9bbd6e9e4cc0bd688d4cb26b8a2d8c03208390d797296b753e88f0d4d01 WHIRLPOOL ffac83a02167e16e34a078c54463d66a87dcab9ef879ab5f58cd3a5cc947318455d474889484340a7fa51f015463443910f503c1fab1119572c2f476f806b190
diff --git a/dev-perl/HTTP-Headers-Fast/metadata.xml b/dev-perl/HTTP-Headers-Fast/metadata.xml
index 2b9a936fc0a1..b8c94c9dba4c 100644
--- a/dev-perl/HTTP-Headers-Fast/metadata.xml
+++ b/dev-perl/HTTP-Headers-Fast/metadata.xml
@@ -5,4 +5,8 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="cpan">HTTP-Headers-Fast</remote-id>
+    <remote-id type="cpan-module">HTTP::Headers::Fast</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/HTTP-Message/HTTP-Message-6.130.0.ebuild b/dev-perl/HTTP-Message/HTTP-Message-6.130.0.ebuild
new file mode 100644
index 000000000000..ebd7e26a27a7
--- /dev/null
+++ b/dev-perl/HTTP-Message/HTTP-Message-6.130.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=OALDERS
+DIST_VERSION=6.13
+inherit perl-module
+
+DESCRIPTION="Base class for Request/Response"
+
+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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+# MIME::QuotedPrint -> MIME-Base64
+RDEPEND="
+	!<dev-perl/libwww-perl-6
+	virtual/perl-Compress-Raw-Zlib
+	>=dev-perl/URI-1.100.0
+	>=virtual/perl-Encode-2.210.0
+	>=dev-perl/HTTP-Date-6.0.0
+	dev-perl/IO-HTML
+	>=dev-perl/Encode-Locale-1.0.0
+	>=dev-perl/LWP-MediaTypes-6.0.0
+	>=virtual/perl-IO-Compress-2.021
+	>=virtual/perl-MIME-Base64-2.100.0
+	>=virtual/perl-Exporter-5.570.0
+	virtual/perl-Storable
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		>=virtual/perl-Test-Simple-0.880.0
+		virtual/perl-Time-Local
+		dev-perl/Try-Tiny
+	)
+"
diff --git a/dev-perl/HTTP-Message/Manifest b/dev-perl/HTTP-Message/Manifest
index 4d5d66d8f605..fa5f3bc04253 100644
--- a/dev-perl/HTTP-Message/Manifest
+++ b/dev-perl/HTTP-Message/Manifest
@@ -1,5 +1,7 @@
 DIST HTTP-Message-6.11.tar.gz 59981 SHA256 e7b368077ae6a188d99920411d8f52a8e5acfb39574d4f5c24f46fd22533d81b SHA512 6fc923b7dbdcce7269a03700a8776fe85522287f409fffac40936a77d951a70d957642eda8d2a0367af60d176c89654b3bb6249c23f458c0cd9d44031e6b6dc2 WHIRLPOOL ac85ed398dc28ea498ef63fdd19b2016bf48b33f14fd9ae73e9776bc9c77f71fe1022dbf5d58573dcd488762acb80d01a76ea2a3b7471a23fb30d865ec0270f0
+DIST HTTP-Message-6.13.tar.gz 74413 SHA256 f25f38428de851e5661e72f124476494852eb30812358b07f1c3a289f6f5eded SHA512 61e911b0bfec2322fa7a31748c17b38e07ecad006ebe249cc063fc68a5f1779765487b5942569575c558a76f8679e8e7f10992b8894cb6905aa66d9185b084d3 WHIRLPOOL 57960b56d8e91d84667df555a2ac4333395e1f14abca4c38c750185010b3d9706032829b38905f255c924d8417ed0c455b9cc17934803031dc2ea523e47fe26f
 EBUILD HTTP-Message-6.110.0.ebuild 960 SHA256 dc3f18d351a65f51a663b223ea39a5d15d67fd871ea6f5dc643e7a5374d90ab6 SHA512 45c740e3fab47ca5d2057cdcf27234d3cfc3020701073480b0b9e6efe88e4a842cfa09470add9a6be847e9983864e336d45c0843908d76228255183d2a44d4b8 WHIRLPOOL 489246174e22b7155c5f32e59944e1bc1b4a12c52d39a7cd11772e117aff5dae8e514a23a0244507a73b0ba378af0da0c41914d95945214d95d46db759e4f299
+EBUILD HTTP-Message-6.130.0.ebuild 1079 SHA256 a75c8d49d35714afc9424a7bd7160beee80ecc6d83f9ff6c1c459f48055ee563 SHA512 e5b31000ac2c8044070e98a02b32f7668b1a3c7ef21133aa90c8c15f39d68b6661d8462512ed26a589c0f6135b7ee4bed7d7e74e181f0db8b61c313aa70cecc2 WHIRLPOOL 19958e72779efab21ea017210275fa116cb3fc89609885eafc869522e7aaeb18319b0cad7ad5b07b8a1b6928569224939c0ee9115809ef1ec6a14a521457c859
 MISC ChangeLog 3752 SHA256 c98c1de68a47e15ad7780c2caef8f8f14551c5a548b05bdb41f091733fe0060a SHA512 faf08e6f100b255092179c19417e560b0751440088d7788fbf63dca7af8ef40ad433788cd6d9a763e1eb1699fb0423efb8a29a28fe1aab91c2338c2f47522b67 WHIRLPOOL da813326b1b8fa67a145a54c1803c336a84da5fc6f659947f3b1308c173ba21627de452093ec3dcb4ab9029034bc3872fc4c7b7bfe559ff686100900c604c032
 MISC ChangeLog-2015 5883 SHA256 8f58a599a02467f222e08085555dc8a7be5594d686ab1975954a24e089245e12 SHA512 799a2ce66247293afc706104118edfa458c76d9ee0ec928cdd9cb50f7e70b453a55c0d77b90ab82ed66c1443f23494a3637bfb16f07e63ec2d2e72dfd4111405 WHIRLPOOL 96e2d260a60433d6f5699f1590a90e7f4df2b53095997ccdd810e922018761784ceafe66d42567b5c92b1424179a2356afde3548b534be5c812a7e2fb4358364
 MISC metadata.xml 931 SHA256 9fe5ecb9cc3c91e74bb62c4fd311a5de7987ea07d8404b8ed55843b27686d844 SHA512 6e64be79b3ff22d9ac9496bdec50e6d8e6bc93ce47343a0e8d5212288899188177028563beae411c2d1dbfecf8a7c950b8a3f97176c0ca865ea3e94cc1a821c5 WHIRLPOOL f079b9f61c0ce68365b76bc210234323b59dfd8fa3c034e48926eae10e7f9f8d64c7bd3b461a7f912a2825538f9c0864622cb34750b04bb7c8d59e3f99c55fd8
diff --git a/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.10.0-r1.ebuild b/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.10.0-r1.ebuild
new file mode 100644
index 000000000000..d24e4d997cf7
--- /dev/null
+++ b/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.10.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=GAAS
+DIST_VERSION=6.01
+inherit perl-module
+
+DESCRIPTION="HTTP content negotiation"
+
+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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	!<dev-perl/libwww-perl-6
+	>=dev-perl/HTTP-Message-6.0.0
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-perl/HTTP-Negotiate/Manifest b/dev-perl/HTTP-Negotiate/Manifest
index 8a24c1d7afd3..b54fff85a283 100644
--- a/dev-perl/HTTP-Negotiate/Manifest
+++ b/dev-perl/HTTP-Negotiate/Manifest
@@ -1,4 +1,5 @@
 DIST HTTP-Negotiate-6.01.tar.gz 8596 SHA256 1c729c1ea63100e878405cda7d66f9adfd3ed4f1d6cacaca0ee9152df728e016 SHA512 2651010f0d989fb255d37a0e4585de4779edcccd59fcad7d7f5ccc7d2c2ec420060324beebc880664d6c0d29193ce62f2d21cb6332bbfa0a3adacfa632876617 WHIRLPOOL 73a4dc66f56b240a422c2bf337b9c2ddaa5553980bea059008c7ad7d9fa3374087f3e6b20dddce174f925817d348fc686d46cab9c3daa367b6ebd7d6fd763533
+EBUILD HTTP-Negotiate-6.10.0-r1.ebuild 583 SHA256 60c9629343ca2f59e18f183097140002d83d2e8f4d486f904501618b825eb44c SHA512 51fa3029c02122a72c6f1f9277ad7602e0cf75f23ca1d7e17406e63397b32be52d88b07561c366b315264a53ee7896c29a02b3712b65ddde8f6525c8288534bb WHIRLPOOL 56443dec0689da39491f9fd58452c2d3fbe3a75c5997bb8b3b109c3e091add34830467012b0a0a9ef109a0a4357fd3e4afefe6a1cd40ba46bc75ed5315f4bddc
 EBUILD HTTP-Negotiate-6.10.0.ebuild 595 SHA256 3f697f8497ae558060d63ee8623adad23fdcf676134d186b91ae73dbe52e8b79 SHA512 7be71bd2823c80b31231c479d40a65349bafc47915ac7c2b58f13f0af3f29fce475be4fa391e5ecc34771e727cb3a1de43c9daa661b418d45e7e0872e9a754f6 WHIRLPOOL a5902899ae072e0147ec0eff35f71765995fe26c9e560040bb1a48274ec28f1b827ee40927f638c9e426b087f37a0661c48318350c61c5a5800128a5d60dc5a1
 MISC ChangeLog 3027 SHA256 552b06118f8376e6ce743c3b273559910be648e0a836d8a786d314f0b3885094 SHA512 3eb98085e11251e1e69c7904285208933a03cbb689fa05fcb9da05fc04f5c3fdd3aaabd616b0d14326d2b4b151698d5ab601896acc06615260aa3404bbdfe37b WHIRLPOOL 861d964023a8a38efb42d57ee4ab15fdd6de00dc5dee99b3a223c83480205fcddca64529b4e8842c2ac5050e6b1cf1a4b7c826751b3fa00ec54ef26d4ed10852
 MISC ChangeLog-2015 3663 SHA256 070bbfe2a1b44a3f864e3f2ab012a69ec3c0291e8c921249e3bc4284ba2a44a4 SHA512 926346db101b13542baf8e20cdcd401aeeba3b33ea370ef59c71f2173d35446df5600ae3cdbf7c51a026a09ad635000360e0113a25153da773e8d581da0391fb WHIRLPOOL a3673509fc25effb14bf48298c80f41a556ea4de1b1d7792cf175c9e167ee698b843cf7c294b865a911e77af9a39932af922bda5a67e36a5fd766867d98e62f7
diff --git a/dev-perl/HTTP-Server-Simple-Mason/HTTP-Server-Simple-Mason-0.140.0-r1.ebuild b/dev-perl/HTTP-Server-Simple-Mason/HTTP-Server-Simple-Mason-0.140.0-r1.ebuild
index 7fe36dbbefe7..c37add1045aa 100644
--- a/dev-perl/HTTP-Server-Simple-Mason/HTTP-Server-Simple-Mason-0.140.0-r1.ebuild
+++ b/dev-perl/HTTP-Server-Simple-Mason/HTTP-Server-Simple-Mason-0.140.0-r1.ebuild
@@ -22,8 +22,15 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+# Parallel failures,
+# https://bugs.gentoo.org/623112
+DIST_TEST="do"
 src_prepare() {
 	sed -i -e 's/use inc::Module::Install/use lib q[.]; use inc::Module::Install/' Makefile.PL ||
 		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
 	perl-module_src_prepare
 }
+src_test() {
+	perl_rm_files t/02pod.t t/03podcoverage.t
+	perl-module_src_test
+}
diff --git a/dev-perl/HTTP-Server-Simple-Mason/Manifest b/dev-perl/HTTP-Server-Simple-Mason/Manifest
index 3dab254b3fe5..8eebe900338e 100644
--- a/dev-perl/HTTP-Server-Simple-Mason/Manifest
+++ b/dev-perl/HTTP-Server-Simple-Mason/Manifest
@@ -1,5 +1,5 @@
 DIST HTTP-Server-Simple-Mason-0.14.tar.gz 21389 SHA256 b7a49d8e6e55bff0b1f0278d951685466b143243b6f9e59e071f5472ca2a025a SHA512 0a1a087affac10568059c7b09d2242a9289b38807deb4a876a2ce2326d42eb44be79b01f001580e4b62bc38bf23c7336a71496a59822cd20a2da250b1c54c930 WHIRLPOOL 257472a1dea0d1268933aca88bfd1be0681168a5c974096aeb418d836215f3704e3d7fd736688edd071eb45b205b34d88025a437607763e43b6a829775e5105c
-EBUILD HTTP-Server-Simple-Mason-0.140.0-r1.ebuild 635 SHA256 4c8b4f5414e759c7b8c928d099464f1825cc26fdfcc601896753571e4c159bbe SHA512 657eb11b77398243e154ccbcb8ffca9eda3f3f860710345dc6f0e598c8c5bb4e69f54ccfaed12e036e6380c8567ff5e149dea81bbc60973538857d8b49412389 WHIRLPOOL 12d8f7cd49581ce099112b1c4bf12e7ecbcba2194663a20fcf71bb193450d53cb7cda21b90d083925295e33b3ad7eca2acffc0c301e0f28a50cd2dff55f3b6d5
+EBUILD HTTP-Server-Simple-Mason-0.140.0-r1.ebuild 784 SHA256 725b31078d70a4f40a91461a9d5e61f1ca28515f4ecf7af67b5de0858f0c7768 SHA512 82d73e5f6dd4721ffd4d29fe205ac752899260bb6bcd1251d6728db7c422fc0afd268fb306f200c950dd764d81cfa76ee005dfb6a076d21f35de75ad0ef4a597 WHIRLPOOL 5dd1b30612ab3ffeeda9e12244176451cb20a5c032e55a7f57f23e9c73dc5c08780652c7bec454cfe3dc9a15ee549b2a60e61f1ca64689401112528c1167ab3f
 MISC ChangeLog 2488 SHA256 6e4fe451005a097a7a2e099cd7fe416a16755b0fe35e662cc930e73bf83322d0 SHA512 3865d1b0c1fcdd8484ed11d84c043d28560b169722379f97089204f91c421f5ead6dbdb2c20ac3c8df3ecc30602614a9e2fb8c8305945328da8f9e28d0df840a WHIRLPOOL f09de5f44b269e7247940ac79cf15aa0df2c68771fa717c9c7315965bc11f9080a8024f6de674ac5959ec903219629232ee9b2ea433994d6a498f811a9a64003
 MISC ChangeLog-2015 3785 SHA256 d7f11bfefd4e99b5b64d6ebf2e6c69d36288875831f3eaa39f6503d089bc4b71 SHA512 f7e2a38551eaf333185f8c5323a998a3ec82265dcc812528cc9d57ce7b4b5500de408f5572e5664ebd21829893abeaa77d7a3334705e6c653660fdbdaf438c16 WHIRLPOOL 61586e7f94d090b479d2bf45e5e4987b737d78b152857a39bb4877c5172a892a3ca0a0791a9cdfd15402aef5a7f2879dc7ebc3bd0bbfa3fc6facdda4b43cf536
 MISC metadata.xml 422 SHA256 9815f6f664a9b00a479eb3548aaae6e6bd2d6d8a48e175f880574078fdc50c18 SHA512 a7b2108373bea67534151e9851cfde0f316cdfacd34077fa036c98302dc57d6672492e96ba67905bf3d4e9cef90311f92bfb07ed54678ce60bf05c03efe4536b WHIRLPOOL 6fb446bdd5ff692acf47d450612e4b9ef054a503db6f5b0155b7f4069f7f48b10842f79e77ab3d07c3118a20083b22630434f9e05d009ccd3e76a59111a2d522
diff --git a/dev-perl/Hash-NoRef/Hash-NoRef-0.30.0-r2.ebuild b/dev-perl/Hash-NoRef/Hash-NoRef-0.30.0-r2.ebuild
new file mode 100644
index 000000000000..1f65c4b520ce
--- /dev/null
+++ b/dev-perl/Hash-NoRef/Hash-NoRef-0.30.0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=GMPASSOS
+DIST_VERSION=0.03
+inherit perl-module
+
+DESCRIPTION="Hash to store values without increasing reference count (weak references)"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-perl/Hash-NoRef/Manifest b/dev-perl/Hash-NoRef/Manifest
index 92d1a3483136..ee7c2f14bb81 100644
--- a/dev-perl/Hash-NoRef/Manifest
+++ b/dev-perl/Hash-NoRef/Manifest
@@ -1,5 +1,6 @@
 DIST Hash-NoRef-0.03.tar.gz 3312 SHA256 7da135291c35286bafdc3e1ec2a2d94fd0ad7232cfd7158184fa793ed46417a4 SHA512 da24051a4a274fb96174b6102c73f1ad27e763f4930d7ca4a53bbdb94313c07592374bf8bfb0dff32e3d1c27f441941010fed55f46edbe75267fe076b7b2df3c WHIRLPOOL 8f00448b791942d10bcd55059feff41e399049f3b95258271a210cd956eb3c7bff734560b28a1c780e9f91f282d151a3cb3286967ff24d1b22058481923dd931
 EBUILD Hash-NoRef-0.30.0-r1.ebuild 307 SHA256 d2e25f51890287cb838d469dc9cf1fec93492a543bf2da01c6bd20f1344c7605 SHA512 fdad8cae2667bca2d8ffb56ae9839ee23597edfe9e46ef9e3c29651ce83bccd721b4a49aece1f525562b07c246f5968c1ca866814db7d4c1f4503aabbbe00f0b WHIRLPOOL 0323fdb08f7bc019bda7aa974aece606ce317023c2289ac96f641e8ab91eecdddfb418debe134911b0738d2728c4f7f6c0da0e14223899d0338bcbbb537cd4fc
+EBUILD Hash-NoRef-0.30.0-r2.ebuild 305 SHA256 71b01ba1d2826489bd0dbab1d83e521521aca452aa2d764745737a2a03742d19 SHA512 19a18550455ce6f87a8ee3198f1215652ec63f6e373d3c67ab9733b3fe12f9da44f0a546fe45ea8f8572b811c11ab75f8dc168fb14f812d2107f46260b44f765 WHIRLPOOL 201b46cbfbf8ca2ef252b442a3ed5e70a72473162327b74e1b0e8ad0b3a3869df0cf3f5f4dc00addc512b1860c5b6caf329b7c70e23a19007073af4106aaa77e
 MISC ChangeLog 2645 SHA256 8421eead826e8257e36ab1f6fed0d126a110350028e80e39e78797999a1deee2 SHA512 3bfc733dca8089c532c6c695d27f6b4f1c9114dfc954de3e255a03a35db6594d045dc8dce640c596a89bf5e886d4d985796bdddf972f24250adfc948a282ddf8 WHIRLPOOL 791b0ee72ef23fab5e415331110cad7cbf110d4b7e03dee641b3a79cf65c5bb89b1c3068fa7999364530e551e2bd3f3605d58888ce54401fc0f7e30f5d61c8e5
 MISC ChangeLog-2015 898 SHA256 01adba7e961055ef8e8850a39883b2207b3822c3e67772515264f0afd2265b8b SHA512 7a0565f8cb6aef50b6b93583dcb6a657ed3679b2fb0489d6b097012771c9e55e5259ebf9d8fedc04a775890bf15b1a0eac4e68801c287a277e8f84757eb79580 WHIRLPOOL afdc8ee229819e4d466b7d9fa21742967d9819eb87beea241844ef5ad30cde850822f365c378dc0535cd3186f176c84fb026bb521a79ffbc0bdf204be286c157
 MISC metadata.xml 392 SHA256 0cbc7a94da794fd779e50d617870b56e54d5e37196e83fe1a31ff47e5514c695 SHA512 527674335a8d42e434ce0d81e5a406d340f0f5e8c9cf7703265d6c701147fd7980e46998f681967d51d0d72547bde5b5071a19170141567131bc4c356cae906f WHIRLPOOL b22ac5359157034bece835ee2343d016eee5ddfe2f3c3e2d73de62ed48b927d1fea7eb97a0bba655fbe99db2d5ce2ea886fc6e28581fe0ebe5986cb43dc67241
diff --git a/dev-perl/Heap/Heap-0.800.0-r2.ebuild b/dev-perl/Heap/Heap-0.800.0-r2.ebuild
new file mode 100644
index 000000000000..336aa320482b
--- /dev/null
+++ b/dev-perl/Heap/Heap-0.800.0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=JMM
+DIST_VERSION=0.80
+inherit perl-module
+
+DESCRIPTION="Perl extensions for keeping data partially sorted"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
diff --git a/dev-perl/Heap/Manifest b/dev-perl/Heap/Manifest
index 0760e030eab6..0dcbb21ce04a 100644
--- a/dev-perl/Heap/Manifest
+++ b/dev-perl/Heap/Manifest
@@ -1,5 +1,6 @@
 DIST Heap-0.80.tar.gz 15673 SHA256 ccda29f3c93176ad0fdfff4dd6f5e4ac90b370cba4b028386b7343bf64139bde SHA512 133e2668a90de8cea13302464188415fa30e4a0a85fb51af7409ff2e3466e33a6daf172b2466f046c5275db6ab19bb573e8b2d14acf616b110bdd60869865690 WHIRLPOOL 3331d77dc0903e9b178020e2f015e9cd9482fb28ae6b1668767533908e7ef2326fae1db04b05eea3b2c2193304cf202beaeb2a386fdf2abe7a93fa6c20574475
 EBUILD Heap-0.800.0-r1.ebuild 312 SHA256 18d40febae6d0e7e3b1a5a3f2aea2b1b7fefeb8b09677fbf48e5ed6caca8f7d1 SHA512 90ceea655debac17b08a0716494b251ed009c3f1da1c2f7acaa5ef96edd7e78d2682ee9159bfbcd79bdd49b658f980633b6a151c03614ad8d15ca9452a1b1175 WHIRLPOOL 1200f1e3f4893489033dc0fda34dff0098af9b4f6dab33875f7c26cb1cb0dc391eb01dc31585a2c4c97587eaafb5e4af5b39e1a46de5a45843fb68769c6d7c58
+EBUILD Heap-0.800.0-r2.ebuild 308 SHA256 e090014dede05ea169442ca5e113a809d7269f5b49c5a77ae4dee740f5a40022 SHA512 67ecefcde5d44f320cc475a84dcbd23f44e469158d032616be8fd42d6e6c13c88384801676fade7932bc837429dbbb1df0c2add679442e955fe252db303ebb2f WHIRLPOOL 453a4c013b99b3e32afb8a52adfb8388be99ea7c2e3ecad80215cff3d325dd9b5e2207707764ba832abc3882d0e433c9e7713f254670cbe6852a58bca3692b08
 MISC ChangeLog 2428 SHA256 2582ba639d42cc08359905ee4bd235a2a8f635c9c87e9c650e458c13bb74c070 SHA512 1bfc0f17ba9d64e80d61009483b5597bc209a13a2b91f1780ce61eea3e9a13e8d4ed0ba353750facd781837b0b4dafccb82a67f7d685ef97331d01d8bd49bf6d WHIRLPOOL 6ccfa7d2b64e793bfd46fc425b03b436f8157b8431904ac4b17e370990b5a89773cff882a4651df8e2506e56c13163b67694dfd4d6ffa885d22a8325387514e4
 MISC ChangeLog-2015 3546 SHA256 7b7ade85b5bbd182f9d1a5dc1ccf35502540789be6f0af29826b385a7216bcb6 SHA512 6757de592ea30a0d468bfd6c0cd28640ccb21d7fa8a4ba7360c118c5b2b1547b47243fce8b4fc3c7d467bf63010ae537c24c40e66b1883f47160841f504a94ad WHIRLPOOL 29534917240f293d6a8020631ef1ef21619cb3d2a5a48b5ed6c1ecdf35161ae62496ee0842184f3b0f4c3296ba0b3585984922fb27c161ada7f6b532e1c10cee
 MISC metadata.xml 999 SHA256 c164dbe142edbd454a0092c1894df0bb777f00eeb9a3483503c4e3d0570a71dd SHA512 3eeeff922abee87d887f32fd2aa279e0bc9d30b2604cb61af94bd71eacbdc1944fde1e824b2c9b314a74eadc348eac2d1b373cc0d22bb3ed64934bb83d83ec99 WHIRLPOOL 787802b694de319b088d2199b1d490de5834333abca248265f5f979ff2e9f2c4da227eeada9ae698b5c0f4e2ea6a1c2b266f47803b7eec82f2cc39b2ded4b997
diff --git a/dev-perl/Hook-LexWrap/Hook-LexWrap-0.260.0.ebuild b/dev-perl/Hook-LexWrap/Hook-LexWrap-0.260.0.ebuild
new file mode 100644
index 000000000000..80c4d74bcd72
--- /dev/null
+++ b/dev-perl/Hook-LexWrap/Hook-LexWrap-0.260.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=ETHER
+DIST_VERSION=0.26
+DIST_EXAMPLES=("demo/*")
+inherit perl-module
+
+DESCRIPTION="Lexically scoped subroutine wrappers"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-Test-Simple
+	)
+"
+
+src_test() {
+	perl_rm_files t/pod.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Hook-LexWrap/Manifest b/dev-perl/Hook-LexWrap/Manifest
index 3d00225b6474..5d0e35cedc85 100644
--- a/dev-perl/Hook-LexWrap/Manifest
+++ b/dev-perl/Hook-LexWrap/Manifest
@@ -1,5 +1,7 @@
 DIST Hook-LexWrap-0.25.tar.gz 29304 SHA256 08ab9af6bd9b4560702d9d994ad9d905af0c2fd24090d1480ff640f137c1430d SHA512 63623164ac67a33bd12ef771725a09647bdfe19d2f8eb84a0049ca0bdf4adc325143889a5751b1aefaca23eedb1a503ee42071b2fe3e7e3f033c148c0716eca9 WHIRLPOOL cccf1e39f207dc005417f7056acafdb905a6cdc1c8f880a91565b03b00fc3d8017f877505d3ebca73359353d842888fde5e411336ea7ebbd110e661a3382e39f
+DIST Hook-LexWrap-0.26.tar.gz 29479 SHA256 b60bdc5f98f94f9294b06adef82b1d996da192d5f183f9f434b610fd1137ec2d SHA512 f7771d4fb8379f43fa5b864e345f4526603914c3c486c637ea07fb9e2d41569bf40948a9039fab7d10c683fb85e16a8653876613903d34cc6801fcc9e92aa58b WHIRLPOOL c541a7cbdb63c8e9bd258bd5f46cbd43720cbe30e019894ef0d765fe5f53a53b19c5ba779fced426491be555a00f036c394720a7ffaa7db13d595499460e7bbc
 EBUILD Hook-LexWrap-0.250.0.ebuild 626 SHA256 3225f875de806c53b46401b507d870543db461a8a8ffaa2678af6350d7c5cc75 SHA512 08e2142757d8c9f8ba2b28b659f1e764c509a9790b5afd586c8708abd61c41e2ffd45d4c0ad400d1fcc9b8e7d36fda513025f1cf02dad9e3cf9887099d0830c5 WHIRLPOOL 7e3bc5402af115ac63d68976d999bcb11f96282f63019658c3cd4ad5eeaa03bf850034ad7fc443bd2e74871142d501fd18bfcea680ac2d2b215b957d374dc0f3
+EBUILD Hook-LexWrap-0.260.0.ebuild 590 SHA256 d5b348451e9dacaab1176751dc3190fe2563967ea2d6d29d3f2730665eafbaa5 SHA512 ba7376d6cdbd40b6b309fd40b02f13cebb8658ff505f92f2af515ee5a9e2c346e82f6276c6e6da322d1c06223bd9e8585310cb786e50baca1bf57c4b82bd53bc WHIRLPOOL e60d6fac00ec89bd87a7994acd7b15bc5719f9bb072031f0452891d78cd851a151b007720a1d308bf668e87fbc410efc6dc9a1d3a6e4e520cc84e9adf68a580b
 MISC ChangeLog 3418 SHA256 35f757f795a5868abf98d7302603f4b73d729e2d4ac2c37a1a92a163fe1df7d6 SHA512 81d9834b592bde41ffaefe1fa7637073d79a7bb3ef029d95801f2e1b16bd14616e24588bbb842993e73818e41d5cc0a14dcb0ddd1cd07b7a84e241723e0121e1 WHIRLPOOL 085af07b0a60c16277fe453b0658df4f7cefb85c726e95526e3ddadf13168fc5b1652794237e37a6b19859b0fbf4ae9a1581a0513d8d6d2e1506e7626860bfd8
 MISC ChangeLog-2015 4433 SHA256 79c69061127e0f9faa7e867625a8af14367ebc0c66ac243827080269667af225 SHA512 1be1fbee47673eb27cf2e26e31faacd1c283cfded5746e8d96a739493e4c5159a78647a4e186ebb9c274e8f61b711dfd1e83f2027050769eebe0c8ef5a2a8ec2 WHIRLPOOL 38248f0fb17041c0ee83289320bc2e17eb6ef3de8671fa7e3f902b6de7c995a49e73c25a3ab3d833f06e3ca6a73f87ac1390e3dc8902352f6926803c101c3181
-MISC metadata.xml 465 SHA256 b786438ed8a8c4d195062c4142e88e32407a6f752e2d34502367b80cc791e021 SHA512 a776ab9b0698d49b551351124d1f4b3a5cc7770cc196c32b2b46d8c50d00b288b955821ff9eb70f23cc7234d5d95719a8582fb42c188cfb90cb189186124abf3 WHIRLPOOL d3a9506dd8a6a9aa89ee6ee14548f0d5ec1a54bdf873d7268c6ebdcfcb54c1f55797ff9925d6df603fba9189dc7a85edb64138fc3f3c113428cacd5335eca861
+MISC metadata.xml 396 SHA256 3ef587728f0c98b74aff52df2686e026b4e3f9852ea4bb15d5d6a35b0ced5ccd SHA512 ad99fa93dbb52689ea61dd31590e478da4c7dd7a1d384019aeb506d10f889882e32bc85567812b1a1625afae6ea56c57abad658a35f939655f8b362adf1eb8e6 WHIRLPOOL cd173a26cf04047bd2996bfdd0abfb8260934278b44b703edcba70fa8d29b503d5e05dd4ee03d26a8e633d1d9b2489b2ced3c4ff831f25f61950c49449e75ffe
diff --git a/dev-perl/Hook-LexWrap/metadata.xml b/dev-perl/Hook-LexWrap/metadata.xml
index af7715211c68..430b45ebbfea 100644
--- a/dev-perl/Hook-LexWrap/metadata.xml
+++ b/dev-perl/Hook-LexWrap/metadata.xml
@@ -8,6 +8,5 @@
   <upstream>
     <remote-id type="cpan">Hook-LexWrap</remote-id>
     <remote-id type="cpan-module">Hook::LexWrap</remote-id>
-    <remote-id type="cpan-module">Hook::LexWrap::Cleanup</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/IMAP-Admin/IMAP-Admin-1.6.8.ebuild b/dev-perl/IMAP-Admin/IMAP-Admin-1.6.8.ebuild
new file mode 100644
index 000000000000..0aa8613b1af4
--- /dev/null
+++ b/dev-perl/IMAP-Admin/IMAP-Admin-1.6.8.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=EESTABROO
+DIST_EXAMPLES=("examples/*" "test.pl")
+inherit perl-module
+
+DESCRIPTION="Perl module for basic IMAP server administration"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_test() {
+	local MODULES=(
+		"IMAP::Admin ${DIST_VERSION}"
+	)
+	local failed=()
+	for dep in "${MODULES[@]}"; do
+		ebegin "Compile testing ${dep}"
+			perl -Mblib="${S}" -M"${dep} ()" -e1
+		eend $? || failed+=( "$dep" )
+	done
+	if [[ ${failed[@]} ]]; then
+		echo
+		eerror "One or more modules failed compile:";
+		for dep in "${failed[@]}"; do
+			eerror "  ${dep}"
+		done
+		die "Failing due to module compilation errors";
+	fi
+	ewarn "Comprehensive testing requires manual steps. For details, see:"
+	ewarn "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/${CATEGORY}/${PN}"
+}
diff --git a/dev-perl/IMAP-Admin/Manifest b/dev-perl/IMAP-Admin/Manifest
index 6f273e485569..8c6999314a1a 100644
--- a/dev-perl/IMAP-Admin/Manifest
+++ b/dev-perl/IMAP-Admin/Manifest
@@ -1,5 +1,7 @@
 DIST IMAP-Admin-1.6.7.tar.gz 14990 SHA256 382f44a8ab92ae9332ce35327c97e49253768719988a569e2fbb18b41acaf58a SHA512 cd4c735b3152e9f9db5198274b6c1dd39a8cf0f127b55e671880e6a6fb2278673e5443df46e9e01741cca1f1013f885781bee6b9c45214919510762475e72a75 WHIRLPOOL 2f0ffa26dd7ac2e825134730b229802e673f8fe5d85b61c77464dec862298bc09965f6dc1e41dbe2c632bc422be1f5462492db2077fbb460b94960284fa77eb7
+DIST IMAP-Admin-1.6.8.tar.gz 15332 SHA256 86bd699bda6774b6281e2abb629deeeb30edb58b7a179679aba90243ef1a7456 SHA512 b9a600b66b539a9d7e5fa3c635f37302bbef87f5403c432f880edd724ab0576b1365303a309582d5dfd455093e8a67ad9716154d55ca9e938dd8175acb7fa0b1 WHIRLPOOL dd3b82a5cba1859affcc498ac63eed26e8685a0bce20ac90bfa363d8fa4bd0b6ebccbf44a44408ddd03917423493bc20d89786de09b7fe822e9af703774a9978
 EBUILD IMAP-Admin-1.6.7-r1.ebuild 471 SHA256 88fb1039e37464d9142f831c6213ba255c0db3473b470a77ac68ce6bcde067aa SHA512 01ce375fcd1eaf0d028454bedf12ddbe5b4eff14816efe971256b05134c4a80ce8a28f8305febc52831555c5ce6313dcd8d6aa1dad3605308cdd0ad557399e87 WHIRLPOOL f789354503f409dc0b909f604d0dd68eda99058be3904d40603c0528e5eeee47a2c62c991867873037dfe455f4af86bb2ef8771c18c11d028ca3f1b0c9452959
+EBUILD IMAP-Admin-1.6.8.ebuild 882 SHA256 314f779a5e8c7a0bfff1ad085329c83ed8a3bacc88a5f34a9dff2b90409c3234 SHA512 1afa3cf77cece2005b87ea2475a37c63ffe3ccf6a235f5ac17439184e74c9fa4f0698a3030d71e878a47894d60c1b4570b14bcd3636a9c02a6a8bcf5197161cb WHIRLPOOL 064336a966dfb7dc5e8e6d6c906cf6704f033ffa67d6e175d9bf7d2e5a3ce03689b11e6899232bce0fef6efbf0b44f31a6701aabc00c52c68172ba35c5218c0b
 MISC ChangeLog 2442 SHA256 0c619a466b126d44faa5e6eff4d609539753bcc158a8e7b3786c9dc553b781a0 SHA512 42d13c611d1c61b5a50ed0b27c3b698f9f5f3869d6d740a6ca333d0da9e4680c6c90def73ec0d7d1e02ced9a6cf678b69d5948636287b83fab94ee6a27f205bb WHIRLPOOL 57932f591204c4c2ba3c41e13b43f954c8dd766441753d0279938cd9df6b30e20448248d8a39d06e1180ee5637a4e681a04dc7dbc830bc7d333a97a08bb9bd76
 MISC ChangeLog-2015 1755 SHA256 57d5ab9664344ae5304646d722e0c4a963707dfcf91736d722b245253c000517 SHA512 5b94fbdccb9b7940d673033c4299fadbc91e77e945187363056ea47c68a3dcd95705f2e04bd137998a2142d0654792105f45efed1297472ebd8b3b1edd503a0e WHIRLPOOL cd6c72f64ec6865add258d08960e84839c236b3de8da9af637138677b2f91abbeaefe375baef02b4bd683298da49fd29321a2f4bc0a3a03b950188a4fef3dc30
 MISC metadata.xml 392 SHA256 fa959b3bddc9be90de76e94b07fb581b0143987ac950945011b87318504d7e23 SHA512 1cdfce1d1ed1b6f1d76b13e1570cffa0684457a7eb9b47ebce0b96c599980b6ff1726b976f8b103341301c9da0866a93e9d24404924a3d539cd3b1a26d2fabd9 WHIRLPOOL a567b4f91050370018deab1f8270cc5c5606f5d4b5c6716dde60458fbc520be43e5990c5e799d65f1ac696f7ee0df7003cda0405b80239ab144a2eec40815a19
diff --git a/dev-perl/IMAP-BodyStructure/Manifest b/dev-perl/IMAP-BodyStructure/Manifest
index b239bdb1e6fb..9168bd4ae6b6 100644
--- a/dev-perl/IMAP-BodyStructure/Manifest
+++ b/dev-perl/IMAP-BodyStructure/Manifest
@@ -2,4 +2,4 @@ DIST IMAP-BodyStructure-1.03.tar.gz 25541 SHA256 9f903b9297ca943081c4dac1c23f870
 EBUILD IMAP-BodyStructure-1.30.0.ebuild 373 SHA256 20e964901ec2319e16770a66009acd7853746ab5d87c16bc9e74afae8f0167ff SHA512 ebae92f822d1fb4314125aeeccc44381e479afae21f948a930f5cb8ac4a2d13a2fa8b812fe5da7acef5c8ddce458f4411076d4d53ea8d540d9aaffa9e2fd026a WHIRLPOOL 2fbcda47c3aac36c972007ba65d7b1d0083db2314caee57d408b479c9927954b91d2ba3bd91447c2b9aecf63dbe7aaf1ee537a109add1b76c6c13dbc498a9422
 MISC ChangeLog 2849 SHA256 602c5b02416b16c39978e14d272021fceb989b92628c1cf6edf450c1ed95b3b5 SHA512 517c846bd4869125daea0de107ed69365d4825e43e775303abbae1763161cc91eecbad9419d671f9746e641a2988255a9e468916cbf0841914667cb2a06f4254 WHIRLPOOL eac698963ed703de9b41e4d82e6726d6a60b2856b03e229a0a6ec5f6e4b36a4a1daf41b10b100604bda88a018fbae79c723ccb1261f2b0410390389aa07579a4
 MISC ChangeLog-2015 609 SHA256 6074a3abfafa4e3a858f1d0ed9c1c5e349681299b86cc441857f9f0557b8fd3c SHA512 d365a3680c44bf59d9337cd4dcc1c8c49a59d901e536f5cc08ad36102feb41b6624fe1ccaadd13a58d93f624a56a8491b8b2744d44c028c641ceccac6a9b1764 WHIRLPOOL 06dba035b4c3a0f4358031d56f5d6b71fe59010dd6b142a1c1955c3657b0e2fe9100b15044f0b55c0b1a9e2fa11b80ab28cd083be489f5b730ca6d2ef4e284ae
-MISC metadata.xml 342 SHA256 1c76433dc3bbbc05b2892f9d405ee2d9043be05100f998831d77a4cc410866e0 SHA512 cd1ae211685af70e43c30c43ce52ea5f3749f2b1117a1dec43f3f1edc30030592d3951bccb785ed49e8750bb8de092e12334dfc2f6d51778de6b64c226e3c6ac WHIRLPOOL ef57f3bb9dad2c14fe0418d885dc1ad617f147414259933f2aaa00680ef918ade2e1f2f3e2f90548d439b54b3305185c1203526d690865ae36336feec3c0c169
+MISC metadata.xml 484 SHA256 5f2a9e3283ed31738c95665331b2c26f65036be58a2b166c8f3aa92ee7b10912 SHA512 56056fb2eb7c5abfc5bb6bf5d1d474e8e07ffaaca4b7843504694ee8aba6faaaac3566e9ae788e3d2aae824b10f54ff341a322d5e9c375a3489565c479cd2318 WHIRLPOOL 35e47312f6ab36093d1df6510f26a973f5d371e1cbf0e468b3d0d9ce658d398288c35ab19dd8bf423accf64c61a105e2fff8c82e997083c9599f057e1d7b99ed
diff --git a/dev-perl/IMAP-BodyStructure/metadata.xml b/dev-perl/IMAP-BodyStructure/metadata.xml
index 5410b41ec6f4..7febcaacef1e 100644
--- a/dev-perl/IMAP-BodyStructure/metadata.xml
+++ b/dev-perl/IMAP-BodyStructure/metadata.xml
@@ -7,5 +7,7 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">IMAP-BodyStructure</remote-id>
+    <remote-id type="cpan-module">IMAP::BodyStructure</remote-id>
+    <remote-id type="cpan-module">IMAP::BodyStructure::Envelope</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/IO-AIO/IO-AIO-4.340.0.ebuild b/dev-perl/IO-AIO/IO-AIO-4.340.0.ebuild
new file mode 100644
index 000000000000..0d1a730a6890
--- /dev/null
+++ b/dev-perl/IO-AIO/IO-AIO-4.340.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MLEHMANN
+DIST_VERSION=4.34
+inherit perl-module
+
+DESCRIPTION="Asynchronous Input/Output"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+#RESTRICT="test"
+
+RDEPEND="dev-perl/common-sense"
+DEPEND="${RDEPEND}
+	>=dev-perl/Canary-Stability-2001
+	>=virtual/perl-ExtUtils-MakeMaker-6.520.0
+"
+src_test() {
+	if [[ "${IO_AIO_SANDBOX_TESTS:-0}" == 0 ]]; then
+		# Tests trigger stack overflow in sandbox code, see bug 553918
+		perl_rm_files t/01_stat.t t/02_read.t t/05_readdir.t t/03_errors.t
+		ewarn "Some tests cannot be run under a sandbox. For details, see:"
+		ewarn "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/${CATEGORY}/${PN}"
+	fi
+	perl-module_src_test
+}
diff --git a/dev-perl/IO-AIO/Manifest b/dev-perl/IO-AIO/Manifest
index 51ec595b01eb..8e7f7069a12a 100644
--- a/dev-perl/IO-AIO/Manifest
+++ b/dev-perl/IO-AIO/Manifest
@@ -1,5 +1,7 @@
 DIST IO-AIO-4.33.tar.gz 154120 SHA256 7590320a1c47bcf0b7daf37a756c61501de71f001e50cf74338610d418f66bb0 SHA512 9d59d9ad511bb07178ed760a0387357ade961f9b0e73cdc64861fa3b5674fb4cdb07b44a0c0810cc364909c1bc4fb012c2975269c1e3035cd37ba21a8a029df9 WHIRLPOOL f2ee84da781fae31df183c0c94bf586601306b3b32d97d98cfdc90d5f7a077232a4962d08ce8589a5b3e2b4fef833cf88bf1422c2bb6f8bf35caeee55dc2a1ae
+DIST IO-AIO-4.34.tar.gz 156615 SHA256 5d3d047367659355e77793a4f7df955583fc7fe9a3107057726b885570790525 SHA512 7b7e05fb01513864321c1aa2a28192444299486831b75461bd57bad5a0370863d46df42c698288096eac55f9972a3492f8af46cb265f13c721da698c9fe3529c WHIRLPOOL c9c9ee17a5baf0c4d77a0d0bafe81589c7b06f602e14a64e96437a3c0c4d7576336a08e463b6eee45811e5ac6315fd554a5621f46a96d1e5774acdac0da559bc
 EBUILD IO-AIO-4.330.0.ebuild 470 SHA256 fc6ad31c1b45f3232099ff268f93e38a57cb08fa95f32ab672eba428812f44b6 SHA512 386b10814cb2793056d925e08a2a1bc3114e8ec6b3c07a416b5eb622790df6b837b4716baf02050d4cbebb5fa8672b99f93fee2ac43b5b4d80315cebc433e76f WHIRLPOOL 834d09c30847f006be1f4fc08a4c530cb5143afea6c948cde1da184eacacb35085b74eaf7f2bfc6eb1c4d3acdcd8f2f0430209efea715d2254a889bfbd257a2c
+EBUILD IO-AIO-4.340.0.ebuild 787 SHA256 a503f70079cd55da290e3e2f485a1beb7d4443f1739baae63f12054d7ba80136 SHA512 bda0f3e22afe9203a1ae289421ae28f6edb09287a6114fb6d1a5c36f5dd5e7d6e282bf1e55a1bb7d7c5b103985c6587f9b6cb829ad7b9691dc01f6400e714d61 WHIRLPOOL deaa67933f98e41cdebf38950d71e465a929611b07ae16371ce7e6215ccc37a1a31157ad3c969951f757acf262bc9aa0ec66da5c736f58b93743071b7396e4a2
 MISC ChangeLog 3546 SHA256 1ff619b195de4d567dc11c3a787bfc087c848135d23f6ce86f3542cc7a6dd278 SHA512 237bc9d1f44dae7fac84dbfdd32c0d2bdb1fafc43c1d2f76aa2ccf40a5e235755496e708b301b3c9931fecd05d717c261406686034be0601fc7beb4b53eb830f WHIRLPOOL f2c0f04c4c8f30ee4f9a7b4fc63747fa5ee1be3b7208d082ed1091f92e11dd2bd8adcaa3a47cd1aa8cb99df8ed09cbc6fc4193fa29b2437a8215d4767444c8b1
 MISC ChangeLog-2015 4421 SHA256 1578c94588074b286334d04f1a7b141274df9badd19eaa0ccf7d8289b856e0ed SHA512 03ef9292fe196b22d9cdea6665132804d87829238ae50e935405775c99b9811c4a4be9d497c58fd9ed06cc53cc76158160c45c80dc979b3616323ac107225484 WHIRLPOOL 69cb2c0b776122b97ccb8604f0504ec70c4de5788cdcde2a265aa6de6722436c202128c8405164b29a254bb0bd0eada3c238360d79e9627e1eb224b91029c034
 MISC metadata.xml 384 SHA256 6fad2d164edc8fc19d9e541972660437fdaa7248c3c578f9b4988aebf46a412d SHA512 b8b6b875f238a07128ef4a9c41f4cfd00d3b782c595dc79873d49474db057e0d8991f06637905dd8cdbcd78764a0fa55bde44f7ef22f3d08eb0a86cdc8dcc5f3 WHIRLPOOL aa1d893b2a24539b03793c0426368fa966469f523f90f22f0f3a0e2f6904bad56158714ac718ca03c7f23e51bda844811ec776f96a8a8951185be485462d7265
diff --git a/dev-perl/IO-All/IO-All-0.870.0.ebuild b/dev-perl/IO-All/IO-All-0.870.0.ebuild
new file mode 100644
index 000000000000..e6e7047c346d
--- /dev/null
+++ b/dev-perl/IO-All/IO-All-0.870.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=FREW
+DIST_VERSION=0.87
+
+inherit perl-module
+
+DESCRIPTION="unified IO operations"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+# needs Scalar::Util
+DEPEND="
+	virtual/perl-Scalar-List-Utils
+"
+RDEPEND="${DEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/IO-All/Manifest b/dev-perl/IO-All/Manifest
index 83afa66d823d..a714c7ea0c7f 100644
--- a/dev-perl/IO-All/Manifest
+++ b/dev-perl/IO-All/Manifest
@@ -1,5 +1,7 @@
 DIST IO-All-0.86.tar.gz 78648 SHA256 4574c2cfb8ca591783a62744d51952452e9304ff103865f2ee8c9c23a7e928d8 SHA512 3bf2f1caae19d10905d8c959b88e0ef43703b3cd0fb389060fd6a6a0bba4d6b24a92b8d2568f4bbfca6b7614270adb7131225a7b7f9394b26467bdb780a16a0e WHIRLPOOL c280d410d76bb46188fef590c250a1058a202fe918d17a08fc8d007570d9821497d2419fa16267e254c94be6138b341281b9255a54c18251d8799106ab686b28
+DIST IO-All-0.87.tar.gz 77819 SHA256 54e21d250c0229127e30b77a3461e10077854ec244f26fb670f1b445ed4c4d5b SHA512 bd8cb6d44db51a9a140209223f016e48acd713ec03ced1b9c02933fd88c6363926635dae033b20905201b13e8186b8bcc3f428d4d85cd187fc68b777cd197267 WHIRLPOOL 05883822f88782f724b321ef2054e489ac0505268fb7f8a67019fcd61b6d4be2a9c7030333da5df25e1fa4447a5dc5d1717322ba1f265d13e99a4ee67c2ea91f
 EBUILD IO-All-0.860.0.ebuild 429 SHA256 79f00144ff84ebaa37a15c6d448a8cf746ed9122a036a0a463576c9a5f9fe38a SHA512 82c28f009f9ac1850d852528b39dd3aa18f86e62b23bd519f10a37b50d142a67cc88396598d2224644b004ed101adf40b3164da4c8fb121897b978d920fb5584 WHIRLPOOL 1184da79e4e56137c258d576ff02028a5cba5560d7495e9b5df20df54f4c283adb6eed9e5d27192a222a7226ca74036bffce2d67b096d167a8bbd35f220bbd72
+EBUILD IO-All-0.870.0.ebuild 405 SHA256 515c1e8094460082286ca91b340e0dbf76a7e1b0846189d4225eaa4f2310e462 SHA512 ed736d0728acd7fff192b7894f7de245a2a10f6ebba67f87c1557c1a56c027277ed8940a5284ad2ffbd8a11e2e48449444e5fe3ed1139fdc803020c8ad649303 WHIRLPOOL 534ee9d0f623b29eaeb2864bc152e388743d4979f0d8087e801ec20f4aa58af0d1e23bfa8ae9b83222ad8ab3760f4671ddf59326c86ef76791203a07bbef9876
 MISC ChangeLog 3005 SHA256 fc40fde63534ad6cef6a4395d2e07893369c753540a1cbde585dab7b8b803b27 SHA512 cbe09f22478ad136abc0f8abb078a30829699ac3fce34456c88342512e694bdfe9167ce7a206ab5053bc002ff2ebe5e9a0a3ba1047f3a2232fecfbefcf4e0488 WHIRLPOOL 0fd7767d00fc9ba8a821af0087aac1491005e58709660d1cdb70dfdf9bdfa9356a1092f8269a22d7804c5b84d992196cb8f7a2bffaf840c7535e7455e15ee83d
 MISC ChangeLog-2015 1877 SHA256 7a2cf6cf7da6b021af14fcea54648f5d866b1dc4a088202ec7ff0096639baffd SHA512 ae109507768c53636e887d280cb748432c39b8fc3027b241c6ba0256250e14d70004c3e835d5050c2f39757a4aad8dc27b5bd61aadc773a3913721ef7cbba3e2 WHIRLPOOL 9c1df8a7d5e1a7aa86fdafe5520a6bef457028e5bb466b5b94d6e628f1bf1a521d535a2e29f078f672c16d9562d2b5abc1147079fbc79415586dab9b141a45ac
 MISC metadata.xml 1111 SHA256 05c828c35ca766001360333da9cfbc3e2f64e78513aa0409b7171074c9d5382f SHA512 bebf7616b2651f704d1f26fcbab1d555bd49984ab7dfe56dbc3214a8ad927f39283af51e7be5bc54094f83352eab855a2e5775945ef2fffb8e41503868e61abc WHIRLPOOL 37282ddc1d28dabfd0166bc701e37047f0c2925bbf462272c1f03c65f0506da3d75a9c140d4dc164ea7b18c39ec5f5e900ea5f8336447b07c47f048ba9367148
diff --git a/dev-perl/IO-BufferedSelect/IO-BufferedSelect-1.0.0-r2.ebuild b/dev-perl/IO-BufferedSelect/IO-BufferedSelect-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..3a024a51a63c
--- /dev/null
+++ b/dev-perl/IO-BufferedSelect/IO-BufferedSelect-1.0.0-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=AFN
+DIST_VERSION=1.0
+inherit perl-module
+
+DESCRIPTION="Perl module that implements a line-buffered select interface"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+S="${WORKDIR}/${PN}"
diff --git a/dev-perl/IO-BufferedSelect/Manifest b/dev-perl/IO-BufferedSelect/Manifest
index 99cc4c6f6ff2..74eb7c0566b0 100644
--- a/dev-perl/IO-BufferedSelect/Manifest
+++ b/dev-perl/IO-BufferedSelect/Manifest
@@ -1,5 +1,6 @@
 DIST IO-BufferedSelect-1.0.tar.gz 3519 SHA256 95fe2ec483156fd9e98886c4ac90420b30dbdb6e61f25dc6cc4432db497517fa SHA512 30bc0ebb5f62c6261938780eaf9eaa9aba2ec9ee3453c35b87614797e74399fbce9cc3aea5742078069e8131ba31ffb5ff5cafed1147b66c8f98b92b40652fc3 WHIRLPOOL cdca91f0e994340585016a4bb628f3aff786c0cc5c262876de49f7431b0ffb40a3904ea816f4757cf33f6e4cb080204d71855f2cf48a4d00e0691da91bf00782
 EBUILD IO-BufferedSelect-1.0.0-r1.ebuild 320 SHA256 0743ac897f416cf9212730c9d00af8674b41e3516dbc14633773ba3ce3045187 SHA512 d310f0948eaf7dd8a7fd85df163979dc1cecd0ecc7d8ba4ea97f9ec7e748b65ff7017d9161f70291fcfbbcd7e52e78869b017ffff5d2dd48b8ea80916b191010 WHIRLPOOL 600dfdfeb5e2d389090baeeb291c2c0fe4dd1a035bb185accd1e0b385e5c1b0e77f15fcd572c65dd4229cf4482257a5325d45371000cebc93be283e76d198328
+EBUILD IO-BufferedSelect-1.0.0-r2.ebuild 320 SHA256 0a511ecc739393537b8c8a5d80546b3d718177e2fd5114b8acc6daae72e947a9 SHA512 dd56f48a5fd8005196709d3af6a465bcc258ea2b2084a018df367f8aeef977a5f9d6261251ccf4a2a97d16628f370c2e2bd0b53c59dd81c39284c57adad2a5ed WHIRLPOOL 8f665830c665471b1a068b85078d0beb2c5212574fc2832bf1f7acd5bbe033b30fd34f86b591b99f1138464b6d08d308cf9d5f7c4db8da98854d34d7336933d3
 MISC ChangeLog 2463 SHA256 8b1fcc780faea1ab6080507f853a2d498534bf04a287ce5faf4827fb932c966d SHA512 357db3d5e39cc3fe6f6dc4d0e3b968c2361dd7b95aa081796c7d9221b78c598bf39988100db99bc0d562091f3c975ebe9be54bf8f8c9fb9503231b18aee0c8f5 WHIRLPOOL 09151cdfd31a637ec5814f08061812d29ba0d1af7b723aa380946a3ff53e404fc1b3abb2b78198f6fcc73a2212861ad7bdd2071bd45b80a7e0554156af50fcd3
 MISC ChangeLog-2015 2319 SHA256 77c42c5b4f829b7a4c80fb3a8f89741245bdcdbde8cfaa5187ac18c9c13df048 SHA512 35a421bab27d244f32da0c204255142192a01bc033389bb2d82d7d19b3746784020e1978c5999e91e4df66ff41fd30b0a16047d5024e3673716028bdf9ad08e6 WHIRLPOOL 7da2c1972a296c4589fccf9c6a746290ac0561062d82ad0914774234b417a1378588ef5fe6033305993b202b34aadfeac707d3b498f8bc5843ade0c6baac23d7
 MISC metadata.xml 643 SHA256 871c87dce435445c2cded6a1998d403f730a960f29b79938e9fe6fa1fa921422 SHA512 08f880982ef241742c37eb1acde5aa6fd7204daa4614f1f363d83f13c3cf9ff933804faf25072513dc9b9a61047630d0d8b9e4e111776df5453a4d0dbf046a84 WHIRLPOOL e2d1cf5fddb83df4dd0d43f07680d10ebcd5d5d46ee572bba63a5cd2b1f2a0ffe6b122aa01baebf1a5792734e71946e15f8f5a5b764c369a6f8c718653cd6dbe
diff --git a/dev-perl/IO-Capture/IO-Capture-0.50.0-r2.ebuild b/dev-perl/IO-Capture/IO-Capture-0.50.0-r2.ebuild
new file mode 100644
index 000000000000..d6b65618b540
--- /dev/null
+++ b/dev-perl/IO-Capture/IO-Capture-0.50.0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=REYNOLDS
+DIST_VERSION=0.05
+inherit perl-module
+
+DESCRIPTION="Abstract Base Class to build modules to capture output"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-perl/IO-Capture/Manifest b/dev-perl/IO-Capture/Manifest
index c5fd90ca3a39..15542477696d 100644
--- a/dev-perl/IO-Capture/Manifest
+++ b/dev-perl/IO-Capture/Manifest
@@ -1,5 +1,6 @@
 DIST IO-Capture-0.05.tar.gz 14246 SHA256 c2c15a254ca74fb8c57d25d7b6cbcaff77a3b4fb5695423f1f80bb423abffea9 SHA512 7e2176a34cd1fc6d95f27160196c73e88d44cc96d7f2ed002d1bad242ed4edd00e24943f1d712bd014d3a2b6f2e9f26054cf270e0265edd6ca5829ba3ce14923 WHIRLPOOL 04f50e06f1fb1366ad6eea74e7229320f39f96a751a1a0a1a586b93f1cebff5d8ba5193453626ff5220ad2aab84d02a75953ff6cf3fd6d5029b0e33113edc147
 EBUILD IO-Capture-0.50.0-r1.ebuild 290 SHA256 1f6d49a6f335fda24544c5b2a267ab4e9b7bf21ba0a30c34d9467dcde4c77e6b SHA512 214b70d9d4fd16977b132d69170143cc8a54deaefb2c779259c0ec49e6127485935479afb47ae0cd341295fc18f7aec0c8cbca6c2f9cd164a4133ab7ea7cd8df WHIRLPOOL 35f227bb244df9aa2b335975fc7290e73d7c8761c51fb4f234462ed7dcfe50bb869976949cebb48b986b4a0d7bdd12854192efd04525385fe425c7793a495fb3
+EBUILD IO-Capture-0.50.0-r2.ebuild 286 SHA256 4da8de02dfb1d4d6e7adc85343f6215626f40f44a9c411558d99d2f12b458d5d SHA512 a66d4ef368805a430e6da142d5b4fc8cd5b4385a4fb7c7722eaaf74f7d679b5863e8224cb50bafb7f91c24d0525a333813970c478b7dec9c3517ec4b0bc9f3e6 WHIRLPOOL 1d868e476fcd6c64aa6250f989b2a8da77b21e297ec17076b8d45fbd96b7ecfaa53355aafaef88985181915e5915c16977208b4b5bee6015836bd77c52142a22
 MISC ChangeLog 2444 SHA256 bf4daa1855b85a55d985a739c588f2d9ab78213458269c9571a9a324c1bfe684 SHA512 34f9548cd77d528085cae8436c335c5b08eed0349dbb6ca27be7b92a1ebb417df28021ac52f691294a7e6315d170673067ca80595b511350ef5c6bedf296f48e WHIRLPOOL 2f8384816acc3297499548963d545d2dcd05ddf2e67c4a7c0475991efde2de163388dd83ca75df80f4bd2aefb5f468286fba4decf9b2cfdf1a4a7ef02a36340a
 MISC ChangeLog-2015 1146 SHA256 ecef48ea3bcd2a75cedd70d1f6aefb14c398705c36791f0fce8e2f46636860c8 SHA512 1d10c5421a7f48ac9c4f80eb626c1f83de7ce872e7be3f9e272faaaa5d84fc950855680b497112be5a706015a7707ee03d6c04a9b65eafb9dc7d70edd3a001f3 WHIRLPOOL bd84405c6fe4025158450fdd340d97f644f3c0d175ebdd93abc2805956b1a45a1f18d93b41e9856a355bddc8e1b38d4b2006fb3748df05c554e9f35d83d03331
 MISC metadata.xml 592 SHA256 1f6e90693a49d7b2c5c20db06d6e3f63f7b589c3db0863281708ff1ed2037514 SHA512 b6a6e8188e4a0d5b6132166d03ce2ea299a518231c24af785baccafa54ac91432e977657b028cf66cb0c5246b5dcc6bcebd499d4194c676b7b42c13386d0bcf6 WHIRLPOOL ec8ae5aad2fc43c633cab0e8b7448cc8e3e681100e25236e92645d8f9ab4e6f014d53750142de45577defce410a6f9463e7112021062738e8367e489db58f025
diff --git a/dev-perl/IO-CaptureOutput/IO-CaptureOutput-1.110.400-r1.ebuild b/dev-perl/IO-CaptureOutput/IO-CaptureOutput-1.110.400-r1.ebuild
new file mode 100644
index 000000000000..9783333d9b5e
--- /dev/null
+++ b/dev-perl/IO-CaptureOutput/IO-CaptureOutput-1.110.400-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=DAGOLDEN
+DIST_VERSION=1.1104
+inherit perl-module
+
+DESCRIPTION="Capture STDOUT and STDERR from Perl code, subprocesses or XS"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Exporter
+	>=virtual/perl-File-Temp-0.160.0
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.170.0
+	test? (
+		>=virtual/perl-File-Spec-3.270.0
+		virtual/perl-IO
+		>=virtual/perl-Test-Simple-0.620.0
+	)
+"
diff --git a/dev-perl/IO-CaptureOutput/Manifest b/dev-perl/IO-CaptureOutput/Manifest
index b446213c3629..4e20f9def1d0 100644
--- a/dev-perl/IO-CaptureOutput/Manifest
+++ b/dev-perl/IO-CaptureOutput/Manifest
@@ -1,5 +1,6 @@
 DIST IO-CaptureOutput-1.1104.tar.gz 27651 SHA256 fcc732fcb438f97a72b30e8c7796484bef2562e374553b207028e2fbf73f8330 SHA512 5694635c91e4dd11279c33fb9d58e2eb27014f4ea0a976e62c23505524e3d37264aab6d6b1cfe5d925e123d6aa240e574dbc4f489c6c1007da09631368af94f5 WHIRLPOOL b18f9eb5a88bf655c7ce448cd6b164885ee8e4a0da44e572a9c266c4295c3a9049958898ef74eda631e54d117de8b5a707fa10788e7ee94d442658c708afe5e1
+EBUILD IO-CaptureOutput-1.110.400-r1.ebuild 613 SHA256 ad06cd857441a021cd693a32c25ccb8690413099dbd4b32155bb2580312f8737 SHA512 f6333f886cc91bf0652539246c04d08e83b80b5a858fbe981ce77b029b5caa85c646f3e6ef6df3f465a01e38117a36d515d9d9b5ba43bb5b24b4c948c64cf9fc WHIRLPOOL 324791424ea822a52968c391b3ca7aa15346e599064ac3be27d752e0f6b42f4c67c307135dd49db8a6ae1fa0ef38381a4a97dc2e3ed13174bfb6ff9ef1534f79
 EBUILD IO-CaptureOutput-1.110.400.ebuild 624 SHA256 009e4d961f62577f264c2c9bb204b1f80bfb4ec42caf2cc7980f5f89bd9c5e80 SHA512 a8a401858bf45f705a654053c7b759d2a3dfb91de19d430208cb78bddaf1a5390a5f5b6fad84f16a9f37bb071b7c29d4589ba3656ac2a2d921b6b3d08efe63ff WHIRLPOOL 10f6e9a695b1f44a96751fba0a397fa96a4283589b42b470676247c01a3dc3e52b6d7d28679f19f1b061a9c06125ced11778b4ca6c0271be9585d65836c2b017
 MISC ChangeLog 2820 SHA256 b41837cbdb95c636b3e1299a0f51b16a916c9705cd5929db6f57c6ce6db9f1b6 SHA512 656cf6ff65114cf6b5eb74c5bcff6c6315c6460354322c05b271b6a2af9d3763efab1ec6c143d92c817b5d09c551628b706a878614e0b044a876e43f8ee22ed6 WHIRLPOOL 290b8cb61ca764009f2cbcad099eadc7490f019cf74e2d07037e3afd79944804cff00e30aba8ddf299f910e8f111d02168c27b84000e3f91b313e2d8c22a58c5
 MISC ChangeLog-2015 929 SHA256 3261bffa5b112e924aca66cea2e55b314f6ccd4a70faa116d934a07479aa7d8c SHA512 9f50bd13b5260886c3b203f5456f67cceb3ecb4ddd544cf0a6e7320cd5982edce433958fd74ae201b6809b597eaa6e89ea29f77a2efeb7378ec6b7b44f9314d3 WHIRLPOOL 49dcb0bbe61d5c8fd53965f768739480fc5607a8516fd6cf3091ad66a207f0bd91f4a69c505bc482cc971355d012b70c8f1db8d9fb09b583e81745ea964f5410
-MISC metadata.xml 247 SHA256 27f3a316ecc7f285838d28af09f1d1b76398615a5aaee404214aa9b1fb61a7fd SHA512 9bd9ddeb07e0644027c9a1dca33f0704de6062bc6b17333adde82a177991f35265f90e1b623e3a6288fedd729597921f48e4fda17fb8d402b1b2f3fc73c6d693 WHIRLPOOL 9a6451451b71a7b374696d841572b5d2dca769ec6bda12f582659e77274cabb0b9fed82e107a870cb9025e566b4b13cc51049c98068e137ce8c7739dacd649c3
+MISC metadata.xml 404 SHA256 e0534028e17b86aad23b74cdba41c1241ded4f4a914924570bb53aeb3f2a8d62 SHA512 8f47e8f2ce312ba5b5dd1a168515f2de2dd4c2a1c44713be9e1f85bd5ff265958c553f35812fd67dc9adebbe42e4254a5b71471a304c0da463303e78435f0677 WHIRLPOOL 78daff3b7de39f969bba92acd6424132683a9f192fca783773cc94f31f34996b6da468ec63d39aeffa7fc8ded6afc91c0b67a43844b615fd3f5b4a0b5e8c605d
diff --git a/dev-perl/IO-CaptureOutput/metadata.xml b/dev-perl/IO-CaptureOutput/metadata.xml
index 7faa8dfe9af4..272b532d4a54 100644
--- a/dev-perl/IO-CaptureOutput/metadata.xml
+++ b/dev-perl/IO-CaptureOutput/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>perl@gentoo.org</email>
-	<name>Gentoo Perl Project</name>
-</maintainer>
+  <maintainer type="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">IO-CaptureOutput</remote-id>
+    <remote-id type="cpan-module">IO::CaptureOutput</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/IO-Digest/IO-Digest-0.110.0-r2.ebuild b/dev-perl/IO-Digest/IO-Digest-0.110.0-r2.ebuild
index ac62b6d59ed5..17172546e1b7 100644
--- a/dev-perl/IO-Digest/IO-Digest-0.110.0-r2.ebuild
+++ b/dev-perl/IO-Digest/IO-Digest-0.110.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,3 +18,9 @@ RDEPEND=">=dev-perl/PerlIO-via-dynamic-0.10
 DEPEND="${RDEPEND}"
 
 SRC_TEST="do"
+
+src_prepare() {
+	sed -i -e 's/use inc::Module::Install;/use lib q[.]; use inc::Module::Install;/' Makefile.PL ||
+		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
+	perl-module_src_prepare
+}
diff --git a/dev-perl/IO-Digest/Manifest b/dev-perl/IO-Digest/Manifest
index 58f3152b4de5..4e70fadfdb79 100644
--- a/dev-perl/IO-Digest/Manifest
+++ b/dev-perl/IO-Digest/Manifest
@@ -1,5 +1,5 @@
 DIST IO-Digest-0.11.tar.gz 21665 SHA256 8ffcf85a7f6213e5e94140adcc2b179ed02498eadc84309457e904dec93f7f92 SHA512 29e76361255f19327d97f9caafa6f6bccdab8ee4b823a80c0ca176abc7c35c13270d8cfd0b76a17e6bfce7f9face2668988dfc5e154e9066320d851f5d3f83fe WHIRLPOOL 328f770444dad8313c34b05053b50ea53f419cd94579c620a4e825881ff366e6af1ed36c70cbc822ec26f5f9a845fd1305bee4929d06ed258028c56effd8092d
-EBUILD IO-Digest-0.110.0-r2.ebuild 454 SHA256 3492e639c3a63206ee025b8172b8b76f75ae85f98f28ef143ee2c51bced863ae SHA512 e964bd54d178692911c3aafc86a4a56cecf2fa32d2b566195a3677b4aaf623e3d0761cef592fac01882aa7dcddf005e9233422030881512903528f962cffc309 WHIRLPOOL 092ce82b96f7da24408975e6bada6220d612e90a6cb8f6a23196ff350f703eb26290c28e7d15581525f6748099618952d6fbfd35d2446b7c92092ca0f4f2251b
+EBUILD IO-Digest-0.110.0-r2.ebuild 647 SHA256 6dbda40b1bc105e100af2ddfd0d94444de1fa55abd98fe98e9bbf5aa8de81d2a SHA512 fe04421f62806c1dd3558a367cdb60687ac54d002bbcb971b9c413680fdd11e5e4f36638387c7ed65d97335d5bf5b1e3ec475301f466e7d386ec3644b907354e WHIRLPOOL 8bdcda594d6246dc7ba92195bfcd8ee247d69132c501cd81983dd368467b3f8a1255ac28776a1a312c25a3b532c322f88d3ed03bff4ea133679fd31ca6796749
 MISC ChangeLog 2443 SHA256 fa162242fa206265b535a47a59b59ef74b5fe8dc61e94d968550d153b791be80 SHA512 2dd1c7cb7dd4dc0cc1f581ccaa2972718b908f39ea0bc573788a1d16ed1ac3227c6710a22af5be841fe57fe18cf79e97c0229e7255bb68695903fb4ce29b776f WHIRLPOOL edbfc4fac7cfabdfe11d1f601e93f1446769bcadb4511c2f8ebc8d40e1e1de7aa6b16a93d8b590bd4be02898f3bcef9106bce7a9f5f7c8248825054ad44c7f75
 MISC ChangeLog-2015 3480 SHA256 e5763a90f00af8025e323b6cfd28ecb1a96a86de8d1e7f99ed3f9d097e7b3b0e SHA512 a22787fbc6839bcd66102de41b00d45e6af11544aa224414abdcce235e7e1b3a56ab3b050a772e19c6dae59da454249880eb4741d52d27ade71ca21f0670b8fc WHIRLPOOL 5e0ba298adeda8965163a8cf8b3ec17caad95a17148abc73ec887617b08e318932771b011e6cfd15a93add1d3f77e82df66f121ca988c18d0cddb0f9b8bd7d78
 MISC metadata.xml 390 SHA256 5853171c5fbcd89392c3a2e61ef257cc98f78f879bc29e9fd00c9c1a2b94dd6e SHA512 69055c2220ddfb8b60d6cfcd533add49a79f3055377bf5f1ad30dedfbd0e34ec4eba5cb99adf18f1f18cff5781dbac11e8b8b03f7bb210122b20b9e8879954be WHIRLPOOL 42b855ac1ea5e5d0fa1a3555dc4a0ba3b25ef1be0c9d07f319820452a7fe4f9c5da6bb14c18857ded20c2f31f6ba88381a00a2efb966ddb3191eb34836167722
diff --git a/dev-perl/IO-Event/IO-Event-0.813.0-r1.ebuild b/dev-perl/IO-Event/IO-Event-0.813.0-r1.ebuild
new file mode 100644
index 000000000000..2fab52622591
--- /dev/null
+++ b/dev-perl/IO-Event/IO-Event-0.813.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MUIR
+DIST_VERSION=0.813
+DIST_SECTION=modules
+inherit perl-module
+
+DESCRIPTION="Tied Filehandles for Nonblocking IO with Object Callbacks"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-perl/AnyEvent
+	dev-perl/Event
+	dev-perl/List-MoreUtils
+	virtual/perl-Time-HiRes
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-perl/IO-Event/Manifest b/dev-perl/IO-Event/Manifest
index 5e87995dd041..288ee51ad14f 100644
--- a/dev-perl/IO-Event/Manifest
+++ b/dev-perl/IO-Event/Manifest
@@ -1,5 +1,6 @@
 DIST IO-Event-0.813.tar.gz 34477 SHA256 43be65d079156d708bdfb6e0436a20593e6a040125187e577262c85b353f73b7 SHA512 234fe3037e9600b843b7db094b2bb67ff6d573d5a8cf48cec813d5cf6a996ae32bfde0eb35f8593c0cfe4d2d56a56882183e5fa291498df845a3c9fcb0ba7293 WHIRLPOOL 2482c0a2dacaa1598a0c7cb5f39b7dd5375c6bf818cc2c4cf82bf43c4a4eedf27557f53edff07416f9c03f6273fd96569ff83a6e234a999616cc6243231c8906
+EBUILD IO-Event-0.813.0-r1.ebuild 457 SHA256 50e75ec0bbf38922d721c5a4524a8d155b9207cc3823d334128a7bf6309463f6 SHA512 f33cdf6d10e52c808dda324ccf9e4f6da771ee27f35bffa67b76b026be191bef72f60058c1b7ead968c7e7b3b1cd63002bc90abc5ed074b5bf6a291caf83399f WHIRLPOOL 3e0d2b97159cdf369c534ca0e4cbbdc86237e9460897cc5102b15515e171d900c3c940250ddc974c0ee5ef36836d05f8c18708fc41a4c073b840571463cad33f
 EBUILD IO-Event-0.813.0.ebuild 456 SHA256 41780dad09b9b80cda151b8acbb8b8da3415771e2c14c565b4d86e981e1e99bb SHA512 c3f21e7224139fc8fdf7c9bac9e54baf997cf75fac464a20b4bdd6622db2fd1f470d6509ec5ec1d8738de9b628edbca046b2f0e1e54e18e02c17b63fa8dba039 WHIRLPOOL 36f6324161be3010a4a34a0b2fd5e203236da4a723003e106c4b592c6bc74cfe405b7f032530f004b23735ccf7ad73912dc559858e9479f82ad8a59377558222
 MISC ChangeLog 3905 SHA256 9a37396f5e3e16e4c4729a84c872f9e5ba7d9f8453eca6f914f55da0a7bfbad6 SHA512 7476db8efa2ee63817097701f4c80082ad41ed8e65bba869e5b2590fe83985640c15d6ab4cecdb7e693d64c4d100a0552226815cf00d00290cff9f97c4bea576 WHIRLPOOL da949c9205bcd4d6937f1d134f8b8c200c38d28f92cd34940ffe0d5cf62e0cafd32c6ab94db3f63b7f84fee4e5aa7af0257fed5da1106abd84d9bf7c5e8afc0f
 MISC ChangeLog-2015 804 SHA256 839510c80b22fa1832ffbdcc1d3e728cbb47b30f3110799ee2eb4e65707bc34e SHA512 99c69fd3bf6323911cec8801cc456a72260b40d1a2e29e8a4b45d41560b579db4ae9ba9a5268ba813999b8f096fe2fee2b49de4fff17a53cba22b9d6b5a5c48a WHIRLPOOL f9bce7d15f4c6c34959decf91d1bba717d74657a167ba039b81a7c5fcae133717e6e585e0dee440bd47e464edcbcd06deb1909f5f758da60975a2f806bca1017
-MISC metadata.xml 257 SHA256 4d43e70b770d0898a99af64a8454a6116e4a86500c23290655c8371265010427 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e WHIRLPOOL 87039765046556cdc2f7d76ce4192945117bfd5bb684220ea8fb72be310673a5b729ea428666ff1ceb1e6c21fb585a3a7dd72bd94dab89cf076a895e6a7677f0
+MISC metadata.xml 862 SHA256 5994bbb1ede240082d7f9b4ad04753ae2ab0d5c7942e04e37a6a2a2c9e62fc49 SHA512 f3cd5733848d02dfa1eb6b6a9d97947ca2b99b0a4faaf9095fc700d9c9f3bf4cced75123ce2c99728a8ec7f67ed405560b947cc70d3fcc30c5bd5f159b56c191 WHIRLPOOL 2bdfcb0ddd4267b139756389bdaab7785c65c4494eacd5ea09650fada973a6906d7e786b9bb7c2b4d9ae7a1e084f919235ae7deb3c16b893774f3a74a3db824d
diff --git a/dev-perl/IO-Event/metadata.xml b/dev-perl/IO-Event/metadata.xml
index 2b9a936fc0a1..efed7d27116e 100644
--- a/dev-perl/IO-Event/metadata.xml
+++ b/dev-perl/IO-Event/metadata.xml
@@ -5,4 +5,15 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="cpan">IO-Event</remote-id>
+    <remote-id type="cpan-module">IO::Event</remote-id>
+    <remote-id type="cpan-module">IO::Event::AnyEvent</remote-id>
+    <remote-id type="cpan-module">IO::Event::Callback</remote-id>
+    <remote-id type="cpan-module">IO::Event::Emulate</remote-id>
+    <remote-id type="cpan-module">IO::Event::Event</remote-id>
+    <remote-id type="cpan-module">IO::Event::INET::Callback</remote-id>
+    <remote-id type="cpan-module">IO::Event::Socket::UNIX</remote-id>
+    <remote-id type="cpan-module">IO::Event::UNIX::Callback</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/IO-Interactive/IO-Interactive-1.22.0.ebuild b/dev-perl/IO-Interactive/IO-Interactive-1.22.0.ebuild
new file mode 100644
index 000000000000..1e58b67a7442
--- /dev/null
+++ b/dev-perl/IO-Interactive/IO-Interactive-1.22.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=BDFOY
+DIST_VERSION=1.022
+inherit perl-module
+
+DESCRIPTION="Utilities for interactive I/O"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=virtual/perl-version-0.780.0
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.640.0
+	virtual/perl-File-Spec
+	test? ( >=virtual/perl-Test-Simple-0.940.0 )
+"
+src_test() {
+	perl_rm_files "t/pod.t" "t/pod-coverage.t"
+	perl-module_src_test
+}
diff --git a/dev-perl/IO-Interactive/Manifest b/dev-perl/IO-Interactive/Manifest
index ab7f8f7ba80b..de2bd8351bc2 100644
--- a/dev-perl/IO-Interactive/Manifest
+++ b/dev-perl/IO-Interactive/Manifest
@@ -1,4 +1,6 @@
 DIST IO-Interactive-1.021.tar.gz 11751 SHA256 915bd642142649e23f0078341b2c095061c8b6dfa43050ff90f92d3d916234c0 SHA512 16307148e762b6c382dcecef653eab581563fefabd5289d7f3f66a439d17fb496982e24f7e74494f5710749eb11654d366001e016bf50b2e43b1dca7564c24ae WHIRLPOOL d1817af8e69f770cac743eacf7faafc10a94a5b38b687cbb11db0071f305f907a9874230043213259138b79b2cadc1af5545145785c92c7c89fb888d04d1cb08
+DIST IO-Interactive-1.022.tar.gz 11791 SHA256 0ed53b8ae93ae877e98e0d89b7b429e29ccd1ee4c28e952c4ea9aa73d01febdc SHA512 159bd97912a848e20df3ac9f3f7b3063788c7bbe2eafd35c6cc9b798027c6e7c12d2488385936c87669877928707603729bc34b2d7b8c108534fa8fd42082074 WHIRLPOOL 6102c6cadfb027369d80f82ccf0f21a8ced2cbb1857c6113873268a8db8c3da8a201b6ba79da11b980cf30c3a831b155267632a307ad300a161325eb6da86c80
 EBUILD IO-Interactive-1.21.0.ebuild 521 SHA256 7ea94721d868b292f958cfbc1339663e97caa187cd712aeef2eb50d5e0ac4df8 SHA512 09bdf98a5335a4d94e75e0bba695ae2d5d408129a119957b8e16fb0ab4ce7cc55d7e279cfb1aaa1547cfa083f47f93cd8b7e6e2c8ae9b98e8d3411329a9980e1 WHIRLPOOL 891cab208d68bfa50073eb99f6daf925aa4cedd9049bab2f9f420777bf56288b85ad8e2da993eb1026bbd4e55c5cc222ff8e2c5adbbdea4faada36b102bbd517
+EBUILD IO-Interactive-1.22.0.ebuild 523 SHA256 dd05205698929afdf28c5c6dd0acec310629f437e44d39354cd8d67ff075a78f SHA512 cfdb28050dab0e3c82b3e1c9ba5ee53addda4f67c5fcb106f88b9b0aa11b61d9c1ae7713dc31bb27079f63602fc7c54ba9ac80e4bf4571ec902413e6bcaed5bc WHIRLPOOL 6b78bbdf53b2bc2b3c5c7a42810e3fc1cf1555188c984df20e06c8ee8953c229f2d83e0aaba138ce174af17b06409c40c1258961f2af267938a655f960420a6a
 MISC ChangeLog 1132 SHA256 ad9d8d8bb1ed2b4f45e7c971f5a90a8988371fd5248b29e57017362a2e5167d5 SHA512 ead15125276f46dde8188b4272cb27f13b4103d75ae1662df46de6c50fb648c326d55ba32e74de84c9b1584f3080c6bb9725b08a42d1b062960f048d027733af WHIRLPOOL 3ac09b52fe92fd15912d6b308315b24aa8fdde4e5e68959fa9eba08ce947f6e56e6ce1bf3846d4b1d74c9918b38b2e95b3183bc340aa2bf04f11931a4fd72e8c
-MISC metadata.xml 247 SHA256 27f3a316ecc7f285838d28af09f1d1b76398615a5aaee404214aa9b1fb61a7fd SHA512 9bd9ddeb07e0644027c9a1dca33f0704de6062bc6b17333adde82a177991f35265f90e1b623e3a6288fedd729597921f48e4fda17fb8d402b1b2f3fc73c6d693 WHIRLPOOL 9a6451451b71a7b374696d841572b5d2dca769ec6bda12f582659e77274cabb0b9fed82e107a870cb9025e566b4b13cc51049c98068e137ce8c7739dacd649c3
+MISC metadata.xml 388 SHA256 17633e08a2bf84d4f009e10addc55ac5c9bb039a5d5f73b50322cfef189fad45 SHA512 c3bb9b7804e6dd2c6e958f8e0744959a28cdc632068b7e1d9e039602fc0f98a4397457500c3d90abd4522b482b66d758f6e569640d41235a9b16f43fd73c8dfb WHIRLPOOL 2050c9fa5ee8907b89508ba2b81f2fa762e117cf9995ca5a03459933978f075ed9d95f5a61cf2cbfcf38d881b861d30b9f249bfd092fd9402972b9fbce6d79a9
diff --git a/dev-perl/IO-Interactive/metadata.xml b/dev-perl/IO-Interactive/metadata.xml
index 7faa8dfe9af4..da3c8782e717 100644
--- a/dev-perl/IO-Interactive/metadata.xml
+++ b/dev-perl/IO-Interactive/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>perl@gentoo.org</email>
-	<name>Gentoo Perl Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpan">IO-Interactive</remote-id>
+		<remote-id type="cpan-module">IO::Interactive</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/IO-Pager/IO-Pager-0.390.0.ebuild b/dev-perl/IO-Pager/IO-Pager-0.390.0.ebuild
new file mode 100644
index 000000000000..d69218e446f7
--- /dev/null
+++ b/dev-perl/IO-Pager/IO-Pager-0.390.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_A_EXT=tgz
+DIST_AUTHOR=JPIERCE
+DIST_VERSION=0.39
+inherit perl-module
+
+DESCRIPTION="Select a pager, optionally pipe it output if destination is a TTY"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-File-Spec
+	dev-perl/File-Which
+	virtual/perl-IO
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Exporter
+		virtual/perl-Test-Simple
+		virtual/perl-File-Temp
+	)
+"
+PATCHES=( "${FILESDIR}/${P}-no-dot-inc.patch" )
diff --git a/dev-perl/IO-Pager/Manifest b/dev-perl/IO-Pager/Manifest
index 92dd2e3c232c..f205d2dc3f6a 100644
--- a/dev-perl/IO-Pager/Manifest
+++ b/dev-perl/IO-Pager/Manifest
@@ -1,5 +1,8 @@
+AUX IO-Pager-0.390.0-no-dot-inc.patch 687 SHA256 c2d22a9c28d5ab56fa5468ba4826002a33e5e894a5ea448873cb2b73c6cd33a3 SHA512 5e49e0167970af2a19333e723e3b072e61ab156f916a69ba5f923f41195a99330a4811a297dec1c42b9bf8999b0a1c40b2145bf6d5cabb446dec56d0a5b747f4 WHIRLPOOL 84772133c1ba9c9caf9f6d5851185ad68dff0f43b0ac1335f1774bb88ec6e27ca895a4328e445af59aac9a491d7d7ed3672c594a01bb3aa65f70ed721b2bf89a
 DIST IO-Pager-0.35.tgz 17298 SHA256 3aa529089be7a93014cd03ebf469271d6d333eae2d34e3bfd127826a38aa8d45 SHA512 adfb9e7d65941115f3d6376996c3c41682079a02346e1cddda0df2bfa93d46a0deeea42a0109697dd327e19ebf9ed869adc2827f0ea9acf28c69885afa6cd962 WHIRLPOOL 531ee9fc77d95bbe5df7c6ddddd52aed455446cc21ac3fbf419d971d01641bf19859e08560b5e7eb616ef87a528e565fae726d51e750be806900f02704ddbe74
+DIST IO-Pager-0.39.tgz 17552 SHA256 cfd1260e3e6de9aff3a47c51d027296c3d1eaa33d8447066f2ae7908386b544f SHA512 165e6c5e93cdcd463eda0a0f0f713790959a788220e29bc77bb10ff59f8e1083d1dc01fc059f150f8cfb4de1d16eef04813430072ea33d9dc6f4acbd3287ce67 WHIRLPOOL b6e32492c77116609a0c5b586400b499d61bab48062592f5e52b90581385b5b725e5db5edd1849c7c70b780f20911183e619743581ee61d8cf505eb9ee6e02cd
 EBUILD IO-Pager-0.350.0.ebuild 685 SHA256 9390471f8bd4e50794a81c63574a99c89008dfcc299449aeb4a75ca0488badc6 SHA512 aff2f1482ce6e68043276c973e588b92732e0bd0087843c357f082399fe5cb54034fc0d613aea4db2bb552c1cd6c56845e7fe6ba7c3516a6d68a222266901252 WHIRLPOOL 0b4f7e9b281170e0e114c6a82b4f31fd3d37a4c5c3664dc659ae83f0c9f9afd0c99918a36e967c79bbe21344d633e41a626b0db339d8c0c9525f90eb20df5244
+EBUILD IO-Pager-0.390.0.ebuild 653 SHA256 0443efa0c83afa3e1c77af53f22b68ff463ff27dc69ab16907e9c36c609382c8 SHA512 43dbbd2becb9f6046dc08f36337f52076a9d337369818e07447a8d0cf829dce8655623d3e41b90df53cde83231d5f883106aa51c60d743ba90b5e239596303aa WHIRLPOOL 4f0eca814d0f9d87be594fb9ed4d33439ea94c7d3e7a8b2a4988799beb8defde1646b22156255f8ec3b549b989e5373294fe1671d3a5962e23e10475f194bc7f
 MISC ChangeLog 3210 SHA256 3bc4f4b91dddf381d9ae7873a11fc0a0dbff7432c316f74a0da20c31a7f11a33 SHA512 1d6cd13e62f857fec0b4ae46fab9cdcf7f0168e61882a4e270ba23df387e5c504c1aca29f7e7c49b77d623c375b3f66e7d39b7fb6799cc3ff548fd51ad120ae9 WHIRLPOOL 873dc840764daf0ad0c476bdbbd97e1dac3926e8d403e92c07188a32f1495aa331415d6287031128b6ce69843062563e652521487075f9ac53e1318eb36df645
 MISC ChangeLog-2015 4633 SHA256 41722185a442b7a56e288d4f4d3f8570765b52e563786f52be7e254a36fa535c SHA512 485f6a2721e0f2fcdd92572c510ef9909278a1e7cc98ab155eca6cf8dd198872dac30829e950f3af32bc27b2571669ee4ed40f86f030ecf42a270fa01ddb9b3c WHIRLPOOL a634e74281fe4975b250688986e8f268f483785284084a3e9fe1cbbe935428c77050958361fac2908cefc8f456e6d9efeaf6c311a272b500ae14a8e2ff2eda0a
 MISC metadata.xml 584 SHA256 ab97c515111746e611f537da910ea7ab02080cd7dd28f08c4ee4a050d82e160c SHA512 06f4420648c0a977c373dc3a8582185153f6690d946b07acba08de0c159f806ccb9682ff94c7c35c9c52e71fbec7f72048737728d62fc729741de11d7f335358 WHIRLPOOL b299e7d21ceb29beff0905e393b7bad324715e91e309b992724bcbf3c357761adfbca8b8a912bf4b154c8cff8c09e859c8f75565fcea5a61d8b51dfa359ffd0a
diff --git a/dev-perl/IO-Pager/files/IO-Pager-0.390.0-no-dot-inc.patch b/dev-perl/IO-Pager/files/IO-Pager-0.390.0-no-dot-inc.patch
new file mode 100644
index 000000000000..4434d1fef26b
--- /dev/null
+++ b/dev-perl/IO-Pager/files/IO-Pager-0.390.0-no-dot-inc.patch
@@ -0,0 +1,27 @@
+From a8628cb9690900f6bbf44b8cd509ab53d1c16c15 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Thu, 26 Oct 2017 11:27:10 +1300
+Subject: Fix tests failing without '.' in @INC
+
+Bug: https://rt.cpan.org/Ticket/Display.html?id=121450
+Bug: https://bugs.gentoo.org/616994
+---
+ t/11-redirect-oo.pl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/t/11-redirect-oo.pl b/t/11-redirect-oo.pl
+index 385d6d4..9203500 100644
+--- a/t/11-redirect-oo.pl
++++ b/t/11-redirect-oo.pl
+@@ -1,7 +1,7 @@
+ use blib;
+ use IO::Pager;
+ 
+-our $txt; require 't/08-redirect.pl';
++our $txt; require './t/08-redirect.pl';
+ 
+ my $FH = new IO::Pager;
+ $FH->print($txt);
+-- 
+2.14.3
+
diff --git a/dev-perl/IO-Pipely/IO-Pipely-0.5.0-r1.ebuild b/dev-perl/IO-Pipely/IO-Pipely-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..61dc14484531
--- /dev/null
+++ b/dev-perl/IO-Pipely/IO-Pipely-0.5.0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=RCAPUTO
+DIST_VERSION=0.005
+inherit perl-module
+
+DESCRIPTION="Portably create pipe() or pipe-like handles, one way or another"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
diff --git a/dev-perl/IO-Pipely/Manifest b/dev-perl/IO-Pipely/Manifest
index c99c52bfb7b8..89373068f399 100644
--- a/dev-perl/IO-Pipely/Manifest
+++ b/dev-perl/IO-Pipely/Manifest
@@ -1,5 +1,6 @@
 DIST IO-Pipely-0.005.tar.gz 23928 SHA256 e33b6cf5cb2b46ee308513f51e623987a50a89901e81bf19701dce35179f2e74 SHA512 0a49ad646978506c6c8ab305cad7e295f68a8c9ddc95b7ee39bc381598cad054ef0ea790904e3bcc96a38fc87c9c91a865209d94f6332106c71c55c5bc98477e WHIRLPOOL d2abb0fa224d6c90fd4093fe04c09caa1565185602025e2e0b387cd679f91f4c3c351ab7fa7bee5287142781b22b4dfb0acc9a5b9f56b141999c142a8aa1e76e
 EBUILD IO-Pipely-0.005.0.ebuild 301 SHA256 28b5da70c15886bcdf393eda09bb7664ae7c0b12cc39b5645ae105e48efba2b3 SHA512 435bc6b462d5e19494eb7cc026ccd89233f0368efc95122921e564be27c34146dac95610d6931c65802446676a8d10b22a3d809b163dc55ab264887e8d56e804 WHIRLPOOL 6b41c2047102833f51105b544cdeb4d2837a9cfaaaa37ed2fbea817b10a836de767715e72ac1df2392dc50418c310fefe53d8d279458604600173f5f449a34e0
+EBUILD IO-Pipely-0.5.0-r1.ebuild 300 SHA256 4cf3cf0a9f526e983437d3d0cb5e3fbd2213f557093f79008271f051e5a2f486 SHA512 8c4115e147bedf6e8c9def1885b7045bdf7661878fee38cf4f98d66c4576c6e59b5f8b758f714d456ffa60e505645be8cd3fa99ff35c03b2a756ad4142f72873 WHIRLPOOL aa5ed814bfeaf4b484c8a8ba1fe5e4195ea769aba9bdccb9c7d58a0ce7ce90c62cac0cd88c2a400710959e7f63591dd972d7a932c52cc8111099a24dcf307401
 MISC ChangeLog 2437 SHA256 f466cfc4a5b6376d55034530f28403b177cdec2736b7303cd4b979b252130e6a SHA512 84ef1502300e77ca787db5f546640da990a9d0aadd787ae60f34fb0683e26dd341769af9b618d447400757d41334e31ebc3f3e58c3c34e55c705dcb147adef5c WHIRLPOOL 29ac531d45f289ac77cca5a583dc84bafd36413f4cdf1071a0e93956f53e53e274aba9439cd4d3718ebed6c1bed66532f31790f018bab69f802a8038378184b5
 MISC ChangeLog-2015 702 SHA256 f770392f19ad6efd01110ebf4cc22b917defc888799bd9f3914547a7b3843370 SHA512 d7b71438202b11fe326c5334cb2bfcbf6f1506df45d739ed8505d11abf4e3d4892eb1dedb392511d7b5aacd5396d64cec3485c8a694f854ea4ba8ce823646702 WHIRLPOOL 10e200dd3f9dab48239cb1ba8c5288e325883ce0f2b3d5de0b6676da6a33ceeecc9dfc6953c57f2505022e79c76300e7eb8d74632f13c2a3d6cbf3ca4ceaa634
-MISC metadata.xml 333 SHA256 93b2c58798b833afadc2bc9c487cc449a199712adee98ea7befe455ce37adb3a SHA512 b5ee25e5ec1473d7841344fa5a92e9d33f8e4823a807f35418fa83aaaa516610271ee06910f515a6c952d94d0568e721087a7f240e03a2b7b8fd7ee78b281ccb WHIRLPOOL f0411f753a5a4bdbd95dea17da76b0f4afc4d05410c032e953a2e4f603547090c8b80c38cab3a7c6fb55695755b09a6a47b2be9f417166e07f4a6ce3b6b3ca1e
+MISC metadata.xml 390 SHA256 35c047bd7671d14238f112959d155bf7ff8adf0f8048e8d1b62abbbc26e60c7c SHA512 971fa38118ed37e7e6aa7ba6f6bbf593f2518703f0b1ba1116289cef1c6f821bc96035a7db996c5303b9090d7dad62a8e0bed6ad79a82f394768a759c360cee9 WHIRLPOOL 15ae90cdedffb07a8c09f5f45504a6e2eed2194ddbb46c1c5c34c0bb2e37cc3dddf5ac33653c7508a94b2bf29f5dee07b5da519b7ddbbd98256148717a23f1f5
diff --git a/dev-perl/IO-Pipely/metadata.xml b/dev-perl/IO-Pipely/metadata.xml
index bc2ebf900e8e..9aabf353ee8a 100644
--- a/dev-perl/IO-Pipely/metadata.xml
+++ b/dev-perl/IO-Pipely/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">IO-Pipely</remote-id>
+    <remote-id type="cpan-module">IO::Pipely</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/IO-Prompt/Manifest b/dev-perl/IO-Prompt/Manifest
index ac87536aa987..0e9a36ff8f85 100644
--- a/dev-perl/IO-Prompt/Manifest
+++ b/dev-perl/IO-Prompt/Manifest
@@ -1,4 +1,4 @@
 DIST IO-Prompt-0.997004.tar.gz 15297 SHA256 f17bb305ee6ac8b5b203e6d826eb940c4f3f6d6f4bfe719c3b3a225f46f58615 SHA512 a3624ae807b88493231e3de5ad2bff78927924fa72db68828cdbe69fd54c9a38f6fd7e39d9cddf1e82e60614ddaacbcdef1ba08e4af6713d899077b141d8b2e6 WHIRLPOOL 6203f1142148ed6867123160c32f2880b358479c0318de6cc085a022152c5b980e8c051c40ed4e552f7bc2a2620fbc396c7b4ee545bef502badf43aa35028ac7
 EBUILD IO-Prompt-0.997.4.ebuild 532 SHA256 e666389ec0221134dc911f7d6f3deddc24b6f4e0d375b32f709cbfc3bd180593 SHA512 d9e63ef400a0df70134dced8628e67a10b4d43637af4cdab87514a3bec3defbc6c35c012bc6e1285bb55a6a10269bf50dce14ce8e02f4bb4c54118a251f711aa WHIRLPOOL bce5b35255a59089749ea3ee233b8e6c38d646ae9af0d6de9bda7c0dac2b70d6b9180547e758ef8a19452864afbcc495d1fe22763e0942158453d9372c3b99db
 MISC ChangeLog 1165 SHA256 380b03d3fecfadb4db52bd21b3c615e2c2ed8716307a7598fc3dbbdf9b6d27cd SHA512 77cca915f2761d12f1e04e288b488560c39a6538750b3a5008bcb90ce6ea11cbf46dc35dffa03cbe0ecb6477358f4daab612772f232def739e4167d22ef13a29 WHIRLPOOL 632a63fe0de0dd54c4cd97852a659c1e27dc37f2144b9862e910658cb202c8cb882aa90d60847dca29d59a87c2bfab0078fb60d0f8177a5629dd6c08a1967fa1
-MISC metadata.xml 257 SHA256 4d43e70b770d0898a99af64a8454a6116e4a86500c23290655c8371265010427 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e WHIRLPOOL 87039765046556cdc2f7d76ce4192945117bfd5bb684220ea8fb72be310673a5b729ea428666ff1ceb1e6c21fb585a3a7dd72bd94dab89cf076a895e6a7677f0
+MISC metadata.xml 458 SHA256 f62248cf303d749172f38ab04386f6694bc785d72b186fbc4be79a572f3a9745 SHA512 ec291786e5f84628c31f0db426676cb05367f631ef8375d8d151b333adc14f3e14a98f72522f6d38145175bb450c1e08aabb084e52327f807445e0870ffc446d WHIRLPOOL 62cc765c44d8499d463193d601191e2647947a96c37d6235fea0dd4e9253e0b11ef1400b2c16e7ba951bb62605b599fdb436b4b55e73325c952ccbadbd031b52
diff --git a/dev-perl/IO-Prompt/metadata.xml b/dev-perl/IO-Prompt/metadata.xml
index 2b9a936fc0a1..31fec48fc326 100644
--- a/dev-perl/IO-Prompt/metadata.xml
+++ b/dev-perl/IO-Prompt/metadata.xml
@@ -5,4 +5,9 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="cpan">IO-Prompt</remote-id>
+    <remote-id type="cpan-module">IO::Prompt</remote-id>
+    <remote-id type="cpan-module">IO::Prompt::ReturnVal</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/IO-SessionData/IO-SessionData-1.30.0-r1.ebuild b/dev-perl/IO-SessionData/IO-SessionData-1.30.0-r1.ebuild
new file mode 100644
index 000000000000..180ef9c860d7
--- /dev/null
+++ b/dev-perl/IO-SessionData/IO-SessionData-1.30.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=PHRED
+DIST_VERSION=1.03
+inherit perl-module
+
+DESCRIPTION="Session data support module for SOAP::Lite"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/IO-SessionData/Manifest b/dev-perl/IO-SessionData/Manifest
index 1ed12fe325a9..21263a47a43f 100644
--- a/dev-perl/IO-SessionData/Manifest
+++ b/dev-perl/IO-SessionData/Manifest
@@ -1,5 +1,6 @@
 DIST IO-SessionData-1.03.tar.gz 5377 SHA256 64a4712a3edbb3fd10230db296c29c8c66f066adfbc0c3df6a48258fef392ddd SHA512 3fe6c9c275c64e4250933f6bc377172ed09d123b5aab3ac981b12b42c571be5638728bdd0d16438f973606da5b6a583aeaf6213008f249ccee7e275383eebd6e WHIRLPOOL 462aded0821b27b64e66e96a16e82103229e2f137825e8415f40ebb7f32e6b5a0ad279ff29cf8ed1ce2a3f529e0c7a2b55553dc819d8178742936560212c354c
+EBUILD IO-SessionData-1.30.0-r1.ebuild 373 SHA256 0b89ca6e0dde329d8fad49fb837038ed4cb703759460c62f651717fde8eaefa8 SHA512 1b9f94defe48b1bb3bd6e04f1a06e0d52cbef76c7864c73e11e629365de0559e55018f5a6cb9dc45b36ee51fb4f353c3617033622266d2b373f6a3967a698e47 WHIRLPOOL eb9056aef6e7eb3e0de8c8fb5ff5bba9a0f37364388967b437e028b942f8fed7a33b4ac8fb09de38e14feec43f50c8fa2aabd8cb0bbe15819c2ba39c4e8ab660
 EBUILD IO-SessionData-1.30.0.ebuild 386 SHA256 417002c592f427598d329ce01c44d46e7d1eaf237a6be607aee6b26439af83c8 SHA512 4e4bb9c730e216a7fc245805bcf9d0f3a3e0713aa8fef10e357196e5e78e992195e18837f2c4ef00d529e019900095eba351126cab9b73256fde56ea6805648c WHIRLPOOL 7a24e8de13a93b4dc2290ab69589e08ac45c71f0e2c75548e31588323ed10e0b553be77b95ca4b8780c56299be5ed3fc37b4a02b5084c3185ad3ed8ed6ca844c
 MISC ChangeLog 2562 SHA256 98da4383a433e21c6cd4afb59d3c8e294fa3bb0a48e9cc459f93485a93fdc6e2 SHA512 14171bb5f47b43380965adf197ac44b01d3e3b944b5e69d0bda9720675405345e5ed126c1924fea2947216ec94cca0c6df181cacfcb9807575ee213dcd6e0c96 WHIRLPOOL c5959fd7bca81e1dbf8d33c4148ce4408bd0e625bc227457a5b94a6c9723155a9e0451a87badd2a3d861724ef71462eb798dbc69e2e617a4513d507266412abc
 MISC ChangeLog-2015 427 SHA256 391a75a7ffd50272f980bf44297262be4d5a952819509677fcc936fce0724c18 SHA512 ceaaa6a8b37928a39dc45f1873966af6960188d45d317748cfd13032000c2b9471694766c53c7dfcf31da676a60a8b141bdbb9a7d2d73a1fb4610736205f6cf6 WHIRLPOOL 771fdd9bbd625721ca93cec022108597ad431fe6d2256cd805a6b9cda7637195560dc6f92cf47d2fa34178fe591fbf26bbffb8ea1842219d875b8aec4c3c3817
-MISC metadata.xml 251 SHA256 38969a343659e88a894d06828458ee55b28e9acd7aca5a59ed98621146aab844 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695 WHIRLPOOL f05271953c2c5c80651322f48dbe5824812a413518fbf78b44ecf77c3e57d53507b42cb3d0b0a9c0ba77c31cb6278bd3af3bae204f86dc428ef1125fc155b30c
+MISC metadata.xml 447 SHA256 0ff70beccce7c6deb45adcfe7a8f36af29e10e461c1a5be50baa6da9fe062062 SHA512 d27e71d4ad5e1d61afd764feb4f4c9e6cc77d71f11a8707036ae1d981d9af19c50c4e536b148f3f7a552c45b228812109b4013da7a649c7f64f6ad4779a4a1fb WHIRLPOOL bbcff72bd49cbd1abd2cf96738ddbf6caf56d2774116364ab763ba9b9a6c0cf13c7a979b7da201a5086ace1bd7d2b1e864eb3e361c95d52fe2a39717926b82e2
diff --git a/dev-perl/IO-SessionData/metadata.xml b/dev-perl/IO-SessionData/metadata.xml
index 51930499ab60..586f568e36de 100644
--- a/dev-perl/IO-SessionData/metadata.xml
+++ b/dev-perl/IO-SessionData/metadata.xml
@@ -5,4 +5,9 @@
 		<email>perl@gentoo.org</email>
 		<name>Gentoo Perl Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpan">IO-SessionData</remote-id>
+		<remote-id type="cpan-module">IO::SessionData</remote-id>
+		<remote-id type="cpan-module">IO::SessionSet</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.720.0-r1.ebuild b/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.720.0-r1.ebuild
new file mode 100644
index 000000000000..3f3607ad9cfb
--- /dev/null
+++ b/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.720.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=SHLOMIF
+DIST_VERSION=2.72
+inherit perl-module
+
+DESCRIPTION="Work with IO sockets in ipv6"
+
+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 ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND="dev-perl/Socket6"
+DEPEND="${RDEPEND}
+	dev-perl/Module-Build"
+
+src_test() {
+	local BADTESTS=(
+		t/pod-coverage.t
+		t/pod.t
+		t/style-trailing-space.t
+	)
+	perl_rm_files "${BADTESTS[@]}"
+	perl-module_src_test
+}
diff --git a/dev-perl/IO-Socket-INET6/Manifest b/dev-perl/IO-Socket-INET6/Manifest
index 803e7ce98340..7c09f97f30a4 100644
--- a/dev-perl/IO-Socket-INET6/Manifest
+++ b/dev-perl/IO-Socket-INET6/Manifest
@@ -1,4 +1,5 @@
 DIST IO-Socket-INET6-2.72.tar.gz 27615 SHA256 85e020fa179284125fc1d08e60a9022af3ec1271077fe14b133c1785cdbf1ebb SHA512 c6dc0bbcc81682d317597de26d5023de84781e4bd2af224145cc4980db7fcbc93295a7d0a80c1eaa649c6aebf4057d0b0159f47e6a6379d4b545b49305f28a37 WHIRLPOOL 5f09c8390c29235bfd12983b404155a142d4069a013b1384c28b702f197e60f52d001d94d27b83b271cbf669f622078954befd96534a84c509298532281c7baf
+EBUILD IO-Socket-INET6-2.720.0-r1.ebuild 630 SHA256 7653716f8968765e12b10e122a9eae996e3d712b092876149d8d81e64fa4b578 SHA512 b2d6c1e19ad2b8052f667277403a83a5b18ca96440fa2e9acd6e18d5137413097606e09cd9880c97de2cbf8e0a90c1ecc8e35ab3141cbaff1d1d84785da2427d WHIRLPOOL 373871db73998118cde1aec0724393301f69183fa3000d818cc382ce1a7a36d6e042d317c4b7c7c99c09b4bdeb4a9b9e6b48c35a920e8200b7b66085839a2f1d
 EBUILD IO-Socket-INET6-2.720.0.ebuild 583 SHA256 849af7d874dd02b4154cd5a7157e2247104ed5ee79e35a6b942bb6396ab7af8d SHA512 cc7ca06dc17e32e3c002c51b94de82e20accf07b501ae255a0465197a89a2adf094b15fea61e955db4601eb485a14358a8863def2e3d048d6be91b9bf3d15d8a WHIRLPOOL 283b9f3f3f159d07f3f95666b841197d40501c170e53da19a6ff349d9d4ef4a8edd64f5240eb961cf7a3bae616b918ab8c83fce0a3f1648a8d026fb8bd1fbdab
 MISC ChangeLog 2679 SHA256 d9bad2e81c92c86ea0c14ce322ea996ca7effb5a4605272d82020ba33dec9dc0 SHA512 9253d33e3c752d5ec1f461c9688f233c030db21690eedad5255b8354b021b13be2ae42d7df304cf45fe999ce92068172c510655b24ceb971dfe7258ed2d082a2 WHIRLPOOL caa1b50c095046a14c783278a18ede4cb8e2c4b9818dfb01f8c78c2ceaa568076dfac38b2dffd2a3bc70a000f24af7a603bacd4731f63d68bb6fdbdc33e30b23
 MISC ChangeLog-2015 8171 SHA256 c6535b385efbbb4ccd91bf57700881081dc79ac0ad0f8238442be94a209a9527 SHA512 0c42259a3339036166c0034adf382d18db1490e0cb25139f583cb2951898c33fdd1203973c01614c5302493751d4177d6b58e3d103d6d7036ad9f7885057dfcc WHIRLPOOL 68138ef1cedf0895c190360ebda770727099970e522b8b6bd8eb489cc6a657a93b820553b9437aac3de8c3e3ff092691bc9716284c5c0817c07f51fb2e7506a8
diff --git a/dev-perl/IO-Socket-Multicast/Manifest b/dev-perl/IO-Socket-Multicast/Manifest
index 93fd9f5ee318..ba40faa3d845 100644
--- a/dev-perl/IO-Socket-Multicast/Manifest
+++ b/dev-perl/IO-Socket-Multicast/Manifest
@@ -1,4 +1,4 @@
 DIST IO-Socket-Multicast-1.12.tar.gz 11685 SHA256 70e8af4aa21d19bab5edd9f43a6b3d6277748a65145d46ff0ea2ae4c59495c72 SHA512 7512a48b56aa12c04ba082ed7ab44f573d3cd2ab2b3b377a5faeb93499220c65d8ed7d99612bd0c6f3b15e574438907389bd1406f55fe3bbff878cccb03848a3 WHIRLPOOL 741853035f02c7bb73fa7d277d78dda3e13d75a8019ecdba3c6ac97c9330ccad47b54fe51816e925b21cebd44d61a1ad57dbd0b59a67862bd92bf77e46581590
 EBUILD IO-Socket-Multicast-1.120.0.ebuild 363 SHA256 2aac9f20a8af36380db52ac95d739ee94cea2522fa765be0a371e50d5417a99e SHA512 8ed85f4f49c3f0d7513d9129baf78183e72b69a1ab3c2b3e1ce2710b5f423c6f553b9b4679d2ece6aa49f8b3584bf71b683a7c063c51f86c9fdeb56e2bd58aa4 WHIRLPOOL 514e7347f13483b495552473d2c837b1bf74c71c48c95e861b5200cbff701d0960c3a518e688bc25a92057315b440ee28f367d94c047ff02f7e3b079e501fd8b
 MISC ChangeLog 384 SHA256 6233c9f8c8315f6d23e399283e7a1d0c21780e5e1526ec4c62906c6027a4e663 SHA512 61a90b822c1451c35015d2018af9bbf42be4667df51e38b112873cb5c6a566e3598d8c080bed98e2136abeee3753e25ac96def4b2a145eae95a0b9e4d36cb7d7 WHIRLPOOL 15b12b71e00921cd796e3162cc19f153680f77360ba20cd7343dc1a2cb6ac80ad83af5cc36e1cd9c0f35475fa55951fabfd0a71d3c32fa3ff03359a8efe2968a
-MISC metadata.xml 257 SHA256 4d43e70b770d0898a99af64a8454a6116e4a86500c23290655c8371265010427 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e WHIRLPOOL 87039765046556cdc2f7d76ce4192945117bfd5bb684220ea8fb72be310673a5b729ea428666ff1ceb1e6c21fb585a3a7dd72bd94dab89cf076a895e6a7677f0
+MISC metadata.xml 411 SHA256 ecf708bc0d34f919736814e65ad9fd088fed0827974ae40a176cf44b57a0be1a SHA512 61ba41fe9c319b840c7bbcab5a5149139a966c0deccb90f22735142bc1311246f916a5d7a0bfcd7aee917dbecd4d059ce6939d78230a9bcf6c0500a90fbf4c11 WHIRLPOOL b878ff9df85cf0579f0f22840bd86b3318d8025cab6ac07257ac7f7e9b077a5789dc4f8d9bd0c5894e47daa24311e0448061562c2e6624d386496f7a60b4311f
diff --git a/dev-perl/IO-Socket-Multicast/metadata.xml b/dev-perl/IO-Socket-Multicast/metadata.xml
index 2b9a936fc0a1..ae909e31ed4a 100644
--- a/dev-perl/IO-Socket-Multicast/metadata.xml
+++ b/dev-perl/IO-Socket-Multicast/metadata.xml
@@ -5,4 +5,8 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="cpan">IO-Socket-Multicast</remote-id>
+    <remote-id type="cpan-module">IO::Socket::Multicast</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.48.0.ebuild b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.48.0.ebuild
index f3881ea2cc7d..25753ee5e7a0 100644
--- a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.48.0.ebuild
+++ b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.48.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Nearly transparent SSL encapsulation for IO::Socket::INET"
 
 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 ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="idn"
 
 RDEPEND="
diff --git a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.52.0.ebuild b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.52.0.ebuild
new file mode 100644
index 000000000000..da3175fcd3a8
--- /dev/null
+++ b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.52.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=SULLR
+DIST_VERSION=2.052
+DIST_EXAMPLES=("example/*")
+inherit perl-module
+
+DESCRIPTION="Nearly transparent SSL encapsulation for IO::Socket::INET"
+
+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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="idn"
+
+RDEPEND="
+	>=dev-perl/Net-SSLeay-1.460.0
+	virtual/perl-Scalar-List-Utils
+	idn? (
+		|| (
+			>=dev-perl/URI-1.50
+			dev-perl/Net-LibIDN
+			dev-perl/Net-IDN-Encode
+		)
+	)"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+mydoc=("docs/debugging.txt")
diff --git a/dev-perl/IO-Socket-SSL/Manifest b/dev-perl/IO-Socket-SSL/Manifest
index 6e2ebb4e8c41..b02c94050453 100644
--- a/dev-perl/IO-Socket-SSL/Manifest
+++ b/dev-perl/IO-Socket-SSL/Manifest
@@ -5,13 +5,15 @@ DIST IO-Socket-SSL-2.043.tar.gz 214312 SHA256 cc08b1e40a336902a544825520e76a9c4c
 DIST IO-Socket-SSL-2.045.tar.gz 214926 SHA256 ed3877815961e30f57be9975067e2bb67bfd61a11ed9add790f26d908d81ec11 SHA512 fa2d1c9ad690965069a2f05a0bcecfd6c03fe3c2d38e50195933a9301c5c2374871eed3da637eaf3556df0c8e60ef8be26491d2d3ca453062079d69d2ce0ffa0 WHIRLPOOL 0452996fde809ed2787cf5c1b1a66d126da25fd22a38d87adbc11d30537023d11ce0c8437332feb51caada639b06f62e416ed7bf9910ac0f400f5e3da45b07dc
 DIST IO-Socket-SSL-2.047.tar.gz 215199 SHA256 c5ad8e14174863194ad43c23a38c77e0b202a989cac9d3e13fb30efcf1d41158 SHA512 402d08d0c3fc9fb34ca83f371c1368cced68636198b0cb807562d480335784183850d1f1f9deb82b2ede312e86116624ed09439915c81cbbed3412e8e5697a72 WHIRLPOOL ec6ecaf01fa795c13d5341591451a21c91dbade95a02e6ad149e22954113e4c358547239b32528f209462104783f7015dfaa08555232408c09ade23ce6ddbf99
 DIST IO-Socket-SSL-2.048.tar.gz 214926 SHA256 b0f2199adf0f688a11357151fb47cd91b417a73d910539d4d48b5ac7e267ee07 SHA512 649aa7f4ed8c7c1f4725bd48e28c40d3929f0c7c7fc40093f6e4d373ea8e306451c2fc3f645a23a33d99cd3a5a378997f7affb2b165d883648c33fc801cfce67 WHIRLPOOL bee6702285d7ccabbf34c1923b63802360fbff397ad96c6614d1dac3f985e84342da56470747787866ec0059e40813c2bb6484874ca8a0bd11bc2d114cc2971f
+DIST IO-Socket-SSL-2.052.tar.gz 221703 SHA256 e4897a9b17cb18a3c44aa683980d52cef534cdfcb8063d6877c879bfa2f26673 SHA512 44a2ba94d1e9f911d6815a784263e2cddac0cea90e79cf8e267f73d8b2a3726ca9933d621bac8849a52db50bff0bd7a0d2cfd546a550f2963ea44346d3f8b600 WHIRLPOOL cef09d4ff2c9eee61ad4252d7cc7ed65d62315f5205d474e9c302a06649f5fad114225b544bec8250f033984c4852a70b57a908dc9bd52781cf7d255fd21ec96
 EBUILD IO-Socket-SSL-2.24.0.ebuild 736 SHA256 3a769e99efb168e397ca1d87cc839732406717e7370b75c3cc0eb8f2b4ab8362 SHA512 6732c7f7389da8ecdd9c65cc68295f9a06214f0146720ae660a594edd367d168ca69618e2ff981ef19448d80efa165d68429d9509dd30062ca208a29216a0d30 WHIRLPOOL f71eaadac42559b47712d84af1f885955980e2e17002161d2476702c2ea9e4490c7ade17cfa73cfec0bdb9d6cd04ab4a66322a3caf0331f3bbbc92a3d48610bb
 EBUILD IO-Socket-SSL-2.39.0.ebuild 784 SHA256 0503f80e7211634e8669f489e9f1fc75695b8fce8d3e6d0470404ea794812d03 SHA512 97fbd86947301e838e3fc949a1f126ae5212c0530ec7ecab9187b0c3580f19424c3f9745f8c3b5eaeae65d650cc16e370feaf15949f6409a2a20bac9f371297a WHIRLPOOL 7a2c0fc955ac1c47f4ba1f8fce50ad9bb40a751f2b3d94da64e83b8605205debf8d468fdc68ad16c5cfc11c09f62880dfae3ed8dde6cc714295c722911bacf73
 EBUILD IO-Socket-SSL-2.40.0.ebuild 784 SHA256 6082ff4240e05f7da24cf124a24ba2de7c29e6fde7437024516e0f73ea4cf477 SHA512 1a213c58058b5a011308edc43e215bc320bd511649c2ee0b4f990cfaf29d97c93c2cbbd320381005b9ce1f0851e2f05456999715c9f759be63b713063173204a WHIRLPOOL 43352fbb05986f84648e03e8c8cb255615b7c60c50672c4d1574e4751526406ca1140526bf8427138718d3793384afac1d15a86045d88bcc1e7799e727a4ed63
 EBUILD IO-Socket-SSL-2.43.0.ebuild 811 SHA256 d24b591bf9ea41c95ed591075b85f920cfcb12f742d90f4206f9f8304954e307 SHA512 f0abd4936622a1e4f9cf40e603075ca14d7179364c33d97d21698d2b0aba67fa70db2b9733133bd48955a1329d9c35a4fef759c080178803571732374b052d43 WHIRLPOOL 185bd308338c07a2b11c126e58081c084e60dbf4fa2412041d4529c90e26fbb1844bf1df15886dec030c7639cd351e50b565759c45b5bc1eb2d97b2c5585b4bd
 EBUILD IO-Socket-SSL-2.45.0.ebuild 823 SHA256 22065e0b45945ca30d1ab06db1226809f7de3ad75745271cd783e67e5bc9b451 SHA512 0a827787fd6777d8f2138ff0ef94ddfcd0129e36e7a73e64494891d94a35bdcbd20c85fec8ae7cc5445e4916362b908fa0435f68244b3aa5efb1b7460f6870bb WHIRLPOOL 1c1b46a6851e4f0f9afa44e7458df709c2d55973538770a6fe6b1eaaed455f7110464bf01a843debbfc009eb885e4cdc2d2d83ad1092ba46abd968124274bc87
 EBUILD IO-Socket-SSL-2.47.0.ebuild 823 SHA256 88887c17d9162d2315d4a14c52f1948650863f9b3bc34214e60465d2ba2ab633 SHA512 9986f4d5105dcafeae461aa43b9169719d0d1bfd7315c800f17de85f445c5b2d68244933b59f78d046713d0186e1017ab138e8976f8f6cd7fdcc0fbe3ec07407 WHIRLPOOL a2180e499eeb6f8b74fb0a5b65070a93fe64729c4f2b015c3b7270da597bd7181881baa883ef6f869c29871fb20d701963c5a3be4c8d1f1dc57951436fdc98e5
-EBUILD IO-Socket-SSL-2.48.0.ebuild 823 SHA256 358a6002a76fda91ce28eeb26349e1fdc7b0c6a49749813eeaa1e91d1e6d5e01 SHA512 8a34ddde7ad5abf4fd737aee7fbe1454dc1b1d586170036c76a4b0921e0b04c9ad48b70c65587bc24330c70a3e7c59285691d684f8907237d6e469e644f7c7ba WHIRLPOOL 2580922ac4320ab4d443075b1cca40ed5e1eca3853156e251c6c42daf00021cdfb3391e642f58694a8d9cb2f0efa718cd460e29f52d97ad6e074789e770498ec
+EBUILD IO-Socket-SSL-2.48.0.ebuild 817 SHA256 470f374ec2ab1fb43663878e0fb66eb4eca66069feabc7356ca16ae47e059d13 SHA512 b68eecfea76cf8c56153ee8348a7657369b94cece32a20a9cafb220982a4511da9f4dd6f35a288ee56a108bf939f31018de2edd332e1832ee6dd7d00f900352c WHIRLPOOL 7fbaba6e0dfa6eb2805e548a99e64f588c8750b01ec3237ae0ca66c4d0fa865cd17218229a9251425cb01022ef1c53523607a80671ee99a81b5315ac426aee28
+EBUILD IO-Socket-SSL-2.52.0.ebuild 823 SHA256 ac9ff6e21ded2f00da6d5558faae08ed7afb9a1dae29b44d5e38b1984cf745ef SHA512 44a50024c65df09df98eee89a961e26bf7f908dcefc8988aa6d0d61b84d19da368c87a4b683b3dd70ce29c3addae45b92df92bc76ba620ee9c4c298ee20a2555 WHIRLPOOL ac05d55f2f52a56fc39a07e4cd6f04924eea07d9b098f3d4112b5988a0c4464e0c83c9f339aa94bcbd5bd3f44a12715e28974ead31184bc477abaac67c542a28
 MISC ChangeLog 6417 SHA256 a5ee8e9b3cffa144b4ffc48eab6cae3668203b4766a253a54c835470040dffa6 SHA512 11ac4dc1455f53318135588b279b3bc21829581c5ef96b4a0dda3564517227c22870fe8e3c24a3f6e7454344fb99740df86f6821c6bfb4eb7d830b749c49ef7d WHIRLPOOL 19011c724fb2e1e9124a9a494cfb3b1a0fc8937515248d4e0ab318e206de8740ae58cb715417a2a7ffc1254ada0596555a7c85044b5ce3f4bc7c3e49a7fb0322
 MISC ChangeLog-2015 27261 SHA256 bcc15b222bfc9ada625d7378c3452ef42586bf5b1680999b52fcbdbd11f46f70 SHA512 f8a22b865cc9d770eddb761d90ef79ef097a2b1835b69a783ac217e244b0551fa587732fd14d2072d0ba58cea019f17545abda2d89f629b55882bdb8b9d12aeb WHIRLPOOL 95403116e07310f56289bbb7ce32dc8b9f2c7471bc264c6f400ebc5d33c216d339960499607260494bb6ef64b3b5625030a5233dd4a74436f680b148353d0d6f
 MISC metadata.xml 994 SHA256 c2ea7b98c1df3dba87a0513b9f58d58b4e174bbbbd760aa4409b3357e98a378d SHA512 c861d564131ef33b1949718f73b16df3b14a801465f544e831b969b52d5c03bd0b4906416e99a92331ef08641d283099d1ab0352c29f90b4b835d46819c20c26 WHIRLPOOL a351068802d84adc5b11f16d80a14076aefbe3f59c05af0864c062372db9f057b8bd0c449bcc73cb2ef969968353d715c6b9ff87e16fc3229d081a1ed91fbf59
diff --git a/dev-perl/IO-Socket-Timeout/Manifest b/dev-perl/IO-Socket-Timeout/Manifest
index 0ee156f1bba4..285ae9cdedd1 100644
--- a/dev-perl/IO-Socket-Timeout/Manifest
+++ b/dev-perl/IO-Socket-Timeout/Manifest
@@ -2,4 +2,4 @@ DIST IO-Socket-Timeout-0.32.tar.gz 16294 SHA256 edf915d6cc66bee43503aa6dc2b37336
 EBUILD IO-Socket-Timeout-0.320.0.ebuild 521 SHA256 774178ff05e0a0522ffc25cda795434f5eae530a88a60a82226b95fd3e9e0ed0 SHA512 19aa34b5c447817f8d37b165ae12b0d8918c151d86116f7f6a24a72abdbb48bfb60e64488daba9461eeca2e3c90e704c6ac898ec0cb0fd3186c8acba124a6227 WHIRLPOOL a745bc398a0c19aaaae715dfcda4e151ead6db88e2666a629723aa6b159a07110b916f56ddc4d20d6e5e11d3b07a02a496640e9719ab68a39edf228551f74d76
 MISC ChangeLog 2827 SHA256 b9b984984baf815a9988f90e2967c084b8d0e43fbda2ce92e6d087b58b29d134 SHA512 e6b1b95f62affd4916299fcdfbe4430f4bb4610ec94fb7d402e9004f8fa5784f2203ca3c759c922192973b38cf9a652fe74b006c6481dcd0e78751ac33c3625a WHIRLPOOL f80a57a88c1ec96c579ceb9093dea473ca1971f0cccb6e0de56aa89cc26a481baa063eb42b35f7cfcfdfb946b25bc589972c8eb9fbbe7c3b716e66d7ed6d59ee
 MISC ChangeLog-2015 567 SHA256 82cadde09302facc8d7b3ecede23778a1b88a532230ab98e1285608236e7ad5f SHA512 eb344810b1e7ce0304356c5d75d9ba8dcf3722a7291db39558d0740078c19abc751b5bde3f9137943f5ce84ba3a2ddc8850cc6d8a813776afb09c0ac11e9c946 WHIRLPOOL 610666d6aa64bc3a5887a08e1d884609f528b242facd87337d13dba10c163b29b9c406751e3250af663075c600ed6c6a73d2eef2a96ffe92df3a20d35da29acc
-MISC metadata.xml 257 SHA256 4d43e70b770d0898a99af64a8454a6116e4a86500c23290655c8371265010427 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e WHIRLPOOL 87039765046556cdc2f7d76ce4192945117bfd5bb684220ea8fb72be310673a5b729ea428666ff1ceb1e6c21fb585a3a7dd72bd94dab89cf076a895e6a7677f0
+MISC metadata.xml 571 SHA256 77083df4783426d97f49219a257e55a35c2f3a316256baea478e7e64c375458e SHA512 3318b04bcd23eeacc9640e0088bfe3aa21ab92f455e8490ea80e368a3c37f2f0336a9a7c50d1c39fedc4bcc0221de5c7cf5b5e10346618d2a2b7043bf0b6713c WHIRLPOOL f6c390109f4fded6b6993985c95a9eb30b781099f8d057b608c0aa8be6bd419d51ba8b3ea3b7c1221afb4dea657a2885608e7dd29d763bbc8334bb5a1bed8037
diff --git a/dev-perl/IO-Socket-Timeout/metadata.xml b/dev-perl/IO-Socket-Timeout/metadata.xml
index 2b9a936fc0a1..fbe27fb7505a 100644
--- a/dev-perl/IO-Socket-Timeout/metadata.xml
+++ b/dev-perl/IO-Socket-Timeout/metadata.xml
@@ -5,4 +5,10 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="cpan">IO-Socket-Timeout</remote-id>
+    <remote-id type="cpan-module">IO::Socket::Timeout</remote-id>
+    <remote-id type="cpan-module">IO::Socket::Timeout::Role::PerlIO</remote-id>
+    <remote-id type="cpan-module">IO::Socket::Timeout::Role::SetSockOpt</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/IO-Tee/IO-Tee-0.650.0.ebuild b/dev-perl/IO-Tee/IO-Tee-0.650.0.ebuild
new file mode 100644
index 000000000000..d2019f3d7cdc
--- /dev/null
+++ b/dev-perl/IO-Tee/IO-Tee-0.650.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=NEILB
+DIST_VERSION=0.65
+inherit perl-module
+
+DESCRIPTION="Multiplex output to multiple output handles"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-IO
+	virtual/perl-parent
+"
+DEPEND="
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/IO-Tee/Manifest b/dev-perl/IO-Tee/Manifest
index c1fc488c9be2..3889fac06156 100644
--- a/dev-perl/IO-Tee/Manifest
+++ b/dev-perl/IO-Tee/Manifest
@@ -1,5 +1,7 @@
 DIST IO-Tee-0.64.tar.gz 5039 SHA256 3ed276b1c2d3511338653c2532e73753d284943c1a8f5159ff37fecc2b345ed6 SHA512 9473a9ce3222ee6998cc53851a34051a9ae5990b9c514b5e5d322832d76f0e20d7af51bf7f06603ad927ab9789e5ab10da7a0693e4867112cd3e1dc1ca25d017 WHIRLPOOL 578f4aa86acbc433863e757a8b5d0756b8595037795f65f23663e75c9cbaf05a355cc3b77cb40fc2a7651c1f26018c9532cc966b20cd5ebf43f4a39749723602
+DIST IO-Tee-0.65.tar.gz 12842 SHA256 c63dcd109b268962f867407da2654282e3c85113dc7e9655fe8a62331d490c12 SHA512 f0f2f069c9c43098fc8fb343ef3a701e8ea5d6171a7f86b3c296f542435b1305f263085ede07431cfe34ccf02d845c8f3719ddf1eb6fe0d8def0c730f8e97236 WHIRLPOOL cade6b868088d4d88b4746fe3d43814a49529837231a757262a1f804b4d6eaaa4f8b065e93b6eca2bc6cec7b442e00ff532c8d841aa52911113b20c01fb986e3
 EBUILD IO-Tee-0.640.0-r1.ebuild 306 SHA256 d17bf83486babb34b308c1bde117d612291c39a6cecbcae7c5099a5d5a809697 SHA512 c6a613509cf0010c04cabf0d1731241d407b23de76066b7480b1f4da6b97c43b2c0e6694708c2fc43884c29f1838421265cb28f09710d8222c3d3dff7ac19f51 WHIRLPOOL 111bde37a1850d1ad09a889545697056cec14d865db12b094c85f09195b2cac6ea776b8244e8aef29ecd39bb853a46631fe6a41a25136b58b51fa0ee0362247d
+EBUILD IO-Tee-0.650.0.ebuild 404 SHA256 b137c9ba4c634a9480b80941434cd26dfc1e479f72fb29aa766e804d217b856f SHA512 a0ad9f882bf0a5cf18a586285aea81fe1424cc42699764613170998c2670867c8734917d97dd241114eed3a244525c5992c8748222bc797a10017e62ec141af0 WHIRLPOOL 474548e1482431224681674d956347aa0fed55fa9e33819cfc16480eb0f826bd2c01989ce95164874f410547122eef1d16659db185c051d37235e633f9c768ab
 MISC ChangeLog 2434 SHA256 ebdc93409acdfebb42e1fda7d126effee9029dc92bfb8c033f54d24c8c6dd960 SHA512 cce1f583ea8d047954cfcdb3fb30d736ab3b4ba4de56b947de88d4dae2d24b51eadd029f0e99c1fbeb776b7d3bcf8da28248acb8d6114bf7801f45989c0ef0c7 WHIRLPOOL 184cbfaffa506bb092a6dd3d395b77f18634370811f0e2eb6e61e000ae198de2eb1f620c343a7e24ae2ef30478f6a10fc4e7bf4f54d3c22934375a5bfdb18831
 MISC ChangeLog-2015 2063 SHA256 d56c044d7e184cf58a7ebe94263ea8676fee737a159f9d350e6bda9f3f532004 SHA512 004ebc455ac799872898e9fd5c4a71d0f9b269b85de8302459a5cd2fed0971e0b41db8bd557d4d0444f4cef0ae003e618198012c1bf3531fa74506d7f75dc1e1 WHIRLPOOL 5798821d940fa4baf4545da857a4aa497d53b6537207e98c35fe82c5de1549829b017e4e98cf7cd576d5cce74af0c5c35d73fa88eafc73480eb739b3b549f33d
 MISC metadata.xml 384 SHA256 9795c5f417f1878494e71891af435ed4cd4539ce7f166b55897e048308e1354e SHA512 8310984e63b763d5e9481ece74c77f84b1a8d9be8540a42820b6d78c2096d410cc88616d042b8e4679a9a9414d4d494d0deb792012b7f98ddb6291f39196f71a WHIRLPOOL 79c2ab180995a947d9393829e052ca624430b73dba69193607831d98da7f593dc9f19cea6c7e9febf8098df982271797feac07ceba3f0b30826ad1e3f03c007f
diff --git a/dev-perl/IO-Util/IO-Util-1.500.0-r2.ebuild b/dev-perl/IO-Util/IO-Util-1.500.0-r2.ebuild
new file mode 100644
index 000000000000..a0371bba5ca0
--- /dev/null
+++ b/dev-perl/IO-Util/IO-Util-1.500.0-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=DOMIZIO
+DIST_VERSION=1.5
+inherit perl-module
+
+DESCRIPTION="A selection of general-utility IO function"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_test() {
+	perl_rm_files t/test_pod.t t/test_pod_coverage.t
+	perl-module_src_test
+}
diff --git a/dev-perl/IO-Util/Manifest b/dev-perl/IO-Util/Manifest
index 0cab98b74597..65ce82ec01f2 100644
--- a/dev-perl/IO-Util/Manifest
+++ b/dev-perl/IO-Util/Manifest
@@ -1,5 +1,6 @@
 DIST IO-Util-1.5.tar.gz 14017 SHA256 6141970f5fa5b6e8c1ac342c735cea2017eee6b3b5f9f59f2bc634afac86e3e7 SHA512 5936241cdab8d601523efe1f2e9d3c7b3a99e46f59eb9a1ea7d273f2c1d36c6bdc75d2c5483d36f65e498384756a59adc0ba82a50bb4d7c34d5c73d52faa8867 WHIRLPOOL 133100cfc7e3048d0db34d2ebcf416cca8fe4b50533b80dff95ccad0152f41b45e804c6aec681cbdc6fd1b2ef920c2e5e549017c7048be49056fc0b618339c04
 EBUILD IO-Util-1.500.0-r1.ebuild 274 SHA256 5c8f0aa2815a81c376eab94ff64ff189e4c9271b79f81e22d0ab58390f711e7e SHA512 b950dcf8852600988a4c6751f1529cba046c0af57777e6fa3b81a21d75381d0b7511553409adc202cb6e7637d33db2ae24ad1774e9da8023521458ec18fec669 WHIRLPOOL 176e2482f4e2130ac9b00a0e22261d0a517afd368eb2dd3509ceb6caf71430185613d5e8a599caf1ed63f1efafcac0d8399dc7de1f49b5ffb884e40de397d44a
+EBUILD IO-Util-1.500.0-r2.ebuild 360 SHA256 769455387e8e383dd98614478e759dfb98a17187bf26baa9626f2566c27f1a74 SHA512 fa8e6b8f941fe46d0efac2bc1284548cddb88cabbb1920f46d76b8292d75c3884fa8f2eaa106c1baffb763af0b1ff0b7d820a6c7f728a2c78bce25126b969832 WHIRLPOOL 330d7bb3a9e4939bf8be09433cc2c2f89e9ce7a4324d3bc96df561f00d9a11e6e1f2ac448888910bcb0474ac766ada57a5b43389b3dce774f9e5aae600e91dd5
 MISC ChangeLog 2675 SHA256 bea7371154b176afaa18f1bbad2d8c7a3853f3a87a9c1ddd7ce71a206965f676 SHA512 8569829a7fe8f6133e58c820e12ddd0a89f702d581c51c39a736278e85d348cc09551be2de283bb24c46b0c9c6aa72849dc08255772dc822bc6705d57c7ec47c WHIRLPOOL c3efc1a679221479056ff8b648cfd9e8fd7175ce45a2d1773a89b202bd422cfd5ea55fcd4bffe8c70515f9afc499d72bb3d5e3cba5c5741b9710a61085a774cf
 MISC ChangeLog-2015 950 SHA256 5cb88020351963a54340506e3f85175f6d08f0308d734db6e6a74f05c64451e1 SHA512 3938a55de36eb30f9c69a9742695d0c1429f0d61cedfcf1ff8eda52516a96932cba3d351fe2c4cbb62e311fc394776fcaee59a102765b2449215283d45b60ad7 WHIRLPOOL 7528b7f8e6f775ae1477562894d7770394bbfe97a3a7c6a31d841fce2b32ae8cd680da6328c943b7c59a1a3b73236e9aac890d2b849654db363cdb451e16d36f
 MISC metadata.xml 386 SHA256 395866e67a999f807d408d794abbebb2b097054ae9c7c6699069e5766e8bc297 SHA512 6c40292673dc204a2e5b04325cd38442f88c7249efea64f0ab6cfdf6784aa35cd952bd10d7b27247cb42aced57bbb04438c6d05c1d03ba9e1cca0fe08cbcf738 WHIRLPOOL 8e6e52d7038980e576e4fa93724e5094990e4f456a9428f9501e130808dc13526b0d36f87b26148f609c7e2a439ae766a70fca75e43c3dbee68ea3b914a21322
diff --git a/dev-perl/IPC-Run/IPC-Run-0.940.0.ebuild b/dev-perl/IPC-Run/IPC-Run-0.940.0.ebuild
index ce2f7606f1b0..a5fbf45ae47c 100644
--- a/dev-perl/IPC-Run/IPC-Run-0.940.0.ebuild
+++ b/dev-perl/IPC-Run/IPC-Run-0.940.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="system() and background procs w/ piping, redirs, ptys"
 
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/IPC-Run/IPC-Run-0.960.0.ebuild b/dev-perl/IPC-Run/IPC-Run-0.960.0.ebuild
index af0b7f96fa08..b05d0b4f3294 100644
--- a/dev-perl/IPC-Run/IPC-Run-0.960.0.ebuild
+++ b/dev-perl/IPC-Run/IPC-Run-0.960.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="system() and background procs w/ piping, redirs, ptys"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/IPC-Run/Manifest b/dev-perl/IPC-Run/Manifest
index 053e8b3eaf24..dee1d622282a 100644
--- a/dev-perl/IPC-Run/Manifest
+++ b/dev-perl/IPC-Run/Manifest
@@ -1,7 +1,7 @@
 DIST IPC-Run-0.94.tar.gz 121394 SHA256 2eb336c91a2b7ea61f98e5b2282d91020d39a484f16041e2365ffd30f8a5605b SHA512 c42fb5e0a5085698bec3f970ba642c00ad947629bd30c1485ebd28e8e24db4273fa6439e0abeddbc602be66e4ebfcaaa7e8d3982ac8b82c3c6a8a431c170f721 WHIRLPOOL 3a89f0d4615dd155e001057ac22d82903e0a6110679e198168b425589df33fd36797e1e1be6c69c0609e2147ff5fcb60e272ad9f71def00c5bbab55098d1aaaf
 DIST IPC-Run-0.96.tar.gz 121644 SHA256 bbd24ff027e1c232b3dc027562c9f4386da72b76991d30f9f3d4119e87cf4640 SHA512 8a531a2126c15653ab0230813985cc7c83f2c3467c987757fc1f04c3c9952ee0246bcf743dcc4381351c72989f7271ede16962cca24e030404e414ff000c57a8 WHIRLPOOL f7f8fcd0bc738273f3f373fb8bde31d722d4989c23821acf0f78e8c750dbf7ec5792cb09892a68e1773d5bcb1ce7c6e2d0588c98513729a5aa768440985be965
-EBUILD IPC-Run-0.940.0.ebuild 593 SHA256 b0b18dca74321d0bc3f430e21ddaf5340ae33448e8f63ff2ec9a2f13ceebff8d SHA512 d9ef8ded24094809a9b83ac5ec81d487b35cf0c6433349ab50cdf396a71903e5cce1d122ab8f066d25b756cfa91c9d4ae9e3652b1fabed0dc2b468b14903d3ef WHIRLPOOL a41c5959ffe46a093a40595cf23bc31a9374a525c6e026ef462274805543daec4011a40fa8649f6b0399271d21d02cfb5f85df7625cf05ceaa4c3d91236e1cfb
-EBUILD IPC-Run-0.960.0.ebuild 594 SHA256 9b4b195a5d1f13bdab35e63c2cd867b398c0fc68955186dc6e5f711dad49bd1d SHA512 2e87e9fb2a15ee8328fc37bd81b99134a8bb8ec694371af25c9464d0d0099a549fc7ac0f7a470274a037eff77185ad3104d4a80f464c6c2f8ceb5e80ab8b2daf WHIRLPOOL 3bdfaad8ed085a35642fa2d14d3f3edc146251456137738404b28a98450081c80c0a96cfb02e45bb6b8d814b95aca175d668f7df5be6bf402a7a9a5c1de6634b
+EBUILD IPC-Run-0.940.0.ebuild 598 SHA256 949b805a286e8de035bb022bc833be9a1363aa7ec605792a30ad0d66d2c72dbf SHA512 602aec39f3cd7a14fdf95923a14c152156620af2becbaa47fd2f0ac0b490438d7b1728161c90b6a0de52b0a3f619cda5df70c9ef0e9e65eeda1d1d32f36ffa53 WHIRLPOOL 15d7555aede48f75ecb541641b2a3f5081731d77ec5c33b526471ad3cd5efe0128bfdffff5617923aa124ab673073ad9c289073a10d6c24010db079d565ff1a4
+EBUILD IPC-Run-0.960.0.ebuild 599 SHA256 8a98fe6e3f47664da1001031fccc4ae22baa13b7b68519264c9f701afe82fab7 SHA512 9d70fcd8b2b0c4bfeb6f8c6956bd343580a8bce305ff10c19ce2527f3cfea4e87f982b127eda19cdd07130bceb5495bac287df0db9f2c7450508a653b6cc9bcd WHIRLPOOL 58357745c5b49654a03c6d506692835336225aeca3cc33c2f319dc4b19480f1d5201a5ec9482d2ea76306976249813a027a0dd588ba68e487c3e77859674a19b
 MISC ChangeLog 3128 SHA256 9c0028fe39792636dd18f007a2cc7b5f384d7ac92e8a5cb583796fb850785218 SHA512 68ebf09bb7728dbd485a71c315057bc4ec6c8f6061f84266d7a4d2e9d490d5c3cfbe13602205e2729ee4317a89736b5deb898751c325408ab8940950af43e97f WHIRLPOOL 207f83be12c7400e72b4ff71d61532e630a9752e4e56987bcb45299c9e972e85b6296e17b1ee68bb4d79600c89a288f005aeaf42e5d26ffc79cf2f5fb45f82c0
 MISC ChangeLog-2015 6389 SHA256 bab15ec4ebf2a903edaf5d88148ed84d47ecb1ba942c74ab6ee3cf5952e6e469 SHA512 33bcb76bfa69c6167542e313b709e55c557c2f136fd3550491ba7dbfb071a08397b61dfada333d9b8aeaf5e1f43efbee63a9be0807304522026c0348f6a889f5 WHIRLPOOL 20b4d5e04b012e0572552b4b8a890e8ace8e0934e67557d82df66b480d2d101a0ef2bcdb7e76efc3dd1288192d7e56249e87316bbb49e5478f638c6d702f768f
 MISC metadata.xml 767 SHA256 f9397e8e7effcfce6fe74910b8a1336b4cf736b15f8a58bb572fee1a76afccc0 SHA512 a07f01e225a9fc724be559d9a268e91c25bab1108f6a960c29fb7ff80d4cab9bb865d3fc646abed08895a1e797a64e8bf5f44da6de62ab59a76fda4d8852dc1a WHIRLPOOL 18b3b4804aae811cd85225e5a127a0923b4fcadea2c23aa8006f13ae5da806629a618ea4d9864e09b88b0fab681396cc2d813ee225e09814fd2492223dca3ebd
diff --git a/dev-perl/IPC-Signal/IPC-Signal-1.0.0-r2.ebuild b/dev-perl/IPC-Signal/IPC-Signal-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..a795dee864b8
--- /dev/null
+++ b/dev-perl/IPC-Signal/IPC-Signal-1.0.0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=ROSCH
+DIST_VERSION=1.00
+inherit perl-module
+
+DESCRIPTION="Translate signal names to/from numbers"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
diff --git a/dev-perl/IPC-Signal/Manifest b/dev-perl/IPC-Signal/Manifest
index e472ac6583dd..864e85d2e34c 100644
--- a/dev-perl/IPC-Signal/Manifest
+++ b/dev-perl/IPC-Signal/Manifest
@@ -1,5 +1,6 @@
 DIST IPC-Signal-1.00.tar.gz 2649 SHA256 7c21f9c8c2d0c0f0f0f46e77de7c3d879dd562668ddf0525875c38cef2076fd0 SHA512 31ee15a55539546532cb8deb9bd379e0014b526fcd79ac20dc53591391b0fb50b182f6f653837bc230debb1779418316b7ac8e389224ad41a0aa3a380c76f229 WHIRLPOOL 9cb38b34ac66342ba9767a61aee59f3164af2f8aa8002a5b66c8149ed3d03d491a730f841c3b6a1ff66542f8fa62d6a435d9b755b9f410bd32c04873536279c9
 EBUILD IPC-Signal-1.0.0-r1.ebuild 284 SHA256 c1c74f5a0393ffc71c5d30dd191b9b317cf2f41a368cb0f6c8c951e3943942c5 SHA512 17606a376c675dc2414031220d9c452e312b76faceb623d066861fcd7a26c7fcd5759b88e24863684f4dd50ad816ea57437aaeefc35db83e07ddaad23531d46a WHIRLPOOL c970fa8b6f56714bd9c9002bef4456f9e729931cc69eb7de962da4644fc3655cfd7e42d84ca3cc38f88295fc3a8c42882eee8fe930b7b8e83eb401a047e1672f
+EBUILD IPC-Signal-1.0.0-r2.ebuild 285 SHA256 94e7420f4b5af4da7003cd2cb4eb43e6fd920ee03e340ac75029fc8784a275cb SHA512 f67314ef1acce9954e8c402e5ee3d999d5187340ad0b72edf62d27efc9db1075d5d604ebaf84144df0e88675ec583ff65b23f2528c6f981c0fca79f3fc353497 WHIRLPOOL e067d6149abc358ceb7e8256ac7ec8b26aa3c7ca5ede6efb5030e27091ee7df68eecb1a9d5d5c57789b4a43b4db1ed2bfb814767b741f23e4dbe789acef18dd1
 MISC ChangeLog 2442 SHA256 792a0a314b5a9164ada10a5dd10555b4d9fdb2eb595fe66db9e74a709335f22d SHA512 1d5364b3c21c31bfdf055c70ce1788b6be19b210149b38cc3f35ba6dd6345d05a1bcb3b27078f6fc85765ec646bc2165e6690e5716e923eb4a0e5d58ba4feed5 WHIRLPOOL d833f2012e99f1566e05337d0c5cf0115649138a75cd6d1a42cceea990baaeb10d6448fae5f5b03d7908f470ef57e4312108011a265f9c25fc5bf604b3d2c717
 MISC ChangeLog-2015 2155 SHA256 435b3096f81e5e7f380f6389dbfcbafa988b3cddfd10f7502968b18b5ae28d79 SHA512 c86d31ae21bd2fbfaab780aa35aee6afa4b41f846c9e4dc86d10a6201df9333686587f7c6411a3b1ecfa363259ae45045de1ef40e2554ff38840eff43f647d53 WHIRLPOOL 6134376d7a2931b50df5462092bebac94c3c597d2bc2a3255c598e540e51b1c582f4ae1fba660de6d169e2cbf218c60c80643c9ec6237eff580c36a39fa7983d
 MISC metadata.xml 392 SHA256 4c999db4e120598e46c5b853bae94d641849de308983fb0b9da974b88df11d17 SHA512 4b07c7c605712eb12b1a5176c86b9089ec4a5b5c2b4204930a15c9e27e3df7c929d34f361e04d49006f227484293d0726a1219e74854e47882d10facae055366 WHIRLPOOL 2e64ecc503f4c20e70aabd826aef423fbdeff33c4ffecfeffe43694641d677fa2e8bde533a15df7d9b651826345e7627f8ee9ab53a130a6e99a8fa41126ca9cd
diff --git a/dev-perl/Image-Info/Image-Info-1.410.0.ebuild b/dev-perl/Image-Info/Image-Info-1.410.0.ebuild
new file mode 100644
index 000000000000..3004ac5e849b
--- /dev/null
+++ b/dev-perl/Image-Info/Image-Info-1.410.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=SREZIC
+DIST_VERSION=1.41
+DIST_EXAMPLES=("exifdump" "imgdump")
+inherit perl-module
+
+DESCRIPTION="The Perl Image-Info Module"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-perl/IO-stringy-1.01
+	dev-perl/XML-LibXML
+	dev-perl/XML-Simple"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	perl_rm_files "t/pod_cov.t" "t/pod.t"
+	perl-module_src_test
+}
diff --git a/dev-perl/Image-Info/Manifest b/dev-perl/Image-Info/Manifest
index 6b5c84d4dd69..e32b6169659e 100644
--- a/dev-perl/Image-Info/Manifest
+++ b/dev-perl/Image-Info/Manifest
@@ -1,6 +1,8 @@
 DIST Image-Info-1.39.tar.gz 264725 SHA256 af155264667a2c22e3e2225195b8f6589329f9567e1789b7ce439ee21178713d SHA512 c246842029f57ad8be47348489bc625c9dfda46d96a5489fffca8cf6cc294eea2321dc8ba414b959aa48b5e72785a8221db69e9afb45be6c6ad6544d9adc8a91 WHIRLPOOL 06e878bfc3e222340d017304d63a54909e8d3c906abf0431c265a948e103e6e1d0e7a20f14c652c34bed33d7bffc2ebb2e08f710c551498d7a4bc6882f861401
 DIST Image-Info-1.40.tar.gz 264982 SHA256 8d65f4b03cde9d707cec3927dc4e39ceeebf8490d412e49abe8232acebdba782 SHA512 9a5caddea3b54a9433621144284eb52ee9683db0420a35b0774101cc50f28a98f03a988748fc280b4d34e4c0312b7585f063c844b0bbce3efd9621bf6c76b35b WHIRLPOOL a1e555e6d8c686b58338f1b0b6e5d02a8916e888fd1e4be1b99a4406a76dff195f6e007163021134dc40530586443ff0010697127abafde731a48cc120436dd0
+DIST Image-Info-1.41.tar.gz 265977 SHA256 c546d27414686660dbc3cd8501537128c5285a8db0faf742c2dc12b9a29ba3db SHA512 7e3cb103efa004ce728b6e594f5b7518fa5be14a814e6f06d4a3e85563d7896fd283855cfe9e091c22b3728f6126501463f7326d704c0188ad696206f9318824 WHIRLPOOL 1ee1d7793005275bf3255ff0b0d5eb32de0879811e4766a61a60ebb04bd2aa27b5a98a8993c5579724b8ddc7fa04db8147411eafb0087d6ce419a5ca85fd7cf3
 EBUILD Image-Info-1.390.0.ebuild 482 SHA256 0fd79030b74046f8b582c6ec9777e90e7beea77b0b2950f66877bfe780a49562 SHA512 f74f122f9f5ac2b0b629cfcd623a6a1a96ca893ef972e1306edf45ad67edf8e1c0a47e09a9be2bc8cb0522a1bce1d0005c7dca4982add787319879594d986113 WHIRLPOOL 05a8169ad2c81daf867f6f4383a2367fe5847b0c1bc6e86e1710f23de4f18573213474118b731d28fd0510faf8f58b3e4b9137b1eb773a127a9f40dbb61fe490
 EBUILD Image-Info-1.400.0.ebuild 487 SHA256 e144aeaede11184a520de14d11ec64bf84245e665484d34862c08e46b0d68eeb SHA512 93f9de3a6b352b44a4cc082525656f57353b8bab204430e4671c69505bf712feab1b4534f765f14803344643590bcef3eed5b5386038402811d333671a3909cc WHIRLPOOL fd80d4c1ff4d81c35345cb4d2fe924eb84dd614dc23606a16dfd2199627bf537cc259a375de9ef5b8116d0a2b297ce522b7cf325d56aa6a94b1eed41fc0f0bfa
+EBUILD Image-Info-1.410.0.ebuild 487 SHA256 01383274e7a1674defb779bb02ec77b98709ea0b6a1c3ec4afaafa37a19a1231 SHA512 41a06651669a0463933d8ffc1f6e61a41dee407e4ab4050485aa6e73e8184ade7b88c5ea09419e7bfaa90b02e6554ff8dbfca9374899767f52976249f75d8040 WHIRLPOOL 16361dd7560333f8d9a4ec418cce310edbfa3e5686dbfaa6f52d4b245409b3efc1f32279455076f037205b1cb6cfa4139a00fb3e6faa9258da03602312d9d130
 MISC ChangeLog 2182 SHA256 1ed96e37a6b3bf4505786b7d4dc85a6f119caab0f4e586c64f4a906deef2d9b7 SHA512 060b67d6439060f6589261773baea438be334ccea28ad87c573fa9e551cd77f971103aec4f1638f2ff72008419841728364bdf2b1179f45ba3715584b94a7c86 WHIRLPOOL 7b8abd098123e4d6973855f6a2603f61b2e9372d4dc3096f547ef909dfe6d9f00bd564413d99258448e7c6aeaf43f9b1cff29516c0f67399cc0dd038b5d37769
 MISC metadata.xml 1796 SHA256 90b6d5463ec71fb5270c73ec5d7af3891d271664b257d730fe907ef2ba8855e2 SHA512 cf6efb0c6da4d922208d0519d387b3b8c18d5abfd5a6389606e036fcc5e6c4c0c7afbb57e52a8ea9cbffc844200af47506104decbf690417499bd576d6207d13 WHIRLPOOL 927f979cfad05536a29cae06ceaf82a90806c0a7fe5e3b2c290f3d8db7cb2fc08bc234ebdc89987068fa0a63b2248c87b0ed8f0cf280aa5b279e1c0136000b96
diff --git a/dev-perl/Image-Sane/Image-Sane-0.120.0.ebuild b/dev-perl/Image-Sane/Image-Sane-0.120.0.ebuild
index 5269d9980830..ca2b08405235 100644
--- a/dev-perl/Image-Sane/Image-Sane-0.120.0.ebuild
+++ b/dev-perl/Image-Sane/Image-Sane-0.120.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Access SANE-compatible scanners from Perl"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 
 RDEPEND="
@@ -21,6 +21,10 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-perl/ExtUtils-Depends
 	dev-perl/ExtUtils-PkgConfig
-	test? ( dev-perl/Test-Requires )"
-
-PERL_RM_FILES=( t/{90_MANIFEST,91_critic,pod}.t )
+	test? (
+		dev-perl/Test-Requires
+		dev-perl/Try-Tiny
+	)
+"
+# https://rt.cpan.org/Ticket/Display.html?id=122380
+PERL_RM_FILES=( t/{90_MANIFEST,91_critic,pod,81_scanimage-perl}.t )
diff --git a/dev-perl/Image-Sane/Image-Sane-0.140.0.ebuild b/dev-perl/Image-Sane/Image-Sane-0.140.0.ebuild
new file mode 100644
index 000000000000..c003e14750d3
--- /dev/null
+++ b/dev-perl/Image-Sane/Image-Sane-0.140.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_VERSION=0.14
+DIST_AUTHOR=RATCLIFFE
+DIST_EXAMPLES=( "examples/*" )
+inherit perl-module
+
+DESCRIPTION="Access SANE-compatible scanners from Perl"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/Exception-Class
+	dev-perl/Readonly
+	>=media-gfx/sane-backends-1.0.19"
+DEPEND="${RDEPEND}
+	dev-perl/ExtUtils-Depends
+	dev-perl/ExtUtils-PkgConfig
+	test? (
+		dev-perl/Test-Requires
+		dev-perl/Try-Tiny
+	)
+"
+PERL_RM_FILES=( t/{90_MANIFEST,91_critic,pod}.t )
diff --git a/dev-perl/Image-Sane/Manifest b/dev-perl/Image-Sane/Manifest
index 6c4728699537..b87ed2a7c39c 100644
--- a/dev-perl/Image-Sane/Manifest
+++ b/dev-perl/Image-Sane/Manifest
@@ -1,3 +1,5 @@
 DIST Image-Sane-0.12.tar.gz 46834 SHA256 4e69d1ccb755a871bd4ee1226b177bc1f662f5f92006aba8d92e5db6592a7f02 SHA512 ba05f198bc4bddf43418af7abc9a171000fa8bb776d7247fe42094117e244e31705984fec8be70d47659003d3cceb33b60b66750e1fe07ccc9f903037be98edb WHIRLPOOL e23d8c7068546f2be3be6cce06114429d88944cc6ae9ea1abbee2fec5f010ec02d951b46a524ad500b6e5cda0346fa0e9d151519af12ed9ac34c27734a444d15
-EBUILD Image-Sane-0.120.0.ebuild 566 SHA256 1f45f83b553a3027eab8da893189cf13c8749ae48f9cfef0161c09177385bf1d SHA512 6993ddfaecfb4dc29e6b2ace4b01aedf6c66126a2260978a806019c91eb2bccb0c54ce8ff3abb849e6e8e31c8f1ac5260f4c08e08907a4c560fb1b37991a6334 WHIRLPOOL ad712d13b893dbc43e64d69c03e56d9f879aba63e84b0b940bfc13cf59a8c75f9da393fedf87a670d947224dc8699efbe0ab2cea7e0a3e0b2f0ec70cab35c208
+DIST Image-Sane-0.14.tar.gz 47158 SHA256 a4b027c9b7650291f1acb0eb93861a7fc45aef4e08f6726843f174fa113c8ba5 SHA512 d08be5f0d18f367178b7d76d50abe12faaba48525374c782f6a91fdb44d314b1943617bab9f6e7b2bbbf4c95dcc221bfbd92cdf7c80783916aad24daf5b04bea WHIRLPOOL e5aacb3c84f2193a1f718790a186020a8c068ba883e90f0e17d78afa284e81d1efcef3a2fb9d085d04175fbe6df2ecb5c686f7bc270355d170855576ebf8b9d8
+EBUILD Image-Sane-0.120.0.ebuild 658 SHA256 89e2882bb03fb5d076aaa99e2b755f224a1446c312c698234260acc8964b4372 SHA512 8efb1ae32bfa30daf4f262256cd01b90c4c6bfacc2d4715a074b355300d42c71592f332f0f44494e55352aac0767785198a51ac8fd39f0ab08d137f2e53e7d1b WHIRLPOOL 8780442126cc99bd5903fe1fd759797aa39461ab178876f556496dc932a01fe76fb48553f04dbe565add92ad4108ccbe2426a5a20a3747c7d7d716d40b1f98b5
+EBUILD Image-Sane-0.140.0.ebuild 584 SHA256 aed3ce1d9d8808b1e9936d2fef43729efde48bae04dd884a77ed0ae139f1cbec SHA512 4256883295d87637250d33b3dd3702406b216afb7e4b8374ac56eebd3e2a71b63f4e0af445d057a2bc1d7a6bc41f68a043d961ada1d592e4ba148a6e3898fc8c WHIRLPOOL 23c7d37578d2dd75252e5b0afcd0feb61bd78015df79fb59cc6c1f4aad62bad48970ef754413aa903ade1d97650492c7ecdc2f16cbbde0a70ea5770d3ffd9a6d
 MISC metadata.xml 458 SHA256 3c3cdd314c182d69b35d530660a2898813d09aeb9c6c7ca23f50d867956c1d5d SHA512 d2b1a91ef7ae499f5fd65a0a90cd0acbef04545bfc6ad46bc9c843db6ad788f317bf8e34995915143587fae8e5e7e900afbaca69060f7ba8cc90f75fb1fa7c50 WHIRLPOOL 772138fef2d17b1ce7c8259e96e202040ce8b4ca2e0a4191cf3a63dea6fd12f38951d89164b016fe616811d766d95ba41cb840e95d6bdc6f385e8b70e4fdd61a
diff --git a/dev-perl/Image-Scale/Image-Scale-0.130.0.ebuild b/dev-perl/Image-Scale/Image-Scale-0.130.0.ebuild
new file mode 100644
index 000000000000..ac3988afea1b
--- /dev/null
+++ b/dev-perl/Image-Scale/Image-Scale-0.130.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=AGRUNDMA
+DIST_VERSION=0.13
+inherit perl-module
+
+DESCRIPTION="Fast, high-quality fixed-point image resizing"
+
+LICENSE="|| ( GPL-2 GPL-3 )" # GPL2+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gif jpeg +png test"
+
+REQUIRED_USE="|| ( jpeg png )"
+
+RDEPEND="
+	png? (
+		media-libs/libpng:0
+	)
+	jpeg? (
+		virtual/jpeg:0
+	)
+	gif? (
+		media-libs/giflib
+	)
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-perl/Test-NoWarnings
+	)
+	virtual/perl-ExtUtils-MakeMaker
+"
+# https://rt.cpan.org/Ticket/Display.html?id=112217
+DIST_TEST="do"
+PATCHES=(
+	"${FILESDIR}"/0.80.0-disable_autodetect.patch
+)
+src_prepare() {
+	use test && perl_rm_files "t/04critic.t" "t/02pod.t" "t/03podcoverage.t"
+	perl-module_src_prepare
+}
+src_configure() {
+	local myconf
+	for useflag in png jpeg gif; do
+		myconf+=( $(usex $useflag "" --disable-${useflag}) )
+	done
+	perl-module_src_configure
+}
diff --git a/dev-perl/Image-Scale/Manifest b/dev-perl/Image-Scale/Manifest
index 21731cbc2039..ac1f745371b2 100644
--- a/dev-perl/Image-Scale/Manifest
+++ b/dev-perl/Image-Scale/Manifest
@@ -1,6 +1,8 @@
 AUX 0.80.0-disable_autodetect.patch 1314 SHA256 50d6a7abc2b581d090557f8f5f6a17c64232a31315650c69c3492d1eb989d433 SHA512 d6e800c0b9aab8eb1808d77da5591629f757ed7e26ce286d336ea33b8ce02a871e12495816dde7651de3deb92572e44b022c719969c3558c457957188c4bc9fb WHIRLPOOL 1ccddf801c63168b736a18cb25c5699d6e5f4dfa027976ea832c0cb7c061be53c6f5eccd3fb20a590fa0ba478fd616b4d13486ad3369032486048487c510ec68
 DIST Image-Scale-0.11.tar.gz 1012273 SHA256 6b8e0cb71f4d04d4c5a568e30d5eda8c01bac3479f10bd8235d69124a61336ca SHA512 f9da139b72c8be4f99d426cec15913fcb4558b6839ad40454916c7e6242194a23b1cdf7d0a9745ce7806c4eaf0e0af8dba9cd409cd00a8fb61ac40c4c4abdb5c WHIRLPOOL 167bcc901e12d04977798dced955fdf61a1f0b90b3cc2c0826de70ad081ef8b08b74095fc02af29d00bc877d602b0ecc72f4fc527211454660391715e0ec2ea9
+DIST Image-Scale-0.13.tar.gz 1012810 SHA256 5b2c92dc2dd635b488879461760cd251aa2b1feef41b64f17914a6e4bbe3e442 SHA512 70c2b812934cbe6b7cd3fbe846ae862081a7ac5b40396a20f4078a3c0b79390b855fb623d836732f9347ee3ede3be29a04677f36fef14bbc83c863352862abbe WHIRLPOOL 5b154abb72b8af17ca682f480b4231283160ddbcfe3ae99cd67e0f6bb34bef525e6adebb84e77bf557d23090e25c34df18eb16876dd87faa7ebeda5f4d1af9d6
 EBUILD Image-Scale-0.110.0.ebuild 963 SHA256 33c62b8926b96498af7cf1ff1e9132de01fb92d9345249d1188ae75e7762a4f8 SHA512 306eeaa9c845c955c62f41c766a415796fda12df7bf16db8688487eb8d93e12c3e3e764a0a79e407aa537b47997491993e06eafae7e2c9879b474a3007145996 WHIRLPOOL 914e36bd70433267d1d12b5f44ceb192c5f2ed1a6663b132b671ef60d8dc1e3dc002d0b0c379a1eb798bf3565fd85a7b85f6ca1e746a41b3094908f3c2d30641
+EBUILD Image-Scale-0.130.0.ebuild 962 SHA256 0961d7cf8eaa1d10baf86fa17da314fe33563c5fa96c63e5ff5b3af643b9aa2e SHA512 9b34158d4238ed136a18261ed5e0f584dce42a6b761e2413bb1be3a9a939ab7769ba41992d16ec3836a298c9910694ef0cac7634e8630a9d6785f76fddfc2bef WHIRLPOOL 686664c8e83b98843974c3a23547dbbe4b29a93905dd8375c5a79e94476b2ff73f3cc1d690d6b044adeaa6267723dc67f4006c295f51844bfe8d74909f54d477
 MISC ChangeLog 2960 SHA256 f064080629b350005bc28ab6d34c9b5cf17d67e251d6bc5ce45c9ed9792e5a06 SHA512 c51d4271a661daba014eaa9b1bc0ea606cdc912d9bf13224cc80cea360208268d811718356b4fd496418bd7d34ee66107d5d6fefb8f7fc346c3467d88e9919b2 WHIRLPOOL 6b1a291e28315bbb2c746d6df0a557c8d1287ca6949ae5387e4cc52d122fe9ad0f2e0de803275f8c3893cb23b96c27d4b76bc0bc73fa7bc1be69fed919159c3a
 MISC ChangeLog-2015 989 SHA256 8b97df0751948b90ec1172f428f6801ab3c40a321ed55868a9c45b278111d96d SHA512 945e5705b665360ceaee91fd1826e4ce2cecd496c6a64c3c70ac98c58f1862543de0cc42b0885c53fce7d157656cef6a2b1ea57dcccc8b8abad29fc600fae70a WHIRLPOOL 0db37117d8d0b10a0f5fc9f2a9db79048a008e6018d68183cd19c625383919fd8003ddcb0660e363f6e9b918b676a6526dd43c4ce6bbe874509ad68b6124186e
 MISC metadata.xml 394 SHA256 f2bde1fc1f78dd5dba5b7d3219be846a7ba01ee2669f025d8d25eac2ea4fad6f SHA512 c1639a4ba21f8accec3f074958e3e9ff96a4e7d66fb948c733c46b762b5b6b39fb961c5d0223fc6891b249bfaf601215ac272b979df4f811a4ec7deec8831ecb WHIRLPOOL d0eac8dfb3051305830a763701086e0625a814d9fd36fe81dbf2313bdfc941494c9465f4e007fedd3b5a01cd42e2aaae6b0dd76b8597c0049fe6ed78f4fd77d2
diff --git a/dev-perl/Inline-Python/Inline-Python-0.560.0.ebuild b/dev-perl/Inline-Python/Inline-Python-0.560.0.ebuild
new file mode 100644
index 000000000000..575cfddc122f
--- /dev/null
+++ b/dev-perl/Inline-Python/Inline-Python-0.560.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+# Feel free to add more targets after testing.
+
+DIST_AUTHOR=NINE
+DIST_VERSION=0.56
+inherit python-single-r1 perl-module
+
+DESCRIPTION="Easy implementation of Python extensions"
+
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Data-Dumper
+	>=virtual/perl-Digest-MD5-2.500.0
+	>=dev-perl/Inline-0.460.0
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=dev-perl/Proc-ProcessTable-0.530.0
+		virtual/perl-Test-Simple
+		dev-perl/Test-Deep
+		dev-perl/Test-Number-Delta
+		virtual/perl-Test
+	)
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+PATCHES=( "${FILESDIR}/${PN}-0.460.0-insanepython.patch" )
diff --git a/dev-perl/Inline-Python/Manifest b/dev-perl/Inline-Python/Manifest
index 9bf6ef49ca45..3adade8d5f59 100644
--- a/dev-perl/Inline-Python/Manifest
+++ b/dev-perl/Inline-Python/Manifest
@@ -1,6 +1,8 @@
 AUX Inline-Python-0.460.0-insanepython.patch 652 SHA256 acdd514e011d68e8a4cf76aa7a213fe06efc40955654f7573487d18d45fb819b SHA512 f9fc8e8a287801f331ac92bdbd80f665648f9fee8dc43383fe563c6ca8e0aa4d01e06b09a25408b7908e5394cb4bf496e76441c6ee5dbf0fdb7c65dc4222bac1 WHIRLPOOL 7e2c00ad20e962a7142a3c01fd0e57de4fe663b24576d57298ac00d8a2f5de0726a5f3f4cc66393531e47387788357f15b608e7f18db20671189af92c526f659
 DIST Inline-Python-0.52.tar.gz 57345 SHA256 9c946e1c9ac308d4431f07bbd3965a945850d69eab33aced6c81e674729e2ff4 SHA512 5b097740e149ae5a1a51d068f2732bff06daa03279ea3ad009b34fc72f0baccf0304989a3b9c3d9b8cadca1bb897693d48fb1a91ed3dc412c61463256a9bcaaa WHIRLPOOL ab2114881997791226b4e9005cc3d7daec553c21b0f595945abb941638b64ff85b31692c3c882edc523603c167e9dee16c8e75f5f84b8759a6f1d525b3f8755a
+DIST Inline-Python-0.56.tar.gz 58224 SHA256 ae2c437f367160ecfd6f8d6c6fe027ea6754feaa27648971c4a74e7fe934d95f SHA512 d5fffec8a377ec10c8b21ed9324e2de5a77d10304fc2a89196df89984e55869e3e4e0ef970f1aa4651068b8a6d834fa8eb18d70a052c646ddd98ef338f772e7d WHIRLPOOL f3ab40c765a0d6d6eeaef8c2ced24613fedf1e5bc8bccc6258dbab54f03d9f4edb63faabbcf5984d3dcaa02e3bec3ccf85209ab8c71e1e0306d78ef8f3974eb9
 EBUILD Inline-Python-0.520.0.ebuild 771 SHA256 09f1e30b804b5c49bcdd7464c3493f0f7ec4503c547fd7b3c52970513e885180 SHA512 7090643beaa27f26135312cd199d11353045a5c5194ba14d82bb71b12138456622aaa336df7554ae39cdecbf2ae0c386b690eae1efce75c9951980db8ed8abfe WHIRLPOOL 5eed649e3fa7e17fb2adc4e12253feeb5927a52f8281cec08bffee68d3cd662d362e037e519ea647fae50d1978df5f74b78ea128da4b2a8ecf866d43551f1a98
+EBUILD Inline-Python-0.560.0.ebuild 800 SHA256 225b164b0fdf0339aac5c9a85cbf4ef7bc5e767963e11e5d81ef6418007dcaea SHA512 7f24c8314ca1a90f39db3a83360700930227cd90c125f5711782b7398b87df4b284944e81096de460633dc7aa7d70377673353a67cb93c1b7273327787effa36 WHIRLPOOL b8265985585f102394e6e1bb28e8146c3fe391076f86ef7a751ba6a11fe0f68b723f323d56f2dfbfdc7699cd0e86510fb0fc6036582b7d17671e329dc358f5ae
 MISC ChangeLog 3224 SHA256 46c7062392a618007cf7732af36b3ab4077b46be2b429cda8c45a52b1d1b991a SHA512 590067d247b87c61a554b04d9317a7b9821e43ea4fb06fce7da9ac97d4c8bedec128b5a89e287ce7122c765fb2227b59b09790248f41a0cc237d31eb4e39bf8a WHIRLPOOL 79221a4a341dea54f833e2b73145e88f8ac286953d83acc1526bf3cd28bc36542565d003cd6fb771f385042a5e6c29c78281a2fc6333a50ad0680159b1c5fb85
 MISC ChangeLog-2015 4395 SHA256 b69a478fb9bc2603c4f0cf0f362004474f034b1a97ad789236ef1b459fde2e9b SHA512 3139fd122ca0ffef4c43a8a4133ba04f3c3963f3abac26e73c362a3ffe2bafd75ed641e293deaf2c1c93ef0319b10867fbe7f6d8d7a0719dbf16ad485cf0b298 WHIRLPOOL 24dbaaca8cd8c361c5e771fb3dabc10c93018b144eaa4f176a4f79fe37387612b79feba7f1ef9c5c5baf82ad9eaa03d32fdfebce34172596d0e378e57b5abfbb
-MISC metadata.xml 613 SHA256 4f4943e94bd6bcf8337fa7b6f819d947f14d90e396a8fcd9fad6de9afe357df0 SHA512 83bd0994320a23ef4e166daa325860f732f3f820dc614bc7ae3222847971e45a0a1fc9a9ef6bdf002efb48911ea1a27c27309e16399d0ec60bde4cef131b6a1f WHIRLPOOL 3df43cd6d693a0bb0bfac015f21fddd4e1ff95943182437cf456de2fdd634263ffbdaa11863f8003d56bcbb4f1d906c8890e50f3e39e9a6ef7b2cf6cd34d5ecd
+MISC metadata.xml 683 SHA256 0a051f7a8965c801412346852a4f562fc2a83fd307fabaa8e43d2469110490eb SHA512 03b3a3f8697b678e054251de5bea03f3344c063b1ae93e6f674e30375062ac9d125af3c428d4f0869d333ded2831617af14b7908ba55c01638534970329ea17d WHIRLPOOL 46001e54243c60536977e7618753751fecd591c4ba55266bbf94c9fea07fdaf00768414ec74f43143074a15f1f26fdef7662894dda331dea0991d1f376ad5d3f
diff --git a/dev-perl/Inline-Python/metadata.xml b/dev-perl/Inline-Python/metadata.xml
index b1f32aff849d..7639860e78fb 100644
--- a/dev-perl/Inline-Python/metadata.xml
+++ b/dev-perl/Inline-Python/metadata.xml
@@ -8,6 +8,7 @@
   <upstream>
     <remote-id type="cpan">Inline-Python</remote-id>
     <remote-id type="cpan-module">Inline::Python</remote-id>
+    <remote-id type="cpan-module">Inline::Python::Boolean</remote-id>
     <remote-id type="cpan-module">Inline::Python::Function</remote-id>
     <remote-id type="cpan-module">Inline::Python::Object</remote-id>
     <remote-id type="cpan-module">Inline::Python::Object::Data</remote-id>
diff --git a/dev-perl/JSON-Parse/JSON-Parse-0.550.0.ebuild b/dev-perl/JSON-Parse/JSON-Parse-0.550.0.ebuild
new file mode 100644
index 000000000000..ba973e727d8e
--- /dev/null
+++ b/dev-perl/JSON-Parse/JSON-Parse-0.550.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=BKB
+DIST_VERSION=0.55
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Read JSON into a Perl Variable"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="virtual/perl-Getopt-Long"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+		virtual/perl-Encode
+	)
+"
diff --git a/dev-perl/JSON-Parse/Manifest b/dev-perl/JSON-Parse/Manifest
index aa0f07c5783f..6cab513acd66 100644
--- a/dev-perl/JSON-Parse/Manifest
+++ b/dev-perl/JSON-Parse/Manifest
@@ -4,11 +4,13 @@ DIST JSON-Parse-0.46.tar.gz 72873 SHA256 657d537a93d7126d01cbc41286e0d61f066e953
 DIST JSON-Parse-0.47.tar.gz 73611 SHA256 c4d8fd3e6d609caa3dfcd2cbe8f38ddb2fc8f2de7cfe0890639e743ad11dfb6a SHA512 6a691d95cecc99f6361e5f619f1702952d8184994049454db8240875015c3bea07bbcd57436dc890fb075f20df6877f23afb0cf171bdaa1782e1c4dac478eccb WHIRLPOOL 54d4c7f57166b18153b3109f0fdb4443ce9039d3f534fb58ede012cd61b1e1f58985beb11042ffb5c85d84fba084548c9205840c6023fd23621d3a262356de7a
 DIST JSON-Parse-0.48.tar.gz 73169 SHA256 32d470f07af15778de93345d50a91a2b86c88850b9b008b91f1048d0606730f1 SHA512 62c26160bc69f418969175f77c33d3c1f90425bdb94c7544c2c2f911b358da105758a6b93f567061d8cb53cf204267cffba6cc40fbccdfd84d2ea0700b4e88e4 WHIRLPOOL 2f86ad89015d5ef14df899fa0a613c860e21073987581d66bb611903f2a8053c5d27f3c5c70cb743b21e245043bc5ca6d8ba3ad805448f6f5802c0b0110a81aa
 DIST JSON-Parse-0.49.tar.gz 74543 SHA256 e84342336d3a6d096d8e5c305a02396e2e2190dc7f1ff6a648447d49bcb979d1 SHA512 b78903470adda729c5459ea09896f4a595835f23698900eb8014ad5d66ec20c01f9d36ff997881e54dc941023a0d8c36066292322068b8f1b685618580f18c68 WHIRLPOOL d4aa260a11eebdb02a9100aa0c7bc94da9b01574feda84928490cf329f00d06ccce86c4c3ac9ec89fdada2dc048968e1b4ceaadf31d6fe4d55c0115e5c628234
+DIST JSON-Parse-0.55.tar.gz 77591 SHA256 dc9856dbc355114bcb0dc036bb632976b19b88d3a7ad59726f1fa917e7f5d256 SHA512 adb4bbf61e7aa73098bbfb03c1b3eaac6f56905cb05b7baa3a3a9047f47a24ba9dadd0dc7fd34aeaeca2a393bc577c3b85345c5ca740d2e9553c0554c39bd36c WHIRLPOOL f0091fe57b4601d55ce796db1415c324e1e9dd866c8d4c11b1e71a6bdd92704e7148c159d409782f092b3effcea79b1fa6ef4c1964a2b7611f4c206bbf367638
 EBUILD JSON-Parse-0.420.0.ebuild 432 SHA256 95c4604e4992ed233bfd008479cc7f97a1aafcab1bffdd3250df73f7e5844aac SHA512 ebacc754a9751cccbc847d3d5a1641ca1d8d1ce4cc4b88ac13f596b4a0110ceb68289f7b11d974d16fb49c40e7ef6f896368f395932c7fdc2c7bd03102a55659 WHIRLPOOL d51038b8911a2fe1ccd83330a1b2d8c342f237c4a8aa684281d676ec8c8c2010dbe4d590e42efb9efb77ed8e6e3ee12571e420062b1227050db0348c637dc291
 EBUILD JSON-Parse-0.430.0.ebuild 411 SHA256 2d469c1e9367f85cf6eed0edd5e092423b6b8938c5d466bfc7336ec6cac0a018 SHA512 24ecaa1187436c2817b9e5910fac7ac95a0d7b461290ebf7961151d7a9a67a8a9b51e546c5facba3b7e8bc2216306abe3855e8e17340ec3b73e7b6775778f921 WHIRLPOOL e2eeaed85b5f11dea621917fef79e50045b9f58f32577e59b6e9d4a8fd12aa9b9b83ae9845765625f10bc8482bd29573f60617fe4fc3d55341f08a6588db93f4
 EBUILD JSON-Parse-0.460.0.ebuild 440 SHA256 8d99b61fadef466d52c85b2c92fa1482ae1455f72c029d90d410008736cc9d73 SHA512 32ed2f0864a6896cf3c615576e6212f2be36caf9dec81b251fd631904377efddcf6889c7f1e06a3034cdf75be94b857ac722e9b1a99413e28f327db5e8cc68a8 WHIRLPOOL 917971edb16510a3f52cb31123e921f0b1b3e45e340e8ceef13932ed8ca99bdd574fb2486779fbc73fd8613b8280ed9660db251be6b9c87638a3365a561fc335
 EBUILD JSON-Parse-0.470.0.ebuild 440 SHA256 992c3e6b89e3d8629fcf9a9464c9ef7355cc5d3742d27797f867e68c176924a8 SHA512 5b8ccd2b685be1c097107fa5f6971519407d06b36db09767bb09d89a6300f5c74275c4d81d01ac7ae07dd8d2f7597f8a189b7b38b9918427e0cf927e223d7cfe WHIRLPOOL 1985666c3c4f90de5a07c882790f022b5f79ed7e53d59970ba3776415ce405c67eb13b0ff65ff2d7942cf6eff7e23c11df7fb0ea23255d0d82d5c5efbd2c0578
 EBUILD JSON-Parse-0.480.0.ebuild 440 SHA256 0734c7262bd28297c7c0dcb7169ac4f0e3973e8daef0cbd801856822ff31ea97 SHA512 30ef310d20084c11e9097ca2038701a27b201500b7170a9345745718b748e36ba4065cc56a954f1ebce1339b3956ce275dad6320d02dc39218ab92a4bda2b45e WHIRLPOOL 87aea2daf7149230a6ff5973f5a293876f377ac884a26bdc91bbbb0735e2ef8f5d848583ce8d4e89c322d4c904a857f88ef7468ace009e529c14d3f0766009b3
 EBUILD JSON-Parse-0.490.0.ebuild 440 SHA256 3112b6a7eb41308740826e742c6729ed9da62bc1ccae09bbcf1befcad42126bc SHA512 2e3220b7bfcfb7237921b1b86a1f8eddad731c38ac60da2170be909141ad5f082e4b8094ce6044c55774687ef45d6f9a290a42ce21fd0336851cd21bcb13ee34 WHIRLPOOL 41b90aff70683716f95072fc5c30b0d881d4e1e11576ce9c22c46a04263b4e55d25afb635110aebd48fffc5c3d7903c8585e9c8623f521ffcc0fa7bbb3218b54
+EBUILD JSON-Parse-0.550.0.ebuild 440 SHA256 f9aa4c351271b3e32477d27e6a03c32609df4b4437dcf4280406639ba5047056 SHA512 7dfcf9708b973ceadb48efaba63c09fbbced142adc38e54b1edf7de88aaa229ff4f2c66cf97b8d13faf56e30bc56e3479560af07fc62dcf245a5de8997b918cd WHIRLPOOL 0c60403bbbed7e606cf095b5dc40bf18594c0596fa3bd796b679ebeec3fd6f7397c6503221063dfd86b74953ecf37f0bbd07256dba3742b00b9e62bcb98753fb
 MISC ChangeLog 1800 SHA256 49402fcead3b89334fbc40ad33fe10b95b28a1c279852f80b6378f896f03c708 SHA512 f2ba40ac4cdad7744d780e252fd0ba5320ae5ff617aaf3aae5e851915cde27b046592d21500a6f0abb417dd6723895ab6e0d3ab9dce039608927c5e8b678edc9 WHIRLPOOL 1eaecc16e36b26345b565ca0ffcd08eda651412718d79b583aaa4a0690fa3df833f8424da5e38f9aebc6ecf24e9f3f1175bafa9dc41ba19f33c1a1d46267bbe0
 MISC metadata.xml 453 SHA256 93830edc140d984c642f6a7083c48ce5394bc2c252c2f740e197ce05476d43a8 SHA512 d1e4b31d3245b4e2a0f478c38121f50d30f06960679c7b5b2261303f346c9d45667696c9d415fdba826407e6d596d7d63d4a65a4b9bc863f0bda3b1275b4a22f WHIRLPOOL 1cb61cdbcc168349ff41ed78053c28a7b8b39752af0b618f61317868c7f88ef4f3bff0cd6d4796524fed5044005773c41e7ea465ae47a2d53ff943d751044e42
diff --git a/dev-perl/JSON-XS/JSON-XS-3.40.0.ebuild b/dev-perl/JSON-XS/JSON-XS-3.40.0.ebuild
new file mode 100644
index 000000000000..2e220e3310e8
--- /dev/null
+++ b/dev-perl/JSON-XS/JSON-XS-3.40.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MLEHMANN
+DIST_VERSION=3.04
+DIST_EXAMPLES=("eg/bench")
+inherit perl-module
+
+DESCRIPTION="JSON::XS - JSON serialising/deserialising, done correctly and fast"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/Types-Serialiser
+	dev-perl/common-sense
+	!<dev-perl/JSON-2.900.0
+	!<dev-perl/JSON-Any-1.310.0
+"
+DEPEND="${RDEPEND}
+	dev-perl/Canary-Stability
+	>=virtual/perl-ExtUtils-MakeMaker-6.520.0
+	test? ( virtual/perl-Test-Harness )"
diff --git a/dev-perl/JSON-XS/Manifest b/dev-perl/JSON-XS/Manifest
index c58ae8227a49..03f8dd8369ba 100644
--- a/dev-perl/JSON-XS/Manifest
+++ b/dev-perl/JSON-XS/Manifest
@@ -1,7 +1,9 @@
 DIST JSON-XS-3.01.tar.gz 78245 SHA256 4e8df3256a5aa9ed304ce1bbcd9140737deef31ba847bff9f4c15480c88c71ab SHA512 75acc0d1b8a916ff1ef08466357e77159f1c53a0e021f93a066f745bf3a67dbf18342fb7f1d8666f2ff2c54a0257ea8a9ce6efc8ce2eeefa81689d406f667733 WHIRLPOOL 0f16dfcc5b852bf07f71f15df24c597ffa2f6fea905cf159845abb8d1124c9c36005cf5743f89a5ab46c28f9688d367a8b08a6b4fc28964eec5b87d5190f0e44
 DIST JSON-XS-3.03.tar.gz 83303 SHA256 699e8e3e516e2ea9e05d8ca769dc1f31b36b7a0830e100004f016a702e876dde SHA512 757dc3bff01860d348e3bbb0c68ddef6a80e25f74b812b1969e57f4284724fc92828014c059a91c232ba100b5c96d41257272900db48395b484d6eeb540c5db8 WHIRLPOOL fbeb37c203064b7522cd2febca8f51ab5e0f9cbf439525323d15876c875fe730303e099a640a82a2aa52f7853625e288751d93eb6058f8324e7bed3f9d7ad3f5
+DIST JSON-XS-3.04.tar.gz 83424 SHA256 65d8836bd8ea6f0b7bffc70b2212156adc3e2ffa587e27e548d576893f097c2c SHA512 69c2e199385b5b5e331d905b64805304de80e1a3b393acaf7dce21c45254b1f23f1a83b246dcd3a80c2cfdadaf8ce3634ee587c469629cb69106f0c2239c73db WHIRLPOOL 8f941c66fcdb7bf7b3673ad4360e9503ce5e7102032bdd7a9ee62dcfdbb80439b449a183d54b2d3d46d57acb66fa2bb70dabda47db219c09b3fceca7400bdb5e
 EBUILD JSON-XS-3.10.0.ebuild 567 SHA256 da5cc8cd5d237d130c288bb27cafaf4a0538a14ea37386567e1905ed2409f0f4 SHA512 4a31de3344bdf0c1bcd265c395ab9acdd7666e9ad0cbfe42a7b4f69edd283229a0134e165cd847f0ea8f21d694d81ea848a6e420b936ed7127723bd013f7ff00 WHIRLPOOL 8945559e5d8b900e55537c22362e5c1b33ab3a8fed70ac774145ea5b5d8657f7887b7c00fd332785ef3e09c745ccc5f0ad4d6196e9c16323b243c08fddfeb3c5
 EBUILD JSON-XS-3.30.0.ebuild 641 SHA256 e76cd9dfdd729bd223dac1ea6ee20a65df07a770a345089f4ad57a6d2ba5f4b6 SHA512 2873b8afce78193e0825f0d7308ff3b4c090cdcca5ee9e3a138984989091225c69c5a06987bf7ccc122cb49c22d39ad0cc0dad2df8238ac2950096c3bc00bf83 WHIRLPOOL 41c02aa2c812b68fba7f647e0e01fbba217becf85174887aab7599cd1a8373122e2278018b5388ef71406e03ab051f2afbeeaeafe525fb7cfad06002b940a36a
+EBUILD JSON-XS-3.40.0.ebuild 641 SHA256 d0861f7bc0b4c5597fddef3b7b79c582aa33640c4f534c5a0f8f1c908b058962 SHA512 b9d2cca1cd57875fc47f67db47266ed701d3d55a29529315c4d07c57c57a9213b711ee3febe9b82d85180f8b2bd83597cc6deae599eb0a9d69ed9f4c9d5e38e9 WHIRLPOOL d01f85cc44460a9bdc20910213e48aed2ae22d2bad20c7f76b8645581cc0a309e455ac5480dfaaae84621908910c8c08778439bffe709cc2fa15e07923977c7c
 MISC ChangeLog 3657 SHA256 0c43c2462b567bd737a41465a7eef7de3e53de2f039938c946a2777cd9f6eaa4 SHA512 70871f8d9efc4202705748064d7d1db8a6965ab6a63036f15d8686d240e6ce6f33668edfd8c1c15c6bf1976043bc6a888de5c63c915aaba82d81091d562aff09 WHIRLPOOL 964457080c6c823490401e1688f63e7d11590ef0b3b2dc6cfbace78484897c657f886b8b533bd9ceb4767fb4218c641801fc6a6e5dbe641000926e5233cfe7e5
 MISC ChangeLog-2015 5831 SHA256 5bb26ae9ed3b98e19f8b9d16edf034e9186853ccb7d0126de20975c38b2f94a4 SHA512 ac0999fd277cdc92d05fbcfb2cbab68875078320a22af1579e5922bc64d61faf091cb04c634b60cf611d49d32e325c33804944cfd7c0eba9c384bbb2b74e1282 WHIRLPOOL 8c820a7d765c9fd5217f1b4f84b10b07a905e7b39d498da8e3a344389dec2bc3be35a55684328647711a358f7fb0637c0ff5324f34d4232d2a2678477e727057
 MISC metadata.xml 386 SHA256 6c939e1153d017aedfc1ed5a49313573b07b17b76f596e2c378af705c34ab189 SHA512 929eec3831d4f9accf2ea3dda8eddf68f49c905d299f433ad01f854e7ee8a537854c84c22581545f3a0a4a2076322c2eeae485a9ed58789b23382055c752fa30 WHIRLPOOL 33816f6170c8f48d67519fefd6f63480bc17afcae19bc3ba60e02eedfec5f96dbfb965f220b934f162b74c51e6352f38548cf2e0563f5ed4974c29ad7ed957ce
diff --git a/dev-perl/JavaScript-SpiderMonkey/JavaScript-SpiderMonkey-0.210.0-r1.ebuild b/dev-perl/JavaScript-SpiderMonkey/JavaScript-SpiderMonkey-0.210.0-r1.ebuild
index 1bcd74535a3f..f706b2f4e578 100644
--- a/dev-perl/JavaScript-SpiderMonkey/JavaScript-SpiderMonkey-0.210.0-r1.ebuild
+++ b/dev-perl/JavaScript-SpiderMonkey/JavaScript-SpiderMonkey-0.210.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,9 +18,9 @@ RDEPEND="dev-perl/Log-Log4perl
 DEPEND="${RDEPEND}
 	dev-perl/ExtUtils-PkgConfig"
 
-src_prepare() {
-	epatch "${FILESDIR}"/mozjs185.patch
-	perl-module_src_prepare
-}
+PATCHES=(
+	"${FILESDIR}/mozjs185.patch"
+	"${FILESDIR}/${P}-no-dot-inc.patch"
+)
 
 SRC_TEST=do
diff --git a/dev-perl/JavaScript-SpiderMonkey/Manifest b/dev-perl/JavaScript-SpiderMonkey/Manifest
index f54752f87c3d..126020386fb8 100644
--- a/dev-perl/JavaScript-SpiderMonkey/Manifest
+++ b/dev-perl/JavaScript-SpiderMonkey/Manifest
@@ -1,6 +1,7 @@
-AUX mozjs185.patch 13492 SHA256 d6ff0ff942088d6984f23f34257a314b5572100825c933ebf33c00817ce3c42f SHA512 237e804612e37d6347291e08bd2cfb5469c990f437ad3fbb4c4c7692fdd3ad7775a9f7571d343a1e8f5ce8552b05f6e396c4035c1fdca2a43cdcd4e997aff947 WHIRLPOOL 739c72b78e2a97074a41bac640f24622dd25902227245309df891f830d251655b60fa93f897a70d173bd5eeb4d8ded49e310dfd23dd0f95e1c17718ff3344f0f
+AUX JavaScript-SpiderMonkey-0.210.0-no-dot-inc.patch 3235 SHA256 965d21a5ae52ed6f7d9c90147e636864c9737a8e89f2a9fefa1d894ab0fbd121 SHA512 92c89a8e8c3e1a295ec40567b207c20f0c8f10bc36ef1327a97629da541bf924ff91bc4ff6d3d82c54a4889f3571b4f6f6d56a1dabdb81629f6b72293384cd2b WHIRLPOOL 548f9fb3c000620ba91f456d39792997e87e76418566c36a9600766f26db4eadb0b99ba87830b97d91478d3fba9ec7ba028b87a2d04cd5d3f7d0cf41b41888fc
+AUX mozjs185.patch 14890 SHA256 9db5e7cfb449d51e4ba90b35706cfcf6a048ab8c7fc6ae0cfe4065b392fafb6a SHA512 23c111d840b59fd6663dd642c2fa17a1abba719b0bc797de06f002c8f7e53f83d2ad3d4eba0923adb0f42c57abfce8d3e35b22e725c0857b319c79a392b9e2f9 WHIRLPOOL c270d23a47fe917f1ba708e5e2fcedbceebe9df8ea41d321d66334cb300f12f1fb41711a071ef821daf0c62c0775eec1a117cf57de5435645ef096fb4efe6ae0
 DIST JavaScript-SpiderMonkey-0.21.tar.gz 19494 SHA256 7bd1879afaf4d73f37adaab6464611a466c1b93d4fe23509d81eedf428809a1a SHA512 5a1e26d8ee15c73a566715ac150ac597e6bbf542629bf1884ae623478ed6dd1085b4afc02ab6a152c7407239ba46a9d30f9472fc6375fab823815b38372fb1ec WHIRLPOOL f7eee6e66a6945468060fded8a0b195c0a1b33df044aab1dd1cf8d630533746c11b8fa978371ee6030d1ff0c60805d4f742cd22547126080b05bcf11ab9cb6a0
-EBUILD JavaScript-SpiderMonkey-0.210.0-r1.ebuild 490 SHA256 a57943e45589815beef9dc828a8269d9c017069d021040a2c31d185ff1812c5a SHA512 41448daec28cbcc185fdde09034d437ca770ee2c9c08409abc39cc22416df0d8ebf2618a81b35edd9a683c26a74533e637fd403d8b30524ee55ede3e12b01a05 WHIRLPOOL 86333a092a7b0066261a59659251675d903f254c98137ee1c3cb6d7b93f2ac346850c32746e17da0bad5fd35cc502068ba40194539acde5701c41ec7e85a5fd1
+EBUILD JavaScript-SpiderMonkey-0.210.0-r1.ebuild 489 SHA256 52c6e759f3ae8c68737fca3b6b0ad27f85425625d059db2fa9f6a3966ba71ec4 SHA512 661bb5146d328d5d1ebde3856e2982b981e9f4013a9c3b629ef77c13015aad446c57cfecba0a1a512de1d5c1da614d86e7a37838f41bb159f6ba99378cef25be WHIRLPOOL bb9e5303a19e176608c6c7f2384a70b0311ab542190d763adc1bf2fc810d45f725264563c782f8e7bb068d2f1996b3106436c8d4e6e886c7f0404df84ff83e98
 MISC ChangeLog 2679 SHA256 f5a64f3816ea1816653f4ae0d505748a1b984246e8d4300b50b7771225a0bcb7 SHA512 3ffd59949572d3861fd1abfebcc6b4b22109153d747b141f78d9caf2c772e08edfd06b6a0a634f376c47196bee4d666c2a56b57cbeceb7083de7042ed44fc22a WHIRLPOOL 31868285d91137bb34e6d90d7ee6daab7abc3ffd14e3b67c5e1bb5ccd37c5c94ccbf469324b8894dc58e89e1e5d57a1abcba9242e7e5a650c5c0116184732942
 MISC ChangeLog-2015 2082 SHA256 35835bae4cc52e847c8e52e6963585a6b6c14efe8c7a42148af647f9e8a8a959 SHA512 d681a8ef47142b8f29193c4ec49ee0e2d583a7f6a7d0743708b98eb82e1ad001821a9cf5d4b87355fcf058ceae79cc46dcfbcb0bad5f71d9bee369d923c1300f WHIRLPOOL 5d9438026055dd8b5f364ee5ad41087810535bc2957df63f1f66b510a797ad24e8096ce8833e78b5ceb5badb83d6369ec8ebef56f35844d4e692fa03b8845314
 MISC metadata.xml 418 SHA256 4cdd1097ea72756d0a02aaaa8b1cd206051eee4a36557cc8601595d1dc15e478 SHA512 272a2732f91a987ddc8859d39b1589f453ad1bd4f5c410c6c014b680670368a48a4835eb92ef0eb764e57e53ca8e688179db420056097d7ff2cf7cd4ec3b47db WHIRLPOOL 471d77d7bdbe8c3e2cb4242437b43541fa641d4210158fcd638e0b0ef8c24a7926b9af7ae38dfc7608991cfbded76c62421f567779e87f4389081015633fb69a
diff --git a/dev-perl/JavaScript-SpiderMonkey/files/JavaScript-SpiderMonkey-0.210.0-no-dot-inc.patch b/dev-perl/JavaScript-SpiderMonkey/files/JavaScript-SpiderMonkey-0.210.0-no-dot-inc.patch
new file mode 100644
index 000000000000..f76aaa95a1ce
--- /dev/null
+++ b/dev-perl/JavaScript-SpiderMonkey/files/JavaScript-SpiderMonkey-0.210.0-no-dot-inc.patch
@@ -0,0 +1,167 @@
+From c89a871ead0a961f8a0125d875cbe28974e23f29 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Thu, 26 Oct 2017 18:50:34 +1300
+Subject: Fix test failures without '.' in @INC
+
+Bug: https://bugs.gentoo.org/617006
+Bug: https://rt.cpan.org/Ticket/Display.html?id=121452
+---
+ t/00array.t     | 2 +-
+ t/01doc-href.t  | 2 +-
+ t/02nav-appv.t  | 2 +-
+ t/03doc-write.t | 2 +-
+ t/04loop.t      | 2 +-
+ t/05form.t      | 2 +-
+ t/06form2.t     | 2 +-
+ t/07func.t      | 2 +-
+ t/08func2.t     | 2 +-
+ t/09meth.t      | 2 +-
+ t/10elobj.t     | 2 +-
+ 11 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/t/00array.t b/t/00array.t
+index 3bd85a6..ba36807 100755
+--- a/t/00array.t
++++ b/t/00array.t
+@@ -5,7 +5,7 @@
+ print "1..1\n";
+ 
+ $init = "";
+-require "t/init.pl";
++require "./t/init.pl";
+ 
+ $js->array_by_path("document.form");
+ 
+diff --git a/t/01doc-href.t b/t/01doc-href.t
+index 7f79c95..c545ca7 100755
+--- a/t/01doc-href.t
++++ b/t/01doc-href.t
+@@ -6,7 +6,7 @@ print "1..1\n";
+ 
+ $init = "";
+ 
+-require "t/init.pl";
++require "./t/init.pl";
+ 
+ my $source = <<EOT;
+ $init
+diff --git a/t/02nav-appv.t b/t/02nav-appv.t
+index d038f3e..2e0d7f6 100755
+--- a/t/02nav-appv.t
++++ b/t/02nav-appv.t
+@@ -5,7 +5,7 @@
+ print "1..1\n";
+ 
+ $init = "";
+-require "t/init.pl";
++require "./t/init.pl";
+ 
+ my $source = <<EOT;
+ $init
+diff --git a/t/03doc-write.t b/t/03doc-write.t
+index 9b38e21..f757592 100755
+--- a/t/03doc-write.t
++++ b/t/03doc-write.t
+@@ -5,7 +5,7 @@
+ print "1..1\n";
+ 
+ $init = "";
+-require "t/init.pl";
++require "./t/init.pl";
+ 
+ my $source = <<EOT;
+ $init
+diff --git a/t/04loop.t b/t/04loop.t
+index 3757c1d..768067a 100755
+--- a/t/04loop.t
++++ b/t/04loop.t
+@@ -5,7 +5,7 @@
+ print "1..1\n";
+ 
+ $init = "";
+-require "t/init.pl";
++require "./t/init.pl";
+ 
+ my $source = <<EOT;
+ $init
+diff --git a/t/05form.t b/t/05form.t
+index 0dc763a..3212d05 100755
+--- a/t/05form.t
++++ b/t/05form.t
+@@ -5,7 +5,7 @@
+ print "1..1\n";
+ 
+ $init = "";
+-require "t/init.pl";
++require "./t/init.pl";
+ 
+ my $source = <<EOT;
+ $init
+diff --git a/t/06form2.t b/t/06form2.t
+index 9aacb7a..fdf1bd2 100755
+--- a/t/06form2.t
++++ b/t/06form2.t
+@@ -5,7 +5,7 @@
+ print "1..1\n";
+ 
+ $init = "";
+-require "t/init.pl";
++require "./t/init.pl";
+ 
+ my $a = $js->array_by_path("document.array");
+ my $e = $js->array_set_element($a, 0, "gurkenhobel"); 
+diff --git a/t/07func.t b/t/07func.t
+index c0f95cc..9b12633 100644
+--- a/t/07func.t
++++ b/t/07func.t
+@@ -6,7 +6,7 @@ print "1..1\n";
+ 
+ $init   = "";
+ $buffer = "";
+-require "t/init.pl";
++require "./t/init.pl";
+ 
+ my $source = <<EOT;
+ $init
+diff --git a/t/08func2.t b/t/08func2.t
+index 6b49ef7..95c7749 100644
+--- a/t/08func2.t
++++ b/t/08func2.t
+@@ -5,7 +5,7 @@
+ print "1..1\n";
+ 
+ $init = "";
+-require "t/init.pl";
++require "./t/init.pl";
+ 
+ $args = "";
+ 
+diff --git a/t/09meth.t b/t/09meth.t
+index 4b5da81..2b86a9c 100644
+--- a/t/09meth.t
++++ b/t/09meth.t
+@@ -5,7 +5,7 @@
+ print "1..1\n";
+ 
+ $init = "";
+-require "t/init.pl";
++require "./t/init.pl";
+ 
+ $args = "";
+ 
+diff --git a/t/10elobj.t b/t/10elobj.t
+index d4eca5c..2c097b9 100644
+--- a/t/10elobj.t
++++ b/t/10elobj.t
+@@ -5,7 +5,7 @@
+ print "1..1\n";
+ 
+ $init = "";
+-require "t/init.pl";
++require "./t/init.pl";
+ 
+ $submitted = "0";
+ 
+-- 
+2.14.3
+
diff --git a/dev-perl/JavaScript-SpiderMonkey/files/mozjs185.patch b/dev-perl/JavaScript-SpiderMonkey/files/mozjs185.patch
index 5ba0f32a8fc6..788a523b8c8b 100644
--- a/dev-perl/JavaScript-SpiderMonkey/files/mozjs185.patch
+++ b/dev-perl/JavaScript-SpiderMonkey/files/mozjs185.patch
@@ -1,6 +1,22 @@
-diff -ur a/Makefile.PL b/Makefile.PL
---- a/Makefile.PL	2010-05-29 02:43:06.000000000 -0400
-+++ b/Makefile.PL	2012-10-11 14:56:18.000000000 -0400
+From 9c0fbdce2ee643c23b3be8fa391b779fc6afbab3 Mon Sep 17 00:00:00 2001
+From: Ian Stakenvicius <axs@gentoo.org>
+Date: Fri, 12 Oct 2012 08:09:57 +1300
+Subject: Support spidermonkey 1.8.5 and newer
+
+Fix support for x86_64
+
+Bug: https://bugs.gentoo.org/404129
+---
+ Makefile.PL     |  44 ++++++++++++-----
+ SpiderMonkey.pm |   5 +-
+ SpiderMonkey.xs | 150 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
+ t/error.t       |   2 +-
+ 4 files changed, 180 insertions(+), 21 deletions(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index 901b773..6095dcd 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
 @@ -12,6 +12,7 @@
  ######################################################################
  
@@ -9,8 +25,8 @@ diff -ur a/Makefile.PL b/Makefile.PL
  use Getopt::Long;
  
  # Get the right lib and include dirs for different platforms
-@@ -37,7 +38,7 @@
-   "/usr/lib/firefox" => "/usr/include/firefox",
+@@ -39,7 +40,7 @@ my %possible_install_paths = (
+   "/opt/local/lib"   => "/opt/local/include",    # MacPorts
  );
  
 -my ($JS_LIB_DIR, @JS_INCL_DIRS, $JS_LIB_NAME);
@@ -18,7 +34,7 @@ diff -ur a/Makefile.PL b/Makefile.PL
  
  #### Determine compile options
  ##############################
-@@ -57,6 +58,19 @@
+@@ -59,6 +60,19 @@ GetOptions(
    "JS_LIB_DIR=s"    => \$JS_LIB_DIR,
    "JS_LIB_NAME=s"   => \$JS_LIB_NAME,         
  );
@@ -38,7 +54,7 @@ diff -ur a/Makefile.PL b/Makefile.PL
  if ($JS_LIB_DIR) {
      push @JS_INCL_DIRS, $JS_LIB_DIR;
  }
-@@ -78,13 +92,15 @@
+@@ -80,13 +94,15 @@ foreach my $install_path(keys %possible_install_paths) {
          }
        }
        if (scalar(@JS_INCL_DIRS) == scalar(@c_header_files)) {
@@ -55,7 +71,7 @@ diff -ur a/Makefile.PL b/Makefile.PL
          last;
        } else {
          @JS_INCL_DIRS = ();
-@@ -94,15 +110,22 @@
+@@ -96,15 +112,22 @@ foreach my $install_path(keys %possible_install_paths) {
    }
    last if $JS_LIB_DIR;
  }
@@ -79,7 +95,7 @@ diff -ur a/Makefile.PL b/Makefile.PL
      print <<EOT;
  
  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-@@ -111,17 +134,13 @@
+@@ -113,17 +136,13 @@ README file on how to download, compile and link it.
  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  
  EOT
@@ -100,7 +116,7 @@ diff -ur a/Makefile.PL b/Makefile.PL
  ## Determine library name and system-related defines
  if ($^O ne 'MSWin32') {
    $JS_DEFINE  = '-DXP_UNIX';
-@@ -160,10 +179,11 @@
+@@ -162,10 +181,11 @@ WriteMakefile(
      ($] >= 5.005 ?    ## Add these new keywords supported since 5.005
        (ABSTRACT_FROM => 'SpiderMonkey.pm', # retrieve abstract from module
         AUTHOR     => 'Mike Schilli <m@perlmeister.com>') : ()),
@@ -114,10 +130,11 @@ diff -ur a/Makefile.PL b/Makefile.PL
  	# Un-comment this if you add C files to link with later:
      # 'OBJECT'		=> '$(O_FILES)', # link all the C files too
  );
-diff -ur a/SpiderMonkey.pm b/SpiderMonkey.pm
---- a/SpiderMonkey.pm	2010-05-29 02:49:31.000000000 -0400
-+++ b/SpiderMonkey.pm	2012-10-11 14:56:18.000000000 -0400
-@@ -161,9 +161,8 @@
+diff --git a/SpiderMonkey.pm b/SpiderMonkey.pm
+index 223204a..de210c3 100644
+--- a/SpiderMonkey.pm
++++ b/SpiderMonkey.pm
+@@ -162,9 +162,8 @@ sub init {
      $self->{global_class} = 
          JavaScript::SpiderMonkey::JS_GlobalClass();
      $self->{global_object} = 
@@ -129,9 +146,10 @@ diff -ur a/SpiderMonkey.pm b/SpiderMonkey.pm
  
      JavaScript::SpiderMonkey::JS_InitStandardClasses($self->{context}, 
                                                       $self->{global_object});
-diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs
---- a/SpiderMonkey.xs	2010-05-29 02:49:31.000000000 -0400
-+++ b/SpiderMonkey.xs	2012-10-11 14:56:18.000000000 -0400
+diff --git a/SpiderMonkey.xs b/SpiderMonkey.xs
+index 4d97117..1cfc9a5 100644
+--- a/SpiderMonkey.xs
++++ b/SpiderMonkey.xs
 @@ -20,10 +20,13 @@
  #define snprintf _snprintf 
  #endif
@@ -147,7 +165,7 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs
      JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,
      JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub,   JS_FinalizeStub
  };
-@@ -67,10 +70,18 @@
+@@ -67,10 +70,18 @@ JSBool getsetter_dispatcher(
           * I hope all reasonable machines can hold an address in
           * an int.
           */
@@ -167,7 +185,7 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs
      PUTBACK;
      call_pv("JavaScript::SpiderMonkey::getsetter_dispatcher", G_DISCARD);
      FREETMPS;
-@@ -83,10 +94,21 @@
+@@ -83,10 +94,21 @@ JSBool getsetter_dispatcher(
  JSBool getter_dispatcher(
      JSContext *cx, 
      JSObject  *obj,
@@ -189,7 +207,7 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs
      return getsetter_dispatcher(cx, obj, id, vp, "getter");
  }
  
-@@ -94,10 +116,22 @@
+@@ -94,10 +116,22 @@ JSBool getter_dispatcher(
  JSBool setter_dispatcher(
      JSContext *cx, 
      JSObject  *obj,
@@ -212,7 +230,7 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs
      return getsetter_dispatcher(cx, obj, id, vp, "setter");
  }
  
-@@ -128,10 +162,19 @@
+@@ -128,10 +162,19 @@ int debug_enabled(
  
  /* --------------------------------------------------------------------- */
  static JSBool
@@ -232,7 +250,7 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs
      SV          *sv;
      char        *n_jstr;
      int         n_jnum;
-@@ -149,12 +192,20 @@
+@@ -149,12 +192,20 @@ FunctionDispatcher(JSContext *cx, JSObject *obj, uintN argc,
      ENTER ; 
      SAVETMPS ;
      PUSHMARK(SP);
@@ -255,7 +273,7 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs
      }
      PUTBACK;
      count = call_pv("JavaScript::SpiderMonkey::function_dispatcher", G_SCALAR);
-@@ -174,7 +225,11 @@
+@@ -174,7 +225,11 @@ FunctionDispatcher(JSContext *cx, JSObject *obj, uintN argc,
  
              if(Debug)
                  fprintf(stderr, "DEBUG: %lx is a ref!\n", (long) sv);
@@ -268,7 +286,7 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs
          }
          else if(SvIOK(sv)) {
              /* It appears that we have been sent an int return
-@@ -183,7 +238,11 @@
+@@ -183,7 +238,11 @@ FunctionDispatcher(JSContext *cx, JSObject *obj, uintN argc,
              n_jnum=SvIV(sv);
              if(Debug)
                  fprintf(stderr, "DEBUG: %lx is an int (%d)\n", (long) sv,n_jnum);
@@ -280,7 +298,7 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs
          } else if(SvNOK(sv)) {
              /* It appears that we have been sent an double return
               * value.  Thats fine we can give javascript an double
-@@ -192,11 +251,20 @@
+@@ -192,11 +251,20 @@ FunctionDispatcher(JSContext *cx, JSObject *obj, uintN argc,
  
              if(Debug) 
                  fprintf(stderr, "DEBUG: %lx is a double(%f)\n", (long) sv,n_jdbl);
@@ -301,7 +319,7 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs
          }
      }
  
-@@ -240,8 +308,13 @@
+@@ -240,8 +308,13 @@ ErrorReporter(JSContext *cx, const char *message, JSErrorReport *report) {
  }
  
  /* --------------------------------------------------------------------- */
@@ -315,7 +333,7 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs
  /* --------------------------------------------------------------------- */
    PJS_Context* pcx = (PJS_Context*) JS_GetContextPrivate(cx);
  
-@@ -374,11 +447,46 @@
+@@ -374,11 +447,46 @@ JS_NewObject(cx, class, proto, parent)
      JSObject *obj;
      CODE:
      {
@@ -362,7 +380,7 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs
      }
      OUTPUT:
      RETVAL
-@@ -404,6 +512,9 @@
+@@ -404,6 +512,9 @@ JS_InitClass(cx, iobj, parent_proto, clasp, constructor, nargs, ps, fs, static_p
      na = (uintN) nargs;
      CODE:
      {
@@ -372,7 +390,7 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs
          obj = JS_InitClass(cx, iobj, parent_proto, clasp,
                             constructor, nargs, ps, fs, static_ps,
                             static_fs);
-@@ -411,6 +522,9 @@
+@@ -411,6 +522,9 @@ JS_InitClass(cx, iobj, parent_proto, clasp, constructor, nargs, ps, fs, static_p
              XSRETURN_UNDEF;
          }
          RETVAL = obj;
@@ -382,7 +400,7 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs
      }
      OUTPUT:
      RETVAL
-@@ -469,11 +583,17 @@
+@@ -469,11 +583,17 @@ JS_InitStandardClasses(cx, gobj)
      JSBool rc;
      CODE:
      {
@@ -400,7 +418,7 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs
      }
      OUTPUT:
      RETVAL
-@@ -582,10 +702,18 @@
+@@ -582,10 +702,18 @@ JS_GetProperty(cx, obj, name)
          rc = JS_GetProperty(cx, obj, name, &vp);
          if(rc) {
              str = JS_ValueToString(cx, vp);
@@ -419,7 +437,7 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs
              }
          } else {
              sv = &PL_sv_undef;
-@@ -675,10 +803,18 @@
+@@ -675,10 +803,18 @@ JS_GetElement(cx, obj, idx)
          rc = JS_GetElement(cx, obj, idx, &vp);
          if(rc) {
              str = JS_ValueToString(cx, vp);
@@ -438,7 +456,7 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs
              }
          } else {
              sv = &PL_sv_undef;
-@@ -718,7 +854,11 @@
+@@ -718,7 +854,11 @@ JS_SetMaxBranchOperations(cx, max_branch_operations)
          PJS_Context* pcx = (PJS_Context *) JS_GetContextPrivate(cx);
          pcx->branch_count = 0;
          pcx->branch_max = max_branch_operations;
@@ -450,10 +468,11 @@ diff -ur a/SpiderMonkey.xs b/SpiderMonkey.xs
      }
      OUTPUT:
  
-diff -ur a/t/error.t b/t/error.t
---- a/t/error.t	2010-05-28 13:02:43.000000000 -0400
-+++ b/t/error.t	2012-10-11 14:56:18.000000000 -0400
-@@ -9,7 +9,7 @@
+diff --git a/t/error.t b/t/error.t
+index 732226c..de977a1 100644
+--- a/t/error.t
++++ b/t/error.t
+@@ -9,7 +9,7 @@ my $js1 = JavaScript::SpiderMonkey->new ();
  $js1->init ();
  ok (!$js1->eval ($jscode1));
  ok ($@ !~ "\n");
@@ -462,3 +481,6 @@ diff -ur a/t/error.t b/t/error.t
  #print "$@\n";
  my $jscode2 =<<EOF;
  var fruit = non_existant_function ();
+-- 
+2.14.3
+
diff --git a/dev-perl/LWPx-ParanoidAgent/LWPx-ParanoidAgent-1.120.0.ebuild b/dev-perl/LWPx-ParanoidAgent/LWPx-ParanoidAgent-1.120.0.ebuild
new file mode 100644
index 000000000000..a45d634a7c9f
--- /dev/null
+++ b/dev-perl/LWPx-ParanoidAgent/LWPx-ParanoidAgent-1.120.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_SECTION=lwp
+DIST_AUTHOR=SAXJAZMAN
+DIST_VERSION=1.12
+inherit perl-module
+
+DESCRIPTION="Subclass of LWP::UserAgent that protects you from harm"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-perl/libwww-perl
+	dev-perl/Net-DNS
+	virtual/perl-Time-HiRes
+"
+RDEPEND="${DEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+src_test() {
+	local my_test_control
+	my_test_control=${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}
+	if has network ${my_test_control}; then
+		einfo "Enabling ONLINE_TESTS"
+		export ONLINE_TESTS=1
+	else
+		ewarn "Comprehensive testing requires network access. For details see:"
+		ewarn "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/${CATEGORY}/${PN}"
+	fi
+	perl_rm_files t/40-slowserver.t t/50-stuckserver.t
+	perl-module_src_test
+}
diff --git a/dev-perl/LWPx-ParanoidAgent/Manifest b/dev-perl/LWPx-ParanoidAgent/Manifest
index 06a75f9187ea..d93eee8ebe28 100644
--- a/dev-perl/LWPx-ParanoidAgent/Manifest
+++ b/dev-perl/LWPx-ParanoidAgent/Manifest
@@ -1,5 +1,7 @@
 DIST LWPx-ParanoidAgent-1.10.tar.gz 17665 SHA256 84130aa89cba829fe6a25c9356474e3bf15eaccd6319a71d4ea0e356cf356044 SHA512 8a1a1cdc4ab826b66abedfbbe7baee694d1083fc6dce2c2f6b69bf5e369ef0212ffdcd2afc9fadafa9977e3be9f7a4e4b1ea092e6c6773c1f9fc356c87c5434d WHIRLPOOL 398140fd71d5908812011c5ce81e6ad661c35b6042538a650c96777dbe985e215bb92cdda1441db85d24a50d9a0a33249d019aad9b48c8ead267b3a792933401
+DIST LWPx-ParanoidAgent-1.12.tar.gz 57426 SHA256 cc041aedb74e183cdf91cbebca1c7bd6d764fdee68fbdc84f2be08bde4e0d03d SHA512 96c380bedfc47802e4167fc1e96dffac8544b74c5b29082728196cd709cd8997caf5c715f06a7d37aca7dbfb1bba1e452618e5711fb250d798beb1fc7a49134b WHIRLPOOL 5473b669f01988f0d49856ce0ff1ed8da90060cb66045c588961e70764cad307c10cfc5a77f1b19ecccf80ba11668cd0542a5a23b16615c7955d2751bd0eb089
 EBUILD LWPx-ParanoidAgent-1.100.0.ebuild 729 SHA256 88ca88fc5dd070d6f7da84d24deeda0795ac40ceccfe099115fc540f7affee3f SHA512 aa6eaf45349ba7de9a887634bd8e1671a1d9d259c8d601f7d8f1fdadc4d1c06487229714820b809619f25f8e02e0cec6bc8541402551b14421694a2c6a456ad9 WHIRLPOOL 510b57bb8ca9d99f53dcf652536988f0049429fa662d292aaafe5af59d6e8eb2f3b68bc4d4602cba60d745f8589c9822a40cf2f9c9854e5836189309fcdcf8b1
+EBUILD LWPx-ParanoidAgent-1.120.0.ebuild 874 SHA256 ed8e2a9ec53810c409687f1faf8695d73ea4887770456eae0d2a2af294fc08ba SHA512 85cbd057266d59fc4879a192384cbfedfb14cb971e9f1ef7c5f9d48d4e33ff58c22d755dc19b556b7b77338124b746750f822045f0f230691b2d239fd56a9b7b WHIRLPOOL 07cc7339d50ae78fd2e43ad2bb0af1bc6c856c13a69c2feb829d5cbf975dbc984742aab556b1188ca9b773bc60a4dff6f967eb8853d76839656207474d6249d2
 MISC ChangeLog 3229 SHA256 a9e691eab99dc613aded03197e7eb941b8796702aaa7244b6e6ae33a9dc1bd62 SHA512 fa79c869eac84664c4c280f86ab008a8315677a589c791eda533e067077407dca13808b2df848a37cd58483d407d87c4b8aef32e44d00f07adceb45fc0ec576a WHIRLPOOL 411ed15f6ffc0c50c8df077be3fbd3c84f14ffbdf2225e25ad31df0ff4c9b66d6c4479e3e8437e4b9c4e8bdd44e0d84f5612b9fc6a9957c0acfe36624e2c290d
 MISC ChangeLog-2015 1856 SHA256 264a11ffb990f6c2de3674cf5652ebb32ebd265f3a28b0b76e7482f315227072 SHA512 a9da0693dacac30a9d0e99297c85ad3f8646e89d90bf3749eda02733b613f523ec5f6f6f17f6838545bc031b1df28c142f84d5fcfdf9c4f3106eeb791e3ac068 WHIRLPOOL beb5e05a6c1e24f816d2fd5e04804bfda8763248caf978e977f279ea0002575848cafac454eef876e70e4ee58e7b6ebf5b9a9e78db33eda4f004d19edf219eda
 MISC metadata.xml 821 SHA256 a5db1bdee30145a5f71185732bdfb4324bb3bb0f81a680447f8af880daba989b SHA512 d71e0e650604e1dcb7b90072375b62660d50835d2148d7792119ebb0ad2c6491c29942c5cffcfef4b2dc77535b355a71dc61ce2666b59de92b97192e1fe6a042 WHIRLPOOL 700fa3e5c501f4dad4ec7cf06e8253cb80b374df07d6b706266d979d9854e5ae30aff2dee7c60d643eb7b2dae800b64eebf12f6e4bb7d4907c136d4a2623b763
diff --git a/dev-perl/LaTeX-Driver/LaTeX-Driver-0.200.4.ebuild b/dev-perl/LaTeX-Driver/LaTeX-Driver-0.200.4.ebuild
index 239b44ef5140..5af597d3e678 100644
--- a/dev-perl/LaTeX-Driver/LaTeX-Driver-0.200.4.ebuild
+++ b/dev-perl/LaTeX-Driver/LaTeX-Driver-0.200.4.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? (
-		app-text/texlive
+		app-text/texlive-core
 		dev-texlive/texlive-latexextra
 	)
 "
diff --git a/dev-perl/LaTeX-Driver/LaTeX-Driver-0.300.2.ebuild b/dev-perl/LaTeX-Driver/LaTeX-Driver-0.300.2.ebuild
new file mode 100644
index 000000000000..dcecf72ede33
--- /dev/null
+++ b/dev-perl/LaTeX-Driver/LaTeX-Driver-0.300.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=EINHVERFR
+DIST_VERSION=0.300.2
+inherit perl-module
+
+DESCRIPTION="Perl encapsulation of invoking the Latex programs"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/Capture-Tiny
+	dev-perl/Class-Accessor
+	dev-perl/Exception-Class
+	dev-perl/File-Slurp
+	virtual/perl-File-Spec
+	dev-perl/File-pushd
+	virtual/perl-Getopt-Long
+	dev-perl/Readonly
+	virtual/perl-parent
+	virtual/latex-base
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
+	test? (
+		>=virtual/perl-Test-Simple-0.880.0
+		dev-perl/Test-Exception
+		app-text/texlive-core
+		dev-texlive/texlive-latexextra
+	)
+"
+
+src_prepare() {
+	sed -i -e 's/use inc::Module::Install/use lib q[.]; use inc::Module::Install/' Makefile.PL ||
+		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
+
+	use test && perl_rm_files t/{90-kwalitee,91-pod,92-pod-coverage,93-perl-critic}.t
+
+	perl-module_src_prepare
+}
diff --git a/dev-perl/LaTeX-Driver/Manifest b/dev-perl/LaTeX-Driver/Manifest
index 9039564ffdef..9ece170098ef 100644
--- a/dev-perl/LaTeX-Driver/Manifest
+++ b/dev-perl/LaTeX-Driver/Manifest
@@ -1,5 +1,7 @@
 DIST LaTeX-Driver-0.200.4.tar.gz 63968 SHA256 f853501847ace834b786090bae6300edfbf020d9dec710497a4684ca4598b77b SHA512 7ed52118076460d84aa465cbe6c637d7289e2197aff0a40a654d4fdcea9e7a96ab945c7552709ba7cc65f818828e4107477da47b3fe184e474d4baf105048993 WHIRLPOOL 73e7102d817d3cbe7ea3496b245050c9261509d0f3df7e31945048fd811f1058cbd27eb194d6963e9b0faef5ee202b6dffc7f634e8cae6651dbfd283221c57ab
-EBUILD LaTeX-Driver-0.200.4.ebuild 837 SHA256 39afb2f1211b909e2675f62520b3f7e2a48b6149409781b212e9bc5930b2a8c4 SHA512 2ab6ba516cad61d7a0b0ba68d11d50b59f85b388f6ce2824c277e9f3b51d26bc0513462593bbd80f90b82b7c9fe2328ad546307a9b47b1b65f23b382d4db480b WHIRLPOOL bf9e1f8dedf405de35aded72aca57df6ba7dd840a259fec4792f4714b9e30b71de64a64c9708991707a37535b0574c7bafce9a46a48e6d7f2d9d484a0fa866d3
+DIST LaTeX-Driver-0.300.2.tar.gz 54084 SHA256 f963539634e3ab17bc4301e367bdd866f387069067a9f79d89333d3c87e77a1d SHA512 09f485071004d151c2d3ced576ac7b5423fd2d014a3950e0bc8bc2bb1e507b4aa6f041a7d54ad085632a0988d48d69ad726439adcabb8d8a81e10fb613e78271 WHIRLPOOL 34a236c91e0ff2381025eb2738829a8cfffc7eb7765136ea4e47f65db9caf811d2bfa75598d8f7bb87033889d6f3366849226268b99b702165944cdab6e0bfe7
+EBUILD LaTeX-Driver-0.200.4.ebuild 842 SHA256 2574ace9ab84d99cc55d03e2e8b0ed9b42b792df38f90bc056f66426e364880d SHA512 8dd76ac1daa5bdeb3e9ed766d3bc41d63038d38b423bbfbd1ef52846c97d3849a81ed693d4b66b1412f2c55379c46a26ed868b2bdda5af5275635d4eae926d2b WHIRLPOOL 3fca811f3702828e719c806e731ec6603e9d1f92d56e2a7893d1e95b0341db4bcea9381c6bf79d7b824e1c050eecc8d60bdda0fd1d5b51ef2772b88190bf8a34
+EBUILD LaTeX-Driver-0.300.2.ebuild 1027 SHA256 0ab7ac1d044d2dbebffff505e1ab61f080a75e9c6b80ca452a0e52122ccbd0bb SHA512 d653013408f43f9eaa0ebd51701895a7d9816c11c5edc580a5b3a0239c3ea8ec547022cb59ab5572348175c0049db9ab9854617eaae4e7643459b38014e23579 WHIRLPOOL 118263469eb864383261a2885d24e8d6bf589f131a4d41529a1487e8acb788ddcff0de296f4f9d4df865490e237ef1a6d80125bcf70ee9d534a42ee25d64fc28
 MISC ChangeLog 2446 SHA256 d7fddfd291ef1b6c9ac9e95b0f9979d99568acec8c1c05d007af4232c285f1e9 SHA512 667f9783e271e9090b56681ff8f7a07fd7951b5d29d9fc734ecea2e1e9ec264d5a27ddd5d07fc8cb6d697bbbcd8819367a2edb719e5250941176f3d22550a5f4 WHIRLPOOL 12f2bfc1b7ae1a0855adbf7582ade32ff78543fbfea0a5509ebd5ef33158d8df449894f74fa5a99f498e2c0b258920f0a40ae88ad57d448f17e1677fe2e8a7c5
 MISC ChangeLog-2015 748 SHA256 a6bfe0b826071590203a1338a410b3e8c616464dc4af579010b30e2e1d0c1dcc SHA512 c56fc0d8d6209c393709b437e42967978012b7d46509b49c3fda0c4897f777e7a735953e235bb7dff9061bdc7b4a10a66267ee5c93e4f872f5cde1a058968d39 WHIRLPOOL 679fa59e03a005983d030df9fb77db65c19dc48a1373927df4f3cfc663cdb0646711c765e7878823942896be23801eb110b1a8bf79dc5158481e7e281f410e0e
-MISC metadata.xml 257 SHA256 4d43e70b770d0898a99af64a8454a6116e4a86500c23290655c8371265010427 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e WHIRLPOOL 87039765046556cdc2f7d76ce4192945117bfd5bb684220ea8fb72be310673a5b729ea428666ff1ceb1e6c21fb585a3a7dd72bd94dab89cf076a895e6a7677f0
+MISC metadata.xml 471 SHA256 173da03d7f03b7502b83a545ce88440c02d53906dd3b3f4f3ea38104485b4361 SHA512 f65e222344ca0d16b7254b7d8dd180a12e898a7fa7e041e442f01273dfefc0b38678f690d8b0ae75948ae8443f0b9158150df473dd164f88faa50e210a4654b8 WHIRLPOOL 25705d4b0c5b830a1f1f64a4d7702eddc3cd5be48ce6449d2cf0aa6e8b9650e0ae7dfe622fb7c1f8ff3025dcb00cfe53410db92764071e0e16e77209dc8b3177
diff --git a/dev-perl/LaTeX-Driver/metadata.xml b/dev-perl/LaTeX-Driver/metadata.xml
index 2b9a936fc0a1..631cf85f9c71 100644
--- a/dev-perl/LaTeX-Driver/metadata.xml
+++ b/dev-perl/LaTeX-Driver/metadata.xml
@@ -5,4 +5,9 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="cpan">LaTeX-Driver</remote-id>
+    <remote-id type="cpan-module">LaTeX::Driver</remote-id>
+    <remote-id type="cpan-module">LaTeX::Driver::FilterProgram</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Lab-Zhinst/Lab-Zhinst-1.20.0.ebuild b/dev-perl/Lab-Zhinst/Lab-Zhinst-1.20.0.ebuild
new file mode 100644
index 000000000000..9cd31bbf856f
--- /dev/null
+++ b/dev-perl/Lab-Zhinst/Lab-Zhinst-1.20.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ "${PV}" != "9999" ]]; then
+	DIST_VERSION=1.02
+	DIST_AUTHOR=AMBA
+	inherit perl-module
+	KEYWORDS="~amd64"
+else
+	EGIT_REPO_URI="https://github.com/lab-measurement/Lab-Zhinst.git"
+	EGIT_BRANCH="master"
+	inherit perl-module git-r3
+fi
+
+DESCRIPTION="Perl bindings to the LabOne API of Zurich Instruments"
+HOMEPAGE="http://search.cpan.org/~amba/Lab-Zhinst/"
+
+SLOT="0"
+IUSE=""
+
+RDEPEND="sci-electronics/labone"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Lab-Zhinst/Manifest b/dev-perl/Lab-Zhinst/Manifest
index 3b65b178d775..7e4c583fdcf4 100644
--- a/dev-perl/Lab-Zhinst/Manifest
+++ b/dev-perl/Lab-Zhinst/Manifest
@@ -1,6 +1,8 @@
 DIST Lab-Zhinst-0.03.tar.gz 65577 SHA256 531cc266dfaaf614364c046505c2076151de9d59c01ddd9462479acca87d3396 SHA512 24d6f18cd48dda5da11302d7458ae3616f7a1bc33b363ecc1f022df6b09ba68dd2c67a9323334d96c192a65cb96ffd868c9d24e96840b9b85248d55e7a732380 WHIRLPOOL 9f6ab29c787876db3d7f3eabcd2b56cb6c8aecf2c0c08060d0e1b919b564ad67013a2022628b42757ca8d1a62f515bac57beb3374adcfac87a56731181d369d0
 DIST Lab-Zhinst-0.05.tar.gz 65583 SHA256 32c3e001aae143868fa96f44da9bfb20142e8e029b5c66005e0a0520534c0e9a SHA512 38aedc3cbd6356c77ac32414c5a09e55b4f98001a932cd025d0483c64c57684aee61548ff4f6a944006ec8f79046b18c18d3935f4e2ea67d6a476d8fe10740c2 WHIRLPOOL f4a672cbf4e6da38e4e6faa0d96a47a9d994448ad7ed85511c974be01ca79c641d446a4585d419555cd60a2ac7b22eee2995dacce053a1ae47c4f93d0d93118d
+DIST Lab-Zhinst-1.02.tar.gz 66342 SHA256 9b848cbe5e88ac5ed8e1be326c0d576a007a1f83484960a9d7da441efac62d23 SHA512 09a6912495e1077b62b8cefab8eed133700e6d3cef967610ca455f7bc1e767400b45672965c057210949b6b1601e95151455ffe30d884154353f44a55e4bebbc WHIRLPOOL 551ba1ba068473e05ac24f4cd59c7a00cda7a90aab4a40a3e068798adad6f79c49f4b3c79014d21071c257e4102600249fb2c2295aa91351776a5de754cd34df
 EBUILD Lab-Zhinst-0.30.0.ebuild 578 SHA256 14ea2b848eeffa984a7bc62bc2ac4e63a5ffb51e498541dced2bf5e87acef3c7 SHA512 dfd435c3df239edbaa6bbb5223cc52eed73352f43e1eee1c9d57ff24cb135d4fe54049370393ba81da1ac7a1a18a352a179b7bfc09c740786bb8ca1b13c87436 WHIRLPOOL 34b4eeb2bdd783dc486c659c359ac29ab447e07944cae2a324ec3ef1d947ed105b0cc329b6a8e43b58fd001fac5449f2eefb365c387b9c4bbbafa045b5d9d577
 EBUILD Lab-Zhinst-0.50.0.ebuild 578 SHA256 16f16be94ee3d2dc81ea80cfb77e3e0ef67b40150e26bb450d2af9f17d5d5abd SHA512 0861e9771a605b34e66fa93c16ae50819ca45f920c11cef4860f824cc7ab72e37bc62effb8cf80111afcbe6644edf3d77781da4fc500770a1f82a258913f4fe5 WHIRLPOOL d825630c017b8ae9e6e35717d9de3e0f593a5fc2ede0b65fe2af9b32eed3b58ea63886344c2073c217556b14c366e74eaa450106b8e5c74cbd0e4dd323440451
+EBUILD Lab-Zhinst-1.20.0.ebuild 578 SHA256 35ed6845431a3f41b203836a13928c1157773ccd3e6d1cd2dfc28badfdbf0e6e SHA512 4222055e11b65d5b61ad6609a5c58c213bc1f8fdae0aa64a94251d7cd630895da31c3889dc2d30210a516b2420713430306859a9d609022bb5c8b09a2dcff7e2 WHIRLPOOL 9142a3e554c4fdc0bd5d3b3c420a1ad374c7921d147eee710283f8fc3faa33c94ea44ea3cc9281b914f410591efa5c4250fafaef2fd92c9195e166f3f5366a39
 EBUILD Lab-Zhinst-9999.ebuild 608 SHA256 acc5809a4640105f41228e4a1dd2e52d0aa07d17a822c93ef0a1df96fbdf9e44 SHA512 b2acdcd78a2810737544ddb3ed9411544d0d40392ef00c3f8cba510990b4acbaaaca1b70b861e9da47e3e5337dc32b52400c489f463170c8108847ba869a3740 WHIRLPOOL 5ab39dd28ab69c3770addaf8d75bb54b3e149c2c92a0927862c524b23098be4a53959b060ef4789910599810e6cac9b6e4dfcc323042ed0abbf4d9acaa440b34
-MISC metadata.xml 334 SHA256 3107a1653689330ec55b0a8af6d2107e60443f572488c3eadbea028f565daabe SHA512 c8ff08a51f5e307bbed57c5c2f0e58e5b547ae4dc6693d80173a040304a2783c77262605875bbfd0b58115a902b2bee96adfcfa1bf6a8aad664a8a19d6470dd2 WHIRLPOOL a0ae6068fd8bb086dbb23f59fb2552f62fee7d873eae6786c9d3fcfc32e72379a4f3c6170c96ff2e1f995161424955b0fa5b2bb2d11b1a268e2f7a52850a35ea
+MISC metadata.xml 550 SHA256 116976920379c6e1f05e47ffc9a0fd01326c80510aa89f931f816c4b1d83060b SHA512 786a475284535e92a843f45c1714cb1015315de8f4092198a14d3e806b9b609de2a7d009cceecc2f1ad7589933c18b76f1e81aa94fd6ed82f625c13db8335ac1 WHIRLPOOL 899cb62245e328323acd2e939a12bf7b3e65fe3274b496320a451b3b7928cf9efbe5ba3330f2e34b47a95180dbf064aa4496067547e3dd5e79834cab2d67e04b
diff --git a/dev-perl/Lab-Zhinst/metadata.xml b/dev-perl/Lab-Zhinst/metadata.xml
index 2ceed6145686..bca1acc57a98 100644
--- a/dev-perl/Lab-Zhinst/metadata.xml
+++ b/dev-perl/Lab-Zhinst/metadata.xml
@@ -5,7 +5,13 @@
 		<email>dilfridge@gentoo.org</email>
 		<name>Andreas K. Huettel</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">amba/Lab-Zhinst</remote-id>
+		<remote-id type="cpan">Lab-Zhinst</remote-id>
+		<remote-id type="cpan-module">Lab::Zhinst</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Lexical-SealRequireHints/Lexical-SealRequireHints-0.11.0.ebuild b/dev-perl/Lexical-SealRequireHints/Lexical-SealRequireHints-0.11.0.ebuild
new file mode 100644
index 000000000000..f286829a7c47
--- /dev/null
+++ b/dev-perl/Lexical-SealRequireHints/Lexical-SealRequireHints-0.11.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=ZEFRAM
+DIST_VERSION=0.011
+inherit perl-module
+
+DESCRIPTION="Prevent leakage of lexical hints"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="test"
+
+# Note: This module is a no-op at runtime since Perl 5.12
+# but is required for dependency resolution
+RDEPEND="
+	!<dev-perl/B-Hooks-OP-Check-0.190.0
+"
+DEPEND="${RDEPEND}
+	dev-perl/Module-Build
+	test? (
+		>=virtual/perl-Test-Simple-0.410.0
+	)
+"
+src_test() {
+	perl_rm_files t/pod_{cvg{,_pp},syn}.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Lexical-SealRequireHints/Manifest b/dev-perl/Lexical-SealRequireHints/Manifest
index bf45e029885a..bc826048aac7 100644
--- a/dev-perl/Lexical-SealRequireHints/Manifest
+++ b/dev-perl/Lexical-SealRequireHints/Manifest
@@ -1,6 +1,8 @@
 DIST Lexical-SealRequireHints-0.009.tar.gz 20857 SHA256 dc8925fedce4647473aa6e3ed51e23e024f50fc090173b9771ff03e8e2f2a064 SHA512 9c0951e23c7cb6101a9ec8c9f1577d257436204f80605eed69ed301fcca3ae745c68b7a5a226a05d80a4e7118a2ac543089b613d16096d95f9779c6250c2b9b9 WHIRLPOOL a587d471a59875e591cf9529be2ba606e52d33b3629d677fa388502715a9e0d97dc404c60272d9dcec9fc3847e0101ef31d7a8577cefe04660ca740ed79efef3
 DIST Lexical-SealRequireHints-0.010.tar.gz 20903 SHA256 e975b0f4296fe379accda73c8775435986128dac8ad8864f4694ddecd715a134 SHA512 4c71a22397ae689349bf45c1b2177108008158052b341f9d9b09e5d97c55cd538bb427c041389c4edf8584be292bf4b1f42abdff573510a0a64fb69e5166aecd WHIRLPOOL a76a6ad3667c8e536ac60097a300bc910e019d11eafba7fa2b108ec3ec0b179bd5d8ce7115f7841c7a2f9fe704b8645aca555073df89a8d856fd2a201762bae2
+DIST Lexical-SealRequireHints-0.011.tar.gz 20649 SHA256 9e918ed118ef685d6e09dab1cd6e66ee0a31d776fe24bba63e5243906f56013a SHA512 b31d3527e3ea1d28ebcac58cfdb35893643c7c371dba96cf06509cc7b1ce61c38f6cc37f420c2ec93b0a57adfc3d3cd797af97fad9aeb6e1000ef1769e26c31e WHIRLPOOL 55d7efd5ba8da530ce9b7480aec46935f25ad833881bf4eae0a8e0967975cd856350ec02e488cdb262c08243f5b4ef5330cccccc23c586668bd5e65ae4c379e1
 EBUILD Lexical-SealRequireHints-0.10.0.ebuild 596 SHA256 1d43a07ed088497431ceaa10ecf455cfbf7b68dadc5916c3ffe015e57f075228 SHA512 9a97cedea985f468fc2933bd301cd6f77310ce7aaed4dd5c1421169743c89da23b685f807906d8bda6979c1690d336b252d6227f0b5640ac03abb2ba77e4b0b0 WHIRLPOOL 3b03862a8547c9645cc2ea7b017c572588b7c03faf10f293d41587d2eebff566e267296b989f003b22befd3fe959ef85cf7b874c1de811ce1e44b0436912dc0e
+EBUILD Lexical-SealRequireHints-0.11.0.ebuild 599 SHA256 c98e3e67b4f4821463ff0bd70454e9c6073064164f634dd28448768ec9f30743 SHA512 8f33613f4c3750db3b142d148c876747298116cbc1a3d524aebb58628343e7c34d1a71d7ad8ec260c791d74c5af2199909d238ca73e14dfb1e0b67b868c025c0 WHIRLPOOL 3edba10981192edb3ca1be283255c32a90509b6024afcc24358c511280426f3ffbc2d4ce99072d00e9a7736f4552bb59f7a9cad4c418d929d1bd72efae8ed0d2
 EBUILD Lexical-SealRequireHints-0.9.0.ebuild 435 SHA256 cfcfe91feea89ec4eee7d3ca7bcc2ddc4fa84bc3fa883d055e0fe75819cdbbd7 SHA512 5720897ee99042b0a4013283ec7b760a0973b9d399658cb078b9cfd03068092439250285757a65767159d8434479ef0284acdd14f1c6253959108208b5624665 WHIRLPOOL d833bbd910850dd2780789b7957c90872b3009ccab96d05a54629afb3b5e471aac2a3c8d0cd2a2f5925254daa47642e4e6277f7e827581f90071fc7c3d591957
 MISC ChangeLog 3206 SHA256 6d008126c11ae905ac25d9684bf2db6347b8e5bc9869e20301f63a5fb363c450 SHA512 326cd62335c8db2b3e43f36a6036c67a2a9f3cfba37fb34a4416e49505b3ef0f36820f98512c368ee7ea0005df0c522d76f2e2f3940a67b0f4deb282fe141caa WHIRLPOOL cba779140ea62d1c790f5e963fcfaa8da99cbb193f2e1fd381b40b3449b3ccb22fcb5da70ca255fb5505f896fe9232ef9540a1066c91c001ed6e4988b16edf8d
 MISC ChangeLog-2015 626 SHA256 cfa260dcee3c98037b03e0c5f8a3261d7c5e636f306a56dc070bfecee1a97e36 SHA512 28b7fb70ce49f0b277ed65bfa94a5edbaf40d5e3a33232cb82757fb33b01bf23fc42e8e2efece7002950258059166543b03c6a6b51a292c933929f345cab05c4 WHIRLPOOL 676de96c14cb01701e5e7582a72303d642fb4b2ea61968e267a57a26f52c96506d64540d2900a2d4fb075c2ddd96635354e00d624363867bb77f93b9eba68472
diff --git a/dev-perl/Lingua-EN-NameParse/Lingua-EN-NameParse-1.360.0.ebuild b/dev-perl/Lingua-EN-NameParse/Lingua-EN-NameParse-1.360.0.ebuild
new file mode 100644
index 000000000000..798845d12ebc
--- /dev/null
+++ b/dev-perl/Lingua-EN-NameParse/Lingua-EN-NameParse-1.360.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=KIMRYAN
+DIST_VERSION=1.36
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="routines for manipulating a person's name"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/Parse-RecDescent-1
+"
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.380.0
+	test? (
+		>=virtual/perl-Test-Simple-0.940.0
+	)
+"
+src_test() {
+	perl_rm_files t/pod.t t/pod-coverage.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Lingua-EN-NameParse/Manifest b/dev-perl/Lingua-EN-NameParse/Manifest
index 6580b7259089..254e9d56f5c3 100644
--- a/dev-perl/Lingua-EN-NameParse/Manifest
+++ b/dev-perl/Lingua-EN-NameParse/Manifest
@@ -1,5 +1,7 @@
 DIST Lingua-EN-NameParse-1.33.tar.gz 27215 SHA256 d7754295f6f878812f7489ec74aa1af743ab15cee8f22cb014cfa990828a6ae6 SHA512 fa6fdc17053eb42d12ef9bb25a26434fb0becf2a3ae8bdc44887e0f2ab4873470520fece17637d1c34540a1b6a52f9cc0fd657692e87ed71bdfcdf5232eb9739 WHIRLPOOL 689f8115bef442cc24af1681870acb6b692cc17d8c142c8da5c7e3b422db5f0969951a9ad8a72d46a38eec88b4cac6f77c4741748e3e98374f453b5831894ab7
+DIST Lingua-EN-NameParse-1.36.tar.gz 35648 SHA256 3cc663818d99977a24b5c555eb29438bd5a36e5476b2102d9014f7fbf93fb747 SHA512 d82b6d5a7813dae5dafd36e5ae521792b3477757e918cac9ccff985afd0b3018a390c04cab39bf0d4b0cec9307941901d1aaa35febc650c25f85e8c77b03211e WHIRLPOOL 4b43371aacede0d60fad6ecceb97e3fd40e2f818227cb54482c80b31205fa01f59300428ed39f098a5e4327d3e0ea21a468a9a28862cf305faba19cdc0bd9a9c
 EBUILD Lingua-EN-NameParse-1.330.0.ebuild 531 SHA256 a2b33e683679d6a58359049fe5a7a8c58cb6d6ce43261da66cf1bb0b203bfeba SHA512 335878d93aad3eab4f4d2344f2ee82343974aa5f318069b52507479f752d3a36620cef02da9a15b418d315f7bcfff633656a220386c2e54d4a30b4a8c2b65a92 WHIRLPOOL 013bed752dfe1af75ed932d57f0a4f6998293cf4692af5e27e0fbaaadb409e1649faacccf3d10c93d8873827287a6a1dd9e73bbf95b5d9238b89f353ad8e02db
+EBUILD Lingua-EN-NameParse-1.360.0.ebuild 534 SHA256 177573aff81a9151d95123831282e85392ab860732c17b42cddedbeb7ec60b1e SHA512 f8581ae2e201e594b741a9a6c445be6cbcb855771ddc9a14470e4e367e068ceb41e68655c5601d3d617152f30f606a082c684896e5442d1808a78e18afb7b9e1 WHIRLPOOL 496d553c49c69a3129d671ecbb856659e7833a4736c350dc1210a81c0b197ee728b2de8b26fbb697c57bcdb66eec85a38d1bf06ce174d243472cddb00a542a8a
 MISC ChangeLog 3260 SHA256 f0ef46a10b18e1019d83f900e9cf1198b870fdfa655127989036ae27f6c183a2 SHA512 c9da5e4c5b91b8a1872ce190896abd3c461995e0bbf08eb3548b99d921c781f08dfb01754df809799631e193c8147c84e9354da954d1c68e3a687aaa0eaf8af6 WHIRLPOOL 06ca102331f5774aa14d2c5f562155eda53a0679fd7fa51b737616ac980de565109b56d80458abeb344823e3445a0cc30da100fbd63a07f1bd603e9cfde6fda1
 MISC ChangeLog-2015 5839 SHA256 723c4cfab6e0ee3879f48178aca1a73010946b441cd0d0ddb34108f73dcce985 SHA512 121dfe166c775bc364c369e2466f7e41fa7e09a97fae4538b4a14f7c81ef9acbe065745320aed5c4828263f00e9e1c36f8a83df2ce97b240421d7450b72ac0b2 WHIRLPOOL bd80c76275fc3e01b8cf65b724f0589e176383740de227400414f44d69aa2b0de289e7991264a2cb48a6320b1a216121ae7c332606da68ff0441f8ce68efc71b
 MISC metadata.xml 488 SHA256 d8b331b192a809ff62ec1d3ffda98920fe311ab6703c4bc9ae8ebb5133c43574 SHA512 fa69a5c9c46d7b26313868df18d6494765d845b1da4e2b07b47daeb5acad07069ab1902562dffe61fb055bb9c3a32ea41ec78e4320996c2049df982ca15f886d WHIRLPOOL 6480b58af8c700224b9359fb8637f673198e8e4bd060763a0640b8f87335e5f18dccc9fff4324e7951b1c19ea5cf448d43c9c0bc7dec30ae4d08a94c0616c783
diff --git a/dev-perl/Lingua-Translit/Lingua-Translit-0.280.0.ebuild b/dev-perl/Lingua-Translit/Lingua-Translit-0.280.0.ebuild
new file mode 100644
index 000000000000..3de3587278e0
--- /dev/null
+++ b/dev-perl/Lingua-Translit/Lingua-Translit-0.280.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=ALINKE
+DIST_VERSION=0.28
+inherit perl-module
+
+DESCRIPTION="Transliterates text between writing systems"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Lingua-Translit/Manifest b/dev-perl/Lingua-Translit/Manifest
index a4e4b71fce10..6fa1de421789 100644
--- a/dev-perl/Lingua-Translit/Manifest
+++ b/dev-perl/Lingua-Translit/Manifest
@@ -1,6 +1,8 @@
 DIST Lingua-Translit-0.25.tar.gz 394066 SHA256 54409e1ca92c301fd9ecdc5a3321cf10741ce6ce9e11c0b01b85fb9ea295bdcd SHA512 eb1ce2d48ceec9ee729f944b1f5979edea4b9abb7c3c6e61fb8eeccd6b15864b7f6f012d02ecb991054b051e3f7ac61cada467c6ea45e51fad39375e2cd43517 WHIRLPOOL 96746dd83eaa4cfb5e57a447c020d502b03f2edf10db0c9d21c4a6c5cb518942e0b354cfc0c53eec2790e0315df07ae35b3a584ec7add4a292c5a1346384dba9
 DIST Lingua-Translit-0.27.tar.gz 110337 SHA256 650f40c06342d112b53450a8eeba942074af333af39f24d20654e65596530d2c SHA512 a42aa61cc5e08d0358a7f5b72b5bf2a10938124ae49e693c6720ef8793b5afe653cc13cc4e7f3132427d3e9a0b87c6e95f7e083b23c044f478c43ac6bae7d2ba WHIRLPOOL b1f18c4ac647a68cb96a96188df37efb7622397be7e43a3b7a1869f4a1e0a6d6f7c372455beb3f3a758fd892adc35c73bda13e1163331bb306b654e0e15ffeb1
+DIST Lingua-Translit-0.28.tar.gz 110433 SHA256 113f91d8fc2c630437153a49fb7a52b023af8f6278ed96c070b1f60824b8eae1 SHA512 eb6d6fb6cda3b4c73fffc3ccc907453b3f285cf3e1d7e3349c971c55af855c301bdb1fb0e9d6dbab77d6f036740ce5aebe28c6d7f04f812460b9e2b6f53d4bb8 WHIRLPOOL e698dec160bec29ee651bb01b0e59f8a0cf82cdac10660e15e1ffaf67f776f81ff569041b9c4ddff4acc4c57dbb006b9e752a3a4fd0e6cfc53e62d6e689a9fb7
 EBUILD Lingua-Translit-0.250.0.ebuild 338 SHA256 fa033c1befacc7bd03109703c502cdda1f0496b72f152af3a466966ed5f223c2 SHA512 2e585c9e8eaa3373c625b50fe7655166f60f85d8bb2899236834d81227e8cbfad82f40a9c2116fcb0edbc2bc60a80f827f12683c661f3d804491942e780517ab WHIRLPOOL 2f5fe2f212c1366e4996f0e8645afbd7de091ba9d0d8de955af6080705e44570cf5dac8684a1385e417a0497344ef237b3c30f019b525f0467de372fab51bff9
 EBUILD Lingua-Translit-0.270.0.ebuild 344 SHA256 9ae20e5807c875d55de6de71c929439e6a0184139faa9d51afa8af29f6f9c2c7 SHA512 4c02d3025ce6d4cc987bc323939d1cb6fef0154b3f87fe669393b35aa7a7641e67e14859cf86075efb716f31fee52f5fae7fa4c30201d2c9fd69136636d75647 WHIRLPOOL dae3e63c25da5f6a40700d9f086e0785db3b29b70b424bbd430785cd22ff6fc641c8a2361128a0b46a361562500e495130ea49683a1cacc5ddff53a0412c20f6
+EBUILD Lingua-Translit-0.280.0.ebuild 344 SHA256 d0b51d426c98b8fe511a361ef1ca07f2977dde6a5661b984633a1b44c47cb8e5 SHA512 593b7bd48a2f0a677b89d27c7928fd1ba511c24bc9845af12c9152408e6e0abd17e5181707748786bc3fa3eadf2952d86de731a6cb228e09ab8373d0ecb60a26 WHIRLPOOL e04e4cfa4cc0ffffa65473e5f6e9d8df7abc6456f89bb9333ed7d396c51708b251938245e807819247b491559a243cfed392adb527ece62806fffc0e3be04296
 MISC ChangeLog 340 SHA256 297a16ded262fcd5ad3cc99d4447b33059c440a5179473d14484b7fcee459c79 SHA512 10c7e3d2f27cc093e69b22ea17891536199d186db7152aeaf322dbde70974fad6b4243bf628dcdb99e8a97ae1c4c8f18c9583951bcc20f9ff1680d9a1c496235 WHIRLPOOL eca336d0b50436aa20723fdae524cdee179a4747f8039f42116dd4e08ba05f422cc5f96be6ff9864696d7a7b3bd6312d02740107bbf77ba6005bea454b27a03d
-MISC metadata.xml 257 SHA256 4d43e70b770d0898a99af64a8454a6116e4a86500c23290655c8371265010427 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e WHIRLPOOL 87039765046556cdc2f7d76ce4192945117bfd5bb684220ea8fb72be310673a5b729ea428666ff1ceb1e6c21fb585a3a7dd72bd94dab89cf076a895e6a7677f0
+MISC metadata.xml 473 SHA256 12b3f50fcbe0a4ea6fe31ff6dbf9d090bc8f49169c49a31901467143b869c0c6 SHA512 114c170723f124a15914ba4bd6ac88e68ce6108eb62932ba45e96bca0430abfc1506df6b0c431803a0cec9241aba2cc2d24e479f7885b9856ca036e0833e6828 WHIRLPOOL edae2d417c6ee0820c60b5e3ee92838d77d845f02f72b4c7a9b519f15f859cd3953481b62472b41e91f678f4e20398c4a93b1a3ac53250ebb697d48cc0e509f1
diff --git a/dev-perl/Lingua-Translit/metadata.xml b/dev-perl/Lingua-Translit/metadata.xml
index 2b9a936fc0a1..48aad74d2983 100644
--- a/dev-perl/Lingua-Translit/metadata.xml
+++ b/dev-perl/Lingua-Translit/metadata.xml
@@ -5,4 +5,9 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="cpan">Lingua-Translit</remote-id>
+    <remote-id type="cpan-module">Lingua::Translit</remote-id>
+    <remote-id type="cpan-module">Lingua::Translit::Tables</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Linux-DesktopFiles/Linux-DesktopFiles-0.250.0.ebuild b/dev-perl/Linux-DesktopFiles/Linux-DesktopFiles-0.250.0.ebuild
new file mode 100644
index 000000000000..c51b609b235b
--- /dev/null
+++ b/dev-perl/Linux-DesktopFiles/Linux-DesktopFiles-0.250.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=TRIZEN
+DIST_VERSION=0.25
+inherit perl-module
+
+DESCRIPTION="Perl module to get and parse the Linux .desktop files"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-lang/perl-5.14.0"
+DEPEND="dev-perl/Module-Build"
+
+src_test() {
+	perl_rm_files t/pod-coverage.t t/pod.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Linux-DesktopFiles/Manifest b/dev-perl/Linux-DesktopFiles/Manifest
index 294457ab9dc0..c46397bde739 100644
--- a/dev-perl/Linux-DesktopFiles/Manifest
+++ b/dev-perl/Linux-DesktopFiles/Manifest
@@ -1,6 +1,8 @@
 DIST Linux-DesktopFiles-0.09.tar.gz 10268 SHA256 45afb52301ed1553fa741c40e62dc91280bb0e6e58dad83e6a49415a02f0973b SHA512 9c46ca6be9c21092481efa6e101aaaa162c54e9c02156ac38f62363ddad937b9341a2b66fb09331347c45e1a8b9eba9dbcb2a7b0f45da41237a896b4dd31bb78 WHIRLPOOL 521976d1e340b381d352f41f159bfa8161cba22bed3fa8f1f756db1e2782a1c0b2769a4913d31fc602179579b7b81cc55d6366da5e08182b37364839c62aa053
 DIST Linux-DesktopFiles-0.13.tar.gz 15008 SHA256 5ed7aa22895a33d2d3ad1e053273996550a446a37a9a0aecad131f6c75adf266 SHA512 408df4ffd6c4879426d74b196b2bb0c0d13ceab09f53160f62851c44cc7b3de295dd430d3a0391bb5d5f6682eab5816a1f34c589db084f9cf41c00f633102b9f WHIRLPOOL 7347b1dd095a81f998d6b9294afb538f7a11cc87d50d6acd2ea4021ea8ca043b7f7bffdcd53db6c7ff1710c84afdb56a308cf521834e49e9bbcbeb642a2611cc
+DIST Linux-DesktopFiles-0.25.tar.gz 13995 SHA256 60377a74fba90fa465200ee1c7430dbdde69d454d85f9ee101c039803a07e5f5 SHA512 a825b014e85e53cf0a142c7d239948f288930627a517444d21a81b8ee898ab3bc1b7dc8864df7b76b2f3a982280ffcb09325f492d0d83950c682110999d5e107 WHIRLPOOL bc99f53fb136d51e0254ccbbc149d26c44853fd1e9b9ff76ac7b50b7cb0e62095f966c9c41e4cf687c4253b845d3881a2d2198ac85cfd34f38d3dd7520f6c558
 EBUILD Linux-DesktopFiles-0.130.0.ebuild 445 SHA256 1aba0efb4617cb30d26df82c97c2a2d05119b0a64329070068a16a7d4573e141 SHA512 215e47dbe9bd32206ca66a3b7cf75f0b510862f7c9c9e72a2c52db33d1560de7a4e555aa52f9e3a3f3ecfd329061ed2a462f593cc7dbfe332b4b9cbf24525426 WHIRLPOOL deb00be815f916e1d95d215af25e9af7ee7a58554bd9f743e7d5b8ef1b4853fa7b4988c813add33476b47c655691540c5582d7f27a4c471403682cb65ea91920
+EBUILD Linux-DesktopFiles-0.250.0.ebuild 439 SHA256 4871ba6e289f9d05d49be2841941163c8b564b485c9974cf2fbda7f8b17c9dd9 SHA512 1bca4796af66758bc802d667d0927bd5eea8ea1f9776e0a857f673964fe648df0fc7b0e08e9b7d06221080c1bb5793b0f5ef775a473842ea8bfc0431b2df6361 WHIRLPOOL 1c6fd6b684ba92c23776d88cd77e4bfed87280fb6f12011eb58008c1bdeb336247d613a892531d79d578996a5ec569a67e996a91f4a1beb433b38bf600116e36
 EBUILD Linux-DesktopFiles-0.90.0.ebuild 409 SHA256 b658e28a24faf58defc7319174dbc1e671534027a14d82a893024f9f1387ef0e SHA512 bb7147d181a956b29551adc06932c5a4f043f811bb480876db794514b5b4399a5dff607efa9cbdac3effe811aab72293b5029eb1ee4b9b5e25627386c2dc17ee WHIRLPOOL 38421eb19e9137773e4ec577083458a05cea2b46d2effd611ca31562230b3acbac30134ebb43c76155b386b76c922c602e294311f10c5fb4d5de88059c3ae8ae
 MISC ChangeLog 3303 SHA256 83b8eccef4fc232bc686d0afe0bc2d9debd594752bc1859ab49bde64e08fc7ca SHA512 f90ecd6bcbad700deb7ad4031cdfc731305c47498045720af8b029ce3781b5339b6fc48b26e6c1c083e8f6d1bda4019686037b113e2daec5e1b95546a55884a3 WHIRLPOOL 22afe5396e186b445896c205c302d105cc6fcd7ff5f41fcaf92b72635862562dc7a056a4dd8ec10136378ce3cacd29d3029b25d322fa871aad90fbb628009a6e
 MISC ChangeLog-2015 1818 SHA256 6ea315038bb77a1f9bdbd344678eb2e48ee4113436899d6f6d90fa83ac9de5e6 SHA512 afd671ea8bf4ad429c7a46bec4b5daeb44675e78b27a0d4e2f9f05216429f850388540fae312f292be56c6d9244d63292ef5316ccdb8459d8afa3afd63bf4d4c WHIRLPOOL 771abdbb9cbd377dd4ed1ce121924c89c64e53508d809be224b07aae1900bfc07b8dfb2cb8c3e479726673e5cb1f415342d70069fac23565f009f29570e6d234
diff --git a/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.426.0.ebuild b/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.426.0.ebuild
new file mode 100644
index 000000000000..581d6eb64026
--- /dev/null
+++ b/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.426.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=REHSACK
+DIST_VERSION=0.426
+inherit perl-module
+
+DESCRIPTION="Compiled List::MoreUtils functions"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="test"
+# See XS.pm/LICENSE
+LICENSE="Apache-2.0 || ( Artistic GPL-1+ )"
+
+RDEPEND="
+	!<dev-perl/List-MoreUtils-0.417.1
+	>=virtual/perl-XSLoader-0.220.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-Carp
+	virtual/perl-ExtUtils-MakeMaker
+	virtual/perl-File-Path
+	virtual/perl-File-Spec
+	virtual/perl-IPC-Cmd
+	test? (
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
diff --git a/dev-perl/List-MoreUtils-XS/Manifest b/dev-perl/List-MoreUtils-XS/Manifest
index 4c41a3f3d7f7..200da2dd9232 100644
--- a/dev-perl/List-MoreUtils-XS/Manifest
+++ b/dev-perl/List-MoreUtils-XS/Manifest
@@ -1,3 +1,5 @@
 DIST List-MoreUtils-XS-0.418.tar.gz 129838 SHA256 0aa41a90337bb1ec48db50e5c73875b960685ff4dd49c26ed39dea0d52752d4f SHA512 1f6b9adfe641afe45ee3bb9d6df8f81d20916cff860c4955200026302da82799939d309dd2412af10ad1874e4e0528a63e8852e543a667942f1c582cb522b4b1 WHIRLPOOL 7842b37186257c325d32420d31098ffb3263e47b982185d287676e8654f66ca71f5e7119c349c625561e395708892802cfda4e5fb07a10d3201e1e3b4eaaee89
+DIST List-MoreUtils-XS-0.426.tar.gz 159015 SHA256 6c7dbf4cf9ab5fe15ff0198927e938c5ee7a04ee0a5685537b47639f1c50406b SHA512 c98bafe58eb636ffb0a2410b74904e9dff6b719d3574ddf5f56bdcfe19fbba76135b4f631cb45e4c9cea8330125cd3d2be2d8571026cd521a25eb512b88e99cf WHIRLPOOL 84b9c5b3d4127f76d19020680387e6d52c291e4b69177b95520fda1f2125861ded65c276e91f2a9c7c65e833698c1e6808d2ced51f4f79a40f274a838045e2e4
 EBUILD List-MoreUtils-XS-0.418.0.ebuild 821 SHA256 f6027f5eb6309f3c64e1228ecf93584fb1819ef816cd81f72e1481c317e654f0 SHA512 eafd688440d3d49e4b3c4c918bcadd3544e294494c15c72d74b0faabb80e1abe5cfa9e9eea640ec7e4ceebd6d2ce93c5d2a42a69db9a87c68f1c9fb3443e2542 WHIRLPOOL 51e1c52f57d80a782a8a589c67126623782815fbb4e9948fb49f9353474dcc7eb52279d87a033522b004354f04183ee45d1516af81f3face8bfe5ec3a6f855ce
+EBUILD List-MoreUtils-XS-0.426.0.ebuild 794 SHA256 0b69e2bc5193e3c3c1a6b2d04096abd39e1c3e0a0afcd06655c89d0b1aace1aa SHA512 b0a7206eef020cd912cf30a38e77d11f80a0c25551c00d97c7f2fb3e3b378e97a2f67cbe241301455ed03675411fabcea560c619dd0a44c8c849954bc1df69e9 WHIRLPOOL e33c9f0c38f1d89c5e59a073ba9c0e6bb8cf0e928a2b5d5b2ccdbcb33b955bb7651ca72d15ce3fee6d0b0e820058d15eb010cd1fbd6de3f1908380d88ecab418
 MISC metadata.xml 407 SHA256 354058eb590d787391359746e789ffed94051eb1de429154bd3308212f672c17 SHA512 be227e311e8d434fd0d3b55a335946bcb3c319956eac4fa94a829c682496abdd8ced4c8325b5cb3ec67c8ac60fc557ce4933ff8eb6aab3f2475ddd8a5bafba7c WHIRLPOOL 8b0336c08bbfe85a47d63141203cfe09b6918907f96177b215dac4be112177689361b7f088c657f5f62bd8b8726984f4122feb0d374e63a5ce0002e88f888b77
diff --git a/dev-perl/List-MoreUtils/List-MoreUtils-0.426.0.ebuild b/dev-perl/List-MoreUtils/List-MoreUtils-0.426.0.ebuild
new file mode 100644
index 000000000000..8620b5a3283c
--- /dev/null
+++ b/dev-perl/List-MoreUtils/List-MoreUtils-0.426.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=REHSACK
+DIST_VERSION=0.426
+inherit perl-module
+
+DESCRIPTION="Provide the missing functionality from List::Util"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="test +xs"
+# See MoreUtils.pm/LICENSE
+LICENSE="Apache-2.0 || ( Artistic GPL-1+ )"
+
+PDEPEND="xs? ( >=dev-perl/List-MoreUtils-XS-0.426.0 )"
+RDEPEND=">=dev-perl/Exporter-Tiny-0.38.0"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( >=virtual/perl-Test-Simple-0.960.0 )
+"
+PATCHES=("${FILESDIR}/${P}-xs-config.patch")
+src_configure() {
+	export LMU_USE_XS="$(usex xs 1 0)"
+	perl-module_src_configure
+}
diff --git a/dev-perl/List-MoreUtils/Manifest b/dev-perl/List-MoreUtils/Manifest
index be7296dc343a..794b671ad1a1 100644
--- a/dev-perl/List-MoreUtils/Manifest
+++ b/dev-perl/List-MoreUtils/Manifest
@@ -1,7 +1,10 @@
+AUX List-MoreUtils-0.426.0-xs-config.patch 2181 SHA256 4ae7e5c59b9deb9d49510a6b1c464f2743c050042e5339d2899628478835db79 SHA512 e1a0c15d2835871b2e52a069d8c99cfee74da58251907c2519146b8e8b2fbdd1863a93aa1b623cf4ffc100ebe29605f8dda0415b1969707eec3bb1ca414d482d WHIRLPOOL 1c5eeda83994167bd36268a7f3188f546e19bed1d309dd546033561aae2f54d4c2bafccac82f9d6ef8bf9d6056aa4375c3a881d360ccec21adcc65a69056f932
 DIST List-MoreUtils-0.418.tar.gz 55111 SHA256 365651edea4e0c806576e4dcfc3dfb98bb4cbb343bc5c3e04cdc7b5b71ed4988 SHA512 7ba4395262c4406e822baf40e5a32aa6d93779a56d2567c4920f085ab2580c376db41e2141e4b9b43860d65122ebe73a03dfb0ed76a32f087b05ca7eb90f6d6e WHIRLPOOL ed63b850aebc353fda7ba9a8b24b1e50527d56b0c672c16cbc534cd90c9fe452a055b05f256d3e05c2d66be3752b1ab20580815d473c0231bfbea55d34c55c40
 DIST List-MoreUtils-0.419.tar.gz 55193 SHA256 5f8e65608f5dc583faa6a703d19d277ad46dfc1816e51f8ff34fb8322ed48615 SHA512 d13beb5031d1559c2ec4cb93826e86f0f314c4f10c4fdcac6910de0cb039199599911838eadd499e81cb41025aae2a52d69a259653a9637679a1705c7adcd37a WHIRLPOOL 15c8d91b80aba279d458288edb7bc4c5557f2a84560ff284e0918dee09cf69cd2e320b958b201522e536493d49154d2af3654a0a43e74ad8cc353a71ac03a0ce
+DIST List-MoreUtils-0.426.tar.gz 145518 SHA256 8e05610d04c6d0cdb63607d88950fd5c6e850a71cea1e1138ebf5c26c83a47b6 SHA512 622ce2e5e418ba803359107b15cc9f5234bfbb32f03d072c0b448b6b8d603472254d9653757d0048f537852a68b17bef1b71a7f5104d95802e4b78f595664b32 WHIRLPOOL d9156ba0f34706358758ba9eba8ad0f7ed45ac091fde7ae51c47f7fcb737ab0ce034ee8302cde1bcbeb9255b763d9ab6c211f73b483168e6f2e86c4088f5f779
 EBUILD List-MoreUtils-0.418.0.ebuild 727 SHA256 18b8caa6cfc738a1639869f1b144dcb1a8f63c9a12e30a26468d39f411636b0c SHA512 33fb12ecdc5b870fbe5f796bd96e5d9598b1dbcc51b84bf8b05c90353049d5e1e710d3e37872cfb007c754948276a410697db5f6bc9c7aef02e1c22b181913a8 WHIRLPOOL ef5d19e75f6c425f5335afcf8998ee175c8c859ec6283e5793402a50f5a1944ebe2cffd8ef1d530d00e2f04d99f1df269bbdaa06b93397749698bc3820a67160
 EBUILD List-MoreUtils-0.419.0.ebuild 736 SHA256 fbef59bfb8bd98981409ce05cdaa60e6ea39459c46ea4bf492e03bce255c5593 SHA512 b9a2dd380767a3d4033794aef12506588659ab5a2883d8989757527a15be4671f0e3042147f232c8274353cc77d1f5b79edb4def8c7da5bd32dadc9e8f277742 WHIRLPOOL e606d65f784898821847b5ac72dd418c1f0743d41943cb46cc34d975f5cbc354c058f4401b36725b68d9663b4a78313cc73abcc71c866ef06099e73160c07dde
+EBUILD List-MoreUtils-0.426.0.ebuild 874 SHA256 7a82488e03bf69e4adc27edc6c9281ce3d5f6f68b67a9f5f678f4d41e056348d SHA512 6baccdd4b4b69e10f1ad69c1cc818ac014e67a74974b4710c3eeddeb37d76862fa5f7a7562f20c8ed000d080ef54e4aa10728fc0ca43f124d75bd9050609c9ac WHIRLPOOL 306498bb07b995976215ee6e6c5730d34960260aa4b633070d7e15468ca67706128fb306be784f458763ab2ebd4d8648aac98c801cfe37b768e73a480566b665
 MISC ChangeLog 4963 SHA256 bd2d641c0c9667c4ff1f07f258a8cace020d89ef0e626f14880f552979050a72 SHA512 e950ed3847b715aace3bc70db9c8f6c163f6f958480128d2ca933a07858601df9bfdba4e8b57f2f5f3eea3d617efc647464480de0854998cbf2541383656893c WHIRLPOOL 59b52cb591d912bbe9e204226e93dc54e8bb6a556c83efce989cacabda208459d26fde9721dfaa99db4ff7bc3547a4e2c403ca4ecd356584d1ded34a916ff6df
 MISC ChangeLog-2015 7307 SHA256 b632225677d3dbf993108c096947467dab668f68156340f8d28eb64349b8e0ab SHA512 d4dd7d8a3f79530307cfcbd9f5eda719271bdf14cc5febaf7d23d0950341c9bb4530daa39c7be8de67f413b8122465c1af46759ed39b073f19d0b6a324026122 WHIRLPOOL 883b956dcc71ea161251a81f8a64745f8725cbb3ceeb62456f8e03408530e9328c17ee8a177617ff4a3d194daa0faf151bdbce781d3496fa7a0c1717a49a35a1
 MISC metadata.xml 565 SHA256 cce75ab3f2ed9cb688fb087f8164bd9e7f7e5f56697762aa8f89d92b28cb950a SHA512 b4fc48156533446dd91d18f6aac2dd58a61f3e3911357930b3710241f8b3e29a7a9143b02bf348e25c15e5cb323c66dbaf6b3555d64b5b333bc7281bded865be WHIRLPOOL f03bfa4f1a429ac450d582859c7b9299717ad65c01e46040ac064e8ed6c683495ed4b3ea1b889711fa15d79619cc632ebcc45609aeacbd208682e6da71d543db
diff --git a/dev-perl/List-MoreUtils/files/List-MoreUtils-0.426.0-xs-config.patch b/dev-perl/List-MoreUtils/files/List-MoreUtils-0.426.0-xs-config.patch
new file mode 100644
index 000000000000..941f2d6bc1a1
--- /dev/null
+++ b/dev-perl/List-MoreUtils/files/List-MoreUtils-0.426.0-xs-config.patch
@@ -0,0 +1,78 @@
+From 903ed372cad330e86ef767eb98a4d29d04781e5e Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Sat, 28 Oct 2017 14:53:23 +1300
+Subject: Use configuration instead of pure discovery for XS Support
+
+Given in Gentoo that ::XS is either going to be available, or not,
+based on user configuration, *before* configure runs, trying to turn
+it on/off in configure is nonsense.
+
+Subsequently, this test logic just determines if we should be running
+the XS tests or not.
+
+If ::XS is installed already, then XS tests should be run despite user
+not opting in to XS, as the opt-in only regulates dependencies, but
+LMU can still trigger ::XS at runtime.
+
+If the user opts in to XS, then the tests should be run regardless of
+perl detecting XS being installed, because XS *NOT* being available
+is then an error.
+---
+ Makefile.PL | 41 ++---------------------------------------
+ 1 file changed, 2 insertions(+), 39 deletions(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index 89680b1..5083b86 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -8,45 +8,8 @@ use 5.008_001;
+ use Config;
+ use ExtUtils::MakeMaker;
+ 
+-BEGIN
+-{
+-    unless (grep { $_ eq "." } @INC)
+-    {
+-        use lib ".";
+-    }
+-}
+-
+-use inc::latest 'Capture::Tiny';
+-use inc::latest 'Config::AutoConf';
+-
+-if (inc::latest->can("write"))
+-{
+-    inc::latest->write("inc");
+-    for my $mod (inc::latest->loaded_modules)
+-    {
+-        inc::latest->bundle_module($mod, "inc");
+-    }
+-}
+-
+-use inc::Config::AutoConf::LMU ();
+-
+-inc::Config::AutoConf::LMU->_set_argv(@ARGV);    # XXX hack because we cannot construct for global use
+-my $loadable_xs = inc::Config::AutoConf::LMU->check_produce_loadable_xs_build();
+-
+-if (-d "Sandbox")
+-{
+-    unless (grep { $_ eq "." } @INC)
+-    {
+-        use lib ".";
+-    }
+-    eval "use Sandbox::Tumble ();";
+-    $@ and die $@;
+-    eval "use File::Path ();";
+-    File::Path->import;
+-    -d 't/xs'       and rmtree('t/xs');
+-    -d 't/pureperl' and rmtree('t/pureperl');
+-    Sandbox::Tumble->tumble(qw(t));
+-}
++my $loadable_xs = $ENV{LMU_USE_XS} ||
++ eval { require List::MoreUtils::XS; List::MoreUtils::XS->VERSION(0.426) };
+ 
+ my $conflictMsg = <<EOCM;
+ ***
+-- 
+2.14.3
+
diff --git a/dev-perl/List-SomeUtils-XS/List-SomeUtils-XS-0.550.0.ebuild b/dev-perl/List-SomeUtils-XS/List-SomeUtils-XS-0.550.0.ebuild
new file mode 100644
index 000000000000..5828e9f59a1b
--- /dev/null
+++ b/dev-perl/List-SomeUtils-XS/List-SomeUtils-XS-0.550.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=DROLSKY
+DIST_VERSION=0.55
+inherit perl-module
+
+DESCRIPTION="XS implementation for List::SomeUtils"
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-XSLoader
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Carp
+		virtual/perl-Exporter
+		virtual/perl-File-Spec
+		virtual/perl-Scalar-List-Utils
+		virtual/perl-Storable
+		dev-perl/Test-LeakTrace
+		>=virtual/perl-Test-Simple-0.960.0
+		>=dev-perl/Test-Warnings-0.6.0
+	)
+"
diff --git a/dev-perl/List-SomeUtils-XS/Manifest b/dev-perl/List-SomeUtils-XS/Manifest
index dfc88787f63a..a02c079e117c 100644
--- a/dev-perl/List-SomeUtils-XS/Manifest
+++ b/dev-perl/List-SomeUtils-XS/Manifest
@@ -1,3 +1,5 @@
 DIST List-SomeUtils-XS-0.52.tar.gz 92368 SHA256 e0e43c393283c15d8d447c4797102193a2c3543a20f6a014dd8aced0a843f4e1 SHA512 871d492a0ec019d56ecb5a02d0bb362462b52b08cc3ea5b95f58125009e6cca83ae77b3b877152885c8a24c36e438616051b61058a67b212c2dd9fa51ccf7ff9 WHIRLPOOL 0fc05290f8f87cdd8cba2ea3379c3715e656201d770da169638c0d62da04289a9f864cf4b6e814bc6468d6eca088d252f3d17bb48b62efd0fc18777fbeb83504
+DIST List-SomeUtils-XS-0.55.tar.gz 95426 SHA256 bbc745dda3d76b7d3a39e8c43cd523acc8a8165d7c37af54735366edfd01e940 SHA512 44bf99ed3653c6d21fe0d0504dc6e3235ee89079b9c7cb77315f5713c0522057f8f3acbd34001bfba34cce6dfc568684c564b4fcecc700cbc780c57d36591f1f WHIRLPOOL cf1c94261bde59ff44cd5f01647525129e042cd7850321a5d3e4ac9c1df492ee8023f0a01d801b7d4ecc647b6d73f98e61e5a3826db0cefff8ac4cecd3472108
 EBUILD List-SomeUtils-XS-0.520.0.ebuild 609 SHA256 9af5c94a45161c8dcbf0b0ca0f84c44666a78f7b0eb6263a06f34a34a0b59407 SHA512 afaaa19bf6b4bf52f561d36e4392c524e2095bdc5f2a0eea212bd812f814c6f732bfdbddb78031186f2929e0cc7cd9f43b8111868b1a51166998dad38b3e762d WHIRLPOOL 845d48eeb5c60cd96c64fc947f05678851639d2fd20cc89f18b44c1f3a9ac123451f3046166af49077ebf7f4438951c1bfdbec36b2e8c5f2f69c070e492f73f4
+EBUILD List-SomeUtils-XS-0.550.0.ebuild 666 SHA256 351591a1165d04f8ccf9dd3c911c13b29ddb75f696a6d5f6e20809b7b95901ac SHA512 c34f38021597adf468a6aa29f1c6835414cd013ae64c7bf91751522002514ab7cefc15262d587a3dd9766f598cc3fd31504c76b279760b570167fdbf175a2dcd WHIRLPOOL f36dece2fb5b672279b94317cea494939fec3e1d77c64b0e9a1be0ad0833ce692412346c857a944aaf449e8a7f12cb3d158fb34ca242faa0b90bf2a40714b283
 MISC metadata.xml 407 SHA256 d4eb88a5a8d65179319f062de2f2099a896aaff5c9f207222e52289d98651a48 SHA512 7b7e867350c5c5d70f773da33373eb6ad0f5a40688ff3abd31e6f376c00f5adcd08f5ea76680c5dc8b4aa1cf8abb8d289659d9ddf2540e356ecccbc1208bef09 WHIRLPOOL df04de222dce3e63a0a228ae04296e72293c226c00646691f4a7aedf5a5fc5c913ea16718793afe47f5c16d009e8e50dd1c5fbe471985de58cbffaed18208e41
diff --git a/dev-perl/List-SomeUtils/List-SomeUtils-0.560.0.ebuild b/dev-perl/List-SomeUtils/List-SomeUtils-0.560.0.ebuild
new file mode 100644
index 000000000000..3fb11c5b5d15
--- /dev/null
+++ b/dev-perl/List-SomeUtils/List-SomeUtils-0.560.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=DROLSKY
+DIST_VERSION=0.56
+inherit perl-module
+
+DESCRIPTION="A colletion of List utilities missing from List::Util"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Exporter
+	dev-perl/Module-Implementation
+	>=dev-perl/List-SomeUtils-XS-0.550.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	virtual/perl-Text-ParseWords
+	test? (
+		virtual/perl-File-Spec
+		dev-perl/Test-LeakTrace
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
diff --git a/dev-perl/List-SomeUtils/Manifest b/dev-perl/List-SomeUtils/Manifest
index 58a951d2b3c7..888a3a2c35fd 100644
--- a/dev-perl/List-SomeUtils/Manifest
+++ b/dev-perl/List-SomeUtils/Manifest
@@ -1,3 +1,5 @@
 DIST List-SomeUtils-0.53.tar.gz 62522 SHA256 f4103a16f361abd163126872d949806a6b9eadf1d852be359301c9cbdbc1a598 SHA512 baac767b92cd3062396c5f7d5570fe88b358d4c23f0705671741662f41ce859cabfb1fef100573522517fb7108f69ccc3502d901882448ed6008dde38a0560d8 WHIRLPOOL 57063904190f7d2ccb8e86042c42431219ae8b96de1b29ba5714e751a7a5250ec1bf49389a0b51cfcb6fb8a2c55c0f252aa10e2d26f5d28e3d10e62a7736f600
+DIST List-SomeUtils-0.56.tar.gz 63880 SHA256 eaa7d99ce86380c0389876474c8eb84acc0a6bfeef1b0fc23a292592de6f89f7 SHA512 b74c2a97811185d21bfd68fe60606afe8e92c266e98a763d51589021c9b3ae5310275005dc80198b8f9d92118fed569b5251d5ad87643f47af75a478db388503 WHIRLPOOL f7709cf45513d9564821ad3ae09ab4d960fade277b28ae4c222daa5736951c0000af6117c64ad150b0ce8c0ac363c58d79e8b4e374b7ace781086220de545bf8
 EBUILD List-SomeUtils-0.530.0.ebuild 636 SHA256 4b550e4d26ec8b69f3ea199be5c234a35dd8b3b7b8bda622b906f4c25fe49da4 SHA512 dbc7c130d58ba55e459180f7ac6e0982cb852bd1f6d8329eaae56e3397f678a0ceeed0dd11caf139bd91fa2ffee57fa159c122a3d6fb9c35189e6df77c4cc11a WHIRLPOOL b4f7eec8a681770f966b56b477926697f927eee893a90f7520c2abeda22e2fb589803666e1686a4052bfe1364f51369f3c82b99436f14f580c106da84f82a001
+EBUILD List-SomeUtils-0.560.0.ebuild 646 SHA256 86c6433a27209ef02fe22057413747e946f23c06630a2f1f775c651919da2ee4 SHA512 295f0bed88cf4c78354b92809f8cd26b049a27c7964a2d6d8e598476541365960fc4b40b3fcd4a645a0065dfe91e21553cf91fe716d86ea7b4ad75626a152012 WHIRLPOOL 2546c153e42adf47ff3840cee2669fd7db8e0c8801811f848396fff1aafc5b1d2e61199e1d746cda67aa8ec7062d7eb9d4717d775ad8c4a40242f111824eb189
 MISC metadata.xml 466 SHA256 2eb77493691ffb29b54964cd7ad8ff496a6bc3fbc74c2fed5388c3aba19d3bd8 SHA512 7fcfff632ce20f39573382b3d287f69fdbb82c3f8fa390b7e1694ebde8a0e165ddb930ae04bedf67957ee7d960d49a149288968810b80686009e6f6335b0a05e WHIRLPOOL 994a26f403ef586cc92bd3ab1eaac8cadc64f330b975fec44123b921646c76040b78f2a52359e6b129131d931c43ffe410ebc4f496859b0899516fb686fc4aaa
diff --git a/dev-perl/List-UtilsBy/List-UtilsBy-0.100.0.ebuild b/dev-perl/List-UtilsBy/List-UtilsBy-0.100.0.ebuild
index 5026eba8331c..229589cd0784 100644
--- a/dev-perl/List-UtilsBy/List-UtilsBy-0.100.0.ebuild
+++ b/dev-perl/List-UtilsBy/List-UtilsBy-0.100.0.ebuild
@@ -17,7 +17,7 @@ DEPEND="
 	>=dev-perl/Module-Build-0.380.0
 	test? ( virtual/perl-Test-Simple )
 "
-
+PATCHES=("${FILESDIR}/${P}-no-dot-inc.patch")
 SRC_TEST=do
 
 src_test() {
diff --git a/dev-perl/List-UtilsBy/Manifest b/dev-perl/List-UtilsBy/Manifest
index ca9aa4e444a3..a0408a4004a6 100644
--- a/dev-perl/List-UtilsBy/Manifest
+++ b/dev-perl/List-UtilsBy/Manifest
@@ -1,5 +1,6 @@
+AUX List-UtilsBy-0.100.0-no-dot-inc.patch 684 SHA256 1a59c656cea8ec2c4629ff805267ce5920b0d74bc332659b8583a5c83f0a376f SHA512 f31bea197d89f905761a73f084b859a9cb98ebee4dd4eb2b21baa024c817da0cd1c667d574a825c7d64b3a351aa7b96c8209e9ff2500fd22bd989eb51b862654 WHIRLPOOL 44a9ca142141e7b8ee55c667bf76de063f8dfa6696c580d7bdb35e842041fc38c8a71a07259f47120c4f733598e8c62e26511f1b70f0c2d8c07929dd130bb9db
 DIST List-UtilsBy-0.10.tar.gz 21845 SHA256 bed74094c625aa34a5ae94a7e1fe1856f08e1bd26b8ba152bfe7a51d3277192e SHA512 3e73ca8a99da111ff8869fce9561f52163bd4173589f0ff5c17913afea080279765a1f306af50b11040e26eea0f8ae9d993a93b0f0908ed15fa301e421dc0384 WHIRLPOOL 82347f0d556aad8e67cbf7e45bed1301d1a0ffe4ece7f3661a33fe4b80dac096d8adef13a1346219a1823538a1e6fe1270956112394af009798de3fb976d1139
-EBUILD List-UtilsBy-0.100.0.ebuild 479 SHA256 d2860b76cb1bf6de78a8970b48e730f089987fc360198715184aeeedf8ed4918 SHA512 fda80fa6b03ddb60afcce4a1b58724e3aa9b7bab51cbe395fd5196ef09a4d28bd4b0fb8d7dd77ab72bf6700510ae2ff47cb748f217cd7bdf90fce18807e0efea WHIRLPOOL d88941af144b035a9b24c109947ec9c5c3ba517ff627e1efecd770fbd610335d56bd03b2b2ff2a785a0f3548e8991753a501838509bde395cd759d13cce98f2c
+EBUILD List-UtilsBy-0.100.0.ebuild 524 SHA256 bbc9fe77fc216e50c1af0f380dee814398364db06c43f0244a01500a47c0d42a SHA512 41c48450d54d2554b599359eb9bc1400083d0326866661a0de50658c9e0da9846d3642c20ee07739c88e6be18daa6b72aba8a697cbc81b9801643bb8bf693c00 WHIRLPOOL 569b8d80e024cca5c5e1737755cfd5991ae1c7142490b1addb6728d5c173ee4502b0e92b7e0a1f976d9bb55734b4907944bdeac962f6f5111caf9c55360783b9
 MISC ChangeLog 3168 SHA256 b4dba9d1fe755d91291b5da89f37d84d80560adb8695db6013747025db3d1d39 SHA512 f591da350fd45818947b469a1375047adbf3dc32e7a3f2e4582472181e3b5155a6f0b32fd4f2b13ee2e884bdf3d6aa5c6837fad67c093d3f40d9a257276e170a WHIRLPOOL 1722f7a2e4cf909e16fcc738aeb16e1f5013c8c27e740885840aed6e8727dbbb133a70088db0f5ce1ad44d54577999324ab4a5d3da7e07394278fd7a9f631977
 MISC ChangeLog-2015 1249 SHA256 d9e994ba00f61b644b5b9120b9c1af05ddb35b78ad0d94d067fd638e65dcbc03 SHA512 a17a801315b750b62a86e90421edc6658f6fc49b4cb74ac58ec85396bafe836bdd7cdc19eb3b4b48fd741b37b33f1f7ef3755cc60bb18a71deb34985f70b3799 WHIRLPOOL f0abd2d597ae465df0babe0a5181ff4ad6e99d83292ced63d50d23ca42b0de73978978c54e86d3bba0d4927e93f96fe5f62d4330bed53f05fe201216fe9e5e5a
 MISC metadata.xml 396 SHA256 49ae440b8363aeb4c90110bcd74c3f51fe5c304f9ed1594fb2c488c35fd470ca SHA512 e65fd6f63de1f1e62951f5e6782ede697062d76e71fdd612edbe89017d856a874cc015763cd6d54f064cef1285cb83a646c91fa946c0dc8b5f5716809d88aa19 WHIRLPOOL 257ecfe9632baf71cd171a7bb432845add3bffaac74cc1998e33582c41d25576c576aed71ba55e641172dbe910da53dcfbc5b5bc2f549bda3420d00e72bd6ea8
diff --git a/dev-perl/List-UtilsBy/files/List-UtilsBy-0.100.0-no-dot-inc.patch b/dev-perl/List-UtilsBy/files/List-UtilsBy-0.100.0-no-dot-inc.patch
new file mode 100644
index 000000000000..1ca063f24ef7
--- /dev/null
+++ b/dev-perl/List-UtilsBy/files/List-UtilsBy-0.100.0-no-dot-inc.patch
@@ -0,0 +1,27 @@
+From a7ce31efae156a93136b07136aead3e44b7d4b6c Mon Sep 17 00:00:00 2001
+From: Paul Evans <leonerd-cpan@leonerd.org.uk>
+Date: Mon, 27 Feb 2017 11:05:41 +0000
+Subject: Fix test failures without '.' in @INC
+
+Bug: https://rt.cpan.org/Ticket/Display.html?id=120418
+Bug: https://bugs.gentoo.org/615096
+---
+ t/11weighted_shuffle_by.t | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/t/11weighted_shuffle_by.t b/t/11weighted_shuffle_by.t
+index 68da739..0d41639 100644
+--- a/t/11weighted_shuffle_by.t
++++ b/t/11weighted_shuffle_by.t
+@@ -4,6 +4,8 @@ use strict;
+ use warnings;
+ 
+ use Test::More;
++
++use lib ".";
+ use t::Unrandom;
+ 
+ use List::UtilsBy qw( weighted_shuffle_by );
+-- 
+2.14.3
+
diff --git a/dev-perl/Locale-gettext/Locale-gettext-1.70.0.ebuild b/dev-perl/Locale-gettext/Locale-gettext-1.70.0.ebuild
index 542a8efc7972..b239751ccd13 100644
--- a/dev-perl/Locale-gettext/Locale-gettext-1.70.0.ebuild
+++ b/dev-perl/Locale-gettext/Locale-gettext-1.70.0.ebuild
@@ -18,5 +18,5 @@ RDEPEND="sys-devel/gettext"
 DEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 "
-
+PATCHES=("${FILESDIR}/${P}-no-dot-inc.patch")
 S="${WORKDIR}/${PN}-${DIST_VERSION}"
diff --git a/dev-perl/Locale-gettext/Manifest b/dev-perl/Locale-gettext/Manifest
index 120b6a0c3670..445c5743d8f8 100644
--- a/dev-perl/Locale-gettext/Manifest
+++ b/dev-perl/Locale-gettext/Manifest
@@ -1,8 +1,9 @@
+AUX Locale-gettext-1.70.0-no-dot-inc.patch 2576 SHA256 21ddc19a3a5d0255529ebcdce7d446d53d0a2233d6381491a836c8bab427e086 SHA512 af169db6991e968e29dcc760030919cc619e4bd9f13b4f20d707914674aa5c53dabeaec0e9f29254dbf9250fc96e6ace36a86a50b1dc5af0e1573bf4485047d2 WHIRLPOOL 487034322afab3532b2be210f7826be9d0c0856a43184c3192665642dd66bf71b145db8db327d0b353781d3d46efaf87fd11df230d3ae68db67b0d3db4e89edf
 AUX compatibility-with-POSIX-module.diff 449 SHA256 e40b9911008c65719f8f890856d1fb77dc5f7f728f68231ec48264e86aae8008 SHA512 079d36e570bbfb6d940c5b02ecd14f685ca004c07e747b019dfb086b4017d0f59e76e94d4f423fe6d43a619d446f5b90443f60731f6008b789822b48d98e9b78 WHIRLPOOL c70513623e3518b419d3b8ce4d42a7f453100f840ab4928be9913b454def0f928bbd52f07d70030343e57b59c98a5359f5944b7be146387c9d3414195e6cb5df
 DIST gettext-1.05.tar.gz 7693 SHA256 27367f3dc1be79c9ed178732756e37e4cfce45f9e2a27ebf26e1f40d80124694 SHA512 ce58940be16b7f2b3bde8f321f142486b38874018d37267ecf0587f44a0ea6c7a2d86fc22ce4ac78f3c9cc521e1ef7142009dd8d050aa45bb12a0e64959d37b1 WHIRLPOOL 87b64aae4d24435fcd38804fbcb9d41747f703a004b40b48a0e91718a67bd42958ede87d79deb462325d2bc6d81ba78a0babb9f879ca9176601ab247540bff0c
 DIST gettext-1.07.tar.gz 8651 SHA256 909d47954697e7c04218f972915b787bd1244d75e3bd01620bc167d5bbc49c15 SHA512 d3716a597d586ee2ff29472ca7b13aaf67770299de31e5f12abafebc879bbe4a1e1dbc0025cf4f3dc29992955f26cffc3be387d974c3911af095d5b49e67a1c6 WHIRLPOOL d41dc69e46d9ae533989cb8eee3e055f968cff87d45deca91d0a6cad40a7cef584713df965f445eb217304696a7f84cb21882a10653dbe8a43882ca7cdcc272a
 EBUILD Locale-gettext-1.50.0-r1.ebuild 668 SHA256 e79790e442279d8fc2f12115d95f92e90fef69a824f6727a033ce38e82fd1918 SHA512 062fb86104b0a2c79a383a8cfc1922a526edc95ae84b9011b8986db407bff7588d523455329642d98b833d10f0675e48b863e1e169ef2646e461d69da9f03247 WHIRLPOOL 88f9531f5b5a55304505ca7c3913f0130437cfd88b6fad572e1395580e263b3d70459f9f5c4da7cf425c33e92d0d9a2d59e9d4aced9f3d82740eaad0627d2c84
-EBUILD Locale-gettext-1.70.0.ebuild 625 SHA256 81dabd75554f1968ad14f4911a33d7e576339da142d4abf69022238e0323d304 SHA512 c67cd437f8e977e51e6d6d7cb129fa1d894984e6d3060db228e19e09dd6f7f91e363309d9ed15bb9bf2d4b9bf17193c0e238cb862a50ac9f3436205532d3d953 WHIRLPOOL de8b9cd0167dce780eb220f427ec49493cd70c46de88c9d7c87b4097aa5b3fb4f0de75c22d99b25b5eb5a9fc49ddeee1dc279af821537cddb2654820fee46ad0
+EBUILD Locale-gettext-1.70.0.ebuild 670 SHA256 b8f83bde0261aa9a0b65c27e3d5bffc0fdb2e1cc70bae8f22b9e34169d780f1b SHA512 b8dac3bf877dd7d8ebb99c4463b6e8e193735c77e575607cc14e7b76716680c77940adb7de47e8c6579dae81cacadc7fe316deefcd7c9dcfe3dc6c4a634a1a46 WHIRLPOOL a76aaedaf425976b052151606caf2ad3c81f6ddd1cf4e19882c6f4dcbd65b585ec9a2cd6720baa247563da1da65f8658de9cd5dc8eeaa7d031023d1f233a7e5e
 MISC ChangeLog 2697 SHA256 f9c56a5d8cae92cbfd4356e47dba2aadded07330ccf33ec23a667375827f19c0 SHA512 2c65896075fbe6d0062b185505ff67fde3731d22c7689b4fc6c17efc4db67b3edafd045b5a7685c7bd4a28de8bc7309130fc8df8ad84451f8e41597dce80b584 WHIRLPOOL fc0fb4c56a1438c4b18958bc8f9effa361174d1dfdbb42b30c964cc0fc25d978dd584718b8735db0669ee55e35b4f63f3b3c8b3292b5878ca5697542b9880d27
 MISC ChangeLog-2015 6394 SHA256 1ca5cad5f7f234db21a7f273bb7178fccad5102d7df1ad3b76e82248e48abc55 SHA512 0440cc0e560df5b25f8d67164617f23870443a5e1c0acda2a22444a617cfd8441bc58502984d35a27a33319bb395d036b858ded22dcd249b6510c0ef3923acf9 WHIRLPOOL 2d0cede5efb0714619877398f8cc5cf82e845cfb69d776451ee144265a0eb5f4a834674410d27b57f3a4f3a9ba44e4e4b31c830245bc0a7372ed6e926a125408
 MISC metadata.xml 393 SHA256 5682047b2c98cd0d61d48c9d33c749ed17c361eb7679b620d569fdc36b601405 SHA512 368d7a37c00a186733e33eeaa01c12fdfed50f2f45c66bc88d0dfddcfd063aacb6c0953aa76737d8f9f5c2ed392e0eef41279975cf2cfad7fb423b8ca29592b0 WHIRLPOOL 1002806a98a7640b8604aaf60875b017f5ca1dea6ee5b76364f8c25a8ba6ad2507271d96d459d2d1c5570cd14a80eafefb4e536250fb6e235850eafe552dbd64
diff --git a/dev-perl/Locale-gettext/files/Locale-gettext-1.70.0-no-dot-inc.patch b/dev-perl/Locale-gettext/files/Locale-gettext-1.70.0-no-dot-inc.patch
new file mode 100644
index 000000000000..962d90cdae7c
--- /dev/null
+++ b/dev-perl/Locale-gettext/files/Locale-gettext-1.70.0-no-dot-inc.patch
@@ -0,0 +1,90 @@
+From 08c1f219ae209b2475e5a1b025caceb10cb4a41b Mon Sep 17 00:00:00 2001
+From: Kim Vandry <vandry@TZoNE.ORG>
+Date: Sun, 28 May 2017 19:11:30 +0100
+Subject: Update tests to work with @INC that does not contain '.'
+
+Perl 5.25.11 removes '.' from the default @INC, and this breaks
+`require "test_data/gen_test_data.pl"` due to not being able to assume
+./test_data/gen_test_data.pl is in the @INC load path, and due to
+`require` treating paths without leading "/" or "./" as search paths.
+
+This change implements the first solution suggested by the reporter of
+the bug: Re-organise test dependencies into a dedicated directory such
+as `t/lib` and load that path into @INC with `use lib 't/lib'`.
+
+Bug: https://rt.cpan.org/Ticket/Display.html?id=121458
+Bug: https://bugs.gentoo.org/617048
+---
+ MANIFEST                              | 2 +-
+ t/frconvert.t                         | 3 ++-
+ t/jaconvert.t                         | 3 ++-
+ {test_data => t/lib}/gen_test_data.pl | 0
+ t/raw.t                               | 3 ++-
+ 5 files changed, 7 insertions(+), 4 deletions(-)
+ rename {test_data => t/lib}/gen_test_data.pl (100%)
+
+diff --git a/MANIFEST b/MANIFEST
+index 9604b91..e9f6e08 100644
+--- a/MANIFEST
++++ b/MANIFEST
+@@ -8,7 +8,7 @@ t/jaconvert.t
+ t/raw.t
+ t/use.t
+ test_data/foo.po
+-test_data/gen_test_data.pl
++t/lib/gen_test_data.pl
+ test_data/jaeuc.po
+ MANIFEST
+ META.yml                                 Module YAML meta-data (added by MakeMaker)
+diff --git a/t/frconvert.t b/t/frconvert.t
+index 2bca28b..9a4f4f5 100644
+--- a/t/frconvert.t
++++ b/t/frconvert.t
+@@ -1,8 +1,9 @@
+ #!/usr/bin/env perl -w
+ use strict;
+ use Test;
++use lib 't/lib';
+ BEGIN { plan tests => 1 }
+-require "test_data/gen_test_data.pl";
++require "gen_test_data.pl";
+ 
+ gen("foo");
+ use Locale::gettext;
+diff --git a/t/jaconvert.t b/t/jaconvert.t
+index 5794dc4..b95c883 100644
+--- a/t/jaconvert.t
++++ b/t/jaconvert.t
+@@ -1,8 +1,9 @@
+ #!/usr/bin/env perl -w
+ use strict;
+ use Test;
++use lib 't/lib';
+ BEGIN { plan tests => 1 }
+-require "test_data/gen_test_data.pl";
++require "gen_test_data.pl";
+ 
+ gen("jaeuc");
+ use Locale::gettext;
+diff --git a/test_data/gen_test_data.pl b/t/lib/gen_test_data.pl
+similarity index 100%
+rename from test_data/gen_test_data.pl
+rename to t/lib/gen_test_data.pl
+diff --git a/t/raw.t b/t/raw.t
+index 1e1cf14..7439397 100644
+--- a/t/raw.t
++++ b/t/raw.t
+@@ -1,8 +1,9 @@
+ #!/usr/bin/env perl -w
+ use strict;
+ use Test;
++use lib 't/lib';
+ BEGIN { plan tests => 1 }
+-require "test_data/gen_test_data.pl";
++require "gen_test_data.pl";
+ 
+ gen("foo");
+ use Locale::gettext;
+-- 
+2.14.3
+
diff --git a/dev-perl/Log-Agent/Log-Agent-1.1.0.ebuild b/dev-perl/Log-Agent/Log-Agent-1.1.0.ebuild
index 4ecc7bb82017..edcbc2a2ca92 100644
--- a/dev-perl/Log-Agent/Log-Agent-1.1.0.ebuild
+++ b/dev-perl/Log-Agent/Log-Agent-1.1.0.ebuild
@@ -19,5 +19,5 @@ DEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? ( virtual/perl-Test-Simple )
 "
-
+PATCHES=("${FILESDIR}/${P}-no-dot-inc.patch")
 DIST_TEST=do
diff --git a/dev-perl/Log-Agent/Manifest b/dev-perl/Log-Agent/Manifest
index aa64e13ae039..4d12a6a87a93 100644
--- a/dev-perl/Log-Agent/Manifest
+++ b/dev-perl/Log-Agent/Manifest
@@ -1,5 +1,6 @@
+AUX Log-Agent-1.1.0-no-dot-inc.patch 4048 SHA256 5e9767bf2c635284402b3a4dd76c68e2c3d6438dc9800f3f12afd108a1dd63b9 SHA512 4aca7bdb2eab4405028bfe7e8a1fe2fbcfc7db7f4b0302d9a753944586c5558bdc4c4c161a557f2e865d27172b0c78a685c74b5d9c38d4097c83038959b8d970 WHIRLPOOL a3dfef7e117cf668b00c2d32102412d86937b20a049d1b5dc7d2ef5a4e3dc5a8ad842caaab457f8a5614b9bc402d8baa7d0098ce8d6d47ebb3b190cd07dffd7b
 DIST Log-Agent-1.001.tar.gz 56215 SHA256 9a7827fa862e3bb3af121518fcfbac4f505fdadbe863496dc18ee7daabdeae85 SHA512 b8d3a15e40129add73bb4967ecc5daf37c0fd8a17eb75ed86fe338a9eb228b37ddd56b9bbf9bdef91f8453eb1b53d7fe303a96f68cbb0834820f2354fa37b5e7 WHIRLPOOL 8b421a6e1eb08f2f7744d56c8fd066c907bb2a4b8964005123ed817c1a0604fa3a51a098fa285c2af0e7ad11e70900d6d574bdef94e02218a944da684f8a0c0e
-EBUILD Log-Agent-1.1.0.ebuild 553 SHA256 2f49dd998aee9bbe7250fad137e74c72dc88ea2cc6d1c84b244313600ac62396 SHA512 ae1025969bdc508efe947d377bf43e3387392e9152fa8ccee0fc3e7c0278d97ff1ae54778ea77c86388ee97d44e1ca7ca0700742c5f9f40f7782017beddeff07 WHIRLPOOL cfbdd3dc25b74abb1a15ce4eaffcbf020114b73a0436c5e7ec12c1bf16103360f54b7a01680481be42562b1e466045fb97ea5ec64e58611976076a7d15cbfa8d
+EBUILD Log-Agent-1.1.0.ebuild 598 SHA256 6e537a8c22bc70cb9b9f1616d0302c99bea856148c9227c42743768ff0b74973 SHA512 8d30918ff376cd5c4d8d000b05e40f8269825d7ef1ab9036506578f71609e0fbbb77de0a078f3585aeb57e513b8f4585e0ba8a883962c0300d7727949968785d WHIRLPOOL 254a811fc4966c8c6374a97ecf3d9b031d661069469fc3f2b41275462c41b53cb4243a4c30f2b848d553a7996b629c192ff490b2680d6e86a46ae410d02bc699
 MISC ChangeLog 3190 SHA256 11b6370cd07bb2338a0101e5723ad4464b7076b3fb46785befdd69c562f02bb8 SHA512 3c20617dd1088654e017310e5355d85c721a211fd5c2d8d4a221ea53b7ad1338ecd2be1340aec2d6801b9a9cce6646530915f2e2abaa863408710fcb718e8364 WHIRLPOOL b510c4225c4fc099fe551d5db90152b3a8aacd74852a9f8606d25a0667b70ca6146b85c7c647f6422a5f4d342641f19a3703bcaf3761374504185525397b569f
 MISC ChangeLog-2015 4164 SHA256 e4f7373a41a748df9b976524ec04b6c5adb296dc2eeb6927b83c4ebf5047172f SHA512 846999534948055e95ecbb242e8d807357926305f28c0d580959ec52515764fc30eb8292df10c2268f1a788ce3dbb1660ca1fad07e8a7f35d67b91ff1ef59762 WHIRLPOOL dd60161119a6e3d1e685e2e4f79a7a13e254da57407b722840ed65dda20e7088c637d8ea08dc9ed72c1e2f21393ce96a3852ca480f1f68f246d84360d39aeffa
 MISC metadata.xml 2136 SHA256 d05db5e866287be847b85c1bb5107ae342e25a70ff2ca3522382c9be229b37fc SHA512 1a707e2e4710a690bbc44ff37f551b8e03e5b88c270d219dc5da5d5604599c93d5d14880956d3ca3df1b83e434ff8fa5264121880e3319dc78b963cc8f8c82b2 WHIRLPOOL cbe0a9958cf5a38230294f5625d6dbc1c4d2f092820cbad8a52022298346583c59e0e5475d2b94c901f89ad3a3f697529bb44f414b3cadbb804ccab1f5caa00c
diff --git a/dev-perl/Log-Agent/files/Log-Agent-1.1.0-no-dot-inc.patch b/dev-perl/Log-Agent/files/Log-Agent-1.1.0-no-dot-inc.patch
new file mode 100644
index 000000000000..e46c0bda2a7d
--- /dev/null
+++ b/dev-perl/Log-Agent/files/Log-Agent-1.1.0-no-dot-inc.patch
@@ -0,0 +1,193 @@
+From f85b4f6c097338ff07c5736fbe77dd09d2bca289 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Thu, 26 Oct 2017 21:02:47 +1300
+Subject: Fix test failures due to '.' removal from @INC under Perl 5.26
+
+when PERL_USE_UNSAFE_INC=0
+
+Bug: https://bugs.gentoo.org/617050
+Bug: https://rt.cpan.org/Ticket/Display.html?id=121459
+Bug: https://github.com/mrogaski/Log-Agent/pull/13
+---
+ t/caller.t       | 2 +-
+ t/carp.pl        | 4 ++--
+ t/carp_default.t | 2 +-
+ t/carp_file.t    | 2 +-
+ t/carp_fork.t    | 2 +-
+ t/carp_silent.t  | 2 +-
+ t/default.t      | 2 +-
+ t/default_exp.t  | 2 +-
+ t/file.t         | 2 +-
+ t/fork.t         | 2 +-
+ t/priority.t     | 2 +-
+ t/tag_callback.t | 2 +-
+ t/tag_string.t   | 2 +-
+ 13 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/t/caller.t b/t/caller.t
+index 6a14aa6..feb3c2c 100644
+--- a/t/caller.t
++++ b/t/caller.t
+@@ -14,7 +14,7 @@
+ 
+ print "1..10\n";
+ 
+-require 't/code.pl';
++require './t/code.pl';
+ sub ok;
+ 
+ use Log::Agent;
+diff --git a/t/carp.pl b/t/carp.pl
+index a4327e1..352f7d6 100644
+--- a/t/carp.pl
++++ b/t/carp.pl
+@@ -14,10 +14,10 @@
+ 
+ print "1..11\n";
+ 
+-require 't/code.pl';
++require './t/code.pl';
+ sub ok;
+ 
+-my $FILE = "t/carp.pl";
++my $FILE = "./t/carp.pl";
+ 
+ package OTHER;
+ use Log::Agent;
+diff --git a/t/carp_default.t b/t/carp_default.t
+index 293ddb7..819e438 100644
+--- a/t/carp_default.t
++++ b/t/carp_default.t
+@@ -20,4 +20,4 @@ select(ORIG_STDOUT);
+ open(STDOUT, ">t/file.out") || die "can't redirect STDOUT: $!\n";
+ open(STDERR, ">t/file.err") || die "can't redirect STDOUT: $!\n";
+ 
+-do 't/carp.pl';
++do './t/carp.pl';
+diff --git a/t/carp_file.t b/t/carp_file.t
+index 9e5e9a3..8239d62 100644
+--- a/t/carp_file.t
++++ b/t/carp_file.t
+@@ -27,4 +27,4 @@ my $driver = Log::Agent::Driver::File->make(
+ );
+ logconfig(-driver => $driver);
+ 
+-do 't/carp.pl';
++do './t/carp.pl';
+diff --git a/t/carp_fork.t b/t/carp_fork.t
+index c81a86b..dcf8131 100644
+--- a/t/carp_fork.t
++++ b/t/carp_fork.t
+@@ -29,4 +29,4 @@ my $driver = Log::Agent::Driver::Fork->make(
+ );
+ logconfig(-driver => $driver);
+ 
+-do 't/carp.pl';
++do './t/carp.pl';
+diff --git a/t/carp_silent.t b/t/carp_silent.t
+index 6c7c8ca..c913308 100644
+--- a/t/carp_silent.t
++++ b/t/carp_silent.t
+@@ -14,7 +14,7 @@
+ 
+ print "1..2\n";
+ 
+-require 't/code.pl';
++require './t/code.pl';
+ sub ok;
+ 
+ use Log::Agent;
+diff --git a/t/default.t b/t/default.t
+index eadca93..73bab3a 100644
+--- a/t/default.t
++++ b/t/default.t
+@@ -14,7 +14,7 @@
+ 
+ print "1..4\n";
+ 
+-require 't/code.pl';
++require './t/code.pl';
+ sub ok;
+ 
+ use Log::Agent;
+diff --git a/t/default_exp.t b/t/default_exp.t
+index 5fc95b7..940e1eb 100644
+--- a/t/default_exp.t
++++ b/t/default_exp.t
+@@ -19,7 +19,7 @@
+ 
+ print "1..8\n";
+ 
+-require 't/code.pl';
++require './t/code.pl';
+ sub ok;
+ 
+ use Log::Agent;
+diff --git a/t/file.t b/t/file.t
+index 57caaba..e7487ee 100644
+--- a/t/file.t
++++ b/t/file.t
+@@ -15,7 +15,7 @@
+ use Test::More;
+ use Log::Agent;
+ require Log::Agent::Driver::File;
+-require 't/common.pl';
++require './t/common.pl';
+ 
+ BEGIN { plan tests => 38 }
+ 
+diff --git a/t/fork.t b/t/fork.t
+index a943a89..5726ba2 100644
+--- a/t/fork.t
++++ b/t/fork.t
+@@ -14,7 +14,7 @@
+ 
+ use strict;
+ use Test;
+-require 't/common.pl';
++require './t/common.pl';
+ 
+ BEGIN { plan tests => 19 }
+ 
+diff --git a/t/priority.t b/t/priority.t
+index 3e5be89..3f6b2c4 100644
+--- a/t/priority.t
++++ b/t/priority.t
+@@ -14,7 +14,7 @@
+ 
+ print "1..5\n";
+ 
+-require 't/code.pl';
++require './t/code.pl';
+ sub ok;
+ 
+ use Log::Agent;
+diff --git a/t/tag_callback.t b/t/tag_callback.t
+index 64a1bd4..39b749d 100644
+--- a/t/tag_callback.t
++++ b/t/tag_callback.t
+@@ -12,7 +12,7 @@
+ #
+ ##########################################################################
+ 
+-require 't/code.pl';
++require './t/code.pl';
+ sub ok;
+ 
+ eval "require Callback";
+diff --git a/t/tag_string.t b/t/tag_string.t
+index 843fc10..b4851c2 100644
+--- a/t/tag_string.t
++++ b/t/tag_string.t
+@@ -14,7 +14,7 @@
+ 
+ print "1..2\n";
+ 
+-require 't/code.pl';
++require './t/code.pl';
+ sub ok;
+ 
+ use Log::Agent;
+-- 
+2.14.3
+
diff --git a/dev-perl/Log-Any/Log-Any-1.701.0.ebuild b/dev-perl/Log-Any/Log-Any-1.701.0.ebuild
new file mode 100644
index 000000000000..cc5823ce8177
--- /dev/null
+++ b/dev-perl/Log-Any/Log-Any-1.701.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=PREACTION
+DIST_VERSION=1.701
+inherit perl-module
+
+DESCRIPTION="Bringing loggers and listeners together"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="test minimal"
+
+# Test::Builder needed for Log/Any/Adapter/Test.pm
+# constant -> perl
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Data-Dumper
+	virtual/perl-Exporter
+	virtual/perl-IO
+	virtual/perl-Storable
+	virtual/perl-Sys-Syslog
+	virtual/perl-Test-Simple
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		!minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 )
+		virtual/perl-File-Spec
+	)
+"
diff --git a/dev-perl/Log-Any/Manifest b/dev-perl/Log-Any/Manifest
index c660d6e82814..d6c035e9313b 100644
--- a/dev-perl/Log-Any/Manifest
+++ b/dev-perl/Log-Any/Manifest
@@ -1,7 +1,9 @@
 DIST Log-Any-1.038.tar.gz 41707 SHA256 09a07da9b797efa114096e2ea26287d19f22cfae5ac4d135c1be7ab5da94e220 SHA512 36c8370d3924ee9cc85f2be5fe9d8212e7148b98392df90ef8e5566aedf12050115029434d9d969c1582c43a755fb540268dce73390ea53e8918f2901e25e62e WHIRLPOOL 055df7a42d7424eca9162da656b65c0f37cf16c3c355836aefcaf0357afdf2450f63b500db350a86facae291fa9c00314b5d5681e12a35818713dcbf624282c3
 DIST Log-Any-1.049.tar.gz 44718 SHA256 0db8f84eaefea734d31fdb3e285188523fe9ce0e8ba0870757231437c6d4f8bf SHA512 9a6363c7fa8c187deb1c9008411150d3c6a723e17c51cfd957127b2f33246ce680bcea47eae15e856358e643ea8bd8c923a540503b733c421d94f9fdca340f7b WHIRLPOOL 922e946656585e34739d8e01979f8c09c018953de4e37d6e45f6f342dcc13ed9d989d58a3dfd9f0526fcb6b6ca7d88ed3f4ec1257b975db121101a7730c8b6a5
+DIST Log-Any-1.701.tar.gz 49026 SHA256 385b2c0f42bdaab02ca95af29538a7c3ccb4c7f67359d5a842fd14675a80c4aa SHA512 cb66cf36d0bd15fee8e397f3e9f916875cfff485d2177832be9a36fbdf88fda963c658f3317182acd5fcaa88fa14c46b8d5d05d7bd7572b35f81a6eba10dddf3 WHIRLPOOL 8dea04c3489d68bdb0af878a7e302a753a79826322612fe415a7b9d506a289a60e3d857ffdef6e4a02d96ff6c3c0666b96c02f95266e937c4579fd1595154c61
 EBUILD Log-Any-1.38.0.ebuild 669 SHA256 fe3c3a645e691d90ea777fb6a59c62da8e24456a0ed8f54e0f7e91ac923281cf SHA512 144aa08c4ecf5b4988f3a09c3539e29b41aa3decbd54ebf68e26c6948d090cf5d50a7029eb4ba9dbe70f933a843684477c4a089a6ac58f8115286d9dfe22aa82 WHIRLPOOL 458d355a1fe4ebc2c5078cc55e50f27eb7bcefec2a3d5e075f0a1d09cf0d1a200abe2159cc85daa1b36d73e34dc9d51a2bf0200dc26e3f38f92291b8427387bd
 EBUILD Log-Any-1.49.0.ebuild 665 SHA256 4853f3954745b580c718416210c3f3db80bc8b4fad0f971fd57bfe1feb6ce531 SHA512 f51f324ed3b2bf7e3939c251984cd783dbf40b6a953d43c82233e9d0b2e8dc49c3796d426890497fa068564f3d8368df68878030e4d6a9d03151d8816555dee6 WHIRLPOOL ec73ac7a27e41f443f82cf53ad87bb9fac6ae59171d3d6365e5afeb78b5a7020de17b7f4b5e7d8ab95040e7c498314231464cb317f4353a953f5d3dcae34ed17
+EBUILD Log-Any-1.701.0.ebuild 688 SHA256 223bda086499f34ce2b7208e5167260f681de6e965e7799d451d7ed2d3a88b55 SHA512 d0d638b824430e78ba5fb8c9f6f432e826f61c5bd5977e9e00ed75ff68fb53e011650e4d71014678934a1285ec908a888477f2049a27826e1b601fa93bdb8622 WHIRLPOOL c4f5b5fd676d75e7c1d5de5e0c6f199fb9c03fabe89a9246bbb130a5594c160a6831f6d978e794fd6371ee12a7e842cc50296108bf2ca05b03d68984a64ccd61
 MISC ChangeLog 3180 SHA256 68103a0831cd76d4bbbe4194d18d2ea618b1893d6a37b450ec148a0ee9d704d9 SHA512 b9b915e0fde3bc1f892c86064862afd626abd6ee477acc1d01fc442898cdba62378b0a5850d99a379372e4bd43acfe1693b7288c7ad89e4ea659fcf084456164 WHIRLPOOL 82cdce337e59833a848748246cd5409efd17213aeb0bd23090148360c9b0055a545d9218a9d7ecb94913174c2df5fbab5f20a3e5bdb676706ea245afa5ee0120
 MISC ChangeLog-2015 1643 SHA256 cdd2e59af710075f42f4b8a8fc2022d4561822b821f2eafc425cc92ab81a5cfb SHA512 7bb5a8a8ceb8aa99c7d9013fae4590fe42f33798a616dde1e0a9fdad7a3a5108caa435737178cac5e7e58b949839e6f6e1a12bc01803b2e5a8ca5fe9d5175b9d WHIRLPOOL 2d229ef36364f5cb8f763a86629c8744f5cecdea66b034d717c966ebe3c935db21270d2442b50252cea69b1185a9e3374fe181167fd2549fffc140312b1d77f4
 MISC metadata.xml 1339 SHA256 4005601921e89b39617b5d00b1c8143f0c25fca7b9f3f76913cf1cf44e7b3aca SHA512 dd3408d5c17d233d6b7a822ab8a2186604174b376823e7cddcbcde484ef42baa7a838d3efaca25a1bc935cb223bb11884e14761b22ad4d99706076eeec0ad047 WHIRLPOOL 5b2c220bc275290161caebcca2cb690b109516bbd16af192e1d3c031e27d5a0d51119c8e1498ed5361954bbb19ade80e432cc8e6fcc22ac5aa321344248e7400
diff --git a/dev-perl/Log-Dispatch/Log-Dispatch-2.670.0.ebuild b/dev-perl/Log-Dispatch/Log-Dispatch-2.670.0.ebuild
new file mode 100644
index 000000000000..2c3fac8b4ed4
--- /dev/null
+++ b/dev-perl/Log-Dispatch/Log-Dispatch-2.670.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=DROLSKY
+DIST_VERSION=2.67
+inherit perl-module
+
+DESCRIPTION="Dispatches messages to one or more outputs"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc-aix"
+IUSE="test"
+
+PERL_RM_FILES=(
+	"t/email-exit.t"
+)
+RDEPEND="
+	virtual/perl-Carp
+	dev-perl/Devel-GlobalDestruction
+	>=dev-perl/Dist-CheckConflicts-0.20.0
+	virtual/perl-Encode
+	virtual/perl-Exporter
+	virtual/perl-IO
+	dev-perl/Module-Runtime
+	dev-perl/Params-ValidationCompiler
+	virtual/perl-Scalar-List-Utils
+	>=dev-perl/Specio-0.320.0
+	>=virtual/perl-Sys-Syslog-0.280.0
+	dev-perl/Try-Tiny
+	dev-perl/namespace-autoclean
+	virtual/perl-parent
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Data-Dumper
+		virtual/perl-File-Spec
+		virtual/perl-File-Temp
+		virtual/perl-Getopt-Long
+		dev-perl/IPC-Run3
+		dev-perl/Test-Fatal
+		dev-perl/Test-Needs
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
diff --git a/dev-perl/Log-Dispatch/Manifest b/dev-perl/Log-Dispatch/Manifest
index e9c014daca0c..f65b9d93a8e6 100644
--- a/dev-perl/Log-Dispatch/Manifest
+++ b/dev-perl/Log-Dispatch/Manifest
@@ -1,9 +1,11 @@
 DIST Log-Dispatch-2.54.tar.gz 59316 SHA256 7c365b8cdd2712cb642421773665d67a0a190cc6b44d19b804671c7631193f81 SHA512 67dd4bf15899fa441ecd725305b443873c77fcf8eeff44e53408637f81dc14c3375bdf52514214c111d1692a7087efb929ecdc411771dd413fef10bb034dc45b WHIRLPOOL fb0a86477f31e27db217e238fe9b27f923e1cfef71861969093e6bdd55b1bfb9acb5ac01a2372b771257311d85ad3ab82d668baeffe3150efb33a5f2690966e6
 DIST Log-Dispatch-2.58.tar.gz 63916 SHA256 34acff8fb4d61e963b45362c5222b4ca02838c8702c2a0d6f1118cbb634dfbab SHA512 6f086d2a95c75cb59d269f11528d8062e6a0b8ab23a9c5e4970ddadb018227e4fa7c6f9aa17f45ddceb59ead5fa0bb26a4bbfb56c7de935a870830ababeaaa5f WHIRLPOOL c9b9a0b1bff8fa274aa719da2e6d5bbf474ab82c128d1418234b6db1bc720a00ee75a32bce85ed7717d51f8f03ddaa17d4e00406fdcaebb3629979f7fe5871d6
 DIST Log-Dispatch-2.63.tar.gz 65522 SHA256 f6880d82f8ab7296892819db9cd0dfdc7408248630c9effa83eb1314a541da6f SHA512 4b44ff7d85741eb57b25938b9b92863614a5267f1574b88c20d91a47e6ef2c957ca47be5211f6c735d453f35c0a326d3b07ab044440e24d763ecb9a09a4856c8 WHIRLPOOL fc3ff887ceb7b1f00988a5759aabbace6ab5919da8657368f008ffdfd8557bf5c34500f16f4cd19d947cb4adbacdceff42d9e8d3d27881532696d629f902b7f9
+DIST Log-Dispatch-2.67.tar.gz 68022 SHA256 a94da2a5a24b3519012b69b94d32c558b332fae1a37c773e6e058009e2d0f304 SHA512 ab03777800fa758a502e69b25669c3e4ae851d9dcf5f2f4d1a21a94cc61aca866ac361d2a5db3d22d19cb4d11da29ecec19935e29fcad40bb831fb27175846d6 WHIRLPOOL 0a95dde7d4e0152e81b0f2346772b5505550636850dc650f249d6bb9928600d0a170bc762186484958ba4f7233ac4e7f3b0f3997a699f50f1c8ba7b0c4f684d5
 EBUILD Log-Dispatch-2.540.0.ebuild 1278 SHA256 c3fbb61b2d1ffaa6d6e92467d5aece73f36b5ae1249b720609d520be237ed4e6 SHA512 07884c3332da84803f3f46c1488de9d052c0459f178772b300ba9df1327b8fc4d05239b413b880825877cafdc2bde0f39885b6f8aa02622abfac3272040df2d3 WHIRLPOOL 188df6c939a5c1a18ec5e2c753204eb789f16f34e57599fb7c0be840e5181753fd3bf08478e977f73c19455e21c3b3b24864ea41cc95e6f1c421ef45c282eec9
 EBUILD Log-Dispatch-2.580.0.ebuild 939 SHA256 04743a1e58bb190d93fab6c0482f9f453c2cbfc17ccd9a0c5b8ffa52951f8630 SHA512 bc01a96024a2c379d776386448bd266a0695406f28dbc7914c0d7e68fb52eabfaf5c0255878cc02e3da252afc20b967126ea1c32af67f14582b423fbc72a5e53 WHIRLPOOL 3f13430e78ee5203ee1bfd7e44b811a6cbcc4542c5c93ba55d2e194ff2033496501b52c0ce24c9866ea0c3d0cadf42410dbaf24ec9863ebb0814bea288ed5fbf
 EBUILD Log-Dispatch-2.630.0.ebuild 1005 SHA256 959ddfa84f87133221444773ffae996519e59441554d507283cdc57b957bac0a SHA512 16a3aabd8e1ad8a87bb152838d7344e6d0f2083e31253539330dfdab9ef8b7db25bcd2a4ae22813a125e34e7895688021b440ecc56312f1d91394946f1041af8 WHIRLPOOL a62cb941fc244a9c9dab01c43f4618b0ddc693e8ebe429363bc11123aba2a20620b1bfcf6f353d3c22c06bb5789ac87512d83129a6792d237d0d5d83fbc8ebf3
+EBUILD Log-Dispatch-2.670.0.ebuild 1005 SHA256 dec200bc5ae3daf50aa46a55e3dc20648308d96935478b1244cfeb9bb5a167bc SHA512 36a763af8628cc9d9018d836d4614d4d19c82b8e25934b44e7e558f90b9673dd11fd880d0177423b39f8d50797cded349dd4e8d69f2e860f22cd3c76250dd140 WHIRLPOOL 733d386b26a498094d4f2440ad57397912eec2d54b37f3ba3c56b90aa81e460b3402aee97b4044c0ab236d6a619a54887b89b2b6dc44e8681189150032ac5e1d
 MISC ChangeLog 4404 SHA256 b79d6212708c77457d6e7ec899e39653bacedcf5ef49e7c929034278ef478840 SHA512 0f591e6e9a8216e29af2b39761f51bc5639645ece429572cf2a04ec98c6ee596de7e41d9f91dcc89ea03c64ca7e06d521de646773180a43eb7e29c0606e9afc2 WHIRLPOOL 7c27b143c2cf5ac3e0b985000d7e6ca0e30121a5fa8a7f0ff10266b1e30864d70d1cb886bda5576deea265def4bc0763be0e426a782f0ff7fefcb1695a340713
 MISC ChangeLog-2015 10841 SHA256 7d606b5ebb984b5103435e71bda4a96d9fffb7e1a933aee74074a7094027203e SHA512 3777f0bae4e765c731e3e4840830c945f4333573a38850fe6b33ff75e5dda51ceaf9e4e647472e8c2923e43d92c73fcbff73f7a0f82920320acb71143dd80ce6 WHIRLPOOL d2d21ac7e0f1ed3c1809498b392bd230ace4163fa41dc5298a72e21840b649013b446906409b27f6be9e493a0d73ff5c820349d3926de7f8ffaf3e2a4b18fb62
 MISC metadata.xml 1591 SHA256 1dd6b889145fdfe5312987ee227d78264df7bf3bd4cfb81a0b2c963cede40c62 SHA512 9166ca6cce9d81d72ddb471f5cbfbc4226bd8008c5f6d0d0fa862149aadad9d0531534b80a6389f8b9c2752d2231427b2c0be78d886a2161b77ae26665d1a054 WHIRLPOOL 7e0c248a0a8ae3b94260773d3785e58dbf4b058a0e87f9ee93180c58730cf0011976d36582454edccb0613f6a4c3471b6e66bbbac019902a151915bbd66b383a
diff --git a/dev-perl/Log-Report-Optional/Log-Report-Optional-1.30.0.ebuild b/dev-perl/Log-Report-Optional/Log-Report-Optional-1.30.0.ebuild
new file mode 100644
index 000000000000..3da7db3d627f
--- /dev/null
+++ b/dev-perl/Log-Report-Optional/Log-Report-Optional-1.30.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MARKOV
+DIST_VERSION=1.03
+inherit perl-module
+
+DESCRIPTION="Lightweight implementation logger for Log::Report"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/String-Print-0.910.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Test-Simple-0.860.0
+	)
+"
diff --git a/dev-perl/Log-Report-Optional/Manifest b/dev-perl/Log-Report-Optional/Manifest
index 39ecc5dc3992..d1e591269300 100644
--- a/dev-perl/Log-Report-Optional/Manifest
+++ b/dev-perl/Log-Report-Optional/Manifest
@@ -1,4 +1,6 @@
 DIST Log-Report-Optional-1.02.tar.gz 11126 SHA256 0c5b865f99049cf7fcb7b02d878edab926a9eda9991fab91b40141e07c7d92f0 SHA512 a548aed43658133b771573e86ced16ae37bfba89d47f8b69d2b53351ab84ed3c6c6e40bcd6c98a6258c87b9155eed00f0efd9451968837efc90646b6358f3f98 WHIRLPOOL 6807655f29b6d09eadceff7877c24bda6ad0f9cbcf958042bf5958d3540333860fcfa44ab35f82ecf4f211eafb69ddccc82f131e05d6a6704dfbf597f484417b
+DIST Log-Report-Optional-1.03.tar.gz 11475 SHA256 f2a031748dec681090b136ef00001735d275f82ac846acacba7dbbf499463260 SHA512 d90ec054c00fe902d2cef6be9d3dd8678b16ccaa541200db31ef736d1b908b37a1822aaed2a526ef8635c084ad22b4d62182d6159ff8559fb9e85c62f8efceab WHIRLPOOL 63e80c80c0e033cc4f781af356e648d97fcdcf21a894369a3fe63f32991eab117079867c7673eaa81c452cb925b59c8442919b84b46a11a3d65da5a32990e4ee
 EBUILD Log-Report-Optional-1.20.0.ebuild 431 SHA256 d4ede4788c811437446b1913d28847097ff26d0fc115b4802a67df499de348e7 SHA512 cf55f2585197a3dcf3e5a0afae397110faee1e019cd0cc14e382aa25e27e901017571f2332366aa5116e2079230ee610d07210088440d2632cfc76fb04ef6929 WHIRLPOOL d66d1a77a49ada6e18390bcbc7a78726448b6b22519c710ffa6cceb226cd2622259b5f21887c11356fab6c4a7ce1803a85c8ad3ca99d8d0fcc681fb9fd6ec050
+EBUILD Log-Report-Optional-1.30.0.ebuild 431 SHA256 b9214eed3234a23ab5f501c398af0426cb5cc4e297a9250cb788c546f161c61f SHA512 fc293b4dcaf3622618b333860b0ab47607ea4977063639a10387065b68e75d67f921990bedfa059c2cdff1e81020572c970b79e2c0f39994d648c40c1bc77349 WHIRLPOOL 95e4f3bdb173bf2067942d6048a0809b5364f90e7e15798c2b06158e4d47c3ba2a1351502e6f071584fa28606235f2f10301d49196f50a6eea17179746137a53
 MISC ChangeLog 374 SHA256 f3905db276a844a0ecac71fcf6c5f8bb6f7be2f67d357c6aae9e0fb6a7920acf SHA512 2e38543b7ef2bfd825e3e915023df2c01e7c74e60cbe33df660ea5adc2dfcd58751075bef5cf92ac328637e18cb6a32d647338438c8afee830ff11a4307bfbd7 WHIRLPOOL 1e8aec973d329a5c0f3cb6d0c9df64c55fd37caeb45cd3bd9b07d90c784f48ec606bc511f3e09ce111a41d8915cb89aa00bcef35d63fcef3ea14849d10ef6c00
 MISC metadata.xml 617 SHA256 47832f0a5e0650d5753d60f06d8e4aeb65395c7af55acf86292e964edf2098de SHA512 b2685c1915321986bb2b1e4fe490332c6637efc9879322cbbd00276e2710d6bc03d5bd94bd09ecb2aec4972403c0d300104e7031ef8f6b4b83553e5c735dae60 WHIRLPOOL d6346a5bdc8629793017c4f0de495c816a8085a4d4d7fa3051f2a864f98df5ee010acb5707ab13773bb414bc81929faafae31ccf633d8c945bee1c01e9fc3e45
diff --git a/dev-perl/Log-Report/Log-Report-1.220.0.ebuild b/dev-perl/Log-Report/Log-Report-1.220.0.ebuild
new file mode 100644
index 000000000000..e0115cc303cc
--- /dev/null
+++ b/dev-perl/Log-Report/Log-Report-1.220.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MARKOV
+DIST_VERSION=1.22
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="A pluggable, multilingual handler driven problem reporting system"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/Devel-GlobalDestruction-0.90.0
+	>=virtual/perl-Encode-2.0.0
+	>=dev-perl/Log-Report-Optional-1.30.0
+	virtual/perl-Scalar-List-Utils
+	>=dev-perl/String-Print-0.910.0
+	>=virtual/perl-Sys-Syslog-0.270.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Test-Simple-0.860.0
+	)
+"
diff --git a/dev-perl/Log-Report/Manifest b/dev-perl/Log-Report/Manifest
index 54b2859879f7..39783a62eb63 100644
--- a/dev-perl/Log-Report/Manifest
+++ b/dev-perl/Log-Report/Manifest
@@ -1,6 +1,8 @@
 DIST Log-Report-1.18.tar.gz 90477 SHA256 7f468841f0ecd544069916b61dd5a2d67dc4debd6b7ef2002be48337e38ff30b SHA512 3f6fea8e7d0c66bc4b81b5565fd26832ad891936b0e4b79654670b5aa1092c16f060dc8a0c290687ddefc2672ca3206b7cbca4e135a79f98df1ea1b9fed5c3c8 WHIRLPOOL c6862bdaa1bfe04ceab88a9f744ffa9c3cb6edeba037fa83fc613cf8c5401fa9b7e939ab82cdabb88fb26a52f5cd8fdda51676e3f6ea218c0b43423883d78fc1
 DIST Log-Report-1.19.tar.gz 91833 SHA256 c58357ecdfb0b14f2b3424a5843076f10b4b5d4252784063a99a6ebed809df6f SHA512 1ad21572d7d75a7af6c34a9abf2749ecb2ebb31c742b589a60b6f224f8357834dc25bd2631e3df4126f3d5a8543fbaff665d90fca7a91db1db22615e8bd9d005 WHIRLPOOL 57f7d9f987924806148b68293a95f3a6152f602bbeeb45b027669155542756e93c6299d95293eb6d4c33cd64f7d9ff8b5bd197d07690c4f495e469773a8dec93
+DIST Log-Report-1.22.tar.gz 92490 SHA256 490161c55f638a4acb90c6009c563b2671012fe9eb56b64128932a7ffebfa89c SHA512 91726666e576cc5661c28fe20ab6fb98a29f3a2496add3fa8d81c3779cf58c17cea4f083c1e07e1c5be8dd26cedd0c9e4495291b2b131d913e088e446265449d WHIRLPOOL 77682a9adf94dc7106fd4d74a45a0dd111e243afa12b8ccd7b2f6f42b3773bf32b1ff1bf84b708ed870031d0752a81f88eda2f10662412d687df8757f49267dc
 EBUILD Log-Report-1.180.0.ebuild 654 SHA256 59ca530a21e97f4bee278d8844940509ae93bafeb64151333fe30258fd0793a9 SHA512 3d6d8797897942d2ed75e16eaecae7a2c00f8530742dc00a4dcd4735e2b7f0a16a4df3ba92abd38898a28214df74f681b57a152513646a31af11781f3b2199f7 WHIRLPOOL 0a70bf8af7576c54e101a3a3ea830db8173a213d19792639ce3955df97daf270dc24c95769e215f686bb43554756f892952f576af59d8c7b12c27251c77fec6d
 EBUILD Log-Report-1.190.0.ebuild 654 SHA256 cca8c9d2bf45145982749dbd2e0c90ff69373ec9d24e479d5d2d4238b79edc7e SHA512 4fd74ba44e74be7a1728575b7ce5e42890a02bba197d09dd7e11ceb5f35917e3966bba43f105908673d5e2748944220290cd2ab17bfd21d1d675503b6fbd7b15 WHIRLPOOL d5136147ffde38b257c8ade9725c8c3e4f1ed142bd1075a7f6e7d38515a5ff8d9b41a9c5d6f9d462424d72c4f257fec7c81a4b619279fc3c94fbb6f3f3d1ec23
+EBUILD Log-Report-1.220.0.ebuild 654 SHA256 9af3c9e1d898a5bb0a45ed3636a5437aba38ea40ffb7ef38adc30b2a4507abae SHA512 b5057b9dc37991954ec8ea68284728f0625d55d87e0ebba5d3b04b1d7aaeec390b5b2898327bded007550e7e64048148ac9175ff40c5dacdd8370ee7a29d3ea7 WHIRLPOOL ac949c81e3299eaaf6d7c6748af952ac45edccf1c320ced9ca37b36eb4c46a7e165df8952f81981a4a5835b01b211ea2ffe63daaa3c3c64717a3e79b6bf27ed7
 MISC ChangeLog 363 SHA256 089a593159b597219fcfe9ffb49cb95418198baf08d7de0c3c39f28213170cdb SHA512 5c1820d6a8186b6a56f1c207bbdd816277c3cbf4788d5563c6dde75ae43155e385bd3231b69cef9ca007ec24b0cba2c0350b0f3e18ac85fac5b83c2307cd8fb2 WHIRLPOOL 656874be0ebaff99301cca38a2f98bdaf446ac2de1985ff73bfc1cbb70c2d8d93082866984bb2b11f53dd18ba467d1878b164e85c4450b789b0018dcc9b887ce
 MISC metadata.xml 1784 SHA256 fa21abbd547604a4849871c2775a4d9b27575aac837b3e6f943924481f63e880 SHA512 66fa8babcf998c7e1abfb29c4c4376b492a949c1f9bab9635e2e50619a327a14966787b9283611f1c3bf4a960b825811dc9c9e23438e6ad73d384bb4ae1f6645 WHIRLPOOL 1a7be967ffbccbed532626963049131c969d2c4d9f8be1c333509f67a3c0fa327718357c89a61bd338307dabcbf498379d04bf7e4296e3f30c1edacec6e1297a
diff --git a/dev-perl/Log-TraceMessages/Log-TraceMessages-1.400.0-r1.ebuild b/dev-perl/Log-TraceMessages/Log-TraceMessages-1.400.0-r1.ebuild
index ff06c2c74f6c..533799d8bc65 100644
--- a/dev-perl/Log-TraceMessages/Log-TraceMessages-1.400.0-r1.ebuild
+++ b/dev-perl/Log-TraceMessages/Log-TraceMessages-1.400.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,5 +15,5 @@ IUSE=""
 
 RDEPEND=">=dev-perl/HTML-FromText-1.004"
 DEPEND="${RDEPEND}"
-
+PATCHES=("${FILESDIR}/${P}-posix-tmpnam.patch")
 SRC_TEST="do"
diff --git a/dev-perl/Log-TraceMessages/Manifest b/dev-perl/Log-TraceMessages/Manifest
index eb18cd08ab60..4724d44621b1 100644
--- a/dev-perl/Log-TraceMessages/Manifest
+++ b/dev-perl/Log-TraceMessages/Manifest
@@ -1,5 +1,6 @@
+AUX Log-TraceMessages-1.400.0-posix-tmpnam.patch 2424 SHA256 1bb850ac95d16f41d9c28f9c7d9483cf51ece6e0de4179c54b61cb90227c617b SHA512 307c6b54a1717664463c7295ea24d5b25bf3ceea0e83b7f6baf74478f273fb23e39b208257f694f2c0786629c1dc7af616a4db3fc40681c133fd4c9a9a888055 WHIRLPOOL 8b1b9ffdf6fb8ca97f58de7d19c2fcac68379839ed49f494579a21e80b4d7427e58e22f85e6bef89414fcd54bc6b16b561a8e0e04bf33f6146c16bd112b2c930
 DIST Log-TraceMessages-1.4.tar.gz 5437 SHA256 343ab47c1d69200df6d37bc1dd0127132e6f0a469b77ee6b71eca1146ce6cf8f SHA512 ccd298f7ecc0cb7e478812dbbe20b870baa2f87f19b8adfa003818d70e1118f7a3f59a7f50898ac22751d2dc4b96fe9bd1282b30b72cce7334e645b593a01aae WHIRLPOOL 6f417f5a00df8fe57b669b2ccd1957ba7cc3cf7dcdec1357e31354c4c6bfa474e0629ce437eece306e1f4be18d8cf81400f8a45d44f0058aa03a606405b09cd1
-EBUILD Log-TraceMessages-1.400.0-r1.ebuild 344 SHA256 f1444b566518833f6a7b8ee8fb810dc1023a9e1a4396b6beb554bc371db3b2ef SHA512 80dd8fcbac91c43a29f00601b1da2682543eed3f0dfdd821341554fa65b2c29baad0c13f65e6ad487cd8bae8d19ef676a641c9a5bc14f62db668987e6d18ae0c WHIRLPOOL 4f61ade0bcdfd5649f246cf2447ea080d9c15e9c1beb8757cd1d7f18dbb52b4e0e940aed385bec5ec9e49e4df1d357e9a9f06c2f8e794548eff9b00bc73772e6
+EBUILD Log-TraceMessages-1.400.0-r1.ebuild 391 SHA256 fa63ef462f3d21217cbeaf6060516614b1b44d18719d2e9c119be211f8450119 SHA512 aac9d6c2788ce1b94ec79bd485643f8d7e5bdefd1d327ffd41d8ed12aeffafe363a2379ac3c34eb5bc92b1c28339ce6e0e5a709834456f0b752a24e99aebd818 WHIRLPOOL 996ffa962d6981a3afab16ca8a740a45f59cdc6acce2c5963030aef06952d239336ec9bbd50cce88f6981e0ad984f3c6812cb340bf1adfe48e92f95d13f20948
 MISC ChangeLog 2467 SHA256 6c300cad86022638ff7bc7c4a8df6e343890548980b942ebc580b17a65eb47a7 SHA512 168e57bd7b0b9a81919e9f4b4b010a8e3f5e0e2e846452f60b1410a20486c182e1f7af7bd5dca72725ddbfddafb50be8ba5b62c2d030a89cd50a1723e95e2af5 WHIRLPOOL 68ca6b9cbdaa8e021642869de20d862a6544d50c271cc2276a63ce575a61c285eba841ceb45345afe3fd8cf8e61ca2034712d36b3894eb1932da332ec21e3f02
 MISC ChangeLog-2015 2946 SHA256 7fcc4d6c5e63e77a11400b5e11fd4928d02c393fe04159e0f4db6c01adbf9f43 SHA512 b7e9bc9d55e4a66418df9ca41a7df811ed70dedccab106adab9106d44e64e2d3200ff9be50dd11c1b51db49d7a696e5512cf0fe4ec43b0824f3a10c178a6732a WHIRLPOOL a7f1935ef7492ec476c82159312a2a0e74d18f4638f0ccf8b0b82cdb7bc4303222348750ff9c282673240199e9dd7c459f2b554fc7aa9f645da68985496627a8
 MISC metadata.xml 406 SHA256 999653bbabec5fc73b0391d45d32006ecab1fcc504c236ce345699e75809bc35 SHA512 4778efe5353db60500a964dbeb8b5c229b76e59953ff8d4e2b82fddc0ccfd20d86dd8110b1d4903dd52070d0d4f20ee047b6bc72dda88ee4d3e828a6c9f202e9 WHIRLPOOL d281c85fa32885dfca564296d409ce8f11672ea3aaa96eef6fcb9c9d39b2950a6d6ab48ccdc7cd51bd525a0a110b83f79250625bf488f622cda794f77c1ae33b
diff --git a/dev-perl/Log-TraceMessages/files/Log-TraceMessages-1.400.0-posix-tmpnam.patch b/dev-perl/Log-TraceMessages/files/Log-TraceMessages-1.400.0-posix-tmpnam.patch
new file mode 100644
index 000000000000..e5e4066198b0
--- /dev/null
+++ b/dev-perl/Log-TraceMessages/files/Log-TraceMessages-1.400.0-posix-tmpnam.patch
@@ -0,0 +1,78 @@
+From 26d6f87b667e9087694633b38750c8ef230fefca Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Mon, 22 May 2017 15:18:01 +0200
+Subject: Use File::Temp::tempfile instead of POSIX::tmpnam
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Perl 5.26.0 removed POSIX::tmpnam().
+
+Bug: https://rt.cpan.org/Ticket/Display.html?id=115089
+Bug: https://bugs.gentoo.org/617052
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ Makefile.PL |  5 ++++-
+ test.pl     | 10 +++++-----
+ 2 files changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index 9ff3e55..01f41a9 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -4,5 +4,8 @@ use ExtUtils::MakeMaker;
+ WriteMakefile(
+     'NAME'	   => 'Log::TraceMessages',
+     'VERSION_FROM' => 'TraceMessages.pm', # finds $VERSION
+-    'PREREQ_PM'    => { 'HTML::FromText' => '1.004' },
++    'PREREQ_PM'    => {
++        'File::Temp' => '0',
++        'HTML::FromText' => '1.004',
++    },
+ );
+diff --git a/test.pl b/test.pl
+index d1afa67..c8635a7 100644
+--- a/test.pl
++++ b/test.pl
+@@ -21,7 +21,7 @@ print "ok 1\n";
+ ######################### End of black magic.
+ 
+ use strict;
+-use POSIX qw(tmpnam);
++use File::Temp qw(tempfile);
+ my $test_str = 'test < > &';
+ my $debug = 0;
+ my $out;
+@@ -50,7 +50,7 @@ print "ok 4\n";
+ # Test 5 - t() with $CGI == 0 after setting a logfile
+ ${Log::TraceMessages::On} = 1;
+ ${Log::TraceMessages::CGI} = 0;
+-my $tmp = tmpnam();
++my ($fd, $tmp) = tempfile();
+ ${Log::TraceMessages::Logfile} = $tmp;
+ $out = grab_output("t('$test_str')");
+ ${Log::TraceMessages::Logfile} = undef;
+@@ -68,7 +68,7 @@ unlink $tmp or die "cannot unlink $tmp: $!";
+ # Test 6 - t() with $CGI == 1 after setting a different logfile
+ ${Log::TraceMessages::On} = 1;
+ ${Log::TraceMessages::CGI} = 1;
+-my $tmp = tmpnam();
++my ($fd, $tmp) = tempfile();
+ ${Log::TraceMessages::Logfile} = $tmp;
+ $out = grab_output("t('$test_str')");
+ ${Log::TraceMessages::Logfile} = undef;
+@@ -124,8 +124,8 @@ print "ok 11\n";
+ sub grab_output($) {
+     die 'usage: grab_stderr(string to eval)' if @_ != 1;
+     my $code = shift;
+-    require POSIX;
+-    my $tmp_o = POSIX::tmpnam(); my $tmp_e = POSIX::tmpnam();
++    my ($fd_o, $tmp_o) = File::Temp::tempfile();
++    my ($fd_e, $tmp_e) = File::Temp::tempfile();
+     local *OLDOUT, *OLDERR;
+ 
+     print "running code: $code\n" if $debug;
+-- 
+2.14.3
+
diff --git a/dev-perl/Math-BigInt-Lite/Manifest b/dev-perl/Math-BigInt-Lite/Manifest
index f128e7614997..6914f5e17019 100644
--- a/dev-perl/Math-BigInt-Lite/Manifest
+++ b/dev-perl/Math-BigInt-Lite/Manifest
@@ -1,4 +1,4 @@
 DIST Math-BigInt-Lite-0.14.tar.gz 44517 SHA256 0ae0d1fdfbfe0d1801f3fd99d1958a61958f1d50ce4d38acca735e85ef3035ef SHA512 abee57d6497566f8dfa32d273f0ef9cf914ed57b9397c61455695cbfc141fce8f1ccd2c65a2043ec0d4843dc0a1cde978a0b8b05bcc12e71a7438cd379a462c5 WHIRLPOOL a64b379303cf26d048975087082aec768fbac1e46d9bcf03a6d43de0206f2fb2e649fe041628ea2fb90eae14f23d5778c246fb53c01ebd491f26e8362038c307
-EBUILD Math-BigInt-Lite-0.140.0.ebuild 865 SHA256 15f8be4e21feb7bfce049563cc362ac3e079c8c3041cea0f996e36f009cbeeb7 SHA512 e9946791c99112ebb27c99f3f9ce6f9b7218ea4a0f49d3af905c6ef5b3434148668d66a4dca8bac3b77b906b82208df7d0b00812d044d4ff48eb65eab3982056 WHIRLPOOL 409b316501e0dac0c88bb43c814064181f0af1b787b766a8df3d50d3d1669494fff88b8cc908ee71b779a522368d8898b23201cda2af5c1520866f402ecc460f
+EBUILD Math-BigInt-Lite-0.140.0.ebuild 864 SHA256 49dc3bcc44d31744797cceb2f93c123d08abc42bcca6031127876a58a3c65a87 SHA512 b54fbf773d8a58e644d1148aafd3f660d5724986c9192c3051994b1fcc6cd0d366ebc90b197d4012193f3b358735df5263e99d1b34eb11643a6e99420525f166 WHIRLPOOL f64a56b9ddcb9f979c35fea6783fae11493b81b26b657d903c144e0d0dbf27df7b40992ce187c2f49d67521ccd02959385b6c328d0b87aa5bdb3d476de6ef77f
 MISC ChangeLog 399 SHA256 43e7b6c36880574c112a5572e7bedc7ab4eefcf840ad64f3b54450ee754cf2fb SHA512 0e0c545fd6b598873493a766f703d65cd060ed249f7d67c4051f08110e4378eba89f27287e31f22948bf191f24cf04d703950db76d102c09422afd9b087a116e WHIRLPOOL 94dca4235d65ee023692d123587455957b11e8404d68bd0ee450af9b91bbd2533f407360b64e9b320e5773161f4ffdd1fe8b1be01856d34bb4e23e3e124835a3
 MISC metadata.xml 662 SHA256 a5b42a4023daafa3d4f9c55df918b8f85e974938d78ee972ad2eb0de9aa28d0e SHA512 6d4d421721bb78b114413ec2bc8bfa42b711210a8d6075fd9c4535bb7aa33926eef6a751f86ddd6ddc4d6372536b72e1f4374d11c40a8fb31abb3c0c283ae559 WHIRLPOOL c9f05f855c36f30567c3fbf00eea6991a42e432412697b42bc47b3da29e89a95f59df7930a6a2267299142e06fc7ec4aa60ca30cbc9e08fd53bed30fc121898f
diff --git a/dev-perl/Math-BigInt-Lite/Math-BigInt-Lite-0.140.0.ebuild b/dev-perl/Math-BigInt-Lite/Math-BigInt-Lite-0.140.0.ebuild
index 8a4d4061f806..81877108927a 100644
--- a/dev-perl/Math-BigInt-Lite/Math-BigInt-Lite-0.140.0.ebuild
+++ b/dev-perl/Math-BigInt-Lite/Math-BigInt-Lite-0.140.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="What BigInts are before they become big"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Math-Factor-XS/Manifest b/dev-perl/Math-Factor-XS/Manifest
index c52d79277da6..0b4a024fa916 100644
--- a/dev-perl/Math-Factor-XS/Manifest
+++ b/dev-perl/Math-Factor-XS/Manifest
@@ -1,4 +1,4 @@
 DIST Math-Factor-XS-0.40.tar.gz 62370 SHA256 f594f5f107ac1b6f2f1af76b7711121dbd7043cc7bad0bad1cdbfc3186239833 SHA512 3b7c2df63f02585ea5508217fa93292db74ed5c94e379dc6ef9b9887c6b5cdccf76f36e30b71e50848cfe698a262d99049918075b28ac44d07aabf7fb7d799b3 WHIRLPOOL 63af1db5a9b33942dbe69b0b7ae300917eb9e25ecc19ee08d6f4dd4f2c38b1a0f17d6fa705dfbf0cabf652a0309989eb96e1c585088bb60e0fa3f3530759fd11
-EBUILD Math-Factor-XS-0.400.0.ebuild 670 SHA256 5055c16648ae36557b8cfed923e201a9f85e247dba872ae88b72185c14ca3899 SHA512 e519b6bd5f787622455565c4494ecc7cc04c8a456d19f82b45db5bdcdd7e31ea797f64761f18e8d98634048835a92f730739f583c7727bceb5033dadfc424fa1 WHIRLPOOL 7739a1421fab1c64fb1b480de6c79a2d3e338ac881b7b839dd5d0f21810450ace5075ef3dc6b2d2caff103c93a49f6219c4c336dd8af46bd1c4c6800691b5bb5
+EBUILD Math-Factor-XS-0.400.0.ebuild 669 SHA256 2939102ab02e2871336d32283ec7b02f61ba2bf25c220a8859e4e5a081c45c53 SHA512 646a4b2d7b9d0cb29b1021eec1ec43ed5fac24f04bdfb50867397bebf396e0a41934861bf797456c521a5b0e8d44905c60ee964bbcaaa95e50561a061521fbde WHIRLPOOL f9e30ac169f519c9243de54967838705f97f9ff22da2ead67e55d12e80ca2bba363a990370a59be9a8ac75d3dd7d81cb2457a599ae573d364ff67d707896c711
 MISC ChangeLog 393 SHA256 605a2df9e23a48ba78b54e1bf22198f8084243b81f6ba94f4e16559b34c29350 SHA512 e6754e12af0e0a09f2424955517a32f0a81a2877a31afba8a0114650ad13fbb60f2b93b0ec9a47974090136ff5e15e1ac67f4744f447ad0280302dc4492a53d5 WHIRLPOOL 7da42396c70de92f61f18590229b1bfd65028eb2a441672e5cffb446f3ea18baeaf54c866108d6f33cae25a2f9780d5804b18489e19f5fdfe6dec28e5490c079
 MISC metadata.xml 658 SHA256 5d63647d768d8ca014b737ea3f36d4dafd9970f672cb889af4709c24ee85fee5 SHA512 7e680369c85867a1139e8bd2970190599aff61163769a636ab938123f73bb529b4f157c2a20652d7eccd419a30bf9869f8829acf542113a76d6691e6c797f855 WHIRLPOOL 647f999f09389e4ca2954e4253129d4710055274aa90bdab93f3258ce6019df7d8a2fd753a6b9d331835d1768dedbf056da47d1a8f5844dc7bd415f170b79998
diff --git a/dev-perl/Math-Factor-XS/Math-Factor-XS-0.400.0.ebuild b/dev-perl/Math-Factor-XS/Math-Factor-XS-0.400.0.ebuild
index 9cfb2d414b92..737cd32b2faf 100644
--- a/dev-perl/Math-Factor-XS/Math-Factor-XS-0.400.0.ebuild
+++ b/dev-perl/Math-Factor-XS/Math-Factor-XS-0.400.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Factorize numbers and calculate matching multiplications"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 
 RDEPEND="dev-perl/boolean
diff --git a/dev-perl/Math-Libm/Manifest b/dev-perl/Math-Libm/Manifest
index cf785ced7eb3..3b0e5b81c29b 100644
--- a/dev-perl/Math-Libm/Manifest
+++ b/dev-perl/Math-Libm/Manifest
@@ -1,4 +1,4 @@
 DIST Math-Libm-1.00.tar.gz 4554 SHA256 bfd309f283ac8cb9bf00af8c7c3a10bf25abfd642861c2022efaff0a4a52c276 SHA512 17a1f38e32a82ec9a0307033920559dfe554fdae43b9fefffd7dc0ff690b6c5018079bded8554135da8546ccaf8dc0890e7e9b9a1e3845e53d46c993cec11540 WHIRLPOOL 09220baab48f6e907db3f7cca0770a85c7c3ae0c76bfe9d02058d848f388eb0594616cf17f04670ebfcbfbc6937e5031ebbc739b3bb607faf2bdb96903a1f4c0
-EBUILD Math-Libm-1.0.0.ebuild 372 SHA256 7939bf83c73135ec37c23fff1aa43843f24206bac8892045f2a58454247dfe5f SHA512 101698c441805f4675dd27ac2be29f8d7b6ce6ddef873488a26f567bd8c9ffa733e38aba4dd00eb64f4ec05f52d447fa2c0061ed7791f290a9971ecce724884b WHIRLPOOL bea3a4dd2177b33e51839cb2fc8b87cbdd3ca385dd9f88081bf46be6d80301340d189cb7b4d966cbead433da79579a349d6be646dc34fb0eb4f64b9e4c98eb5a
+EBUILD Math-Libm-1.0.0.ebuild 371 SHA256 e0826c29fa1b70ab24bb8885b43822ff76e4259e376822be3528d41d566da1d3 SHA512 9c5f09a4012f8026144be25bbd68d2c31c6a98437d8ec0bd4bf4d599017110f27ee008bf31064925833e0f6fabffd613c10f356037fa01fcc5e86e0de4d04d14 WHIRLPOOL 5e730c70493f665b4e18475a48c92b8b62abd8dd4b3014fce554710f5421b31de027713973ab2ed14d942e7fa409eccc260f1f6e52f3dbc1c880665e93988a3f
 MISC ChangeLog 372 SHA256 33116f45ca3465f2ff7fd6205f968e7eec223708718358ef31ffe4940a34bca3 SHA512 051cfd6817dc90986fbd05b344a5f1a6112b67ee235c94fab25a3a657cf7d36e60a857642ce350c4c1b454ff87bf400bf04bb034d59c4dc1173b01842bf184a2 WHIRLPOOL 761bfbcb9d198eaba0722e1aac48279ae19a5383e60afb89f45d3aefe7ce922edf1627c0897117497e00e8aaaac1252f9dee05da260daa711a97312d5ba80624
 MISC metadata.xml 647 SHA256 448ac560a45fe055f62c9f0dc7127c733ccaa0724265d3a95f7bc39f2b5a1fa9 SHA512 559f22ee22b9e9d9d05d15aea7668d6bfdd15f788cb6c2708109142176e61423966fc8618f85a049e70b768d6b29f89b98ddeeaddd8401409a8a245bd6ca1299 WHIRLPOOL c2683d251e980cd71734b3baa14d8cbf19b653ee8863ff4603fa3b8a2c162f64e55ab2dc59f6d400cec08689b2805e3b36676f72fae68561fbe747eaeb7149b0
diff --git a/dev-perl/Math-Libm/Math-Libm-1.0.0.ebuild b/dev-perl/Math-Libm/Math-Libm-1.0.0.ebuild
index f68ec4a35b7a..adbe68456144 100644
--- a/dev-perl/Math-Libm/Math-Libm-1.0.0.ebuild
+++ b/dev-perl/Math-Libm/Math-Libm-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="wrapper to libm functions"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 
 RDEPEND="virtual/perl-AutoLoader
diff --git a/dev-perl/Math-NumSeq/Manifest b/dev-perl/Math-NumSeq/Manifest
index 1fa146d84337..72e918e248dd 100644
--- a/dev-perl/Math-NumSeq/Manifest
+++ b/dev-perl/Math-NumSeq/Manifest
@@ -1,4 +1,4 @@
 DIST Math-NumSeq-71.tar.gz 824620 SHA256 53ab83bb14fdd3d5c37e3165d64fba87ca845e33c3d9dfcf2882e5e60c11884a SHA512 2679d6b28523b172e1ac4b48b018e896c083d1d45227fd0bd4d156c6dc2862edb234888701ce4019234a7cff888cf84bf72b4e8ebd2f5d78fb5ae12c8374ce2d WHIRLPOOL 4b5c135383a7135c642bae553086262879d89b0d2047d3b4f8ec00fcd2bec7fbd1d4585696402fd8eefaffc410c97dc2b3948894e163815c142f1275983dca4c
-EBUILD Math-NumSeq-71.0.0.ebuild 940 SHA256 535fae558af284703bbc94a7d9a19f05395619487b07c294cfb7b859e0e2e02c SHA512 342e72186c27d2dada753d094925527133253e3bacf7d2909a808c9a8a9c2976eab6c2804f01566b8cac88fed4be91bc69685cbc0ea0654257394c80ab7f5500 WHIRLPOOL 3b5de691e971d558f33c5bf0d86a2d2f1cf0ae4e714fe1e0dc36e6a8247d474fdf057067f7bd333b8f7687b0e2ebd93bacd9cb5af9547fa4423d6f76330904d8
+EBUILD Math-NumSeq-71.0.0.ebuild 939 SHA256 5701ef0e3a948e311363921c4d7fe45a1f1e47b64ba0d8212cbe5ce84ecce924 SHA512 95fa04ab5ecbb4d0cb7acb24137fa2a51cbb63c863f92869a2f3810b614660010cd64746c393c53d22cf557718f3bf854f41756f235218c9b5cd9eef078d1c59 WHIRLPOOL 93b2b1c76cd385b66d85a85ba0de01140ca83201927f4345528bc3658ec63c89984c296eaf32884bfe678474a7fb739b3e5621c5929cb5ed0330e02a596ff164
 MISC ChangeLog 532 SHA256 521dd1184a2a5152c1777cf8c42ded4729b19658822d73b66b37c00c605f501f SHA512 d77735855f7953703015d53a2c431c74ead4a65d5e0381e774100278eb8b2c68502b756aad847a7f775dcb86d72c5e229efff16f44e057bec68a4d04743aecc6 WHIRLPOOL bc4883dcdc2ecb65bea88889ab6db56b7827a0f8d932a645a60b7bdfaef91c70fdf862fbb8594768a917742eb23800b0d65c2dd41ceaaa9a57741773d0c65143
 MISC metadata.xml 9901 SHA256 201764a6bd90b662ce5528647cd0ccba75af16da13103bae4b99b7df1d742c96 SHA512 ba7dc50efbb1625c005b8fd579a2d7afd54739d5369c4ce5507d0ec10cecc82b85840f84c18d179a2ecc7361b7cfe4d1c0c02a3b687aa39dd15043c5c624ca73 WHIRLPOOL 133f5017b0461a507d070e4dd615043c928b160e0f7f50b73e16aeb940c3ab925b53cfd4fa9f6d60a88bec21c2d2c27dd5ba75443ed316a3971e78dbba891edf
diff --git a/dev-perl/Math-NumSeq/Math-NumSeq-71.0.0.ebuild b/dev-perl/Math-NumSeq/Math-NumSeq-71.0.0.ebuild
index 308846fdee12..bfdca5f8737e 100644
--- a/dev-perl/Math-NumSeq/Math-NumSeq-71.0.0.ebuild
+++ b/dev-perl/Math-NumSeq/Math-NumSeq-71.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="number sequences (for example from OEIS)"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test examples"
 
 RDEPEND="
diff --git a/dev-perl/Math-PlanePath/Manifest b/dev-perl/Math-PlanePath/Manifest
index f79bd155d1da..6e67dc3fb05f 100644
--- a/dev-perl/Math-PlanePath/Manifest
+++ b/dev-perl/Math-PlanePath/Manifest
@@ -1,6 +1,6 @@
 DIST Math-PlanePath-123.tar.gz 1284214 SHA256 cc77cb05ad63cd10b534d8b5cf5c1d99a2d5315d47f3d8f3704239feef107e8d SHA512 5289f674dd62f668e667d69baf52d2f6d8b8fcf4ce6bed1429ef1fb412f2415b474103ca9b6d9c5b876b6926d860f70834e26c68a30b53d2211cbc4c457e2b43 WHIRLPOOL f9eaff401e35c8d99e69ef920bf28f5036d96f4991e2633a12f2559e2e7e3536b1004677fbeb9baf851451bf029ab8a560ad90b6c4264f1a7ac41d89b402d0d8
 DIST Math-PlanePath-124.tar.gz 1308595 SHA256 a849d0e13251c0b10eb8aa48678b3f138ea7d76a87033a292663ceedb87e6c4b SHA512 24e347134b64642775a5641b7c17d1ba1e15169504023d3f08463fde21dadb41357edfc1d7d07466160cb3a7cd2542e0b1a52a845132223a9473b73b32e31009 WHIRLPOOL aedbaf03d9d8548dceb0d7e680bc59e4b3e7db86a844f06b56f018eb33d8ca3d57f0fe703e4f34a59d2851fea89d09668d4175a8ff75726336993eea91565212
 EBUILD Math-PlanePath-123.0.0.ebuild 758 SHA256 15e0de2735c3789cca81432970920358a9ba35cf816d02ccdf934599c13ee5b9 SHA512 c02a2193b2a2479453f6eba4db419e0cd8f398cb45e5ff2a966672809e6b9504688af97662d2f1c641a1b65eaac9e604d318664ce6d4a020b074ab858af89502 WHIRLPOOL 11f34bd9d278e47bb564f2a7aed3a2b662aec248574d5be5cb4590dbb29e610705ecf830772c99df5568551d384d854b33c28387cef6b5136505584b1a4a0a8b
-EBUILD Math-PlanePath-124.0.0.ebuild 665 SHA256 5f50b58726b65f213a824fa1c2c558da36c2b250dfc9920ab9fc9bc82cfae045 SHA512 6ab69d5055b5192d31f7b35a1b8a473f64fe42fbe1360771bfdaa4c902094a0395948b1872507989d14e6bcd955fd84601ffd630d78515ea6da7c459e4ce7a9d WHIRLPOOL 8614c1ff2b9b45f3a0ed12588dd1f51624ec4119fdc3644481cf5e0c9d4752663b9d07d9d7cdd353e9a04c5ff3a0fb7363bce182f6148c406d2e96b515e3a7fe
+EBUILD Math-PlanePath-124.0.0.ebuild 664 SHA256 d0d35ccb05043c9bf6cd5da32857351165d1b776176565094a7ced5d648617c5 SHA512 16c5c7d5ff7cc38d40548ef5cd1e6dd6dfffb4b786f5d9e12e97e8a4e6f58d31565cb97ca124c38e0808be0e4fe38f1945c35152a292ef38f75e2b9c3a99e3ed WHIRLPOOL 9d57bf07ec127850e4f92d82fd268013cf90bf1fbcfa93b2492b8e6ff971287e3b5296c36831b7fd77aacdfa62adac9ed1944d8fb3c11a79f0ce968754de241d
 MISC ChangeLog 959 SHA256 ac4b88a04081c0698699ac2a716ad1c9cb49e40e2e5a9c057e6ab11299ae4892 SHA512 751856c0fae5661ec7e0bbbc92c75502210a080accc036347f122b1ed5322301dd14cde2231f00ebe426fe94a50295a1dfa23d8e9a5801fda0b6b2c4322e1a3e WHIRLPOOL 12f3a8c123232a07531fa67ba92f29dd5431f3ac454394d136f4e10eaa9ff91b7f7d3b54507087c61ea84aa0805708713e1d9e18af109763da6720dfc641cc74
 MISC metadata.xml 10887 SHA256 ed7b87b89b16c0e3c87839d6be6fd81fb3dc4173e04597f8ca8cc344c619c42c SHA512 e2a02011b29d8240494bfc573aaceb4a1950f02b539a742f8f5bcb38f41740ab2db6cb5c7bf7c6d7363f55b5aad23b2150397901db3096d2a09aaca998aae076 WHIRLPOOL 17d29fc50590f0f2ebca5c6389380afb44d6f9f30cee7147c93b9f991ca510ac63d5f04d098289915cd0bcdcf45d5f714bd6b599a1be4fe65e24bdc4c263cb0b
diff --git a/dev-perl/Math-PlanePath/Math-PlanePath-124.0.0.ebuild b/dev-perl/Math-PlanePath/Math-PlanePath-124.0.0.ebuild
index a8174d48e391..ed1619a58c01 100644
--- a/dev-perl/Math-PlanePath/Math-PlanePath-124.0.0.ebuild
+++ b/dev-perl/Math-PlanePath/Math-PlanePath-124.0.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Mathematical paths through the 2-D plane"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="gmp test"
 
 RDEPEND="gmp? ( dev-perl/Math-BigInt-GMP )
diff --git a/dev-perl/Math-Prime-XS/Manifest b/dev-perl/Math-Prime-XS/Manifest
index f28faf41cbd2..2d821e70a800 100644
--- a/dev-perl/Math-Prime-XS/Manifest
+++ b/dev-perl/Math-Prime-XS/Manifest
@@ -1,4 +1,4 @@
 DIST Math-Prime-XS-0.26.tar.gz 61354 SHA256 d595728a2a537edb22818f0050e0ff7c99b19f958386585715e777409b57f1e1 SHA512 4054114b320e15c349c6620fcd8b2ae6a94b590f2be2a6301577dae09aef3058f901cafd669ea9846c0b7adaaad46e18552cdf147c8412b297d96d5f3bbd6fa4 WHIRLPOOL ad30005deb6184acaf97d7558bd72cf4d89f3268bcce23479937e80a5dae407d6791a12c13523e0031ed027d476bef61bfd00ea12adb73d0ff36f34437f1bc9b
-EBUILD Math-Prime-XS-0.260.0.ebuild 648 SHA256 363e5a797b2ebaa9c6af6d795bd3fcccaf3c6b6ac032dee2d430887c3c62dd95 SHA512 baaf379df24ee102e4f19f4e300660bfe030a3b4c35ea8fa568c502d92f562cf2cb4a31fe63c087831dcd410369d2a28ec05bf1a44785d5573d36c9c1683cc0c WHIRLPOOL f0839b195c0e39d6d7e009646540a490ea406e9a16ed6a020f55e499c88246873617ec09124960b2f484aa9ba2e25a8e9c5f08f8455c4fcdf819a83aceba6ff6
+EBUILD Math-Prime-XS-0.260.0.ebuild 647 SHA256 3f0dbefcd79aa734907205f44130c6f1b6169a66d367f853ce848a8764e02a69 SHA512 f4dc73da4b4e8d5cc7c18048355b669943de36d555913a7540d5730e7c59bd22a8f805e98c65a74e1518147583cc29d460c40800d289ca02c7f360d6d78ee710 WHIRLPOOL 18fd9a0d3c423655c5625682cc5cd3aa75fe4cd3e8e3dc704d23ebc7e21257400efb010a56de05e04d151491018591a278374d5226aa75da32cebc22b3ef4b1e
 MISC ChangeLog 390 SHA256 f2aca17d9132469854f74f1acb992193e4eb0535b457fb7012b5e25533a462b5 SHA512 e93d3fddb4a1c4b6fd559a0daa74748506afa062268d674321955d5389b75a00db77801a325650e6ecc0efb30606d8e726d3c22cc90f0241e0475d2075e72faf WHIRLPOOL 3683d348accb1b5b1f71a116752973a6ef9b5edfb446d327f5206cefe8de7a8e314f181d694ab367e89fc6d232ad792026a62644d559d22d4b1b6994c51f20a8
 MISC metadata.xml 656 SHA256 af6c99f5e955f344a7a33fff25882f403ffbf5d4d4dbec638e92d27a7d48fae4 SHA512 639aca7ac17219e46ef81de2022b3e092a4af3c9f41c038d8f6b14b9fa18a6109f2132616b8a7bb7c86cf53dae91344451939f314c31f1966160326d8ed138d9 WHIRLPOOL e1d259c3264413313f3e4f24b029ef2684c78db39887d23c3800083bc9aaccd0a66db41da18a61d52deae1ae1cd73e89d5f191ee582143e67f9996717b404b0e
diff --git a/dev-perl/Math-Prime-XS/Math-Prime-XS-0.260.0.ebuild b/dev-perl/Math-Prime-XS/Math-Prime-XS-0.260.0.ebuild
index 66534e453d3d..933727481066 100644
--- a/dev-perl/Math-Prime-XS/Math-Prime-XS-0.260.0.ebuild
+++ b/dev-perl/Math-Prime-XS/Math-Prime-XS-0.260.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Detect and calculate prime numbers with deterministic tests"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 
 RDEPEND="dev-perl/boolean
diff --git a/dev-perl/Module-Build-WithXSpp/Manifest b/dev-perl/Module-Build-WithXSpp/Manifest
index d00bae5271b5..18e447fde559 100644
--- a/dev-perl/Module-Build-WithXSpp/Manifest
+++ b/dev-perl/Module-Build-WithXSpp/Manifest
@@ -1,4 +1,4 @@
 DIST Module-Build-WithXSpp-0.14.tar.gz 14103 SHA256 53b3c8c8fdbd50fc3dad3d19da20f1b6414ef70665b9311710c802969e746934 SHA512 2d334656128fe9e4b2e06ce23fc33b81bd4302477dcca2ac2cf87a74cbd4d160c7875e2a252e85116dc17a6e9ee53d43457a7d50e0cdd33d3514ad47eac4554c WHIRLPOOL 617ab44960c975551d62bb1f61a2c9a4f503edb0454f00bc3b21bd8a19ad6a8d31480324d71382979f3f368d93d1fd463d5480b91841929acd9cc14739857a78
-EBUILD Module-Build-WithXSpp-0.140.0.ebuild 546 SHA256 fb8c9babdc27aa370df5cdc8aedef3f52ba412924f0bf236c29cea9809d26beb SHA512 2327d53d8739285a5ba86c8dfca4edd4717a2e2d8da3c7e056b59bea3515f820e8b9f3fc006ae667ac445a378022d2eb7d3f1fa00acaf8b5c3b77b475b7994b6 WHIRLPOOL d92013ae84560e1e973a71e29e9313625376c6f1ffed4b6e5e7c33d8eec5d2f7747597a18d9bac35a763642dbc165b9e0428e0a940665670c2aa570b7d4e96d6
+EBUILD Module-Build-WithXSpp-0.140.0.ebuild 545 SHA256 64cbac298ff92996ff58aff403f905072c12b6e2c70e836855f2995227a2bcae SHA512 c4ad8de4274a1148a8f468988f86a69a85c1264d36cf78db43780e8d4941fb987efbba4d54cc2bf8d1b1c220b2c03454c1ac35467999e767284695388737d413 WHIRLPOOL 39af96f0fc8fd559633840a2464ffaa9673c9cecce81cffcebf6037c5aaeb11257a3021057194d08ccb28560ad815816584831bd9ff8b7c368d3a9d77766cf90
 MISC ChangeLog 414 SHA256 03883cac04332019a3b98b6090505c51032061e62439553edda3e744daf4669f SHA512 6031d622620c8708ffcc353af6b32d10c39634da537cdf07b574ba99b20615a548538c33a4acf2754cfdbaf50b874e7195e981e379d298330bf28d2a7b8a4126 WHIRLPOOL d697ac039fa779bb7fe1247e13590c7fc44bbeb2fa0b6025c968d6b90c8925a7ade1574236f99eedc2ef89dcd6386bc5712da29d7da8375e816a3dfe56ccf702
 MISC metadata.xml 672 SHA256 be424389dd79795c538c84f68cb85f670cbdd02868237d09ca93be53fb6d7ef9 SHA512 f6191a8dbd3561ec8020ec54d1c0c6e253416cd6ee27b36cc2c1e480af24779469d57c586bd53b57eee7223de78ffc4d7721a3a05d3ea8bea8d9389affa6c848 WHIRLPOOL 7210f4e06eb160f2fc9c4c34251bf69d13a8b0d28e574963602ab8698c775c46eb5d7fd8eff09be8c97dc5df71877f1326ee692c3462b5afedb040e8c98c7209
diff --git a/dev-perl/Module-Build-WithXSpp/Module-Build-WithXSpp-0.140.0.ebuild b/dev-perl/Module-Build-WithXSpp/Module-Build-WithXSpp-0.140.0.ebuild
index 974092a6a7f7..4ce9a231a07e 100644
--- a/dev-perl/Module-Build-WithXSpp/Module-Build-WithXSpp-0.140.0.ebuild
+++ b/dev-perl/Module-Build-WithXSpp/Module-Build-WithXSpp-0.140.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="XS++ enhanced flavour of Module::Build"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 
 RDEPEND=">=dev-perl/ExtUtils-CppGuess-0.40.0
diff --git a/dev-perl/Module-Util/Manifest b/dev-perl/Module-Util/Manifest
index 3e53704b200b..9e43a8c9621d 100644
--- a/dev-perl/Module-Util/Manifest
+++ b/dev-perl/Module-Util/Manifest
@@ -1,5 +1,5 @@
 DIST Module-Util-1.09.tar.gz 11661 SHA256 6cfbcb6a45064446ec8aa0ee1a7dddc420b54469303344187aef84d2c7f3e2c6 SHA512 6669216598c5a3b41964e65792fa5bdea9675150bf2ef908ed3e154b9fbc207de0b766feaebc2656a5379393cf8acafa5e27aeb694b9a56d8ff3b5f9c35837ad WHIRLPOOL 2beafb667ced5a865d518196e55176f92cd45454f8d1619d6c6b2a7de1a2db10b3fda89b1ff355987035051d5ff5cb05d62b8b6f9c89db3e7e522f6ff1f982ad
-EBUILD Module-Util-1.90.0.ebuild 447 SHA256 4b4f41fd359fc8849b2b4ea18a8609e4d662d7747b69007ac7b4f0c4041c3f5a SHA512 71c65eb2947aeeeb121b3eda7372b2edcf9a0a1abf78de22d681dbab7a7b907f989ec4cfac1487069ab1e0fcf3268ab068acbb8af1d1a7c7222ae03fc57b0147 WHIRLPOOL fc38dc935b752d7875d699ebc8d1933764c3d586391d1f4e9bd2f66ad5783d3f11da5ee4953b18f639df5c81c2869ec247ed99a66e1d937c11ac5a8bd4df956d
+EBUILD Module-Util-1.90.0.ebuild 446 SHA256 695ee36174abc591dd7c097b7db3835cf4945c5af0b8ba046f53f36004ddf055 SHA512 f8a67aa1875a34a12f566b2119d56c18593a9384ca14e5dfda915c1823d143cd8c1abcf5d3b25c46b7ac590b3546c095a90eb479ddf364cc769ed77e1ca2cbc4 WHIRLPOOL ff97dba987e8b39a45f0626576673c97e35609c1535e9b5c2bbbc039b80efbb68ec264f285e7ccdcd8f69d301c15058bf3c1a434ff290376b14dd6fef197f0b0
 MISC ChangeLog 2755 SHA256 0f213dfcd31a83bdc60d570f9cd3add2aa7568822c0abcb3f175f525db8133ad SHA512 c8fab3c1afc2ae668e0de9752c07054aa613a0d7f3311332b42a7edcc35af7677d684492fb8da4b3f27846c3f1d3886c8d812b14ccf72acbad43545f64acaf81 WHIRLPOOL 3b1168126aaf7bc69ada99e68ba3a167edcf44a0ff1f375295a3bbd3eef2b2f856a5665449cf493aa7bd52d0a9aed3f33bb52abb4988a8926ef87e9a006ecff5
 MISC ChangeLog-2015 1542 SHA256 47686e0d206790b1ccffe268dbee5dbeca159029e731075cbe71a6299d9636f8 SHA512 99242d5ca72943e56d66bb058ad4c0fc3f4ac1e54fa6d21a1cde0c41666ce617785f08899c5534214b7a50a531ca35a5936e36b3ad62829dcfd2f70fbf92abc2 WHIRLPOOL b13c6af54fd5eb28599b057e02ce015ecdabbe74304c47cb12c8c5a133fa6ac4fc2dd5daeafc1225577232abb5b4ff58bbdcdcb0f0a45020e2a9c6bcaa30b403
 MISC metadata.xml 382 SHA256 6fd473148c26da24f5a1a2a183367b46139d0ae4d5ce5b8aea8bede06dfee705 SHA512 9774ce190764a7741608e4a3e9a9871d0886f8a4bf41c5435d3dae4fe352e29a6b1512a872a9d02241039686923b890d81207053a8beb1cab701ef85771b4e73 WHIRLPOOL 6ccebd3c4a66257c5da9e9c94a9d2e9be18d8b132e03a345efce0fecb84f8b52c6ed14fc2af258fce7e09700d3d76f077daded5995e1c2c6d9692709f8031d3a
diff --git a/dev-perl/Module-Util/Module-Util-1.90.0.ebuild b/dev-perl/Module-Util/Module-Util-1.90.0.ebuild
index 53ade1558b6b..9b0dd1069114 100644
--- a/dev-perl/Module-Util/Module-Util-1.90.0.ebuild
+++ b/dev-perl/Module-Util/Module-Util-1.90.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Module name tools and transformations"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Net-Bonjour/Manifest b/dev-perl/Net-Bonjour/Manifest
index 5c921f06a100..d5723fa5d55e 100644
--- a/dev-perl/Net-Bonjour/Manifest
+++ b/dev-perl/Net-Bonjour/Manifest
@@ -1,4 +1,4 @@
 DIST Net-Bonjour-0.96.tar.gz 8323 SHA256 c38a1f3ab200b08208d0c3a02b23d30653dfc62c09c6a12561c6ea08a69b1f97 SHA512 1d35f29dac829ba5cdd51878c00f361830d50862ebeb29dce942f4bf291de6f700015ea792061d3410fe315ba20b425222ac87dfb6843ebfb0b97d7dca736a65 WHIRLPOOL f26787d3a872ce18eda8855dd5c5e20178c98f6f4f282bb97977eadd1f2ce0a03bf183085e70379a78e05a70b44bc933f9c3675c97b922f1bd1907a073a2896f
-EBUILD Net-Bonjour-0.960.0.ebuild 611 SHA256 bb74e65244a120465c494c05ae7e60013926f624318b84cc986f7961d8d2c81f SHA512 5b8499311a3e8c7bc50c7c96488ed3fd851fc123a80aac32b20ed57e79e350f10a26b9358ca84be4aff2a82f0322f1030fcf93369c12566eaa0b033a19a21513 WHIRLPOOL b5456ad8cb985e5d02cb16fed1f5f345d7d4d2467400a5791447047cd6241fd56d6a57e92514fe7c7f9340cc8dccd2aeca3b4d43aa609f9d2814e2c86225204a
+EBUILD Net-Bonjour-0.960.0.ebuild 610 SHA256 4d20a68135b170532e16877a09114c1dad7e4b98df446ebfd804182e377f4607 SHA512 6b2ae65bba1b87c73318f9cbad51f2d930e844df49ce82f558e78e1f2f2bbcf157222927eaa7af29567dd211aff92afc3812242f1f0a5ad7d4e8572058a227c3 WHIRLPOOL 02f85cb33250af4944e5f102288f4f028dc1f46dedc0e70a706b367675adeaf531cb61829ba3b75327406243c43c47c5f3820bfa54ba9d35ba9e1b959ff5fd7c
 MISC ChangeLog 384 SHA256 21ffaa88d74baa72b76425969096926a219600f98175ef5e368fbeed2022aacf SHA512 d247e54837a2ca30dbf3a882f7e9d50650085153be6ebf7899e96abbb90f991deef06ed3d892d9c57d2bbc1d552cf24ff1d0ac0a331bc3b2b1e3a0b931c2c41a WHIRLPOOL feea9cf93cb50ed7555df5b5b5eb34530f607dd13059567f19f3ba627fe24cce6244d83c3c9bb996dd853a0629b47b2f9046a7b3c8a80c327c100d64e43ca4f8
 MISC metadata.xml 784 SHA256 c8ed4db4686b9817cf14143516e84aa8fb850f7c51e78b245de603e6825466bc SHA512 907b1271db967d0fa4b3f54457c85ce912067670730d09a25f618f417d994fd9f74ffeab0d8585b1bb894e64c5d1f5c887760e6463a1bf366bbb92c932bbe35e WHIRLPOOL aef20f52b6b35a6f2e10f7c38cfad65bc7ba89783f0f311c29096349c2ce20233e9dc19c54152537f1578195c42d922934ca25c7be98d585c78ee3d54db4cb3f
diff --git a/dev-perl/Net-Bonjour/Net-Bonjour-0.960.0.ebuild b/dev-perl/Net-Bonjour/Net-Bonjour-0.960.0.ebuild
index 4dd6eeaa17de..8f1c4489d393 100644
--- a/dev-perl/Net-Bonjour/Net-Bonjour-0.960.0.ebuild
+++ b/dev-perl/Net-Bonjour/Net-Bonjour-0.960.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Module for DNS service discovery (Apple's Bonjour)"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test examples"
 
 RDEPEND="
diff --git a/dev-perl/Number-Fraction/Manifest b/dev-perl/Number-Fraction/Manifest
index 5acad5190e6d..2da73f728eb4 100644
--- a/dev-perl/Number-Fraction/Manifest
+++ b/dev-perl/Number-Fraction/Manifest
@@ -1,4 +1,4 @@
 DIST Number-Fraction-2.00.tar.gz 7771 SHA256 90c20d3d0ec8ef263679d0ce124dffc8e0441552db02eb1f094caf1c5e550397 SHA512 ce78d42b4d448ae1425f1a6c98a7c8a330d35aa510971748e30b55a235f26e3fae4f1cb498b9014fcee512fd19a72902c5d44b2f00ad6b03111783a757644135 WHIRLPOOL 05699245c53c67ea218c7604be359d064314ef4956784499095725978f55cca935c6cfea105e9d3a95f28595f5f5e432497188d1ec1b6912904cbad851bd462f
-EBUILD Number-Fraction-2.0.0.ebuild 494 SHA256 06c383df360011d61416174041b89ad38b0f6f0313ab75f257e02b4b9e439553 SHA512 7eb2d5b2c87b645d614eafe1f4f28417a69c2e37f1e7b4f5d31501ffc013c76d23b4e0ef0c8a006664f4191b69724d21018eb1009415ab05452736ee21b5eb3c WHIRLPOOL 55b876e3a4d3ed92da1d73247480133944a4d8bd24a4127fbc17d9958e40ab8989a3165c765f94c4b0f6bdf13c1e5049059dd72d42e153f653de4974b04080d5
+EBUILD Number-Fraction-2.0.0.ebuild 493 SHA256 4910ea9ee24a1d175b38a6f8e2f80b2537f3231759fe33f8761a436c2e9954d9 SHA512 fc9d28d6537fe09a43ec80e6ee399e8cfe673da1a4033f38f607a8b26fd8ab003e3c10a35abb98086838cc5e226dfa0b8fcab290f0c70ddc56d151d897177ed5 WHIRLPOOL c5480db213ce67ab7e2b07ecd5d6e6422fceee8a764ae834fa845b1d2471c68e054f82b8a69987bc0e747dbb706e9d1c26804bfd7ed1cbba137ba841de27b493
 MISC ChangeLog 390 SHA256 c9dd3c5389a782b8165e0ffef945dd032bcb00f1d52ea076c6aa6a50704a553c SHA512 c03d93426d1d2c6d6b9a6736969cdf45c657dc6d464c5061cf8ebe0e7bd909af8854ef1cb37c4c9309375d7b66c8c66a9c7f35019ce691ad4ada9f057d68d92a WHIRLPOOL ce0419ad7a630bc631319692a289c806b3296b6865b515b6f4314d15b6083bcf5cda8e0e774f52d049bbdb5306dcce295ea253ec11a2ae87097cdfc1144a615d
 MISC metadata.xml 659 SHA256 d77176c8d293512c3e164659878837ecae530c8b4688e97c4caaa8df50b57b9d SHA512 f088fafa9166c74af582d366bc9820fded17bd42d1835cb0e87e4fc77f7bbfbf872276025ac7bec863784bc82604a3ea9b707e4ca1a8b24b1a15b025481b3bf6 WHIRLPOOL 13994f62e56d1fffe8e74e347aad8d49050101b4835a781f1166d509533161fbedb5760112e74c196dedb2e456bfd5991b4f4967719f10dcdf95fcdece9924f3
diff --git a/dev-perl/Number-Fraction/Number-Fraction-2.0.0.ebuild b/dev-perl/Number-Fraction/Number-Fraction-2.0.0.ebuild
index 0934d9d8a2d3..80254edfa148 100644
--- a/dev-perl/Number-Fraction/Number-Fraction-2.0.0.ebuild
+++ b/dev-perl/Number-Fraction/Number-Fraction-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension to model fractions"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 
 RDEPEND="dev-perl/Moose
diff --git a/dev-perl/PPI/Manifest b/dev-perl/PPI/Manifest
index a10967ddeb6b..ae11b3b9dde1 100644
--- a/dev-perl/PPI/Manifest
+++ b/dev-perl/PPI/Manifest
@@ -2,7 +2,7 @@ AUX PPI-1.224.0-t-marpa-dot-inc.patch 670 SHA256 a210f40e2371a65a9f0b07ff030a325
 DIST PPI-1.220.tar.gz 245416 SHA256 1e15be50e7d95a36d351af8bf5074f6695a2c72165e586d93e616183e7602b83 SHA512 03ff865424a11cb351211dc7d57b6477848e8f354de74dc5bae214614438549f1dba6818842f6312f88fa631514abad69b0023046d56c8e8584d0b634c202694 WHIRLPOOL a8ea5f55613d1d0cd7223f12aeae5c3819121db3bb519fc000eb6f251618aa034dbff437e5d2133218a79452f8b556d469acc2b3ac62196c20616b847de228ad
 DIST PPI-1.224.tar.gz 257197 SHA256 8d0f9faaea68515fb5aa6323115dcf98ea6c1dec4441f3844d3b9633b6cc9d94 SHA512 7c5f4a01b3d4a1e7e2f68d7e5c81368387fbe9a4cd2f20afc494706f742c9ba0b293747b692fb77af9a1457e077687c7d5217bf09137ab71bb50ba52da24431c WHIRLPOOL 4ed26b3329664f0f46af0f6799bf8b6d15e8220ecaa36c8733fb4b9840129ec30dda27e55030bbf7875e2d7b070a854ad14260d1c52485782eb0f8d5b0096fd1
 EBUILD PPI-1.220.ebuild 845 SHA256 a7a841a11df3d5af156cdbf520eb15b02f22145e12123f5292bab65b388ae913 SHA512 8a8dc8b12e1293205eee6bb083983ce3f249cf3a0543ff58f5398cdd7e60f8a0dfdb69fc1d29cb86a7f1a62c2a3a109d8448286d008122fcb40d5d4a4acbb1cf WHIRLPOOL e020b78816cadc5d4e0c034be14f07a92f5776ca5e1c4eba6e801d5007c059a67fb763e8a1f8a78d72eddc3bbe67f4ffe4c2da1b075c1a8b797aa2f3069c78b3
-EBUILD PPI-1.224.0.ebuild 1024 SHA256 37294b6546712a29e69825e4acc311540968a9bba0fe85cae6ff11dde402a399 SHA512 a7d0307c8fd61af4d50b3257606bd34661778008bf68165c85873a8984a4b499bd9e69fae3f7a2a1edb37d62e9bbe73116c78f1027de1c9b50ab48aca0f6632b WHIRLPOOL de4a93d7d003111d708531316293a2f6e319812437a5b750d74f920c580a8ae6ef23fd3ed469f9389ef17e06cfbfd114f2b8b638a1190b0bce90df40b5919204
+EBUILD PPI-1.224.0.ebuild 1023 SHA256 8b88036ae5927417ca3f63cde936f0453baccd16759bcf84d61364134d96cd1a SHA512 d063154a41995265a1aecc2094d0e3d80ee0e15ef7927c5f2eb3d843c9bd8065588832e244aad5a2ebf9dca8ba0f1d6e303cffd5750866344c44de25100fc7fd WHIRLPOOL da28666ed9eb87579495d7af339c056eb7a9c680c26d49fc0aba92a5c734d595c2b12ac382f69f7a59a9b9464258256bfd200b06fc87a660e26d2292863a8ac3
 MISC ChangeLog 2945 SHA256 d2554a3b3c89aecf7b22fa6ee8c69ad28b85145f623ec4fe621c9f94f042436f SHA512 3eed535701285e83f42d62a8c439b1963dc5a63176d49171d49348e8e6f4a3bf6833b033a1917ae8d16a801a2d6b298dc91b5cbf2be9e4f7e05fc440e9496c87 WHIRLPOOL afd2466b32e0d3f272ed865012c0653b389511474f12a088bb18ee67af6c867a48e60f418d207c32fbc87383adee487973d0915b58cf5bb9b2bb2f6da77b47b7
 MISC ChangeLog-2015 5619 SHA256 92d178f38989152cbe5417788c4c42f672839ae849f0011074dfdea6e00e79b2 SHA512 8fa28de8b5f932319818666a0fb71864dd1c0b7f771f81779e5957ded0d8a3fc5fff4487aed76b5c88365db851899da5d1a8fc5cccd86e0b4c20b6de26505327 WHIRLPOOL 132be4fcc7ca617d638aaf496942bb7a1534069161e1fe8efcc79f909fbf1cba882803369480366776d824fd5330f45316b90381f5013a519164f86addb00d4e
 MISC metadata.xml 6633 SHA256 c82220b958202173d481d5368637857008ae4128d62f95f4219b60e565401bbc SHA512 a6f5d77c3a8a13f3c454185c090d595b400b665a9aa2dc7e7edbc0c643109bc251d6522a330510080c5ce905f84cfd8892ed0783032a6e45dccc710df5569ec2 WHIRLPOOL e32a1fdf7d3aaf2fbbd526bea15822833121d8517147ab0a45e551317cdeaa06e263595c1967fa078165d00189fbdfeab979c154c7ad4cd2b5ccd04f5bf6a43c
diff --git a/dev-perl/PPI/PPI-1.224.0.ebuild b/dev-perl/PPI/PPI-1.224.0.ebuild
index 47a8d217ec81..4f2343f6db0d 100644
--- a/dev-perl/PPI/PPI-1.224.0.ebuild
+++ b/dev-perl/PPI/PPI-1.224.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse, Analyze and Manipulate Perl (without perl)"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha ~amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/PerlIO-via-symlink/Manifest b/dev-perl/PerlIO-via-symlink/Manifest
deleted file mode 100644
index f6b45d5d6c87..000000000000
--- a/dev-perl/PerlIO-via-symlink/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST PerlIO-via-symlink-0.05.tar.gz 15656 SHA256 4107d4c34a6a3629453448c25695d92f82522aff64e29b716b56a5af586b2d52 SHA512 752bdeef202d8dbd89a6db6107213f45dc37ecc50c3e441acd6be5db7be0002d3b403d2cc91b4a0d0154b0551a08dc61738275688393e960dfc03a389a610508 WHIRLPOOL 5748d8001a58530e0a5ea7f89df0ec5167d73df4bdf9eb567f67e8e0f37b499f011dff3a7428f35c32b828e6bf2b80e8da433ade72ac7244e25b65d8a0823d03
-EBUILD PerlIO-via-symlink-0.50.0-r1.ebuild 497 SHA256 8e053d452e35e27371dbbc1347a25fcaf371daac2d16993e3341ff364e146d77 SHA512 c0c90adfb0a199a29b7d0c05a0741793e227dba64b9fbed6c745abdb4c32c08da2039881f6ddde72974c22f6fe6ceb33e1505ea36c86d338fdc3dede9dfce8ed WHIRLPOOL 77983117ebd46e5766fa4eb2cf5e5336a2776525cad33516ac97c9c2f1c56561ac35978e32b9c6b18e55ac31dc982b92deea27422fef555ef8f61739a55b0f89
-MISC ChangeLog 2468 SHA256 6c3153d4c8cc53a7c6eec582b16295ef9b3182a6eaeadd79fa2af7cc727d56b0 SHA512 b6b50efe4384f9991eb78e9edc1688849b0df993189f9771e72666ea6dc9254bf5558dbd4f22859fe773c6345434161b1bab7f41a1309cb09b967af81b2b2bfb WHIRLPOOL 3d107e1a24e7b144f4683266e2e33b670bf9edcacbf61003506431244608e3867c29d346a713f8be23c76e29e78de9e2e69e1342e4b6e3b50e67a6f1effd596b
-MISC ChangeLog-2015 3264 SHA256 fcd7f6ef2f43bf164a9601c801a9f694330712a2260a26f5cb839a18a406f656 SHA512 0af59d7c34f9dd1f21e8bcae2b05d2b4cefe8dd77b0dafd16ee27225d906e7a3cf671f3991744f4c1d2112cf4f35baa2943cebc3c7f3e6dbd05495e1a25405cb WHIRLPOOL 1197cc1558a911747ce5ceb96c0277c21e42d811be7ad5f4587aa6c5141e8d26a88061d48d04e1306a9ae1060034f2e4c253f9b779366eb965f750a9ce819cc3
-MISC metadata.xml 409 SHA256 1f8ed57b694f4358403a283bc581a566743d425af304594fa53a44c43eab8339 SHA512 1c9bf7e97982d4bb15edacc1d30967ad55f1292fa369693ff8b511d75d36d087e71bada07d5e6ad597e87f39ca80439db92734fdf1f04b2e25120b9ff909d458 WHIRLPOOL 00516d8ec240d6f083d1a35c0a496740db527fe06a933fd4e4bf206d6842b77d1c187aba7f6bdaf6c28a9b63af274cf84b463ba0a858718a04cf22909fc2fae0
diff --git a/dev-perl/PerlIO-via-symlink/PerlIO-via-symlink-0.50.0-r1.ebuild b/dev-perl/PerlIO-via-symlink/PerlIO-via-symlink-0.50.0-r1.ebuild
deleted file mode 100644
index d5b2c56a9d40..000000000000
--- a/dev-perl/PerlIO-via-symlink/PerlIO-via-symlink-0.50.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=CLKAO
-MODULE_VERSION=0.05
-inherit perl-module
-
-DESCRIPTION="PerlIO::via::symlink -  PerlIO layer for symlinks"
-
-SLOT="0"
-KEYWORDS="amd64 ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE=""
-
-DEPEND="dev-perl/Module-Install
-	dev-perl/ExtUtils-AutoInstall"
-
-src_prepare() {
-
-	rm  -fr "${S}"/inc || die # bug 483812
-}
-
-SRC_TEST="do"
diff --git a/dev-perl/PerlIO-via-symlink/metadata.xml b/dev-perl/PerlIO-via-symlink/metadata.xml
deleted file mode 100644
index 0fa09bee7804..000000000000
--- a/dev-perl/PerlIO-via-symlink/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>perl@gentoo.org</email>
-    <name>Gentoo Perl Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="cpan">PerlIO-via-symlink</remote-id>
-    <remote-id type="cpan-module">PerlIO::via::symlink</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-perl/Proc-ProcessTable/Manifest b/dev-perl/Proc-ProcessTable/Manifest
index 852c60b46df1..047700734bd4 100644
--- a/dev-perl/Proc-ProcessTable/Manifest
+++ b/dev-perl/Proc-ProcessTable/Manifest
@@ -1,5 +1,3 @@
-AUX 0.45-fix-format-errors.patch 1032 SHA256 ef2c9f062f0f81a987087864f4b3209edaf5e105b88dfdef4b945da9c8e300b6 SHA512 5ad1674b92f17cf4eb76bc86405cd91aa29be49f80c4be9e9599927aca1001a165c8e94a3fed4eccabf79245c76b4eb82e8f41b11ace60e50e12d5c41f2b155e WHIRLPOOL 63266ca868ce4874db042db12c8b4dfd6e011d185b39be78bbe1caee4414a28aee22c3d7bbd1c57a9e73043987432cd74d8e541e27fe388bae066cae6e461ac8
-AUX 0.45-pthread.patch 476 SHA256 246f067e98debb2bd5568d516099ebac35d353608250f09c90b822dc8f3f96fe SHA512 79f607eeef5867e7d14b26066e898d8c1255676b97deef10f53670bdee7ca74f39f8f929f831976fadff12d33a5385ef3798a1178211bd5879185e99bb32ff95 WHIRLPOOL fa460bdc949f969dd83eba074d7135f6bcf2e02a8b33d2e61d56a8528ecc7ec5f0fe4933c2d8ab3301988a501cb817c837d6d19c149eacb8b9678c4e4db2d6b3
 AUX amd64_canonicalize_file_name_definition.patch 396 SHA256 f2208715c4c209bf70041bd6b386c103ac01049857668ef69e04a4511908af32 SHA512 176033162dbc12d0f5e732950ada138b02c9db252cfad9bb456adc92cf5e399c7c1bb46e7e80c1ffda0944966a2ddb256009fbee6cbacd5c3e461440f2f3e3da WHIRLPOOL 4b36276726464d1b4d10c42d21e1f3a572eaf94c0bc8a745d68e6ac92c5f23fdc0ece43ae1d356a5b2611c0ef7019b922267220c26ce808e6765497058d6537c
 DIST Proc-ProcessTable-0.53.tar.gz 71060 SHA256 b05811cffb366b1db6f71f2dcbffac5d2cbf01d987f0c0242b671e447326ba44 SHA512 9eb11963ac2e86fff63b515537c41297af2f3610862fe18525296e18a9abc68e4a61e95ea824e8a91d9e0a4ff0e5d909fa1252a30657e9bc22df129090edb4e6 WHIRLPOOL 2df95aa9b3cf33b0b0ccb2441ce0a2f1f02a7ed62d97fed969250911a8f0071ee049e8d27623e6aa1c005a3bb22446703a3baccf5c5c20dfa5c461f5e9b16116
 EBUILD Proc-ProcessTable-0.530.0.ebuild 774 SHA256 035fecd71effaa0c28759b89cc0643d939b1f7380275f20468558d30e48498d7 SHA512 3382cd228dafe823fae19390240ad4bf84ed21d0c6dd9c496d83b8fb7290d236242e8c2c79e86a73661ae6e4b2380664c0de8670ee5018d1a7bbd27ec67ee268 WHIRLPOOL 9d0a5a93f20c3c3a6b1f1a332840baea058b841545ac918ad61bc0de31dcb2da4935d2e1d3eda24fda96ff3bd3956afe9ddea17e72e0fe49cc2b4784e4fd673f
diff --git a/dev-perl/Proc-ProcessTable/files/0.45-fix-format-errors.patch b/dev-perl/Proc-ProcessTable/files/0.45-fix-format-errors.patch
deleted file mode 100644
index c7bbec993446..000000000000
--- a/dev-perl/Proc-ProcessTable/files/0.45-fix-format-errors.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://rt.cpan.org/Public/Bug/Display.html?id=48445
---- Proc-ProcessTable-0.45/os/Linux.c
-+++ Proc-ProcessTable-0.45/os/Linux.c
-@@ -397,7 +397,7 @@
- 
-     /* copy the path onto our obstack, set the value (somewhere in pts)
-      * and free the results of canonicalize_file_name */
--    obstack_printf(mem_pool, link);
-+    obstack_printf(mem_pool, "%s", link);
-     obstack_1grow(mem_pool, '\0');
- 
-     *ptr = (char *) obstack_finish(mem_pool);
-@@ -618,7 +618,7 @@
-         bzero(prs, sizeof(struct procstat));
- 
-         /* intilize the format string */
--        obstack_printf(&mem_pool, get_string(STR_DEFAULT_FORMAT));
-+        obstack_printf(&mem_pool, "%s", get_string(STR_DEFAULT_FORMAT));
-         obstack_1grow(&mem_pool, '\0');
-         format_str = (char *) obstack_finish(&mem_pool);
- 
---- Proc-ProcessTable-0.45/ProcessTable.xs
-+++ Proc-ProcessTable-0.45/ProcessTable.xs
-@@ -388,5 +388,5 @@
-      char* error;
- 
-      if( (error = OS_initialize()) != NULL ){
--       croak(error);
-+       croak("%s", error);
-      }
diff --git a/dev-perl/Proc-ProcessTable/files/0.45-pthread.patch b/dev-perl/Proc-ProcessTable/files/0.45-pthread.patch
deleted file mode 100644
index 537e2926c4d7..000000000000
--- a/dev-perl/Proc-ProcessTable/files/0.45-pthread.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://rt.cpan.org/Public/Bug/Display.html?id=46861
---- Proc-ProcessTable-0.45/hints/linux.pl
-+++ Proc-ProcessTable-0.45/hints/linux.pl
-@@ -1 +1,11 @@
-+# We might have a non-threading perl, which doesn't add this
-+# necessary link option.
-+use Config;
-+my $thread_lib = "-lpthread";
-+
-+if( $Config{libs} !~ /$thread_lib/ ) {
-+  $self->{LIBS} ||= [];
-+  push @{ $self->{LIBS} }, $thread_lib;
-+}
-+
- symlink "os/Linux.c", "OS.c" || die "Could not link os/Linux.c to os/OS.c\n";
diff --git a/dev-perl/String-Print/Manifest b/dev-perl/String-Print/Manifest
index 78e4270df6df..252e12ce52a3 100644
--- a/dev-perl/String-Print/Manifest
+++ b/dev-perl/String-Print/Manifest
@@ -1,4 +1,6 @@
 DIST String-Print-0.15.tar.gz 13569 SHA256 b4e97c3ced0f75d485be6d73987bde4757e71d31e790ea61424f1b935b6134d9 SHA512 9f25f588bf47930504ef3a7ecd351561096cddd3f5451f99c87443e3944f7f1ebf0cefafadeb441901a387f80e7d42f1b73efa7723ad6e7732df7f6851de5e4a WHIRLPOOL bd38e86f53187760bfb54258b9ab4bcdbaf0ed470140ed4c95475d3a34d02c8ba7860559cbab6e3eac783b15a162fdca9dc0561a860222e73ccbd939c9948b29
+DIST String-Print-0.92.tar.gz 21134 SHA256 973fb120eed7dc4a74737d04ddbcb1413d8ccc3bc819c07f9260be619dd94e71 SHA512 bc1eb3d7dd0110701e4c8e15a0572fb1d8f1e2c93bc43351c433d038aa5d86f7cfce91eb05dbab62b338ee2f7f2826f3b4df08b5d5e30f857cab01f31df42ad6 WHIRLPOOL 5993d17bbfd5f83bde1cbe7052bdf8b349b23140928318a88ace9a0db7f214ad1258db05f1c7f3f20dedbc52df5c41758c2d9a813c1ef2f33e5f379b6090bcca
 EBUILD String-Print-0.150.0.ebuild 385 SHA256 b82ca8a9db4f3d135b1b9020866c480c8685de5550d003f8ce4aeb843a7d6e36 SHA512 c8a8286a24e4720c46230fc384c213d54909a77c69276b762201f58ace726da3b0ae3b9a5ed0d5f75aa1d357dd8c08555b441f1657c291620877eea873d8637a WHIRLPOOL f125e95a0a05a5512d341000718b79d747de09141cf87618383888e0c5042a4a41d81eb65686c76eb499caebade93a5784e4d496225a3d9e1e6e3e76756fe636
+EBUILD String-Print-0.920.0.ebuild 436 SHA256 ac66dda6c43090542cb531f90ca7fd4d1adc4a62b2cb30f9d7cd9d525bce0d30 SHA512 184031254a337cb11c0eb2b482c97bebd274eab8e103b280ecc1868e29aaddf1813d405d3e6adffc4dfa1e93db7a2a12e1093011235a1ccac99ef5bc52b4d189 WHIRLPOOL f3dc58550e58bc4e61ab77e7f0de65d24693424b24e3e12410c6830602a1be0b9ba0ed853d8e78d00e6fda885dbf4af8a28240ac9d2445b16dbb44efc29b3882
 MISC ChangeLog 363 SHA256 e8a604b4887fb31e583ed3561ab1658a9f77239932ccacf17d06ff42aae17d06 SHA512 5e34631a47fa501dfb4bd218d27319d552f9dd5bffdebc9be7538ca7d8271cc399f5a6df7a32b1ded7ea932a9a852b24c8a51cbd4b84ac96d483bb3ff4234397 WHIRLPOOL c3ba026d470dce43ebcb274e23ee9ec43329cfc8c3f1a42f08477c0c66aea3e04e3f44bc08bb6abbc8b270c539d17ac37911ecec9927e79de93688bbc909ae5f
 MISC metadata.xml 396 SHA256 77697ea4e79e927ade54127fc8f26478396c4dc9a85d0dc810088c31914f8c3d SHA512 49191cb5820243001a051f218f0a86e3c4f2f972f42f0029920a34ee15a7327048d061437308c9bf9fc418120f217a23f67ad5009b860fbde13402b5d26f3e3c WHIRLPOOL 98ee1ace6a72ad054fd1f901b14f40f7fcb1cec2f7a44c883624a5775efc62ed7eed65893e58f488a8234942a3f03187da5c7cb49db435b081c4b79e6675d066
diff --git a/dev-perl/String-Print/String-Print-0.920.0.ebuild b/dev-perl/String-Print/String-Print-0.920.0.ebuild
new file mode 100644
index 000000000000..8855373dcd49
--- /dev/null
+++ b/dev-perl/String-Print/String-Print-0.920.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MARKOV
+DIST_VERSION=0.92
+inherit perl-module
+
+DESCRIPTION="Extensions to printf"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/TimeDate-2.300.0
+	virtual/perl-Encode
+	dev-perl/HTML-Parser
+	dev-perl/Unicode-LineBreak
+"
+DEPEND="${RDEPEND}
+	test? (
+		>=virtual/perl-Test-Simple-0.860.0
+	)
+"
diff --git a/dev-perl/Sys-CpuLoad/Manifest b/dev-perl/Sys-CpuLoad/Manifest
new file mode 100644
index 000000000000..105de3e5bcc5
--- /dev/null
+++ b/dev-perl/Sys-CpuLoad/Manifest
@@ -0,0 +1,3 @@
+DIST Sys-CpuLoad-0.03.tar.gz 2806 SHA256 1cf00625261cacabf15b407055cd5f090ffea50a42378ee426de48266ce0fab3 SHA512 f8175d1c4e65901e22b5adf912ffb17458151b098634758e6d5377a32bb513e39e914136216b2b38fd8ba30d6bd47957f9637157794cd741cf8802cb5a5f1503 WHIRLPOOL 292a7fdc6868b27acd2cc8a72f20d7e68bfe184e78e87ed135efdf474ad412c4587943258413f39b9021c3c79b57b0e0b0c4928a0b4508d9a6597d755e3cb8aa
+EBUILD Sys-CpuLoad-0.30.0.ebuild 365 SHA256 70b0fa7dd7a2a5b756d77acf2bf0a265aff14c5df50d60672abf13c5957ee561 SHA512 56a5e7808f24f045ad9c2d616fe04daad336a3844c04381cf457946908bf3e6d55190469c97a46496862407a74c1b1806fb71734a1e236a7e74268c7be146414 WHIRLPOOL 5b371db929055dc51a97aec9200b700bdf0958feea4a636bfe7a9e781798c67e1ee11076d5e90caa1368f4b9a5f73663dcd1ecd2b9c3473d2216037be08c8bfd
+MISC metadata.xml 394 SHA256 fd128644aa8e4bc4117ba951e4eb434c7314c1c042b78e8e9c048d378f97fdd6 SHA512 8c04de52c933d24c8fc81d4f20ba0ac82bf259d2b2ea23a501dfb5d0e06bb693bae99def22631fbb83bdb80f9f05d05902f9dd0da282fe750529872c6e6dc57f WHIRLPOOL ad2f959b1c40f015962ce6977d31ecc20d5ec9326ba070df261a378e2addcd9cba92a3c7a66c6f5957e30494488747ef229c86d0ebac3072cea3bad16dbe9bf7
diff --git a/dev-perl/Sys-CpuLoad/Sys-CpuLoad-0.30.0.ebuild b/dev-perl/Sys-CpuLoad/Sys-CpuLoad-0.30.0.ebuild
new file mode 100644
index 000000000000..d67993c098b5
--- /dev/null
+++ b/dev-perl/Sys-CpuLoad/Sys-CpuLoad-0.30.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=CLINTDW
+DIST_VERSION=0.03
+inherit perl-module
+
+DESCRIPTION="A module to retrieve system load averages"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Exporter
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Sys-CpuLoad/metadata.xml b/dev-perl/Sys-CpuLoad/metadata.xml
new file mode 100644
index 000000000000..a3c2abfd6102
--- /dev/null
+++ b/dev-perl/Sys-CpuLoad/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">Sys-CpuLoad</remote-id>
+    <remote-id type="cpan-module">Sys::CpuLoad</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-perl/Task-Weaken/Manifest b/dev-perl/Task-Weaken/Manifest
index 6601d2cbfaee..ffc1b0140978 100644
--- a/dev-perl/Task-Weaken/Manifest
+++ b/dev-perl/Task-Weaken/Manifest
@@ -1,5 +1,5 @@
 DIST Task-Weaken-1.04.tar.gz 29976 SHA256 67e271c55900fe7889584f911daa946e177bb60c8af44c32f4584b87766af3c4 SHA512 19749fada2b030a082d745abbc172125c3e195be5e1166ff02511fbf08aa8d37092cb0ea2cbf95452fef70f2e1cd0062d32f04d74aa52b30f6e85108f9ca80ff WHIRLPOOL 5af1c3aebecf9c44d5afc530007d6872eba491667bd3cea3c1e1971340de335344d330499a44c9968297b57cbaf2b99217ce320d3e663c33abfeed0370c59437
-EBUILD Task-Weaken-1.40.0-r1.ebuild 568 SHA256 120406925ab7bd7b2c3a7cfe9b50c7b945a9038c7467d9e25da2bc5644b8c4c6 SHA512 b752491864bb7efd6b158f636ca7765cb3305abe38101f5793160b3aa18ca1d085c9b51d9ec75afe62ca7fdd24b9da0d31873ffc4f01720632956312b78c378b WHIRLPOOL 6361f819688cb790b3ac94fa68e189f404cd205cddbd00ecab2b25c61e6ce515f40dab872e45d5217ad374ff556fba0b8245e9e696438699864d9dd25d0c4574
+EBUILD Task-Weaken-1.40.0-r1.ebuild 567 SHA256 830d919f71f6aa91ab96628fbbceecc37c08699e9f5c5ad39ad9f9f0cb91e1c0 SHA512 0e6946f39293a621388c8ba3a5d444abe07a56bec76e53c302f5bad896fe3ac6ad9f077fdc7bb1a3ad394581692dde0837be704fdf5a54d0eafdb08325f22af3 WHIRLPOOL cdc74c92ba38742fe4f1b685be60a7a67d6febd12cdb3fccdd960ea34491511dfe2864cb7b338dbe6cc23b234cb4cecffb44ae1b7630136630151c7d450ae7e5
 MISC ChangeLog 2555 SHA256 5620ad256f935e44cb35d76e8e71ac5cc27e6505342feb08437bac5fe926191f SHA512 bd0add6c53d623dd19c28de0d9718adaadcd56cfc79257937e445359dc05b5183c1729e4ceb313d43a966435cb7ab8dfaf8f67b13bb30d10e542e84ae57c37c5 WHIRLPOOL c26569042edb848d046ee52d831d84578378d357c6e07094168787f3b6acb0e9db6c5d877672b9c36b2065e7c56c806e3fc5bb0e3536b97c3d76ea3778937ce6
 MISC ChangeLog-2015 3550 SHA256 ba10591a1239c1b1ef1ff67f6838ae28db738ebdb5ac06437180060f00b9170b SHA512 1d0da6e19d8de9ec4ceab3385b4ca92578150c5b3abe77cd1de117601d5b54338ffd8a1fcd0de74f19006a038cb1f4d933d6fbbfb19625e789f69a6649dc33d0 WHIRLPOOL bd6e79a0dc0b703b12b290c4b6fae68143efd1e4cf6fdf1b019948ad954725fd059179615626cd398b2ab4b2dbf04680a7e5d9c1c5bc8a0bd0e391fa9afa8e21
 MISC metadata.xml 394 SHA256 fd055e4ab6f8e029a71c1a47f8730e76c4411d3a32d7a3ca4ad73082fd94d013 SHA512 9ad930b4f05be6c1bee40d07120c123a1b8c337312bbc729c56f268101f8ab5000c273299ece25f71fdcfe8ac7c5fac7ebc5b22d89f8594968933f36f6650b89 WHIRLPOOL 4035c73d4645a31978cded4fcb935c30421029c17955cfb5ed15bdfcfe36059a805d5bda04d640d4f04296b21e53877f9270794e3b9915633eae6e77d8acc5fa
diff --git a/dev-perl/Task-Weaken/Task-Weaken-1.40.0-r1.ebuild b/dev-perl/Task-Weaken/Task-Weaken-1.40.0-r1.ebuild
index a824e6f12097..bcbbc487ef9c 100644
--- a/dev-perl/Task-Weaken/Task-Weaken-1.40.0-r1.ebuild
+++ b/dev-perl/Task-Weaken/Task-Weaken-1.40.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Ensure that a platform has weaken support"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/Wx-GLCanvas/Manifest b/dev-perl/Wx-GLCanvas/Manifest
index aebf7b739031..0e868d7f863d 100644
--- a/dev-perl/Wx-GLCanvas/Manifest
+++ b/dev-perl/Wx-GLCanvas/Manifest
@@ -1,4 +1,4 @@
 DIST Wx-GLCanvas-0.09.tar.gz 13910 SHA256 6ad2c29ff06ff80a5c8b4b9d1d6bf0aed57489e831be59c94494f4f688dc8fe0 SHA512 2a866736a77c9de697ae474eae82363f89f5ac53c39fe2633b154f218f54d0ce9a0c08894152cee507969a0eaae9695472f27b353d4395469a97da758e59ce84 WHIRLPOOL 609ffcbc2f2d7d22c5f22e396442aed2566a479a3fda6575ffa41e043530852166614f1e8737a6d6f5b7c6157a8ee7ba79629a4eca451e71d86d0799edcfdf93
-EBUILD Wx-GLCanvas-0.90.0.ebuild 513 SHA256 9f3f7b60c347e583ec4466d64b309b73bb3e8bc6a869f143bcfbacfdf345ab60 SHA512 0c4e44e26aaa9772124fd894b62701810f70a3120a68bb401892679f12e1095712e2e6f2c0a357f229250c13ef8f3c6f0439b74ab1b4c913688691c9d1e74a98 WHIRLPOOL 8a835daf013840fac9d2d569caa270f0754c4b9814279f1fe48d544ccaecfadb6f02ec6d2b56fe231e9981fd429d00517170eb91ec1d1f26d4c9897d2491b256
+EBUILD Wx-GLCanvas-0.90.0.ebuild 512 SHA256 e2584a831599d5d67638c9902bacac4f40c8ef08e56881d4c5aa2cee49dbdf11 SHA512 3cba2753afcff079d68fe925d5400e8d8e89b32959bf378d59bb3516ea2b0241b65e8ad7ef51ef6f3cd4057450bfd669f27686726099248695c3c84b3a66e99b WHIRLPOOL 4b368f4b423255cc5c663faf47579fceaebc2a381a7a7841f599338c44148d1702b093662d0c0c8ceb5c1978c8ffe28fb2fd1a2eec555329ef47b10ed68c1509
 MISC ChangeLog 541 SHA256 0fa1be9d01d8dd9e390451df70503e32476ed43a78706a3686426e93eef818e4 SHA512 2b417192c7fd59bbe3395263d10987934cf477b55786f9c475fa174e90aae641014ce1ae1c913ac6691b321d669e1d696bfe460b928fd2a96e4bc92683f7f65c WHIRLPOOL e5ebcf52820732159cf439987b5bd4c1b06d28feb66f22ef8c02da764e9ba8cd5113cc5ab348a9e8b722b21d4fbeed44b0e82ac7442f9efac970fb271b6b3997
 MISC metadata.xml 723 SHA256 da389162e3314b9e42828ce0302b8cba19f858dc7571faab797b9001149bc1a9 SHA512 235651e77d0d4107639d00b82a52e0bbe0b02eb2107476bf28aa6270199ab54ecb46ead4219d4aeb3112dfdd5f7e6caac1d9fbabaaaf5659c8f275cb5ff6626c WHIRLPOOL ea53b3508df12e85d6b31ac0a18da9280e2f36b17046a37d2e185fe553eecc04b48ff0e12d8d19f7c7641a095e083ade4ee45eaa49cfd8b037fd910a80b90a56
diff --git a/dev-perl/Wx-GLCanvas/Wx-GLCanvas-0.90.0.ebuild b/dev-perl/Wx-GLCanvas/Wx-GLCanvas-0.90.0.ebuild
index 407ef2d54afc..9636d5033982 100644
--- a/dev-perl/Wx-GLCanvas/Wx-GLCanvas-0.90.0.ebuild
+++ b/dev-perl/Wx-GLCanvas/Wx-GLCanvas-0.90.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module virtualx
 DESCRIPTION="interface to wxWidgets' OpenGL canvas"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/XML-SAX-ExpatXS/Manifest b/dev-perl/XML-SAX-ExpatXS/Manifest
index 42898ac7d552..332dc5bc922d 100644
--- a/dev-perl/XML-SAX-ExpatXS/Manifest
+++ b/dev-perl/XML-SAX-ExpatXS/Manifest
@@ -1,4 +1,4 @@
 DIST XML-SAX-ExpatXS-1.33.tar.gz 156436 SHA256 1e3db191853d235c42c7d2a5dc2ea055158ff29c7d54c5c673d271cdbd43bc6a SHA512 bf00b444611baf215886534acc6ae16cbc8dc593223698762f3a68f2baca661fe82a6287e1c1c4bf3c5c005f165516eae32b22af7505c502009da0a46aeca40f WHIRLPOOL e98d1e72e54c661be2cd83ff8a0adfc618d860c1e541496fa267b515555bc92e0934125860d75e9d49af481ee016ced7e3a613b513e38aa1a5dfdbfc0d6a2870
-EBUILD XML-SAX-ExpatXS-1.330.0.ebuild 439 SHA256 e74a161c7a6022f958244547ebce6a188b9ddaa0b5de112aeadf718615de5903 SHA512 3ea013e9157060ad8cc6113a672d839f64e3864314910cecd82f835fe8582d49fa611fc9ac8c8abf0992f0a3a1a1fa1bf8005c8aab703650d493cd6136ff1c67 WHIRLPOOL 136a71c49a281556922769a12517842fffe288dff26167b7005d913e41fd7c7012f2c5a9ecec8f55cbfedb3999ad1928a83bb31b1335e275365addaf17e2e1b9
+EBUILD XML-SAX-ExpatXS-1.330.0.ebuild 438 SHA256 b24a9f5e2eae0cbab2162427636d39e0e3413eacb07717162605c21f2094c635 SHA512 e966759b920e110b9bdffbd2a0979b596ef1e050e6ebe593c1d78950d498a67eb8d0a64028560390023ddeae211a2fb0f398c821f06025d99a868026290034ee WHIRLPOOL b995bd7dbeb0d7173061e3bed37a48e8f7d3b1c1562835b46698eb55e7ef2f23a77921e78da8cf6c8abc94e8f0872e6d45908c9eead2e085e94c47f579b675f6
 MISC ChangeLog 396 SHA256 acca8bc650a06f6885e8e85c03725bcc987b466772976d594856a548ce616d0d SHA512 f7abac6ae98050c8e0bb9519c7c9d79b7d38362f3b8b501af6b52704b87950ef3c47c6a1b612ef75420cf990e3cd1e8ca06f9d0cc1eaca55aeb7d31e37ae8bbb WHIRLPOOL fe95fa223036aebe19b089825f29033fc2d9f85831f698ced56988caef48cb19ef5e082250cc58c2eba6655d3f797f01ead3287446276e1f8570a42db3a74842
 MISC metadata.xml 550 SHA256 22991d1835b44ec39eff48908d167d25915cf2497aff0f29f5e4052cdffa7ab8 SHA512 e56258428a650fd9b78362a5c401b0c6c33c4760cbe49565bb52f0e1f22e35404f2b5f3ee17c0d74e7db83758cd6798bf9d79259677f3af1fc783ea60563b347 WHIRLPOOL 1ed884cb0c1183afe9f468f5e6bb33d8e615bb6531de706034ac8c0757511d68a76dddc752658e5b6a79f9ac4d1414cddd76dc3529557b0b03139855f72971a5
diff --git a/dev-perl/XML-SAX-ExpatXS/XML-SAX-ExpatXS-1.330.0.ebuild b/dev-perl/XML-SAX-ExpatXS/XML-SAX-ExpatXS-1.330.0.ebuild
index 94a5a2e9517b..dd549229fc50 100644
--- a/dev-perl/XML-SAX-ExpatXS/XML-SAX-ExpatXS-1.330.0.ebuild
+++ b/dev-perl/XML-SAX-ExpatXS/XML-SAX-ExpatXS-1.330.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Perl SAX 2 XS extension to Expat parser"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 
 RDEPEND="dev-libs/expat
diff --git a/dev-perl/constant-defer/Manifest b/dev-perl/constant-defer/Manifest
index 822e7d84f253..6863eeba41e1 100644
--- a/dev-perl/constant-defer/Manifest
+++ b/dev-perl/constant-defer/Manifest
@@ -1,4 +1,4 @@
 DIST constant-defer-6.tar.gz 43427 SHA256 7b21263198ca22686efff3ae987a240be423dd2160afdeb29fe716d032986ffa SHA512 902916d32ed11737d34f8764af171ba1731de807ffbfd62e342f83bef05ab0a34ddaeec3f2c9b41814877b0568fc3e09fbf26e7ce2cd4a3dd6eeba75e6755b5f WHIRLPOOL ccd9e0fcb0763677e7fbdb5815d332bca69d3db117985582dd0f2469d4c70e27024f7f01a96d84ba8d0b8b009d4e6496402b7f2990b532f0995e84d7ed9f8067
-EBUILD constant-defer-6.0.0.ebuild 617 SHA256 0e7c59439c41374b07c21d5cfe2a33702be9457b82a8ec3139c4feafe4014320 SHA512 fcdc5e12af9fd81d1926533e51cca9b87a53f7da39b5ba86430900da1b90c04644288b4f26a370898faf3cff6cb9dd1477530a9ef8943b0d20a673a29afbcd75 WHIRLPOOL b0ebb5b5a4111e5b09ae24d30fff9ea623d6204f95b2d5bcd77fde03fd6fdc8c89f15b5a74a18df02819b061705323234e03fd8d0983d0368d851785b17c61d8
+EBUILD constant-defer-6.0.0.ebuild 616 SHA256 66bb71d997b6541f3db40f1db954622c52078d051eb851fb9832fe45013e3b80 SHA512 fee46f4c8f7b2df6e2228047d88c19239609843962e37ec885f5ee11911e6070b40939fb819e926542e562be99d08a018b699af5a63351db4780b166b09b226b WHIRLPOOL f31779bb60c89c2d325143187fb6d6e3db0b031817412d6ccbc0c5eaea8612c7e5e81a32035e92b3766550220c2f30f351a2558cd86e55a505a1b17695cbd6f4
 MISC ChangeLog 387 SHA256 53ce6cedc703fcf143d8d3427b1b48e4e0f769c169b5dd3d86c68299d1864dbf SHA512 3052c7082cecaadadf729c392ea1a5c9ec5cce610968b7e67683331ce28cf77a9b9988f1577e14f5ddf40330af13a1aab85c1d7c9b3e5385388a3c42864a9dbd WHIRLPOOL 470dd495d4b87fa5045f6af04d3af6975ce9dd00c79e845ea450de5cd63faa5763d50a31625a4576a42e5557d037bcee18d75c192b046a501f5029680cac1d20
 MISC metadata.xml 657 SHA256 0ac7c642b356f99ea1326d6ad95c165c08f06a9f727c9d78ddb4369e163e0a47 SHA512 decdd11e3545229bb34a032cdb93742dea296c30ae17be055fcd9ff334c035bc0b4bed98db232c408bd0728db059190e79a9d2306ec83b3832007e5dd56ffd00 WHIRLPOOL ed583960ce4f56db6f0d67c525994fab7dcfa041f860828423e321cc79e4f5c417e2a52039b6f18b7f9695ea2b3a9d0bcced32f3735cb8b0887596726fbfea35
diff --git a/dev-perl/constant-defer/constant-defer-6.0.0.ebuild b/dev-perl/constant-defer/constant-defer-6.0.0.ebuild
index 39c2a944a49f..7e9304ef1e75 100644
--- a/dev-perl/constant-defer/constant-defer-6.0.0.ebuild
+++ b/dev-perl/constant-defer/constant-defer-6.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="constant subs with deferred value calculation"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test examples"
 
 RDEPEND="virtual/perl-Carp"
diff --git a/dev-perl/forks/Manifest b/dev-perl/forks/Manifest
index 06b3066cde95..dd99dc7f9ac7 100644
--- a/dev-perl/forks/Manifest
+++ b/dev-perl/forks/Manifest
@@ -1,4 +1,5 @@
 DIST forks-0.36.tar.gz 111143 SHA256 61be24e44f4c6fea230e8354678beb5b7adcfefd909a47db8f0a251b0ab65993 SHA512 d361d7fcfec925b03552bb5f8ae4eb2155b7945d0a57ff04c9ed45e7620a55fe6a1907b1aef8af3f80f8eabc158ab5886628ee1a987dc674e4c25e1042425469 WHIRLPOOL 9d45f06caaf5b83817a3d58d11e8cc65d6ababf1e385f3d2ac0697369742e19b980ba5378cc8e9fddd4116794b4614b7d8c56185ab51837190e64362250cda78
+EBUILD forks-0.360.0-r1.ebuild 640 SHA256 8cb58ff88f74c2a14dc3cc1eb50d25f0780b0c53ef50f33f77b6b06600ab996a SHA512 44aee3f58b6801ec590d5b4b0e4320db708f41ebacc7a5c2f7f7353f883f3adfa2e53a1f86f74e7e5e164b988f8d084ba6f474ddfccd20c67d2fa1c4c1f92b7f WHIRLPOOL 502094243dcc26103c8ddbd679fff639353fcdb5f37e0d000516133f6d2033fb5e07ea6a6c614f6abb7a8bbe605decfb59c877d10576007f19336d0923833efb
 EBUILD forks-0.360.0.ebuild 668 SHA256 5e24327d5e304ba51281051b004a1d744ac459263e59f26e807d900e93ff6a9e SHA512 f33a426bc4ff0175d046c55e06243c5725ec9d390b52e84340d4d6d36e946c1751ae458e7c6986b179f6da284817254e2d04405089a7c01b9351fa455046c826 WHIRLPOOL 57660a2def4c2bb0a9b61c0cbeaa0faad3c815b40886e9d39af8157ff27c0c8a59e567eeaaf7cf88cbc899ef3d0732c3d2cb79f511feeacb5b8b2b45c4256a70
 MISC ChangeLog 700 SHA256 4c263d105d4cc4cd3dad9297b5eef9b8a533c46874a88152b131d85e26070a67 SHA512 582ec79378213a0fd233232dd89bf0aa7cdf424532370cbdc09943c90b57ed455f76aee750303196a728d900e2b8fd34144153a89b156d5f391a20e135ef6a56 WHIRLPOOL 34810856ed55c944247b2c66ec0278786d671d0bf4dc911b58adbbe4c89225955aa59cd5ff17630d2910de7dff74943f279c65ac9e187238088bced9200b61d8
-MISC metadata.xml 257 SHA256 4d43e70b770d0898a99af64a8454a6116e4a86500c23290655c8371265010427 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e WHIRLPOOL 87039765046556cdc2f7d76ce4192945117bfd5bb684220ea8fb72be310673a5b729ea428666ff1ceb1e6c21fb585a3a7dd72bd94dab89cf076a895e6a7677f0
+MISC metadata.xml 441 SHA256 21306e1d7951e59919d1aabf59493ae41ad2624bc10029cbbac9fd6648e58ae9 SHA512 e721fc4fdb30dca69a31eb949dff91a7760dcb91b0f014da59f4c4e9656c4dbae28dc3b6d63b265789d87b1f6722c03b53ab68c0d51406e3cd14802f435d0d9a WHIRLPOOL bdff20e55f7d2fb85a8307b1574a7d717d4966b013a9aa79bce7bbdf9fa463fc17eb7d9a6974aa571094b6a5bbff7138d52f87ed38c7ab391882dbf5d6eddc53
diff --git a/dev-perl/forks/forks-0.360.0-r1.ebuild b/dev-perl/forks/forks-0.360.0-r1.ebuild
new file mode 100644
index 000000000000..f4358b3a3874
--- /dev/null
+++ b/dev-perl/forks/forks-0.360.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=RYBSKEJ
+DIST_VERSION=0.36
+inherit perl-module
+
+DESCRIPTION="Emulate threads with fork"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/Acme-Damn
+	virtual/perl-Attribute-Handlers
+	dev-perl/Devel-Symdump
+	virtual/perl-File-Spec
+	>=dev-perl/List-MoreUtils-0.150.0
+	>=virtual/perl-Scalar-List-Utils-1.110.0
+	virtual/perl-Storable
+	>=dev-perl/Sys-SigAction-0.110.0
+	virtual/perl-Time-HiRes
+	virtual/perl-if
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
diff --git a/dev-perl/forks/metadata.xml b/dev-perl/forks/metadata.xml
index 2b9a936fc0a1..647612455f5f 100644
--- a/dev-perl/forks/metadata.xml
+++ b/dev-perl/forks/metadata.xml
@@ -5,4 +5,9 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="cpan">forks</remote-id>
+    <remote-id type="cpan-module">forks</remote-id>
+    <remote-id type="cpan-module">forks::shared</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/frontier-rpc/Manifest b/dev-perl/frontier-rpc/Manifest
index 03c8d20e04b2..9f48c79f9057 100644
--- a/dev-perl/frontier-rpc/Manifest
+++ b/dev-perl/frontier-rpc/Manifest
@@ -1,5 +1,6 @@
 DIST Frontier-RPC-0.07b4.tar.gz 21696 SHA256 525a611fd5e81280edb701319d1bd769daaaba4475efddf7fa8eb9dfe1b9b19a SHA512 417275aa6a47ab36fe208be65bbe13f367144531de32aeb0c5cc9e133da9125c3498fa3dcf57ccc9e7b2cd7aea75f17d7db1b9b9dbd2da9135c0778e4a3a1cc3 WHIRLPOOL 7c99922a37d8c9a4a9c7bfa5d1198511f5393305abea065aefe51e40fe61a643d481ad5143b4b8e65ad48e78aafcba8fd13a69ae97186aff56d16513c1960650
 EBUILD frontier-rpc-0.07_beta4-r1.ebuild 655 SHA256 df00f231db140e65924383bbb7e23cea1721d0bddf97e540e0538786ae481ac4 SHA512 59a92a7de1ebd8cf47fc53e417c58ba0f54ad307da2cd0d04c41a6fdd523ce905d3ba2b953851fe1f5d65a49df1ee139ee104e526c8614469ed11eef88b75f77 WHIRLPOOL 5636a2fede24e7c5986af60e7be2d11d22c0533bbf711b82996338ff4345329a37815819e0d10ef7cf00c74587b5723bdbbca0ee9b23b6a0ba9fb307c099d567
+EBUILD frontier-rpc-0.07_beta4-r2.ebuild 694 SHA256 802b3612cddeee515628915dcdbd1806e1fda0c1f7922d6773679c894376cb8e SHA512 d03f0a9021d189bd2cc593e167927104e23a3580edbf9ea451e994fdbcab0c7ad06ce32495371177fd3bd1c7d362c4cbb6266b9cf688e8816774f6768eb55009 WHIRLPOOL 2940827c11756b3a00384abc394be9264d52258b6d2000ceccdc003cfac27bda02fc8e3c55d093604405c75a894ae18bb6e13317f842ccc85a7b1b5c924d4a7d
 MISC ChangeLog 3321 SHA256 3d2e6d27d01aae0080a33038b7526059a0bf63ba89b029828778913c7c7da2c6 SHA512 1a72cdc21f5a1e92fbfe5ab54d103e826ad20189fd1ae4f64629125996c2b9fc3ed1f69f5038ba133dfa4bdefb147a083bd72d17d7253a28efb04b69b8e4dae0 WHIRLPOOL b73eb8252ca71e8f72f8ab3dae9eadb8c10d6d3181913471e45af725a70ca6218c7117879086421d314de0108316dd2f0697fd4307cab005d44ffb712fdd641e
 MISC ChangeLog-2015 3590 SHA256 ec1f5aa9ec9a6d82b9cb0201ae5f742b0087351e5c31faa383f0298f0309af7e SHA512 b6571cf176734d43fefb5e7a6922ab11ba67ca2fe12384d1ccebc69910c6f8f7af998b25a779e81df6944d6f07d688d3ed5505d387a8d167356163e42c23075f WHIRLPOOL 9298688bd4cc49260d851bc8eb4600379ca6bf458126f10da002233ea05393daa35fc142f1d8970a3b2edf701fcd9be4c769457eea5936cd7df1bfd6b12fc087
 MISC metadata.xml 1203 SHA256 728cdd4cacb7f238d9ddbdfd984179a1225aadf83bc1d0e61d3d85e62ed82438 SHA512 d39ee4afa8a5021cc009e663fc0626a22338dabfabbee29d45c3036f0c86b76b0d160a9078d92c6c8fd58b44ddb019763db6b5a5981090515d3e4b9ca5cdd5db WHIRLPOOL 6123b8a5ee6906f40d716835dbd0ce8c26d033a709a7d26bda68d4ae29f2cb035392462295f4c8b0cbd9ffc8a5e9e53a1aa55ab7b8a44f793917c9ade051cae4
diff --git a/dev-perl/frontier-rpc/frontier-rpc-0.07_beta4-r2.ebuild b/dev-perl/frontier-rpc/frontier-rpc-0.07_beta4-r2.ebuild
new file mode 100644
index 000000000000..f34439cff25e
--- /dev/null
+++ b/dev-perl/frontier-rpc/frontier-rpc-0.07_beta4-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_NAME=Frontier-RPC
+DIST_VERSION=0.07b4
+DIST_AUTHOR=KMACLEOD
+inherit perl-module
+
+DESCRIPTION="Perform remote procedure calls using extensible markup language"
+SRC_URI+=" http://perl-xml.sourceforge.net/xml-rpc/${DIST_NAME}-${DIST_VERSION}.tar.gz"
+HOMEPAGE+=" http://perl-xml.sourceforge.net/xml-rpc/"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	dev-perl/XML-Parser
+	dev-perl/libwww-perl
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-perl/glib-perl/Manifest b/dev-perl/glib-perl/Manifest
index 6531d13757f2..aaa94c01f9f7 100644
--- a/dev-perl/glib-perl/Manifest
+++ b/dev-perl/glib-perl/Manifest
@@ -1,5 +1,7 @@
 DIST Glib-1.325.tar.gz 297456 SHA256 04b3ff35a21d06509f2eb5769d161217cc3c92dd60204fc778cf089eb80b7b15 SHA512 f4d2d23d4c702ba7a3058494bdfba4d725bd2310ed55bba7114d5abab15f4c8d8f4b40ef6eeec3e733da659a572a6601aaa8ce1964b9cf549e4bed734e016f70 WHIRLPOOL 732595b48c4ff49ba030c41896be1dc49ba153ee5d3a7236340443d793212ebc942d2291d4202f51896686d96fabb1d1826ca0d6ce933304dcdb0aa19c982706
+DIST Glib-1.326.tar.gz 297125 SHA256 020d0308220cb6e03a086bd45d33dd8fe03b265c502bfc2b4e58f2dbe64c365f SHA512 28f4f6d544389b7bedd5ccfce17659759e0996cdfea4f73e140de336b6395f5688bbb4707e3cf3e29b39f840eb8db9fc52dcbdaeb51154ae8fded2975ce9308d WHIRLPOOL 03362651fef21667327acc1dccddcb93b5b97bd10d1c3e5d080946e48cd56d615654543a558b11c01b4d12a85c71283fc2a8c9d5d527f78be9481f6a79e39495
 EBUILD glib-perl-1.325.0.ebuild 803 SHA256 1ef9228123fd8d926c41aa732ea7be6743b380c4275ccdefcbe5a89dd9742d82 SHA512 711360dd3a41428a8c1f084d6dfaa345da8f04642ec6ae2f2560886a2da34c92f8dd48cba568a851bdd155b4fa4da39f8af3ed60f9fa249676b7970bb747382d WHIRLPOOL 71dd0a8bc0a0d5400c7c2eee0c2221ab6e9722536847d4e7fa92b15deffa5ac39e88ec5c5d132c0d3a826b276b4003bdef5d79f447aa006eca91a98773efe261
+EBUILD glib-perl-1.326.0.ebuild 812 SHA256 e7bc56f6c0a7f7370cbee875646d6f104853adc7922693c3ca7a65c4253702c5 SHA512 9d18cfdab4788c7cc71e007fe85d7a1911f0f57882cd7164af291b140562b682c3c5721177b274dfa8e807dc2abde0fe4558e031787b0f4de55938bd64f04de5 WHIRLPOOL 3be61ea4a46565a0036ad1c3469b9c4f823a5069d55b2b3d343befd835c8941af158e00a69ec5017270506b1c0eee63e3fa3b53263431002dfc35c04aefebfc0
 MISC ChangeLog 5610 SHA256 7fbf3e21c14baf204c80838657e8ff531e49efc662a4cb38de53d57bef23d560 SHA512 e967421be9367e6d2ba5850e4482615683470a2eb8b0800f8fd5385a503885b44af14b99b3ef9cb87df9c4a32d70cb20cb28aba8298147e1a5fb8d51170fd97d WHIRLPOOL 67f79e13fc526c44414ba42245d3558e97ce83c4e4d74276358f1970a45eed3b7b609bbe909d05165d84d6f394c5040134c4a0214843612e2d275a017bda4c23
 MISC ChangeLog-2015 21724 SHA256 822ebcd3decee2d23473efc0d14629733746635f077866e24d806bfea133492b SHA512 55ca92af5e3a03cbc9c7999d038d3664b8a92a2b0e0dbce4b8a1415b8f8ecad0f42a3bdf83a76d17540874aece92cba2a7b3485b35a5d40ddfcd9eb9dba73b2f WHIRLPOOL 4d9b36ff7df67b6ed5a47cb22e95b5ee2314a130ca190e40ccafe5b07e61f07035e7439a5198261840a0150e4f306262da27501e65a91d7c0f190e1cbaa8a0bc
 MISC metadata.xml 1365 SHA256 e19e86eb2ea94f838b079938f35b9d6ca84e615f525d4610f99bacd8a507a034 SHA512 0432b79471db1629a75a8d8cbdec17adf89388466e213f1525cb571504d97bb844edc5191c8695d8616d659e8f99619dd0357d86d00206ae345045feff3cad5e WHIRLPOOL 8839764b9b4f412a46bb3a7c87afd07e92b1a1cbb09060f6769b236cbcc6f622b0125c76a1960f1ab26595a72ab6809d6edc83bbcc1063d21505dfb69c2b131a
diff --git a/dev-perl/glib-perl/glib-perl-1.326.0.ebuild b/dev-perl/glib-perl/glib-perl-1.326.0.ebuild
new file mode 100644
index 000000000000..eb2d95e91890
--- /dev/null
+++ b/dev-perl/glib-perl/glib-perl-1.326.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_NAME=Glib
+DIST_AUTHOR=XAOC
+DIST_VERSION=1.326
+inherit perl-module
+
+DESCRIPTION="Glib - Perl wrappers for the GLib utility and Object libraries"
+HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2
+"
+# Log::Agent optional by Storable but has caused unexplained segv's
+# from build/doc.pl : https://bugs.gentoo.org/529080
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	>=dev-perl/ExtUtils-Depends-0.300.0
+	>=dev-perl/ExtUtils-PkgConfig-1.0.0
+	virtual/pkgconfig
+	dev-perl/Log-Agent
+"
diff --git a/dev-perl/gnome2-canvas/Manifest b/dev-perl/gnome2-canvas/Manifest
index 47b773ff2d92..dd81315f1a96 100644
--- a/dev-perl/gnome2-canvas/Manifest
+++ b/dev-perl/gnome2-canvas/Manifest
@@ -1,5 +1,6 @@
 DIST Gnome2-Canvas-1.002.tar.gz 62040 SHA256 47a34204cd5f3a0ef5c8b9e1c9c96f41740edab7e9abf1d0560fa8666ba1916e SHA512 9ad7e5b5a29b1b90cecca56c63165b92ad607a6f6e260810c597081a77a282910e85d372271d2f4e299e8e0728b79733f39439e3927237a92b16251d7004db89 WHIRLPOOL 73e9d01a936623120796325978ec254c4a21558ec21f5290227447f7adb997b10c0fd0f2954fc6ac1f7acde9dd9e0af461834d4ce9b509be95fb2976e42a023a
 EBUILD gnome2-canvas-1.2.0-r1.ebuild 543 SHA256 2dc166c33003077c950eeed46dc127e56cc0904702d78ef8fb5c9a3baf21a0ce SHA512 65c71c5d62b5dd7ba420c9a1df232e0876ff3e25b55fa568243896b17967b8341444b1a9a707bc091dabd6a5cbf8bd74c1132934662c81891c70f21d0765067f WHIRLPOOL e43a7faadfecc2d9f861f18dfb81413cbd21d13c5be070a5006664753a1b9c3e75a57d113a4ea31780017673c0082d5060cb7d62e79b38ec998260b5456c8ffc
+EBUILD gnome2-canvas-1.2.0-r2.ebuild 635 SHA256 021aa421c271d4dc0dc2be9c273575d23e05a10f9cb55cfe5b3e999b16e4ef31 SHA512 86689432f439201ac19a1a879480259590c38c653820279206abe5096bdd1e0d90140ee217060db0461e2ce8b66550c1f60e71fbd74f3af4b5e482cbf1430db3 WHIRLPOOL 0429e6289c1ff0b0b6261c003716a6339afb49cb246898ad683f9472376af2de821874d007fd5111e7341e8b7cfb8c9bcb8261d9752ebcb4736464c649e83f48
 MISC ChangeLog 2606 SHA256 5dcea8ce1cce97d42d627d9e7a2c6a65a6eeb44c2913561bbbcfac4e5a73f6c2 SHA512 33ee3f977da064494dfa633857fcc10fa0a356531edee101e123e7879c1a875a644409b15e9a21dd3942eeddc38acb5b6abb17765ada96e8d78fa240969f349b WHIRLPOOL 06e12a96744e015c64155d682e6f9744d92c08129a43bc71fe615276fc24cc93f856249812f64bff0c8c65db7076b365bd3d3a81662e4afcf83515da52925e30
 MISC ChangeLog-2015 5475 SHA256 be462604173bd0f1bf840964a70e532cac68c3318daab7b8a6868ada40cab3a1 SHA512 9b6b85a898a845bb5000e70dafb86651e56bb9aea683d0633332e66ba71194239121682326b4d4680b9afd341a39fd7af28c24f5b576f3f06655154076ca6782 WHIRLPOOL bd4df99c59946d02900d604ce0073ae9fef3bde8e13347420efbbdeb58c80229b21896b45dcc70df3d6c12d9b3d1fe2881053ac8eb7ee69a6c84acf43e816734
 MISC metadata.xml 398 SHA256 ec0ccc8a79bb114980f5047369e81444622b49abc34a8bea5505d75c8590ecd0 SHA512 2b1cb0e49c2443443b77970bf702000a9fa02199a3da13968f5bda7385dfa529ced38df17b125f448ce1741d15085254d77c2ab9438818dddcbaa6b1cbb6968d WHIRLPOOL 18ee070f631054e8fe72e9a30448320dd68e8859cc9f4fbe30b3b227fc9c6f552720c501b7469086fa70b63be3c6837c7a7d53b996139dcc2e1585e4b1af3cf2
diff --git a/dev-perl/gnome2-canvas/gnome2-canvas-1.2.0-r2.ebuild b/dev-perl/gnome2-canvas/gnome2-canvas-1.2.0-r2.ebuild
new file mode 100644
index 000000000000..9c31f14c1de5
--- /dev/null
+++ b/dev-perl/gnome2-canvas/gnome2-canvas-1.2.0-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_NAME=Gnome2-Canvas
+DIST_AUTHOR=TSCH
+DIST_VERSION=1.002
+DIST_EXAMPLES=( "canvas_demo/*" )
+inherit perl-module virtualx
+
+DESCRIPTION="Perl interface to the Gnome Canvas"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	>=gnome-base/libgnomecanvas-2
+	>=dev-perl/glib-perl-1.040
+	>=dev-perl/Gtk2-1.040"
+DEPEND="${RDEPEND}
+	>=dev-perl/ExtUtils-PkgConfig-1.03
+	>=dev-perl/ExtUtils-Depends-0.202
+	virtual/pkgconfig"
+
+src_test() {
+	virtx perl-module_src_test
+}
diff --git a/dev-perl/gnome2-perl/Manifest b/dev-perl/gnome2-perl/Manifest
index 9a78d047dc3d..61f4a7c2a105 100644
--- a/dev-perl/gnome2-perl/Manifest
+++ b/dev-perl/gnome2-perl/Manifest
@@ -1,5 +1,8 @@
+AUX Gnome2-1.046-no-dot-inc.patch 9535 SHA256 5b261cc1c05a504373427e9757ff05249a922462449af5af91e20f0bf0b6be93 SHA512 0fdf04f1f71cd365197dc2b641fe7102a1639e70679c902d357eb8c0fc3433d37ef1f519f3029c648587795d17849bad2f9d39e510bcb546c856f03880562991 WHIRLPOOL 1432b2c4e58e9719be0279dd9c5b66c73359709862e4694e4933ed485ca3cc705ec4559668aa3a30dee6925992d65c9a65a6735e0ba803cb5281a14409744ae5
 DIST Gnome2-1.045.tar.gz 79262 SHA256 1426044de3ab4900e0a7cb0cc27aa2213c6ad29ed0676b018dce2eee832692f7 SHA512 fa4ac02dbc3d96e6790cff964968f86b9eaf5bb79bbdd2fb3e967e4e8f4bcad25bf1308d25b26ae0298303dfaab7aaa5b49028336d25648614208e622a848316 WHIRLPOOL 54d747c44d06fa7324f3234d9849e400dedd9a0dbfff35834ad754bc74638df83dafd3dca5dab6de13832c533fdd19186765e301d004a03951f4cfad8be2ba6d
+DIST Gnome2-1.046.tar.gz 80275 SHA256 a6c787232ab7e82a423a9ff5a49cec6bf586c1bb3c04c2052a91cdda5b66ae40 SHA512 0e4ee564b4514e63c3b66ef72aad6780e79d0f8d0376d7cbb925c579773d96d5fdf0918c90c0e1cc0f4b0be2c2d0043a54ec700361109c6b4b576627ca1d9efd WHIRLPOOL 3c95937b2f8ecf4bd463490b11445ebbc7ffed6be2c1ddf090ad1dd2219d2d0c87feb3928eb20121e829bae17867ce90e2a12a5af254f934b0e5bbdee2194961
 EBUILD gnome2-perl-1.45.0.ebuild 643 SHA256 82c943a5d3f26ed9c390b46280f8b7baaad0b0609dc42880d224c317ec459857 SHA512 d8ab08447509aab0436b08a0e1f16ef12ce891f5d0515795f7ee26af4a919410d7c225e2cb1e4417c654492c2368cbdfc62acfb765279407c1b4038db9b31aa9 WHIRLPOOL a1e8661c56ee27919363218b5fe827028d3358115ff12c17d315ae79bacab180047fd31f002a7af1ade3d2211d5e0fedc5b86de6365962f57f433121e00c32ff
+EBUILD gnome2-perl-1.46.0.ebuild 706 SHA256 76b9ce0cf43315fee16cdf9270d1d802c24ceddde4c00982a330fd71769d7947 SHA512 ced454d996dcdb5e60fefaa9aad653e10932fd8b08cae300255db1901f9c8084ceedaf4d7edba8fd51ee191829559ed1265dc5247aa724b23611d844534c4679 WHIRLPOOL a2cce061b36e25f91f8e039f7ff6df3fc86024d5b26d49aeda833d2a8abf829626f3c69e734fa522851b072af870243466c060d8910110e79e41cff6883c11d3
 MISC ChangeLog 3978 SHA256 490a3eaa9a2db1bd897bdddfe2e5abfe3db4df2adbb161d1ed82560f7deeed96 SHA512 29e335b617cfefee42fc7ff7606d686764b7ef2f24f6a793643f7d54b90a9702a8714731ab44bd438279501bf059ff0217251a5cf685edd47e9c51a2ce27cd77 WHIRLPOOL 5675942b4eeb003e1dec811e47a94ad3630d694b6860cd57648ef5d89cb4b4545d55bbb769b38c7292a0813e5dfa5d91630614852c71837d6eb895b96ec606cb
 MISC ChangeLog-2015 7637 SHA256 ec615654681559b8ada22c1b2cd3863d99de2006c16e7a53229ca457493aa10c SHA512 5acc975aeec09e071aced91a24494cd36ba8c6a80778c8fa12d5c1f09303ee5371fbee3f4b124c4c46c39fa4387d374e0b813c8ce7b8d695f97a572399afd12a WHIRLPOOL d6c14acfbba04481c6b64a62df8a109dab6c06c93d42ac624fee23d3a17f71ddb38e014564e896f21265e6ee8d03f1fd6cdd8d119ef078ec29a1cb275d05aad7
 MISC metadata.xml 439 SHA256 f0963fcaaaf2b3197c0c76ddd8f4908188994f2eb9b2bc307126b49c6f799974 SHA512 34ba638f9c96d9cec2036725b71c7604e78ad8fdc6057a5f21bacd86422a3c51420146fc8f756071c34e3b5e654da280096c9c0afb86f808fff5f8b1ce84cea6 WHIRLPOOL c55f477f5d2d5b1bf301d3b7f30e365e68367800520fbd3b0b42851ce3c5011c6d2ba64f4ef4f8ba11b6bd33937f6d6fe23d487103568b2c549347f34765116e
diff --git a/dev-perl/gnome2-perl/files/Gnome2-1.046-no-dot-inc.patch b/dev-perl/gnome2-perl/files/Gnome2-1.046-no-dot-inc.patch
new file mode 100644
index 000000000000..1364a89247eb
--- /dev/null
+++ b/dev-perl/gnome2-perl/files/Gnome2-1.046-no-dot-inc.patch
@@ -0,0 +1,355 @@
+From 6d397faa7006e0f3a67595d317e10d3bb81d8792 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Sun, 22 Oct 2017 18:50:01 +1300
+Subject: Fix tests failing on Perl 5.26 without '.' in @INC
+
+eg: With PERL_USE_UNSAFE_INC=0 in ENV
+
+This patch additionally creates safeguards against tests being allowed
+to continue if the "do" call fails for any reason, as do does not
+auto-fatalize, only warns at best.
+
+Bug: https://rt.cpan.org/Ticket/Display.html?id=121440
+Bug: https://bugs.gentoo.org/616954
+---
+ t/Gnome.t               | 4 +++-
+ t/GnomeApp.t            | 4 +++-
+ t/GnomeAppBar.t         | 4 +++-
+ t/GnomeAppHelper.t      | 4 +++-
+ t/GnomeColorPicker.t    | 4 +++-
+ t/GnomeConfig.t         | 4 +++-
+ t/GnomeDateEdit.t       | 4 +++-
+ t/GnomeDruid.t          | 4 +++-
+ t/GnomeEntry.t          | 4 +++-
+ t/GnomeFileEntry.t      | 4 +++-
+ t/GnomeFontPicker.t     | 4 +++-
+ t/GnomeHRef.t           | 4 +++-
+ t/GnomeIconEntry.t      | 4 +++-
+ t/GnomeIconList.t       | 4 +++-
+ t/GnomeIconSelection.t  | 4 +++-
+ t/GnomeIconTheme.t      | 4 +++-
+ t/GnomePasswordDialog.t | 4 +++-
+ t/GnomePixmapEntry.t    | 4 +++-
+ t/GnomePopupMenu.t      | 4 +++-
+ t/GnomeScores.t         | 4 +++-
+ t/GnomeThumbnail.t      | 4 +++-
+ 21 files changed, 63 insertions(+), 21 deletions(-)
+
+diff --git a/t/Gnome.t b/t/Gnome.t
+index 8b6d0c5..e62b662 100644
+--- a/t/Gnome.t
++++ b/t/Gnome.t
+@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
+ 
+ SKIP: {
+   our $application;
+-  do "t/TestBoilerplate";
++  do "./t/TestBoilerplate";
++  die $@ if $@;
++  die $! if $!;
+ 
+   #############################################################################
+ 
+diff --git a/t/GnomeApp.t b/t/GnomeApp.t
+index d7fc143..49420c3 100644
+--- a/t/GnomeApp.t
++++ b/t/GnomeApp.t
+@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
+ 
+ SKIP: {
+   our $application;
+-  do "t/TestBoilerplate";
++  do "./t/TestBoilerplate";
++  die $@ if $@;
++  die $! if $!;
+ 
+   #############################################################################
+ 
+diff --git a/t/GnomeAppBar.t b/t/GnomeAppBar.t
+index 22ac53d..b127b2c 100644
+--- a/t/GnomeAppBar.t
++++ b/t/GnomeAppBar.t
+@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
+ 
+ SKIP: {
+   our $application;
+-  do "t/TestBoilerplate";
++  do "./t/TestBoilerplate";
++  die $@ if $@;
++  die $! if $!;
+ 
+   #############################################################################
+ 
+diff --git a/t/GnomeAppHelper.t b/t/GnomeAppHelper.t
+index 849bfe7..5ed6350 100644
+--- a/t/GnomeAppHelper.t
++++ b/t/GnomeAppHelper.t
+@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
+ 
+ SKIP: {
+   our $application;
+-  do "t/TestBoilerplate";
++  do "./t/TestBoilerplate";
++  die $@ if $@;
++  die $! if $!;
+ 
+   #############################################################################
+ 
+diff --git a/t/GnomeColorPicker.t b/t/GnomeColorPicker.t
+index 7f7fba9..8dcee3e 100644
+--- a/t/GnomeColorPicker.t
++++ b/t/GnomeColorPicker.t
+@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
+ 
+ SKIP: {
+   our $application;
+-  do "t/TestBoilerplate";
++  do "./t/TestBoilerplate";
++  die $@ if $@;
++  die $! if $!;
+ 
+   #############################################################################
+ 
+diff --git a/t/GnomeConfig.t b/t/GnomeConfig.t
+index 2c42a14..24973be 100644
+--- a/t/GnomeConfig.t
++++ b/t/GnomeConfig.t
+@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
+ 
+ SKIP: {
+   our $application;
+-  do "t/TestBoilerplate";
++  do "./t/TestBoilerplate";
++  die $@ if $@;
++  die $! if $!;
+ 
+   #############################################################################
+ 
+diff --git a/t/GnomeDateEdit.t b/t/GnomeDateEdit.t
+index a8f2e33..addd98d 100644
+--- a/t/GnomeDateEdit.t
++++ b/t/GnomeDateEdit.t
+@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
+ 
+ SKIP: {
+   our $application;
+-  do "t/TestBoilerplate";
++  do "./t/TestBoilerplate";
++  die $@ if $@;
++  die $! if $!;
+ 
+   #############################################################################
+ 
+diff --git a/t/GnomeDruid.t b/t/GnomeDruid.t
+index c209004..21a9fdd 100644
+--- a/t/GnomeDruid.t
++++ b/t/GnomeDruid.t
+@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
+ 
+ SKIP: {
+   our $application;
+-  do "t/TestBoilerplate";
++  do "./t/TestBoilerplate";
++  die $@ if $@;
++  die $! if $!;
+ 
+   #############################################################################
+ 
+diff --git a/t/GnomeEntry.t b/t/GnomeEntry.t
+index c2d2b68..a0aa95a 100644
+--- a/t/GnomeEntry.t
++++ b/t/GnomeEntry.t
+@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
+ 
+ SKIP: {
+   our $application;
+-  do "t/TestBoilerplate";
++  do "./t/TestBoilerplate";
++  die $@ if $@;
++  die $! if $!;
+ 
+   #############################################################################
+ 
+diff --git a/t/GnomeFileEntry.t b/t/GnomeFileEntry.t
+index 91befa8..1d572a9 100644
+--- a/t/GnomeFileEntry.t
++++ b/t/GnomeFileEntry.t
+@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
+ 
+ SKIP: {
+   our $application;
+-  do "t/TestBoilerplate";
++  do "./t/TestBoilerplate";
++  die $@ if $@;
++  die $! if $!;
+ 
+   #############################################################################
+ 
+diff --git a/t/GnomeFontPicker.t b/t/GnomeFontPicker.t
+index a2e8e68..98520db 100644
+--- a/t/GnomeFontPicker.t
++++ b/t/GnomeFontPicker.t
+@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
+ 
+ SKIP: {
+   our $application;
+-  do "t/TestBoilerplate";
++  do "./t/TestBoilerplate";
++  die $@ if $@;
++  die $! if $!;
+ 
+   #############################################################################
+ 
+diff --git a/t/GnomeHRef.t b/t/GnomeHRef.t
+index 256347b..484fa61 100644
+--- a/t/GnomeHRef.t
++++ b/t/GnomeHRef.t
+@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
+ 
+ SKIP: {
+   our $application;
+-  do "t/TestBoilerplate";
++  do "./t/TestBoilerplate";
++  die $@ if $@;
++  die $! if $!;
+ 
+   #############################################################################
+ 
+diff --git a/t/GnomeIconEntry.t b/t/GnomeIconEntry.t
+index 35ef1e6..957efc0 100644
+--- a/t/GnomeIconEntry.t
++++ b/t/GnomeIconEntry.t
+@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
+ 
+ SKIP: {
+   our $application;
+-  do "t/TestBoilerplate";
++  do "./t/TestBoilerplate";
++  die $@ if $@;
++  die $! if $!;
+ 
+   #############################################################################
+ 
+diff --git a/t/GnomeIconList.t b/t/GnomeIconList.t
+index 2bf9eb1..8067a70 100644
+--- a/t/GnomeIconList.t
++++ b/t/GnomeIconList.t
+@@ -11,7 +11,9 @@ use Test::More skip_all => "Seems to be broken", tests => TESTS;
+ 
+ SKIP: {
+   our $application;
+-  do "t/TestBoilerplate";
++  do "./t/TestBoilerplate";
++  die $@ if $@;
++  die $! if $!;
+ 
+   #############################################################################
+ 
+diff --git a/t/GnomeIconSelection.t b/t/GnomeIconSelection.t
+index 35117c9..566ae85 100644
+--- a/t/GnomeIconSelection.t
++++ b/t/GnomeIconSelection.t
+@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
+ 
+ SKIP: {
+   our $application;
+-  do "t/TestBoilerplate";
++  do "./t/TestBoilerplate";
++  die $@ if $@;
++  die $! if $!;
+ 
+   #############################################################################
+ 
+diff --git a/t/GnomeIconTheme.t b/t/GnomeIconTheme.t
+index 9baeb4c..dda3582 100644
+--- a/t/GnomeIconTheme.t
++++ b/t/GnomeIconTheme.t
+@@ -13,7 +13,9 @@ Gnome2::VFS -> init();
+ 
+ SKIP: {
+   our $application;
+-  do "t/TestBoilerplate";
++  do "./t/TestBoilerplate";
++  die $@ if $@;
++  die $! if $!;
+ 
+   skip("GnomeIconTheme is new in 2.0.6", TESTS)
+     unless (Gnome2 -> CHECK_VERSION(2, 0, 6));
+diff --git a/t/GnomePasswordDialog.t b/t/GnomePasswordDialog.t
+index 51c548c..38b2dcb 100644
+--- a/t/GnomePasswordDialog.t
++++ b/t/GnomePasswordDialog.t
+@@ -10,7 +10,9 @@ use Test::More tests => TESTS;
+ ###############################################################################
+ 
+ SKIP: {
+-  do "t/TestBoilerplate";
++  do "./t/TestBoilerplate";
++  die $@ if $@;
++  die $! if $!;
+ 
+   skip("GnomePasswordDialog and GnomeAuthenticationManager didn't appear until 2.4.0", TESTS)
+     unless (Gnome2 -> CHECK_VERSION(2, 4, 0));
+diff --git a/t/GnomePixmapEntry.t b/t/GnomePixmapEntry.t
+index 17e4996..dbfe42c 100644
+--- a/t/GnomePixmapEntry.t
++++ b/t/GnomePixmapEntry.t
+@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
+ 
+ SKIP: {
+   our $application;
+-  do "t/TestBoilerplate";
++  do "./t/TestBoilerplate";
++  die $@ if $@;
++  die $! if $!;
+ 
+   #############################################################################
+ 
+diff --git a/t/GnomePopupMenu.t b/t/GnomePopupMenu.t
+index 20275c9..151f410 100644
+--- a/t/GnomePopupMenu.t
++++ b/t/GnomePopupMenu.t
+@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
+ 
+ SKIP: {
+   our $application;
+-  do "t/TestBoilerplate";
++  do "./t/TestBoilerplate";
++  die $@ if $@;
++  die $! if $!;
+ 
+   #############################################################################
+ 
+diff --git a/t/GnomeScores.t b/t/GnomeScores.t
+index 1b21ab2..82aa3a3 100644
+--- a/t/GnomeScores.t
++++ b/t/GnomeScores.t
+@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
+ 
+ SKIP: {
+   our $application;
+-  do "t/TestBoilerplate";
++  do "./t/TestBoilerplate";
++  die $@ if $@;
++  die $! if $!;
+ 
+   #############################################################################
+ 
+diff --git a/t/GnomeThumbnail.t b/t/GnomeThumbnail.t
+index ec0095f..ba24928 100644
+--- a/t/GnomeThumbnail.t
++++ b/t/GnomeThumbnail.t
+@@ -11,7 +11,9 @@ use Test::More tests => TESTS;
+ 
+ SKIP: {
+   our $application;
+-  do "t/TestBoilerplate";
++  do "./t/TestBoilerplate";
++  die $@ if $@;
++  die $! if $!;
+ 
+   skip("GnomeThumbnail is new in 2.0.6", 4)
+     unless (Gnome2 -> CHECK_VERSION(2, 0, 6));
+-- 
+2.14.2
+
diff --git a/dev-perl/gnome2-perl/gnome2-perl-1.46.0.ebuild b/dev-perl/gnome2-perl/gnome2-perl-1.46.0.ebuild
new file mode 100644
index 000000000000..b95f0acf28ae
--- /dev/null
+++ b/dev-perl/gnome2-perl/gnome2-perl-1.46.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_NAME=Gnome2
+DIST_AUTHOR=XAOC
+DIST_VERSION=1.046
+inherit perl-module
+
+DESCRIPTION="Perl interface to the 2.x series of the Gnome libraries"
+HOMEPAGE="http://gtk2-perl.sourceforge.net/ ${HOMEPAGE}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	dev-perl/Gtk2
+	gnome-base/libgnomeui
+	gnome-base/libbonoboui
+	dev-perl/gnome2-canvas
+	>=dev-perl/glib-perl-1.40.0
+	dev-perl/gnome2-vfs-perl"
+DEPEND="${RDEPEND}
+	dev-perl/ExtUtils-Depends
+	dev-perl/ExtUtils-PkgConfig"
+
+PATCHES=( "${FILESDIR}/${DIST_NAME}-${DIST_VERSION}-no-dot-inc.patch" )
diff --git a/dev-perl/gnome2-wnck/Manifest b/dev-perl/gnome2-wnck/Manifest
index e355e203ced2..d87882ac40d6 100644
--- a/dev-perl/gnome2-wnck/Manifest
+++ b/dev-perl/gnome2-wnck/Manifest
@@ -1,5 +1,6 @@
 DIST Gnome2-Wnck-0.16.tar.gz 24865 SHA256 604a8ece88ac29f132d59b0caac27657ec31371c1606a4698a2160e88ac586e5 SHA512 d8ed39cd19ccaeb5995d97b392d1cc97fe0c9bb66781efb70d6160f50a212e263be3bb89c33ca1ff0ed3da3c55fd9968fa4026abcf8593996760831164acd00a WHIRLPOOL 3330351c6c9b46bbf442db71fe639e982ebc2fa708ca9dd718cbf752d4924b7d4e113ed7d657d47cdbe136318ce87b157864ec77df1eb78927c7cb09327ec9af
 EBUILD gnome2-wnck-0.160.0-r1.ebuild 564 SHA256 99ee0e2caff1770483cfe4ae48ed28ced2d93e85466fd32772793edc25eff1d3 SHA512 e74f566f92773b7177fc1bc10ed0ac66b1fa492a01094c5a213d8def79a9be12afd8427b7c00b0d0e20fa78b9794330beb058b757182fe1a8288c1ee5714119b WHIRLPOOL d6cd7092ee8900d334d049350c7035db9a660d13f86bc83fe3741c498843933bd42525ac59e98367bb1ae68aa341b421122c68367571b13cf79fa5f0597a9fd6
+EBUILD gnome2-wnck-0.160.0-r2.ebuild 653 SHA256 d69b3265d0dd626b82b696c6fb1504c169f7e738bbd63248b86842b67fd60eed SHA512 fa944932e98a0607490e2d5a96ebfcc283b3ac6f5261e31cf077c81d0e016a3fa356e97064d7ff0587d8d337668a87412e996ffe07027674e3c7e4b9025634e0 WHIRLPOOL f421c6259ae4e7abe1ad548786a92d6f9f394a65b1cf40f34bd3a578847809c1e8a145df8eaafba3e094be2106aa9c5e4178218872ce2b205c180496a3c362b1
 MISC ChangeLog 3150 SHA256 fd5978eda6e67bbcc51d8904987cbb41b30417be7819141288bf6a04f3e50853 SHA512 a51d1a1c8bbdf917101fde6f5884e5a05e7e15c5ad1937315dcdb4db1f4b321311b0026f3b92fa6272cb4e543ae64c46110db1443db6b5fcc65561d4e5efa4d2 WHIRLPOOL 88c3b94fe817914b3230cb46234d1c23cf8fa66bdcc2c71cb8a2bdddfc1e791e5bd4bfb1e36fb0d9c5532614824d8c528579e595dbdb5a633c476bb9a18ac73b
 MISC ChangeLog-2015 7840 SHA256 12e1af3b691b3e0917e6a3d98bd02731b8e34586054484fa099d6988428dbb45 SHA512 cc8ae451ac48036608f2e8a7b5cb20f4284c6137cdc9bb9f58dfae84a9171d13ce0ba1e1c8288da60f55955de45112893388e19052912ef80a086299e142b54c WHIRLPOOL ddba5b8fe1ca3d1b23e5d9306629004392c5d0337ad9bfe2ddd96b533b390d665c12cd167460e130e68c2aa72bd58dbbaa31a5d57a90789ed8bcd8b51ea2139e
 MISC metadata.xml 450 SHA256 c09c49aa5795f38aead07845b449642e9c6acac0fdce3502470499aa3b822384 SHA512 d4c40c7e5d46352fcffb3c1816df6675816f4469b39281648621526bc45ce47bc2de25eb0416f31eabe29ae4509253eb22fc83d7c18a68a5b2b75da6649840aa WHIRLPOOL 2febc672852d61beb400cd7accb0b36dbad87972a454272ed885b9004bfe1fa46fb57c0a67e832431e9f7ef95a7e946a053f25ff2197c0020cdf9b4ae150f29b
diff --git a/dev-perl/gnome2-wnck/gnome2-wnck-0.160.0-r2.ebuild b/dev-perl/gnome2-wnck/gnome2-wnck-0.160.0-r2.ebuild
new file mode 100644
index 000000000000..294a94659e89
--- /dev/null
+++ b/dev-perl/gnome2-wnck/gnome2-wnck-0.160.0-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_NAME=Gnome2-Wnck
+DIST_AUTHOR=TSCH
+DIST_VERSION=0.16
+
+inherit perl-module virtualx
+
+DESCRIPTION="Perl interface to the Window Navigator Construction Kit"
+HOMEPAGE="http://gtk2-perl.sourceforge.net/ ${HOMEPAGE}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-perl/glib-perl-1.180.0
+	>=dev-perl/Gtk2-1.42.0
+	>=x11-libs/libwnck-2.20:1"
+DEPEND="${RDEPEND}
+	>=dev-perl/ExtUtils-PkgConfig-1.03
+	>=dev-perl/ExtUtils-Depends-0.2"
+
+src_test() {
+	perl_rm_files t/WnckWorkspace.t
+	virtx perl-module_src_test
+}
diff --git a/dev-perl/gtk2-gladexml/Manifest b/dev-perl/gtk2-gladexml/Manifest
index 03d2c751c2d6..3b3ee4657629 100644
--- a/dev-perl/gtk2-gladexml/Manifest
+++ b/dev-perl/gtk2-gladexml/Manifest
@@ -1,5 +1,6 @@
 DIST Gtk2-GladeXML-1.007.tar.gz 38496 SHA256 50240a2bddbda807c8f8070de941823b7bf3d288a13be6d0d6563320b42c445a SHA512 e40b859e76f99c5c9497e0c123679c916b3f5615aaeb208f56a9a4758a2a8a5d5078d4bf7b441ffc6080162a04bb146739457bbd71e4a443a2d092ddbb1ed94f WHIRLPOOL 0f4fbb0e59de53adeba6bd818f6ebf5ef2e9015cccb69be7ffe8f9889890a9c5bb4056e921278e3c9ba583f24e82e4dd59f1429e0d61c937570f488a4866e624
 EBUILD gtk2-gladexml-1.7.0-r1.ebuild 571 SHA256 34dd78b8bb82971f1f9e18f9c35602cfb0d631c37338a3abbc1a9e1346f530a6 SHA512 c55b57c31178e2ae8940be7b1294f4a327b9377e7d2614d2ad158871b024e56c6b8eef1e9c6582a775b69dc1c4884f45161b929e366ce67b4347cf3ae0b65305 WHIRLPOOL 3741e5263ec3c6c5aa42fc7e0c41086b9d8d75cd8c890cf2d2c34fc2adfd3dbff79b6a941b03fdcdc153219b3b71b5130ec95c11d4b089bd2960b50b528c214a
+EBUILD gtk2-gladexml-1.7.0-r2.ebuild 658 SHA256 d818981b4bf3f998deb22cf54649fe3aec83f13ecbb7ac437aa47aa9bf6bbe0f SHA512 b9d2a0a6f65df783c01cd191f521597f6875b3cb26b4791d8fc4efe5ce0a9b340af54f6c7a46b4990925e88cb01765b353bdb860874006fe0de816f1354e3235 WHIRLPOOL 3668134ac0c9ce6f34bea4405fc9424bc08dabdf8e637a36fc0eb9dc63da43dbc7d9e83ceb5a7a0ae3ea7d6922b9a7305c6f3f00f68830121ee43146e4f704c8
 MISC ChangeLog 2606 SHA256 3ba617bebd992458dcc4f292a27ad172d4576d7766f70746889d4c671b6c2ca3 SHA512 6d88bbe30d5d4c60f73bc0c28711605c74fbf38633e69dbee3f1d816fc99ed0243296b6a70f5be16dedb518b6b7fb1843846e3ba4ec40a00638f07385b3195f4 WHIRLPOOL 384b2b7cec410048f83ee79bedbfb07611c4c1d5c2022e3a8c1c8b7965ba69ad2e3dc0445ba15aa9450ea4ee009a4003fdfcb32d68ac9eceed294056ead39ff3
 MISC ChangeLog-2015 7156 SHA256 690fe6c00098e3fcd1734b2335cdf7c6af27ed2ab15d7fa0e793ba20afcce20f SHA512 213f8a82b837e5d843b702c8fb152aafafc5ee4d4e120ef03010d8079f6993e9d288c900728455dc890d18be2de7c6edef62cac8b05e43133118719d12822b67 WHIRLPOOL fef05a3675be0dfc297c157d54d565526601f76053e333356ee0bb7ef1a5a92e30ce21c326a87360205f832018505459c176d43c2db9e83b49abeb972684d393
 MISC metadata.xml 398 SHA256 5c64bc53b467224cac651e9d0cb8dec787a46afe63843cecdbcbb7ffba597c7e SHA512 f2a4335f43f2e5e6951f79ed31bcedacd0b4728670a0b223705cc78a95c9c2e984b314c6af14c8642ee2de86d1f9d67468aafe7410b8b3b1b126ad97bf2e5bc5 WHIRLPOOL 8cf3ec7c18d823ecb22f4f0140640f86421eaf5791136906a614f70a020be233847f579292e7bc00d55788014d317e2ae2828b97a88dddd1451aef8224f4156a
diff --git a/dev-perl/gtk2-gladexml/gtk2-gladexml-1.7.0-r2.ebuild b/dev-perl/gtk2-gladexml/gtk2-gladexml-1.7.0-r2.ebuild
new file mode 100644
index 000000000000..9a671bdc4849
--- /dev/null
+++ b/dev-perl/gtk2-gladexml/gtk2-gladexml-1.7.0-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_NAME=Gtk2-GladeXML
+DIST_AUTHOR=TSCH
+DIST_VERSION=1.007
+DIST_EXAMPLES=("examples/*")
+inherit perl-module virtualx
+
+DESCRIPTION="Create user interfaces directly from Glade XML files"
+HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
+
+SLOT="0"
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	gnome-base/libglade:2.0
+	>=dev-perl/glib-perl-1.020
+	>=dev-perl/Gtk2-1.012"
+DEPEND="${RDEPEND}
+	>=dev-perl/ExtUtils-Depends-0.300
+	dev-perl/ExtUtils-PkgConfig"
+
+src_test() {
+	virtx perl-module_src_test
+}
diff --git a/dev-perl/gtk2-spell/Manifest b/dev-perl/gtk2-spell/Manifest
index f81566cb9baa..6f9e8f5a7547 100644
--- a/dev-perl/gtk2-spell/Manifest
+++ b/dev-perl/gtk2-spell/Manifest
@@ -1,5 +1,6 @@
 DIST Gtk2-Spell-1.04.tar.gz 17512 SHA256 33017b5f510020f0a04cfcc9dfe149db2e613369506df3a2961a5b0fb21b3911 SHA512 b0f71158e56efe561e9999066e896c92b90e9b046e6193fe0b96b4b8fbd4d10d9fc906b9313b4c5c5fbc93cdd33b710eea3170a9677bcdea46fa22032d19b960 WHIRLPOOL e29a07ebc8ba543e60d82a90336ed10984fe33582dd9a52b5a1a0f61a04645a77a994b966ee2688f934e4675a8cb5e15aed3208b8ab7a2b1409b54c21a4688fd
 EBUILD gtk2-spell-1.40.0-r1.ebuild 598 SHA256 8499d8ddefb003a2ae20dfa10c808a43e6eee14237ca00c48e0afae0704de083 SHA512 3b8d23c6fa2e470f1c72b8b0c5981e9d27d79273bede31a66bd3b99a5d71f0f839a880d9af9ff198fe889e47b63bd6825e0b822e876b0c8534e19c1a4cfa6c3a WHIRLPOOL 04806518e89ce1c11768f340123dbaccc34fe581d5d1464ce9e92d56b6e2b967ff497b6b91e80da0dcf9da8f69177c5648962dd25bcf0ce2eaf3335850bc0ada
+EBUILD gtk2-spell-1.40.0-r2.ebuild 653 SHA256 50b598dfc6156809c07473be4eaf8e2be9b9d013bac090e71ccfe7be7784d82a SHA512 5cc1dedd1f811b41b3dd0a043de61bdb4e602790249429fb18df69ebad48d4626d63f430343a91eb59b6ff132aa1881733d0e8999cfefc4c6af820894f444e43 WHIRLPOOL f3745e19170034cd4abd94af836368cb7bab8aeaeec1bc2144a2792061fe9bf0c1b3387bd42a2f4f24bd16689315f2c56735e066638d8eaf5b2a599d02129f1c
 MISC ChangeLog 2597 SHA256 b174d9100f47f21d000148adb4d7c419891ba48426cbfd489710438d4b8f727e SHA512 38e36f25e2ea05f9a3c25fe2f644d2a9977054ac622dc3eed1b34ad55be465b99e2a657aaea798e02cc7c9ee2f7a1572219faef503cfeaedfd3c43b7b6850a85 WHIRLPOOL da0e2f2048b90cf034bec580ba72634a3d51322f1d1236b569051211198526eadece39aa1f464e39f09979e909f79cf3bc75f418bbb3e5cd19b8cacf97b8b0be
 MISC ChangeLog-2015 4380 SHA256 8b9dbd298358edc4a697441efb9fba1df26b76c2eb6a55dc95934b5b700e7dc4 SHA512 6f7bb16212ef95d23cb45de8fe0755cdb9c28baa37cb6f0bf8e433ca51eb9c4cc9f804655ee097248619cf50339addcc40131c22075dbbd1bf754ae5f244bd18 WHIRLPOOL 6f84da93e8b79094a3f60686be235d5d97793bb7693d6118e1d70db79c37ad27971480054f2ae134f2f0d71e2ba9efc3fb3ca464cfe3dfeac87e8a48f8c5253f
 MISC metadata.xml 392 SHA256 01e40257a82cbaf2b9a599b97123ea3b207027bd6697611aefa76371f21d2c25 SHA512 7998a8bc4adf67707626dcd9a388c12da013c787b2856c69a3178bd0472778b4cccb4d5df1d23d85413931feddc43b21febc6746d1e59abf84a8e19aed5d22b5 WHIRLPOOL 17c673b421f42f46a4f1d2e2da9b8000224de274ed9c1d8390efca5fe450a446d205b44b1002fccf611ef0b43179bd86c31f6a222484289f15462823ab5933ca
diff --git a/dev-perl/gtk2-spell/gtk2-spell-1.40.0-r2.ebuild b/dev-perl/gtk2-spell/gtk2-spell-1.40.0-r2.ebuild
new file mode 100644
index 000000000000..224a3df7ccad
--- /dev/null
+++ b/dev-perl/gtk2-spell/gtk2-spell-1.40.0-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_NAME=Gtk2-Spell
+DIST_AUTHOR=TSCH
+DIST_VERSION=1.04
+inherit perl-module virtualx
+
+DESCRIPTION="Bindings for GtkSpell with Gtk2.x"
+HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	x11-libs/gtk+:2
+	>=app-text/gtkspell-2:2
+	>=dev-perl/glib-perl-1.240.0
+	>=dev-perl/Gtk2-1.012
+"
+DEPEND="${RDEPEND}
+	dev-perl/ExtUtils-Depends
+	dev-perl/ExtUtils-PkgConfig
+	virtual/pkgconfig
+"
+src_test() {
+	virtx perl-module_src_test
+}
diff --git a/dev-perl/gtk2-trayicon/Manifest b/dev-perl/gtk2-trayicon/Manifest
index eab42c14cf5c..9edcd5cb0134 100644
--- a/dev-perl/gtk2-trayicon/Manifest
+++ b/dev-perl/gtk2-trayicon/Manifest
@@ -1,5 +1,6 @@
 DIST Gtk2-TrayIcon-0.06.tar.gz 9576 SHA256 cbb7632b75d7f41554dfe8ee9063dbfd1d8522291077c65d0d82e9ceb5e94ae2 SHA512 a74e6e3fa974d11e1bd9b07cb3ce4547d9239cfee6b46e1fb07a2b57c673154802a1f784f5f5f5b0c50baa357320483f6afadec222683e7e08d49ab0f11557e5 WHIRLPOOL 9e92b6f2db6b828ba3800176e52dede5e582b384223b14dcc12000bd301dcc59d997b6124e09ce181bd9f95685777fb6714dfb8b823381e2829cebf0fa0b89f8
 EBUILD gtk2-trayicon-0.60.0-r1.ebuild 587 SHA256 7bdacbf57bbea126595a8dff8ca24f7ebb94d3ab20ea536ba8f4fd74422fca50 SHA512 499373700fbfa37d0f1976493c81ee6e1306640db8859cdfead9a805c7ce1df536ce67f5fd89b46e89aa252828fcfaf1d652299b7eef4f8be3dc6af74aa4f36d WHIRLPOOL c0f477cdf740b0b45de264ed3f8857ab3935a96279880eccb788ac7ab00580cf9d93da0425f716edb2b662a6622040ee7af000d3cee375df0abf1e7a026ad5db
+EBUILD gtk2-trayicon-0.60.0-r2.ebuild 672 SHA256 53ab851345e8d25fa2e19d86e30c44bd212fc0e2920a621c401a1cb13c9414d4 SHA512 ba88e6bcd0cad672dc64473385dfebc7c913c29afb5cee9f34c954e21fb2ce5a51602f4201dd06b3fee82235ac2f9e4ec3a827bd4f38c283d3d38a21163b5048 WHIRLPOOL 10740689e11dca60adfdb1158da799b0e1a9dd35320299b1155aa080662436f7eadf0e65065dcde096b72234bd02035c32b661489428ac9d87c5e957c5be64f1
 MISC ChangeLog 2611 SHA256 3cb02ba2bdbc24e21f5fcbe31ba0b03a72d3f9db418b4b686a3b314dce4b02c6 SHA512 e2952cbde647e8f143ddff00d9bcbc829d44549151fae6fe4e719d985c11a26b209bacb0ba7f06fe3513cd263f9c47b27123ffa42d4dd08073be26347a7534a8 WHIRLPOOL ec34a8c63d97c6a49b64bae4c760bb349e4e2325b8608da5ee0bf2c644ef6c13eb54ae032c5d4d04e85c4b7dac44f70dca21c890a0009b3b891f6f20896c20d3
 MISC ChangeLog-2015 3351 SHA256 12d2fb1ddd7bd499792bf12b66a83a12bd13b519716037957c1516baed545e4d SHA512 4c375913c4348124148738a41eb82c654e229715cdafd92acf202026494999a5070764e0ae5854136f1cc528ebfe10f00919ce7d29ef780789d5446423862716 WHIRLPOOL b57d49969c6bf8cb7bf9703f79a093911892625f96f2a3e7fc988fec9d3aa55bedff2dff2d6fa849cf8bfa7efc6857e6d63ae402a5c71da409d8ad2f0fcd43b0
 MISC metadata.xml 398 SHA256 1e61e7fa67aaf645fe264e3130cec525392674120ea8fec927088a18e534b734 SHA512 77ac08a1c26b6613467486fced5e3486687d7a65573ce15704cc5bbc04bdf102f3b2d15804c9e543aee5d753289093b1a05bf388a71919377f966562694f85f5 WHIRLPOOL 36fb67fea6dc1ba54d61312557debe7a6fba1f2da8a7460589971f569700feeb5df899222bc9987ac50949447275fea36524e3b9301b74256eff8f11fccb0b9a
diff --git a/dev-perl/gtk2-trayicon/gtk2-trayicon-0.60.0-r2.ebuild b/dev-perl/gtk2-trayicon/gtk2-trayicon-0.60.0-r2.ebuild
new file mode 100644
index 000000000000..baa19f488d04
--- /dev/null
+++ b/dev-perl/gtk2-trayicon/gtk2-trayicon-0.60.0-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=BORUP
+DIST_VERSION=0.06
+DIST_NAME=Gtk2-TrayIcon
+DIST_EXAMPLES=("examples/*")
+inherit perl-module virtualx
+
+DESCRIPTION="Perl wrappers for the egg cup Gtk2::TrayIcon utilities"
+HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-perl/glib-perl-1.012
+	>=dev-perl/Gtk2-1.012
+	gnome-base/libglade:2.0
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	dev-perl/ExtUtils-Depends
+	dev-perl/ExtUtils-PkgConfig
+	virtual/pkgconfig"
+
+src_test() {
+	virtx perl-module_src_test
+}
diff --git a/dev-perl/gtk2-traymanager/Manifest b/dev-perl/gtk2-traymanager/Manifest
index 0ad3339abd2d..015abbd100b7 100644
--- a/dev-perl/gtk2-traymanager/Manifest
+++ b/dev-perl/gtk2-traymanager/Manifest
@@ -1,5 +1,6 @@
 DIST Gtk2-TrayManager-0.05.tar.gz 10853 SHA256 43383f9a20b4c255e72a88e732d2b550f21ff9832995797ad15d965d48b43aca SHA512 1f5e70f86f6c46aede939ed1c2412afbc3abb96176c13a953fdaad8110d9a0403d18f27eebe57eeb7d9d9d25c5ddeb7c74f5be9d89ee51a6a156eb9010025f48 WHIRLPOOL cf5b9309b9d1ed8d446a7ecd0804d3b3241f09f67f5990e125592a77b4c1f695188bdd3f7a6985f3636e6aed69a4eea9ac6a61405a0603c748beb7b53036c106
 EBUILD gtk2-traymanager-0.50.0-r1.ebuild 533 SHA256 1c385e07f6ddce9630170ba8754867edf762477d93681a617b43d60a9b179ae5 SHA512 8c043a2188dfa7203bc1039b39ba966e3cbc619176005d27ffedcd638366bbeb61df23426c2034d0af3af640b8f8dd06709a4fd32f5c147ae1ab3a4d4269e2d2 WHIRLPOOL e048cb8cee9ee9af3700ca216864d622b45dde636256353b0fd40c37958817af288da5a1c30a488d37ce2bfa5754e4062a39df91356220d74b4c6ed353b23d8e
+EBUILD gtk2-traymanager-0.50.0-r2.ebuild 619 SHA256 b96e167f42f32e05e16e56e96faabfdf7434e6977649abccd89e95e5455c0865 SHA512 fb94ed652498cc8e34b9e2b7e80f743e7c70b1f329f3d9f2f7e967dc1121477f2583299f61b1cc7a12845189d1d6e0972a8e1d0c40cab6358ff1478dc92184aa WHIRLPOOL 0ea962d8eca0d56aaa26fb62a50fcb45685c5e9ada52482f8777d2a51c66f5b94505fa88f6ba3982239a36f3578a3b8a8ff8a08b5b3ebb7b47594794a289cdf0
 MISC ChangeLog 2623 SHA256 dc2ff0c79db060a7bca9754859c013443f3f662dc9309949facb9956c59bd423 SHA512 a9c3d5672dacdec4b1742bbdd585dab33031d2fbf60cef464b471a72ddfc8b687b04655953384e1a72e1b1f483269df709d53d2cc6ed7a0d3927e668c6ce7557 WHIRLPOOL 71070caeea56a4d29a14447f6d7a918bd8f3ed77a6c25357dc0a9bdff7ec363045a6aaf858056eccb222b713da598bc81378d6cfdd11640a833aab9db6ea12ab
 MISC ChangeLog-2015 3036 SHA256 0e9287ddcce75dc4b99a9032293419cd3e68ad18105217cda72447edc5842d4a SHA512 0327fe680d187b3e9f69b70ec4b35a0db9a3fd34abc11c5f9c68fc72e7e09ab7a04829c4bde1bb9ca7841e3cc9d0961526670c0c27c4a204881164a654837253 WHIRLPOOL 2e2ff38476c4171c2b1a5fb35081e5e54f5099037f588bb924e8208c6a409448b955df74f7f05c7737ab89d4b2237833e38532b8fb799ceaa1da7f1a48471bfc
 MISC metadata.xml 404 SHA256 6e65e6d3101c0d8916304a0cad4460025e6d09cb406d48a47ec1ae9bbf22f970 SHA512 c6b938b50fd65e0cbcb2da6d5e38f0ceb26f5d16c101f9b19a180ec74dfcdec54862e4ed59b27d5af812876fad5ec81aed71ef2d945300f0b2dd704d1100fce9 WHIRLPOOL da335a57e0b56e78ed52bbfd05364e6ccb358d09700e66cdf284a8fad2d14ed2c7a43f7ceff041e576e3789be935bff050328a20dd98b23707511ac2402f1a34
diff --git a/dev-perl/gtk2-traymanager/gtk2-traymanager-0.50.0-r2.ebuild b/dev-perl/gtk2-traymanager/gtk2-traymanager-0.50.0-r2.ebuild
new file mode 100644
index 000000000000..056f8d3f1660
--- /dev/null
+++ b/dev-perl/gtk2-traymanager/gtk2-traymanager-0.50.0-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_NAME=Gtk2-TrayManager
+DIST_AUTHOR=BORUP
+DIST_VERSION=0.05
+DIST_EXAMPLES=("examples/*")
+inherit perl-module virtualx
+
+DESCRIPTION="Perl bindings for EggTrayManager"
+HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
+
+SLOT="0"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	>=dev-perl/glib-perl-1.012
+	>=dev-perl/Gtk2-1.012"
+DEPEND="${RDEPEND}
+	dev-perl/ExtUtils-Depends
+	dev-perl/ExtUtils-PkgConfig
+	virtual/pkgconfig"
+
+src_test() {
+	virtx perl-module_src_test
+}
diff --git a/dev-perl/indirect/Manifest b/dev-perl/indirect/Manifest
index e0c88e1986f2..e06df0db17c1 100644
--- a/dev-perl/indirect/Manifest
+++ b/dev-perl/indirect/Manifest
@@ -1,5 +1,7 @@
 DIST indirect-0.36.tar.gz 48597 SHA256 7c2676566fbee16d15be972cb2b7a2fcb7972d3d58a2fb06a41030d909b7e55b SHA512 27f86702a2b3597e2bc20390130584324bfe86cc4d9f33a488b4788d6e1513ac19dfd4e1407f29b6f862172b020b3001a248450ad8dddb5a31e07220c0783ceb WHIRLPOOL c07281a07d931577b707caa0207ea6c8c1f66066590bed796e21b4b2e58e7da69335cc211287de0222fd11f65f628fc8371e79f37651a953951d3f48c1552984
+DIST indirect-0.37.tar.gz 54892 SHA256 ada92a3edb04ffd882fb6b5b4f2324dc9f385c19afc78c37ef27fcb52798fba4 SHA512 8d46ff62c86b23519b030474155f7d8aa4872a9a4a2bb1e3199ac506aee60343b4c572eae8fa41dc5148c115de3c80bcb7f21900ad30822dc9eb437033defe09 WHIRLPOOL 174aa826b261f9015bec36eba88e176566522792e26fffaad55bc038f39c50e697eebfb1b3e5545f00d7cd2e37ebfa602ac4a5a9514d0f3018248c379f2a48da
 EBUILD indirect-0.360.0.ebuild 492 SHA256 14e49583f236b5c7d499cc5ae04e7721546e93233e79f586ccdf5b67d2b8a4dc SHA512 6b7bbc29b5e3a08cde536b76e06f2c02b06ac3838d45ba5d3d23a8d962c9bb0e074cc026b47f2703bc0dbb4e55a8c54cd25b5006f11b87d843c67a60596221d2 WHIRLPOOL f0d41a1177693d326f0b1989075885c239a9960c087a98c70234323698334fd4e2bbcf18edbe4685124796ab77e04ebb50c8e48a281c384121d693249931ceab
+EBUILD indirect-0.370.0.ebuild 467 SHA256 0a3422750f464ec01eb2365318e1e7cc004149f86648aace8c3737c419a24f53 SHA512 bddce9446cd6d4a36fecc3565c5f8c82ed2aac8d31ff1689aec409fffa2c9ae2253d94cb828b322bed1c27d4c559f918a882176a09f2299b8acbce531f0b6f69 WHIRLPOOL 3e9a7ff024b5af02da179a8de1c90e0ca412058a10845607dabc27df55c564f8744021926338ad79ddfeb21480e9f62487996151c155c8504fcfc16bd3787fe4
 MISC ChangeLog 3644 SHA256 c1a21f344fd2be6a457f3ed9eb69f02fbd1d38e3a8718a69a52038d7d13d7191 SHA512 11065d0deedf3d0fa6d23e53b83de07416b7ec3f83a08ff34baa0a7cd205a592afbcf3008a7dc121f5fe102e299c9b0d4ac230c0898c122326a657aa4602be7b WHIRLPOOL 3d7839035e7ea752d9cc9fc87d2408b3d77ec740be34908586cc41d278813deb26d698ebcb62a670bb5d52fdd172899ab4aecc99acf8aa411eafe9893fc009f9
 MISC ChangeLog-2015 1756 SHA256 de23b50f1f827fbec38f26f666d5202c4c3996c9b99313ce5e603c57d73eae8f SHA512 35821c72f7d47a8511d7dedf352532cd52f365e874404125de707bd4ee61aebe21502f108c52328294cb16ce0eb5bcd423b8b421a07b2563bb056541cfbf9c7e WHIRLPOOL a79855e58e9773ff3248b994b65d99962aec3405913704aa5e0aed53e7fc48149cf1d5ee6d19eb2232bbff6a6483d5e6be2bf65d7becfbc898f61b4a65fcb337
 MISC metadata.xml 375 SHA256 59d710eba5aa7b36ade2d36071c1b8d191896c7d4dfa32860784f5392af1457b SHA512 7237dd49000e3cffe04121f726aa9453e0ef709b7f43d1d4c583bcd363c0732415fa79a49ab1e7cb864e35563480a20e750782719ff1f897ab8d57e80644b33d WHIRLPOOL 9cbe16bf49586f93da077154453f01ae3410bfaaa34fc94d04a0473410a59b63ae651c25ceeee944939a86137ef33e172cac787a7d5ab217e94830a1e9b79bae
diff --git a/dev-perl/indirect/indirect-0.370.0.ebuild b/dev-perl/indirect/indirect-0.370.0.ebuild
new file mode 100644
index 000000000000..02063b7cb1b5
--- /dev/null
+++ b/dev-perl/indirect/indirect-0.370.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=VPIT
+DIST_VERSION=0.37
+inherit perl-module
+
+DESCRIPTION="Lexically warn about using the indirect method call syntax"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-XSLoader
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	virtual/perl-Socket
+	test? ( virtual/perl-Test-Simple )
+"
diff --git a/dev-perl/rpm-build-perl/Manifest b/dev-perl/rpm-build-perl/Manifest
deleted file mode 100644
index 1a159a25dd24..000000000000
--- a/dev-perl/rpm-build-perl/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST rpm-build-perl-0.82.tar.gz 27903 SHA256 595d2bf27e4e7791085d8f92d666634925433a0763a214e1ffbce0a128723ffd SHA512 d8f129ea82cb45ab4c34da37dca5868da1c38fdecf6d90e89981fa4fb880c7312d8a0a4c2d1ae7b443696c1d43c100d173838a478e6cd596447a76779d4c1b10 WHIRLPOOL e76823c8190578875f900a2ed4372e5da85266785b82a860845e89ed2add9743153e67e4808b9d01fcbe56eb9c0a25c6172ee9c85339e51837a9ed78d45e81a7
-DIST rpm-build-perl-0.820.0-perl526.patch.gz 50632 SHA256 84d1856fd0290a8354a9ce1357191a6edbab79ddab9dcf4803020bce71349c42 SHA512 d9a239c7331f7778c87887ab3e10a428cb5fd4e2598c01f63040517c9f91c81b493374f1f1894fa39e0567b1f2afca91906ed3e38cc7d4e94c285fd709e48eeb WHIRLPOOL a7fda0767d6cb3e39b2adba7852c267cbfd730a69a1fc9c71788c45496230e34decf0204996b826704e9c8f161b930e481a64da7a2bc6cdb8fb2a9236822c778
-EBUILD rpm-build-perl-0.820.0-r1.ebuild 585 SHA256 1f3bdd4b1be11a36aa45064e285ae9b48d2ff0b1cc0f25d0bb98e6874c974755 SHA512 c70d969c24158ed15e87e2868c024771583d06a7d74e0652ef895f709ff1499db07ba6ec9c83c6c67eb7ae1d99f28822198ce86c366da5ff81ced59a7547c5df WHIRLPOOL 282439e2c230c04b3451beed4ac8b049fecd54a7a35f20985e07a69b571eb2a3e905cd723d08da81f139dbd3bb3caec83ce2bdb4f658b90b7018773d8394afbc
-EBUILD rpm-build-perl-0.820.0.ebuild 464 SHA256 b8abd07659e855b6584c381065a2c437134b4aa4b7e06a26484348aaa9d81249 SHA512 c75e2aa5671d9b09c5105cbf1451fa3e01f0ab1751a5597bf83f31eda3b437e83ee0cfee65bdc542431d99d00985b0961425bf99d48ed3eb049ec4e46c572705 WHIRLPOOL af6303da4e55fbb07c4868ae1b4a6e0cc3d3dc30708fd38e15efc1fd1208482ea1f536cdf0aef93b82de79465e2b7deb420f3f37ca9e86fd9fcd21fd6ee3b2d1
-MISC ChangeLog 2452 SHA256 5e40c1b4e02a372fd713fcb2a68190482cfcc2344434dd5368a449aa28f3f6d2 SHA512 fc6cc5e99e5eb03eb5d1aa6184e42b26b5a1c14ff1ccfff052cccdf58a0cea16a24b135d14ed578195035b78330e2d643c9ddf8159c02f6f60f7f6277ea9760d WHIRLPOOL f6345ad44c352542c7b3b7fe298da563d9d0c149795892ab2205e303108e82e65f9ddd2635b83149af9ab96d7b3cf99ff2004550efeb3bc63032fb7342de3931
-MISC ChangeLog-2015 415 SHA256 7835c4b933fb71a1de488081bc94639584fe6cb68ca59fe44b1e2ba2cfd851c4 SHA512 f52cddb88a69c31b8499d848e59aaad76b9c04e89508c58d35efb64c064d8897b7a24861352dd86ec0e89c1f89b2305d9f373315821047b0f26653cdecc23c21 WHIRLPOOL f40e017b04a5eb4591417b4544a9bb68cdf68aedda7b5388adeb4c76d71d0d6f16ca73ce77de7b6889ad066784df53b201839174144fc8491ee2f4620be3c0a2
-MISC metadata.xml 257 SHA256 4d43e70b770d0898a99af64a8454a6116e4a86500c23290655c8371265010427 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e WHIRLPOOL 87039765046556cdc2f7d76ce4192945117bfd5bb684220ea8fb72be310673a5b729ea428666ff1ceb1e6c21fb585a3a7dd72bd94dab89cf076a895e6a7677f0
diff --git a/dev-perl/rpm-build-perl/metadata.xml b/dev-perl/rpm-build-perl/metadata.xml
deleted file mode 100644
index 2b9a936fc0a1..000000000000
--- a/dev-perl/rpm-build-perl/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>perl@gentoo.org</email>
-    <name>Gentoo Perl Project</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-perl/rpm-build-perl/rpm-build-perl-0.820.0-r1.ebuild b/dev-perl/rpm-build-perl/rpm-build-perl-0.820.0-r1.ebuild
deleted file mode 100644
index 206415515d30..000000000000
--- a/dev-perl/rpm-build-perl/rpm-build-perl-0.820.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=ATOURBIN
-DIST_VERSION=0.82
-inherit perl-module
-
-DESCRIPTION="Automatically extract Perl dependencies"
-SRC_URI+=" https://dev.gentoo.org/~dilfridge/distfiles/${P}-perl526.patch.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	virtual/perl-Encode
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
-
-PATCHES=( "${WORKDIR}/${P}-perl526.patch" )
-
-#DIST_TEST=skip
-# one subtest fails, reason so far unknown
diff --git a/dev-perl/rpm-build-perl/rpm-build-perl-0.820.0.ebuild b/dev-perl/rpm-build-perl/rpm-build-perl-0.820.0.ebuild
deleted file mode 100644
index aa7205e5dbfc..000000000000
--- a/dev-perl/rpm-build-perl/rpm-build-perl-0.820.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=ATOURBIN
-MODULE_VERSION=0.82
-inherit perl-module
-
-DESCRIPTION="Automatically extract Perl dependencies"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	virtual/perl-Encode
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
-
-SRC_TEST=skip
-# one subtest fails, reason so far unknown
diff --git a/dev-php/pecl-cassandra/Manifest b/dev-php/pecl-cassandra/Manifest
index fdcb7d0019cd..5c3f0fc9e33e 100644
--- a/dev-php/pecl-cassandra/Manifest
+++ b/dev-php/pecl-cassandra/Manifest
@@ -1,4 +1,4 @@
-DIST cassandra-1.2.2.tgz 153553 SHA256 31db2a9ee2275e69ba0f7b0eec098f7a80cc6afa7c6a4eaa2d9d841ad040fb22 SHA512 cda256c8159be0b8f47ab46e23b9c24e3bbd9878679660fc956682d62221a289e262a394bfbff257a314d765ff22abd735a9624b2f8045219b8452b9bc8cb2b3 WHIRLPOOL ce79af578726a950e8b18eb571717a5e0b0983e0a4c619ab9e728eb29952c7782865bb3b91e7104ec2b4ff7b2273ca3e4b3e343f8ba03c8bfbb724e7e29e3899
-EBUILD pecl-cassandra-1.2.2.ebuild 389 SHA256 b0b80386bceda158713c451b6e0cf5796f7eb100a93b406111bcad83ed81f488 SHA512 76d333bd1e35ca77618c57f5b077dd320b0e50f68486d5c748b9c2b02371f5ce8bc0164738bfc214188f6847748cd6ca78f2d0d4ddf0d30ae1385952862e415a WHIRLPOOL 592d3e3bb1e40bd93efe6d045a69160971aea0cedfd364c125f29adef771cebec8a734dd38614d991eee486357c0b617d330e2930776590114c793bd6079b49f
+DIST cassandra-1.3.2.tgz 163700 SHA256 ff80de20482021266426e8c431a2205bc9cb5c18caebe0219de709f6745025df SHA512 2b3605f24e81b247afa5ea6bb8e1d1c24216a281babfbd750b973fb2094c864a3d45c7769c759bfe2f3f31360766a5b2eb1ff0ee4414ec9a9e9c5f164748242a WHIRLPOOL 41f9a93d7b67ca1f4adb2462213e88c20d68f1be510dd8c381c1752d1d5ce4a7c68ef2aeb1c561ba17358f7a710c0b84b6754535ee85b6a056193814909ca8be
+EBUILD pecl-cassandra-1.3.2.ebuild 396 SHA256 be096b66d5fc7249e81a95ee5c318e8317c2924896bf7653a16afa4a353921e2 SHA512 a0f2bd06a44b4a96a1ffba34be28545df95628888d0c05e78a26f5e31de8e93d5aa99c72bf9e6617e6d8d8160fad6f896b7312be464ae182541260f080b0cadf WHIRLPOOL 12957dd2fafd0fecb0aaef78a2279726c0855858ae2a27d13843a9e58053613851a462087ebb3d9bfb7c2824da28c04363f86a8ccaeb82c7f88831936160fd38
 MISC ChangeLog 666 SHA256 70ff5b86b9eaaa4d89d1b2beafb41bb1121a726dee7a22a5f651a73a7c27fcaa SHA512 04040d821532c140afccfacbcf1d7320389b61f72dd0bc6f63133f3cfb171784c442cf5edbbfd19b5fcc2b5f1472c572a294b40c3410f993319c7e12d0dbc57e WHIRLPOOL d28a0e2d49e6a8043e94d272219aa5018c35e647c2e21f608c3d627a633547940ddb145318ff50e13d50ee91fc77801d2b5e97598f2fc1ecb6fd009cc20c950c
 MISC metadata.xml 541 SHA256 8994c438e60bbb6449c713fa21e741ecf7353863fbdc7f7c242ba0de4e920d50 SHA512 8d9a8b0ab84c8f8557dcdc46b94b22074492ceaf6ce61daf80eb5470cd58088838f78d1a54f0d5c5dc88802e9cd8e483235a27a7ddcf419e2b6ebabd3c39ffa9 WHIRLPOOL 09ce3f8a3ceed544cd1da010ad10152b254001ecf65c1afda39550ae6b088ed0b26408da00e2b500bebfc55ff5ba2a4bc43a930652d95d0e91f3ce5771a53537
diff --git a/dev-php/pecl-cassandra/pecl-cassandra-1.2.2.ebuild b/dev-php/pecl-cassandra/pecl-cassandra-1.2.2.ebuild
deleted file mode 100644
index 7ccdde7002f0..000000000000
--- a/dev-php/pecl-cassandra/pecl-cassandra-1.2.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_PHP="php7-0 php5-6"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="DataStax PHP Driver for Apache Cassandra"
-HOMEPAGE="https://github.com/datastax/php-driver"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-db/cpp-driver-2.4.3"
-RDEPEND="${DEPEND}"
diff --git a/dev-php/pecl-cassandra/pecl-cassandra-1.3.2.ebuild b/dev-php/pecl-cassandra/pecl-cassandra-1.3.2.ebuild
new file mode 100644
index 000000000000..96329971cded
--- /dev/null
+++ b/dev-php/pecl-cassandra/pecl-cassandra-1.3.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="DataStax PHP Driver for Apache Cassandra"
+HOMEPAGE="https://github.com/datastax/php-driver"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-db/cpp-driver-2.7.0"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/astropy/Manifest b/dev-python/astropy/Manifest
index 76f0e0dcedda..fe3b3fc0fb96 100644
--- a/dev-python/astropy/Manifest
+++ b/dev-python/astropy/Manifest
@@ -9,8 +9,8 @@ DIST astropy-1.2.1.tar.gz 8179665 SHA256 0d7ef702166f26fed239b59fc12edcd5243ca5b
 DIST astropy-1.3.3.tar.gz 8427036 SHA256 ed093e033fcbee5a3ec122420c3376f8a80f74663214560727d3defe82170a99 SHA512 15956d488a390ab3b4091146bffe6f192f22e7598d00e302c2bcf0ec9728911f48bef3ee4c71d331f58e57aec86292421d27f915ea16027a7f62c5d43f6a12e5 WHIRLPOOL a9246b1ba56ecda5eec42e89998f18da4987f611d1154ba8ef5d3480d398fd77c0fdad6c15614885ae722454b9c284b9281ee926fed0f39c314864a015bf658f
 DIST astropy-2.0.1.tar.gz 8220097 SHA256 25e0881a392a2e03b4a705cf9592f01894d23f64797323b21387efa8ea9ec03e SHA512 0677b4f22a9eb7d3334109a639ec14ce904935dc58925d303dc98c27cbac2be7d0e95bd873cc21d3cd92e8e553481d203382c281f91cb7a4e41c27d1ff83aac7 WHIRLPOOL af4d78b88cf9ea7f536eb2d6b6a0cc46068ae5312de3f8f83f0ad3bea539112868f3704f6898be6da6e1a0a60caadd2d88335523c242f6156723dfd849c6ef76
 EBUILD astropy-1.2.1.ebuild 2722 SHA256 31000b83ca542af0b2e98b1538baf25e0d70f0e179c6c9fc2e94cf44cbacfd17 SHA512 5bfc876359230883412b57d3de9fa99d88d83cf5c3bf5df5a74e24e10a5e729bd8445a2a8cc3f20792c81cd9a4efead673c39272ef31acfe6c68f3e784d8717b WHIRLPOOL 71bf6cdf56ea37c2de9528a9b5406be17ea5e89e881260375987987082e4dcaf91287038e0f2badf93f717e81abcfe4c5511d6f3cee8a6945e1cf82126be5b31
-EBUILD astropy-1.3.3.ebuild 2517 SHA256 4a94397354f7a363b22630fad09a261da5859f79f6e413684f903d67430b9627 SHA512 e1a26616f59e57377acce5dac0e06ffa83cb2a627a7fc5143a7a8b1f9445ddad2d9833680bb29b39bd9a74b6f25321c3b3e616d59b30c3d65869db9327a2694c WHIRLPOOL c842940dbff2e3322a62dd051f64ee58c4fa64ebbce36924ba959b0b7ea1403d0013053230a15f0815c8ce5458b507f07ccbc4b31e7900a8638a7df83d1eaeeb
-EBUILD astropy-2.0.1.ebuild 2490 SHA256 1249f4b42c25985d26a9425d7aa75266a3734effc5ecf403f824815c828d2b9b SHA512 480cd8e1d9ed9813eb42aea7b1839c421b67c2cb3f27ced79007ce5ea9bf47a73d28cd10f5af8ae1f1ae9f9baad3cbdcba779fabceffcaa7f330df1ee8a4a574 WHIRLPOOL a2eb41b972df05d84ebb4a307167c03a93145b10ee71bc1bfced353ecb64843a851b13d31fa515f3dd64b2d6292a66c295f2d056880e86b46d61ca150733ea19
+EBUILD astropy-1.3.3.ebuild 2520 SHA256 c72d199e68cd5a5ae81107e3f26183ba40cd069e64a9f51d20d4dc58fe01af29 SHA512 c42937fbdc31556ca4fc34c440acf92e638ea84b7ca055fa675750a4365fc6629a42eafedd4be30b7ffbb0c472f4ea1bdc9bdf16e695b4e79c5dc1099854f3ef WHIRLPOOL ed36c81cd1f867d3afc22bbe11ab37a6ca36bd88c6e8af24188e54d399998db96e6643596544ae6beea6fea2463a2f5404f2861a912ba614ae4ead9d7cd37fd7
+EBUILD astropy-2.0.1.ebuild 2493 SHA256 c649dc3dedbf2c404d833f7c6c0044e946a8a80d55db52e6c5011fa8dec5be7e SHA512 ad8d0d38abc4d5238a5df576640fc9f40570ed47d73debd3657cfe7e5dcce2333ed5e24c6c9f9fe18fb5f4fc2eed59a4e3d23298b233421565bf4f1de921388f WHIRLPOOL 34235a019705ceaf6f6a89653821c5ed7e021726f5ee2895b94393af47f1d0fe29952a0fd16254f51c847546b46d271922f88df5c4fdf7daa49e2fa9d6db9e21
 MISC ChangeLog 6917 SHA256 444c267ce4e2dbff8d0d2a3b072786dcc2ff2009c30ea7bb2c33c5eb40c2fadf SHA512 44ca7409313bd23606f4501470168a19f71da9976f050f700a19513051fd3793383c9f8dbf9604c293bde989962933e2cef674aa62af87a8b7e0cea3eda66f7e WHIRLPOOL 1febdd98889a209ae584cedf67ae4ed2de39da74dbc47710bb13397dd234f3093754bd68d0325bdfad0b19b9b163006fd7bfa18aa4c74bf0e8332eec7f6352ba
 MISC ChangeLog-2015 3905 SHA256 0caa97d13b7b0a80d2f5b4ea1d60ab6ad79b751e13e86694e83b0d77a083936f SHA512 d1321808335b50433e13c3238130153bbf5803b22145796ccbbdccd58d4636bea2d762fa0f71eb799293227e4124cb5ef1fee769f05b70201c48120c7a008914 WHIRLPOOL d06117b036c97da9f9abd4b8b525b0d17fa4d508fccc2b079ca6adcd2cb5e48334f8e95a514b29ccf61615d4fbc6685996e39e323aa8b1137546f8806f6e9742
 MISC metadata.xml 573 SHA256 bdd68bcb0bf0c3ca0e5ebdb00f7b04b6c22f60cc4958eeeacfc9f0657683d5da SHA512 a8054d4eb431348c9840e37a5877c2ce7cd4b73f213c1a24f9d3548dfc63a6756d80ffb9f96f78a053fb4ae2a39a424dbe46257be2e9f892f42ec18ff44fad17 WHIRLPOOL 87d8d5f608325797299e4c6ed130f76b7446535d4355ec7b338dc5ce834ab7224f489519b5e27ce73b273a3f19226232a0be2e6e06bb4a2e9a9330d5f37c668d
diff --git a/dev-python/astropy/astropy-1.3.3.ebuild b/dev-python/astropy/astropy-1.3.3.ebuild
index 784a43072ae8..b1a454a4e082 100644
--- a/dev-python/astropy/astropy-1.3.3.ebuild
+++ b/dev-python/astropy/astropy-1.3.3.ebuild
@@ -40,7 +40,7 @@ DEPEND="${RDEPEND}
 		dev-python/h5py[${PYTHON_USEDEP}]
 		dev-python/jplephem[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},jpeg]
+		dev-python/pillow[${PYTHON_USEDEP},jpeg(+)]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/sphinx-gallery[${PYTHON_USEDEP}]
diff --git a/dev-python/astropy/astropy-2.0.1.ebuild b/dev-python/astropy/astropy-2.0.1.ebuild
index 65cd60ea569d..fb535d4fd513 100644
--- a/dev-python/astropy/astropy-2.0.1.ebuild
+++ b/dev-python/astropy/astropy-2.0.1.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	>=dev-python/numpy-1.10[${PYTHON_USEDEP}]
 	dev-python/objgraph[${PYTHON_USEDEP}]
 	dev-python/pandas[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP},jpeg]
+	dev-python/pillow[${PYTHON_USEDEP},jpeg(+)]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/brython/Manifest b/dev-python/brython/Manifest
index 1320aab51f73..85c18eb61ba7 100644
--- a/dev-python/brython/Manifest
+++ b/dev-python/brython/Manifest
@@ -2,6 +2,6 @@ DIST brython-3.3.2.zip 10140819 SHA256 396326912d311d56ec6e2ba413f059e8f2242cd6e
 DIST brython-3.3.3.zip 10040987 SHA256 b48f236a55a220520ca98b5c1caf705d8eff1742e622c8440d7bc23632ca6984 SHA512 e182a6c859cd18b90b205f751260b0b5c8d250746e48844c59cd61608dfdaf0fd6f0f25b8061de9505b7c5d094ac68fe57536c52cb31adb48f04c2cc5624e249 WHIRLPOOL b604b4a0bba610fc84ca059696ed37fe8b6735a806c7616fb1f41a378271ab16e76f4f063a51568ec774af2ff694551ea4f67970a77230551223aaa1071c4be8
 EBUILD brython-3.3.2-r1.ebuild 742 SHA256 2e92caf867908cd054caedfcd7b478091d57806645d17b05d434df55af780242 SHA512 55d34698e55243e8b757cdb141b1ec445c54520039b09f54f829d0319d90767f76a8af2356c9599fba9121ac6c15710d7a114f9f1465c628f27ac606e58a6c60 WHIRLPOOL afccfb3cdb5da9946c7ed5fab8d285c10e37d2b7c06bed7f08787af3c783fb30c4d3884540babd31f48792d491679cd52e0198a43048fc475de6bc9903f9e631
 EBUILD brython-3.3.2.ebuild 629 SHA256 b814117347e7fea9165721d5bd8ede12c68f3abfefd6958b56b2725fe1980805 SHA512 f5a1a99ce16b6f699ec1884b572cbed011c1cb07eebf1600e335211e4f9ec8f0ab03e9b56edcf3bfc8a84270092c7a2058917ea3ec34acfb2adff0c8785f772e WHIRLPOOL ad386a249fbadd0b17e1769610fe571ec15a92b7c04d53dfb25aeca05327f3650a5a8a5024f2c498c91e27510c2de27ce026e67733f61b4557af52ad266f1342
-EBUILD brython-3.3.3.ebuild 742 SHA256 2e92caf867908cd054caedfcd7b478091d57806645d17b05d434df55af780242 SHA512 55d34698e55243e8b757cdb141b1ec445c54520039b09f54f829d0319d90767f76a8af2356c9599fba9121ac6c15710d7a114f9f1465c628f27ac606e58a6c60 WHIRLPOOL afccfb3cdb5da9946c7ed5fab8d285c10e37d2b7c06bed7f08787af3c783fb30c4d3884540babd31f48792d491679cd52e0198a43048fc475de6bc9903f9e631
+EBUILD brython-3.3.3.ebuild 741 SHA256 16ae62ee2c4be2a5c82c5ba3c684fb25569de169d8564346dce5b830c91ed4e1 SHA512 68b1492e01d0d2f0f036f211611bbe57dea4c443ee87ba92c7f550d5ebf6c15479e53116a4b7bc4ea1b35b30547d1ed60709044c37411fa0c10d393445ace681 WHIRLPOOL 174b6c005b32ee2b9c9080e8e8bbc4ba5f1e6f5355e8dcf3ddf9d9c13146b10e2d50404f5365eee46419e921e94daa7e57aeddabe00ec83ef61885719cd6db05
 MISC ChangeLog 1339 SHA256 af02bf87f0fd711b68b70489fd54424bdf3a012a37a7b9040e3022e2649a22fa SHA512 f5651ea91c4b92c41c28d108b15bea0f5a544ea4047a14ea81f28f5e3a825f68b9fde24535827ce11774e429b4119751964a50357633c2fde99409b42756c660 WHIRLPOOL 90a96158e10582a9a7ad875cf8623e2b518dbc46296545b53b0a2a58471df7221f3baf2539eee221907259220fb14dd8463e0f230bf2310bb03726b14a437796
 MISC metadata.xml 467 SHA256 5f8066c489d7fdeed7170a4fb2d2ce1fae46de5275969d7e03ef522301fc7caf SHA512 a9c3c34e617cc5a3ea80f30c8de8964712af694d8048197662ce2c68d521279761751824a55c68bde5b75444495f176cbcc7d867c46924729391d3488fc3100a WHIRLPOOL 1ab2f1e9001cf664ca5e632effdc17a5ce5e34d5374e87343e4044793f3a0a94a97ca3277acdddc7ccf07233571c41364a73d280b9b9931bb17e0f7e66f5bf2d
diff --git a/dev-python/brython/brython-3.3.3.ebuild b/dev-python/brython/brython-3.3.3.ebuild
index ca62031b60cc..a072c0036904 100644
--- a/dev-python/brython/brython-3.3.3.ebuild
+++ b/dev-python/brython/brython-3.3.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.brython.info"
 SRC_URI="https://github.com/${PN}-dev/${PN}/archive/${PV}.zip -> ${P}.zip"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/constantly/Manifest b/dev-python/constantly/Manifest
index cf6aec448863..751625865b53 100644
--- a/dev-python/constantly/Manifest
+++ b/dev-python/constantly/Manifest
@@ -1,3 +1,3 @@
 DIST constantly-15.1.0.tar.gz 21465 SHA256 586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35 SHA512 ccc6f41b0bd552d2bb5346cc9d64cd7b91a59dd30e0cf66b01e82f7e0e079c01c34bc6c66b69c5fee9d2eed35ae5455258d309e66278d708d5f576ddf2e00ac3 WHIRLPOOL 0d8225c0dbef4ca71997ae46eb55da02fde8cd31e9d315667b14daf330a9806e0331e8640f2495d190053bb40c4cc357ba99a5dff8a853535b0271089e705037
-EBUILD constantly-15.1.0.ebuild 564 SHA256 58877967725e85aaacdf2b715355df790ac9fdd9ecf434400d62c2a0c1ca8f18 SHA512 89cac107f1368435fb92b35deeea351d915b2bd5095b83ed602453ec1e7dc61bb70357162cf723b6d2bb6d2c2f860358c5447cba2b3885bc1923c5e63e802196 WHIRLPOOL 338d5df766762f16bcf87a57240beda2b208c7a53270cd15c2eecc17cf8bda042a70cf26a47157811a86996444e5e3223fcc306bd7a66eb62c7238d5d02b91d3
+EBUILD constantly-15.1.0.ebuild 563 SHA256 5757183ce7c9f3bba7afedd83a2def0f481f42e2f96f0d0cc61e9bd5dcf970ca SHA512 cfda90aeb188c67a9b772c8f06d56c649407394875792a9cbc28bfe691f249891af464ee320b5d5fa886237c0c9e9264dccd78f0cfc9b6ecff3982866d955a43 WHIRLPOOL 93a6b3622fdaf084818819d1882fe2091861749fa31e427d2c9048d20285979b7d40bc6ae5cc124931fee1f40e64f8a1d7c38b83620e8ae641a8c3dd06687f45
 MISC metadata.xml 762 SHA256 c10b78629fcd6e5ec8c4111ae65962faf397a193ffd42c5c6cd201cd5c8a4028 SHA512 512de83e894e7e6f4c22888f66f7d0f27374f8fe76ca87d645d3cf9272091dcff71dac93c084c1d8733fcee07d5281cde5eae17cf27aa94257485f969a967a98 WHIRLPOOL 3b4a4e28376ea7afec72db3f771dc157477b417e69ee402fdf4b670785f01bb324b9d71285b50bb85f7bfb1ac4e929246a1f4d7bf62be87f3b8a95ab67cb8a08
diff --git a/dev-python/constantly/constantly-15.1.0.ebuild b/dev-python/constantly/constantly-15.1.0.ebuild
index ba161fe3857f..b9a974017088 100644
--- a/dev-python/constantly/constantly-15.1.0.ebuild
+++ b/dev-python/constantly/constantly-15.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/cryptography-vectors/Manifest b/dev-python/cryptography-vectors/Manifest
index 83503b9a7f33..2afd5d2049f8 100644
--- a/dev-python/cryptography-vectors/Manifest
+++ b/dev-python/cryptography-vectors/Manifest
@@ -4,12 +4,16 @@ DIST cryptography_vectors-1.8.1.tar.gz 26653746 SHA256 2fd61facea08800ca98ac923f
 DIST cryptography_vectors-1.9.tar.gz 26653563 SHA256 bbf767727ad1b9d4cb684fb2b36db4cc78bd420fa6999e7e6ca1aab8c30d78f3 SHA512 3c37dc39496b66539f54bf377b4653b59abaa81fc9fbd68e2d337acbfe9c7fd80801b37ddddc2f7698356b22fb9bcd9f8a41ff95ee405b208c267c0fcba56ead WHIRLPOOL 801a6e58cf48b68422905de1a2ccc4ce5955799df505cfcb2a0870a7826acaa29d5f1de0c0752c8b326ea5d3c0530cee660ba030255da47650862eb3425f64da
 DIST cryptography_vectors-2.0.2.tar.gz 27011827 SHA256 512f1e699dfbb41376e938e6dc6d7f1f40b9578f873438f002e2e5212e13717b SHA512 ab14bdf664e6df08c8436eb24c4465d3080aacd4e6cb47a0113b0877f869cd91d4184ad9122a428b323e91316b686eeb167c4e932773cac1e7b2adbc9309ca36 WHIRLPOOL 9c699e29a636ac56afcd12d938a316d4c89ebf55330fb747d61cf24d77273694e91bc5cc212e80c13497b72d24668ef738ecbb47eaefaf7891c046d20d729064
 DIST cryptography_vectors-2.0.3.tar.gz 27011810 SHA256 beb831aa73663a224f4d7520483ed02da544533bb03b26ec07a5f9a0dd0941e1 SHA512 a944ca7781d47e6e81d69c32a717a19c2f461412e38f4d2b93cb02309bacdf01d766f7227a20b520faae2db20cf3dca194ed3c34363dcc70866d9ef6200f65cc WHIRLPOOL c2f35a4421fab2744daa3be10a2eedb461bd8db148b088df94fa3a473bcb4df46312a3e88dadac9df7ae1276e1fe16c38788b946cae2789c093b04ef1aea00ff
+DIST cryptography_vectors-2.1.1.tar.gz 27255936 SHA256 92f1300dd2b0a5812ca5d28003b7a11eb9eadba8c1c8c2b5150a0132d4a1fd64 SHA512 fa32a52a3e187d62c3a8eb4262795d0a9762fe8bb5d8464bc9bca7b1a56c6e19a3a14bfd0b2f56f4a048a8cb4dd05e105a90925dd4ee0697a76de3577faf88a3 WHIRLPOOL a6fdc7e45f1f514b787ff60db3d9e399fa9bba7aa128370995a885b66362f5bbf7436f81937fe3a9edba3abc8294f3b155570fe7f5674458ddd1d128ece3e98c
+DIST cryptography_vectors-2.1.2.tar.gz 27255884 SHA256 1d3829bdb7b7822cee85a829fe2e0d2455d69e242186705ef1a9d4d1ab6337df SHA512 e12c52b501e3f9974237e6b02b79e602e1c44c97928304560c9d68beca68be07acf2bb3cfe111d1cb0357ad0b9e458fec241463e63ec65fb223b65e1dbbeedaa WHIRLPOOL af1e8de02227289dc963e1e3ab8e2b9a4969c914861d3fb1d40ec636b2ddf5bc829d56906068a06877d851e40d59b0965c7e89e9c290f02580aee03b74cb888e
 EBUILD cryptography-vectors-1.7.1.ebuild 632 SHA256 fa053ef9730cbb0999a32412179d0efef2d776236695ffdac57a385b2cb314f6 SHA512 652b04cd22ce0aedac1904acbb292355622fbee31da765b4acc2ca7f2e8de577e196acb935eb1335459d11a9fc7367c8ed448eec76538a22ac6151f5b152b27b WHIRLPOOL 9b01cae34ee2785f33740b35316de23ade23fee07f601f3830a032a5dbf84e39c91bbbea14992b4fb3f65df86aad1cc0e798729a5b46c1a738bbb3052593bf20
 EBUILD cryptography-vectors-1.7.2.ebuild 642 SHA256 1c37c9c1ce3dcf6edd4e680d4b62e3e589db298126645c2328b7b5ae2b73e7c4 SHA512 53b66c690c62327685f0dcf6e59172f284130278d03a9398aae9abddb7bee913b60592ee2131f8521e8aca75b78b19ec0e4e9ecabd3d46866ac64659839c4f8a WHIRLPOOL 4ae022051d04c53286f8e5ef103cef460d13caded51fb19eda3bf7ea5b73da74de99b401f30f3e9eeaa186f68475dd0a48d4ffb128790a15530b5b571f89806d
 EBUILD cryptography-vectors-1.8.1.ebuild 642 SHA256 1c37c9c1ce3dcf6edd4e680d4b62e3e589db298126645c2328b7b5ae2b73e7c4 SHA512 53b66c690c62327685f0dcf6e59172f284130278d03a9398aae9abddb7bee913b60592ee2131f8521e8aca75b78b19ec0e4e9ecabd3d46866ac64659839c4f8a WHIRLPOOL 4ae022051d04c53286f8e5ef103cef460d13caded51fb19eda3bf7ea5b73da74de99b401f30f3e9eeaa186f68475dd0a48d4ffb128790a15530b5b571f89806d
 EBUILD cryptography-vectors-1.9.ebuild 642 SHA256 1c37c9c1ce3dcf6edd4e680d4b62e3e589db298126645c2328b7b5ae2b73e7c4 SHA512 53b66c690c62327685f0dcf6e59172f284130278d03a9398aae9abddb7bee913b60592ee2131f8521e8aca75b78b19ec0e4e9ecabd3d46866ac64659839c4f8a WHIRLPOOL 4ae022051d04c53286f8e5ef103cef460d13caded51fb19eda3bf7ea5b73da74de99b401f30f3e9eeaa186f68475dd0a48d4ffb128790a15530b5b571f89806d
 EBUILD cryptography-vectors-2.0.2.ebuild 633 SHA256 a4d7596ffbd52479423f10da1e3092263c14690245a650730f498f0458dc1e85 SHA512 245ab5c5b17930fa85039307428ba2138484831b8dea4afb382425ce13043d66addc3d4616e5b40aec13d11dc8870c9e0b244d2b5abff87ca43b4b6660662ba6 WHIRLPOOL 6fa09f3c3ceacd3bb07431c965a0b324ee457caf99466c29b80b676db41dff32b78c97c5106ba3b3db1a24759e8ea108cede8a2f1ecd705e4fdcfc5b014c7206
 EBUILD cryptography-vectors-2.0.3.ebuild 642 SHA256 1c37c9c1ce3dcf6edd4e680d4b62e3e589db298126645c2328b7b5ae2b73e7c4 SHA512 53b66c690c62327685f0dcf6e59172f284130278d03a9398aae9abddb7bee913b60592ee2131f8521e8aca75b78b19ec0e4e9ecabd3d46866ac64659839c4f8a WHIRLPOOL 4ae022051d04c53286f8e5ef103cef460d13caded51fb19eda3bf7ea5b73da74de99b401f30f3e9eeaa186f68475dd0a48d4ffb128790a15530b5b571f89806d
+EBUILD cryptography-vectors-2.1.1.ebuild 642 SHA256 1c37c9c1ce3dcf6edd4e680d4b62e3e589db298126645c2328b7b5ae2b73e7c4 SHA512 53b66c690c62327685f0dcf6e59172f284130278d03a9398aae9abddb7bee913b60592ee2131f8521e8aca75b78b19ec0e4e9ecabd3d46866ac64659839c4f8a WHIRLPOOL 4ae022051d04c53286f8e5ef103cef460d13caded51fb19eda3bf7ea5b73da74de99b401f30f3e9eeaa186f68475dd0a48d4ffb128790a15530b5b571f89806d
+EBUILD cryptography-vectors-2.1.2.ebuild 642 SHA256 1c37c9c1ce3dcf6edd4e680d4b62e3e589db298126645c2328b7b5ae2b73e7c4 SHA512 53b66c690c62327685f0dcf6e59172f284130278d03a9398aae9abddb7bee913b60592ee2131f8521e8aca75b78b19ec0e4e9ecabd3d46866ac64659839c4f8a WHIRLPOOL 4ae022051d04c53286f8e5ef103cef460d13caded51fb19eda3bf7ea5b73da74de99b401f30f3e9eeaa186f68475dd0a48d4ffb128790a15530b5b571f89806d
 MISC ChangeLog 14548 SHA256 c5f2de1c17990451376eda24dc0d0e9a1b45819c8c8a11cc1de604740f47bf7d SHA512 1e2c9f6273ffb60905f5dd30dcaf94a4c37c32a20af4807acec00593062f14c89dffd48f0f75fe7c5cbd9d91a33ca8051119c7e62e0a99539aa9c0fe4e216918 WHIRLPOOL 0a784e2f313a5d0a8bafea45048c6f66bf50c17cd9490cde8da997f742fd9203bd4f881ca7d280cf519964db5591e3ae002c64c5025860de0faa0ba2e64e33fb
 MISC ChangeLog-2015 5384 SHA256 7e6854358fbe448569b7ef469923057f58b6fa344e315581578f0e209422be36 SHA512 c727701a17221d31216b7e8f3f83349f778630571ec8807c4da9e5a9daa611fbdc932ce94566bdf2c45879158b26201f3d03ae5bd5a806c4f153f387f9d0e719 WHIRLPOOL 1e5323c11ada642b1e86995b5b5b53d8aac94355ca2df42e3b97b56ac0077f7ea6696d66ce19c7c0eacc6690295883438ac673c21d70cb2a288f8c7e07c325d5
 MISC metadata.xml 333 SHA256 bc80b1372c77a6b09ebc055f777e2d16f12b51f439489abeebddd4929a7fce1a SHA512 d65176e5ea86d82a13687d70fb2f29ca046bd71526752fb3583be9b0507b124363f271d697cfe6724245d6863c5aac36e67b1e50808041c52066d66e1f8b586a WHIRLPOOL 71727a286773144d80ff7fdcb1becf6326e347382c6f07dc44598770628ba5f174e9dcce2f25d51f0ec9e22d2e28634d0f3df45bc351b7a161d121adb017ccf1
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.1.1.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.1.1.ebuild
new file mode 100644
index 000000000000..711276fa7749
--- /dev/null
+++ b/dev-python/cryptography-vectors/cryptography-vectors-2.1.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Test vectors for the cryptography package"
+HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.1.2.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.1.2.ebuild
new file mode 100644
index 000000000000..711276fa7749
--- /dev/null
+++ b/dev-python/cryptography-vectors/cryptography-vectors-2.1.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Test vectors for the cryptography package"
+HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 47aad7cb1ca2..394f8a4d2ac5 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -5,6 +5,8 @@ DIST cryptography-1.8.1.tar.gz 423560 SHA256 323524312bb467565ebca7e50c8ae5e9674
 DIST cryptography-1.9.tar.gz 409664 SHA256 5518337022718029e367d982642f3e3523541e098ad671672a90b82474c84882 SHA512 815e9c09366935f8603a3e6e74c28ce79175596d00dbcd19d3792505237bd1cf953a4f401c2b97e4beaa7f2bbdcf9d7f95c4753d001a07fa816830af97cdd24e WHIRLPOOL b79a10de82b2cf98b27535f0b018f651038ed235f5e63eed48da52a87efaf672057e147b9c1b23701da0505d52cc85558ad3b6e692670a9f9e63061b381500d8
 DIST cryptography-2.0.2.tar.gz 427303 SHA256 3780b2663ee7ebb37cb83263326e3cd7f8b2ea439c448539d4b87de12c8d06ab SHA512 a71219ff52006a7c8bf1553d0f132c747566c630281ef89aac40c65b193b1f0074fc9cda1de7057c76b452113dfb6188c83baef3ed9c05ff18adbc8b7bba646b WHIRLPOOL 2c3b3da3d2d578c0ba29230c0955fd48688fd5039f08eacefc4017c5cd357d1096cdc79a271ff4e7319c1bb344edee12f8c184c33f12569226612a4dccfb6d11
 DIST cryptography-2.0.3.tar.gz 427544 SHA256 d04bb2425086c3fe86f7bc48915290b13e798497839fbb18ab7f6dffcf98cc3a SHA512 fa569c4f5a994e2bd90810649fdf48115bfd5ff46790c849991e8f7a7c8b5435402f92453e4365426ee645623b3bb509c9bb781657c4b4e81e3a36b58ba5461c WHIRLPOOL 4bbbfb4c57a5c4de7c84654d6474bd9b7b0d1eb9ed1f63d91a360b2987187f7bb1910ff4ca540b37fd3e98a00b37d5963a92b2d6ae0acfaab1636f512e887ca3
+DIST cryptography-2.1.1.tar.gz 441477 SHA256 2699ed21e1f73dd1bdb7b0b22a517295de07809d535b23e200dd22166037fe6f SHA512 d021f7af1cb4c6430049d2213405b7bea84bc0bde9e9f92c99c87dd835b2f28eb28024d65090756d2cc72b63510f25d71c55e473ce00e1d24736c15037998adb WHIRLPOOL 1095cc8698775904019744bb7c7410f405183fa4b497f2a1a66bb3922176e2dacab3c050eb9d081fa0bf07aed268782950e9953d10582e4d57e953d30d93618c
+DIST cryptography-2.1.2.tar.gz 441439 SHA256 d7f348e4f5df146a0e75998544bab6d42313cf19a81a6e49990ab7b27cc9c73b SHA512 a5a1bf7ea60f172ae72816965a471be00ee092151c02d9d792579a4457cceddd181d5d95fb832752981f9bdd3cfb88a5d531562845b0b70f37b39fb0fbcafe85 WHIRLPOOL 49c543b80c09f77daf2a49a784bb2132dfadf07dde5b1f7e5c9174b215dda7113ab8b90a5cac386010bcc5fe0c012f55b601b895087f4c0bcbb126b8435cf440
 EBUILD cryptography-1.7.1.ebuild 1666 SHA256 07c512a796db87de7a6e3ee3fdd6425dd9574478c64ddf9088bb11d67ec5b42e SHA512 d30f513b2b76fb1fa100b9c9a06adf3330e66f6fcc18ca62d01dc493fa70aa6e84e6cc902e0d2d537d456c8fe8b963b25142bedd5d1185d476c032d0c50b7950 WHIRLPOOL c778fbf6714de843212ce33b5233647ae4d2859f41270eebd4c06b353ac383bb873e18fde0102eacb1acc37343ad0cf0ca0b6da8e7f61333a80a9f5befec5a94
 EBUILD cryptography-1.7.2.ebuild 1748 SHA256 d186c9abdd5f89e682598e1c2f6166fbc4041be7d71402f2d88317835c241036 SHA512 f6d6768259d982e8c2f933bd61fd103384110258bb7133184f54ec48a6c91593a6261cef15b4208330192a7678be45e53170ecb16ef3f64b761ae9d258ef7ae9 WHIRLPOOL ef1899c94574e4011964b1bbd6f3a70fe0c1a80273b63b818c8fa9cd36d365c94a92d6c28e398fa9212fe01fcfee8863dd34ae8dc4209a0801aaccd9eed6ac15
 EBUILD cryptography-1.8.1.ebuild 1675 SHA256 653083b45ac8b5e11eff9a8b5742d67fe5b55f45282ea462699d9db62f30291e SHA512 dc74e12777b873ebad3a97d7f8b205e0d200fac1479bc0d8c7e5b13aa8714d3d8866f42380540b6c81e48d83640abbe87582694097f8145e4c88ad0da314ca4b WHIRLPOOL be672028ab6564197e73d618879ea9c5d7015152ddc8d6d67ca5abec972498b2061af21f9216d2a5b8868d5831d46d67b6e197ed86dc72341245ecb2b574d1ee
@@ -12,6 +14,8 @@ EBUILD cryptography-1.9.ebuild 1646 SHA256 2535199d50fafda5a6e5e87c540a253292cee
 EBUILD cryptography-2.0.2-r1.ebuild 1624 SHA256 45e6fd16917c624c317bdab445dedaef029cecfbef987feafb54d1bd309c186b SHA512 ab34101a8b2556703dfd1d4947aa9c42b85489c3556e558ce0e78b0ed685c00d836f4a349c623b78c5e1d54f92156d982bcaa9f54b04c8f960f447b5be390bdd WHIRLPOOL bedd4fcab97551131372c3f85ca333e7b6f56d7841be9122322c5053475c6a5d5cd7a6bb75a9d33f5a579745d8a27dfe87a446591884a6f1194e16631306431d
 EBUILD cryptography-2.0.2.ebuild 1542 SHA256 07db5ba031dece262de146cc6a3d4f6e8bf17f2c4458e09def15a86326916374 SHA512 51a737cf880345dc75a7973870dba1971e8f35fba61b744bc4c352a643feedd9f342729e483383dbe4c0dd2b729d3564274bf57c77a35343143b70bffafdca1b WHIRLPOOL ebda0e16cf84820e8317f114277dcddc2edd3822100aa62646083c6fd0c7a725805c90f9b239dbda24a7f168a8b679dd43657be2e469cd252f96b7128741a674
 EBUILD cryptography-2.0.3.ebuild 1646 SHA256 948a31ec4b78bc9d00a228eadb1ecaa06161704586292f310e70cbf23b711907 SHA512 7d11e6ddae039e21eb205d5b4f71e56bd0bbf57670166afb57bcea711adb360653e4337a83a826ea11d1a964153b767fe05c7a8b00f16798f581e9c2de7ae966 WHIRLPOOL d0d674f90374d32f515895ebc09e3db92c58b07e9ca8a083f90b0e624ac204a45cbcddb8dc673bfdfb0c9233d7aeaca5f2b942a1d9efb916ac50a9051a4b4cad
+EBUILD cryptography-2.1.1.ebuild 1646 SHA256 948a31ec4b78bc9d00a228eadb1ecaa06161704586292f310e70cbf23b711907 SHA512 7d11e6ddae039e21eb205d5b4f71e56bd0bbf57670166afb57bcea711adb360653e4337a83a826ea11d1a964153b767fe05c7a8b00f16798f581e9c2de7ae966 WHIRLPOOL d0d674f90374d32f515895ebc09e3db92c58b07e9ca8a083f90b0e624ac204a45cbcddb8dc673bfdfb0c9233d7aeaca5f2b942a1d9efb916ac50a9051a4b4cad
+EBUILD cryptography-2.1.2.ebuild 1646 SHA256 948a31ec4b78bc9d00a228eadb1ecaa06161704586292f310e70cbf23b711907 SHA512 7d11e6ddae039e21eb205d5b4f71e56bd0bbf57670166afb57bcea711adb360653e4337a83a826ea11d1a964153b767fe05c7a8b00f16798f581e9c2de7ae966 WHIRLPOOL d0d674f90374d32f515895ebc09e3db92c58b07e9ca8a083f90b0e624ac204a45cbcddb8dc673bfdfb0c9233d7aeaca5f2b942a1d9efb916ac50a9051a4b4cad
 MISC ChangeLog 18416 SHA256 1c2c81e70a455fcf401bb7c0d61cf38f3de9e7a2cc5ba5c18865038dfd43cea2 SHA512 b327d91034d2141d3c39cc406a0d74ff019994a92dd8f35e8b1715d5f0ba00930a15f42e601013dd7d14a81de0a30fd3b0dbf66a00a2c555f6015b8a6eea9943 WHIRLPOOL 5f09b6aa83487c428ced79af0f2c4d5d85db223f74298a1216b3cc248494f0c7f85ef98aa8461666420006fed1caf61f18679985b75998cfd4dd8ed82be8d1a0
 MISC ChangeLog-2015 8237 SHA256 c22eb0f4c94dd39980a8ce9b7d3b7149bc4ce59a7496f87c7e34951715c94e4a SHA512 b11fd6ecb95dd1265087e007ead9245b577ae76591343ed8f9bbf7c730344f0f31e3562edb87768a4a4dc3ab78a982b31bcbdae52b0060f805a7c4d0d64ec798 WHIRLPOOL 5e148ed158f1a68f8c1580c0ed5ccd3b50a6c88ce2a6228c80f5354eac95f8cfbf31ea6c2e2cc65633b1ef7332eb181efac8eaeb1a954a3004b081b3ed162286
 MISC metadata.xml 384 SHA256 1eb9fe441314061b742ab80221c14c78f22fb93cb64f7eab4f3c89c6b95eadcf SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7 WHIRLPOOL b29d989556a30a69dd73203ee4fb22e15cefa78d441e10f153e0924f4666817530c703e44047f551379c5fa31666d5856c4b3684883064d130913fa9732f6c92
diff --git a/dev-python/cryptography/cryptography-2.1.1.ebuild b/dev-python/cryptography/cryptography-2.1.1.ebuild
new file mode 100644
index 000000000000..1c526d65add9
--- /dev/null
+++ b/dev-python/cryptography/cryptography-2.1.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x64-solaris"
+IUSE="libressl test"
+
+RDEPEND="
+	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
+	libressl? ( dev-libs/libressl )
+	$(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})
+	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
+	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+	test? (
+		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
+
+python_configure_all() {
+	append-cflags $(test-flags-CC -pthread)
+}
+
+python_test() {
+	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/cryptography/cryptography-2.1.2.ebuild b/dev-python/cryptography/cryptography-2.1.2.ebuild
new file mode 100644
index 000000000000..1c526d65add9
--- /dev/null
+++ b/dev-python/cryptography/cryptography-2.1.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x64-solaris"
+IUSE="libressl test"
+
+RDEPEND="
+	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
+	libressl? ( dev-libs/libressl )
+	$(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})
+	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
+	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+	test? (
+		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
+
+python_configure_all() {
+	append-cflags $(test-flags-CC -pthread)
+}
+
+python_test() {
+	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index 77bab24659bc..a551348daf78 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1,3 +1,5 @@
 DIST denonavr-0.5.3.tar.gz 60941 SHA256 8904bda0f6de1d40f602a26f909b592c33a82df4f22963f908168f6e031af585 SHA512 709f1eb2c51ba193ec17d3dc20d43d1f632a6e8b387b962e15b9b573c4d539357b3fd48cc177dd701b4b7043afdbab7a06a808b34b44e8c971f2f72ef6383d9b WHIRLPOOL 519f46898e1af12be5733c8d4cf2c0d65ecb191c283ac9b77f467680076b12f2749b5c183f823fda879e2f5ec855a36b67af3a95fd01b61a28a60e4092a16d19
+DIST denonavr-0.5.4.tar.gz 58307 SHA256 c9e7d9e6847565481f38fe3dd6fdd57277fcd20c9023729b360da55769cd738d SHA512 10242193bd93fc4465d51f7fa856be558932eb3610ed0e239b0758d657ed176d08bd9c53424040e4e12b58f87cb65d44ccc804e90cdaf17d9d34b64876a67b91 WHIRLPOOL 96298a59a52de9534b9d13fb95a049ed4f56ce358a8632cc711e54d0cc3dddd239fc866e9a295f89cba55f23bdd6783448768582f45035d2e048c21d629c0429
 EBUILD denonavr-0.5.3.ebuild 850 SHA256 e04b41bf6de459ab5f441854ee0dc82378d4d7b0da0756aba5102c6ecac94790 SHA512 d72f4c5747c6133b0cc205877e2c7aa1f67d05633c757b7df89a0bee38e9e7a35033a7f4c5cf116e1f93f94590e1a106f848cc5e82a470d6341dad23bf55fdad WHIRLPOOL d2e2a0acb896bced4baeea3d55351d505a16fa5792e679d002bd553e617e39f602dc194d1933219c0ef192e66e5fc981064d539fb9e040b83ce4b88a06541908
+EBUILD denonavr-0.5.4.ebuild 739 SHA256 0766801cb8259ae5e60694694466f8edfc2a6fcd7cd726684843cef6077331f9 SHA512 557aec9a04955dac993f9625ba39006ab88f6cb58a5a73f198acfc20f05394278c5d248e5f27679bb22250e650f706107c4ae97052460cb4ccb7a4bc8009005c WHIRLPOOL 9de601431fafdc2b26698fbedf20a81c07824462873dd87d10104753469fbcc0b6dc7feddf16dfbaecf7d380658d37c117abdef027982475d836fac03c1b9462
 MISC metadata.xml 572 SHA256 b128c4f7d3c785086b88e1ecfa1d49718f5ee39c20ad08ede23fe5a185db97c0 SHA512 009f44bf923f227dde48e3304ef2a3164f664b8736c872dd6e3fbf27a99ac67905e312a64c2389b9845295c164fcd0fe6125337ac6aa1c77097eb864b4cf3857 WHIRLPOOL f4ab1b6bc857fc41283a32d4104aa6c5ea47c25e486ae4b18b42bb6955add51404ba8a42f31599425cf50538520b18c420a6a30f2e15ab736c6c12b246077c34
diff --git a/dev-python/denonavr/denonavr-0.5.4.ebuild b/dev-python/denonavr/denonavr-0.5.4.ebuild
new file mode 100644
index 000000000000..4812f7dd0c58
--- /dev/null
+++ b/dev-python/denonavr/denonavr-0.5.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Automation Library for Denon AVR receivers"
+HOMEPAGE="https://github.com/scarface-4711/denonavr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)
+"
+
+python_test() {
+	py.test ||  die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/execnet/Manifest b/dev-python/execnet/Manifest
index 697147a56a66..e0dd4a5dc3c9 100644
--- a/dev-python/execnet/Manifest
+++ b/dev-python/execnet/Manifest
@@ -1,5 +1,7 @@
 DIST execnet-1.4.1.tar.gz 171041 SHA256 f66dd4a7519725a1b7e14ad9ae7d3df8e09b2da88062386e08e941cafc0ef3e6 SHA512 e8c0c32e873f8585ff4d4da3b9cbd40046479370f5653f67a98c9029d4535a619731d1b825332fe4af4dc5ebc9ab11ee879ef45df07f08943b1e1685f2255790 WHIRLPOOL 487c31617b78e4eeed9dc75ae8f01ade33aad35f7547677ec007b688071dd56e69c4f4b92cf9355dee7cea97bf6eac09f508099f104cf52d6c9fe3860e4fd3c9
+DIST execnet-1.5.0.tar.gz 168497 SHA256 a7a84d5fa07a089186a329528f127c9d73b9de57f1a1131b82bb5320ee651f6a SHA512 ca2b571fafdf8f68b3cc7a04ee326e3255828d4cde28ead65d0cef325569c3a6dee09359e525152248038de65326ffc6b75c8362f53aa5c0b3f736eb596cb2d9 WHIRLPOOL 2cd562109412e3133824705fcb4d2a7c083c6a3aac79456b104eea4cfb7f33346e90c82aed39afbfb8cb9990814ef6b088aeacf471b542d46441d2287ef7387b
 EBUILD execnet-1.4.1.ebuild 1267 SHA256 b7a57b057a44edf1c17b15107f3583f570bedd8c9bd80c3dad0ef0cfc1c52624 SHA512 f2319195883a57fe2d69328ac5258345c2234c3b5974cb269f9aa320953a97b17e60777a2e1a12de41363f9b353e059083188525faa3d0a7514cbd84dbbcb3de WHIRLPOOL 3ad3c00674b60118244f972989608ecd2dd490cac35880c70e5517b3edd2e65c2c8d3f38a1336dea30f3255bda1c24121938711104a36467dff36a25c2a80222
+EBUILD execnet-1.5.0.ebuild 1277 SHA256 d36d3b9117b356c6f11da9099dd4a9f57836edeb998de7c761b9df42f66b3859 SHA512 74818f088f3bd9d644f9b3c60964f96d8ce79a845121f114f4016b0537177481145adb5f27f1846b7bb67d2a1e9db82691bd44a8452e480b83f57e642eaf6d12 WHIRLPOOL d2859a8b080fd3b8761b79978305fbb3d1fa3c856f11417f8eda86207763f2d40cc8f5a5e0c0b7087da36e011255fee0e7d364a5fd0c92b1125d77c0a11c2f35
 MISC ChangeLog 3673 SHA256 d763bec6268da229319e3f0e51c213901d7fef248586214076d5a20580d88e89 SHA512 c7af23a568a3740602c3968c3fb67cca0a1ebe87727f0294a19ee8ebcc16cce36ca0ab37662ce1b7364fee3da8f376a365714c3961d5f319da6d05b95f1cc13f WHIRLPOOL de08c6d220e92b2d0f0c9bde47f87f972d2d051d7e3205660040b340ae0625a178903615b8d33e51c5338671fd3b90ea1b37fc405deede1c5b06bf46f77b5e49
 MISC ChangeLog-2015 3979 SHA256 ab583d6fbd59ee50fde491589b5e6a7c2c4bb62ff4479fbbc4fc9d71ebf2fb4d SHA512 84b40ef3c6a615dc001340a98a51e97ecebe94f0b3fdf6f89389115b3c3a2767b5f2f6991e4921685ab92e979572254e55ec93effc5a2d6d4de8a921873aaff4 WHIRLPOOL a9d65042dd8a1c54f764929cda16c738735c5069df42b3f5e13754d897a3e5e6e76dc0e005603579971cb6b626439a8f4a1e0e203f840ff203b9bcdfd42c0148
-MISC metadata.xml 537 SHA256 0ce0032e5a4c681acdcda81864bcaa1975957fc566819ea813696fceb93a675e SHA512 a5a760db3d0753d69c0bec281ac5b6d7920c2a94b01413fa5ec63541ca09b4e7cdd9a63ad7ae417e8a886c2ddedc505f5784fe928e2c673158a38afc2cd0e1b2 WHIRLPOOL 900cbe090e1023213267c394ff1a5c5d89539b62265af762802cecebb3437a7ace9199865f429159bc3050f3232371b1cc131f9fa9f7789eca81c0804431946b
+MISC metadata.xml 541 SHA256 6c4b30f61fefe51ed99f2a20ac1b52e7802ba1b1ab09d934ea147c9a6e6f6264 SHA512 8afb04a008ce5704560a8f984dc5662abb01244b93bbf655bf0c66365a125a07dd1adca26f75df2bc89f923409b3687bc610f0ed739879a6f66167b799963091 WHIRLPOOL b5fa455d1b0090f46cbe42afa56af8e75b2a237b5a42ad321cff7fa5f5a04a711695e13d14e4049355e4411f29c8dd218eb7f21c9e951ccba67e8af04d1040ce
diff --git a/dev-python/execnet/execnet-1.5.0.ebuild b/dev-python/execnet/execnet-1.5.0.ebuild
new file mode 100644
index 000000000000..3a8a1c3f8986
--- /dev/null
+++ b/dev-python/execnet/execnet-1.5.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Rapid multi-Python deployment"
+HOMEPAGE="http://codespeak.net/execnet/ https://pypi.python.org/pypi/execnet/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/apipkg-1.4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (	dev-python/pytest[${PYTHON_USEDEP}]	)"
+
+#PATCHES=( "${FILESDIR}"/1.2.0-tests.patch )
+RESTRICT="test"
+
+python_prepare_all() {
+	# Remove doctest that access an i'net site
+	rm doc/example/test_info.rst || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	# https://bitbucket.org/hpk42/execnet/issue/10
+	unset PYTHONDONTWRITEBYTECODE
+	py.test testing || die "Tests fail with ${EPYTHON}"
+
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/execnet/metadata.xml b/dev-python/execnet/metadata.xml
index ab39f126c6cb..780195f0f3ee 100644
--- a/dev-python/execnet/metadata.xml
+++ b/dev-python/execnet/metadata.xml
@@ -9,8 +9,10 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<longdescription>Interact with Python interpreters
-	  across version, platform and network barriers.</longdescription>
+	<longdescription>
+		Interact with Python interpreters
+		across version, platform and network barriers.
+	</longdescription>
 	<upstream>
 		<remote-id type="pypi">execnet</remote-id>
 	</upstream>
diff --git a/dev-python/flask-admin/Manifest b/dev-python/flask-admin/Manifest
index 4a6f7a1d53a0..5adc9c4295b3 100644
--- a/dev-python/flask-admin/Manifest
+++ b/dev-python/flask-admin/Manifest
@@ -2,8 +2,8 @@ DIST Flask-Admin-1.0.6.tar.gz 235842 SHA256 c16d1bb1b6c2b6ac8db8486b9a5e1919d1a0
 DIST Flask-Admin-1.4.2.tar.gz 922579 SHA256 7d1cfdcb29a7135d4275dc22628c0f068cccfdb84dadad885bde685d0511597c SHA512 e736d5f6d05c886ac8bd96b7524d6bc7af956fd9d2f183d1c0872ea346301d67c5b634589b94b1de3be9fd5f1595ad95505b68d80adc613520259380bb9b0be5 WHIRLPOOL 25b20415ebb3286f59f496d4d443d560e2036b1f9521de9143e97821db5929d3b17be1bcd8cd878cc12e4c232781df4a57540e19655ea1567a6adb4bb8cad812
 DIST Flask-Admin-1.5.0.tar.gz 1598074 SHA256 fe3a96d99f22e293cd7e83d364de6cffd36573ef25db93d6e32102527a624bc5 SHA512 dbf5b97f27228eb000fd1298f4da8d4824196856e4ba9e2d8cbae6e562794ec2d1a998b382efaa84ec4fd7a74ae589a739c52e117efebfb171f19bc16e7350e7 WHIRLPOOL 875c1db6527ecb3e1526a72594c017cb999d3cce9a0737d7947726b01511d5ba790e21183aab16d54977f741dd1b51338d2daa393026d2ec3bf37336861f7d7a
 EBUILD flask-admin-1.0.6.ebuild 1187 SHA256 eefa4c54dabf1451d78ff03bd712018fdbc854d797cd0a73b378ede59b7a1b8e SHA512 ca3866cdd8fd63b475ad4a3f0c8d7ddf93c68d085b1904ba4dac74fa55686d4aec3b08ed8bb990e73dcfafb9562d76113e08d41c4e1b60560a4292311fd81aa4 WHIRLPOOL 2678f13573efc93742ffe7e6e2e4b80ceb3ab431b29935f29f909a6459fa3e8c705c9d1c1aeefd972afa91f8cbaf5d0947ab92410c55cdecd724a6e2729c9dd2
-EBUILD flask-admin-1.4.2-r1.ebuild 1558 SHA256 578ea41d46f2717d2a3ab0b3d26c998464760f586302283f6f0a47ad78a34a1c SHA512 645a3b3ef6fa977551d7773a485d68ab3fd759a1e18140086bf716f94f4d9e2497e624589555c031702e50732d43b2c77af3b1156f0b0c7ef0309868c89b2934 WHIRLPOOL be96bbb9b6abe71b0bcd2a8f138b8141c8e144e32edffa424070538040874a70255fea1491694dec7ddbf788fa0541c57810e656725dd46b20a8f183f8c6df2a
-EBUILD flask-admin-1.5.0.ebuild 1558 SHA256 8eb171cafeff62079b24646cdb45f8d3b11e644c9e989e3ee7aff81d3312bcd3 SHA512 14dc8424ec849007b2adca10d31faf35b013aeff6876ec35b2bcdc2e72429cbf4092b54764e67bbfe7f251579c2c2f1074341e671e767434942914bf976e7abe WHIRLPOOL 5757fb9be279a083a882e0f58888b1aa79addc9e9572e8e5330786147980334c96f8b6bd47871f48aa0c9ac86f7c5f621f7039dd162f2050ddc21c4f8324202d
+EBUILD flask-admin-1.4.2-r1.ebuild 1561 SHA256 8a8dce2c97f737a07f61bd8a6963c6c9436a1bdfebd915644cb37454f32d3db1 SHA512 b467c1863fbdb47c8a997121afa24343aa147593bd71e4ccb31221c45719e82291e34afab7dd42dd21925d4f97ee0fdb2761054feef39a34e24cb2b4fa99d24b WHIRLPOOL 65efa4aed0b705857c276e717f22067551ce92c1f848def9498861945d78bb540d175de88f3188cf6a1ad4535826c15ceee6fa036fa974dd72b00d7efd2f6818
+EBUILD flask-admin-1.5.0.ebuild 1561 SHA256 8a8dce2c97f737a07f61bd8a6963c6c9436a1bdfebd915644cb37454f32d3db1 SHA512 b467c1863fbdb47c8a997121afa24343aa147593bd71e4ccb31221c45719e82291e34afab7dd42dd21925d4f97ee0fdb2761054feef39a34e24cb2b4fa99d24b WHIRLPOOL 65efa4aed0b705857c276e717f22067551ce92c1f848def9498861945d78bb540d175de88f3188cf6a1ad4535826c15ceee6fa036fa974dd72b00d7efd2f6818
 MISC ChangeLog 3259 SHA256 6579aaa1cee4aec7952349ffcf292739295840fb404b21c07544641eab52bec4 SHA512 6c67d900ac784c936e92ec0f6c04b6f9b5e3ce3c807f041533c7f7be7fa970bb040a43ebcdd852e49ca6347286521c19edb6f527739b52633540a86509ab0979 WHIRLPOOL 2ebf96d18761536c7cf5ea22e44a06904ab49925d60f72eef4d9ee94878eb4a6183b0f0d1411cb115a8b74d269dcaf79bffc8daf719a4ed6099c2ae4637911d7
 MISC ChangeLog-2015 1258 SHA256 8c4ed82aa60fb011fd2d64bea1364b5b82c49bd6789b22dd4930470e9acc36f3 SHA512 ae1a44ea1bdc17c3eb9902f349eb98504131b444d91f80eb7d343db52a09f3a6188e074d12551463e205e9d281daa9138d941e677a3bd7da542a15ed6453fc44 WHIRLPOOL fd711730600b5e637153f709127f75fc8a9da7760438c40cf9a8ec44b48e560548ca77f585ded4b70b3c3e4ff1459044d4cbefddf10f2e440fc7bbf3f640ccdc
 MISC metadata.xml 324 SHA256 b1a7662375ce6c78e5b74214ca99d19ded75810fc44ab0e6865d650a57b23149 SHA512 02944086c5f7fbcc10241e5596db8caef60c142ddfcc28627c9e7bbe9b472663fc6be2f6234d0205233c7ab5e51b9a4a1c4f7f08256daf1314ae3f0274469ff8 WHIRLPOOL 6e48bafcaffa4b9c4bb716b6c054374f4380b37fadb0c32e5f7550b241d100b32fac7a939f192174b93d5b46a07fb492e9d1e30c226007146350eb4844bc358b
diff --git a/dev-python/flask-admin/flask-admin-1.4.2-r1.ebuild b/dev-python/flask-admin/flask-admin-1.4.2-r1.ebuild
index 4448c1c4616d..655c35bfca6a 100644
--- a/dev-python/flask-admin/flask-admin-1.4.2-r1.ebuild
+++ b/dev-python/flask-admin/flask-admin-1.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -36,7 +36,7 @@ DEPEND="${RDEPEND}
 		dev-python/flask-babelex[${PYTHON_USEDEP}]
 		sci-libs/Shapely[${PYTHON_USEDEP}]
 		dev-python/geoalchemy2[${PYTHON_USEDEP}]
-		>=dev-python/pillow-2.9[${PYTHON_USEDEP},jpeg]
+		>=dev-python/pillow-2.9[${PYTHON_USEDEP},jpeg(+)]
 	)"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/flask-admin/flask-admin-1.5.0.ebuild b/dev-python/flask-admin/flask-admin-1.5.0.ebuild
index 7cbd867bf944..655c35bfca6a 100644
--- a/dev-python/flask-admin/flask-admin-1.5.0.ebuild
+++ b/dev-python/flask-admin/flask-admin-1.5.0.ebuild
@@ -36,7 +36,7 @@ DEPEND="${RDEPEND}
 		dev-python/flask-babelex[${PYTHON_USEDEP}]
 		sci-libs/Shapely[${PYTHON_USEDEP}]
 		dev-python/geoalchemy2[${PYTHON_USEDEP}]
-		>=dev-python/pillow-2.9[${PYTHON_USEDEP},jpeg]
+		>=dev-python/pillow-2.9[${PYTHON_USEDEP},jpeg(+)]
 	)"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/future/Manifest b/dev-python/future/Manifest
index 2c938e77d63e..8767dcab41fd 100644
--- a/dev-python/future/Manifest
+++ b/dev-python/future/Manifest
@@ -1,7 +1,7 @@
 AUX future-0.15.2-fix-py35-test-failures.patch 2339 SHA256 563628f399342a6f5035b105f0cc1d56f7817025ddb20d065447c563719fcc85 SHA512 816a3d30461f6e0eed0106bc46952e3f6d98323d03ff3f212332871b7eaf7d3b9817ee2043110bd004152c4239bfa427d9ed74f1dc7166d41534ba0fc76ad055 WHIRLPOOL 65cd5db9c57e00545632df729c8613a975a63ad787caeaaf222d8a7ba72a3dfe75b11efddaff3fddf246ff771bf9053e3e6b9000a971d4c3cf7ab904777b4bc6
 DIST future-0.15.2.tar.gz 1583441 SHA256 3d3b193f20ca62ba7d8782589922878820d0a023b885882deec830adbf639b97 SHA512 24a0eaf70795efe1644b098c5abbcb0103d9172a5243721f0d26b1cbd108872b6c0616180da8f5507855ddfc7b26bb10a606a64e59d307d39042b346700f77ee WHIRLPOOL 557b53495033d4586dc0f34837cc7f0cab12fb770abda56049fd90b5bac3e36db561e185d86e8a08b153869f0f692ccf0b305f5edc20871edde487faa1b1fc4f
 DIST future-0.16.0.tar.gz 824484 SHA256 e39ced1ab767b5936646cedba8bcce582398233d6a627067d4c6a454c90cfedb SHA512 41c795cd1746a76df84de2da9fbc611fc6164322c1c712ec9e8a8626c21c2717cb4899ec150d95c5e0c037270e6bb71e099edd169609369aae619daea9df2e5f WHIRLPOOL 744ab7e228c608f49308609e18778e198804a7b6fea3a6285efcce14a4ea8d114e146e94779e084ac91916fb7cc560be2178806378305b40568d6bb7ff448951
-EBUILD future-0.15.2.ebuild 490 SHA256 ed6145f6dfab57b955480719c27e24179994720c5f8a292c654df9c16f714405 SHA512 2830318a18c7948a413e83401e33a7dc911791ae672288160c49159a96918d9556d7077746efed3467fda487a61b07da0d34d8adbb6c38ea7618cd8b21d48ac2 WHIRLPOOL fa5cf6ed8ecef08e69549139c3e48a606f9f6a8d8368f5e0e295130fbd6afb3daf9dd22801f80c93f73941e55d275c3a07144f37dcb6fb8dc7c290af2312ec34
-EBUILD future-0.16.0.ebuild 555 SHA256 aa31b591d1ba357e87dc802d018085fc1b00afda2eff4835a79466fa5647628b SHA512 b68848c3df188420e8a3826ed06d4e85994278e9214ae03945b801a7eeb0df3cb440852dd4b42f54c451cc2a7c2efa27e9bdb8164309794ff502b375d1113207 WHIRLPOOL f86de97d310fb9ad158534fce6ded08ec3427c208e7afa36506ee50be50b95c28bac3e74bb270235c9dbc073558b5bd3929fb63455f81a1364f19ce90faeaeeb
+EBUILD future-0.15.2.ebuild 496 SHA256 bae2d56d925f9250db304d426eccc49b0f74ca1afc27fab04ed32353bd883f2a SHA512 673c6e67a56de5324b91be86b99f510095fba1f79c6e236da9eaaa58531b4a461698217c3a2a03bfd279fb4ab3f3d7f765a01cb05e3634004a7e32877646027c WHIRLPOOL dcde4874e86a35322e8b1b64e789c0a3b2dbeb8a034034b3d3eeed38fb3e49f2d8c978fd4e4690b1b4ce5c0114713d5fbadb94d10afa5ce525dc1ce336936aad
+EBUILD future-0.16.0.ebuild 561 SHA256 a7e8e0904d024f68f9030f254b8ca6cfb1fc3bec6cb3a72176ad0e755958d3fa SHA512 ebc8533443a3551c37467c513c66cd207f933ee27a30ed5e73bccd407b00a39f4554c2c48260488f58eb28726c98a15418bcb59fd98914b00809865b319f2129 WHIRLPOOL d04917e7607591027bc722966d25a9ebb43bd03d8f513255cf86b483c2929110d8722163c1d71a04a4224c755f8623ddf302a3d81e3c4bc39eb0bd36b3ba9903
 MISC ChangeLog 1394 SHA256 98c7b22ba268a5ab6ef159456f749e2fe89f22c18ef62da04f14f2d2dd65a007 SHA512 4a6dbf4a22ff0af654f1b367ae6534b92c0fc3f37407c8de7be5514fc5a9de6abcc8380edaf6fb408a740ba074c731bc98b021ffeccbd44c9b344512185668ff WHIRLPOOL d627df34b85c5e6bfa05c058a0ff0846f2bec52ef7938c38e360a4e3a4c03a8412d5fde79c19f3ca0f35370574b087f23238c4392d199a8226f33f639a5d8085
 MISC metadata.xml 309 SHA256 b34d01a25d528ef86a4bccb18881a1623e31aac8a8df38c36371fa6f51fbf3e3 SHA512 e01e3b2733211e1eb6aaef4da19265c7165411a46fde4c2156118700c315bc2ad52cd87de1b90355741de77d91aa22eed5f9e5847d45186bf7138d246cd775e4 WHIRLPOOL 8f95c0410c7e60dec33b734054a4a7b57283b4e41794a7b24b006142457f97f4a5bf08ebf864e6433d5634a8e54a2f96183aea698cb5aea31be3d0ac3e01e924
diff --git a/dev-python/future/future-0.15.2.ebuild b/dev-python/future/future-0.15.2.ebuild
index 065b9adffcbb..d8e02163af82 100644
--- a/dev-python/future/future-0.15.2.ebuild
+++ b/dev-python/future/future-0.15.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 x86"
+KEYWORDS="~alpha amd64 ~hppa x86"
 IUSE=""
 
 PATCHES=( "${FILESDIR}/${P}-fix-py35-test-failures.patch" )
diff --git a/dev-python/future/future-0.16.0.ebuild b/dev-python/future/future-0.16.0.ebuild
index fb402928085e..ded90544b7c5 100644
--- a/dev-python/future/future-0.16.0.ebuild
+++ b/dev-python/future/future-0.16.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/futures/Manifest b/dev-python/futures/Manifest
index addb258de55f..cde3047999d2 100644
--- a/dev-python/futures/Manifest
+++ b/dev-python/futures/Manifest
@@ -3,7 +3,7 @@ DIST futures-3.0.3.tar.gz 24959 SHA256 2fe2342bb4fe8b8e217f0d21b5921cbe5408bf966
 DIST futures-3.1.1.tar.gz 26471 SHA256 51ecb45f0add83c806c68e4b06106f90db260585b25ef2abfcda0bd95c0132fd SHA512 7ccb041271ed2688591942f46ab2d2c92d806efbd5209ff9aba77c6d5d3c1a1495fccbeb1718d914894b0b8d936438687e8f3cc22b7ab6625fb518321084ead3 WHIRLPOOL e0c71503261511713872344cd7e8c429ae62ac5fef934758fd1c7b60a7a697c824bbc78ca1aeb7a05b03c8b2a14ca63dfe3028e7c48e78670ecdbe9dd66d0051
 EBUILD futures-2.2.0.ebuild 1033 SHA256 4e27167c9c2e33b0ae631ab1b342d79a4a3f9ca56660fececae8f143e6484e91 SHA512 5bf24a597059f6195478944b836171132f9489b2fd880d84bbe1dd1bf80392dea2e6a3d26b551ade75eca507c1c8014fc7315e030a8131bfb9cda510f57f3bd3 WHIRLPOOL 2b3fb62c36187235dcd108454c12c91bab405049598f58676819f14bcfd6c9fddf923af69b2383914fded7c78d5d9219ecfb68674baf7b5947503255bc7e0703
 EBUILD futures-3.0.3.ebuild 1085 SHA256 1c1da03fe7369b9c43b6613fe5e56a1fdceb121a33e08740e61ae4f52e25d36b SHA512 616046f342a0ed20ee369c96741e1a6c223b2a302458764a19eae8cb632a990ec15916c2b93a681b5fa93e8bce420b8e785179ce627366a378c224dde3535962 WHIRLPOOL 4f5032d96d09503cced261d15da91b0d8efa5187ea8096668234cf91c5a5a08ce2b69b72db869c3eecbe93f90b1e6254acf7eb002c84f68e1526b3f663d1920a
-EBUILD futures-3.1.1.ebuild 871 SHA256 285d0f04a982a279b629999489a887f2179978ea50136d6f5fabb9ac86273aba SHA512 a1b9ba40a36312d8e5480e48f99b1b8939eb99ec80b44315ca153d1dd4faf41efb356dd4bbdba411747a2d88d34736f07730d69b723e1b1b6500eef95b74ee2e WHIRLPOOL 7237df320cbff2517a3417d5d04456c9b1f9abf454bc386f71af8fe1f8f04d047fd3a59719244fb00839a4df58cc0137435d6faec86efc050f273d9dc4686b88
+EBUILD futures-3.1.1.ebuild 870 SHA256 c97d12b911f4eb7be2f76fd7ba36aa7fd74b423fd743145eb1ddea7e89fc658c SHA512 6abe928aa404ac45cd6dce880d0f611ea3c6a2f8509f82aaab8ffbd3524e1e29ae2ea34d43fa1739159a37bf27d76595536d440dfb13d305ae5e9bd80388b218 WHIRLPOOL e33e448b5277c4542f54c290ab054af8e524c28772ef4bc3445bae95bbff65aa343e1005116f2ca27eb7527b3fc9057092edcbd534dfa2133185620db0cbd111
 MISC ChangeLog 5863 SHA256 7a99fd9a7494a1ed68b4a314d6a446a382f233a40a30202ee33dce89f10079a4 SHA512 be5054a2be7d2e83e54e9e47f581efc4c4723c6d976cfc044d25125b51b42ef000c8ce1451c90f641b7a89f944890365436b01af2eaeb7910e021aaaa7843d9a WHIRLPOOL 8a0f755983a2ff30f025415c752be7e4c9bf4d4cefbec383d70e039828a1414b10440cb8a415ad6bbe74f1eb41025483bbcc52e72b8a3c0d7e90203efbabb06e
 MISC ChangeLog-2015 2528 SHA256 da01eaf6a1fddc32e34248deb91fedcf59f34419924151107936ef810535a646 SHA512 50450d9419492267a313ff8df10bd709d1b959fd60d914689a3de1e4db71fb197acb0be903ce67771a8000dfbdeddf10330f4ec60b4055111139eb0029bb1b6c WHIRLPOOL 94a942fbf61cb1ee6ad67aec32dbcf19d22ee491d27f5034ec0314056bd32fd349af81a5d70a50f388383abc492ad6e728d51cf7749b0558b375a57aaffd00ea
 MISC metadata.xml 310 SHA256 3156dce7e9e3a82ba0d74f0b723a68ce309fdb23a7d3505b034ee0bc6f7080f4 SHA512 a6efb8ac5fff2d6eab08681ade46c776ad393e65ac9c5fdbe53977ec7cc852e05b82d7466001caa91021eeda0e03ff6513322b90251b8d273b72d80ca30ef20f WHIRLPOOL bd72826cd5ab21e6a11337447d3848524df1a01f0a98c0cd6d416d47c107e2a7abddc34d16da23ca9b2b6c2d25c1b52e60fb4360a4004e964aef7e2dadd1f3f6
diff --git a/dev-python/futures/futures-3.1.1.ebuild b/dev-python/futures/futures-3.1.1.ebuild
index 0b7ad52ac7a2..141b2a2791d9 100644
--- a/dev-python/futures/futures-3.1.1.ebuild
+++ b/dev-python/futures/futures-3.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest
index e74dc6b8037c..ab3da67df034 100644
--- a/dev-python/gst-python/Manifest
+++ b/dev-python/gst-python/Manifest
@@ -5,7 +5,7 @@ DIST gst-python-1.10.5.tar.xz 390188 SHA256 ccc7b63413c29196401488ca2af599ef8bc9
 DIST gst-python-1.12.3.tar.xz 388220 SHA256 c3f529dec1294633132690806703b80bad5752eff482eaf81f209c2aba012ba7 SHA512 f4d0d09a5b068e79496aa5e0d73f09af2d1e929cf6f80874dba8396950952b795a30f5a33c18b42a650f173c80ce342f959d497aa0d9d281bbe36507a71d1b4a WHIRLPOOL 2903fe2391173c731ec91a3c750c99651dece4ee6789059d6235b4e1e748b81e65a50e6bb77835e5d5a60ad315c3225998da3b44b3141fc729448c36b1ff949a
 EBUILD gst-python-0.10.22-r1.ebuild 2148 SHA256 ad01d5164839df14bc10de659b53c6d78d4fe00f31f4b9533141207b8a9b2183 SHA512 ebc646247140167dff59b882007d1919cfcc03cbc872d2d0db1dba3887287b3f9110a523df844da4b59ac70f764a8cb1f9de570ac660458a29d0802b7791639f WHIRLPOOL a95ae5bff61a4db977c442527d75076b8f30fd0460f6789db43d83f1261a1ca96e90ba5572f38f581dafdb463b056d9f5aa11e796034831fd0f1c9dd13a9c1bb
 EBUILD gst-python-1.10.3.ebuild 1121 SHA256 7f451ae76de262b1383f95ec700be01a3c5e8b48bfa283cd424525167bba9322 SHA512 82a9e5b7ad9811d59cfebe0772b4003822bd179bad5d00ccbcdb4c9cb1e03ba57b9c116f0827c635ee3005c0bf4326f4d57ac51c77b7d941058a2e524ede4545 WHIRLPOOL 8a92d7d87beab2e4e3977455b21b73635885661c2e4f5ece4e9cbc674648be16e4087491c7f9844b7c712d98cafd35b361f100f7bc72a6134e71dc3ccf827525
-EBUILD gst-python-1.10.5.ebuild 1128 SHA256 dae8ebfbc1e10ea73aec19fa5fb32b9adc679beb944abe7b579e31a1840ae5b6 SHA512 69ad39b66f451d44da914a59e0d0c3424852417e3c8ff34545705a84da7e2008d053dc626954e52ae3e8296a30874af2bd74315b1fb7655b745d8e841d5a54f7 WHIRLPOOL 3b273cbe6950174953e886056a095d65e1f00e35c5a25625df018a65b48d8659026e182d2ccdaac0d94391f3917683da53fa797b4a28fcad4bf86ce8174b7d10
+EBUILD gst-python-1.10.5.ebuild 1126 SHA256 bc7129b274d5602c5057279b495d006379368b275add16d8856acb662750ae87 SHA512 cc95c1e419634aa8b55cae379c7d57251281c9fe65a8b2ddf4e8d17ac113173f5c71ae0e602fc287408d60a0aba7450a5c0d9ef15db9fca3acd8556c53f9c702 WHIRLPOOL 2272e84b73cb036f8fe3dd335740b34c3afbe73a65cf7a2f4c278b211bb4ff7d7500edee4ebeae4affeeb0c38abafc9754adae836268c63c6b0e2a2cf71ecc1e
 EBUILD gst-python-1.12.3.ebuild 1133 SHA256 6b0d0fde717dc0db1340d75d37d95ded7ee6b58692b072d72f12c91b462c5ab2 SHA512 f81a6bc528ebe479583e922524db39f13ec2c3dd8baf7858d99ca5743e298a488c0e3e221341880811dad6fe6736a7102a094ea1571f65baf2f822ec8b654a94 WHIRLPOOL 1779c5134cd547503c7be651d16319c2891d3536ef75605021581359e313345d85b4aa28c97363a0df17295ec153270e0cb61a71425be289bc032442b0d16142
 MISC ChangeLog 8901 SHA256 5b4d606ecd7d165a41fc1fd440ecf2a4f80f098db793db1d717b8a6b805be372 SHA512 8a818af9dcdcbc2daa50ad8abda2beabed387aa301e7acd8adda9119157f82ef1754eeb7ce923fbf6c9ae0399a6114946b60938282462f28e6e8ac11f99af22d WHIRLPOOL 3c3cb3912b79fe75e2aa41b4ea6fd1bd32a991826fb5e1481ded90eac868b314e3d04973417db3030027e006dc7b4c1a6d60a4f4d1b8a5f096a64828614354ff
 MISC ChangeLog-2015 19499 SHA256 faa35ccc2dcdeaf3f92a918338451aa330a6e7e959268cbf03d8a83f11a0de77 SHA512 93fbf1c4c68e5b7212ad6d310a8ed1d13710d4f2e8b7e92715d7303b6b7bf71362b0813962268e4b7abb21c9ef8f5789e0ad5fd129e96cfc2199d52de2d271c0 WHIRLPOOL e1cba65dd70b859bd351bd0634201adfbf91d00db882d03bc7439bc964d0ce17b66f6ad3b8433dbb483ca1c0e49bc3a1209fbbb2a5a410e51d9b35e28c6b1b00
diff --git a/dev-python/gst-python/gst-python-1.10.5.ebuild b/dev-python/gst-python/gst-python-1.10.5.ebuild
index 9459dc429bdd..8bc72a6cadea 100644
--- a/dev-python/gst-python/gst-python-1.10.5.ebuild
+++ b/dev-python/gst-python/gst-python-1.10.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/hpack/Manifest b/dev-python/hpack/Manifest
index b1c61f19aa7c..30ff652e3c81 100644
--- a/dev-python/hpack/Manifest
+++ b/dev-python/hpack/Manifest
@@ -1,6 +1,6 @@
 DIST hpack-2.3.0.tar.gz 41610 SHA256 51bd9aa8151efd190d70fe87991b1e3b79be0f93f0e34088fba2a8d34877a0a9 SHA512 a3d13da105482bb258ee3a2314b2629215028777f84127f71359f08819c96af088a3952bb0a74435472035d10ee6e3943cdad689a28f04cbc12cddcc4af9a8a7 WHIRLPOOL 8f47b6c2a78f915b009c35ecefa517486c27eb45f0b99834718152e14f9e934c23d52981c87b0c39af28fb9cb58d94e5eda07db2e999c37900b76b7aefd64b08
 DIST hpack-3.0.0.tar.gz 5305971 SHA256 0f8f5f92cfa59f91804eabb237d4b18895f3e200e282c41cedf6cd11a4416daa SHA512 7b9cf5e643dff2a6454bfe419b797c8ed1a0fe6ec3b725d2696da5a820ab96fe87a64e600b1831c7024bd82616b155a0aa058301acb32172155b6538ba0a73c6 WHIRLPOOL 3252253a9f489d5bf4bc8ef243f576c99f5fa9a49d2767ca1e7f59ba15da1e00de3b083e6e64f69bb8c3c32bf27b177aaaad94b3cf1aba1c726d473d7b062403
-EBUILD hpack-2.3.0-r1.ebuild 1037 SHA256 54895f4391112a042e43e26d91f1d55d4194014d76132ceafda288b7a33e696d SHA512 f44d46b46f3cb4ef53e416b3d141fc3db00b304d5b79867848db10e8b0389f1a53b44464b782d360a7294c6d307cc9701e2c7799d16ad800c5e201a2909abe35 WHIRLPOOL 59e3ba9f8df693859fec946451069f1d0b710c92208e99b87255b26d69a4b37b293bdcc0c4016c8c98c0445c82a4744fa92889e0204e119b6320fc2287b3b7ea
+EBUILD hpack-2.3.0-r1.ebuild 1036 SHA256 507a6a54a142fbf3bc93e5c7393b8067ce140a0ac40e209601e294ac9dfac956 SHA512 05c86a6eca24d5786515b22fde29fc7bf8e2bf1626bc35e9ce38a801df5f4b6d6c57537011636a9e437bd39be6963cc65f5ec2e04b8e49a982f376d7882e8149 WHIRLPOOL f6d7351238774c531e482f64560c4073271d2a4bd73c44d984c1ecce4a329c38ae689b25b7192bdcb7cb08a589729567471d6213532c675b7d09d7d461f91d53
 EBUILD hpack-3.0.0.ebuild 1077 SHA256 f9f6031f81ee5cb4636ca25e78dfc24f2eae5061a655be20bf89014eb33ad69c SHA512 2ce9835a2aa1f3eabf15f320ca34164f4007a3ba92ae7e316131bb5ef850f7d8814c3dd257466e32416a235fe9c8f65fd074241c8142954817f262b6bb30aa4e WHIRLPOOL 07ec571e523b8451c822d2822ed8438c1fd59f99bc5c4c26f4b04360e330638cbb3180978baacbf4a6277872b7d47b19730a474ed95d813e995621db959c86d5
 MISC ChangeLog 523 SHA256 f001fd94530baa2f45994b34c7612a68954b1a95826d1dba5629c2abf8f7a9d3 SHA512 cd250280a0008dbbe71f978165c7bce670c71e69177876fb64e87267726760dba4ef42debb3acfc51921d116d37462eb417f2455758158cc448bfeb110d5e5ea WHIRLPOOL 9714e0c8ffe42e81e7dd2c8131034963c143dbef8a4b739fa223d2ac58a6258c254d7881d4e885c0d76f937ee70108037b0a10c39d9858bd0314e0d651c496d3
 MISC metadata.xml 803 SHA256 1c1a3736c451f7ebceedc758010cd28721c9bfd0334f461da7c2026b0005eaf3 SHA512 b8ac20ddf96244080d349be25143b5fda799e158b16363aa23bc8b628e241fe7c8a32f8f281c91f56c80a7a91130640d922112f565c7dba470062ce97db528ee WHIRLPOOL 81c63dcf91a8f38a14015f5dcd5ca83997655ddfa73c831e27af1d0e0d8a63b7d76266c1c32546ddb4652bfdb1a1978f0ccc7914cb2b9eaf6d40971b4e873ed6
diff --git a/dev-python/hpack/hpack-2.3.0-r1.ebuild b/dev-python/hpack/hpack-2.3.0-r1.ebuild
index cb4eb89e1531..4a0fed57c12c 100644
--- a/dev-python/hpack/hpack-2.3.0-r1.ebuild
+++ b/dev-python/hpack/hpack-2.3.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/hyper-h2/Manifest b/dev-python/hyper-h2/Manifest
index 9b7dafc7d125..d501485053bf 100644
--- a/dev-python/hyper-h2/Manifest
+++ b/dev-python/hyper-h2/Manifest
@@ -1,7 +1,7 @@
 DIST hyper-h2-2.5.1.tar.gz 92713 SHA256 673937480f97ad5a1fc8d78ff937352083c82525905b0f631db841c776a91f76 SHA512 e82a7e6b592b43d74defbd4c729ad287ed019881f6ddf0d2dff9d3eb4fdba29cab8d988848ec64b693da77df5cbcacb06eecf1ecd77843c66c9eea8808fc949c WHIRLPOOL cc1d761bc636fcdb1d760c04676c50427d6a0940bf739244e738506982116338e108a4d2d2dc016127894d1dea842709a2f667239cdd9320e4f1fcc73e7c86bb
 DIST hyper-h2-2.6.2.tar.gz 169942 SHA256 af35878673c83a44afbc12b13ac91a489da2819b5dc1e11768f3c2406f740fe9 SHA512 4bbdb26fabe2ee72e1b22e91dcc2a727d4b5c4e2cc465aaf45a15d004062740db87ef5f35f369fd423cdd6fdb61475f0dc423cbe7cec1bc52ddbe8a7488acf1d WHIRLPOOL c9bf4ca23dea8d6223c1d560cd9a95432c782da75c12f9fb9c269245bfe5aa5322f956c587adf00e7a6b8946a8df6c3e26389bf6f679789a1567c5920bfaa5a0
 DIST hyper-h2-3.0.1.tar.gz 2198911 SHA256 fb77d22e844ea4a81ac9305249f4fcf73d06bf7162687980d9a9d20a63133e6e SHA512 5d98b4fb654c20f6b9e6918bb71b88a42a3027bae795f31c32c2b5cc4428774457c44a194f9c819f99b9cfd01753a6e6d8edb6c162020ff463602452d8e9057c WHIRLPOOL ed387ca70f29ee507f46712991def5b7db87ff0b79199848b72ef153d60de74c22db046e926f6dd4af3e955af68455324707f54874014b7c17e91b153e48ef02
-EBUILD hyper-h2-2.5.1.ebuild 910 SHA256 3499c037bb5f0647e65eb098f6cbbeb4208ac8b37008e5e416ecf31fb0780e22 SHA512 d2047fec6abaf6913c38203098a807b6ab7fd08fc8cbed6d4fa55aa00b19a28c2098764bd3a91c2d3479ad6862d61e6133e6a5cec10fd4a634a500d7d6c2a7e0 WHIRLPOOL a922439f389786445741a1f8369a711efb5de17cb64debbb8be81164e34d52aa134b3af446b8725ebed23a8f17b2f9b8b4f4c0f6d6565170bad9d5e1b7961ce6
+EBUILD hyper-h2-2.5.1.ebuild 909 SHA256 a3bbc1f88db9a178e146bfe097c866cc3586af02705b8c77360444d1aeeb5b66 SHA512 7be65db24db69d3cd16fb79b411d0b863f37f578d3de41eade2613db5c336a665092e3cfe68c5daaabf04c7734db2c2c8c8772403ab350dcfe3860d18608ef6d WHIRLPOOL dd0d86e1c6cd7c51ef2f8ad0f7c57e5539fbdaa1cf6e980140a36ae1b733d034aab0948dd78ecf951e0c40c7e5e4d90cb7f99c78d23d4b0d5988be09b89aac2e
 EBUILD hyper-h2-2.6.2.ebuild 910 SHA256 476056b9f935f24e426f3115552d73996520b2cd43c5b0b475b0d87534efa866 SHA512 97999129a918910602e18c8ca3cf975766ae0a6d08f0530f357fe94389a46b1cdd4a0fa066d801b84a70fb0ef165250e66d11aeae61b844a8e5e2a81329922b6 WHIRLPOOL 370df267bd73fb2b4f0539054f4878bfb0cb75f7b3dcdb1094f958ea393048450513f714600cade18a712c3add14062522872bed05b101c7ed52134b96572017
 EBUILD hyper-h2-3.0.1.ebuild 893 SHA256 58c45f18d73ffc6b38abf0d0c0fbb7697e42debed448c9b605f9fe969e298352 SHA512 3941a41b1dbea09770d5f3acf285387832965a876f6201fdc3f4793d50cdbb3f7f7e836724522b91edf6f70b5d9cd41410d9c750a1d8ce910ea59a03d73ed300 WHIRLPOOL f879ac2556042f75673b120ed414b68a6b5bfdf0468ea87ae57e25067d5ebdefe9632690ff526dc807c1c46c6ead7cdb51989513e5aa47f7533dd5ddc2e6d717
 MISC ChangeLog 976 SHA256 2ac8927205957778855017e8211a1754fa112dbfd2a3d59b0c66efbaf37f00d8 SHA512 cdbf599e9e4be8f32093b4326e0ca4330ac1df84290164d71997cf3b85b434703a4b729e077cf66079905091ab493e400a4daacfaa3616b5b004c534ee2189b1 WHIRLPOOL 2e7703ceefe0c4879f199df76a709e8f1c99b508d06c5da45db507470643c27232f6354133185fc0db7e47ba8a6313f85b1cec2868c6876207921cf9aecd79ad
diff --git a/dev-python/hyper-h2/hyper-h2-2.5.1.ebuild b/dev-python/hyper-h2/hyper-h2-2.5.1.ebuild
index 153285fdd586..6800ea3c2d6a 100644
--- a/dev-python/hyper-h2/hyper-h2-2.5.1.ebuild
+++ b/dev-python/hyper-h2/hyper-h2-2.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/hyperframe/Manifest b/dev-python/hyperframe/Manifest
index d3a566be9179..d47f217f2564 100644
--- a/dev-python/hyperframe/Manifest
+++ b/dev-python/hyperframe/Manifest
@@ -1,7 +1,7 @@
 DIST hyperframe-4.0.1.tar.gz 16110 SHA256 8a57365b9c5046819fb7bb9c47eb4b44fd4385b976edf3518940f11725c04e43 SHA512 0970faf8711b12b4be2cb4a41b4be6d067eea57c40ee063e2ea0c15b148f1eed0214b29c9e8a4341ed453edd8679b55f290c3818157d66f247dc4ab8e3d369b9 WHIRLPOOL ad7283e6f70dabaf932ba77600ededeca357b6fb97ea3e32e2a9d687474bea15618dfc69b3ce8b4864563d05813472e0ddb6000c59f890b3c2fff4b2d8a4a500
 DIST hyperframe-5.0.0.tar.gz 17691 SHA256 b886c7f25dab2e39a95cc01741c56755d11092abbcf33a6e60c465206f6ae7ec SHA512 cb971bfc35938c3b76410432a7b3a677e25e44372fe3005351191e4bbb0fd11564f0e60765d22a96b565e7cc2ac80ea65447673bff2bee36e502bcca89a76491 WHIRLPOOL 251523fd243cf45d0a1d89977b80b632c64d7568686c6591c93180644650a04d047ad925447abc11cd7f0802ccd8fd26c9d829f39dda9a86cb02302c248f59b4
 DIST hyperframe-5.1.0.tar.gz 17851 SHA256 a25944539db36d6a2e47689e7915dcee562b3f8d10c6cdfa0d53c91ed692fb04 SHA512 5326f1b3362086a905e9c9ec63767707547428311b3ccee28d4bbf2ce729869bdc6d30a21617984ec3ac7ebef5919708fc1f2edc08d22b99a7820789408e281b WHIRLPOOL 96ebdd29cc201cbdaa4604c327f4bf992324458436269ce5ef4f3832cf3abaff1b58e378c81ab3a4160017edba4951a37699c88b78632edb8339c2defed96e07
-EBUILD hyperframe-4.0.1.ebuild 493 SHA256 dbf933f2fe30371131cb31dfc09ccf09c9a8a8d1f5329e73dd3f286c71d48170 SHA512 8f5528b92c143bd4d928f44026d9f4462f87514c6a9ad0e799a8a3912b91c56994b2a198f5a8e1ff262756a3d59ca7583363df47628fa2ded9ebc59bef13fb18 WHIRLPOOL e450ce498fa7ae0a02adde7631125199854a66f1f50e366229bb932c0039b34d5feb8b9a573fcc88e48537102e72d57734330f3efa08a0f937d807d39e612e60
+EBUILD hyperframe-4.0.1.ebuild 492 SHA256 426ebbb3612fd2cab655259d95eaeeabb1a1774e37d84576859c008e91851767 SHA512 34b4387f1b0f832eba5ba5e44bc9a9038b865527f40f9fa45193a34d04d0ab8afa6cb1130156d5119cd308e0c1bca887754536e4042940b1e59e0c893280dbc9 WHIRLPOOL 55777aee02f576b96fcb1572749374953ff4ead1fdd3701fa12e168f5641dc6ea665bc1c8162db975e4a0b6745f6c5b64923f1a82aa2c50b264c47676d134939
 EBUILD hyperframe-5.0.0.ebuild 493 SHA256 a3ed2a373238089ca78df908a5505317310e0f4b81639e539637c62ff821b063 SHA512 82942760c801e98f7ed92998383348da49809008889a0fc2ab7afeab6acb3dd5586a4878e5401f6f7ac633edf899c330f403572e8f8592d8901cb441d6586e03 WHIRLPOOL 0390dcdea0898f18a35599088b7542159d6f0832104e77250bf0214c02f6865d291062204ea96683e6980b2e21ccfc1e1eeb38b5e8e0fae0083a238089a12f62
 EBUILD hyperframe-5.1.0.ebuild 499 SHA256 fe342ad896151262e660ffa10fce785f488178ebab9c3d90a7bc8c801bc30b66 SHA512 e345a457827f6cbdf3cfc1a9bcf38ea482711ce63fbaf205d9c61f30cec14dde9a1b8e4c00a5400d9c9c0f82321b29a15d39fa42a603461f027ef3926e14c5f4 WHIRLPOOL 5092abd39a94113dd2c90f6c6cdbec51fc917deee7da0229cbdedb558fe658d28ebf50c02c8027efa12de12e2ad4243608d48f011432554cc94e97b52944857d
 MISC ChangeLog 537 SHA256 565c6e55f1efc1cd5c70407f29942ac9c9fe20d4ce70e0dadf2b8e8a17a25cb2 SHA512 9b48f9c7dcd56f2e20c12d90b8d74e6d70628fa3ae6ae0a5a1fade35057aff671236028fff097c05d097533a265e7e8efb33570b6cfc5a7a67bc11d26357b3aa WHIRLPOOL 886597fa0b57eb1d5a9d4fc55384ac9b9fb5ec04d32959b912043a198c5e4b6d34682844992a5beefeee07ca2c4cf93cd5dd9f116b7ba490676f033e9038cb19
diff --git a/dev-python/hyperframe/hyperframe-4.0.1.ebuild b/dev-python/hyperframe/hyperframe-4.0.1.ebuild
index 0aa32143a45b..1ffafaa17a61 100644
--- a/dev-python/hyperframe/hyperframe-4.0.1.ebuild
+++ b/dev-python/hyperframe/hyperframe-4.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 8a4a1f3dad95..860495aa5043 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,6 +1,8 @@
 DIST hypothesis-3.31.1.tar.gz 464365 SHA256 b2e5413e5424b433f013f4c7c5308130a55fa7dde346ffad2e0868139d442e57 SHA512 2bb0bcf1030374a17d0002901a9ffeb2bd522917428989206a3398e13dc0523703b9b39331cc503ee4d815ad48dca4826cc49379434767803373aa7b81a2625d WHIRLPOOL a46599f7e1a5c93e2de4dff00f3b40f75972cdbbab3ee943e1683774cb9dbbb5e7c6cfdbd700e08c72c772b13b21789ee39d6ee954ce47f77ee79a477ae5e5f2
+DIST hypothesis-3.33.0.tar.gz 467424 SHA256 cd10a68b65b160da6c957557255dc2aa89c8967c21169a79d765d4aae1d2a929 SHA512 3e89fa183381f2df556016ff4af17d2731685b019aed74d5f8dccd53ad262dce107f83f105b7e950a579ef247cc9b8336f15ee321292522118fa4c3487a21138 WHIRLPOOL ce1d30d72880d841c116dc2b8edd700fa483c845d7c7271efeceb94ba3336e5ed9493d0032c8aa4efb15d67a95490f3bb556b63a4be6168c53ed06406558808b
 DIST hypothesis-3.6.0.tar.gz 73586 SHA256 ecb0e711ab83032c54605d88fda1e07ca5c6025bdb5e91deab96eca29491f678 SHA512 cb885628e5c38ab9312cfb177ebc3c014617d21031737f5fba343ba485c1b8ff82b1302e7bc1d3e79192bfd8324fd0501498c968f3ac8343829f8965f6354389 WHIRLPOOL 189c788fdd0a326879a468061c271b14056da5f7dc1d5975e8f360cd5a91957eb8f79c26a045fbe49d7b11f7cc09024d3d09a353321b1dda1d4d96b452fd9e7b
 EBUILD hypothesis-3.31.1.ebuild 1100 SHA256 fda1923e9047ae3efb96595e3c8ae3305e2e9b17d207022640360d1c26cdac0b SHA512 695fb455580fc5d752e8b8d2be0f9110fa4074c027f660de11cdccb2877d112c2d853ed0f3e2ce982abc59916f4e25869c1f217051e4a07a1dec39e920d23b3c WHIRLPOOL 230386cb9b6ce4ca94a88a5bd3f0066117da91da0bafcb43ece9df1fbfdc214f318ad49f3e1184f4c01604dbddcbf90aa6c331efa41f2d9d688e9581b5dbce6d
+EBUILD hypothesis-3.33.0.ebuild 1100 SHA256 fda1923e9047ae3efb96595e3c8ae3305e2e9b17d207022640360d1c26cdac0b SHA512 695fb455580fc5d752e8b8d2be0f9110fa4074c027f660de11cdccb2877d112c2d853ed0f3e2ce982abc59916f4e25869c1f217051e4a07a1dec39e920d23b3c WHIRLPOOL 230386cb9b6ce4ca94a88a5bd3f0066117da91da0bafcb43ece9df1fbfdc214f318ad49f3e1184f4c01604dbddcbf90aa6c331efa41f2d9d688e9581b5dbce6d
 EBUILD hypothesis-3.6.0-r1.ebuild 915 SHA256 fe23c94089626188676ac9fd4874aea2b85a13034602f30f4e846a5ea0140fef SHA512 83ab953c3eca8c1e3672eec5d4acec86566cd2eb6151f7304ad57f8dd9ff485e40322ef4dc30b9b7444799bd919be9b3b5d8165c663a0f4e10d0e69e90eab6ba WHIRLPOOL 446636ef0dc735872fa2bed6a8d8a97ae7ac737ec04091020be3e576531b1cd863e328bf60de19e7d8166ee7ab21beb8d43da4d2bbc4a44e63e01cb557b7c870
 MISC ChangeLog 10982 SHA256 16d4bd011e6f9233e9a02424c453a1fba9c516f65a692d81536359a53af2407c SHA512 c393ae1550bc62ff5562fd28c91ed27b79455f199d77c6b1f61d7b554fb5f8f73f66b9b494536d119787c4764d24d3d3bd99eeea78ce9f25af1f223582170375 WHIRLPOOL bed69f6e30e34dec48e08e15e78921632389b7e8185d8db7f55a8c78b5956e6c0a1a661351f4f731681406588d1627aef3a44f98bc1e6fb711d4d9476310330f
 MISC ChangeLog-2015 643 SHA256 8bd7afabf7b29c9cef84286964de6f612b036e52c56234c7daf0ef38463425bd SHA512 6d0960bab281c57ff2ed827062421fd636f8dfe1b388530fe02858883158d2a47cb95521736d23799f8928e2d7a8c108894dd05b8725531da9156df850bac405 WHIRLPOOL 40eb3e014b2dac792d9668b27c1281f7044878bb26224141a030a92f265d3e83a651c3faeb4c92e3655502f1205f53e9bc7fd7afc8059fb178fc808670a00cca
diff --git a/dev-python/hypothesis/hypothesis-3.33.0.ebuild b/dev-python/hypothesis/hypothesis-3.33.0.ebuild
new file mode 100644
index 000000000000..4869c0b7b9eb
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-3.33.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis-python https://pypi.python.org/pypi/hypothesis"
+SRC_URI="https://github.com/HypothesisWorks/hypothesis-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/coverage[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' pypy)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${PN}-python-${PV}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/ijson/Manifest b/dev-python/ijson/Manifest
index afb6dfacad65..63be1ada3207 100644
--- a/dev-python/ijson/Manifest
+++ b/dev-python/ijson/Manifest
@@ -1,5 +1,5 @@
 DIST ijson-2.3.tar.gz 11800 SHA256 5db72cc5ebad786ee2cf85ae277ae068c14f965e0747fd8b65bf4d8d9c4c8395 SHA512 4d6647cb72661b26a3b36addeabec79fbc047a6c3b86aa419c178dfb8ef09bcdefdf37ed729f26b4b6b176cec06230ef3dab53bdff4c4b401bbc835eb486d038 WHIRLPOOL 0f1bef3e7f3237d259839253cd0c433bdeafdef4314cc2f50d1965abb835179a4781c39f11a8fd4cdfdec1688c53f26bec7d051a94b40fa808ef71a7df6be5f9
-EBUILD ijson-2.3.ebuild 579 SHA256 689d0fc9e272ca317d3cd4e6699d5503a9d0045e572ddfce9ac151174a9f7129 SHA512 9952594f801e6e969566a46dcad5f4e6d224c2f34dfc89b92ed79438c8a16c32aa76d98f2d2d758797869de900cb3a89dec5c46b2f3a33d1038143151f397b81 WHIRLPOOL fb49d1c34badb215a01de234555fd5e3f192c21209ffe6b2723f583e17e2c474d43fd13c8e3e896e14f2d0446bba9e3c8ba7516c737a7ea59af8780a4569e1d8
+EBUILD ijson-2.3.ebuild 583 SHA256 9f59eddb8c7353e9962828b0a6b7f6f824e4b6870a286952afa1a9a057a17ad0 SHA512 906b7753b6cff89fba0c6db54875ce032cdc56b84fdc01a5427f14d15f9c68989649b53c95786643a2b179a120234c27bb1ade87addb44bd0e331ca54d4d68b9 WHIRLPOOL 7f5cd8efffbe1319bb0867cb3c9ae4de457d4ac650a52b3663124f381466b55afc3421e15dd84a51b2fbf36619a982ef2291a0155c9216593cd5ba188b42f02a
 MISC ChangeLog 3320 SHA256 6bf3947b2be8f080d25f06827a190f8f30fdf7a97036f5550f2f9b8d1ae546b7 SHA512 2d8d38354744237afe7619e0296b4ba6cdbe5deb706c1c93ac501894e9b0d6d5446db9a4f2671ed6694ca14dc32e917fbee14cc230cde6d144f3d1522bedb31f WHIRLPOOL 79b3e308543a8f378dc28202cc733ed61d909a363122bf441dfe210c8c16ffeba1320528b308f414b1e91a0ed0c422c0d1a56d133241faed4d06e3825062ee84
 MISC ChangeLog-2015 1728 SHA256 37a65a1090661952ec7dcd1c193933f903a81cc7941f019f84f6db52eb51c392 SHA512 956c43bde823c6cf05f96cc58d396ecc5bc2c0a3ba33eef41194446ed2714539e22426479e98211307ee69185300d9a010596a1fdb76273e2e029ce399ed83d9 WHIRLPOOL 26d11bb4b37048a9752ffa5c564d0bb5e81167ab614d120b244e74db4c812ef847e84202ecbb1f45cf06ab6dd422b9e78a47479889518472275f4221ff9f3cac
 MISC metadata.xml 375 SHA256 c39a8f282757afd212f91269c64fabee8de47aee64fa7feede6f8f4ffa5d642c SHA512 99d84d8cbffb0864a3473385642d96238a3ec4679b13d60361ce147536e58780978ac5ca947533fd25d97f05ec9b011ce3a831c05b90a24281b828b03fb80919 WHIRLPOOL 8cd0c43927beed7c02896268171e71659b6943d148f2c0ee6d32ec45625ae7e62d18790e01166384fb2daf8dff17f6409eb694f7871df0a8ec6c13e5160acf85
diff --git a/dev-python/ijson/ijson-2.3.ebuild b/dev-python/ijson/ijson-2.3.ebuild
index cb1eddd040e0..999c8af9568c 100644
--- a/dev-python/ijson/ijson-2.3.ebuild
+++ b/dev-python/ijson/ijson-2.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/incremental/Manifest b/dev-python/incremental/Manifest
index 2a750c3bfd13..dc579ecdd81c 100644
--- a/dev-python/incremental/Manifest
+++ b/dev-python/incremental/Manifest
@@ -1,5 +1,5 @@
 DIST incremental-16.10.1.tar.gz 16066 SHA256 14ad6b720ec47aad6c9caa83e47db1843e2b9b98742da5dda08e16a99f400342 SHA512 b60ebc41c32f27da5a489ebd76c7fa1707a5a38c32097bfab20f355a86b490ce21acc7be157d0309a30c63b85d79f72f850587d1449110bd1a8075ca3586db5e WHIRLPOOL cfc84b426e3cdcfb915b247a928b7e614a415dc7679836c966c8cb7b863477923839fa021f30d0351365939948ce2a8c62be86dce29200a0ac3c76e7b1dc1c6b
 DIST incremental-17.5.0.tar.gz 15527 SHA256 7b751696aaf36eebfab537e458929e194460051ccad279c72b755a167eebd4b3 SHA512 91443205f7c92ec8f6502f38379c5ac2fe441435ff9490af01e5420d6bb05bb1c666dd612fc45204199a34afd533fd3de1390ca482bb554dfec7d3a22958a4bc WHIRLPOOL 7546143aa9bf3f9fecd50dc293e7ad2d5fa5b5efcf8307186e33fbf0e82cb973e14436d7b10243e20b7808e7dce0757ff60720d31d49b7653c4657dfd62ba405
-EBUILD incremental-16.10.1.ebuild 601 SHA256 aa6ca9aa3b6dd6f14a380f12c4ecfddfa969f8426be814de987ccf6a6ba19af6 SHA512 a3dd394a01f7aa84c4b683159777fc301a7a9e0704c7db6154f722b9d43e826c2b63bdf6ebafb7b927951dc50298525cfbc3f959348d0f93c4cbc99dc6e482ea WHIRLPOOL 0cefcb0c028049635c7430b8f81ce0a436c21127d46f201c1a6a7132344650379556fd661a70e1deb836f2f6e00a7004790c3d633c386690a736faf936e94924
+EBUILD incremental-16.10.1.ebuild 600 SHA256 06535e6da62b1f3f8af219380f459296ef04f97f1092988037bff944970ef4fe SHA512 fccbf12785803eb3e2cda91b4785a851f9cb84a56f85493527489d8fb87f65edf9474034901c9b58c6f5e8d7307462ed51f7c3672e8abdc9ffd1aa14f68e2d8c WHIRLPOOL 1998b73040f486b23d81388938e3a0a4b31eddd4e9f240fe0baf1a2f051a0a4fbf4b339da7f75bef8905bec7c4e9973f675366498c4692de89205b2580063f4b
 EBUILD incremental-17.5.0.ebuild 606 SHA256 aaf4e552d10b71d80f11bd76f5814775e7e7d549d51a528da585f2b766d0ec96 SHA512 f4d7de4a137b56141e4289471a70fa18ebfda37908df793ece43b6043a043c527262654014deeb0e5e1c947d7c2f379ec6e9e0b5936f159965143b1241b14a40 WHIRLPOOL 65fd1ee7889201e6f22a63a012c792fc410ee9f5ee6b5d9a141ce7623bbf1ee9afbabfa4e28c7078b8e3711ecb822fc4e0cf837285658ec09b5f4f32ceb01525
 MISC metadata.xml 602 SHA256 1825e4934d025949daffa69b0bd73cd6a86eacca5a2ee30c1023456a097ccb3a SHA512 0a5dec49f829c3fcb16aeaefe77a4d70ca33f934c9924eaccd47541b2a2817a7327209656e32013c60d3e58a530c439529dc69ccacb653490da9adaacb0c1c2c WHIRLPOOL 0cefea8f03eb8ed8be26462d3dc3a9eb9365a866caabd8d281e2250d90d1b67e30e9bc8d9360d974f8bf9e84f904f5ac4840231a550bf0a9da39c1cb07b0c2a0
diff --git a/dev-python/incremental/incremental-16.10.1.ebuild b/dev-python/incremental/incremental-16.10.1.ebuild
index 04aa5a6ecc1f..0d30bfab5bfc 100644
--- a/dev-python/incremental/incremental-16.10.1.ebuild
+++ b/dev-python/incremental/incremental-16.10.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/json-tools/Manifest b/dev-python/json-tools/Manifest
index 5a06a9faeaab..39eca1379f9a 100644
--- a/dev-python/json-tools/Manifest
+++ b/dev-python/json-tools/Manifest
@@ -1,7 +1,7 @@
-DIST json_tools-0.3.3.tar.gz 8093 SHA256 d651d10326447b7a039305661b0fa6c44bb54ca2313494e20dda1e4c8c63b7d6 SHA512 34bb34d52f7f230a13071a9a5c3de79f2c76de6b4a8ce60d0acb4447f68893faeb79ee9a98133ba72f1c1acebd9e8beb34dba0953242aee97799e8b97fcf6537 WHIRLPOOL 203666696b13d95b4c918c604c8b968ac1b64603f3559fec4251c2d80792c1d0674fd7a7a086e4536110f241c93fe28457921023183daa3697bf7deee352a11f
 DIST json_tools-0.4.0.tar.gz 7277 SHA256 ec704468805d898da89c5c88157e8aa6559df0cfdcf29ed60a1076a45f79d19a SHA512 b3f86493d17f97eeaecec6572adfc6e16c113c1755f49655863e84f17467c9dae9a57911d66639eb6e6d8548a99887adc827ff28bd26b6180e523b145bba2d5b WHIRLPOOL aaac4a58404a77043cd977c198b5ffe71ec9be9fe0a7fb727bd2efb94802861b961355ce52c0b515456c404a3c855d5a38d4c15a9d9e03cdd9fb4d8bb4989cc5
-EBUILD json-tools-0.3.3.ebuild 745 SHA256 0fa7fdc9865b03358e1763919dea8d318e8de0830e6aa930dab98cab1a0ae1dd SHA512 7e47696a580e52c4836784e305f13713d395180fe569642469ca1afe5d3bf0462584ff1b58b4e4a1e2da2d8db068e897418f09a934081d6717c70265e577b5db WHIRLPOOL e23c86f5932d7d26ea144fd9043e4b7b08d057882459b49c021867515ced63bc28b4e21500510f3cef34989329b605cd97ace4861ace11517c083aa30fcaf0ab
-EBUILD json-tools-0.4.0.ebuild 825 SHA256 2661e070b8d7e83a8e059ade2a19a512e67ec51a15261a279e7ab2d0e6dd4447 SHA512 c41593fcd1bc16bb6a9d0819c12e599cca34a0bc7ca006144ef2a75918ac1be8e8379f94dfb3e60af797c38b1d869acd0faad8678005a6ed2d5442ff4561f19e WHIRLPOOL b5b5768dc396b9c5ab7c506e6b40f39275027fdc04326ac56d9b9cc90987481811b29ecefd1772b297d7c1646ce7ed00071f0a42d90bad607e8ea6b4e50ace92
+DIST json_tools-0.4.1.tar.gz 7222 SHA256 f82693c12df727fee5d59ff3845f5b7953d0545c8e677480d6cc6fce1ce47415 SHA512 12b5e3b611032b87ed4ed68d8bc30cea161fc80bc73b0724ca6404e8d651e4e6941ab4cd9466efa0da4d2c5b58166944ad2ce954f620b249b9fb7bd637353fe9 WHIRLPOOL a88e04ed1e50ab4fa87de5f17e5ddc8fdcc25ad1124c3fdf700be670ad5bbcc830c39298e04fc21d208d2a20953352b7947162b24a13794f8f3d5031649e96d5
+EBUILD json-tools-0.4.0.ebuild 823 SHA256 0bea3b4c1c2a3bd6bfee25dffa87bc8907fc91856c93857d0d9f53c56b41c43e SHA512 4f4366dc06f40f644c1701e3923a64090ad5b8504db0d86e97d8183c44ec711b988bbc28dbfd5a98bdaab6daf47097012861b52d4a7a28702c8a3cf35abb8bc6 WHIRLPOOL 81a039195ecf8a9e3d9a83f61f2fbfc65fad68edfab30cdd810b762a14532f72a8a4b9918aeaae05668f4671c4c60ed576ada358be6f59dc65164d129744f562
+EBUILD json-tools-0.4.1.ebuild 859 SHA256 8aacfadf6c9eec75ea1faa89591f1d79514c405654f7a43d3000a2ecda906251 SHA512 e0ebcb8035f7680fe9418e58b3d74b9e44128f24bef8110ac746ba14c68b10620f2103cf03f70eb8465687295c4adc526884458f075dee7afe3c311a74e679be WHIRLPOOL 9a53bd490d1b1a0443e563dc69d6a9dc0ff407bce403f136c03edaa7a1e7949f6f3e28e9f19b47577455aec2a88424679ed5df6099dcfd3b72e1d771398e70ea
 MISC ChangeLog 2627 SHA256 55468b5e7a56f716f2830956b652bd23c7ccd2b3b9bbcfdfa73c5c187dd8035c SHA512 c3ece4b0e9145e6edf38916bc5a5e68acfc063a938b9fb9472878c4172aef33e1bf56d4192edbb9304f2758b1c983b3e3301825f1b57a6d0d00322496ce82942 WHIRLPOOL 1632196fa5285c3d5e99f528920d161bc1b65ec1af2198293d2c6a5261c309af0bbf71f714f255ac29a80e431c7db4d45c5bd1e0c9546c7aa59d2f174ba4025b
 MISC ChangeLog-2015 1129 SHA256 a2b59f6a7065a477485a4d60dc66d7c69f0f9f9f6a64b43c099338689e13e52d SHA512 f1f284840a84b421f6bc52f5dfc6320aadaf4b24ad2a66af5317c9b66b2cdfe72eca72e91efed9b55bce452ca937298eb16ff99cb2cd0b30fb7b6cb2fd30d272 WHIRLPOOL 014e9451cb2fa40dacfdde8f9f484906342b114aa031e4b65ed17449aae3f024a34293ce484a4e08baf41707ade5a93b321b365e7aa02a3ec671e3aa6687fd57
 MISC metadata.xml 392 SHA256 993925a627f7a5e8e52630975d18032b0358d08b0e9b902b2fd9073dc8a767cc SHA512 66769c970cb91b5eeba9870de3774f0f3f1e7fb9ee95e01af16293293874441c00efa233fffa9c9fd84c5e1e40518d88beb04f0f9d220b7f453c2bacb3272d4d WHIRLPOOL 1a49f4668af420901db5185eafe5e68e9f22b1b3b4fb489b623e0ea049b8a25155930b33115b4561d3c5f9478da115eac7dc2803b942c04b9129b34a13f49367
diff --git a/dev-python/json-tools/json-tools-0.3.3.ebuild b/dev-python/json-tools/json-tools-0.3.3.ebuild
deleted file mode 100644
index 62f4ecec755e..000000000000
--- a/dev-python/json-tools/json-tools-0.3.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-MY_PN="json_tools"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A set of tools to manipulate JSON: diff, patch, and pretty-printing"
-HOMEPAGE="https://pypi.python.org/pypi/json_tools https://bitbucket.org/vadim_semenov/json_tools"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/json-tools/json-tools-0.4.0.ebuild b/dev-python/json-tools/json-tools-0.4.0.ebuild
index 252ce00be9ad..b80c38d3cf63 100644
--- a/dev-python/json-tools/json-tools-0.4.0.ebuild
+++ b/dev-python/json-tools/json-tools-0.4.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/json-tools/json-tools-0.4.1.ebuild b/dev-python/json-tools/json-tools-0.4.1.ebuild
new file mode 100644
index 000000000000..5e621d566e82
--- /dev/null
+++ b/dev-python/json-tools/json-tools-0.4.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# 'Programming Language :: ...  in setup.py requires updating"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+MY_PN="json_tools"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A set of tools to manipulate JSON: diff, patch, and pretty-printing"
+HOMEPAGE="https://pypi.python.org/pypi/json_tools https://bitbucket.org/vadim_semenov/json_tools"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index ebff2e95a1f7..87c0e13ce075 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,7 +1,7 @@
 DIST libvirt-python-3.6.0.tar.gz 181778 SHA256 ecb9cbc8b1f33b245b04e3a937d8483584ab7a18258b217be96661343a4b1ad0 SHA512 333f991fc69b509b2eda67ee70dea39cc9d1ff36b1abb6a881296313ffebfb5ed41de8443534f19b27a70271548214fa94a12e7f59dc217492edf0bb5555ede9 WHIRLPOOL 6f13ee521713c3540e649c9c9edf6fc0427e0c4563305a42366796352fc99867bc79dd5ce61db0d7b79dc02957f8854c5664f5b5952a402c614e19264167546b
-DIST libvirt-python-3.7.0.tar.gz 182372 SHA256 1e4a8a8b08ef8f2502088f26ce3aced415d55ef808d8301dfed023f45154c06f SHA512 2f37d860d9ee203af3765a1b8d7f8981a8e51b5e6c78170d4bd80d0b23b9f5997725d81ff8c4ed4e5bb218346913321a3b4b8e2d337fd3cb8eeb95ac78256413 WHIRLPOOL b35f8aa071beb14ebf4be233bac190c6022d7ad56788f28bf3c8d265faa8fc514e0604beea9ccd8b703079fbec65de5c5b20ec6b8d00693cf6a6c7b9afc8bd75
+DIST libvirt-python-3.8.0.tar.gz 184346 SHA256 5fcba9ca645b01a8d970da84f7f95d54b0e8e915739d06b5e6d86ae626ea570b SHA512 40fcc67bf793b298016171751f207d65d98c8fe3e04d72bf4a815aab3c2f91a624fde1e0f1a420a67f4cf330874d7dd91ae46c3118e75067030ee551957a8178 WHIRLPOOL 15d815b5f6086e0ffc0f2688aef517c8a62fb89dfb123b6ce3b63a6190b885ef918e16e42fb9dd4d4f2178cf16777be6fc8aeba8d0115d8b3cac3f3a32f8cab4
 EBUILD libvirt-python-3.6.0.ebuild 967 SHA256 ed96a152932adcdd77b623742dd386bb4c02e60bb6e1e177add0b12cc8c7798a SHA512 342912f6f1aa4a8f2c7f7b5df2413490d9d5e9b19b959a1b339d5b6e617ebfb76aa91a6bdd363bf4d9b842e2113bfa7ae5d235d8da4787ef3f07959cc0334e8e WHIRLPOOL 973315859bd2aaac52fb24bc5af7cdfd6f388488a01e6e1fa860a2df2875184df4b78f73c9cdce38219b995e0d9162dff0e5fa0eacc70f6f86cbb9172a9076a8
-EBUILD libvirt-python-3.7.0.ebuild 964 SHA256 92bf9bd371325bd9cba38a138cfc10544bd566f7e69e58918b3f142b326c7a9f SHA512 5067c0583c8f3042ed13b6afb53d9aacca76305650223d318b5d82013b22bf0320069ac26efee4713376d01a75b9e2b797588d2bb5696b3815a74218c651072b WHIRLPOOL 6cf9c76a3dd05b31aa6b46c5e3ecfa89fb3b9ad39927917f379b6a4af5746d941c63c0b98e7d92252f4166eab136d77298d5ae0c327d30d4f3cdb6588bfda52b
+EBUILD libvirt-python-3.8.0.ebuild 964 SHA256 92bf9bd371325bd9cba38a138cfc10544bd566f7e69e58918b3f142b326c7a9f SHA512 5067c0583c8f3042ed13b6afb53d9aacca76305650223d318b5d82013b22bf0320069ac26efee4713376d01a75b9e2b797588d2bb5696b3815a74218c651072b WHIRLPOOL 6cf9c76a3dd05b31aa6b46c5e3ecfa89fb3b9ad39927917f379b6a4af5746d941c63c0b98e7d92252f4166eab136d77298d5ae0c327d30d4f3cdb6588bfda52b
 EBUILD libvirt-python-9999.ebuild 965 SHA256 07d0fd1b274ae7c25e9401ea7b6d1215874c903197890b336b7ea18bd5ac47da SHA512 031a6875c7685b942cc444faa1a175cf44ac2700de9611920eeef03ba771c87be449b4dbdb71fbad7348cf69ba3c475516d41bed874b7f672b14b7c7d56a0156 WHIRLPOOL 219d268e84d8eec062cae56e7c67e812422dacd0350e68322b31a6db6cf55d1a54c393c777b728e37acb2bd1f3390e9f3735559f03d123bdc9a50b543fac3366
 MISC ChangeLog 10187 SHA256 4c9e3a534260ccab329ff53474e2106cc71eaa205c7114f8fbd25650f2b32fec SHA512 0a2c23768c88fc676d6acd30edf8851daccd7892611ca3713500a2c8996af454a577b23788588ddffb2c9a8d260c474acdd63645cbb2d49110b28baf070a8aab WHIRLPOOL e91ce13a2048f101f238ab8523afbb6493c62ebf6fa8730c1c1d96640aa1b50eb292cb214bd72158b2c993c6ff52906056d39953e24c4a6d1a7f7faad43e418a
 MISC ChangeLog-2015 6687 SHA256 8fa4074b08dac5640b998739c571b9580a1b5e658ae416a53bf8188eb57dc6cd SHA512 f8d3531e978480c684badb7e914a4b2bf3039c3030bc610cec26ff83ae60b64e42a68fcfcf3182d0f175dd8e1de71c27915cfcd9da42d1b41a8af2b10feb10c6 WHIRLPOOL 1a6eb42d21b6758105aa72c56bcdb1c268be5bea67e1a66ebea21354fc60637719a1adb8a33cc163d57502217122da1ddbe48056b305d5d73ecece4bff2aec00
diff --git a/dev-python/libvirt-python/libvirt-python-3.7.0.ebuild b/dev-python/libvirt-python/libvirt-python-3.8.0.ebuild
index c16440985c37..c16440985c37 100644
--- a/dev-python/libvirt-python/libvirt-python-3.7.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-3.8.0.ebuild
diff --git a/dev-python/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
index a7a3c0fb53de..bf85054eccbe 100644
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@@ -1,8 +1,6 @@
-DIST oslo-serialization-2.16.0.tar.gz 28204 SHA256 0ef8dfa735a42dcfd7d804c5b14576df92407f842d5e12c1fad7eb0889c444fc SHA512 d6612d99e05e3c634d8b2a2e37183884f7aeec3608080bc2bbfcd8e436a64a678e1bb294024ddec0d276fc216fa92a9117a63eb085bc110500e07f1db172e5b0 WHIRLPOOL 5d43524577569a2ee194bc92f387fad10bf15e6922fa315f9559d6a7a6ecba95dfd977f30e7a9086e6120e38fc56f83d37e64f25bc113b6f212f03753f355cbd
 DIST oslo-serialization-2.16.1.tar.gz 28733 SHA256 306d9982eae272fff05db7637971fd07d2b9b818306c9e3af87aea7f452b4844 SHA512 36e162c8f93d064d103052eb8295de7753ac9739f6c9c9f8d048090f5f2663f643f69507d9c47b9fd6142f5ba14d1eeb49120119cce5c6e60cbe09248e8f5a1d WHIRLPOOL 7cc84da7a5437b91c9f5cd5c3c3f7cb6c6e260cdc7dcceb78f98da7ec2f3af10c444fb76b9e4ff0ed07ddcb98e567c8c86f49fc2b6e3f3274f48d0f46236b2e6
 DIST oslo-serialization-2.20.0.tar.gz 28693 SHA256 fca6fbb350d560aab8a4fdc9a1128dac3b1d38b2fc9bf5ad22136ae090854802 SHA512 f15c55a28d1e99b4e01a579f6a3b20d260f8e911ea801b20b27acf3ce284a2bb0ef8a3fa6d6db2d5a094aea9efaa87308b1166ac23dab169209e06bb23d0880c WHIRLPOOL bd2d4fae43f685e2f307c944cce7b9cad21b571ef7bfe7419fba03bc912a2aaa9a1777292a53bcc518663d5b4ac05b3a1e144350d7acefa1657c0a15bad99af5
-EBUILD oslo-serialization-2.16.0.ebuild 1937 SHA256 58a5b66ee2a4a8e2af6650b676bcf4a0b3fe7026eb28f4308c0dc8c9761a46af SHA512 ecae4ed604c659001c8ab3c48b3af0d003510c1a8dac526be5c4e939a032331f665579ee989bb643f5ba6f6976c2def43e1aed1c431925344c35160cf8df755e WHIRLPOOL 231853e5d196775f3f7059c362fcb40395a18656d3fa4cfbec2d95162abc059225f8a5f1a9bd62f8dd79ef8d2f5e11dec73631e1553738eaddccb1e4fd4d1e77
-EBUILD oslo-serialization-2.16.1.ebuild 1939 SHA256 36f91f8243164f0e869e5daaac9bcee02c5a15e2adb413fa0b63c0ac1b9fc0a9 SHA512 a8ca4ff1a708a175c8d4cfd7f2f92a823acbe0d809c20874beb2697cfed22082ea7f147b517fa280272576fb05ae7f3fb896249d42acd6c7f158cb52814f0148 WHIRLPOOL 9db7112f48284fff58e2354bfe64079ae38ee431f8cad7f2194cfa20fdfb58001372239363f946c460d578d6fad9038ae3d422c42fdd4e796b345862675c4a32
+EBUILD oslo-serialization-2.16.1.ebuild 1937 SHA256 58a5b66ee2a4a8e2af6650b676bcf4a0b3fe7026eb28f4308c0dc8c9761a46af SHA512 ecae4ed604c659001c8ab3c48b3af0d003510c1a8dac526be5c4e939a032331f665579ee989bb643f5ba6f6976c2def43e1aed1c431925344c35160cf8df755e WHIRLPOOL 231853e5d196775f3f7059c362fcb40395a18656d3fa4cfbec2d95162abc059225f8a5f1a9bd62f8dd79ef8d2f5e11dec73631e1553738eaddccb1e4fd4d1e77
 EBUILD oslo-serialization-2.20.0.ebuild 2040 SHA256 067465a5b4194b3d0151c819dc91223e8629893100ae58ca8b04593cb3fcff6f SHA512 7557be8fb2e8c112ea12744a7aa3140f4634a33806efbc0726ada8b356c8648de5bee4697af0f50f72bfc5a39c793485dc4e0ea107eac31d4f71f15f54b1e3f2 WHIRLPOOL 9968b1f21051ab96fe290422a3a54835c4afb590583f1d5a6c54f38982fd5b10734a2af202fa55a4c1e29029494f3687c62f367d1e7e49001feabe40d96cedbf
 MISC ChangeLog 5721 SHA256 3c4fe97208a0b298fa2550afd1a94cbea5f8281fc84ca0cee4f4b82c294f079d SHA512 d07d92beb25594f326f3fc96f01d721f6acbff40c6e6d048904e8e99ec2c4e4c3569fa92472f0191c89f59f28ca2f369f54ef73a70cee5eac1eada156d8ea600 WHIRLPOOL 3298024431d56ae48be5669d0341a25f7fabf4f820528eb87e6db0894a68e64a9fe3d33eb0b98592037ee81472d3570b22ebb1ec5767072e10c7716566f98d0c
 MISC ChangeLog-2015 1824 SHA256 4ccec52a498894b723319998700c98afbc2b9d1a5cca4cc4d2c371bd2dc6cc37 SHA512 7eac3cfd9a784ef49fe8ddd47cab024cdb4bb59f6cf6f481140d29f349028689dd0b5bc115058256e0ea80406bea2800ff7bffe4bfe58bfb3e5c7f8443f7b263 WHIRLPOOL 2b9abf1853c5dc73ddad40bd4715b6a728c1cae649b3d9757dc1ad0e5eaf295a17210d57385009e9207916e57fbcbfd39466091069d5eb43a54aad37e2ea978a
diff --git a/dev-python/oslo-serialization/oslo-serialization-2.16.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-2.16.0.ebuild
deleted file mode 100644
index f9c7052e5501..000000000000
--- a/dev-python/oslo-serialization/oslo-serialization-2.16.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Serialization library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		virtual/python-ipaddress[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
-		!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	use doc && esetup.py build_sphinx
-	distutils-r1_python_prepare_all
-}
-
-# Note: Tests fail due to requiring installation.
-#
-# Installation appears to fail due ot the use of namespace packages but root
-# cause was never truly established.
-RESTRICT="test"
-
-python_test() {
-	distutils_install_for_testing
-
-	PYTHONPATH="${TEST_DIR}/lib:${PYTHONPATH}"
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-serialization/oslo-serialization-2.16.1.ebuild b/dev-python/oslo-serialization/oslo-serialization-2.16.1.ebuild
index e98506682f1d..f9c7052e5501 100644
--- a/dev-python/oslo-serialization/oslo-serialization-2.16.1.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-2.16.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 210298c96b41..a75ccd4f555b 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,9 +1,10 @@
 AUX pillow-3.4.2-no-scripts.patch 411 SHA256 597223119626ccd36a0427df401ab9e2ff330099afc307162ddf58f62be07f46 SHA512 51ac7df4e9c6b76bbaf20e243cb171f9d824c94e183f4bbe5047c6932efe6913527a0a4d328266a8984d51d07aaa18cbdbb98de92dc8f027a3d392d0355cdd70 WHIRLPOOL 1863f9eeca9470a072d4cdab1c7c8eab8de242f35fdaeafce469df71b417cc8ae2e9d9122450d6283d9e749d429c53b393f789ce11f4ba7bfedbde44609cb931
 DIST Pillow-3.4.2.zip 11042238 SHA256 85b237840ad8b30a1572bf9e3898a26c77910a56554d73ed4f58a42197c2e4c2 SHA512 5e05206db5bc1b4177384f7e91ee79015c6e1bbdc7c31c997da054391b9b5ec7c1ebdec258a33f598986533894f3324b03d0b4b385b94e72a0517a3437553b39 WHIRLPOOL f92d4320ca5fd3e004a2ace41d14f0816dbea6fcfc9b10739a59d2dd393725a47c28f5b9f643d0b3243b9003701094ee953b38118412647155e8ba13fafe0582
 DIST Pillow-4.2.1.tar.gz 12673417 SHA256 c724f65870e545316f9e82e4c6d608ab5aa9dd82d5185e5b2e72119378740073 SHA512 8a1c691f067c1127b941a94ae991c728c94eab876fe2a511ed0ad8af9702d4969325bd565b11e656ffefe867bf385725a5c14e3c28f8945730fa21986f934f69 WHIRLPOOL af93b67a60843d9f853921d5dd1332209cefc87a9680201cca5010f935527abcacac57e9d2afeac6bd3ccf8ab6636ffc2321e0888b73babfdb9ff0a933a77951
+DIST Pillow-4.3.0.tar.gz 13874155 SHA256 a97c715d44efd5b4aa8d739b8fad88b93ed79f1b33fc2822d5802043f3b1b527 SHA512 5811252802bd01ac86157235d42138685e746723df48b67ec7c7ebd3f172532b40cf86ca9d3d792e82f03986303a084bf3491c0d511dc068dea1bc631afdeabb WHIRLPOOL 60b418d8e549f72a295c632a5caee148179d8bb931f63959fb4ee383db43e68bcab92789791fa912b74386410ac6023cc8232f3cdb0b7e7eb5a92467b8611034
 EBUILD pillow-3.4.2-r1.ebuild 2501 SHA256 7e2cc471d164b3fc8bb238eba6aec9644b60d2288158c6c16766e6fb5b8ad6ee SHA512 73e98674e3faef57e55fd5ea3703ec5de7a6c20e1d359ea13582629c6af07cb3f051d60d3313c6661faa1a76ce194e680b1d4324313015a618813953b8e38c39 WHIRLPOOL 71fef3416f125a3e4cd74d137e0238c304fe8389f9b430e997687ea3999366871662fbd72e2e16a4dfc9f70cca8753d4965098e4170a030a6f48b6b25e5bf140
-EBUILD pillow-4.2.1-r1.ebuild 1976 SHA256 20797c58b3cc00e9f919e2a4f026968d253deeba30e9b1f6e317526096790af4 SHA512 c4a27b1010ddc01e12ddb04f65cc69c164ff4ea58be7901caf85d19dba279dc9d1a36d33b6a43a5b1c86cca805c665a6ed38e7726f5f2f143d6f0331b8af97d4 WHIRLPOOL 1c443259ae0a59975bfc0edd376964dff417affd46ac15a11fd24390dc7613021e9d2ce84543a54e7044a557aa77e492b8bb5e097d497e458269a6b81b872766
-EBUILD pillow-4.2.1.ebuild 1989 SHA256 ce2c4034da7fff485477f337c46237805cb12a6b228ecf01d2fafad4126f10ef SHA512 36be85c1eec1ed794332847c279107f2f6f8d1d44b3f78d1c9b1555cf165e64cbf31f4338fa495f9b7cd7488de8ec4d3551112a1e1fd8d4b01276366f95df733 WHIRLPOOL 5405019de1a4627f2c36b16bb5d8eb33e93c3949e3bb2def6829ba6a0b9b90d152a7d4926f678a9e73239ff7a4ad6b015ade77733cccafbd7f0a66e0ac9b72f4
+EBUILD pillow-4.2.1-r2.ebuild 1932 SHA256 59f2d201d2e97570d99258d871a226cf9e3e270e0f2f479157bde64b34ad750e SHA512 d0f149bf96ad4ee1bb094d4e09d1c991d9786cdbafdc5b0016f8ebdc63988ba8f7741a5d7701ba1b93bd27d5a65e396547847df8f205f5e045ec7817d6e729fe WHIRLPOOL ec2f63117b7068321dc00a3d2e6e6c5d690c63206d42c748947a59551494fd3ce2f83bff17e80233cf8d2b554c7275565cb81a52007588d920d36b4849061c73
+EBUILD pillow-4.3.0.ebuild 1932 SHA256 59f2d201d2e97570d99258d871a226cf9e3e270e0f2f479157bde64b34ad750e SHA512 d0f149bf96ad4ee1bb094d4e09d1c991d9786cdbafdc5b0016f8ebdc63988ba8f7741a5d7701ba1b93bd27d5a65e396547847df8f205f5e045ec7817d6e729fe WHIRLPOOL ec2f63117b7068321dc00a3d2e6e6c5d690c63206d42c748947a59551494fd3ce2f83bff17e80233cf8d2b554c7275565cb81a52007588d920d36b4849061c73
 MISC ChangeLog 11134 SHA256 59cebb3fd3d3d36e347a01a92f22824998406266e856d17f959cb6326b47fdcd SHA512 9e0f14954055628779deebf09171c4c28eb4384128d72e525888389e347e498929da9f36be7a5da5816244899e1a3f841742295973227fd1e5c138d2e7ee9e9f WHIRLPOOL 4e1daf48638a419d0e168b6c5c1ce0ebf3c724a2786d41cc0b79f376cda6e122663c0b0e8ab188d9188cde20d1e269101184da201dabdc6ec885f1ab4188d15e
 MISC ChangeLog-2015 8100 SHA256 e35d62d80a480830916fc6661fc0b2f63d96ce6092ae7a440a88e4a388e03b8b SHA512 3508c7477f1ffcf8497a41c5b316dd1d2f4b98a51a01d09da6263c998320e9e8077073f5ff7d9cb2626a254f5d97c334fdeeb24443cb7e95967a845489c3115d WHIRLPOOL 56c7be042a7f508b1b6c168673d0dbe8deda2c3febad678301fb9db0ea911e627ac8855240e99d96778d4308c7da9f2433dba96f6d5c4ee1d85ac5747bade472
-MISC metadata.xml 538 SHA256 43641f5debac619035cc1382ffb1f09ccbae80556a4b576d9fe3bb620ae90208 SHA512 ad0b456ee31c3b1be536d665158886d788b3abd78f6900d944f7a98ee9a3b90abe410f2d2b03d5e343b335e7c5d88a74209a13482f9af244fda18bba28facab3 WHIRLPOOL 6cb936f3faefa89ae91729dbef9393acad13c5cb524c89f56e182f99bd7b4bea221cb779b069bf45177cb2c59f5e8f5464d77caae8d26c4dc95a5982afd8d4dc
+MISC metadata.xml 476 SHA256 b0e79671d5a5a621d84cbb720eff7145d699b10e1d29b5e0c6835b36094cd3dd SHA512 a3de4e446d11e115ff85062a12866ebc5988079eabb658927fe2f319df5b0e944ca751d1070b051f44733ab22533496b2b006ec831b99e04f81fef55900cab6a WHIRLPOOL 9e916371bc62116dbd476a519ce95822cdad5f081176cf67c66661a3400f337a86a7e8b999a7b3ab204613be09e4370d263d0279ed93714d91be4cbc68ab7653
diff --git a/dev-python/pillow/metadata.xml b/dev-python/pillow/metadata.xml
index d641c40047bf..c3f74b982665 100644
--- a/dev-python/pillow/metadata.xml
+++ b/dev-python/pillow/metadata.xml
@@ -6,7 +6,6 @@
     <name>Python</name>
   </maintainer>
   <use>
-    <flag name="ole">Add support for OLE2 image format</flag>
     <flag name="imagequant">Build with Image Quantization Library support</flag>
   </use>
   <upstream>
diff --git a/dev-python/pillow/pillow-4.2.1-r1.ebuild b/dev-python/pillow/pillow-4.2.1-r1.ebuild
deleted file mode 100644
index 1621cc8edf34..000000000000
--- a/dev-python/pillow/pillow-4.2.1-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 eutils virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="https://python-pillow.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
-
-REQUIRED_USE="test? ( jpeg tiff )"
-
-RDEPEND="
-	dev-python/olefile[${PYTHON_USEDEP}]
-	imagequant? ( media-gfx/libimagequant:0 )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2= )
-	tiff? ( media-libs/tiff:0=[jpeg?] )
-	truetype? ( media-libs/freetype:2= )
-	webp? ( media-libs/libwebp:0= )
-	zlib? ( sys-libs/zlib:0= )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (	dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	# raqm not in portage yet
-	distutils-r1_src_compile \
-		--disable-raqm \
-		$(use_enable truetype freetype) \
-		$(use_enable jpeg) \
-		$(use_enable jpeg2k jpeg2000) \
-		$(use_enable lcms) \
-		$(use_enable tiff) \
-		$(use_enable imagequant) \
-		$(use_enable webp) \
-		$(use_enable webp webpmux) \
-		$(use_enable zlib)
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
-	virtx nosetests -vx Tests/test_*.py
-}
-
-python_install() {
-	python_doheader libImaging/*.h
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use examples ; then
-		docinto examples
-		dodoc Scripts/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pillow/pillow-4.2.1-r2.ebuild b/dev-python/pillow/pillow-4.2.1-r2.ebuild
new file mode 100644
index 000000000000..785dfedc3b93
--- /dev/null
+++ b/dev-python/pillow/pillow-4.2.1-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 eutils virtualx
+
+MY_PN=Pillow
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python Imaging Library (fork)"
+HOMEPAGE="https://python-pillow.org/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples imagequant jpeg2k lcms test tiff tk truetype webp zlib"
+
+REQUIRED_USE="test? ( tiff )"
+
+RDEPEND="
+	dev-python/olefile[${PYTHON_USEDEP}]
+	imagequant? ( media-gfx/libimagequant:0 )
+	virtual/jpeg:0
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2= )
+	tiff? ( media-libs/tiff:0=[jpeg] )
+	truetype? ( media-libs/freetype:2= )
+	webp? ( media-libs/libwebp:0= )
+	zlib? ( sys-libs/zlib:0= )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (	dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	# raqm not in portage yet
+	distutils-r1_src_compile \
+		--disable-raqm \
+		$(use_enable truetype freetype) \
+		$(use_enable jpeg2k jpeg2000) \
+		$(use_enable lcms) \
+		$(use_enable tiff) \
+		$(use_enable imagequant) \
+		$(use_enable webp) \
+		$(use_enable webp webpmux) \
+		$(use_enable zlib)
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
+	virtx nosetests -vx Tests/test_*.py
+}
+
+python_install() {
+	python_doheader libImaging/*.h
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	if use examples ; then
+		docinto examples
+		dodoc Scripts/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pillow/pillow-4.2.1.ebuild b/dev-python/pillow/pillow-4.2.1.ebuild
deleted file mode 100644
index a22b7b1fd8b9..000000000000
--- a/dev-python/pillow/pillow-4.2.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 eutils virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="https://python-pillow.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples imagequant jpeg jpeg2k ole lcms test tiff tk truetype webp zlib"
-
-REQUIRED_USE="test? ( jpeg tiff )"
-
-RDEPEND="
-	imagequant? ( media-gfx/libimagequant:0 )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2= )
-	ole? ( dev-python/olefile[${PYTHON_USEDEP}] )
-	tiff? ( media-libs/tiff:0=[jpeg?] )
-	truetype? ( media-libs/freetype:2= )
-	webp? ( media-libs/libwebp:0= )
-	zlib? ( sys-libs/zlib:0= )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (	dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	# raqm not in portage yet
-	distutils-r1_src_compile \
-		--disable-raqm \
-		$(use_enable truetype freetype) \
-		$(use_enable jpeg) \
-		$(use_enable jpeg2k jpeg2000) \
-		$(use_enable lcms) \
-		$(use_enable tiff) \
-		$(use_enable imagequant) \
-		$(use_enable webp) \
-		$(use_enable webp webpmux) \
-		$(use_enable zlib)
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
-	virtx nosetests -vx Tests/test_*.py
-}
-
-python_install() {
-	python_doheader libImaging/*.h
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use examples ; then
-		docinto examples
-		dodoc Scripts/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pillow/pillow-4.3.0.ebuild b/dev-python/pillow/pillow-4.3.0.ebuild
new file mode 100644
index 000000000000..785dfedc3b93
--- /dev/null
+++ b/dev-python/pillow/pillow-4.3.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 eutils virtualx
+
+MY_PN=Pillow
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python Imaging Library (fork)"
+HOMEPAGE="https://python-pillow.org/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples imagequant jpeg2k lcms test tiff tk truetype webp zlib"
+
+REQUIRED_USE="test? ( tiff )"
+
+RDEPEND="
+	dev-python/olefile[${PYTHON_USEDEP}]
+	imagequant? ( media-gfx/libimagequant:0 )
+	virtual/jpeg:0
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2= )
+	tiff? ( media-libs/tiff:0=[jpeg] )
+	truetype? ( media-libs/freetype:2= )
+	webp? ( media-libs/libwebp:0= )
+	zlib? ( sys-libs/zlib:0= )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (	dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	# raqm not in portage yet
+	distutils-r1_src_compile \
+		--disable-raqm \
+		$(use_enable truetype freetype) \
+		$(use_enable jpeg2k jpeg2000) \
+		$(use_enable lcms) \
+		$(use_enable tiff) \
+		$(use_enable imagequant) \
+		$(use_enable webp) \
+		$(use_enable webp webpmux) \
+		$(use_enable zlib)
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
+	virtx nosetests -vx Tests/test_*.py
+}
+
+python_install() {
+	python_doheader libImaging/*.h
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	if use examples ; then
+		docinto examples
+		dodoc Scripts/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/priority/Manifest b/dev-python/priority/Manifest
index fa701a69adbd..9358a02cb80f 100644
--- a/dev-python/priority/Manifest
+++ b/dev-python/priority/Manifest
@@ -1,4 +1,4 @@
 DIST priority-1.3.0.tar.gz 13827 SHA256 6bc1961a6d7fcacbfc337769f1a382c8e746566aaa365e78047abe9f66b2ffbe SHA512 cefb13b15e99ef98c37fdd1486466c9e1d7d04b4574cbca1665fde7b7b44cc7d66964bed41184315a9b51bd6f9d0e02bbe113bfa004a754ac270170309b71e0a WHIRLPOOL 45fe643b70a4c3cb9e3600e73475384a5b339acbb0a801be8c0e6c190bc2e3894443b28c3b691b3c555250175d6d313808c6bf7a0fed3b586c9fe7beb3b4a843
-EBUILD priority-1.3.0.ebuild 881 SHA256 58b223fe7a54b6d759cc76c5e8c64ddd1eed7c187399c75beb80e3f97b046396 SHA512 d69ec85a367fe71cb09bcf18dfb58f198f9156a34e9c46dbe05c02497d7714b718875c6481d0880d78abdbfe26da926d68b0be60070afd4e3c2771673b9cbedb WHIRLPOOL e26bb25cf8b95acafb84dd54a791a3715e576815b1f0a21b2bb7fa5dbba7fb4425a442405f7369f114b30880c2e8d1922f45f059022020fda89e223e860d13fe
+EBUILD priority-1.3.0.ebuild 880 SHA256 7168d2d21c6a79906f33448574ae94899e61f6c3fc2391767d3d2172c1d539a9 SHA512 c345547014321276fa00b090e9635d88bc49336721e89c4ae497bda7cb9044e25a86307ebf209bce5e2aa777bc8488f81296274803b720b3dcd997f7f39ad8b2 WHIRLPOOL e775f5e1a6b14288d972db2a51ef9e93ada76accedfa51a6254400ef9b2074287c6fb3f8df1ac2eadf6b5c77e66f237ba0be884361717bb1db4bbebcc1981154
 MISC ChangeLog 890 SHA256 4a46fcd1c6978f140b7992695ebbbb172cbe2f462f058f41692a3f10f11ea82d SHA512 e1c81c296ceff454bede58908068837f7fb3033ab8f435533f7ca6cbc432916ecdfcc1315ceead922e54a4164af7314c9a1f924d12090fc4da2219800a16bc8a WHIRLPOOL fe6782799871f00e67ed85c0d0831befb686b82c8ac106f86a3eba2b25af2cf634bda13ab7f08e494cd9dcc45f5b179c9c16f9aad0b2ff32f9952dedc165b786
 MISC metadata.xml 965 SHA256 8fb0c3499ba81ecde836a3a3d643eb9d2fa78d0f6b3dac68bf3717642f9ab3b2 SHA512 bddf7fe4153c705edcf710ccca4cf44875bd8192f80ef0811cad7028e605983f1a8c5b219c82cd2911e77150fb9e1b729450b9e12ba7dd5dbd2f23c89a4028a5 WHIRLPOOL cf22f0310b9947a77ffd514c06086a3732883610a4bb6382fcc1c5331da070ee97015bfad31b1d679fd45dedb0d74708545328d23cd3787da6b2c60db084e506
diff --git a/dev-python/priority/priority-1.3.0.ebuild b/dev-python/priority/priority-1.3.0.ebuild
index 09284c99fa61..ed2cf6f6c385 100644
--- a/dev-python/priority/priority-1.3.0.ebuild
+++ b/dev-python/priority/priority-1.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/prometheus_client/Manifest b/dev-python/prometheus_client/Manifest
index 5a78fb1217d2..b57d48d6d093 100644
--- a/dev-python/prometheus_client/Manifest
+++ b/dev-python/prometheus_client/Manifest
@@ -1,4 +1,4 @@
 DIST prometheus_client-0.0.21.tar.gz 40859 SHA256 8836c8e8ac7bed68b22d7b03552ad1c677c8e73821470c541d4733f4b9d13823 SHA512 e948ecc9044bd6a59fdc58bb3dd638c89d210a5856a360b4270eff206b2280ef7a68c1e94aea64f5cfb68a218499e61627e34c71363ff222b1a3d27403396a31 WHIRLPOOL 83746b1ff1c609acd961589c310c820dec6e3015e4174de8e0d71a0849ed439f858e05e7684965678d5f77f1b1a38438432412851b38c651cbbdf511198a3aed
-EBUILD prometheus_client-0.0.21.ebuild 728 SHA256 4ab192e9929029f6514fc815bc96560f8f8d7e391a472948273c7279a4c27b09 SHA512 b8830fcc2553732db97acf7859cd7fa32c21a80ea3a15083bed368248c9826396c30a11677f6b636e9eb4bafccf9af2176a361f9d8020f9d0187a1d2721f9649 WHIRLPOOL e80dd5690d36b3f55b7988f367cd640e212b94419336f29328ec40b990e9bf96dbcfbd996dee164dc1dd9ffdd440a81be5bae53c01c8a0f94056a3e659aff2dc
+EBUILD prometheus_client-0.0.21.ebuild 727 SHA256 0173ba047c1d36feb88e64d4a604692eb0b744a72c19b0fa5f23a07c23ddc880 SHA512 53ed1f26e1213b2959d69ace6094c746eac22ad2446810f068d18b39ef0149f7c59968d0f8a5721e251caf10da86172f83e7b2d8ae39827a7e7a464fbb093788 WHIRLPOOL 7c829ea7b0a4b84c36c920949a2b5d780150d3b5e29a0f271febef4fa729ee408224487aee9002f78daafffeaea90c0a6857e5fb032c6c1968aba366757d5d75
 MISC ChangeLog 341 SHA256 c3e5ba257526a78da189b1f971d7cefbd471bf80ee82103098aeaebf987785ca SHA512 0462446f12ecb686ee85a78140090f77df45dba76ecb6c36935516e768980a0b7d89206c50b1c98f5ef78ba527b3ba90f4497f3ccf908d97a4cccaa587670ecc WHIRLPOOL 553e790421de112d6dce392dd9c773d2eb46de4cb8789a00cad45cd9f22ca11f4aaee5c07b1254bb3eb71903a9f13e870de276c6352ef66e0d6980a1b832df77
 MISC metadata.xml 451 SHA256 9f5b530ef933527d08b20aae44d1aff0d7a4603841b93eea912aa3c719b60bf1 SHA512 fec61f65143e869244b519455a7214884de5e72c75cf7e500e5aa156c41eb1e644ece46c402cb4722ec294e876078f9332654901b06f2a6f5ab8449f0181532f WHIRLPOOL ae2d895055743ada6f72f03f907b2dc6a8e3cfdd6431806081f072d24fe2de034a47fc2d8bcce5c5cc2a270ecf6ba29ba1235c57b0d99d80f3f2230e3d25e283
diff --git a/dev-python/prometheus_client/prometheus_client-0.0.21.ebuild b/dev-python/prometheus_client/prometheus_client-0.0.21.ebuild
index af5a5b0c716d..545c44e416ce 100644
--- a/dev-python/prometheus_client/prometheus_client-0.0.21.ebuild
+++ b/dev-python/prometheus_client/prometheus_client-0.0.21.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/prometheus/client_python/archive/v${PV}.tar.gz -> ${
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 
 S=${WORKDIR}/client_python-${PV}
diff --git a/dev-python/ptyprocess/Manifest b/dev-python/ptyprocess/Manifest
index c460d95a9f84..226af156b7c9 100644
--- a/dev-python/ptyprocess/Manifest
+++ b/dev-python/ptyprocess/Manifest
@@ -1,7 +1,7 @@
 DIST ptyprocess-0.5.1.tar.gz 68474 SHA256 0530ce63a9295bfae7bd06edc02b6aa935619f486f0f1dc0972f516265ee81a6 SHA512 9e7481e8e3facde73086ef0728a57516a15b6bc2a5fb6bf6d6f892c396c9376d9d6334ee37737f3469929c4086d5678a2c5deaf44d70589d41644a98f2239dad WHIRLPOOL ba327a02a847f7c5e4b62e6bf8ba0f070f8a22ff584045d7ed3cc134f8a922b9d75e397992cd5df5ca4569f563d234ea2a194b5a557606978a37a4f04559ee1e
 DIST ptyprocess-0.5.2.tar.gz 69297 SHA256 e64193f0047ad603b71f202332ab5527c5e52aa7c8b609704fc28c0dc20c4365 SHA512 cb4e70855d388a6ff691e2a244c072a5a50cf39cdf727e3a4218817bf5ac722c4b49f0dbfd80204259998eba137492690759b8908bfea925842b9f7fc83ee553 WHIRLPOOL de6f42fe487b948b5b7801a9c0375f7586aedcac5c7e7563f0f7cf56a3a8d7c2abea42d256544b32cf5c0bb71bc71602b8582d581199cf0e2234a648a6017be3
 DIST ptyprocess-0.5.tar.gz 14923 SHA256 dcb78fb2197b49ca1b7b2f37b047bc89c0da7a90f90bd5bc17c3ce388bb6ef59 SHA512 6619bfc1dfc7c980ffc72dba62697692eb749f19500616e8783cfdc3c35980276eb39070f4cd7932775abb5e798c921b9320c5f51b9052f526585f01cd56259e WHIRLPOOL b1bd0da485ea106a3d366ab21dc714418b8d392a32fc3386ef734362da8ee455a38f9330cedfe35687be09bea3ff622c54440119fca72d7787d9a29518717b77
-EBUILD ptyprocess-0.5.1.ebuild 607 SHA256 9f410c856810e96eb246fe183d633b28abfd073938826c4d0adc0878853d292a SHA512 bc65d7b28bbea47bcc33ab9d0cfb18f9896f29bd212239c88b5f93b9344f13ff50c8120648c4d028af52d7fed5de95e1dd82e5b4aa3bac1777b9ba5dea36ec46 WHIRLPOOL b6f413528dfda1ad30f64edba73afc5ac0ee8d610dca6479973286caf5ab2c9286091b9e61575267aab6c1d3b4840c43515354b7505f7b03e49f3567fea17fa9
+EBUILD ptyprocess-0.5.1.ebuild 606 SHA256 9048c3c2bdc0f175a297531821a82363984a38d7b992b36e830d6951de210f4b SHA512 af14cff11045c26a74717bdb7e169b7278f9a4fa48c587c3f5326fa900df3aa3a9a995db83ffb44d3f2348ea7ef6a00887d98ef6ccccb4e855934d047674a8d9 WHIRLPOOL 203ab7dfba89b1aa6eaad9022c6a397f14ed9adb9fbc83362649dd506a196396225f11222285cf5d33ea8da364af8362fb03bc5c3a3f47862f166bc55e2c0811
 EBUILD ptyprocess-0.5.2.ebuild 628 SHA256 123192b7f51075b035533bd7566694a6c0dcadbc8e29e95c0f913ae25b46f6c5 SHA512 10325f39029c41113f1bd0670b0a2c8a539fbc70e40083aa7599b7da78c649824c2eb163c5d09f8f233abde03db10e0b32fe81f01145e909c0789c514f6ae71c WHIRLPOOL 22a1a3108382ad0384a31d4b90d13a7a1fe568292c0a2e7fae7687e94b9746e5716470bd1e4c5f9393a9449e4a7e881f302f55ccc4c45bf75a8d599de799f45d
 EBUILD ptyprocess-0.5.ebuild 610 SHA256 4ea670f95be32179a1e84e923da9cac8534557e2192157974eaff371f218a51f SHA512 076adc28648cbd054a8988191dbc654c2d6c133232c1d8c36e0327eb815b1d38fdeeb96cbcbe87d574a480ab29efa306d53520f0d0fe9ee0c0418c725f76cfb9 WHIRLPOOL ed94a4fe36815c3227e3243480e18241c12c216f7144c4ee370d0d68e0bf96192d91a4ccd9625132d65fb7094af95338dfb859678f268530d377071900bbea22
 MISC ChangeLog 4460 SHA256 f44f851cdeb6894fbf80620684ab12c3174cc1d919baf2aafaf2f758ebc1fd8f SHA512 f72a44e2d7c1d457da08facf02cd5588ecd69e0d6ae23a69c734ad7a7bc1a4c94838d0c84990813aa1eb0914f6b91d25820ea42fe0a5e898a499a9657c01a500 WHIRLPOOL 27472013506d12aa3ce6d81d95ff4fdb32b96b195fa7116f9f7c289c9e7b18e19006429738d634900d439bcda5e4e80f9c0e8f4ec2ccadb2c7d624a2bbefe010
diff --git a/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild b/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild
index a6a5b1ab0a43..2a61e8e817be 100644
--- a/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild
+++ b/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
diff --git a/dev-python/pyasn1-modules/Manifest b/dev-python/pyasn1-modules/Manifest
index 4efe927ce6d0..5679a814a786 100644
--- a/dev-python/pyasn1-modules/Manifest
+++ b/dev-python/pyasn1-modules/Manifest
@@ -2,10 +2,12 @@ DIST pyasn1-modules-0.0.10.tar.gz 63543 SHA256 3d86ab0fa226a60897c8123c505b3d071
 DIST pyasn1-modules-0.0.5.tar.gz 38710 SHA256 be65f00ed28e30756f1ef39377cb382480a2368699179d646a84d79fe9349941 SHA512 b8fa41ed28087097502e8362022d819fe6914511c09f60f64f173c5674684fa8c45de23ce718700001d9f2d9b11adc17657d7cfd4cb24ea740b8d14eba8d8161 WHIRLPOOL c0df005909ffa4320f0ff7c580410ff2468cdd4002dfa5383e561c9c65721c0a72169e10c72fdc225b308d8fd1d5691dc519b6ee811c167ddc466ba1657e92c8
 DIST pyasn1-modules-0.0.8.tar.gz 38776 SHA256 10561934f1829bcc455c7ecdcdacdb4be5ffd3696f26f468eb6eb41e107f3837 SHA512 6040d4f83c6b00f7a0e6ba0e1264090d0fa96fc39e97b04d624721cef200b6cf4dabfe550127ade4edc181187ca1b4219fb46a95082a39e6291d0e2e08f36d78 WHIRLPOOL 45f3c2ad6e3320f5d7d1f3bef6f0168f2d85b3093f33438aaacc8251d6457d88c2db659d0912a76417196f5ed431c427fc9a47a8a6af5c490d97f931515d2884
 DIST pyasn1-modules-0.1.4.tar.gz 65552 SHA256 b07c17bdb34d6f64aafea6269f2e8fb306a57473f0f38d9a6ca389d6ab30ac4a SHA512 29467aa9fff15b7a7ef999389db01fe696350e29910397f0c867685689a9fa8e5df8128a7703ae0de095804ae20c3759b24656467cec8d086d07a1014ccf5d65 WHIRLPOOL 99ff13b3d4b5749360f9ae9845ccce228e6c1835b3cf692216c4dee49b0ab834ae11aef256e869b18a3517114707ae5eb1b13aaf068c1610bf5c5ad8102a0467
+DIST pyasn1-modules-0.1.5.tar.gz 65690 SHA256 1d303eed5aa54cafeca209d16b8c7ea2c6064735fb61f1bee2e0ed63a0816988 SHA512 0d7f631fdbcb4c89ccf65b91c106483f536daadd099f5b3fb9b144bbcfcb0619bf818fa18715b8f61baf10699421a1af80f003781a5ebac28ebb4f4e7f677c1a WHIRLPOOL 24f1f20b23bca1327ed554463f5dca5d3ed374878a0cc60327050c46c01918980401f7569039660e515d508de61136e1117a1fefa3801f1919b8c9d1d45df1d9
 EBUILD pyasn1-modules-0.0.10.ebuild 905 SHA256 273812cea7b5328fd898084d39e7b7a0b007a67b3b734322f87d4b202f79ae1b SHA512 a74fc0444a3f48ca1351a93396f2b36c16885fb95e839d068cb99c505db74b133c62d12cc12466f6702ee341e1d1251507c1587f51c3b678ec498d6820cdc2c6 WHIRLPOOL 00a6d1d3c6e7e70466bc7da089693246f051e2dfbb2bd6bf58c8cf40aedd4c79255957f26b10d58ed3471c6c84db2d503f8f9fb6811c4ef8f0552633d8d986e1
 EBUILD pyasn1-modules-0.0.5-r1.ebuild 911 SHA256 5bbd49c7d3899e7170d4fe1daa264becdf760a26ea9ddcc1d729e5151062c1fb SHA512 4df6d4a88f2323027c69cc0988786c2049342a379dbd92d57a6c5e9250eaf1fa88cc877bc3773acfc6a41381f58de2533315cafae7f1b0f9bfe2b8329a7f3289 WHIRLPOOL 3455e85ad9d5915fcb4cffda71637088a355a8cde7860251636b63f45c25fa93afda4ab9d35d51d65df07bfb01037286cb239d58edf045f842b67cf051543361
 EBUILD pyasn1-modules-0.0.8.ebuild 896 SHA256 7ab5b5e519d11142086ca3fc6940b95b40e6337df83e50be8e0fbcf7d4b17b49 SHA512 794ab52e8758117f716f69048a199be0c78bf6b5eaa55220aa2048e712ab59f05183d2f0dbfbb55d35a1095d33099b7e0b2a7985b47792937655fc61119d65f9 WHIRLPOOL 54037c2b40f73d108266e640f1873172f2e0efd95886df7d2c36337b3b94bdff3d0e1d394dfc61f5c8c5ef99f21382274f015c6433c499190ff478790eb5f7a9
 EBUILD pyasn1-modules-0.1.4.ebuild 905 SHA256 273812cea7b5328fd898084d39e7b7a0b007a67b3b734322f87d4b202f79ae1b SHA512 a74fc0444a3f48ca1351a93396f2b36c16885fb95e839d068cb99c505db74b133c62d12cc12466f6702ee341e1d1251507c1587f51c3b678ec498d6820cdc2c6 WHIRLPOOL 00a6d1d3c6e7e70466bc7da089693246f051e2dfbb2bd6bf58c8cf40aedd4c79255957f26b10d58ed3471c6c84db2d503f8f9fb6811c4ef8f0552633d8d986e1
+EBUILD pyasn1-modules-0.1.5.ebuild 800 SHA256 0ea787c0eed54e565bfa6a8ea6f661d13db0477770713e45c2a98ac9685fe5ac SHA512 fce7c2ddfba608c04125ac29d95aecfe57bd3b5288eb2ff6e83816d2dd37cb63b5476715681bfe9ba8122539650ad07b32bb2a485633b5f37b801ea9573eceb3 WHIRLPOOL e2087109ae41615758cd276d732ac561ea96956b5985861c5baa028e2dc79f5c37c152805d9faeb0707b47f9b05f4a6cbcbf0980f8e3fc16a972090e80a2f04f
 MISC ChangeLog 4565 SHA256 f68cfb0956519ba928e727db77c13175bc0ba0f57d6d6e5e13d274be8684471e SHA512 981b55eb3aed4f15445ee845ad78d04004769a432990ed1848c01092e45efbe797745abf4c0dfa93cbe183a1b4486ff8739e40fe194f78595158bb699649c5bb WHIRLPOOL dd968554889069fed7f2ee48f197442e7d485389b979934f5085a26c7e61012ad6a532bef7b91d87f60809d6a3c8336937a5e03269993bf6c351123d9e87c0ba
 MISC ChangeLog-2015 5771 SHA256 c16802a5987f93b65ec963e3b793247a294c409acae724f4bf239e2fc44420a4 SHA512 0655ad58bd3c0ccfb05fa08c38c2480762902c679149316798facdb8f0b4a2df721fb39a841e4836bf0ed96120c6801b6ac52db9e483d2edae2627106837830c WHIRLPOOL b0a9b405304e066ec93f339b0275de746c69cb4be9177726ffb116b7f7bf6067fbbee83f8d364d8ea7fba727b56aad05836f23ed9832c732c2a63d6b46c61b46
 MISC metadata.xml 380 SHA256 e30d5a3784eecd2a9e6f0506e7ac120108470bed9e6ada536a1aa7cc16ec211a SHA512 0122261838e5789fc995c1e07fd2f8d59fb470d2f525126adb971d7e991e7b7cd76c3fe37ce21949d6ec3fb79af8ccc2d5ce02aab4afda842809916a5c609f15 WHIRLPOOL 0fae07ab9522c40951ffd778a1b85b19032186cd4482543835b0a13b48b850ce8018f88725420d2524a3fe5c9fa9d3cd3508aab337e377a5b8ba4a57710d61a0
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.1.5.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.1.5.ebuild
new file mode 100644
index 000000000000..6b4d97a374fb
--- /dev/null
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.1.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="pyasn1 modules"
+HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.python.org/pypi/pyasn1-modules"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="test"
+
+RDEPEND=">=dev-python/pyasn1-0.3.4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	insinto /usr/share/${P}
+	doins -r tools
+}
diff --git a/dev-python/pyblake2/Manifest b/dev-python/pyblake2/Manifest
index 4ebce7309f79..88bc15af405d 100644
--- a/dev-python/pyblake2/Manifest
+++ b/dev-python/pyblake2/Manifest
@@ -1,3 +1,3 @@
 DIST pyblake2-0.9.3.tar.gz 130641 SHA256 626448e1fe1cc01d2197118954bec9f158378577e12686d5b01979f7f0fa2212 SHA512 6336a7f7e79bd3e6ff7f8ff4d279ae170e86f1464b9fa9e7ea7f0dbbac6fcc044caf225111e065f9cd9cdeea0f81fae8d373e1f65be3e418929f53fad063205e WHIRLPOOL 0d8f2aaf35a5eb0ebdedd9219a0ee8b126c93b11ae3e406ef637d8930a34783886b212ce50a33d677b0a19289cd32f40dc3da22a9a9fec108b481268f153d45b
-EBUILD pyblake2-0.9.3.ebuild 1066 SHA256 8487f1bd95367c3630a2519430fd81f0c0cd453728d07dd16f59367cb4fe0a99 SHA512 e9cfcdaaa84b37098e01d98dd4b2385614f44d53101ebb6b9a8a029c1105b7b84e06373d68bd5fcc2541d7f305bfe462a5c744e05372454f188ba952e12327d0 WHIRLPOOL 2dc90a66d924ea07dcc2fe7e95f48c9a6a6995dc366a379dbb4379131e3460516d76524d91068561c30f18d1c32b70d31c5fff3c5a43330c29729ff9b3650dc1
+EBUILD pyblake2-0.9.3.ebuild 1349 SHA256 a1c4703ab3fe28fbdddb7532fe008f597d8ffee875354082fce493c119ab6a4d SHA512 5957a643ffab1129b76ee1bfaa284fdb5bd8fe12923d43408ab25e1649528d879becf082b45af7da4b901906267426fe9244a470fe8c2e070409100a3fd154ce WHIRLPOOL 63860ea795d0a7541781d92940d44d4e1197204a7a6074b73bb4fbe89c56bce7d229c9af0e508a9f0b50e7b74d363a6edda0fdb55dc47651c48f389cf9aeba37
 MISC metadata.xml 452 SHA256 327935068e4b2311b5db81380ca0323b5bcf8b0769fce733e0407500bcdd58f0 SHA512 28acd5472435f8832eb8cb7587e651f428309e9a37c17cad378fe8f01c47896115c4d42ace1c6125eb99ddd30de562d42503b6dac42432b55b37775cdde7c1ff WHIRLPOOL afc476bc3e3dd531ec5e886e0180bd8a3a78bc274b410c6f54fbb24ab761c0e9bd95ba7bb5507aff0c162fc69c62a12dd4858e688aa21bca0e0b48509f87c3e1
diff --git a/dev-python/pyblake2/pyblake2-0.9.3.ebuild b/dev-python/pyblake2/pyblake2-0.9.3.ebuild
index 10da95058c15..619cb27c3cf6 100644
--- a/dev-python/pyblake2/pyblake2-0.9.3.ebuild
+++ b/dev-python/pyblake2/pyblake2-0.9.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
-inherit distutils-r1
+inherit distutils-r1 flag-o-matic toolchain-funcs
 
 DESCRIPTION="BLAKE2 hash function extension module"
 HOMEPAGE="https://github.com/dchest/pyblake2 https://pypi.python.org/pypi/pyblake2"
@@ -12,19 +12,36 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="CC0-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="cpu_flags_x86_ssse3 cpu_flags_x86_avx cpu_flags_x86_xop"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+blake2_impl() {
+	local code='
+#if defined(__XOP__)
+	HAVE_XOP
+#elif defined(__AVX__)
+	HAVE_AVX
+#elif defined(__SSSE3__)
+	HAVE_SSSE3
+#elif defined(__SSE2__)
+	HAVE_SSE2
+#endif
+'
+	local res=$($(tc-getCC) -E -P ${CFLAGS} - <<<"${code}")
+
+	case ${res} in
+		*HAVE_XOP*)    echo XOP;;
+		# this does not actually do anything but implicitly enabled SSE4.1...
+		*HAVE_AVX*)    echo AVX;;
+		*HAVE_SSSE3*)  echo SSSE3;;
+		# note: SSE2 is 2.5x slower than pure REGS, so we ignore it
+		#*HAVE_SSE2*)  echo SSE2;;
+		*)             echo REGS;;
+	esac
+}
 
 python_prepare_all() {
-	local impl=REGS
-	# note: SSE2 is 2.5x slower than pure REGS, so we ignore it
-	use cpu_flags_x86_ssse3 && impl=SSSE3
-	# this does not actually do anything but implicitly enabled SSE4.1...
-	use cpu_flags_x86_avx && impl=AVX
-	use cpu_flags_x86_xop && impl=XOP
-
 	# uncomment the implementation of choice
-	sed -i -e "/BLAKE2_COMPRESS_${impl}/s:^#::" setup.py || die
+	sed -i -e "/BLAKE2_COMPRESS_$(blake2_impl)/s:^#::" setup.py || die
 
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index 2b8e1efe5a3f..476486278c92 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -3,7 +3,7 @@ DIST pycairo-1.10.0-gentoo-patchset.tar.bz2 9669 SHA256 31b5aef32b5d2fb3d8e1c6f9
 DIST pycairo-1.10.0.tar.bz2 246556 SHA256 9aa4078e7eb5be583aeabbe8d87172797717f95e8c4338f0d4a17b683a7253be SHA512 a03db6f04cea504985f390b0734042390f491f32ae2bee1299dabbafd369fde36bb506ebb941d22bbc11b0d008c4f758baeacf309a7336880529455092db829f WHIRLPOOL e779d56d67ef18bbd052d81acb38d8b610ca4bbf787f4b0e3982633de55ff54d6dfa3e5ce1957321fba09f0ec2d12ce12057335de9d5ff3f84c2bc0530415e76
 DIST pycairo-1.15.3.tar.gz 177056 SHA256 8642e36cef66acbfc02760d2b40c716f5f183d073fb063ba28fd29a14044719d SHA512 1fc75d193eacb976f2e5a594aa07409a0f80ccb21921065c1794961143785eed48be1966d2d2d3e2d0428f9b4e956994dd851d21f3c3cb91fbc27b007a901ce8 WHIRLPOOL e9248366c8eb541bc70ad73c9c6eea995a2527d189584a1ec6f6b835fdeae57d1aa63e2deaa9f790042d0670e7d07af8867b111ac107b53befd354c3cfc70ca1
 EBUILD pycairo-1.10.0-r5.ebuild 4801 SHA256 1933c92394e858f016a9a85ce19cd4a49743fe4271300da987ae8fcc704ad2dc SHA512 0af881180b25a67fa8102bbdb03d0fce758343f251b970da05dab48df024e0e46ec35c1d42288a68004d5bde66c925b6f734f985022e404c70b4ece014a3768a WHIRLPOOL f297032c612fc23b3a48bbc169babdd9c6b5c68c37de47bad4b49b2f22c5d71da232e357aee4622ee0821864a78ce7f79fcf1aacf51b0a6b782adce7c2c35daf
-EBUILD pycairo-1.15.3.ebuild 1614 SHA256 60eb8212dd285e92ac3a306f7584ceaf463ad1977100616a958dbc20684eaeed SHA512 1d5445d6dc0c73405e6bb94e933cb6e2d43b0cb5d6169d238faea596fa099a4aec07ffa2d37c888c056e4ff01758384320dcd99ac66072a453cc99e4195a9332 WHIRLPOOL 711ff6b6cb393de9e7eb6e579300ddf08279f00f7608c968d52fea05617f8ccde358e70b16a974e44d917cf648f580e4d909b30734da9ce7149a54e65ba8e1d3
+EBUILD pycairo-1.15.3.ebuild 1612 SHA256 ed08669b3aa6d85f9176febc1b939c46938c1a3c28327739701d8270ac1a2b31 SHA512 116fa64a37cc45b86d48b41bf696775d08668f5e6018cbf0e4b5c4de26d2ff156e0d5c10ff7c42ad750f1350d3b5431531bf940f8b3429ef9ed906d79ea24576 WHIRLPOOL 05912634fada26ddef48ff3edb5ea204fe02f87b38e2b66dec362806548649b579c11685ce73d1b975b2f56aae6eecf6cdcecb92f3a5001bb7b1c52bb8553393
 MISC ChangeLog 4405 SHA256 0290ffffd0f0c4c7daa5273929bff3e300f971663f78f268b7e6bcc8fff9b321 SHA512 15f3867446f2e1c27cdd63624c4f8014623162394982fdd10d11176118f099522963cddb461f62a6e2c240de8403dadc1a465ee795084b954f728452b55de8f0 WHIRLPOOL 689ea1a3fdbe13cd1253ff04895afddb70ccc278a7e98de65732bbff55564192bd0811ede6dbdf2f1840ec38bd35367d6864a26dfa20eee9ae68ec108538ad0b
 MISC ChangeLog-2015 19702 SHA256 fe08ff0a819ad0b3a356f5f40a1a41df91a1f23b724a40d2f918629c722daccb SHA512 d5a3f9c9798f2a90ddb9ebcaf3883222d2e56fa8836a120ea8ff63890ce46aeeef7dfeb45e0a8c94d93e76aa463c65ca3a965db2a04917169841673eff2120f2 WHIRLPOOL 01e7b92dfefbb54123b9329c032657fc6e63d592b7d6b4d68a4e2a9e506ef0a50c2d680ee16c518d4e07858254a6ed2933260e891da934e3426ee0546fcc9f4e
 MISC metadata.xml 246 SHA256 634432e12556106844e569b7ff16962881c6e70887e6fc9650bdd82deb51a834 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc WHIRLPOOL 869ef1c8e23bdae0a11b44ccf38ddec23f0dc0ae2573bc83ccbe2d8a2c6bf5a3f9c3c52149aa2e3690dd66f7fc7ec498f2eb6b9d338440fb54c12d5ac0b9fb7a
diff --git a/dev-python/pycairo/pycairo-1.15.3.ebuild b/dev-python/pycairo/pycairo-1.15.3.ebuild
index 837b7b0e5ba8..43c618a9ee86 100644
--- a/dev-python/pycairo/pycairo-1.15.3.ebuild
+++ b/dev-python/pycairo/pycairo-1.15.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples test xcb"
 
 # Note: xpyb is used as the C header, not Python modules
diff --git a/dev-python/python-gnupg/Manifest b/dev-python/python-gnupg/Manifest
index b492521cb0af..c4e3ddf6154b 100644
--- a/dev-python/python-gnupg/Manifest
+++ b/dev-python/python-gnupg/Manifest
@@ -1,6 +1,8 @@
 AUX python-gnupg-0.3.6-skip-search-keys-tests.patch 731 SHA256 b7bbbbe0f043c42a2ccc3bdd33aecd9b1c368f745e2ac38783785784d11668aa SHA512 6e5ddce9865f57185713b836ec00aa479456343950d4a40edacf23ce88f155c9f73070684211bdf9cc8cb4c379ec12eea6589a0b9995ac9085ec2a7d6b8ed35f WHIRLPOOL de007a6377a8d8c75af60c5d8b689c7fc7da2fa6058e65a58475a31dc8557c126d17accb220126b96be35432521224bde76366546ce58d2afbda23bb43cfe456
 DIST python-gnupg-0.3.8.tar.gz 38993 SHA256 3872ced77d69203f31817107b324b0dd33d4437a330dc58eca140c8758d26b5a SHA512 128ba1f89e8baf0d1ae53153d7cbe73bfc99617a1aadfd9a02e2e2e2c5f0bb9c7482023bf54f32989e92cc14a9eb32325e4c358c63bce48a70a78d068103ed4f WHIRLPOOL 9080ceeade7e4c614a532eccbd4e9818d62233a6d1751acb159e8e0f13c71edf177d2c1592f0685c7e4139ba59826b8cb13864c11c37e33445a176c693d84f52
+DIST python-gnupg-0.4.0.tar.gz 43987 SHA256 e6aaf344852fa11824e4151ab63326a07dd0ef977dddffcce43669a79842a8f9 SHA512 f486ec97aee01cf46d055421211ff5704093a382155043b7ced6f809dc15d7669d5869038a1b26c5f1831076d85c929d781bc22e35ab293a14bc6e2f5f27fa32 WHIRLPOOL cdb34fe95f147fab286d1bcf0574ed186a4557f6cd866a10a1a37076a218e586b4b66cdd3dba754acfc7cad140c583b93e3779986d3408b4148c84f89e8ca85a
 EBUILD python-gnupg-0.3.8-r1.ebuild 673 SHA256 96c99420ad6a67bfe434b273b25c1f0953e7c58ab0c82d24716a72950c781c58 SHA512 da68b9d882b89f6ce71bcda2b4e939579d4c4c82e02839fbbf4d14a152a8efc84d635c2aa7a2aef1b609f2f0dccdf3d77dfe9d7a6688af5944e9bf5a627235dc WHIRLPOOL 21a334965629e790b9763ff63afcee6a26e7253ddcd37ac6f4230fde7ea6b3b4c3e6ccae25a7f206e1f58bf3d20fce6193b4f3c5a9c35bcad02c732190174d07
+EBUILD python-gnupg-0.4.0.ebuild 667 SHA256 87f78312cfda49f9d39074686a2242e0a7196b33b8e2d6aafbe3c56d9163148b SHA512 b0682ddb95ae0d737eae11080dc4cc87562a36367ca40290731be2c6b0c965d9ac427a88d4d2845eaf84e1bca9d34f6ac3d0c8eb8393353340bb2b8164da8c7b WHIRLPOOL 8695111a0899ba8e1a8fe41409c7c319a82d603ee8a3e42176717963a37c573f18260e564e281eae756e0eeb184fdbbdf63765bb181a8e5bf405cff047d9cc92
 MISC ChangeLog 3703 SHA256 79f36321526b4b49cd2a10dde31ae4f718345ff8caee6e972f0c329d9dd5391f SHA512 0afa2ab7f86e8af56089b19468df5f556551dfdb4b10be9f1c541d218846e72fedc19232818f48a8ea2b0f2219abbe26b7b7e7f3a752a190fda037ce8296a084 WHIRLPOOL d08beefc5d582d32918665ef44d0c1d0eeabdf59e0fa3e615a0ca67227cdcbdd99018e0e27caceb8abeeaa89600db3db2263859f3b843a9f6bb5d086d84705e3
 MISC ChangeLog-2015 2425 SHA256 f8ce1daba6a76f1977d5459e99ed958a2d52065aa3b5d8d955726fa8415aefb9 SHA512 ab937456a51cabe1e7199943cb11fd39b5c21e01bf7787ad94ada4daec6a798d34a7be896d0b080663b78d0936ac7351c235b61882d660f0b7d7400f36b72a11 WHIRLPOOL ad0a454a206be237615bb1eaea9b3802c51a9279979dd4cdcb938cd08d810962aae527032e3b8ca8b4d75a123fbd69c43467b401e17086d3eb71917910d0bb1a
 MISC metadata.xml 445 SHA256 571ad6639250e4f49be02dd9d9940a1c23ed347e52f2438a945f32d6cb413ba6 SHA512 4f934dd056cef7f43b98985a52a42ba152c891890f360eb2942167f2ee69ef7fb03476bfde87be8e4e8c178fb7db429d23c695f81dc5d4c3fc266d3a84e827f8 WHIRLPOOL 9355d1a26fbbadf22e87fd6b4b9ae6200f43d87e8178bc3c796ea1e5e833bb00f49d7ba9fac1d14094fd8385704b74d6ed8fa6de42a54ba801cd680a23718a7d
diff --git a/dev-python/python-gnupg/python-gnupg-0.4.0.ebuild b/dev-python/python-gnupg/python-gnupg-0.4.0.ebuild
new file mode 100644
index 000000000000..72c13fabebbc
--- /dev/null
+++ b/dev-python/python-gnupg/python-gnupg-0.4.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for GNU Privacy Guard"
+HOMEPAGE="http://pythonhosted.org/python-gnupg/ https://github.com/vsajip/python-gnupg/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+RDEPEND="app-crypt/gnupg"
+DEPEND="${RDEPEND}"
+
+# They hung. We haven't figured out why yet.
+RESTRICT="test"
+
+python_test() {
+	# Note; 1 test fails under pypy only
+	"${PYTHON}" test_gnupg.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/python-heatclient/Manifest b/dev-python/python-heatclient/Manifest
index 166692b86a51..9966d284925f 100644
--- a/dev-python/python-heatclient/Manifest
+++ b/dev-python/python-heatclient/Manifest
@@ -1,5 +1,9 @@
+DIST python-heatclient-1.11.1.tar.gz 166963 SHA256 fa40709b7c7e13c4434dbf42db47dbab2980fbe4ae0066e03a5e3d488b364c28 SHA512 f4ffc4706a2630753c11423270ef18a344603ec6b1d5afc550fb8f3cfeca1bf4fbd0c32670318eded6b81a810fcdff68faf9039c6290c6a106bf8618502efe78 WHIRLPOOL 75fbf67bc46717ecd4208331eaf867d6fa1c8140bdac092339cbfa27e2720f75bffeba467939f2a45f8f9005cc7a325f88322b49771ec2ecbc360e1e1269728b
 DIST python-heatclient-1.8.1.tar.gz 163976 SHA256 95558abcb78d747e5516b51f9aabe3bd54013a3c8b4ec06de5415ff2a042009b SHA512 7d9be61f048c2a23b853773009e060517eadff158cca8efc1fbd3a5f3a16d257950021e8afaafc15a536104248d53dfda49698a9d83a3b35955e9e23376655df WHIRLPOOL 6c65266b8495a1502637d08ee53fe5ae0ad8465440ad62ec27a596ff1b816a241328cb9eb9e349a21ec63ccd0ad3b70f4af0cba73128bc9f522e4dfcb01b7c05
+DIST python-heatclient-1.8.2.tar.gz 165073 SHA256 1543106a99010e2acbed9d4c8d4f0c459c968454f9022e7740e79e24a5d5ac14 SHA512 38c27dff97c8bf9826e57c02fdd5edb4c0410ccc041b7b1f2e95aa16b22d46cfd9a8b728bbd371e1dee0664aa1f8e14b4eafc6bbaab92a038abbb821e3c8dd34 WHIRLPOOL e4a962a58d0479807c686e793076f9b0d8158186285624b40205f7b00f841ca85bcdcc1a5a9388d2c3e9ef12c242eef425be144c1f675ffab721ee2a29fbfbed
+EBUILD python-heatclient-1.11.1.ebuild 2668 SHA256 9f376fb94b5146aece820772a160965b98765b3c94d3888fd32c04426cbc88c5 SHA512 bf32c34539da22786ea75ce625962356307ba5ce2017a54ec925c372949742cca78cd9c5adafac94b67acc548691687e5c5d6f622a90de4d00dbe631e166c916 WHIRLPOOL 2bab27ae606b80baf33ceb4d64d544c416dcea7ac4f9589910452d625260db5d91149e66d3b15b6bf153b95ac16da5bf70929191e102c9f0092f56cef1972f61
 EBUILD python-heatclient-1.8.1.ebuild 2410 SHA256 e8d57fcbfa99fd38ede4bdc5c6c6751112fdd52d67368fbf3288df8102b1b6fe SHA512 95f5ecea31d0160089447e68d624dca7b8ba4c7f0c669847c4dc046feefebc7fd5db9e235bcc3ffccdf36afbe90b11b2f30785663d95b7341d88181e4a998bed WHIRLPOOL aeca41a3cfe998057cef4632c77c0214c857fefd092623f23f3ababb714894be691c637e62266feebe65f2b8627fcfc8ef502530d19b1879cd082d068270a680
+EBUILD python-heatclient-1.8.2.ebuild 2412 SHA256 52d44e6a296f3f7111b62c6f1e112e925042c8e189f8bc0c8f7518f3cb02754d SHA512 5e5c49fe5d9469eb5711c8899e0bbb363adbbcc89cb33aef1e65239c26c76231beebf352dc289c6b64e09e7738989976563457a90f89db9f769749d3f83cabad WHIRLPOOL 9b9c96946dda1c3c893058fe83e74c187717cb0f15cb32f44e655fa3c31a815014a17335fe03a8e883c7d57fe109bf9e176b3ad0bda12c007b779677d7f652a1
 MISC ChangeLog 4260 SHA256 1e6806b64ef9c967e8d414d84d3df0b466c8f94f5460c859ff168d73cadd82d5 SHA512 c3aef5b50992a2413a368a42abb3c282e50b23f395eec4f967a9bb58aa5a65ff38c80370c65de31d364c9d65d0db7fd31389bffb562e46aca9ab9312e2ef23e9 WHIRLPOOL 219452c6a55a576525665414d42f15afee0850b7073c46e18b0312e7d244875f92aedbb7d028ae2bc01f6917e18c8763f596eefb6efbc9418502eda6c14c436d
 MISC ChangeLog-2015 3894 SHA256 4a6f84ea07c6864d69707bd7d65f75bf650c3c4e68a9940237a1dba2c23d80b9 SHA512 427dd709396f961e232bd428b142566b6b71839087eaec3e0920d2f7c851cc1a78da852f987826bda70571b2cbef383702c9cf761b38bb8b59e62fd319e0bcf0 WHIRLPOOL 7ace4ea4721cc7280f9024a0e83ee65d4f3a41e3bc51581d4a68d6cdda9f4c295d326eeca53650094984bda379b6705142979706b617f23c468fac0151a53222
 MISC metadata.xml 582 SHA256 3582e8582506bc61a9b6aee93fd4e8c0d68df3aa60c50a42e32d80bf99b5cbc0 SHA512 b0af42a00c8e7e226f912a056edf53b3fdaf356457fd76edd34cb243d45e7f6427fac8bebd39e1aad57c0d16da8e222b3c6414fa9c5b85728294032afdf5804c WHIRLPOOL be6805d0ebaf3e2f99d5a55c3e49ea9cd137140faf1cda46c9345e01b54af0c3153ca48d5dc958b6958ef311a75e27b231e32a4f343533b677907f22a24b9d89
diff --git a/dev-python/python-heatclient/python-heatclient-1.11.1.ebuild b/dev-python/python-heatclient/python-heatclient-1.11.1.ebuild
new file mode 100644
index 000000000000..34409536762d
--- /dev/null
+++ b/dev-python/python-heatclient/python-heatclient-1.11.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Orchestration API Client 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 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+		!~dev-python/mox3-0.19.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/python-openstackclient-3.11.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/openstackdocstheme-1.16.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+	)
+"
+
+RDEPEND="
+	${CDEPEND}
+	>=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/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	sed -i '/^tempest/d' test-requirements.txt || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init
+	testr run || die "testsuite failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-heatclient/python-heatclient-1.8.2.ebuild b/dev-python/python-heatclient/python-heatclient-1.8.2.ebuild
new file mode 100644
index 000000000000..ce88a3dd514f
--- /dev/null
+++ b/dev-python/python-heatclient/python-heatclient-1.8.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Orchestration API Client 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 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+		!~dev-python/mox3-0.19.0[${PYTHON_USEDEP}]
+		>dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/python-openstackclient-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+	)
+"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/cliff-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init
+	testr run || die "testsuite failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyusb/Manifest b/dev-python/pyusb/Manifest
index 78602a8a4063..b58456325509 100644
--- a/dev-python/pyusb/Manifest
+++ b/dev-python/pyusb/Manifest
@@ -1,5 +1,7 @@
 DIST PyUSB-1.0.0.tar.gz 52559 SHA256 5b34ffa74ac34f330bff949c94ee00ec4a9d147234db17ee2eed2a67c0275368 SHA512 a66cd9e3c95d0ee0959667866101f089d5ba5d425a930cc32fdf679f8c1fde8681aaf464efc96cbdad99fbae9f72086c4704f857c757b12e4ce2016e3451dcc0 WHIRLPOOL c93d3bb289646fc06bebadb7d2d5677d685e49756bbcd4ebf01e0eaec30620fbb3f7d925d3f11b9c8cb1d1af87fb357c27f0266c86b83a2c30aa001787f994ac
+DIST pyusb-1.0.2.tar.gz 68694 SHA256 49dfa601f28e9399df62004170cfb623197ad32d8399885b7f789775767b50c3 SHA512 6a264b796e17612004196a7a526a7c6df99feac9062f8354540221016411a78a65d413731aea2fc1206ed5ea2b84787078898b9ca3754164f1dfe2a9878b75a5 WHIRLPOOL 1edcbae8e4469088645e12343357e1847dbc9cf8e9b4e4fcd27e9a0e87d22017a432d7b8ac4fcb1e79678da3cd37d31133f253f644dc23f8befdd0aec37fced4
 EBUILD pyusb-1.0.0.ebuild 593 SHA256 0c759ce4849571fa0b76697feee27347e725e73f54da279415dbd10731a8e3f1 SHA512 754c715921ec8132f52f77005c63871e6c09fab669195de3de76981d86378c2218c83bdebaad97a2db5e7287b86f34fbb978bed14cc960fe7a6c43beecf670f8 WHIRLPOOL d6ce526f88dbb95db6a8e59d70dcacd38445c83d19c1ce84004b1904a951549f1f8bcfb75e12520a1f80be641562922d69763731a344091fea8779c789dfb633
+EBUILD pyusb-1.0.2.ebuild 821 SHA256 3ed2c71421099feda2b120acd819f1bed543d3a7836bb1f6b7fe43bd08d114fe SHA512 6f28480820f8199a497a5cd310ef1634b17a4888e4285d7f027c6b5e6d2b175bfc10c00bc18b17f48741d893a8f2955d74f647569f472e8df43703713499f854 WHIRLPOOL 1797b041d3a540456afbb4d59db6924279f9419b7a74b1c7aa5f1820167ef934c6ad81f867b4adfb1cc2e17e8a98b401dfb0501df24e483a4afc8523e108f116
 MISC ChangeLog 3721 SHA256 0cfa7e54ad5bd2bad5d7bf7e2f6d1a58ee625a4e0085d8bc0e045788ab531e3e SHA512 0272193e34945ada3b9e003f5781f8ed2563301ef7b19267875ec7a9326ab16d3bf80865f94de7da353c00fc5aada534aaadc81b370b313ea6410d6940c2fc6f WHIRLPOOL 7bcaa42f11bc2c41a36145d51468177ad9dd3a55c816ec59aab999b8df1944336028ebde0b994c60a3dd1616bc6de64de5ff6a0b8fdd0df56e7ce2974c6db9c4
 MISC ChangeLog-2015 2902 SHA256 c523e67082d9810dcaaa8de7d2503bbf1737806d13ef02245c068be986ffd842 SHA512 46618df6229383f0a8ed505451c1cbf86095af84301d1864baa767cee6bc494d730a6c78a491be21848ed973be16381985132ed6ec2e8efa694985a8fe8ed5e4 WHIRLPOOL 8d6041f959fcbac2bd32cb23276cd6db48166d058ac37d1dcd78ed605ff2e6ff0d4116baf82bb6413610b77515334eee8217644f507d2f1fc9d615136bddcc0b
-MISC metadata.xml 471 SHA256 a536667938aa97d4d1eef3866ff2bf785e2b16bf5f5aea367d23b0b778a49a93 SHA512 ea70dfe350e02b1e0b16bed27aec5eae3ec12f8161b5d8c423391a8ef3d05ae1ba3e7998f74bc6db94b1c5b9487aafdced020551d5c520ef0b9a1f9d0986d0c6 WHIRLPOOL 41987052f72b60452ab63897002e50a77db94c881df5252c2abf8eef682bd9efd5134551c7422d37bced61a0b98af71ff6d1e2172dc97e2abf3efc79cae3cad9
+MISC metadata.xml 472 SHA256 e51f8ea6821d37137ad3b056f1a11077b76ccd3915588f221e655257f1f3e369 SHA512 7db6620b2545b31d9dd3c3844f9d02d0403c266a931935ec8e5728bb936ed3ec1f5ec5fd5d7146668e4e17c9f8f1eb31affaaec90dc93e690864b574a7ddbc4c WHIRLPOOL db4163d721631d4b7211181c76183f20591a44e61c363427a12e41f97bbe05864e705d0d887dabd05365b76a90c2d35c0bc4ecf23f9f3d3305756c9885fb38b8
diff --git a/dev-python/pyusb/metadata.xml b/dev-python/pyusb/metadata.xml
index b547c09ec840..7a1db2dc3782 100644
--- a/dev-python/pyusb/metadata.xml
+++ b/dev-python/pyusb/metadata.xml
@@ -10,6 +10,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pyusb</remote-id>
-		<remote-id type="sourceforge">pyusb</remote-id>
+		<remote-id type="github">walac/pyusb</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyusb/pyusb-1.0.2.ebuild b/dev-python/pyusb/pyusb-1.0.2.ebuild
new file mode 100644
index 000000000000..abedff611616
--- /dev/null
+++ b/dev-python/pyusb/pyusb-1.0.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="USB support for Python"
+HOMEPAGE="https://walac.github.io/pyusb/ https://pypi.python.org/pypi/pyusb"
+SRC_URI="https://github.com/walac/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+# pypi releases don't include tests
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE=""
+
+### This version is compatible with both 0.X and 1.X versions of libusb
+DEPEND="virtual/libusb:=
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+DOCS="README.rst docs/tutorial.rst"
+
+python_test() {
+	cd tests || die
+	"${PYTHON}" testall.py || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pyx/Manifest b/dev-python/pyx/Manifest
index 6a93d9d951cb..35d17da60bf3 100644
--- a/dev-python/pyx/Manifest
+++ b/dev-python/pyx/Manifest
@@ -3,7 +3,7 @@ DIST PyX-0.13.tar.gz 1237082 SHA256 1952962c965000d8e04a00d1b85c600cdef4588cea88
 DIST PyX-0.14.1.tar.gz 2475186 SHA256 05d1b7fc813379d2c12fcb5bd0195cab522b5aabafac88f72913f1d47becd912 SHA512 16265bbdcaf28ce194189a2987b32952f296c850b829454bcccce0abd23838bfca0276c3e9c8e96b8cbfaf1473bf14669f9b7f2032ee039b61ae59ea3aa45a20 WHIRLPOOL b87f3cd4cd7620e6fdfe7e25f13bd424272695c8a93b658782b05b797e4424b3e1fe179123c9b1a9ebb610c59534c661f5db1b99d2b99b6f9b48e28215e327fd
 EBUILD pyx-0.12.1-r1.ebuild 1040 SHA256 fa6f32824d2d9bd06b55f4111e6c6b24e263d1d8a163d26251dc5dc8934f48fe SHA512 925eca3a2edcf2160b52cdbbc99c09f6517eb5faf0c68adee79a6e72cee666cc020868e1036c62c1c6873676f10fbe607bddb6d8b1a2faeb5ecd68537bd917f9 WHIRLPOOL 5598f90643f6e88d39fd2a5f6e94d6ea7c8244e2d8aa8f34d85e12b72075499be6bbd23f6ca286484e933019f524a15acb594225f39bdfd4ec90f026045470e5
 EBUILD pyx-0.13.ebuild 1035 SHA256 83d906e76272470c256ea2cf4a60972a0b17c13a7c34c491a0ba19e1ebc0d40b SHA512 75aef766c29f06094201d43df43cea7fe567139946ca77a824e1b8bc1184aedfcc14138687c633a52ead64d329424f28b73a8457869d602cdd2691881febf361 WHIRLPOOL 46b2142bdaa0f1325c00cfbca3f201ecf81239bc659cb08e6464c774b804d5d25d597edff3b9af747c73801e03c44485d79a77e2f333037763622ffcfc655c79
-EBUILD pyx-0.14.1.ebuild 1158 SHA256 42b49491c3803b5f2348d508fde1884d0252292369a715a14f13ce4d57c36335 SHA512 f72854d875ea70795140e65b08604cfbbba575e0d06d6053eb5a8d2b9d9652f898e00548bff2e5147c85574b9a2ab63f951647810416ad4d495f8b8793f6f31e WHIRLPOOL 467eb1fb62df7a736f00dffd3e76dcee12ba850e7fe57b595893214eab09f4d6d77c54f56533ea0ddc8aa2bff046db5809ef703b8f7ec6264e5533e188ea6992
+EBUILD pyx-0.14.1.ebuild 1160 SHA256 72ffdd12c6bca2e9baabacb7ecd24a4397617fdf47d970c3ccf198ba651de7bb SHA512 df35dd121606d01349903d76f2fb240757049657f7fed820f01ff06c353d3dc9012de08fa861df2fe9d0970cb0b8e0b5ca0a99bec394ce8e4b2ab94677410915 WHIRLPOOL 7ce99a0d3e44a6b86b3102af0316fb55d470ccabe60d807addd35f4d81001c4360b25570280f8b3a7ca7d6fcefdb0f341fdcf0e6cbf67a3b59f1e152be3b3be3
 MISC ChangeLog 2835 SHA256 d02393eb3c60504cf75efdb57ad7513db3ffd1e1613e3b1176379d4d44ef7e35 SHA512 65d18b9a540b98ed0e5126dab9fcbb3a80dd898031a8c37610fae76a29f3f7dde95f9041326b281418803cb5158b6d082244bd0944ed9e4b1372518ac9a4418c WHIRLPOOL b82b5565aa610196139d77be32b23d09c0fe3b0c5a52becc1429a632b124112c9097826575143cad5a682f74bc23bdc0c403f7bff86795ff1ff4086f7a666f9b
 MISC ChangeLog-2015 6296 SHA256 7b07c1c4b623dae0445054b864913886d3ced77ae706689afcdfde1713aa472c SHA512 dd6dbc669233fd77f8aedc3af18f0a05ab3811c6555f91448287c96362b329137e5aefab4c6c0c530023d09aa49c7ec34b5b1f012cf35a8d6267374868b988b7 WHIRLPOOL 61d610fb5e346a64064904abb0f4b95b8b14ec20aed8fcefffb1fab1acaef56327011a25894c95848c4fcff933440dfae2fc951abe219a7aed716069f1df3923
 MISC metadata.xml 642 SHA256 a6a20b730c5d015f8ec27fea09f17a53c2237fe4beda346720009c3b162f84a0 SHA512 c95b0de51a001623d93ef15159eaceb5c62fbe38bd7c21f261d12d131eb00c1764ab4f4f124c4bfdfce575d80a1318a996cb02629cfff0a5f9b853fd078627e9 WHIRLPOOL f671b98c455a34e08eb39308250d00ae49c2617716ce9329514ae4ce6a15712bcb14161b6e0fcd30837d886454df79b6234d1d149748ea7b4c6b0f8e3abb8143
diff --git a/dev-python/pyx/pyx-0.14.1.ebuild b/dev-python/pyx/pyx-0.14.1.ebuild
index 2b079741f0dc..66f76ddc5a53 100644
--- a/dev-python/pyx/pyx-0.14.1.ebuild
+++ b/dev-python/pyx/pyx-0.14.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python3_{4,5} )
+PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit distutils-r1
 MY_PN=PyX
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index d96d4e58acc6..765b765d441d 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -2,8 +2,8 @@ AUX reportlab-no-pip.patch 419 SHA256 9adce87eb85a16446a00d56ce549d9c619c03a11b6
 DIST pfbfer-20070710.zip 677333 SHA256 fb1462ff6ce8efae58a0c496f0537c5ac16d4895c68f1640c2973db574ddb376 SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2 WHIRLPOOL 5aad616d063cab1862d77fbbf9f625f20c4bcbf09e45688719e312c1e8d3815f1b295d290b78f6c4789919cef39856ec223c30a2e424eeb1c8137cccc5ceb90f
 DIST reportlab-3.3.0.tar.gz 1959255 SHA256 f48900b9321bcb2871a46543993bd995148d769a11a9e24495f25b4ec0bbe267 SHA512 a6dbe5db13a9e430855ba8139310d8f04ade221c340467c2e0f5bf60c700f17148069358beb057f1667217a09b71ba1ae3112bd02e7c8de00e53a8f852acb8df WHIRLPOOL a62cb9ecd2f85324e8e847365346e4fbd64ef098032a54884149db43f4a9f42a0358747a185f1d87107472689bd08f86f70f976da49d09806fc4acf1b175f4f2
 DIST reportlab-3.4.0.tar.gz 1995779 SHA256 5beaf35e59dfd5ebd814fdefd76908292e818c982bd7332b5d347dfd2f01c343 SHA512 7f00074b93be49e1aa7650e61381e285598599911b12a6b63c0f12d6eb64bc59afb6907b683350740b0a81c99a3164373b27e18cfccc0f9da12405c3dacd1ff7 WHIRLPOOL 7d97433ce15d4730b6b062ae67603e81aa210483f01dcb0b972f048aeac1ef4fff233f6c6b4943e98667a0205d3e8670c21e0f5fa1bd171ec37681d6f2a8b1c2
-EBUILD reportlab-3.3.0-r1.ebuild 1663 SHA256 08a8396bbddcd802022e6e7d8413c961811801c929c3b1f9fd7788c0d9fc09bc SHA512 59f25e15700f62ff308819f59641067b5e32c6d99bb3d18acfbe5e9e53c28df77507ac142be177d9ec8629fbbc5d8b0ec54aebcea623c49c480ad8b2f6a3f431 WHIRLPOOL 3664c53b16cd0b4af5500ffe597752a44a2300689c23d26de57a82e6b2d7dfb354ea2d66ea80424becd1d3cba339119f5ae472738cab539a6b821bcaa3fff54a
-EBUILD reportlab-3.4.0.ebuild 1694 SHA256 1b2a2c6b2cd1dce5a6d1c573717380d65982eda30ef01a6951567cbf5996f9e2 SHA512 3929892657ab5ee98436a04876a793c34664a6208d7966f6814909df92859c22e9b1d1919053c4e88dc3d46c6f4aa9557fa36dfb351a5c129a6c176076124b89 WHIRLPOOL 5de838e603426646ac2a2a42dbb8572166e731086f2bba7380b2eca91ce10f2a08881fa606835e351cf23679f87c559440a7cd49c08fb3559bd977581d2894c4
+EBUILD reportlab-3.3.0-r1.ebuild 1666 SHA256 7f74ef6b08c3ff0a97efd04380e494b3cdbaf032563088f2004b0f41e77d6431 SHA512 3a14bb37721c8cfe9e0b97b185aff26d7300128c1f47d6723a56378bd1a7cc63ea9a6d4669af8ef55a2ea589a4e1db66553d5f4f1235f7d37cc2c678510f1945 WHIRLPOOL 07d8f8229b418ff822ca4cb552ca0c2153219b0bf05cb01bb53dda4be0e3ad8ec259aca9c7fd329bff68582db6de86c497bffb805871a918ca0dcbe550d5ff82
+EBUILD reportlab-3.4.0.ebuild 1697 SHA256 cc0ca5ac259c4d890c75ba70cef3f0f3c10da157c1f47ad9695b38ace791b9b6 SHA512 9b7e35d4ca25eec9576d62c426cbaa2d3aa2ef87eb5ba50c9add55b6bfc3b1bdaf5b79177af700ab498e455d2357dce27dc6a79ab99427ed392be7255ca69dd0 WHIRLPOOL c55a48631089c2a6866b8af19bc40430cbb029da16e4ae1a1b0d299ddb672fc3ec8b095fa7d9fbd87c56a1db8ffd84ee9c7f8553e0261a14d0adc492e88e7955
 MISC ChangeLog 4410 SHA256 2964cab02a01fc3fba9b05455d6b3aad7913497f6c3cf8885285c334a4b5a9c4 SHA512 2f6ef913fff25141576dd40dad6dd2c756447302cfbfdbd7366174e6982abaf96729e4ecefb4fa3aa029a42ab93a6f4f72e99a531d9a6f482e5a0daa733f4177 WHIRLPOOL 80725c8c23e070ab5cb807706db7f6cdeab53c2e1d0371ffd66069c7aebec25b75a9545e74b7ef9f32bd000fc24d1218533671b850feef9e57d15ea07a4a69f6
 MISC ChangeLog-2015 18152 SHA256 595cfb8495f9621f18f23bf5318c55276999bbe302b8b769bc7baa25067e7bfd SHA512 e79f11d240710e2c31f434300f22e052f4ef1fcf369fcfdc55bc9603bbce4761e45570d7c20a9ee8cfe72736eb8ffb8e6bd2a93cab3f20769a78a1cf32734283 WHIRLPOOL 284502a61d5ccde30705b19b8116139076670bee1db8da41f905d7d1049e6f87d53690a5de3506d437da83c4273ec562730c32917dab624e5534407febc58589
 MISC metadata.xml 441 SHA256 03004a8b74c47d8ad5469c215fd4f7fe2456f2cdc7a4c606bfe7b0608cbb8ffd SHA512 4c54b763bedc090a8f16642829e4b2f16068a2cd6a8f1ded89ea9faa6425771a32b85a8b49b2f8dd91a51ef16f37051f76b5f899f7b34c7d4c2f37cb94a253a2 WHIRLPOOL 4510af69940cc0dd604551fbc53a7f4768cd513c20a915aba4b17111d632ec0e8133852356883a9319501269758f4d4dd167b4e840726380b0272b7bc2cdcfff
diff --git a/dev-python/reportlab/reportlab-3.3.0-r1.ebuild b/dev-python/reportlab/reportlab-3.3.0-r1.ebuild
index 558ab2b237c7..f950134c4fd2 100644
--- a/dev-python/reportlab/reportlab-3.3.0-r1.ebuild
+++ b/dev-python/reportlab/reportlab-3.3.0-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~
 IUSE="doc examples"
 
 RDEPEND="
-	>=dev-python/pillow-2.4.0[tiff,truetype,jpeg,${PYTHON_USEDEP}]
+	>=dev-python/pillow-2.4.0[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]
 	media-libs/libart_lgpl
 	sys-libs/zlib
 "
diff --git a/dev-python/reportlab/reportlab-3.4.0.ebuild b/dev-python/reportlab/reportlab-3.4.0.ebuild
index ffc0d13ba0a2..d9aff09004a9 100644
--- a/dev-python/reportlab/reportlab-3.4.0.ebuild
+++ b/dev-python/reportlab/reportlab-3.4.0.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd6
 IUSE="doc examples"
 
 RDEPEND="
-	>=dev-python/pillow-2.4.0[tiff,truetype,jpeg,${PYTHON_USEDEP}]
+	>=dev-python/pillow-2.4.0[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]
 	media-libs/libart_lgpl
 	sys-libs/zlib
 "
diff --git a/dev-python/scrapy/Manifest b/dev-python/scrapy/Manifest
index 51eb4d957337..ad9020888106 100644
--- a/dev-python/scrapy/Manifest
+++ b/dev-python/scrapy/Manifest
@@ -1,5 +1,7 @@
 DIST scrapy-1.0.3.tar.gz 1006911 SHA256 725eb5906b35076ad112b1b0ac27c68dd684e72514eddf95bc7ace64c04b2bb2 SHA512 bf61d449d7309de0ebdc36c73371d01518ee5cfa5d4ac1b68ee42389466ee15dba82690dbc885aa6bc1b9fe0b2e29a03fb3a3af3889842e1039e3a81749fc0c0 WHIRLPOOL 0dee3a82a0368f50420d484252d5d138c8a3bf8257715dad5d74419a7a852ef5d21aef5b52e9959f8f08d7dcdd58988221faff38d9a8d530406cfb83fbb031f9
+DIST scrapy-1.4.0.tar.gz 1114816 SHA256 7889790a5684ffeafe4389dd819e0e700ea34cf067bd36a06c2e05ad4adc7b03 SHA512 1442cae1a26b5c7c8c27998ec6ef9ab374111221180a5933d53aff0c7aeb31102882c387581c1455c1dd246e11f0c0f5ab5989a21037204e5314054e303f7312 WHIRLPOOL 32e7fa565716657072faa817de7e9f1d01e2599dcb3861664ea960097dc78b7bc5bf3a410703eb4ad6995ded3568c2e394b4b8201ed84751cc1ecc88c8ad73a2
 EBUILD scrapy-1.0.3.ebuild 2453 SHA256 a211fa472a96eeec115705a70269d5b4ad49a6638daee2c00d50034883a7a326 SHA512 f4130d4a03111fa1a9c1add4cdf8a777563f46cdbf8e1ef25415a33e89060ea283dd13a2736e8561fb3c68fb64627d80de2c6babfc0a050e9d6ad7f1b332e88e WHIRLPOOL 8e6b7fa9abf86a302be12ccd48e93f82a5ef4fecc7e408d9d9d961dcaeebf512c67d3440c7f8725ee1ddfb48b715f54363dc0b753306d70b275c1af07b4982e1
+EBUILD scrapy-1.4.0.ebuild 2438 SHA256 19bb9b9e0b0c0a85b3e9f37be513e314d5e7afff618190ad061fef2805a7da95 SHA512 691725c85fb8ddc580d26fc9db15dc40ee7c84026febad8e68c546417fcdc0292425ec1aff72b7c38a35a7f60f7d977863d036c3e7defee020590c67427f0085 WHIRLPOOL eb8bd1ec153958ed725b63e6d41df6609c82db2f86b3a8c03be54c1f72d26594d4fe099e345b4b9a92616774a70eb3a115b2df6893122126f646c195f5067bf7
 MISC ChangeLog 3605 SHA256 b7ccec687ed23574c3b9ab7e8f613c03a42784b8e9490e27b3b5121f58c8e8c6 SHA512 4f9a7eaa5683a43b6a0f6022a035e2ab85dcaa5cc85c3dbdc5e1abb6a1a50ba11f0cf5f3c48e6d3d16d3ee0993818863c101ef9f60d370643a2407dd8fc0f272 WHIRLPOOL dde670d441e414e3cbe7bc3d8e87d1bd9143b158e5d469f8598b377d6fb63a0cb8a1ddd99eae8d3ef5887eae22f153357912e839b68469efa6bc4c2ee0e33e39
 MISC ChangeLog-2015 5355 SHA256 e435b0fae880ec5304e6a34ac7a8ee115da87b910aea479556df9d052028e46b SHA512 dfed23eaffb8786866fefe1054d1749c92b189b29c4daebf80ae651f014cdbc8ef2d17f7be9eb79a2cdf65772c69fe7c083071024f8798187662380cf1afeeb3 WHIRLPOOL f2c74a475b6e60bb43f25db7c82e0ea791e122d76261d786a9f76146cfb56c1c0e62bffc2c383eb46aba5abdea29602b0c2a56e7a9c5e6f553f1f709bf38d9d5
 MISC metadata.xml 606 SHA256 06d21cd2aa76afdf41ee74c5399718c2f8851be557f3701a1346cc227a1c3808 SHA512 6c507058cfa5501fd3e8d163ee697b5b00fa341374431e6d7c43dd61cf16fca5c935b26abf17f8be38657463c7e106bdffab5eacac9764b2a3a960b80c24fc9a WHIRLPOOL 97d977b7c2c23d1ceadfd38853a31db72ba0fe806ffc0101b27e4b8323aec33fe8baa8bb19428020ee42d946b49a824c4222d8e5c207350468ab52ffd8bbca42
diff --git a/dev-python/scrapy/scrapy-1.4.0.ebuild b/dev-python/scrapy/scrapy-1.4.0.ebuild
new file mode 100644
index 000000000000..e26e409f3d1a
--- /dev/null
+++ b/dev-python/scrapy/scrapy-1.4.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A high-level Python Screen Scraping framework"
+HOMEPAGE="https://github.com/scrapy/scrapy/ https://pypi.python.org/pypi/Scrapy/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boto doc ibl test ssl"
+
+RDEPEND="
+	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
+	dev-libs/libxml2[python,${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	>=dev-python/parsel-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.4[${PYTHON_USEDEP}]
+	ibl? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	ssl? (
+		>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}] )
+	boto? ( dev-python/boto3[${PYTHON_USEDEP}] )
+	>=dev-python/twisted-14.0[${PYTHON_USEDEP}]
+	>=dev-python/w3lib-1.8.0[${PYTHON_USEDEP}]
+	dev-python/queuelib[${PYTHON_USEDEP}]
+	>=dev-python/cssselect-0.9[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
+	dev-python/service_identity[${PYTHON_USEDEP}]
+	"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( ${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		=net-proxy/mitmproxy-0.10.1[${PYTHON_USEDEP}]
+		=dev-python/netlib-0.10.1[${PYTHON_USEDEP}]
+		dev-python/jmespath[${PYTHON_USEDEP}]
+		dev-python/testfixtures[${PYTHON_USEDEP}]
+		net-ftp/vsftpd
+	)"
+# pytest-twisted listed as a test dep but not in portage.
+# Testsuite currently survives without it, so appears optional
+
+REQUIRED_USE="test? ( ssl boto )"
+
+python_prepare_all() {
+	# https://github.com/scrapy/scrapy/issues/1464
+	# Disable failing tests known to pass according to upstream
+	# Awaiting a fix planned by package owner.
+	sed -e 's:test_https_connect_tunnel:_&:' \
+		-e 's:test_https_connect_tunnel_error:_&:' \
+		-e 's:test_https_tunnel_auth_error:_&:' \
+		-e 's:test_https_tunnel_without_leak_proxy_authorization_header:_&:' \
+		-i tests/test_proxy_connect.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		PYTHONPATH="${S}" emake -C docs html || die "emake html failed"
+	fi
+}
+
+python_test() {
+	py.test ${PN} tests || die "tests failed"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/twisted-conch/Manifest b/dev-python/twisted-conch/Manifest
index 6f232cdec486..b764f94c3049 100644
--- a/dev-python/twisted-conch/Manifest
+++ b/dev-python/twisted-conch/Manifest
@@ -1,7 +1,7 @@
 DIST TwistedConch-13.2.0.tar.bz2 243977 SHA256 1559f2070e47a8dfb63a387a8d8deb4dae73226429b26bf2983dc7d1df86cc69 SHA512 3e9cfe76b5fdd8e18732d554721d493bed70b757b21029f8e126d486011b41da26a34409062cb5ffe4283a57b6d342434c84959b78b2781f069e22d2da610043 WHIRLPOOL 7ddf201c17f6625cac09197bfc1b532d1f6f8bd01b888668ccb16b5577b235a3379af11e436e0a4ed308218b6fc27e1250841367dc8c191bc420f4a90a7a2a49
 DIST TwistedConch-15.2.1.tar.bz2 222736 SHA256 77ad3f89fcad8918067e047831c0716a514ff5f9405d6896abf17fd3de05d634 SHA512 d21879801e3cc925345e6528a84fa031f5cc1c8a2b5aebc5d3540fdd356d9743fe827ab8060db13b462a6d8986ac23307feaf78725950cef462f06b4edb93df7 WHIRLPOOL 072a90c66380467354e32af702a0caef71bbd4de469681240e3e91deb74927e5364835d4065a72224433d716763b5eff503adc5205c28a61a07f7ec51c1fb671
 EBUILD twisted-conch-13.2.0.ebuild 788 SHA256 31baad9a8227a9ceb2d4b13555fc6dc52eed51fc3cb0839c1ec47c9e7ca880da SHA512 4e66a99ec56754da74a8e3c58da79cc837b7f723518efed38fa9f245508e0d47d14a4ea307840719590d22b187b1a1ea10854efb311a0c1af437391032e06e7b WHIRLPOOL 1bbf365b4cb54af0cc4d8aa282a09a439f147781c43ef687e8744790b726770605f22e857060583ce8ac3d4e653b5129a9d97ed476aefada09ecb6f83df7911e
-EBUILD twisted-conch-15.2.1.ebuild 473 SHA256 1de06128b4f6aac8aea304a10a97219a828bcad7dc1f3c8263d93bea68567976 SHA512 18069e442a45f56384c57aa69c17dfe18810d842fc9e599daa3bf92f8e40c0fd854934aa36c7379ab68443f3a725346b593e1ce4563a7371017c41de7281ceb2 WHIRLPOOL 200583473b78c2edf5e0d29404f5709bdef1da7448d258c5a3bb3e019e76116e6a487ddd27d736ecd9f3f0bd4be956b25e41a37aa1c11f25dae565bdde6ec43b
+EBUILD twisted-conch-15.2.1.ebuild 477 SHA256 8d91929daacc4c91775312ab9627bcbba91bed35babf34d6d503d9b515be7809 SHA512 9d57089497d0fd2cdb595ac0e366a97c5d3e0057f0810a3f8db538c507f1b9aeca77d1be4525178191c5342b7ddafda3e8a5b2a21c46ecc3bb2f2748e0c8f650 WHIRLPOOL ba0de9e3fcab6ab4645ab52a3ae87653a8524a78df85555451c1f5a48c15d82ae53c809920239f8395b1802f33922c8b3f2f8c49acaf0ede0f5abec32d187f81
 MISC ChangeLog 3522 SHA256 d25ab309c4a56d45ac8f1f3ac118cff8439646082a4fb610e3d4d5d7bf41819f SHA512 71e69a7d0794b8a6d93c63bdc370c4416e4060ebf99a33c42b3fde4cbc3983989fc40b0038cf0cc527fab9546a082f85cb1a54da1837a7f9f3f4b4417e2a2581 WHIRLPOOL c978f7e19b7ecb3ed99f5448090239d181e455e5a71de92c85c28d35b34f479ca72ecd74617be2f1d385d7d6f57aedb6630f07b3282e3a2954a201c282d0c9b7
 MISC ChangeLog-2015 16985 SHA256 2297eac0a701dfa62ae43606f0bcaecc0dc570e4561ed495cc5a4e24e0287411 SHA512 dc94686d8dce2328fa18fc3f62b66c8bd63bbe57be3f8941870128acce92f52491cd2b65cddfe5015f084d450456d1f30b34ab1c4c29292198528ac88a3fdf01 WHIRLPOOL ae4c7254c27b4dc0f00ba3acf57673dc6659da4a881a1a0f421d25992ee7b14cd1e230f16ef8a8168907d3412e69c02c82cc9764f1821cf25b22dcc37a0916eb
 MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/twisted-conch/twisted-conch-15.2.1.ebuild b/dev-python/twisted-conch/twisted-conch-15.2.1.ebuild
index e28a1ad781cf..471d751be87c 100644
--- a/dev-python/twisted-conch/twisted-conch-15.2.1.ebuild
+++ b/dev-python/twisted-conch/twisted-conch-15.2.1.ebuild
@@ -14,7 +14,7 @@ IUSE=""
 DEPEND="
 	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
 	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]"
+	dev-python/pycryptodome[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
 	!dev-python/twisted
 "
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 53687f4091a0..222e911790ea 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -4,14 +4,18 @@ AUX twistd.conf 277 SHA256 aa2ffa5b128973bc0c58a1251b8bbb56f6f890728bc902805ea2d
 AUX twistd.init 563 SHA256 cb0ee0ff81d50f673b4359b1329e72352e6f5d32f061aba5f8d1f9806f0ec217 SHA512 7860601beba1efda2b0a045b2a044ec33caff9ee915d45225c05e281760a68da349b4c45080600177aab32aa806714327acf3cf5dda92be0874f781f129bb129 WHIRLPOOL bbf71d8496a67e7d9da08a3958ae02be96c86894a665462af899bc551e9e823f65963fcf797fa53571c56b76bdb229c3ee1de51845600ee2ebb312c9bc681fa0
 AUX twisted-16.5.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch 427 SHA256 a2ac4339a844b762cda9fbd8fd37205dd418ce9c303f8d7249ae4b43d20cbf3a SHA512 d14b4941c3a13c59dfe0599a3eb73b9b0d5bde8e7c26033848ac920da8e8c63a0290d7f4d711cab16a17ba55a2e13830ab02bbd0db38f0757768cb973000064c WHIRLPOOL e059394c92abcd9eb27d19a7cff297422080e0ac89a3432fdd879905bc8b5cd7f312862dd6a2c2494a1654528a882f9318e1549e4af649357e7281f257e3c700
 AUX twisted-16.6.0-test-fixes.patch 10591 SHA256 270293351eef926a18a4db99bef30ab1795727d0df0edb95c8c8335054421291 SHA512 5071ffe30d1911ab4eb301403542f34198cbb3e09137d6260125fa61f702a0ce10e5c11c7967c10841a9d1b62f2eaf44e04119182a108cfbb7046622ddbdbcf2 WHIRLPOOL 06d3d49ce1359a669bc7b250b82d615408f97a78392893df0bb97f3783a53a3cb1eb60bea19f97b87fd6f21a6c2efa381250615c5b0dcdbcec321bfcf0f3c88e
+AUX twisted-17.9.0-Fix-test-on-Python-363.patch 3490 SHA256 bffc9b8cb4133789d296748514371930ce6124ac0a25e4cf8ef7f3b15089c5e8 SHA512 0ba6b68267418bee3b2cfb15937dab4d6d3291725dd7acc41f37e0c8d39218acc4e23cb704c292f62eea57a128a1fcee6899826601b6763f37800c4b83ad18a8 WHIRLPOOL 5cd6c3d3ce154820738818b151becff5a06df70df995dc9a3baa09993649a29bb571ec09c72f1378d4377d6ab9e095881a7bdf235c4669ce818217853d36bec6
+AUX twisted-17.9.0-python-27-utf-8-fix.patch 1630 SHA256 a409a44bd22a5a3633ae1f074905d65ee8be748f7032b256647c17aa796a30c4 SHA512 635c498ab0e612b7d7ab262c333f18408e22dbe95d86389e87da36f0c41cee90f25b4c1df626cb755932c970a9f12dc25ca67e3790bd9c15c8a4d8ee6f547956 WHIRLPOOL e179dfd75c3c6a4fd0a1b086fc33c1cd9dddcebccf3f327e9bfd4df0a53b0f0fa20097f664a169565bed8152352cf9a6e9363c7b83f2ab75175c1fc954eab093
 AUX utf8_overrides.patch 2288 SHA256 dd2c9220dc7aecc15ed9c55a804b8512d75e90af9a1022e364ea58ec04101fae SHA512 b495268282e0233c570655b2b3d42ecc90116b22c36cdec4ebf581ce1019abedb7ee301d860ec161b4b5e691d1b747ad45257966b5f510de8dcce8271021e7e8 WHIRLPOOL be3f1998cbc8553606ccec61040dd97bf3f91af249073dd4c261043163780d5142fa9c966ffc803b30ff590b1de9cb7e5b82e2265cb2bde413881eea2f11ee25
 DIST Twisted-16.6.0.tar.bz2 2979747 SHA256 d0fe115ea7ef8cf632d05103de60356c6e992b2153d6830bdc4476f8accb1fca SHA512 0b8de0ec7f64457f76c396fced64b366b8e63c6e000a5edc6c6388cd917fb2f95711918cd8edda39e0aa77e2cd32b5d775d23630a5ad10fc013c18f8316300cf WHIRLPOOL a09a8747312580e3b27d222bf0942b714ad041044a817876e1731c5fa2ae3d11e4d5a45221d2e7d126ebb664730d15c886d5ae164841c7a8f0acd6e12c4691a9
 DIST Twisted-17.1.0.tar.bz2 2997334 SHA256 dbf211d70afe5b4442e3933ff01859533eba9f13d8b3e2e1b97dc2125e2d44dc SHA512 e5eedc9a70b7e4d0ec18dddaa82aa9a784e96fd517db65c278d822d15e8bdc65a35307a5a0474eb68dcb73fcd5508086bec605580a9f2f767bcbe27d714b4966 WHIRLPOOL 828a939134df47950a285c732867b3d4172e5e86a75fbdc1cc4365b5a24699a0b3fcb573b7e3d389eea591fc9fc79456c09f2d2c8f08d7e1215dc5761e88ed8e
 DIST Twisted-17.5.0.tar.bz2 2993816 SHA256 f198a494f0df2482f7c5f99d7f3eef33d22763ffc76641b36fec476b878002ea SHA512 0fd10e5db7c87daf0d2225cec9929f1040f0c67e9605bfb1a5bc84db8b825e943cfa08e094c32c25c680bddc6587bfdc525a994ad7b785396e5ddb2621649379 WHIRLPOOL 28a0578545d525b5239a897229904489c38fa1e7148f374c96e66d3071f8dcd861aa5b772b338e5aaa9e92cc4d0f19a1598136bc2f9a9173b2489f6ec7fb391d
+DIST Twisted-17.9.0.tar.bz2 3019243 SHA256 0da1a7e35d5fcae37bc9c7978970b5feb3bc82822155b8654ec63925c05af75c SHA512 0fb854db1044bfdb208594a379a0f8df0193326a9974e193266e82113488d49220648d4a50b323fa144654e94976f5848e1d60efed13ab2668b02cc795720345 WHIRLPOOL d0fa84debe9524a25b9d4e737083740c68cb80a1ab3cc2379e336ded591d85ca62b151752fdff32931788e800df17e13dd5343c4f6fec793b9940f650cee38e5
 DIST twisted-regen-cache.gz 911 SHA256 e88fb326c0e24506d59afa3a4113e63c3e496fa1114156db6521f84fbce41652 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03 WHIRLPOOL 8077fc4d102bb8071e3163c386edf10c14a2cf0c8bbbf57c66787bdeb9b5f21115bcb022a770fe72b48914d829ff69384684f50928700f83547702d6a0d35423
 EBUILD twisted-16.6.0-r1.ebuild 5382 SHA256 a3bbba4fdaa36f7b36c1381109a50deaa2795800c8729707f14ac84e191257f7 SHA512 025fd917940cd45b678c0f964ce7621689d7ba8b545f248ddb54f56be04157062151da0a40ee152ec0b6321de03c5b77eca28a5f92ac4dba944818b49c5aeff6 WHIRLPOOL 02ea0018abd1ccf572699c1fc7b11087b359e1057d89bebac6788170180b3f88dc66c910d82238dc8d44aa09c33ef05ea88b622e69d2cd558b8bbb5dfcf6d78e
-EBUILD twisted-16.6.0-r3.ebuild 5706 SHA256 3266ede871aebdf46aaf368892cc75c0cd1dabd04f715be704898d364c71e4b8 SHA512 76f2c1d0970b1bf0696f2ad53643cb4a06e5397586dbd7e2c31143b06e526ce3fae5c6753e4e053818e522d1d11dca950eb7a39dc53cb65f1ec7d8ce5c33906c WHIRLPOOL f6bfd174da82333da9156f26675d480e88395ed8057f42a2cc5cee57ea91334e04d1c9286a946f75a019c541e99ac4b5d2891a7a829a7cdfde057ee9a7066962
+EBUILD twisted-16.6.0-r3.ebuild 5711 SHA256 f4821261876a70746d8eee8b14ebe970bcf2fe674a22a3ebf1ec8ea59c7e3f67 SHA512 f337af3be8208030efd63202f2b957fe1c617296fad3d625457629a527d4c948fef11e3bb385169c6b4fc5f9c000cecfe221db9c5d016cffd8bb3a3c4309e70d WHIRLPOOL 1bf5d4eaf4452907e5c8cf6a85a44944190d1a28de924d5f3a9a7a2e26045142b1036d424ee9e75c0b5aa1efc2c3db365ba97a0434305b478de9ffb56ef18441
 EBUILD twisted-17.1.0-r2.ebuild 5740 SHA256 e66df58898543dd2d0eee3c78a76e7d2094870245c4a8709af72d5e3737dd995 SHA512 7262676cea7fcb550f60c856ff0a1e864a9f6f3eb913d6b8f7d0ef1267bcd3973101cc531237e4de458152140878618dbce3837aa9129b4571ad9f5fd6851b65 WHIRLPOOL 4c0f55250490e8352d8e0591a6f155e6e9375ed67dd38998c800ca06b498795a37f35b84d66bc9515433ba10652bc8045eec326bfc19fe39d844dae6ea0a0e88
 EBUILD twisted-17.5.0-r1.ebuild 5841 SHA256 f721ec90c26be1b6a46c6a7ff84a74d6f933395fd8cc6d3418629c1a662f9fba SHA512 7a016a43d9d5c19707d63ab75783f9e6959b938ffb1e24c9bec9304ddb2b971b8737cba2c4ecabfd0b47fe08708e880b3205f8ddfbb182c5527624b39d123fe0 WHIRLPOOL 4cd35bea4f9b665442938ca98debee1ee88d40bbd5e5d1a90adabeaca53fc3b7fc6bc1bd0d563d79cdb51767db54b0bb03022270e869afa99537f8a3324a943c
+EBUILD twisted-17.9.0.ebuild 6005 SHA256 ef2356d8bd4f4dbb3965c23b9b1a1399c4a240f599876f652246abc819f7bf2a SHA512 3abf74c726a4fbf37c4fe6a102579b1623f1715460b975c19207d71812a40eeafdb6fc33fa0a8a414201b1042290b60230677ef855b573f534c7619f42858814 WHIRLPOOL 444b0e6f5df9a9181fa946e8d8d1c8233ff045d36c0a3a62a9597059ea7444f479e434c60ff0d5dd4089950f7fd6c03b2935639cd9e00448be473314b46346b8
 MISC ChangeLog 1173 SHA256 5917245364842babd165f6775b8d54d235a3e91c6b81659eac72ca7c2d2f3834 SHA512 e921d93be93d72161a3db1d9f1fdd514936e2528ea37b18c51c7ec26f410cbe7d5893a4aaf9dcb8a8a5a9994a1b3664c8eb6619d5a11b798e9de8b329fd65134 WHIRLPOOL 7cee46e51f6fe487b420207cbc6317246fa456f8d173ff2b40d7ec143d4bd30638516cf2457a87b4f1a38b2ec52dc9f74bf175ce5df4acdbcb258b9910e0619b
 MISC metadata.xml 1469 SHA256 4c80465f66f66f4149f9c356f65fef4db81cd7947043e91c9f45f50567acdb96 SHA512 05a554323d1806d5643e33a8958fc1d4e3e18da112d47ef458721318b41619b977463bae77308d05ea485a0bba93f75e648ea949e1b1d00eb679989b8fc39fe0 WHIRLPOOL cf388df70f9c894078c0b598bf72860af111bfad10759173155cf20eec53d9545df8d3b60253a1eeeca0f35609545ebd2f0098e5a67a90d86bd897355a5f6ef6
diff --git a/dev-python/twisted/files/twisted-17.9.0-Fix-test-on-Python-363.patch b/dev-python/twisted/files/twisted-17.9.0-Fix-test-on-Python-363.patch
new file mode 100644
index 000000000000..ea7a480abace
--- /dev/null
+++ b/dev-python/twisted/files/twisted-17.9.0-Fix-test-on-Python-363.patch
@@ -0,0 +1,74 @@
+From e58956fe12af7b41f6c1735ba7b14cba69e82a5e Mon Sep 17 00:00:00 2001
+From: Craig Rodrigues <rodrigc@FreeBSD.org>
+Date: Fri, 6 Oct 2017 02:47:55 -0700
+Subject: [PATCH] Fix test on Python 3.6.3
+
+---
+ src/twisted/test/test_sslverify.py | 53 +++++++++++++++++++++++++++++------------------------
+ 1 file changed, 29 insertions(+), 24 deletions(-)
+
+diff --git a/src/twisted/test/test_sslverify.py b/src/twisted/test/test_sslverify.py
+index aca56f5..3fdc480 100644
+--- a/src/twisted/test/test_sslverify.py
++++ b/src/twisted/test/test_sslverify.py
+@@ -3052,28 +3052,33 @@ class SelectVerifyImplementationTests(unittest.SynchronousTestCase):
+             in self.flushWarnings()
+             if warning["category"] == UserWarning)
+ 
+-        if _PY3:
+-            importError = (
+-                "'import of 'service_identity' halted; None in sys.modules'")
+-        else:
+-            importError = "'No module named service_identity'"
+-
+-        expectedMessage = (
+-            "You do not have a working installation of the "
+-            "service_identity module: {message}.  Please install it from "
+-            "<https://pypi.python.org/pypi/service_identity> "
+-            "and make sure all of its dependencies are satisfied.  "
+-            "Without the service_identity module, Twisted can perform only "
+-            "rudimentary TLS client hostname verification.  Many valid "
+-            "certificate/hostname mappings may be rejected.").format(
+-                message=importError)
++        importErrors =[
++            # Python 3.6.3
++            "'import of service_identity halted; None in sys.modules'",
++            # Python 3
++            "'import of 'service_identity' halted; None in sys.modules'",
++            # Python 2
++            "'No module named service_identity'"
++        ]
+ 
+-        self.assertEqual(
+-            (warning["message"], warning["filename"], warning["lineno"]),
+-
+-            # Make sure we're abusing the warning system to a sufficient
+-            # degree: there is no filename or line number that makes sense for
+-            # this warning to "blame" for the problem.  It is a system
+-            # misconfiguration.  So the location information should be blank
+-            # (or as blank as we can make it).
+-            (expectedMessage, "", 0))
++        expectedMessages = []
++        for importError in importErrors:
++            expectedMessages.append(
++                "You do not have a working installation of the "
++                "service_identity module: {message}.  Please install it from "
++                "<https://pypi.python.org/pypi/service_identity> "
++                "and make sure all of its dependencies are satisfied.  "
++                "Without the service_identity module, Twisted can perform only"
++                " rudimentary TLS client hostname verification.  Many valid "
++                "certificate/hostname mappings may be rejected.".format(
++                message=importError))
++
++        self.assertIn(warning["message"], expectedMessages)
++
++        # Make sure we're abusing the warning system to a sufficient
++        # degree: there is no filename or line number that makes sense for
++        # this warning to "blame" for the problem.  It is a system
++        # misconfiguration.  So the location information should be blank
++        # (or as blank as we can make it).
++        self.assertEqual(warning["filename"], "")
++        self.assertEqual(warning["lineno"], 0)
+--
+libgit2 0.26.0
+
diff --git a/dev-python/twisted/files/twisted-17.9.0-python-27-utf-8-fix.patch b/dev-python/twisted/files/twisted-17.9.0-python-27-utf-8-fix.patch
new file mode 100644
index 000000000000..7e3ec26bcfdb
--- /dev/null
+++ b/dev-python/twisted/files/twisted-17.9.0-python-27-utf-8-fix.patch
@@ -0,0 +1,47 @@
+From c7db4c055e92509e5c19a051cbebea53034994ba Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <bdolbec@gaikai.com>
+Date: Wed, 25 Oct 2017 14:39:57 -0700
+Subject: [PATCH] python-2.7 utf-8 fixes
+
+---
+ src/twisted/test/test_twistd.py | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/src/twisted/test/test_twistd.py b/src/twisted/test/test_twistd.py
+index 3a9d337..4b0cf28 100644
+--- a/src/twisted/test/test_twistd.py
++++ b/src/twisted/test/test_twistd.py
+@@ -1902,8 +1902,12 @@ class DaemonizeTests(unittest.TestCase):
+         message is Unicode, the child encodes the message as ascii
+         with backslash Unicode code points.
+         """
++        if sys.hexversion >= 0x3000000:
++            reported_str = b'\u2022'
++        else:
++            reported_str = b'\xe2\x80\xa2'
+         self.assertErrorWritten(raised=u"\u2022",
+-                                reported=b'1 RuntimeError: \\u2022')
++                                reported=b'1 RuntimeError: ' + reported_str)
+ 
+ 
+ 
+@@ -2003,9 +2007,15 @@ class DaemonizeTests(unittest.TestCase):
+         unicode and too long, it's truncated by the child, even if
+         this splits a unicode escape sequence.
+         """
++        if sys.hexversion >= 0x3000000:
++            reported_str = b'\\u2022'
++            length = 14
++        else:
++            reported_str = b'\xe2\x80\xa2'
++            length = 28
+         self.assertErrorWritten(
+             raised=u"\u2022" * 30,
+-            reported=b'1 RuntimeError: ' + b'\\u2022' * 14,
++            reported=b'1 RuntimeError: ' + reported_str * length,
+         )
+ 
+ 
+--
+libgit2 0.26.0
+
diff --git a/dev-python/twisted/twisted-16.6.0-r3.ebuild b/dev-python/twisted/twisted-16.6.0-r3.ebuild
index a7c293332815..b5cf40e4777b 100644
--- a/dev-python/twisted/twisted-16.6.0-r3.ebuild
+++ b/dev-python/twisted/twisted-16.6.0-r3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
 
 # Dropped keywords due to new deps not keyworded
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 x86"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/twisted/twisted-17.9.0.ebuild b/dev-python/twisted/twisted-17.9.0.ebuild
new file mode 100644
index 000000000000..0569d8490d0f
--- /dev/null
+++ b/dev-python/twisted/twisted-17.9.0.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6})
+PYTHON_REQ_USE="threads(+)"
+
+inherit eutils flag-o-matic distutils-r1 versionator
+
+TWISTED_PN="Twisted"
+TWISTED_P="${TWISTED_PN}-${PV}"
+TWISTED_RELEASE=$(get_version_component_range 1-2 "${PV}")
+
+DESCRIPTION="An asynchronous networking framework written in Python"
+HOMEPAGE="http://www.twistedmatrix.com/"
+SRC_URI="http://twistedmatrix.com/Releases/${TWISTED_PN}"
+SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
+
+# Dropped keywords due to new deps not keyworded
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="conch crypt http2 serial +soap test"
+
+# openssh-7.6_p1 test failures: bug https://twistedmatrix.com/trac/ticket/9311
+RDEPEND="
+	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.0.2[${PYTHON_USEDEP}]
+	conch? (
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-1.5.0[${PYTHON_USEDEP}]
+		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	)
+	crypt? (
+		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		>=dev-python/idna-0.6[${PYTHON_USEDEP}]
+	)
+	serial? ( >=dev-python/pyserial-3.0[${PYTHON_USEDEP}] )
+	soap? ( $(python_gen_cond_dep 'dev-python/soappy[${PYTHON_USEDEP}]' python2_7) )
+	http2? (
+		>=dev-python/hyper-h2-3.0.0[${PYTHON_USEDEP}]
+		<dev-python/hyper-h2-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
+		<dev-python/priority-2.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
+	>=dev-python/automat-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/hyperlink-17.1.1[${PYTHON_USEDEP}]
+	!dev-python/twisted-core
+	!dev-python/twisted-conch
+	!dev-python/twisted-lore
+	!dev-python/twisted-mail
+	!dev-python/twisted-names
+	!dev-python/twisted-news
+	!dev-python/twisted-pair
+	!dev-python/twisted-runner
+	!dev-python/twisted-words
+	!dev-python/twisted-web
+"
+DEPEND="
+	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
+	test? (
+		dev-python/gmpy[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/pyserial[${PYTHON_USEDEP}]
+		>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
+		<net-misc/openssh-7.6
+	)
+"
+
+PATCHES=(
+	# ${PN}-17.9.0-Fix-test-on-Python-363.patch"  <== version specific from upstream
+	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
+	"${FILESDIR}/${PN}-16.5.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch"
+	"${FILESDIR}/test_main.patch"
+	"${FILESDIR}/utf8_overrides.patch"
+	"${FILESDIR}/${PN}-16.6.0-test-fixes.patch"
+	"${FILESDIR}/${PN}-17.9.0-python-27-utf-8-fix.patch"
+	"${FILESDIR}/${PN}-17.9.0-Fix-test-on-Python-363.patch"
+)
+
+S=${WORKDIR}/${TWISTED_P}
+
+python_prepare_all() {
+	# disable tests that don't work in our sandbox
+	# and other test failures due to our conditions
+	if use test ; then
+		# Remove since this is an upstream distribution test for making releases
+		rm src/twisted/python/test/test_release.py || die "rm src/twisted/python/test/test_release.py FAILED"
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		# Needed to make the sendmsg extension work
+		# (see http://twistedmatrix.com/trac/ticket/5701 )
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	export EMERGE_TEST_OVERRIDE=1
+	export UTF8_OVERRIDES=1
+	unset TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE
+	# workaround for the eclass not installing the entry points
+	# in the test environment.  copy the old 16.3.2 start script
+	# to run the tests with
+	cp "${FILESDIR}"/trial "${TEST_DIR}"
+
+	pushd "${TEST_DIR}" > /dev/null || die
+
+	if ! "${TEST_DIR}"/trial twisted; then
+		die "Tests failed with ${EPYTHON}"
+	fi
+	# due to an anomoly in the tests, python doesn't return the correct form
+	# of the escape sequence. So run those test separately with a clean python interpreter
+	export UTF8_OVERRIDES=0
+	if ! "${TEST_DIR}"/trial twisted.test.test_twistd.DaemonizeTests; then
+		die "DaemonizeTests failed with ${EPYTHON}"
+	fi
+	if ! "${TEST_DIR}"/trial twisted.test.test_reflect.SafeStrTests; then
+		die "SafeStrTests failed with ${EPYTHON}"
+	fi
+
+	popd > /dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	cd "${D%/}$(python_get_sitedir)" || die
+
+	# own the dropin.cache so we don't leave orphans
+	touch twisted/plugins/dropin.cache || die
+
+	python_doscript "${WORKDIR}"/twisted-regen-cache
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newconfd "${FILESDIR}/twistd.conf" twistd
+	newinitd "${FILESDIR}/twistd.init" twistd
+}
+
+python_postinst() {
+	twisted-regen-cache || die
+}
+
+pkg_postinst() {
+	python_foreach_impl python_postinst
+
+	einfo "Install complete"
+	if use test ; then
+		einfo ""
+		einfo "Some tests have been disabled during testing due to"
+		einfo "known incompatibilities with the emerge sandboxes and/or"
+		einfo "not runnable as the root user."
+		einfo "For a complete test suite run on the code."
+		einfo "Run the tests as a normal user for each python it is installed to."
+		einfo "  ie:  $ python3.6 /usr/bin/trial twisted"
+	fi
+}
+
+python_postrm() {
+	rm -f "${ROOT%/}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
+}
+
+pkg_postrm(){
+	# if we're removing the last version, remove the cache file
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		python_foreach_impl python_postrm
+	fi
+}
diff --git a/dev-python/w3lib/Manifest b/dev-python/w3lib/Manifest
index 5205fef594e4..5a633f58e934 100644
--- a/dev-python/w3lib/Manifest
+++ b/dev-python/w3lib/Manifest
@@ -1,7 +1,9 @@
 DIST w3lib-1.13.0.tar.gz 36757 SHA256 72739cb480413a1d2cf176942986a2b9113411166ac81f2551e5f5eecc383a84 SHA512 813a709ac20d5b7a3231a2f2f2336de574f1aa9eaa005bc60eb0e79d56a71f8ca88c6b793692eb26950c2310a23d27963b4bf36f8857bf6ecee9bda50fecee42 WHIRLPOOL 33d497e60c3f2c635d81ea36e00dcd8d6867c69ed4af5d5a95ba7df355dd1aeec6bedd1f5abfd86d2da79d9e70b142dc88c9dedaf76dd28390a831094225e055
 DIST w3lib-1.17.0.tar.gz 30357 SHA256 d8c654827fcf92ba4d7111f8588d2eff8653c5580c27ca61b1bc7805c080506f SHA512 a131e1671e27d34c77ff62ce17aa1d28461d12b66e1fef4f4410d061f2a75ee4cdbbb447eea16c265ca6e4f1da2e72c8cf30f87fe1a92a8f3f70df036b4b2c96 WHIRLPOOL bfd67603a0089679c9e454e950e98ffe85fd51862a64b8b5bba6c40eb446e1a5735144a7ddaf613f2ef0fe9baf6004e1157b8198034f75cd9314dc00f6adaa39
+DIST w3lib-1.18.0.tar.gz 37709 SHA256 c48731d5d73cde86f9c3c2bd6898d165f670120427353a7c8f9d6c685561d3c4 SHA512 5d7a3453081eae79807f6287f862b1b6af196d1f3db19c4063d1730b0e736496e3bf2c96021d4b7237cd448a52450131e2a136c776d0ca74b4222965033289e7 WHIRLPOOL aa384f8954c53ef2bbd3b85e28dc9196e3945fa6792cbc2daedb322ada288856d93171fa93aa02e1c08881a43743c5ad232466e4afdfa02966b0c42da3349c20
 EBUILD w3lib-1.13.0.ebuild 486 SHA256 1193f76523eecd2e1c3ab8485546fa96f112deae016108493d2dc349edb868e0 SHA512 a395d62b92923b6d57aae218ddc86133344433bf9b2b6c8ed9836199aca9e4cd4fc5415f37858affb74b82f81f8b2ad3e1cf57e2e72bc0513706d513bbcbd89b WHIRLPOOL 3a0f8b0c2d6832710b27ad767f4a5479ec8b3948738c102eb76d2e69c78a58809eae3e810d062be8761a8836e2f2f94c6dad1106e8e77ecdbb1d271db21ff7ea
 EBUILD w3lib-1.17.0.ebuild 627 SHA256 9d0308c78167b23bae4d95e243716015db1d9460700bf0d4b9f4a48c5b0a8104 SHA512 dc1773c28f556b5a1dd7b6738c9459c1df56fd4d6ea2d84435020aace286ac7e78148266db791ba170f6abd63a8d64a8eea484a43f3aa9d7f68011af3dadecd3 WHIRLPOOL dca9ceffff1824da291362b2f3173ea21808d203c94dac7405b10d36ec7e547e3ff3808e213ece56c2ea427b243064100d3bc4655b963bbf8a172dbd914f1769
+EBUILD w3lib-1.18.0.ebuild 486 SHA256 16b64901035e9cde32867b6956d40e8322ffd4b99979e9306a5883ec484ee935 SHA512 6606d7daa175ad221b37c70e5aaf7eb8041e4b0974ab81fc70fc64d98c39cb1eaae23654925fc30a7ca9ea011addb9e2efa366499f3542a0c2ad4a8a5c7375b2 WHIRLPOOL cdc82fb0ef95ac95834cf8ea45c82ad0f55a24613b71428998586f748a61361634dc2f635d5d90f64c47a518a679cc5d0594102ef9da97270b15fe67dbf7aad2
 MISC ChangeLog 2861 SHA256 c81f8fbbc28b5ff3552299e973f46b8a99fa621c517dd1c146ad53a9e1c4bc3b SHA512 ad1173240a006760134dc6d2c29cb8bf2811fdb3e1e2f69901f7671ae77a7124703ae1affef0907218dd5f437aa48ba72d333a55cef4939d311953bf382f526f WHIRLPOOL 5bb28e35e87e777293eb648305aeb6d795f5190560a1fef5c2f42f5dd01deffc43368538f29ed16807e315247d38be256006e8b5e7ff94add41f798cc31e31ca
 MISC ChangeLog-2015 2053 SHA256 809b6011e279ec8df55b4fa25969baa63dea02f05eb41fbe6844162f8c56ecfb SHA512 d216e5be4a11067ca0269543220e93fc710a84bc6ddf521708cd39067475bb235d31f88bd1032ee7dff818286ae6e97abebe657269d94efa0590508e3923d76b WHIRLPOOL 17273fae79fd169bd4a63c3437585ac420fb3be92fe6dcd21464322749dc2349e9364dae72ebfe1062789058d971f97b10b52d753eace9d4d443f97f382f6ec3
 MISC metadata.xml 457 SHA256 6530424eb97f72560ae2690d9e3b45b114c09b1bc2bd8d2d7a1a4fae8ec0207f SHA512 5136e07ca268ec52f678a36a8aa2fc254d74e104da0303b5427386bcddd86618f6a76383a4808cd7aff3e179294825f8b70458bc7341e062164ae78e5f5b2569 WHIRLPOOL 6d98ae92c0e6b8befb6f4d8e8cd615f0654c71d9b95ea6b51e425202a6f354b81f2fdc47e25a0922840b94262ffdd2128d14dd45a134386826781551fd612f0f
diff --git a/dev-python/w3lib/w3lib-1.18.0.ebuild b/dev-python/w3lib/w3lib-1.18.0.ebuild
new file mode 100644
index 000000000000..02b11704890b
--- /dev/null
+++ b/dev-python/w3lib/w3lib-1.18.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library of web-related functions"
+HOMEPAGE="https://github.com/scrapy/w3lib"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/six-1.4.1[${PYTHON_USEDEP}]"
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index e5cd4e1c0476..4e206cdd19e8 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -3,6 +3,7 @@ AUX qtcore-4.8.5-qeventdispatcher-recursive.patch 4017 SHA256 5db36cbb0686b8a503
 AUX qtcore-4.8.6-QNAM-corruptions-fix.patch 17586 SHA256 5309c0f1ed0fc54799537b6d0a51b9682f52b4b40cc76e6fa71afc7273120e40 SHA512 4367974513b230d0395d0d0ebff5007255c257126309b614c37e8297981b833b397792fe9dede1960e0027a87d3fbc5eb252253a7ed73f4f9383531ea39cc874 WHIRLPOOL 8eded4f95d00f2ce572cf1956745d5a06e07f54a6ed6e67578914c0d2c9be63994cbf9177212d25c3c2678bf7328b2364b5977ebb8e8d7b8e4ad79009be6a7ae
 AUX qtcore-4.8.6-moc-boost-1.60.patch 884 SHA256 cf7417eb14641c0e4f65148f67cab2af74ef2f20cb245ef9e21b8a0b2d8f0c0d SHA512 f7375b444291cd0abf5324aa9150e3eb49e110713826e2aa03d8a149d6727c1ff2fe6f6b2e159f3a9e41c628a6d5f3e6ea161050722f58ca0e9ad269a27c052d WHIRLPOOL 7d86baf0ceeb2259fc319d7908f47d2c64f98e490e9bda3930137db5808c9cd0fb2877ac3731bfaaba7ed19a8c014904054b08545642588650b58504ec52e378
 AUX qtcore-4.8.7-libressl.patch 2161 SHA256 c01d0225d593a87d5764993be9a53b0adbf9493487ad7c5583ef3abcb35b1c4d SHA512 c84b827fd5f0c504c9ab95352677dc2cfe926c81aa012b454d8260385215b510835ba693830b3a3a6fa374b299995ec14cbb07711f41031788fc6c3bec396021 WHIRLPOOL 26274cc870721bcbb364a3e41aa95af0d7d5561b0882ca4bf058c036a063fe3fa77072f09a0d84ffb1f0a6dab2201d03c8602a2d5f7815752cfdb9180e2689a1
+AUX qtcore-4.8.7-moc.patch 926 SHA256 032978c364ed669842fc06f03f28b08ad8fd5a19afe49bd6e6f2b5b5ae262ebb SHA512 cb64e3e2271d3031c11d2c8afe1bcfd5263bcf8b8c787d03059b4bca25f3dd2d8a092c80cb396a1a466d2ef667697c31856c7c675aa7c48b5680f5e91db95f86 WHIRLPOOL 588f6fdaa43f8d65ece7ae2ec1e20d7f797d4dce6cdd67bd05d2c27d7facf28c598c7e191a118e1433cb1d1e5c7596073f552568d6683c69d07db9e9e79ebaf0
 AUX qtcore-5.6.2-plugins.patch 3264 SHA256 2e0e863830f457d597e608815e92c25e4e0924a7c13c80649547e8a9be6bb420 SHA512 0d50ba6cd94fc29158931e2e09ec21c48780ecfaa75443efd842cce05cc3030f81a02385714b42d5cede3b0cbf8efc24d3c660ac4438cdd428a24bf8a624bb2d WHIRLPOOL 9ea062360162c636f43d7b490a3ee3931496b05001f9f0c99d588494d344f0a7a9d0e989b5695e468ec754e7bc789b2c2961db221701d8adf984efd691ee2a92
 AUX qtcore-5.7.1-qipm.patch 5915 SHA256 a5fb3bee98d797ac5e34bec02bcc1b5b0834fa1092fa6d1e1ea3d490975ae42f SHA512 807c030c2059cddcd159cb537ba2e4be68d6f612f45e1e7b844fc045f661739aea7bc35743735cee364d692d51774e17edced1aac8d444abaa4e4435117a5b3d WHIRLPOOL e13e1a24b750fe7729b1d86214491358937344b7a39c6c2941d372f5ce9077ecc1c320a0be2e5a9c772e1b01d786e55176cdad252c317bc62215c9c7acfe0d6b
 AUX qtcore-5.7.1-qsfpm-1.patch 8922 SHA256 3376b4564d793e0bf3770a8ebcc474a03e7aa49a8a578c136bbcb1fa6e9e136a SHA512 3854fffa1181cebe4683c54d5e774301a8710bf784dcc18367d04d193a7ce76fc6f634096b6986af41c3f5e4432b702873181a8900fd18e7617ea472d23d6d92 WHIRLPOOL 0ae27f2596e8601a4717bf76d06a2c452f4a0f087355766e7ca9483c8959ddd2c0765a6154ee1dde612347fb69ddc28581121c64cfa6f97a3067b1112bdb86c3
@@ -14,6 +15,7 @@ DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 SHA256 edcdf549d94d98aff08e201d
 DIST qtbase-opensource-src-5.9.2.tar.xz 45148744 SHA256 7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b SHA512 a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7 WHIRLPOOL aed0b8aac590fad17b4f9067b46097e81d9991307b296428a9592d66a7c11967ee3e9a50b1d05afdeb7503470e658b016ec5af5c71e71059bd4c0d391b845f95
 EBUILD qtcore-4.8.6-r2.ebuild 2744 SHA256 968b23f5c563cd96ff65a62da9632e40dc64d1b6f44a8918109ff3be1fac2ff3 SHA512 d5ef3b214ea1c8569d56383b6c0400435f3244a5e22792cbdfaba5147c7b746f96b83dd8fb035c01e8dfe09474f414f516e8f80e8aea489184d9bf01d02f4949 WHIRLPOOL c96e51c2e79ee21b4c286a08ae21364b1a03cdc4b8efad290b8d7160a1f57f0d8ffe5760dcb2693c6ac55fdb8d70f452f42b8602e2d26c20614aac1e2247260c
 EBUILD qtcore-4.8.7-r2.ebuild 2864 SHA256 7461eb354f481eb54958681f620ffb3280ee77e032c7b458f942f44693092a47 SHA512 9d17ecbdc61d4a32313b57939b2791852a0e041bcf21ca3a2d1b1e64c2111d63085c161a50ecdf94cb2dafe3a724f2ef9e259a0f85e85ff43cd12d26a8527d51 WHIRLPOOL c2e11e085b11cd47da1e7925c3337f27b4ad5174e4333ad06cc7b7877fe18eb63953c8422b3b2f11600a0e2dbc7e813902afc4fb10beb364a73818c079e491bb
+EBUILD qtcore-4.8.7-r3.ebuild 2870 SHA256 0a7a3e4ce75813f2ffb5e27f4e0d94bb66eb9d9e0403cc1ab59ddad974dc6cc9 SHA512 b667ef5eaeb44dbb5d5b97017e5f5bfcd9d1a0b3ba821f0b2bb146430030cb8cfbfaeaa519cb5f4af9d35ce9125086da0010e94bc987769aeed1e5bd3ecd16c4 WHIRLPOOL a07628361e7ebf8e8f64eea07e3f960b1650abfe6c635ab5d1c8d4623fd2d9ba4e293519b878ab955eba2bfa0d1b5416a0a56b4260ef89fd28b65dd7f9d5e405
 EBUILD qtcore-5.6.2-r1.ebuild 783 SHA256 15cb9ff991a709c55bbd21215937034b519c8ff22bbdb05052ce8db3f914cb30 SHA512 3f3ff0c9abb107de70d9b4e2b0319652e58f5aeac2a91554fa92edcd71137e295075c456bfdaa5901c6ddfc18fbdd7a94412e27fc537f042d78d83426b72eecd WHIRLPOOL 476519404c4485b589442af4e12c7288f4f65a5e7b8e635fd3e7456744970691955a5851fe0cb96e5900c837e1e39deb85e10402a4bd643a6646866daac6815d
 EBUILD qtcore-5.7.1-r3.ebuild 896 SHA256 5e5147a1845598ad8ca5dd3adc0a48e0f75c2a83ba4ed55f4ea688005babf53d SHA512 bd5fd8e6a9a189773f4c5473d0073709f034b661a28296a8f4d3cac4d26eaf63f04e4b0d08028810b77ca10bfe8c67aaf6c4cf2da7a436e2b29f9b04024cb158 WHIRLPOOL 142ea4799f6d8d9795f2f63b3acf7c38bb6c2b879e03589df1cc4ee5f1adb8146054a66f92cef22adfeaf7ed72f213cab4fdea5f98f58c3661476a95599c13f2
 EBUILD qtcore-5.9.2.ebuild 1389 SHA256 2a348b867a9f2698d76dfbc29fe88f869a7376498c4a329d76da7891ec4a7b03 SHA512 b51328052f28e8cb5f48ae59834553fb995099245a0e6b3390fa0006b89620a889c45b36baf5f028ef1111b87597380c940c6df0a69a14aac07ca6824d795fc0 WHIRLPOOL 62325390101aeeb78c53da2113be3b461558f062fabfbc676d480927bcd98941f36ff69b98de52fd0a3586cfc802e1c6c35a13f5ffe1f7ffb3aad6f9ac01c34c
diff --git a/dev-qt/qtcore/files/qtcore-4.8.7-moc.patch b/dev-qt/qtcore/files/qtcore-4.8.7-moc.patch
new file mode 100644
index 000000000000..7660dedc1630
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-4.8.7-moc.patch
@@ -0,0 +1,17 @@
+diff -up qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829 qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp
+--- qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829	2015-05-07 09:14:44.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp	2016-03-16 13:20:43.145899869 -0500
+@@ -188,8 +188,12 @@ int runMoc(int _argc, char **_argv)
+     pp.macros["Q_MOC_RUN"];
+     pp.macros["__cplusplus"];
+ 
+-    // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829
++    // Workaround a bug while parsing some boost headers. See QTBUG-22829
+     pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
++    pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
++    pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
++    pp.macros["BOOST_TYPE_TRAITS_HPP"];
++    pp.macros["_SYS_SYSMACROS_H_OUTER"];
+ 
+     QByteArray filename;
+     QByteArray output;
diff --git a/dev-qt/qtcore/qtcore-4.8.7-r3.ebuild b/dev-qt/qtcore/qtcore-4.8.7-r3.ebuild
new file mode 100644
index 000000000000..d4979c7760e1
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-4.8.7-r3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit qt4-build-multilib
+
+DESCRIPTION="Cross-platform application development framework"
+
+if [[ ${QT4_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+IUSE="+glib iconv icu libressl qt3support ssl"
+
+DEPEND="
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+	iconv? ( >=virtual/libiconv-0-r2[${MULTILIB_USEDEP}] )
+	icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+	)
+"
+RDEPEND="${DEPEND}"
+PDEPEND="
+	~dev-qt/qttranslations-${PV}
+	qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support,${MULTILIB_USEDEP}] )
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/qt4/Qt/qconfig.h
+	/usr/include/qt4/QtCore/qconfig.h
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch" # bug 514968
+	"${FILESDIR}/${PN}-4.8.5-qeventdispatcher-recursive.patch" # bug 514968
+	"${FILESDIR}/${PN}-4.8.7-libressl.patch" # bug 584796
+	"${FILESDIR}/${PN}-4.8.7-moc.patch" # bug 556104, 635394
+)
+
+QT4_TARGET_DIRECTORIES="
+	src/tools/bootstrap
+	src/tools/moc
+	src/tools/rcc
+	src/tools/uic
+	src/corelib
+	src/network
+	src/xml
+	src/plugins/codecs/cn
+	src/plugins/codecs/jp
+	src/plugins/codecs/kr
+	src/plugins/codecs/tw
+	tools/linguist/lconvert
+	tools/linguist/lrelease
+	tools/linguist/lupdate"
+
+QCONFIG_DEFINE="QT_ZLIB"
+
+src_prepare() {
+	qt4-build-multilib_src_prepare
+
+	# bug 172219
+	sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
+		-e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
+		qmake/Makefile.unix || die "sed qmake/Makefile.unix failed"
+
+	# bug 427782
+	sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \
+		qmake/Makefile.unix || die "sed CPPFLAGS in qmake/Makefile.unix failed"
+	sed -i -e 's/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/' \
+		-e 's/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/' \
+		configure || die "sed configure setBootstrapVariable failed"
+}
+
+multilib_src_configure() {
+	local myconf=(
+		-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
+		-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
+		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
+		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg
+		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
+		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
+		$(qt_use glib)
+		$(qt_use iconv)
+		$(qt_use icu)
+		$(use ssl && echo -openssl-linked || echo -no-openssl)
+		$(qt_use qt3support)
+	)
+	qt4_multilib_src_configure
+}
diff --git a/dev-ruby/autoprefixer-rails/Manifest b/dev-ruby/autoprefixer-rails/Manifest
index 17e784628385..d2cf57471308 100644
--- a/dev-ruby/autoprefixer-rails/Manifest
+++ b/dev-ruby/autoprefixer-rails/Manifest
@@ -1,11 +1,9 @@
 DIST autoprefixer-rails-6.7.7.2.gem 354816 SHA256 853d573a8ef2c9478e12a79bd8f9fbd66e4861ed3cea8a7ac60ce5e3cedd33fb SHA512 5027da925da376fa271eded6792ed754aa34a2b12ae41ca0fd7cb0938f14b530a4ee16b02b62c22d00454da96b839201ea0e60e14e270f4a0f54c5e7105cf5db WHIRLPOOL 0b4aae68e03ad72860ce23a64b4528c5037e5b285991efa4ded102b3ba045f1f88235a9ab1769b85da82ff7c8fcb50efedf75a0622ac01500a803423fa1f8404
-DIST autoprefixer-rails-7.1.1.3.gem 197120 SHA256 e98fe82dc309298ca3dffd15c41bd98f263f46ad95dbf6b213b47ae8c06321c2 SHA512 2dc36600c3b7544985797ecbd113cab5878afa5b473d758ed4d101b1850774ed57cb07c2a759b5b37c316ae6d4b4e7e168961122c8d53a3fca6b039557234f4c WHIRLPOOL 937936a2a7f8a6b4fd07a6aa864ded33185aed76afa79ea01833b7a619e99bc544db3725cb553e5d3eaaf4011f5d65bb360992632e02fa55a77d0b46c5d7d05c
-DIST autoprefixer-rails-7.1.2.4.gem 199168 SHA256 5a891ae9ecb043232834032e7a392eaa58ac8672f4f9515a4d118c5e74612a48 SHA512 a713605f87806c7d32406c26470fd31c9274247dc13247c84ea870f35d0a39d8817122bedd90adcde081e74e99958e9bb89dcdd38566f54a4222fb7a69018d6b WHIRLPOOL 13d7d8c03fb997d022e47587b78bc6771be4eb11ae7fdabc984c605c306f7d9c06897f70c3487939b70827b1e2a905c610e398d2fe05e9133848bc9db338e8ea
 DIST autoprefixer-rails-7.1.2.6.gem 199168 SHA256 359fd6e7b206d5c13cd2a41f0a5b031d3bb1c3c9677b312a185a18becea3c8f1 SHA512 0ff25be410656a5a9b27097b05ca60c779dedaab96a39fc9a95b336194283c5e7fd75fe80cce06237c3965214c3469a06591834c2bd0b5c4786ea51849273e8b WHIRLPOOL babbbc064fb03efb3745ba8abdee01b952b3c1a40241deab45b9cf1412954a94dc25813b6b1ff5e097542a19914695cef8a5066d96e245dfb422119abe476692
 DIST autoprefixer-rails-7.1.4.gem 188416 SHA256 ebeb336e645b6a950898a50f289b39e4c190f0e1cf236d6af0a31f1a5a4eecf0 SHA512 08068f4b6d1ea41a1a64aaf2b3dc895389b0b9ebebd60e2db4f961e4d02b2dcc75cc98eb5e349672ac840e53d504d78dec00b30c3f24699d86c059efd304622e WHIRLPOOL dd04ae9db14ba414a83f13ea7f20f15a3bcfb4127020b0540f0d78a2a52e5b893b26d0bb71867525955272dad2b9a8f71f81bee1e256a638db3267c0fc4c0c82
+DIST autoprefixer-rails-7.1.6.gem 190976 SHA256 747278a387959d711d74cd3c7174ce1cc8f3474aff56313cee686cc7cc8b5e04 SHA512 832626700f6a61d44b0fb3721d29121cda858f80aa8a13d134af874cc3e71eb27360f8d9e6de618fe9400d966d2e0afbd2e8a82772f96f34d6f78171574be536 WHIRLPOOL a623ffbfcf43702a8f31fa34e84b0443ee8be619947b881d3c83348759f00cb424bb2999a71d9283e4b3cbf6f72d3cbfc206ca499085275936ec83308e5ae6f6
 EBUILD autoprefixer-rails-6.7.7.2.ebuild 779 SHA256 261fde12c48d1b42149ebea4d7d0daab029fe8973fd70b0fb90d2e422400363e SHA512 3adf23a8c40426db6275a0c34548155c7f62fb331f99efe0ce0adb9dd6b04107c50ab05aadb9a03919a7ba93da17ef50fe713df772e53a6b51400359f5f75138 WHIRLPOOL 9ff827866913d32484d81e77d51424cea27b209ffb511a1ad8f69fa3e0d5ea1ff7cf5758a97e36683b158b66b14c9b4d33d8728b8fe84be0c5f27f5c11df61b0
-EBUILD autoprefixer-rails-7.1.1.3.ebuild 827 SHA256 fefb3aa7b0b9575fed6775224cb933bdb4674995b01d02e7c9dc15335f9b0b52 SHA512 f3c77a8758ff9cf5eaf0fcdd7490eb7a98013112ce5e43c2627683cdda2b31308618f05dc52c0889e259a44258ae6c64973fed068f83be3d41ffa5f00a54d021 WHIRLPOOL fcc5d5384a18cfc8a7ba341f5c8189f6c7f4caeaebd1b0a3e53d1c9fba0dd39ac55dee5ebcc957327c762ea73266cdabbb658dd708ef03c188982a839244e728
-EBUILD autoprefixer-rails-7.1.2.4.ebuild 827 SHA256 fefb3aa7b0b9575fed6775224cb933bdb4674995b01d02e7c9dc15335f9b0b52 SHA512 f3c77a8758ff9cf5eaf0fcdd7490eb7a98013112ce5e43c2627683cdda2b31308618f05dc52c0889e259a44258ae6c64973fed068f83be3d41ffa5f00a54d021 WHIRLPOOL fcc5d5384a18cfc8a7ba341f5c8189f6c7f4caeaebd1b0a3e53d1c9fba0dd39ac55dee5ebcc957327c762ea73266cdabbb658dd708ef03c188982a839244e728
 EBUILD autoprefixer-rails-7.1.2.6.ebuild 820 SHA256 da6b49731a0b9e69d6e219340f06980fafbb21b3fee4c8fdc5f980896410bf4a SHA512 0d5d51920a86c458c8b57838316c9cd5d07d6b85e116b887380e106dcc7d2330bec1d1f8eafdb8655990b7c56afdcd4036915247ec6b724362bf948b06d182ee WHIRLPOOL 11d61d74311d195b08db5fb341897e3602ae033e30dc13ef1f667f52b67953a58a1a0c7eb626b99d0a28a7b78dda994c93101631221c3c91ed53b51037ba0a34
 EBUILD autoprefixer-rails-7.1.4.ebuild 820 SHA256 da6b49731a0b9e69d6e219340f06980fafbb21b3fee4c8fdc5f980896410bf4a SHA512 0d5d51920a86c458c8b57838316c9cd5d07d6b85e116b887380e106dcc7d2330bec1d1f8eafdb8655990b7c56afdcd4036915247ec6b724362bf948b06d182ee WHIRLPOOL 11d61d74311d195b08db5fb341897e3602ae033e30dc13ef1f667f52b67953a58a1a0c7eb626b99d0a28a7b78dda994c93101631221c3c91ed53b51037ba0a34
+EBUILD autoprefixer-rails-7.1.6.ebuild 820 SHA256 da6b49731a0b9e69d6e219340f06980fafbb21b3fee4c8fdc5f980896410bf4a SHA512 0d5d51920a86c458c8b57838316c9cd5d07d6b85e116b887380e106dcc7d2330bec1d1f8eafdb8655990b7c56afdcd4036915247ec6b724362bf948b06d182ee WHIRLPOOL 11d61d74311d195b08db5fb341897e3602ae033e30dc13ef1f667f52b67953a58a1a0c7eb626b99d0a28a7b78dda994c93101631221c3c91ed53b51037ba0a34
 MISC metadata.xml 347 SHA256 85bf12c3b4511f0e5dc57d749e47d6d30dfd6abd7187008bfa47e652b5909afc SHA512 b0985f41e9463a6c5bdbda0d5a84cc76cb6090614fa07395705b3207e0cd4fadbe9b1bb18fb7382f3c8bd00663db1232fd7107f6757bd20cfca0a0df99928426 WHIRLPOOL 9d9cc636b020beacf5beb6b7ca9f6ce042450a9d15c8c17c0ef5b97be021d36d5d60e1e4370d14f2ce0d9a4b8bd8a17d2baf81ffdfdc5ef9825e011eef06c369
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-7.1.1.3.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-7.1.1.3.ebuild
deleted file mode 100644
index 3f028c0f5205..000000000000
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-7.1.1.3.ebuild
+++ /dev/null
@@ -1,36 +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"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="vendor"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
-HOMEPAGE="https://github.com/ai/autoprefixer-rails"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="7"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/execjs:*"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rails
-	dev-ruby/rake
-	dev-ruby/rspec-rails
-)"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
-	sed -i -e "/Bundler/,+3d" spec/app/config/application.rb || die
-	rm spec/rails_spec.rb spec/compass_spec.rb || die
-}
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-7.1.2.4.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-7.1.2.4.ebuild
deleted file mode 100644
index 3f028c0f5205..000000000000
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-7.1.2.4.ebuild
+++ /dev/null
@@ -1,36 +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"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="vendor"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
-HOMEPAGE="https://github.com/ai/autoprefixer-rails"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="7"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/execjs:*"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rails
-	dev-ruby/rake
-	dev-ruby/rspec-rails
-)"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
-	sed -i -e "/Bundler/,+3d" spec/app/config/application.rb || die
-	rm spec/rails_spec.rb spec/compass_spec.rb || die
-}
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-7.1.6.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-7.1.6.ebuild
new file mode 100644
index 000000000000..7f614030fe5b
--- /dev/null
+++ b/dev-ruby/autoprefixer-rails/autoprefixer-rails-7.1.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="vendor"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
+HOMEPAGE="https://github.com/ai/autoprefixer-rails"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="7"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/execjs:*"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rails
+	dev-ruby/rake
+	dev-ruby/rspec-rails
+)"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
+	sed -i -e "/Bundler/,+3d" spec/app/config/application.rb || die
+	rm spec/rails_spec.rb spec/compass_spec.rb || die
+}
diff --git a/dev-ruby/backports/Manifest b/dev-ruby/backports/Manifest
index 6085251c4cae..b493b6611c2a 100644
--- a/dev-ruby/backports/Manifest
+++ b/dev-ruby/backports/Manifest
@@ -1,4 +1,4 @@
 DIST backports-3.8.0.gem 146944 SHA256 f5b6109367910c280c33223f8882d175ccbb829b25e5909b974557693ef8ec9e SHA512 898472ee88dd0df46067de12ef38bb033b270573ff09db99982336b9eb264c90003e6e150101f7fc0034998961d81eac7b2f72e1e843e0a7e683b6b98980153f WHIRLPOOL 773ebec85227cf898179fe50fda942d4f3ca82532ca9a9e10cbb465bcff8c9b877feba1fa2694ce2144484923ca0881c6bde68bdc22f14bf3d8516fb503243fd
-EBUILD backports-3.8.0.ebuild 601 SHA256 1a841b669b29baaac11117b4a0fd2fbbea321d2f6e19d2f182f116c325227f2b SHA512 077c69ded9da1a74480c2d25c5d4d72721866d0bb8b11a47c440eadc5995a7dd810f2395ae3a7c609f96f86493521a8cd78cd70b2e6b7a248f8a54c990660579 WHIRLPOOL 6daed1d7671e5e0282355f1cc255415fbb72185423f68e82e6bcc8f6bc73add7e36e8f74d559a8d8e6d19dcf9f08f7be069df666356bb3efe42586548ef0f850
+EBUILD backports-3.8.0.ebuild 612 SHA256 b0813cc4b3a3b67111ce12bcf38015ddf213476307c724d46ed9818e46036df8 SHA512 02f373ef3154dabe456167910a2893cc97311e199e84257d93a638faba3944a595be16752e85f52019b9f427315af513a05cc3abcf922b5411352a899f81d0d4 WHIRLPOOL a238c129adb3c15e6d97777cacf83585a7b935c0788a54dc3fefc9aa1d1fe2add7f4142f5bfdbbb4081e86ceb177d6cf66e95f4c50f2745c27ffbfacf75f3889
 MISC ChangeLog 597 SHA256 6b377d704b051d56100a4d81c9079c05c055d349395af335bb773cc9721a2e25 SHA512 73757c7404d4c9de3fb0e0e997fe8667c6a1aebcf42cc94393286a6cdd81d6bf69a047c9b61230fd84df08f568650266d5c57c72348bf13f9d4f4d997fe67820 WHIRLPOOL a178e709779212a5155acc5dbbaadbcdc089ed3fa24bc27bc9a69e10a97c76a18ebba88c95183d1c4f276f49e0584a1545dff691638c5f1395759710f38b0152
 MISC metadata.xml 341 SHA256 6fd863b157e87f81944c44c3db08258e5cf40c10d72c054f71ea74bd88bbfd99 SHA512 1835994105d6f5b331e2f16d92683d8ab4edccc1c0187804f008228cdb5ce70de37dac477d16b555322cd6c64301124935ed4859dff5cdc2eccf92f4d802bdcc WHIRLPOOL 8a68f9e53c7a5b46e3a5d06524bee68463f16ef78adf1281879ea11abdadb0ebf54c04368db95e399148dca33fab06c5a7ab56a00a30b0bc7eb4064ba26d2bfc
diff --git a/dev-ruby/backports/backports-3.8.0.ebuild b/dev-ruby/backports/backports-3.8.0.ebuild
index 28948e558d5c..9c3554a0f823 100644
--- a/dev-ruby/backports/backports-3.8.0.ebuild
+++ b/dev-ruby/backports/backports-3.8.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/marcandre/backports"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ia64 ~ppc"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/binding_of_caller/Manifest b/dev-ruby/binding_of_caller/Manifest
index 532d62702448..dbc44466b0fe 100644
--- a/dev-ruby/binding_of_caller/Manifest
+++ b/dev-ruby/binding_of_caller/Manifest
@@ -1,5 +1,7 @@
 DIST binding_of_caller-0.7.2.gem 85504 SHA256 d327682ce1d8e8cc46e282a46052946af0de16bef734014c63df0aac66334f96 SHA512 6eb114070c3f15801c4f2454433630c207c2fb93afcf5906fa1288985303ff87c54ca07273b623bc2d3f76dc5bf363feb1561e109f599776a785aab65dfd7132 WHIRLPOOL 1ccfe6389e0a62730015e2e9bc3b0c20278e9175411561ab913225179e2bc37e58b66aa45cdd8fac32ec67c68a7838471a92140ffe1eb0be5a419b9a551721db
+DIST binding_of_caller-0.7.3.gem 87552 SHA256 c32ba3d6a64a1272118e09d40ae1b0f496924c35baef7149859ee52a453f2ec0 SHA512 e16bfc1fffe7e7d87013506a28f2894c3737a9dfd149ab4c7deee7332e6a3b8eecde5d837a58defcb0ad45a6a8d01ffd7b1e32a9395fa895d2dc84d8e534e547 WHIRLPOOL 5095fd9fb3e253f3893a94579f00234558c32b11bcab32a20cd6bb05a9145f15f452b51e16ad2ceec1a4b08a74adf17222d3b665513458e7445cff6e496cc040
 EBUILD binding_of_caller-0.7.2.ebuild 586 SHA256 3e52beb150cc2d4765d91cccd4229c85233d1157ea6d1520e455b0ebd6d75894 SHA512 0da2d88227e4b19ca9493a2592d84a6c282624596c5ecfe48292f26eac9ae47f05de80710c341e00ef2956e22c1620c9dc5c695df48b64788637c9e398554c4a WHIRLPOOL 22cf83341670f00e0b1af4f4bd753e30461759a5463b2f86c5ff6692fc29e5e7a4ceeda1a8c53d5313666a82f95779e2b9069dbd5606559a98977741ad5597e4
+EBUILD binding_of_caller-0.7.3.ebuild 579 SHA256 14b95163eed9ff653a07b5bdf184d5a99746f8b8989db8932aed193f1fbf1223 SHA512 93d772c8e0403adfa39f2f1ccb7558568a0e930dba42a37986a4e9b9af12572f6f3d6dad08082bc831d60ceec835a44abb10725f32e29c83ae530b258064262b WHIRLPOOL c0d6afec93304272c61c6e484da20e1600f50e1da68d091cad98002abf786e646b69abd5dd8acd309e14e42347accee1d2105b063ca84bf0349e144e7b319e0f
 MISC ChangeLog 2588 SHA256 ee88412fe027a4f40c3f93260211cf695b7992f8891ca0478fb1b274fceac42c SHA512 6abc74b5080186e1e7ea511b7eae5494a24b2be7e3eeab215dabdb5583e9a3e3a07cd58600541fa970ccc100b52b4bfbe2e5ddcd0b1898967d6c5ba20e9a5be0 WHIRLPOOL d1c7462b8f529b21d152c3ccd0afadc7780890181ad25e262ef428524fb6ecab238e2facfb2103d083986202901faa211087b8cd6689d0cf7cbb65d66ebead83
 MISC ChangeLog-2015 525 SHA256 413333794fb974d3180246c9fac4a211e29e6d11de4143065d31ca6460005840 SHA512 f83bd0f1ba96b00169518e4f21a2419ab820564f738eb5cb7397eb1435cc3442154a8a7c6f28e6c7cba05cf1b22fe83ca86cc69df0fa0a94ca27877a15e2a654 WHIRLPOOL f1a0ba69ff847d87d71f34432ec0574302918a04fc07cfe77ec640f5998a257041a1c8afb36fc4f8bfc9eee7ddb7a326aa741259a203ca1e558f003fe008fae9
 MISC metadata.xml 352 SHA256 8acfd382d1be66ca401ca32417ded1868b2f260e5d66adea4023e508bb695bbf SHA512 3774a75d46642d38c562d1a2cfe3c432cf3857801fb44b3da21ba2bbe9bd046b60d1bf4b5712efe66b9d875d407717a53f0a00a3516b631d05335f045f87fa23 WHIRLPOOL c2bf13cdeb5c04f3c1c14c995a30084a4c648cb85c76e0645d59a784f58ad9ea29fb4f64dc5b2e995c9c0e71728afe0aebb06a138de21b42d01ddd4c62ee61a6
diff --git a/dev-ruby/binding_of_caller/binding_of_caller-0.7.3.ebuild b/dev-ruby/binding_of_caller/binding_of_caller-0.7.3.ebuild
new file mode 100644
index 000000000000..db88afa35d4e
--- /dev/null
+++ b/dev-ruby/binding_of_caller/binding_of_caller-0.7.3.ebuild
@@ -0,0 +1,26 @@
+# 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_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="HISTORY README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Retrieve the binding of a method's caller"
+HOMEPAGE="https://github.com/banister/binding_of_caller"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/debug_inspector-0.0.1"
+
+ruby_add_bdepend "test? ( dev-ruby/bacon )"
+
+each_ruby_test() {
+	${RUBY} -S bacon -Itest -rubygems -a -q || die
+}
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index cc3eea678b4e..68e028fcf0c8 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,9 +1,7 @@
-DIST capybara-1.1.4.gem 72192 SHA256 33073d7e4920a3e74c61ec46d1afe655eb0f3361187113c5e146df498e4611ed SHA512 102738031281d0fabd645fa6d941cf0a9ddd56f90d53d7cc1c8a7b03a37b6af8f4cddd178e6fc07d6751a539a5039cf20502eabdd49e8001793601bb312b47a3 WHIRLPOOL 81eff318acfdc0806c9f8d4e212068edd57694d44db1e29bbefaa7a4db162f3a2354374d6ab97ad7c2372ff9e6f6bb864ed483050facad5c298c2223a39c63cc
 DIST capybara-2.14.4.gem 265728 SHA256 bbdfd40c542c790dab81032e23bbc7438a562bbe440b4712abcad67f10d17d7d SHA512 d3ebbd8d96e4d2026327b1c70ff723225ce052fff510a909111b8cc7e02b12fec9e00acddc0bc2565371cc5eb0b590abef43d42a99c3938a929ea25930fdefd1 WHIRLPOOL e4829ed0895af9b80c936ffe7f274e0637ab0b1cc2e790e261089fae14a0f8544fd178409e1420527d5eec69104a96aa4ab87e0f6f088e94bad9371e4c260ce2
 DIST capybara-2.15.2.gem 270848 SHA256 11223a4f98942913a67520c8e1126ae6f544b48f26844a9098f5f440caf12b50 SHA512 8c7eec2d23dcf82b1c41144fcaf5151330c220277bf2fe2a4713a79c6b065789465a9e867936a25d00bce727ab218cd3ff9934a67158552a04f552d734ee5387 WHIRLPOOL 519d6c841e8a1edd5372086f76400856525c7f6daa3c97616ab2c6ef4a382d0a66718137b29295af44292608a35d699f1977bf313f628f1abf50a0c619ac7050
 DIST capybara-2.15.3.gem 271360 SHA256 b67bcaa5ed9082c14179d9ea5268ff1b3455ece0a52f21bee4e203fe6fc791bf SHA512 8248f29e2da570b693092136850f6a4b8e06451c502493177884a9306bd8704843ddc2d3caa8c530c39909257e308bda86cedf263bcf5eded83d734229de6bca WHIRLPOOL 8777ed1248d8edd36bbb6b142806900d9a2c5785f892e249d27ec1c09bc3537b8b9a686a0475132c1c46bf427055f6644a83dc5ffc72fb76839ae5d6b5adc103
 DIST capybara-2.15.4.gem 271360 SHA256 051d8518c42c20900950b34868c4edb07fd4d116d82175f84c7b96aa1a6b371f SHA512 405f5d9aeafe98e8aafe26d1f563c42ebe737b88efb9a52fbd38aec6b2418e1d7701368c75b6ea4946bf4eee0c1471e9af7be63dda3238ac5c4129fec8e3f999 WHIRLPOOL 7298f246bd465ff45830d2a55247f69f9aee342b128c121cf77c4ce47ccedb607c86310a03f6cb3b6c34c16a787f76a419a81154efea6d8ce160f8453a014f32
-EBUILD capybara-1.1.4.ebuild 1084 SHA256 e63363732196e97a0b9dce4509342ff275cc37a13da947b067b9c9b5fc8540bf SHA512 feb5ecfbefd469c058403444865f90d92f5d40227dbf496bf3a93e2fe338e9c8c0f0667e0454119a22d7686b4004ba90263f613ba7a03ce4647bdcf80ff0661d WHIRLPOOL e384425211e69007978420fc73aba86351c56c864f82a68792c2c539b910a8a430a820f6a85aa893ed0417264969aef7de61ff804f08f500e8a423f9cc9dc1b2
 EBUILD capybara-2.14.4-r1.ebuild 1506 SHA256 123b0e67fa074082ec630ed8b553da177b0a81957cecb6691bd22f4a63aaf2ce SHA512 98a6096c892facbbd9f665fa9cfefdebce53fb7ce328b0a4b97716c58a090089e2dfd9b2454763fc4eebd384871bb964780b8fc9e2a883b31ee169781a1fde20 WHIRLPOOL 833091ee498faeba0a0d104269db0fb93d9f16a6e6885afcd4c1a0135816cfd48aca904afae3b4a247e4c2dd9b931ca6ee6802b28e49f6886080d7404587fd3f
 EBUILD capybara-2.14.4.ebuild 1352 SHA256 aba068f32dddc2f52d401dcb47319ff75b5a25e91a3956fcff96dba238f767de SHA512 e979fef0dc97221dc2d47a85afa6fa817f7f42acf6f6ec168a1cc9f48b58e057bdb208f2c366b2958f26bc9e8a7f55b5b1aac8fa484c42f515d1476958fe2447 WHIRLPOOL 443325633619eaf52e5f755baec2a2ded7c20426d12f5cee61e63f0b2887ffc9838200ba3ab5371d7cf5f727d961d3d2e83660dfab6838140706d6ab13af2684
 EBUILD capybara-2.15.2.ebuild 1487 SHA256 0f468d534ec55527340058f18d6e1d3a5459d5dd9634aca82789d1429c87b336 SHA512 7c061aee86de394cd6f1e5e236c7d15b8d89dc907d2c386a2ea1bc570bd8c6f5de08592414dd225bea42aa8bfc7adb5974ad58f05eb2ca441eb611809b5c3286 WHIRLPOOL cddadb397854827bf4b72b47721760360032575ccf5afa14dcc7e7e404f4d808100f0c4eed90733d4f5c966e8143272f8a6232cb9f603017efdbf6c6763765ee
diff --git a/dev-ruby/capybara/capybara-1.1.4.ebuild b/dev-ruby/capybara/capybara-1.1.4.ebuild
deleted file mode 100644
index 0b6d4cbed74f..000000000000
--- a/dev-ruby/capybara/capybara-1.1.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-USE_RUBY="ruby21 ruby22"
-
-RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
-
-# Rake tasks are not distributed in the gem.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit virtualx ruby-fakegem
-
-DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
-HOMEPAGE="https://github.com/jnicklas/capybara"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE="test"
-
-# Restrict tests until launchy is part of the main tree. With it
-# installed all tests should pass.
-RESTRICT="test"
-
-#ruby_add_bdepend "test? ( dev-ruby/rspec:2 dev-ruby/launchy www-client/firefox )"
-
-ruby_add_rdepend "
-	>=dev-ruby/mime-types-1.16
-	>=dev-ruby/nokogiri-1.3.3
-	>=dev-ruby/rack-1.0.0
-	>=dev-ruby/rack-test-0.5.4
-
-	>=dev-ruby/selenium-webdriver-2.0
-	>=dev-ruby/xpath-0.1.4:0"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' spec/spec_helper.rb || die
-}
-
-each_ruby_test() {
-	VIRTUALX_COMMAND="${RUBY} -Ilib -S rspec spec"
-	virtualmake || die "Tests failed."
-}
diff --git a/dev-ruby/coderay/Manifest b/dev-ruby/coderay/Manifest
index 570d7bda0b0c..f4db82863b46 100644
--- a/dev-ruby/coderay/Manifest
+++ b/dev-ruby/coderay/Manifest
@@ -1,7 +1,7 @@
 DIST coderay-1.1.0.tar.gz 242639 SHA256 a33f6490aacd1d035fa82e2c1fe88b0e2c9553c1f7d24b813ca2b4d73804342f SHA512 9443a629bf60b7f888198ebfc72f012cceda5c9cb3e14204b3d025807dc4cb0ca0896869ae1cc89f1aa87a7c0e84830cb03aee2c4da4fd80326606a0e22b2031 WHIRLPOOL 50c5b6d07e803bfd7e14c10b0f583657f2b95dc548a748a8d677b80c49480110e9e763bdd6fe376bf58b1992a61a93e88ba2b5476ce9437e41a8d1fc5addc745
 DIST coderay-1.1.2.tar.gz 220645 SHA256 20b83bbe9009fe47aa7a90d514ba2670d161d7ae57265b5e5e2ab98eaa377a3b SHA512 cfce5e9f0a0d988e7920912e064ecbef3b54200a08ca2e07453452edd7f382a1eb9292bc566e069f5d1b784033e816f13d9ddfb39520e8e44a8d1e898aa33591 WHIRLPOOL e0823e864be015805b8961acafe869195b46fd527dfaa782d53bbb8051dfcefbb30a97c4d4f68669b5582b0c837bdec27b1a9572ef7976907ba8227d9a389b7f
 EBUILD coderay-1.1.0-r2.ebuild 1203 SHA256 fabccdfe93a284281d41e44ff09aa07786a9df575983d69817289e6ae24422c7 SHA512 ab597a033dc28ffd302443ec8318b856538e46dbf6e95cf455775786ecd1c6c3688f143b044f01f99479d3fef7bf80794c76886d56d5625b4214fb6db41ef7c5 WHIRLPOOL 657866d5687c128872b6667610016677041359633ac34b5a5e2740632239b793c2d6778f9a9850e76cb4407c5248972f9ff4e7aac3d71ad0770ef4c5d77701cc
-EBUILD coderay-1.1.2.ebuild 1242 SHA256 f1007e4dae686a22fadcece9bf7278765725be0885bb89621c3d8823e1c2d9a0 SHA512 00ee100ec65c0d0dc6882a332772a4021324d5d320455776268f9ec34a7c05ae44368381de0df03eb3a7f66292b91b046c1e50289a7aa59db57ddfc718a51d3f WHIRLPOOL 20f616f444b6fccceb1601c6572c0922a34b1921023ad8adbc3669037bb9e00000853e0f47d9ccb572fb5f941fb5177cafc506d70c4089782fd5a00423a6e538
+EBUILD coderay-1.1.2.ebuild 1239 SHA256 5349961fe9be0a86ff298273b586e7a1958e3cca347015106c95af48002a710a SHA512 712a5f269906b1a59d2640d111f9f38e1d94d917264d46b2a7d8b38055a64900ecc33ffaacfe08dbeccedaf33fb8d904b418a49bf30f7efb008cbdf03e2bd94b WHIRLPOOL c5478dfaf81c4b31615100c97dc0884c6da3ad35e730762985c52f4172238ddd3b0e973571885d5d5ab5aa01db16b590c220ee8ce91f0e22b00c1c3df2013afe
 MISC ChangeLog 4563 SHA256 d6ce58c0713a18156273990912597dbab98adfb378fefbb0058ba857bd7c6cf6 SHA512 b7a6c673bd4b6010e62dcd3f16edb6d38a48ff8fe38a2c52270810904a7a0b380916599c56939b6418f6b287736d8d4e2a34b342aa239c08e364c8b6418b569f WHIRLPOOL 2e17c42056a6cf9ff387875c81c688057fa7ae32c118478bad86aad84ce5d1fe7c07406d77f5497ae47bbfc78607ac256ab8484ceec3c334ead1486a4acb79e8
 MISC ChangeLog-2015 11926 SHA256 ea32cdc6b029fb3abf3309c9b438a9e5aaf18f1ad174f0e5e24067e3d62cf4de SHA512 37d5748a1b6f9fc34e5ae8b7988f6bc1872edc987138688e1970ef119da63b534df3e50c0edf622eb2247622645c396d7ab4c7cb53346c047cbf6797a4fa108c WHIRLPOOL bac199cfa39dafb07a58a4c8ebb5cb4e76aebd805422f2f6330c767bd30f77a83d98f420f22696f69bfa5d6f597445c7d8ac7f2c9a0a3608980f5a321fa20130
 MISC metadata.xml 342 SHA256 a88e2ff2228280a6963811a8afbd0c679199788c396c7b29b70a463191f3549e SHA512 13f33c6d77b3297dab6c125c2ebc9a1f7584dd5374e7f13d416d5a80ffe04e39ecdddd93de30fceed22e110e1c68e4b853fdd5b6ab5ec4d254c05b17f624ca4f WHIRLPOOL a073c0468939f974bc9cf2992092d9ff5fd5e856a062874952711a8f345845c47598aad3aa0d640ead51a013386855a0a24a34c30f0b2eb8a53bfcbad9f41987
diff --git a/dev-ruby/coderay/coderay-1.1.2.ebuild b/dev-ruby/coderay/coderay-1.1.2.ebuild
index 26eb76200683..caa0e52681cf 100644
--- a/dev-ruby/coderay/coderay-1.1.2.ebuild
+++ b/dev-ruby/coderay/coderay-1.1.2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rubychan/coderay/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 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"
+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"
 IUSE=""
 
 # Redcloth is an optional but automagically tested dependency. This
diff --git a/dev-ruby/cri/Manifest b/dev-ruby/cri/Manifest
index 8d2742d7ea29..7780a8d8675e 100644
--- a/dev-ruby/cri/Manifest
+++ b/dev-ruby/cri/Manifest
@@ -1,6 +1,8 @@
+DIST cri-2.10.0.gem 28672 SHA256 6c7210f06b72acc3de6edf993ed9a6b71ff0a72af14d5c1daed4248b17cfd9f8 SHA512 90c33031c5819823aca54b6ea8be18aeae9a0e707f25a62dfb4091724f46782ed9f44200950ae6d5f654d58c2b925dfcbb3d404acc6ac38b86dba922aed18efb WHIRLPOOL 3ea1468fc537a40d367bff3f44b660494a225f2a898f679bf07db679961f72874e0c55ed49b37bbe04f83791876635067b55cf16b7782c28d088b25b7fc3cfa3
 DIST cri-2.7.1.gem 25088 SHA256 989fc14d1986c9c252c84e1b22e300fd139ef6bc4c9c57762a93cbf7eb4fd5f5 SHA512 37d641390dc83550c254b3c48018f7f2c53f73161807c299cb78ef84b8625e5f00cd8c877ac464ece5c6623d7118872c45648ed56c2bd5f53ae62cd66b8e24d1 WHIRLPOOL 85a5eb19f439d8fb53c56139bf6fe14faef2790c2eb5c319b2e8c52d92807f257771180afcf7af4342747cd69ae4787ad5266fb3f01bb2a2c01fba9f9f8fc9a5
 DIST cri-2.8.0.gem 25600 SHA256 61da9c5aa44d46b0e1e4bc2a7f310ed6f521883aeb318a456fb237ba6e005240 SHA512 ea8543debfda3a9e6ed1ea304b93dcf12114cdade532981b6c1e854ce37fa0c939455b7501f7b36a6efbdd1fd6b77696b97f9baacdb7029f55a9e707c19225a6 WHIRLPOOL b31d1bb63e59ffdcc9fc6d3e8cd7090ad9a7dac9a7602e68883c5417e69bef36fccd65f740f362ab46d85dfb22899a813782d1405ae14e779bc56b4bcc085478
 DIST cri-2.9.1.gem 26624 SHA256 add77bfd624700abd48a13a3569c224caedaf98a40961bc901fda781897e5efe SHA512 5abf0ba9315563c4b12ccc11ccb74811fea4de16f25ea2b81fb0854bdeef418bfdc45ab84320f5d71d89bfdcefe5e2a6eb66900aec9231ac1ca999c84b944805 WHIRLPOOL fc8ebfd8b7442e18f674ce894048d9b8e7792f4dfbf231c036991f16c28a243863bdb1ee58271717d7d7959348b7e8cbf5536ac9bdae566ef1927161daab9f39
+EBUILD cri-2.10.0.ebuild 772 SHA256 bb3675f4036e50ff69db7121b525e039a1352b9bd08b39155c0b56b45228253f SHA512 ef696f8a982b80b764b370fb41a39e620810a728a5593017daa97fddcacddec8c625d2fcd1ceefd4aafd80886ef2d3a276f6c6f7d8fb98063949bb4e2866f888 WHIRLPOOL 1db2465a9667ab4ea5751c450624fe4ac897335338b855afa3522dc33d278fbce5cbb2d4003bbea4a85708b1fb626858bdce57770e9c96ddffeb3c4d540b9716
 EBUILD cri-2.7.1.ebuild 778 SHA256 f55913ad19aefaf94a99665e39a92288a4e3e3edb588cffa94778e4f033dc4da SHA512 2055a481409e4a4a5260eda361cb9ebc500d0dd8018bc2c721c9dd6d467d684ad2a222ba936c14e67bd122131ec1238b025d11952c85c7fa52528130e271fc2b WHIRLPOOL e9d069c85df354c5c9db7314e91d89cf48315152975e89398a27da54b17f38cafeee87825588abebf1e0041ec10ce200e07109f8657ee955fd956bde6258c2a7
 EBUILD cri-2.8.0.ebuild 771 SHA256 f84379ec62cee78ee5928f15dc24017cd5f2de38b8567c20fae38cbfd7bd635c SHA512 226796398fd65959e58e39f62c2f80eb41eb0ebe7eba1356580c8aa9eba10dc76b5c509ba4f3f067496ce27fd060d5d5b638fd95de31b492eec3d247e37d0ea2 WHIRLPOOL bf44822928f554e11de009e08cb0e0628662f0ed27ed1fbedd986e8a3c20ecb45f462a1c324aa36453f1263fcb714345bf8278f4da3e2c8ec53922cffabffd27
 EBUILD cri-2.9.1.ebuild 778 SHA256 e8737ae5d3c16b1972ded66e674acdc2c0570942cfa8f88f7e5df3dad85f1449 SHA512 c69eb88bcd2af2d90e940453566e30140262697b63c015ff0a7dbb389e00413da5bb562dd0cc7c54e12683bd75046d959b9b39e361ed077a37ba5d1d66ede84a WHIRLPOOL 21236991c93182f213f8c09a6105991e0ba9094d1a52a075477aac2368ae91837d3e98e1f486b582a363e785a47e47f2de749ec7ed8f2208fdbf76b0d3160219
diff --git a/dev-ruby/cri/cri-2.10.0.ebuild b/dev-ruby/cri/cri-2.10.0.ebuild
new file mode 100644
index 000000000000..01337421830f
--- /dev/null
+++ b/dev-ruby/cri/cri-2.10.0.ebuild
@@ -0,0 +1,34 @@
+# 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_EXTRADOC="NEWS.md README.adoc"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Cri is a library for building easy-to-use commandline tools"
+HOMEPAGE="https://rubygems.org/gems/cri"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/colored-1.2"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )
+	test? ( dev-ruby/yard dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -e '/coveralls/I s:^:#:' -i test/helper.rb || die
+	sed -i -e '/rubocop/ s:^:#:' \
+		-e '/RuboCop/,/end/ s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib -S rake test_unit || die
+}
diff --git a/dev-ruby/daemons/Manifest b/dev-ruby/daemons/Manifest
index fb594cfd1c16..79e78f29d85f 100644
--- a/dev-ruby/daemons/Manifest
+++ b/dev-ruby/daemons/Manifest
@@ -1,7 +1,9 @@
 DIST daemons-1.2.3.gem 24576 SHA256 0fbf1f7ef654e98fac324b43ab690576fbe8b66941693b473f4f27ef334c032d SHA512 05acecc07bc3f760472453dd11eb0231b9e7f2e04a783ab44dacecf9c666d01122d27fdb782d9973f475bc378e0e3e51795ad58e221f29b201b1ba5e0de1e277 WHIRLPOOL 9568c383912195964b0079df60f8342268a51d75c0251b50e5c747759b82463d3d79a597e593a24ee84eb8618a637bcb22cb842b7c9a43d67db1f0be41c72e5c
 DIST daemons-1.2.4.tar.gz 27191 SHA256 34e28ad4f5b8fa402f7f2783949024da09575dcde6b8110242ca2048ad932608 SHA512 9b6f0202ad87704b441f150ae5c3f5086861ba220069b6e7219714b62c36711889fdd094cfc1de907e9fb4528e5f6bb42b5421b9bcc4ec286648349e78da280f WHIRLPOOL 4b0454884b1bec01eed876dabc3a9cb50b25bfd77d26c374ac6ee98d7d3c8ccc18b852a9da36e39ded2047f847961f6400af9d0ec0515c7afb826718e35ce3a7
+DIST daemons-1.2.5.tar.gz 27475 SHA256 7ebf1fe54b24c45d168e3b897547b29fda5f84b0fc723f74abeaf81d852a5dfa SHA512 5d3db8e5917eff5a3946c385a1ac6f561d1e9d1d6cd87c0deb4c4777bdab33a5e4f889300ee61a2e68df0200d51b3ddd0aa01d9f2841104d01a866f3ee8c09ac WHIRLPOOL 9d2e2d833e16b4cde1cc90f4fc4435c2e5f87540ae10e1d8de201693f40772251ea4bccf0479358d28d803cabfbcb930e2070e5e01ccfd3cbe516990010f23c6
 EBUILD daemons-1.2.3.ebuild 689 SHA256 16c7e327047ed8d5dd2cbce59ca494145d1d2fd499e9ad9d59602380e02cb58f SHA512 888620fe4d6e4d073b48028fae6d211e1c51fb81cb5556a8d49227f8d7fc42f21e77181da4b3396cf575cd90fea879416be3f773120df4c7a2a2d57e20a84e5d WHIRLPOOL dd1a02e6d327f8638a8ea1fe6b7135fa4fada51551b97be65ffac018d14ac81baaaca5c305ad8210090b37abef3f674e4cc6b45e1738c3dd8fbb21fb150a3bc4
 EBUILD daemons-1.2.4.ebuild 872 SHA256 2a19841a36fe649be6e572d31fedf11017be1c5ca5e5836c5a18b9081d70af6c SHA512 d156400a5b403ec8d7a4f81046f3942bdf1e600268f940a3300267fc980e708622e0ec73f4566a7e8388e2163db6d9e85def59493b8698df624d4dbef8ad12c9 WHIRLPOOL 0bbdc6660dc221b41b769d7d164418bd239db748c2d743d32562f23c4e271f445326b3ce698b556f350a68c8a5f05a728aa167ac280031b87da91c5eff0524b8
+EBUILD daemons-1.2.5.ebuild 865 SHA256 970a7d11ecf337f4b42de4efb8f2ddad1531b6eddbc0f4506ab89855b6b9fea4 SHA512 f9d9f6d339b8157ddbabd42cc495d4ce874bbe9151fae2f17441884764a4aba9fe8ce77b65f3250272d5d967ef626757c0b1036860a6680e4e9a32568eda6da4 WHIRLPOOL bd6a780e2a799b9aaac82cfa0e94f381746b9226ab25668c14296f8423b83013806aad8380c9f9ccf706a42c2e34311f49b31d6bf60fa2f23ef885eb05ad3fe5
 MISC ChangeLog 4392 SHA256 e31a22a814b2a29a0764fb6e6f713c0b50510c20207fafbab97b22190cfd1285 SHA512 29fe3bf6cf940a644cee99e46b7b0bca886562945e3d37d6d99ccc82a710b99791f96225b53b8019a9ce05ce91ec247550b75173d9488471007c4195baff2176 WHIRLPOOL a8003fbdf62e2f20ca672cbba53bd1b404c915f10b1cf30a673ef81acb2d32b50e590934e5da05a91d5ab54c799578bc1702108718cd9238cb7bdad1d204c7f0
 MISC ChangeLog-2015 12064 SHA256 a279f2186dabc9d7cb6afd7742ec890b2df73870c13eb4d2b71ebf2a959ec963 SHA512 2c8d3ec06a800a1d9ad55b6aa583142bcafe67e4ed2d19338c2a2db3b19f3213b47f63f06d6aa0dfcecab3a89d9323f71915dd3c90a086b1a2eeaae9c5acd0bd WHIRLPOOL a440acbbf774aa7b7a58de2337e6aab9773bec111e328816efd9ba3b49a2da64c844f010fc9168891b88d40f9717f8fe19f43bda37c7c8a8c550aefbe826fad5
 MISC metadata.xml 345 SHA256 ef9ca3d2f62be5d42c67fa485b8bb286053a6e489e9f4013a29db2b37b317989 SHA512 c6e30f1117d3ebc21e91cf49a6e4952f3cadef673c1a624f9b5cdd4bcf036f1a4d25120799ff72896b2bd38386fe251e72b27028e2a31551716f21bc90217cec WHIRLPOOL 26f292eee475ec6238b8412d0028dccd6fd34d4cf15d461ca548f5bca36496825da8db9a031d2fd90141b65166397873ef50485e18b4253ece1d249474da7b8c
diff --git a/dev-ruby/daemons/daemons-1.2.5.ebuild b/dev-ruby/daemons/daemons-1.2.5.ebuild
new file mode 100644
index 000000000000..792eabef56a8
--- /dev/null
+++ b/dev-ruby/daemons/daemons-1.2.5.ebuild
@@ -0,0 +1,34 @@
+# 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_EXTRADOC="Releases README.md"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Wrap existing ruby scripts to be run as a daemon"
+HOMEPAGE="https://github.com/thuehlinger/daemons"
+SRC_URI="https://github.com/thuehlinger/daemons/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="examples"
+
+all_ruby_prepare() {
+	sed -i -e '/\(pry\|simplecov\)/I s:^:#:' spec/spec_helper.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	use examples || return
+
+	insinto /usr/share/doc/${PF}/
+	doins -r examples
+}
diff --git a/dev-ruby/dbf/Manifest b/dev-ruby/dbf/Manifest
index 375c3d4d6cbf..b78c409f48bb 100644
--- a/dev-ruby/dbf/Manifest
+++ b/dev-ruby/dbf/Manifest
@@ -1,7 +1,9 @@
 DIST dbf-2.0.13.gem 125952 SHA256 d970c42f6f677df3b31788814845ac3135979987641447e3bc3b0065c98e6ea7 SHA512 26b05a72b20be81993316260dfa685723ae0b2ba376a9ede11d701ddaeb94dfe13e4810b71bf292d9e1304a6d1001216793d2fe4f642d8278446b2d56226c3e0 WHIRLPOOL ba3916ffe8766620f5f1f0235f9ae09df991e463454767242670aaa532559396638a5f29be35c52ce692ad2a8af540afa975d6c2c4b24842be84c40819d09ee1
 DIST dbf-3.1.0.gem 126976 SHA256 3b2548e6fda93a714950c7b7463d1525bf54c1e9cdbf407a6767045b518b7185 SHA512 d09c2c10a4d16774e8c72a3cb11ddbda6f302ed359b234b9d5698571bac4e10fde73d1200083c1cc7044b632ac196f0c59a94ff60c93e4953359030d74b26e3c WHIRLPOOL c98faadefe71b3d0617cf9366dff329c92a6a1732825fb67beaf0af516a762f6dd11e2c9c49b730dbae14aeb3f8280a4fd8ec06192339a67750a042b6d4fca61
+DIST dbf-3.1.1.gem 126976 SHA256 56df634c06c42839e32e9e41ddb3643ab683529fb7b891e9cda4ea53fd22c7ec SHA512 88aedb43858702ef2f24a2a751ceaeceba7d75ad58a6abdb314219cbb83551165aa7a1973a68e6b4c0da87c9f35c80b2e0650b25f570a76821bbdccb3dbaafb5 WHIRLPOOL a8cbbf2d95d068c93a0920c73f1cd26067c3cf637709409010d3c4523a467a4dcf57f8b0f635ecd8aadabe0f7f1616b356135d483988090aff61308a8a90c99f
 EBUILD dbf-2.0.13.ebuild 601 SHA256 3fcb357a94d10cd0af65e9cdabd45510e4afbff8103fac7b139748b91b99cc74 SHA512 28a41e6bc41d97de4b46f4e857658649cc02e3adcd33a417845160356e59e5e6ae453afeff12c21b4729829f4bdc04e6649abcf2580d059d07b91d3e7bd82082 WHIRLPOOL b779ea00e15a3feb61c903b0d3065e8833f3c04c18cd0eb1ac5268be8023fe84fac88bfcea544523f3c22fce32d922dad0c0c4089cce00501ef0f900974c41e0
-EBUILD dbf-3.1.0.ebuild 491 SHA256 114646a45f0e15f986df0223532116fb3e289fbe05e0c5092497095bc1dcae43 SHA512 22a64b6a28b5cc73bfdb5d03f80135186671d71cf939ca3208b61cfd66a98c758d585914a10ebcb55f0c65a98494b1e0d409fb7db0826cf57bb13c80dad1645c WHIRLPOOL c4a47e02e435d513f16f1a1e88b61dc91f069490894dddd66485ff6e13ea25f27973d59cb9e84ddcec3ab9927244dbc337e240b33bbb6f69f1fb246081d78cce
+EBUILD dbf-3.1.0.ebuild 489 SHA256 27b81e7410df7aa9d23787c101802bf914e72f5c2d5b59ff53cae2da18644f62 SHA512 06260e05926a1318440c173e76493f0c22d7d72f90ff8852af11b8d40f5f7c7d2bdb09eedba3860e434b2011d48cec8ccff36cb44823abb9690bf289dd9736c9 WHIRLPOOL 8b7598c9ca78836a95e32e13e75061e71b4b3f319b12bae0f2cfa30ae69a2a8f45d8c6653d87759f1b3aa5ca1a1bf3af2bd43fcbb576be00b40efe8e9496810e
+EBUILD dbf-3.1.1.ebuild 484 SHA256 3583ba1f722340007eeaf25347458650fac687fcb33b16272e7909065cf6e5a2 SHA512 5ded71be147e6909f1c4dde67027e9f2410b997da26da017aa9572dfbc3339befce7f15e8829ac7a21a796c1774bc77fe61d979039daaaa809fac6e9c8d8bc3a WHIRLPOOL b3147b257f379080952fb2dd161421f00bddb683e5e4cc8846ba8acf95d7e370fe55ca91e1138afc82dd693684f304cfb619b0ac77b53b7f2e82d0ea02fa504b
 MISC ChangeLog 5065 SHA256 308c1b00f8e6b778f9d903fa7e059bfe8ba83fccf0528d92382b830b6f968596 SHA512 499e9015f46ec394bc732ba417981b335cdf6846e255d0d72e02ef42c69f7b2e6bc42ba265549e58ee498f5b815a46e31f4b6e42f86a7982b0bb9dcd7f21a29d WHIRLPOOL a7d0ff33a43f5d8295edf8f0b1000efb83605cb2be2c632fc6c33145de3fa61ad6232995b97ca283feb98ae589e9c8717c319622d33ecc63313c5acc06dbd6a1
 MISC ChangeLog-2015 2119 SHA256 731de54ee2cec6f3a6ee63234b9db514c65de2c69463ff64475d2bb3b0f8cbf0 SHA512 0e5816c14859ec0cb39d3c0b3136fb63b9dd5c4e37e9022d9f16d9e3dcfee61d540ab8196de069a8d01dd4bb2d1eb5c36ca7d8072ed6990dd4bb2f028c40a6b5 WHIRLPOOL 3dfbc93a7697b298777a6d537888320f349609828ea21af85fe3dbd03d61e77f83c0d24431fd4d4d3ab7195fbf10a355ec975ede8f4bc28c855166cc4af01473
 MISC metadata.xml 473 SHA256 d93b3508fe277244033bb8d23340f431aa189412c78389a6d223a09415e3af53 SHA512 5e46d9be66b6236bacb4089909d40de9b2124dc5fd1e026807c4e6fdbb70e25aa32bfc3fd150b92168bfd7764fa8ff74314e48fa3bad897b34276d7f12722f90 WHIRLPOOL 361d2460e4fad9d02bfcec031d015493682c4e1c4f76a319ac3b8485490d24b768a7748ff8cc4292b7c7d19066e574a420ab5f1bb4d8489305860a717b154560
diff --git a/dev-ruby/dbf/dbf-3.1.0.ebuild b/dev-ruby/dbf/dbf-3.1.0.ebuild
index fd83bd066b65..3f02e64967e0 100644
--- a/dev-ruby/dbf/dbf-3.1.0.ebuild
+++ b/dev-ruby/dbf/dbf-3.1.0.ebuild
@@ -18,5 +18,5 @@ HOMEPAGE="https://github.com/infused/dbf"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/dev-ruby/dbf/dbf-3.1.1.ebuild b/dev-ruby/dbf/dbf-3.1.1.ebuild
new file mode 100644
index 000000000000..1d812c3076b7
--- /dev/null
+++ b/dev-ruby/dbf/dbf-3.1.1.ebuild
@@ -0,0 +1,22 @@
+# 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_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/ethon/Manifest b/dev-ruby/ethon/Manifest
index 2bb1b38c5730..5d3a55677d63 100644
--- a/dev-ruby/ethon/Manifest
+++ b/dev-ruby/ethon/Manifest
@@ -1,6 +1,8 @@
 DIST ethon-0.10.1.gem 55808 SHA256 d4fe4965b20c92cfc89df916cf8071db1848bdd46a1e196b17451255371b07c5 SHA512 cbc3d40dfa04aed73780e669979fbaa21d98a7a607f727bff05e679461502ed7e06c29dc81cce89b01458d7e2bea81c99cc43544e85a2329944eb5c2955cba07 WHIRLPOOL 55be64a062714d9cf8039a155f411afd4d784a5232f88c58bd15c812430b5da3c887c1fb796c596a9b16dadffbf406e9923542147ed836400c8a4b0c73cc7c61
+DIST ethon-0.11.0.gem 56832 SHA256 88ec7960a8e00f76afc96ed15dcc8be0cb515f963fe3bb1d4e0b5c51f9d7e078 SHA512 271ff2ce5578352722bab318ad40f06d9c76fdbdead573a015fed0a38f3fd6341bcf70acedaa9470fe97f47069977b09ac9f71d8dacb21b67aad917c2a078c72 WHIRLPOOL 98793b951269f7ab33040d02e1ed1aefe476cbf4925520dfd1559db648aa73e28d67129ebffa0ddf3e042859663e49d86ebaa22cdfc5c310b465d47fac9da1de
 DIST ethon-0.9.1.gem 55808 SHA256 c6b19fc2590a701b860f76ac1aee6fa5cde4a08dbf289c0a42c359f8c7b6758d SHA512 2104a463283340513c02ad97a6578140cf3d23bee664de40fa0ae4a7bb8aedac69ef09310edf3582f83bff5fa7d65feec9ace663568b9cb798833f2db61adb80 WHIRLPOOL 35498aa205a045d7bf13a5c2ccdcb6dc24524b3348e6a191a77f7fd8e3bbfcba79967f6bca2dbfc6dd79f351b1ded2b941cc4f2c2f66abaa838de77f78e31158
 EBUILD ethon-0.10.1.ebuild 708 SHA256 20faba7b824653c3e0927ffcfe82047ab0d306768c377c2c25de2cea7111bd18 SHA512 5a9519033eebb53a71551ea9d3675671c04c5b96d09f6ae1df90cbd5bea214f4261a9930d436a563addd775a8e83800d53f9791b2ab966bc7482113487b57bcc WHIRLPOOL b6de17e93cf63677c557ac70e1f18e98d142b3d0561e7ab6f2c2692c13173da202e972a87f3809729bbc6cdf975d718754575459284f9e7667b63d3931ef97a0
+EBUILD ethon-0.11.0.ebuild 701 SHA256 c09d37b2f51e6d3ec74efd6e66ab373799a41b653c6a9388e6e431005eaa24a2 SHA512 af3b4e23f66c61f621ad30395fa197706d5a0800820c398523b00891fcdb91f97d2bdc7a032aa3bafd6d8a730207648002454f165224d3036aa0757bce2d7166 WHIRLPOOL ab7c7bc1454b6c59d1c1801a56322178e17c82e3fc1c0706959c64762bb543918b32956cf0fc41dc6273c1e1c4d62aeed390d4f1a4b520f67e0e5eb6cee6f20b
 EBUILD ethon-0.9.1.ebuild 703 SHA256 d09089ce17123a5984d691b3ae42011c0a25a3a93ecf4c761651335b9ec245db SHA512 af972be3171ad5293053e19230519c6ebb6a9389a048532b9aebd36713c505b183111b2914dd3def77b9d11a93f3799f31487c1eb9f95d69d70dee07d4535600 WHIRLPOOL b24518ad8b2f3d663eebee271bd134f91b750eda550394b64471cfd15ca5d70bfd155fcf8ecaa4866c1e11270227668f26f8d6af321ef0ee88635f00cda1287c
 MISC ChangeLog 3861 SHA256 2471a715613e9137e7a8fa30977823ef6c355fa10734c180b4f75f97c91db5e4 SHA512 cd77476d4fffd945589acc1e8a5e2819ceee7f1169af435a2c1b03f6131378e3a13f6145d5798c1e8e4019651e63a982e204eeea5b404e522456e04224ca55f9 WHIRLPOOL 81c6e7693b3dcc84ba1200d51afd9a762545c64694d1d82c69535377087c79f484fbfb3d04c207b8927b9a6878bd201c77a37faa95b499d6d4b869e01f3c3e00
 MISC ChangeLog-2015 889 SHA256 f37d2b1b846522ae3e6e13da26f2114a9aa81295420e1275af55f59341084410 SHA512 572849098df1adec840abfd7655dffbff62f7a69d771ce73bcc235943e209a96915b6f41d14b116bb3a78a4dea7b4711e0ae8a805c6b3137c8d311119f9c967a WHIRLPOOL 9ff95e4f19c1efeee6dde95756c70c8f60c8218a4ab3e24ef71507470c41a2f4a65b6c7e1cf6cad2e39f8191181b854496bfb062a063f43a20d0d62ed3592efd
diff --git a/dev-ruby/ethon/ethon-0.11.0.ebuild b/dev-ruby/ethon/ethon-0.11.0.ebuild
new file mode 100644
index 000000000000..9f332d857bd9
--- /dev/null
+++ b/dev-ruby/ethon/ethon-0.11.0.ebuild
@@ -0,0 +1,33 @@
+# 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_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Very lightweight libcurl wrapper"
+HOMEPAGE="https://github.com/typhoeus/ethon"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND+=" net-misc/curl"
+
+ruby_add_rdepend ">=dev-ruby/ffi-1.3.0"
+
+ruby_add_bdepend "test? ( dev-ruby/sinatra dev-ruby/mime-types )"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -e '/bundler/I s:^:#:' \
+		-e '1igem "sinatra"' -i Rakefile spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index 9c3e58d46982..1d7ccb1f5c24 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -1,6 +1,6 @@
 DIST ffi-git-1.9.18.tgz 901805 SHA256 8daf534dd511fb52a4f73d400b5e6e99c68d07e4a724e02541b06291e87cb08f SHA512 49c52e5e42e436b7969c35a34b28bd7929d75372638ac5373486a1d624026c12dc682009bc101e4a2c8f1442ed6f1ba17b438cda2e02d4256622b489c4bd9945 WHIRLPOOL e409bc63059eb00d8d075ddf0d52a2a16ec49d7149facfc81a0366c62288d8c82c090585c5e0ab42367145c4ddf2bdcf6f25faab93ab1cfe2269915b558f3e4d
 DIST ffi-git-1.9.6.tgz 895468 SHA256 b27a59bf2eddcc17abaf7063a64e527fa892ba95cdb6320aba6fa945c769c9c7 SHA512 4b690b70db41642be679f13b33a67e27e1a4b14ca56d6ce355ea0a300c793a63e1081fb19d4c4bd395c1bea55a1669b96e3405932fffeebd328809a410fe3e8f WHIRLPOOL 7f5ad8d7766b037e24cff4721db02f05b39604c1be5e07ddad9de4a5155124d2a05ebd43209dfc2491cdc50ea08e5cda856f7502bf1c12666fa19b77516c81f7
-EBUILD ffi-1.9.18.ebuild 1536 SHA256 e28cd2f644392914e3554d191b7248f2f07165826a4eb657a0da23d171db6e6d SHA512 5c1d09fa2b548badfef2f1fcadbe00e881eb5e29589c5566624fa6025194c720f9721e721c0fba90d8caf9f908f404b1a8d93c4885d2fe3570b3529554427330 WHIRLPOOL 6078817710376d0d0954f5d8ecda5e49cb5edd67464372090ad40b1463d9c0f08833c153f83f22165da8c4e114a5775ace16a9dd8efb6be23982aec423be2e5c
+EBUILD ffi-1.9.18.ebuild 1534 SHA256 26a428823405c8e76f6f42b6e2df6f21fa336ecacab3fe229ad42d64dd16ea86 SHA512 7984b3d159b0c0972bb4ff0058704124985bf5b84f0ebcff324fb4fbfb8393bc287f60877f19755035a4bc006a5574f32056b4ac9ce2caf2c0deca89a13f1a12 WHIRLPOOL af65b306a25fbe85db555126e93edfc3dd8897354c41917653ac3567dd35c65c8cca6151f4f9386fa3a1d3a9d5509c0dc60ff27c938b6a4aa47e0c74fbe48465
 EBUILD ffi-1.9.6-r2.ebuild 1559 SHA256 52240738f1bc725ae47638d99a9f723105ffe6c6300980b54b66539aad4679ef SHA512 e57a07581f2a82a0607c44cd98ae70b613856526293f80e906bb17f75e654db3c156a958d74dd3aae361f83b490027c69d58003a10bc97ecdcd469243f36eef4 WHIRLPOOL ba4c8e3a3759e2ca3195e8f51b6299b3661641034c6aa7ed04d6bf32a361930a2519f42049290954b3f9c9ddce07e19851de96a9164086b31835ecd048dfde67
 MISC ChangeLog 4683 SHA256 86870362a94308c1d47550ff809b0447f586c4e760eeeed82ccc9874be312453 SHA512 f9dc6c3755972e0adeacb913ac41ebae23ef257032ca15733a242b8d0b93d71acfa3367525e93660c12561606dd308b40228b2f3da8dc9819719c38ccb3694ca WHIRLPOOL 8c7d531d01583d66d10e3d44180d012952d4763649cde25291f9495f8b39967791aeccca899b500c920bb0f6ec1c378186087dbd62b5f40c58e7ee202b5e37c8
 MISC ChangeLog-2015 13170 SHA256 8e817727910b53e3867d553d49eb9d9a8486435523294e0b42bd103476f8dd68 SHA512 574b1e6ec251da2b4726da0a04a7b963700e5b828a9f04c9ccefe1d9eebbb6b0a7fa5fafe4a9835e4fab6aa45d91d7e50be90c0f31d898a6a58c753bb98fa09e WHIRLPOOL 7ca50df63d77c5401db555fad29b420216dfa6743b00f83dfcc0b1d8df056cf2f854bf9e201b7cc67df953aa9857a97733828937d77ba9acd2487a1d9fb0582c
diff --git a/dev-ruby/ffi/ffi-1.9.18.ebuild b/dev-ruby/ffi/ffi-1.9.18.ebuild
index 1600ff6f5b54..4c5fc1a2bc3d 100644
--- a/dev-ruby/ffi/ffi-1.9.18.ebuild
+++ b/dev-ruby/ffi/ffi-1.9.18.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.
 IUSE=""
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND+=" virtual/libffi"
 DEPEND+=" virtual/libffi"
diff --git a/dev-ruby/globalid/Manifest b/dev-ruby/globalid/Manifest
index 2ba7cdd31806..80b8bd273f9a 100644
--- a/dev-ruby/globalid/Manifest
+++ b/dev-ruby/globalid/Manifest
@@ -1,6 +1,8 @@
 DIST globalid-0.4.0.tar.gz 18087 SHA256 58cdc29d1062f7b34b04910f323b523ca23abb308f19e68e82a9c785f576e4f3 SHA512 181ee39c12bffe16048b6ae77064f9a9f7babbc8fab43893c8eb89f98571ecd6cbe0032174a9ed6db04398e5f848d718a9ec2d587ac6cfdac4478c7e80284a61 WHIRLPOOL 0a5ec731f7113dab91d39798618438ea1aa01dd66ad72c20539f419635944a5414a7e5f57e66add8a7f98e8eb5a580654db2524e2b16e9c41590050cc2286559
+DIST globalid-0.4.1.tar.gz 17924 SHA256 d4a00a08cf046d8d50fa4a426fc49fcec24019b2e6c3561dc5aa09a3dd4269b3 SHA512 da484c6c7e8155416d008d650929c6b72981d2ae2d1654eb02e414838a065dad9b4ba3c6e275abb008a0d9cad1e2d4d5295d90807c7d7fc73e55b7071c0fd657 WHIRLPOOL 288e73fc0eb1eefbf07c0fd7c94def85578ca64e9f93710952dfe4edb68abbf0db08fd0428ece63d74b36c14772407670a97f091b7c08348de7f82b9fc486dd9
 EBUILD globalid-0.4.0-r1.ebuild 694 SHA256 b01e16ae38259f7de37071cf67121b5ba12a27b6837eed7f567e19b29458c93d SHA512 c8030bbb5e139aa6e512562880312f574e7ec21a22ec2b3cf2aaea10d93ade66ad23b885c36f284cbb95e1a6dd60c0f9829e7a05f2069b6a6f77427c4e996922 WHIRLPOOL 181360c481f6df4f6c86bb52c85b17f457190cc14b2424584261ec21534a1a0d881fef477c2988f1522fd91ae6efa75772bf1adf70f985d7f308fdb865ccad3b
 EBUILD globalid-0.4.0.ebuild 697 SHA256 ec7c9f1a369f97510a5fdfbbd2ae702eea63b2a1bd56c691cfe7a158a421556f SHA512 e22248fc09a20f0a458627e156ba189f59df8a8e8569a8dcb0b6b138a440da25972da0304244a70d518ab7133fbe9852598a1d89606b0e4f99c63b440e21e3df WHIRLPOOL 12d5d934402d6286102d7fd4eeae653f1b8725aaa2e6bd38b2a2d94336b8c9c940d559bab76200211cccb2b17e1b96414b1e9cffcbb2f193fb230f72d2844197
+EBUILD globalid-0.4.1.ebuild 687 SHA256 63c77768642ed142f352f28877396bc89dd551ff786aa7789880b97bcb151574 SHA512 4107961b6d4f06e903487e238f2d8338a160e3a2a13beeba24b85d757e4734e4b9528d2c3fe1080af4f90896e2cac9b1904a97221e4d4bbd65c9f732f5499555 WHIRLPOOL 567d83692ede54fdd01b179c13eb98940239861720a7a509007c535eb159ad1db781d50f39ffc2b4a92768987c095b8b1d97680087b2a0823ace554c45a274d6
 MISC ChangeLog 3397 SHA256 2553cab076de28656004db90e43e5c53fd42926d76e2acb5e6f15853b5e843d8 SHA512 ef7a21665bd2c0d965ab4ed12ae673b87102ae0776eae5b112adbc296c2e5719beee03ab52607baa694d7a79ae8162f6abc4d472758414288e5604bb7a81dba1 WHIRLPOOL 1462558d48c88e8ef789b1674f2e8dd5a6886f349081eac0c81e56b416389fac731c77b6faa812305527178dae98820afb0b099fb19ae476e6c84f397e5cbda6
 MISC ChangeLog-2015 1510 SHA256 0e24f6364668783c88c8ebfdb50cf9d5f64f6f7a545218f65089b9f248c50af1 SHA512 59361b83ed9f6dff883589031e508bed1b01fa335e7d6afc050c0033fff40e77bd7d8c44549ee951f15a0e012843455cb898d3864aad55bbd0297f964619c07e WHIRLPOOL dd5fa02bc2aeeca4b3fcc5c066eafedaa55a10b99a8073faadd03b2778a622a25742b6fb9a0c0fdd0d830327dc560520067ac07c079316db5bb22b7cc463a5f3
 MISC metadata.xml 340 SHA256 b1085d5ea2afe48bca6d1a9ee07bfea86c2bb57c5e240043336e0ef58142eac3 SHA512 31207f04b56e2be06ebe5367d496e8f7e9c73732cd0fa852d19bb49cfdb7b53ff30d23131a53ec9a9ca8c7aee8f8d0b4d74cd896c7e407a8b6aead17f06e106e WHIRLPOOL 381874762f4038f2bca5e954705ba08364abd213d993da549cd7bb5da619728fea484e2c33b17ea7af02c2c245b44724727fc0102c5e76fbcc5ad7998749e52b
diff --git a/dev-ruby/globalid/globalid-0.4.1.ebuild b/dev-ruby/globalid/globalid-0.4.1.ebuild
new file mode 100644
index 000000000000..875ada0757c6
--- /dev/null
+++ b/dev-ruby/globalid/globalid-0.4.1.ebuild
@@ -0,0 +1,26 @@
+# 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_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Reference models by URI"
+HOMEPAGE="https://github.com/rails/globalid"
+SRC_URI="https://github.com/rails/globalid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/activemodel-4.2.0 >=dev-ruby/railties-4.2.0 )"
+ruby_add_rdepend ">=dev-ruby/activesupport-4.2.0:*"
+
+all_ruby_prepare() {
+	rm -f Gemfile.lock || die
+}
diff --git a/dev-ruby/highline/Manifest b/dev-ruby/highline/Manifest
index 75af16fdce56..6fa28f2ba361 100644
--- a/dev-ruby/highline/Manifest
+++ b/dev-ruby/highline/Manifest
@@ -1,7 +1,7 @@
 DIST highline-1.7.6.gem 224256 SHA256 17d22a44993eb5e9836cc2804a966ace22386f2a0e37cc1cb7d5b69b433fabe3 SHA512 0ecf743d92227c17d19649afd909ed90e27f159aa54dd3ccfa7591dc4a95e17aebd5082f9a89c5c663a7db53a8cf9a90bb28ee4b6987254edb34c1e494b4ac20 WHIRLPOOL c7be26f6fa3d454175d5b4102c521bc0fa8b0502798b0e3c39c8f579eac82c82a5660b89a1c10ec57cd8d5621d3f01cd1adc782e6944193f08fb7351b74cd0de
 DIST highline-1.7.8.gem 224768 SHA256 795274094fd385bfe45a2ac7b68462b6ba43e21bf311dbdca5225a63dba3c5d9 SHA512 85f57ab732009cc961b824e252f0b65bbe7c0a8c97849d453773a331016b2ea8fa0efe393bc1a0073eae6d3cf523d97b9434cd73bdceed55bc069be0b6f4b41d WHIRLPOOL 7085518a05a27429d0b58582fdc20d182f06e85894ab96e60ced9dbdea547246449f3a6a4b5a363bb92ec49547b9360765e1d5f6ea8352e4cef0df3fc9666052
 EBUILD highline-1.7.6.ebuild 1251 SHA256 54d850ab48e5228a3992971d9459eac7da301eb85b339258890e5172f91daa29 SHA512 40815f3fa1cdbe278893242bda92f8cffaa055030cd8558524e4c334bbfecc190641f7a806ca2165355415067098a7a386d3f5daad1a40865da1e4bca6b0dcb6 WHIRLPOOL 8de4046771195df10ca3abd574c982ce9c36ccd8a01caa5a790572741f1407f564e4540daf3372acc294c0b4f2e2fa1c37fee95199cd8e8ad913b705b5a21ac8
-EBUILD highline-1.7.8.ebuild 1262 SHA256 06cba5790b658343cbb9a78293a53d2049b45b452276c9099854270de385cc06 SHA512 1a1097f53a11df08908f4d286424590328b0a55a809d28edbc600a9e922f068227531e303f9dc61c55fcc158055328477cf1b5f420ee4ffb3c34a27caa5bc429 WHIRLPOOL 8ce1ef8048672055b5ac54358655470eed02ea18ca398c0442caebb14d51ecb758b56dd3ccf41c9c23172eec92b335ee334066915e1ff31193925a64be8c647d
+EBUILD highline-1.7.8.ebuild 1259 SHA256 1919eec69a86843c9eb546a0901991e937404687f6fa55f3a52996d567b21408 SHA512 17a783f7b6ea0aa5104777119c182bcd8002fe105d53838808a7bd4fc0a664b49780053b68a6475b8ba7280de6b6b453ec9156f139b0a8bc3d919373e96535e9 WHIRLPOOL f5f6b2f243df21ba09051aa0d7eaf38517246dbd557312eb022c6585aa1d8f0ae3a198ce4d1dca3c5787f6eef722a728874d41f15007d2fce0c06bb521e266e7
 MISC ChangeLog 6009 SHA256 a2544498219a5072afc3ceef6ed7e2ac4efd7cc12cd11611eb3f45094ae1e309 SHA512 b00e8853ca6c2a831e608be2b07df278bc452092d1e91f8cbabe4bc2d1b001e77d1a7df41bf71ae55f1d410e0301e2cd48931056248988e61857804ab7543139 WHIRLPOOL 66dbf81b867209b6ec5cd73c52043309b430718a167e7cb13a6ad86e14149b2ca3fdffabed351afa369e568c971a436082a1886981a95b2bb88e96c97f1a0dec
 MISC ChangeLog-2015 12579 SHA256 34559be236e7ccca951c09de04bcb31f9b9ccc6c9ab5313a6e65db2f14405b23 SHA512 e2ffe606eeb4354b707de30c335474edddb3bbc7f611a8b579eb6e04d42abfbad4a1e4cdb626148b9dda14c9278d0f7e32feed4c807b7745327574c5e21e0caf WHIRLPOOL d3941f78c5038bc595e84356de763742b140e9a3e1b0ef240a8a7b272b651d45a0ee27c387a1e602a2f8cd4991986d6178b1232d8a5a270693ea23812f704283
 MISC metadata.xml 339 SHA256 5252affa662aab583b14b73c5435a1b80c854925a2ebf66153e91a5701f0e7c1 SHA512 723488f3e201d857ceffdbc6779199469aea1d3d21a391c5bd5ab9402388e6c32e4964491a609d7065d0684a256811be04f2df20b3db745d83c4cb8bd769a945 WHIRLPOOL e5f6eafb9ecc5b5e89c445c2a2ad049af2aa068aed003fa3178cd2a174058bd60a98c305f99e58c40285b50805cab9963d32b2190b10c7aa339a5bd0a0c7a9dd
diff --git a/dev-ruby/highline/highline-1.7.8.ebuild b/dev-ruby/highline/highline-1.7.8.ebuild
index aeac82dbeaab..6dce707150f4 100644
--- a/dev-ruby/highline/highline-1.7.8.ebuild
+++ b/dev-ruby/highline/highline-1.7.8.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/JEG2/highline"
 IUSE=""
 LICENSE="|| ( GPL-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"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 all_ruby_prepare() {
 	# fix up gemspec file not to call git
diff --git a/dev-ruby/hoe/Manifest b/dev-ruby/hoe/Manifest
index 314e7288e43e..e240c57442fc 100644
--- a/dev-ruby/hoe/Manifest
+++ b/dev-ruby/hoe/Manifest
@@ -1,7 +1,7 @@
 DIST hoe-3.13.0.gem 130048 SHA256 a74013aa6749ab10f0db92e9ad56e735d407104baa0981bf0d10dc2feacefef7 SHA512 0b6b109a063811651787ccf3d63eff2944024013a75c0c3362056d2fba6668141b7541fff8e53a9ef414899adc560546a98c452878aa5c53620a115fef7ce242 WHIRLPOOL 3639b1b2d984110ab234e5d48744f362031c312ebb47d5994c102e2aa71e6b83039b5bf9549b951b3d653b6c131f39d489602787c6a1fb7cbefb3171a5f1a9b8
 DIST hoe-3.16.0.gem 188416 SHA256 8bee33376af7dacbd0f3440614453589e60df14c13471c938ab6124bb8b6280f SHA512 66cefb5a24906e19bbf0c82c8539d6d101b84d0dc1d3ce1910e4117357639489968271e76e86bd3c432b9ef7e3b24a78294c06210cbef280860f7dac18100606 WHIRLPOOL 778b59cab2ed778fa8e4ad62e90ca26b346bd0942e747f17594fbc475bc233f7495e5b4457818fc97e04b6111197d40012ebaa65acf5d2a27862c09d2a61acbe
 EBUILD hoe-3.13.0-r1.ebuild 1451 SHA256 960b085c9119d35b4a4785ffc3d782bb8bbc2737584bad2d4783ad1a79ee3522 SHA512 43628099f9f8480855fa9a60d82bc8379f732d6b06fae5b7ffa3066a01ea0e9b001f444b6c4cd3cebc9af12579b4ad926869f762c1ba821d2ac7e9eea0439013 WHIRLPOOL 28e25e02530512cfc08a0682169836aceea6f36bfcd23e09771200306123243ada996f96cc9265d9fb5393487b33819f43fda28c9a67a53af6bf04072e4e5ea2
-EBUILD hoe-3.16.0.ebuild 1525 SHA256 e395146cbb4827ae111e056d962dc55451c9afe2afa576dac15f4d69f2978ebb SHA512 7fee6d592727927e8003285ead200e972842f5cbd9b5e210be9a86d37b34fa42db478c4560ebdac62afa6129e2358324a720c8c2ae54fb0f7a80d043db3a2012 WHIRLPOOL 6d228c678dde6cecf26ce67fd906a23ea3a0e562b0c7238180560fb2dd8f2e2c6a90f0c10f6f977ededa4bdf2d1d8838e1cd832968ca499e5aa91c1e0fd864b8
+EBUILD hoe-3.16.0.ebuild 1522 SHA256 e9e363cad0e0bedf8a7497d557eeb6a08c3c81e7d2b3a54c849306124863226d SHA512 d76db7d1b3bc52157e30ac8dc7fb4807463551de4c825eeabf3b1f487aaa91c35730251c7ea952feb897151572001628426ae00acbdf2b7649aa31971c01d4fa WHIRLPOOL 45839096b651cf0574007463573040dee620d1f5e74de183ae23351cb205de74483fef2e4fba9623482ee4b5ce20781784674f0e730710257b660c781885e995
 MISC ChangeLog 6061 SHA256 110f8326065512c8f3a942804707318266bd19faa627021ed448979e2e456312 SHA512 9843d6d12f9b5efbad0e175ab48b2c4416fb5c529f0708484ab24b350cf7065279f9bbfa460facea42c42bbae89b537abecf6f1e54765a60ad17c68f8008c1fe WHIRLPOOL 43dcca711d66a32659467ec6d1f347deb5f47537b2b0c7dfd8f845528ec584cec7a3433f3b35623364d3f9b7ccef35a797cfa11ba56af911557adc0d952ac830
 MISC ChangeLog-2015 22346 SHA256 6440b0ce8819fda0b90409acdbb1151e66aca4efccaa93eab2c4da31c96185dc SHA512 5543694830f6f3b2878c848e0d016fa4132dcc1b4f26f1ead1ee5aaa2827b444716e3fcea9dc413bf0220730af78eff4c4ad41e572d03bf06880d31f3d65de4a WHIRLPOOL 973f21922db046db333ac6a622abe88fee2f353540aa27da7769d915ca4e8313800f6fa8dab1b9bc8851cdf7ff4ff27f7b5bedeeca9aa0aed41ca63a75158ce8
 MISC metadata.xml 251 SHA256 e42b6a84b1ae72e905433686395988601795455bdc99180089f055a3498c4c9f SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea WHIRLPOOL 2408c62b64285a8a340b446568718af55786b22010e127543f28dc67de0c67f1739905e31b7d0e549bfc663ba05ea646c011de5df57505a5bc5ea7a79e2e7639
diff --git a/dev-ruby/hoe/hoe-3.16.0.ebuild b/dev-ruby/hoe/hoe-3.16.0.ebuild
index 6d5c196385a6..ed3876579b2b 100644
--- a/dev-ruby/hoe/hoe-3.16.0.ebuild
+++ b/dev-ruby/hoe/hoe-3.16.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
 
 LICENSE="MIT"
 SLOT="0"
-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"
+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"
 
 ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index 645304eeaf63..377341c13700 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -5,7 +5,7 @@ DIST json-1.8.6.gem 144384 SHA256 65af27ca985f70eb0d083aab0f75712c771871222af021
 DIST json-2.1.0.gem 140800 SHA256 b76fd09b881088c6c64a12721a1528f2f747a1c2ee52fab4c1f60db8af946607 SHA512 bffbe462e952bca321d4325ecb9c5e9f61e51cad13758581ecfaa6a038bac4e30dc7db50bd897086a5592f6fc437d0e0909f91e279aaf4dd71cf127100c3550b WHIRLPOOL 94140475051d90e9b207c6d0224483b5ee0c371a27b7a4aafc612bc2e828cffb350afd4001ba20a3b5ddb124561da960cdb0d757bfbfbba031942d6bbb9cc641
 EBUILD json-1.8.2-r1.ebuild 2076 SHA256 39a27b3f18d67234cc4050d91e0d978da1d807c365ef18e4a72adb301d36e357 SHA512 99ce2593c742309f7b9d2d984f53eb6d71c6743fe59571e42a173a62040455ff8a46d5a2169a49784a40e8bfd3cf8b54d190281821c35fd6ba81b87640b3c0f3 WHIRLPOOL 699c12bd7f87a799c3432cd162a6e190b74bc4b116b6eaebb6ecffe661d23eedf8d323ff355801fd3fa14822399c2f0dee3abb1c9b68b554eead242c24292250
 EBUILD json-1.8.3.ebuild 2091 SHA256 773113fe37f7b0279e37885f38482b3ab948000ff9c5b1ce16693ce50961ec0d SHA512 3601ceb5b0bbdada74836475f3730f11da8c7a6bfec49397e7eecdf9686571917f5b51fccfa900656991baaa2e99c154a1e7b31af1cefbc5d8b6fbd966d3e6b7 WHIRLPOOL a5e7768dea6034ea17f66f754e029a9b83af463158b929e67bce026d98094962cc1b57f91f6ddd304454ae87d029ffd391c518ba8575e68fe6efadbfa59ef595
-EBUILD json-1.8.6-r1.ebuild 2112 SHA256 2e8470a852c89b565e10b4fdc1e1f1e6ef757d618c4fcb0c9202c63168da4709 SHA512 ceb6f70688c5ee61b3b27c8970d7884e8de09ca77e70019c6a0f0e74be5d29e3fe3cfeb60409d286232dd409ee508ad1aa6d05e9b33f6dcd05f0857b3bfd65f1 WHIRLPOOL 3755ce1d84af3c641f668f783a6c0d9aca401a02ae07c7ee9906d805981148e703793328f06ae27684bde11bb68b26283a140707f20be19b5573752ee8c7ae23
+EBUILD json-1.8.6-r1.ebuild 2111 SHA256 a78fde60b45fbb3577dac6b6a3c9501dcd782e4c4b378700ce14f1b1f32bfac7 SHA512 4b2ce2dd5e5c3713f2920e6a67d30d7f3c5a8db746711c536eb1acf65401a48a0f6617386180827596c65f5564c59a995774a0c68cce996f07ead09736d78aa5 WHIRLPOOL cf2824cfb3fd661e5978894505a0829683ea3eae0165a476c5ca034910ea28b835a5e8170f2c7c736731759ef698cf71e9f8db5c70223ce652eba8621cc5419a
 EBUILD json-1.8.6.ebuild 2071 SHA256 4f49c8101efb92fd4199b3a072be7e8982dd870aec4568059bfe32e681e4e73b SHA512 bfe55a86afea8a96f28feeac30edd2e51729b99a74a680b12b8799794c8697554574826fef5ddcffc37a14c5dc90d55c886d2e3a7dfbef5c5675bdc32424f55d WHIRLPOOL b620e2f8c3c4e4c5521dbedb04fd41c43ba44e8f3d6ff0ddec1c3bc4968b53023da3994dbd9a00a156e4ead62541384cf4bd9285d8d5174360d0d04c465289cb
 EBUILD json-2.1.0.ebuild 2063 SHA256 f855d12cdaa40f0e6c5ebf8ed52b6c156d7272ffa1f5e9b1ed73dff2ddbe5ca9 SHA512 296d0175321fd6811b144f37bbb39ebad763edf5f4424a0ef35a6f4a3c75a555df35629ab356e12813e09eff35fd0f5564ad46bbbf655d6fd4a7de52e9bdcb64 WHIRLPOOL b4d6f9693b03827d97256e42407960ea6536c172b39957768e2650eab9beaf718b7a8375c11da6c16a4987cf5a3e7d9aba2100082b31068fb5d37d5f5cdd8232
 MISC ChangeLog 5018 SHA256 750823aba9ab4df34144d05f071a2b36c18527bab998f6741d59b4f99c4701f2 SHA512 b268c64bd0e58227ec1052ea12713b8d0d51ff1280e6641fd2117703a2e9517e8bdf1e138df610037b1cff980a34dd844326dcac7e7cc8b3491a0e25c543e708 WHIRLPOOL 577b200a89cdaffce3fbf40bcee0c882007faa982647c7d1b79833465e517d084a2db2cd81ee25636b348f833a0f90abd92431ecff7aff37260a6f0982f2058b
diff --git a/dev-ruby/json/json-1.8.6-r1.ebuild b/dev-ruby/json/json-1.8.6-r1.ebuild
index 1d21b4bfdf29..f8814f50c0c4 100644
--- a/dev-ruby/json/json-1.8.6-r1.ebuild
+++ b/dev-ruby/json/json-1.8.6-r1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="A JSON implementation as a Ruby extension"
 HOMEPAGE="https://github.com/flori/json"
 LICENSE="|| ( Ruby GPL-2 )"
 
-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"
+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"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/libxml/Manifest b/dev-ruby/libxml/Manifest
index 2c6355d2adac..1bce4dc0d5f3 100644
--- a/dev-ruby/libxml/Manifest
+++ b/dev-ruby/libxml/Manifest
@@ -1,7 +1,7 @@
 DIST libxml-ruby-2.8.0.gem 261120 SHA256 0bd2780afaaf944d38786999d929a4fd37eb30922c404301b86dee94c9c512b6 SHA512 085670e0d343d47085d03d7d95a94498e7be049fbab5e60f1c5f43f9fc41222fe96315de7d5b12b221a3c866d0c178dbfbe2e717a206cce8c4471a2b3ddb9c42 WHIRLPOOL bae7fe3e885b35c58e314cf84ecf0f09abb754e4d41e047b101f20fc2d62f7695e328f8cc07f91d473de87ceb82c2a54d37ea4cb03c421897a5d539605883400
 DIST libxml-ruby-2.9.0.gem 262144 SHA256 e25a6278aaca2376ec0cc9e93a034a25d95af1102590abdbfce786d5c6612ddf SHA512 06ad42ce68c16715fc92a41439c3c27b49fc25b4f8829fac0a27f860d6c3df9a4cb964f1b4677d7587d31c0e5542c4d1c1c25ae3bcfcec889015618d22f6ff3c WHIRLPOOL e656ac449cd893325378b5af1d1108c8b2fa53e79b9000891785ffe5800a067f961c162699d1c6fab585dd8ba475b4b97898ee1ff2d2cf254c10a965504122c8
 EBUILD libxml-2.8.0-r1.ebuild 1937 SHA256 8168de946e0fd012050b8c77a84b8e3cb856c1e8b05abf78adedbeb5bf9ce1df SHA512 847062ac253bb86afe488108a6cadeb031a289cc4436ca3c21926e13c0f722978ffc5eac98088dfed9efa0c2f3dae2abd38e3354bfb9ee79df3efd5f4e54e676 WHIRLPOOL a25eb323b652617608699e834971de1ab2fb81773f4b72483436a5ee50370c341e8f13df26cca7ba5753295c92883a8eeea3cfb2c04a84262536c92d27a886d8
-EBUILD libxml-2.9.0.ebuild 1388 SHA256 2502cb164a9564f1ea841946514fe8f8b90b46deea5d7a922742ee508305a2fa SHA512 1144cbcc5cccb7c15782fabae49599a8fff18875c438a09f32226b07b6e27e9197909ebe0f09ded45aba003f3c6c2e8abe0fe557ac88eeba51ea1a0f71ca0ef0 WHIRLPOOL dff1089e4a8b662ac18363781d0854fef1d57900e10055b38290966a4a4e46e4410474b5e74a45a499ac99b8d9f75c164649782bcf435d3b63d23d3e69f5a227
+EBUILD libxml-2.9.0.ebuild 1387 SHA256 4a5910607bc7b58753d80cf8f5fd7f4e97d6f98b67b20a5638f02e47345601c8 SHA512 71b72b8cecdc4731585eedacda18318bad2eea728824223186c40087f69edc55b5fb247d3fb95f2e6f275e9feff1d84c8dd196e7c402f0944159058b14781ed8 WHIRLPOOL 81f6572a36d97f2feaedd89ad8de17ff2b83854456995ef231a456c8be0a8d89961edefff1d0017e58f33470d44ef0f1564c545f1dd4ad6b9fb4c61d388d4cda
 MISC ChangeLog 3044 SHA256 7a74cd10b526336a60136fc914f4170ecc65c7e84bbea5af43658476a6a9ebcc SHA512 19e4e0a1b76dc56c922f4383f0d424ed624757e1f9ee37833f7198071bb095fa718cd6cf4aad09652824278ab317a60fac778c6b41a332fa322716c7b72ea575 WHIRLPOOL a5c63d5507d50f1cc2f6de006a23af0ee85427ee5b96baa1bad911a664a74950271c57e0246db3235bf2fbebf633f0ed74d043f6e0de72dfac504d6925b2cb8e
 MISC ChangeLog-2015 13689 SHA256 d4174bd2ff2013deb72ce8a319b123a6248208cae05bb2639ffe08f5af0af8a5 SHA512 09f55e68ee6e2214fa4289c4f2fc5de9d5f13be63a402d5ef9a3e15b42ae7fbb7e9b47ddc946eff6affe80c664a54330c9eb76c7310ecf325867aa358830e510 WHIRLPOOL 6dcc49d80dc6c8c072df8571d92bf653cd7d1c6416a2418153f57654ff24386d257a2eadc7e7b2bbbb04460b4029cb0d9470de97bc738c7d95e47798eb82f895
 MISC metadata.xml 343 SHA256 eec5821adb779214fac85196a0bf39173d88aaca17330d200d043c417584a17b SHA512 fd2936253ab0f8f0e35b3c8e3b6a145eda17d8bf82badeaf78e20e1622c0aca323240227e4159991d6436c7473f96bf9960ce39a97513ff9610c13d9f5fda13e WHIRLPOOL 32fc84b90347cfc1b664b51490826f774bcdee50b4b54bf7136935d20b8ae2c69bd9a5de77090889118724ce5bedd4f8692e2b40dc391f57cc11e339d08af04c
diff --git a/dev-ruby/libxml/libxml-2.9.0.ebuild b/dev-ruby/libxml/libxml-2.9.0.ebuild
index cec6559a556e..7aaf4739bd5e 100644
--- a/dev-ruby/libxml/libxml-2.9.0.ebuild
+++ b/dev-ruby/libxml/libxml-2.9.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/xml4r/libxml-ruby"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="${RDEPEND} dev-libs/libxml2"
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index cb576ecc86d3..e778774cdf06 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -10,7 +10,7 @@ EBUILD minitest-5.10.2.ebuild 806 SHA256 41422e9bc90a17c54bd1973b3c65824f417aa19
 EBUILD minitest-5.10.3.ebuild 806 SHA256 41422e9bc90a17c54bd1973b3c65824f417aa19ab1dddecabbc6c986e6d69473 SHA512 5c6c2c91f11eeafe874fb60b3c351ad304cfd81cbacec656aba32b27b549f9e5d21cfd486b6e2a90cfbf1c1cfab6cc8ab654fa82f3b0149328e6e72ccade4084 WHIRLPOOL ccab4b5c666f2e1805ffb88f028559ea06a03b728bd376ceb896cc8611842bb9cfa0c52cb405ca8f76b52898aac1a15ac78a3e9e1769268c36a39001c9cfeff7
 EBUILD minitest-5.3.3-r1.ebuild 817 SHA256 6266fbda8382ae5453e9a1b8ed26ad9bd64a2923bad6adc0276b7e53a787840b SHA512 b96a9b0b391626ec3579314fb4d5e4d2635a8b78bdc3acec904519c78c87b633e5ed015fed19f7bba04a47adb7d2808495354e7ae378847c88cd4fcff3d84c53 WHIRLPOOL 0f91d16d1359701997ecf60d33ccc7b7df367b8effa042beddd90b950cbac2f8279c74e5a328f503f9403fafb92baeb0cc44211ae0c535319f756fa8b2363870
 EBUILD minitest-5.8.4.ebuild 797 SHA256 f74731a3e82f698922f0aef4d562af680e3b8e5036a38c25b1865a8d596b0408 SHA512 fbed034036e2ff323466bcb3deb5d5a369f07c8d4c0636676c068e12e3df290de4f6579c54f167b975407093f1b5661c9271db364b9fe1cbd9f239c7b5913ab8 WHIRLPOOL 58fb4594c1ff36cb39907f309ed3f6c1d8fe1a595ab5f2e5f8097a03aa5499cbf81da28ff5699b207f57c195d6da622041e15e90aaf8a8ce2fbddf7ffdffac03
-EBUILD minitest-5.9.1.ebuild 803 SHA256 38c383754ab5c43d470b8c72c07a64767db20fe7c5674bafa2011e91fd6c527b SHA512 c2bda7c9e032e10b7d18cb4ad72aeeeaff70a92713892ef24c8f4e27b7a3cd85de084ccb7ee46d6f1849c226404a65d302a228739fd4c294f8d6e020e736ec5a WHIRLPOOL 2274d8b3e72a70125d68ec4889cb5be3caca475ad737ed87b0416c9f30e1bc9a235c487a0246efb8fd973fd916771b80f16e6ebcb745b3f26e309693002e093a
+EBUILD minitest-5.9.1.ebuild 800 SHA256 36942ddad1f72628ac822755ab74a90db1e1bdfa48b554447e976065d6b2559e SHA512 db30c876940461cd9cb539234097e6b6b1aa65b5127e8a7b9074dc94d909215edb602658b27adab18a09123e174d8313d1bb1199e099cad7387fcc57f7d359fa WHIRLPOOL c980e099c776ceb6b67171068d4bc86abbd609bfb44b7f2d3b060606b563f93970c5acba23537721b51e582bd26b27a399fdaa7323c6c78d43b234c164956e51
 MISC ChangeLog 6715 SHA256 7aa95eb3c020627edb2d6061392447a6019857779d7cc3c2bfc69587b3bd5a9c SHA512 8acd8119e7ec7a9a4dd2be728369586f3376e7cec454226e0197449499606b66cc8fcbed07a5cd18f97e0a8ff25a6dad5566c054d8952b3ae12b70e40eba6284 WHIRLPOOL 365e93b2b4652022ed138981becdb7b31cac81e4cc694f7ef531c816441280e9cf61acc02073b570d938ac4730a05b860520c0e44b7347340f00aee8f358a27a
 MISC ChangeLog-2015 23965 SHA256 ce145797badcabd1d371d643a83e83301101ddd23a9f358465b47cb0762666ea SHA512 5a8874e2c2fd7aca86beef6c0af593c4c8b15a3c428203ccd7d2813e7d79035d720f00e13e2bd3a09414fd8316a54e8901788b51308de2657746ab56bcd78337 WHIRLPOOL a58172785b93fbb2d5b99e5877f3192020964c147e740f94ab75cd20712f4d3e185227bc66f9b56adfa6cb0a3df7ecc46a540ea13e65305e23a757becf52fca5
 MISC metadata.xml 344 SHA256 e7e654b06d47dbb2961cd0d960bca7e681731a3ac2fadaaa39a4d6f549d079cb SHA512 48a43ffed154ec65035a6e84ec7e7e9ec222698b4dd56a81b6ca84844d9835c087fd7972d38ecc40fdba7f74acfeb2004bd1084d2cd123ffd09906e644c59e00 WHIRLPOOL 2dbf49b7c3c0c57146a13be9e6dd4f1aa155520bf3c12a794c80f802e8a404ae7af993378ffb634b7099e209024c3ffe14cedc68491af6803d6d309ac91443f7
diff --git a/dev-ruby/minitest/minitest-5.9.1.ebuild b/dev-ruby/minitest/minitest-5.9.1.ebuild
index 57388948b9be..2f1fd845c4b1 100644
--- a/dev-ruby/minitest/minitest-5.9.1.ebuild
+++ b/dev-ruby/minitest/minitest-5.9.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/seattlerb/minitest"
 
 LICENSE="MIT"
 SLOT="5"
-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"
+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 test"
 
 each_ruby_test() {
diff --git a/dev-ruby/msgpack/Manifest b/dev-ruby/msgpack/Manifest
index c50d322f4e0e..067b971ab20f 100644
--- a/dev-ruby/msgpack/Manifest
+++ b/dev-ruby/msgpack/Manifest
@@ -3,6 +3,7 @@ DIST msgpack-1.0.3.gem 77312 SHA256 6a0de861d6ef51e9155ddac15a476358fbcc21d64be0
 DIST msgpack-1.1.0.gem 78336 SHA256 07d27ad7563ec84adf6881e2aee2942c45f8d62938401bd15a922cd34ee06732 SHA512 0142c9a446a476a7b4f9212513dd7b1fbe107193a473873f4eb6f4321d5515c42ea3540ac4de17f37f9e833f19bb75594d14b84ccf70b16d2a3840e066c873da WHIRLPOOL da057f4cb9815ac05729af36f362aa82aefdc2fbe7d14d97ec91f5745e6583aa7d8562b7c18bb4d8ca32c82118fda01ca0d32c0943e62774d6ed696f155564aa
 EBUILD msgpack-0.7.6.ebuild 1135 SHA256 6e175a875d1ce7c66f3ed5943b56fecc7348f491182861a0fa92ba9c70293bce SHA512 f0c00b42fab6d68ee37b8a8b56ac578517614fc5aaba7376d10e508926b20aa9bded94dcaecd440a56a91ef7a62dd10a3327f35aa323d03c339cd240cd65a4fb WHIRLPOOL f8e2389988bcda673bfe2e8b6252bec99bf77c053e55c7409d482499b1f77e0f4b01be68e54d6c7b08160c52c8d3936649a8c10654610510ad7ddfdc72803fc1
 EBUILD msgpack-1.0.3.ebuild 1134 SHA256 2f331b52955e0cfc24e2a23bd1497fedf7dc5b3da256dcaa6fd848f930c29c99 SHA512 70de551f55543ff788216e6193d748e7f610f8957d1ced9701dadffc79fd2964b3c6692b2e7fbb1d755b9f41669a9fd782cf3f9b1fb353d76c27dd36c2cae8a2 WHIRLPOOL 7077a4fad2fb8b35cddf62444e7573244ae9b541a2d5c8edd2e1d5bff6446682b769df5a1baad117de79444c65dd70f6ec10bc7eddae71610d05b90dc9cf32c1
+EBUILD msgpack-1.1.0-r1.ebuild 1134 SHA256 5e7f49b683fe29a57e02bed7bb2f74a86b584642d48e20b1543b75f2df9ac78f SHA512 203489b8cc169c99f692328a7952e11b49ffcb42f72f3a04a0bbccaff3d0187d632b31c2c2b8d56a7cd979ab7606ecaa2e3ee957781c3a92c1fcd1da16cd7f72 WHIRLPOOL 9986ad43813dc7c99911e78ba1eaefd10685563ff6e9eff8241981ea6bbeb35a0baab4caf304747e755b2430666eeac04c84994da66ca019eb261ae88c5c8524
 EBUILD msgpack-1.1.0.ebuild 1134 SHA256 2f331b52955e0cfc24e2a23bd1497fedf7dc5b3da256dcaa6fd848f930c29c99 SHA512 70de551f55543ff788216e6193d748e7f610f8957d1ced9701dadffc79fd2964b3c6692b2e7fbb1d755b9f41669a9fd782cf3f9b1fb353d76c27dd36c2cae8a2 WHIRLPOOL 7077a4fad2fb8b35cddf62444e7573244ae9b541a2d5c8edd2e1d5bff6446682b769df5a1baad117de79444c65dd70f6ec10bc7eddae71610d05b90dc9cf32c1
 MISC ChangeLog 5665 SHA256 4c96fa1cfaae198a727b7b0699ad655553fbdf6bc5977d9ddb41140f0713d1a6 SHA512 780cca9389cd3e3b171eb3d7e32531cb442a459507851506a2f4b5c44b8e9b78cd16324be6252ac0cada0463ab9b05440c552c038733e87aa0ed53fb43ad99ed WHIRLPOOL 16417265a18685bfc3e42b28b9298dfe0422b2c55255fb689052cc5c04a055a771d77a281b5e173237ed763aabdf6a223f233f1cae5291ab86fed5122961a8c2
 MISC ChangeLog-2015 4872 SHA256 e236c98d83b69e538e0be0ff0c6f15f4f27c64715e3b476be3ac18f1d49e8ed6 SHA512 c7773cf40c0dc7fc2b08ac6d02df4af4f7145d4faa957bc2371c432bcdd15a55e7f847aca7f83154e420741cbb9629bb336a70b685122d556b625513359f8d0d WHIRLPOOL d18431d1ab482234eca11f95db9d3eb26e166854684c3a36904d13a74140196eaa41b150d430f6a39c4050dcd5f2794990e18a17ff40e9e9e4ea3f3f8536da1f
diff --git a/dev-ruby/msgpack/msgpack-1.1.0-r1.ebuild b/dev-ruby/msgpack/msgpack-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..dd26691671f2
--- /dev/null
+++ b/dev-ruby/msgpack/msgpack-1.1.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Binary-based efficient data interchange format for ruby binding"
+HOMEPAGE="https://msgpack.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd"
+IUSE="doc"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+
+	# Remove jruby-specific specs that are run also for other rubies.
+	rm -rf spec/jruby || die
+
+	sed -i -e '/git ls-files/d' msgpack.gemspec || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/${PN} extconf.rb || die "Configuration of extension failed."
+
+	# rb_num2int is not inlined on 32 bit arches but also not explicitly
+	# defined, bug 582968
+	sed -i -e 's:-Wl,--no-undefined::' ext/${PN}/Makefile || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/${PN}
+	cp ext/${PN}/msgpack$(get_modname) lib/${PN} || die "Unable to install msgpack library."
+}
diff --git a/dev-ruby/multi_json/Manifest b/dev-ruby/multi_json/Manifest
index 9a0f783f8b1a..cf927bc87826 100644
--- a/dev-ruby/multi_json/Manifest
+++ b/dev-ruby/multi_json/Manifest
@@ -1,7 +1,7 @@
 DIST multi_json-1.12.1.tar.gz 25579 SHA256 1ec98fd529284e99cd6156509542ccd290cfdd5bce03910ceed5127bb84cbb42 SHA512 f61e500197c5a1373443b308bd9307238c54d2d23ba9da91843c667c12e491f34fd87575028c3630a81a7355d4903344996f20408bbb7971b12dfba3cc4f76df WHIRLPOOL 93152310d15ca126960814c53a24d8d1e7c6241eaabc913f88f1485451eaed70288d8c7e5b7a19260f73e2a25de17b95c46fb15c16e7758980b79a48be53b498
 DIST multi_json-1.12.2.tar.gz 25630 SHA256 1d5c51ea6ce8b4ead8c93964104e4935896452430e9209476550c57839abb3ad SHA512 bbbdd05a6dd12052aa3e09389f47212f15799310d5c265057f7ca801622d32295d1f0844b37e51f8f1fd2d48e4430234f99bc6de4b9ed149e81d9a33a831e6d9 WHIRLPOOL 6a550c7ccb3e234a12a42418048ad45c5abfc7aad1be56a13e9fea9b66c4864574e38cec69e2d184f46fdeece5cce8e1aa227dc69e9f3de6689f70cc44e22672
 DIST multi_json-1.9.3.gem 30720 SHA256 631390d4b6c3d3753a3df0c28339c8e7840704083dfdcefb1323a22ab97b2281 SHA512 7f06747e760a63b6421dfda480522924f12bd00ad63f95414f6624173b9b9b255b139f9dc33d2d2a8d19b232f99a005033e00e3a0b223be992f73d142a55b8b5 WHIRLPOOL a96f1c1e53865e153bc83079fc70b69af6c941c4995f4215317ca53567532d1406adb174683fc8c5229fdc3563f5e8d3c2c662d77cf9d9d55367aab2df5b34f0
-EBUILD multi_json-1.12.1.ebuild 1924 SHA256 96358d07fe9724dbd114e9f8e7bb51ee9fb85c6fbf9c5cfe382217922e853014 SHA512 22e16098d1d0743c4d4f4d466e14f23a1f343fe3a54cdb23af1bda6ce44a689e3ffb2dc6eaf6584dd16bbd829dd433b377f870207754c65495935ce3503d6548 WHIRLPOOL a85e5246dceb0843fcddb06f73e9a5253b84c4b5fae5eb42c427f7267903d7eaffd341376f5e814543d2a53b13037fd7dc5c0c232a6032c042505bb063b817f5
+EBUILD multi_json-1.12.1.ebuild 1922 SHA256 db143c9c7aa2080b45393d6800f158a38234aa6fcc18c4aba435427b6a5ac1d4 SHA512 1ab178c30dcc898e2a0b0490176e84204c524b720ade5afdce18017dcd2581abb170c59eb4eb0f00ad63e79080250dd66726935e759e58894eaf812a8ec3ad7f WHIRLPOOL 7aa1aa5ee25dfb92623fb90c049576e70ad4b241f8fc4520113e89a4996b602cfaa537b3f2b8c0bc50ff6da8e77608df6717142e366558743cddbcda827a096d
 EBUILD multi_json-1.12.2.ebuild 1922 SHA256 9d49315b4d7c3980bc7a7e72c0da3c10a444181bf21e0001b3c6cf8cb4217aa0 SHA512 429d8f7036473500cc478d690e28ab4baab02cce66a474f0c73e03b2362e3b9124248520bca8ce1c2c89ab46f6ca41dab196b654919f8bd43e66e76c6e04e9cc WHIRLPOOL d64d902f8dd7ef079ff81289145be853f7eee6f776d655c7d838b5903103314a68855a9553381a4bd6e3d1454c9a8547c2f9d32274bef42068c528a549378068
 EBUILD multi_json-1.9.3.ebuild 1878 SHA256 a235696f516491c3aa082fb82ff53e3784d91438353b360d602c1248dc07d10d SHA512 d82cea8ff2899461a50592acaf261603c5f5d12c44153b663387921ecd12ee34615a09b6c9b410782e012326e2bd36d7ae2dcedfc900adfcbc03ced229ffb816 WHIRLPOOL cf89a2ac618338df57f775a5f076a3e9488c045fd13ca284d61cb6b83e116ed68eff3545ee6e706b4399f31a5efefa80a6e4b87f59bc2468f83c8b126cc6b24f
 MISC ChangeLog 5287 SHA256 4434696da49b2b23606f9159a616f6c08d2b702bccc130f990af6c48af1f60fa SHA512 29e82cdd07ce0787e6d9e2745130b0bc82af4613af7d7d813c1a5e17e19e5a8f23e7968b481e83d3e61d699bd73276ee948c82f0776bc92d9de1dd1096532174 WHIRLPOOL bafa5560d535f41ae8cb8eec563b11e9bbfcc002b6b149fb01bd29f03781748c9f9fcbfc8c5905deab3d2f53b1fa394cd4e47e21d96f4841e688d5955f4b44ed
diff --git a/dev-ruby/multi_json/multi_json-1.12.1.ebuild b/dev-ruby/multi_json/multi_json-1.12.1.ebuild
index cfcd3b5a27c8..b19649ee7f66 100644
--- a/dev-ruby/multi_json/multi_json-1.12.1.ebuild
+++ b/dev-ruby/multi_json/multi_json-1.12.1.ebuild
@@ -20,7 +20,7 @@ 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 ~x86 ~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 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/neovim-ruby-client/Manifest b/dev-ruby/neovim-ruby-client/Manifest
index 69a8ef1c4f60..b09ba19b8bce 100644
--- a/dev-ruby/neovim-ruby-client/Manifest
+++ b/dev-ruby/neovim-ruby-client/Manifest
@@ -2,9 +2,11 @@ DIST neovim-0.3.0.gem 32256 SHA256 daf9851c1733a5674b0d29c07ac038436686bb75ec4bf
 DIST neovim-0.3.1.gem 34304 SHA256 1c775b26dac08e97793ce7c49a855df922f9b280a8146c1599eb778537991505 SHA512 1e786fa4cfb37f6769c2f717508eabbb4892c9c04a530036d7db481995e341040dd43648e77c7c00f183490ae21c08d4ae6f8379cd8800f967f54fd46c3b72a4 WHIRLPOOL 917ff6bfbe7af12ad43ddef9f29ecad836aad18582e6d7119d14015ac64c038e0d1b24acb02c53aefb52aaa5f1ad22eec230b4f1c7a7f263a6b2656b4e0fd3df
 DIST neovim-0.3.2.gem 35328 SHA256 118ce2bcba0954da8676757c153499c3a8547c47b48b9c442121a3403ba6fb9a SHA512 252f8bf13c190ae138074e6fc90391c22cb56b9c8679af13ba1e914a57cbc1206ec296457763d2e41955ade17d0aafc0f61b81ceb9d94f3b3d7cdfb17f7aa404 WHIRLPOOL ca04256786999fff9aa997c4aad5e04eba2d2cc32448840adbcff2eb884d2c7986efafa37872721cad65b81e97426a30e60a97895be77d657b347e3571925f6b
 DIST neovim-0.4.0.gem 37888 SHA256 22d92f343c5b8a43bc8fe208f5e2562cf0653d1516925e803951e5387f507cbf SHA512 0583c3bb108d8fdc19fe992f8879e65bec2e4cb94a985a7caa73d47cca58253eae43950671e3365b68a715362b54cafdb62b23367f893e48bdc0b32e746bd16e WHIRLPOOL e5f630626863d70f32b869fc479014531235669d20590754f4982b293fb06ba2de0316096d13c2979eb344a583c50884a9b233d73ac1459ac765a43f654654af
+DIST neovim-0.5.1.gem 47104 SHA256 973928c992c1252a11c4318a1eb48bfb5ed04787e4d6b9e122948ff0483eb623 SHA512 2c54292c426364e082e785eabd4046997db3e63e0679c29be60d58d3bec1a646afa6dd2eec764e2941d8214a62e9c9045a19ddb7df6fd6e5146f5bce091f8a79 WHIRLPOOL 1b280c875252fc8a3a4ace6cca6cadc155427f3f8e4cd9612cda1d970cfe370dff13e09ed0dfba2c09c3cc9296248c335cebcafa2203a77acf4e260289f0ac11
 EBUILD neovim-ruby-client-0.3.0.ebuild 410 SHA256 ef0112a5007f69165ade4164119dce7512725c0a429b66171c9d3e5cb54c44de SHA512 bca8aef7a586f78ac4ccd22974cc6be45aae40ef08c55f4b78a8c07ba9023e591d29532baa6bd284d29792fb23ab055c86ea38645f4e9e23b8d85971019e56d8 WHIRLPOOL ccb256bd358bdae1cfe5d8b1a074f341cbfd23ff1ca2faee75a1bd10539e136d2f7a56ad8405d1e35194ea6a611719f7beeea8a30208dd478022e98008450b02
 EBUILD neovim-ruby-client-0.3.1.ebuild 410 SHA256 ef0112a5007f69165ade4164119dce7512725c0a429b66171c9d3e5cb54c44de SHA512 bca8aef7a586f78ac4ccd22974cc6be45aae40ef08c55f4b78a8c07ba9023e591d29532baa6bd284d29792fb23ab055c86ea38645f4e9e23b8d85971019e56d8 WHIRLPOOL ccb256bd358bdae1cfe5d8b1a074f341cbfd23ff1ca2faee75a1bd10539e136d2f7a56ad8405d1e35194ea6a611719f7beeea8a30208dd478022e98008450b02
 EBUILD neovim-ruby-client-0.3.2.ebuild 410 SHA256 ab8145f1465225bafca6dc12bcae4d7ca1080896f2ae4a00d478e30d45cf004d SHA512 6a041ca29cb819ad34903d4bfcea60caccdcbe1b7bc99f22a4b036af65a91e351ed29f8e27e7a903c183caf908a5803c58a55df4c3831af7a1c20591d0586bef WHIRLPOOL fa754e78855cafda8fef7861753c8f883bfb638e815b2f6331b7289d8befd215411c1520e936183ebf01b94d56cb45b14ad676543511b8464c80be4c62548ec9
 EBUILD neovim-ruby-client-0.4.0.ebuild 410 SHA256 ab8145f1465225bafca6dc12bcae4d7ca1080896f2ae4a00d478e30d45cf004d SHA512 6a041ca29cb819ad34903d4bfcea60caccdcbe1b7bc99f22a4b036af65a91e351ed29f8e27e7a903c183caf908a5803c58a55df4c3831af7a1c20591d0586bef WHIRLPOOL fa754e78855cafda8fef7861753c8f883bfb638e815b2f6331b7289d8befd215411c1520e936183ebf01b94d56cb45b14ad676543511b8464c80be4c62548ec9
+EBUILD neovim-ruby-client-0.5.1.ebuild 410 SHA256 7f53081ee7bfbdae80415e136ba46a020cdb0a380afccef40ae6649b61299060 SHA512 e7fd000036acebaa24a723da87b52a647497e1dde57394ff047793bd82ac398a1ae0489cdf3fc39056cc73576131645adcc05eaa2d6abb4ad61f16f623469bc5 WHIRLPOOL 5f28179d7c34ddbc00a98eefe23cc27ffb699de20108adb05a666f459a388acdc7fcdb4ed000710269ef1ff364470f6735c4ea9a2dd6da7f93e117f3f43bde60
 MISC ChangeLog 563 SHA256 d40b504c34cb95c7afa864fc6491b005b28f14bd5d5a67775805c503aefd3946 SHA512 7f830cf7459eac9933d409083451416252a719eec879dc003c2e96d51aa98534fab022f682ce578be23ccf8951c803fce50a308ab981cfdd1ca63c5f706a4e26 WHIRLPOOL 9429696557b2492469b2dcb1e0af0f00f86942c1bbe7aeb87279b8aa4d8fbc61aca5b9b739d29936b7dd30b7842ca2cf70f67ac020c120ccdd665acd3b4ceeac
 MISC metadata.xml 341 SHA256 ae46e2012bd98643839838b1f90e45a9a4957aeea2d5e16bf536c59581d4ce12 SHA512 22a5dd69b6c2721c1e70106904f9a8184c593f166053b04abe2ac1c2619c624e5372e0a641214eb1c5ec8f961e3ca8a56eb51229d1ad1c127c9d9e645accba79 WHIRLPOOL 3fadd33a7fce0eabd9aafc15f3b0277a618e5dc4bb5236251d60890445a76ecae46109b9a02b9736c4dc26e7fb2ced4a3305ee8d2136f7ac968fc0109f349271
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
new file mode 100644
index 000000000000..4c073d898d1b
--- /dev/null
+++ b/dev-ruby/neovim-ruby-client/neovim-ruby-client-0.5.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 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"
+
+ruby_add_rdepend ">=dev-ruby/msgpack-1.0.0"
diff --git a/dev-ruby/open4/Manifest b/dev-ruby/open4/Manifest
index df0600497856..21ad2d71405d 100644
--- a/dev-ruby/open4/Manifest
+++ b/dev-ruby/open4/Manifest
@@ -1,5 +1,5 @@
 DIST open4-1.3.4.gem 18944 SHA256 a1df037310624ecc1ea1d81264b11c83e96d0c3c1c6043108d37d396dcd0f4b1 SHA512 838a18efcd093d55d9589ff9d5c11054618abef863224c2d9b31445dc735218c2f96d954040e2d3f8d5aab0140e54b627fcc4a1b01c17e59267402a2abdd8efb WHIRLPOOL 74d55311ecc0c973059cf7058d72a4b0d4c7e664bf9bfe0f825dbe7dac85f66272449ab18668089837a397c6162e10aa697feb605177d69b06fd75d281ea8a18
-EBUILD open4-1.3.4.ebuild 670 SHA256 fdce40878ac811aa27f77a3bddb328d08edc06c41e690b7a390b0eca345c8627 SHA512 390ba3f5a7e4dadcdeb98a63025eb96c9b967c54a74196c576cd376bfc7dab463812d157515ef8d2a0fbdbd7b99bf230fc95ee1f786629edf95bf39ea764dbb0 WHIRLPOOL 4a9653c7aa155761518fac6d86a0892f92942a90bcd1eb705736cd9f2bbcc56c670086b3af39b08a9ab1a66583692f5bc6f53abb623fa3bf699ab875db211bf9
+EBUILD open4-1.3.4.ebuild 675 SHA256 56ed695ed92d1db5bcf9c11e15848114b403b7ef19c139082f03856f9ce4582b SHA512 15e8a9f13fd71b4237fe8c4a6ce651c3f550520502cc358bc8879ca53eb5894d55c437553008631c024bc172d19687a48cf20eceef151e4123eb3c9d98db4098 WHIRLPOOL 3f723dfbbea290e11d224ba377e0b51667b20d0431284a06bea82e8e56be3a0b593eeff71c4ca0512f2ded934f142dafd2d27055ee3a40ff09e33058a36b3e21
 MISC ChangeLog 3622 SHA256 9c7d66a86d15bb07f07eeafa9d2819bb51728bcf9e7bc61c52941ad73b9edff8 SHA512 cbc6f7471d656211d139f173e71ea25c59a01ed0b10bf75d4094c819ec452692f363cf64416da4ad5910cf37c2477bbe2fab063a487cf3284db1f077acd59527 WHIRLPOOL 68c73e3e0ee64d66e2057bd52b0da773d785fc0aadb46adcd3584731adc5fd2cec73893598df43b4dedb48eff51db2e5b273d5cd2ab07f42d6049ed44d21b6ac
 MISC ChangeLog-2015 2548 SHA256 8cd47aed18772e2403382c7cdc1fd3b70aab541b9380c2a1a4c38a4b88139c0b SHA512 b9e71521bb5556eb86c46b4093b7847e01660c1e1c437d37c5883088d30e8bf0edd47bd221ec0f13b6f3c070747064acf4da568e8ebadfef85a4a2761072195e WHIRLPOOL 52cd3b56271e3eb914029bf78ac82e626136273f65e1e7e2ce0d486b831c0fdfa3ef46fa8a99666882607884d1efd78a16b517012983caec0c29623dd08aebe6
 MISC metadata.xml 339 SHA256 55187ae53bba86955b41623975ede300d5202b5fb10eb4f3793d15bfb5c1bca2 SHA512 1a79e7584a1a8a3ca0df51e0b3f0631eb6a61f1aa529b464a15dc94abcd7de2385ce68f50db14b5041fcbec5b5d86d50d9584c524c43c89b3648f35caa23f1e1 WHIRLPOOL e5b5d3a9e0bd3398aee9ae6f7ada65ab5f31e2e68e44a89955cbd6929a62947629ea459319223287bf29adf9943ece940691f9124e8fc81c1c81e8c711bc83cb
diff --git a/dev-ruby/open4/open4-1.3.4.ebuild b/dev-ruby/open4/open4-1.3.4.ebuild
index dbfd9d59df52..304ad1d76f13 100644
--- a/dev-ruby/open4/open4-1.3.4.ebuild
+++ b/dev-ruby/open4/open4-1.3.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/ahoward/open4"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/pkg-config/Manifest b/dev-ruby/pkg-config/Manifest
index 8606317e795e..ab3135dbb419 100644
--- a/dev-ruby/pkg-config/Manifest
+++ b/dev-ruby/pkg-config/Manifest
@@ -2,10 +2,12 @@ DIST pkg-config-1.1.7.gem 19456 SHA256 1f3cd171432f4634805ebf7cd187d1d728d732bfe
 DIST pkg-config-1.2.3.gem 19968 SHA256 bc193fda2ceb83cd0eeca87e1c9eba8e142dcd785699205246e28b1a7f14a84a SHA512 1e0ec12cdb9647d9d5b29c48940f15dcf27e346a18b9f33922a5b8e0a57957206981cf5c7dd70da36fdb2a32bbe8e3ac38737f66abc5f5afa8b4dabf52a696fd WHIRLPOOL 7a2220cbdfddc3b93ca7f47ae4c9cd026ca6088a3dd5ee3c16bb2fd09644465d18e0def8d2e3d00e92f7f9f83aecfbfaf424c25047a2b71cedc2bc23b288a320
 DIST pkg-config-1.2.4.gem 19968 SHA256 cf3f95210991dd3e4c54b5e41ac7b7dfaeddb5a0564e437b63a7516c01e75802 SHA512 74abccc5b067d4b98bc1aa20eaf990f1e31f8ab9251f8081440dd2b11e9d14ffe82ccff92d0858386e11fe3ff4f8927da7ca17d382946e4b0c3dbd7a45ffae24 WHIRLPOOL afe3a26ec7579ccee57b5c1ed39505b90232bafee34d5456828f9b2c9a353c7ec85cca535a20c9f247658f612ff3aa7bc222ae7be1c23ef5bd7f997901cea2bc
 DIST pkg-config-1.2.7.gem 20480 SHA256 fc8ab6f3200cddfeacb8a29168daa38d8f76c0e09af91a00a3d423bc472d70af SHA512 88a0d0c616e4c00dcdc25980c532476eb9c9ff17e9f8a015c414cf2f536c558bc10656e2a56dbe01f34c016e86fc92959f2231a07e03b541c32c79ab36423760 WHIRLPOOL 9a93af606ba0fe167b2dabd8e0cff8b055412146175ddfbb28a20de44da222c7603a1178f8bbc617f8495f5f8d9341925222c2b3d6b037972b3e267f94420cfe
+DIST pkg-config-1.2.8.gem 20480 SHA256 9aff7ab9d6aea2218dba94791a1b3ba6f149fa57dc9c81634e54f0c59959d814 SHA512 d83a599a48c7d404946054c6846b6cfd9fce2a264c288519a6eccd9787f05d45397dd46300bf97c80700921456318154ea6d44ba32cd159803471073c2a2b065 WHIRLPOOL c924956bd3a8acc9d24d877e6803be0d8ae73a0dc578f5c1089c98c9bbe7ffa290329c5870ba5b2afc0f37b92a30feef2d4758ac3e3d8ac92f5eb5aa4ea80190
 EBUILD pkg-config-1.1.7.ebuild 815 SHA256 6ab03dc6b6f2b96bfee9cf4e647b76d5fc71ff3a15c06b32cea0b92cfab72c2f SHA512 f5574a0724a162fb834e5bc0cf0056eaf74f463f0b99b775ac966ec1b47d4965e0905b08078ee2f6915133bd862c27293992021417d20198c130e49e7c84f2ea WHIRLPOOL 36855f54883871721681eb71b7fc59ca32eab29b5e7047614bc44d16cf113589af6b97acc21f6221effa42d04312023d34364d90017de9c31006a2c2bd1dc4c5
 EBUILD pkg-config-1.2.3.ebuild 824 SHA256 1ef4a34b947ea6d54df617b3ebd85c21f2c1529c6a2d3291b6a5d0d32a1f85ac SHA512 e33cbcf684fe1b3b913d1048c1d2b94d6412f5e8af28d2646e28603ef18eb0cbc1391d39c5c80f150eda0df76dee1339a8de2c4d7050a2bb2a1ff302a88a7fb2 WHIRLPOOL 50fbc6930f0bd474783615c55a9f72ab69487f99559778ff97e46eccd53fea741f382e958d1836e44dc127a3b25bef5807c6e535833763d99ef2083125ab95aa
 EBUILD pkg-config-1.2.4.ebuild 824 SHA256 1ef4a34b947ea6d54df617b3ebd85c21f2c1529c6a2d3291b6a5d0d32a1f85ac SHA512 e33cbcf684fe1b3b913d1048c1d2b94d6412f5e8af28d2646e28603ef18eb0cbc1391d39c5c80f150eda0df76dee1339a8de2c4d7050a2bb2a1ff302a88a7fb2 WHIRLPOOL 50fbc6930f0bd474783615c55a9f72ab69487f99559778ff97e46eccd53fea741f382e958d1836e44dc127a3b25bef5807c6e535833763d99ef2083125ab95aa
 EBUILD pkg-config-1.2.7.ebuild 824 SHA256 1ef4a34b947ea6d54df617b3ebd85c21f2c1529c6a2d3291b6a5d0d32a1f85ac SHA512 e33cbcf684fe1b3b913d1048c1d2b94d6412f5e8af28d2646e28603ef18eb0cbc1391d39c5c80f150eda0df76dee1339a8de2c4d7050a2bb2a1ff302a88a7fb2 WHIRLPOOL 50fbc6930f0bd474783615c55a9f72ab69487f99559778ff97e46eccd53fea741f382e958d1836e44dc127a3b25bef5807c6e535833763d99ef2083125ab95aa
+EBUILD pkg-config-1.2.8.ebuild 817 SHA256 b4d6767d73a4ba9fac532181ce8e5e541e00c63c062bca3b06626126ad189c21 SHA512 7358efdf6993598976aaef00b3292b6ee6904b72e05281f2d5ed0aa5aa0c49be84ab7eb3fde3c481eaf77c20b778b210159ccefba3c6581c6f2b32dc348713e1 WHIRLPOOL 559e812c90e3ba721918722f01d44be0356e80946eca77bd97ea8827e61f530a222da7f55efa2c7a5014331c5daa289304f0778f5cc3b03171f365a73420035f
 MISC ChangeLog 4979 SHA256 2bab922519c2a06860451032a4f205bd20698b28f09660bb8ff47b6e482f05f4 SHA512 d5972cc00c31393314c1da56dd1465bcdbd8d1a1aedd4afae9d632373a4a72c4614d1a27fc846b11a8ffff6056dff1429f96937ac0daab985a20c01b8b16424d WHIRLPOOL 6980dd89a3569c13f9c79ce00bceb1d04a9b1f1a7c9111f2384d30d130ba38af8f839c6aa30ed9f696d9489900518a85e78619282f6d575367a7863b1f210038
 MISC ChangeLog-2015 4485 SHA256 5c3d85e88570eb0f4209d41715663cd79ca0d2b9a006179e38a00b6a88b8065d SHA512 8dadfe4a3928e3f75ce0ade76de800de3702af688f62210455dc47aa9faa27a091d601edc6337767fd1bfdf038d39787c31c87f1582c0bca843b7172aa44e7fd WHIRLPOOL cec832b1d36be4347fb84b1d0c454f43e940403abf08bfd65fb199a6ed7f05af749312189d449a820e2941e94f4836229dc5781eda294574bd1cc1091b88cb25
 MISC metadata.xml 424 SHA256 5ccf2a18ffee148cf724c420e484bfe11b555d0968192ee94b02e3b99e914bce SHA512 40e700a309e3678157d9da4ef18e8f0178e23aa192949ac06acd6f8026d0d53d4f79c199aaf59e0e27dba17925f44a97ad901e0774c6b70583b24b09254eb8d5 WHIRLPOOL 2986528963711732d2c0ea49b7a01506d8a1fc5411a08c7aa8fd84c6283a04f5879ee1143ec4e2560bd207441c5267e6cf8966ac9b589a8d8bbfd786628f87c9
diff --git a/dev-ruby/pkg-config/pkg-config-1.2.8.ebuild b/dev-ruby/pkg-config/pkg-config-1.2.8.ebuild
new file mode 100644
index 000000000000..18f63ebf02e9
--- /dev/null
+++ b/dev-ruby/pkg-config/pkg-config-1.2.8.ebuild
@@ -0,0 +1,33 @@
+# 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_EXTRADOC="README.rdoc NEWS"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A pkg-config implementation by Ruby"
+HOMEPAGE="https://github.com/rcairo/pkg-config"
+LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+# this is used for testing
+DEPEND+=" test? ( x11-libs/cairo )"
+
+all_ruby_prepare() {
+	# drop failing tests
+	sed -i -e "/test_cflags/,/end/d"\
+		-e "/test_cflags_only_I/,/end/d" test/test_pkg_config.rb || die
+}
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib test/test_${PN/-/_}.rb || die
+}
diff --git a/dev-ruby/power_assert/Manifest b/dev-ruby/power_assert/Manifest
index 6d1bea264cb2..3d3c0285eaa6 100644
--- a/dev-ruby/power_assert/Manifest
+++ b/dev-ruby/power_assert/Manifest
@@ -3,11 +3,13 @@ DIST power_assert-0.4.1.gem 14848 SHA256 8d2bf80d28a9f8bc4c6c7eb162780971896d0a2
 DIST power_assert-1.0.1.tar.gz 15376 SHA256 58681a9b3166b9f7d2ee41554a3d5363b5a6f64f5262f703fce5285c4ebd58c7 SHA512 69370f69e7289c36a8d16a433e3629d25aa99049eec9b737af56d56c07ed5c4e72692c9fdc544cc76e7008babb2c7fd68c796e27e300268cd75b12cabe1d7403 WHIRLPOOL 0a2be78ba7d5eeef66995d3c32b3b99ce91b624cbee55e0cb78b3272816d9d3faa21cc36e597d541666e496381e663d458b497a8e2aab0ded8526a03aaf27aad
 DIST power_assert-1.0.2.tar.gz 15381 SHA256 f2fb8a6830617659263c57b7a5c742611c83360b93d5282d355678c407fc1711 SHA512 31e1f0eb0b873b3ce05c72cd467e1928d53b028e1ec30314bd027d7402b5834442ff268d0263100d657cb485e67c64fae93996d08ba74d603b924c4526a7022f WHIRLPOOL 2ea494fb3be7620ff504299028acfdf05693198d0f97258886fc403ddd2471a4cdb2a57a1a98ba01cf518465036a5a46d1ac29f10f0de1238f5f0a9ec5102e69
 DIST power_assert-1.1.0.tar.gz 16184 SHA256 56c8a1f7588ebf00ca0fa1ead298d5f8e44743c1bead4abb3390414cf3bce3ac SHA512 271de1c87adb2a1e427329cba4f3e7ab15d17bde9afe4725de7b50f895fb4fd5b89bdd08694c84e1eac1183abbd53ffc56ad55216e0cd7841378e48393c885b0 WHIRLPOOL 835e11280251a5d51576fb88b6bc1d168ed1403c57dee8aebd657187616630187e1a60554d15ac4e7496a8e24ea5f3c8addecdbb20968cc11a78a31702dcc235
+DIST power_assert-1.1.1.tar.gz 16799 SHA256 6d31e3a1aa5aa358cafc108fbb5d3b18b633f6a71727c99709ebb701204e9dd4 SHA512 a33429bf918c71a5b75e56940d46dfd05ed3c87f909d6f09ebf2d8b2cd43a3c5c37b5ac13c334383f1b3f52817ecd4ccf68cd649c53bebdfbc464a18c88b702c WHIRLPOOL 0fd5121ca6d538fbb30f6bc177b448af53924b56bbd9f06e657136a54ac5addad82a6e028370ffdc8fa776f01949768a8dbab2b228d73bb3bf6bfbd249467dd0
 EBUILD power_assert-0.3.1.ebuild 793 SHA256 60b217555ecd2a23d5b68decd13b5206fbf711ee81c96bc73c91849ef9b84ba6 SHA512 6ea74f0fd4a955a5082a2445202c837633a9f530d7fe0ca571ab0bf1c52897cb4f13a49bb167197bce85fe6a810e7b1d467cefa122aa6fb470dd0c98386fe454 WHIRLPOOL 2bce51e4385458d160733f662b7355fa0fd4439992e217ca7da7e65bf16ea02c30d8ed0850838719ef5835bd7f67351d8dea6d1d4edd3d89527545ec551ffec3
 EBUILD power_assert-0.4.1.ebuild 808 SHA256 34cf6080cbc0a831001abc674767ad175eba44e3eb0a45c2bb1cbe14e35fd521 SHA512 bd5324d32bd8e296a7bd64856d615ae744ac983de3d99c0d97e81945894a052e466da11aed23d0495af89a4704da744dab89653ecaa60cff43ee548db165a9b1 WHIRLPOOL e1d0e8cb024770cb0d4c4cba1d1e2c9d7e22cad3e21d78dc22915ec966940dbf73c6fb629c05cf755ea0a96bf9bc85ed18074cea36bf19fbcfa2fecd3c532b38
 EBUILD power_assert-1.0.1-r1.ebuild 1338 SHA256 ce8cc8ecb059f8f358c2656aec9703bc89a92bc54939cd439a1e57ad51872528 SHA512 3d16f1eb1d5289b2eaa6e00618f02f237ea263e24b26546a9c288d31c297e3237fba68dd907a5f00eced3ece8fef9f9044240b44bf2114d6204056b2945983a8 WHIRLPOOL 1bfc5c0f24aa4908ae84f5cba346f6b1a1864ce88a78ead3d7f6bd2debdce255b9180fcd78cd1b3427d584df606a9c88f2d23cf5ce4b5e231e23196a0fb8e696
 EBUILD power_assert-1.0.2.ebuild 1338 SHA256 58cc347d642456ab091556333e8b20e7cd23204fe1a9bafd99b8032d76277935 SHA512 d51eaa7a24fb5af4067cd8b6f32c0e08cef4b48a2c9f9bc3fac677e86e89b16e37f42c3f6fcd397a89f7c78a9fa33006b2511aa00e8b71a3d7a9d1e7b5d9473a WHIRLPOOL b4879642ee718753a2c5190afcf12933aa4af89d5b3af158cf19c2d8a21a37d1e2be5a69b2d0c068ee85471823f8e506abf9971eb89762abe28971da74f50939
 EBUILD power_assert-1.1.0.ebuild 1338 SHA256 58cc347d642456ab091556333e8b20e7cd23204fe1a9bafd99b8032d76277935 SHA512 d51eaa7a24fb5af4067cd8b6f32c0e08cef4b48a2c9f9bc3fac677e86e89b16e37f42c3f6fcd397a89f7c78a9fa33006b2511aa00e8b71a3d7a9d1e7b5d9473a WHIRLPOOL b4879642ee718753a2c5190afcf12933aa4af89d5b3af158cf19c2d8a21a37d1e2be5a69b2d0c068ee85471823f8e506abf9971eb89762abe28971da74f50939
+EBUILD power_assert-1.1.1.ebuild 1331 SHA256 62cf4156e8344ed539d4a71e6c633481f39c68e245761266ea4d7d8bfef98271 SHA512 cf946d49002745231c988729fc704538aed8aca9742b2bf1292586785dfea030d27c1139edd7654a6f318b90715cba10b4c041e9b8655b01b8d89032035d252c WHIRLPOOL 997bb2c1890f275bfce6986ffcbf7f7aedd2b3cb66786d7c68dbd4e598bac48b7900bb7e93678d8637f4c69956a4432c309036f27192497a2db04b39e729ea8f
 MISC ChangeLog 4486 SHA256 4716bcbcbaf444f01864e1d926a7b7a8fa1d0fed1c711052eb73dd4f4cd8310d SHA512 3f67efd7acff0e1d2f6730cbd987fce8334962abd6733fbd147dba5832288ed8c7f50e177ad93f78d41c77e5b809ec981cb4f16213b560d3d0047720becc0849 WHIRLPOOL 0562a59c97dc3706e4b9d71d97b76cfc73110d9bbcaec919685a09b3e46ea4ec16db2c773a422c4f84e88005b923f8a0cd50eb2acaea9798ac35aea188f52ba9
 MISC ChangeLog-2015 1149 SHA256 d542747db9516024168a6121603f877193c651663b4af3366971b498f5934048 SHA512 ea04ed36d42aa3be40bddc54b6ee55456974f999e68299c5fee191895c62d8f6f12860ccf0dc13b91fe92de6c812688fc44872f8bf22468f34f97ef90cb9ae7c WHIRLPOOL e8590d5b9f3bed7c8da319216b19c00b76bb6fde2ca67ae1a05c38af29aaeff864a404df47b78f0874ba1d1aba46f906c7e9c9a885d5f6f6967c7cd1093f91bc
 MISC metadata.xml 344 SHA256 26010cf147a4641825a7cf102152446a7f18017af1c19b662bec225fabd80e24 SHA512 87e232c55b49880144aa509aaa79413864b3f575df07a559a9f1aa60909d4d8e01d1ce2e86542c847533eda2f233542deb36b1103b56d7c512f2385a6c8eb2fc WHIRLPOOL e76e052327d6482d73d78c40227e4cc18b002ea02630c550710f1451ac044a24eec6a7f214be89fbb83df2eea063a9a97e66bf33b94928880412122b3cf1d378
diff --git a/dev-ruby/power_assert/power_assert-1.1.1.ebuild b/dev-ruby/power_assert/power_assert-1.1.1.ebuild
new file mode 100644
index 000000000000..06310326830a
--- /dev/null
+++ b/dev-ruby/power_assert/power_assert-1.1.1.ebuild
@@ -0,0 +1,37 @@
+# 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_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Shows each value of variables and method calls in the expression"
+HOMEPAGE="https://github.com/k-tsj/power_assert"
+SRC_URI="https://github.com/k-tsj/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="|| ( Ruby BSD-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"
+
+SLOT="0"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile test/test_helper.rb || die
+	sed -i -e '1igem "test-unit"' \
+		-e '/byebug/ s:^:#:' test/test_helper.rb || die
+
+	# Avoid circular dependency on byebug when bootstrapping ruby
+	sed -i -e '/byebug/ s:^:#:' -e '/test_core_ext_helper/ s:^:#:' test/test_helper.rb || die
+	rm test/test_core_ext_helper.rb test/trace_test.rb || die
+
+	# Avoid circular dependency on pry when bootstrapping ruby
+	sed -i -e '/pry/ s:^:#:' -e '/test_colorized_pp/,/^    end/ s:^:#:' test/block_test.rb || die
+}
diff --git a/dev-ruby/pry/Manifest b/dev-ruby/pry/Manifest
index a42f2f4ccca9..4c8c0c85564a 100644
--- a/dev-ruby/pry/Manifest
+++ b/dev-ruby/pry/Manifest
@@ -5,7 +5,7 @@ DIST pry-0.11.2.tar.gz 223514 SHA256 9db18a35678facc73f6d2c6e2bad33086ba3302fdc9
 EBUILD pry-0.10.4.ebuild 1363 SHA256 4c2e43266c54c21c6f900b2a0e2392871df583216b55b8d5141018c02a21962a SHA512 4122a07f1681995d3d4eda19c2cf2b28e4b5fb29ebce58ef3ac4cb18894a4820d4ece28f842af409950bfe5255bd49c4b3dc8e89a7bab4162925c82ae6043c17 WHIRLPOOL e451f2eaff6c0f5b58daf41157c733a941cc3556cf9bdeef7c36d0c27d016f2a883485e3e8cc4e4ed332bfc6d1923059472fe38efbef459cf3720bbe5289381d
 EBUILD pry-0.11.0.ebuild 1171 SHA256 09c84efc29f8d24392d90bce20c0d026f92dcb406b5ce7cd7a1d8ed25aa38945 SHA512 72ae4a3d8c5802238142199e5d3b01f57f1a12df239afaa55f2908708d7417462653cd48cc12c644c1919f1a9fd64a6b489579a7eed4355a61b13dd19a293fe5 WHIRLPOOL 6472ed5765987ee3d4dba4e87ead549c5d2279d369d821595f4584fa30ff3127935b029920cb574d47aaac5385590ea56b21e225a0aa36d614b46d777a2c7871
 EBUILD pry-0.11.1.ebuild 1171 SHA256 2f2398468dbe332c2e7429ac9d71a3aa0e4179debb69edf9d64ae4707bf4320e SHA512 28ae5671055c3b91aab90d363576966ce1f5fb78fda5a54a9f24f97aa4fbec0aca24e815a03b071a267c6c3e7eeae9a08c315a62194aa2eb2122bfa77bcd58f5 WHIRLPOOL 9018e9ecc38c9d4f7216fcf75ae16e838178eed6c2f17d3490457de62e0c2fc0c48d8cf580ddb2693f415491c0e8c61e4827694c0fa7ff4a3c537817577f15e7
-EBUILD pry-0.11.2.ebuild 1171 SHA256 2f2398468dbe332c2e7429ac9d71a3aa0e4179debb69edf9d64ae4707bf4320e SHA512 28ae5671055c3b91aab90d363576966ce1f5fb78fda5a54a9f24f97aa4fbec0aca24e815a03b071a267c6c3e7eeae9a08c315a62194aa2eb2122bfa77bcd58f5 WHIRLPOOL 9018e9ecc38c9d4f7216fcf75ae16e838178eed6c2f17d3490457de62e0c2fc0c48d8cf580ddb2693f415491c0e8c61e4827694c0fa7ff4a3c537817577f15e7
+EBUILD pry-0.11.2.ebuild 1176 SHA256 4573a7f88f5619a50683734d3cfb491c6cb5c44bc14b1d14bf1c2bf6c5d8f473 SHA512 b1f6dd8c59d6fbafcd146109fdb05ac9445c894824ac6030f9f25ffb560bb43ce435aff222b42156345687f14519fad185c71de61bac1d5c906dfd8817aadd1d WHIRLPOOL 55cbbca0ce44412167280350a62cee160047e897b088053d311a4d411c6ebf459a4499ec6e55ae37dc7b1b44bdd276fda9ea0572fb9efc3615f947089622f2ce
 MISC ChangeLog 3922 SHA256 8aad379830f8e3144ed9f3c810bb0ee23ec7cc7027d9d503b5238e89e4484ef1 SHA512 04c0ef166e7d806eace28cbeee14fe0ef383cdf29c1a9ae1c4fe21c681c1d0c7ba116d8d22f6f806ed6e2f8b4eee95d2c2775230f2465aaa03f2a74552ea49dc WHIRLPOOL 7c25e64328e7bf859a71cb959d7bf6151995d1ce01bb75fbc111f7c2d69979c117db1df2b9c3a478beae4952fe353597f04b004295823ff75433ec2f3e5f0ae3
 MISC ChangeLog-2015 3249 SHA256 1dbac7261131bdfd22a3b7de54ae392e299c97f45cdf5d1a3c1198983d9be947 SHA512 1665716cccf43777f5a4c5ce52b42c8750e7d35f3fd83acc6344945b73e3da1f8277ec07311b84111d8292556370c40e45e718a14089105fc37e5a1cb522b94a WHIRLPOOL f76fc6c1dba5dad99b228af2d87116426aaf169f0d0c203a3142c8c81dafd5b9cd36123156281eed30d58586719a6e7b3293e274308da413c723006efa63562d
 MISC metadata.xml 333 SHA256 0b0ad482624ed87aa9a5ba4d4482961a69499006af5f6eb13d30318541f1b2a2 SHA512 4bd968aba7e36044799dfb4abba1a0127c4aa4ccb4e7d1830dafbf27c6c9e94fcc29ad008dc527cf2c409c8308dee14f803946afbf716bc22d9d3f716b951887 WHIRLPOOL 4bde23a2aea17380b4aec77abbbb6812e864425c51b8f26740229c93230baef7378cb038c7df3e3616000a0ca4a9d31e8a2b45f7ae5de32279297a6d2f2313b0
diff --git a/dev-ruby/pry/pry-0.11.2.ebuild b/dev-ruby/pry/pry-0.11.2.ebuild
index f085f07e6e77..a60683982ec5 100644
--- a/dev-ruby/pry/pry-0.11.2.ebuild
+++ b/dev-ruby/pry/pry-0.11.2.ebuild
@@ -19,7 +19,7 @@ IUSE=""
 SLOT="ruby19"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 
 ruby_add_rdepend "
 	>=dev-ruby/coderay-1.1.0 =dev-ruby/coderay-1.1*
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index 1f29529d106d..e1926b6cfbfe 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -9,7 +9,7 @@ DIST rack-2.0.3.gem 254464 SHA256 8c1c9bbafd74f11c78a29bd87c72a70e7b5b872712d176
 EBUILD rack-1.4.7.ebuild 1557 SHA256 1c6142e7f6c286b04662771c88b91ba42dbe1b73d2561cc048e185ed1930150a SHA512 b239eb29871e63a8833c59f38d32703ca11463040f2606dadacf43b382b52cb706b0e1e9e223ed1c956d28470c51b8b038492304c657214e7fb8c7b45b61bf74 WHIRLPOOL 40017c0d06fcae3f968775bf50552f16524e0415f16373e0568e2c0877bb25e01fa86ccae4493eb4365056dc7bb2119c4a27adceb348fcba6f23555d533351f8
 EBUILD rack-1.5.5.ebuild 1390 SHA256 f11e2e00e69a4c576c77fc92151cbed9f296ffd8946aedb3ac6c46e016195f54 SHA512 e71a13d85c2bd8513a14fc805ed3ae4795be5de773e9cf9982e7ba3309695f97b221de9a84856ee9e2465c28de88509a1a48e0af5d33b209a0341ad5fcc62ca1 WHIRLPOOL b27f82c222d0f371bc27eaa4659383d14fe372159e237f106b9be659112f72bddfac34cfdec51a2f97b9c7ee48d0624ca083ee09172b294212616939d95983a3
 EBUILD rack-1.6.4.ebuild 1578 SHA256 d7edda7472ac958ad6491ac62c00cdddcf13b20d191f265b4344c11cf13001bd SHA512 f7daa34fa1b88935c1bc0c9643f25de06ebb2bd8eec906da6ea7a5b9728b4ff7df4f615b16aa356b67b6de7733cce3d5f10cb2ae7a385ec3ba6612c109bf8c3b WHIRLPOOL a005f366e527e691a48049475b88d3574c4f37963fa3fa2a25da89bf0fe82718dcd142043c466b6c2fbc0e73421016beee21036dd129883df448d1ac4e3b8d64
-EBUILD rack-1.6.7.ebuild 1656 SHA256 c8f083121e446c698db1a90d3d5107dc75b61ae03a941daf7560c583bf580292 SHA512 759189df22a8579a9f4699a6b5792e887ad6f99d4f91a8276f2cd8428dc2d8685ec9a84ec9b8fd1ffa27f9b59ba49e9007d52dcbbfe9d5bf36fd2f498e454b59 WHIRLPOOL 6e1738333e88d2f616423d381b4583de2c713287a6a86e9c61de095b49bdb1d077de3b5f53089d6d704113465aeb38a2ca4aba0e0805fcaa7ac3e43961f3810b
+EBUILD rack-1.6.7.ebuild 1653 SHA256 a9ae40d6b3b44a95a0d61dce2f239d76b06cb95ef89b73186908f6c16f23d647 SHA512 a5e3bbe43b8fb344bed77a75934a7de340d6119db62dd9f013ea88152508ede463d3463bae050c1faefc6f66b013c16538df7c611c1c45a2c04e13b537985ca5 WHIRLPOOL c31e4d7d9375d61c84c94d022a275a90783c78686569c474cdcdf8243183a7168fc280953c63393b344c8173c1b3e36600d0a77198e7fb71dfa8ccad5dbff96d
 EBUILD rack-2.0.3.ebuild 1502 SHA256 f274c18df17a0b8bbe1624005fef7a036e6c1b5c0ad7411f5d1d3bf8c774c58a SHA512 94f99de7510687caf3905d1ec27a357065cbb409e64ff03898c271ce0f3534508554fe5e0b3c06f5b9fe27012d6dfb8ba196ebfe81dc27fe005efd87728dbbee WHIRLPOOL e1612e7788ab86dfe4473518d319a2cfbdabc984a215ea5e48030aca1fc85bca11e02c9748bfbd62f5410919c659482a91ec5dddeabfca3d1d5c56f7d37c4ed5
 MISC ChangeLog 7935 SHA256 b5ba506e2ce2bd734a32d74ccc5672a0d346931e9518939f6e54ba5be0bbc904 SHA512 7af0866e82e41b4a9d8cced47e40c0b532192718c5507ea929755b0b9b63a98600a6c87199f66fcc1d408f68fc721ca317dc4d1dd6befaf4b553f3c18f321b8d WHIRLPOOL f0dc123fd346d58dcc165090e50bf8d55eb289ba238316649d7896de5d0a148b2f5caf53dc38ffe86e4d8f539b588662881a2a1f3c31c57a85963fe4f41a16c8
 MISC ChangeLog-2015 22215 SHA256 721b2dc9276c1d1150e680c0bdb32ee3d683554d5b8f4ea7b27ef693d834597f SHA512 f2df4c5ffe2847da8f02b444b41df0be07805d04cf719a3d442b8d74f39de148b68fa431ce800c3e0bd998200853fb1e3f3628a42e908ce51b5443e797555e78 WHIRLPOOL 28bfac28854575fe8fd5dd8b4aa8d3e4d80c7da07141301813ed85fd18aff862fef41a11df73fb95e9bf31de99522d377015726b1cdb621c4e99cedfb0b82594
diff --git a/dev-ruby/rack/rack-1.6.7.ebuild b/dev-ruby/rack/rack-1.6.7.ebuild
index e048f7408395..dc158b66503a 100644
--- a/dev-ruby/rack/rack-1.6.7.ebuild
+++ b/dev-ruby/rack/rack-1.6.7.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://rack.github.com/"
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-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"
+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"
 IUSE=""
 
 RUBY_PATCHES=( ${PN}-1.2.1-gentoo.patch ${PN}-1.6-rewindable-ruby23.patch )
diff --git a/dev-ruby/rainbow/Manifest b/dev-ruby/rainbow/Manifest
index 7ae2f0b84d22..2c671a60ccff 100644
--- a/dev-ruby/rainbow/Manifest
+++ b/dev-ruby/rainbow/Manifest
@@ -3,7 +3,7 @@ DIST rainbow-git-2.0.0.tgz 10480 SHA256 d3b2bc51449429669e91c5edea05f973cc0568cf
 DIST rainbow-git-2.2.2.tgz 14295 SHA256 6e5c6e852cd62b6975a9594d0a0a03f9f9cc997f308a12f38f040698e6e1b9f7 SHA512 fac9a8cc39f23a1b268f3a01d755a5ccb79f8ee11a28228d958a5b77472c5b3fbaac748c917f7d4afebb911cbef0e0242c5224c8df29672073c1f54bf44c9307 WHIRLPOOL 750642e8d95f4629954d5a7a7ca2251a4b3429a6b1f71eb05a240f4f95470f98d9673db21c0a5b5c7c8e103e5926789677e602b7aa4ea8a5bdad6fe8d4017481
 EBUILD rainbow-1.1.4-r1.ebuild 569 SHA256 1048fdd062b20bb7111e6fef28d5a71e37450b1ad1ef96f4ec0ef9f49c9679f2 SHA512 a51516649b6ca94f881e87eafc899bfd45a03cad1821ded93985636fac645cac9fd1d3e0a10513c185fbfbc66fd1bff8688d2c913611eee84b68e41f7b5dcba9 WHIRLPOOL 1b962a9cf9eea02433d2f69bed67a8c00034177d6e61d86a31ef08fbfab48acf420accb1197df27a00cec1bd63eea9833619e2680457e32d17c1847a136e885a
 EBUILD rainbow-2.0.0-r1.ebuild 575 SHA256 6ac942e37dc81d12248ed191dd848f3acb8b9a7183969d1756277a05d637d99c SHA512 af3d38179f214ff0f06c2834d1612cd2da381ad56eaa91f11f8c247cb145f1dd0ba53d2d008bd0f0473d0bee8f5284123f210a51ce4efa4911a2ec9e3a9df8c9 WHIRLPOOL d10dc3fedb95e08f98f2baa72f2c18ae89d3ccd0c0b136f5ad40e721d15da98737c027fe01b3c78275dd1d2643da6f0db930a9348a95604f0bebed56208d6b3c
-EBUILD rainbow-2.2.2.ebuild 585 SHA256 0b984db1960f75b3fbf953cdc35d240fa13f7bee3e396ae3b6b9869eed4b8680 SHA512 8ff26e335dfbcc12b887cfdec8a3b6605fb0651fbd7346208b756c944af0ac08d55f018799a10bc5730d64c932dcc34c5158b3ca2a81190f8a197e85743bcc69 WHIRLPOOL 9b8dd2884c4de8e123b320ab28d278cd38f60a00da325e2348141f9205985c322613b9ce5106c4f9bdebf0dccc7da10208ca83ab1cd98c96f4c0f75eddac8fe0
+EBUILD rainbow-2.2.2.ebuild 583 SHA256 0d3b60f76cba4c48d0472f60be57f5df487bc60bd5cb1edd04169e9f2c9789e8 SHA512 5b9e4d37b420f2372a5539b7e15e2c63c0bb0938d17e39b5e81e6ca3fd363abc670762d60c33c6036e911ca39d123ea79b645b0bd7b1b6c001ce8fa33377f017 WHIRLPOOL 52136e510b6b9e07beaabd9177ba07122f6e0d0052eab31737af3696095bf170f323e42167b7928cb61335872d8847ef4a1ae0b2556f2b9f36c2cb0736732341
 MISC ChangeLog 3577 SHA256 5335d9689b5eb97b916d900981a96d6bc5b8130577b314da9f8ad3922aea26f7 SHA512 f2f3cdbdfac9370bf807e5b5a224eb799fc98b9f32ffb512457f314a663c602dad380b89ec9cec2468730db71311b0cc0486be92e883bc401b15a5c0a7923931 WHIRLPOOL 4dda6eff5e2d0975f9e0f78e493036902e2323c1d72141f3621efc4d3d9ace07c66117d6e48c9415bfe407b7d147efa50f1e709616aed7e491e270ea88f0b667
 MISC ChangeLog-2015 2546 SHA256 222eba29e702523f30f09bf19e576b36feb70a75deb11ca810c2d33d93fa8d7a SHA512 5b3f1fcb4392c34815f1ccc366b11ed88a0a66ba14c03edb727fe39a86091c09f074c357836ebdcf5dd0887e50e52a09aa90f18ae8cda71f816b9e59b67b92a7 WHIRLPOOL d627a032e9d003eed25aded8175ea153ad9ceaef3becc5573eb994a92c2864cb365c8d1197c61a8a88dcd0b6902e50e4a83cf5b2909ed55f392ade9041a9be68
 MISC metadata.xml 341 SHA256 c9ae9cc3b7242e663299e1b82a0e2f7aafe6902759b502b3b36422a9fd8302b6 SHA512 b85bd3a7b023aaa019689a9e8caaa2c1d920d35ceb3b7af8ae249d9ce42c15d73d466d926561b160bc18ed9acd2ffec6fb169a625c46c37abb5de356eb4ab067 WHIRLPOOL 361bef271bd8421f8b0ea75f29db14bf3a1d830795c3112b2e2363a1ce34f3b4e39801e10b4e7dfb409a58365ab9a40a7ac6eedeefa47a8cdbe757978f9acd4b
diff --git a/dev-ruby/rainbow/rainbow-2.2.2.ebuild b/dev-ruby/rainbow/rainbow-2.2.2.ebuild
index 0b85e53a0020..bdcae2071ed3 100644
--- a/dev-ruby/rainbow/rainbow-2.2.2.ebuild
+++ b/dev-ruby/rainbow/rainbow-2.2.2.ebuild
@@ -18,5 +18,5 @@ SRC_URI="https://github.com/sickill/rainbow/archive/v${PV}.tar.gz -> ${PN}-git-$
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
 IUSE=""
diff --git a/dev-ruby/rake/Manifest b/dev-ruby/rake/Manifest
index 9b922d3515e0..7a02160d3345 100644
--- a/dev-ruby/rake/Manifest
+++ b/dev-ruby/rake/Manifest
@@ -4,11 +4,13 @@ DIST rake-10.5.0.gem 130560 SHA256 2b55a1ad44b5c945719d8a97c302a316af770b835187d
 DIST rake-11.3.0.tar.gz 134863 SHA256 d60ecce6911035a65daf80d038123a55723dedd62b960bccaaeda55a278b5375 SHA512 705c4b1979bdf8042acdc6cea403b2886ac9c589ed0eba7c258d0ce5c46104b7d6556415e82a26b5cd9559954ee53a0bd9f4e0373fd2601bb3b3338a426b3e5c WHIRLPOOL 162de593a1492623f2281339fb8a8974f36e691a0ab4fedae6a01f3b23a4b0dca2cbc2d0e90bbaa444a90872b55d18652800aa95c60ff8459ea732f4c0b69d5c
 DIST rake-12.0.0.tar.gz 117571 SHA256 0754389d1ca3448a3715ca9f61ef303631cc6998c9483f8eceba0109de3a35f5 SHA512 2c8a0442b8c2f7755d8740f89d0772c646c87f64c04377955760c42a37ac25334628044ea37c09cd21e7372cab9e8f3d04b0076f0c34466eb4ea328c0bdcb01c WHIRLPOOL c083a8c61e0e074e2a13bcde93043dfa47523374d8a5221f5965721c690e5c39579dc367a4c85c883c515da70adac58012d11bc15ac5141688636be3ce40dc98
 DIST rake-12.1.0.tar.gz 118891 SHA256 5935501d3e777405a5cc83050d3aaad14b889766d0298c8ff1d8334be58c6591 SHA512 931161e9c220bb18b913c7a2aeff5bb4711cb6a4ff5ab1850aae307e6ab38ac0dd9d0aaaaba4510c27006def6734a8debf8e500a5de8d6f827c3c954832ff136 WHIRLPOOL ff1c9e8790039d6ceed7fb21842d25122aede8b0aba657107dff4fbe4b905aaf5bb8a880de3492bcd205e3fffcf8f9523405f61d2817a8b32e2a8f2db0230d77
+DIST rake-12.2.1.tar.gz 119660 SHA256 bf3226cabe1814c557c084c90d23343b925962360fea70846fcdb4355da51ca4 SHA512 930e2d82f0b5a3250cc0e8357bad60a7ad5f01fed06884e746b72cab60065a326c84d78410943836a698ee8cac1b291d162350d8304a4abcb7e8c930c026af4f WHIRLPOOL 901930bec67d3740e994570c5c5bf2cbe2932a0f7f3ff714e97e2bae0f832fea03de5bac01b7dc0f0d03d8103b7e221ae2aee4b5f5d3435722b4b370e06de36f
 EBUILD rake-0.9.6-r1.ebuild 1652 SHA256 6ae7c65b8ed038dcb54ea18312ca444723a80e702c1f62903b54734743b0e1b1 SHA512 2bade0e1137fcef57b593440604ddffa7cbf8ceb12c1f7eccc3f91abc05a01b86090dafcffc807dc47f46ab17b1fbdd68fde456cc7d8c06753efd79e50af7f97 WHIRLPOOL bfc201a5602151ee898653907c0a26ab33f4863fa99ad60d88fa24cb5dbe143192034f7679f8884adc39ed9dff6517d3ad3ec164fe7d26391ccb0d9dd433a962
 EBUILD rake-10.5.0.ebuild 1195 SHA256 d00af466e177ed390ab7a9901afb1fc281cb1386bc78a0dbaf0f504a45dfa739 SHA512 42baa6f51ac1604a1594eaffce3b374b9c983861ed5373e5f7fd94a7b789d2a0b6da36fe044f2354aa64494b5f9f1565b2edc2173a60be3f9585d7976e521664 WHIRLPOOL afec2eff3a7625caeca7ad81c7e297cabfce0e9a058e674934e2742e50ea83823747ae9efb39ee55119634997c0ca814a170444edf76c01c47026b0b377cf6d1
 EBUILD rake-11.3.0.ebuild 1301 SHA256 69d0fb65ba028b6f4dcd3ab022e2583d51487e13dcd647b19a4e6f68cae6b5b4 SHA512 99fee0adee74014b78392cfcad60ef753adac4e8fedafcada27b5429a3746b45f36caa854d4fbc4f888901b2d14604f427b0d0c99fd98a577c36efaa5488dfcd WHIRLPOOL 44297a433d5b379bfe3b4f1f75541bc5525825269a8388577323611dcf6acf4ab44cf431dfab65052767ee1618635de5d3122f965dfd7769df50c3ed1fca4420
 EBUILD rake-12.0.0.ebuild 1308 SHA256 0a7e15655601c96e4f3375630abe40dd5086997fcbb0af6dda67642c0330cae5 SHA512 95125011cdd74c8b6b1befe9378e65b46d8c8af66776e427ab4f4b8f7dfe96059db06717b43911c066c35dce1607c58c739b72c409bbd0299bdb9885f27433ea WHIRLPOOL bb7172ce9b9ce251e19b650592c5203895709495ba2d985759078228261b039603201206da78c4613fabe71fca8d9fd1f3ec7bcd64a4ceb154dedcee5fc6e517
 EBUILD rake-12.1.0.ebuild 1395 SHA256 d8c61e98c36d833ab155a7e35abac4011fad6e68534fc20d358d1eb877d24d6d SHA512 d46d7e79b563a974e055ab02d4224d7b7110769133e6c837454b7e4372db202d293cace9afe4c6fd96c4950c003cefc726fc90267ac93bcf98e6b575662e377f WHIRLPOOL 149483971e72227b990654209f2edf51022d70d79cefd59b8d23a865bd2abe2b042f11ca4c7e64c3bdcc5b982a79f556b92ecaa59af4a1730c51651e559e874b
+EBUILD rake-12.2.1.ebuild 1395 SHA256 d8c61e98c36d833ab155a7e35abac4011fad6e68534fc20d358d1eb877d24d6d SHA512 d46d7e79b563a974e055ab02d4224d7b7110769133e6c837454b7e4372db202d293cace9afe4c6fd96c4950c003cefc726fc90267ac93bcf98e6b575662e377f WHIRLPOOL 149483971e72227b990654209f2edf51022d70d79cefd59b8d23a865bd2abe2b042f11ca4c7e64c3bdcc5b982a79f556b92ecaa59af4a1730c51651e559e874b
 MISC ChangeLog 6386 SHA256 cfa6101b18b505163a5fe76a6e2ab872fafb7f94ecf4d72a567bc87af7f397ec SHA512 e5871609c70086be1788298c53f518495a78aa05bf7931594dbde85ac8302f62b201aaeb938c71c1d7be10db3b05f79ac22e7dc8a7c0ce355e8e224297a958aa WHIRLPOOL eec5bed7a6a238bc4470fcfb58a7d4422c1b6f552074dc019fdc7d709bee58f6948bcdce4ca111fbd170bf49579d51fbe8c72d61d1750ef2d015e28ef95078eb
 MISC ChangeLog-2015 21136 SHA256 e88f3879a57e3a3c4d3231e84ff0b3de25baf1b2a9e9edac9d2921a9cda79341 SHA512 3d28f93f3531a6c760bd6ee0c5c9a6e6b71edd152250aba67c96f5a18fdc43b4e26bc289751af22393a6ef6a699eeb2dfdf7e82413c91574b255948433195ff7 WHIRLPOOL 616c5963124abbc2d4b5caaf1f3ae8a71ad0fe5dc7f1c3da28a940bd560f0d90d0434aa8963c94e9b35ab2fa99877178fe523697fafab12db6efabab7f9ba918
 MISC metadata.xml 341 SHA256 8386191c550e90f6595a52212e0451f7ba02b951aea1df7782d0aaf3e112eed0 SHA512 56fc95931062163036dde73847a796fd5802ff4bcb8a8e72686847537d0f38c9d15e0ec83bd06c2f86ce92952e9fbaa0e90eb4633d7afc460adbc0c9676e0040 WHIRLPOOL 22fcfaedc1a03e442680d5f5516c8fa03c3ae7b2d598d14c05211da2a1948332b89545fa54c7e33e3091c223dc9776a6f01bb545b28a6c7dacea803784594068
diff --git a/dev-ruby/rake/rake-12.2.1.ebuild b/dev-ruby/rake/rake-12.2.1.ebuild
new file mode 100644
index 000000000000..712e7522cf9e
--- /dev/null
+++ b/dev-ruby/rake/rake-12.2.1.ebuild
@@ -0,0 +1,56 @@
+# 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_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.rdoc TODO"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+inherit bash-completion-r1 ruby-fakegem
+
+DESCRIPTION="Make-like scripting in Ruby"
+HOMEPAGE="https://github.com/ruby/rake"
+SRC_URI="https://github.com/ruby/rake/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+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"
+
+DEPEND+=" app-arch/gzip"
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.8 )
+	doc? ( dev-ruby/rdoc )"
+
+all_ruby_prepare() {
+	sed -i -e '/coverall/I s:^:#:' test/helper.rb || die
+}
+
+all_ruby_compile() {
+	if use doc; then
+		rdoc --title "Rake - Ruby Make" --main README.rdoc --out html lib *.rdoc doc/*/*.rdoc || die
+	fi
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'gem "minitest", "~>5.8"; require "minitest/autorun"; Dir["test/test_*.rb"].each{|f| require f}' || die
+}
+
+all_ruby_install() {
+	ruby_fakegem_binwrapper rake
+
+	if use doc; then
+		pushd html
+		dodoc -r *
+		popd
+	fi
+
+	doman doc/rake.1
+
+	newbashcomp "${FILESDIR}"/rake.bash-completion ${PN}
+}
diff --git a/dev-ruby/rr/Manifest b/dev-ruby/rr/Manifest
index 3dc53124c162..a3ad9a1b319a 100644
--- a/dev-ruby/rr/Manifest
+++ b/dev-ruby/rr/Manifest
@@ -1,9 +1,7 @@
 DIST rr-1.1.2.tar.gz 89970 SHA256 17396ac98c63d57ef83dea3904de2e86f5b78c9893b8f64e66d434dcd2e32438 SHA512 e0954206b8118cf0acd785cc300e267556cd62bc73dbbca885848205df6456e43463cc46ed1fc47c672574bdf33c42d288c403e550a89c74cac452a54c30a384 WHIRLPOOL bb6a7c128a84f17a690a35f904822324664471b366cb8d6a3677c45f025cebbd38f2f5afbd2bdafe861a979b6260fd21204395a61abc37e75c18b93efc7c07d4
-DIST rr-1.2.0.tar.gz 137694 SHA256 80d78995ebc7be2ce07ba9415597d10cf1a018205accb7853ce1610da4b40942 SHA512 d693dd720067c6d2cf04da6e980ec4d34fdb461fc9d316b4740d7c19047e349ddc7938e2965890dfe5ee35d7d45b7d53185e37460b202fd3108214ef894f17c4 WHIRLPOOL 92fb38b89851422ff25c33f7fbf7e083407b49d1e716baf3aeb086e8c3582166c8109267dc7b3ca60cc910fcb8a8c161d1961c3eadab610781cbef1bffec1c99
 DIST rr-1.2.1.tar.gz 137497 SHA256 b0dda83de6713d631a3bd5782f974dfb736639fcc5cb1f9eae029a696f7ce05f SHA512 df2d05ff732908da55878cb89cb7d1c4442a18c19f71940244f5bd7dc55632467a1824f55d7fade4b5122486a61277090d7ad05df9f99098030c21aa45b36dd2 WHIRLPOOL 1650fc24e410d8c7034427655ef86bdd2ce0a09d6f5ee82ac5870638040c83e80f1c7fc2a16cb1a429c47832bc473546c06d2aac7465abed4b81c46b9fd97ccf
 EBUILD rr-1.1.2-r1.ebuild 1125 SHA256 ae1b296414d23b17523d6f892b4b752672b90031aa6e138f62e6efdaaf9355ff SHA512 320b74a0df7659811497d428bb2953ddb21f299580506dbbba36d14b6477d32854ef4126c7234a24287194674dcdb409acf7d15e2e72cc73b4ef9b392114e8c4 WHIRLPOOL 27270f4c3aad5cc18f3ad4f9d24d03ca75553aab6fef85c5148889e681ad31358a8ead7333fb915364ec24ca3d678c800e0c1a51312b36700489bde06483c00c
-EBUILD rr-1.2.0.ebuild 1140 SHA256 97f3d3121c4fa6e7c3ac85af2499ed2b85a3d3d0908274c40f3aef838e258da6 SHA512 ecafd28e51b1e2c981b095b562591aa626e7c6e2df6f107ce5fa9d09942187b29a274c9b88344b685533e3c257968dc384f415372c1e50eee0ad94800998050e WHIRLPOOL bf703e3f5b2401dd8175a809451b0539cb1dbbe8da7e81bddcd16c05245204a34725107a7ccf9e554235dd6b3a80cc12beb73dd6b3c46a4844787b2aa584a028
-EBUILD rr-1.2.1.ebuild 1134 SHA256 e1137602cdd52837ca5475d46cc4c76924c25508b7334a6e58475e2a10fb39b8 SHA512 fb6324aee93e4e083535b3ddbf0b1bebeed6a2160de3d89216751cfa5767bb2208e039c746c08af4903b9e419a9bd6a7ad85dea742dfab4ceb0a4ed81984a91b WHIRLPOOL d37cf14a2e601480973ac002393c6f7d6485ef16f29a471781973cfd12feaeac4f07a7795683cd106a178c56df12698da308378307843b0cc9e31e01a90db0ad
+EBUILD rr-1.2.1.ebuild 1132 SHA256 0e7f74c048073008978c8a68e5836d11e72c8e344143493b70af2368d9f3c074 SHA512 e523589e1f80bb57f1b2813e1727d37ddd506757d15afc61333cf4e89b89445b64697e678fc329375a7f185d037ba97a616b7f4c5965dfe8c88a52edea2b660e WHIRLPOOL 09e04c794f7e2ea72175e5078963c44714f232815af539e2e0968a4feba8452cc8ea34c2740cb45625791b685960b33bc41341c8a540f6d2a7a00e72c217c22e
 MISC ChangeLog 3279 SHA256 81884e0a05866d5852892e5389653f3f4ebc4b02e889c94435c411a66220fd5b SHA512 8a44987a9c34606153249f3ae3ce574fd036409dc40947d7c5db98fdc8ad35edbbbcbc306a7e007ea3373914f198a75e06d51298c2a64c5a2ff5e1af5ac22b0c WHIRLPOOL 9f8fdc7337275ab4823a684d98d28a0fd02db4dd92cc5784601190551b4512f547df809dd80da7793a736d052958d381706bef33942e7a746e5f9a7c1a8e8231
 MISC ChangeLog-2015 6172 SHA256 976bd9f232eabe98f981721e66a72d37f6e112474a3c546a235b7393cf4b8472 SHA512 03f9e089bf92765f3a24e11b4f80640e99443361a6710e63aa24abec931933fe0efe8528ab6fce514a8ad3f6613171e036fec532c928bc62c4bdc9ee06a6b82d WHIRLPOOL 295b4f9bdbaeb94ca0d3a20cc927bb51f8c03fb4b6f0fdf541e7dd1cade3c72e0ceef509a9a9441f5fdc483d43a848d7dfd9cddf8b323349cc3f6df8db2f6681
 MISC metadata.xml 331 SHA256 b997ef379e148a1a9199be7e917696815d1c9a71b1ab8ea92dd5942bcaf1e488 SHA512 3a7b57e7e43fad3270e91950256d20839fa2a4a2d7e7c8a9b82ca9e5bb72bd465427925b7994ece2f882c37b8ba5984bf8949ebe28c3bb0875c8af6cba3cec39 WHIRLPOOL 8841b3d7370c18b906a491942af0644a3b3da0748e83d7d5436f1b35281c8e4f73365ceb328e21c461a3db522ea84ff15bbb27765e655545528978be5fb69687
diff --git a/dev-ruby/rr/rr-1.2.0.ebuild b/dev-ruby/rr/rr-1.2.0.ebuild
deleted file mode 100644
index 345fe529c64a..000000000000
--- a/dev-ruby/rr/rr-1.2.0.ebuild
+++ /dev/null
@@ -1,39 +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_TASK_TEST="none"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A double framework featuring a selection of double techniques and a terse syntax"
-HOMEPAGE="http://pivotallabs.com/"
-SRC_URI="https://github.com/rr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-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"
-IUSE=""
-
-ruby_add_bdepend "test? (
-		dev-ruby/rspec:2
-		dev-ruby/minitest
-		dev-ruby/session
-		dev-ruby/diff-lcs )"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '1,2 s:^:#:' spec/suites/rspec_2/spec_helper.rb || die
-}
-
-each_ruby_test() {
-	# Only run the rspec 2 case since we don't have appraisals. Setting
-	# up everything correctly without it seems very complicated.
-	ruby-ng_rspec --format progress spec/suites/rspec_2/unit || die
-}
diff --git a/dev-ruby/rr/rr-1.2.1.ebuild b/dev-ruby/rr/rr-1.2.1.ebuild
index 1c60c993f2a1..8ce43bc2e7e3 100644
--- a/dev-ruby/rr/rr-1.2.1.ebuild
+++ b/dev-ruby/rr/rr-1.2.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 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"
+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"
 IUSE=""
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 224657f35144..75f31d278b2b 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -6,7 +6,7 @@ DIST rspec-core-3.5.4-git.tgz 369170 SHA256 6e7f0cbccf13f774936b25100f743682bb43
 DIST rspec-core-3.6.0-git.tgz 375590 SHA256 8994ff9ef23e11262d2c0cc7c54ffaa3ce73c3d2fd01fc0c089f46a31e7667fa SHA512 cecd3885652e18ba1ffed45e40d12c932ba0d880e96b2f1d264709f55dbda8d6b0c78c3bf4bb940d246b84261d1b80038618735f65302ff62646165b2e932be1 WHIRLPOOL 7923ccf7959f5fdc23f27ba0a4619b582a6a16ff20dc27eee82a17436ba9c278eaf996f4e851fac8c9a2802cda30ef1928ab5a4bc20269fe66ac4df540d6b827
 DIST rspec-core-3.7.0-git.tgz 376565 SHA256 502b7dc92919e593c748840bbcbdf74e27d0b4a58e58838b9ffc13bdaea3bc34 SHA512 071bd2a5c905d4ce621f2d7255b882a9d34cf42001cb2995fdb05a91387805929198c32e53cf4c2df2a43d179d2c49337214066be87eb50ab044b5f70aba8c54 WHIRLPOOL 48d98d14f716a836a75d25ee523b10ce64e4a1dce91df953ab60320f41d9661c12509e9f788625311b3217eb10f760249c3aa454b28cee4c8d196206d6c26d2f
 EBUILD rspec-core-2.14.8-r4.ebuild 2978 SHA256 2f120a8e6fd50a479e31f636baec14ad3647d2d56c1f19a4b93e71d875dbceb7 SHA512 77b23547500eb43368b2733f78c5b157a489302ee115a54ebcc8bf469d1d86633f1bed20d653bff59f1ad5004c464c59d9898d4d536025069cd68b2341661025 WHIRLPOOL 6eecd1392a11c150921bef0740ea00c4e87d93e8e9c39b9b20147ff9f980f258cadc42961019f684909b24ef71944f4b1874ee93bf217ad7898db4e3a4d9b5d2
-EBUILD rspec-core-2.99.2-r2.ebuild 3053 SHA256 2c408800ec4b18f78886295a1a02e7ad84152979425eeda190a35ae3e75617f3 SHA512 4c1efee5e13b89f6fb6ae6ef0d070655ae37c8c142eca1e344b01ad207652310b34eeb08432551c4b9c023a733ce472d06db1ea491a39b6acf4ad22e2d3e6ea4 WHIRLPOOL bad0c86630123d313706b56e4fb5bb42fdc3e10462192d45b0a3a18946dcd9133f25044b1292abc70a5b1cc4a8a5bc201ceba5c0f1078d85a42eefce9cdda245
+EBUILD rspec-core-2.99.2-r2.ebuild 3051 SHA256 08f5390df8730a271abd725bc9889543d403e6d374a43a3695ca8ec6ce19a206 SHA512 572f1466fb894509935704691806563f7186e1911201b4b7bba04245d43928e8bde4ddf1370b358c2abb15ab3c924395e181a6b2257b19f98493dc64bd8cdce7 WHIRLPOOL 93335cabec876dbc8d93c738bff216dc4537edbf61ef51db9e4fda512929211d0d1427837dabfd8cffb695edfa59e551f85ee853a12c2b4b342c99aa39f48cbe
 EBUILD rspec-core-3.3.2-r1.ebuild 2903 SHA256 aacac231cfe68a02837360207aa39fc7fcbb783730b0eca3c614a1946935e190 SHA512 776100a89ec88881475d1cb584262a02067a8ac54413cd2cdaa768af1cfbc0b5a00bd5d26287225bba69cf457afc6a1e41291abfdb376a47fc57d45f5a8a0b55 WHIRLPOOL 24cbf36cc8833d59500939ab26f154983e8443cd2bc48502e72b7e4b8ed828b80be0991bdbedcce4f12c235ed024313d9088155f5684974cc6bb68afc5a4131c
 EBUILD rspec-core-3.3.2.ebuild 3044 SHA256 d705906495247456425351fb8d2e48937dd24dded70d40abbdac9e48b3117d6b SHA512 fcd6ffab8f1df675d54f7d72ec6efe9ccdd15c4a06ef5f13133d2004e0bce587b467e7a61330d102498ada2eca529aa7f4b05b77c990b8a91da07cf0b8195f8a WHIRLPOOL b9e747ccf85673170633817305600d3e9eada1cbec3c05a78c331c0ef659578c3b9a94b977ba0856ee836506245a94e4f80204ebbbc6a51a85c4891b82786798
 EBUILD rspec-core-3.5.3.ebuild 3164 SHA256 b7a413e6a334f4725831c560a3ab686da5d84619c042f75fbbb7340ea29816aa SHA512 fb8fc39c784cf66a63385d6e58abfe2e74833ea5594c0d01887e883003a67603dabea69a2c598bd38ab69a49938136c0462fa4a217363b1d4cd189a9e4946dbe WHIRLPOOL 6e8a072aa3118bd5317442df3adf1a53125a7bf8042566624e17822063e4207aaa488f78c7e5ec3232280e08cd746c176ce61e365fa69c1821b3924f9411de6c
diff --git a/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild b/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
index 6e22d2b157b9..6b01d05d9ae3 100644
--- a/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-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"
+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"
 IUSE=""
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index fd861e09882a..1cc55e71439b 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -5,7 +5,7 @@ DIST rspec-expectations-3.5.0-git.tgz 187600 SHA256 edbd7dec2b1e685b12e3a14c3ea4
 DIST rspec-expectations-3.6.0-git.tgz 193897 SHA256 7f36c884b771b0cd80ded906469fb51e23990de50cd19c59b1cd57512f296f1e SHA512 5c784eff2c076623f471bcfff6e014420782c8d52ff54a68adc9b4d6b60a91726da36e3989535f4ab7f1fcc6b1e2a3c3a63ee330f8ea55f475711741762c0f07 WHIRLPOOL 3cf7b971d4a36ffb5015e823f7e25c3e566b1537d8f61adf371b167b04a80f90a486198bca0436cb9b42ce80bf638e4379583e4969771b509ea35239fc94f9e8
 DIST rspec-expectations-3.7.0-git.tgz 194071 SHA256 b936be3a5483de4854cf6012e506f14fa204c0c481545f3a54108e08a262eabd SHA512 bdd3222089299e9bfdd6f17a2b8af81d5e695290a3ce976630d586d51ff2df5baf76a3887b8adb31294bd6623ba85f8c2a4a31ac520046515aeeb81fa3a1bd5a WHIRLPOOL 5ef85b702f0d83bcbcf873cacc958c1216fc81be3f28327b5706f367f500d3a85e0ed391bba19a27117b757a2bd78bf2672f65e4a8c727f282ca6aa11918fe2a
 EBUILD rspec-expectations-2.14.5-r1.ebuild 1297 SHA256 3a5be722aa87b1cee65d00c5feb61c68c180c8d7447aba1007478a606ce62201 SHA512 63879f846e1c7066e242f3c90071997f835bd76dd6c9933a8eb7ba6d3e4f9a1316315e57ba0f5760783d265ec7ee101866cf1c5972d7ff23dbccd819f9340b28 WHIRLPOOL d7c8143a214c84ede0f10a3ea4582e4f8a6f5445881bd73b807a8bd94d76220237a38fa9a1f8aea601e45ef2e7f2384b337b47798dc3e65869d6dab6578cae94
-EBUILD rspec-expectations-2.99.2.ebuild 1693 SHA256 1349f4d517c7be561fb3eca30a8672362de3c7bd0e4071dbe0d9e4667b07f13f SHA512 c58fec483dce094bc4d1d2b158e1641a872690187d3e1de93a069c3276c92aa9581b68a05e78d4c7bc2be7568049f6b95aad8f6588205d33a1e6bbc8630a44db WHIRLPOOL bd4802183a38beecc2e5926dd5da4ff35f2eecbccc61f720cf49d3064c29df5efb2c8fd283b0eb65de127edd37c9bc30e59e05164aaeeea940d0feb39e63c9c9
+EBUILD rspec-expectations-2.99.2.ebuild 1691 SHA256 50f3a348ebb78bc43b692bdb119a95d8bfe33aca2d16d52915d5f4ad1ea1a4f9 SHA512 823d54414ec189a87e982f5c6d9e81e6cec3a44274a2cddf5396780e7cc04d47eb8b0cb05189a7ecdc7d41f2c4a1e6e9a322cb06837a25f00705a916e7b76d87 WHIRLPOOL 87fd857d35f4dc1d65e30b2e42ca86fca979c46a77b01f5d0948104c1efa5cbef59581485e49f7b56a945fc2be837cf62277c6c822e3dad9a5755f19e66e8c32
 EBUILD rspec-expectations-3.3.1.ebuild 1811 SHA256 a2637e9282500408122af08b1e065a1803ad143247850d051b2a3cfd97bcb2d2 SHA512 f0d3648237464917add707bae606ab471aa1edf5fa5d59f2067378c1c5b1f761542dc9c6c28401bf599e36e3a44bf79d35b3b2ae2bea8adfd2ffead747487f87 WHIRLPOOL 18991b0c125e441fbac5375b5074110d63f991015dcfa6ac0c203d7c1f2a2c8445dc49ed07db7a65755268e0a27fd682e2c72da15cf1d0691adb521ac2589ebf
 EBUILD rspec-expectations-3.5.0.ebuild 1316 SHA256 de2d83f626d4ec693785d9b1253962bc44dec3ffdd62b6e3decde43561ec3281 SHA512 b1478417e75af503f4b05cb6dc21a1901ae4338bc2c4fb8f372bc2e84840233ab8069e6ccd0fa265ac7462935d9886e9722d18cebd74a50b9bb162aa6abea7b4 WHIRLPOOL 4785e595497f846c8cb85094ba7be3b30fbf7c95b6487958ba9f2ff45c80dc0aa5e489383c102deffc2722babd45ec3f6fc7d1095b2be40c6c530941de25dd8b
 EBUILD rspec-expectations-3.6.0.ebuild 1331 SHA256 3117c1d7fcf985d388a9bd5f6e1166e7fe5041590a94f222e9c090d2f39a85e2 SHA512 b0121724e5114884d30a64775da3610eb8b94d7fe86f040d70801a0d187a38c44924da2f75f85ee0de33b497c452680b6a0c0a3f7c7bd5343c6ddf97a6b4be9f WHIRLPOOL b1ece16c98b87afc901152a0c2a0825b77098a721f114b6a6e82d5551b8a89cd23371ddc4656f3f3ddb40850f0ee39be74b0334d464f07fe215552b25fcd2a9f
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild
index 1e19f996bb28..c4f0315fc2c6 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-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"
+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"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/diff-lcs-1.1.3"
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index 833855251de7..eaac5ab872ba 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -5,7 +5,7 @@ DIST rspec-mocks-3.5.0-git.tgz 186806 SHA256 19340072723eb9b632fdc3e2636540d617d
 DIST rspec-mocks-3.6.0-git.tgz 189000 SHA256 fdbb61f579d442eff8c7096143a701bcd834b7ce96a959fab663db6be2f262f7 SHA512 42cc4870fde8eba0a6da7df4ab07e4d59c6447bb8f52e0172e7f231d47304c20c6e2edfceee698d5d344bb78384acbe3df4bb67de784cc24a63fae02ed1d4a7b WHIRLPOOL 9939c4ced45b85c5d270079345851143466affa1a40458edf3dff6427861f03198fce6b55ef27ddd452338ad2411a45c88dd9fc1fe59a2dd5494da11e288976f
 DIST rspec-mocks-3.7.0-git.tgz 189170 SHA256 293a5406099d6767d7ffbdb01c57022e6bb3050d650e972bfa8fe64b30115fc4 SHA512 8673726571ccf8a901281e44faeb25ffcb59579dc380138f0557cd9310192cd340081e5e8ad65ae281777727b502cca2f6877134b0fb48f2e0ea40b133002aff WHIRLPOOL 7991dd19cd62b0b0cea5b905bbc9b4e51a9a49cb56299fbf62d21e7fadeabdee4b28895f1b835327e89ad260b6e400e3d21290f744b1ab1bfb6548fcca1d17d3
 EBUILD rspec-mocks-2.14.6-r1.ebuild 1285 SHA256 131c459f5dae86a31bfaf28ca4ba1a11b6fa3a26685172602ea7f0be858a6d29 SHA512 f515fe9492f41766c77a8b57bb4bc37d60f2d7c053a877a9c497e49b80df61320b4f01dd6ede5fbe4e4686304327d9657518ed06d820becdac5e2d1234126e36 WHIRLPOOL bd04ace23e4bb8c12dbb3469afbbbeecc2194d249c4569b04da61ce2b8f8c99afaa7e3e000094f19f6856b00486f49160bb496c15c6639b8e96c7c3c18d98b78
-EBUILD rspec-mocks-2.99.2.ebuild 1486 SHA256 049325f15b346231f7fc6161f9f385a8f43585ad27408973c5bb96216cc0faea SHA512 88b9dcc57b4e2ea69b3f673ad06b0ec7f07be379025fd4b4841c8a6d8417d569ae6bcba584426e484f3f41317f196c480b819a63e1d9eb4c01299ab8e59c29c8 WHIRLPOOL 890a56eecdc3513631e1869141290a7a4cf12c751fb0bb267502827b75b9581b57f850ea753be899cda7eb32f5fd24f6b324a3cfd85f02783a4f3d5fbfca051a
+EBUILD rspec-mocks-2.99.2.ebuild 1484 SHA256 59656c0e6eca18f1f8e9f03293a363354c1c568c1650831080ddb5dcdad9e74b SHA512 80a9b9e773758b4d073d41c8fa8c1ab4f55be1affec805f419397a5467e38bec08876af9383587dba087c5bfb0e6137f7467cc6b74ea873a8af2734da697ad17 WHIRLPOOL 9fc61fe103849effa9e59ff104da8e039cb37027a72a77ad29040523d92fe17ed82472dcd3c25ff4497371d182249f593a5932e05787fb17730bc770127a4f95
 EBUILD rspec-mocks-3.3.2.ebuild 1929 SHA256 02dd1ab84e02ca65be00b078ac1bf74d7e8ef2ce9990e3339905aac825251953 SHA512 7471395d3ddc2899dbd1e6cfa970b58bc439de24dd68c01044015224e86868268b27784519439e249c16c82948c217614cc3d808c89a171b6808bfb789a87fbd WHIRLPOOL b73f5a097270defbd3864d137b45d07c36d65a28efb10e5ed53a4d4774d929d94d58b52228e94b34d3f9a21955c2b1767398905b8888c53d0df87988662d4546
 EBUILD rspec-mocks-3.5.0.ebuild 1340 SHA256 49046dad6d660b8485e1096c4bc1e2f2d64337440969750d882308b297071459 SHA512 f58f8cd79532ddbcd464c9fdbb2bfe341b30df95049edb860bd5aae00c898a68dc8310b9896fdfc663bb9ef8f3240bcf490b7dea0bc5122536bc37e7ba871267 WHIRLPOOL 9c07b2b07374ef2a428d7849dec2eba31b86d4e8754e5af0d73bedadf353d0ccd39ce877e9f60c09670cc41e0a5c0f2064146c0cf17eacc73efc0b8067e30ed9
 EBUILD rspec-mocks-3.6.0.ebuild 1355 SHA256 18c26aca53968dec3c741be685178d4124b8f77f7aa665fe2fef200751ef6e61 SHA512 03c9a18b08784c8d05a7f8bd4f405aeef96a32f6d9c77439ae0bdbaba84e66af9cfcbcc6dac4a671967bc17f7c014c783715eee37bc3341c836e351122e2d950 WHIRLPOOL 03d51bfb7bc30adb1b863a9ce40539c020bc0d6f7e42e5a02b5e5b43be45f609c10553a67d6afe8353f7c807507a3fcf0c1400d05a1a141801149dad3616d723
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild
index da333166de11..bd47fb66a978 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-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"
+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"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/rspec/Manifest b/dev-ruby/rspec/Manifest
index 95e22e51dce0..876e7e42d920 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -5,7 +5,7 @@ DIST rspec-3.5.0.gem 10752 SHA256 dab06dc328931b0711943f074989ff45cfc3341e4c7cb6
 DIST rspec-3.6.0.gem 10240 SHA256 ebc3d479cf2f144b3deef5d72dbb1cc6a15750899d26a8da164a2cc53c04a5d9 SHA512 ff0208209fffe205038e75ea410d0a0c140d35f9dcf46b699d9359bb17b8d6e92c4c3643b8f99d741921dd4a4b9bc62e639f5d48f46e4e9c656dcab0f62fdbb2 WHIRLPOOL c727350b8c3328087e65215d5ab25299c87a11814a870496dbc748621e12c9a2c6a0650ffeac8f73f77bcadbfeb87467b510a5ef76e424b27c9499928e168636
 DIST rspec-3.7.0.gem 10752 SHA256 0174cfbed780e42aa181227af623e2ae37511f20a2fdfec48b54f6cf4d7a6404 SHA512 5c10a878e9697030783c987ee9a6244b36cf85a2a3fb8c28bf9771900a3259da4f19c7f159180b5ff9140ab715b38b5d90cd5e0014ac1862f478c32a95e7edfd WHIRLPOOL f52be8c492ca2331b1a48f228fc9e561288be0fd408cbc5bf5914f013999962628e2d61a61f253d7b22b2ecb880e79aa058e2fd1abace9e4a64a5d7c9f1b1a8f
 EBUILD rspec-2.14.1-r1.ebuild 783 SHA256 14a7068280953541bc90f22f70e669803831839dbd671a806c56b9adf3baf35d SHA512 67fc73cd59e23f941fb56d27e03f800ccdd142bf52e27f8e5340843594f5855945de4a5ec11188e75786d35f8811c2e2105d8cb87727ec0e2dd7a31def01cb11 WHIRLPOOL 0b28eb06a950bf19669ecaebe0099a7539a1e53c4d3f97d4d986ce4f077f2b0dbfede477aedce4a2dc8825832d8c6dbf9e4dd59831d450abddc218959cb84892
-EBUILD rspec-2.99.0.ebuild 801 SHA256 eded3f2a754b30fd17acd7c26dedecec86697d42471ab9789276863b28b9aa2d SHA512 218ff243f7071acd792cc7535ef7823a78a7f7121a30a023c448c6adac38d3a8715e4dd94b5a61eda0e441931cd8d35b1bef2ad3875b50a27e08c123a0b4d083 WHIRLPOOL 3517d798da167cf752c9d966fdf99722f3c166fcd271c9fbf95f4c4bc68180264dc518f9aef9489bd989fd84730018c1b886fc0e4684f57d88476c8b79490093
+EBUILD rspec-2.99.0.ebuild 799 SHA256 6f2ce70469bf5b3b9d23c874200b972661bff7a45757e5c6be92e7e63e279787 SHA512 1272a3071f68fce1ba08f1277684d739f01cda213e07eed23cdd8e2c8444aca129d8fc0ffdc85eb6c31d23b6905075b336fd4535b4f1d8f2686795566f36927b WHIRLPOOL db9382d2bc6836a52f60e932a6ee7092ae1f2985511e267942c06d97877f2c95a63356ceb3cf76fc146c1756ca56d04cbc9925891ca278c104a07e05890c9feb
 EBUILD rspec-3.3.0.ebuild 794 SHA256 2af29e3208e57373304f4b334c49523f762f79d82704d489fee440e049c65204 SHA512 55c0ec5dfdb2684584fb384a2900cb8b8693de6e8ff35f2e99892d4431fa4130bba06f4043ca800c695956da6cdd0d1892509abdca7aef6d365a23bfccbfd81a WHIRLPOOL 13f058cdfc90078f22a6640079932be168174220322a10d3179469ac96c65cda027ddd2bf8067a69faf407e2741588d3cbf64709faaf3ffab0fcf08f052dd397
 EBUILD rspec-3.5.0.ebuild 661 SHA256 d754c0e6494ea9d01d7e7681f2448d6112a7acdac7b249050e00868b9e536008 SHA512 b40c4942baf9dce20ee03c8ea02d83978fb14ba98d6400a416fdd5f70372deab59323157ce7403ac02100c676e5982e56961443bcf7e3feaeb24da8330604161 WHIRLPOOL fa6baad5c06bb21bc049b933c1dc9a707c5d487696c85a7d4545e6174e1a55781715702a40b0acb9ee5e0e407aa995dda6bf333060a49ae557944d25d3151ec8
 EBUILD rspec-3.6.0.ebuild 676 SHA256 8f0cc4f73eebbd9b7c9a769568354a6308a72feff63292815c0d928de537e586 SHA512 3401c454ca3b99481a5494a29d22703b9c9904ceb74f5d0a45adf126aa74b399fe5ca20e24ad39008f4a35c0fd55e765068c482bd80fe668ddbfe1c6535f7ae7 WHIRLPOOL 589eba78ac67bce2ef6528f4c3e6d1eb10d40fd6e24b00a0949193d486331a298944a13dd309bd3a19003c222c0470fcab7501ef930b8691e875618fae164f16
diff --git a/dev-ruby/rspec/rspec-2.99.0.ebuild b/dev-ruby/rspec/rspec-2.99.0.ebuild
index bda96b1157ce..fab9e0714e3f 100644
--- a/dev-ruby/rspec/rspec-2.99.0.ebuild
+++ b/dev-ruby/rspec/rspec-2.99.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://rspec.rubyforge.org/"
 
 LICENSE="MIT"
 SLOT="2"
-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"
+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"
 IUSE=""
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/ruby2ruby/Manifest b/dev-ruby/ruby2ruby/Manifest
index addecbc5c9c6..b00d6322086c 100644
--- a/dev-ruby/ruby2ruby/Manifest
+++ b/dev-ruby/ruby2ruby/Manifest
@@ -1,10 +1,8 @@
 DIST ruby2ruby-2.3.0.gem 25088 SHA256 19d9648bebce9eb08f279192ba18a03b9776a29fa527f2654191b4a12daad487 SHA512 82630abf24ddf53b5bbd8f9d399f49b043e6f1c418ec83f1ff5011044d3a7b52864a3c7c5f628a9afb5afcf59f7c5126a413e7743ceb1e03bf623d919af1fbda WHIRLPOOL d1b6cca7d61ba149e91c9c407631adf4bc9985e977ca1141c13fdbf169011e5371bf78e8599a63d6111204f7e39786b751f1aa1592b0893c0a647e7914e26027
-DIST ruby2ruby-2.3.1.gem 25088 SHA256 77c36c6ce3f26c1166782c75110d3c3f70b40c85707d9094ab0ff6ef1ca5e011 SHA512 4b6ca39cc469f44697e2924a1074452a9453d7d809d088d89583040e1743dc49c1d5d92b2b74207ee5862565d6293e9563c698ddd53e18157e06a6f7fae6bad0 WHIRLPOOL b73393251d4a9a652f8ce076b4c37f80197edbb6d0f7898c610383e413f055027c4cb9acb244a05fe46184efea59980d5acb15836b4b0fa0c53166346ae88e55
 DIST ruby2ruby-2.3.2.gem 26112 SHA256 17cefcd766567087b0f53f1a7c541f07dd3bd9b708dc9de67b7eaf91d2228a91 SHA512 4cccbc0498ed2af8302860b5547a54b4fada04eff8158ceb9e6a8969f85ddd84dcf315e90b2308b3f5e9e685d6e2105125ca9197dd1cf26cd03179c50e460ee7 WHIRLPOOL 6826f25ebdd31d2963694bcf980b7d38f2690a9fcbdc6e805a6a4f20bed17e9095271f5957d6dbd8d10378bfcdf420bc07c22e0515b94a4e73661d94c710019d
 DIST ruby2ruby-2.4.0.gem 26112 SHA256 f28a18931bb71c4819b56ad809f72aeccef2667115acdeaf15f031e91e471ccd SHA512 1edeb5e90c5d33dabfdf7579d2f24f6daed8b9686ce1f7d746d96b18c23c2d4c505a4807a224536d194426fbd81e740113bba6d659bd2dbd2a84c71e04594300 WHIRLPOOL 51f1ffddb11122dd056d4d2a3fcbe65eae527e958311206e506f5032e281cf1dc3bb9f114d43036b5f96b0bdd8bf79bc35b136dbf526d6f5d3bfcce49f775d32
 EBUILD ruby2ruby-2.3.0.ebuild 874 SHA256 ad3f783aaef5cdb3d34c98d77bc4c774b30e9045f9c4015013963d7463e705a2 SHA512 e9c3ea75c89f7c8f0796cdae5ae85b0e26a0f59811b0898706b112d906e05bc0ac6efaaee34d4fdeeff59b2f00c30aa6db431c71eeb70093bbaa5f51f2295ce8 WHIRLPOOL e2761037e586f76a393b9eaefb8f31d3c6d9364264e61f8846b0a56335c3ac8a1e86df9fcd1977dcb1329398eec6ca9efdc42871b80eb55f697def7cffe06c49
-EBUILD ruby2ruby-2.3.1.ebuild 878 SHA256 229145a9adb3acb89dbe0a53e25196f1b26d8963c26328bb4eeaa0227041d68d SHA512 8dc6a8761802c26d3976a98f5f880b093e8c904101db51d8c8741b911255e418cc0cd9f89826431ac5cae64edcb3a214888fdf3b654ec9f96ec2e5dd134e50a6 WHIRLPOOL 45ebf1f4520ec023356be179ae4e944b73a3fa12a8e3572b02c8cc158028b86e969f3c540846de439c4a4237de72939ff692101eb2303f182e772214a50a6a58
-EBUILD ruby2ruby-2.3.2.ebuild 806 SHA256 41fd2426f1e9eb302eb334529ba01907fc99d1988b08146129a2b64991a103d7 SHA512 b318e1c88ebfd3ab5ad059e07549840ee2a0616e6701d78b556b3d4d17c838e93eec741843d42e985a9792f6f56d9a909cc8e8e65ced08bce415ba1118dc1d09 WHIRLPOOL 075d0d7f0f16fbe504f0ec7a23a13221f113eb5113359ce7e119872fdb389b951babd6ad3bd16014702a303005a6c0873a74e7f7d20a86f916c115d2b3b675c8
+EBUILD ruby2ruby-2.3.2.ebuild 805 SHA256 f4e76ae051da59423802fe851bd3477b4ab07ded35b3627e3067b39d279e8de6 SHA512 336e585da6b86b4f5c75e5ea2a7b251e0f3efdb9adc1d9a6b5d3eb39f347b8dd50ed93c5a3fc373ff4c3030f05b48533f7919fe63ad2b1b50e3493e8260f645b WHIRLPOOL e2a808e2a43d51deabf367a2d8c7c3854f39f526d5e087c29980070571676601cf4b1d43f375e38e84b6f609044534fa6d3a129e93cee34fd6eaa5983a42e169
 EBUILD ruby2ruby-2.4.0.ebuild 844 SHA256 804bfae0dd65d91b650eca441ae04e54320ca9c32a154c8d4daf0f2b0b300be1 SHA512 b47c71ce59d46f894da4a1c1d0bccae6e4e59ea8a1277cf355bef9099aa8211eaae197a82587299755565792e80ac6f22250d061396df2ec39d3944fa13f4ac7 WHIRLPOOL 475664c892f890bbfedb2f754d46c5dc7248c28faaf25168b6c277629d16e3a9795deb1d833fcb6ccba5876c7466c4e7f007cdddc66564724f67baaea85fc8a1
 MISC ChangeLog 5115 SHA256 12101a573c3fc97674c4653f987897a7348aef56a289272361fc990fd02c00f2 SHA512 4f0d1fa473d2727c26204ad04331968052a90c60808d2d70d89fa86548baee6ea435332645a578cf0822f7c71131ac00b7f09af91b61ff518e214b8d200c623e WHIRLPOOL 1c4f25410907aaf8ddd3afe195177de8d589e44bddeeb0c218fe0301d74a6cde1a7d2600f6b1b355b8fa66653f6edad6f53f42306d4657da2c7934412532ada3
 MISC ChangeLog-2015 10435 SHA256 58cf95d1eff26cb55fd4f63bf0c4d4e0959cc56c05edea60c19abc8b690057bd SHA512 706252708acbdf85edc7374f97bcf87f703275c8e0ba8a1c0f096964904dbc2d3993a07eedc78f937ba8268ca3c4c4c6e307006f97c7a40728efda6160a0d5be WHIRLPOOL ab91f06d2504895babb767f922d8c2022083f0cd0be4d044f4ed70264de536cea4a5ad617e3de032c3c91a1a2a455c3c9465c8b070d00f490e3000877cce1ac0
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-2.3.1.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-2.3.1.ebuild
deleted file mode 100644
index 6d6ee49ac9d5..000000000000
--- a/dev-ruby/ruby2ruby/ruby2ruby-2.3.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
-
-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 "doc?  ( dev-ruby/hoe dev-ruby/hoe-seattlerb )
-	test? ( >=dev-ruby/minitest-5.3:5 )"
-
-all_ruby_prepare() {
-	sed -i -e '/plugin :isolate/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-2.3.2.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-2.3.2.ebuild
index 9232fdee5146..e3f587b67bb9 100644
--- a/dev-ruby/ruby2ruby/ruby2ruby-2.3.2.ebuild
+++ b/dev-ruby/ruby2ruby/ruby2ruby-2.3.2.ebuild
@@ -15,7 +15,7 @@ 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"
+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 "
diff --git a/dev-ruby/ruby_parser/Manifest b/dev-ruby/ruby_parser/Manifest
index f3ea80db30c3..a6d2630327f4 100644
--- a/dev-ruby/ruby_parser/Manifest
+++ b/dev-ruby/ruby_parser/Manifest
@@ -1,15 +1,9 @@
-DIST ruby_parser-3.10.0.gem 413696 SHA256 15b284c9bdf310a41114287e462b63025d64ef1713b05200d62ec5a96df1de68 SHA512 0880b91e78804e1578056eca893e73fbc2f0e12aaf599dc9026f3fc9637157e625f470308e5491dd357fadd128db3ca0acf49de4916163034ec47e3a671300ec WHIRLPOOL ad0a4504b6a7be3df45df943a2abe2ec2c823356244dcbd111f7752b3649f9af9317a5efdd155d83b20c1141dde795163ab3f496610299bedd0b308a9fab1b6d
 DIST ruby_parser-3.10.1.gem 414208 SHA256 454806d4e1b2c606f36f7f4cc9cfd981c8bf6c7485b4e1963850ccdee6e20b38 SHA512 57abb2a972020d443baa46b2866ded1bdd5a5d6d7d5649375e9bdaf0d3884dba23d152db2e50db776bccefc51e0bf1221e1eb8c3a6468bfd5b19b2e47dd16cc8 WHIRLPOOL 5e28b8649db559f67a8c54ea64c26d2eccc615b9d556a0becf0d9f29faee9800e9edbca21c232141efe0c4b8e762d60c22aedc4483657e93ee3e688761183a89
 DIST ruby_parser-3.8.2.gem 360960 SHA256 0c600cdf79a9d925d8c06b65bbefffba34ce7177520d1545659ce03d252f2173 SHA512 c12f1928dfb18e0f3db1bb9b3f0186b37b4add3e4503050eaed5bb44c25e05a10de7e45ab63c0f2a691f0cafb3dfab6137177e9f73e73633dc84a673667a5e75 WHIRLPOOL 53ab19656d58265e94bacbe99826679aac3b6125670b67beca38e6c63511613670b2d5b53955c772bb8160d4211597a803af1de7c57c3d5c65692edba90ab7fb
-DIST ruby_parser-3.8.3.gem 361472 SHA256 482d5eb7ae48dd054d840fcbbddf162fd8beca6c3e666bb6c8166ab82b872a77 SHA512 1d90d9fcd20b3fcfc0b61da118c3f0d8cbec21ffeb6f4a758c291c188383f3a6d5ee68fc3b421c9040e1490688b96e0f551c3b1d85b65f56af7c056b3611ae03 WHIRLPOOL b9b0dcf4d07608f77abb385e86100c5200ffab2dc545bb7671ea023562a3e368e8eca16b139a50d3bf6e092258daeafda4da185ca8bb3c475be94f2f6daa3684
-DIST ruby_parser-3.8.4.gem 361984 SHA256 fe65c8fb428692818c9f693ece50a7d994e1d19b5d5bd50ccbcf6b26ee2f89e6 SHA512 cb0b14cc41a84cf1a96fa942a8b3aed2c64e026fb5294a236d53d53fcce50330a5eb2d1f92101e64fcbc31c5a4fdb026a6d6dc4dff20772b174425ebeb398fee WHIRLPOOL 2235626a4781ef03213009650f4bc072fe4ebe19cf18ce4743489f4c9adb239eca3e66850fd31b209efcf1d25e4278375ed1bd5ea04f4b77086557b7e6102c0a
 DIST ruby_parser-3.9.0.gem 411648 SHA256 76e4888893b75e563a6f60547d91e759469504b9b37607990eeced58ab5e57a1 SHA512 f609084d82caf4c33a40b64ee9df473375f00c59a34ec5b419f155a54a7fb9436ffb77ace406a01974c6c0d7b11b97447da0b3053c1fd87c66eb0406a0150312 WHIRLPOOL 6744e5ca09a555865cc7ffedbdcd5a4ee81c37ebd48429bf471ca78e6a5b3b63e25d142d3e2f8f3fa85071e233f7a644f4ddc548abc5ff9923ab32eaedc708e3
-EBUILD ruby_parser-3.10.0.ebuild 1084 SHA256 666bddef4226d1c8bc7c42fd81521f326dd2530e802d7bd8d6acbe006e34119b SHA512 b8319def22cb90240ede21b0a9b5527d599c959c2b535f1582d76b6f9abbaf6b6724b10baacbfc78a02e777908b5296b8951f3947be02f17551d9de796fe8e14 WHIRLPOOL 568642ec99dbef09fb497439cc23c0a9a1450a9302bdcc0f317987b6222bd050119587d2f5074a3aa436ff3a9a9c5e6446ed3f46104af57ed46ffd106c1883ee
 EBUILD ruby_parser-3.10.1.ebuild 1084 SHA256 666bddef4226d1c8bc7c42fd81521f326dd2530e802d7bd8d6acbe006e34119b SHA512 b8319def22cb90240ede21b0a9b5527d599c959c2b535f1582d76b6f9abbaf6b6724b10baacbfc78a02e777908b5296b8951f3947be02f17551d9de796fe8e14 WHIRLPOOL 568642ec99dbef09fb497439cc23c0a9a1450a9302bdcc0f317987b6222bd050119587d2f5074a3aa436ff3a9a9c5e6446ed3f46104af57ed46ffd106c1883ee
 EBUILD ruby_parser-3.8.2.ebuild 1102 SHA256 8b1fd7918c9ecb91b7ebffb73a634d5e1ebd383cd0e87ce1351f3afcb4c50bb5 SHA512 1e371cc0b93de83a14566ef1fbcff3958b57538bbc6c09d3d71ec20ab5d508a2192cb12aa001a20f9e045cbdc1aad76e88508dd8e17560fa597550de0e7cc8a8 WHIRLPOOL bb355ddebebf3bb7f0f0639a9954640f9b90c1e06962288949c1fb91c70a8ef41923b24e9662517cf1648976d11b48fbac85a8c60ac61472be3b4e7f7efc5a0e
-EBUILD ruby_parser-3.8.3.ebuild 1106 SHA256 4765e9a8de2d4cbef02062f6dbcbfc9842cfcee155f93928d0f9695e8bfd00b2 SHA512 60437946d4dd107e6465d23fd26b6bb1dfb45ff4a2c95093a468b3d00c5214d91ed9641a64457dc620664b8c80c812cb428241795ffa12b6c6e2b2dacd27df4d WHIRLPOOL d586ce90ef7797d0155a6b3a4791bbba1ce12db9905c11edbfe5bc1c40c88b5fad9b667008d2c29a39eb0678ed3a449fc69a20111313ed2213847cb999e20625
-EBUILD ruby_parser-3.8.4.ebuild 1084 SHA256 609724dc892baa9d3daf49209233a8b49e82ba28fd8e7ea7195b2cb9e8a10790 SHA512 0e15b5fcf8a4c1acc1401f50dc31e522049b348d601674301f8a2eb592a2acc3cb334fefc61366cd4908f2f600a8904cc1f9f61148efed37e3310bdc82f26c7a WHIRLPOOL 3873a2dd8c8714b40e06a8c95fb57319845b69785e6ca925bd886dfe3e3ef27899cbc6554864f1edcd4d8724e5dc7fdf09c1483a4e39c86fbf152686092adff5
-EBUILD ruby_parser-3.9.0.ebuild 1083 SHA256 824e8d5f2a29a575d343c5455e33244512329a80cbcf3e3565f4377360429626 SHA512 830f2bb5166f9b7e04d99b40ef04ef311cbdba79e7ee74d24a648331c809d8df770e5d3ca7ee11d0de8721ba289c9cf5a9fc1d579e744a3e8c2e5cb130b540d6 WHIRLPOOL 5d6afe39dc843d83d82d76e1fe55e516355000f32af2f0538dcf06f741b7995c8c9856f8badaa09c3fe3d2165f4207c54dc9251c659ac622d8f1dbca9faf3d0c
+EBUILD ruby_parser-3.9.0.ebuild 1082 SHA256 e2572cb187b4258e24564c4a2fe84287dc1df8e61318d5f981a44db7ed0713de SHA512 9511632a6cb66f7a5f6bedb7d045e203b55e69ca979f03de78a45ae5b8225e6376602dc649801c63849144ba841b63c35fb43b0417921960d215af4dac8552b0 WHIRLPOOL acf838d82cbf41ede3c6b02e227574b9a2c36b30d956ec5d07672dfac5963c8b480d65d3bbf13bd3f576404d558b7bc507722276f0cde7fe0fd356531524db0d
 MISC ChangeLog 4926 SHA256 e2ff30439f6c5b98423eb5755fb07c2a5e4eef5bc1d652ac93cdf9566638cd6c SHA512 5c7a921a99d8dbd9bef9d112e604d8d58a8541b000d440d1988e4dc97f3a0c568d8ee3529c4063de33c2ce99c9151b1a671a045f3f602a74ecd7e01b52dc9dc0 WHIRLPOOL 6af65514aa176b7fb6019cbb41bfed8f8bb806f3bf472b15ee5aba017b91db9c3faca376935a34d504e22c11015b4eba15f8450950667b9d9874882889d58809
 MISC ChangeLog-2015 10968 SHA256 4a33609c43328b9122c85d1d890e6718dffe6e9bd49b7f6dab091df9140c1f3d SHA512 6fd7c77ad2ddb796f28615caf0d576b16c27bd1b4d91fa1b5c84e90bee4b01884f8af22f00cac0e5883a855b9556a972e053f7b62b758d299a5dd8ad6100cce9 WHIRLPOOL 2dee291a14fc67e7fbee5dc4ee78ea0409edf617fd797c9e35fbb9f076799b98783b6d95b4b20bae554bfe40bb4d02a66b0b241cc402e6893ccd454a51d732af
 MISC metadata.xml 347 SHA256 9cb966ff9d832b4b73027e1d5f389ca9ca6ac1f6d4b6a810f27de2eee94d2099 SHA512 ff141bbed5bdb7f610f87c5f8040889784f9a3a1f7a2f5802d0ee52a2a3d660d7ef2e8e3cc37af9c8b549433447f1d523b4864a6175efab755a3009c99c59632 WHIRLPOOL 02b1490f623f5d6cc764eda0ab774bec61b3c733acffaf99fbbcdf23193be149e94b2160b1ca4fd4cfdd2d8d64a1bb092ec8d0a4503e3245cae138dd5bba8d05
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.10.0.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.10.0.ebuild
deleted file mode 100644
index cf010a3f4d3c..000000000000
--- a/dev-ruby/ruby_parser/ruby_parser-3.10.0.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.8.3.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.8.3.ebuild
deleted file mode 100644
index fbbd38740ad9..000000000000
--- a/dev-ruby/ruby_parser/ruby_parser-3.8.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
-
-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.7.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.8.4.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.8.4.ebuild
deleted file mode 100644
index 27e414222706..000000000000
--- a/dev-ruby/ruby_parser/ruby_parser-3.8.4.ebuild
+++ /dev/null
@@ -1,35 +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_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.7.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.9.0.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.9.0.ebuild
index b0a7e5b89939..2af0105a03c8 100644
--- a/dev-ruby/ruby_parser/ruby_parser-3.9.0.ebuild
+++ b/dev-ruby/ruby_parser/ruby_parser-3.9.0.ebuild
@@ -15,7 +15,7 @@ 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"
+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
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index cd75612396d0..3843812e785b 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -3,10 +3,8 @@ AUX auto_gem.rb.ruby19 509 SHA256 f0f7f61b110955325be52d278fcc1d3f3ea395cd9523db
 AUX conf.d-gem_server 81 SHA256 aa850780bebe0e31da9732d8707a748567ca72716fd91e294dc712e71f82db2f SHA512 71630a0530ec62f4024d9bfc4e6afe1f409f3bcb5d71ee5876d1e190c9e69016571ca8f500fcc7ffea6cbc36a8dab5eef2d0c61f72de99f2776c9137010b9ccd WHIRLPOOL a99d35afa6955ad585d5e2433648130ea50065dd1f2cd1bc3763390bd20740ecd6e144a056da5067190048a9a47de20b6156e6b70c64348663f13391974978ae
 AUX gentoo-defaults.rb 972 SHA256 c0f821041391c262754a5caf7314562137218119eb3510b7edfc070462c3ca57 SHA512 fd5a33c433041efeefba4bb8d550b8db66f31d4c0966188f07943f4f575ee9e13da6ef6fd66f89a4b3b979c5b310d96e2876407b79aee6ed404ca3027859160c WHIRLPOOL f31f380016108649bcf64feff752a02f1c464990cee97f89f1bb4017225968d04d684c24142c4123d2ee987783189d318c444b80953f80504c5857b939e88ae4
 AUX init.d-gem_server2 503 SHA256 f2b2aaa83e69482e1dd6b71c0c0c4b82375029d4e23f6347e8c5560b62840579 SHA512 8b9386b93a8ef43fffba5a8c4c5232265a9b0d146d24839e75874721d3377ae0c3d0f52f14592e54c9ee94d26d7a81bb125b25f8c270253cc27e4a76dd64757d WHIRLPOOL f900230bc3a753d764347e209b937c91bfca456d36416468dbdc91b7e6056444f8de4cceb2c89a1b501db0dda1e3941ccc04953c2b9dcb16e9e4608032e568f2
-DIST rubygems-2.6.13.tgz 768906 SHA256 d041502ae77e8d49e0a436483fb91f9ad6cc1489e49e0735e7c4a7cf10e728c9 SHA512 c952b6061a9a0778db304c3aa5bea693e71ae2564abfb19f8b123eef66eb1e3877fc7c36f4f1527da97bb320870cbfd4574ac57ad88e850a44fadd67ebdac152 WHIRLPOOL b03b7fcc9b4e84f1692afcc5d7111e75ade5fe777ec73f6006580e65be1f23101f0c29b9d2e9f9af5d66bb5f46ab3919cd11e37126758e9edd66609a47085739
 DIST rubygems-2.6.14.tgz 769418 SHA256 406a45d258707f52241843e9c7902bbdcf00e7edc3e88cdb79c46659b47851ec SHA512 7743845bc5265df3782f85a23896cbb250d8a2bbc9934a27f274b001afa7aa62f7f00f616296f74747ea612d2cb37dd7f533c931aa72550d84c64d2a73d60daf WHIRLPOOL 61f64c4172d33f63a12ddcb08a331fba55d33cdee2ad75e4307d94979df46e8235b96944217f7d3316abf59b06927d12ea206d14b058f9a4993609cd912eaeb3
-EBUILD rubygems-2.6.13.ebuild 4064 SHA256 8a7338cb8c4b8997eaa754e8adc841ccea1fc015346f9759268cc5f1b20100e4 SHA512 c8671ca33ba19c8629914e0743bef1b5ba3e0d09dd094463586e99659d99419bbb13202a12d2a9c69998102a2a6e314cb7aeabeae4840a89ed315cba4af50fbd WHIRLPOOL b2c77bee1d1dd051cb74e444b46bf6bb021269c7e7d0add53eb101728f8e1695ecb5cc76faa09ae51ef40128000f4dbd2c80b8e290552ee78375dae53a2fdbc4
-EBUILD rubygems-2.6.14.ebuild 4066 SHA256 16f2e2270d6e5cdb515254d6ffcecc97dcf92fc4a202e689083ff57a49cbe269 SHA512 3c03a1f98ad959e7e813b43adde18253a018d3ebff4ba6cf4433ddde5f05e0f6b6f29eb52da4ba19c0f7e4c4a7b41a6ac486f5cc6ff562962cb0afa0b59622d4 WHIRLPOOL f0ffab4480a525eb1347cf44e8643eaf477940221b766f16fa8b34d27f626831a973ff878af46bd0e094fd87a15be48a911f06a20c858febf88f421e21c6fa03
+EBUILD rubygems-2.6.14.ebuild 4064 SHA256 8a7338cb8c4b8997eaa754e8adc841ccea1fc015346f9759268cc5f1b20100e4 SHA512 c8671ca33ba19c8629914e0743bef1b5ba3e0d09dd094463586e99659d99419bbb13202a12d2a9c69998102a2a6e314cb7aeabeae4840a89ed315cba4af50fbd WHIRLPOOL b2c77bee1d1dd051cb74e444b46bf6bb021269c7e7d0add53eb101728f8e1695ecb5cc76faa09ae51ef40128000f4dbd2c80b8e290552ee78375dae53a2fdbc4
 MISC ChangeLog 7072 SHA256 bd2bc7bccd485cebf61f987e368bd367082f05f4d0de7eef72268a17a37f9ff0 SHA512 a5b6e17113533e24f48757d1c02cd7a9c95c209a01d49c5ccc00b4e51ca90bc33a7c645aef0d43ca92b3db182b91fc823bd2e3068b112fa9744b78937cf72fc0 WHIRLPOOL 2d1853337f923ad73b3e30304013b9a169299cbb4df69863d18adb30fb506b386973d327688b87340f64566f3a468ddd7dbacc25662733c9c758038376c07b9f
 MISC ChangeLog-2015 41896 SHA256 305d77cfe24e0470947e40901d582b1a2973e1f7f37777730f655f4576cec23f SHA512 bc2cdc365c3dc0efac2e30a02e9d9d6333fc2fd023c27ee038e1614c076c10abe2890265a62c93763794971ff9821fdf2cdd1d62bf8514c2bb29118b671cd61b WHIRLPOOL c91c086363e286572b483c5a9612b75a69351cdcaa651612b26341c0c795602e7c8dfbf1df66661f6f410d0b67f0b6eece369742fdc5a80ca837fd9c7c9410ee
 MISC metadata.xml 335 SHA256 bab66dededb00ca646623a09584d00c8639c00aa41c8827b5990358cd023e6e9 SHA512 fd7bf880ad68fe5f1fe8eb79f9662af87831ed499517d5a97e22f18a4ddafc69d53118f020e15c3b8b171fe144bf6cb0ce799beaa6e4e4bdc01c984ab582388e WHIRLPOOL 660543fa0d7e9aea36220a8f98a9e7f39ecd180533cf712c101766adc45bea546431287af302737383337c32d597efe7983db6500453b109ffa51dc13093042b
diff --git a/dev-ruby/rubygems/rubygems-2.6.13.ebuild b/dev-ruby/rubygems/rubygems-2.6.13.ebuild
deleted file mode 100644
index 1740977337c5..000000000000
--- a/dev-ruby/rubygems/rubygems-2.6.13.ebuild
+++ /dev/null
@@ -1,111 +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"
-
-inherit ruby-ng prefix
-
-DESCRIPTION="Centralized Ruby extension management system"
-HOMEPAGE="https://rubygems.org/"
-LICENSE="|| ( Ruby MIT )"
-
-SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
-
-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"
-SLOT="0"
-IUSE="server test"
-
-PDEPEND="server? ( >=dev-ruby/builder-2.1 )"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/minitest-4:0
-		dev-ruby/rdoc
-	)"
-
-all_ruby_prepare() {
-
-	mkdir -p lib/rubygems/defaults || die
-	cp "${FILESDIR}/gentoo-defaults.rb" lib/rubygems/defaults/operating_system.rb || die
-
-	eprefixify lib/rubygems/defaults/operating_system.rb
-
-	# Disable broken tests when changing default values:
-	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
-
-	# Skip tests for default gems that all fail
-	sed -i -e '/test_default_gems_use_full_paths/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
-	sed -i -e '/test_execute_ignore_default_gem_verbose/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_cleanup_command.rb || die
-	sed -i -e '/test_execute_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_contents_command.rb test/rubygems/test_gem_commands_pristine_command.rb || die
-	sed -i -e '/test_execute_\(default_details\|show_default_gems\)/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_query_command.rb || die
-	sed -i -e '/test_execute_all/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_uninstall_command.rb || die
-	sed -i -e '/\(test_default_gem\|test_check_executable_overwrite\|test_require_works_after_cleanup\)/,/^  end/ s:^:#:' \
-		test/rubygems/test_{gem_installer,require}.rb || die
-	sed -i -e '/test_\(load_default_gem\|default_spec_stub\)/,/^  end/ s:^:#:' test/rubygems/test_gem_specification.rb || die
-	sed -i -e '/test_uninstall_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_uninstaller.rb || die
-	rm -f test/rubygems/test_gem_indexer.rb || die
-	sed -i -e '/test_\(require_when_gem_defined\|realworld_default_gem\)/,/^  end/ s:^:#:' test/rubygems/test_require.rb || die
-
-	# Avoid tests playing tricks with ruby engine that don't seem to
-	# work for us.
-	rm test/rubygems/test_gem_request_set_gem_dependency_api.rb || die
-
-	# Avoid test requiring network access
-	sed -i -e '/test_download_to_cache/askip "requires network access"' test/rubygems/test_gem_remote_fetcher.rb || die
-}
-
-each_ruby_compile() {
-	# Not really a build but...
-	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
-}
-
-each_ruby_test() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	#unset RUBYOPT
-
-	if [[ "${EUID}" -ne "0" ]]; then
-		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} -I.:lib:test \
-			-e 'Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
-	else
-		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
-		eerror "Testsuite will not be run."
-	fi
-}
-
-each_ruby_install() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	unset RUBYOPT
-	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
-
-	pushd lib &>/dev/null
-	doruby -r *
-	popd &>/dev/null
-
-	local sld=$(ruby_rbconfig_value 'sitelibdir')
-	insinto "${sld#${EPREFIX}}"  # bug #320813
-	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb || die
-
-	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') || die
-}
-
-all_ruby_install() {
-	dodoc History.txt README.rdoc
-
-	if use server; then
-		newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed"
-		newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed"
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-
-	ewarn
-	ewarn "To switch between available Ruby profiles, execute as root:"
-	ewarn "\teselect ruby set ruby(21|22|...)"
-	ewarn
-}
diff --git a/dev-ruby/rubygems/rubygems-2.6.14.ebuild b/dev-ruby/rubygems/rubygems-2.6.14.ebuild
index 3910d2646da9..1740977337c5 100644
--- a/dev-ruby/rubygems/rubygems-2.6.14.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.6.14.ebuild
@@ -13,7 +13,7 @@ LICENSE="|| ( Ruby MIT )"
 
 SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
 
-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"
+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"
 SLOT="0"
 IUSE="server test"
 
diff --git a/dev-ruby/session/Manifest b/dev-ruby/session/Manifest
index 8048e64022d6..a9ce5403b8c8 100644
--- a/dev-ruby/session/Manifest
+++ b/dev-ruby/session/Manifest
@@ -1,7 +1,7 @@
 DIST session-3.1.2.gem 17920 SHA256 4fd787c21b622e65867082187434e15a4cc5c8a1e895c347242e230655621d9c SHA512 ef0e8aac6776ffec6ead18079148a9ff65f5bd2699344680dec4d1ca1695e6e159d9e8174fabae7d629c5b019d9571d50930fd6af89e1f221d6662b56ae63e16 WHIRLPOOL bb45b43f27beb222d195ad9e9c86421089da2e4e803f5b0f91feca9042ef8b5c727972ed90fb3232231eb96f5f1d61bace30155c38af4ab68281120b78fb79ad
 DIST session-3.2.0.gem 18432 SHA256 e9d97adff2662aef3fb9524b62ac2fd9c09ad48ee01bb9287b77331e1566fb08 SHA512 57c0676fb4a4254e86dbe68e36309c8eb85515dd659de73a87e1ae2e8e5dc7f979192ef665135e75182c26e2a5c847d61daf855639772da7c66af888ed0dc91a WHIRLPOOL d71b084471a57d3401385b2781b547d00ee934a5eca0270bb4ded636683a8f1afb0a271e787d0daecb663241d04b425678f7a54671e2604e2a6ae6bc9525fd9e
 EBUILD session-3.1.2.ebuild 1115 SHA256 488ede5873faaf8e55288c1de596805c5aa864dbda0f5cc1bedffa0d6dbf8e19 SHA512 798be3c9c4df5918f6a963b3204b17aea49246d1eba43edac94a98fa6d5ab6a0d08b5e6bb03fc45c2f4a3f66ff51860d7ebeafff71d7aa1aec67f5b9abacc228 WHIRLPOOL a5c36ac7c45c5a01c39e5952224593c425919b1a0d03acdcc8dad1bea06fa150d08c3b80f367b6a686db92dbf4bd4fb8a22652d0f4e7804ce04e5a1193d70afc
-EBUILD session-3.2.0.ebuild 1131 SHA256 ecb5ec1a14280b49b90576d794b3b7082d1bdc4e371c16f9545665c6fbd04ca9 SHA512 1b670dc8a4454d3065bafbc6f0bad785a62be8dda216f9c219eedc942a4e987091d7451234dac689978d80c3c71fd7f207fc582917818414f7f41da3448d867e WHIRLPOOL e74874301b3a2d0e4560f69597eb3445d563bbc67f674139197534e0b416f2774b49425514a9e1190741be3de03ebe901c7a69b4cafb09f4264b5c76e9b5336a
+EBUILD session-3.2.0.ebuild 1129 SHA256 7a133436fe1f45eba43ffc7802cdef0658dec3a8d71b66fa0893d84b014c46e4 SHA512 ea7791d6ecdf664a62bf05020aa6ce9b005e7131378fdcc2a2b992981098c09ed8b5b46a6c89858ec76d8dc433663c5cf3f72b0e543743c4606b448f89caae5c WHIRLPOOL cf35be770d3238e99db28b306eeb8cb8a2df348c23a6a9a0e531870804d96fb05914b19d03629f18c707a92665b995ac2de5b673e513f8252eebeadbb07b0a86
 MISC ChangeLog 3148 SHA256 e770b417b22c6b83184272fcaf37920012e5746e44208ff40bfa788a5d596fc9 SHA512 579ccb8f0fe466b2492d7bfb603084b8db4d27af6aeddd18ca37856e46b2b9addc7fd2244964127cf25185f49bb98a74af9ed32af78bd7c78454ba50d808e2f9 WHIRLPOOL 174ccca36cb897eea4e5c5561db46cfee71452213e8e35d98f6291520f4bcd315a63a7db56306d8ef9f12c7ac240db645dc34a3bad58219f523bfd3421b96236
 MISC ChangeLog-2015 6504 SHA256 e993d2513cff196e68755ac3c2613c0afe23453247ce36aa82b423e9b642bc13 SHA512 fa845a210196cae659ce2db20691551f550c5f432274985586a3890436613d635a34d7069624ab797fed4878b504070d1ddaf3c2a7fc10e9834d3dfe45fcb456 WHIRLPOOL df0b3cd72dae2fc281f51ba4be0c680bcc572e539061109eb124de4b92f3206296626823300b8786b938dfe675da63f96823f04d841af9c6d6fcc3f743d69207
 MISC metadata.xml 247 SHA256 1236c1552dc683658bd5bc3c5f880b71d9dfa13025edab4a0f8973f9eaa6bcf5 SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09 WHIRLPOOL c1aa829db3553d79fe71a8bf79fd6ea24e9fff4e591a4ade3c05e2a97b0df352170fbce76450c0402ec6d8998951c2f3eb3e198ac4638c0e0882208b9f4d8fc8
diff --git a/dev-ruby/session/session-3.2.0.ebuild b/dev-ruby/session/session-3.2.0.ebuild
index c694ab5e9391..025325f7c160 100644
--- a/dev-ruby/session/session-3.2.0.ebuild
+++ b/dev-ruby/session/session-3.2.0.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="http://codeforpeople.com/lib/ruby/session/"
 # by author.
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND+=" test? ( || ( sys-apps/coreutils sys-freebsd/freebsd-bin ) )"
diff --git a/dev-ruby/sexp_processor/Manifest b/dev-ruby/sexp_processor/Manifest
index 59bd3050f9ad..6d55f274909a 100644
--- a/dev-ruby/sexp_processor/Manifest
+++ b/dev-ruby/sexp_processor/Manifest
@@ -1,11 +1,9 @@
 DIST sexp_processor-4.10.0.gem 54272 SHA256 b67a289ae4a3968d93dab0803d0ef5a262b6f94138ab98072e489d2aa8af4034 SHA512 6ab067d921b8ad9f88fd35b942f0c28c3d8d1ac17cc85e73774c97cd4cdd5f91dcfb9392ef0337a7b3ffcd8dda8892f0d71c9323d45f453819848aed52965019 WHIRLPOOL 41033409ef15f14de06127b9b1bcd46197389e59e959c8ef5ae3b31c01a7979e223d529b158394f10b1431c70d39c7161ef8d33b3e8c662e27a584a28be43566
 DIST sexp_processor-4.7.0.gem 39424 SHA256 963a1f5b21c95595fb3cf1e8531784bf3d8fe30302cf6f271b08aefdc63e453f SHA512 6c48853f2eaca37bcddb097f6677d37835171618e4209d07baa1f361d4cdf4ce95a11f892b6b258cd91e51555aa046c404d8970560618b4e8a86fd0d6dca71c7 WHIRLPOOL cad0c31e6aace9066be2d400d392206c7b9f71b2fbdbe072d0a1d98e241acc15f79c0992d45cffc261284f751d1b5046380254b0f050f62fbdad0132437e3b8a
-DIST sexp_processor-4.8.0.gem 39936 SHA256 5b9325f28b5be80ba8d43b7660f60ad67c9304fe8181dee89d3a348b13d2fada SHA512 041f4ca8603359ff37c408ca0f6bcce39145928f7ac5dd3d59a50142fb4ca8c41f91ecde9a5d15ac6d06ee5be302b609a5091bd6a7be5ad81f861685567a588b WHIRLPOOL 5892a4d0d335bcba5d1442ea75c6558eb4d4ae1942088a1cc5cbb4cabefcc8eb531dd5ac357a72a0d36d130976b4d9d2c4997874842d2a08a634e0908146007e
 DIST sexp_processor-4.9.0.gem 40448 SHA256 333619bc71d563ee60f26fc5f3a7f57bd89ee3191177fdce87a014dcb1b8d3b0 SHA512 f73b71fa436b73db3adb590f3273904474f2a8575377c0ea9184c2dbe8068b3c673f74657e949666fc04d2028efc22f81c14488a5484c66e2b6810afdbbcc531 WHIRLPOOL 290481f3116252faea6371a5e4795f2321e90f093c5cd0f72f6cbd7f98003df29d6330198824abe23a5d0a5529d864e0ba4598a4d2507a7d86e2e267515a1c2a
 EBUILD sexp_processor-4.10.0.ebuild 763 SHA256 eaa2afa652e82b6f925c9769162489810fb6b2ac69cb0958de9626769b0b0bf3 SHA512 a244563a1df30a315dbc8b10c80799a6b2694a6a00fb1bb6e1cd8d78916d3e14874b3ea183c421f3a7f9a9cd1e1300dcccf4490523098dd2a47803b450a57f63 WHIRLPOOL 07736013c6ce3ee9f96be37cc186a18dd16eca005f630e2b9db6da5a1c0cf3a5f4eee6cb3386d2cb45d30d6df92df1b8eb18abefedf524c98830576f452c6230
 EBUILD sexp_processor-4.7.0.ebuild 753 SHA256 b9bcf569dbc29253e6ddf78f50296f697ea9b2bab2cbfa9b35b3fcd8f84fd5ae SHA512 e0cd168e5113fb5fe8c0935c00f174ae2249104a605a97ab1b0fcb7ae143e39b8804e436d73695d8b01a471fc756fdd0e522a4bc9d17858f3a640e875850bda5 WHIRLPOOL e1f8c85c45cd3130dab2affb7a85c94cf8868ccc00517ffc5b71660f88b24ac3185cb4439c3a64a3601f857e765a8c09c9941d20b0973b92c6d3f2648be9bbb4
-EBUILD sexp_processor-4.8.0.ebuild 757 SHA256 ca02d9d1793e117925be88c1c6c524037f5c1da6ff7fc9e936e9636f8cfb4d4e SHA512 b740c33e878467002e36149f8f01cdf6d145c4282900ac9bb25b2109dd42c6192df7749f258d938e83bd47f2e03fc4de7540a7830519bdbbc5cc570c77706f3f WHIRLPOOL 31c95119e1b375e4664f1632690ab3970cd33a665364869f7fc98e640dbb67020ac2843dc694f3906649b6df7718f59fc87798691df41f374ce97ac667c05cfd
-EBUILD sexp_processor-4.9.0.ebuild 762 SHA256 c03127808ee2bdc6c3f1fe0df5305cd43b831dc020fe8f645db238c697729518 SHA512 a63821c8ed4aef7ef6001122765e0bad059597918510d98714826a72b3ab49fbcf3fb51a7751ad902426282efb25b687c4cea7f8b93cf20a9dc7183dd94efaf7 WHIRLPOOL 3d1664861e57f352fceabebf2e8e0b96cb4cff556805704e2f3be458f18df101c5168c776604506eaf0717ac000c0e2079c98e9da1ecdf694ef803b886ec6bd3
+EBUILD sexp_processor-4.9.0.ebuild 761 SHA256 a84d237515d30f682fcac96acc690de96fd95d76575bdf64368268d7027919e4 SHA512 51536780c7484bfa612fd4deb568b3e894dd59d3af4e855d14086760d558ff96ecc1b1442b986c16e452daf1e383c053eb15cd6fd7dab787c4b34c0b6b8c1621 WHIRLPOOL bac73b380e3b65c01bfc905c748376eae456aeb33ede211bd91d0442113bb0190b4b7ff1422275e1e21db8944d8e24c34e4511c6ed999e73209a3ba2a84b3a5b
 MISC ChangeLog 4599 SHA256 6bd1705a8191ee272f50ef98d1e99870d86855b4a2951c2e80e46065704264d3 SHA512 4bde63a43bc332365a30a0f9fd2cafc7da3c51759b8d31f730da16dbd20a6510a842c4c1d7c6064e4222d3c4fd4084f41799fadc4dffb55ae010237bdb41de71 WHIRLPOOL 74f2401950daff649b7c1400e32c70b12d54296a5cdd54b4205bc424e3e45999bdb25bae185d5d87b2be7a1b7fc55cc171c28db9a0a45f1127bb68b4beec563a
 MISC ChangeLog-2015 13203 SHA256 6a1b2f4386767c739ea8664c5851ce3afdcf3c18af53d2cc561b4f87bba625ec SHA512 6d3445b427618ad1a2d120158c1c518abcf403a1268b9d771147a426d12acf14a061bfc42403b4ab6af0e8f22adca101f5c8dddb713c023005f2ac0ebeb60197 WHIRLPOOL d41278c5610ffde9bb5769946e6b936d487aad3d52ac2dc7ee170fc73b9acf4d0d1f415695c877f92866148132724a54563d5dbd596104123d96806b32be7a86
 MISC metadata.xml 247 SHA256 1236c1552dc683658bd5bc3c5f880b71d9dfa13025edab4a0f8973f9eaa6bcf5 SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09 WHIRLPOOL c1aa829db3553d79fe71a8bf79fd6ea24e9fff4e591a4ade3c05e2a97b0df352170fbce76450c0402ec6d8998951c2f3eb3e198ac4638c0e0882208b9f4d8fc8
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.8.0.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.8.0.ebuild
deleted file mode 100644
index 0baf9127b605..000000000000
--- a/dev-ruby/sexp_processor/sexp_processor-4.8.0.ebuild
+++ /dev/null
@@ -1,27 +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_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="http://www.zenspider.com/ZSS/Products/ParseTree/"
-
-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.9.0.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.9.0.ebuild
index 46139c51835c..11eaf952e804 100644
--- a/dev-ruby/sexp_processor/sexp_processor-4.9.0.ebuild
+++ b/dev-ruby/sexp_processor/sexp_processor-4.9.0.ebuild
@@ -16,7 +16,7 @@ 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"
+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 "
diff --git a/dev-ruby/term-ansicolor/Manifest b/dev-ruby/term-ansicolor/Manifest
index 92535b234780..b625c30454fb 100644
--- a/dev-ruby/term-ansicolor/Manifest
+++ b/dev-ruby/term-ansicolor/Manifest
@@ -1,7 +1,7 @@
 DIST term-ansicolor-1.2.2.gem 889856 SHA256 b9534713ba4c2a48f2291fadf9ce2edae9f2dc96157ee812fe8fe16a70c081ac SHA512 c1ad873f47d2d0d0677d9c9229531cc341ab1650acf5b9a7704a4739796c9b7dfa6357ce60708b3e0efeb342837d9f23acc178005c4eae6b077a27f20a69eb15 WHIRLPOOL 5842abfa00a8a79f11fe6ebcee154fb2730c75786e45414ca382db946ce3d65652d6c5c8164988231f982100fc02e22612206eeb7cfe1e3e2985343316e12e0c
 DIST term-ansicolor-1.6.0.gem 43008 SHA256 ebcc930f9f8d564a457285aa4d0be41f8b8e9d9871a339bbc7631f2869c23cac SHA512 574999d67f3fe167aefe9b11c04dc34cb4263c4eb105e147933def3a90b5bd7acccd7033a72a66f54fc33dde50f862037dbd8c53951243a7bd8787bdfd237139 WHIRLPOOL a9b131facb9405a6751ee685dd33d25859893f58a6a977ba43d28f4fc6163afd128f6773451bcd5aa5521bb3ec4c68a2b810ae6da9524372848869c64cc05211
 EBUILD term-ansicolor-1.2.2-r1.ebuild 928 SHA256 572c540a9bea9cb34ce501b08da08b7a089cbe6c0635fb5dba703225aa873890 SHA512 951acaf8300c3cdb9368d3b768237604ff1ec09f5d2e0ff389b23f78cf4d10251100e8d0f42e763ad0a9269903462e9803294aceb4e8af635102b40619b4847c WHIRLPOOL cdfb688c953bba2bd59460c9e932a6a5d726015f5518114261807263217fe91809c513fbdddc8a3f0c599e43d68ba938ea6527594ecc98e79d933ac735b4e0ea
-EBUILD term-ansicolor-1.6.0.ebuild 876 SHA256 3947c7b3ccecd978c75ecbd195e1cc88572276bc21dbf66e169f6ee324453a2f SHA512 33ebea28fd965acb7bd4cf99f2ae3824927e15e538071ccf13ca29f1263ef096df704c4e8224a04a52552aac06025e6d9abfe4538b859e6b1a2648a73457253a WHIRLPOOL 1832b5438f765bf8cb7939889491051db3d85b2ff4a114a8f3e8998422f076102e711c5f8a3403b3d7be56466ca441c2d1b7002d0ff82123ebcefb9ee00918b2
+EBUILD term-ansicolor-1.6.0.ebuild 874 SHA256 34a956ab13a94bed03676dc4d082b10c6891271870fbdfb3a5c1fdd71010362a SHA512 13c6e6ffadba38c584337970104cdb79f64085627ebe46532c3e448d39695e79dd9e32452201b8c812c55987fe8822713f827b68c9d7fdf03b3c321db87e4d4f WHIRLPOOL 7c61dd033f537f4a0bad009c6879573b0f656746333c9cbdad2d7d0b4d98d4f3d03fe34492d8451e13cabad2e81f031f8f85389aa4e2e42c29f0f7881bb48fd6
 MISC ChangeLog 4713 SHA256 4b629c11e0c03f70d9ca605281c1a1ee009a6a553f6ce0c1e56001fd8066fac4 SHA512 e3ba20e8657ed8d32d01057edd0b8cc1d8e6f94c264e722fa6d8445c11246b5b18ac470dbe9bcb9b4ff2fd9f2917aecd21e8ddb98e12c4bbfd23eb61a730ff10 WHIRLPOOL 36e9f43c342715dce4876bbe93dd801d4dcfc7f542451ac240c845740f5611d38cf14076b701f2b32cf7035199362609c875d48f612bb28362a9e236032d1d5c
 MISC ChangeLog-2015 7470 SHA256 3a5f6e467686beb98c458892828ecb375b8264e852d5d537778ceab31e20de0d SHA512 8b94a55bbc0799c085d451878455e1ddcbf7e1664990204f00c5c187c0a0bf6a169d9a7a6daa3f0190337bbeeea0b1eb242e23de32e83e0d9825d357a4b8dc66 WHIRLPOOL 812ca90741059cc53fd2a3750041e5c44634d2c58d98db5103409cc7a6252e2bdf5af599eb1b2fb29e2da67a815a16aa2adc08cc126099958137e65aefb7df46
 MISC metadata.xml 251 SHA256 e42b6a84b1ae72e905433686395988601795455bdc99180089f055a3498c4c9f SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea WHIRLPOOL 2408c62b64285a8a340b446568718af55786b22010e127543f28dc67de0c67f1739905e31b7d0e549bfc663ba05ea646c011de5df57505a5bc5ea7a79e2e7639
diff --git a/dev-ruby/term-ansicolor/term-ansicolor-1.6.0.ebuild b/dev-ruby/term-ansicolor/term-ansicolor-1.6.0.ebuild
index 42af26125ed1..c519b3b20f19 100644
--- a/dev-ruby/term-ansicolor/term-ansicolor-1.6.0.ebuild
+++ b/dev-ruby/term-ansicolor/term-ansicolor-1.6.0.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Small Ruby library that colors strings using ANSI escape sequences"
 HOMEPAGE="https://flori.github.io/term-ansicolor/"
 LICENSE="GPL-2"
 
-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"
+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"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/tins/Manifest b/dev-ruby/tins/Manifest
index 510f1654f779..dfeb50d2dea2 100644
--- a/dev-ruby/tins/Manifest
+++ b/dev-ruby/tins/Manifest
@@ -1,7 +1,7 @@
 DIST tins-1.14.0.gem 303616 SHA256 e0bb2d44c6ab89057f38ee0fd1434a66c2eb9a5e0d7ae5c44d916a5b645af0b1 SHA512 9bce95b5d6aa663902a8d9fe5badc029db97658d6bf4fe574ebef670e7041ee882ed8b110d906c0f8dbd506bfbeb2092634d607281260db3a40e310881d4154a WHIRLPOOL c3c400d1282f3e605de9ee110726b50db6dddd0a7e37e7dd9de6bf0eacfc40ba1c54e2667f6f7e24be41140327b27cdc4111647d8268cb8a2f219a857a8f90ea
 DIST tins-1.15.0.gem 304128 SHA256 fab8025041474faf4f182e5d608a811e4f136e957ce67fd0319ac5a34a8f9027 SHA512 c4b69357f4f89c75b8aea713c122bd83759678ab9aac8553f25fbe867dc7dc55c72e54673fe2a17e818c089a4517f62ac20e40597fe40945c742cc6f153460bb WHIRLPOOL 0af17656cb534524544f7fab901597e5c6e66f444ab304a17532099dc4e7c1cec44ac41f852eadf5f25938faa693038958de54a3e0080e8e0a9f54089b8d829a
 DIST tins-1.6.0.gem 299008 SHA256 1f82e41851f343147e8acda8b02a67e990e38d4755e1e7a8de7cd913fcce0a0b SHA512 33d576a0960d841f72a3f3c9017f873d0445fd569ded852d614b4a2b32e59ae784a47246b584bc4e0d16d5be4d63c1d7834b32c2bea2129a75dde9b1723ccd01 WHIRLPOOL 257e019636565081197c3d353396db2937043886696bb6be294b0930a6e1f7ada1a21fd863d1ac29b649bba3875d7d4b868ded70480a0dec0ba27a6764debac1
-EBUILD tins-1.14.0.ebuild 634 SHA256 4ea515ce25b666c3b32eb5acb7a312ab2250e6582cd02f0bdea859da166bbc10 SHA512 b18094876836531c104a4a23d52bff137a2522421fd4c023a7f1d54b3d1bfab48114a6f07b4c7bfa76008a82cbf9a90bf1499dccf6ca95c1f439aa62ede47078 WHIRLPOOL 958dcc5e879f987b7a4fb14179613e730ec264e203f8d7c02c8a6c85854e42e8c462e41e90e3db1af21c99e1aad5024d31a1bd5627123e2aa3f903914e2a5444
+EBUILD tins-1.14.0.ebuild 632 SHA256 e04fceaeb8c202a8f88a49f50bb5a8b65e7fa561aec34124eee502155f3ae740 SHA512 7f699acd28e99825416faed2c1d25d03240cbb5607e26b5aa1a9e86b8bdc51de6a3b007c7fd0fda9e1c27b2fca1684006b3da43e178e15f7e1cd5de43d33399f WHIRLPOOL 8be10b43e8a214cd6330d2a4b1e5c839ae911deafeeb04798b2b456444b7fd5d8f3a9868a46225efd087dd684286ffb047e313b309effa37788097513eeadfc1
 EBUILD tins-1.15.0.ebuild 639 SHA256 e97b3a6f485504702edab72439b110f0c6cc2ddc443bba046d8bab43a4303ba7 SHA512 cf2c36314b7e9a7e37bfefc83ebdfed9d3e68992275714d94ab00ca66e8c7f762d2e1921640dff4401059f6f64d9c991c26d7363a8f4a35029cb1b0942809c01 WHIRLPOOL efe42854da2607bdae06b436ef673442aa0676c7a833ac68f8a92888d27b914f71b69ad8e421f1a457004444f4fe2f7b07b5a301e217ba1118415e053fb7f037
 EBUILD tins-1.6.0.ebuild 644 SHA256 dd1d7d15ff6e8846701aece2413c0641905d8d297edc892705e4a91a1b9cc8f2 SHA512 9bca2773d10f248db1fffc4cd0598de240d852bb552e33e5e5724fac8c60e33cc6d15f22b882f9ccadcc1f6e749d300cf53cc9956b9f2a625f8c953bbbd2dcbc WHIRLPOOL 2929673fdc46dcd94c52d2008bbbc155b49eb68b79e37bf17812878a9fd51fd3c77e18ec4bd1f77c63871922ed0f8a47d85c08286e8177c39a9f32c346df944c
 MISC ChangeLog 6970 SHA256 59f26e818459778e7221cc9e30461c804df81b5e081803dc74e31546c6203915 SHA512 bd663e7aa9805967e145a457a305e0dd960e2c8e3513731d10b1ce4eb0009866d2deb5a1cb8753336d39acac19c5cbfd24270c2a5e6eff266104b2d74ca09569 WHIRLPOOL 6a59c84459431fbffa18c90d67e41147f94cb2afedafd8265b3bab4a7c8e13f10349fd1acd4239ab6c9dde7cc073d29c83b12f9412c44f077e181ff3182ecd15
diff --git a/dev-ruby/tins/tins-1.14.0.ebuild b/dev-ruby/tins/tins-1.14.0.ebuild
index 125266a7e504..4abacc3297ab 100644
--- a/dev-ruby/tins/tins-1.14.0.ebuild
+++ b/dev-ruby/tins/tins-1.14.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/flori/tins"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~hppa ia64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
diff --git a/dev-ruby/tzinfo/Manifest b/dev-ruby/tzinfo/Manifest
index da3402e34070..af8637c83791 100644
--- a/dev-ruby/tzinfo/Manifest
+++ b/dev-ruby/tzinfo/Manifest
@@ -1,9 +1,9 @@
 DIST tzinfo-0.3.53.gem 301056 SHA256 7e16e6ed8c0c44c0d1e581f3b21bbaae9c8ae206c243dc1cba4368270d8fb83e SHA512 f5a0119c04852845f1e4c8db36a2a374f2886ee5a14eee74ecacf19bc60bdf3e65197ee2ad1fe4fee56ac882b2e7cf17dcb4fef593767675e1fdb3da33b31b24 WHIRLPOOL ff3cb38a531a4f3fdcc8bfcd0a5ded8f18f2e14fdc27f51c0c57b7b758ec9b4096d10d1c90641f031d01b18c60fc791a2b48c4750b3d9b5e26889c8ad8972518
-DIST tzinfo-1.2.2.gem 147456 SHA256 fdb1d3fdf2776d490c82a0e589a08e7cbde70ac1ae7d2b1f0b7e77f3e6b801b0 SHA512 717f5bda5a40e8225446c4ff413746a526682e5bb58e5047a2d1c8d0769cadaaca612d1f01c758fab5751f81f285156d77abbab08131de627a62def1a4e2eeb1 WHIRLPOOL f49a1b91f6765671043c4a7435df0cd6dfb4b5d55b9305b6fec0cde790708e90adf0d30c966000bf88908e4b2cf39c508d9a1f2dd1b352b689f2c0f4a2d2b6f7
 DIST tzinfo-1.2.3.gem 151552 SHA256 9469862963cf5e8f12bb7d1cf89e681ebfee417537f6835b2e471c7c260d2817 SHA512 79a0c364d02ae1964e032586546073ebda3af822cbc064c06927cf48b7c9d0577ad38a738dc4e7065fd8a56e5a7939290e74031d850172635906744c841a6d2c WHIRLPOOL ed678c620c95a565da1f3115c78545602cb5cd66018fd33d2f3f2da82a8bf4fb015b3a94614d3823cd3eb52a8e71b7b21b00f1e5cdad17e315ba4a4d75f6ec62
+DIST tzinfo-1.2.4.gem 152576 SHA256 f7e79ceee9d0a9f64558f865b9ddaf471c31ff6d6c2dea04b1951400635eb725 SHA512 0b983aa6b4fdbb3c49329bb51394f1edbeb6f4d216d108448aa9dce751dbc2e348d58032cb41df78a3d249611770e9e345a4d0041597ceadf052b863c3e6d1ab WHIRLPOOL 9af06e018fda9a8d5f8041cfd5b1aff5fbdacee4fae304172c2bfd8e425b827a55ec119b4e7f213ffd074dd1b8b0432f2950acfa270a97713f153eb323b3afc3
 EBUILD tzinfo-0.3.53.ebuild 1036 SHA256 2560f0cd1bf4d4214e769913c0cf1d34cdb01e386cdd243550765182239129ce SHA512 c9b199a435560e3b821071bb38ba999020b941d4db295740fbb80f7c6e3cc43fa80429145c7ea9cd3c36981a08ad188c189cf83ceab563f38590e4669d12552e WHIRLPOOL 7427defe8415396b48c70311bbbe3d21f9820090987b045a9da56ea7479d2996c09d14318909172ae18219e73d93604fa4a7841d29d1a9e46288e1202c8ed9d1
-EBUILD tzinfo-1.2.2.ebuild 911 SHA256 50a5cceaf5a743cf689a07abb613c4169c660c3b3dc7f8097f0bae692334e824 SHA512 026888ab732f2c82f600f967d6261eb8012c95678428914123e3368dadcebd0bf48538a58c4240237819b898c9bea0d179f56a85abc7cc1dfe259572f4e1f71a WHIRLPOOL bda4427646a97f239efd0a6e9e8a7d99998f66f19267c3787722d0bc76444127030a61a230f1ab01d646327966e181d45892eb720071511d03a6deffe31683c1
 EBUILD tzinfo-1.2.3.ebuild 919 SHA256 55881212e2efe802395dd77d644d6d6f70a02463a59f62cd10be07af173b4897 SHA512 782f76e097e3a1d581b4e25763ab79df59985f215d3dde1010b718dafdf1d0e2f39668ad0ecf46aac83a7fe38176bfbf1a1a6710b3286f4f52b2f5ea50570dd2 WHIRLPOOL 687fc9ca3b7e3c373e350f0152ea4e823bf89ad1116321ece4456f2fa1f8918c57cbefb2ececaea8a110b163d96647f683a76321e7bbe1b3e7febb0c0335106e
+EBUILD tzinfo-1.2.4.ebuild 912 SHA256 3f6f5a3ab39eca431013d1d71e2974af89b6013aa08461492a430005959c21b3 SHA512 5deec0e949b01af97c42b6ca6c5b2ff1a71519a1e82a9c3a4d22773024ed0cde14870790f3e163376cbf0217addba67f83a8eb732e3da5ea65b301c62e470ca0 WHIRLPOOL acaf1d11bc883451f0c97857383fc96f31f9fbe61069c4ac307adc648cd1db76074ad99b0b18a005c35e51fc86610d67f0338a3360fdeb54cd960de78ea7921c
 MISC ChangeLog 5751 SHA256 d6e279368d10b823cd87fde7429142fcca9d9a42fc7977a286cb4d32c636bdf1 SHA512 ab3b95ac71b90c959a20a9519fc956d12bb8e26440fedd3a32d0959b7213c214803d4635197e10b6307eae9ee94d05c50f3c4814e285f33a5122e8206b0b8853 WHIRLPOOL 0fa049be35273c81f4bc85ccbb6f6fb5188af566d80a1352fb4422d4ca0a74f0aa27aa4d901ab0467d1c4e11c0fd67fcae19c9f237ebfa65f7adae92ee65c199
 MISC ChangeLog-2015 18699 SHA256 18bf79b2ba3a71528473c4f49cf48c7354b778e84444320d1140c92fd3a60bec SHA512 015dd24b61d7488fe4dad3cf9b26e98e0923cf027d44f51c60ebc9bb19dae0fff474119f4f84b1a52ada981b8187c4d947e330edb33e8344578f29673336438e WHIRLPOOL 65da47fb6b0c203242b4057a7aa4109d2118fcb7a25daeeab8aaff4f79c64b0de90943aee01029472e49c4df017eacf1baeab131491cd6e999686dc39c769ed3
 MISC metadata.xml 251 SHA256 e42b6a84b1ae72e905433686395988601795455bdc99180089f055a3498c4c9f SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea WHIRLPOOL 2408c62b64285a8a340b446568718af55786b22010e127543f28dc67de0c67f1739905e31b7d0e549bfc663ba05ea646c011de5df57505a5bc5ea7a79e2e7639
diff --git a/dev-ruby/tzinfo/tzinfo-1.2.2.ebuild b/dev-ruby/tzinfo/tzinfo-1.2.2.ebuild
deleted file mode 100644
index 7e3c0b7f0191..000000000000
--- a/dev-ruby/tzinfo/tzinfo-1.2.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_TEST="test_zoneinfo"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Daylight-savings aware timezone library"
-HOMEPAGE="http://tzinfo.github.io/"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="sys-libs/timezone-data"
-DEPEND="test? ( sys-libs/timezone-data )"
-
-ruby_add_rdepend ">=dev-ruby/thread_safe-0.1:0"
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-}
diff --git a/dev-ruby/tzinfo/tzinfo-1.2.4.ebuild b/dev-ruby/tzinfo/tzinfo-1.2.4.ebuild
new file mode 100644
index 000000000000..e88eac65e79f
--- /dev/null
+++ b/dev-ruby/tzinfo/tzinfo-1.2.4.ebuild
@@ -0,0 +1,32 @@
+# 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_TASK_TEST="test_zoneinfo"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Daylight-savings aware timezone library"
+HOMEPAGE="https://tzinfo.github.io/"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="sys-libs/timezone-data"
+DEPEND="test? ( sys-libs/timezone-data )"
+
+ruby_add_rdepend ">=dev-ruby/thread_safe-0.1:0"
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+}
diff --git a/dev-ruby/xpath/Manifest b/dev-ruby/xpath/Manifest
index 4b2d8951657c..7cb4123f509d 100644
--- a/dev-ruby/xpath/Manifest
+++ b/dev-ruby/xpath/Manifest
@@ -1,7 +1,5 @@
-DIST xpath-0.1.4.gem 13824 SHA256 60a1363643edb3b3802fa1d7c5a042fed0f8f5f5589ed308a47f099ef5dcbf6f SHA512 7764dadf1d63607a5091790b6525242fb293abba01b85bf3bbded9e1ca668d2ebf6af523a84c46de423ad3340af07fbec5cadce59a9c3917d082593309df8aab WHIRLPOOL 270e8109c8c1c91fb50a86d8f3f33e4ae90a578ec9e03b8197ed92c80a67c287abda2d3c3f8350d066b61229691d6a74c6286c5479bbbca7c39e99d008885397
 DIST xpath-2.0.0.gem 18944 SHA256 9ca4a1cc88d9ab16c591468cce7b5d00ee06a8a76b841f8438970c7a44c86c12 SHA512 5d0375d795c755b88d4a16b7da9efe2bf234190066e38654360bbb0d837fdd481c946f055d95975d905330eef7e57d9b1eb4f1c5340d540db0fbd78fb58af690 WHIRLPOOL a745f438b9fe8471ec5975088aa97b2d1a6e587eefd93f248dec4fad2e17ea8acc1200fd88ee6517dcfc93e39bb684379d22e6aea52c8c421e75358aa644e8a6
 DIST xpath-2.1.0.gem 16896 SHA256 dc3f9c47c071b092d06bd17fc00e37a8d09e70b5eda645e375a04067aa1146c1 SHA512 50d80cac3fd65cbd211d3a87b8844a6607b14c841a1a5609e2370c3624daf719b937a61e526bf31aedee13346802d6bbb721d58bda2bef9c564c187b28bb90e2 WHIRLPOOL 753e00cb1f94f26138847e4ab833792764897dd8b57b8d014de68ea53e0c568b7752ea7c6726f78f12b6f2d2183ba10894c881aa44ed83398fb0470b32f35ead
-EBUILD xpath-0.1.4-r1.ebuild 554 SHA256 303867e4c7c9d9e4e7511c9062e21325bdd1f08eb60aa342edc9c90ba77b8f7b SHA512 6c526256a8cb24353154abcfab89c27397e5fcd7261c1d33b7ad4cb26ec70005face4d50e2c5b2403f680b8f49888fd3b5ee5e00e59410367710617c1fab68d7 WHIRLPOOL d9708fdab6578c53596b210c751379d952bbdda75fc294fe6a8e45cc64a591a2c799143eb77fd94fcd214b6407f9ca4dd977b438253ff60d3ab6110a2514eb49
 EBUILD xpath-2.0.0-r1.ebuild 557 SHA256 fb58b9eef4fb0577a279adbcbe33adcf6bf669283ffa89d6e95b98ad7003d0ed SHA512 7a0d298c0f97788d226defd848aeb9ad478bc37148a64f4b0e21268568d675945021868fe86b8c2f627e0ee305ef70afefbb28f54330dca4110a3465c418c1ce WHIRLPOOL dc2897487a3ce23944d933de0eebddd6773dae2c7845f7e5702155f35f970b045338f3c5dee8e2b7c788a6efe2bf115fd47a2e776a78370cdf3c6dcc853ea9d1
 EBUILD xpath-2.1.0.ebuild 578 SHA256 11a757fb1e79691b222df7043422f469daf9287cb834b1e6c7b75f6e9c4d3688 SHA512 91c2fc2ee8c004e565e86daaa0f89a1af443017a95c21bc01a43a4bf96b1580ff99513a5fefb7668098ab6fa3fa672e91d00b5ec1916929ab27ee7e78fed059d WHIRLPOOL 66965ed1d2ec173c54b7295fdda588400d798ab262f63595ad306c8d55f7d9f239efae77b2707bb608d796b40e1f8bb6c6717b4d22bbe511e61ad29b66e489a2
 MISC ChangeLog 2870 SHA256 bcdeba665d3760620ffc84450c8b1c7d1bd30d6229c77a064aade56b5ed17bda SHA512 59dca0b7606235cb3ae941293ff9e05afdf1edead9cbd66af32aa35872e92acb9082666aef83824f8ea0bda9f5425cde4ad0f250ab6bada6c6a8007bdb8e113f WHIRLPOOL 4e9365c083ebbd8c46b82570c8ff9f1c3fbea626b306e6a7078eabdd9692bea6b4c278b1d05266f1e0b32c2635ae74f9980afaa7a9d18c6b96b9e175ebe27578
diff --git a/dev-ruby/xpath/xpath-0.1.4-r1.ebuild b/dev-ruby/xpath/xpath-0.1.4-r1.ebuild
deleted file mode 100644
index 4b87774b47fa..000000000000
--- a/dev-ruby/xpath/xpath-0.1.4-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="XPath is a Ruby DSL around a subset of XPath 1.0"
-HOMEPAGE="https://github.com/jnicklas/xpath"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/nokogiri )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/yajl-ruby/Manifest b/dev-ruby/yajl-ruby/Manifest
index 4033702dc8aa..fd9f8a45d683 100644
--- a/dev-ruby/yajl-ruby/Manifest
+++ b/dev-ruby/yajl-ruby/Manifest
@@ -1,7 +1,7 @@
 DIST yajl-ruby-1.1.0.gem 557056 SHA256 95b85940c96c0745e780f363170b8bd1b7b66d36073a061b1461b1788834446a SHA512 bde81b5fbe467c6403d27b49075822ff07b5cf356c05f711757fea5162543af36846f1f1da36acd5da359133f05e2cb3186215dc5597f3255da74c76cc8bf3ec WHIRLPOOL baa8f6ec2bfe70cd8f3441c971b2854a99b9f132eb2cae22f9fe6a9de7c7ccbf84f0f3ec982296d4cbc998051529b464aaf16b268049193aa4170ec7ec1ca11b
 DIST yajl-ruby-1.3.0.gem 550912 SHA256 f1941b3606aa8da0800ab0a5560929454a1ba9c7ec41cb5a2905eabb2f155069 SHA512 351e46fb7037541096172bac5c3dcadaa6ac9650ac6aae46de2b4ba31b82427f596bade2b233d0d8e916927800e83b7930b5ceeb9d7340edd02c323f9c0b3116 WHIRLPOOL 8de8b6575f3972dbb2503315d33f5701f6141b0ce11f9f3b027a7c15ab257823e772d14400dc3db94b41135e90b25c89a89931fb2670a7e0de72a0ee40d885dc
 EBUILD yajl-ruby-1.1.0-r1.ebuild 926 SHA256 b15f57d4e86e477a4e203f5c609fe8efe12fd36d28bb5b594ac1f73fb4396dd5 SHA512 53665219df16267cbf79029858e425226d0872484a11d9178ea3eb6698e236f3d70634e4301416687f9cdee4f555be8df1df0be4866f70d9b4da3edec9e73dfe WHIRLPOOL cdf1b3141d4bb3b88e24d50f9c75164b4210e1b0be1aa9cd481c63250c91281a8119266436e03e934e3e9df9f49c47736a22a20b00ea3d3e0c858055ecadc671
-EBUILD yajl-ruby-1.3.0.ebuild 1242 SHA256 d929e03733b22725c6ed38dced96271b0f4c6f5fcbfd5e320c9c4da11f4233b3 SHA512 7812284eda8eec7abbc5bb925d19e9b4682e3b9089b2a978988a8eefd6ea21e8015521ddee5c1ea6066ba922dd5672f9f1610c9bf01bd9321710d42e5639d536 WHIRLPOOL e081a645f8682fec38941fe9fc6cacbcda2d807e0cf0fde3e8319f40fffbad018a4cc16e8dd44c5a7ecc93c71c7ec4ccdf9472ae2ee7af635c7514ed2bd7c038
+EBUILD yajl-ruby-1.3.0.ebuild 1234 SHA256 6bdfdb49bbae1052e38f2d7bafa228529719b1b6016d011fb9d2ed05f997ab6d SHA512 a6f64f39845a720e179f65bed03b3d4eb374042ad4addd33573c8bafc77a035a2892b312fb517d09ac22e9fa02a3c4dc8ed1678ef36cdbb9093b0d390db48071 WHIRLPOOL 11366263acac79c8e32545318c980f7818df8210db5ef5fb4c755e981c8a126289a74d60d83513d36cdb0b5c673a71516c16b1b2e2e89d1c478d3d628b7a5e80
 MISC ChangeLog 3572 SHA256 901edca3664616cf0a19920e344198a0e4097af2877aac92087634c1b1c9b51f SHA512 5db12de2004b8896974616bf843bb0c238961cdbede9ee856cce5bacfe4b8bf4c80a7a0babdf3fa8c3faa7470a6d0701eaa3965d7b0ca5de86cef0445a0bb788 WHIRLPOOL a247e75740c3fbc525ae8c87c0ab89df27b21532e8ea319780d19303a63257960ba54b4f6b2020b7fb184111d5b2fb32613c4a8d58c1f34a8a9b3509ebce80ce
 MISC ChangeLog-2015 5765 SHA256 2bef41d63b19325834543228f81b8d7c5f2a197f6da13b7e6cb69e56ee5d3b7a SHA512 6242d29a4558892524def055860f508b016caa8674315441cc8fda999fd58b7715f21e0cc4ab141120840074723cb34717a79199f89a61d4078c06041b739992 WHIRLPOOL cf74a6bffae07a40f998d4faf8485db22f685729ed92e3ca9387648aa75af172812f5eac16c442ea5713faad6d65d490b35ec87df2857184c246879cee44dba5
 MISC metadata.xml 346 SHA256 b6133ea502856bb3b19eb89ed6431204e4678f3e7b53bd8b06e72216e55aa497 SHA512 54921a3e3df293d819d020aa6671e7e33f9031b83d375d6f8423fd844cf757c20c2e6cafc9d5a8f2670e10bd286b4e29067a8d7176e7acafd3474578134a2aae WHIRLPOOL c96706a8b829eefa7600bba4557cf028fbfe5c329a85701612535acb493400d604444c14179da1d175516a07be036ee41318eca819cbaeedead6a5cdaf34d367
diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.3.0.ebuild b/dev-ruby/yajl-ruby/yajl-ruby-1.3.0.ebuild
index 8a7ecf923276..93472d110d8d 100644
--- a/dev-ruby/yajl-ruby/yajl-ruby-1.3.0.ebuild
+++ b/dev-ruby/yajl-ruby/yajl-ruby-1.3.0.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/brianmario/yajl-ruby"
 
 LICENSE="MIT"
 SLOT="0"
-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"
+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"
 IUSE=""
 
 RDEPEND="${RDEPEND} dev-libs/yajl"
diff --git a/dev-tex/ppower4/Manifest b/dev-tex/ppower4/Manifest
index 4bdaac4bcaed..54134930cfed 100644
--- a/dev-tex/ppower4/Manifest
+++ b/dev-tex/ppower4/Manifest
@@ -1,6 +1,6 @@
 AUX ppower4-gentoo.patch 411 SHA256 e97c267c8d96b74ba46be7648258fcdfdb9ce6efcd41a6963e47c5c9f281ab63 SHA512 901783d8a4d1806f820a5f98375230497781f5ee16ccb2c9092e8e34527aa7d0a3fbb1a12319c69d989ff6d8aedcaec041e9e59f03c43e3b5ef1ff2f9f97d7f2 WHIRLPOOL b3881b96953d54c383e7276a80fb0589771e0e7431c5b5a95001f2a9530d02ef415a1d0563413d178cdd1be3d6fa579ca3791895e61809abb58c22f55088a528
 DIST ppower4-0.9.6.tar.gz 379282 SHA256 92602c3f31c925ee37dbde7a7639e8d74e52c1e6087874d8cde7eb9516c4a3a2 SHA512 edade748c33006a20535a663904adccfd8196eb96bcd963d3512a4e416e2747231101756396af7b4eb2395c4bfa1338b73fd77bb1c1e9addfcf57cf8d0beadcd WHIRLPOOL 900ea951bd33cd505807eccf444a1ca944eebfef53da1bdae48dbb60fbec5d8d060642d70b6c38110bd12919a6be29c565843239773136e825e579877a5c0749
-EBUILD ppower4-0.9.6.ebuild 1004 SHA256 2ecbb0842e7b7c1d55972d5b2db15aa8f972dcef4d9785c8f5a374a4bae85fe5 SHA512 4ee2d4d8e2f51638ed262620cc840be61fd41e8d99c1c9067b475896cc420f09d4c4d0d5ed358732192876fc071c09576abf4b396cef11ac31c412f32528dc6c WHIRLPOOL 994b2cfed719b4e8e68573f657b0410a15b7fb0cda9140c082db6413cadef9a67204b443fbcee3efe1e91ee58a56f40abf41ba3a53f75d5729f789668db7d722
+EBUILD ppower4-0.9.6.ebuild 950 SHA256 67c8f298bb11babebcea61145c90130ed6d79d098167f49f1a4b0b166bcdd8d4 SHA512 b34eccc01211f7d64d753af0b189495820bbd762424fac79197b5958bfd766560ed703ad7cbae92100baac651fe66e05ceeecdd8bafac7092c8babd887b3fe54 WHIRLPOOL cfcc6e0d92979de2efc13d7cb82f88be8a3e8292ae09001a5a722c6e1ff6c1513bed26793411cbed637687e132caa9ae1f616910e9c8af00206a1fafebd93876
 MISC ChangeLog 2593 SHA256 775433395af83119990bb7bb2fdf0661a5d64e5632e20a26f21ad514040cd46c SHA512 f8a4faa6dcf1874745828428965269cb6d2107021e54068d6e9fa1082f7079ec96e5760e42174b95ec374bd3c2dc3fb48f6e6a8fe4afe729e6b9c6b9006a5b7a WHIRLPOOL 2c771c973a5be7d2bbf66bdc96471b350bd6953846f928126ca67316d6527215200fd76cb6aebf631754157da1a58e88370a09700c69aa3d607dffcacf7ec558
 MISC ChangeLog-2015 1828 SHA256 91ddb8de5a80bc76d9edcdabaa4c428dd39f182a3325438a91766de7dfde067b SHA512 d11ccac3a868048db6f0cf36a0bd347e03457debe029f50bc8c31e55443fdf15db6b983b355e1b8204608000448d0d59c111ae1e010c6339fa03403d5ab3539c WHIRLPOOL b2c7e2a2d0c904b420e438cfde218fa6a5db1bfcb9d3eff08753b41b3de8bb659f744aebedbf1ac53e32eedbd19c82b489f7cb4552ba1fbde428f443da5acaa4
 MISC metadata.xml 245 SHA256 b3de478821488be2cdc91b078e21c911dc384af882c5c44631a47dfa91516dc8 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690 WHIRLPOOL 701a78fc2214f5fd4bd781477f85e87e716b8d76ea831a0fa4afc8871c4286cc363679f1ff4f844555ad4f77cc7265208b83e805f56c22fc4baeed1062280c08
diff --git a/dev-tex/ppower4/ppower4-0.9.6.ebuild b/dev-tex/ppower4/ppower4-0.9.6.ebuild
index 4f42ccd175ca..f15e945445dc 100644
--- a/dev-tex/ppower4/ppower4-0.9.6.ebuild
+++ b/dev-tex/ppower4/ppower4-0.9.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit latex-package eutils
 
-DESCRIPTION="Post-process presentations in PDF format which were prepared using (La)TeX to add dynamic effects"
+DESCRIPTION="The Java tool PPower4 adds effects to slides using LaTeX"
 
 # Taken from:
 #SRC_URI="http://www.tex.ac.uk/tex-archive/support/ppower4/pp4sty.zip
@@ -12,7 +12,7 @@ DESCRIPTION="Post-process presentations in PDF format which were prepared using
 #	http://www.tex.ac.uk/tex-archive/support/ppower4/manual.pdf"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
-HOMEPAGE="http://www.tex.ac.uk/tex-archive/support/ppower4/index.html"
+HOMEPAGE="http://tug.ctan.org/support/ppower4/index.html"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 8961dbc46af4..a5461b767f9f 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -9,7 +9,7 @@ DIST android-tools-6.0.1_r79-extras.tar.gz 648657 SHA256 4c39fca97a419ec2b3c1edc
 DIST android-tools-6.0.1_r79-f2fs-tools.tar.gz 70255 SHA256 a69b7653b1886d58fb8e7104437b3751c440e9367051d8ec1b859db2202555ae SHA512 0871f99f78006028889b42668ec627b6515bb812ad3ec4a489f62187a79f64d2a74f66556698a5f05fc99932f75fefd8810dedceeab744b212beb764e97b82c8 WHIRLPOOL 23c2f6d95a92bb97290690534082810ff50817640e19e9567056194e4a01d28516433396bc0aa42c545b47738e739d21823007ffaa171e972789b7cb1c71be94
 DIST android-tools-6.0.1_r79-libselinux.tar.gz 50814 SHA256 f93426fa21aa4d57f95ed832d61edce3363b3c0e80c666b6fc98367fbc95003e SHA512 686557271271c4d59fb968c5aa76b433955009733f3151c4c86faa996ce846088d6632b0969b23699822b7a6f09eae60abedba6abb0edc9d444159bbdb5c6f91 WHIRLPOOL d82d53133a54044e92db534b3c546b92ba77759999cc2890b202673d68120a42d8cda169d1298a5bb36e466e65c9c5191d01bc29fdf53d8e621b30a2ccafcd75
 EBUILD android-tools-5.1.1_p13.ebuild 2088 SHA256 91217324d39bd292ada4b92bb116ec6b078b362bfcfa9abe0d23f83348d4b92b SHA512 a557d31b6488a3a96164339f9e2508cfd71c6f749e5b3f7829b79bcba85ef75985e1865a9ce528556ef0976ebc1e2f52ae8c1368bc6f75bf78c7e70649327dcc WHIRLPOOL f68e0773fd2af6f453c3099a7f95902bfe61e364354aed51b77690faf08f6cb313ee8ebc437da82f28e0e24942dd7477f386c26786dcaeb8ba40e999e04923fa
-EBUILD android-tools-6.0.1_p79.ebuild 2833 SHA256 bf81ab1637df80d2261021e8377a7d684dd5c13de6e58cdece94d0d330b46bf3 SHA512 27bd9159d3c761e7e984b466a47f239d4695189fe524c0453ba8d76a175eeb67803d1809e8032eba5203dad7acc19b5e23450f910c0d4ca08fa9e5103dfe0d6b WHIRLPOOL 2dadc38e29936df29fdf9504fcb859748fbc0e25af224424c98dd8a837feb66cd22d2212ba91e535a653fc70426637a09382299e24d20d8e045cdc92bce9be9e
+EBUILD android-tools-6.0.1_p79.ebuild 2832 SHA256 d819c663faf8a34cd03a951b9f60989e3539d51facdf729a4465fcd780a597c2 SHA512 9b0d8cc701b924edd45434963d7441f90e45f6e72a9f791a90c549192882108a54da5219514a9e896725b2aef7fe52c19fef0023f90e859b076c26f46c0f5f7e WHIRLPOOL d826f0c56e8d456490c4d02b9bed7e8f33c1a2e758c2f08c6c12479e780e5b50ec518f7f0b929cf5d6c556b264369dd398c32c2432b87a672d122ba696f9af13
 MISC ChangeLog 3989 SHA256 a4478e84bf33b3115158155c63654518f3fdfc5f6b963d0f5a320e274fb11d73 SHA512 8ec298a9124614f43399026be28a025e910c8b82f9fe711b4b3f191f748e712f4a6a760d78c754c36a5a226327d6d4721c06104be39d5cf18be6f8bae9ac5d60 WHIRLPOOL 498d5c32f6f12b3d15b4307897eea6bc3579be057e177512fe813b4896efcc3bc52fc2a40e450c09c151ff7580f1669088b41e7a91ebdd4ae2eb28c8ab41b1f6
 MISC ChangeLog-2015 1183 SHA256 95a4c5467f26e575a7a64d5c244686fd57d31790a7490cae59b59351e65333e3 SHA512 70e9fe893b224139bf450876319d8ddea3c7aeb5f194fcc3a06528bb15c4879d409a129643071a091cb690957a828b50521923c833e21979790102c41e9b1335 WHIRLPOOL 4f4bf02023402be60c6384f1c22bb2ac62d97c7e680047d3ec7138afa9c12495363cdf174ba1eb96b2a6aeb46a36d41a319eb4f2eab12c18e27b7de6912c2033
 MISC metadata.xml 643 SHA256 0f10169f0f70025ecabdc95c1cd83ebb7db16be7df670678fbf131c8b66f5882 SHA512 51ee41cf77548eb1ce543b2c1f5f37e9634250c2fa42b36a8128b4a80a73a270b90b9e9e1c2c58d7aeb6dee85238ec73345f1a3a4ac398a4f7b2cd8e8c6e84ee WHIRLPOOL ebb5e0bd8f8205f31350d501a98adf0147e57d7a695999c61eb8a2e3c8f0a58015ea2762ee2394df0b9059c8be862dd2073e539e632ce94507c837745dcb9ff7
diff --git a/dev-util/android-tools/android-tools-6.0.1_p79.ebuild b/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
index c08ea80eb0dd..5e7dddfe2e69 100644
--- a/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
+++ b/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
@@ -20,7 +20,7 @@ mirror://gentoo/${MY_P}-f2fs-tools.tar.gz"
 # The entire source code is Apache-2.0, except for fastboot which is BSD-2.
 LICENSE="Apache-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~arm-linux ~x86-linux"
 IUSE="libressl"
 
 RDEPEND="sys-libs/zlib:=
diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest
index 06c05ca76980..035f34f01023 100644
--- a/dev-util/bazel/Manifest
+++ b/dev-util/bazel/Manifest
@@ -1,6 +1,10 @@
 DIST bazel-0.4.5-dist.zip 101505017 SHA256 2b737be42678900470ae9e48c975ac5b2296d9ae23c007bf118350dbe7c0552b SHA512 bc70e379a9f6f962440d05d4a706959461690e28a943833e17d6e2b7e3cd7dd2344f329f72d833ec5104334a71764fde195e50b09a582ae7c1b89bd62822943b WHIRLPOOL d236eb387373f4b1cba32084a8b282f2bc75e6a0a714f18229cf5064230ad912bd879df2e7ebcc30da18538958ded4a1b8e59c27c0716aa6b677690b10a0356e
 DIST bazel-0.5.2-dist.zip 100003640 SHA256 2418c619bdd44257a170b85b9d2ecb75def29e751b725e27186468ada2e009ea SHA512 2580b41a09d8e7766bf06ed55bca06f542a13fecf050b105829811d8a95e8f9a4395ebc8d3ce6436ecec8faab704afd608d71e2d368e51c668df3f766ca6e9c1 WHIRLPOOL 8ea9522bbd38ec5d9de4eebae0586c71ab2cf2f782430e0e0bd5fc84c8d431df7f758627ad9f0aeb57445c1c3d4b3de34702e2e2a6a73aea246519543d8ff118
+DIST bazel-0.5.4-dist.zip 100430507 SHA256 2157b05309614d6af0e4bbc6065987aede590822634a0522161f3af5d647abc9 SHA512 f13c003d1d27213e5a723878f488f02a77f1549b6c377db007d412e3db558ab1dfc4e7434c0a7634959d7f5447e71200bda7f99c16fe70661ea81e610c8089f5 WHIRLPOOL 667d78e2cba875cbe31bb49869881ebc45de9f03eb7a503458ba7a5821ca2cead2489a562a2928f5b701b85f6c9cb652dc5201ecc2804d6b57d9d61c25517b82
+DIST bazel-0.7.0-dist.zip 84669893 SHA256 a084a9c5d843e2343bf3f319154a48abe3d35d52feb0ad45dec427a1c4ffc416 SHA512 039ab6a04fd4422bd14503187e6cc0d07301723b3ecae906606fa12ccea72190d82237899c103c1adfdf05dc8672887790780ddfb4cce87cd590adbde3d3f6d4 WHIRLPOOL 36bf995886187c0ad237163c4bf114262e491b46ed2961183e930589cf6709f248b095fe6a5c650b35e294c4f2a0a4dcbfa7297da76df0a3af69a751b1d94855
 EBUILD bazel-0.4.5-r1.ebuild 1820 SHA256 5fc8efbdf3f33a0a571c299620dc248cf367b9d4c1a3c5fe8cdf71fb600f78dd SHA512 eea6c74fa9ceaea72fd8ffd2f40b1a96858cad297168eba38213993f176eb8069ac7ba6e8f166d7eff43af56b2c1ba2039c268bbe86efb7dcf842fe33d5cf583 WHIRLPOOL c01f964c36314bbff5f4259837fe6eed7049a2b3122a28a366eb774d218de34db0167db3c62148ec2e68e1113773944f992e9259685291deab5fcbec50ceb0ef
 EBUILD bazel-0.5.2.ebuild 1977 SHA256 1b9478c334b87f8d3b3f9fceec65a824d8c4a355f6da5ad674a3cb9a640ba61f SHA512 1ebbd3512a16af79b14cec5e365dd43cc280356cd9fe1bd9af10db2f81fc69ddabd337cab48a960731c9d5a9cde0d4fba8ed1cdf57356d9603b6a959edb67e76 WHIRLPOOL 54ba799fe5f5768762595b89fd1ea4d009edc4516365c6bc8287dea860b4d450b57a5b69e3585db47d3e7b6ad32d08615f53f0e0365f706334ed1678c897861f
+EBUILD bazel-0.5.4.ebuild 1977 SHA256 1b9478c334b87f8d3b3f9fceec65a824d8c4a355f6da5ad674a3cb9a640ba61f SHA512 1ebbd3512a16af79b14cec5e365dd43cc280356cd9fe1bd9af10db2f81fc69ddabd337cab48a960731c9d5a9cde0d4fba8ed1cdf57356d9603b6a959edb67e76 WHIRLPOOL 54ba799fe5f5768762595b89fd1ea4d009edc4516365c6bc8287dea860b4d450b57a5b69e3585db47d3e7b6ad32d08615f53f0e0365f706334ed1678c897861f
+EBUILD bazel-0.7.0.ebuild 1977 SHA256 1b9478c334b87f8d3b3f9fceec65a824d8c4a355f6da5ad674a3cb9a640ba61f SHA512 1ebbd3512a16af79b14cec5e365dd43cc280356cd9fe1bd9af10db2f81fc69ddabd337cab48a960731c9d5a9cde0d4fba8ed1cdf57356d9603b6a959edb67e76 WHIRLPOOL 54ba799fe5f5768762595b89fd1ea4d009edc4516365c6bc8287dea860b4d450b57a5b69e3585db47d3e7b6ad32d08615f53f0e0365f706334ed1678c897861f
 MISC ChangeLog 897 SHA256 8294a290203448f900849de62e63c76b7dbb156b4f7e8515236615ddc1563a03 SHA512 32d4e758dfdebd9b0641117e943f638f1068eebcdbd80ff5c1024205f5ae95c0356e825ec89ea087e3b9ffc3cb0991e7b4eee54f5d2a6715d1470f88b0741b40 WHIRLPOOL 0b9248ea794466e598293a0035df5dd96bb41c2300dd050d6d1100d565d2e19583ded5766a40ee02cc8cd717d94e67b126e988ebe0c6a773111a5242e20eb35f
 MISC metadata.xml 789 SHA256 0383e35dc373a0c7f4cea80787481ad95790be959eae2e685ab1eae275464141 SHA512 e5790a5b54ca33ce53646382ff667656e0a843494cac2a6fbd3f11cc45b711b8dd656df1c16921484b186bf80708179602630d9aae4382587a19fe5b5270d77b WHIRLPOOL f4883d618b4e1d6de0acd756b8e5d402f3cca806a30836797b2928a2bbe38015dd6b3eaaae4bd17a16cacc781924df7cb230c1725bad0a0c2942b8ec78999ff8
diff --git a/dev-util/bazel/bazel-0.5.4.ebuild b/dev-util/bazel/bazel-0.5.4.ebuild
new file mode 100644
index 000000000000..4684dc2d3b48
--- /dev/null
+++ b/dev-util/bazel/bazel-0.5.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 java-pkg-2
+
+DESCRIPTION="Fast and correct automated build system"
+HOMEPAGE="http://bazel.io/"
+SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples tools zsh-completion"
+# strip corrupts the bazel binary
+RESTRICT="strip"
+RDEPEND="virtual/jdk:1.8"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	app-arch/zip"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	echo ${PATH} | grep -q ccache && \
+		ewarn "${PN} usually fails to compile with ccache, you have been warned"
+	java-pkg-2_pkg_setup
+}
+
+src_compile() {
+	# F: fopen_wr
+	# S: deny
+	# P: /proc/self/setgroups
+	# A: /proc/self/setgroups
+	# R: /proc/24939/setgroups
+	# C: /usr/lib/systemd/systemd
+	addpredict /proc
+	VERBOSE=yes ./compile.sh || die
+	# Use standalone strategy to deactivate the bazel sandbox, since it
+	# conflicts with FEATURES=sandbox.
+	echo "build --verbose_failures --spawn_strategy=standalone --genrule_strategy=standalone" \
+		> "${T}/bazelrc" || die
+	output/bazel --bazelrc="${T}/bazelrc" build scripts:bazel-complete.bash || die
+	mv bazel-bin/scripts/bazel-complete.bash output/ || die
+}
+
+src_test() {
+	output/bazel test \
+		--verbose_failures \
+		--spawn_strategy=standalone \
+		--genrule_strategy=standalone \
+		--verbose_test_summary \
+		examples/cpp:hello-success_test || die
+}
+
+src_install() {
+	output/bazel shutdown
+	dobin output/bazel
+	newbashcomp output/bazel-complete.bash ${PN}
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		doins scripts/zsh_completion/_bazel
+	fi
+	if use examples; then
+		docinto examples
+		dodoc -r examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	# could really build tools but I don't know which ones
+	# are actually used
+	if use tools; then
+		docinto tools
+		dodoc -r tools/*
+		docompress -x /usr/share/doc/${PF}/tools
+	fi
+}
diff --git a/dev-util/bazel/bazel-0.7.0.ebuild b/dev-util/bazel/bazel-0.7.0.ebuild
new file mode 100644
index 000000000000..4684dc2d3b48
--- /dev/null
+++ b/dev-util/bazel/bazel-0.7.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 java-pkg-2
+
+DESCRIPTION="Fast and correct automated build system"
+HOMEPAGE="http://bazel.io/"
+SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples tools zsh-completion"
+# strip corrupts the bazel binary
+RESTRICT="strip"
+RDEPEND="virtual/jdk:1.8"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	app-arch/zip"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	echo ${PATH} | grep -q ccache && \
+		ewarn "${PN} usually fails to compile with ccache, you have been warned"
+	java-pkg-2_pkg_setup
+}
+
+src_compile() {
+	# F: fopen_wr
+	# S: deny
+	# P: /proc/self/setgroups
+	# A: /proc/self/setgroups
+	# R: /proc/24939/setgroups
+	# C: /usr/lib/systemd/systemd
+	addpredict /proc
+	VERBOSE=yes ./compile.sh || die
+	# Use standalone strategy to deactivate the bazel sandbox, since it
+	# conflicts with FEATURES=sandbox.
+	echo "build --verbose_failures --spawn_strategy=standalone --genrule_strategy=standalone" \
+		> "${T}/bazelrc" || die
+	output/bazel --bazelrc="${T}/bazelrc" build scripts:bazel-complete.bash || die
+	mv bazel-bin/scripts/bazel-complete.bash output/ || die
+}
+
+src_test() {
+	output/bazel test \
+		--verbose_failures \
+		--spawn_strategy=standalone \
+		--genrule_strategy=standalone \
+		--verbose_test_summary \
+		examples/cpp:hello-success_test || die
+}
+
+src_install() {
+	output/bazel shutdown
+	dobin output/bazel
+	newbashcomp output/bazel-complete.bash ${PN}
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		doins scripts/zsh_completion/_bazel
+	fi
+	if use examples; then
+		docinto examples
+		dodoc -r examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	# could really build tools but I don't know which ones
+	# are actually used
+	if use tools; then
+		docinto tools
+		dodoc -r tools/*
+		docompress -x /usr/share/doc/${PF}/tools
+	fi
+}
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index f7cd51327f96..f41076303d2f 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -1,9 +1,6 @@
-DIST bcc-0.2.0.tar.gz 1195653 SHA256 8bdea41286dda0605e3e52fc76d345356dc637434935a112e6378e2dcb439a70 SHA512 edb696a5382e2f56d06e6b8b65c37b50e719da944fbce43cbad116c773e759fb51837d57ae3d159d83a489dfd0254b9f50b97dab7116465d57f787cf50d58808 WHIRLPOOL ffa4b47dbb16a73699176bd2926763588c6f5ed73052d58ce8f9c51af1eba82c73ac541458b34d6fbd8cd9b698b37bfedc9c9f312967ce639f45daf4789138b2
-DIST bcc-0.3.0-llvm5-76887992d786064213af87694d2a21745e579338.patch 2600 SHA256 e7bf9b9b46a339431bf272a2f8d19c5977db69a36f1f374c73ef2f95a5d1a3a3 SHA512 1b5330a5a8bb8d7152130e5f2acbd5b3f7cad42cc519ff51312792d529a37eae76881eb1fae74c637de4fab35b5a0d33df7ca2bb55e65daac6b54b08c7037286 WHIRLPOOL 841628d3525429f00dc0a767e9a953702bbaf20fd6a8164d9bf3ee909272ca25a700c965fdb0fcb8de99a43b8d8de9eb8414caaf84239e31f55809d120bf7e6e
-DIST bcc-0.3.0.tar.gz 1645152 SHA256 88f54dff96c30c6e7b45f475938eef790b1c9485f794b1ac6791c4e56007f7cc SHA512 e5a0f9ad1b0ba865b5644a5a4a0ad130708aac882239ed545bcfd74a5d80328361bc92287bad5569710849682501841e89279089efc71a97da4e02bfc709b916 WHIRLPOOL fb06e4bd7e5ffbee104b5ad4d6e6a9004fc77dccf9f9cdebfa16741c899ce16c0154d6700f9eb6f8754c90da69eeb17ac9a3e878b5f75965dbccd13f6ad35abb
 DIST bcc-0.3.0_p20170913.tar.gz 1736513 SHA256 9d6357b50f64d2b0ef2ab4d2ae50397b9cd42eaaff766066e42c50b4b9588b29 SHA512 8298d98fcadc95a2f5f27e1f656f392634c0940cf6ea03f432135477790e770f58dc3e3e0b434391eff8d4e3df6671c250252a29a7344c6adf7606251daef4dd WHIRLPOOL e9a6b9a1aac158ea8fa012a88acd2c5027f8cc44305dc1c135326a8f40d21e81db1382a34fb7f8cab6922845bc7d7867a8fa094e21d03bbb5d7985592f8112e2
-EBUILD bcc-0.2.0-r1.ebuild 1092 SHA256 63f42b71e5295204e2d1c12776a9034bd6cc8c2f31ff269d052369f7211e4b43 SHA512 65c436c1e4891bbad89a119ca2f997bb5616fd57b9d9cc3db8978f9584fa2c79c9531bfef26e7d36066ea3863f65f8a90d42c15691ebfbdd0421b698144f98a3 WHIRLPOOL 69c6e162f70434ece867d45add853725b40fb41ea50f016eb4d94c2352cd6b1d0a960d6bca04264087311206ba0da0e8e8372bc62308f5907df7aa83573426e6
-EBUILD bcc-0.3.0.ebuild 1336 SHA256 1c70193216b49a11ae99db1e7b8604fa9f552a114889e20ba964687cb77af78f SHA512 b0aad430a85e42dbb1089e7e6047a4e18f4ab8286788d6c8e844460acef90d827096c40b752d24ce9218af4394fbc043d70e0ce1ccf0819e1882a48042c7c450 WHIRLPOOL 1f89b809d55f530cb3f1a45a497199399e967e1188e3094af322d0e03de8adb456491b5bf3960200add741fbf070d127fc85338ec30a558797cb7ad5a4f3533a
+DIST bcc-0.4.0.tar.gz 1752520 SHA256 f77dd07262e8365e48589bf0475e3248e4e77deae0f90e4fb77af26255bce87d SHA512 d4bca6ab30ed2d398685a5e142bc55ebd70d29b494ce9fa28d85aceb1843111de8f1c61049712d8be9ab827b65866db07b6be27e82bd243e182b7bbe6fb2014f WHIRLPOOL 769621bc8725ff8797431e0580e1051339e97d2cd07b76a86b68f43a162feadddd253f35a76807e64befbe676030377d3ebc486324c2ad41fb3b33a0c546cd24
 EBUILD bcc-0.3.0_p20170913.ebuild 1128 SHA256 3063d732abffbd6fc87c19d21b833ac9ca2dfe167a1f077c4f8daddbf68d06ad SHA512 3d76907e1322f352b52b4152854ab5d6401a8a23431766ab1238483c5835d5085647cdcfd3507d33eff1d6397f641cdb9666901a0bfa974d9af264f0a4c62a8b WHIRLPOOL 26f33b68c512848050c2da88bbb7c8e2dce61b17490d68f18b514493dc4bf7e16fb28acdf10c0954c93853a6d5f849b54b5e999c5d3ed9aadb0fadd5da3d7944
+EBUILD bcc-0.4.0.ebuild 1094 SHA256 3e3299649051aa6b636fc51fb1ecceb79c4042b866ac6174b94cd846a9b908b1 SHA512 c670c31428c55d670c7a2af790e10c143fbc02fc2d6a60056018e89d1fcea7d1bac35d855e4bbef6a8961ab2852e1b6e7823ec249d25dc3be711a7dea3b5888a WHIRLPOOL 8979d86e828a3d7612433f97da05205162ef23084551f4af85be5db836bd9995f2082671f096aab4edc996f42e33540064a33a34a67fe926e84fab75a02cd1b0
 MISC ChangeLog 2234 SHA256 9c06fa32ab1f5f70b46fb9f532a100cf2fc6334a8e56acbe98c36790bd742b05 SHA512 64348b9da78d4eedd466a546963e00137febf79393f7cc994954f6b100113af67135826eb7eb6d435cceb9f30d6b3da1456830eef36759815bc8a9602bc77874 WHIRLPOOL bf4567bfe2873e93bd93b9844b2bf7cf4aa8110797e7e078ee38dbac57d6085a8726a5040a89fbc08ff8f59d07b8f9936648c87abde7673732d72e0a1425c3ae
 MISC metadata.xml 302 SHA256 e3eb82c5af7b22ad9f5286db9672a578297ad2f22d4b772b5ea4cd44c2e4b69a SHA512 56eecad64a95bef18df26d32d87911e46c8222079387c946b086c38be9b22ec07dbd715344f373ca486758dadf65d84f1ec289af065f964adcff8b2e8906b6ad WHIRLPOOL f78bcf5f51b88e732e3844a2ef413ab3ffa3aebefa6d15efb11df441b367999900389925bcc8c4909d96766f589fe9f22176f0e6a1ec8b15ddae0c96ae7b8abb
diff --git a/dev-util/bcc/bcc-0.2.0-r1.ebuild b/dev-util/bcc/bcc-0.2.0-r1.ebuild
deleted file mode 100644
index 4cd829860f84..000000000000
--- a/dev-util/bcc/bcc-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit cmake-utils linux-info python-single-r1 python-utils-r1
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-EGIT_COMMIT="v${PV}"
-SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-RESTRICT="test"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=dev-libs/elfutils-0.166:=
-	sys-devel/clang:=
-	>=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-S=${WORKDIR}/${PN}-${EGIT_COMMIT#v}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~BPF_JIT ~BPF_EVENTS"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DREVISION=${PV%%_*}
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${ED}"
-}
diff --git a/dev-util/bcc/bcc-0.3.0.ebuild b/dev-util/bcc/bcc-0.3.0.ebuild
deleted file mode 100644
index 4c73ab15df1c..000000000000
--- a/dev-util/bcc/bcc-0.3.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit cmake-utils linux-info python-single-r1 python-utils-r1
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-EGIT_COMMIT="v${PV}"
-SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	https://github.com/iovisor/bcc/commit/76887992d786064213af87694d2a21745e579338.patch -> bcc-0.3.0-llvm5-76887992d786064213af87694d2a21745e579338.patch"
-RESTRICT="test"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=dev-libs/elfutils-0.166:=
-	sys-devel/clang:=
-	>=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-S=${WORKDIR}/${PN}-${EGIT_COMMIT#v}
-
-PATCHES=(
-	"${DISTDIR}/bcc-0.3.0-llvm5-76887992d786064213af87694d2a21745e579338.patch"
-)
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~BPF_JIT ~BPF_EVENTS"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DREVISION=${PV%%_*}
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${ED}"
-}
diff --git a/dev-util/bcc/bcc-0.4.0.ebuild b/dev-util/bcc/bcc-0.4.0.ebuild
new file mode 100644
index 000000000000..0e8e32826953
--- /dev/null
+++ b/dev-util/bcc/bcc-0.4.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit cmake-utils linux-info python-single-r1 python-utils-r1
+
+DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
+HOMEPAGE="https://iovisor.github.io/bcc/"
+EGIT_COMMIT="v${PV}"
+SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+RESTRICT="test"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=dev-libs/elfutils-0.166:=
+	sys-devel/clang:=
+	>=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+S=${WORKDIR}/${PN}-${EGIT_COMMIT#v}
+
+pkg_pretend() {
+	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
+		~BPF_JIT ~BPF_EVENTS"
+
+	check_extra_config
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DREVISION=${PV%%_*}
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_fix_shebang "${ED}"
+}
diff --git a/dev-util/buildbot-console-view/Manifest b/dev-util/buildbot-console-view/Manifest
index 9f762bdac09f..82949d3f854b 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -1,12 +1,8 @@
 DIST buildbot-console-view-0.9.10.tar.gz 640908 SHA256 ca62780a7405df761fa2d80019890c8b25d79f6b716df26fbc4ce257a21f762e SHA512 a7ad6289a314f096e6375646d17e2f6b595ecae040e9d135334ac46e810d24f6903318e5ef34f015d923b795d01d8e4011dca00b9b6adeb8c91734350f5d1982 WHIRLPOOL fb60315596c0f0d1ef1a07bd9f40a6f194430e5b825979c5e80616fb96c185a3fee126c42634ab7183c1bdb60ff53f058e8ef6085271c29007a468788117deaa
 DIST buildbot-console-view-0.9.11.tar.gz 640623 SHA256 a0467c096971178462dc18b6a652b53485d1ad0f2791c19f6026a432a07d9d9b SHA512 24a7915713665aeefe0389fa2aae1cdbde2b0dea0041b4a00410b77956b76897a9a427658303bf976916c5a0e3bb373a4a21339f4ded0b716d80ec380ad16cb4 WHIRLPOOL 834c44937994a41c3d82dcf31c378f18c15c89313a9cb49d9d0ce9d2c19f725e2d04b6cf7efeac87b5568317ab360b3c8c7531387561930e8aa826d8469f6250
-DIST buildbot-console-view-0.9.4.tar.gz 631510 SHA256 16d1ab8801439d50d712883ab155530840588d4d77ab600299ead0ef23da5bf0 SHA512 f2e99e58acea3eebec7600a23597c6235fe93532653352c8e427d4b55a14066534dbc046de02856d738a5943ccdaed0ac14643a830d9d11acf76f6d1760def03 WHIRLPOOL 1d3ec1476d69e68f9bd752f5ff88796b504b997373e82f3428e5ead44f7c19c66278448e61aa1a36bd1d3e2bc7e55e21877537b8d02f9add0d12c5dd7c0e24b7
-DIST buildbot-console-view-0.9.7.tar.gz 632458 SHA256 757ee80e5c4b698e6bac7b409c63af7ebd8c00c31117fa290776ad6c103a67c7 SHA512 e07c032e17ce9faa9d71b71c5c48fde9ebde4995dec408781b6bb2ed77edcbe320b8d825a9a4bd76d9f3c48dd445560ec55867639c454591c5b7095e4142c4f2 WHIRLPOOL 58a534d641d3f28272f074998231b4873086cc1c8cc081463545e0d6b49145299e2496974ba6d51150cab505b67c5bd81d56fa9747271b64ed8b487d1409a5ae
-DIST buildbot-console-view-0.9.8.tar.gz 632459 SHA256 573b03db8c102114b12bcc29c3224653bbc4a08cce25b91725b4bcee2abd7020 SHA512 f6419fd47b70369866440437521a10a2e4062466878979b0c65594c7d74095c89c01c65cc0641f8faf7dee163347426e50a272f93dfe45ee91d072360e249674 WHIRLPOOL 5bfe80b6f148603f98ff684b1b317e059587d37baf88c04e2f4f6f1eb4f4026d92df57463365f4bf460743c2bc4ce5407cce2df74ff2623f95d09d5b6230d7fa
+DIST buildbot-console-view-0.9.12.tar.gz 640923 SHA256 b1d1d364c4520ab74c664f2b4fea3848f3112affe85b3938a86f33edb60fe436 SHA512 4a73994c29fe1f78c4432bdb42fe14106b8d7887bb35f2835b203f4818844d3e8d2ea308fc4fb2bd562de302bd7cf6612fe047476512feac068eca3891a49522 WHIRLPOOL b69f1981c0bfe7094b0808638e1e0c48f9d5817c91d65a6f38dcc9c71a55e6016cafc74bc76a8b5d0270bfd8bce7c76a08060a6d04c78c5d4f6d5550a049303c
 EBUILD buildbot-console-view-0.9.10.ebuild 1140 SHA256 6b8bd099fb86082487e5d40f96dba34f9e9bf7a11a75d0954f9cb7f6e4ab3fa6 SHA512 a808734e64edd70fb3e664e58558006e31c18be5b31e1d15f03fe8f4048b6677d8023fa2efdf2b95d3dd6cf10eb67b3c3d0d0b939d755b0719e6d671a3f6a725 WHIRLPOOL 6f58b408810e2942f30e61be5f91ac766f735e42e4552b54180af8252bd567da6567bbacecb22c61c6af65f0bd24d453dbe1d9087392e33f87c9a7c7745446ac
 EBUILD buildbot-console-view-0.9.11.ebuild 1140 SHA256 6b8bd099fb86082487e5d40f96dba34f9e9bf7a11a75d0954f9cb7f6e4ab3fa6 SHA512 a808734e64edd70fb3e664e58558006e31c18be5b31e1d15f03fe8f4048b6677d8023fa2efdf2b95d3dd6cf10eb67b3c3d0d0b939d755b0719e6d671a3f6a725 WHIRLPOOL 6f58b408810e2942f30e61be5f91ac766f735e42e4552b54180af8252bd567da6567bbacecb22c61c6af65f0bd24d453dbe1d9087392e33f87c9a7c7745446ac
-EBUILD buildbot-console-view-0.9.4.ebuild 1124 SHA256 29a72a32c8857c52bd0de1d49266b7f1a55c927a7ded07e1a95303bd4d01a4df SHA512 bcc9fb4948e260feff293f05d7f56725cd87219ceb95cddc89271e87e06f6e57dc54fb3d9443921410757383d8728e94071408d46a4a571b7bb643f3d28bea9d WHIRLPOOL c281d4b89143077e59a0798d157d337a19738a0f0f780c02da08cf12994e503e7b2fd52b5ce0329c10e9457f9cb357a957f4f4405eed3019624fd159b5038ca3
-EBUILD buildbot-console-view-0.9.7.ebuild 1134 SHA256 a6832e4e2c295145cf749b9524a80f90a19eb531c4b0050c9afe0e66c10387eb SHA512 fb7a76d7a136d08420b8f6ff80854b706568d34628d77cd0061ad6ad2744d87d0dd76200a0f78348e24e5be33d84e77719bf094e6ce52630b85b6ead28fbf8ec WHIRLPOOL bda8fb5d5751b18d57d8efc1997b9808a3750e577a019f14574669eba2ce16eb904b7631c9c457cc890407e8ff02ed7cc53dbe68a609e1e353df3ac401805870
-EBUILD buildbot-console-view-0.9.8.ebuild 1134 SHA256 a6832e4e2c295145cf749b9524a80f90a19eb531c4b0050c9afe0e66c10387eb SHA512 fb7a76d7a136d08420b8f6ff80854b706568d34628d77cd0061ad6ad2744d87d0dd76200a0f78348e24e5be33d84e77719bf094e6ce52630b85b6ead28fbf8ec WHIRLPOOL bda8fb5d5751b18d57d8efc1997b9808a3750e577a019f14574669eba2ce16eb904b7631c9c457cc890407e8ff02ed7cc53dbe68a609e1e353df3ac401805870
+EBUILD buildbot-console-view-0.9.12.ebuild 1140 SHA256 a416f10dab9d877efd5a0e0a360a960b8e1715ae6e10a262a98e12d3c9a01edc SHA512 bba9abd918950d3259b2ca4eef20c640ed433bdefa7a39c4b89a2cb49da1980ccec8169394af5c2560972840dd513f293bb96417735e1a509330834e64c2f143 WHIRLPOOL 2e5756be5d373a9f2d035d842872ce3dd38ea9682e0b53791d12bd62ca7e5e344dbbd2981af663baf6bff76dafc0e6a7b4c49c857394ffe02a55d824b97abf80
 MISC ChangeLog 1514 SHA256 3d488f73f21573f5f3f12beec9d1f5eba46faae736e17b7d99f4d40613ea0c81 SHA512 8e787b4ec1e25fa7baf8c5a629124fe030563be065465b4975ca2c498dd4314dbef5bf4f88fe50de4b6fa9e11a32e55469e3c8fe9e1ea19780ac870388688f6c WHIRLPOOL 52295d190b3be8cbd0e397efe16256d8680adf9520595e9b24ae23ab4439b6afaaead81981eebb60274f522ffc4df887d92789c8de9486ba594997d04e45dcb2
 MISC metadata.xml 771 SHA256 d776c6b874bd4843e9cb8cb695ff26c5da8d77b96e6d66a12f56c3063c7dc4a1 SHA512 a8edc15d355234948b35fe2d563ddc7d27b82195f706eb935fd8145836a41b1ddf2adc40c402a806334b30a2ba0c156b89f5c355a53126f3ea69130b214bc66f WHIRLPOOL c3cd40d151a24abc0bd29baf75852bbae1788062ec4d2e727819d6797c44ccdfdfbafa70b250ec3132654948fe2cd0e098c930795d1ae9f243bfb31693dc7c3c
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.ebuild
new file mode 100644
index 000000000000..0b002bd2400f
--- /dev/null
+++ b/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 python3_5 )
+
+EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+inherit distutils-r1
+
+DESCRIPTION="Buildbot console-view plugin"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-console-view"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+IUSE="test"
+
+RDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+#[[ ${PV} == *9999 ]] && S=${S}/www/base
+
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-0.9.4.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-0.9.4.ebuild
deleted file mode 100644
index 231232b3b79e..000000000000
--- a/dev-util/buildbot-console-view/buildbot-console-view-0.9.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-console-view"
-
-MY_V="${PV/_p/p}"
-MY_P="${PN}-${MY_V}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-0.9.7.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-0.9.7.ebuild
deleted file mode 100644
index 8cb93d7c3ecf..000000000000
--- a/dev-util/buildbot-console-view/buildbot-console-view-0.9.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-console-view"
-
-MY_V="${PV/_p/p}"
-MY_P="${PN}-${MY_V}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-0.9.8.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-0.9.8.ebuild
deleted file mode 100644
index 8cb93d7c3ecf..000000000000
--- a/dev-util/buildbot-console-view/buildbot-console-view-0.9.8.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-console-view"
-
-MY_V="${PV/_p/p}"
-MY_P="${PN}-${MY_V}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-grid-view/Manifest b/dev-util/buildbot-grid-view/Manifest
index b956f29454e6..7cd66c65a56f 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -1,3 +1,5 @@
 DIST buildbot-grid-view-0.9.11.tar.gz 638818 SHA256 f93088ba6ac063c4bd7400b2477c94e86a7531fc614c3965c18914dcc701812b SHA512 4da052b284452557a1de080afd31064b8ae950f1a1fbe2f2418a130e1150b84fc25a119866ccc5889a38dfe94a5f1f8d3b4ff7f3f7dd6cdb485eea90adda3f2a WHIRLPOOL 1ccd86ff91d508ec06c2f21128e2f09889450c81efce2603d29348c449c4d4d2e82ad7c885c11c53abc001ae3d40100ef3de86f1fac7ea1b8099da2ef13c4444
+DIST buildbot-grid-view-0.9.12.post1.tar.gz 638819 SHA256 9dcccd323589f8bb17e50ccd56cd7147e3e3171fcfc9c6bb2aac1d75e411c939 SHA512 3bc90dcee10781afa90a44d0ff57629f2fe8620fb1133a489282b3a69b884d33a7ad3cbf6e38f688755fcc2153c9ae1c0d48cd2797e33070f66a9093887179c6 WHIRLPOOL 803c518e773a7c2c4360efbb72417d1fc315560048a3662eefe4f1213861f260208703d7bb5837206cb90c2ef82ff248e4180a083648432554bde4cc83f4869f
 EBUILD buildbot-grid-view-0.9.11.ebuild 1105 SHA256 92cc73d8de7ae1fbe402363afb79592f811a63904f4b48dfd7d1d02028a4dc42 SHA512 9555429dc5cdbcea15fc89d576f4e981c79f096d0e1793392497af8ee0b405f7e9ac97cbc908b80faa9ad8bf4ced34b7beb48c8db45c4fe278d22c910a6f1d0c WHIRLPOOL b5f0b97c435a70dece006f81b1371b5bf03d76d41f4d49b182f2ccb5cef35c5115f5d889dd01df9b490c2a4efb738bcb3998cb15e83cdcc5324693b6e92d9518
+EBUILD buildbot-grid-view-0.9.12_p1.ebuild 1109 SHA256 d0108727b6bf02f5c360b8615c72bb27f8442947dc574de37ea30427055d0695 SHA512 9d2fed5d500165ec18d319e81dde7d0af2cf303611044e0774b14acfd9f6472c0389dd673d516e4627b96e73c93c4ca5c1b2be4ff25adb80e80d84358a7a2a4b WHIRLPOOL 3ca55739d9d71e680b2112fa361bf24228bac41e74f1e4f00312c5415037d2c0fd153da38c402f03c4f76663b19cee6804c05c8a9cf763b1efe08ad0199b0367
 MISC metadata.xml 750 SHA256 2e04125d9cd141283ac7eb524cedd77da9cc305052f58c735cbc8e3dad7cb4f9 SHA512 8ae01c42d25b7e2d957968dcbe8c89e6b1efc9005b5021a7190c585cf586f37ce9b6168b29b58844149a8e869de9374cb611df6668476152fcaf393e55577fb3 WHIRLPOOL 3413473730451b9431d9737cb9c734e161419b00ae51077908b377bbd0a7ba45acc45ffb2a38743acbb25d4c053216b755684423a9cfa552223ee3ac2b392d10
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild
new file mode 100644
index 000000000000..f32dcb7f4ca6
--- /dev/null
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 python3_5 )
+
+EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+inherit distutils-r1
+
+DESCRIPTION="BuildBot grid view web interface"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-grid-view"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+IUSE="test"
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+	=dev-util/buildbot-0.9.12*[${PYTHON_USEDEP}]
+	=dev-util/buildbot-www-0.9.12*[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+#[[ ${PV} == *9999 ]] && S=${S}/www/base
+
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index 2da716f242bf..60db8449ed85 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -1,12 +1,8 @@
 DIST buildbot-pkg-0.9.10.tar.gz 4422 SHA256 6eecdde02f98be469ec9fde47c55fe64ca04eec764a4729be2ff4faa892532d8 SHA512 d31ef269ddbd042a9064daea526f289f2ec3ffa58dc8f43a8e40ae81b03cfa026f219bcce2ccb83addca0b1da0a8a2d3bc894a400edb9c45f4c0cde7691b5e4d WHIRLPOOL 36ff1465b3f0ab2699d3c9b5916862b1f3038e4fa999939730a7a280576b2bae5f106d2f34faabfe6ae3cabfe4ea5bcfd75bb472dddc6ac43fc36ad702d81aed
 DIST buildbot-pkg-0.9.11.tar.gz 4420 SHA256 6328abfa68efba299d0309a88b8de40d71d1da4d7bc9148476fed8f393e407be SHA512 63f75f4df2a725caa48d98c09037580c7b6a16609e4063e7aaab8a0e4b7bda4c74da8bf524b7d9a0cf9e909146522af5ffe8f1a5a8617c5f67658cc723f61b2e WHIRLPOOL 795aeeb945191bcd23df5acec634c2782e7910f9c10cbc9d7586d01baea82034d33273c98708676344adba67d0a8a9a29d3c6b37ea45d055e1b737b19189e869
-DIST buildbot-pkg-0.9.4.tar.gz 3830 SHA256 968f252f0700fbbcc6cac9f3fcf66d06bd577db5bf793fb3d7c84158f4f64325 SHA512 ac41792076e5a86ffeb58e694d6aedcf3cf386facf156ce658dfa7c73166c7883c097d160babf6d6ca92c1fba1527db58bade74c3500fb62c448eeecbd840dc0 WHIRLPOOL cb4255c90ae59750aa43fea890d79880bb30958ca36ee27a0f11e859575372dbee82708960dd8862c1ac551b4f9e5b38e4d70c8b7cc87048385c08c31ed455c3
-DIST buildbot-pkg-0.9.7.tar.gz 3871 SHA256 fbb75cff1d313a0fa810894073716ddf56b834ede761b1fae34f100f420e655c SHA512 7991425e69a404e15fd018d920accc65915e9d40a3b4b1faeca7b7501d1c9a2b01c2bef209ac10b9ea4dce03a41fd0d05266a5c3c9d50ec0f936a5f1c80f577b WHIRLPOOL 186fe1d1f155df98452e441303f916c498a01fc1e01ce741388ca00f33dd83105aad59d3024fd5b2f50680369f99e17fa609c3d325f291f4a33df7699d8394e5
-DIST buildbot-pkg-0.9.8.tar.gz 3913 SHA256 10000b0630d2f96230fada97828b986b4e9f4897fefb4b8be63e51b73e6ed63c SHA512 53e21a4ed20df687f9f646f0570fe610bd6d9da116bf7fdd60f1f2d245541ba9444e6cf7c63e3d780979a9320c9b98fcbe310acd736e3877c02bee31c683ebfc WHIRLPOOL 831f21235e4396603e4fdaec226006a7c6e01fd8378c7df9c2a8a24724542c315f97641b9fe4edb353405b79273bd361e7dade34a2be81be9e27c551728351ee
+DIST buildbot-pkg-0.9.12.tar.gz 4446 SHA256 32df3d38befd9d04b13426ca0f34fd786a94e0d1c5270c1d8142676d99570c2a SHA512 5b9847747924b7e04ae7584f549fa498715e293c6dbdbfef1fe5896c8c96cd65471a908b48c46a32eddbcf8f7b3642402974b4ed3319cf42e90028e772b5e34b WHIRLPOOL a5734e7cde324ff6a5e6cbd29fd07a9f575f9cb0d36f22d0c6505c32323e37c113d80213e8c7766f6dc6e69d6428c18097f6f2fbac0459236bbe6c138fdb832c
 EBUILD buildbot-pkg-0.9.10.ebuild 1067 SHA256 ad50e36828acb1a732131299002e0aa66b65a4e36069e9ce285a8719de3e140a SHA512 4efe52a0999ed6ecbe2ab002f2bff90f365b78e8c47272c952211128b94f93b8070925c6784fc1c5655802c8ede02300781670b60d604569c40bdfa855a8ab7f WHIRLPOOL 279926bd3d73870af872aa38f245eb96d076bd16b85b5cb6ae434c79aa2305d8c2c994c16014c5da2a11d0a8e91f11822c0821b701f805c09daaef699e564d6e
 EBUILD buildbot-pkg-0.9.11.ebuild 1067 SHA256 ad50e36828acb1a732131299002e0aa66b65a4e36069e9ce285a8719de3e140a SHA512 4efe52a0999ed6ecbe2ab002f2bff90f365b78e8c47272c952211128b94f93b8070925c6784fc1c5655802c8ede02300781670b60d604569c40bdfa855a8ab7f WHIRLPOOL 279926bd3d73870af872aa38f245eb96d076bd16b85b5cb6ae434c79aa2305d8c2c994c16014c5da2a11d0a8e91f11822c0821b701f805c09daaef699e564d6e
-EBUILD buildbot-pkg-0.9.4.ebuild 1051 SHA256 0f469d79b0cd2eb1277dbb8c1eab18b1692f242a6d10e4b5b72a496f7ed088fe SHA512 91ede9e7135bbe8708cf7593d2fd9804a8c58f17ef21815e33e4d07dff5e469f7b208dfc0ef7a0189ac83b177a2372f6a5aa08ef7279ddc03168f9aa92006658 WHIRLPOOL fba46bb95b8b8ab9880621f5dab4a720dfbc4998f526f02ab74061b18a8a9b001cd92a947d7db0e0498bc566f9fd80e7c24ddf83e711551a3634b4bc67de36a1
-EBUILD buildbot-pkg-0.9.7.ebuild 1061 SHA256 4c57bee37e78b280945569c0e7400a26d98c8af5aa50c826e39c477d17e63745 SHA512 929af1ec53cccb8f76acf7ae508135bdf626bc738e1b16eb84953abae728fc5ddc2c4a831f3925047e2093a6f45d6ad2c501931846dd85619dfcee501a1f5317 WHIRLPOOL 5105991ef9f2864f9fc1f8cac90299bfff0293df43b413422f032eaf7933f73b88d5bd196b86729bf9783938887e6c3d936a5e2593ca1ce6afadf491530d32a3
-EBUILD buildbot-pkg-0.9.8.ebuild 1061 SHA256 4c57bee37e78b280945569c0e7400a26d98c8af5aa50c826e39c477d17e63745 SHA512 929af1ec53cccb8f76acf7ae508135bdf626bc738e1b16eb84953abae728fc5ddc2c4a831f3925047e2093a6f45d6ad2c501931846dd85619dfcee501a1f5317 WHIRLPOOL 5105991ef9f2864f9fc1f8cac90299bfff0293df43b413422f032eaf7933f73b88d5bd196b86729bf9783938887e6c3d936a5e2593ca1ce6afadf491530d32a3
+EBUILD buildbot-pkg-0.9.12.ebuild 1067 SHA256 7935784b905aebe6c0fa2c2a08e92f4aaae8e9f3ee858da77dd7a9c510aeb05f SHA512 4182c2166ce82bc5909a6297b35aa443b5960829717f48eb1cc187c12d8b519b6d158e8e06ffc2946893c9d415a833bf1ead4bd36300c124912fe132870ce1a3 WHIRLPOOL 7f751c2be74fadf2382e78a164539c2939d01621ac093c6021bcae88db6b4d803674de2e638668ee4f5d1e796f9c3426d2ee0c013387681c0ff4015f727c6d42
 MISC ChangeLog 1434 SHA256 a8c07d05da9da952f38fc159c60b10f625f8c063d6cebf2ff4fc700cfb9cda26 SHA512 c461478a8e2812239bf920fdbcc6892d7c0abba909a9bfd19224beaf956d92b0af8f63d45be7f2e1fb0d4f9400cbbd8dfb4faba6b734d431b54683326f5e9958 WHIRLPOOL a4b7ff9d9ebbd52d8e6b8629ecfed3b7bd0d499ac66dc90398c556359423826280e10a45932b3d68615b20e2ec6e829828a6e7e64599830211a0cf033ba98898
 MISC metadata.xml 1309 SHA256 e94f5fca38d78b3eb789cbfc5c9d5c86a39e22539ec36ebd9b12e9a85adb829e SHA512 8ef3eb044f5b1b072a48a26436fec067a2b299b1cb144df13eaa283370c291225dde8e895b6cefab18ff7632882c9adcc7344b6bd41f0fb8a102d65862102a19 WHIRLPOOL 6042238109776fd57f188f929f424fa224b894316ffe7de3953cdd92df541aef764a5322193e905b634a486c21ce23b773fc5a1f2df768aa8f777589e4786887
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild
new file mode 100644
index 000000000000..d1fcb6b9d18f
--- /dev/null
+++ b/dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 python3_5 )
+
+EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot common www build tools for packaging releases"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-pkg"
+[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+# No real integration tests for this pkg.
+# all tests are related to making releases and final checks for distribution
+
+RDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+"
+
+S=${WORKDIR}/${MY_P}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.4.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-0.9.4.ebuild
deleted file mode 100644
index d8ef0b6245a7..000000000000
--- a/dev-util/buildbot-pkg/buildbot-pkg-0.9.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-MY_V="${PV/_p/p}"
-MY_P="${PN}-${MY_V}"
-
-DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-pkg"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-# No real integration tests for this pkg.
-# all tests are related to making releases and final checks for distribution
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.7.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-0.9.7.ebuild
deleted file mode 100644
index ce71cd9ce764..000000000000
--- a/dev-util/buildbot-pkg/buildbot-pkg-0.9.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-MY_V="${PV/_p/p}"
-MY_P="${PN}-${MY_V}"
-
-DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-pkg"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-# No real integration tests for this pkg.
-# all tests are related to making releases and final checks for distribution
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.8.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-0.9.8.ebuild
deleted file mode 100644
index ce71cd9ce764..000000000000
--- a/dev-util/buildbot-pkg/buildbot-pkg-0.9.8.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-MY_V="${PV/_p/p}"
-MY_P="${PN}-${MY_V}"
-
-DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-pkg"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-# No real integration tests for this pkg.
-# all tests are related to making releases and final checks for distribution
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-waterfall-view/Manifest b/dev-util/buildbot-waterfall-view/Manifest
index a493ae956dd7..3d78944ed25c 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -1,12 +1,8 @@
 DIST buildbot-waterfall-view-0.9.10.tar.gz 714260 SHA256 c2768391d7eb92e550afe4210e3cba7b69b34a7c9a27d333582f2a04b0f8b030 SHA512 e57a680fb3be7072f1dd6a757787932d9640f1442370048411987d3521f6c600c1f1adedb439ed439cf7928110a6191c8cc4207bf7cd7ebc8e6d1ac5a36f4a1e WHIRLPOOL 95894f7d7b1a52f0312cf1a11f645f5212cd0a18a62ad99f90c804271013ccd4c3f82f7e851d0e02bddef5da9c1ba8af1b2599d424bd95a7f3f29e7f914fe6c3
 DIST buildbot-waterfall-view-0.9.11.tar.gz 713915 SHA256 54e36f8d02be7c046510173f7adb14e3eaeb912e0f41f1b7784e2ac0744799c1 SHA512 aec554156ac6d430f62a090d61896732cca7a0f9ebeaa33c929113f9fcf07c4383d9aae7e544d3dbeb83e7f267327810c10c04ba3ec1f7f9c7192a03b4cd47f6 WHIRLPOOL 5d9003b79c25622048b22ec5ab5a17cf6219ccca964ce8ab14de7052d95af9deee7e8dc9dadbd819b444c3b1562957625cc39a7e684060dcacbd89c3870e3c54
-DIST buildbot-waterfall-view-0.9.4.tar.gz 705483 SHA256 4e8e8d85a77a95fb6ec6e9b0eaa4a774f80cbc6f3a6568f8525d4c90f336b69f SHA512 b619e366b2d276ec956c7f2b814fbea5ad8d626f21d365f586fb93d9ddd8d90c6e3f290a6404b401051e780b228b84f78642f876783c0da6e96549f0e2c9929c WHIRLPOOL f6622afe37931b1525f4234b138d7cd6c296ab92ea00a476eab2b8cd00192972e2b3ca936d54d01b5ed4d93441824d79734b179153614f568a3023ecb308fcfd
-DIST buildbot-waterfall-view-0.9.7.tar.gz 705818 SHA256 d6455df447720e367988f043ae381130add96daf80ae45cdf5a0fbcc8aa082e0 SHA512 4f5a068ff03d2ea24eca2344676eecd5558b02127f805b0c88ab0b1bcf353640a6b0bc8756c12d0565a5fdfc8dedff8394b5dc014378200880d469fa26b7263b WHIRLPOOL 2d63af137626018440975cb55e587a94dd9227e0dbc2b62b6726b9bb86e78b183ad656dcb52ec0afecca6b66a0320bc3ac42bb208c4f835343e6e062d00abfdd
-DIST buildbot-waterfall-view-0.9.8.tar.gz 705815 SHA256 a8ffe67b5bb8bd5ac15e6cf853cc693c3328fc508ecfa337613fc8f6081c3603 SHA512 82f75f706c97bdedb744f34229c5efefe6f7bb713874f0d99a322233663764b37572b9c9b7a2004c64d7693f6e58625e0c17bacbf743c16ed5fce16d6ad87b2d WHIRLPOOL 87922d9637a8f9b028c1e7495d552b7b2c63a78c5efb313066e6cc212211b6728de105076ad399ea04086948707b7f5f0182fa6c5e471b5cc83cd9b135ab6677
+DIST buildbot-waterfall-view-0.9.12.tar.gz 714290 SHA256 f83ae2a2e095c589e18784d743275eaa62e45c2bf0f2b530ddaec195fac3ed8c SHA512 76abc01783c02980bc2d6e878536416aa046dce3259c65fa5c2f15d3f66d1b9b5e0bed2d4f6b9d6c338300637c6b91e9bdee3fca3e47022d2ea9b75ffa69eb99 WHIRLPOOL 6a2ad5d4162a05d168b6efd35181ed494b641d53599819da19c963d7a9f0b2524b90f4b21020033d673dff8b317016d58576b059d19c7a4ed1c75f064b827848
 EBUILD buildbot-waterfall-view-0.9.10.ebuild 1144 SHA256 7ed4c13fad83f37835accdc001d6e67c028c989f8fddb928f951abcd3598c07c SHA512 d499cf5938765934703baf981973ab2899b368cae040367557caecc79d0dc39be3a92dbf068b7d04f957d55f82fa9e89816e1c5b9d1b65e6484e22d26300e689 WHIRLPOOL 36eb0a19171fd6ec3789d6bf3d5e02c7e53ad3e80d836ed97df338274c488756e09450f2f80c91a4799a2b207abd71b08c7ff5597ed873808b6f2f0af3afe122
 EBUILD buildbot-waterfall-view-0.9.11.ebuild 1144 SHA256 7ed4c13fad83f37835accdc001d6e67c028c989f8fddb928f951abcd3598c07c SHA512 d499cf5938765934703baf981973ab2899b368cae040367557caecc79d0dc39be3a92dbf068b7d04f957d55f82fa9e89816e1c5b9d1b65e6484e22d26300e689 WHIRLPOOL 36eb0a19171fd6ec3789d6bf3d5e02c7e53ad3e80d836ed97df338274c488756e09450f2f80c91a4799a2b207abd71b08c7ff5597ed873808b6f2f0af3afe122
-EBUILD buildbot-waterfall-view-0.9.4.ebuild 1128 SHA256 44cb89355756ae544474efb96f28a75443051837190e083f6cc75192fae50cd8 SHA512 fa14b672f6f906fae4e613c9910b0c7fb5f078b91e5d2a5ea8206a1336e7e4c86d8310cb7e222b18c5f41032e50621a6ec7c6dcb407a75df1d64a476265c558d WHIRLPOOL 1dc152fc5c122679b4462c2ee23ab8b4b7b163994db2c8e4c893b99973f4f6a3304bf283c7babf89849a0a355bf3c35c03fbada5d03920db7786526bf914d11b
-EBUILD buildbot-waterfall-view-0.9.7.ebuild 1138 SHA256 af74f64528fff07d56ec183b3ce4fa059ee4c392ad46a631c8f8c4af83be4256 SHA512 45883f50f051a21f965128d610cc2dce86749f533e83d011c28c08a2b778c1c55c8edc8fff2d283f3b176c37f46431a093d5c9d77bd9977cc24f5876173af25b WHIRLPOOL 0ae9092ce5ef1477df76e7033b67d202a36997b2cd222dbe20ba92c00f8a8befd974f93ca65c3ceaef8e8299feeb79370dc65698ebd6237fb67a0f7be7e496fa
-EBUILD buildbot-waterfall-view-0.9.8.ebuild 1138 SHA256 af74f64528fff07d56ec183b3ce4fa059ee4c392ad46a631c8f8c4af83be4256 SHA512 45883f50f051a21f965128d610cc2dce86749f533e83d011c28c08a2b778c1c55c8edc8fff2d283f3b176c37f46431a093d5c9d77bd9977cc24f5876173af25b WHIRLPOOL 0ae9092ce5ef1477df76e7033b67d202a36997b2cd222dbe20ba92c00f8a8befd974f93ca65c3ceaef8e8299feeb79370dc65698ebd6237fb67a0f7be7e496fa
+EBUILD buildbot-waterfall-view-0.9.12.ebuild 1144 SHA256 d92dd1c272c7d72a28c26f5fe748f68dac5e0e09a2383fc07c268b6e14ecff08 SHA512 f687c6c40dae5e82694f10e75e42b8a94fbd1b7b95827acd6400c78c2cef34555a3be9bca3c213bd79340e6099336ffe02b43e485b9f04c619939244aa4f985e WHIRLPOOL 5e3356db5f9320deba75f26bb1ccf5dbf2c430814cfb8f2b754b6233d7af7d63d50119881428d8f8fe0ee40c96654d62df29a650d98a4d72114621b28c5cebb5
 MISC ChangeLog 1552 SHA256 a240f51f3de95487d52cf50a9555c709d9018065ee934495448ce67db7c66659 SHA512 2baa45f8ab5632ac777141d519bbc70cdfc80fd8f18b307e1bbb5285e1becc159feb8716b8880572d5676555b5589878ce937b5ced8aeacce06251c493fa1e87 WHIRLPOOL a9d08e3e7738787d966e9218a0eef5a8c2bfc839bf5b87ae9fe337cd76f278928ff154db696edd13ccb25501721db358bbd170f49b9c1fb6640fcc20b4e0b06b
 MISC metadata.xml 791 SHA256 fee2ac7b0b3201ae6839203cb59e516e9c73c96f41760dc014deeb0afa4fe263 SHA512 0a5df49353620d0c31e66181179c213e7add694cdc141715635650a1a7962cfd96f5a965e42ca8f860d6d24ad9be08001e4a9b2ca49ef31f529f9aec0878cc13 WHIRLPOOL 81e929d5f622174b8eb3036683d50fb4ba6667a44e1ae42bc6bcd7e99328d27ed9b0bbd75f6171491bed7626510e4d39a24e0acf3e40710808f240173d4e0fc9
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.ebuild
new file mode 100644
index 000000000000..da5ed0674422
--- /dev/null
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 python3_5 )
+
+EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+inherit distutils-r1
+
+DESCRIPTION="Buildbot waterfall-view plugin"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-waterfall-view"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+IUSE="test"
+
+RDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+#[[ ${PV} == *9999 ]] && S=${S}/www/base
+
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.4.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.4.ebuild
deleted file mode 100644
index 5ecebb613e0d..000000000000
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-waterfall-view"
-
-MY_V="${PV/_p/p}"
-MY_P="${PN}-${MY_V}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.7.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.7.ebuild
deleted file mode 100644
index be64d6dbd801..000000000000
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-waterfall-view"
-
-MY_V="${PV/_p/p}"
-MY_P="${PN}-${MY_V}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.8.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.8.ebuild
deleted file mode 100644
index be64d6dbd801..000000000000
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.8.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-waterfall-view"
-
-MY_V="${PV/_p/p}"
-MY_P="${PN}-${MY_V}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index 35d92b77d0ec..95b313dbb8fd 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -6,14 +6,10 @@ AUX buildbot_worker.initd2 1640 SHA256 5894d6b79e903d82d3981b08957834af33757ba38
 AUX buildbot_worker.service 296 SHA256 c7bc100f3aa9e9d8b7cd0656e8474776177dd56ba35da864db4750b8ae42d69f SHA512 936035e92d8bd481b8af93450445a82ccf8eb21d3f6bf99c2a02f52ba71d911940b8a6316b7f8b888443f577d73184bf7e7d99329ffbaa995e32ea3d9cf715bc WHIRLPOOL 8c55173c8bff639e031d1bf0212e6231cf12e59da74fbc3a5cd367b7432c7f3ef3eb3244b001ab45b3fc0ccc3fd4cdbcc60b5ce3b6c549f681e95c5374319968
 DIST buildbot-worker-0.9.10.tar.gz 99028 SHA256 1793631d74629cd73bc0df1fadf28fb34d87e63aa72cba82058122bde165a824 SHA512 0f515610d9c788657b10ba6624745841241fe554b472e53abdda221a678eb73d7a21a6529eb0769450de3a79b43bb6e51f4208247a4d8ef25c3d36b6ced6ec89 WHIRLPOOL 67cb199328428167c7e52f7b6ecbe7aa73729b5b453b5a8c16ba4999502bf30d9b139788f755eb4811968a60ce61fde32cdc29a31242d3777302792bb04863a6
 DIST buildbot-worker-0.9.11.tar.gz 100746 SHA256 4254bf964465acb6586fda36b26a424466a265b6a5259138cf4fa63a1e9f6851 SHA512 c7209c3fff8c43a23de71fa61709c9f02a5bdd9c8c8980ac5d205f720abdaa9bdb78d0d4e40fe9f915c8d5cf253b9e3c63401712ee121ac085909b0244d82897 WHIRLPOOL 30e1fb17eda975ff3a1e333a0ae17bdc2b432bd9c139a0c1f8dbea69984311add3a6f0659b7add0a3fecc2acf9460a908709efa8994f5763bfbbd2618df67050
-DIST buildbot-worker-0.9.4.tar.gz 100889 SHA256 129e0d3fa9ee34f0f227487b6d1645820d2d4853099a1b0aed56587d3acab965 SHA512 7d055b7b005ebf1cc8033fb86f5321a9d80e0505c1a8b28b9ba3945323f157d34f34066ee9513e82b05c63af099d6030bf42d6f44533859b4e01983f1114462b WHIRLPOOL 8f2b95a476e93beaba5305137bb1d219a9aff59e8bb4450d6352babe799bb0166c299e7c8ea69e53c467e7e58be2681ddba4ae74ad8ba945221e1059906e5fc1
-DIST buildbot-worker-0.9.7.tar.gz 96416 SHA256 a41b4e0c7329821a0d85ee0e6edbde3db403676c62e59a6f436a048a008ac268 SHA512 84ccaf0472553f8422b342163e44e55481f6691338df38db6b1be74f0a79c13e2a52be56df632491662ab79648cd5034ce04d906bbedb01030e4fa96f1689ef9 WHIRLPOOL 70379e6f34ea30aef0e0008fd098a53ba144696f1416ac77c3756018bc371646d2261a28589ad5131f7be7de930189bd771b4a82de27343441543da5c683e122
-DIST buildbot-worker-0.9.8.tar.gz 97193 SHA256 825e022a794c7470276169b6ac1b774f39f60d16545bb46fdf5b4a3b2c78f44f SHA512 43cb7d83835d009c3d4f9a9671d3bd1037d50969b6238f9c77e9f1caedea83c9b9f77d642743d47ff2eea8f3c6549b9e4c843b7d9f638dc5a28339e034ea9b47 WHIRLPOOL 1127b956c3a94ad426c686e42dcbdf6a6f4427751c4ddf247569bc0ee03e86d1ae609263386e730d92b2a572be76208cb999c571fdee9f85de49de161a5c1ab1
+DIST buildbot-worker-0.9.12.tar.gz 101655 SHA256 d2a9cdf5525bd18965c1f96d2b9afb8b83c46f2d10bfda6a22cbf6724265af41 SHA512 c2e86bd8818eddc2849626a0c7642169bc91fa2cc1d531977736e53c4ad3c87c3f0cb17d7b9acd137e783ae822f558a19f4668e3cd37e90a8435157485bd1d57 WHIRLPOOL 83d914cc94fe99471c830a8615e6a93ccb351c98f75978d6f504cf45a3d87f48a82b07f93b51993c679c1c316c4058fe91e56717f786262d234e230e88b8272b
 EBUILD buildbot-worker-0.9.10-r2.ebuild 4810 SHA256 79b798ef0f6513ec2ac108005657d0cb067c6781532b74fa98ddfd21e714a5e4 SHA512 c330f345c67d69ac7c276462104942061ffd9fa5b55173222a8b5b927576ac218ec97a11c09c9fd4eca56beccbbc45f8080d771dd5c1ebde7eef7cff43ca4a2a WHIRLPOOL 9794ba57c88cc4674eb3cc59492d820714ff9e0ece4d6d55a8cf3f14924d4f352323eb37792d3c6dfd9c3b19a846b40004b13396f00769bd3df8bd1a80decaf7
 EBUILD buildbot-worker-0.9.11.ebuild 4804 SHA256 13c159d879f67129928e5e6625bebe0f91414fc0cd4476bb8cd192c3aad2ae98 SHA512 999648a81ebd40ffc7cba11a718374e558d7026f0cc67cec1b7117e6b81f571043037e98ac3e5e0ef8751ae9a426be5fa5e675764223091c789c725ae99a1b7c WHIRLPOOL 6494284ba56aea9f77dcc3bfae2ca49f5224a1550e40b8198715da59a4dce03568272837a5ab5fc7c70c47e81f659061ec8a60c94570ac963e1bdb98e8d31a93
-EBUILD buildbot-worker-0.9.4.ebuild 2010 SHA256 f0cbb73ac8ee6008ecf71af5c98db4c62f6812507906588d8d9b9b44ace61895 SHA512 f4743127ede02a4ea17fea13db095ef96120dfaea37c92812beecec1e86221e1dc51d5dd12391b639f6ec2a8acbf13126c5e091a713bde8f795a2c0efc7af176 WHIRLPOOL f095fcaccb6e557df3a22245c0f3173c76505ada5ef073ecf7d3671a359f72815f22c38fbe8c9ddbd2e4b44d78b4602e2458903c8e229ad26216fd0b00dec72d
-EBUILD buildbot-worker-0.9.7.ebuild 1929 SHA256 f3e4a4142d631de55641e6bd03815c17ade4ee381f5ca8f84665cc0ffa843f56 SHA512 e86c6223f0b86fd54ec0f68c3ec4577c072543e3cb9f0d679c98a8a5a4af58f172e681979aeaba4610eb3bd8af133d367fedf78bb7de8ea386a7af5acfc384e3 WHIRLPOOL 55738da98a6e3e10fc3dc7f4b03a3fbfceb5a4e89df3b8929106b62d0b2fde814493c02d59da212153fe08921596f7ef85653dfaa3b545ccc64a7ed117377dab
-EBUILD buildbot-worker-0.9.8.ebuild 1956 SHA256 633288152b35404a12844d82d336b2ad44697ae2bf9c38c7e914c04ddcdd3181 SHA512 0128564c240f840f80cf035b912300ae615027ca32326eaccfddb5b2acc611e9f7fe191c65a9450adaa4a5d79ebef39e9bc0e7e0e373c5f4daab8a67af386148 WHIRLPOOL 0f545de1b4f13ced4ba844e02f1a47eeba7c9b0ffb600a3a6fd1ee5f7e2ce8b006a87e204fc4d155e478caba23aa6b2f429f7f887e04f20852cc6156ea55ea53
-EBUILD buildbot-worker-9999.ebuild 4804 SHA256 13c159d879f67129928e5e6625bebe0f91414fc0cd4476bb8cd192c3aad2ae98 SHA512 999648a81ebd40ffc7cba11a718374e558d7026f0cc67cec1b7117e6b81f571043037e98ac3e5e0ef8751ae9a426be5fa5e675764223091c789c725ae99a1b7c WHIRLPOOL 6494284ba56aea9f77dcc3bfae2ca49f5224a1550e40b8198715da59a4dce03568272837a5ab5fc7c70c47e81f659061ec8a60c94570ac963e1bdb98e8d31a93
+EBUILD buildbot-worker-0.9.12.ebuild 4807 SHA256 6544fbb1b0cd24e2342091a299dcf5703c07d73e2623c01ef63c898ddd6d1f23 SHA512 a6e244e3971f9015652bdac9702932475da8fce610ab5a92fcde9c01e43ea6a0f18efbbb8f1589fd0babe3dc8975e3becebffc034105536442c090958cfd748d WHIRLPOOL 7f0d827354fb521fcdb105a3e4a0ac05180253b11350a9d86e7aa1eadfac5665169e49b22845ec17e563b57f53af8a663a94c45aecfe8d07f852eb42ece54f45
+EBUILD buildbot-worker-9999.ebuild 4807 SHA256 6544fbb1b0cd24e2342091a299dcf5703c07d73e2623c01ef63c898ddd6d1f23 SHA512 a6e244e3971f9015652bdac9702932475da8fce610ab5a92fcde9c01e43ea6a0f18efbbb8f1589fd0babe3dc8975e3becebffc034105536442c090958cfd748d WHIRLPOOL 7f0d827354fb521fcdb105a3e4a0ac05180253b11350a9d86e7aa1eadfac5665169e49b22845ec17e563b57f53af8a663a94c45aecfe8d07f852eb42ece54f45
 MISC ChangeLog 1884 SHA256 e84ac9d3144868250dba0f8f838d5758ad64836792e5a2fe02a9bcab9a1a74b8 SHA512 6fc01aefe3d8e75fb7ae5448154e04565ebf434acb2e0d843c89d6dbc607ba0b3064a0a352fc38a329ce588061c4491960a2dfdbe3a51bc9f035501170e341e4 WHIRLPOOL 4cff2243ef7c6ee758d399779b0f9d18490b22ea51b7ec27576a83a05996db55f2f78b98f56dcb1d5147c4dc1d2d35259a8e2115d80108aac74f537837d2ad11
 MISC metadata.xml 591 SHA256 3a89cdceb5291fcd69949b39636d7114b706e2c40fcf11b03c0a06bd2aeb51b2 SHA512 d3273df1c8e6284b75ab5cd15cc5092d10db8ab8c0126e5eb21425bf3f2cab0f582a4e1bdf1e96881cc580a13047ac9fc72e09474f03dd788f85cd7962be6257 WHIRLPOOL ad7de4c7080f104c6545121826b45527607a3da5b5135dfb66de78369818665e05905d1d514ab6da940295c04d4dc030e054882802c9eb2ba120c41c168ffb15
diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild
new file mode 100644
index 000000000000..4fd3f42b8d6f
--- /dev/null
+++ b/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 python3_5 )
+
+EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+inherit readme.gentoo-r1 user distutils-r1
+
+DESCRIPTION="BuildBot Worker (slave) Daemon"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-worker"
+
+MY_V="${PV/_p/p}"
+MY_P="${PN}-${MY_V}"
+[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+if [[ ${PV} == *9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	!<dev-util/buildbot-0.9.7
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/setuptools_trial[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+[[ ${PV} == *9999 ]] && S=${S}/slave
+
+pkg_setup() {
+	enewuser buildbot
+
+	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
+		to support starting buildbot_worker through Gentoo's init system. To use this,
+		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
+		Set up your build worker following the documentation, make sure the
+		resulting directories are owned by the \"buildbot\" user and point
+		\"${ROOT}etc/conf.d/buildbot_worker.myinstance\" at the right location.
+		The scripts can	run as a different user if desired."
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman docs/buildbot-worker.1
+
+	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
+	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
+
+	dodir /var/lib/buildbot_worker
+	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn
+		ewarn "Starting with buildbot-worker-0.9.10-r1, more than one instance of a buildbot_worker"
+		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot_worker configuration file"
+		ewarn "is now the common base directory for all instances. If you are migrating from an older"
+		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
+		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
+		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
+		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
+		ewarn "    rc-update add buildbot_worker.myinstance default"
+		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
+		ewarn "Systems using systemd can do the following:"
+		ewarn "    systemctl enable buildbot_worker@myinstance.service"
+		ewarn "    systemctl enable buildbot_worker.target"
+		ewarn "    systemctl start buildbot_worker.target"
+	fi
+}
+
+pkg_config() {
+	local buildworker_path="/var/lib/buildbot_worker"
+	local log_path="/var/log/buildbot_worker"
+
+	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
+	einfo "Press Control-C to abort."
+
+	einfo "Enter the name for the new instance: "
+	read instance_name
+	[[ -z "${instance_name}" ]] && die "Invalid instance name"
+
+	local instance_path="${buildworker_path}/${instance_name}"
+	local instance_log_path="${log_path}/${instance_name}"
+
+	if [[ -e "${instance_path}" ]]; then
+		eerror "The instance with the specified name already exists:"
+		eerror "${instance_path}"
+		die "Instance already exists"
+	fi
+
+	if [[ ! -d "${instance_path}" ]]; then
+		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
+	fi
+	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
+	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
+		|| die "Moving sample configuration failed"
+	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
+		|| die "Unable to create link to init file"
+
+	if [[ ! -d "${instance_log_path}" ]]; then
+		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
+	fi
+	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
+		|| die "Unable to create link to log file"
+
+	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
+	einfo "To change the default settings edit the buildbot.tac file in this directory."
+}
diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.4.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.4.ebuild
deleted file mode 100644
index 309d72c4734f..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.4.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo user distutils-r1
-
-DESCRIPTION="BuildBot Slave Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-worker"
-
-MY_V="${PV/_p/p}"
-MY_P="${PN}-${MY_V}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE="test"
-
-RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	|| ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-		>=dev-python/twisted-core-8.0.0[${PYTHON_USEDEP}]
-	)
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-0.9.0_rc1
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-[[ ${PV} == *9999 ]] && S=${S}/slave
-
-pkg_setup() {
-	enewuser buildbot
-
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-		to support starting buildbot_worker through Gentoo's init system. To use this,
-		set up your build worker following the documentation, make sure the
-		resulting directories are owned by the \"buildbot\" user and point
-		\"${ROOT}etc/conf.d/buildbot_worker\" at the right location.  The scripts can
-		run as a different user if desired. If you need to run more than one
-		build worker, just copy the scripts."
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/buildbot-worker.1
-
-	newconfd "${FILESDIR}/buildbot_worker.confd" buildbot_worker
-	newinitd "${FILESDIR}/buildbot_worker.initd" buildbot_worker
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.7.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.7.ebuild
deleted file mode 100644
index fcdfadfbed66..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.7.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo user distutils-r1
-
-DESCRIPTION="BuildBot Slave Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-worker"
-
-MY_V="${PV/_p/p}"
-MY_P="${PN}-${MY_V}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE="test"
-
-RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.1.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-[[ ${PV} == *9999 ]] && S=${S}/slave
-
-pkg_setup() {
-	enewuser buildbot
-
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-		to support starting buildbot_worker through Gentoo's init system. To use this,
-		set up your build worker following the documentation, make sure the
-		resulting directories are owned by the \"buildbot\" user and point
-		\"${ROOT}etc/conf.d/buildbot_worker\" at the right location.  The scripts can
-		run as a different user if desired. If you need to run more than one
-		build worker, just copy the scripts."
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/buildbot-worker.1
-
-	newconfd "${FILESDIR}/buildbot_worker.confd" buildbot_worker
-	newinitd "${FILESDIR}/buildbot_worker.initd" buildbot_worker
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.8.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.8.ebuild
deleted file mode 100644
index d3e878cd1624..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.8.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo user distutils-r1
-
-DESCRIPTION="BuildBot Slave Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-worker"
-
-MY_V="${PV/_p/p}"
-MY_P="${PN}-${MY_V}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE="test"
-
-RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.5.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-0.9.7
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-[[ ${PV} == *9999 ]] && S=${S}/slave
-
-pkg_setup() {
-	enewuser buildbot
-
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-		to support starting buildbot_worker through Gentoo's init system. To use this,
-		set up your build worker following the documentation, make sure the
-		resulting directories are owned by the \"buildbot\" user and point
-		\"${ROOT}etc/conf.d/buildbot_worker\" at the right location.  The scripts can
-		run as a different user if desired. If you need to run more than one
-		build worker, just copy the scripts."
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/buildbot-worker.1
-
-	newconfd "${FILESDIR}/buildbot_worker.confd" buildbot_worker
-	newinitd "${FILESDIR}/buildbot_worker.initd" buildbot_worker
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
index 0697e9a2ce0d..4fd3f42b8d6f 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 PYTHON_COMPAT=( python2_7 python3_5 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
 [[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo user distutils-r1
+inherit readme.gentoo-r1 user distutils-r1
 
 DESCRIPTION="BuildBot Worker (slave) Daemon"
 HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-worker"
@@ -26,7 +26,7 @@ fi
 IUSE="test"
 
 RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.5.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
 	dev-python/future[${PYTHON_USEDEP}]
 	!<dev-util/buildbot-0.9.7
 "
diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest
index bfe6341a3b64..04d4c30d8191 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -1,3 +1,5 @@
 DIST buildbot-wsgi-dashboards-0.9.11.tar.gz 627215 SHA256 bb72b78045867bc0ee2cbe90df96978860ed14e61090dc67b5ecd9606bab2975 SHA512 6f829d5ead05cb91f5b85f128874f1df01288e87938df9f8dd1cca1552ccfb7cae35be4eb077ea97d5ca4f44b236947649131b9aed2bdc9142920c2ee1439f4b WHIRLPOOL d33937eb54c8c4f7bc8d5d3258d37b0fac39293657e2668fc96149a574ff583f37798ff0ce03b2bc5a2ab5db1015db5538c1d5806ff23ca7d2b7a8152666d97f
+DIST buildbot-wsgi-dashboards-0.9.12.tar.gz 627274 SHA256 6feaa8018ea4a16edefa3fa6ea48fa40a37ed374226473cf7a79369f599f9599 SHA512 113c1616b08feb64fd3d94c1186e3d7dd7ea93e563a96ddb802e6ff8135e194014464ef09a23004518451626584bc531fc17419188ebbdd388e9363541b80c3d WHIRLPOOL 6a3b07bd131f84ed13b940c19ca6680d76967135e50d53fb1da9115511707200ac322adc59ae4a3f36928f00903137df44fa012aa3f097af06660b75b728a1a9
 EBUILD buildbot-wsgi-dashboards-0.9.11.ebuild 1149 SHA256 aef5bb31637e237292329c610e7c4ee390adb8ed92a6ac8cf94348dd8723aaa2 SHA512 c79a8319c6d3496cf1b9e7e2b5314e8fa58ef8322e0b4e6d1b3e45f90076063c5a0812a86ce76a0fa97345605474dad51c60670b0e9c0d5110cbf4764840bf1e WHIRLPOOL 581a6d750af5ad57595c0330bbacfe5fa533761c22f6b1d5c8921f750f3ac68272c785e82a5f27a2dc43ad0916097daa534fc7e373a0ea7e799ee1aa19769f84
+EBUILD buildbot-wsgi-dashboards-0.9.12.ebuild 1149 SHA256 aef5bb31637e237292329c610e7c4ee390adb8ed92a6ac8cf94348dd8723aaa2 SHA512 c79a8319c6d3496cf1b9e7e2b5314e8fa58ef8322e0b4e6d1b3e45f90076063c5a0812a86ce76a0fa97345605474dad51c60670b0e9c0d5110cbf4764840bf1e WHIRLPOOL 581a6d750af5ad57595c0330bbacfe5fa533761c22f6b1d5c8921f750f3ac68272c785e82a5f27a2dc43ad0916097daa534fc7e373a0ea7e799ee1aa19769f84
 MISC metadata.xml 790 SHA256 d00575352bc63fe4e7b77eb26e120689fd6a8cde90dbb61d5e2b0d68b0fda7be SHA512 15928eff7b660deca2fa007e8924a8c878f4694880a3e0d2092a63b9fc745fbe91f77ae4af65d1ecd1f593519dcfd6b4f495cbef16704680826b00bfc5b4cf4b WHIRLPOOL d6013034f5d0da76fb9ea889a5bd4f77ba67fdf03433f850772a7349969785d17ea1f0592750a428e30eb60ec3f11d5076b9b3832b451b53cc3a463dff1bfbb7
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.ebuild
new file mode 100644
index 000000000000..cf9810a5d1c1
--- /dev/null
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 python3_5 )
+
+EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+inherit distutils-r1
+
+DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-wsgi-dashboards"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+IUSE="test"
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+#[[ ${PV} == *9999 ]] && S=${S}/www/base
+
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index 53d1bbe04848..0fb470733ae3 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -1,12 +1,8 @@
 DIST buildbot-www-0.9.10.tar.gz 693452 SHA256 9083516d702feefb8b61dd6cb351a54163f3b2d4f34b14071f77f2f550de9bf6 SHA512 9ff91de09ceff6dc53619ddd7b8a233f9206b91d75f508cb82fa948451eff8146aa112bada5f1f261f3c25870867046c40a41b85a4acd3b98c00ddab76580780 WHIRLPOOL 7986ad9423d5b585a52a9b04e0fbaf98716f9bfe81f1d99fe57fef7cd84dd391347cd16acaf3684626fc5927171cebec71cf2b12c60e24f393da5d3dcedb7fba
 DIST buildbot-www-0.9.11.tar.gz 687664 SHA256 af01216d543eddba0772e55a0a97a2a1d0a9b0fddc1c87dd59b449b4818893db SHA512 5a4ecde7a79bace65fbaeedb9153ccfc8094e0fdccd19bf656a1aee1cb5eb84dd28ffb0279aaa0f75a2365278276f5a16d7015eab732e2642a3344d2b28ff441 WHIRLPOOL 05ac3085a70b07ed430d20e70225c13c80133cca31b5e86f9cea71b1e2cb22c08a2dcc68e0461d6f9259679351bec4b19221cc43996f25ac1c004f841ffaaf67
-DIST buildbot-www-0.9.4.tar.gz 691706 SHA256 eb2f48aabee5e840aa8a4fce1f95f2fe4e2ae98045f9465d275ee5e263ae04b3 SHA512 522716f4200c00c1fbf196834279caef0fa2d805c7020d31890ce4d95ade85c5fa4a605d343a4fbf0d404f3088d98a7fd3c39bea58f3b02bc9e4a6daa9e3f6c6 WHIRLPOOL 6991e6052b3e5c3fffb83f2808f0b7da4f2267c0b4aa9b3cf3b665ba2046e5f123baf18d8dfbe25780782e9230b488edf1cfee8b3c07241aa59ce99509bb735c
-DIST buildbot-www-0.9.7.tar.gz 691849 SHA256 3123b1518976edbf285c2c0791719dafda59baab0103e533a54eb6ed134b78c9 SHA512 be9eaef167d354e1a028552792047ba31b475f57fc19204076f125552b5ee84770987d16894bc78ebc281b69d480e7b204d8cdaf5a4041af9ae09fb7785721ba WHIRLPOOL abee257ab8df9851bdcb047432d48648176a423337c1dbcc9c45832cb905bc58df8ba3d359b9de7367df36a251375f94f2579a984353a8747e1d256efb691676
-DIST buildbot-www-0.9.8.tar.gz 691945 SHA256 d3384b942b9194f52d8855df066ae355417a52cb69dc02ba061ebeb0f996f06b SHA512 819fa74219f27c0a8a7d4b05f099d4a92e1211cd6cf212dd9db4df3fb3d2ec3bf29bd4de8a463bedb611fec5e7c82e64b3a139b77505b0b9955ee3ed1cde205f WHIRLPOOL cdfa636af9aaaee8d42425b0269cd77c2c87846333d9b62cbdae9dc513ad37bc52ebc631b4f1284e2c27f94aed78a01df84114dfa1c766102e49ead1d7806505
+DIST buildbot-www-0.9.12.tar.gz 691551 SHA256 92b80fc61f3491eff3da310f4d36a9ea9495fb0756c42f62ebac31945b43659a SHA512 6c525d32407be24aa728a0bd9c9a09c64bb4bef092ef9e5285475527f7fcbd89d516ea376d90b22aa24af384d73125bc886360cf992dfe3d01471838193f351a WHIRLPOOL 540923b3b45f1cb2fc069851b275a253c8b419915ab7a529de1c1790a1a5b83a5dbeb0a329a87fd78aac3efd0d77730d1bf4d9bed8576eae7be68cd1c660dcb3
 EBUILD buildbot-www-0.9.10.ebuild 1181 SHA256 500cb653d534013712fb56c832776b6d23250d3c22cd1be1d7fa25e0f37d64ee SHA512 770bddc301920a0a6e8abeaac1c231794c824f9d8d991be9213aecca68621b56b8ab1118a6e3641841375682e1d3c54cf784a11e93164404804f840083985c35 WHIRLPOOL 64f035d25d8340e139174d4baf2864daa27c66e2356bce4e92e1c0d9cd2d5cf6b6ad0e65fa44f4baf04c7cfb0863dc18ab95ec8eb1733a1ccd739a07e9c70029
 EBUILD buildbot-www-0.9.11.ebuild 1181 SHA256 500cb653d534013712fb56c832776b6d23250d3c22cd1be1d7fa25e0f37d64ee SHA512 770bddc301920a0a6e8abeaac1c231794c824f9d8d991be9213aecca68621b56b8ab1118a6e3641841375682e1d3c54cf784a11e93164404804f840083985c35 WHIRLPOOL 64f035d25d8340e139174d4baf2864daa27c66e2356bce4e92e1c0d9cd2d5cf6b6ad0e65fa44f4baf04c7cfb0863dc18ab95ec8eb1733a1ccd739a07e9c70029
-EBUILD buildbot-www-0.9.4.ebuild 1165 SHA256 3adb8f216000946d5282191a5e016632eba83dbab158dae83a07e853de9a83c5 SHA512 bc26062abdf359eca2d79bbb2504cb30785976b1d629788582b89b7eb40dca6dce1247c3c8947b434df8402fa9a5ff604e8430b6ce0eee7fbfc5db6168fecd7d WHIRLPOOL 7dbdf12f77dc2eb41c0436e3acdc24fd569fb71033c25e5f8209645dbfe13f6be0f44b4234d8ccbdcbf8f126f01180b84423438f582d459982896e682c69f831
-EBUILD buildbot-www-0.9.7.ebuild 1175 SHA256 8d8178d31c2c8cd1f2cbcc7bfdd4a6ea5624664a65cb6c211070df4acd3cc845 SHA512 28fc86bcd028483500c65e2120ee28b744d219a98bcf372e9772b80bbe5ec849c795fe783dcb6bb18517853256be113694da9dc0b3b05ce703f4c8cbd40a64a8 WHIRLPOOL 6500e25bc0c5cf685e8d477ecdfe991e6b4e00ac74124e2a6b588dc99e04cf1f65a1eafd594df73720ea9bd6c6e0ec662ecefa6187771e4edf3d515c28af5a04
-EBUILD buildbot-www-0.9.8.ebuild 1175 SHA256 8d8178d31c2c8cd1f2cbcc7bfdd4a6ea5624664a65cb6c211070df4acd3cc845 SHA512 28fc86bcd028483500c65e2120ee28b744d219a98bcf372e9772b80bbe5ec849c795fe783dcb6bb18517853256be113694da9dc0b3b05ce703f4c8cbd40a64a8 WHIRLPOOL 6500e25bc0c5cf685e8d477ecdfe991e6b4e00ac74124e2a6b588dc99e04cf1f65a1eafd594df73720ea9bd6c6e0ec662ecefa6187771e4edf3d515c28af5a04
+EBUILD buildbot-www-0.9.12.ebuild 1181 SHA256 e89220861e96cbda8bb6c7f8fc94fe976c8a7eb1a5380ff3b1916bbd2caab087 SHA512 55413cee7848b2026b0ed6ca5d5c94e4c563f270dc49dc9b323da75c268888d97155c808150e2e4d40482842f0fd4dd3fde4ca692112e42a8aab9c911644d02b WHIRLPOOL 94003ddf0a33087bc2d35c80c52e8b96b4df1796a0dfe3d68650952fe579f3af73df38909a23a7aeeedede95f97923e7a76ca88970ebb56ecddec73c35977773
 MISC ChangeLog 1441 SHA256 16e41fc1f9bdc755de438665ed93ff1fe5dfa118808dff5d998d012c15d23b32 SHA512 b587afe92f2591ddc8cd47d72b367a2bb467b46e48be8a9a1d7e6c8ffc8deaf59306fe49424d6b410878522e31ace7b0d909f8b037db7deaf317fe5036a302cf WHIRLPOOL 7b09f9007361442e46732b89b141d121fe19448e46a264862b4d7698ad84bb7b36b03f8e0f2a572ba4664c2fd60802fcf7f5868a74a578d6449e423e160f3e4a
 MISC metadata.xml 777 SHA256 bd5b7bb290e4b12d1f69a4f4531e5991cc2133775b601a67095a1845cd90e768 SHA512 9cace9b96d46b5cf2775d4a1d328c5cfdf3448758f293c0b12855bca7f65244e34529bd51e019201f9d397cfefbeb503f6dc1e2cdc9fe1f5e456dce1dcb2a5c6 WHIRLPOOL 7f2165a63b1d2e94040db2992869de06b9537864278bd473456b3e0a2394dcee90f34bb88a897dab5cf79593b438993eb0ab7b3b85707463e25a7eacd628759f
diff --git a/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild b/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild
new file mode 100644
index 000000000000..8a824ff4cbcf
--- /dev/null
+++ b/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 python3_5 )
+
+EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+inherit distutils-r1
+
+DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-www"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+IUSE="test"
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+#[[ ${PV} == *9999 ]] && S=${S}/www/base
+
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot-www/buildbot-www-0.9.4.ebuild b/dev-util/buildbot-www/buildbot-www-0.9.4.ebuild
deleted file mode 100644
index 2985e3067ac9..000000000000
--- a/dev-util/buildbot-www/buildbot-www-0.9.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="5"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-www"
-
-MY_V="${PV/_p/p}"
-MY_P="${PN}-${MY_V}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-www/buildbot-www-0.9.7.ebuild b/dev-util/buildbot-www/buildbot-www-0.9.7.ebuild
deleted file mode 100644
index 8ab635151e65..000000000000
--- a/dev-util/buildbot-www/buildbot-www-0.9.7.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-www"
-
-MY_V="${PV/_p/p}"
-MY_P="${PN}-${MY_V}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-www/buildbot-www-0.9.8.ebuild b/dev-util/buildbot-www/buildbot-www-0.9.8.ebuild
deleted file mode 100644
index 8ab635151e65..000000000000
--- a/dev-util/buildbot-www/buildbot-www-0.9.8.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-www"
-
-MY_V="${PV/_p/p}"
-MY_P="${PN}-${MY_V}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 8a84d528d93d..2ec290579ef1 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -1,3 +1,4 @@
+AUX Remove-distro-version-test.patch 804 SHA256 ba232a084d776b20cfe3a25b7438b4f26af3bf4abbfaa7a28ef954b46056b2bf SHA512 b98005b8a02456d60bdc8085efb4c6fa52386e7b185bf7acefbaf3cd8fe481f87cad68a4d4986f498e35dca1618208032f0a73b04ca0515bbb2703729d3308fe WHIRLPOOL a94c6ae199704ee464cee507cfa394f3f414679caf9b33ba004c30e3621695c87717641661e010a4adedd29c46398bce272414eafc053f9716917be21ada573f
 AUX buildbot-0.9.4.docs.patch 4619 SHA256 25e802ba82315e6f62b536e0002d7af8b6b6c814803d9f142cd70f4aa4e5b815 SHA512 c521b44c9db5d565302bf611842d1b607f240ba89988aacc4d988aa61626be125a5b20a7cc2135fb6e331a50f5de3fc6ba7fe0e5f5a42049700eea46f9cc1c8d WHIRLPOOL 3bead12e5d510d225ad3b8f4070c5d6d206287391c6c5262ae2573123bd1e2e33a214c56e0f88d223cd3df77b04221fb60016e50666ef277c0eab0de76084a40
 AUX buildbot.service 435 SHA256 a94170eaac47b72e3fe86eb3fa3e231c2977940fa77b84ab0736a20a7e68639d SHA512 0baf2696efe3843c93f90c4678696ffe1c7d5df2292b5b3ee48a4e30bf213956052f4772c8e7938f541c08c76b39157b246debf376f9fa26a8773be785cddeab WHIRLPOOL bd2802cc78c5a6a6672e8e84c1330c641911c31bc802be222b9e4c87e3be5ca9115f18e90f3a48012619f7e3bbaf9fddaa0af333526aa034b4d0eae2cd9256f8
 AUX buildmaster.confd 218 SHA256 bb7f93e3867b32a25e2445a66d40573fa5073a80e73e35ae2a904db715f870c6 SHA512 d9339c30d3a92e92b41b0e3139ec89ecbd1460b0e4ee6c6fe2560c4307b2eb3f29b838c2f2312b9c7049bd95eaf652d09039227c691af805bc25a36999ec1840 WHIRLPOOL 0e258348e5882db063e95b3c508f8d92e2a7598e5f76705da2ebba45b4893ae893b0ed67271a112255d3e5b8f5f1ace17b487fc885db30a774dde44be1944c4d
@@ -8,17 +9,12 @@ AUX buildmaster_at.service.conf 150 SHA256 4056f0bf8713ca26e64cd8d3eb6c570156a2e
 DIST buildbot-0.8.12.tar.gz 4834352 SHA256 c6b66976dff712268566574d57131ec15e5682f6d4390cd5c8559bab0980c4d6 SHA512 18c5144132fb033f3581d3c494d5e8ff35d3e8b1548764452ce9ae543d710e58a2c6e3e8e46a0ef237804f9a6a45485890ae4616ab655fb00d4ccf328d6f6645 WHIRLPOOL 5754b7c0278fb5e7da8a7dd66253f6f4d12f54c125f6a78aa9018a2b6b22fd88a27e79e6821ab05e4cd9e87bf0dd08c3c73c7914d4c499ac13c48ca232ed21c8
 DIST buildbot-0.9.10.tar.gz 3112750 SHA256 8c5ed75f3f16f4ff0f2c9e3f9b091acb5e6e1c0ef68ffa8f687a55413a833143 SHA512 95b489d5f7d0bc00ae5f71cd056b36fe689c4dc9408a7a0e4b1b45e036c9074832c8e3755981520a8c85a791b50f7f40765962c12a71887198dc0bbd0140d0e0 WHIRLPOOL 8d62d0aecdea4122709693ce48c72d5dbac2e946a6923a7ea41842dc759369a678e21a8abb0b4ff825e1ba559a9d490bcc4ff56fc5568a4f7f2d94b4f6c5f027
 DIST buildbot-0.9.11.tar.gz 3096455 SHA256 9be352c0aab5d1520fedac8d6b19aadda4f48763ac7f72bb00e5f8cc51107ee8 SHA512 c68a657213b0f878d8c2b4e6ebe18cfc9b3e19a4eecaf085fd3e5631bbb78dc9bd14e6b3d4b576e78eb1631329c86331371200a350d33696204fb76e7beae81c WHIRLPOOL 3b1804d7920e110ca1ae1d04e7a7c38fef0db4a2c7b448a21175a0f2693ba8725d228d27720ffdad976071d143e4158b41dc527d120e2c4928df3fdbd765285f
-DIST buildbot-0.9.4.docs.tar.xz 69224 SHA256 69fc33762a885568b02c42954a64d62d28bcb750b3aed011c3da8a9f84c13371 SHA512 906e551e0db32c8a0b4010b3b8b00c4776e3d1b7d7381e4dc0ccf01d361184e4605c3ab0ecaf4e42207bd73c3e72f8a570a4d4c29db72f4d68241abf48741d7e WHIRLPOOL 95f263e0b9ab22a649118f362d866b08cbdf62511f2a1f9bd6a7265103f174e35d0c8d86ad6a3b7dd5fd0b4277d60dbd25801c5e6f7e414e7fa634c241dae987
-DIST buildbot-0.9.4.tar.gz 3020851 SHA256 068161cd9ada10b87f40117c768a37ce796ebf5e7bf08f224f4c7ded88cd7472 SHA512 938a94192560b989a277d9650c50781d7e7c116bc5e2010ccb2e655df757de0ee254369531b2f432c835c0285c724e52d999a393d0ce1b104d4b9dcc5c6687da WHIRLPOOL 0ffe61b82ee93b78cdb3cb74ef96d5a3547e0fcab9ec8093b59a7212c5e2a1ad16eff046306bffcc0ea63b2e0bf2df1e54b5a0874dc78e27744db2088ccac804
-DIST buildbot-0.9.7.tar.gz 3092434 SHA256 8fcbf0e6536e5d60407f59d14f96d5f8386cd91846a4fa47b4336d71551a9e33 SHA512 3fd2b488cabac37e297bb1a475cdb115f261324a22ec4d6fbcf8dc5bfb6ee135fab3763998433be8795581d476f69e2adb6f42d248bf2131a42eecfc1667202a WHIRLPOOL 427d4c1c452f767550a3d2731b2e34480c399dcf50e57d4fb69f0a350f381e3e7ecc47d712fc8fbb99afcf8b230c7bd3afe8437ec3b24bf9ddbf7d35b4d1caad
-DIST buildbot-0.9.8.tar.gz 3101418 SHA256 39a2f7df458ec9be1009cf90a02d732d142a2ec3fbc0404e4f3fce4b8a4c3af7 SHA512 88800bad542d26aee6df348021faf5f76f36c250e9fb85c9abe3af7f13ec87fcae5727c8633772205f5c024709fd39b05d1d9c3aa1374b4ca72a528b5ec3ba83 WHIRLPOOL fafb46f6d6bc10f6073567cd6a6894cd67d61c4ff537b342060319874eb22ea45d816f6b764f0b9f841f9b7a5e127481a85dbb4abbacd228a8168a5e3e948b2b
+DIST buildbot-0.9.12.tar.gz 3057832 SHA256 0e8a75059dd8d04112ae77391b979432a3b5efb6e80ec60bbe110d8d9d983835 SHA512 62459918267297b31b2a6416f72794c7a4ebdcb60de04ece1681f6b8be9debf161716cc70ad843fd468b23e02c521c0a0783a5a1e119d75648e107691d6b908d WHIRLPOOL 0e29078f6d67c1996c6fa389790d3c89dbdd13f6926882df16286a33b95e275b6436865815d225d1b243a1cfefe4948ebcaa2700ee7a003b449ccac4a32b62e7
 EBUILD buildbot-0.8.12-r3.ebuild 5490 SHA256 ab180e34963560c3a14df8a5f00f451bb469c25c37bf29a211e5c02eaf8bde24 SHA512 16e5f6ba87559ed9788f4cb7451020cfd0e3b2efe22f5126aca23d0b6e20b9ed6050e4dada0e9e595b28f8ddf4e5446c1217c2e77adfd44dc307fc0b8b5b654a WHIRLPOOL d01753e023dadfc3155308bbf9b41a1d1eea03a57d2ba6a5640989e3491977007dd7fe37ca072c1676dbe87b4a920ae294573770baaf53913f39ed5552108f73
-EBUILD buildbot-0.9.10.ebuild 7279 SHA256 bac78fde783e5642abb90ad826409209c4159cced413c7caa1ef374956d23e7c SHA512 6de67b6cf11bff7e21cedd159d6d253fb083cdf2094611410d94a0514d409849d1d8913e5e3ed18f2ca227d3acf2fd1f19e6fccaf31566c8d971ccd278a7e0e7 WHIRLPOOL 128616ff39de2340d10ec6f7f63d42780645c7a014c691172d1b942f030ea353ef03536e3690386ac1fbdc67755cd1962f6ac50d5f83114285c16071062662de
-EBUILD buildbot-0.9.11.ebuild 7053 SHA256 425c5dc4f36d6df2fc5cab17bc5dbad951658b012e8d983d95a286c926877ed3 SHA512 34ff2a130e1a2f44b570667db0ccc7acb1216a873a75491712d1cb3a8ca82a5dd1c081f42837f7ee23b69265298a3889467d646ed0d3fb7b944a38bf40bbb6fc WHIRLPOOL a906335ab4f067047516573c5c72243612a57a55f340f9a0ed1639ea430a3ebd8e89099c2ca14abc33fd95a1d25337666fccb45e8bbefdc36aa6d915ef8e1502
-EBUILD buildbot-0.9.4.ebuild 7076 SHA256 088566d6e59150e1bfbcbfd12a19168b43f9dc420da601ee7e27005c2d6ad299 SHA512 1f5a6fc87fbf5403090c2d573476a910b4b557babac8857512f27458cdf97844a47931884dcbf59eba646b45d8d0408ae15a41ef6eaa42ae0e86c9a0e9af6831 WHIRLPOOL 086a8b5108286ac8de15da37ab8959e76cf922bf2183225c41b5e9c327ec3ab0073339ab6272fc896f48f60488f3659cac5a2772f371a6dd6adb03270c9968d6
-EBUILD buildbot-0.9.7.ebuild 6682 SHA256 52d651cf20b067e0036bf70ba221ba4408d3c33b65c93a9cd2bec9f6d1c8608b SHA512 708ccb2387de7ee61f9c92f8c8a15d8cb39f67a2a161ef57fbecfb9debf5107d35515b7d4c84b6bfea7fbf3ec84b7096797416236ed9d9014958913ed77f631a WHIRLPOOL 45a86a824882a2c87b4a66c8c9b1975889247c1c7c969ea686066646b55917b04a4702755641e40aaf33917b892fde94a847aa5b5f83a5614e7c5d1b8801ef14
-EBUILD buildbot-0.9.8.ebuild 6730 SHA256 44bcdd947b81c7019ba92e7f715949e2b5b339022c3d399dcb772d18df136c83 SHA512 9e3a590fdb60ce3f5d3f24e62bbc3d245c9af9a7d858d69a984c461abb7eb07335ef6a00058987b1f944bef9c6604d129071227df7093e027c625a819856884c WHIRLPOOL 4033eed24f1e5f178810f3aac5781b78ed613ff4a1e9c1c34c9d9fadefa086c5b422f1c1724b2eb9fa2a80560ff3b3c8d73086b0d7f4eb1b76cce413bc064529
-EBUILD buildbot-9999.ebuild 7053 SHA256 425c5dc4f36d6df2fc5cab17bc5dbad951658b012e8d983d95a286c926877ed3 SHA512 34ff2a130e1a2f44b570667db0ccc7acb1216a873a75491712d1cb3a8ca82a5dd1c081f42837f7ee23b69265298a3889467d646ed0d3fb7b944a38bf40bbb6fc WHIRLPOOL a906335ab4f067047516573c5c72243612a57a55f340f9a0ed1639ea430a3ebd8e89099c2ca14abc33fd95a1d25337666fccb45e8bbefdc36aa6d915ef8e1502
+EBUILD buildbot-0.9.10.ebuild 7272 SHA256 a08e34f4a80d5020ee49f9c742876f05888bb592dbace092286ee5b3bcd6d749 SHA512 173da10076a2a58772abf009cce729a8ea1e7e85a5f5e5ecf46f6220ef60cafc8252c88ab8129479c41e0e3606454921d6da79d925ef6e64cce575db043ae730 WHIRLPOOL 74ac9a1c40907e7db4baf8b24988ae0789f66046f863c1f3d9ef01369f7d0c017549ad53699414fede9738c08c6fa0102984f45a46c25ec9d67a4c898d5085b4
+EBUILD buildbot-0.9.11.ebuild 7046 SHA256 53883db3f3a6255d3568bab66b58f905251982d88fcf3315ed844e27566ab252 SHA512 72223002dc2774a5316623a5e7bc17ba780311af0dcad7766534c4728ab339b87620e0e6285be9aa87cdd076e5f77dba4ba9b66b1395881fc60341140a1ab6d9 WHIRLPOOL 80618630aa08367274b3b2091dff261430fb732ca88fc06c7f91a66fbdf856dbe55d0049992b7664854a85394be20df9a951da7c412fbe4b4b531a419fc55353
+EBUILD buildbot-0.9.12.ebuild 7107 SHA256 822c2885c4df40017bf67a957d12840bb97f2fa1279e32b8db60d172545e8df9 SHA512 0dfd907b7cb5e07ce59ab22664ea535c3010c20602503ff9dddd9c54c2031cde0eef89a5c22fd053fd89e4e3581f174ae21789ffaac45d646442f51e0aa2523f WHIRLPOOL 191595c0b39d63a70596ddd667cd230de7c6765b0c0fa119e6ad6352cee03d25f011050b2cb10c90014829f0ddf9f15e44205e1f8deac12321d87c2482f553e8
+EBUILD buildbot-9999.ebuild 7046 SHA256 8e01dba1d45eb16a702060658f157703bd61c528accfd44dc08ddab4d434b3e1 SHA512 af5e730d60d886e74b59789dd64fcf1025b92f880ebeb54b4e74bb410e441977fb5fe58e2f5737caed8a1cda4420cd0c131524fdf54f2dc1976206b7c3de2be1 WHIRLPOOL 294d26d58339cdce362b0a76d03237ee507d4a57ea3516c7f5a3b4494748a83dc1e0d7d47e360e33a526b67664c76b5aed21f6c6133b566f4bebdf2c4889468e
 MISC ChangeLog 8474 SHA256 f17f98b73101e0c7ef4a57d9de67201ec8cb2e13dad90e31c9ebb4b22d3e8a47 SHA512 a86c113f5d2921f2077e3f69f599255e91ecdf31d4f04965881d7f3167c53084b4178a0dc3c87be499dce7b715b97ec7336aa9f24dbb97f0108a33d337bc6234 WHIRLPOOL 3003bee799a0509b76bd33d855f9addf2433ab05ae2fcc160a50b9a4f4c1974c9f76293bdcea45548b017df2f74c90064ddb8bf347685da5540b2f657ccd376f
 MISC ChangeLog-2015 23687 SHA256 01b29df49e2d44ead407b455fc3fdb5746b6a07fed70c6b91935490c4816200b SHA512 6b6a9680134503958352c40c3ca9ca3acde081b77cedab97e6eccbcba6716cf68101d592bcfcd4bbed226cd038d79d1b20d34e1532a63e30687d04b0e4bad00d WHIRLPOOL 45de95ee421fae3b3052d57e90bfdc49de53c1cafc185d12b0280873cd113bc0432ec253e0ed1e40fea0824c1f261f3907c3c78b9bf53ff147e935c970150952
 MISC metadata.xml 1543 SHA256 204ee06fb9b996162310b5404f2d7edbd3cf12d773f67ae1ce446cd5c207bfc7 SHA512 a5bd8e8b9fe253e2a4bb43c536dc9b0fdccca675d5381ba7f488d1127c73805838ce881b691f8c638f774706c4b025cd5b70145b10d6c3578b68399e1fcb628d WHIRLPOOL 2c9191bb2c0d125c008042702adc70b39ae82105a84c8afc373b37a3e3790fab791d8aac29bf005f6af871085842e6b3a23e4a7a0bd691f24610b2ac3052b644
diff --git a/dev-util/buildbot/buildbot-0.9.10.ebuild b/dev-util/buildbot/buildbot-0.9.10.ebuild
index 0f493ccb8ffc..ec293dba8932 100644
--- a/dev-util/buildbot/buildbot-0.9.10.ebuild
+++ b/dev-util/buildbot/buildbot-0.9.10.ebuild
@@ -121,7 +121,7 @@ src_install() {
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}
-		doins -r docker docs/examples
+		doins -r docs/examples
 	fi
 
 	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
diff --git a/dev-util/buildbot/buildbot-0.9.11.ebuild b/dev-util/buildbot/buildbot-0.9.11.ebuild
index 694b31c8f116..e0acf382b491 100644
--- a/dev-util/buildbot/buildbot-0.9.11.ebuild
+++ b/dev-util/buildbot/buildbot-0.9.11.ebuild
@@ -112,7 +112,7 @@ src_install() {
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}
-		doins -r docker docs/examples
+		doins -r docs/examples
 	fi
 
 	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
diff --git a/dev-util/buildbot/buildbot-0.9.12.ebuild b/dev-util/buildbot/buildbot-0.9.12.ebuild
new file mode 100644
index 000000000000..1db6439d370b
--- /dev/null
+++ b/dev-util/buildbot/buildbot-0.9.12.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 python3_5 )
+
+EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+inherit readme.gentoo-r1 user systemd distutils-r1
+
+MY_PV="${PV/_p/p}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot build automation system"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot"
+[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+if [[ ${PV} == *9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+IUSE="crypt doc examples irc test"
+
+RDEPEND="
+	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
+	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
+	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
+	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+	crypt? (
+		>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
+		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+	)
+	irc? (
+		dev-python/txrequests[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+		dev-python/pyenchant[${PYTHON_USEDEP}]
+		>=dev-python/docutils-0.8[${PYTHON_USEDEP}]
+		<dev-python/docutils-0.13.0[${PYTHON_USEDEP}]
+		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
+		dev-python/ramlfications[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/boto3[${PYTHON_USEDEP}]
+		dev-python/ramlfications[${PYTHON_USEDEP}]
+		dev-python/pyjade[${PYTHON_USEDEP}]
+		dev-python/txgithub[${PYTHON_USEDEP}]
+		dev-python/txrequests[${PYTHON_USEDEP}]
+		dev-python/lz4[${PYTHON_USEDEP}]
+		dev-python/treq[${PYTHON_USEDEP}]
+		dev-python/setuptools_trial[${PYTHON_USEDEP}]
+		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+	)"
+
+S=${WORKDIR}/${MY_P}
+[[ ${PV} == *9999 ]] && S=${S}/master
+
+PATCHES=(
+	"${FILESDIR}/Remove-distro-version-test.patch"
+)
+
+pkg_setup() {
+	enewuser buildbot
+
+	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
+		to support starting buildbot through Gentoo's init system. To use this,
+		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
+		The scripts can	run as a different user if desired."
+}
+
+src_compile() {
+	distutils-r1_src_compile
+
+	if use doc; then
+		einfo "Generation of documentation"
+		pushd docs > /dev/null
+		#'man' target is currently broken
+		emake html
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	doman docs/buildbot.1
+
+	if use doc; then
+		dohtml -r docs/_build/html/
+		# TODO: install man pages
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r docs/examples
+	fi
+
+	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
+	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
+	systemd_dounit "${FILESDIR}/buildmaster.target"
+	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
+	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
+
+	readme.gentoo_create_doc
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn
+		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
+		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
+		ewarn "is now the common base directory for all instances. If you are migrating from an older"
+		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
+		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
+		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
+		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
+		ewarn "    rc-update add buildmaster.myinstance default"
+		ewarn "    /etc/init.d/buildmaster.myinstance start"
+		ewarn "Systems using systemd can do the following:"
+		ewarn "    systemctl enable buildmaster@myinstance.service"
+		ewarn "    systemctl enable buildmaster.target"
+		ewarn "    systemctl start buildmaster.target"
+		elog
+		elog "Upstream recommends the following when upgrading:"
+		elog "Each time you install a new version of Buildbot, you should run the"
+		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
+		elog "This will add files and fix (or at least detect) incompatibilities between"
+		elog "your old config and the new code."
+	fi
+	elog
+	elog "In order to create a new instance of buildmaster, execute:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_config() {
+	local buildmaster_path="/var/lib/buildmaster"
+	local log_path="/var/log/buildmaster"
+
+	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
+	einfo "Press Control-C to abort."
+
+	einfo "Enter the name for the new instance: "
+	read instance_name
+	[[ -z "${instance_name}" ]] && die "Invalid instance name"
+
+	local instance_path="${buildmaster_path}/${instance_name}"
+	local instance_log_path="${log_path}/${instance_name}"
+
+	if [[ -e "${instance_path}" ]]; then
+		eerror "The instance with the specified name already exists:"
+		eerror "${instance_path}"
+		die "Instance already exists"
+	fi
+
+	local buildbot="/usr/bin/buildbot"
+	if [[ ! -d "${buildmaster_path}" ]]; then
+		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
+	fi
+	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
+	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
+	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
+		|| die "Moving sample configuration failed"
+	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
+		|| die "Unable to create link to init file"
+
+	if [[ ! -d "${instance_log_path}" ]]; then
+		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
+	fi
+	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
+		|| die "Unable to create link to log file"
+
+	einfo "Successfully created a buildmaster instance at ${instance_path}."
+	einfo "To change the default settings edit the master.cfg file in this directory."
+}
diff --git a/dev-util/buildbot/buildbot-0.9.4.ebuild b/dev-util/buildbot/buildbot-0.9.4.ebuild
deleted file mode 100644
index 4ee67e152c9c..000000000000
--- a/dev-util/buildbot/buildbot-0.9.4.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 )
-
-EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
-
-inherit readme.gentoo-r1 user systemd distutils-r1
-
-MY_PV="${PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
-	https://dev.gentoo.org/~dolsen/distfiles/buildbot-0.9.4.docs.tar.xz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="crypt doc examples irc mail manhole test"
-
-RDEPEND=">=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	|| (
-		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-		>=dev-python/twisted-web-14.0.1[${PYTHON_USEDEP}]
-	)
-	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)
-	irc? (
-		dev-python/txrequests[${PYTHON_USEDEP}]
-		|| ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-			>=dev-python/twisted-words-14.0.1[${PYTHON_USEDEP}]
-		)
-	)
-	mail? (
-		|| ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-			>=dev-python/twisted-mail-14.0.1[${PYTHON_USEDEP}]
-		)
-	)
-	manhole? (
-		|| ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-			>=dev-python/twisted-conch-14.0.1[${PYTHON_USEDEP}]
-		)
-	)
-	dev-python/future[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/pyenchant[${PYTHON_USEDEP}]
-		>=dev-python/docutils-0.8[${PYTHON_USEDEP}]
-		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
-		dev-python/ramlfications[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		|| (
-			>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-			(
-				>=dev-python/twisted-mail-14.0.1[${PYTHON_USEDEP}]
-				>=dev-python/twisted-web-14.0.1[${PYTHON_USEDEP}]
-				>=dev-python/twisted-words-14.0.1[${PYTHON_USEDEP}]
-			)
-		)
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/boto3[${PYTHON_USEDEP}]
-		dev-python/ramlfications[${PYTHON_USEDEP}]
-		dev-python/pyjade[${PYTHON_USEDEP}]
-		dev-python/txgithub[${PYTHON_USEDEP}]
-		dev-python/txrequests[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	cd ${MY_P}
-	unpack buildbot-0.9.4.docs.tar.xz
-}
-
-pkg_setup() {
-	enewuser buildbot
-
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
-		to support starting buildbot through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		The scripts can	run as a different user if desired."
-}
-
-python_prepare_all() {
-	if use doc; then
-		epatch "${FILESDIR}/buildbot-0.9.4.docs.patch"
-	fi
-	distutils-r1_python_prepare_all
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null
-		EPYTHON="python2.7" emake html
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	if use doc; then
-		dohtml -r docs/_build/html/
-		# TODO: install man pages
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r contrib docs/examples
-	fi
-
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
-	systemd_dounit "${FILESDIR}/buildmaster.target"
-	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
-	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
-
-	readme.gentoo_create_doc
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
-		ewarn "    rc-update add buildmaster.myinstance default"
-		ewarn "    /etc/init.d/buildmaster.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildmaster@myinstance.service"
-		ewarn "    systemctl enable buildmaster.target"
-		ewarn "    systemctl start buildmaster.target"
-		elog
-		elog "Upstream recommends the following when upgrading:"
-		elog "Each time you install a new version of Buildbot, you should run the"
-		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
-		elog "This will add files and fix (or at least detect) incompatibilities between"
-		elog "your old config and the new code."
-	fi
-	elog
-	elog "In order to create a new instance of buildmaster, execute:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config() {
-	local buildmaster_path="/var/lib/buildmaster"
-	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildmaster_path}/${instance_name}"
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	local buildbot="/usr/bin/buildbot"
-	if [[ ! -d "${buildmaster_path}" ]]; then
-		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
-	fi
-	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
-	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	einfo "Successfully created a buildmaster instance at ${instance_path}."
-	einfo "To change the default settings edit the master.cfg file in this directory."
-}
diff --git a/dev-util/buildbot/buildbot-0.9.7.ebuild b/dev-util/buildbot/buildbot-0.9.7.ebuild
deleted file mode 100644
index b82986878383..000000000000
--- a/dev-util/buildbot/buildbot-0.9.7.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo-r1 user systemd distutils-r1
-
-MY_PV="${PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="crypt doc examples irc test"
-
-RDEPEND="
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.1.0[${PYTHON_USEDEP}]
-	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/twisted-17.1.0[${PYTHON_USEDEP},crypt]
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)
-	irc? (
-		dev-python/txrequests[${PYTHON_USEDEP}]
-	)
-	dev-python/future[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/pyenchant[${PYTHON_USEDEP}]
-		>=dev-python/docutils-0.8[${PYTHON_USEDEP}]
-		<dev-python/docutils-0.13.0[${PYTHON_USEDEP}]
-		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
-		dev-python/ramlfications[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/boto3[${PYTHON_USEDEP}]
-		dev-python/ramlfications[${PYTHON_USEDEP}]
-		dev-python/pyjade[${PYTHON_USEDEP}]
-		dev-python/txgithub[${PYTHON_USEDEP}]
-		dev-python/txrequests[${PYTHON_USEDEP}]
-		dev-python/lz4[${PYTHON_USEDEP}]
-		dev-python/treq[${PYTHON_USEDEP}]
-		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-[[ ${PV} == *9999 ]] && S=${S}/master
-
-pkg_setup() {
-	enewuser buildbot
-
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
-		to support starting buildbot through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		The scripts can	run as a different user if desired."
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null
-		#'man' target is currently broken
-		emake html
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	if use doc; then
-		dohtml -r docs/_build/html/
-		# TODO: install man pages
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r docker docs/examples
-	fi
-
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
-	systemd_dounit "${FILESDIR}/buildmaster.target"
-	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
-	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
-
-	readme.gentoo_create_doc
-}
-
-python_test() {
-	distutils_install_for_testing
-	export TEST_HYPER=1
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
-		ewarn "    rc-update add buildmaster.myinstance default"
-		ewarn "    /etc/init.d/buildmaster.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildmaster@myinstance.service"
-		ewarn "    systemctl enable buildmaster.target"
-		ewarn "    systemctl start buildmaster.target"
-		elog
-		elog "Upstream recommends the following when upgrading:"
-		elog "Each time you install a new version of Buildbot, you should run the"
-		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
-		elog "This will add files and fix (or at least detect) incompatibilities between"
-		elog "your old config and the new code."
-	fi
-	elog
-	elog "In order to create a new instance of buildmaster, execute:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config() {
-	local buildmaster_path="/var/lib/buildmaster"
-	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildmaster_path}/${instance_name}"
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	local buildbot="/usr/bin/buildbot"
-	if [[ ! -d "${buildmaster_path}" ]]; then
-		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
-	fi
-	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
-	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	einfo "Successfully created a buildmaster instance at ${instance_path}."
-	einfo "To change the default settings edit the master.cfg file in this directory."
-}
diff --git a/dev-util/buildbot/buildbot-0.9.8.ebuild b/dev-util/buildbot/buildbot-0.9.8.ebuild
deleted file mode 100644
index 7ab416edb5b3..000000000000
--- a/dev-util/buildbot/buildbot-0.9.8.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo-r1 user systemd distutils-r1
-
-MY_PV="${PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="crypt doc examples irc test"
-
-RDEPEND="
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.5.0[${PYTHON_USEDEP}]
-	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/twisted-17.5.0[${PYTHON_USEDEP},crypt]
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)
-	irc? (
-		dev-python/txrequests[${PYTHON_USEDEP}]
-	)
-	dev-python/future[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/pyenchant[${PYTHON_USEDEP}]
-		>=dev-python/docutils-0.8[${PYTHON_USEDEP}]
-		<dev-python/docutils-0.13.0[${PYTHON_USEDEP}]
-		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
-		dev-python/ramlfications[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/boto3[${PYTHON_USEDEP}]
-		dev-python/ramlfications[${PYTHON_USEDEP}]
-		dev-python/pyjade[${PYTHON_USEDEP}]
-		dev-python/txgithub[${PYTHON_USEDEP}]
-		dev-python/txrequests[${PYTHON_USEDEP}]
-		dev-python/lz4[${PYTHON_USEDEP}]
-		dev-python/treq[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-[[ ${PV} == *9999 ]] && S=${S}/master
-
-pkg_setup() {
-	enewuser buildbot
-
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
-		to support starting buildbot through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		The scripts can	run as a different user if desired."
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null
-		#'man' target is currently broken
-		emake html
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	if use doc; then
-		dohtml -r docs/_build/html/
-		# TODO: install man pages
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r docker docs/examples
-	fi
-
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
-	systemd_dounit "${FILESDIR}/buildmaster.target"
-	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
-	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
-
-	readme.gentoo_create_doc
-}
-
-python_test() {
-	distutils_install_for_testing
-	export TEST_HYPER=1
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
-		ewarn "    rc-update add buildmaster.myinstance default"
-		ewarn "    /etc/init.d/buildmaster.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildmaster@myinstance.service"
-		ewarn "    systemctl enable buildmaster.target"
-		ewarn "    systemctl start buildmaster.target"
-		elog
-		elog "Upstream recommends the following when upgrading:"
-		elog "Each time you install a new version of Buildbot, you should run the"
-		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
-		elog "This will add files and fix (or at least detect) incompatibilities between"
-		elog "your old config and the new code."
-	fi
-	elog
-	elog "In order to create a new instance of buildmaster, execute:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config() {
-	local buildmaster_path="/var/lib/buildmaster"
-	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildmaster_path}/${instance_name}"
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	local buildbot="/usr/bin/buildbot"
-	if [[ ! -d "${buildmaster_path}" ]]; then
-		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
-	fi
-	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
-	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	einfo "Successfully created a buildmaster instance at ${instance_path}."
-	einfo "To change the default settings edit the master.cfg file in this directory."
-}
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index 694b31c8f116..0b08a8046964 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python2_7 python3_5 )
 
@@ -29,7 +29,7 @@ IUSE="crypt doc examples irc test"
 
 RDEPEND="
 	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.5.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
 	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
@@ -40,7 +40,7 @@ RDEPEND="
 	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
 	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
 	crypt? (
-		>=dev-python/twisted-17.5.0[${PYTHON_USEDEP},crypt]
+		>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
 		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
 		dev-python/idna[${PYTHON_USEDEP}]
 		dev-python/service_identity[${PYTHON_USEDEP}]
@@ -112,7 +112,7 @@ src_install() {
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}
-		doins -r docker docs/examples
+		doins -r docs/examples
 	fi
 
 	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
diff --git a/dev-util/buildbot/files/Remove-distro-version-test.patch b/dev-util/buildbot/files/Remove-distro-version-test.patch
new file mode 100644
index 000000000000..c489be25c1c3
--- /dev/null
+++ b/dev-util/buildbot/files/Remove-distro-version-test.patch
@@ -0,0 +1,21 @@
+From b7201f706f9238d642dfe96da89006b437e3760d Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <bdolbec@gaikai.com>
+Date: Thu, 26 Oct 2017 12:00:37 -0700
+Subject: [PATCH] Remove distro version test
+
+---
+ buildbot/test/unit/test_buildbot_net_usage_data.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/buildbot/test/unit/test_buildbot_net_usage_data.py b/master/buildbot/test/unit/test_buildbot_net_usage_data.py
+index 709c804..7885d1b 100644
+--- a/buildbot/test/unit/test_buildbot_net_usage_data.py
++++ b/buildbot/test/unit/test_buildbot_net_usage_data.py
+@@ -153,4 +153,3 @@ class Tests(unittest.TestCase):
+         distro = linux_distribution()
+         self.assertEqual(len(distro), 2)
+         self.assertNotIn("unknown", distro[0])
+-        self.assertNotIn("unknown", distro[1])
+--
+libgit2 0.26.0
+
diff --git a/dev-util/clinfo/Manifest b/dev-util/clinfo/Manifest
new file mode 100644
index 000000000000..aac084505ddf
--- /dev/null
+++ b/dev-util/clinfo/Manifest
@@ -0,0 +1,4 @@
+DIST clinfo-2.2.17.10.25.tar.gz 32992 SHA256 23cab774915eea6730582abfc449ac57dc10f2ce7b39293e56166ed500383862 SHA512 9b035fb9ee052a8cff517032db70d16c796c3a2b82fefded5805dd7b012472b1226fc634d8b9e890be604f26f959a2a7438966158e2ccfc9e27af1fc03971c46 WHIRLPOOL a2fbdcaf137a5c85f1374c928e6706d20af5709b82bab289401be03f1b59bb1d8ec494bef7a11f77f88347fc81905522db9edb8c2a5f968afa8b50e82f7a0005
+EBUILD clinfo-2.2.17.10.25.ebuild 615 SHA256 06495deeda286204f53e07f63ad68af4ca7ee87ed02e4652c46d8bbb4477751b SHA512 5ad16119e7b770fd14e0497e8e847b4acad38fab5f866bcbaf4c6457aff1f93e056f7a1e128f71683a6d6cbe30b1c91f4a69c0d0ad60f7098fa2d5ede4da066a WHIRLPOOL b05e763ee600776bf9ff70eea4433c5289a728c7bc272b7547f9da4c071739642aa2252aabef92b4b0bc46dbdfaa6552014b56f0032c0606b26a209302e8e4f5
+EBUILD clinfo-9999.ebuild 615 SHA256 06495deeda286204f53e07f63ad68af4ca7ee87ed02e4652c46d8bbb4477751b SHA512 5ad16119e7b770fd14e0497e8e847b4acad38fab5f866bcbaf4c6457aff1f93e056f7a1e128f71683a6d6cbe30b1c91f4a69c0d0ad60f7098fa2d5ede4da066a WHIRLPOOL b05e763ee600776bf9ff70eea4433c5289a728c7bc272b7547f9da4c071739642aa2252aabef92b4b0bc46dbdfaa6552014b56f0032c0606b26a209302e8e4f5
+MISC metadata.xml 327 SHA256 af562a1ce92717c6b0c997b0dc75211ab119504d473e478bc093ffc9cb88ffa4 SHA512 20261dabbadf6a93f4b4a7d65c917872de7b81f689e111a3ea0076a066201eba82b2061cf5ae9956c00f5d6208bd4dcc922c72a3feb2643aedfa2dc998c0bf21 WHIRLPOOL 3608c4e04a60f227eddf4e4087129b624edb377e8cca7b815c6d0db3011abee95609b5e2d7dbaf1ed6014a76deae5241ed61d084b80084195202f07b646cc08c
diff --git a/dev-util/clinfo/clinfo-2.2.17.10.25.ebuild b/dev-util/clinfo/clinfo-2.2.17.10.25.ebuild
new file mode 100644
index 000000000000..a3dd2fa351bc
--- /dev/null
+++ b/dev-util/clinfo/clinfo-2.2.17.10.25.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/Oblomov/clinfo.git"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/Oblomov/clinfo/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="A tool to display info about the system's OpenCL capabilities"
+HOMEPAGE="https://github.com/Oblomov/clinfo"
+LICENSE="CC0-1.0"
+SLOT="0"
+
+DEPEND="virtual/opencl"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	emake MANDIR="${ED}"/usr/share/man PREFIX="${ED}"/usr install
+}
diff --git a/dev-util/clinfo/clinfo-9999.ebuild b/dev-util/clinfo/clinfo-9999.ebuild
new file mode 100644
index 000000000000..a3dd2fa351bc
--- /dev/null
+++ b/dev-util/clinfo/clinfo-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/Oblomov/clinfo.git"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/Oblomov/clinfo/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="A tool to display info about the system's OpenCL capabilities"
+HOMEPAGE="https://github.com/Oblomov/clinfo"
+LICENSE="CC0-1.0"
+SLOT="0"
+
+DEPEND="virtual/opencl"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	emake MANDIR="${ED}"/usr/share/man PREFIX="${ED}"/usr install
+}
diff --git a/dev-util/clinfo/metadata.xml b/dev-util/clinfo/metadata.xml
new file mode 100644
index 000000000000..7682807ac4fc
--- /dev/null
+++ b/dev-util/clinfo/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>candrews@gentoo.org</email>
+		<name>Craig Andrews</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Oblomov/clinfo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 88f9f8149d62..202bce7b3265 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -20,7 +20,7 @@ DIST cmake-3.8.2.tar.gz 7504706 SHA256 da3072794eb4c09f2d782fcee043847b99bb4cf8d
 DIST cmake-3.9.4.tar.gz 7705052 SHA256 b5d86f12ae0072db520fdbdad67405f799eb728b610ed66043c20a92b4906ca1 SHA512 d9172f86df7ddefd0ecf1cd271add8b8af2d712a47ded530e9ff2c26e39087bc11a099125f17add6b563d176f27a68f4998bb53ae390b3f12894d658dfc8eee5 WHIRLPOOL c1cc16977ce1c1a4ac58692694a608bb5996c19db677bb6d25db1e017586ad1d676bb1f086af4016b8017cfe845ed7c6795fad7f1e7b5ab0b4d9b414452d661f
 EBUILD cmake-3.10.0_rc3.ebuild 5926 SHA256 58e0d5a44a8328bbb51af633b403729b1ef219b01fa8cc78a6699d4f325346c6 SHA512 85d7e302aed0b5ea85828810f61b762b8d2b4a9e04c58e2feea389b5407210b625e4f01b9e36df336e1d2a4ba2068bceb54f7a2ad562dd7ee4ba4f30ab7802fc WHIRLPOOL 2ae8cc6da42d81f51852bd94306f53d3565eb4ad242ea2656efdeb0a541bd65a0750e111d61dea2c8d58fe71acd8b82849c78f9485a54e073666bac89b728e12
 EBUILD cmake-3.7.2.ebuild 5503 SHA256 1f8fde3a0b989b81fa89d4149a9422d118b0459925de3c56106bedc9808f5310 SHA512 8c8b96355c6edf0e84e3cf837042922bc5558f8c488e9ef718553c28eef10bf630671b66a6205cf495e22ceb220fb37c2a7ea1926a5271a63f8c402626dffbb5 WHIRLPOOL ccfbe6cc7c39db516d7fb294a5f656a89d9f8ff9cfb256c389a3e20fe9a3b6c8d3c93b277f71ab4928bfaa88b4de48a2e76a4898caf71782dae9387fd30607e6
-EBUILD cmake-3.8.2.ebuild 5716 SHA256 97512d7626af5499b4f4a1ce367eb59f9e7269975e9f49d76f77d49d4efd13fe SHA512 12ae12dff4dea91755db3bbe60bac27be079f56c6d5539e1bf76f7bd12b3d92b834a9461db9fcfc2568acd34fca65468adb0037cbe0663cb54ef4c471a814966 WHIRLPOOL 5942541fc2447b95a84631f36c552c36b768029aabf22086162a145d2d29980083923a6f3a4db12f83d4da94107ff407003e206ad83a524e4e71e1654ccbe439
+EBUILD cmake-3.8.2.ebuild 5715 SHA256 4f60bc28e164b3c0285390ffb755ee6e1d0bcee547dac3bdde7e20a53f256c65 SHA512 6cb62411dfccd86d12260c6e7d6169d063fc1aa00d5effece2bf3eb9d959591cf28186dab0cfdb76c98dbea1673677b6a9b4f6070b10cfb20acda4d184f23def WHIRLPOOL fec6f8dc7a48150c3cf6e25d895d564ce4bb9ff890313910886b068d511bccab6fb32754c0154bc3f6b6b5b1ef74fa5c0023302009cc7263de7fbcc930be39d9
 EBUILD cmake-3.9.4.ebuild 5975 SHA256 fc9aa836630ebaeafcdc37a23f9871b354b1dd6037f233020adca3c9ccda745b SHA512 b7f3c9d2f72a708e19359b8a0737aecbaacf09ce7b817c785789008353ad758ff7ce889a10e52bce5ac3cfcda4cc1a518f7a49a553e902e3a53e10dc2177849c WHIRLPOOL f2ff6c773f31032d227c1006e5c7c88857a92824168e13afe9ba84d0d9bff88d3086f8837e0c4f852ec27ba2ccac729e262ef1b66c67cda2fb0c1e9d50312799
 MISC ChangeLog 19332 SHA256 2a3d0d8e5bfffb597c1906abb1eca3af3f997ac21673c469afbf6158a6b81b61 SHA512 83435d8060bf76931f512560a3ac4e9ae1f76073e9b8d05f75a5a4fb5d809a949bd55c4891b72475c7f8e19a4d31eb9e23799131fdc66ead7877790d43d3337e WHIRLPOOL 5e3bb823b8460257e98e0431bf55d44e5279f993724293f421e8348640ccf59980ca804bb247dc1f0f19d45aec45245dbf2f6c5d6bd075ed6350167782412c52
 MISC ChangeLog-2015 51428 SHA256 7e79c94e1bc0bc7071915d8e7bdba4812c823812de795931aec29749c410bb8e SHA512 cf217bebf0e7cfcb5771dce5a6df4fb9a4ecf77d296928de0dd2f3f34852a509a403b5b6351b49ab0ce6de755631d7e01b395a5bb9d6be5d6aa49f00185acc8a WHIRLPOOL 8f8585bf220e0a89a7f404108fdd4bc290ca37daf5d24ec3244b0bea8616b066725d7800d94697696a98fd49d6cb7cf834014ff4a0a2b77641119af3a186d451
diff --git a/dev-util/cmake/cmake-3.8.2.ebuild b/dev-util/cmake/cmake-3.8.2.ebuild
index 2b1635e83052..c7b513704b49 100644
--- a/dev-util/cmake/cmake-3.8.2.ebuild
+++ b/dev-util/cmake/cmake-3.8.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs server system-jsoncpp ncurses qt5"
 
 RDEPEND="
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
index 311d7b582fc2..99882937b613 100644
--- a/dev-util/cucumber-core/Manifest
+++ b/dev-util/cucumber-core/Manifest
@@ -1,7 +1,7 @@
 DIST cucumber-core-1.5.0.gem 45056 SHA256 594a30969a33f03693915db7eaa2a137e45fed76d9ae19ed7b96a4bbb1764262 SHA512 544d2c5707bde46d0c12dc975b3858e663776d9bc87ef044681525a547ef2de171a74ba0c53fb28dafcbdf90a153bea5357ec1a129f11b2c0dfedd288c5def74 WHIRLPOOL 7e703d2f7b6131417e0895ee27c0efd511fb98a600a607292e4e9f77e1ca45f7241746b42c4509458b624992a00a60e850f12f8623110359fc0f17a015d37fbe
 DIST cucumber-core-3.0.0.gem 52736 SHA256 14877556e8f05aae857f2f2a5356cb96dfabf40e244a2544c57d2d6f54b71b9f SHA512 2991bc8e2f3f5042b10cd430273dd1fd4c851ee444defbdfdf16ba920f93c6523e1b503c562438691947a969c95c8f65416a69c4fdf1fe876ad0c274982b9e75 WHIRLPOOL 75cf647046d29a17ce430f542a51c2d96be1e8de1ff3abb6a8cf49c1c531cc04fa0619fed8c47edca411173085df0aee746f1a5904e4ebc5637d22231a5e0bc4
 EBUILD cucumber-core-1.5.0.ebuild 721 SHA256 c98536ac86852e656aa7aad7a6256984b43c45b4a990c6e19e5405407d9311c9 SHA512 51ec60b0442ac8c42d1cc67b580d480af1f00e2bb3be71adb7d6427a73c9e0267e14d8b70267d292dd9323a9d8b3719b7357135aadbada16fa35f60d894307d2 WHIRLPOOL a6052c7d63852318f71732e583e78cc95795a08f23c2e6f4809428c42d9b67e65ffb92d0be45111e4f22bb056b8ec6280013025c406a340364f5edc94ca288d1
-EBUILD cucumber-core-3.0.0.ebuild 761 SHA256 144dcb763edf52981c1a720a3d2032e73ec453227a99df70cf36ed0af4434b1b SHA512 528444466996401e8d2391fa9aa2f5ab092df27677258c7e978a54fb01ab630476b1f9a9fe5b5edccefbe2b7d9698898c54681290d310bbae86f924f1ed52aee WHIRLPOOL 5eb649671cf17be89def42336b9193cb3ce62be2b5d3be851d24f6c218a707eade3de4ec4e6a3b07c1a446ba60b0208323cda0c8c12be77cd6076391370cd1d7
+EBUILD cucumber-core-3.0.0.ebuild 772 SHA256 09ae45bb0feb55c35a5d127b937d42104ff90cf0b394762c6dca076f8a5e60e8 SHA512 d7ab47a769cce58a984cb3a2ee04adabeb4baf6e58cb5d0462ea14b26f7216853b449196f4de13f79fa383392e670284b45ac7ad0bafb0b98b4d6ffc843329c6 WHIRLPOOL 4d0ded9ef5be64d2c4c2d88a551df09805170fe0a7ed0ee1affef852a4878a1fa9ba7a5d1f0e6a6729c8aef1a7f8722e3785a6c70303edf72abe8e7ce9ffc145
 MISC ChangeLog 3849 SHA256 28246db2b11bae2dbe5a78b2f408c61644c41839e353c4e43847cfa064f6a673 SHA512 013addf4c819b16e4ab9921b2fda51ed693635a4f7103a0baaaf54093f207e6d4cdeccc05bd900df17df9185ee257b295167a9a18a8fb2a0250e7f1cca45f38a WHIRLPOOL 83644ef9bca4987793386e7718dc7f1a39e99ba12dbdd83285c4944e1f0d6a73da48c2ce11141c42145737adb62b5ac8204ae5c41b57623db284a323ba309989
 MISC ChangeLog-2015 651 SHA256 c9eff78d8d84d08c6725f7b0e1d16ee0367346c586a8a48cdaadefc8e4adcd4a SHA512 41f20674306d16f03735774af7fb37df9d7a672b91800233f67295479e7a34d26545bcb0f587761638314da73eb59125c6993159941b445022366f8c1aa49155 WHIRLPOOL 448beb7c774f608196416e68c9511de68539bebaa915d728520abfa75661b8b2f0b1356ea279cd03b6e03ca14e71af5f7552f0659ba4e20bb1f50777cda98209
 MISC metadata.xml 304 SHA256 7f823b1d310a6e26f4e7bb4698b5f31f1935503b6dca00bdd209d2dcb66539b9 SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902 WHIRLPOOL 3d8b4bd989e56fc12449fd597c2749f05b3ecd6bb40604f72255cf51abe5141713ec097efd6914b6dba6b405ad13b9a3940170b13578ab74ee251d8229ac6df2
diff --git a/dev-util/cucumber-core/cucumber-core-3.0.0.ebuild b/dev-util/cucumber-core/cucumber-core-3.0.0.ebuild
index 2d7c5b6b7b33..05b187df5e43 100644
--- a/dev-util/cucumber-core/cucumber-core-3.0.0.ebuild
+++ b/dev-util/cucumber-core/cucumber-core-3.0.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Executable feature scenarios"
 HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ia64 ~ppc"
 SLOT="3.0"
 IUSE="test"
 
diff --git a/dev-util/cucumber-expressions/Manifest b/dev-util/cucumber-expressions/Manifest
index a944d2972b90..04d3509cefc2 100644
--- a/dev-util/cucumber-expressions/Manifest
+++ b/dev-util/cucumber-expressions/Manifest
@@ -1,5 +1,5 @@
 DIST cucumber-expressions-4.0.3.gem 16384 SHA256 f7ea9e2f319e31620a87cf98d775ad0427cf420c11d9f1f51284c7d01e29b539 SHA512 90dfbab08359a8fcfface4c3a885eadeaaab7df848c3c20a4d85b62a12b42cd449c259134147eae9d44ede51dc8100f4187d63945576985c1ccd62346cfc2f19 WHIRLPOOL 614dae9cc6c2b9a58ac49c9a222c18b42eeb4a537ad61ba3f54b1c02abb1b29a6282b074869abf3f94b3dcfa6c81e46cd2be0cdfcb5773886fa3e5c04c329afc
 DIST cucumber-expressions-4.0.4.gem 16896 SHA256 2ee3bae739312cab3d86527c0740bdaa94f35dec31e2a1d28f2d97d95f268f4f SHA512 9a52b866545154c9e7d4e8f08cbbf6b2d0dcee28c24486eb95ad4717a757a25ae8ac844702dd2e0c892fa0406f686d3b4eb024c90fc6e7b90be7a6edd7e2dadc WHIRLPOOL 144cf0578c534433f68c695ca0f287045de08bb5943d341c90b87a8861a3c6ef4d65059bdea350f03e2b566a45d9baa33ce40fb94123806e555f88a3f7b9040e
 EBUILD cucumber-expressions-4.0.3.ebuild 445 SHA256 5fcce188d921030da4428869fa321245dd22bacad3eb431549f9ef29fb98401d SHA512 a2796fe49198e5289542ec38b5705fc19b7c6ea527d6536e47d9e7581bb1fd9c326c07defd965cd21abf8b6a0d7b7bc07fb247ca81ac04993c6c1825f1784bf1 WHIRLPOOL f9d6e6040b7ff835dd1af1eee052e0676c86642400382139635e2a1e57d47ad1e43c3b953d4f73da4b120d1631d74a5be93a14bdf7cf117c59b862725965214e
-EBUILD cucumber-expressions-4.0.4.ebuild 445 SHA256 5fcce188d921030da4428869fa321245dd22bacad3eb431549f9ef29fb98401d SHA512 a2796fe49198e5289542ec38b5705fc19b7c6ea527d6536e47d9e7581bb1fd9c326c07defd965cd21abf8b6a0d7b7bc07fb247ca81ac04993c6c1825f1784bf1 WHIRLPOOL f9d6e6040b7ff835dd1af1eee052e0676c86642400382139635e2a1e57d47ad1e43c3b953d4f73da4b120d1631d74a5be93a14bdf7cf117c59b862725965214e
+EBUILD cucumber-expressions-4.0.4.ebuild 456 SHA256 db480c9efa91a0468641f8d9743bf893fbc59f0a8c0cfe5abdb056732b3c24b9 SHA512 3cf09678497cddead3a614d4a3a1948708c531152580052abd2b06e2e86bf8c9f7a443e7956f0c7d305c9fa0d26459b42fd58552812aa8a0be35ddf8a1d68640 WHIRLPOOL 13f7aeec0a0a3c0f2710f72fcc982116313cdfdde4658b6f96497a7c7982787a4d16c232b04d45062e4ef9225d1045c93e041128ed0b66939a58a14bb9ff763e
 MISC metadata.xml 299 SHA256 c63039fa6294d21a5a0d6f48b752ee029315095e01a647a5ee11dc6069f3f697 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7 WHIRLPOOL 399c3aaea815357250e07a3a6086b729f2815e76408489582f452ba9dba86219fbe236dd23a58c9286197b0a8b94181817095a46b0f212a4991c2ef21dbaa75a
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-4.0.4.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-4.0.4.ebuild
index bc89134f3f98..0c390d550aac 100644
--- a/dev-util/cucumber-expressions/cucumber-expressions-4.0.4.ebuild
+++ b/dev-util/cucumber-expressions/cucumber-expressions-4.0.4.ebuild
@@ -14,5 +14,5 @@ DESCRIPTION="a simpler alternative to Regular Expressions"
 HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
 LICENSE="MIT"
 
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ia64 ~ppc"
 SLOT="4.0"
diff --git a/dev-util/cucumber-tag_expressions/Manifest b/dev-util/cucumber-tag_expressions/Manifest
index ede11bef2235..ff953e22880e 100644
--- a/dev-util/cucumber-tag_expressions/Manifest
+++ b/dev-util/cucumber-tag_expressions/Manifest
@@ -1,3 +1,3 @@
 DIST cucumber-tag_expressions-1.0.1.gem 8192 SHA256 8ee1756f01115627f283124909f23361d0a3f958b56622bf221a3db54d020583 SHA512 be19d91c4b267d0f4c5f483e61a13d63cc023719874358bb63ac72fa3104e6068b8edc6231e70c4ee24c4f33e0b4f2254148edb666bec1f617c0d322275582b6 WHIRLPOOL 6e1477b9bcdb1831f05602ddb75ee6ad820c350fc8e351f2c0fd2c48e7ea0d99d5d0ee873ea8bb2cf33c9c6f704bc592c16cfe0d0b4056442ad9cc4b5178526f
-EBUILD cucumber-tag_expressions-1.0.1.ebuild 413 SHA256 b3a8323e49a45a29481d0c6a8bde5a3238376105c4fcbd56ba9f48bba00cde94 SHA512 8fd19a04e3e9589500daf171b73881d057144c6e035d37101c6d6400c7efde22d12e050651002ffb0bfa9665c05c907a4208b246280cc22d810f368042f530ad WHIRLPOOL f4d875008fff85be13c3ad0caf138c5d574c7dc37c7314dadaa0eab69ae1c5b3913e372d3157bc340dd28e32397c8c60121374bd06babf02fd0e93c83a6a266e
+EBUILD cucumber-tag_expressions-1.0.1.ebuild 424 SHA256 7300a365769df8b9e5cf8b37a4b07b620b64da01ee462b26babdfb73169d1174 SHA512 5f7886762eff19eff7474d053b3a704dbb88b6bdce329064db2fe93f48001d9d6a826b3574a057599b0c694857ca585f6b07f1f41460e1c292d610a832ea23c0 WHIRLPOOL e4634728d77dcd2dbc1de9bce11fbfecfaeaf455d18e00f2b80df618fb9e7a5b6b3e27019e4d62df1dd3cb0c739f6a5d2be7a0e816b1cfc979a59a132beb4fbc
 MISC metadata.xml 299 SHA256 c63039fa6294d21a5a0d6f48b752ee029315095e01a647a5ee11dc6069f3f697 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7 WHIRLPOOL 399c3aaea815357250e07a3a6086b729f2815e76408489582f452ba9dba86219fbe236dd23a58c9286197b0a8b94181817095a46b0f212a4991c2ef21dbaa75a
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
index ff3a2e992d40..37e6c5e8fac9 100644
--- 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
@@ -14,5 +14,5 @@ DESCRIPTION="Cucumber tag expressions for ruby"
 HOMEPAGE="https://docs.cucumber.io/tag-expressions/"
 LICENSE="MIT"
 
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ia64 ~ppc"
 SLOT="1"
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index 7b8c8f7e0350..023c8aab7a44 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -3,7 +3,7 @@ DIST cucumber-2.4.0.gem 250880 SHA256 307e87c24e250d015c1d9990a7d79f7bdd9b239aa2
 DIST cucumber-3.0.1.gem 265216 SHA256 bcd927f02c900178531d30714bdc3a5f201d0232a99565efbc65ad0c66ee16c9 SHA512 eee664d13dca5ce062f46a5d544ff43fc99bdc2ccd7c6d77d82380d8eb3c97a88305ba5a6052bfc8cee7fc59aa9d019116ef966d394b8b3d37d10fca122a2e7b WHIRLPOOL 0db85b2115e5c89667223f928fb4d433c5942c03327440e9e3fdb35ae5eb3a0ed40f3c91284b84131972f358f057d86f08b708427a4d8fca71beb1e4a7cd5344
 EBUILD cucumber-1.3.20-r1.ebuild 2171 SHA256 07616f8b8e2f1f50dd73e46aa44cbbe923fda76b6928e7db5b5d08d9892276c4 SHA512 5022e706aa004375adda2c7a180257d609b9a4c39ea7594a02b4ca57e85d97d7bd46d8b208e6e88a82c22da24776f5e1d68de31f3bdfba084f299d1c733ca4f1 WHIRLPOOL bf8cce41e530527fa85b0d51f4d1deec67b4a2ff45578b0bf83ef5ddd82fd52ac969b8c064308d81336b084662b62e4a1daa78fe826ae53c9bfbc381c9f402e2
 EBUILD cucumber-2.4.0-r1.ebuild 2243 SHA256 fc3fc51f38f0d61db6e0392cf18c775decd5a4e83748ff9be8e984c2db7db4cb SHA512 5d09f9b09b7a844c5475706db6ae5e9ac707599bb9a88d89ff8317a01b796dbba99cb7776e18627f768c15b29f7613890e74557fce0f51ee96eec393f5d28941 WHIRLPOOL 09c396cadf1646c391c6da9fc95df6737ca873e54a23ae916210acd1adb88b2db916757f22d0bbc566e9dc95c31801b9d3fac5bf467b0432ba9a63a81ed5352f
-EBUILD cucumber-3.0.1.ebuild 2444 SHA256 9390dc29faa0106d498501587e1fd30072153cfa1c349a73d6b3905eaca73d1a SHA512 5a9479f04839f15ace8c1b4e2371ca54d2746dfac5944174feaf72b51d3f42faa8919a153a6f93e58ec88fbf603ebe79427288a15e14d4b5b984544597cfd364 WHIRLPOOL 873bbd50c6a07b895f88cff4bdb77c4587ac59d40839b3cca2e603ae0a02522f763c3005af0145ec96e536dcdc30e5e5cd8efb06ab1612b05c27e08014ef9568
+EBUILD cucumber-3.0.1.ebuild 2455 SHA256 7b1fc95f9f3840d8a609ceb68dff6caa5e92e7680feb0d864a19efdb1a1d42d5 SHA512 279ca5ce616aeb93fb6faa546a8dbaaa970116976e3bf701155400da7be22a9d3ec792a6dd746f84ca7eedf32b4da574da64b0595dba6c4d8c1f8b1c8a9f9b3d WHIRLPOOL 065072776e22ed24b880bcca3133f0b19dd1d09f424a2695b9085b5bd0b62a65a4d17dfa4cc089e3b8f5ab2a72e17d85d0be87a69c571ab684335e9fd301c795
 MISC ChangeLog 4604 SHA256 a884be66f9598d8153554cf8979b4ffadccc48aa10f46d385be85eb2e62f09da SHA512 3262f8ab69e8e4f919bfdcc1de7ad3155c36d0f701613077100719156ee0aecf7b52717ee31dbb22ba911f680578465b92975b77f1f69098d32e7c1ec656ba80 WHIRLPOOL 20bf26314df383700ee3fafc6114b61bda46077a0fb5b3868d0b4b311e074291c7edc56145af60d859e4720fa1335d6aac18b24402c4de691269a1ea96919ce3
 MISC ChangeLog-2015 14316 SHA256 2cbff183309915a9814ce1b89e41f632362f9bd5ef2054657bfbe052a8c3e08c SHA512 ea6db7424fb828881603e14ec992532c2fbff12e606d23f80890f52f26c5c29b98df1a25bb81e7f041e211e8a8b1093e6ef4533097050681405603d76a4868f0 WHIRLPOOL 503e2a3a7216829039a535095d43692dc5cd6c8fce8bcd34f1e77c006a457feb4475a4152c0e7a97dee44e7dad98a08748a0c801e56bcc9b81c5977276d25344
 MISC metadata.xml 304 SHA256 7f823b1d310a6e26f4e7bb4698b5f31f1935503b6dca00bdd209d2dcb66539b9 SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902 WHIRLPOOL 3d8b4bd989e56fc12449fd597c2749f05b3ecd6bb40604f72255cf51abe5141713ec097efd6914b6dba6b405ad13b9a3940170b13578ab74ee251d8229ac6df2
diff --git a/dev-util/cucumber/cucumber-3.0.1.ebuild b/dev-util/cucumber/cucumber-3.0.1.ebuild
index afcae85754d7..144729537fbc 100644
--- a/dev-util/cucumber/cucumber-3.0.1.ebuild
+++ b/dev-util/cucumber/cucumber-3.0.1.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="Executable feature scenarios"
 HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ia64 ~ppc"
 SLOT="0"
 IUSE="examples test"
 
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index c1a06c073245..0bab1533341b 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,10 +1,8 @@
-DIST debhelper_10.9.1.tar.xz 423464 SHA256 62d44d209b11806358a04ac977913b33d60da69f5cb48b150ab4ccbd30e9f6af SHA512 0e34c3375776c9d2eebbfee76a8677c681342055b232dc8673d8fe91f9dd62e444309dca79fa819a901558cd80452a60d9a98d9cdf5c6955f3f1adcf117d91aa WHIRLPOOL e2160007d4c4a735a52e18bb5e0f83ad516cca8f0031b8d8d332644a8fbdfb9cfc35e7ce8a9b1767f4c97d3134ac5ecadf5d60c5ab003de975b2b1ae844fcebc
+DIST debhelper_10.10.3.tar.xz 428548 SHA256 54a381b7bf70f5fa22afe33ccddb13785f26661f03b3ff8b98b7c2e50eb81902 SHA512 b1e78b4894285070f08833a84837ef1cbd8da6cfb04f43538944b9bfb7b9f56e9fe1f9f6ece42c1b4bc2abc6e421c68e42e2517f1d45f90511d213f690a6409d WHIRLPOOL d77bbafaca4b6c7d1752e174d078a03de6541536b15a9d2cf1f176f98836282b777b371c585f301b422b5b049e5615ffda0c6a0222bc2c91ca78c6a77b317481
 DIST debhelper_10.9.2.tar.xz 424752 SHA256 510ba7c22d2fc3eace8f455e19ac2766fbbb90a0278e36a7c01f8dde3c1195ac SHA512 4ea6e63ea64c9fcc2efbabe1419b5616a724cb9bbdb7f08a7aac20576aeae284a09776b087c35aabae49f581b1901a3c37e662e676debad4fbd6c35052331188 WHIRLPOOL eef7b32d893d765bfec2e8e08f1e96af7f010c4ccc6b6e0c0dd241c9726ef8abeebfc44abb028164867e5a77e954252e7fa52b0350df98f17319b9a7a5a51d37
-DIST debhelper_10.9.tar.xz 420736 SHA256 85905a4c7d36137e1d51df064c5177c76535b37fcd4b7d28c68622c877ddab41 SHA512 0efec68a6a01530e57f220593e66ff9f527aa57deb1df025728a52754e32ea6a4f5d57e9c8fb4fb2eb0c584cd9951dd69a92aeaf0c274806c17473ef9926ac61 WHIRLPOOL ce83de4eb9fe28b5f1e3d1a2ac7bddab19c8dc0c6e8852a7d9c5c01b2c4a95848cb05a15248fc8024168ed8042e1a74587821c0c6785baf2a2c1b722c6efcdaa
 DIST debhelper_9.20160814.tar.xz 344328 SHA256 2834a7c1dbeafd9402ea68948c815dab19d903503c45fd70e676269fccd359c0 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62 WHIRLPOOL 334f0aa8075896ec13a061b9841adb5f2b7c5fa6996b507785f50389c86c48e3c89a84ff1049ae7d7cbe4876b649010f892f54f1074ecafd76061bf0588e65d6
-EBUILD debhelper-10.9.1.ebuild 1561 SHA256 a49fc3ff25cb7de20487f6c892531f5f0d74862cfdba2aad606285cc6ab711c5 SHA512 5e1efe03d1ca488f0b2948706ade5a8ac9d9e8e321fd40ecb8c92b82e95716e7c4fde7cc21b203095cf9a3640174776d785606ad8ec88e97c093700915d477bb WHIRLPOOL c15d0c43fa16e42d31a8a38272d7988f2a3e28782c5b81572dde018cabf2ba67077e1dfea861992dc20751a9576b429f1eceb9ce3d9c6d625413407d78d0ccd0
+EBUILD debhelper-10.10.3.ebuild 1561 SHA256 a49fc3ff25cb7de20487f6c892531f5f0d74862cfdba2aad606285cc6ab711c5 SHA512 5e1efe03d1ca488f0b2948706ade5a8ac9d9e8e321fd40ecb8c92b82e95716e7c4fde7cc21b203095cf9a3640174776d785606ad8ec88e97c093700915d477bb WHIRLPOOL c15d0c43fa16e42d31a8a38272d7988f2a3e28782c5b81572dde018cabf2ba67077e1dfea861992dc20751a9576b429f1eceb9ce3d9c6d625413407d78d0ccd0
 EBUILD debhelper-10.9.2.ebuild 1561 SHA256 a49fc3ff25cb7de20487f6c892531f5f0d74862cfdba2aad606285cc6ab711c5 SHA512 5e1efe03d1ca488f0b2948706ade5a8ac9d9e8e321fd40ecb8c92b82e95716e7c4fde7cc21b203095cf9a3640174776d785606ad8ec88e97c093700915d477bb WHIRLPOOL c15d0c43fa16e42d31a8a38272d7988f2a3e28782c5b81572dde018cabf2ba67077e1dfea861992dc20751a9576b429f1eceb9ce3d9c6d625413407d78d0ccd0
-EBUILD debhelper-10.9.ebuild 1561 SHA256 a49fc3ff25cb7de20487f6c892531f5f0d74862cfdba2aad606285cc6ab711c5 SHA512 5e1efe03d1ca488f0b2948706ade5a8ac9d9e8e321fd40ecb8c92b82e95716e7c4fde7cc21b203095cf9a3640174776d785606ad8ec88e97c093700915d477bb WHIRLPOOL c15d0c43fa16e42d31a8a38272d7988f2a3e28782c5b81572dde018cabf2ba67077e1dfea861992dc20751a9576b429f1eceb9ce3d9c6d625413407d78d0ccd0
 EBUILD debhelper-9.20160814.ebuild 1552 SHA256 f5c72e8da17e980a58499ee9012a0ee5d4fe6d0f86eae76bf2cfea3a8872d32e SHA512 101be0361c520416b32d1584498834583c0ad161f10e472ba82743e5b4322e0f8caf737d6796eac6716225d4e2841127f1d3f869d635fdd1e891b77520dc0db2 WHIRLPOOL b1202695449e78a51dc83f0fa96f308faf17326b31a90f8f89c3625aa658e115258b8eb3403552ce57e544ad05069ef89ff0d62354c0d424bfcf26f794a9f3ae
 MISC ChangeLog 7636 SHA256 fa311f8535f6aff2ced962b7bc47e2e87f3d78b1d5077a4024793714d8388dc2 SHA512 58765119b2e1ab49da678f4cc3b3c400adb6722bcdd80db57434e1a36b533dca6efa0b68bc167be14939fc08d23f32c50583c0d07255432abc964d976d2d823c WHIRLPOOL daa41e2c4ddbfa908603ea6dcdd7fc87dd6fdda72c179962d16e18547c703f37288eeba6c78c58b0fb53385e3c5c45a455f6c66a7f9c696d9b65618869d40374
 MISC ChangeLog-2015 18510 SHA256 7f92f884e9115b587c3a5838b527e388ac5198ab4579f59be668f928e15d33ab SHA512 21463637e19558c87c1eaf0b3b7e86c6c5c337b6f7c9c432ccbbe5be8427727ce317dcd239df3e99043c093256d35232718b9628553cdcf786e1db72ffd102b1 WHIRLPOOL 7af51dc5bea277f47477f30582e0f78894f37d282e1bf1d72a63961e753f2aa54ac7a5d07f35f2f1d801e5a27f74b452aae9d18c88b2ed3257f066a995c88714
diff --git a/dev-util/debhelper/debhelper-10.9.1.ebuild b/dev-util/debhelper/debhelper-10.10.3.ebuild
index c4f2a7b166cc..c4f2a7b166cc 100644
--- a/dev-util/debhelper/debhelper-10.9.1.ebuild
+++ b/dev-util/debhelper/debhelper-10.10.3.ebuild
diff --git a/dev-util/debhelper/debhelper-10.9.ebuild b/dev-util/debhelper/debhelper-10.9.ebuild
deleted file mode 100644
index c4f2a7b166cc..000000000000
--- a/dev-util/debhelper/debhelper-10.9.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
-HOMEPAGE="https://packages.qa.debian.org/d/debhelper.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
-IUSE="test"
-DH_LINGUAS=( de es fr )
-IUSE+=" ${DH_LINGUAS[@]/#/linguas_}"
-
-NLS_DEPEND=$(
-	printf "linguas_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LINGUAS[@]}
-)
-
-RDEPEND="
-	>=dev-lang/perl-5.10:=
-	>=app-arch/dpkg-1.17
-	dev-perl/TimeDate
-	virtual/perl-Getopt-Long
-"
-DEPEND="
-	${RDEPEND}
-	${NLS_DEPEND}
-	test? (
-		dev-perl/Test-Pod
-		sys-apps/fakeroot
-	)
-"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	tc-export CC
-
-	local LANGS="" USE_NLS=no lingua
-	for lingua in ${DH_LINGUAS[@]}; do
-		if use linguas_${lingua}; then
-			LANGS+=" ${lingua}"
-			USE_NLS=yes
-		fi
-	done
-
-	emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	dodoc doc/* debian/changelog
-	docinto examples
-	dodoc examples/*
-	local lingua
-	for manfile in *.1 *.7 ; do
-		for lingua in ${DH_LINGUAS[@]}; do
-			case ${manfile} in
-				*.${lingua}.?)
-					use linguas_${lingua} \
-						&& cp ${manfile} "${T}"/${manfile/.${lingua}/} \
-						&& doman -i18n=${lingua} "${T}"/${manfile/.${lingua}/}
-					;;
-				*)
-					doman ${manfile}
-					;;
-			esac
-		done
-	done
-}
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 7a2b0b2a4e1f..42c18fe79c7f 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,3 +1,5 @@
 DIST diffoscope-78.tar.gz 466619 SHA256 f6b444b57dc70bb1ad6e682b3e5fe4a65141488980436b4ca89b55d1b589a8af SHA512 6d83c8297727ebd0dce49805d6cc3dcca1ea5a2c1b8d56097e3c7ef14c9058851f3504aaa2bed0f0ea905796f5c704937320f8bbcd7dad2a73ab940d96f693aa WHIRLPOOL 3245255abfcded1bbaa3c39bf046711cb82cf1a6c1625379421a47454ee6fd01692f42f56050bab2c8525a1a9fbef84290d7e96554c50df683d36b00e91df094
+DIST diffoscope-87.tar.gz 1026242 SHA256 b62a69f095cb056f1b9e43b9d345e36b3b52b9ebe3de135978ae84ae88feba86 SHA512 9f46ca0ba52ee991547c1b2b2477bab1e0c065cebf96649cecafc0e78983f42fe18b012a1f17de6184decb6cbb49aede91445c75777cfb292c6abe8bdf2dd6b6 WHIRLPOOL 2f23cdf0d9d21500b374076ba28c4a2b15af931a5d90f9b7f4427064d594b98079f16521423528ff0723443d4f0fe6ad4fe7b26f280472bee4cd37e444a73c7a
 EBUILD diffoscope-78.ebuild 540 SHA256 440145c4c72a42bd6fd927d64d29199ddcf670748a4b8cd05a4f166b5f8fb54e SHA512 89fc9c0d16c9b23c9c151d32d847d6dbf277ffd289c12fbcf4e611fc688cac39522ab6dab57cfb280a919619778642c11c1ec47954873b59224ac77f87d065c5 WHIRLPOOL 71360388ac7a774ac52a911754ad2e3c9c108bf329ca5f1adfa4740dc879bcc090d1b81975c20fe6301ece177435c1d4b2497b46d951cc7ecf5a9d38fe4a9108
-MISC metadata.xml 645 SHA256 3dacf9e64ae72bae7efaab10d9a437545c158e8da41e63665c2bed91ab11021b SHA512 eebf7b928e71f982cb33200bc8f04c4948a0cee4fad86109aacf9fc5ccb69831fbc9b7d54599700c114e640984bc16479971bc5414e60a20c0e8bb079491112f WHIRLPOOL 53aab0ada0c9498bff4293610c6eff8ba8d8a944d68e5b33da5fe9faa4f7eaa554663cabc81993806ec0d0c04488f6907b1f6f800caad86ff52945ce0845bdc8
+EBUILD diffoscope-87.ebuild 1839 SHA256 074d4a108f0bf5efe837f114a5b2536756cdf9a20077e408099f1396b7eb7056 SHA512 6fd5e6c29e291c49e79847c948d95928a49166bf4a4093f2a5a97a27766216c6018ff3137e330cdc10e9ca8f54bc3b6fc5e30c5a555eb6c5ef9176004cc31c1d WHIRLPOOL a9b7ab55e1af21118054995a271da9ec8ca7450f73ecd52fa39c387759b70d39efdd052482bafd1f8c59fcde65bfe143da5377aa89fba4530cc3557018add2e4
+MISC metadata.xml 2138 SHA256 37b41f77b3f014048da8a90703677def9239e180c6035c32039874aec4846920 SHA512 9f00c504e6ec4cdf5589e8f37d79567ad6fac661740ac482dbef1b3fae8bc60f24b80585eea8d17f18beb1c4c8e40e6f4172193b405be3e51428f027d2545776 WHIRLPOOL cb6fd5bb72be515144841055eacc7afd64c4a0147e2abf1926eb819bd28c8a3cb242a021a5430d570a439df658990f19d6cd55b3074ba2a52092470a2fa7e121
diff --git a/dev-util/diffoscope/diffoscope-87.ebuild b/dev-util/diffoscope/diffoscope-87.ebuild
new file mode 100644
index 000000000000..57f42c082286
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-87.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python3_{5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
+HOMEPAGE="https://diffoscope.org/ https://pypi.python.org/pypi/diffoscope/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
+find gettext gif gpg gzip haskell hex imagemagick iso java llvm
+mono opendocument pascal pdf postscript R rpm sqlite squashfs
+ssh tar tcpdump xz zip"
+RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
+	dev-python/libarchive-c[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+	acl? ( sys-apps/acl )
+	binutils? ( sys-devel/binutils )
+	bzip2? ( app-arch/bzip2 )
+	libcaca? ( media-libs/libcaca )
+	colord? ( x11-misc/colord )
+	cpio? ( app-arch/cpio )
+	diff? ( sys-apps/diffutils )
+	docx? ( app-text/docx2txt )
+	dtc? ( sys-apps/dtc )
+	e2fsprogs? ( sys-fs/e2fsprogs )
+	file? ( sys-apps/file )
+	find? ( sys-apps/findutils )
+	gettext? ( sys-devel/gettext )
+	gif? ( media-libs/giflib )
+	gpg? ( app-crypt/gnupg )
+	gzip? ( app-arch/gzip )
+	haskell? ( dev-lang/ghc )
+	hex? ( app-editors/vim-core )
+	imagemagick? ( media-gfx/imagemagick )
+	iso? ( virtual/cdrtools )
+	java? ( virtual/jdk )
+	llvm? ( sys-devel/llvm )
+	mono? ( dev-lang/mono )
+	opendocument? ( app-text/odt2txt )
+	pascal? ( dev-lang/fpc )
+	pdf? (
+		app-text/pdftk
+		app-text/poppler
+	)
+	postscript? ( app-text/ghostscript-gpl )
+	R? ( dev-lang/R )
+	rpm? ( app-arch/rpm )
+	sqlite? ( dev-db/sqlite:3 )
+	squashfs? ( sys-fs/squashfs-tools )
+	ssh? ( net-misc/openssh )
+	tar? ( app-arch/tar )
+	tcpdump? ( net-analyzer/tcpdump )
+	xz? ( app-arch/xz-utils )
+	zip? ( app-arch/unzip )"
diff --git a/dev-util/diffoscope/metadata.xml b/dev-util/diffoscope/metadata.xml
index 922b04338b88..c6b5b3df2213 100644
--- a/dev-util/diffoscope/metadata.xml
+++ b/dev-util/diffoscope/metadata.xml
@@ -11,6 +11,33 @@
   into more human readable form to compare them.
   It can compare two tarballs, ISO images, or PDF just as easily.
 </longdescription>
+<use>
+  <flag name="binutils">Use <pkg>sys-devel/binutils</pkg></flag>
+  <flag name="colord">Use <pkg>x11-misc/colord</pkg></flag>
+  <flag name="cpio">Use <pkg>app-arch/cpio</pkg></flag>
+  <flag name="diff">Use <pkg>sys-apps/diffutils</pkg></flag>
+  <flag name="docx">Use <pkg>app-text/docx2txt</pkg></flag>
+  <flag name="dtc">Use <pkg>sys-apps/dtc</pkg></flag>
+  <flag name="e2fsprogs">Use <pkg>sys-fs/e2fsprogs</pkg></flag>
+  <flag name="file">Use <pkg>sys-apps/file</pkg></flag>
+  <flag name="find">Use <pkg>sys-apps/findutils</pkg></flag>
+  <flag name="gettext">Use <pkg>sys-devel/gettext</pkg></flag>
+  <flag name="gpg">Use <pkg>app-crypt/gnupg</pkg></flag>
+  <flag name="haskell">Use <pkg>dev-lang/ghc</pkg></flag>
+  <flag name="hex">Use <pkg>app-editors/vim-core</pkg></flag>
+  <flag name="iso">Use <pkg>virtual/cdrtools</pkg></flag>
+  <flag name="llvm">Use <pkg>sys-devel/llvm</pkg></flag>
+  <flag name="opendocument">Use <pkg>app-text/odt2txt</pkg></flag>
+  <flag name="pascal">Use <pkg>dev-lang/fpc</pkg></flag>
+  <flag name="R">Use <pkg>dev-lang/R</pkg></flag>
+  <flag name="rpm">Use <pkg>app-arch/rpm</pkg></flag>
+  <flag name="squashfs">Use <pkg>sys-fs/squashfs-tools</pkg></flag>
+  <flag name="ssh">Use <pkg>net-misc/openssh</pkg></flag>
+  <flag name="tar">Use <pkg>app-arch/tar</pkg></flag>
+  <flag name="tcpdump">Use <pkg>net-analyzer/tcpdump</pkg></flag>
+  <flag name="xz">Use <pkg>app-arch/xz-utils</pkg></flag>
+  <flag name="zip">Use <pkg>app-arch/unzip</pkg></flag>
+</use>
 <upstream>
   <remote-id type="pypi">diffoscope</remote-id>
 </upstream>
diff --git a/dev-util/duma/Manifest b/dev-util/duma/Manifest
index 23bf0d593315..3242396e51d4 100644
--- a/dev-util/duma/Manifest
+++ b/dev-util/duma/Manifest
@@ -3,7 +3,7 @@ DIST duma-2.5.15-GNUmakefile.patch.bz2 4618 SHA256 71c79fedc436402301abc152ff0bc
 DIST duma_2_5_13.tar.gz 233157 SHA256 338757d68f580b38d0680f21151c55e705abf5c933d959410be90fe5c5248777 SHA512 da0f46a697f95cbb17d0dbb3135df779ac347fd9e63c1578d2d732300d5288958d02b5a271e84292a8279c1ebc3dc153f896cbeca916cf18aba8e54788671288 WHIRLPOOL 7262fecfb8a2176c352d0730f2fa2667d985740b2a75f42e7980d9a13f72d494eb9bd1dd4116cec37d03cc5441eb128d405de46e8a718b0a918179c7ae41368b
 DIST duma_2_5_15.tar.gz 240479 SHA256 baaf794854e3093ad1bddadbfb8ad4b220a7117d70359ee216bd59e353734e17 SHA512 0e2abdb08cfbaf9fd0a6be348c831a83ac4ee86d2297dcd1c4d625ddb4b2c1c73eef05e2b895e291d5b8076b1baea559c89d475f30e409210df4ab69b71b6345 WHIRLPOOL b7775cfefa49e942a8243520741920f506b09251e7c0966c2014863589f74a915de4ba8eee77716512ee3ad4071f748beb8ff4c03c95b7242f80aa397c4c51ad
 EBUILD duma-2.5.13.ebuild 2148 SHA256 02e3b9834e8f0229a1d8ed65c6d89c691e280798b19ac53fd4d4b8f45b757c15 SHA512 ae4197f4ebfe774adcaa85f8e9dac52bb66e4bac05f25b2ed91eaed2ad0a6c20433adcea07d0a9a7b3aa41183f597051f6af9266483af04f44c0a1ac0b2f43d0 WHIRLPOOL 76f70c6a3719c0f1132f2eb285d5652340b7835a427f7cc9e3560f0dcd63549e025e82ae9aefc3a782c22a5ed15a98c9d766dc423fbb8690bd26fbf53e86e560
-EBUILD duma-2.5.15-r2.ebuild 2245 SHA256 461391e49f41fda5c52b9c1bbb7806b053ce40914a96f7fa2cff7e65b70bf7b2 SHA512 f0464d408f0666181e79015a7232774f7fbe894474039bad0fcc4dae052e037c4797b9f549c6b050fcb6fd36e5de43456e33181008a818e3adb77b9184a5514b WHIRLPOOL 25bd1534a6fe101e62c040ae62a8b5b52a302daa7c86169f9ba11fefaa6e1af8df82c54f9ec78c140a95fc1201f0e82e488ca1ac600c0870a4ca2b7a454eba3a
+EBUILD duma-2.5.15-r2.ebuild 2242 SHA256 ad9eeed8f0612be10675423769f796df65e1cecd81b8f80e884ca576b5cb1d9c SHA512 4691aeae4fb436653248344174b052eb26c41e7cc9c9eac35bb6b913a077b8513261764308286dd6e629e1c02f914083ae1f78db6337a78cd354a4a5d5048abf WHIRLPOOL 0d7e7d84d923ebc93bc5eb1a1e7dbbd471bdeda8d5da16992321543e47a783121298a777d4dc8e969bc8dcebc013ef290d7a8ce9a01c53a9103b07a879dad8bc
 MISC ChangeLog 3358 SHA256 9ebc2e7437490916cddc03a82d926fb222fedf4cac374f3b4cb6928affaa3d84 SHA512 6a870f345a7a5d957f47586502bf04c3e8ad2a6d33f5dce3051d7807ebe8dcf104bba3054b5b969df096d0579e569812c1b60844efe1c0430f2368536d3b1d6d WHIRLPOOL 310a41285877b4546b69f9746781e5df4a60c25e2b67e0e0fc55ea53cbbbdb45d082a5deed4ca06a5953f12dda9c4dc2c773ea946c812ea050e984bf7e89877e
 MISC ChangeLog-2015 3401 SHA256 9e92b284e75226907b00510bd5336a8fd52c9bb799ee017bc7a0acd3e87967ee SHA512 a54a9e819d640150e9ff781c4c876d963a2f245a30a5bc31e86533f6f1ee2f241bf263d47a77483adcbb2496c6953fe5ffc4d90f54207ee1f2f2e1b8a71bd233 WHIRLPOOL 42c4928bddd38020a6840d1fc0c7e632377fe673a6c94caa3fb5d9d82c73e15263f7cbfbd889da27906f85ccc14e3800da61749aa52c9e4dc1328561ca40a312
 MISC metadata.xml 600 SHA256 965c4175aff48a5102cf4305b0a61dadbd2d230ec1048e174f800524f53d09d4 SHA512 f849e5c61d27430f2c7de1f86ac9f12b8424571703e08661bccb0415743bf2e88aea981e72a5b1c287c949c6634e975c5e3f9882b9a29171389bed998c352f08 WHIRLPOOL 2ebc211272275b05b9a8e7c3489f3b10f414a7fdadf2050339d12cd0554c678f5e0fb976f61eac9a668d0d1a548c3719c44c56445a1fe7ff5a9a778438b95539
diff --git a/dev-util/duma/duma-2.5.15-r2.ebuild b/dev-util/duma/duma-2.5.15-r2.ebuild
index f44643877e1e..5f6cbd88a61c 100644
--- a/dev-util/duma/duma-2.5.15-r2.ebuild
+++ b/dev-util/duma/duma-2.5.15-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/duma/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="examples"
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-util/electron/Manifest b/dev-util/electron/Manifest
index 37cca30161f0..4eafe38cdb3d 100644
--- a/dev-util/electron/Manifest
+++ b/dev-util/electron/Manifest
@@ -79,6 +79,6 @@ DIST native-mate-e719eab878c264bb03188d0cd6eb9ad6882bc13a.tar.gz 23818 SHA256 82
 EBUILD electron-0.36.12-r5.ebuild 23379 SHA256 a4cc890a21d9eb4b57c10be358e3478baf73a72b1116bd490be0bd155b154054 SHA512 32408c39d7242a434c3bed28a95abea6acd450c1e494e88d835825a51a45d4a445a189eb0e5f09b7da7cf3a127dffd6856d8165196580f449a5cda39421d25f0 WHIRLPOOL 7959c997c4a2877c15c578ac8a66063231181a4d376a5dcfd66ea252baca28ea04bbcf465d821f8e32315adbcbbed30ce9d6edb46b79279e0050ae48d254c1ca
 EBUILD electron-0.37.8-r2.ebuild 23755 SHA256 ed816fc53c0d39e777246e2872c0d0c0a476877c58bd2597e2c4b2f4ae0e91fa SHA512 4253f2b81deda03c2fd425ad115f0a73da2c0aee2a200c8ec9e0a57e087962e56e1f72153022f44e3866a3c35047b8a57af381449af044446ee43dbcfbafa7af WHIRLPOOL 4b8a477180a03dc6135f7a40ff0c9ee3fee419bd8570e1a8b6b8da36212c7e4bc65a2b62323a0f984c13e6aa79df8e4443834ff8f5fed49e269a558769a4b052
 EBUILD electron-1.3.13-r1.ebuild 24394 SHA256 48366b58fdc4ea8881547eb0cee6187f80dde89e3557245b2d428410952468e2 SHA512 60264761aedfeb4669f89e01ea526ddeb08e2547f5bd510e7767f6398a6e8419bc4d8a52452139df79bd09265dde14a50bb52bb5d3917ee187b4c1741d6fb050 WHIRLPOOL ac8cd833dd9b7feaa2c352cefc3fc68d000a5646ca334c3799772af62b0c0ad64dceb4009fa9dac3ee930b220caa894b95aaa391b875fe8170a79860164947bf
-EBUILD electron-1.6.11-r1.ebuild 28367 SHA256 57bfa4b3220f8341940bb31d5ce137394f707244624fc5d4c25befca89c19c28 SHA512 deed4646179584575831a3c09fa94e30351db921e7f50cdfe70eed170b0f75626beababfb87cc708a575ab10485ba499125ad924f09eeee2b84fbb90619f8f7d WHIRLPOOL 9b6ff12241bd2e8a56477ee82c68b5d1dd8e2492a58432919225bdae47304edee151a87edaf88a827b52e05cd799eed1b97f417986e45614368b830714772773
+EBUILD electron-1.6.11-r1.ebuild 28406 SHA256 73affc9213fd2bac5b445772b559d9d5a1ab06773e2b3c44462746072b9ce117 SHA512 486833a0c67b0f14151520198b3c04a4f5e9c9465b9220387576d1f3955fd33667afe0cd8d7465d7c1a8177c5315862a7d6541ac11c34139a775a165cab136b1 WHIRLPOOL 63a24b36fa0d559cdf49df90eb8953179c41dc6bc34a8946fbcd624f62d8627f60a59f4b1b118a0b654ed0f8078f245ae51c2f2b86214dd2d769d60ca0d0db25
 MISC ChangeLog 7412 SHA256 54faeab34ebcc39bb9abe01ce5ad8b6acf970e0248156fb0ef978fedc6b05581 SHA512 a3fe8eac0023bd1bf4fcd29c007634b3c91d567611420981b052cd287f254aaf9b8fd3a5af92f5cba6d755e4fd96673b836f94819d0c254bfff7bfef44febd91 WHIRLPOOL 50ff8773beef4ff7b62ad7ee56e236519b93e7226a082ffa29b28a86f2a88706c20d19d475c7bc23981ce895cec08e9b65f40bb1d4a4ce658bc8b59301861c7c
 MISC metadata.xml 1200 SHA256 e578897b4c00427d4dc628b9066d6cabafacaf55ed0c5c5f80ad82bd5d6d36a4 SHA512 a37063e88ba9dac58cc18c88e8b510e0d1d1ddd4e53017a6c92a73e281c0bdb3e87636136c52bc309a81a5c1df02079994409aaa70dce5e0130654d952cd744c WHIRLPOOL 14b3610dc4f57931342a000bb331ccce8d84361ca8ff6288d58837e2e0ca60070b63831ded478b746c40f1e6b258087f6e530c4c4e65aecaf3e4a56ffbe13bb4
diff --git a/dev-util/electron/electron-1.6.11-r1.ebuild b/dev-util/electron/electron-1.6.11-r1.ebuild
index 7c2e7f50ae87..756216c84209 100644
--- a/dev-util/electron/electron-1.6.11-r1.ebuild
+++ b/dev-util/electron/electron-1.6.11-r1.ebuild
@@ -119,6 +119,7 @@ COMMON_DEPEND="
 	x11-libs/cairo:=
 	x11-libs/gdk-pixbuf:2
 	x11-libs/libdrm
+	x11-libs/libnotify:=
 	x11-libs/libX11:=
 	x11-libs/libXcomposite:=
 	x11-libs/libXcursor:=
@@ -161,6 +162,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-perl/JSON
 	>=dev-util/gperf-3.0.3
 	dev-util/ninja
+	net-libs/nodejs
 	sys-apps/hwids[usb(+)]
 	>=sys-devel/bison-2.4.3
 	sys-devel/flex
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 175981293aa7..b3691c5b6131 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -4,8 +4,10 @@ AUX jenkins-bin.init2 1782 SHA256 3ff6ee9428744f616b32db1a7a6da9b99cd78573d2a6c9
 AUX jenkins-bin.service 499 SHA256 51de27d125003a65ff9f8680e741e5f92ccd56e0a2f8a95a4fd0050204f2c3ba SHA512 4ede5e0d55bf9d53239a1b8c152d1a3e38510982d6ff01c9c4288d63b8312ab7412979e0af3466638c7ef2803b711d49344692c14e72baa85d8eb4caa15f7506 WHIRLPOOL 684d39cd7a2fb9b8e9c1efd29fc6b30ffc1f65b045ec271743c9eeba06a267b4a9e0d54154024308917f0fcbde6d070bd9f68a6437d9de1e592147b650a2d1b7
 DIST jenkins-bin-2.73.2.war 73280014 SHA256 f6d1351beef34d980b32f8c463be505445f637e2fc62156fecd42891c53c97d3 SHA512 36fe7d2581f9a2f13b07c43ac9d5915d057bfede3522a17abc9376f19656166586c207c7516f46df7b2cef46ec67444ec44a97df0fc9af50ff41e9938465cebf WHIRLPOOL 1ab128a9e779de7b1c85283b40cf7401520123302d228462da6e77eacf30b288aa90b50b8f5576579e62287e5545cf6696f75155af1dc27cf6363e569806bc22
 DIST jenkins-bin-2.84.war 73749405 SHA256 067bdf4a3d473a5952e541d7755d8155a6ddf03cc1363d54daeb117d55dc955f SHA512 0074b2299f72f45040b4afd087caae0e08362708d3370d17f3bda047d11240881a3fd779753a49c298961e87c509d0b278ac2712934febed23c13c7e36d6c51c WHIRLPOOL 353d5297e6b5fdbfd95e6ea5ad4e6b8ec80653316029cd5bf108c0fc11be85f4f855c5783091e70d729cac842f16602c2f99f314af7e9bd46038854c15adedbb
+DIST jenkins-bin-2.86.war 73796979 SHA256 207aac187882bcddf665cdee78daa2fd8642f94c02d731b9ea18fdc985640ea5 SHA512 a94abb3230c90319f6a632e56afbbc0d19591a6a67ab6ac35856c2bb99ead33d4b23ab3d19a15c1f9501dbf932b3101f569af0f557fb884cd07dadd8a1c968bf WHIRLPOOL 74f8af0451f91088ab614dae0889fce3d986d59ed3c5c518446bce9925adda4544daf18e02d83fb1f55b299fb224070ba7b9f882c8ccab8d7422b9706cdc4fb4
 EBUILD jenkins-bin-2.73.2.ebuild 1110 SHA256 30f40c8b134a22249e4d8949439c683ad89963eec88afba48fb856fb9c44c320 SHA512 7e51e0a6eade5438b25cd1f66220b865a99f7aff7ed4e6615ec8763fe9767a2caabd68eeb71f543c88d5ffddbe57af0e7623b86b693542930fcdd0ff2f9ccd26 WHIRLPOOL 43f029505b191dbdf4b829fa1aae04d2a50176e74333bca916f6092d352a8e57e8ddbc2b378155dfeb0f3c300c7ce99a5e7d3d884f86a202848e8004367ab494
 EBUILD jenkins-bin-2.84.ebuild 1103 SHA256 a10ef477b20d8beb35f4c698b35d2fe56bec72c7ce2729250a61e97750466cea SHA512 1744e21e9e5110d1efe3886d216e2b89c9c2fe64e167bbe2611c4fbdb0583e341aea4c31a14baa81411227cbb5678c9ad642be1c48c3e5100bb564e056a9aac6 WHIRLPOOL 97b669904d0d1e086af7d12d0faec6d786cfa5f917a973667cd41a00a233d89604e26b3c1d867535b68b610854d63da798e39a5bface8c8cb8ea20dd119c299f
+EBUILD jenkins-bin-2.86.ebuild 1103 SHA256 a10ef477b20d8beb35f4c698b35d2fe56bec72c7ce2729250a61e97750466cea SHA512 1744e21e9e5110d1efe3886d216e2b89c9c2fe64e167bbe2611c4fbdb0583e341aea4c31a14baa81411227cbb5678c9ad642be1c48c3e5100bb564e056a9aac6 WHIRLPOOL 97b669904d0d1e086af7d12d0faec6d786cfa5f917a973667cd41a00a233d89604e26b3c1d867535b68b610854d63da798e39a5bface8c8cb8ea20dd119c299f
 MISC ChangeLog 17147 SHA256 cedd72ff5b9bf786d1428289ac9ac8579ad33145dfb8404deef944cdf1665e67 SHA512 022d5ac33a69933bb466ee8276cc03191402ac9c20c361beb5bcfc73abf1ab72b96b507da444a31b524a9d764ab96ee91640a5713c2534460a562e23fabe2632 WHIRLPOOL ac693d36948f784cd45016c37a7b242fd7f0697157f818656754512bf907f8e06754179bed804cfc8c27b5662317b9bd0c3f983e34da51831cdf7edef16601a7
 MISC ChangeLog-2015 7461 SHA256 e48db67fcc69ca6960feec378328abd2bf810336a50541e6415fb0b3761fa32b SHA512 63f46144cb8712c22700d70fcdafc26c8113cb314781e6b351ca5254bc5196d86ff53b48e3eb0d722d8e6788e5f9b3a68f7767dc4d24724312844c14b8a476c8 WHIRLPOOL 58fe8bb9da5b4439fcef35aaed534ff6b78822287b4e328dc993580a4c970e8ff3b63d925405b48fe4c47a869f196f2ff59a439743b4a1b27acdbaa0ece4a7a6
 MISC metadata.xml 397 SHA256 f748bd402594de6903f7182113715c4ab3a9b0b382350ff52a3671ed7b11bd0b SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810 WHIRLPOOL 63fdb75a201da6f1a0d1ca73ed6167a0bbf438b568f0d2d68a620eae559ed3aac5e1d8f5e9f57557c5310dd38bcf459d512027c49928c5d82c7e99609c2dca49
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.86.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.86.ebuild
new file mode 100644
index 000000000000..2101948a704e
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.86.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="http://jenkins-ci.org/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:lts
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index c9afeb3d665b..65e6b9f94a46 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,7 +1,7 @@
 DIST kdev-php-5.1.1.tar.xz 678368 SHA256 a33abd4837354218891225f0e18b7e9eb6e106cc1c744731a9003a9ea71e1404 SHA512 71d59db196e33663ae7167b973c3514e795d636370ace39b9c760a601f4bd947ffd6a3f8d7cfa0e199c77d8818dfeaf56882059aa18026aadd1e7b808326d0fc WHIRLPOOL ea4c437fa30bbad082d2e2fd65d38e8b91d9c4701a7726db7fc7010b80ca46f05d5975e5a2679df82b26ba26175abb11f6b0dca16f98a0ec992531dbe33fe91e
 DIST kdev-php-5.1.2.tar.xz 678624 SHA256 05f1a9a47cd4a8ff74d46f7cef0baeba31c159168c1c58efd7af5e3836980de9 SHA512 c5c6fa288b048fb19597c8cd9708a2d8570c8eaab4584a1ec0808cbd65788ae15b140e8c0437a3a18c2561c078c26208597c674efb37623b5199260ed5b3f851 WHIRLPOOL 31f0416b724a8aba1e5ed404f4821be196af16f1f80773b6bee50858f3efb1460793d8e5d96031272232a2e5f346d4b0e6d6515b42b69715aa4ff3dedebc1418
 EBUILD kdevelop-php-5.1.1.ebuild 1038 SHA256 f5d86f604f4335dcebb94378c01e6f863570e8b4369eccad64ecd0cfa0c86c56 SHA512 dfe152c398d333c9e8bdb6ae29e994d8a24ddc30f9d8e6926123bbef7bbcf53a846e8324a02e9eab34a655e90acf85ad1423ca6a624952c04a899a412b4449db WHIRLPOOL ad1f1d30c9dee0f4c8494f0d05a2b8e8f62be3eb5ee8028c16e0b795e2965100e059aba07d32ccf33396a947eaec05b922cd21d1a3b9ef4caca56b6d23dfd7d6
-EBUILD kdevelop-php-5.1.2.ebuild 1030 SHA256 bee3e1687ec4cd992e8c95ebf7789d29797c3768170f2bd0d90be5d6822345b1 SHA512 982d96a443100fa3618ae6be38a1a7690e58269d4ce48e1d1d42066751a23bac4c4083b50c3b6bbac55685107188889e91ad8d22b41a19407e62c2c4bd9acfb5 WHIRLPOOL 3248499e51986eacd35958758fdcebf4c32f0d07cfa4a61b044dc5a4da947e03cb6c74a2665250eb229f5128100e7c693e871b85b3038f94d3f73e82d3dbf7bb
+EBUILD kdevelop-php-5.1.2.ebuild 1145 SHA256 9b7ceb1d505705c9c99c905fa5e751347db85354d4bd19a06d924cbb11b2dd72 SHA512 4a1d448f72f0af3c19008b016462a15d34c8c4ec7614dc1f959f1d1f398fe57830a6587a07e73803b4c6ccee05937467272135e0eb4b988e62e2e7cfa1bbac52 WHIRLPOOL bddc8cba03f4abc9a1df7b74b69d847a883eea27bad0c71a79147dc6d4fd8d3de331b9d0186cf710408000c4540b7b3a4db7806719a7e88d3281fe4a4ebb8754
 MISC ChangeLog 5381 SHA256 6d7c24e9978c1cf6a3a8fe7afce1799b636b10b2a8f10da0c154ac2fea851ca7 SHA512 1f971dd232dbe20a38d445458ca558355414f06d9229384b4b89f774a1adcda7359822484220e1f379ead824051a71e5cf63bcde161bd3959cb6a360da6a19df WHIRLPOOL 9049eb56aa5ece4401c228db5a5ef8a8a1a0c192ad0ee8777099cb6efbe7f2900b59567ab24a1532d94e35ec43421981c5c428d2a38dee6ca5e0ebe71e8a0e89
 MISC ChangeLog-2015 7253 SHA256 6b212a61458875a2cbfe51d9e3e25f92b6527c670f5afb2d4e7f81050a5466fe SHA512 81bf387fa7d4ec3c9de6488cb9e2f707bb8694ab9f3412df52597c1168310f822172b0ccd90889dbfcc6932bd5f2c14e0baf7ce35f6d5c9805db4b028fa45f25 WHIRLPOOL c7dc35b0962b276c56f04f0c14c10f5c7abb566c6aeda7ee3e13df078441e5756ba904996f5805233b5a7401fb1a6d6dbb2b80b9fa87773255ff3c1c2d8f19b9
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.1.2.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.1.2.ebuild
index 9e4b2a9d9d0b..20744e9575f6 100644
--- a/dev-util/kdevelop-php/kdevelop-php-5.1.2.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-5.1.2.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2 LGPL-2"
 IUSE=""
 [[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
 
-DEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kconfig)
@@ -36,7 +36,12 @@ DEPEND="
 	dev-util/kdevelop-pg-qt:5
 	>=dev-util/kdevplatform-${PV}:${SLOT}
 "
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
 	!dev-util/kdevelop-php-docs
 	dev-util/kdevelop:5
 "
+DEPEND="${COMMON_DEPEND}
+	test? ( >=dev-util/kdevplatform-${PV}:${SLOT}[test] )
+"
+
+RESTRICT+=" test"
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 3521eb10fc16..8868aaa0f1aa 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -2,7 +2,7 @@ AUX ninja-uclibc.patch 526 SHA256 5864494d956310fbc8abf6d7dd7cd8968eb483a1da0468
 DIST ninja-1.7.2.tar.gz 180611 SHA256 2edda0a5421ace3cf428309211270772dd35a91af60c96f93f90df6bc41b16d9 SHA512 29900d07364d87ad8b9614b82bc1b0afda5ca6522563ab73fb228f206ed6b29b70cf034a3caf5a9b2c0b105d1e076c6b425d93b5d14aa3ca3730d75611212a64 WHIRLPOOL 43623778d3f96a87efb4bfd272075b257ebba3760d315c5650fa74493e2193699401c9b6d35d679e7c5235456d48674ac7e913fe1d45b5b98c2542c3b0a72e44
 DIST ninja-1.8.2.tar.gz 185226 SHA256 86b8700c3d0880c2b44c2ff67ce42774aaf8c28cbf57725cb881569288c1c6f4 SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2 WHIRLPOOL 7afc5a6ba34f5c5b464ed47af8e0b5e50bc02a81beb4e5719e19348d60057e6cd3f156ef20f77646fe883b8becc1298d7998d85f1d8bc07ee6b0bd415a58aa2f
 EBUILD ninja-1.7.2.ebuild 2654 SHA256 f1e1da387aacfe5e7e20a410fccbe936b6b35ddfd81f6cc20d6e994184be5d04 SHA512 715d1473f7515354f0c3f3d8c7017abbf45509c477b1d66f6c4e7cd3d2dac0d85fe68a35feed89c77be4d1d10540039a9966abe35c453d3bb6965709686e0cd3 WHIRLPOOL 998aaf6b6ed4493b74b01dd74a80dcb85a6b4f656b2ef2835db58c0cf5fee418c61422ec41f9aa0462e3e1253be3c15c13f0bf1fa52c6334313f850a5d8f6666
-EBUILD ninja-1.8.2.ebuild 2614 SHA256 a8052df0c7f255f373d0df51391e2023704e85188982bd67efcfc15be68e7084 SHA512 356613554f491e50d95afc5659360f735d3aa4e1ed45ea30f2ceb3235f864b59688107614244d029e3cdc3917399e1d9f8c06d5718911b0dde735ec932745274 WHIRLPOOL 66abe63d2eac7c85b8af0bba0a367cefdf054e9ef1e11e8ce6be0173b25553889128892d318a8d7ad4a933734a8d790fde20e7bab6914251868463d3b0a4b4cb
+EBUILD ninja-1.8.2.ebuild 2616 SHA256 c58e125d0ba606f161c194128dc4d24da24e167517660f0ac3972f5e188f347a SHA512 1b3de1937b97cfde38f95eb6d232d1151869fecf48047241724b3d279e4636a1cdd09720bbc0742fd943b6a7cc31fe918635a221d4ea84b7be01c67e232713f2 WHIRLPOOL e3a26b07f4e9f97577662746c75d2f2c3af84aa90096b68f8b8b5fbffe096cab381407d39364a7481aab01d3429277cf2831f231d6dcafbe72f6efa1d32cbcc6
 EBUILD ninja-9999.ebuild 2617 SHA256 b92033b3a4b37c5f5770e3c1c1fb3b379b8c2dc72d78cba37f7640f80dd60096 SHA512 510034c91bc8be87f2e267e3d38ef86f0fe27dc8d2ca634e302b47a1752cd7caa379055f91c493d248693ae5c472ca4987870f0f126b41be0507dd0872ebcce8 WHIRLPOOL 2e0a8b4949f31056d4262d6937dfec1a7c5693d3e42bf1acc8f6c6ebed53ddb0c796bdc5ae27aac69a787022d5c82728d51abcfcca08eb45376bcf901a1e12cc
 MISC ChangeLog 5535 SHA256 06426d51846a9e0a803d92040f79bfde06554f00ff4999f8311e482d5305b62b SHA512 f2fffa79fb37ee24f392afe8a55e9cdcccf3b91a0191ff0573ca05b6b5e737ae16c367ed33e830ba70590829809f89ff45eff90f9d50bcd1a14b59f73bcabdcf WHIRLPOOL f11e09e4eff52d5b0e76e759005b5d2eed7153d679664bea5cd919dc3ad9515d711dde733da6c8ddeaf57476f341844ad1cafe45971bb32d029ed71e99a6bcea
 MISC ChangeLog-2015 6583 SHA256 bddeb0e9007198ddea2c83fa3d9fedfeaac320a7bcb78d75c7e272d3705f2d44 SHA512 62420fba29520829755b371c15d3e5abda58e62bbfbfef9c5ef81843fbb4053ad50f68c2919ec54ea9d32a1a7ecfd444ddab92a219ef19b8b95b8ef03e016e1f WHIRLPOOL 7819fc4209a88659bc3c1a202453a8d153a81ff78373924c0baff929689c3f1815fd7b9acfea04692fb747e116b4b77fa50aeb88fd0548057022defd6f04e373
diff --git a/dev-util/ninja/ninja-1.8.2.ebuild b/dev-util/ninja/ninja-1.8.2.ebuild
index cf9df1fec31b..237787cd4b56 100644
--- a/dev-util/ninja/ninja-1.8.2.ebuild
+++ b/dev-util/ninja/ninja-1.8.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
 else
 	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/pkgconfig/Manifest b/dev-util/pkgconfig/Manifest
index 3df0b7c2fd9b..b737558a67cb 100644
--- a/dev-util/pkgconfig/Manifest
+++ b/dev-util/pkgconfig/Manifest
@@ -6,7 +6,7 @@ DIST pkg-config-0.29.2.tar.gz 2016830 SHA256 6fc69c01688c9458a57eb9a1664c9aba372
 EBUILD pkgconfig-0.28-r2.ebuild 2917 SHA256 af884821614db43099274b354c1f802ce886ff8e0f4bae278de19c987f43f8dc SHA512 1684738c78ae64b822c47c8c85b787dec1b8a44ef3db08611df5af1fa1c2e9e113d841b0270376f29831dc98db46889ceac9201b853c39402d3bd6b4cb566f15 WHIRLPOOL 8cb4a88c259207bf55bd6635b1ee9e88c2b53e5bcebd46ba5ce9ca5a7be801f3bae323ca3776b09ec71592581cf1ef713822a8ce930d73cc15f7138537374eed
 EBUILD pkgconfig-0.28-r3.ebuild 3440 SHA256 d63059644d79e73ff436a28c74fae044c91e5687608ef63d9a0df53a74280390 SHA512 30b8056d52a616023779aa243f96a372ae6ec6ba25009785aa7ee349127aa9ee5d87f9d385d48e8f9fc67678ce16fd8672f8a20c5332f8f363352eba3ef4a4a2 WHIRLPOOL 4d76fa823e321f60a4d95a2a6991e95e694b9c2e17e9229c2bcd34eb2137637b79e1bddc46b6b05ea9b244728e9af9e7e3bdd58ac7987c0922385330d152a5cd
 EBUILD pkgconfig-0.29.1.ebuild 3804 SHA256 41df846c2bdedfb185988177e230538083bc1c8ed4561364a9d9f2987f3caa99 SHA512 38c9f1f0ef4badc04b19901da1fef0cd11038ff9805fbc34ff0598f9d477be8c94bc20ec8f8102576f22c2e9ad0e3d11a1acab5fa676de169c47fbb6ade88de0 WHIRLPOOL 4eeab2abab0e745b455f4b4e5221352ab6ea3cf082fe424beb085d50e78babe60f38b70cfd9edf9d56ee93634c940b19b2fce9059f442d3cae8d8414b22a9c30
-EBUILD pkgconfig-0.29.2.ebuild 3798 SHA256 4b0bdd0a0242889b3945a9795d7e133d26d5e7f589e5ce867c6432220526342b SHA512 306d9eb5dc0c502c8a38ae3285e4c579f1ff89c25168727a836baaba6ef209dc0e7494255c5aee0a5b8b70497c4552f6c661be594d719c73b3790c9360b8d360 WHIRLPOOL a08d601fe12d63d09a0c72e59de35dd25d9e4157c1f3455f7d62b36ed25f5c3ace64fe5fa99c991a135b96805c6f90971454d67c8f6fa4729be77a150c9ac9d9
+EBUILD pkgconfig-0.29.2.ebuild 3796 SHA256 829415e3f4733c52bca85b85f81dd97d86a60a6c3e80b78bee99f60cbf6a5a0f SHA512 1c1df9bb25de2bcb6320db8a767cc250b40ec698da9f167b0c325862de86ece48d3873ec7750985fb8f4131eb3360b97295ed98a6f5dde6e8e22f8bc9cb317a0 WHIRLPOOL 5097e0936bfa47244ad1fbce10a5f9f57375c5e984df77ba124e10a23eb349d9f7547c3c50059a705d3f16c3a74e447a68f07b66f9aa8ff77341766524fd4475
 EBUILD pkgconfig-9999.ebuild 3804 SHA256 41df846c2bdedfb185988177e230538083bc1c8ed4561364a9d9f2987f3caa99 SHA512 38c9f1f0ef4badc04b19901da1fef0cd11038ff9805fbc34ff0598f9d477be8c94bc20ec8f8102576f22c2e9ad0e3d11a1acab5fa676de169c47fbb6ade88de0 WHIRLPOOL 4eeab2abab0e745b455f4b4e5221352ab6ea3cf082fe424beb085d50e78babe60f38b70cfd9edf9d56ee93634c940b19b2fce9059f442d3cae8d8414b22a9c30
 MISC ChangeLog 4743 SHA256 d52a67ba0cfc2b0a08cfc14d4a24b6e9243ee07914b65eb8cd89b5dbaf0d40dd SHA512 160ad07c6aa9e48c8120d1a9e145138de28d896eba28378398909694f1c1f701ee4ed97d0f2d218ae8a669139ccfa5894b6a4d98db72ab9dea3d90fd5285b70d WHIRLPOOL f3b34eacf324590deb60b4be52974a7ba5046c0043918a4fe9cb0bd3ec37f07070963d7ac318b363f9e31eb491c44a66900a87fe7d269ad0bde95aec0da4822e
 MISC ChangeLog-2015 21094 SHA256 cc1d50a35be5f09e95cc26ecdcc79981d65b2b7897e37dae1a6dbec5f2dc23b9 SHA512 7a816d8c7abb0b0a1693d5576cd8410ca482e8e6a4223577e166c794d4da36593b9940f231bdfba997c7c813b93670fbd2bec3f41c906b8c14e32cc8daba5af8 WHIRLPOOL 020cc9cfde139648733284321638c4b5339d6d6ee8d7665ad34d9194502f99fcf0085ea66929acb8db0f6e7eff4703716dda96b3bc2c86ccacd38ec7ff8b72cc
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
index 081de47109bc..d32b9512e326 100644
--- a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
 	inherit autotools git-r3
 else
-	KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 642399593e26..06cff990d6cf 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,6 +1,8 @@
 AUX radare2-0.9.9-nogit.patch 352 SHA256 cb87e4093d4ace137f48e79d899576e89c91805934b0ad0f0b1c5f4a965332f9 SHA512 5a84c2f768b60dc6ffb35130f409714e0ffc4cbc6fb9e08bc4bf86d28651060398d809fed8abafcd56cabde86aa9e8672df77212f0d8c0b6dfc056b243e1c270 WHIRLPOOL fcbc1358c844e486366f766061b82c2ae72f7d513b2e504e7b488057e88f1af732667a5f02b05a8c8f91642799f3fdd47ad8f17e82f9659377c651d3e8d9c7d7
+AUX radare2-2.0.1-635618-p1.patch 938 SHA256 072847408019c7eb48b38ec334a64d801d35d5d95a638e8c7f08e5170a8b774e SHA512 526a0570b60ee90464f441c26c66167bbae734e400d043e3eb54ce335e2e0874a29330e885f3703d116fc3175d5341f0ac9297705757bec54273db4cc0937e8f WHIRLPOOL 9915a5673abf0a67cdae8fca10cc547de238557e036b0842ea45a5c1ee0690004c721d44576af007a01794b2a933610933555e7f5b86950545eece7f711f9374
+AUX radare2-2.0.1-635618-p2.patch 963 SHA256 aef6dae283943c82323c7b8ea273e686d47853b904efe3374892139533070cbe SHA512 d912a3be1b136d963c99c53032fef48b4176421213ffcc12a40ee625a7c126cc1fb0b55b9316fe0385caf5c605396a6d826842d649229ec514d619ce86a752fe WHIRLPOOL a084de94ed6f666e60488aa8d4a4e1e7ee161b4236fb496a359eedad4675b3da167eef7afd124d5e45ea374eb10b55558216110d85a7baf0ce8958d09c8cf3f6
 DIST radare2-2.0.1.tar.gz 6001927 SHA256 d8f7e1ab96028fc8bd62d4f92fbbe8bbf48c6cda8112e6eaec93bf5ffbbbd1dd SHA512 1a8db3c71895fd9ccf284e7d0747770a5490872c5ee7f8e6d1c3a2590d2b344873bfc11b5f686bd08caa441bb787b2ec86aae9e83bf61e296f6a233d3ba35207 WHIRLPOOL 276f5628482a56eba3596a04f42a5fa60ed267ed09efea1adef1305cb3313d6ff59b0821ad05b5421620caa3e902f0839c61c619156f5bc1e1966d33261d1e3e
-EBUILD radare2-2.0.1.ebuild 1100 SHA256 509a02f4bbfe3b6a8947abe6cf0d5e97f3c828a991ed35ffe8e54a530f5abc6c SHA512 960f6846a24780b390e10f090c0678cd6c2295d9dcc4597d55972d158b580b05206b291e5608ee5452d5b269d0eed679b60ddf5d4a123fae7fab382c02fad9c3 WHIRLPOOL 79744466fa01042b680683ae643f195a2459e0c55b842eb681ab61f5518824da80aca11bc180fd329ff18cf751352aa37359efb3e9f7a59ab30e7c0953ba936d
+EBUILD radare2-2.0.1-r1.ebuild 1173 SHA256 822fa9abbf738a6240055c42465403b7530d892fe489710c3ec708ebfdd0d2c4 SHA512 d2b9207d58847675ad5eafa9cc26465fd9bca05f6b9b16d32748e28b74d5b04776bfca981bce57986c1974fa5979f9042ea0d88d8b0021f0ea61ead9ef433986 WHIRLPOOL 87f141d3e6c16ba1804d61acdc00ab03ffbcbf5a43cd2d63833c83655efd746ce0e25d0b4dd912a2d21a4627f9300cfcd61dca7090a5d9c18def5c24ab78846f
 EBUILD radare2-9999.ebuild 1100 SHA256 509a02f4bbfe3b6a8947abe6cf0d5e97f3c828a991ed35ffe8e54a530f5abc6c SHA512 960f6846a24780b390e10f090c0678cd6c2295d9dcc4597d55972d158b580b05206b291e5608ee5452d5b269d0eed679b60ddf5d4a123fae7fab382c02fad9c3 WHIRLPOOL 79744466fa01042b680683ae643f195a2459e0c55b842eb681ab61f5518824da80aca11bc180fd329ff18cf751352aa37359efb3e9f7a59ab30e7c0953ba936d
 MISC ChangeLog 4607 SHA256 0849da5ab6d072ad7593d03e9b9b22d917dd2595cfbf2c13f24428ad36d2dca0 SHA512 eed5b7c00d816f0704b108ab36b69cb017ee2db9765c1faec063d4cf1d7b51d707c6d3cd94e29b754327cf9a786aa8e2337e327e1fb2b2dcce2c295307bac9d2 WHIRLPOOL 164b4dc5cd791295f748fed843fc23bb2108da6bc7d844cf83e862536ede59edcabca277462a964ae14bb373328c77ccb3f01125dd3205d0843e589d45d094e2
 MISC ChangeLog-2015 791 SHA256 4dd712e34e1b2e2ab9be03f8f9ad678dfd8e6a26da95bb9ae76c9a4f2d618430 SHA512 b618b8c70903664d4f78ce1318761460114c52a6b83320f22bef114988919a3c5a9961e01c16b40a1e0b063f4a4f7e367af93c9977dfb0c2d675e3c325541198 WHIRLPOOL 694b555dd75664961bee62ad4fe60394ad7a38e757c5d67218a174c46811557b10271575ee62c2be1617f3019b3e703dbcda281d159cb6d2c8af093ab1f60e9e
diff --git a/dev-util/radare2/files/radare2-2.0.1-635618-p1.patch b/dev-util/radare2/files/radare2-2.0.1-635618-p1.patch
new file mode 100644
index 000000000000..5644e50cc115
--- /dev/null
+++ b/dev-util/radare2/files/radare2-2.0.1-635618-p1.patch
@@ -0,0 +1,29 @@
+From c6d0076c924891ad9948a62d89d0bcdaf965f0cd Mon Sep 17 00:00:00 2001
+From: pancake <pancake@nopcode.org>
+Date: Wed, 25 Oct 2017 18:00:11 +0200
+Subject: [PATCH] Fix #8731 - Crash in ELF parser with negative 32bit number
+
+---
+ libr/bin/format/elf/elf.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/libr/bin/format/elf/elf.c b/libr/bin/format/elf/elf.c
+index 90f6acd30..e3c852fd3 100644
+--- a/libr/bin/format/elf/elf.c
++++ b/libr/bin/format/elf/elf.c
+@@ -900,7 +900,11 @@ static Sdb *store_versioninfo_gnu_verneed(ELFOBJ *bin, Elf_(Shdr) *shdr, int sz)
+ 			free (s);
+ 		}
+ 		sdb_num_set (sdb_version, "cnt", entry->vn_cnt, 0);
+-		vstart += entry->vn_aux;
++		st32 vnaux = entry->vn_aux;
++		if (vnaux < 1) {
++			goto beach;
++		}
++		vstart += vnaux;
+ 		for (j = 0, isum = i + entry->vn_aux; j < entry->vn_cnt && vstart + sizeof (Elf_(Vernaux)) <= end; ++j) {
+ 			int k;
+ 			Elf_(Vernaux) * aux = NULL;
+-- 
+2.14.3
+
diff --git a/dev-util/radare2/files/radare2-2.0.1-635618-p2.patch b/dev-util/radare2/files/radare2-2.0.1-635618-p2.patch
new file mode 100644
index 000000000000..242f4cc6220c
--- /dev/null
+++ b/dev-util/radare2/files/radare2-2.0.1-635618-p2.patch
@@ -0,0 +1,30 @@
+From 44ded3ff35b8264f54b5a900cab32ec489d9e5b9 Mon Sep 17 00:00:00 2001
+From: pancake <pancake@nopcode.org>
+Date: Wed, 25 Oct 2017 18:09:24 +0200
+Subject: [PATCH] Fix #8743 - Crash in ELF version parser on 32bit systems
+
+---
+ libr/bin/format/elf/elf.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/libr/bin/format/elf/elf.c b/libr/bin/format/elf/elf.c
+index e3c852fd3..2248731b3 100644
+--- a/libr/bin/format/elf/elf.c
++++ b/libr/bin/format/elf/elf.c
+@@ -748,7 +748,12 @@ static Sdb *store_versioninfo_gnu_verdef(ELFOBJ *bin, Elf_(Shdr) *shdr, int sz)
+ 		verdef->vd_hash = READ32 (dfs, j)
+ 		verdef->vd_aux = READ32 (dfs, j)
+ 		verdef->vd_next = READ32 (dfs, j)
+-		vstart += verdef->vd_aux;
++		int vdaux = verdef->vd_aux;
++		if (vdaux < 1) {
++			sdb_free (sdb_verdef);
++			goto out_error;
++		}
++		vstart += vdaux;
+ 		if (vstart > end || vstart + sizeof (Elf_(Verdaux)) > end) {
+ 			sdb_free (sdb_verdef);
+ 			goto out_error;
+-- 
+2.14.3
+
diff --git a/dev-util/radare2/radare2-2.0.1-r1.ebuild b/dev-util/radare2/radare2-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..78ee0f1268ef
--- /dev/null
+++ b/dev-util/radare2/radare2-2.0.1-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="unix-like reverse engineering framework and commandline tools"
+HOMEPAGE="http://www.radare.org"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/radare/radare2"
+else
+	SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~arm ~arm64"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.9-nogit.patch
+	"${FILESDIR}"/${P}-635618-p1.patch
+	"${FILESDIR}"/${P}-635618-p2.patch
+)
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ssl +system-capstone zsh-completion"
+
+RDEPEND="
+	ssl? ( dev-libs/openssl:0= )
+	system-capstone? ( dev-libs/capstone:0= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf \
+		$(use_with ssl openssl) \
+		$(use_with system-capstone syscapstone)
+}
+
+src_install() {
+	default
+
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		doins doc/zsh/_*
+	fi
+
+	# a workaround for unstable $(INSTALL) call, bug #574866
+	local d
+	for d in doc/*; do
+		if [[ -d $d ]]; then
+			rm -rfv "$d" || die "failed to delete '$d'"
+		fi
+	done
+}
diff --git a/dev-util/radare2/radare2-2.0.1.ebuild b/dev-util/radare2/radare2-2.0.1.ebuild
deleted file mode 100644
index cf3939d92997..000000000000
--- a/dev-util/radare2/radare2-2.0.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="unix-like reverse engineering framework and commandline tools"
-HOMEPAGE="http://www.radare.org"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/radare/radare2"
-else
-	SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~arm ~arm64"
-	PATCHES=( "${FILESDIR}"/${PN}-0.9.9-nogit.patch )
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ssl +system-capstone zsh-completion"
-
-RDEPEND="
-	ssl? ( dev-libs/openssl:0= )
-	system-capstone? ( dev-libs/capstone:0= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	econf \
-		$(use_with ssl openssl) \
-		$(use_with system-capstone syscapstone)
-}
-
-src_install() {
-	default
-
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins doc/zsh/_*
-	fi
-
-	# a workaround for unstable $(INSTALL) call, bug #574866
-	local d
-	for d in doc/*; do
-		if [[ -d $d ]]; then
-			rm -rfv "$d" || die "failed to delete '$d'"
-		fi
-	done
-}
diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest
index 185d01aa90a4..614f33019557 100644
--- a/dev-util/ragel/Manifest
+++ b/dev-util/ragel/Manifest
@@ -6,7 +6,7 @@ DIST ragel-6.8.tar.gz 1211146 SHA256 dd7f7d22f3a58147379bda61334d341c2caa0caf9f7
 DIST ragel-6.9.tar.gz 1226871 SHA256 6e07be0fab5ca1d9c2d9e177718a018fc666141f594a5d6e7025658620cf660a SHA512 46886a37fa0b785574c03ba6581d99bbeaa11ca65cf4fdc37ceef42f4869bd695694cd69b4b974a25cf539f004cb106e3debda17fc26e1a9a6a4295992733dbd WHIRLPOOL c802e3020842b28ecfe604ca13c8f205ed98fb4c180c65a88be9001e7b73dc4facc6a716f55623da4f9c7cdc43c79d958c4c26fa89622bdabf9b3989e0c9682e
 DIST ragel-7.0.0.10.tar.gz 779503 SHA256 40562bcac66a22dbea8357a35745bbcb1ab596c262d8691145ee11aafa6f8dec SHA512 2d1d4c469d8581239ec21f128e94ab452b398903302f82ef59ce03d6fb89bc89de6441dbe53ea99d7689866f7aec485ab1ec9c537908f21eb1394650b55413ba WHIRLPOOL d99108785163de286d426d805409a23c6ac7d82ea2887e6900ab184758bad3945ccdc1a692c3577ccb084c492c2fe7e8052e45ecc622fe754f08dc8da9f85fc2
 DIST ragel-7.0.0.9.tar.gz 850078 SHA256 b9e6cac5d388398ac05d8ef15a07628f5e6de292e39f5ad92b8176379e8352f0 SHA512 87de7d41af4a08f09d422a0e58820f9b5b1218acc4733c58690feea4f872790813b5f2d7505ce147a2a6e1bcd341926c35fed7c6b55f543bdf864b119868bcde WHIRLPOOL 0ae6c3d589caf967c30d9ccc30a6801cdf55032aa7f2939dc101e6ca3ef5b3e15df4a311164128bca63f9d2e3500d601739b9296a276de3b3b58755e5db0d646
-EBUILD ragel-6.10.ebuild 960 SHA256 394133716ed34fb0a0325eb5f7efb6de42a6787f6f383fd9fee3c4f36690ea99 SHA512 d27cbfd5e4480381ced374ce402d1e45e43e13370ed34edc6e6cf922fa066e2874f61bdbea69b489b8b290d22f71539a729c1828c20c421bd414332324e30737 WHIRLPOOL b115e1ffbc2290c984a4f4c7640dea0e4eee2af8e020394564c8e690ba1adaad2bb7a797bfb75c0c53352ae80942221105a58621079630addcb4143d9c57a00a
+EBUILD ragel-6.10.ebuild 959 SHA256 08f6d29b736375d9fa61bee840913411848cc3707543e60308fbbfe94c70eb0d SHA512 388f63f4bd193a74c33ff2124a590b86fd62c9653c3905923b56a1a514a42dc47d8d7cfa272edc60502975e5da867cef4644dd5a112e110a68fbcaf452abc8fa WHIRLPOOL 79f7d41da15118fe75b8379141e44a66904d267de392ba94571d200ac2b16aafee87f0718039dda6c466b12a9858ef65af4ebdb974467f0c128c85c39ffac68f
 EBUILD ragel-6.7-r1.ebuild 1152 SHA256 e99b2083ae13a8d1a7d784b5a9cb4a6e02fa4d91a35dd5184c31d190813acc9e SHA512 46bee68ca0e22ef5f64a827af52f3dc14374920a31e2817a4430726bb2278447b0515acf1e0b77d58e3a6330e580f71c735e2170e4503734dd31186c10907822 WHIRLPOOL 92150dac5227a015f614531a3670e713167233b27067644ad98788d5d8e0fd49ae44a5ed05edfeda66f5ea0ff76f1befd3ab47903e4ca351839d3b894cd5ff31
 EBUILD ragel-6.8.ebuild 1094 SHA256 507b280002f2df0a5a5cde11713ebce68d9d2f07a9936c39efe5e9ed475e6db3 SHA512 f290a2edb43b60b52a563927343cb5f3672dcac30a598b6e95afe66858cfb33f0af5bc1d960e9b8efc05e9eea9a369045fe8dc7dc77abd596813d80f324d03ce WHIRLPOOL 77384425e2ecfbfc453a876e43387533ff7c97773bf42f6348f83f3745d7751a177f38c172ef574ec81195f4d0b1bdf7b876f7341dfc1ba4d2684df900cdfaca
 EBUILD ragel-6.9.ebuild 966 SHA256 d96f2cfa1bf988e10b3ff77cb4dfaba1dfc93d59d9351e33d8d859c7d0bd5f95 SHA512 14f09d54403f9eb38ad6a6b2640940475514a819f134102920c57700327886094aa94c723e829076540e9cef02b763c6e2204bc665f9ab80aa60f5d47ccff41a WHIRLPOOL 6ff83b36c3401f88b9d6be1a27f78bae62bf35cbe8306edde993297cd5d550bfebd90688a330087998cc8fa6ee7af059b01748a4a85cae3f626aa450b7e0d90b
diff --git a/dev-util/ragel/ragel-6.10.ebuild b/dev-util/ragel/ragel-6.10.ebuild
index 5d81ae75d5d3..0072ba228931 100644
--- a/dev-util/ragel/ragel-6.10.ebuild
+++ b/dev-util/ragel/ragel-6.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.colm.net/files/ragel/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="vim-syntax"
 
 DEPEND=""
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index f66b1d4cbbec..18bece8feb8b 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -5,7 +5,7 @@ DIST re2c-1.0.2.tar.gz 5805526 SHA256 b0919585b50095a00e55b99212a81bc67c5fab61d8
 EBUILD re2c-0.13.5-r1.ebuild 712 SHA256 58b5eefb88530dbc262d2d90a30dece27114fbe1d219167be3633c10f380bd4a SHA512 446a7fe4ff39783c7172ae3110200e896955cf36bb2fa26133a671adc6394ca4efb92f012b074e3cf2dd392d27b4ee6bfbf43a86755b4b6edebb8fe77e395f86 WHIRLPOOL 6e9b9a47ebfaf9e32c8d0c630e3d1de01be98f7c76b166470e3b3ed7a92eb36bd4c139062ee56d0e376d5114d2366517eb30c1e7f0160b0d777dc3204b7ab5b0
 EBUILD re2c-0.16.ebuild 755 SHA256 647b7d33c4a11670844122e5df9ab5db53f2634320381fef1468f648158b16e9 SHA512 8bd63d72cb9bd092ce626def2946ee5167d98c91ced9497f8fa895115c868fb199b2afe4173fd0f5fa14f0aacd763170f72817e4cf2444a2bebbccf307a45653 WHIRLPOOL 4a12c146f133f78320149cd526760e6fb0e3ffdfc4a6f169c3ec4dc937eb4e6af4ed6ae509f63e83a159006b1c46ba7adfbed2c979859b1e3b2ef2b3c3ef5675
 EBUILD re2c-1.0.1.ebuild 763 SHA256 468a6c6013746d15bbea5cd27690acf41e85b0ad0196f0f149c9c9724ed93f71 SHA512 ded3ef724bc5624a00994a80739483e7a21278bb45f7d54001e060b71d591c44cca59e7202e1af5f36ec84b39003c97f7f9161d735a8ba67925d29bdb65253a7 WHIRLPOOL b134ac2e4739c1f460786a5d4f4cce1c1958cec72a226bc0d355a41aee32abdb90d097241643c3a3ef70cb6466a75aeae6fc88c87bda7e0bc6c526084585bbaa
-EBUILD re2c-1.0.2.ebuild 763 SHA256 468a6c6013746d15bbea5cd27690acf41e85b0ad0196f0f149c9c9724ed93f71 SHA512 ded3ef724bc5624a00994a80739483e7a21278bb45f7d54001e060b71d591c44cca59e7202e1af5f36ec84b39003c97f7f9161d735a8ba67925d29bdb65253a7 WHIRLPOOL b134ac2e4739c1f460786a5d4f4cce1c1958cec72a226bc0d355a41aee32abdb90d097241643c3a3ef70cb6466a75aeae6fc88c87bda7e0bc6c526084585bbaa
+EBUILD re2c-1.0.2.ebuild 769 SHA256 07624245d78053cbab05efbc168eaabd12b32147ea68b7bb13b2d5aec91908cc SHA512 2845c30b034de806ec2339ad15e9a966349006db475d614c0399988cc1f6fee866f37e6d5c671d73414c11a14c28b7e56645b8cdebf1f785f47c15c5ca225d86 WHIRLPOOL 022e690c0731257a3abf56e226eba2525bc262b287bb1b0774445ad71c798844c33bb5d1884b9497839723cf43e508c8d3b9ae95a2b7dbab968ebe367dea37da
 MISC ChangeLog 4634 SHA256 9720b96cb59c7a752579116a5722cb5c078ff090ce339847b533ae35f43facf6 SHA512 db2448c60fe672933c2f848d2146af8fe6db82fa318da52f940fc6eb6fc6e57dd5327b95a95d6138d536f490862471050829d5d39baa07450b9b8e69be0b69a9 WHIRLPOOL 58ee96416a2079052ddf3a8fa962c9f68afa4a0e9a94a74b2c2360b553ebb0520ffb0a404761d52f91050a2f73c08505ee2fbf09d03fc43dfd81fa17bf57872b
 MISC ChangeLog-2015 11944 SHA256 83231e58dc4d3c7ca92d55dceb7a7b62e997299156a828be942176ad30cb904d SHA512 a8c6ab17ba21b7c6b8e3a6e99c88f8e74edbe223efe323d4af025a4f54ae6dd9108308328939e268168685e80a4d76fe6fe86d13908f2b0dc935d031bf7c76f7 WHIRLPOOL 8f1fed9dfc047924eab55b3bae15e8a74eb46dab0ac03e433cf4bbb93a93376b4f6f946c20c3a20f44ef601c6819e1f0b83b70761daf04df2290f64c2c0ee5ff
 MISC metadata.xml 423 SHA256 405af3772ed2ee867686c5c204eb602475dee4f0b8ef16dd31888c813b28cde1 SHA512 997590e1de3136f7f87181746d9dccfd8c34a12e570d15a29a8abd4b4163bfa98405d928e932255c962d4af79e9913de563453891155590bff309d764c2b5bd9 WHIRLPOOL 8105f64cb55da72e78651ed400e537ae31e5b1980a1fbfa9de4760a78de11295da1d56027c33d90a695e8f7a07f4d4211ec60d3d1ac6cacf24a36169557295d3
diff --git a/dev-util/re2c/re2c-1.0.2.ebuild b/dev-util/re2c/re2c-1.0.2.ebuild
index f81eb657511c..bce28d1d0814 100644
--- a/dev-util/re2c/re2c-1.0.2.ebuild
+++ b/dev-util/re2c/re2c-1.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 
 src_prepare() {
 	default
diff --git a/dev-util/rr/Manifest b/dev-util/rr/Manifest
index d3ddffc3e3f4..2ac6fd320fa1 100644
--- a/dev-util/rr/Manifest
+++ b/dev-util/rr/Manifest
@@ -1,4 +1,6 @@
 AUX rr-4.5.0-sysmacros.patch 788 SHA256 131be30c9cc07ba73c615b75e62580b6270e594070052bf4ac7d26ac2aff3f17 SHA512 57c802d02ba6d8e9295300fcc0156670a3fc9b35dbd05d594eff95481eaa746d7715d9b493190c94833cb331e45cda71f5574b0fa5aed06991b1d80fd4f9bae6 WHIRLPOOL 528ce6fb414ae327a320df7b3de6142c51a85c78128fb60a407a7c3d3671388dd82f0f5c6c14e4ab92b4a5004e41e0114b6933f5b35615d54b0e230859bc20dd
 DIST mozilla-rr-4.5.0.tar.gz 683371 SHA256 19f28259c0aa562c9518ae51207377fa93071a7dc270a0738d8d39e45ae2b1c0 SHA512 8e9b7c6eaa9908e75853b5e19f61954b57e6e5afa7a8b6fe55f31aee36bab6ff315b5c3511d14c93dca5da19055a7879b6f3b9f51c349b1bb9acea130187a5e6 WHIRLPOOL d16e36da11d3ed0c0c4f8509abe890842fc95127a899e98800db93d407080ea796d1e8fd8545f17d84540a553f848b3985c9c139479d1a76fa31e418ad700e33
+DIST mozilla-rr-5.0.0.tar.gz 1143119 SHA256 95ab26671f39ffe58ed00a1bd3e211781804b010d73339d6ce7a4b1d0a6815ca SHA512 aaec0869e68290d5f7b752d02e89fc4f83dd2fce4abf91b36c006eeec97555b7adc69da311eadd48c9891599245305b585ed1a53580f7c616dba401f1592c5f2 WHIRLPOOL 5badd90ae0c602246706f613bf6c67f144046b13ccf53d7a18456afebeb34e6a318b0dcff85e9f250a9def8ee682e9c27f538aa7c345179a22bcecc577f74252
 EBUILD rr-4.5.0.ebuild 1073 SHA256 731063d2afb3e09469e2e7ed5adf401d6e4093dfdcef2074d126479daaee9bfe SHA512 45174284c9f7c0c1c297629a028a8b83fee93972ee94d111b0c681922df208530849a20884663f511df38f7113b61ce2e4fc3404116102a3a6aa0945afab3c57 WHIRLPOOL 4d5d45abf5fdfc543a8ecd6593228fe68a8745884c4c157a9b4c3c366b84e9aa61d44e6b6ff12aa8013fcdfb79b7f4efdeb7cf04fc952b30c24d5e4e573575e6
+EBUILD rr-5.0.0.ebuild 1091 SHA256 731d08024ca78c8ec26f6a8e5378504c045c1eb6bcd1e4af72bea9275b25a618 SHA512 1d357dda47fb5b2d41fac2aa7e03a2d37ac480eea41df316221d4982f70ba864ebe5b03578eaebda2207c1fb91e5523f4c991174ffd5fe3fd1f20d8830a4b9d5 WHIRLPOOL b875e7f9213fa29987a92f85da7d4bb42aa68460b388a9a764db9643051a748970d6ae0732e868b5b78051603b0344ccf9a616b7c8e6ca11d3c30bc3f1bc505d
 MISC metadata.xml 555 SHA256 e5fa28c09a12a5b011c7e60caadd9436cbd2b8a139ff7db98977a0b385231c7e SHA512 33487b0389d097115365ef82c85accedf17d798e312e9528fae27519f242c343fa280d32bff05c6f1a1620d6481df1db57fc4c1e2fa7ce36dbe56f998f03870a WHIRLPOOL 7a0d6df2c68791c2849a709ba64cfabcd4b5707fe01a2a7d552122ed3b66b863fc9f4040668b133ce9906f210eed9521d0b7d033dce6c2296e2e2280269dc5ab
diff --git a/dev-util/rr/rr-5.0.0.ebuild b/dev-util/rr/rr-5.0.0.ebuild
new file mode 100644
index 000000000000..e2903c93af11
--- /dev/null
+++ b/dev-util/rr/rr-5.0.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+CMAKE_BUILD_TYPE=Release
+
+inherit cmake-utils linux-info python-single-r1
+
+DESCRIPTION="Record and Replay Framework"
+HOMEPAGE="http://rr-project.org/"
+SRC_URI="https://github.com/mozilla/${PN}/archive/${PV}.tar.gz -> mozilla-${P}.tar.gz"
+
+LICENSE="MIT BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	sys-libs/zlib
+	dev-libs/capnproto
+	${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	sys-devel/gdb[xml]"
+# Add all the deps needed only at build/test time.
+DEPEND+="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		sys-devel/gdb[xml]
+	)"
+
+#PATCHES=(
+#	"${FILESDIR}"/${P}-sysmacros.patch
+#)
+
+pkg_setup() {
+	if use kernel_linux; then
+		CONFIG_CHECK="SECCOMP"
+		linux-info_pkg_setup
+	fi
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i 's:-Werror::' CMakeLists.txt || die #609192
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-util/source-highlight/Manifest b/dev-util/source-highlight/Manifest
index f8191a1913a3..57be599f2857 100644
--- a/dev-util/source-highlight/Manifest
+++ b/dev-util/source-highlight/Manifest
@@ -1,7 +1,7 @@
 DIST source-highlight-3.1.7.tar.gz 1600692 SHA256 e1b2e007cdd94595393d42510e2a84763c36aad3409f0c3087f05fcb50a389e8 SHA512 4a1e733bd06468e6ebd023dfe4a62d7134c35aac311509a61e8d80de35ff3cea25fb79adb56bfe413ee214bbf4d578b4d4ebdcf1236481d9b83152aff6d7afb8 WHIRLPOOL 3d99a135abef73e865d2729bcbdf47fc7c143aeef91015b73a87d4a129323ca95aac153c3fa7d5207afb2a03ecba2f05db3e3ed8627b1e0477dcd9dfa830bbb7
 DIST source-highlight-3.1.8.tar.gz 1648351 SHA256 01336a7ea1d1ccc374201f7b81ffa94d0aecb33afc7d6903ebf9fbf33a55ada3 SHA512 00a49ab180460750614b38be9a569478d1d34d01f601ebc7452a4fee8475a19faf9bb9fb2f256c6b40d43fbc3d34962a77ba8b9833483345c4e4a42faad6976c WHIRLPOOL a05c3028816d0e0f0236ed18b806ce7f9f8f82be61b142774fe2156543c577bfcd5fb49bb259f03b4e97d5c01b5292e3b82720e29ccafa3a6bd7661f353ade5d
 EBUILD source-highlight-3.1.7-r2.ebuild 1156 SHA256 9f000c1eaa884515fbd7ef9cac72de9eb5ecd38eaec5984d97c763d50e43d49f SHA512 362e3904871945ffee6096e708ee85ae0e7edb749e1755abd260e8e2ca63587d312c4ed271ae61549b55391bcee543a110eb140eb2614ec754c8d9b053b06075 WHIRLPOOL bc3e156e85e3d6c3b0c0461da5419877a6a962a05da6749143250a2036b02fae1e46a9280efbc7e5107a99a5de55a38382cb401dc3a22364a34bbaebd036ac47
-EBUILD source-highlight-3.1.8.ebuild 1272 SHA256 d649108334adc9f217929f387169c0d1396cf06966b636ff4e273af8c54953cd SHA512 69fa0fced04d0288e56bbbb1f7cba67437e57548ac103a0656a7c1e19cc0c4db6a0cc42df522db3ee0dc7933b1463711ac6b475a4a9bca9a7b5a40c11ad90edd WHIRLPOOL a4f375f603e459634bf5b9bbc463639c0f58e137cb9e304ad48d39558d37237835078f189d1d214e24bc8ead9c8f6fb79bfacd81a5330648f38ee580730fbd9d
+EBUILD source-highlight-3.1.8.ebuild 1268 SHA256 5c7b8e75bdd4a4626df43c8e995c919be8802e7433ca923004c2eac56d150a14 SHA512 049f41976f75f59d75f72285cca8c78075820936662f9e381203693e7bf3f8572a26dc0100f2a5ce392407912a4e087095a5ec996156d769dc3e3ba476edbff9 WHIRLPOOL 4391c97baed8742cf6c8b55fa74d2dd85afa9af5f3ee3fa377dc8583e918a100dc1432377a63dafca3605878d0e7f79e489a81f4073ab5bb581ecbe41b48d320
 MISC ChangeLog 2658 SHA256 3ce8341779514bdbd2b350655d0806e56a921b10790c3c1096da9dedcbd05f21 SHA512 fe132fdbb7b7f1dcd3cf6077a0ac1cd03736acd0d5c1beb52861d1aa12de34fbc60fb2e8c3c55d72887b3d86c42170576a8bf0bf0cbaf6e9ca9570f3d99bb559 WHIRLPOOL 110a8acc4f7f162d557464d9288411178b5a67b4960ea41906121aa72bd105447ad40795929adea99ceac6695c497a1a5f7f49d5d61327aabb6c2a1555f45ee7
 MISC ChangeLog-2015 11116 SHA256 a0c4f9c8ad1fd05e3457f5625bd43b3adf5ddd2b35ef60d79c0ae5c9fc334bc1 SHA512 3ee6493d2a3d58a8e59bcc0760c1b8489e66cee03471d03b626bf322a4f9e184f6a725cac64a43c7e49dfb3ad3acfe9fe8f8bb6c207465e9290411e9923cba8b WHIRLPOOL 69b51e97b6eb22a9453649ba283dadbfb0ab585bda0b91076dc7b51a5ca54cde3a05e1a687f38951edd1193a8c726b43134323f6f29a0511611d56cf4f1f6361
 MISC metadata.xml 250 SHA256 e950c68e7a4e72f8096556d6bb21fea300438999061af252e040672516b06351 SHA512 a57d332a86b16f67fe2896c47c6cc9ba57f602b65943080289c816a9d0f70b779f61cde882034cc1c2adda79208865dae0bf43d95deea4556e840b785e062343 WHIRLPOOL 7804a583de98e5ebb9478b76dd2a78071f8fe6973d88692ae4ec9107dd1dd7c54fd11baf66339a9ad4267da708ffaae3d8b1d0bf332db2d5db9feac46b6856f1
diff --git a/dev-util/source-highlight/source-highlight-3.1.8.ebuild b/dev-util/source-highlight/source-highlight-3.1.8.ebuild
index 65abc1ce0bd3..321087b5ae3c 100644
--- a/dev-util/source-highlight/source-highlight-3.1.8.ebuild
+++ b/dev-util/source-highlight/source-highlight-3.1.8.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Generate highlighted source code as an (x)html document"
 HOMEPAGE="https://www.gnu.org/software/src-highlite/source-highlight.html"
 SRC_URI="mirror://gnu/src-highlite/${P}.tar.gz"
 LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 SLOT="0"
 IUSE="doc static-libs"
 
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 9a12ad6642a8..3eee35d0f877 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -3,7 +3,7 @@ AUX valgrind-3.7.0-respect-flags.patch 360 SHA256 6b1e5938ecafc29428a698296423c7
 DIST valgrind-3.12.0.tar.bz2 12788556 SHA256 67ca4395b2527247780f36148b084f5743a68ab0c850cb43e4a5b4b012cf76a1 SHA512 2c083f7c2e74dc58600397726d9d3af7a2cea40fe3d8733149886d1d77867e6c09996e5be1c58dd932f3662acf7363e04eeadbc0f9c8f0dac089e605024229be WHIRLPOOL 136dd4f358bd18165a5801083cc73fc269a84bf491880af9842e789feea62181e16ca4c099db06fb4ffacf0cb0189b1b29d64790cc4202442f6f6b71ce4c6eea
 DIST valgrind-3.13.0.tar.bz2 14723076 SHA256 d76680ef03f00cd5e970bbdcd4e57fb1f6df7d2e2c071635ef2be74790190c3b SHA512 34e1013cd3815d30a459b86220e871bb0a6209cc9e87af968f347083693779f022e986f211bdf1a5184ad7370cde12ff2cfca8099967ff94732970bd04a97009 WHIRLPOOL 5ec5c371f8fb22813b895eaa3ee1dbb3c32bb998ad4b646d4b252a694d9b40a1543234cb7208445d8ca557e779ce30e9d0503a36bb9e4240a245c5d5d802c8a4
 EBUILD valgrind-3.12.0.ebuild 2854 SHA256 c17d95bcad897f39d8babda49f57d722b055e8c0e147599a36098294b82e51f5 SHA512 a65f3ccca3a33e2bbae7d2616b2fa13a6a3913e927f601f8ef52172981f72c03219ccad126a801719688cb6106dea18c56ac0e14de194e065bffa744151ab457 WHIRLPOOL f83bad7363f3d5aa898be4c67a061ac6ffd2fc339deb845f14d8fd1578449082dfe95c35eada5f1b9bfe6149ed0bc609948f23bc6a78a35d3176f3e3079264c5
-EBUILD valgrind-3.13.0.ebuild 2859 SHA256 61b972077fae385f286a62adbd71fd4edf6c9778549c64b64bdc407a802f534a SHA512 127cf5c6216e5de83041f80a141b33c963a11772f3965b23e2d7573c5d0d8f14474bbba59ac455cc265a36071ad74ea091f275b0901bcd08ff3d750bfd5c22b7 WHIRLPOOL 09bbaef4f4b087567d8611a520d3f187bbc0a0f02d0866f91c053f12a1c8e578d7781637b73f7b3ec51eeed4c61f56986f5ffc7bbab3e5db518c93973f0e9cc4
+EBUILD valgrind-3.13.0.ebuild 2856 SHA256 6673a4b62a0ed9cd36f8782f0266c832d15c3c623bd6ed1ec6655f1b11db5122 SHA512 725a27538443da5ff6ffe23ba58ea42d6b0d9d13cbd5690f61bb4470f25e95ac4551b50bf6deaf0624b3dff6db7354ad170e7fd1a4cf2e0650924bb6073941e9 WHIRLPOOL 6d2029884b01f4ab1d2ddb12a3ed4aa1ae1e53c9da4dce0b4919fefe34554b358669ae78b1301ff3a339aa4a425eefa8c8ba7218c27f80e75c5ad4be26ed90b2
 EBUILD valgrind-9999.ebuild 3117 SHA256 1f5a7ed3874d2094f3c2547dc7791923b27b99f97cc6e22976a1c298b1e8add3 SHA512 8fcb9250a1a602463dfe112d0340bcc6a565beb33979172c2f2cbbdd499e744aa05b9a17c0164ea6f57e3720cc582b831a061e0a75984b0007b10f18dbdf873d WHIRLPOOL 03d5403ee5e23aceb342000fb7e48c5bb71c3d0614edc940f50a3731d3fc2b1872d1f5a9856a4c4212c705ffb9cd9ff8ff000b6b6d03ff57db5ba1fb41e8daaa
 MISC ChangeLog 4905 SHA256 6426fca52173c69a094830fafb3cc1ee4cf198d1cabebb50e02a42290d3dfab9 SHA512 4c6bdfadb501d88387fd4564f264cecb2ce6cc2cd61966e06e9d7f56d110639df6c4b5715cb3c2855351a6e522989b832dd9a28aa80f575e6da982fe434cbef8 WHIRLPOOL 338a907450140519669ff650ab9eea29b8e3bd94cc95515fddf68e981f4d507f6b056a30f587e7d672a81bf1b8f64a4c6d5f29387bfbcf4f0a30bb1701334aab
 MISC ChangeLog-2015 31180 SHA256 da9c64ccba59ab236081a2a3d00f790a3e29799219594aec17df572dd85c4277 SHA512 d9bd1206b5272037af312a6037771cdab9afb806836a669f2958f1924a9c844681e86925d28123f9174f02f2ac72b62b5c564108d6cc4c41f19c4277a7135bd3 WHIRLPOOL 2e2a8f121c363ca32dedcfb3a646494d3d9f974eaaaece550b01b50262981d9b1a8d09c69e2b02d3f7ee7a198079f42a65d3a47454903a59be951e7c85368522
diff --git a/dev-util/valgrind/valgrind-3.13.0.ebuild b/dev-util/valgrind/valgrind-3.13.0.ebuild
index 5f802dc656d8..f4d80dc38c7e 100644
--- a/dev-util/valgrind/valgrind-3.13.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.13.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="mpi"
 
 DEPEND="mpi? ( virtual/mpi )"
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 85e622deea5f..32c21d71213d 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -14,18 +14,22 @@ AUX git-daemon_at-r1.service 340 SHA256 980b2b2234fc672065286244cd4e690c92865d39
 DIST git-2.13.5.tar.xz 4756436 SHA256 21c9e29caac86d244ac7af78bc3422746dabb903cb3952a1ceefd801020ad1a1 SHA512 4a0b55d19f15cf0ca388d43b650c1ccadbc32964925e5d0a3107ae84c38506af957335ceb0cbb5468ffbe0f5283f8e188aa51c9e915b3249126eb37c304be9ec WHIRLPOOL 7a3c9971f37de366801be6a6d1d28a1d02b2f3fe98a508465c01d600913efd0ae4d241fb690686beb2ae9b0321ba4f7eb5b313ec47fb04eb7d0e0e51170c6750
 DIST git-2.13.6.tar.xz 4756820 SHA256 bce97e403bea34f50378e90ade10c12666b2382cc247551b63dc5604e03b2523 SHA512 ed39784205e1077f886eebdfb34a205fb0433071de29f673a79ea32bca31a2ba9bdabba208c9679ea2f6f295bafad52a7e7852b5bd2ccb1e6c99a1d2e76e8ada WHIRLPOOL aeadb595a3fc9b74b143478436f4511d15735e5e01bbaf84bc60ef6c3bb91d94aa29ea1bd700a08d3aea3341de4cee5c4d5ced0b550a223faaadd37774cd3492
 DIST git-2.14.2.tar.xz 4800208 SHA256 50e9723996114ad1eec4dda89960d9fe34461749ae42031008a261fedd03c7a1 SHA512 fe99486e0aef8d73dace3081bbd62bc6d08bc13868b98c905f7833458fdfc464eea504ae2961f4a2f38892cb0e76b533a50a2cacdf07c9ad9f8106e7ac1c353c WHIRLPOOL af0d166fc00aea8a4a77984e8bf92f6fb3abc854263316961683e5e27c8adbe1d73a3384b4d14c2ce762d75fd95f67da9a95a3fd3eca4d6747eb1850ab7b084e
+DIST git-2.14.3.tar.xz 4802252 SHA256 5330960dd52467f6e5bf1931b9fd42b76d3f8ce9bc75150b54ecfb57d407151d SHA512 e32e9ff904cbc2a77d78ca08953e3b69ac527c333a898dd053806e3d7e684ad4ae153ae7663b7ff9c16e2414c3189878a2e6c95fe9320b4af6cb1e7fa5102643 WHIRLPOOL 2ea153e7e32653a86d166c151c2dde5b1e3e1220cfead1ad771ae183aa0f73f04c77f51811f8a0f005f4c3590a288dcd98be8211dfcb989ef7d29328185f1de9
 DIST git-2.15.0.rc2.tar.xz 4838680 SHA256 df624082e8e26ea94a6794da7a14861ff3724d98f1368ebbf85520741083f895 SHA512 7a9415ecac4a0ee5f7058efaec5e72f857fd4972ebcedfb04924e431a2d093ee146a16e88fe053990367488ed550b8f7d9fa7db03819a2dc39bc0a6b013171a0 WHIRLPOOL 4bc4f74d28306ccb60a3ab60d6f0daa3a1a4897e054589fb7c374f53269ab4b3e62cd386368a91a5736632183a09d69878350aa0f18c76e41b74c7c89aeaf63e
 DIST git-htmldocs-2.13.5.tar.xz 1110236 SHA256 f5f10d821544446547dc91798772f36d7515a824c9a28f22521f0094e1a4dc08 SHA512 0ba006ddc35325052be4d969a3a966ec1be7954dcc1676b9914953720e56f3c9a4522541d964c6ff08a921c35f983213eacd00b99db5d97b97ea8f5c1181ed73 WHIRLPOOL 020963c8544dba6acc4b0e681a844b6a9f332b3b3469c056d678791afacab54f4badd956137b21d3a5d2ea465a83f05d815a2c066f71fade41a58e8f802088bd
 DIST git-htmldocs-2.13.6.tar.xz 1110668 SHA256 cdc39ecc8d1ce09f7b865832ebbc466441beb61d1aad4c7796514520220dabf0 SHA512 9eb26f04836620bf4486d3bb2a170ab2b0af319f7f53e2677f4c1445767f5c3521cfdbb274dcc4df2bfd2fc5bf0ca18c6a4a9ca0b9f957c53f66e530684af6cc WHIRLPOOL 126d8ae25c71dc4e6a6eb20ba611cd2eaf94ea8f4f89fde82b2d05044e93f425d9812559db5599b557a1a8f5832cc41d0651b421d265219c257351fe7fb41f2b
 DIST git-htmldocs-2.14.2.tar.xz 1115940 SHA256 a36661e81e5b21e788cd84e11860bcd0cafa402eff06e6371415a5a0e0b80dfb SHA512 c5dda319713a98b9f655a04fbb4dfcba4cc60fe22586bae73a88111d96cd8da989060b8450549a32a5c5bf5bc8ce735e73055ce72b8bf5d3b4fcec2040fa196b WHIRLPOOL 1b47b798ae00f29e84862b973f4e284076eba84992f52b92903b56d50f0a463aac011fdcb3ea0b4859d2cf8661eb24c5faf4569ed22de952e293df95ca9a0438
+DIST git-htmldocs-2.14.3.tar.xz 1116824 SHA256 9d28b922ad861bf747ca34a4f083efa3ce41ca39cccb0dfab8bdcf0b58694ccb SHA512 a73160724f944832f915ff29c557e2a968d6c5ae5c4e9759d96444af8841e52a1193d50a74f01deb1ec5ef03b3301897bd85c5ebb82ac22d8188d528629d74d4 WHIRLPOOL 748cf71a16871cb91e84f7fdd4a2f6beeaf05d514a7e6ea34d02256a8196d0f9814db252c98d6178643ae183f31813cadf9b7056b61ab4478c157e2236cc71bd
 DIST git-htmldocs-2.15.0.rc2.tar.xz 1132916 SHA256 4b5b38eb028356cda303add5d6132b94b744c2b7d4aadd7fe99ee2b6bf24e964 SHA512 5ad647e9db64f3f048560d032ca6bf712b45c64ba87a8443462e392c11bb23d28d094139edac800608202320de0d62944c421b5bedf727aefc78ff3823999626 WHIRLPOOL fb441afed5d1d5bb8432d733febe26d972e334433b35d68c57ce63a773f4b5e189a975ce634a83d7f1405d93d03dfb0e2aaa24b9552dc8ef5c13ec712f930f2d
 DIST git-manpages-2.13.5.tar.xz 407640 SHA256 1dde688dda9162605ae27e4ad1b55c65c056b3e7cd70972b7e1d6bd2b743394d SHA512 42637b264b4a1a73defe22f314cb8ca0bc171fd722252cd926a9fd74a8f89d129da0648ed85b72f44948795c6ae1f33f4f141f11b07688533c8654be0983fbc0 WHIRLPOOL 9b4a3440c4d1da7089d020e146de7401502cdbae0d82a0052f665cfab84d48de5aa5602d78b8d2f29507e280a16ab4bc2ea4a753fc948a7102eef0240ab3ab2d
 DIST git-manpages-2.13.6.tar.xz 407660 SHA256 9c92ed09c3343c770a1afd9dbb1192b00ebb1b3d3e25e21a2dcb1a4e9a494d1d SHA512 b24a96053e348e1d2ebf5c66d968074bc73471f07ac3a680d8b16fd211b69b5fdfad6a087473edf9941ad08493e4d7ff0a916b85ce40ebe19b3e3dad6a4baf5f WHIRLPOOL f25b4b20462806a722067aecb7aa0526f00536630c8f71bd7be1ecc0ff4fec07db2fa79d69d911f3e1a2eaca9fe73ad76e76e7ef7afbb83698db42a540e4cfef
 DIST git-manpages-2.14.2.tar.xz 411160 SHA256 6dd350d1e9d00159a549f0fad08a9f954b1d12576fc8d5865fbed9dee15105fc SHA512 64f9e22ed98cde1dec9afb719c2f7254d5da1eceab2e7d3291d37792fa1b9fc83633ac42a4f47961a6721b325d58818e67ffb14085d5e8f9bed1b691f22d79d7 WHIRLPOOL 902889bed82289773c029ac7c9625f4972559e0365cc04dfb661ae14fd7e1757d3820d75b3591d72dded98107ad7a1e2e31590452699858ca3a94fcc375ac0eb
+DIST git-manpages-2.14.3.tar.xz 411324 SHA256 5b0e3d93bafd539046b67778db0b5d627fe08ee5ef1be8b5b924517ed141b001 SHA512 3e1215bdc28df84fd26ba40f6aedfa9f2140c170af48148b1b89d28e8b411686376715920f86d9db9aa18f4a3f4e8f68082da7632febbcbc7fc956f32807da50 WHIRLPOOL 8f7ef94204fc0658b65228af5bb96077f78e92e37054627d83f817690476a6983abdb551222f9400e55d35201c07d0993eaedb262d41db44839d5a2fa30b19a8
 DIST git-manpages-2.15.0.rc2.tar.xz 412668 SHA256 5fff26704ef20de480a5dbfed1ff102c8e66c6d2dddbcedb62780e1dffdeeafc SHA512 ef0a2ce093789b1c1fd64739ed6206a2c3ae99405dfbaa0c1ea4c15b6236c89a8a13ed92e6ede87749d260f9194b6c5306dbe9fd4a7c70b32a5e10efaf9db35e WHIRLPOOL 2a5d352332f050c127ff9691918737058e8340ab3418a3754025325c3ebe0de0af110ddf5e90bcb3cbce4b76d0dcfb1d65b65345f6a0bc7b383a7429dabda646
 EBUILD git-2.13.5.ebuild 19016 SHA256 60f7549d88e55d94f090293c78c841565b8a11f8db61526abbd2c4de650dbac2 SHA512 4741a465efa6fbdc86775abc4088a9512971658988154a5da2f410e1e243b6f6a1e7c5bece23582f3a47e1ddd587685ebfc32c7b00c8ff325d2e92996e4d840d WHIRLPOOL 1372327523438351e0368978141e4c80d7ab3f0d3f816d9c2b749287caccab69870dd26db28b75f5244b69012fc0951b7894c442d5aae006167435511e5890c9
-EBUILD git-2.13.6.ebuild 19018 SHA256 128e50a563fdadb04bf66fce8f1aa0e3e9e9c37f5493d445459a06a39085a048 SHA512 6e6e3e18ee9c3fb0d6261f3ff827cf0b11a79df439ddcff2cd9a2b5f90d6a4b280324d6e06b42fb1c3f4bdc3fe9269f9b07e7473a03cf0043917cd7d103cfb29 WHIRLPOOL 0b001716179dae7511bced83791ec6a505c205cb7580acbaa854a496c18ac9a81d689849c7dc9895f4c75a29492f703e333ff23fc4dde015d1b14e6cc55c0be5
+EBUILD git-2.13.6.ebuild 19017 SHA256 90faea6324b13c672ce8a20a008eabc4f85d75c54310c176795ace5914f9cb75 SHA512 8826726b04a7bb1abc2ac220a7fd1f8d7af5cfe1a372dbf655f4c50bae839eec547d06c034a1f91ec28fd0eeaadebfc2e515878999ef82c55338a071b9128ff8 WHIRLPOOL eb44b9e14d517aab311837e5647b4bf6715c90043cdeb8796bc021baa118466556ad7bf5c5b47629938157b3d0b9b9833aabe93bc985d9335d3097d5844ce39d
 EBUILD git-2.14.2.ebuild 19492 SHA256 7ffc88887aa46a21a50af75c177e551ef40ffbb1b12b651a9c0c3111d9f3fc6c SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8 WHIRLPOOL 332d2dbb55610ca410fd04e2fc595e1e65fc6edd95d9a412d7dad14b266707d2c0e760b2d5aa54fb7dd7d1f0b2d21d19b561d5060418037f1de24c53b32ad52b
+EBUILD git-2.14.3.ebuild 19492 SHA256 7ffc88887aa46a21a50af75c177e551ef40ffbb1b12b651a9c0c3111d9f3fc6c SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8 WHIRLPOOL 332d2dbb55610ca410fd04e2fc595e1e65fc6edd95d9a412d7dad14b266707d2c0e760b2d5aa54fb7dd7d1f0b2d21d19b561d5060418037f1de24c53b32ad52b
 EBUILD git-2.15.0_rc2.ebuild 19492 SHA256 7ffc88887aa46a21a50af75c177e551ef40ffbb1b12b651a9c0c3111d9f3fc6c SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8 WHIRLPOOL 332d2dbb55610ca410fd04e2fc595e1e65fc6edd95d9a412d7dad14b266707d2c0e760b2d5aa54fb7dd7d1f0b2d21d19b561d5060418037f1de24c53b32ad52b
 EBUILD git-9999-r1.ebuild 19492 SHA256 7ffc88887aa46a21a50af75c177e551ef40ffbb1b12b651a9c0c3111d9f3fc6c SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8 WHIRLPOOL 332d2dbb55610ca410fd04e2fc595e1e65fc6edd95d9a412d7dad14b266707d2c0e760b2d5aa54fb7dd7d1f0b2d21d19b561d5060418037f1de24c53b32ad52b
 EBUILD git-9999-r2.ebuild 19492 SHA256 7ffc88887aa46a21a50af75c177e551ef40ffbb1b12b651a9c0c3111d9f3fc6c SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8 WHIRLPOOL 332d2dbb55610ca410fd04e2fc595e1e65fc6edd95d9a412d7dad14b266707d2c0e760b2d5aa54fb7dd7d1f0b2d21d19b561d5060418037f1de24c53b32ad52b
diff --git a/dev-vcs/git/git-2.13.6.ebuild b/dev-vcs/git/git-2.13.6.ebuild
index e62c88708f4d..08867dbc8c34 100644
--- a/dev-vcs/git/git-2.13.6.ebuild
+++ b/dev-vcs/git/git-2.13.6.ebuild
@@ -38,7 +38,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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-2.14.3.ebuild b/dev-vcs/git/git-2.14.3.ebuild
new file mode 100644
index 000000000000..d079a65a75eb
--- /dev/null
+++ b/dev-vcs/git/git-2.14.3.ebuild
@@ -0,0 +1,699 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python2_7 )
+PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
+if [[ ${PV} == *9999 ]]; then
+	SCM="git-r3"
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+	# See https://git-scm.com/docs/gitworkflows#_graduation
+	# In order of stability:
+	# 9999-r0: maint
+	# 9999-r1: master
+	# 9999-r2: next
+	# 9999-r3: pu
+	case "${PVR}" in
+		9999) EGIT_BRANCH=maint ;;
+		9999-r1) EGIT_BRANCH=master ;;
+		9999-r2) EGIT_BRANCH=next;;
+		9999-r3) EGIT_BRANCH=pu ;;
+	esac
+fi
+
+inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
+HOMEPAGE="http://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="xz"
+	SRC_URI_KORG="mirror://kernel/software/scm/git"
+	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
+	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+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"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	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 )
+"
+
+RDEPEND="${CDEPEND}
+	gpg? ( app-crypt/gnupg )
+	mediawiki? (
+		dev-perl/DateTime-Format-ISO8601
+		dev-perl/HTML-Tree
+		dev-perl/MediaWiki-API
+	)
+	perl? ( dev-perl/Error
+			dev-perl/Net-SMTP-SSL
+			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 )
+			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+			)
+	python? ( ${PYTHON_DEPS} )
+"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		sys-apps/texinfo
+		app-text/xmlto
+	)
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/asciidoc"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	mediawiki-experimental? ( mediawiki )
+	subversion? ( perl )
+	webdav? ( curl )
+	pcre-jit? ( pcre )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+PATCHES=(
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	"${FILESDIR}"/git-2.12.0-optional-cvs.patch
+
+	# install mediawiki perl modules also in vendor_dir
+	# hack, needs better upstream solution
+	"${FILESDIR}"/git-1.8.5-mw-vendor.patch
+
+	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
+
+	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
+	"${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
+)
+
+pkg_setup() {
+	if use subversion && has_version "dev-vcs/subversion[dso]"; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+	if use python ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local myopts
+
+	if use blksha1 ; then
+		myopts+=" BLK_SHA1=YesPlease"
+	elif use ppcsha1 ; then
+		myopts+=" PPC_SHA1=YesPlease"
+	fi
+
+	if use curl ; then
+		use webdav || myopts+=" NO_EXPAT=YesPlease"
+	else
+		myopts+=" NO_CURL=YesPlease"
+	fi
+
+	# broken assumptions, because of static build system ...
+	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+	myopts+=" INSTALL=install TAR=tar"
+	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
+	myopts+=" SANE_TOOL_PATH="
+	myopts+=" OLD_ICONV="
+	myopts+=" NO_EXTERNAL_GREP="
+
+	# For svn-fe
+	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+	use iconv \
+		|| myopts+=" NO_ICONV=YesPlease"
+	use nls \
+		|| myopts+=" NO_GETTEXT=YesPlease"
+	use tk \
+		|| myopts+=" NO_TCLTK=YesPlease"
+	if use pcre; then
+		if use pcre-jit; then
+			myopts+=" USE_LIBPCRE2=YesPlease"
+			extlibs+=" -lpcre2-8"
+		else
+			myopts+=" USE_LIBPCRE1=YesPlease"
+			myopts+=" NO_LIBPCRE1_JIT=YesPlease"
+			extlibs+=" -lpcre"
+		fi
+	fi
+	use perl \
+		&& myopts+=" INSTALLDIRS=vendor" \
+		|| myopts+=" NO_PERL=YesPlease"
+	use python \
+		|| myopts+=" NO_PYTHON=YesPlease"
+	use subversion \
+		|| myopts+=" NO_SVN_TESTS=YesPlease"
+	use threads \
+		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
+		|| myopts+=" NO_PTHREADS=YesPlease"
+	use cvs \
+		|| myopts+=" NO_CVS=YesPlease"
+	use elibc_musl \
+		&& myopts+=" NO_REGEX=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts+=" NO_MMAP=YesPlease"
+#		myopts+=" NO_IPV6=YesPlease"
+#		myopts+=" NO_STRLCPY=YesPlease"
+#		myopts+=" NO_MEMMEM=YesPlease"
+#		myopts+=" NO_MKDTEMP=YesPlease"
+#		myopts+=" NO_MKSTEMPS=YesPlease"
+#	fi
+	if [[ ${CHOST} == ia64-*-hpux* ]]; then
+		myopts+=" NO_NSEC=YesPlease"
+	fi
+	if [[ ${CHOST} == *-*-aix* ]]; then
+		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
+	fi
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts+=" NEEDS_LIBICONV=YesPlease"
+		myopts+=" HAVE_CLOCK_MONOTONIC=1"
+		grep -q getdelim "${ROOT}"/usr/include/stdio.h && \
+			myopts+=" HAVE_GETDELIM=1"
+	fi
+
+	has_version '>=app-text/asciidoc-8.0' \
+		&& myopts+=" ASCIIDOC8=YesPlease"
+	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	[[ "${CHOST}" == *-uclibc* ]] && \
+		myopts+=" NO_NSEC=YesPlease"
+
+	export MY_MAKEOPTS="${myopts}"
+	export EXTLIBS="${extlibs}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		use doc && \
+			cd "${S}"/Documentation && \
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+	else
+		git-r3_src_unpack
+		cd "${S}"
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# add experimental patches to improve mediawiki support
+	# see patches for origin
+	if use mediawiki-experimental ; then
+		PATCHES+=(
+			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+		)
+	fi
+
+	default
+
+	sed -i \
+		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile contrib/svn-fe/Makefile || die "sed failed"
+
+	# Never install the private copy of Error.pm (bug #296310)
+	sed -i \
+		-e '/private-Error.pm/s,^,#,' \
+		perl/Makefile.PL
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die "sed failed"
+
+	# Fix git-subtree missing DESTDIR
+	sed -i \
+		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
+		contrib/subtree/Makefile
+}
+
+git_emake() {
+	# bug #326625: PERL_PATH, PERL_MM_OPT
+	# bug #320647: PYTHON_PATH
+	PYTHON_PATH=""
+	use python && PYTHON_PATH="${PYTHON}"
+	emake ${MY_MAKEOPTS} \
+		DESTDIR="${D}" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		OPTCC="$(tc-getCC)" \
+		OPTAR="$(tc-getAR)" \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		sysconfdir="${EPREFIX}"/etc \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_MM_OPT="" \
+		GIT_TEST_OPTS="--no-color" \
+		V=1 \
+		"$@"
+	# This is the fix for bug #326625, but it also causes breakage, see bug
+	# #352693.
+	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	if use perl ; then
+	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
+	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
+	fi
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el
+	fi
+
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb \
+			|| die "emake gitweb (cgi) failed"
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		cd "${S}"/contrib/credential/osxkeychain || die
+		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
+			|| die "emake credential-osxkeychain"
+	fi
+
+	cd "${S}"/Documentation
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man \
+			|| die "emake man failed"
+		if use doc ; then
+			git_emake info html \
+				|| die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info \
+				|| die "emake info html failed"
+		fi
+	fi
+
+	if use subversion ; then
+		cd "${S}"/contrib/svn-fe
+		# by defining EXTLIBS we override the detection for libintl and
+		# libiconv, bug #516168
+		local nlsiconv=
+		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
+		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
+		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
+		if use doc ; then
+			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
+		fi
+		cd "${S}"
+	fi
+
+	if use gnome-keyring ; then
+		cd "${S}"/contrib/credential/libsecret
+		git_emake || die "emake git-credential-libsecret failed"
+	fi
+
+	cd "${S}"/contrib/subtree || die
+	git_emake
+	use doc && git_emake doc
+
+	cd "${S}"/contrib/diff-highlight || die
+	git_emake
+
+	if use mediawiki ; then
+		cd "${S}"/contrib/mw-to-git
+		git_emake
+	fi
+}
+
+src_install() {
+	git_emake \
+		install || \
+		die "make install failed"
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		if use doc ; then
+			docinto ${d}/html
+			dodoc Documentation${d}*.html
+		fi
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	bashcomp_alias git gitk
+	# Not really a bash-completion file (bug #477920)
+	# but still needed uncompressed (bug #507480)
+	insinto /usr/share/${PN}
+	doins contrib/completion/git-prompt.sh
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc}
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	exeinto /usr/libexec/git-core/
+	newexe contrib/git-resurrect.sh git-resurrect
+
+	# git-subtree
+	cd "${S}"/contrib/subtree
+	git_emake install || die "Failed to emake install git-subtree"
+	if use doc ; then
+		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	cd "${S}"
+
+	if use mediawiki ; then
+		cd "${S}"/contrib/mw-to-git
+		git_emake install
+		cd "${S}"
+	fi
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	exeinto /usr/libexec/git-core/
+	doexe contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	# git-contacts
+	exeinto /usr/libexec/git-core/
+	doexe contrib/contacts/git-contacts
+	dodoc contrib/contacts/git-contacts.txt
+
+	if use gnome-keyring ; then
+		cd "${S}"/contrib/credential/libsecret
+		dobin git-credential-libsecret
+	fi
+
+	if use subversion ; then
+		cd "${S}"/contrib/svn-fe
+		dobin svn-fe
+		dodoc svn-fe.txt
+		if use doc ; then
+			doman svn-fe.1
+			docinto html
+			dodoc svn-fe.html
+		fi
+		cd "${S}"
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# diff-highlight - done above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	local contrib_objects=(
+		buildsystems
+		fast-import
+		hg-to-git
+		hooks
+		remotes2config.sh
+		rerere-train.sh
+		stats
+		workdir
+	)
+	for i in "${contrib_objects[@]}" ; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		find "${ED}"/usr/lib64/perl5/ \
+			-name .packlist \
+			-exec rm \{\} \;
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	if use !prefix ; then
+		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
+		systemd_dounit "${FILESDIR}/git-daemon.socket"
+	fi
+
+	perl_delete_localpod
+
+	# Remove disabled linguas
+	# we could remove sources in src_prepare, but install does not
+	# handle missing locale dir well
+	rm_loc() {
+		if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
+			rm -r "${ED}/usr/share/locale/${1}" || die
+		fi
+	}
+	l10n_for_each_disabled_locale_do rm_loc
+}
+
+src_test() {
+	local disabled="t9128-git-svn-cmd-branch.sh"
+	local tests_cvs="t9200-git-cvsexportcommit.sh \
+					t9400-git-cvsserver-server.sh \
+					t9401-git-cvsserver-crlf.sh \
+					t9402-git-cvsserver-refs.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh \
+					t9604-cvsimport-timestamps.sh"
+	local tests_perl="t3701-add-interactive.sh \
+					t5502-quickfetch.sh \
+					t5512-ls-remote.sh \
+					t5520-pull.sh \
+					t7106-reset-unborn-branch.sh \
+					t7501-commit.sh"
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot="t0001-init.sh \
+		t0004-unwritable.sh \
+		t0070-fundamental.sh \
+		t1004-read-tree-m-u-wf.sh \
+		t3700-add.sh \
+		t7300-clean.sh"
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn="t9100-git-svn-basic.sh"
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled="${disabled} t5000-tar-tree.sh"
+	fi
+
+	cvs=0
+	use cvs && let cvs=$cvs+1
+	if [[ ${EUID} -eq 0 ]]; then
+		if [[ $cvs -eq 1 ]]; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled="${disabled} ${tests_nonroot}"
+	else
+		[[ $cvs -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=$cvs+1
+		[[ $cvs -gt 1 ]] && \
+			has_version "dev-vcs/cvs[server]" && \
+			let cvs=$cvs+1
+		if [[ $cvs -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled="${disabled} ${tests_perl}"
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled="${disabled} ${test_svn}"
+
+	# Reset all previously disabled tests
+	cd "${S}/t"
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled} ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+		-i "${S}"/t/Makefile
+
+	# Clean old results first, must always run
+	cd "${S}/t"
+	nonfatal git_emake clean
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	cd "${S}"
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	cd "${S}/t"
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
+	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+	einfo "Note that the prompt bash code is now in that separate script"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
+	echo
+	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/hgview/Manifest b/dev-vcs/hgview/Manifest
index c7e4e6ccbfe2..148f85bcca4d 100644
--- a/dev-vcs/hgview/Manifest
+++ b/dev-vcs/hgview/Manifest
@@ -1,5 +1,5 @@
 DIST hgview-1.9.0.tar.gz 181130 SHA256 8b2e5e10544deaa79ba9ef3f6339e103af357edbeb4b2594be079fddf7b8e6ed SHA512 604631776e096daf27241e8387d6fddfb9b3f2c54dbfccc95e770ebf2d5d27f64009c3698cf0d427f9a89e073db0d8d7623d57969ca6fcf036d5cb1dbd74eece WHIRLPOOL 01d29625a136664f35f2241c546b4af52853ea78fff31089d83ebb4a1718e4d64571df6a61f217aec6919b6bb27c35cf092195fa56efcffb3ad16e1bb714a397
-EBUILD hgview-1.9.0.ebuild 1430 SHA256 ad29fdd9262fdf63e7480e149c11f4d899926711a6f4d67b058bc2b325ec6610 SHA512 4837e2aab22757cace7c3e7dd3d73dd1afa434802f60f9d3dc66d4e74018be2c3bdbc484ce7f24dbe0019687e9890a4a69ac9efc84f38097205b4fbec25fa7c4 WHIRLPOOL 3a62b8a4010007d02b1b0906f4cd0387866115c271f84b5a61892e00970e23d14f0eb47b620b42f2b226d8f2b317506a28402bcb36009599bcd0425e9a05cd06
+EBUILD hgview-1.9.0-r1.ebuild 1159 SHA256 c33b64d5131875f568bc228519a2380321fe16f6e69ed6dfc3c7b977f075ad3d SHA512 fb2bd3854ee89ff8766507d790d450b1d4d4597cfbd86f644d2571f8371b43f3f200ecbbe483b31b8324272eff421c6afb1fffca2713e72a24cc88500fbdc149 WHIRLPOOL f47c5069ed27e5e7ee1cf55db574bb4074be68a2195d976a03b11de6b5c73fe4a7d5ac32decbe8c095c4b119667e74f4f4bc0c428ba4d0692fd203dd0aa84330
 MISC ChangeLog 2967 SHA256 cf4b08690d2f2f3d8a69ec171cd57653676d153295d54490ba94828b1d04fccf SHA512 c98aee2ca4ecf423c47b7c66dd362fbe89a79cb863c592e6344607f99466f596603798c3996677d2f13aaba2c94f28b341ee5ae4d9130234d8b4ebb37c5b771c WHIRLPOOL c865739488386fad0f46c7a77a83bf45047f8885b250e68ced8acddf9343ea9653751e8aab52331cc13cb29c04d65f8c5f3d2509c232c708414ac60192996200
 MISC ChangeLog-2015 3630 SHA256 944a30283534e6acde143410e057fa3c8292c9069bc267e0a6058fde0ee49c9f SHA512 a27bf17458ece0951b6cb0d89b781c43a119a7a39e61ee64c2af5580e863ccacfed0dc7085e787433d0acaa3fe996bf2f1017dbf7763c71d42ad3f5d7b28169c WHIRLPOOL 7785970d54760845f6d6a14f5608ee8961d027f457bd6cd410757c4508011136dbd73ddff79c45792195fc6c524adccc715dc6e64e722cafe85716ae1465ef96
 MISC metadata.xml 439 SHA256 6f7a51687487e80f329b7c26c258a75b7abc737a71700ffc45f215d7134076b9 SHA512 87592bfa0635fa86d65a414c7061bb6a3e66e3f625fcc91eb5e3f3f8861d4a3a7ebced02f7383d7683ad5953bf0661b62128fa4c88461085c2df4f5b1e7b5607 WHIRLPOOL 19a136e01b7a8f97bd9b19a17c1d1b9f1866e1dcc31e22a859c8f3d083b609a348f4d528193e6b5e1e90a75f41e6a1e5d7d8d6f2061a0e62965e54407644c831
diff --git a/dev-vcs/hgview/hgview-1.9.0-r1.ebuild b/dev-vcs/hgview/hgview-1.9.0-r1.ebuild
new file mode 100644
index 000000000000..9a51e54f07cc
--- /dev/null
+++ b/dev-vcs/hgview/hgview-1.9.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+DESCRIPTION="A Mercurial interactive history viewer"
+HOMEPAGE="https://www.logilab.org/project/hgview/ https://pypi.python.org/pypi/hgview/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	dev-python/pyinotify[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/urwid-1.0.0[${PYTHON_USEDEP}]
+	dev-vcs/mercurial[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+	)"
+
+python_configure_all() {
+	mydistutilsargs=(
+		build $(use doc || echo --no-doc)
+		build --no-qt
+	)
+}
+
+src_prepare() {
+	# https://www.logilab.org/ticket/103668
+	sed -i \
+		-e 's:MANDIR=$(PREFIX)/man:MANDIR=$(PREFIX)/share/man:' \
+		-e 's:$(INSTALL) $$i:$(INSTALL) -m 644 $$i:' \
+		doc/Makefile || die
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# Install Mercurial extension config file
+	insinto /etc/mercurial/hgrc.d
+	doins hgext/hgview.rc
+}
diff --git a/dev-vcs/hgview/hgview-1.9.0.ebuild b/dev-vcs/hgview/hgview-1.9.0.ebuild
deleted file mode 100644
index 2fb8088d6207..000000000000
--- a/dev-vcs/hgview/hgview-1.9.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-DESCRIPTION="A Mercurial interactive history viewer"
-HOMEPAGE="https://www.logilab.org/project/hgview/ https://pypi.python.org/pypi/hgview/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc ncurses +qt4"
-REQUIRED_USE="|| ( ncurses qt4 )"
-
-RDEPEND="dev-vcs/mercurial[${PYTHON_USEDEP}]
-	ncurses? (
-		>=dev-python/urwid-1.0.0[${PYTHON_USEDEP}]
-		dev-python/pyinotify[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-	)
-	qt4? (
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/PyQt4[X,${PYTHON_USEDEP}]
-		dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-	)"
-
-python_configure_all() {
-	mydistutilsargs=(
-		build $(use doc || echo --no-doc)
-		build $(use ncurses || echo --no-curses)
-		build $(use qt4 || echo --no-qt)
-	)
-}
-
-src_prepare() {
-	# https://www.logilab.org/ticket/103668
-	sed -i \
-		-e 's:MANDIR=$(PREFIX)/man:MANDIR=$(PREFIX)/share/man:' \
-		-e 's:$(INSTALL) $$i:$(INSTALL) -m 644 $$i:' \
-		doc/Makefile || die
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# Install Mercurial extension config file
-	insinto /etc/mercurial/hgrc.d
-	doins hgext/hgview.rc
-}
diff --git a/dev-vcs/tig/Manifest b/dev-vcs/tig/Manifest
index df1eb12d6196..521e9a493de7 100644
--- a/dev-vcs/tig/Manifest
+++ b/dev-vcs/tig/Manifest
@@ -1,5 +1,7 @@
 DIST tig-2.2.2.tar.gz 1046910 SHA256 316214d87f7693abc0cbe8ebbb85decdf5e1b49d7ad760ac801af3dd73385e35 SHA512 e43cf8b4e7938342b581a1238222d5cbf62e242208cd65fc9b3261c4076b7c60c182f9a80613538fcf8b50187cc2844c22f6d1aeaaa8b23864670667a91dbfcd WHIRLPOOL c4f569d969bacdea8f7a765acfced6c45b04f36c5eca915702c369de1ab11dbe4d8c01934852d40ffdd641dcbf5ed699803c67ea3deccf539721dba46ca23716
+DIST tig-2.3.0.tar.gz 1080956 SHA256 686f0386927904dc6410f0b1a712cb8bd7fff3303f688d7dc43162f4ad16c0ed SHA512 d5e8bf04689fdbeab4f2ee60eef1e8e7686827228dc2f87b20c40a3a1c31aa3476d5088423ba8bcb72616a9f0f211a2dbb631a72cc946553e41cb225ea60ab37 WHIRLPOOL d7ff8b990b6ebf0fda6df28624bee7e842103047490e037ad562f873740f2358e66ccaf429af7caf0319f06b0f92600f0c04733054aeffc14026a95060abfbc3
 EBUILD tig-2.2.2.ebuild 1242 SHA256 a48ba3a6290ac81c3695bbe650136f5c82c1518cf1c631c776e909ddc50a2936 SHA512 a42a3cf7b2c4b77f7ab8079092b093d1ba83434263a2cf35278466b2bd50edd3165514ac87f6928ea0356e233880bd6ee38d0e6213c70e45090e293a406094cc WHIRLPOOL 99935479005702a6842e1a64c57a0bfdc43da739000fc22632aea2ca06dfea5392356c83bbf6a37dea23536cd9685c70ce8621ff8dc5c0716668dcb553c9e0e0
+EBUILD tig-2.3.0.ebuild 1247 SHA256 aeb4b28de867dd0807d0f2d79735ad5701e2b8d9c88fa2271d5b3f40770b6899 SHA512 f72db9554da8ad7d348a8c71b0a0e5d8d58ed07f8f2d933df6572e0450dfb26ac1fb49bfcf724a650a264c47bd7833914681b934b2e9719a1b6a057f8f97ead2 WHIRLPOOL db65b892070c5c38ee08fc103c4be6f7adbdba4db0748d7a7cca3c602fdf091c7ab6939ae1261bdd279fb2e30fcc489fac9cd2d31e7b0b24646ea6fa56e10170
 EBUILD tig-9999.ebuild 1245 SHA256 d78ddbdf7baeb6f2f098babc976c80392d0d6a084778c4ba13c2ca07403ecc83 SHA512 6fc626f7ff9ebc0bbc83872b75cf9d4d8ad808d3930467de76ff23ac71cb454defc9393ddfd855daa5c7955baad38b4f30c36fe69109532d18e5fa6d3a8d24a8 WHIRLPOOL 60513db09e3e6449949b57be59dfeee8f89ed08214aa9afe466c9860f0b7b2fb5ec89b3158c2bd96a32822e72b455fa4e53998da132193d2d55e078cb8425ba8
 MISC ChangeLog 3990 SHA256 6eda30a714e4317bed8e5befca3e20509bba7364abd8f5ba3ab19278b8c7359e SHA512 848a546d8dd9d34f5e2d43817aaaae77d86962ab960473763590dbd639c143a082506d0bed03abb810a6c61576d3835c5449d145405a3c19a74ffbafcdfa28d7 WHIRLPOOL a7961cb917c6545b0d738d6173200b7e1aaf47d7f3631d71e5ba4d4305f399d015d004c27fb9fef30a4e4c129a35a193338d72effde6ea322f34f39e5dd3a5be
 MISC ChangeLog-2015 7850 SHA256 b3b23d2442d6656fe7ce5de46b613292b1694d624e5bfaa38575dfe4d3bdd8b5 SHA512 bd897a05bca8e679e7bd46ac252a5cd866540b0f18cbc62d2084a3c42c3abfbc95542da3229e03478232bd548331f7ca1316f1615c988b1a81c7a93f1a9f52aa WHIRLPOOL 3bc6d2115518ca5e2ede55be2dcdd1f11a83c45bc03648481e548377ebc3aed1487614c06b9c29184f69a4b9b09589c2595ef7806a56ee48c1ebcf4b5dad8bff
diff --git a/dev-vcs/tig/tig-2.3.0.ebuild b/dev-vcs/tig/tig-2.3.0.ebuild
new file mode 100644
index 000000000000..9f6f0769818e
--- /dev/null
+++ b/dev-vcs/tig/tig-2.3.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/jonas/tig.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+fi
+
+DESCRIPTION="A text mode interface for git"
+HOMEPAGE="https://jonas.github.io/tig/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="unicode"
+
+DEPEND="
+	sys-libs/ncurses:0=[unicode?]
+	sys-libs/readline:0="
+RDEPEND="${DEPEND}
+	dev-vcs/git"
+[[ ${PV} == "9999" ]] && DEPEND+=" app-text/asciidoc app-text/xmlto"
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	econf $(use_with unicode ncursesw)
+}
+
+src_compile() {
+	emake V=1
+	[[ ${PV} == "9999" ]] && emake V=1 doc-man doc-html
+}
+
+src_test() {
+	# workaround parallel test failures
+	emake -j1 test
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-doc-man
+	dodoc doc/manual.html README.html NEWS.html
+	newbashcomp contrib/tig-completion.bash ${PN}
+
+	docinto examples
+	dodoc contrib/*.tigrc
+}
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index b43f0600e5e2..781c2bda0673 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -33,7 +33,7 @@ _KDE4_BASE_ECLASS=1
 # for tests you should proceed with setting VIRTUALX_REQUIRED=test.
 : ${VIRTUALX_REQUIRED:=manual}
 
-inherit kde4-functions toolchain-funcs fdo-mime flag-o-matic gnome2-utils virtualx versionator eutils multilib
+inherit kde4-functions toolchain-funcs flag-o-matic gnome2-utils virtualx versionator eutils multilib xdg-utils
 
 if [[ ${KDE_BUILD_TYPE} = live ]]; then
 	case ${KDE_SCM} in
@@ -929,8 +929,8 @@ kde4-base_pkg_postinst() {
 	if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
 		gnome2_icon_cache_update
 	fi
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	buildsycoca
 
 	if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
@@ -953,8 +953,8 @@ kde4-base_pkg_postrm() {
 	if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
 		gnome2_icon_cache_update
 	fi
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	buildsycoca
 }
 
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 345408aae2b5..44e45e4734fd 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -4,10 +4,12 @@
 # @ECLASS: kde5-functions.eclass
 # @MAINTAINER:
 # kde@gentoo.org
-# @BLURB: Common ebuild functions for KDE 5 packages
+# @BLURB: Common ebuild functions for packages based on KDE Frameworks 5.
 # @DESCRIPTION:
-# This eclass contains all functions shared by the different eclasses,
-# for KDE 5 ebuilds.
+# This eclass contains functions shared by the other KDE eclasses and forms
+# part of their public API.
+#
+# This eclass should (almost) never be inherited directly by an ebuild.
 
 if [[ -z ${_KDE5_FUNCTIONS_ECLASS} ]]; then
 _KDE5_FUNCTIONS_ECLASS=1
@@ -22,7 +24,10 @@ case ${EAPI} in
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
-# determine the build type
+# @ECLASS-VARIABLE: KDE_BUILD_TYPE
+# @DESCRIPTION:
+# If PV matches "*9999*", this is automatically set to "live".
+# Otherwise, this is automatically set to "release".
 if [[ ${PV} = *9999* ]]; then
 	KDE_BUILD_TYPE="live"
 else
@@ -44,28 +49,29 @@ esac
 
 # @ECLASS-VARIABLE: QT_MINIMAL
 # @DESCRIPTION:
-# Minimal Qt version to require for the package.
+# Minimum version of Qt to require. This affects add_qt_dep.
 : ${QT_MINIMAL:=5.7.1}
 
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
-# Minimal Frameworks version to require for the package.
+# Minimum version of Frameworks to require. This affects add_frameworks_dep.
 : ${FRAMEWORKS_MINIMAL:=5.37.0}
 
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:
-# Minimal Plasma version to require for the package.
+# Minimum version of Plasma to require. This affects add_plasma_dep.
 : ${PLASMA_MINIMAL:=5.10.5}
 
 # @ECLASS-VARIABLE: KDE_APPS_MINIMAL
 # @DESCRIPTION:
-# Minimal KDE Applications version to require for the package.
+# Minimum version of KDE Applications to require. This affects add_kdeapps_dep.
 : ${KDE_APPS_MINIMAL:=14.12.0}
 
 # @ECLASS-VARIABLE: KDE_GCC_MINIMAL
 # @DEFAULT_UNSET
 # @DESCRIPTION:
-# Minimal GCC version to require for the package.
+# Minimum version of active GCC to require. This is checked in kde5.eclass in
+# kde5_pkg_pretend and kde5_pkg_setup.
 
 # @ECLASS-VARIABLE: KDEBASE
 # @DESCRIPTION:
@@ -79,7 +85,8 @@ debug-print "${ECLASS}: ${KDEBASE} ebuild recognized"
 
 # @ECLASS-VARIABLE: KDE_SCM
 # @DESCRIPTION:
-# SCM to use if this is a live ebuild.
+# SCM to use if KDE_BUILD_TYPE is determined to be "live".
+# Currently, only git is supported.
 : ${KDE_SCM:=git}
 
 case ${KDE_SCM} in
@@ -135,7 +142,7 @@ _add_category_dep() {
 
 	if [[ -n ${version} ]] ; then
 		local operator=">="
-		local version="-$(get_version_component_range 1-3 ${version})"
+		local version="-${version}"
 	fi
 
 	if [[ -n ${slot} ]] ; then
@@ -148,7 +155,7 @@ _add_category_dep() {
 }
 
 # @FUNCTION: add_frameworks_dep
-# @USAGE: <package> [USE flags] [minimum version]
+# @USAGE: <package name> [USE flags] [minimum version] [slot + operator]
 # @DESCRIPTION:
 # Create proper dependency for kde-frameworks/ dependencies.
 # This takes 1 to 4 arguments. The first being the package name, the optional
@@ -172,7 +179,7 @@ add_frameworks_dep() {
 		version=${3}
 	elif [[ ${CATEGORY} = kde-frameworks ]]; then
 		version=$(get_version_component_range 1-2)
-	elif [[ -z "${version}" ]] ; then
+	elif [[ -z ${3} ]] ; then
 		version=${FRAMEWORKS_MINIMAL}
 	fi
 
@@ -180,7 +187,7 @@ add_frameworks_dep() {
 }
 
 # @FUNCTION: add_plasma_dep
-# @USAGE: <package> [USE flags] [minimum version]
+# @USAGE: <package name> [USE flags] [minimum version] [slot + operator]
 # @DESCRIPTION:
 # Create proper dependency for kde-plasma/ dependencies.
 # This takes 1 to 4 arguments. The first being the package name, the optional
@@ -203,8 +210,8 @@ add_plasma_dep() {
 	if [[ -n ${3} ]]; then
 		version=${3}
 	elif [[ ${CATEGORY} = kde-plasma ]]; then
-		version=${PV}
-	elif [[ -z "${version}" ]] ; then
+		version=$(get_version_component_range 1-3)
+	elif [[ -z ${3} ]] ; then
 		version=${PLASMA_MINIMAL}
 	fi
 
@@ -212,7 +219,7 @@ add_plasma_dep() {
 }
 
 # @FUNCTION: add_kdeapps_dep
-# @USAGE: <package> [USE flags] [minimum version]
+# @USAGE: <package name> [USE flags] [minimum version] [slot + operator]
 # @DESCRIPTION:
 # Create proper dependency for kde-apps/ dependencies.
 # This takes 1 to 4 arguments. The first being the package name, the optional
@@ -235,8 +242,8 @@ add_kdeapps_dep() {
 	if [[ -n ${3} ]]; then
 		version=${3}
 	elif [[ ${CATEGORY} = kde-apps ]]; then
-		version=${PV}
-	elif [[ -z "${version}" ]] ; then
+		version=$(get_version_component_range 1-3)
+	elif [[ -z ${3} ]] ; then
 		version=${KDE_APPS_MINIMAL}
 	fi
 
@@ -244,7 +251,7 @@ add_kdeapps_dep() {
 }
 
 # @FUNCTION: add_qt_dep
-# @USAGE: <package> [USE flags] [minimum version]
+# @USAGE: <package name> [USE flags] [minimum version] [slot + operator]
 # @DESCRIPTION:
 # Create proper dependency for dev-qt/ dependencies.
 # This takes 1 to 4 arguments. The first being the package name, the optional
@@ -262,15 +269,12 @@ add_qt_dep() {
 		die "${FUNCNAME} was called with too many arguments"
 	fi
 
-	local version
+	local version=${3}
 	local slot=${4}
 
-	if [[ -n ${3} ]]; then
-		version=${3}
-	elif [[ -z "${version}" ]]; then
+	if [[ -z ${version} ]]; then
 		version=${QT_MINIMAL}
 	fi
-
 	if [[ -z ${slot} ]]; then
 		slot="5"
 	fi
@@ -278,10 +282,13 @@ add_qt_dep() {
 	_add_category_dep dev-qt "${1}" "${2}" "${version}" "${slot}"
 }
 
-# @FUNCTION: get_kde_version
+# @FUNCTION: get_kde_version [version]
 # @DESCRIPTION:
-# Translates an ebuild version into a major.minor KDE SC
-# release version. If no version is specified, ${PV} is used.
+# Translates an ebuild version into a major.minor KDE release version, taking
+# into account KDE's prerelease versioning scheme.
+# For example, get_kde_version 17.07.80 will return "17.08".
+# If the version equals 9999, "live" is returned.
+# If no version is specified, ${PV} is used.
 get_kde_version() {
 	local ver=${1:-${PV}}
 	local major=$(get_major_version ${ver})
diff --git a/eclass/kde5-meta-pkg.eclass b/eclass/kde5-meta-pkg.eclass
index a79caf145f9c..feea480d9e17 100644
--- a/eclass/kde5-meta-pkg.eclass
+++ b/eclass/kde5-meta-pkg.eclass
@@ -4,9 +4,10 @@
 # @ECLASS: kde5-meta-pkg.eclass
 # @MAINTAINER:
 # kde@gentoo.org
-# @BLURB: This eclass contains boilerplate for KDE 5 meta packages
+# @BLURB: This eclass contains boilerplate for KDE meta packages.
 # @DESCRIPTION:
-# This eclass should only be used for defining meta packages for KDE 5.
+# This eclass should only be used for defining meta packages bundling
+# software produced by the KDE community.
 
 if [[ -z ${_KDE5_META_PKG_ECLASS} ]]; then
 _KDE5_META_PKG_ECLASS=1
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index a72f2d23ce4a..17b480c44e33 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -4,9 +4,22 @@
 # @ECLASS: kde5.eclass
 # @MAINTAINER:
 # kde@gentoo.org
-# @BLURB: Support eclass for KDE 5-related packages.
+# @BLURB: Support eclass for packages that follow KDE packaging conventions.
 # @DESCRIPTION:
-# The kde5.eclass provides support for building KDE 5-related packages.
+# This eclass is intended to streamline the creation of ebuilds for packages
+# that follow KDE upstream packaging conventions. It's primarily intended for
+# the three upstream release groups (Frameworks, Plasma, Applications) but
+# is also for any package that follows similar conventions.
+#
+# This eclass unconditionally inherits kde5-functions.eclass and all its public
+# functions and variables may be considered as part of this eclass's API.
+#
+# This eclass unconditionally inherits cmake-utils.eclass and all its public
+# variables and helper functions (not phase functions) may be considered as part
+# of this eclass's API.
+#
+# This eclass's phase functions are not intended to be mixed and matched, so if
+# any phase functions are overriden the version here should also be called.
 
 if [[ -z ${_KDE5_ECLASS} ]]; then
 _KDE5_ECLASS=1
@@ -35,19 +48,22 @@ EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_
 # @ECLASS-VARIABLE: KDE_AUTODEPS
 # @DESCRIPTION:
 # If set to "false", do nothing.
-# For any other value, add a dependency on dev-qt/qtcore:5 and kde-frameworks/extra-cmake-modules:5.
+# For any other value, add dependencies on dev-qt/qtcore:5, kde-frameworks/kf-env
+# and kde-frameworks/extra-cmake-modules:5. Additionally, required blockers may
+# be set depending on the value of CATEGORY.
 : ${KDE_AUTODEPS:=true}
 
 # @ECLASS-VARIABLE: KDE_BLOCK_SLOT4
 # @DESCRIPTION:
-# This variable is used when KDE_AUTODEPS is set.
-# If set to "true", add RDEPEND block on kde-apps/${PN}:4
+# This variable only has any effect when when CATEGORY = "kde-apps" and
+# KDE_AUTODEPS is also set. If set to "true", add RDEPEND block on kde-apps/${PN}:4
 : ${KDE_BLOCK_SLOT4:=true}
 
 # @ECLASS-VARIABLE: KDE_DEBUG
 # @DESCRIPTION:
-# If set to "false", unconditionally build with -DNDEBUG.
-# Otherwise, add debug to IUSE to control building with that flag.
+# If set to "false", add -DNDEBUG (via cmake-utils_src_configure) and -DQT_NO_DEBUG
+# to CPPFLAGS.
+# Otherwise, add debug to IUSE.
 : ${KDE_DEBUG:=true}
 
 # @ECLASS-VARIABLE: KDE_DESIGNERPLUGIN
@@ -76,7 +92,7 @@ EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_
 
 # @ECLASS-VARIABLE: KDE_DOC_DIR
 # @DESCRIPTION:
-# Defaults to "doc". Otherwise, use alternative KDE handbook path.
+# Specifies the location of the KDE handbook if not the default.
 : ${KDE_DOC_DIR:=doc}
 
 # @ECLASS-VARIABLE: KDE_QTHELP
@@ -84,7 +100,7 @@ EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_
 # If set to "false", do nothing.
 # Otherwise, add "doc" to IUSE, add the appropriate dependency, generate
 # and install Qt compressed help files with -DBUILD_QCH=ON when USE=doc.
-if [[ ${CATEGORY} = kde-frameworks && ( $(get_version_component_range 2) -ge 36 || ${KDE_BUILD_TYPE} = live ) ]]; then
+if [[ ${CATEGORY} = kde-frameworks ]]; then
 	: ${KDE_QTHELP:=true}
 else
 	: ${KDE_QTHELP:=false}
@@ -314,8 +330,6 @@ _calculate_src_uri() {
 	case ${CATEGORY} in
 		kde-apps)
 			case ${PV} in
-				16.12.3)
-					SRC_URI="mirror://kde/Attic/applications/16.12.3/src/${_kmname}-${PV}.tar.xz" ;;
 				??.?.[6-9]? | ??.??.[6-9]? )
 					SRC_URI="mirror://kde/unstable/applications/${PV}/src/${_kmname}-${PV}.tar.xz"
 					RESTRICT+=" mirror"
@@ -330,7 +344,7 @@ _calculate_src_uri() {
 			local plasmapv=$(get_version_component_range 1-3)
 
 			case ${PV} in
-				5.?.[6-9]? )
+				5.?.[6-9]? | 5.??.[6-9]? )
 					# Plasma 5 beta releases
 					SRC_URI="mirror://kde/unstable/plasma/${plasmapv}/${_kmname}-${PV}.tar.xz"
 					RESTRICT+=" mirror"
@@ -417,7 +431,8 @@ debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}"
 
 # @FUNCTION: kde5_pkg_pretend
 # @DESCRIPTION:
-# Do some basic settings
+# Checks if the active compiler meets the minimum version requirements.
+# phase function is only exported if KDE_GCC_MINIMAL is defined.
 kde5_pkg_pretend() {
 	debug-print-function ${FUNCNAME} "$@"
 	_check_gcc_version
@@ -425,7 +440,7 @@ kde5_pkg_pretend() {
 
 # @FUNCTION: kde5_pkg_setup
 # @DESCRIPTION:
-# Do some basic settings
+# Checks if the active compiler meets the minimum version requirements.
 kde5_pkg_setup() {
 	debug-print-function ${FUNCNAME} "$@"
 	_check_gcc_version
@@ -433,7 +448,9 @@ kde5_pkg_setup() {
 
 # @FUNCTION: kde5_pkg_nofetch
 # @DESCRIPTION:
-# Display package publication status
+# Intended for use in the KDE overlay. If this package matches something in
+# KDE_UNRELEASED, display a giant warning that the package has not yet been
+# released upstream and should not be used.
 kde5_pkg_nofetch() {
 	if ! _kde_is_unreleased ; then
 		return
@@ -463,7 +480,7 @@ kde5_pkg_nofetch() {
 
 # @FUNCTION: kde5_src_unpack
 # @DESCRIPTION:
-# Function for unpacking KDE 5.
+# Unpack the sources, automatically handling both release and live ebuilds.
 kde5_src_unpack() {
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -480,7 +497,8 @@ kde5_src_unpack() {
 
 # @FUNCTION: kde5_src_prepare
 # @DESCRIPTION:
-# Function for preparing the KDE 5 sources.
+# Wrapper for cmake-utils_src_prepare with lots of extra logic for magic
+# handling of linguas, tests, handbook etc.
 kde5_src_prepare() {
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -590,7 +608,8 @@ kde5_src_prepare() {
 
 # @FUNCTION: kde5_src_configure
 # @DESCRIPTION:
-# Function for configuring the build of KDE 5.
+# Wrapper for cmake-utils_src_configure with extra logic for magic handling of
+# handbook, tests etc.
 kde5_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -601,7 +620,7 @@ kde5_src_configure() {
 
 	local cmakeargs
 
-	if ! use_if_iuse test ; then
+	if in_iuse test && ! use test ; then
 		cmakeargs+=( -DBUILD_TESTING=OFF )
 
 		if [[ ${KDE_TEST} = optional ]] ; then
@@ -632,7 +651,8 @@ kde5_src_configure() {
 
 # @FUNCTION: kde5_src_compile
 # @DESCRIPTION:
-# Function for compiling KDE 5.
+# Wrapper for cmake-utils_src_compile. Currently doesn't do anything extra, but
+# is included as part of the API just in case it's needed in the future.
 kde5_src_compile() {
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -641,7 +661,8 @@ kde5_src_compile() {
 
 # @FUNCTION: kde5_src_test
 # @DESCRIPTION:
-# Function for testing KDE 5.
+# Wrapper for cmake-utils_src_test with extra logic for magic handling of dbus
+# and virtualx.
 kde5_src_test() {
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -672,7 +693,9 @@ kde5_src_test() {
 
 # @FUNCTION: kde5_src_install
 # @DESCRIPTION:
-# Function for installing KDE 5.
+# Wrapper for cmake-utils_src_install with extra logic to avoid compressing
+# certain types of files. For example, khelpcenter is not able to read
+# compressed handbooks.
 kde5_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -695,7 +718,7 @@ kde5_src_install() {
 
 # @FUNCTION: kde5_pkg_preinst
 # @DESCRIPTION:
-# Function storing icon caches
+# Sets up environment variables required in kde5_pkg_postinst.
 kde5_pkg_preinst() {
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -705,7 +728,7 @@ kde5_pkg_preinst() {
 
 # @FUNCTION: kde5_pkg_postinst
 # @DESCRIPTION:
-# Function to rebuild the KDE System Configuration Cache after an application has been installed.
+# Updates the various XDG caches (icon, desktop, mime) if necessary.
 kde5_pkg_postinst() {
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -726,7 +749,7 @@ kde5_pkg_postinst() {
 
 # @FUNCTION: kde5_pkg_postrm
 # @DESCRIPTION:
-# Function to rebuild the KDE System Configuration Cache after an application has been removed.
+# Updates the various XDG caches (icon, desktop, mime) if necessary.
 kde5_pkg_postrm() {
 	debug-print-function ${FUNCNAME} "$@"
 
diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index b339017f9017..be1055a3fe57 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -125,6 +125,7 @@ _meson_create_cross_file() {
 	ar = '${AR}'
 	c = '${CC}'
 	cpp = '${CXX}'
+	pkgconfig = '${PKG_CONFIG}'
 	strip = '${STRIP}'
 
 	[host_machine]
@@ -155,6 +156,7 @@ meson_src_configure() {
 	local -x AR=$(tc-getAR)
 	local -x CC=$(tc-getCC)
 	local -x CXX=$(tc-getCXX)
+	local -x PKG_CONFIG=$(tc-getPKG_CONFIG)
 	local -x STRIP=$(tc-getSTRIP)
 
 	if tc-is-cross-compiler; then
@@ -166,6 +168,7 @@ meson_src_configure() {
 		AR=$(tc-getBUILD_AR)
 		CC=$(tc-getBUILD_CC)
 		CXX=$(tc-getBUILD_CXX)
+		PKG_CONFIG=$(tc-getBUILD_PKG_CONFIG)
 		STRIP=$(tc-getBUILD_STRIP)
 	fi
 
diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index 6c88c7198937..cfe684bc5db1 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -887,7 +887,7 @@ mysql-multilib-r1_pkg_config() {
 	${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
 	for opt in grant-tables host-cache name-resolve networking slave-start \
 		federated ssl log-bin relay-log slow-query-log external-locking \
-		ndbcluster log-slave-updates \
+		ndbcluster log-slave-updates wsrep-on \
 		; do
 		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
 		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index a5a0b0b4ed42..1ba8ad36e037 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -1044,7 +1044,7 @@ mysql-multilib_pkg_config() {
 	${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
 	for opt in grant-tables host-cache name-resolve networking slave-start \
 		federated ssl log-bin relay-log slow-query-log external-locking \
-		ndbcluster log-slave-updates \
+		ndbcluster log-slave-updates wsrep-on \
 		; do
 		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
 		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index fe379980a800..94a36dc43547 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -795,7 +795,7 @@ mysql-v2_pkg_config() {
 	${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
 	for opt in grant-tables host-cache name-resolve networking slave-start \
 		federated ssl log-bin relay-log slow-query-log external-locking \
-		ndbcluster log-slave-updates \
+		ndbcluster log-slave-updates wsrep-on \
 		; do
 		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
 		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index a18e8042641c..9dca44439c9d 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -239,7 +239,7 @@ S=$(
 gentoo_urls() {
 	local devspace="HTTP~vapier/dist/URI HTTP~rhill/dist/URI
 	HTTP~zorry/patches/gcc/URI HTTP~blueness/dist/URI
-	HTTP~tamiko/distfiles/URI"
+	HTTP~tamiko/distfiles/URI HTTP~slyfox/distfiles/URI"
 	devspace=${devspace//HTTP/https:\/\/dev.gentoo.org\/}
 	echo mirror://gentoo/$1 ${devspace//URI/$1}
 }
diff --git a/eclass/vim-plugin.eclass b/eclass/vim-plugin.eclass
index cdc24a15cf6f..abe9c7b3661b 100644
--- a/eclass/vim-plugin.eclass
+++ b/eclass/vim-plugin.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: vim-plugin.eclass
@@ -11,7 +11,7 @@
 # which is read automatically by vim.  The only exception is
 # documentation, for which we make a special case via vim-doc.eclass.
 
-inherit vim-doc
+inherit estack vim-doc
 EXPORT_FUNCTIONS src_install pkg_postinst pkg_postrm
 
 VIM_PLUGIN_VIM_VERSION="${VIM_PLUGIN_VIM_VERSION:-7.3}"
@@ -25,6 +25,12 @@ if [[ ${PV} != 9999* ]] ; then
 fi
 SLOT="0"
 
+# @FUNCTION: vim-plugin_src_install
+# @DESCRIPTION:
+# Overrides the default src_install phase. In order, this function:
+# * fixes file permission across all files in ${S}.
+# * installs help and documentation files.
+# * installs all files in "${ED}"/usr/share/vim/vimfiles.
 vim-plugin_src_install() {
 	has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}"
 	local f
@@ -42,11 +48,27 @@ vim-plugin_src_install() {
 		eend $?
 	fi
 
-	# Remove unwanted files that may exist
-	rm -rf .[^.] .??* Makefile*
+	# When globbing, if nothing exists, the shell literally returns the glob
+	# pattern. So turn on nullglob and extglob options to avoid this.
+	eshopts_push -s extglob
+	eshopts_push -s nullglob
+
+	ebegin "Cleaning up unwanted files and directories"
+	# We're looking for dotfiles, dotdirectories and Makefiles here.
+	local obj
+	eval "local matches=(@(.[^.]|.??*|Makefile*))"
+	for obj in "${matches[@]}"; do
+		rm -rv "${obj}" || die "cannot remove ${obj}"
+	done
+	eend $?
+
+	# Turn those options back off.
+	eshopts_pop
+	eshopts_pop
 
 	# Install non-vim-help-docs
-	cd "${S}"
+	cd "${S}" || die "couldn't cd in ${S}"
+	local f
 	for f in *; do
 		[[ -f "${f}" ]] || continue
 		if [[ "${f}" = *.html ]]; then
@@ -54,24 +76,37 @@ vim-plugin_src_install() {
 		else
 			dodoc "${f}"
 		fi
-		rm -f "${f}"
+		rm "${f}" || die
 	done
 
 	# Install remainder of plugin
-	cd "${WORKDIR}"
+	cd "${WORKDIR}" || die "couldn't cd in ${WORKDIR}"
 	dodir /usr/share/vim
-	mv "${S}" "${ED}"/usr/share/vim/vimfiles
+	mv "${S}" "${ED}"/usr/share/vim/vimfiles || die \
+		"couldn't move ${S} to ${ED}/usr/share/vim/vimfiles"
 
 	# Fix remaining bad permissions
 	chmod -R -x+X "${ED}"/usr/share/vim/vimfiles/ || die "chmod failed"
 }
 
+# @FUNCTION: vim-plugin_pkg_postinst
+# @DESCRIPTION:
+# Overrides the pkg_postinst phase for this eclass.
+# The following functions are called:
+# * update_vim_helptags
+# * update_vim_afterscripts
+# * display_vim_plugin_help
 vim-plugin_pkg_postinst() {
 	update_vim_helptags		# from vim-doc
 	update_vim_afterscripts	# see below
 	display_vim_plugin_help	# see below
 }
 
+# @FUNCTION: vim-plugin_pkg_postrm
+# @DESCRIPTION:
+# Overrides the pkg_postrm phase for this eclass.
+# This function calls the update_vim_helptags and update_vim_afterscripts
+# functions and eventually removes a bunch of empty directories.
 vim-plugin_pkg_postrm() {
 	has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
 	update_vim_helptags		# from vim-doc
@@ -79,12 +114,14 @@ vim-plugin_pkg_postrm() {
 
 	# Remove empty dirs; this allows
 	# /usr/share/vim to be removed if vim-core is unmerged
-	find "${EPREFIX}/usr/share/vim/vimfiles" -depth -type d -exec rmdir {} \; 2>/dev/null
+	find "${EPREFIX}/usr/share/vim/vimfiles" -depth -type d -exec rmdir {} \; 2>/dev/null || \
+		die "rmdir failed"
 }
 
-# update_vim_afterscripts: create scripts in
-# /usr/share/vim/vimfiles/after/* comprised of the snippets in
-# /usr/share/vim/vimfiles/after/*/*.d
+# @FUNCTION: update_vim_afterscripts
+# @DESCRIPTION:
+# Creates scripts in /usr/share/vim/vimfiles/after/*
+# comprised of the snippets in /usr/share/vim/vimfiles/after/*/*.d
 update_vim_afterscripts() {
 	has "${EAPI:-0}" 0 1 2 && ! use prefix && EROOT="${ROOT}"
 	has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
@@ -94,11 +131,10 @@ update_vim_afterscripts() {
 	[ -d "${afterdir}" ] || return 0
 
 	einfo "Updating scripts in ${EPREFIX}/usr/share/vim/vimfiles/after"
-	find "${afterdir}" -type d -name \*.vim.d | \
-	while read d; do
-		echo '" Generated by update_vim_afterscripts' > "${d%.d}"
-		find "${d}" -name \*.vim -type f -maxdepth 1 -print0 | \
-		sort -z | xargs -0 cat >> "${d%.d}"
+	find "${afterdir}" -type d -name \*.vim.d | while read d; do
+		echo '" Generated by update_vim_afterscripts' > "${d%.d}" || die
+		find "${d}" -name \*.vim -type f -maxdepth 1 -print0 | sort -z | \
+			xargs -0 cat >> "${d%.d}" || die "update_vim_afterscripts failed"
 	done
 
 	einfo "Removing dead scripts in ${EPREFIX}/usr/share/vim/vimfiles/after"
@@ -110,18 +146,20 @@ update_vim_afterscripts() {
 		# if there's no corresponding .d directory, or if the
 		# file's effectively empty
 		if [[ ! -d "${f}.d" || -z "$(grep -v '^"' "${f}")" ]]; then
-			rm -f "${f}"
+			rm "${f}" || die
 		fi
 	done
 }
 
-# Display a message with the plugin's help file if one is available. Uses the
+# @FUNCTION: display_vim_plugin_help
+# @DESCRIPTION:
+# Displays a message with the plugin's help file if one is available. Uses the
 # VIM_PLUGIN_HELPFILES env var. If multiple help files are available, they
 # should be separated by spaces. If no help files are available, but the env
 # var VIM_PLUGIN_HELPTEXT is set, that is displayed instead. Finally, if we
-# have nothing else, display a link to VIM_PLUGIN_HELPURI. An extra message
-# regarding enabling filetype plugins is displayed if VIM_PLUGIN_MESSAGES
-# includes the word "filetype".
+# have nothing else, this functions displays a link to VIM_PLUGIN_HELPURI. An
+# extra message regarding enabling filetype plugins is displayed if
+# VIM_PLUGIN_MESSAGES includes the word "filetype".
 display_vim_plugin_help() {
 	local h
 
diff --git a/games-board/peg-e/Manifest b/games-board/peg-e/Manifest
index 2792f7a79553..628c3fb1645a 100644
--- a/games-board/peg-e/Manifest
+++ b/games-board/peg-e/Manifest
@@ -1,6 +1,6 @@
 DIST peg-e-1.1.2-src.tar.bz2 151224 SHA256 2eefce91eea0f3a412fa79193ed5f66b25d5eb86b8e35e58c3a4f3b62e7cf59d SHA512 d4a09dfb528cfb46222a9ee788de88b4804762125a9dc13203be29a6ec26d01f23249ebbcd25bfe207ab8c40d8bce060fc2f7f131bb1e5b263e19b97852cee53 WHIRLPOOL f7a4c383853712485a6b1ccd96af60d5cf4f29e59603bea93e845d72d19819665ced9e119b8dd7304723e353feb11f67a7c79e8250e6728ac4201d3acfd03911
-EBUILD peg-e-1.1.2-r1.ebuild 697 SHA256 ad54a9ec6520ad844aaa45b1ee0be693c3cec9234476df8a457e3ffe2d4753dd SHA512 dcc4a07486180de2c0a5f3d3fe8be6e03e11f0edfe4244a34d35cb0782ba051ba5a808d011a5b9426a3518c6deab60f3912432d5633e8b4edbacc05bbc80c164 WHIRLPOOL 37d30a8a461bf67362dcc423b93998622bb654e1484e7947cd5ef38471608ad823389df683103ecdc0661bf7ba953c04327bc261a12311805d94d7d66cb89a13
-EBUILD peg-e-1.1.2.ebuild 755 SHA256 b42ecdd0af3874043d66b7de1a2830eba9a587cb7b8fa8310bef46b7e1b0571a SHA512 08fd50cb4f50ef22dbdc7aa11d872ac81d38fd300c8affc399b5581bbd003a89494becabc9c7f2df4c9de977be512d504f9ae964051ecf4ffe5910d7b2a529e5 WHIRLPOOL 3f0fcb1dfb29596b7705c9cf168984f3395faa99a5d7dcfb69ac4adc1ff107cccbab41c8d9f6a434ba958a22f496853fb1e6c61d3e060ab64e750ad34f23d98e
+EBUILD peg-e-1.1.2-r1.ebuild 699 SHA256 082968e991425c71ecf268a36699f93feaf9be94af27d1f27605494fa15c22af SHA512 f7e72a858d3d5b7561d39df498c9606f6d988ff0e8066efd96d56af522cfdeffb4246b9bb358b723b92c5f781370e1f560622bc65df24235bcda00d2cc69799d WHIRLPOOL 5b4a3e7f6f1977d10d19c4386ef9d868ad8cb00e602c73c11ba4af5f469b766ea9dfc37c4831a18cbf1b17d29fa6a21e1755b956c336bfe3a4375a4063f7ab14
+EBUILD peg-e-1.1.2.ebuild 757 SHA256 694fbc0b8403f52fbc6a386fecd98f8b7e7e18d22900f1b12d386488a9bc898d SHA512 d5f1cdb4b5ec88973589e317ccfc9ef03eb19651f7e18200981c4a53293823758d3f1c6a1052a18fca4ec05a6e15ae871a13cdd01f8670595d98eee9b263b7eb WHIRLPOOL 15b009ea7fc60dd2fb3ea74ba70c5574113206b09688e0c30da2a333bcc8d571b65e83684bb5b50f22e6f947c2bbccba9fa082c5ad252411e3480635fb1922c7
 MISC ChangeLog 2672 SHA256 8597604d7a5a1de3651e872be58c33cec9427969f4ed4580dcf70e7f0854cba2 SHA512 eb7b6d7b41e9cd6ebbe19e509e157bbd62db7c57635a14e37e021fe2e43e34cf15d7fbb395e6dd5f81696acb8402cf8ea085ce14d289331a055d50185ff6df88 WHIRLPOOL 19d3d86e024063555310b0f1670ad45a2d09f0993c44cc8af15fdaf21ec32c1e2696be2f0b507124bf1ac8f23d735e7998138abae13c28c88b8cff8bf0b830fa
 MISC ChangeLog-2015 1292 SHA256 abfd53ec49e995d9682767395979817a49628f05ea929d1fda7ea44ed9476d92 SHA512 8e08af2f15f750b1085da2e9ad435bfde0a561c1dcf3aa4f8dc9225f616f60e7c3afd7a23e605125ba1c0dfa0950d51876ba60197a007960a69318662ce41a81 WHIRLPOOL d3a5019bc2f345ebdfb9c603574b6676928938fe6f587c219e2d4bf8b388f4a4a377b5de4e57a30b52a86a31afb5d59f481fc60670852e52d6fd9cb360a19651
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-board/peg-e/peg-e-1.1.2-r1.ebuild b/games-board/peg-e/peg-e-1.1.2-r1.ebuild
index e5f297c03dd1..6b5527a92724 100644
--- a/games-board/peg-e/peg-e-1.1.2-r1.ebuild
+++ b/games-board/peg-e/peg-e-1.1.2-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit eutils gnome2-utils qmake-utils
 
 DESCRIPTION="A peg solitaire game"
-HOMEPAGE="http://gottcode.org/peg-e/"
-SRC_URI="http://gottcode.org/peg-e/${P}-src.tar.bz2"
+HOMEPAGE="https://gottcode.org/peg-e/"
+SRC_URI="https://gottcode.org/peg-e/${P}-src.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/games-board/peg-e/peg-e-1.1.2.ebuild b/games-board/peg-e/peg-e-1.1.2.ebuild
index 19984027d2f7..4d5d3db11a41 100644
--- a/games-board/peg-e/peg-e-1.1.2.ebuild
+++ b/games-board/peg-e/peg-e-1.1.2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils gnome2-utils qt4-r2 games
 
 DESCRIPTION="A peg solitaire game"
-HOMEPAGE="http://gottcode.org/peg-e/"
-SRC_URI="http://gottcode.org/peg-e/${P}-src.tar.bz2"
+HOMEPAGE="https://gottcode.org/peg-e/"
+SRC_URI="https://gottcode.org/peg-e/${P}-src.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/games-board/simsu/Manifest b/games-board/simsu/Manifest
index a0ef814750f7..40bf94ef0800 100644
--- a/games-board/simsu/Manifest
+++ b/games-board/simsu/Manifest
@@ -1,7 +1,7 @@
 AUX simsu-1.2.3-langs.patch 532 SHA256 669c1a9f3ba4ee8ce9e77ca3b37afc24e935fdcb803d7aa2b689da46fcdd7b05 SHA512 c654fc77dfd562a7a3cb5e1ed90beae0f4917e15eaba25ac4cb86567581334a4556ed5068242ddcd935f0ccc9365419103c3a8dcadf2b933803a9e4fde20e1f8 WHIRLPOOL f327c9323be51453c1d9615784c447db6dcb3c2a681514a51f98811f294e0744221e8e5ccab6f099bca8fb76c94b2ea94fd57009d7c8381349d9f919aa62a19f
 DIST simsu-1.2.3-src.tar.bz2 328020 SHA256 623a27e487bd360bee58430b6530f3371f915a868910615572559a3e055a5da4 SHA512 52e19c9f7de5d8d2d2c986cbcaefa61a21ee1d8eca8a8315e9689034e9d4a9e63db02cb163daa7354a368d8e34789c1f623f0482ad9fbb52fdb447cce7505b44 WHIRLPOOL daf5e28fd35b884a751a4df9485a70538fb29813bfcf00203057c0a67291139145795866af5ddd70fa307e7dd511a5f69b1f201df48ce6c118b5bd6b434018b3
-EBUILD simsu-1.2.3-r1.ebuild 741 SHA256 7be4b676a560d3dcf7f6a309df148c61ac80014631e4da779e6e306e304c7fbc SHA512 49cebf7dfe81008a071455531cac8ae8cf3634948fa46144cbfad3aa17a9186e0228e1fbf7ba37a9652f1701bb90b8c85b7b096c737d354d5a4481aa5c2b2a13 WHIRLPOOL 44ec874a185f0e757ed9ff3f03532ca58da3e67d4d2233fc78e7ab781ca1d1b835c5eccafbed9125a655afa4988cf727db3e639d69e569dae53794c17800fe27
-EBUILD simsu-1.2.3.ebuild 916 SHA256 18b944b723ee9491202a6c5a660d4dd6277acb951435b0dda043ee2ac903e340 SHA512 297b2c6008dd8a2c593198d695dfe8707d7a6cbc2391e0bb45d9ae814d5aba3472c68e632d41ed8eee0d42adc4efa9f6c0c15effb21f0514ef0b0c4b92f9294b WHIRLPOOL bc2017cb09b5a90357828621c86273b658bfeca51e8edea5b22092edfccc88e6c1730897e1f0edc754de247320e3935c2d4320cdca1110c1ff787a931b8bf415
+EBUILD simsu-1.2.3-r1.ebuild 743 SHA256 2b1c2367f01f9dc38e3b1f2226b56708c5f5cb93f4a7d11c47322e4a7f7da055 SHA512 8f6ab013af5d281458f90a20db3e7d08bca87b9e6b72f8f071165a67de642e8df1e1a9b9aefc91c2ac5394f23b59c7eb55dd009ee85cc237ae93868177b719ad WHIRLPOOL 3714f2f945d4958cc2d1b8f2af20a9c0ece52b8b391cce385937464f555d0a766552346af72efa371162af61e3b8666a9932b574b969ba8599c5f2848a648793
+EBUILD simsu-1.2.3.ebuild 918 SHA256 b6667e6f7473fa5c04acf5cc362ab26121ce554f7834c852938264a23dac8249 SHA512 45f6ae7f08af831159402b21efea9a754f7061fc0648b78dc556cda18038401c54dac8e290a3b09950b15a0c4b5b2da3d9c9afc900005dd2d3f684148cd1c358 WHIRLPOOL e05903df4d5f92a4e8698c40703a4667e6a03c3d6529b94aaeb41404f36d27dbd917529bfa70de78477b2a9b520ea9575405de3d020d28aa58aeeae4eb510a08
 MISC ChangeLog 2704 SHA256 49d85582c41cc9af519772d0b4566706c17619aaa5279f952897f25a8aa2b036 SHA512 798baebd19abd2d8bc83889dcbcc8cc3b6c8f06406aa0595364ca1acb4ccee83dffcd975440a519cab2f2fef80726b9c6786a8549a2fce2eb3ad05fc2621223f WHIRLPOOL ff8443f8b1266e22a3b05445b007378805382d275e2ed09cb8387edcf4c600af0ee6b7c97f7b9690a038f3f32e8faef30ac8f4f79b308698b4cea0016973230c
 MISC ChangeLog-2015 1484 SHA256 ffdbb08d607479f212c188df20c11e7273b78d6322cf27c6fcf43ad271c1f7d8 SHA512 2d1fdd8a5cc8a5527fcd1808638c6cfca74bfc6a0b9d1106c58a553cf92fa5c01b1cf6dc6c9e371c25628f4b16643d2b709468d62e5416a59d161b07ebfd67d8 WHIRLPOOL d5f4640412b7cd2b2e1f275e27360652c3d10be8a25a188055c321e69025073eb03c3ccf0e0098b0e72c703a0ac8ffbec239a46226a3b2f04d3fabdcf14034d6
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-board/simsu/simsu-1.2.3-r1.ebuild b/games-board/simsu/simsu-1.2.3-r1.ebuild
index ed7e202179ed..b6fd926b8124 100644
--- a/games-board/simsu/simsu-1.2.3-r1.ebuild
+++ b/games-board/simsu/simsu-1.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit eutils gnome2-utils qmake-utils
 
 DESCRIPTION="A basic sudoku game"
-HOMEPAGE="http://gottcode.org/simsu/"
-SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2"
+HOMEPAGE="https://gottcode.org/simsu/"
+SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/games-board/simsu/simsu-1.2.3.ebuild b/games-board/simsu/simsu-1.2.3.ebuild
index 70fbe569e7d1..24b8b48f4e66 100644
--- a/games-board/simsu/simsu-1.2.3.ebuild
+++ b/games-board/simsu/simsu-1.2.3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils gnome2-utils qt4-r2 games
 
 DESCRIPTION="A basic sudoku game"
-HOMEPAGE="http://gottcode.org/simsu/"
-SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2"
+HOMEPAGE="https://gottcode.org/simsu/"
+SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/games-board/tetzle/Manifest b/games-board/tetzle/Manifest
index 33a490fd5137..92d268260459 100644
--- a/games-board/tetzle/Manifest
+++ b/games-board/tetzle/Manifest
@@ -1,5 +1,5 @@
 DIST tetzle-2.0.3-src.tar.bz2 641065 SHA256 6c29ea61501dcc0149ece879217df5710d1169bfae940a667af2a19605415b51 SHA512 39853cc37b0bae676fc516e56c2bb6a54d5cacccd5978d5bd9cd735bf9fcb09948871af06cdb3b3d1a510c51ea71ac3720bbfe2558c2effaa00e00708a70f7d9 WHIRLPOOL 7bc9d4973deb2b9d1b32316c40b13203d0dcab244d1805639c640331b4b582e0a81d821987a8e0275cd28edc59d9e419b03b7280efb0d7e55d5057398c94d4c9
-EBUILD tetzle-2.0.3.ebuild 972 SHA256 ccd4f0423970602570a461114706edac4f8aa082b491ba21af3f5935ac31d927 SHA512 36bf925ba33ccd521f1bd0ed8f0a38d9d41b07a6b5fe900c77384ecd23bc670851dd4d97a41fd9aa7f78e965ea3e1866a91ccd7dd0b7bee2517ef2bdf2f153d0 WHIRLPOOL 7faf1e99dacc43d52ee2467c9bbf333aeb7ea4bf303da1809a5cc95bcbaf89b2a02dc4f10d78d44f7079fe44caa4d037444d56aeca71e127d182b4a7cb5a0998
+EBUILD tetzle-2.0.3.ebuild 974 SHA256 b35d620ab1109a472fdbe92f3a594b696085811d9c4f2e5008ef3be6da77a838 SHA512 c4b791161635a2232a2d321656b4cb229f5dfde8e941e9307ac80e9c48a06c9d4cd724bbf3ce5f2654032dc850de8e23b1b62d5571d32b664cf7a51ea8343dce WHIRLPOOL 54d557f82cab4c1b645a498e6f938ff189daafb6f7d791a7c8153664084884cc4f59105ba23fe92f714a88b37dfd8a8ffca32344ec3889bd9b09a3fdbc262558
 MISC ChangeLog 2427 SHA256 9aabe2b62e4c23848bd641fa211ed74586d8cf59442c560f19b4801ecaf295f9 SHA512 47b0c6e8ed60fe76c2e762bd70d42e1242aa8c456f29a63da0fa34c92a883bff9c3d8d042ed07222063d5c2e2f912459b16490ceb1681158f1084033d23fd18c WHIRLPOOL 0dfdd670d7fc316f7890337029d780cd7c36549b5175f53b3ce10c2aeb62f5e051e6ce138c4954077823ebf593841efda71f74672b064311c23a771d2ef78618
 MISC ChangeLog-2015 2004 SHA256 e719feaaa050dabf08e7fdfaefa9eddc3eb767d523d838a0d097bb1f9edec93c SHA512 066e826059ac26eb2eea488415e0d7791435110bbf5c1b72a60886c568585a9bcfe87cd2fa9448f3add467935889ac15ae4e08ed47d4a475b0add1a1b0de3354 WHIRLPOOL 2e58718d04521031a0223d4cdfb611821881fd2a11614fd34bb29f2771be2f40dfd87331fa28e713a6c7697348c8503e983c48fa72adc2670ab5140074352ef3
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-board/tetzle/tetzle-2.0.3.ebuild b/games-board/tetzle/tetzle-2.0.3.ebuild
index 848ecf3551f0..c69db906bb14 100644
--- a/games-board/tetzle/tetzle-2.0.3.ebuild
+++ b/games-board/tetzle/tetzle-2.0.3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit qt4-r2 gnome2-utils games
 
 DESCRIPTION="A jigsaw puzzle game that uses tetrominoes for the pieces"
-HOMEPAGE="http://gottcode.org/tetzle/"
-SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2"
+HOMEPAGE="https://gottcode.org/tetzle/"
+SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/games-emulation/desmume/Manifest b/games-emulation/desmume/Manifest
index 36ff1f4c6f83..295a4bedc649 100644
--- a/games-emulation/desmume/Manifest
+++ b/games-emulation/desmume/Manifest
@@ -6,7 +6,7 @@ DIST desmume-0.9.11.tar.gz 5359305 SHA256 3ab34ba6cc009566245025c1dd94bf449b6a1b
 DIST desmume-0.9.8.tar.gz 3677290 SHA256 78363468a2d5efba95de57739a9c81a3757ecd76c2a183ec68336e30d47a5e01 SHA512 b739292f1327ec83b1afcb1c6db45365cf0977fb571256b637a7c6f1c1e57add5b9c0f34820f020c1788c481cbf15755a034e69f14fbf92e3c31dc01594171dd WHIRLPOOL 0bd50d135aad85652dc233c69c94607400820682d60d7bc35b0e1366d7b6fee1fac9f7091074c21940a80826b50bccc8f14ba0e3770687b54b4d30323c8cf84d
 DIST desmume-0.9.9.tar.gz 4107513 SHA256 cd2ad70cdde1236eba5a4ff8cea838f42b7dc470e32ac938263f49f12a55d754 SHA512 ba5a965102559f048cd57718b4c50e6b2bd39eca4a5990e4cdf068bfa752fccb52d71911ea48da769c5ec18bb740f6b09e6c856ccc78b1e1adf23fd701d1fe31 WHIRLPOOL 055594100216e4ffd046119716e9acc018e7631f96f2be4e830495f88462382180c3955841bfcc3ec494227a606bc820820342907e2b1b2b61a8a65f9b1949b4
 EBUILD desmume-0.9.10.ebuild 725 SHA256 e36efd25c76368f8b7d8f58f6a7cb1d25b93e1281e006f2e8bfe1e7bc4d298c3 SHA512 1491c41a1fed19dea7165a62d7a2b0ca85828638c3a6aa576d994344bfb1778881c5607f46eded508c8440a8e67ab0332f7223a21143bf968605711d851e6451 WHIRLPOOL 5d0555b9641de0e04dd5c49d7f4bc09457c46ee4a5e0109f8a481527351577a1b2580f4f0d7a33cfffdfcbde8ec4df96d2ec2aa299dff525916d7041a7dc8566
-EBUILD desmume-0.9.11-r1.ebuild 754 SHA256 d444ea186c080554a98c5c9aa0d01502a8163fc44f939bf08e02dd2e50ef27bd SHA512 dd0b758b2d8ff5baf3bad5fd6497c8cd2d5f0421726cf1d80326cb5919d271b404be3e79b6cc373ef593e4b9ccc8f0967c3d77997bf01780cdb40786e7fca82e WHIRLPOOL 95de36786ed9162284b49e532c0bfff80b1e6f0ad45cabcaab595965e800ef1d090901491764875c2900ae46f12c5ee0f5fe7592f5a3c7656b7ef32f569ab6b3
+EBUILD desmume-0.9.11-r1.ebuild 753 SHA256 fb47f01b6b6c75c44767399afd7657c8388a6e6133dead999491cc9c3f942ba1 SHA512 a2c66a6e8f40658b7d462e00a03c54e640bf78c8e1d4a35cc31511f08c063a35cc63b1870bad1b74eababf59a525f1e4a33bc602442c2a440fa441eba65712c6 WHIRLPOOL 9e681ae6bf8f8eb28d814cec155178aad1cc5c7fdf68d786178f5e593772a5c795ede22cd8a7013a39862e6e2252b1efe0cda7151247ea0d9211a66c22a2eef3
 EBUILD desmume-0.9.11.ebuild 667 SHA256 834ae12600e618d7e2f6a996afb57f4befa099d28938dbcc2e6095e1e8d9ae96 SHA512 51d4a18d856f10dedd6a199a393cc58725812f6ece882e6ac30e479921a8a19307d4868a63467368d407f739489f58605eef90c2465fc5a3ca786e4dfb23df33 WHIRLPOOL 538a4a646449d70315ee60fd9048c365713539c591ec76d1a9759b376be4577ca798cadec02b65ace561dcdcd4b8ad7347b221f1a0382826e815c3919afa5f8a
 EBUILD desmume-0.9.8.ebuild 703 SHA256 02e2c5540d9c6b59e0ffc76519ba1b17daab8aed20bd196a9aedf637e174960a SHA512 234c5b44a4598e1957aed0a724d31524e6ca8ca634e802ae012f480a5cfb696c6807e08cc5fee43a2046de0fd1dc930d626a037505da72a7fa17da91dd47ddbe WHIRLPOOL 56941a88917b3c7368197a4a252c20958b55c1cccc7543c17c8b965e285242b67c6394b559b4cd203b1bd745be12fb5f45b65239a8b78f075a3db4999843d247
 EBUILD desmume-0.9.9.ebuild 703 SHA256 a05643612945839535aeb0d4e43b4f946f0dbdffd56d2c5fc67232f0b72de8d0 SHA512 c30858193011b8ae8fa5749304ba941f6408a22af0870b488656f2ba945d3c27e5e8231f7a82deb588e0a857a67c58fafbc852d8a380740349f03322e26e73d2 WHIRLPOOL 300acdee38d6268a7ac7c362814c1a81ad1f5d537ff45e6597e7c52021a59a45b5029674a83f98999eb20fdcab0ac520490d892a93fc189738fe6c9f1bab4bae
diff --git a/games-emulation/desmume/desmume-0.9.11-r1.ebuild b/games-emulation/desmume/desmume-0.9.11-r1.ebuild
index cddcc940a314..66fea5cb1386 100644
--- a/games-emulation/desmume/desmume-0.9.11-r1.ebuild
+++ b/games-emulation/desmume/desmume-0.9.11-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/desmume/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.8.0:2
diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index cfcf4a8fc258..02cd0352d3af 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -2,9 +2,11 @@ AUX urbanterror-4.3-respect_CFLAGS.patch 1473 SHA256 7a6467e157d8e70c409a8cacde4
 DIST urbanterror-4.3.2_p20170426.tar.gz 10058308 SHA256 8009516332e1f77eae3681b436e099fdd42ffa55d2691694eedc0ca94b194878 SHA512 e8107ab44fdb40bc14a548239185905a01120bbe960b8713e5959df18330fd845761350c5e8e5efd5fbfec10ad62ff9fef68420406cc4cfbe2af69ee66eff1f3 WHIRLPOOL 6aac15e44b0695501195ae172133f4b6788b9dffa5442af20d11626ad27ffd597c7f070c0fb95b0e0e8b8b3d6cf0e1bfc40b0a16abaa27c8f932ee90f19a1824
 DIST urbanterror-4.3.2_p20170713.tar.gz 9984763 SHA256 cf1784a3bd00451fe1bda3267235ea3eee93da65880f15fd13c07681952b4859 SHA512 09fd2232c3cbdde001b8d037f2667a55a584378615f2da10c6815797748028f36b75c899ca4fd1d7d97a33f4b3ddbaa4d271b36b5eabf3bf9e81852ef15864a4 WHIRLPOOL 2bed79adc1dc338d74212263105c03bad51391f8c9e9e543ad54f6d6006cea4a8ebfc0e601400338b941d799dc0f642f71478dc68ad84a50718043f06f042290
 DIST urbanterror-4.3.2_p20170915.tar.gz 10061394 SHA256 fe37df609d763247a0bfaa7dedb33ca45a8aa523467b16f1a585ca8a08b03078 SHA512 d22bc3a0d8d191f797f5b1e7a0671424ca6dafbe5a3bd7fbfcd0e7249b9b4b6e790a64cdf7c93690d032b38f92aee703e9e302701084703d7a79d8f60cc2433e WHIRLPOOL 912201a55822dcf8423f77023f01882339739984dc9e9bdb5dca55763271c56158b47fd137da83d6e56c7625e49df8b5fc5299af646e91104e1f53cad9a50fcb
+DIST urbanterror-4.3.2_p20171016.tar.gz 10061989 SHA256 a345cae14ce1f445ef1ed9d883f4f06e0365fdfa05c50d2f34bfcdb89744e405 SHA512 b35bd08f6058d73eecd48304609f7064637e9f1fcad7b22a93a9fdb43f003b93c3c52f3e9a7fc4c468d70fed4ba687bcdcfa0c8749252a12d2eab1cf3ab956ea WHIRLPOOL d4a519b1c9a7e63a98e9901c815e73f1c467412f6ad6757dafd6c4afb013bd9c3d4da3155cdc91c728113078e466d39fa68c1bb404e8019ad75984bf683370ff
 EBUILD urbanterror-4.3.2_p20170426.ebuild 3969 SHA256 79c983e8d6ad44095d13ca8e059a581a71073895ce88672eb1a9b76421f11394 SHA512 ba6670fe91361a1017192bca67d6235c982b878916af4191392607f46367671b802d88befe8118042bc4798920db37d2be920c05f0aaca00c764b19d23c57adf WHIRLPOOL 68892849966d590a6f8869331e4fd764d077720168dba93f18c7b7dc00ce9ebcda4ef7580344e12c0702e72fe5d6469a0450348585b89f7345514298afa8d7ae
 EBUILD urbanterror-4.3.2_p20170713.ebuild 4004 SHA256 11a126c91c5bf155777ce5faaf9364b78ff964e6ea235c8d0bfdc3aa6ee5edb0 SHA512 def80468298e611f7a46bf453582b50f43748da4244d4ae62faeddb26809c6d8f18ad2afa9a0513e1ea3d87b8576df700d092e0412417cf99d63bb63a06df482 WHIRLPOOL e0f0e1f886992640385322e9bf29e8b8c0696a85eaf61d2c47c995a819b7ce95c17169acc5231a0ef8be83b67f70e5f642af11e954de9156fa8b609ab24e0bfc
 EBUILD urbanterror-4.3.2_p20170915.ebuild 4004 SHA256 7a1f1f1996b676412b226eb6f87bdd4d112c40300ed5537b795ba280286412c3 SHA512 73cbfce8f97dcbeaa621a6eca247a3aa496e0221c94dbf718f3a1af550dd9c346842e21fe2690d1ceb4a53dc0c7a70603907558c3c6c43b89f7b81dfc1e6bf8c WHIRLPOOL aec2645cbe2f72ea02ecaad009af408573ca92e1f835c9c6391f5e0e21283e4c882cbed85d95f6654c47d84daccb256362de26ce5f4b09795a3ec5291bc4bd23
+EBUILD urbanterror-4.3.2_p20171016.ebuild 3973 SHA256 ba6f66296fcf8507ce4da49b1ae380f9cb7320d485cfec95de838b704a7cceed SHA512 66f70132d2a855435e49d3db858b39b3dfffea3bf4fdd99849930724a3e9a9031583cda2fa08b4e51e7161fa9b0ecee43cb512920b448aa8ce72834eb4651b05 WHIRLPOOL 927ed2f2f7f8cda4236c33ad0a6f3a212227271ad80bf526bec601c5275071f2c48413b9ecefa16199c1d11090cb61acc3dd5acbe752d4eb97d8b302653ae8d9
 MISC ChangeLog 2861 SHA256 6a07b67b0007d36999171cc39cddb002e247ed978dac24bca50df23787244b87 SHA512 30a7d06750de5a6ce7cc16f8f34954e0a7f5596a1b75e67cc755404ade0fa731b5571bf51f3224ee6a70a9d8a2fb13abf60e218361ee92e68930336c044d65c5 WHIRLPOOL b6fd9e88efe71379fbcdee7cf2339ca2e2de7275aba3b7a8d6f8f45f1f031b6534f1f07ef233e4ef2fa0551ed23d9cc6136880dc23c2eaee3899797269df75d6
 MISC ChangeLog-2015 10015 SHA256 b3650a701ee283726d067bf6244814e3410f789158f0ec939e52261fbc9c7c47 SHA512 1a14a93b1c3b7786eabb0563ce6b10b5090df027d8b3b04a5a51838880190deb893a17f6e0336f810bf34ae549affccc6e5dd50dedb4ac59d87d8288bae1f7fd WHIRLPOOL 89734ece7c9e708b6e42f48c38c080aaab79dacb98d66f8031dd4ca7db705e90240c7f5ed3a92e6fe68488e0cc585b073d2c0a37bd55e39dcf0a8568f42cc3a0
 MISC metadata.xml 1022 SHA256 91dfa742a5e0abfbee69544d8e816505fe9860707a8186fe5904e263924b130c SHA512 77a9bf551d2e24b4cfd36196bd2d8d8e9a969f5ceb643144893a1b9485d636e59eb7db0f4b3758f38a454c1f4cbaf8b4582181fe59ae08dcea20b3ec0e4db130 WHIRLPOOL ed83dab78fbed48d453e4d5472958434775d85b601c3239360ed1cdf1ba760c0cb62fc87b02f716710dedaf0f4ea30eafcdbca821d8e8c1812bf63e15433c4b1
diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20171016.ebuild b/games-fps/urbanterror/urbanterror-4.3.2_p20171016.ebuild
new file mode 100644
index 000000000000..468e8992705d
--- /dev/null
+++ b/games-fps/urbanterror/urbanterror-4.3.2_p20171016.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit flag-o-matic gnome2-utils
+
+DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
+HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
+	EGIT_BRANCH="urt"
+else
+	COMMIT_ID="3e555ab1405c38556cbfcdd42eac23a4af49e633"
+	SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ioq3-${COMMIT_ID}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+altgamma +client +curl debug mumble openal +opus server voip vorbis"
+REQUIRED_USE=" || ( client server )"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.3-respect_CFLAGS.patch )
+
+RDEPEND="
+	client? (
+		media-libs/libsdl2[X,sound,joystick,opengl,video]
+		mumble? ( media-sound/mumble )
+		openal? ( media-libs/openal )
+		opus? ( media-libs/opusfile )
+		vorbis? (
+			media-libs/libogg
+			media-libs/libvorbis
+		)
+	)
+	curl? ( net-misc/curl )
+	~games-fps/urbanterror-data-4.3.2
+	sys-libs/zlib[minizip]
+	virtual/jpeg:0
+"
+
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+	if use client; then
+		if ! use openal && ! use opus && ! use vorbis; then
+			ewarn
+			ewarn "No sound implementation selected. Enable 'openal', 'opus' or 'vorbis' USE flag to get sound!"
+		fi
+	fi
+}
+
+src_compile() {
+	# Workaround for used zlib macro, wrt bug #449510
+	append-flags "-DOF=_Z_OF"
+	local my_arch=$(usex amd64 "x86_64" "i386")
+
+	emake \
+		ARCH=${my_arch} \
+		DEFAULT_BASEDIR="/usr/share/urbanterror" \
+		BUILD_CLIENT=$(usex "client" 1 0) \
+		BUILD_SERVER=$(usex "server" 1 0) \
+		BUILD_BASEGAME=1 \
+		BUILD_MISSIONPACK=0 \
+		BUILD_GAME_SO=0 \
+		BUILD_GAME_QVM=0 \
+		BUILD_STANDALONE=1 \
+		SERVERBIN="Quake3-UrT-Ded" \
+		CLIENTBIN="Quake3-UrT" \
+		USE_RENDERER_DLOPEN=0 \
+		USE_YACC=0 \
+		BASEGAME="q3ut4"\
+		BASEGAME_CFLAGS="${CFLAGS}" \
+		USE_OPENAL=$(usex "openal" 1 0) \
+		USE_OPENAL_DLOPEN=$(usex "openal" 1 0) \
+		USE_CURL=$(usex "curl" 1 0) \
+		USE_CURL_DLOPEN=$(usex "curl" 1 0) \
+		USE_CODEC_VORBIS=$(usex "vorbis" 1 0) \
+		USE_CODEC_OPUS=$(usex "opus" 1 0) \
+		USE_MUMBLE=$(usex "mumble" 1 0) \
+		USE_VOIP=$(usex "mumble" 1 0) \
+		USE_INTERNAL_LIBS=0 \
+		USE_LOCAL_HEADERS=0 \
+		USE_ALTGAMMA=$(usex "altgamma" 1 0)
+}
+
+src_install() {
+	local my_arch=$(usex amd64 "x86_64" "i386")
+	# docs from ioq3, not from UrbanTerror ZIP file
+	dodoc ChangeLog README.md README.ioq3.md md4-readme.txt
+
+	if use client; then
+		newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT.${my_arch} ${PN}
+		# Shooter as defined in https://specifications.freedesktop.org/menu-spec/latest/apas02.html
+		make_desktop_entry ${PN} "UrbanTerror" ${PN}
+	fi
+
+	if use server && ! use client; then
+		# dedicated server only
+		newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT-Ded.${my_arch} ${PN}-ded
+	fi
+}
+
+pkg_preinst() {
+	use client && gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use client && gnome2_icon_cache_update
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		if use openal; then
+			elog ""
+			elog "You might need to set:"
+			elog "  seta s_useopenal \"1\""
+			elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
+		fi
+
+		if use altgamma; then
+			elog ""
+			elog "You might need to set:"
+			elog "  seta r_altgamma \"1\""
+			elog "in your ~/.q3a/q3ut4/q3config.cfg for altgamma to work."
+		fi
+
+		if ! use altgamma; then
+			elog ""
+			elog "If you are using a modesetting graphics driver you might"
+			elog "consider setting USE=\"altgamma\"."
+			elog "For details take a look at:"
+			elog "https://bugs.freedesktop.org/show_bug.cgi?id=27222"
+		fi
+		if ! use client; then
+			elog ""
+			elog "You disabled client support. You won't be able to connect"
+			elog "to any servers and play. If you want to do so, enable"
+			elog "USE=\"client\"."
+		fi
+	fi
+}
+
+pkg_postrm() {
+	use client && gnome2_icon_cache_update
+}
diff --git a/games-puzzle/connectagram/Manifest b/games-puzzle/connectagram/Manifest
index 7dd79199bd48..7130a66d4eaa 100644
--- a/games-puzzle/connectagram/Manifest
+++ b/games-puzzle/connectagram/Manifest
@@ -1,6 +1,6 @@
 AUX connectagram-1.2.1-gentoo.patch 2551 SHA256 7f3a31432ff51b7a02a2308bb4405a1d7de2030999a9a7e173c3837556920c73 SHA512 a95856c1f76670d1ea1e86a34f8d05ed7621479d6268068df46c7b3882dff633e7a8236f01c9ad3215d0f6e89a5702d2ece106be3db971431b129752be272804 WHIRLPOOL 9a65158ad0a1105158b140257bc863e180ae68ae50c80c473ff83904da28a03ba988cd6bcd6d65c07994a2399ee7314a90b9d427670f55ff96ee49b911bb19dc
 DIST connectagram-1.2.1-src.tar.bz2 1632426 SHA256 0a559243a8d970bb79c6791214be879269fc073b5eaec6aa55fb60be82f140bb SHA512 0266af5680e7f76d517f60934afc6115c1118832fef237803b1b3d8c0fb785e5c312d585b099f24f4c476f124ca9722868a159dc4d1a9a8a695e9cdfa4f9c1c6 WHIRLPOOL 3862fee2f4a87c6d7a78bbbaa64713b640df2c0020dfb542eb5655b77c687ca105380ac96c29dc18a324ad90f8942d503044b25971d64c7862925290eccafdca
-EBUILD connectagram-1.2.1.ebuild 1019 SHA256 02b8b8894b18e49b237117c096c0daa0a35b7973430d27ce3a002b8703141811 SHA512 9233dbc7536af7402f76dbdf76913b0c85eb9cbcccf32be0e3087f43dcfeee25258bcd0dc653f38880677f1161abc3c75f5caf5ad61a48c54c9ea9a5c6a4d7e3 WHIRLPOOL 4fd640c19252c3fd3b31c3b751b3f7c9a71213423602e9963f621616c62a871dc12abe1e31b30283fa29df76cb89707d22a46cdd1e5bcdfc41a34bb030f349e2
+EBUILD connectagram-1.2.1.ebuild 1021 SHA256 4070a3c457a4c2c4f7f04043f72f217f929ff50df6f1911130a1d23ed67cabae SHA512 7f2a2a663b1f86a8b9f7f11d95545b4cae8d8d05547facc0f673e7b86383e81413934b1087a310b7d4c47b2733d2db0c7edb1135a450f3b2f92f20dcb11745e4 WHIRLPOOL a77db7d5a1cdcf63872594fee3829da34b5461a694e8d772201c312521943a65304e28f4fb173485bd13d794a431f67c83cb461dd4c7cde2ada429a2eb59e586
 MISC ChangeLog 3037 SHA256 cd37c1b84359cba541a4d5322e73d1c8d060d14d6ee64d71713b9d112ee25271 SHA512 858f88f719555dfd7e0a6e6e9f9ec3a924106d0a9a91f31b025eeb438efec71bfcf2f65101291162082889e69c5114219d47bc5968b10f798a2061a43454f52b WHIRLPOOL 01790bf7193de2c7af2bd94f7b07c7f2595a1152508db3db125bf082f107c983d1902aed93fed580422d85b9b6d0d7ca0daa7fb290d04f03a01cc2b50d293a67
 MISC ChangeLog-2015 2416 SHA256 62f4fde034f3cbe7b3f2441f780ec2c6a20c380562e0dadc94466a2c23f7b9ed SHA512 9667cba5c5ce02959c8d269c2beb7a20d84069f38aeff2e0fd9379a9aa62940457ca35c1a15cb735b2798dd63049f259dfd229a9edcc92b92e3746170b2181cb WHIRLPOOL 2019a56e7338f579a123d8b8b522e28ddc078cdab69a6deb7e7715e563ce88198833c165d4474a359a9472ef5d6fe09c3d0d5c3bc5b4f97cb8cc83106a6e705e
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/connectagram/connectagram-1.2.1.ebuild b/games-puzzle/connectagram/connectagram-1.2.1.ebuild
index 839c66c5616c..b573fb649921 100644
--- a/games-puzzle/connectagram/connectagram-1.2.1.ebuild
+++ b/games-puzzle/connectagram/connectagram-1.2.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils gnome2-utils qmake-utils games
 
 DESCRIPTION="A word unscrambling game"
-HOMEPAGE="http://gottcode.org/connectagram/"
-SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2"
+HOMEPAGE="https://gottcode.org/connectagram/"
+SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/games-puzzle/hitori/Manifest b/games-puzzle/hitori/Manifest
index 06614b91e41e..34195ae03312 100644
--- a/games-puzzle/hitori/Manifest
+++ b/games-puzzle/hitori/Manifest
@@ -1,5 +1,7 @@
 DIST hitori-3.22.3.tar.xz 462592 SHA256 ba21368d6d8475ae8cf0d39b62dab5eaec26ce82b3f067af50f1eded3a43b360 SHA512 a79e8f8f5e0ca4d202184fc301ddda44e2606ca911b9b3910e50f8ad218cd5047b8749e9c9798f970a107682c7f4fc49475be126c06cdd4a6914e1fa831ed7d5 WHIRLPOOL 8d62ba8d5d3988aab292c6c18e3f74a9de52f7b80103f35898d39624ab94fc994215f09ebee36512c45e5c5330cb44bdddcbc2abf21cae34f343450129325a31
+DIST hitori-3.22.4.tar.xz 471136 SHA256 dcac6909b6007857ee425ac8c65fed179f2c71da138d5e5300cd62c8b9ea15d3 SHA512 8c75824d29918c096f3a33283dcb2e49e227c8259d37a4ae5e77d420d4a18a2760f789e12f32cfb8ffc16bfdf19e4aca26d93719d6b762c15b9ac4dbfca93e1a WHIRLPOOL b38c0f3a6cc9831d093dc23c81d05755aba220c0c073ab9b995d6e441fe6ec84d5125d7208781889c9c00b5e575d21f92fb0d3709ac10c70338a7bc7dc5a471f
 EBUILD hitori-3.22.3.ebuild 555 SHA256 0468d0228120fb051d1c7ed864070a32f1b91b920ead3c176c24f2072a3937ad SHA512 5644692be1b2d64887746c951d85065832af2a36273f60619f29d159b527a2a7431c633c35e6fdcdb5b07c9ed2cb0cbdbb3182fe4058b766eef781b539960dc0 WHIRLPOOL d96ec5bf0a37b7a9147bc81e7e2402ddc7eb57713c67d08e92a2fdbd546d4445459eb296378e0309d9c719cb2e17982b892ec5df9d470e7eeb42b523faf4d518
+EBUILD hitori-3.22.4.ebuild 557 SHA256 207fccd380c865211887628444ea1fd03d1d01f77d5db5da89b28625d57b3764 SHA512 2e803915ae2ff4327bacb2933abedffa8d912324d6a45d0ef7184bb16b2e4b83a4f04a8e49719dedaa26b16ad1c26760fa752abbb4fa324f9d40a6a8dbc5ea2f WHIRLPOOL 91cf557a41cfa9caa2934345c8258afeb5cafaf8a5333ca7c5f2227d593788a5d8c400de7428d534033e451cc3291e70fb296a696c8f6693d8708bedb1f12941
 MISC ChangeLog 4342 SHA256 b6f4585115d831d58d05bccd49c03c67b300ea36e12faa5fcd8f934f16c05fe1 SHA512 8c3953655e7387efe50c4174bc918ec30f1b4adbb13f0f782515a5eb59b1ad9e920b8b0e1d78c4e6cc8dbd07d834b81f745250371f5409ceeeb4b5b39e43ef9c WHIRLPOOL da909411b47df2fa02d53b65ce3e8f07ceaa207fd6f1e2ee02cce2d088dc57d31e05f7e912fbe28eba9bb67b722e2ef56bdeeb2ebe0c497bffc1fe7972419e64
 MISC ChangeLog-2015 708 SHA256 d8821c1a4ecf57052d3beeaf9c54ac037d2d688d70677fe2ed4cee6193ed1a34 SHA512 e13964e07be88080350a3afe22923e4490d7a452e73a1f4e9b401404c92fffbcaa686002150dbe165a022018ba63f8c8e3e97efefac1aa75ccb734c12d95ac04 WHIRLPOOL 5bbcc71d1940e89f0cd183d75a55f4d65b7230dd53df93937a6901aea5b0c008d2c42e81f91fc021ede4836997a37825247d47b83b59e2468935946884d4ee06
 MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/games-puzzle/hitori/hitori-3.22.4.ebuild b/games-puzzle/hitori/hitori-3.22.4.ebuild
new file mode 100644
index 000000000000..6c4369571ac7
--- /dev/null
+++ b/games-puzzle/hitori/hitori-3.22.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Logic puzzle game for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Hitori"
+
+LICENSE="GPL-3+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+# gtk+-3.22 for build-time optional gtk_show_uri_on_window usage
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/cairo-1.4
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
diff --git a/games-puzzle/tanglet/Manifest b/games-puzzle/tanglet/Manifest
index 225feceaeadb..fd33972c2213 100644
--- a/games-puzzle/tanglet/Manifest
+++ b/games-puzzle/tanglet/Manifest
@@ -1,6 +1,6 @@
 AUX tanglet-1.3.1-datadir.patch 732 SHA256 58136f0cc97f0cd16c43443c15ec6cc268f6a9eb50c1e7bb3c8e39fd5f7c1f19 SHA512 35442f4b9bfe344c7168048ccd7d0742319b6ab3078d9df13fe66455d45b31a5bb01f7e4ad05b4ba25c83046bfe1428f6a2271231130c433ceac1b18fd405414 WHIRLPOOL c083764d1401ee11b18f70e8d464980b99dfbb1c544eb15ea2220509de61c1e9e0046d0b9337efd8d47b8642348a071f2ac8da33563d53038d73bb7611365f54
 DIST tanglet-1.3.1-src.tar.bz2 8461603 SHA256 d0eab174eaa8cdd5f3499ae275db4cd720172ef28346273db7f5988f2304e0d8 SHA512 b939ca45f26baf8e7e32da8775e673707472e5cd07d344642eeb15986ff99319e0ab1bacf78e2ea49f004ec67a6d081a91c939cf7c75228a195654d429235625 WHIRLPOOL e2ee97327b95b502b603c953c4b42636fd060f8476bd0787f4d7527c9ebf04774868bd0f923f5b7e89e24e4123143b87e8d9859087685fd62d83c46da26b145d
-EBUILD tanglet-1.3.1.ebuild 1351 SHA256 a63009527c4e2d29f1ddccd8cd516f67f6657dfc0c19afad816d35a8090d8fb2 SHA512 1e8c2208414882aed6bf72040cddfb91652fd7886324a15170e965d33ea0022e35a4a601a649cf7ad0e844a88b0a165f4c71a3bf18fa1468965405b0a2b338d8 WHIRLPOOL 7bea3575a1221702d0d4dab889dbef5b8b34bba8907c200494f19e84eaefc4330c500ddc6e3aa6ddcf044eeb798397c6b1eb6f9aec7b0f8884bb05e882cac894
+EBUILD tanglet-1.3.1.ebuild 1353 SHA256 9721ed650788454f3a45c874f77de364d31e10079a0c2f712c652f8dfde86df4 SHA512 6e3bdfb1745810164a792655e7a3a4c3c2e79c70c8e6bc204686d0742134281fd9e1d7c72f24afd6caf15d74feffdd06756e40201bdfc8e750d0875699229180 WHIRLPOOL 1d33977b58a4cb2b48e21142df240e87a70ecafcbc8e44ede97ec064f6f0b3810f9b850f5d090deda63fd6dc1793dbbec697140d8c6b64b3e2d1bdf21b8b5695
 MISC ChangeLog 3343 SHA256 3759baa380e377f070793a54d2815995c835415a0d9f2cc2a6443646bb603f62 SHA512 f17241c3d96301c17d3425dafe84c72ebc017650fea4732a996a17ea5fa9654969eed4df65eed598d6f96cfc0e3c664fcf9d0dcf7d6e0b3afd8cf6a529150a87 WHIRLPOOL 757011db35fd4ea174e6dc4057f2fa99998db8b94333423e1fa337b4dbcbbde614edd715b72c14367be8ef0197fe1e8bee79dcc9e8321f6242e50b58fd397c5c
 MISC ChangeLog-2015 3214 SHA256 2d56ffb1c8514c72c98f34b6cb92a918855c96e6ad42fa425ab34512cad24a3b SHA512 9416bf6d6de6b55f69b8da5531f847eec9857caf7e4396b5955561179bb318b6bcb771f9dc5413bcea3eb770d1dc87ecd25848e2c411236152526fb6966f3062 WHIRLPOOL 44228d4067c9b7bd315d31b9041223b71cd83d36f3e7056f0b00764753e58de87b82e97f594484612402e67caa3ddcf69d9dcb4f5c682db19fcda2958f17482d
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-puzzle/tanglet/tanglet-1.3.1.ebuild b/games-puzzle/tanglet/tanglet-1.3.1.ebuild
index f4b75b9ca69d..93d45133ff1d 100644
--- a/games-puzzle/tanglet/tanglet-1.3.1.ebuild
+++ b/games-puzzle/tanglet/tanglet-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,8 +7,8 @@ LANGSLONG="es_CL"
 inherit eutils gnome2-utils qmake-utils games
 
 DESCRIPTION="A single player word finding game based on Boggle"
-HOMEPAGE="http://gottcode.org/tanglet/"
-SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2"
+HOMEPAGE="https://gottcode.org/tanglet/"
+SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/games-roguelike/powder/Manifest b/games-roguelike/powder/Manifest
index 8dbd936f259a..ebe94426edca 100644
--- a/games-roguelike/powder/Manifest
+++ b/games-roguelike/powder/Manifest
@@ -1,5 +1,6 @@
+AUX powder-117-gcc6.patch 354 SHA256 38b351a9946a7cd08193b3c9099129f8d2d75ee7c0305b22e71d15a5881cfb77 SHA512 7d486a29bad2b389cd6e772c44227b2475dce7630e8fd2932bbafb0f52ba3f3ae3af1eaccdd69e3c3742cec1a9d80b98d9d8527591dd14383e70131620270db6 WHIRLPOOL f994f120ee2476b049b8965a34fe153a21d8112ceb752b9b98dfa67389264bd153fd49b930ecfbb2dff6af04cdcba61b2ff8f66e9e0e72597a162085627d744b
 DIST powder117_src.tar.gz 1891043 SHA256 070346921ee83bc40943b1e1cb576ab3222cecc319fe10f5c138a4deec85e861 SHA512 cdbf67d6d582af39c40cc0872411725d0c296326b21cf8efbe7c7ccd11cd3c831ad129e5e91fb661f938a399ac799509e5123653494f54398c55750026bc6736 WHIRLPOOL 86d5ecfc92b6b1786fa798451f39c6825f8b40483397b240a150ed96d8ad9950d9b3d5cda65f12f8027d997d48d888d15185c48b31dec166b1b1f6ecd462e48e
-EBUILD powder-117-r1.ebuild 871 SHA256 6cdf693638b61d517b6e6b8503ac35f80d5623f95367a5226c892d68c7d5b03b SHA512 6260741f63bfd5c4236e16fa0fc061f0cd13576f8889db0dd3effe5191481fbc52bec6940c29ef1efbf024a5c156e0f18c73e0f70e0d210f2dc1b7b57074802f WHIRLPOOL d8b530131fe5f04ca8b096bd55a7e9f169e35cf36cad8eebd547508645fb70632ba752348f908f2858832d53b3a48530aa7741c931e71c2be2eb3231d0e59981
+EBUILD powder-117-r1.ebuild 919 SHA256 cbc7d4475a3010da373f6481e628aa77b2c9d72088c10d1e9b66f00184215c0c SHA512 592244d7bf3452a1c4cc5cb4db8f88e8c849346dbe95ce0ec9f85b21b40440bbf5ec8999d738cb8836a4c08d2bde92f7fa635c93a1ac007525f9e03373bb1bef WHIRLPOOL 6139eb65ba01ab72475de2b4a45bda7881e65685e9135797b749fbeb36a035c1c1e157c061ff72097c765f3897de3a43d93dcbaba89de614f9cbe6dc5d487a0b
 EBUILD powder-117.ebuild 915 SHA256 e92d63e1511d632ef6aea94c9490b95cafbc4cee6b6e834ed57d74199b96b845 SHA512 0e7d46cdd559085b851e72a8e1200539e9db2ccc9e73184462762fe5704ce2ee0dac92e3b021dcde7e590ad9a0ef011f845733f122ef712e85c4da34eb549264 WHIRLPOOL c6cca6679dd3b41c5fab85757ac6cff0e185cdbbb0c70dd5784d7ed583c6d2f59b17347dfe7762aa0d088ecbaf96de8ba0863df6aad947dd1e40222981c1187b
 MISC ChangeLog 2673 SHA256 3489a8475f499caa6cf90158edf9ca719cb9b8a3820a51c6465f11401391488b SHA512 95d68efcb663cbd3959b8c48f53d53a280974a0d33f7a6825a675ab61d661262d0fadc1e375215297d0ac4786f96bffbc17eaa8a917506b561100e2c722b5abc WHIRLPOOL 12c7571cd8e490148e17fb51cbf42bd93f04a8c2de51eadf0cf8e045aac3e914abafd2dd7f35ac661da2e486639674e0de67feb40204a7406397de854cbb4c09
 MISC ChangeLog-2015 2699 SHA256 431a1ee5d5e89284af93043fcb5c27e2d99de258b83c47a14ffc13b5256a420c SHA512 919efe8c5da408c7263b0a90323b58448a649e3bdc6a8c5f5ba8ce6664c1a41747227b288a29e429ec7fe7209903ce7e700d2115c59557c2d77bcd9b78e1676f WHIRLPOOL 79801acf7f33fb9873e0d55752d69328c193f4a7991f17ed65969d569c4e908353f7c7e68c452e75feab4464cfd2edefd3b4ab91de4d44974d175fedc66dad01
diff --git a/games-roguelike/powder/files/powder-117-gcc6.patch b/games-roguelike/powder/files/powder-117-gcc6.patch
new file mode 100644
index 000000000000..3a9b7f2af541
--- /dev/null
+++ b/games-roguelike/powder/files/powder-117-gcc6.patch
@@ -0,0 +1,20 @@
+Bug: https://bugs.gentoo.org/598928
+
+--- a/source.txt
++++ b/source.txt
+@@ -13400,13 +13400,13 @@
+ 
+ BRANCH MAIN
+ {
+-    symbol	'\\207'
++    symbol	static_cast<u8>('\\207')
+     welcome	"%U <return> to the main dungeon."
+ }
+ 
+ BRANCH TRIDUDE
+ {
+-    symbol	'\\211'
++    symbol	static_cast<u8>('\\211')
+     welcome	"%U <enter> a cave made of metal."
+ }
+ 
diff --git a/games-roguelike/powder/powder-117-r1.ebuild b/games-roguelike/powder/powder-117-r1.ebuild
index b0199fe9fa0d..e7c6acc40057 100644
--- a/games-roguelike/powder/powder-117-r1.ebuild
+++ b/games-roguelike/powder/powder-117-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,6 +20,8 @@ RDEPEND=${DEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=( "${FILESDIR}"/${PN}-117-gcc6.patch )
+
 src_compile() {
 	append-cxxflags -DCHANGE_WORK_DIRECTORY
 	emake -C port/linux premake
diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 8ce1f8284b92..5023d8d18daf 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -1,11 +1,14 @@
-AUX stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch 1802 SHA256 535964d2040d36db3fa45b0ca5c3c7aab03068256e98a96a53265019b8734161 SHA512 7830614f564f5fbfcca18629197e81b8edfa8f31656544ca7c9169c15f5cf6f89fcc98479fcd0d9ca5b742f1d8490d49c8a1e0e4f966724ce4035313b3d5af6a WHIRLPOOL d328c6bec23e0760323d70c22ba1a9534467e42fd2613002f4458a4d4b693105f01ae7dc158c844a3c0a26c1e63e2d26218508d2b2a88a6aaeee57390dd6da7e
+AUX stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch 1804 SHA256 8bc9f9413aff2834194d7a0cd4796af6e3b65c0b3752f5a5416dce4305ed108b SHA512 ff9ca921fb192592bda24f430961335875529a5a310d01ff6b5103b37102006b2129ca7be144bb677175d6efef9324798caa6250f4aedad4dc14b690d8b2f14c WHIRLPOOL bf449a8bc78b7945e35e207d6698a37adb8a5a77ffdd70a4afd93203e7bad78e03a3b71a7dc088871d5a31a70669b1181fd48ac40bf8514a13e07b2d070e218f
 AUX stone-soup-0.16.2-perl526.patch 2189 SHA256 cabdd4c0263a661cac20cf14bc0b84cd814b787ef3b3fdb3aeabc3f6eeef67d6 SHA512 7433e87c5acedb72012fd98a047207da38759497f26a9286ff4fe345090135fd1240c63c1723d9369f37569ae38aa0c7a76d89375d9a803f77c346411339bd76 WHIRLPOOL 560e7e7c65748cca1f85e3b9b9a1c3ff2b91a2d9f1778e0abdf1117096addd83785b809992f7244af8dfe9636a0a2a6517fe83f16695ee44446658ba35452e8c
 AUX stone-soup-0.16.2-respect-flags-and-compiler.patch 3075 SHA256 fd7d351447a4e308141263e8d20ad5086e3a9bcdb180555a1512d749ff3caeac SHA512 dc12c240bce0bdc94ea1b76da0e435b7bbfc51fb22c0bcbe4f2383740262c2cf43efd03dfdfe24a162b07059f5d74e64d0e66d902c02e743b05f75d3186b7fb9 WHIRLPOOL 3c33e95c1908dc153355214cf52d14a4058be16359e9b48539fa4b9aeb6def097e0e3732d29601a8a61c142f97220f6c300182319eaae0433fdb0561155aa733
+AUX stone-soup-0.20.1-rltiles-ldflags-libs.patch 1376 SHA256 e7840af84e97571bcf402014edd2d02ca1b3321ea1fdb33bfd8e42e5489aca63 SHA512 ad139978d67df1d824a772f70d331779ed56cf2cce30c4022804740afd77b6d8b22badd9d20af47b4df0a60499a914f749a3520a5ea76ae3e14795d2bf07affa WHIRLPOOL a8c414ecce6eafcc3895a65d470778987ed95f2ae099cc50d67023b76d20b376076441825b67a6787d029413229ad452d7fb394c69d7ead9f3766b2879663cdb
 DIST stone-soup.png 1351 SHA256 486da51db277817f6fa59c32b131fa4d50cace7d8c9a84995d22f13a92e384e1 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc WHIRLPOOL 621b93f192d9335f57b18a72489450511be993f79ac5ea26529d3424adcddf1c64cb2c996fa1265cbd341a31dabe550253d0302c941fcd751197aff7840acee3
 DIST stone-soup.svg 68546 SHA256 f2b476f57f6e8a9b56bc20ec2da0accac9376fea1ff3e4dbe59e7f2f231eb071 SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f WHIRLPOOL 49b7e0ca45319b2f016203e02b1e08207e9f0c18501b17f5922f1983fbb6bfabc12a9ca3199697f78561739e253f200bfbe984082bb99e1c8e289e5c41004bed
 DIST stone_soup-0.16.2.tar.xz 27843008 SHA256 49d5947abb341eb7f0590fa538c475e68ea954064c615d852de968211b68780b SHA512 fc48a1161028fbfc3c1b91bf717ffdeb761dc03a12aa8282f2235fe86368de343dd91ee33371fe4f682f4f84a8fc339d6984b6357527c3cf0c4139cb69cd5633 WHIRLPOOL 2016018e438e857031c382e53e904126efd7006a1da4b954b3b5eb4f5a9263e8535e7300fa8f54f8a870bf99b362cc0bdda630ea562e2f786e3d88c5b38d0c54
-EBUILD stone-soup-0.16.2-r1.ebuild 3643 SHA256 aa5b9b64f66914f04950432a8665ac80ea119df0a82414e3dd0a02dcc37b6a7b SHA512 837ee2c3570b0a6a7e75f2b4d6220d90099eae1c16a84368cc4173e12bb661ddcbd32af2bb29510d443fc8917c6fcb3feab65406550f95657d8563bd4750e22e WHIRLPOOL 0e42569f07477f52657477cf60e8a6d7463a2279916d9125c501f00ebd476e758c734b017baa26e16c227451d1899776a89e402def33a7e5d9215a68128cebc3
+DIST stone_soup-0.20.1.tar.xz 28372712 SHA256 77d238bd859166e09bbf56127997f810d1c9794e1cf4a0d1edc0687b6f194dee SHA512 420ccc3c66977da8ae15f9c0465b01a6260ad5db450efced3041455674922e714d9aaed226e1bc32fa3c22bca1ec06bd91979a9378c6ab08fbe1d2bfc3f0da4a WHIRLPOOL 1057a0b86df62ebf8491274b37719691c4c709feb478c684882c465a7fd2c8f977bdc7b6a9c2990a47a42c2ffbdf4187a4da705a3c31e0a3a174e909af8ebc34
+EBUILD stone-soup-0.16.2-r1.ebuild 3645 SHA256 ec21234c0736769ae1abacf779eb6564f36ab7300633e026429965b569bd3fc2 SHA512 a0e2283fb4450d32ce0fabca94938a62347ca8c3e19c44a2bd84d325464370ac54cb4b363287b169346a3b566bceae7d677008a124407a73fee033dd78401c78 WHIRLPOOL 23ef661d5a0e7bd77c858d1ba6f0bb3843e6db7f92e01d683788e432b03ef5622b3bfa554186cbf72a6b6d53607b74a31088c3316cc820d23c7a1f14a65b364e
 EBUILD stone-soup-0.16.2.ebuild 3738 SHA256 1a3f9505130541f4882448b7554a6bf8d01688918c169743dfa803177d526398 SHA512 8bbfa57c78c5fad691c53778c5a93140f1ec48e8abbfbb90721171b951630b069c322032c81cd783d46688c871ff8d1d9f0f2f4039fedb5b353467afebc95afc WHIRLPOOL c08ced69367a9fd538a20d05036e738eb1eeca705ce3397aaeb766bc4c9dccd8aa1b938fece6eff5c2493b37b28386bc49f2e7379daa6eb94b0088840a481258
+EBUILD stone-soup-0.20.1.ebuild 3567 SHA256 50cb2a92f1812cd5c579a179106d7432d9684e104ab04f4b4325848d75941491 SHA512 f796f07117afbc7f2051e1423c8192939aa3edbcf427be5ca0bb86d12f377280fc10b13850420505a423ad1f8a8153ac72800bbfee31441c25183b2ced45f137 WHIRLPOOL 541ddeade9be0a0c59f2bf4d94b66864ba450cac8a2729b7879b2cb3fead8f927759a95ed0261110ae29426ef7248921a80741433dfdda19524e330bbe7d6e9e
 MISC ChangeLog 6460 SHA256 3724e2b9126426f4ae5d55aa9ef6862ad4dfe288bc8547df7706da4b21515f43 SHA512 601c36c394297e77741675f24bcb1a42f47a2e9ecb6103cf42255d3c518f3532cad6a0fa4b0b5409ee7efbcb0e3f12f75c10b91e6214cf30b91161b3751425a8 WHIRLPOOL 30bdcac1ad5e75ec4c4f894e89344b14c1fa97baf32c29956d8d5e9f8860c77713c234df1edf959c7c4a180e51673eac896511bea2a7423cc25b26b02bb796eb
 MISC ChangeLog-2015 7439 SHA256 ec9122ef3b534e63ea74bdbe093186e13f1e2e477e96dc4639990452c88039e6 SHA512 a2c08caf62a47422614be9d170f31f24ce702c5d7a8bbc528566c91f8285b171b71a122a0baba4d28785a276d76c444e60a17f53c34844a696e3f94dfcce2b6b WHIRLPOOL b388b1318ef1866b71b111de8f73d24e7d66833e78f9eeb3c0a7e32ab2802a32b8b2cf155981a382cbcfc0d6779e553d1a9f3e2efcf3b651297eb50e1a3da818
 MISC metadata.xml 1666 SHA256 ce36b2eb1bdefb43dd075ce8f2992f1fcdcfb67ce4e17e17056579ef6bb85da4 SHA512 e3d0317f0aca8cae787aa7e659d07f6cf024ce7a983f87b1c54e91a955df96dd4daf570e56eb73c877601855b0fe26041943672dc2f51e5208742e91dd3e84e7 WHIRLPOOL afad12a083da1b9b8a65758992b8119ec9fd56cbfa9b2fb01dcb75a81e2cc6ccabd67b3b0426d91654681fd468ade03b5e88d2155d60cd4fd0c51f8db856b6cc
diff --git a/games-roguelike/stone-soup/files/stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch b/games-roguelike/stone-soup/files/stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch
index 0c029c9f0966..e0b676c3d2e7 100644
--- a/games-roguelike/stone-soup/files/stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch
+++ b/games-roguelike/stone-soup/files/stone-soup-0.16.2-Use-pkg-config-for-linking-to-ncurses.patch
@@ -18,12 +18,12 @@ index df51e70..2db2781 100644
  ifdef LIBNCURSES_IS_UNICODE
 -NC_LIB = ncurses
 -NC_INCLUDE = $(NC_PREFIX)/include/ncurses
-+NC_LIBS = $(shell $(PKGCONFIG) --lib ncurses 2>/dev/null || echo "-L$(NC_PREFIX)/lib -lncurses")
++NC_LIBS = $(shell $(PKGCONFIG) --libs ncurses 2>/dev/null || echo "-L$(NC_PREFIX)/lib -lncurses")
 +NC_CFLAGS = $(shell $(PKGCONFIG) --cflags ncurses 2>/dev/null || echo "-isystem $(NC_PREFIX)/include/ncurses")
  else
 -NC_LIB = ncursesw
 -NC_INCLUDE = $(NC_PREFIX)/include/ncursesw
-+NC_LIBS = $(shell $(PKGCONFIG) --lib ncursesw || echo "-L$(NC_PREFIX)/lib -lncursesw")
++NC_LIBS = $(shell $(PKGCONFIG) --libs ncursesw || echo "-L$(NC_PREFIX)/lib -lncursesw")
 +NC_CFLAGS = $(shell $(PKGCONFIG) --cflags ncursesw 2>/dev/null || echo "-isystem $(NC_PREFIX)/include/ncursesw")
  endif
  
diff --git a/games-roguelike/stone-soup/files/stone-soup-0.20.1-rltiles-ldflags-libs.patch b/games-roguelike/stone-soup/files/stone-soup-0.20.1-rltiles-ldflags-libs.patch
new file mode 100644
index 000000000000..010c729b92eb
--- /dev/null
+++ b/games-roguelike/stone-soup/files/stone-soup-0.20.1-rltiles-ldflags-libs.patch
@@ -0,0 +1,45 @@
+--- a/rltiles/Makefile
++++ b/rltiles/Makefile
+@@ -1,7 +1,7 @@
+ uname_S := $(shell uname -s)
+ 
+ ifneq (,$(findstring MINGW,$(uname_S)))
+-LDFLAGS += -lmingw32
++LIBS += -lmingw32
+ endif
+ 
+ # Note: since generation of tiles is done on the host, we don't care about
+@@ -29,7 +29,7 @@
+   endif
+ 
+   CFLAGS += $(PNG_INCLUDE)
+-  LDFLAGS += $(PNG_LIB)
++  LIBS += $(PNG_LIB)
+ 
+   CFLAGS += -DUSE_TILE
+ endif
+@@ -39,13 +39,13 @@
+ endif
+ 
+ ifneq (,$(findstring MINGW,$(uname_S)))
+-LDFLAGS += -lgdi32 -lwinmm -lole32 -loleaut32 -limm32 -lshell32 -lversion -luuid
++LIBS += -lgdi32 -lwinmm -lole32 -loleaut32 -limm32 -lshell32 -lversion -luuid
+ endif
+ ifeq ($(uname_S),Darwin)
+-LDFLAGS += -framework AppKit -framework AudioUnit -framework CoreAudio -framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL
++LIBS += -framework AppKit -framework AudioUnit -framework CoreAudio -framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL
+ endif
+ ifeq ($(uname_S),Linux)
+-LDFLAGS += -ldl -lpthread
++LIBS += -ldl -lpthread
+ endif
+ 
+ # Attempt to use a full compiler name, to make
+@@ -134,6 +134,6 @@
+ 	$(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@
+ 
+ $(TILEGEN): $(OBJECTS)
+-	$(QUIET_HOSTLINK)$(HOSTCXX) $(CFLAGS) $(OBJECTS) -o $@ $(LDFLAGS)
++	$(QUIET_HOSTLINK)$(HOSTCXX) $(CFLAGS) $(OBJECTS) -o $@ $(LDFLAGS) $(LIBS)
+ 
+ .PHONY: all clean distclean
diff --git a/games-roguelike/stone-soup/stone-soup-0.16.2-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.16.2-r1.ebuild
index ceca0ef94f0c..c9d46d428dbc 100644
--- a/games-roguelike/stone-soup/stone-soup-0.16.2-r1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.16.2-r1.ebuild
@@ -37,7 +37,7 @@ RDEPEND="
 		media-fonts/dejavu
 		media-libs/freetype:2
 		media-libs/libpng:0
-		media-libs/libsdl2[opengl,video]
+		media-libs/libsdl2[X,opengl,video]
 		media-libs/sdl2-image[png]
 		virtual/glu
 		virtual/opengl
diff --git a/games-roguelike/stone-soup/stone-soup-0.20.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.20.1.ebuild
new file mode 100644
index 000000000000..6046f53ae7e5
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.20.1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+## TODO
+# add sound support (no sound files)
+
+EAPI=6
+VIRTUALX_REQUIRED="manual"
+inherit eutils gnome2-utils toolchain-funcs versionator
+
+MY_P="stone_soup-${PV}"
+DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
+HOMEPAGE="http://crawl.develz.org/wordpress/"
+SRC_URI="
+	https://crawl.develz.org/release/$(get_version_component_range 1-2)/${PN/-/_}-${PV}.tar.xz
+	https://dev.gentoo.org/~hasufell/distfiles/${PN}.png
+	https://dev.gentoo.org/~hasufell/distfiles/${PN}.svg
+"
+
+# 3-clause BSD: mt19937ar.cc, MSVC/stdint.h
+# 2-clause BSD: all contributions by Steve Noonan and Jesse Luehrs
+# Public Domain|CC0: most of tiles
+# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
+LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug luajit ncurses test +tiles"
+# test is broken
+# see https://crawl.develz.org/mantis/view.php?id=6121
+RESTRICT="test"
+
+RDEPEND="
+	dev-db/sqlite:3
+	luajit? ( >=dev-lang/luajit-2.0.0 )
+	sys-libs/zlib
+	!ncurses? ( !tiles? ( sys-libs/ncurses:0 ) )
+	ncurses? ( sys-libs/ncurses:0 )
+	tiles? (
+		media-fonts/dejavu
+		media-libs/freetype:2
+		media-libs/libpng:0
+		media-libs/libsdl2[X,opengl,video]
+		media-libs/sdl2-image[png]
+		virtual/glu
+		virtual/opengl
+	)"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+	tiles? (
+		sys-libs/ncurses:0
+	)"
+
+S=${WORKDIR}/${MY_P}/source
+S_TEST=${WORKDIR}/${MY_P}_test/source
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.20.1-rltiles-ldflags-libs.patch
+)
+
+pkg_setup() {
+	if use !ncurses && use !tiles ; then
+		ewarn "Neither ncurses nor tiles frontend"
+		ewarn "selected, choosing ncurses only."
+		ewarn "Note that you can also enable both."
+	fi
+}
+
+src_prepare() {
+	default
+
+	rm -r contrib/{fonts,freetype,libpng,pcre,sdl2,sdl2-image,sdl2-mixer,sqlite,zlib} || die
+}
+
+src_compile() {
+	export HOSTCXX=$(tc-getBUILD_CXX)
+
+	# leave DATADIR at the top
+	myemakeargs=(
+		$(usex debug "FULLDEBUG=y DEBUG=y" "")
+		$(usex luajit "" "BUILD_LUA=yes") # luajit is not bundled
+		AR="$(tc-getAR)"
+		CFOPTIMIZE=''
+		CFOTHERS="${CXXFLAGS}"
+		DATADIR="/usr/share/${PN}"
+		GCC="$(tc-getCC)"
+		GXX="$(tc-getCXX)"
+		LDFLAGS="${LDFLAGS}"
+		MAKEOPTS="${MAKEOPTS}"
+		PKGCONFIG="$(tc-getPKG_CONFIG)"
+		RANLIB="$(tc-getRANLIB)"
+		SAVEDIR="~/.crawl"
+		STRIP=touch
+		USE_LUAJIT=$(usex luajit "yes" "")
+		V=1
+		prefix="/usr"
+	)
+
+	if use ncurses || (use !ncurses && use !tiles) ; then
+		emake "${myemakeargs[@]}"
+		# move it in case we build both variants
+		use tiles && { mv crawl "${WORKDIR}"/crawl-ncurses || die ;}
+	fi
+
+	if use tiles ; then
+		emake clean
+		emake "${myemakeargs[@]}" "TILES=y"
+	fi
+}
+
+src_install() {
+	emake "${myemakeargs[@]}" $(usex tiles "TILES=y" "") DESTDIR="${D}" prefix_fp="" bin_prefix="${D}/usr/bin" install
+	[[ -e "${WORKDIR}"/crawl-ncurses ]] && dobin "${WORKDIR}"/crawl-ncurses
+
+	# don't relocate docs, needed at runtime
+	rm -rf "${D}/usr/share/${PN}"/docs/license
+
+	# icons and menu for graphical build
+	if use tiles ; then
+		doicon -s 48 "${DISTDIR}"/${PN}.png
+		doicon -s scalable "${DISTDIR}"/${PN}.svg
+		make_desktop_entry crawl
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	if use tiles && use ncurses ; then
+		elog "Since you have enabled both tiles and ncurses frontends"
+		elog "the ncurses binary is called 'crawl-ncurses' and the"
+		elog "tiles binary is called 'crawl'."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/scorched3d/Manifest b/games-strategy/scorched3d/Manifest
index 43f2393ec072..84e3050a2f4a 100644
--- a/games-strategy/scorched3d/Manifest
+++ b/games-strategy/scorched3d/Manifest
@@ -8,7 +8,7 @@ AUX scorched3d-44-win32.patch 464 SHA256 325ec09315a102ebb2290007c28fe263771991a
 AUX scorched3d-44-wxgtk.patch 7001 SHA256 6e3e210addeae643f353496c47fa4cebd11e46d0bcf11c7848d51108cecaec6f SHA512 99e21ff6854bbea676c8ea0a5ef2b28a4d6020b34fbae134d9346d4febb7b6defbd39cb712f29b3dcff7ac829b2e76275a85d7d740e921835898f550c4471120 WHIRLPOOL 48fdb4f6636a6d19035236665c9256cd410adb50209ecaa2306e4084b8090ef5c3fdc9050cc6a50c7aa4828fc696ae70b2b232d74ba2aa226920843bc11af4b5
 DIST Scorched3D-44-src.tar.gz 41689613 SHA256 1c8320bb2210030be71dd713c214fbd32f7dd663ea82031383e6b3636f8a8dba SHA512 27341d12ef9db5b64c1051a8abe45cef8a957e26c2cd8928f64c071589052d2857fc6f8104772bb67d5d348aef14122a117d9e00d61e4d9f963f3b5bbe5859ca WHIRLPOOL 6b7c744702b86df856d8879454e7c9616e31dc3a9f539bd97c53cba4bea0e59f44e3c703f847f3cd505ba0e90386887f7134f9500421b3d58ba12a9cc1fdbc0e
 EBUILD scorched3d-44-r1.ebuild 2221 SHA256 d9fff21262ba08c74da8f057e1ba379a46deeccfc6eb88b76c0bd6524576d4a6 SHA512 1cca46096ecf2cf87a913733a1e92777a44f91bdc721a0c78b046380adda16a25f229afb0a223c3c4e945adce85610f0b1772d9a0f9042d85908828bbb2705a4 WHIRLPOOL da7a5d351e4bf19cf7d32d378d73daf75b154fd73392d557bbefa9077bc328f041c0b82850c62eac1cd832a3bbe30ac28a86bd7ae09377a92fb864ae49500fc3
-EBUILD scorched3d-44-r2.ebuild 2309 SHA256 70cd4051872e03c3a8becb94e86ba47c530de915765da0e14994f3402b9383f9 SHA512 a2d4eaef9edaf09e94b593f45daf753f1bb56acba327fbf57fbbfe6de69875030f1d56a794b1bb9f804e336545ed945e5ca036d937c8dd363435167a759a0fe1 WHIRLPOOL ef84d9049bcfd61f010d07a45041047af37d52cd34148510ad4a5bc5c49efdf199e4337acc60e05f72d52ea41d0133b4c42c6cf91d9410b4dc49fc32af6854f4
+EBUILD scorched3d-44-r2.ebuild 2308 SHA256 8dfbf0f77a4db56ac5fa6e309a446ff7e04f2423f6d56647529130de48179141 SHA512 18c56bfe40c9a343c6c698fb39ef18426e16ccfa2273f42533a5b1bb3b121213e68b40eb491cdd11ff5f9852177a3f7db7ad35a03ac4e689a7b11f5b8171763c WHIRLPOOL 150aba34c4b5b962eecfd6b08e81fb2fec34265af52592adf87e840509ba9ff5f7049ce8f613b9149447c17bf181a6f630e5c8917799f01bcf81ca0349e51fe3
 MISC ChangeLog 3881 SHA256 7d78ef5132c961a884ce8ea88129b5c1bd405697787209f7c881ecef2a0786b4 SHA512 3dca1cd6b028a18e5e048492e5ba30a9a0faa554b552962229e6b000e86caf571e66c0433fc04a00751e3cf69ad7793950ef58df4ba89bd5c81fea65d54ab66d WHIRLPOOL ba081308815ca61b8aa63eb1d176d9cd38c21531b77e8cbf46ccc97d98e013e82754239955b49d982efd72c24cea548dedb854bec0d7d8cabf20847d46a376a1
 MISC ChangeLog-2015 16385 SHA256 a4bbf80de049d02acd34341baac4e19aa020e88d37f73bca668ba963951ab87a SHA512 7bcf80ac0e1b26f825e829fbb8d748de5672067f0a83ed0518d9b8e4600c9a227cdad3acbc27d5c2efb4b61898d3b30a4c20933a5004727aefecd83a4a5f52ba WHIRLPOOL b6ae93961727860e049c475ce1c590aa7ea2662d688cc54d2558e0926bb8154d6070dda837c5e77225b345591639631f93897f174727404b40635edcba527822
 MISC metadata.xml 333 SHA256 1ad69c015c8f04f5608782f77b591dcfdbfb9566b76cc2ba63b85e846811c43a SHA512 91b1e0f50ec4635e81ee904179228d25b8168bf74d00eacb734365514e43e681879c121cc2f60302b446367b8b6fb388842e28890719f6785fb5bf389f638171 WHIRLPOOL e615857beedeb663193434eea5546d01dc37f9fe2ce47b5f07067089c958dc5a69d8da4d0f0d072aadbaa25dd7b32bd1696509290f283331682ea2e8176b9666
diff --git a/games-strategy/scorched3d/scorched3d-44-r2.ebuild b/games-strategy/scorched3d/scorched3d-44-r2.ebuild
index bc99fa9132b1..6561bfa9b2fd 100644
--- a/games-strategy/scorched3d/scorched3d-44-r2.ebuild
+++ b/games-strategy/scorched3d/scorched3d-44-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/scorched3d/Scorched3D-${PV}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc64 ~x86"
+KEYWORDS="~amd64 ppc64 x86"
 IUSE="dedicated mysql"
 
 RDEPEND="
diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest
index 55e419ed1e99..0855305cce1c 100644
--- a/gnome-base/dconf/Manifest
+++ b/gnome-base/dconf/Manifest
@@ -1,5 +1,7 @@
 DIST dconf-0.26.0.tar.xz 219688 SHA256 8683292eb31a3fae31e561f0a4220d8569b0f6d882e9958b68373f9043d658c9 SHA512 ea225397a486815c90a113c064d943f113490dfc754e4acba049b033115aa3a6a3849a5cdc133663de09811cde41c963041bc244cfd9ed32d65399889e415d1e WHIRLPOOL 5e4e24aa6083ad5a7a50041772bb7d466eb9cee93725311516fd6070a1b31b8db137772a3c55fa7cfca1675f72f9ab35b70d6aec1b67666eeedfbdfdebd9ac7a
+DIST dconf-0.26.1.tar.xz 218516 SHA256 d583b1f7fc93b879e2956acc6a26ea05a445a0002158aeef80c8e378e1414535 SHA512 4d2b4afce189e448e3bd4e9c2f9d3d5eec6c694748aec87a9a8de047296c858772a5234dbcace8e84d99c5378d2d1ba35cafb5e5ea7efca25c10a53a55b8b6da WHIRLPOOL a790df3c838e0d7e78b4bed6e547f8627348897c9d50c2990208afcc91855b8181b19cd318f48de6ed739bb367f04b84e7f5563fe9f6f2a91a7ed9cfe8db0e59
 EBUILD dconf-0.26.0-r1.ebuild 1508 SHA256 4e362bd74cc385686cb28503842c685a96f63ce7b032e6a14edeea253a7a2da8 SHA512 82a0b2d643087641ddb751cbf9b9b0deb3e5ab6dd9b1034a35b268d8e91c5a2fe238c5081e939adf3eb3460490c637e2d33b5344d4a87b9fc7c4edf9619e07cd WHIRLPOOL 3661241aa1f3cdccf068fe7058927bcf627a5ec4702cadc6cdfe3cf6f6732b2a82228eb1202913435e5bebe95e23730196a7a10a871e21062f80ebcde09214d3
+EBUILD dconf-0.26.1.ebuild 1517 SHA256 f0d2110511be5db01015ea7f9e52dd3a30028961b86aedff9ecec790bc0cf301 SHA512 8b58df3de54ba484990dcac1731bab50c78bfafd36376787f682b1d864027bd7ad7c379238bf8483b7e95a623d485ca0324f5d0807e284502f72cd7f16c8518c WHIRLPOOL 1ec79ad5e99b85b9062ac91751cc51cbea980d971b217513d94445aceb33a8c1be12ab8ccefdf0db495613361d7e9f083384a1e68246b605203e3ba66cf1ee04
 MISC ChangeLog 6133 SHA256 b73af8e368c7ff9192a0bf52dc25462f48a0e2a862b90fc26e49ed3bfc13b0dd SHA512 7e0a06e7dfbe41e2ffb68bc792ca51a7fb22072ce52e625983d3218e722831562b2659a2e9a3959ddb6222f0faefcf3fb8247b53797709c1d9ec46e5397b2e1d WHIRLPOOL 9580a6fb22ae78664a72318c31f0545f0f71f1cea4cc7c657518f87467e9a24ac4a4a10de24b654c715573f27de4ee2fe8b7d455eb354240daa80ed3742d3bb5
 MISC ChangeLog-2015 11251 SHA256 0a8b1d5eff74d4de2074effd7da83b8f2598b4b2fbab1a38e8748823aa8e0bc5 SHA512 620ee7574dc51594470debdc82f398eb358a65ef4a6d2addc929c999ca4a5147b6f05def2046315e2e766db0958f6caa1a78565bdb7e621526355b5bba49d810 WHIRLPOOL d09acd3e5b71ffbe8e930a6241637896e34f3dcd20ad7bceb9e80e931fbea672b72412911dc0b5c043536ee169e5a66d1daadb0d7a537fd8f12f0f35a0c20a42
 MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/gnome-base/dconf/dconf-0.26.1.ebuild b/gnome-base/dconf/dconf-0.26.1.ebuild
new file mode 100644
index 000000000000..88dcc0547e96
--- /dev/null
+++ b/gnome-base/dconf/dconf-0.26.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 bash-completion-r1 virtualx
+
+DESCRIPTION="Simple low-level configuration system"
+HOMEPAGE="https://wiki.gnome.org/action/show/Projects/dconf"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.44.0:2
+	sys-apps/dbus
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.15
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-gcov \
+		--enable-man \
+		VALAC=$(type -P true)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	# GSettings backend may be one of: memory, gconf, dconf
+	# Only dconf is really considered functional by upstream
+	# must have it enabled over gconf if both are installed
+	echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf
+	echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf
+	doenvd 51dconf
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	# Kill existing dconf-service processes as recommended by upstream due to
+	# possible changes in the dconf private dbus API.
+	# dconf-service will be dbus-activated on next use.
+	pids=$(pgrep -x dconf-service)
+	if [[ $? == 0 ]]; then
+		ebegin "Stopping dconf-service; it will automatically restart on demand"
+		kill ${pids}
+		eend $?
+	fi
+}
diff --git a/gnome-base/libgnome-keyring/Manifest b/gnome-base/libgnome-keyring/Manifest
index 3ab573db2c19..069f075e3351 100644
--- a/gnome-base/libgnome-keyring/Manifest
+++ b/gnome-base/libgnome-keyring/Manifest
@@ -1,5 +1,5 @@
 DIST libgnome-keyring-3.12.0.tar.xz 435092 SHA256 c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783 SHA512 dd1777b6e0dd774feb86dbc72d9f2a85f2143e2772a09c438b84aec468ddc5e7ee5ebd534d24f079e5daf4757f2918d0621e26fb671fde0fcef9c74d30f8b9bd WHIRLPOOL 8494913559cf057a77457bdafdff90099075421e88fa247e0215bd0dbb3f79ef41552c5825cfb99857b4f1bf9bc9d677facca779f9d6ed0892eabe9291e0d9a5
-EBUILD libgnome-keyring-3.12.0-r1.ebuild 1735 SHA256 ed2c4c433d1a1b74844c18174ca29801c08786895cedbc42114c3298808b2c2f SHA512 cefa90b703ff4d9b673be7a2e472095ec68e0bc319239f5827d3cd80f34523b17d564ef1779d9e0b00d97c925a6d81a663d694373e6dffb14cd618170366d012 WHIRLPOOL f0a3199a5f825dd3ff3b87513522ce137f89dd893ed7cbffe51d5e382809a8b951cdcc7dacc0c107ecede6b47326193917b3e6a3c07c2ea75dcd2dd9ce053200
+EBUILD libgnome-keyring-3.12.0-r1.ebuild 1734 SHA256 d6b436780905691790bedf7a999a1bfb6ba833bd3ac7c42bdbf51f103b8ed371 SHA512 5ad4a75227990576871f963a12af6855b74aee134e422a65546e79e4fe2f49dc71ff41bc7ef9d2ea6a50a46f89cbc643e209b10d607f034e50d02e54bfddd85f WHIRLPOOL 6e55086f6aa64b9a65a995090a69d96cbb73fa742d6cf88fdeddd21b88bf76613ff61fe5f264699f9d9417d99ce7618f34f26497f6331964a9b22fbb7de7b32c
 EBUILD libgnome-keyring-3.12.0.ebuild 1414 SHA256 2624013e4981abf60cfbc5023aa114571358e14428bd17c26b3b975220134a97 SHA512 a8040b8b5358dbe9861c8c515ae0bedb4ba5b93a5d15a77526f988ab856c2548e409e0b8b8b3daf34444bea0dfc7f7ee1db5075a44d8da19a77f6882c915c412 WHIRLPOOL fb3741703225f2e946b633c948c4b002b03603f50bd65bddf4ea2d37f27c1117fe7b1d72e51fd7edfcc811f0669b829097a24fc5cdffd30dcc435540e580d0f7
 MISC ChangeLog 2921 SHA256 e6f16bdf5cfa7b3b1ed987f19a26945af47559977b417dfaa2462669bbfb6303 SHA512 c082b0af25702eabca23d551699a708f4ae8bf66b8e74e8a384ddb5461c2d50026233cfb6541518656cceca54272ef6006a3b2c23290c6e83a31159a9ee61bc4 WHIRLPOOL f76df2e9552c7759e5c2e6118f406e5e704c66f13e5d496e20224acab3511dfc9ab23edf9b044e56ff916ab25988853adbd7153f903f6919e2fbae03531964ed
 MISC ChangeLog-2015 10306 SHA256 ef98c776eb487f0fbcf93611ae9f4712b6314d4cd617bcc8edbec624f0615113 SHA512 6da704e6221847cdbd2649bad119df04b9023c6dfbc0898f4e510e1ae675dd3aa9ba880aa798ab055d5e0cf31c34e67261d36b27c060a95a313fb74f211444ad WHIRLPOOL 5c1d612955b859f592f06a3bfefc4997afee3c6a69d5950868a5a1a96fe1ba635140565e57262270899c3c29c7e13c1ab7fef6333c9658236c4f706164fd10ed
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
index 29ae1c06bbd9..d1b62da34294 100644
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
@@ -17,7 +17,7 @@ LICENSE="LGPL-2+ GPL-2+" # tests are GPL-2
 SLOT="0"
 IUSE="debug +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.16.0:2[${MULTILIB_USEDEP}]
diff --git a/gnome-extra/gnome-commander/Manifest b/gnome-extra/gnome-commander/Manifest
index 1ad6b493dcb5..497faf227dbc 100644
--- a/gnome-extra/gnome-commander/Manifest
+++ b/gnome-extra/gnome-commander/Manifest
@@ -1,9 +1,11 @@
-DIST gnome-commander-1.4.8.tar.xz 6374144 SHA256 7124e9c45d934b0fba95e6721715d07a251e1e2e054d614a3145ad587340de86 SHA512 1b4a6980bff62ce454d6e0952941bacb078c157d5b6a12ee917a849ada89d9d02bb90e92e01eaf6ee4c0487c35251a9591de9cf340c6c2c3f16a2dd853bb6798 WHIRLPOOL 48a01ba8c5f89025b73dc15826cd9bf87ad094a5775bc82861034b37d094b3725c5cc54032ad968d54ca6e9db014d2dd9de4217fa3bd8d5cad1028a4be8cdae0
 DIST gnome-commander-1.6.1.tar.xz 6550308 SHA256 9f796c65b17e7d3a125e8298638d16d3b0ba7ea155371d7b8d413e7f8b4aeee0 SHA512 717e8bb560c6c7e6505cfee1d9ab12f7b3d5c2f8131b9eaf8b15e13aa71dad85574b14ae6f3a42dae42d8a6a291d33cd71db5a4155184bec4f66e3db8b2daab0 WHIRLPOOL 7569ec3bf275754022a19830871bde6139363c1a3d2e1792cff678cee79674d7a6022ba8fa678f9e48a79bebcf36acfd08c75db4f9e3c457e668a2e68c88c1f0
 DIST gnome-commander-1.6.3.tar.xz 6653164 SHA256 9ac8b0041b0b2648252d461776e2be65e87f2fc52b027815c8c93c9b448f7cb5 SHA512 92f138c3cff1b88b967340f945bfa58c5840fb3db806943b4d4eb87211fea10de01a8a365de6ca2b18cb0503bd850e758c3a37fe604b5402481c03e953e94dd3 WHIRLPOOL 6f907a807b0a72e09456216f734b5a10213498c1d06d9b08a0d783035fa83433d8c8959f8c4946ce9ddba0aa2435cc742a8cb038a2d1679ae2c72a1539137307
-EBUILD gnome-commander-1.4.8.ebuild 1571 SHA256 72c350d75112980191c294363f244cc070c6dee1cc7e8faeb9bb23c757780d00 SHA512 2c3ab2d3fc0759e121f2714ed7f2eb6e27d90193dc5e1a317df6ea162be906716ba96a7df142d2bbaba693fcf55c1e76e8754bdfce36219ea98fce005d112eea WHIRLPOOL 149b99e83abfd7b7d7b297b6916a27b2e4c2958df8cb46ba6379e55685d84691f10a734ffa6ef6360c234281e4db7aa6d1ee94321de2be15a9dfbcbd61715da6
+DIST gnome-commander-1.6.4.tar.xz 6678752 SHA256 d1c5de5245a4852f8aa86e5283530674ec3fc3a5312bd89305c9934718b90b3d SHA512 00fcf86025b69a38e68b2c69977ffe54e8b00028176163ce746824a73faed55eeff2fe37eea2e191fd0e7fc1901e2ed701938c3fdfabe9e9b8bdaaec152df0e0 WHIRLPOOL b42e6d1ea2b7eb0d7d51c9f4c9686f62761c0aecea04e71a2580f3dbf3bdd3f292345b621570e8d0f59af3aef7833f4550d577c057be131fe99aa0c96be1700b
+DIST gnome-commander-1.8.0.tar.xz 7433656 SHA256 d0e73077fe22ae1e00d93f0112e0e019cf40b15419dfa82e51c9d5f30849946b SHA512 0023528301812431bffde4c0d314d07d2399d450604bf88426078cfbeed5ee286f16ad0037f85c2b281e9037fd0c622aa92a4a5be055c198d9bdbd3d211c197d WHIRLPOOL ae31ba7cd24c8cab4c3ec991005ac89ef3852f503d7312998ee4ee2e73e7afc5fc7f62cf4edae58e3a2ea6f9ca1f3882ffb287e87c24964a096dd1177266dc0f
 EBUILD gnome-commander-1.6.1.ebuild 1646 SHA256 e59b269903e8340a0b708f5f913d9958efe41e4accd9e18d20706c70ad5e51b0 SHA512 d20e75f3636b5f38de32bdd91a59cf7c32990618540ac4cdb26dab691211eafd2cb4dc8a15321a03a08ce0bc1bd539ab45eeef9642192f5c5bef4f1cc7843535 WHIRLPOOL 0a0c83401c7aec2746567f0f0c2f22088eb12fb1d2e6166f606e728f9bd1c6f23d5a1a78fdf4ed169676c43547f504414a22d7fc1e18e6acde496d5179357906
 EBUILD gnome-commander-1.6.3.ebuild 1691 SHA256 2624126c3a72f555a4c1a545eb49ece78761c8012334e973900d0d05814742ae SHA512 ef168d556e78ad00f2ef05b506c90bb6e5df8434d12113d686e5f07c81b82da3eb59a6c65fb8f3d8bf36e24d3cecce45c4d14cdc285f282ec99e109ba95ad7d7 WHIRLPOOL f3fa820e28bc8c9e33157bd0c17b5e73a6b1bfbee5e0aa28c6a6420f38c0952a1de2eeeb7019efd5a39982279053a370d3cc26eda989f5cf23d67f015a06a5d7
+EBUILD gnome-commander-1.6.4.ebuild 1689 SHA256 f55853a090757e665b7b5b5a3920db4cce1693e4101a1a5eab00454c3b938697 SHA512 f0e82260e869ad2058e29556fed7f3f98e057bb95831c9f869160e5a1ffe14255bad9379278781725ab772b2653ace2d8d1a4144b821abb9fed1ef621c61202f WHIRLPOOL 65f927c93bf8b6bdf9aeb225219d099a4af17ad03a67e7b5c49c2c406188c857cbcc94b3d49f821b63af64a828bafb8d4bbe1759a09c302dd62077a180de8ce2
+EBUILD gnome-commander-1.8.0.ebuild 1687 SHA256 71f9168dcc46fa9f4d555809ed6cee2f2ab64b6b59295e665e979904770ea29d SHA512 6f52c86cf37b6e02ca4c6c5f51007f58f77b30ff7638f5454b4e6ee292649604ddfda4dc6936d3638943a0a0e8dfbbf91a1b1de8007bc568452226f951e9915a WHIRLPOOL 66063123f2fd794c404715d6a50de24e4a43727157a1a9d31b77775d0d463ccf0930315ba1df6017735e8840030cbda847d2f226a5e69225a437e296fe495c7c
 MISC ChangeLog 3831 SHA256 5c3b045347cad2ed53bd423202644193e72240d4e0b08adc146952bc6fdc36c4 SHA512 05b984dd6ef2703ba860eeb9c9fe886f3cd2feefcc69c1aa2301376a8b9c11a58a21fadcaee4cbbeef845e42b598eda7afd9f255490021754bb965b750e806d5 WHIRLPOOL 47e0a5a4069dd42fb1179ad182bde7d8abe3343f013cd46af8163b278933a48ce4b57384cb5426a6c4b918423788f6778f9161fff140f2f0262773aa45de48cd
 MISC ChangeLog-2015 1828 SHA256 ea6bae077957a1ab13f05b4d995e2f6d092e52afb5bea0c6cb7506a89756b984 SHA512 4d3306ffa4c81d8e272ace46edf8cb9c05457d58842945ab6a23424e593980c8f1e01fc5a6f2c8b7c927d29b99fea48ce2224f295676130e4cb35d200f84969e WHIRLPOOL 1fa534e6ecbedf7818df911c71ab1b908ea4ba9148c2e8eb22ed10e9a966acfb41f5c1be0978301dd1a28e7ab8c9eb7ef20d82d24fc2cc8ce2c1d48cc88c1952
 MISC metadata.xml 1341 SHA256 2a1e6e8e32c933cb9c7c93825e54324fba873f5225ccf418269097addf1bbf63 SHA512 d3f4147f6cc33421f3a4fe4dc44db301daebe435c31e94523f8470733de5f5b5a4873fbf1a7e7a2be18a89012a6686d704bfb7a384999372932b4896f1f25a4d WHIRLPOOL 4e0c9d599576fee4611f83e9635755e8f124510dd71bf31cec5debd9005f8a4c6095b50b6018192efa36011854dfd1fc7ffc051cce926c815fb01b59eab1208b
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.4.8.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.4.8.ebuild
deleted file mode 100644
index c812765380d9..000000000000
--- a/gnome-extra/gnome-commander/gnome-commander-1.4.8.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils gnome2 python-single-r1
-
-DESCRIPTION="A graphical, full featured, twin-panel file manager"
-HOMEPAGE="http://gcmd.github.io/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="chm doc exif gsf pdf python taglib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="app-text/gnome-doc-utils
-	>=dev-libs/glib-2.6.0:2
-	>=dev-libs/libunique-0.9.3:1
-	gnome-base/gnome-keyring
-	>=gnome-base/gnome-vfs-2.0.0
-	>=gnome-base/libgnome-2.0.0
-	>=gnome-base/libgnomeui-2.4.0
-	>=x11-libs/gtk+-2.8.0:2
-	chm? ( dev-libs/chmlib )
-	doc? ( app-text/scrollkeeper )
-	exif? ( >=media-gfx/exiv2-0.14 )
-	gsf? ( >=gnome-extra/libgsf-1.12.0 )
-	pdf? ( >=app-text/poppler-0.18 )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/gnome-vfs-python-2.0.0
-	)
-	taglib? ( >=media-libs/taglib-1.4 )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	G2CONF="$(use_enable doc scrollkeeper)
-		$(use_enable python)
-		$(use_with chm libchm)
-		$(use_with exif exiv2)
-		$(use_with gsf libgsf)
-		$(use_with taglib)
-		$(use_with pdf poppler)"
-	gnome2_src_configure
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	has_version dev-util/meld || elog "You need dev-util/meld to synchronize files and directories."
-	has_version gnome-extra/yelp || elog "You need gnome-extra/yelp to view the docs."
-}
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.6.4.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.6.4.ebuild
new file mode 100644
index 000000000000..b6b77a79acf5
--- /dev/null
+++ b/gnome-extra/gnome-commander/gnome-commander-1.6.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 python-single-r1
+
+DESCRIPTION="A graphical, full featured, twin-panel file manager"
+HOMEPAGE="http://gcmd.github.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="chm exif gsf pdf python taglib samba test +unique"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	app-text/gnome-doc-utils
+	>=dev-libs/glib-2.44.0:2
+	unique? ( >=dev-libs/libunique-0.9.3:1 )
+	gnome-base/gnome-keyring
+	>=gnome-base/gnome-vfs-2.0.0
+	>=gnome-base/libgnome-2.0.0
+	>=gnome-base/libgnomeui-2.4.0
+	>=x11-libs/gtk+-2.8.0:2
+	chm? ( dev-libs/chmlib )
+	exif? ( >=media-gfx/exiv2-0.14 )
+	gsf? ( >=gnome-extra/libgsf-1.12.0 )
+	samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] )
+	pdf? ( >=app-text/poppler-0.18 )
+	python? (
+			${PYTHON_DEPS}
+			>=dev-python/gnome-vfs-python-2.0.0
+	)
+	taglib? ( >=media-libs/taglib-1.4 )
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35.0
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( >=dev-cpp/gtest-1.7.0 )
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable python) \
+		$(use_with chm libchm) \
+		$(use_with exif exiv2) \
+		$(use_with gsf libgsf) \
+		$(use_with pdf poppler) \
+		$(use_with samba) \
+		$(use_with taglib) \
+		$(use_with unique)
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	has_version dev-util/meld || elog "You need dev-util/meld to synchronize files and directories."
+	has_version gnome-extra/yelp || elog "You need gnome-extra/yelp to view the docs."
+}
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.8.0.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.8.0.ebuild
new file mode 100644
index 000000000000..f384e8bbb34e
--- /dev/null
+++ b/gnome-extra/gnome-commander/gnome-commander-1.8.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 python-single-r1
+
+DESCRIPTION="A graphical, full featured, twin-panel file manager"
+HOMEPAGE="http://gcmd.github.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="chm exif gsf pdf python taglib samba test +unique"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	app-text/yelp-tools
+	>=dev-libs/glib-2.44.0:2
+	unique? ( >=dev-libs/libunique-0.9.3:1 )
+	gnome-base/gnome-keyring
+	>=gnome-base/gnome-vfs-2.0.0
+	>=gnome-base/libgnome-2.0.0
+	>=gnome-base/libgnomeui-2.4.0
+	>=x11-libs/gtk+-2.18.0:2
+	chm? ( dev-libs/chmlib )
+	exif? ( >=media-gfx/exiv2-0.14 )
+	gsf? ( >=gnome-extra/libgsf-1.12.0 )
+	samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] )
+	pdf? ( >=app-text/poppler-0.18 )
+	python? (
+            ${PYTHON_DEPS}
+            >=dev-python/gnome-vfs-python-2.0.0
+	)
+	taglib? ( >=media-libs/taglib-1.4 )
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/gtk-doc-am
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( >=dev-cpp/gtest-1.7.0 )
+"
+
+pkg_setup() {
+       use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable python) \
+		$(use_with chm libchm) \
+		$(use_with exif exiv2) \
+		$(use_with gsf libgsf) \
+		$(use_with pdf poppler) \
+		$(use_with samba) \
+		$(use_with taglib) \
+		$(use_with unique)
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	has_version dev-util/meld || elog "You need dev-util/meld to synchronize files and directories."
+	has_version gnome-extra/yelp || elog "You need gnome-extra/yelp to view the docs."
+}
diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
index 268f18a8fb8f..a3d7a4e07784 100644
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@@ -1,7 +1,5 @@
 DIST gtkhtml-4.10.0.tar.xz 1050628 SHA256 ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3 SHA512 efb159f902a910abd259cf38a86894a363dfd6b632aaad5ca88baf278780e653a2efc783ae48d9e4239f9fbfcbab15a5f343b60c910166d04e6663d4e34843e0 WHIRLPOOL 2c4e2bbb97d31b751ebd05a9f2e898ac1ce5242826d025978f878e9a6e3266aff32e6256f42eb05007d3a9c13f05347029b9c9d4a67eb78789762a7163cd1d33
-DIST gtkhtml-4.8.5.tar.xz 1049900 SHA256 2ff5bbec4d8e7eca66a36f7e3863a104e098ce9b58e6d0374de7cb80c3d93e8d SHA512 c35d67b22254570a92739c73a610230659a2ac63ab5e5a135a634655e679b39ad876cdf6abec4adabd0a9ba9ef87834745d03c7e0c005372bfe5485adff5ade3 WHIRLPOOL 665ab2d5319f3824ac26328b012bce0419b0c031b982ed0ef380679f8966f485c2813c2ea0e3a56688c610e1e3fc663592ab7c16cd546292c88254dd9e716d61
 EBUILD gtkhtml-4.10.0.ebuild 967 SHA256 865dc18d499976a84d65a7186da7462218d40c289a3926fee5f4cd9b6a755439 SHA512 ebe33d0bf84e225175dc740cca9e02960f8bb18d7943a91d4ad8c10d320beeb0edb76d18572a2fcf337c92af0217660aa33c7f26ff84b0f1463d167d096cd752 WHIRLPOOL 3335d5ca22bcea261531b820a6d3def4f441b3746bc1c06d71c5ecefdc3331f43f66a8af03448c5c7994426bd6e755f44dcb531742e29e3df3136a2d3dd88b73
-EBUILD gtkhtml-4.8.5.ebuild 967 SHA256 865dc18d499976a84d65a7186da7462218d40c289a3926fee5f4cd9b6a755439 SHA512 ebe33d0bf84e225175dc740cca9e02960f8bb18d7943a91d4ad8c10d320beeb0edb76d18572a2fcf337c92af0217660aa33c7f26ff84b0f1463d167d096cd752 WHIRLPOOL 3335d5ca22bcea261531b820a6d3def4f441b3746bc1c06d71c5ecefdc3331f43f66a8af03448c5c7994426bd6e755f44dcb531742e29e3df3136a2d3dd88b73
 MISC ChangeLog 2896 SHA256 f11cd7515c4f06829f50272516eee890b901083b0fd9f46a8261b827f70a7b0e SHA512 9f978f5af349656445822df997f3776526764f91cf8a728cfa1c11a1451116d5c010dccf2ca1c7d5531d8970382c14190ab7318cd85b0559e52b7c9938ec0f70 WHIRLPOOL f1d743e2aeb3a459df0fdf9e40adac0a663a0c8504ebc060fcf38eeaf469ad257ade74e3e38669be341592039551e4dc034ca27c456e0308f2e570f737638486
 MISC ChangeLog-2015 41783 SHA256 91ee8492259861641456944871361c9059eaf70a69808a8cc8365e75776b1594 SHA512 a9d3b218bd7aa8e5b58e6bed6b06c1d0269b718bef77775f7f1b0299327404b162059d5ac2f8b93a2a35b4f82ee964dbc880dbe8129fa382c86bfd2919d9cf93 WHIRLPOOL 9630f192b8d9272e4f634a376d98f5a8e35d3dd96cbac66fa183f3cf0fb8abe58a4742c5d8311ead8094b9acc1191b880fbf670da55a318a6df8efa62c1c8044
 MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.8.5.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.8.5.ebuild
deleted file mode 100644
index 2020a0d68e8d..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-4.8.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Lightweight HTML rendering/printing/editing engine"
-HOMEPAGE="https://git.gnome.org/browse/gtkhtml"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="4.0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-# orbit is referenced in configure, but is not used anywhere else
-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
-"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	sys-devel/gettext
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure --disable-static
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Don't collide with 3.14 slot
-	mv "${ED}"/usr/bin/gtkhtml-editor-test{,-${SLOT}} || die
-}
diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
index 5298a28459d5..d2235cae1803 100644
--- a/kde-frameworks/krunner/Manifest
+++ b/kde-frameworks/krunner/Manifest
@@ -1,7 +1,7 @@
 DIST krunner-5.37.0.tar.xz 68020 SHA256 8d12150cf48ec7eb36ccdacc0d7de2e1481e79b98754e7d813f46b1f325c389c SHA512 68e046bd62258d8ea55598959d6a0e9aa8f3686f9e2e023cec1c848b7683a001d0f2c09bc88bd3f86283868ed90c2d984a000899ad86348f96c1dda7559677dc WHIRLPOOL e237db900ee62f70956d4404efdec6838c81eb9f7881890f63a94d2006f928ce8d2dabcc85eccdef7799e9089309f2fa7cc77afc36ccf670e4e89e4040baed88
 DIST krunner-5.39.0.tar.xz 60668 SHA256 d43d3821b64a49fec7f06a3ad410f15412cebbe7f365c64a307a2c5ad14fba3f SHA512 2a97e4612b9aba202c143da9de11ba95b3f0f9a9d4d7696376d461427392b8ad4575d2272d684b0bfb8bb276c2648daf8dbc6453756219ec13fd1379116269c5 WHIRLPOOL b779220983c311144b56cb8fe68f0360182f880bb35e79eeb1f8c03d7e1aab86d75d43993dc12d92e9985c425533b7ded2c162b5de0ca387e19578a3f953d219
 EBUILD krunner-5.37.0.ebuild 686 SHA256 6e66741d60b14745b3075bbf5d0042f3dccc8a19a64e1fe8f2542aa08285c7e4 SHA512 268b65fd06b07a6bfa9a9b02b3e339ed56cb2ade1410264e948179f00402de3fd7743215d289c78b53524d02d02bb36de9fe4b327cf4cf571f278fa68b50848b WHIRLPOOL 26c4e01922148739d594bf32fee2e5bd47e6d339e5deb6c4298f0bc4ea6080347bb67852a3bdd3bc4b8f2b49f8db1d806744f551aad99ded31da5cd9347f8a02
-EBUILD krunner-5.39.0.ebuild 688 SHA256 5287cff55090479d9441c971bbfb8aa2124a630fd721629fd76bb583f67d1bce SHA512 76779123dabc145b0ca73f72a257ee3c76e7e553b941eb155f9e214f55112d30ea9cd4305764af82ec21ece31c8bee9b2e29e8df2e06fc67188ed644b653dcef WHIRLPOOL 6537fe48a1fc75e55b7b7b94fca0d6d56cf1e965efa623bc0c8e47180e4286a1442c4a877458713cd5842ce32f9a5395679eb8a26921320a93065baf604c7227
+EBUILD krunner-5.39.0.ebuild 800 SHA256 9e5668c5fc29260eba1e90d8426c13bcfe9dcc5a7d987cf53108391c3bca6c4d SHA512 9984bd46f0b660a315f899adf1553b33a5da3db4e1ab0058deeddc2e767f3b225d4103118195389a6080694ed67eaa268596547ebd4b83fcd49f1c87739a1ec9 WHIRLPOOL aa42650e93a0e8583d9f5c892bc978f97ddcad437451e845472c4519084f2555b66c8103f44fd9607b22c97bd613f33260b8eb6e77ab7d14058eadc5c4f49569
 MISC ChangeLog 9595 SHA256 45c10683c70cfbd23c4ffed98ef4e14dc69f0f152d14aaaf9592cdc0bdc41c41 SHA512 588fd5b883cf005505d718787a6419b8582d089e96500d415b7937fa086e76472e978fb39e8d201ca4d6d8f3d42fcba113352cea884cb7f99ccf78f93c74ab4e WHIRLPOOL a13753f0a483a6e3d1b2e05fa94d83698a705e5bff2af112cf4eff1c411a0878b35762b3150b94cbdcf717a5f4abe7367b9fefb6e8bb92244ef899fd1c247509
 MISC ChangeLog-2015 2284 SHA256 d2e20e607a792fe9ae39a9d030556721f184c51351ad85d79f27d2afdf02dbf2 SHA512 f8b3f5f4d27bbe93a7f8fab00d5bc2a2d61ce5f321b99f750fb6b4542dec5facfe9bd47e2a911fa29591a05fff85edd438ebc9d57ae2f8320e9c7a5f6a9aaf87 WHIRLPOOL cbc7db356ccc2b79b9c5f6b135a80587eb239d50f258fcc8cd15e7cb45f55413eac1c1866080eb2758dbeef2900bff703cf059fba70b62e0ab15a7978d52e861
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-frameworks/krunner/krunner-5.39.0.ebuild b/kde-frameworks/krunner/krunner-5.39.0.ebuild
index 3df0990979ad..d84dbe1fcc1f 100644
--- a/kde-frameworks/krunner/krunner-5.39.0.ebuild
+++ b/kde-frameworks/krunner/krunner-5.39.0.ebuild
@@ -27,3 +27,11 @@ DEPEND="
 RDEPEND="${DEPEND}
 	!<kde-apps/kapptemplate-15.12.3-r1:5
 "
+
+src_test() {
+	# requires virtual dbus #630672
+	local myctestargs=(
+		-E "(dbusrunnertest)"
+	)
+	kde5_src_test
+}
diff --git a/kde-misc/konstruktor/Manifest b/kde-misc/konstruktor/Manifest
deleted file mode 100644
index eee3ac8b6cbb..000000000000
--- a/kde-misc/konstruktor/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX konstruktor-0.9_beta1-multipledeclaration.patch 386 SHA256 feb14a2a33ffb5e2f2a268f75984495b6402d6d9220dfeadd2adab116630755e SHA512 5818b304932ebcaff4448f594ce5299a04320ee2f1f8fa7eccfc66ffef12580834dd6a8cb1996c16731bb3c24f67da5ff0197a3dcb99df63f8de272f6f4a33d9 WHIRLPOOL 31e34ab8178d915bb7bec0c556d457187352010aa1dfda977a6f1e53b55a8b4f489f35391829aecd38acf8e7b038611e7d90c3b0c69f275d32c91733f4bce343
-DIST konstruktor-0.9-beta1.tar.bz2 722098 SHA256 2681e62ac81ab17e712c706f34f7d3954bd280389dc516a2e73606cbdf1f73ac SHA512 c80557b8e094eebcfc67432f71601bfc49a265bedf7630413cead14e4d6c86e9123b8336d0aa5ae98b46615be68c4e731bbfc892f8b3216b37467f117bc9c40f WHIRLPOOL 8618cd4dd35a0fc28c050ff316dee6955d32938ecbad47a775e888e1b55d769e1e617018c48351b05a708a75a9ec5f72e3cddd2d530ce3454c97a82378c917f4
-EBUILD konstruktor-0.9_beta1.ebuild 708 SHA256 1edccd9ad82b6e37039633defc2f9f14d87b9159264019565b34a87585e86a84 SHA512 a8f24ee45afeaa2f4a38895b79e7f1a72e346104b023d3b1c7665f7024bde9d199b0acf9158a4eaea0e30d5ca094b4729a26749be0e69fe61cf04127d354c98c WHIRLPOOL 761efe005794552c7ee2b1b780ff62d1540f493ac570c85a6a02d9717e510ecc4515da43893a22887ca221cef9fd5ec116948e496ec08489ba3210b14d327fc3
-MISC ChangeLog 2505 SHA256 a3029d643e0a6632fe355790a2f234cb90b15bddcafa4fd24f2c386c40194095 SHA512 9a0607d80cbce9eb1aeab1abdc2f650557eec360665cbf194e865111e9125f42cd7dcad08c87233b2927d81c22738b2817af26b6dcdca039dd83844468b28573 WHIRLPOOL 0cb213849556b33ad9f9c693d504f0399262688e73723359f8883815af19680027d294a206c954d21c2e28e0882ca840de8d3eef021e154a06f58b3553b6b4f8
-MISC ChangeLog-2015 471 SHA256 fc341caf184f8d0dc63641263cefec55b13aa60a9139be4c05ed8bfa193e1c9e SHA512 373422a1e563780f5e5fc525aa44fb8f0a3a60b05a31ac15f4e190f6e7280339a3087f8f728cae104ca3514a69f45a445e729c4e53c2bfe88a3e190961bc93d2 WHIRLPOOL 3bcff2f971ca4e6906f5865e70974fe10bc621caef83dfd381b271e277f020160c297c4afbc22d1cf405120712a1355f967eef8dd11017907e12bc3630ccc359
-MISC metadata.xml 245 SHA256 ae3610b0005f668b7174e8c49c0170e7642e895c8e13e7e2fedcfefee6940e1a SHA512 90bcfe500baf163912aaffc9958c9724c4a97cfca294cae6c2eea938f4ca7668c84b132b6dce55767efa47a28b9e87bb75e79634b59079ab8ef3eff3ea95968e WHIRLPOOL 7abb1ad699d5aa3a0a0ebb0e8704df297ad9a662698cb59d1b48700aeb787e6208540e1e84f583a46bdd9975e27a75f04f7463585790b4e7865d0edfdb1e13ae
diff --git a/kde-misc/konstruktor/files/konstruktor-0.9_beta1-multipledeclaration.patch b/kde-misc/konstruktor/files/konstruktor-0.9_beta1-multipledeclaration.patch
deleted file mode 100644
index afccd147d52e..000000000000
--- a/kde-misc/konstruktor/files/konstruktor-0.9_beta1-multipledeclaration.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- konstruktor-0.9-beta1/src/app/renderwidget.cpp
-+++ konstruktor-0.9-beta1/src/app/renderwidget.cpp
-@@ -395,7 +395,6 @@
- 		
- 		glBegin(GL_POINTS);
- 		
--		int i = 0;
- 		for (ldraw::model::const_iterator it = currentModel_->elements().begin(); it != currentModel_->elements().end(); ++it) {
- 			if ((*it)->get_type() == ldraw::type_ref) {
- 				ldraw::element_ref *r = CAST_AS_REF(*it);
diff --git a/kde-misc/konstruktor/konstruktor-0.9_beta1.ebuild b/kde-misc/konstruktor/konstruktor-0.9_beta1.ebuild
deleted file mode 100644
index b0bf118fda35..000000000000
--- a/kde-misc/konstruktor/konstruktor-0.9_beta1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${P/_/-}"
-OPENGL_REQUIRED="always"
-inherit kde4-base
-
-DESCRIPTION="LEGO CAD"
-HOMEPAGE="http://konstruktor.influx.kr/"
-SRC_URI="http://konstruktor.influx.kr/${MY_P}.tar.bz2"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="test"
-
-DEPEND="dev-db/sqlite:3"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-0.9_beta1-multipledeclaration.patch" )
-
-S=${WORKDIR}/${MY_P}
-
-pkg_postinst() {
-	elog "You still need to obtain ldraw data files."
-	elog "Because they are not distributable you need to download them from:"
-	elog "  http://www.ldraw.org/Downloads-req-viewdownload-cid-1.html"
-}
diff --git a/kde-misc/konstruktor/metadata.xml b/kde-misc/konstruktor/metadata.xml
deleted file mode 100644
index 0cf59224b009..000000000000
--- a/kde-misc/konstruktor/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>kde@gentoo.org</email>
-	<name>Gentoo KDE Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/kde-misc/kookie/Manifest b/kde-misc/kookie/Manifest
deleted file mode 100644
index 3c9a1e7c61ea..000000000000
--- a/kde-misc/kookie/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST kookie-0.1.1.tar.gz 42632 SHA256 39e4fe48273fdda97e242e6e76de9be27e49a0f7bf1520ddac6fef23e29af7ca SHA512 62dd638f7d0b86cde85cdd71b79f3e7b868b01e11bacb13341a00c5b76bcdbf863b6f1dfe830801404411b6109de7a143439b5a7b3558e26c67e9ac2aa5a620d WHIRLPOOL 0a3ec6d453af7e40f0a3ef6e76e34842a8e27ef59f7e6ebdd07960ece1d27a569d4d264f7ba3038823b77c8df1d7506c6fb700917be0b8df21e89db6bc0c88f5
-EBUILD kookie-0.1.1.ebuild 395 SHA256 162681de35ba2d672c4b7db7704d07c85f1c8b61d654756a23df197763e5ee28 SHA512 8a4f6f7eef5e0fbc5138690ff1142abe5acb6e760a7ac097cbf20928f535ab893631f027094687005c09360e97f58fc23eb74142f26cf530fc1fcb123f7d1431 WHIRLPOOL d99dc9c7da52f3219ac67e3f7aad1715a57b708d1d86d71913b61ec37c305adfbe49e6573df439752c93eaf174bbe0ae2c42a9f81a645a42a3ed7b75a446a6c8
-MISC ChangeLog 2424 SHA256 edd6531c6a9a313eca8c904a21645d60988a3ef7be7c9ce364253b299ec230d0 SHA512 75a54e8f7c28724ddba86ceb2b7e6a5e2c0bfe892a556a4d147592fc0e9e6b47c709c80be9f02a92b0aa0f3caca1d2a5c6b884f3d38bf79337214902e8cb6c29 WHIRLPOOL 5a32be7371f9f7952bdcebc7f5ae48cb48ab5293f6b0f94fde5b09984b5d352ce00b075ffa62455861dacf3180c5ecf5c3f223391ac11d9cfe7c83f2e6acd8c1
-MISC ChangeLog-2015 725 SHA256 9d0a151686745813fdabbda40b0c6ed52e2075f9a208cfc0aa660281dee9bc3a SHA512 49aec7d470e922f589ad89517ecf537ba57f07ad709e4b53cfe903f2e7181e8b64f4444cd3125ad1d25b2a6d213d5fb0bf5717def60528c4c85a61dbbd0d61e1 WHIRLPOOL 89c3d18d256e14eade3016f21cf4f29316b8d1d50cabfc6e8d3a43a66e7aaf6f6376a94355363f1e71af1a708e0f2574efbf84e5ac02ac6d4e982b78577f0588
-MISC metadata.xml 325 SHA256 d2b36663b9979556fecb83f58b677c865f0286aa6f96c93d78823ba6d5b4bf41 SHA512 043e1ff52d6ce6b17409fce2d861a5262634b7207c7edee20ce876b81499560be2fb2649c28798ecade9dca06a53dcb0f1f831a565c6964fc2c434af03ed32e9 WHIRLPOOL 0dd53aaea6754b929f828c3a7abec7c4f3ddd66ee41894e60e992fb99d429f14992331841d278eb447c4aebb923d24f90c4ece4027297d9673e769807dad4ab0
diff --git a/kde-misc/kookie/kookie-0.1.1.ebuild b/kde-misc/kookie/kookie-0.1.1.ebuild
deleted file mode 100644
index 2a3dbdaf9cb2..000000000000
--- a/kde-misc/kookie/kookie-0.1.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-QT3SUPPORT_REQUIRED="true"
-inherit kde4-base
-
-DESCRIPTION="Manage recipes and shopping lists"
-HOMEPAGE="http://www.kde-apps.org/content/show.php/Kookie?content=117806"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
diff --git a/kde-misc/kookie/metadata.xml b/kde-misc/kookie/metadata.xml
deleted file mode 100644
index 3613ee617ff9..000000000000
--- a/kde-misc/kookie/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">kookie</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index 9752fe3b8a55..1bc2d718effb 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,7 +1,7 @@
 DIST bluedevil-5.10.5.tar.xz 144576 SHA256 394945cbb8a9c2b3249f9aa7601874a10b0cbfc6ffd425fd77cfcf19df73d006 SHA512 fb4b58dd9a98c72f74125245fa1d89048a6deb02c0bfa538338c58f3efa5f02a71d14a0518d0354db4c7ff79bf3690489f1d3172480217ef118aaf7ffdbe113a WHIRLPOOL 1f5bc937ec430ee2337dfdf8b5c5393c3703e2a16fc550bf01f9cdb621e1dd4388419c1328ece5ff00b1f7ba320ee8a36e98bfac0c2eeb518be3a457f0ad0f93
-DIST bluedevil-5.11.1.tar.xz 147144 SHA256 58a0a4bfbd99ef4535b7ee6380dc3a53644f367932205b8694f9bc7ed01d3e5c SHA512 d993acb40c524fca751d80b3fd0adb71a2cd8d5013fc2fb2398448349826631b7644215443592cdd612fde43dc423e71758b81050e4af6d2f274c0b484670068 WHIRLPOOL f1bc5ee7354ff1cc184881bcbdf3de3cf91824796eaa5cf1a09d6560f4af273275b77af80775a6c2de1d352df6ce06b0d81414e0ff166ae11bbff24d594dac23
+DIST bluedevil-5.11.2.tar.xz 146616 SHA256 58ee7d182ed4c04cc6bbd7ee75bcf69d1d1ffc234816f6d86e8c0ffb91af9b3f SHA512 d6de66e8a5cce760d5ba20c009e976798e56a33d1af0359a82911a1651d31b4ad7068608ccd712e128e6e511316396dee7ee7df2d027f77fda9285a5e22ec35e WHIRLPOOL 2c9b1cef96ad7a6fb0057c8e51d63ffff60713cd7341e0e56e50fe69730f98f11186dafd969bcb45d81cba80a1eb1fde8431e3af14a3c060519fc2290ca46b01
 EBUILD bluedevil-5.10.5.ebuild 1027 SHA256 0ac346a595ff1eab7b5b66e1c4736bfd22daf190b0edf8cf7f986878b04900ef SHA512 561a94744c111b3356331f654fa774379440b24bc81caad5823436c3e512673b6a020e36158c2228b0262134d0b6186806bd584a06f12218f307a601b7d2d484 WHIRLPOOL 4bd36b6677c1053db123e21b3f3fbaa7e4de538f3bb8f39a56d8215538e84927136acad14434757e248b00fbc2432c6f83c0eeaf108268d512813b76c5536b70
-EBUILD bluedevil-5.11.1.ebuild 1029 SHA256 c2a80e5629c401fe6d7bb8ff526a9fded42daec820c10cdfb28060baac76030a SHA512 62f35b22c425a5ea64c7a4f8a3f802cf98a3324a45444731df7c7fe1e9eaeffcbd094d86c3f48375ee13f4330b7e297bdadbd6f11a0240e06f500ba188e6576d WHIRLPOOL 3135a47f6ae78ec3704aaf86ff137fa65d27fbb8e224775da6ab201b122275a344e6f2073278f4ce203610230ab606ed69ef34941c9008e64e9be67ed95e8db3
+EBUILD bluedevil-5.11.2.ebuild 1029 SHA256 c2a80e5629c401fe6d7bb8ff526a9fded42daec820c10cdfb28060baac76030a SHA512 62f35b22c425a5ea64c7a4f8a3f802cf98a3324a45444731df7c7fe1e9eaeffcbd094d86c3f48375ee13f4330b7e297bdadbd6f11a0240e06f500ba188e6576d WHIRLPOOL 3135a47f6ae78ec3704aaf86ff137fa65d27fbb8e224775da6ab201b122275a344e6f2073278f4ce203610230ab606ed69ef34941c9008e64e9be67ed95e8db3
 MISC ChangeLog 12707 SHA256 78b11a7864d89c82dbe50871ab6b4a88d87eec6d7c84fa60dc4de4250e9412b9 SHA512 97a6ed66053955afda42b4e06c4bcad01894c56206d750624fa84347ab148bfb9e78d6087053886d994845d8e066fe09823f16439ea92d0f56d6c065c93a1386 WHIRLPOOL 9c7f3105c4339361cd27ed58a79e41bf1cb7c51ddc0b40a61282d55c86cef1d84def0d3be6585418de302347eaa21f528d938c5b8f1b97e2cc6f994d38310049
 MISC ChangeLog-2015 981 SHA256 69e95a15d8408b18831f8cf96e00ee1dd433ead978ff115800f0b6d72e48a1aa SHA512 ae31358cb1d5a06d79aa6f256c88187b50a265c8f108b4fb632d853f6fa5edf737f3a5a0bfdb7533a84e57482d456bfcff75edec3ad17677d3849d2bebbc61ad WHIRLPOOL 792ed61fac826f19c9df33196ca3c9efcb5418c9ca9363e92193f23bf12d7c041d2b2654336d2f5687349a8b7c2e1546da8c9120e5da9932ab077e90e29a015b
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-plasma/bluedevil/bluedevil-5.11.1.ebuild b/kde-plasma/bluedevil/bluedevil-5.11.2.ebuild
index 1b30c235b02b..1b30c235b02b 100644
--- a/kde-plasma/bluedevil/bluedevil-5.11.1.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.11.2.ebuild
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index 8153f7bbf36a..aaa261eb86a2 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,6 +1,6 @@
 DIST breeze-grub-5.10.5.tar.xz 3132960 SHA256 2e0eac19f5b5831787d809afb373d7ac27c01cc7021f9054f359678f1b85a12a SHA512 918ef829f00adbaf2e791028c92b24f7ea9c455591017afd5c76fa82c66a6e7fae48c8ecc9817bab0551316af0b8397c1ff41422537178004de1479439290f1e WHIRLPOOL 529b0c9909ac38d683971831ab509d3c5dbc084588e6a357c3caa86d59d92a58ac9f5f01fb3c97e0cc7f4fb76a0e585ad3d2e06f4d9592c9b17fa86e42f156d3
-DIST breeze-grub-5.11.1.tar.xz 3150280 SHA256 8076f04bd98a2c5c0df70db3a1a3ffdaa6c6b7929e59b3b8a9c5c64a7e88995d SHA512 bc90451caab40fc039b87988f490e3d7546ee0f7bdb494eb2b80f482fbbd14ad341d0404b48ccf54b8109d1dd222bface15f2ed57b25621ca75c464b1436ea75 WHIRLPOOL fa064227c299578c0433982015e630b7527dedecf7a43fc14b78b7066cce6243c419ca62334aa6ef8102d6fdbe68bcb256737b828659682769b177cc1cad7529
+DIST breeze-grub-5.11.2.tar.xz 3137272 SHA256 52495c1ed3388c0dd1c4c5a93f56a56e4c6b2eb1899d8677654cc60c7c24a712 SHA512 ccaa08a511e7b814dc53f0d3f6989420262b868fd4ea61f64bffedba3cfe69d14932bb4f580d39b445726d1cd38e9af716809227e3c40a0f354bcbbd274416f5 WHIRLPOOL 15dbcc132ef13a46a77625d26e20b58bc04990215c7540a97983f76b56550c6b01e014be167b0f79cefa81a2deee9eba22d6452e2afa894aaa3e28bd49fea37c
 EBUILD breeze-grub-5.10.5.ebuild 398 SHA256 0d278cc68059b43c3716e3fef28a043612127ee5b3e8401d10f0fad527a30645 SHA512 db0442c0feddc91ed1bd7da6c6d547df7a9b7ace8a6d6be27436f861fff829f19acfa1e0eea3adac74b8adb2105841ca449e47767d618843a081824d7cf6beed WHIRLPOOL 6e0c64279726bdc6c1b72f61829abe98d00b732300ec48f42319156149b0f1225bffc5f12ad4999edc72f337fb0f143beed72a1110150c7834486159c07bc1a4
-EBUILD breeze-grub-5.11.1.ebuild 400 SHA256 b10be4365f09544352585192edc3b9e21696e6baed8455088fd4ca1d1e73d1d2 SHA512 0b15a3d4ea410ad33b2d7975783c63b487f2adb610b9eae8550ad13474b25e85ac13b934361eb88a76f562efe253039ddc5d3e072217b6f3ab4328d17abb9766 WHIRLPOOL 2faead726f58f94320865c293c8a9d0cdf1945172b4c4b6fb942ceb72427bf2ea2f6da205ebd2dc8bb5889a96d144177afb4987f99864b85fc338c0fde399661
+EBUILD breeze-grub-5.11.2.ebuild 400 SHA256 b10be4365f09544352585192edc3b9e21696e6baed8455088fd4ca1d1e73d1d2 SHA512 0b15a3d4ea410ad33b2d7975783c63b487f2adb610b9eae8550ad13474b25e85ac13b934361eb88a76f562efe253039ddc5d3e072217b6f3ab4328d17abb9766 WHIRLPOOL 2faead726f58f94320865c293c8a9d0cdf1945172b4c4b6fb942ceb72427bf2ea2f6da205ebd2dc8bb5889a96d144177afb4987f99864b85fc338c0fde399661
 MISC ChangeLog 5804 SHA256 a1c7a047a96298ebf8f296cc4513ba39f1950d12937633d2443d6b2fed2154e4 SHA512 7c0cc6022cd2d5d816b7f624a5476021ff79e026072db71565a2c23a7eb8c5955229ef2e6f0508719d1f2787bf0f76a3dfcba25458c092cdb7ef41ff37fce40a WHIRLPOOL 33b4fc0c9b5beca9ce30bfe610a0243450df40c018cd99109242a6c0d9b6137684fe122625e1a7ea8fd6fe523b4302f7837e909f60fa706b09a1530fa56d30e7
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.11.1.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.11.2.ebuild
index 70488d313e71..70488d313e71 100644
--- a/kde-plasma/breeze-grub/breeze-grub-5.11.1.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-5.11.2.ebuild
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index 54a54c7bf201..af84d4e174a3 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,6 +1,6 @@
 DIST breeze-gtk-5.10.5.tar.xz 211368 SHA256 0a7063950663bed3d5d97ad541725ec35e7df1e5ce636146e19c0798706ead44 SHA512 3ba76d370ff5dca9e31f6aa609a308725a9d6f4ccdae6a487d5f48427c5faf5566d877ac199d4dbd9d7bf01bce09ed305dc0c9146c608fed2d69f3cea6dda497 WHIRLPOOL 4841b79c44970a23494193fb5fe9be059c731510f34bd4da8ccb5c3472b58d86758e84d624f40fafd431bf43f8f0db263f1666adb0a55638a120de585be3b93d
-DIST breeze-gtk-5.11.1.tar.xz 211924 SHA256 f9090029dbe316a176fa7ab668a87234904fd8f5b62b9dd58d81b71adcf46361 SHA512 a4d430df1e0296963dd7c9e0824175867bcd061d399a1b01c6b952fcaaa576793718255d41be8203a90fae565486086446b2f41e86c30db5165dcf1ac726a638 WHIRLPOOL 77afe5d9a9bd241c4ebdc484a8f99bfad5d5b90b9239470a87037e3e07098b9bf568805ec32e6402516b1f4affcd039ef4de0e382d9cacb6cdb5d0c84fe44822
+DIST breeze-gtk-5.11.2.tar.xz 212104 SHA256 a48982e8d8cdafc8445740bac326462713222c24a387cc331accdc372dd47b30 SHA512 33f941b1866612d18ce5e3e7f13b0190666afb262d42a365e342fc4c6694be544689b8337218bdc5ed885c5322a8e21197366d50d5396fea650241b81b72c7dc WHIRLPOOL 51e25a8f6cf3ef9891afb9a158ec808e35a26a6450732d7b9afa7c05b34048ed9428f24ce20bbe08a844ec28c89924bc5e7382360d0e30493d53aca3a733ea0b
 EBUILD breeze-gtk-5.10.5.ebuild 319 SHA256 3a44b4e8d9c5bc9ada7b2b1f7d651a80b0eecc03aa2e3865ff92f0fbdcf14540 SHA512 aacecb4af2d09e4eb1a2ccde02b56b540b8868541e2ec1576d99c2562b81645314a2386800222bf9fe58878c463d610e1f155f34ff5ce46f429a5f000026a968 WHIRLPOOL ed966adbbb9fb775e34bee23b4a5db715be8529da8478b7661006c66cc560d4efe1a6b3af06a2ba2d93ed2134774ec1ef159514aa354f9cb23670c2324216e91
-EBUILD breeze-gtk-5.11.1.ebuild 321 SHA256 a6ba0a14604802ad4973a69a3162e800a65037afe654705fcce71539ae7003ad SHA512 58a1688f7cf6309390448d5480080977b7a00684dda23db9b083b06715d1594f6e3015695c86fa67ebde42f28bc83f6310f40f3ba6c9d5692f58029ee102a79f WHIRLPOOL 31e85f03acd46f146a4535205ab2a49236ecbc1e822183e417d4128e2c21cf53a7ea261055e7e2486d728b7d087eb2467b4d373d91facbedd5a31a5a25ed520d
+EBUILD breeze-gtk-5.11.2.ebuild 321 SHA256 a6ba0a14604802ad4973a69a3162e800a65037afe654705fcce71539ae7003ad SHA512 58a1688f7cf6309390448d5480080977b7a00684dda23db9b083b06715d1594f6e3015695c86fa67ebde42f28bc83f6310f40f3ba6c9d5692f58029ee102a79f WHIRLPOOL 31e85f03acd46f146a4535205ab2a49236ecbc1e822183e417d4128e2c21cf53a7ea261055e7e2486d728b7d087eb2467b4d373d91facbedd5a31a5a25ed520d
 MISC ChangeLog 9393 SHA256 57964d4ac48d28678a7c8ab77861d5691843b192ef1e01072c7bbaca240eb668 SHA512 c6812cf5ab578decfcf97072b73e5b5f31d3cfb1eabe8e329bad028563fee3bda4006213d8f2860599e8322049975abfc0548604c85c7e098b2c48277bd71ec7 WHIRLPOOL f8557ee706f6a7f17391caee054830f0d2cbdd33ae6abe4fa512cbc83b5a256e7db1b64dd13b968d01840433ed2d7c64e80ad0d284bf0296f1a9a36ee6c3c7ba
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.11.1.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.11.2.ebuild
index 6f0cd3ae9935..6f0cd3ae9935 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.11.1.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.11.2.ebuild
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index 6ffe420fa8eb..b5ff5b033347 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,6 +1,6 @@
 DIST breeze-plymouth-5.10.5.tar.xz 104904 SHA256 653438029242366983e0378568c77346cc5f6bf044f43f4c704323b82b41efa4 SHA512 179f3f61198ef983812fe97e1f62898a6fb943063e21acca441ac4776d38192fc0b5f1ecf7f7b73f1e4efdbcc6fec31ec669a6a47ce7ea1b858a2d6b63c7e5bc WHIRLPOOL a45c814edc8fa3afcd5965c717191e237206bf8e2d8279d5b766095b81470aae494d737cf6543a0590d8d365608e43ad5bf0cd2eadc91611a956200bc47eb1fc
-DIST breeze-plymouth-5.11.1.tar.xz 104784 SHA256 191e8693c71bb6cd7286b175c4420725373b5b3d9e3fb377c36aa0624e2827fc SHA512 fec8e36e4f6cc3a598a91d6ead707aea97701ee9b4621cefc019a998c257cb07aaae9395c661bfac5d0d6c05d40c0199f8ffb209e1b26a81dc8b2a02019b0c9c WHIRLPOOL 875d4e67589338a21d5a33dbc9dd779b812a03c27f6cd4bc3b76efc80116c6b307f5fb9c8fa8b03bb2dcc2118d330bbc3c2cb8e91089ce03f5a203f519ed6d94
+DIST breeze-plymouth-5.11.2.tar.xz 104768 SHA256 4d934d4c11eb923d4cf69135a77cca3b4f84452c4578a078d6fc7fe053f983ec SHA512 ad2c238f9803e10608d6c115097b61b3147dd382bbbc42c6a77c12fba46a12ffcaedc06d3744710f148e51c4d240a87f3e0107855630b08036332eacb04167fd WHIRLPOOL 3f7232fd1f60209548caa05b2bac45d9c1b78f7407446778c4322bf07b0651ab061aa431024e0553f7f1197bc55fc86e9bbab1ee9fd84216fc9dd9cd3e43888e
 EBUILD breeze-plymouth-5.10.5.ebuild 459 SHA256 185b863b0a86eed39bcb1fc0b73e2f05e299da39eb0a51e739af6fbba172a57d SHA512 07bf1570129557eeb0a7a9be2478be152e2e6d8985b45bb8da89541ef826f9537005a86a2a6dfeb39b27ccd651780d62359b0718e9543a3b98e69f99b37524de WHIRLPOOL fcbd5f379484c232a876e815353e65a2d900c6d4265fc443471f82f0df088e368ae451cbd7ebb7966508024f12757ce638fd36e677970f8a530dc57b8958146b
-EBUILD breeze-plymouth-5.11.1.ebuild 461 SHA256 aeec78b3c12ed8eca485a41721711b10ffba62cb7e9e85809d8574144f94831b SHA512 750dd65dccca585819f0ba2147a57718b68ba65f07973575582652958fbafe75b678900335b06bad95d8d2ea08f3b9b8d01d10a4a695d98e2b0ff8abd6f179ca WHIRLPOOL 52726156a7388e75791f2ae84bc45b20d253cb78a55a90f6363c65a620aafca37196123bd894c97643c0f4eb7cb59e051aa763bc7b5ac4d894d93a579a4bcaa6
+EBUILD breeze-plymouth-5.11.2.ebuild 461 SHA256 aeec78b3c12ed8eca485a41721711b10ffba62cb7e9e85809d8574144f94831b SHA512 750dd65dccca585819f0ba2147a57718b68ba65f07973575582652958fbafe75b678900335b06bad95d8d2ea08f3b9b8d01d10a4a695d98e2b0ff8abd6f179ca WHIRLPOOL 52726156a7388e75791f2ae84bc45b20d253cb78a55a90f6363c65a620aafca37196123bd894c97643c0f4eb7cb59e051aa763bc7b5ac4d894d93a579a4bcaa6
 MISC ChangeLog 6004 SHA256 fa63ee23b8d412f05aa5a3c243fdcd9923a922c49324fb84510760e32ae01012 SHA512 a6d4bc52aeceaf81a51065f2932ad9858dc26dddba7b45393b738bbac9431f40700cb53b234a5768593b67835871c33c020afbd4af15442d38d77007aa239d77 WHIRLPOOL 8b71f75e8457b4936ab86dbb3840210082a7db5fa0128d91f883b22db4dc4f3a348d1aacd698d30ad38fc6377f70ba91cb6e44551dcf6a36533faef97394c03a
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.11.1.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.11.2.ebuild
index a87a824cc8c0..a87a824cc8c0 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.11.1.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.11.2.ebuild
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index cc63e7d4eef7..0fc55487fb38 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,7 +1,7 @@
 DIST breeze-5.10.5.tar.xz 17426192 SHA256 1ba46701e13f983b97c7e7dd01da8637a2f17ee818928064f4729895ac1dac66 SHA512 4af601d1b8f446d6e9d0a381e84ec932294de862f8b13b8e17d01c81d89249d4d841b236498094f21e4402f1448b4f103a49f8010fef90ce603a8493691c3747 WHIRLPOOL b6a3ccf4c48299a3713380a3aa0db227028963f948b69b2281f7125829356453030a50be78b1f346d57d36f87a76753b6d8215595c17306763176583541b324a
-DIST breeze-5.11.1.tar.xz 22206196 SHA256 970a0e9a50dfb49252cbf341e6fe3ee88c5e6870a490edd667d5e208e4c90b7b SHA512 cd34d600a428f87baa2875e57528d4e302cb1cc3661782fddb739731a6f064d452f0b0265610aeec46b193883bad92009fb24cc45e0fa3048e31cec7e5bb6800 WHIRLPOOL 593e179d2c5fc430f30516bac478d9b6e6f46793ed598d36de375b44e88361ed36c949a62ede8a507e07d8bd104fb337d3c741be3cb797d2a5338500cb5700d0
+DIST breeze-5.11.2.tar.xz 22208472 SHA256 014505f87ce0ae90eb0e6e820e5eb9fa18bd30cac6fdb4a3df84bf53cc6d65f3 SHA512 715353c69c1dd1def9b6fb0b04846a20cbbeb2f057d5935dbeaf55c1a03d92046f1f7ee017e5ee3d12bbba97a6319d36022b04acb6b93e839415733768cb8cf9 WHIRLPOOL d3f3f5ccddbf5ecccefab9c10c45eac069d1652f79c6c9fe4ca4fa8027071b61454c44c30cfaa709cdcb8708ebcd5f64091b39f1310e70408e21395efefab1e9
 EBUILD breeze-5.10.5.ebuild 1643 SHA256 cfc374b183661acba6de58fabf1dbe412685d3f06211179127fc01969ce3a0ec SHA512 efb094d5ac6d8f7752fed85f04a17f999bacb45b42a548ddcd0632f2dd64f2c31dd104b314828793191e9fdca11d02e2a5c20415db6f27f7e7d81c7926bc30da WHIRLPOOL 46fd56a7dfc54b2c93bfb1e9885bf3265a8ffaffbf8df29d8b0f588ae9fa493ca66ddfd2d7324f778b7a5d59c4604571de34685abc2dfcf2c7910ed66ca5f379
-EBUILD breeze-5.11.1.ebuild 1645 SHA256 98422a14564d26b3f1857585f2907da14d5814fbb205df0303eab7147f9d00bf SHA512 425f88b89dc8a3ea013d8392799a6b6cb5ca50c7f6d613059252acb1a3323a6fd33f45c6d187e928f73c9620103f124c72fa7821f742b063c2e2d8149e803273 WHIRLPOOL faf578232949562da1126a5f72b3acd0f3ce04615e38231841c9e79919943fa14d1341e484ef41e58f36cb894f8f7b4b0b42a73a7c7136ca15aba2e1956552b6
+EBUILD breeze-5.11.2.ebuild 1869 SHA256 f25f7451608b50718a57666aed420d59d6fabdf2dfff4d5ee880cc37f4b581dd SHA512 3c152204d8453d6a42d8f9d016f4ae9963b19b78d92115b4be3a3f0e98c7ee8926fa81e4ea119c911c9b30369b3e458f9a1e7aa431fae4d6d9a52ed40460d885 WHIRLPOOL 0339e860bb550380d1fb51dd2fad26d517f056ac17d54166ea1f4b590fbf2825dfc513320c5850cb2f61c364fdb178102b9515202d0dd48e3e6ac135e4b267d9
 MISC ChangeLog 13402 SHA256 54f66dc33fff2c77dc4e9bb79acf290c89e3881c6161852429ad2ee21c10b538 SHA512 49ca27204423f6718de20c338e09d4c138b0530f38a5644e58d2c00039e3ea652d1300b82fbb744d5642ff99452a6201f0af6de4d7bf2a2dd27ac5941b5afdb9 WHIRLPOOL fa1d7983e422ffa270b966c3e9b33124e3c189a8da8af77f9bf0a7c5aaa59bca92e02752f3ef8c1eb7273c35593463363ae62aa0cd8586c3853e847cb484876d
 MISC ChangeLog-2015 712 SHA256 b40132361f69adee962d2c7cceba1cd2bc25dc118a80586706bef0ccc3029259 SHA512 afad2fd7e7598a172e6bf7d6e1ead8d23e9a4e1340fe8e374328361598a7780207b59330d3f017cec106ce6cee6ceb6c5d13f55e2d405fc89ccfff20fb0e1671 WHIRLPOOL 1cd19d4e8aa9bcf106d89e0296dd720b48b6ebf4c854c1b98e44dd34f9b2b22b20d5c1cf7b00c2d47f66904e0b5c3c49ccfe802b0305c7e0a5d0ed56556368a1
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-plasma/breeze/breeze-5.11.1.ebuild b/kde-plasma/breeze/breeze-5.11.1.ebuild
deleted file mode 100644
index 4ff1c17cde01..000000000000
--- a/kde-plasma/breeze/breeze-5.11.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5 multibuild
-
-DESCRIPTION="Breeze visual style for the Plasma desktop"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="qt4 wayland"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep frameworkintegration)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_plasma_dep kdecoration)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libxcb
-	qt4? (
-		kde-frameworks/kdelibs:4
-		x11-libs/libX11
-	)
-	wayland? ( $(add_frameworks_dep kwayland) )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kpackage)
-	qt4? ( dev-util/automoc:0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep breeze-icons)
-	$(add_plasma_dep kde-cli-tools)
-"
-
-pkg_setup() {
-	kde5_pkg_setup
-	MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			$(cmake-utils_use_find_package wayland KF5Wayland)
-		)
-
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
-			mycmakeargs+=( -DUSE_KDE4=true )
-		fi
-
-		kde5_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant kde5_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant kde5_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant kde5_src_install
-}
diff --git a/kde-plasma/breeze/breeze-5.11.2.ebuild b/kde-plasma/breeze/breeze-5.11.2.ebuild
new file mode 100644
index 000000000000..02c009acdd16
--- /dev/null
+++ b/kde-plasma/breeze/breeze-5.11.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic kde5 multibuild
+
+DESCRIPTION="Breeze visual style for the Plasma desktop"
+HOMEPAGE="https://cgit.kde.org/breeze.git"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="qt4 wayland X"
+
+REQUIRED_USE="qt4? ( X )"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep frameworkintegration)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_plasma_dep kdecoration)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	qt4? (
+		kde-frameworks/kdelibs:4
+		x11-libs/libX11
+	)
+	wayland? ( $(add_frameworks_dep kwayland) )
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libxcb
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kpackage)
+	qt4? ( dev-util/automoc:0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep breeze-icons)
+	$(add_plasma_dep kde-cli-tools)
+"
+
+pkg_setup() {
+	kde5_pkg_setup
+	MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=()
+
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
+			use debug || append-cppflags -DQT_NO_DEBUG
+			mycmakeargs+=(
+				-DUSE_KDE4=true
+				-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+			)
+			cmake-utils_src_configure
+		else
+			mycmakeargs+=(
+				$(cmake-utils_use_find_package wayland KF5Wayland)
+				$(cmake-utils_use_find_package X XCB)
+			)
+			kde5_src_configure
+		fi
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant kde5_src_compile
+}
+
+src_test() {
+	multibuild_foreach_variant kde5_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant kde5_src_install
+}
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index 9d01fae89a1f..b94e5f8033cc 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,4 +1,4 @@
 AUX drkonqi-5.11.1-x11.patch 1438 SHA256 88a2d8ff7c579f44778d294ea20e5e2bfd09af06c5169007fb1d952e8c37a65d SHA512 3d19b11f7cfd47bcabcdaf7b3bb4dc1e38b38a5e52a3c23849860ed851b1211aaaa61da48f23a46f7a51dea7ec2f132a3c16577bea042da513d1bc84264e0bb4 WHIRLPOOL 803d754955083df4beea94f3140534140edbc4de5adeb99f422839a3b7e2dc652d8ab0d9f75ad9c5c7c31c0e10dceba96309539a39ad5447ab1af0bdf846bd22
-DIST drkonqi-5.11.1.tar.xz 737176 SHA256 6560453eed9c6bee39d214b60693d043a6d02d775832b2527818d534be36004f SHA512 3ffb42955182cae070478a90242602d1d9a76f77c3ba5d4661da7b326636e2bbba2e36b1eb16cb0fde8b247bfe8b604395d1c26970a9162e04bce84f4c17a132 WHIRLPOOL 53e25438d0fe0c4eebf64423bfac84a25dfd7c92bd78d4e91c195cfd6122df5dd7e62278966d40ae205e776fab99679a9f87ad1b3999612490254d49dd22f617
-EBUILD drkonqi-5.11.1.ebuild 1377 SHA256 647d3949bf5af5d6d445c5b5ead3d53dff7c89a7c8a2d7de78272857b5ed64fc SHA512 b4d7db113722e953384a71d224b5a3e3e23e35ffb045de78ab92ca04d1655abaf9bf89e9000a2dc85d37c72b50f441f0c3e45773c9d4375d115e4d58093b20e5 WHIRLPOOL 3bf2fd38acb3127e94f3e6d60d3889f12ec99e6cf082c97cdedc974afecdc9b7bd84928f5c652b6f41b26ef319d11d6ac0487d9bd78a1257949021bbe29c4be6
+DIST drkonqi-5.11.2.tar.xz 736596 SHA256 eb9ce5a1a7e8710c7f97c1e96a29d43e75498c4eff9b6fba67a055323fbaecd5 SHA512 54419f15453a0f413232a09255da66e982d1e683850ee8782b748822ede9821012e4c0740c682edda3d5317ad948e083cf00ee9deb27a34739921fe104b7d30d WHIRLPOOL bbb0c0bb2f326d0d26c62916f2c252b74691b8c1635f35598179e15f33329e63ab0afc7ecbf30cfd7ed9256b76abe6aac022d46e582354717985209bc7f17f87
+EBUILD drkonqi-5.11.2.ebuild 1385 SHA256 80ab8ce687343ab9f6e49f9ad79bdddac694898827abb829b3c42c38cb47c857 SHA512 c15fae9520f5309b8df7c4c01fb50d6e09448ec03851eddb1d2e7fd20bfdb703273b572b148608c8b19925d14e55735e94a08436b303c6360d7f66d900001e03 WHIRLPOOL d0da4d9e9b549daea7e3b41d2c8153c26c3e61aeeeda834a0e70498563b075bd34363853c6596f8de0e1caf152633f9bd917688dbf45cd7db19a2c2f59bcbe9b
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-plasma/drkonqi/drkonqi-5.11.1.ebuild b/kde-plasma/drkonqi/drkonqi-5.11.1.ebuild
deleted file mode 100644
index d540f577a872..000000000000
--- a/kde-plasma/drkonqi/drkonqi-5.11.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="X"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlrpcclient)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	X? ( $(add_qt_dep qtx11extras) )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/drkonqi:4
-	!<kde-plasma/plasma-workspace-5.10.95:5
-"
-
-PATCHES=( "${FILESDIR}/${P}-x11.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-	)
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	if ! has_version "sys-devel/gdb"; then
-		elog "For more usability consider installing the following package:"
-		elog "    sys-devel/gdb - Easier debugging support"
-	fi
-}
diff --git a/kde-plasma/drkonqi/drkonqi-5.11.2.ebuild b/kde-plasma/drkonqi/drkonqi-5.11.2.ebuild
new file mode 100644
index 000000000000..56d8a3681703
--- /dev/null
+++ b/kde-plasma/drkonqi/drkonqi-5.11.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="X"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlrpcclient)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep qtconcurrent)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/drkonqi:4
+	!<kde-plasma/plasma-workspace-5.10.95:5
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.11.1-x11.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X Qt5X11Extras)
+	)
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	if ! has_version "sys-devel/gdb"; then
+		elog "For more usability consider installing the following package:"
+		elog "    sys-devel/gdb - Easier debugging support"
+	fi
+}
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index 2643ecb698df..3b40ea05cdd6 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,6 +1,6 @@
 DIST kactivitymanagerd-5.10.5.tar.xz 84528 SHA256 67937165a443b9d1dd9cb5f97000cabb488a83d278d76e58dfa460e5e34982a5 SHA512 97215cbbbb22f75e4244e2e16bfec97612eade16a1e0537698452a823df4198e28e23934b96d988b304afd090df6caa9657708eda53324d78bf509793ae28673 WHIRLPOOL b5576f854da462909ffb44583248452e385aafbdde5329aee8efb77bc43f922a0df576e5d1c95c32348970c5fc549778e1d7037b2b8b017fc242e925df04d3a1
-DIST kactivitymanagerd-5.11.1.tar.xz 84756 SHA256 0fd6af491e3e75e53949f1ef8b012216076c57e0cd860a7b1789a8f7ecaa66c8 SHA512 e3584431b88b0edd00e6274adc5346953b23bfddc9e52b0f57d21aebb9e94512688d40b2f8414ad8b9f4efc58a4e0d0e7ad8374391c1fcd7d54330bfc45392a8 WHIRLPOOL a3b0654dc7d6043aa4223e08a29bf83d73c742cf5f2d96513fed45f6b5879c88b25dbcd6bacab834581bb9db78a3d74ccfcdd67de1bb69c89292b3c4244a29a7
+DIST kactivitymanagerd-5.11.2.tar.xz 84624 SHA256 a25872289b933a102d8082a0f167bddd6a3c2ee3d919dd9cc98fdf63e1f2b698 SHA512 e2c85a5b2d8470ae8740adfb1bc872e7a7eafd3a210a37cc2450a99941a29eb0edb454d627915f865831d298faade4793c95d78ec2ff748b7abd9a1802022a86 WHIRLPOOL 278df01884905355b608c5b449cd0ea1f528a32024f10f49e1dc471bfb272b7be71c93dc2e40176226b589fce4013bc7ae41bac75fa3b257c6b7717fca3ec2ca
 EBUILD kactivitymanagerd-5.10.5.ebuild 886 SHA256 0fd72baddbe95a58387f501ba6d088f34ec4166849efbdf6937144cf52a3b6a5 SHA512 999be814526b39eaa26cfa2de5f7536f1553e500408d17cc58bd092f13f48f310c58f9d92525e4e0327dbc820324698e7aa029e2f0a3c05f8c5f438c1f2eb3e7 WHIRLPOOL 4bb71be3f4c71ae9f85c74f85e68303982644c345dd8344cf24928e74ed70129d8ed6f2164ec0ff58d1c277a7c821cde5b075527a443dd01f81a9a3db559f5d3
-EBUILD kactivitymanagerd-5.11.1.ebuild 888 SHA256 ff77cfbf604098ec64b3ceb19126dd2bfcb826e93578a9459dfb9880642f05fc SHA512 c4ca62c360ab266e3a87e699db92167b2c622bd9284870ff3f090bd3c6d7aeb1f10c8b5fe57e1a5db3886c76b3348c87f4c27cb1ffc27ee5b509a929407438f7 WHIRLPOOL ce206f758a0c014e14b3ed104d2cfc819c93dc3731e42ee1c87d331e2893600f3ad0031a17496503c7a2243b89016ee83bbefb38e2a048751abea43e9b9aef2d
+EBUILD kactivitymanagerd-5.11.2.ebuild 888 SHA256 ff77cfbf604098ec64b3ceb19126dd2bfcb826e93578a9459dfb9880642f05fc SHA512 c4ca62c360ab266e3a87e699db92167b2c622bd9284870ff3f090bd3c6d7aeb1f10c8b5fe57e1a5db3886c76b3348c87f4c27cb1ffc27ee5b509a929407438f7 WHIRLPOOL ce206f758a0c014e14b3ed104d2cfc819c93dc3731e42ee1c87d331e2893600f3ad0031a17496503c7a2243b89016ee83bbefb38e2a048751abea43e9b9aef2d
 MISC ChangeLog 8103 SHA256 152d2cb989117c4d52f379449990487bd54986d7b8f4334d6ef50cb13d48daba SHA512 5ff538c2b1732cecfa4718909b10696d2ffe95b41c4b61f73d47115ca246b6a2daa58a7496b591528d9333e4e1a76d3f940d5d7a35cbd78b2730aeeac0511d92 WHIRLPOOL 35f2f7287c19c752928478c272b8ac867103fc2051f4ed4e80e153c2f092fa2e68585900d8702a8a540ab0976dd8d6c100d7a02f695f90504c5a7643caf0badd
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.11.1.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.11.2.ebuild
index b0aaf5100046..b0aaf5100046 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.11.1.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.11.2.ebuild
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index 3e1aa12bc7fc..bc448e380e41 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,7 +1,7 @@
 DIST kde-cli-tools-5.10.5.tar.xz 502000 SHA256 731f962e72a741bba5e3608fc4acca1deb896c670c140e82d814d3bffbca4ec4 SHA512 02836ce8760d8471a9c800c070d78c2e3513ce7a69ea04e2dabb33d5944fe53a7b480f48b9a47d339ec53b5bfd4f9798164b656f3c2080485f62d47703c5ba91 WHIRLPOOL 550209130ceeb2db81651a285691fd1946a72e57630b285f19c7bbf381fed48c6f7b146f55d08c44e8c094811fcc67b404e54274f4350854378586746d23877a
-DIST kde-cli-tools-5.11.1.tar.xz 571428 SHA256 4c205e6a9cff7283ca727d12827c983d456f49948b82089bba8fa806fdf52736 SHA512 8cbf504ca853a0517381d2be12b99350256cda48ad2c3bd55bd1138510f54dcf92c5503b2a1eff24a51874f6cee0e936f5d4d5f61d5457261212ae527dc07f0c WHIRLPOOL 23afdf63c3e47152b4776694740e3f70dfd8c5db4b55c26b4ff4f987509cd83442cc30a2dde5df0d89e7449c5401dfa83cae65db3af80ec9c8687276464f5a7f
+DIST kde-cli-tools-5.11.2.tar.xz 572156 SHA256 6a3efde6c8739283c07b9000430c92ad1039d424c7f04ce6e7dfabdec44ef4a2 SHA512 e72416d6485620ea2ab5a2655fd71890988227869cb994c25fec7d1304025c42b3cc2da857ad2375f15da40c1f006b43204e960049d979c8f19a07fb1047e01e WHIRLPOOL 2c33a0c58e19cdb0cb53a796ed6d9a80739bd019d77a81f46c95f3c54d89146219dfefa24b0569ded73729dcb893f9fa4e51226d4f98396daf1ff39edc8eb0f6
 EBUILD kde-cli-tools-5.10.5.ebuild 1403 SHA256 528943706d66ea8d28eb79723c678108ca7b9c3e5c8bd1d1bd9386f8101e5ab3 SHA512 9a29bafbf70ee783ec8a464da68c76b1f2af4c9322ee7bc4719032a1a51eb3d3a00157bf06d8f5109119c2c97e1130f054270fd85664352903741d5239091204 WHIRLPOOL bcaed625796a41b05f55d760212d766f51771ad351dcc906d392067523fd3e5f564bbceb03fadacb196509bcff7f43e46d31a6cc2cf4082969c22617d6714b59
-EBUILD kde-cli-tools-5.11.1.ebuild 1440 SHA256 ddac7b7a38fdeefb307f0e30e7424d808fad49ff6a294ae1bb96d3405d9d9170 SHA512 4fe5d2fc2d6b3a21f321a08ba3e3ae962df4774abffea1da5ecbc7f9793eaadf8ed6ac6111ac09ff22598887be6b5f0a3640a7e385b888a3ba3979c3ae6a66d6 WHIRLPOOL 6fc69e0ee7cfef1d97114eb51b014fa1fc624321df48b3576b1c79548bc6643b72525f57351db3f00d792da7fb50bd28436dd9586956314b306d9e76548609cb
+EBUILD kde-cli-tools-5.11.2.ebuild 1440 SHA256 ddac7b7a38fdeefb307f0e30e7424d808fad49ff6a294ae1bb96d3405d9d9170 SHA512 4fe5d2fc2d6b3a21f321a08ba3e3ae962df4774abffea1da5ecbc7f9793eaadf8ed6ac6111ac09ff22598887be6b5f0a3640a7e385b888a3ba3979c3ae6a66d6 WHIRLPOOL 6fc69e0ee7cfef1d97114eb51b014fa1fc624321df48b3576b1c79548bc6643b72525f57351db3f00d792da7fb50bd28436dd9586956314b306d9e76548609cb
 MISC ChangeLog 13744 SHA256 410d82ef9209473da860d05848e083f25adab658d692a5b8ddfcd6b03f550089 SHA512 b2e0abd8913be8db1982e11780a01f98e8365783265a934eaaeeab078ac665cc08c69555899d62dc5e0a735efc0d9500ae43471b1051eb341f73e1c3fdf20e53 WHIRLPOOL b31dce58bd24f89380d44b2b40e9eabe44ad7a27d36b9989f808ee462037d8de65d0986e7ef70dc479c6b91b8d5bce1598e168a92283c8d2b897a15f1b25abd6
 MISC ChangeLog-2015 859 SHA256 20361163dede3583fa133094b723e29fea732cc14024e2554a22b25c2d85c6fe SHA512 a013e0e35260853b2a3f2d81fbd1d2daba338f02fac1f8147602d5c656150a2df847f3fc51ce7162016652000ca76885666eddc3db94603068383192cca50176 WHIRLPOOL a63a7feaa1b7d293eaf97c840d01cc23f6111923cf93ec9e204fbf5e2547ca24a17e9cf4a963acb1367454ac21b2c7d0162c6a1be45f5466c3c6f8a6aeedabcc
 MISC metadata.xml 353 SHA256 123c6632b172d3df7f1a0790b82c3ef9ecb8a33762c5e0e5373f4dec0925dcc3 SHA512 c8f393c7d9659412f4c2f5fe866ddc7bfe61af2d4202bc6d03aa70d895416a6aaedb7ed024bec03ab951264810d1804e48221a98306f5f41f89722c9664ef609 WHIRLPOOL 48488e1e0f347461992ede41f4154f9f5d72120db822d0b07a2259a80c455a222dd962b44c6d578ff4902ed5b929198fa91cd9a2286704dd4677cb70828e7321
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.11.1.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.11.2.ebuild
index bfade566c883..bfade566c883 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.11.1.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.11.2.ebuild
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index 1ec9614814ce..13d291f44043 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,8 +1,8 @@
 AUX kde-gtk-config-5.4.2-gtk3-optional.patch 578 SHA256 98b5f8fffbcddd890c00ec1ee45554cb3579242732fa0aefbf8b782a4c3a4214 SHA512 f4cfdae004dd0c6d26eca2b46a1d28bded9576c3488320b4436742020835ac5029a163f7e5859542d087181e07651b66777cb3199d79c1aa1fac682edbf20617 WHIRLPOOL 7f0dfd879caa58fa526a882fb32d0fc04e192caf0118aea88c5e62c4d5ef4cc0e14ef9851887a899292bfe98c18ea45624c37e397e0553182d27000ed4a2a5ef
 DIST kde-gtk-config-5.10.5.tar.xz 152488 SHA256 a5bedaa880d416a8ab259c59dc84b4086a1cb8582d95d8632d79c3e9a746b8a8 SHA512 6043b8f37ec291bb0add449ea1a1777fef89d7aa246fac9af0fa4aa417e9c9551429a4c9ca1918d0079fb93e1bde13d82b1fdf83c615d2951f74558b013570a3 WHIRLPOOL 3125918af5ae52c2352845acd7c6f497294dc76e96885a53014e5127cdc046d9d0de1816814925f9f8d50f493331a5e5bfa86864575534a756db6908361e5bad
-DIST kde-gtk-config-5.11.1.tar.xz 154904 SHA256 549d0828a5bdc6e46c9d08fd0c2b03c2aaada8b64ffbee39162aed2673e3cba9 SHA512 23861afedd2beb445f36c4728c358b016590ca08e6040837bfd5018ebff46159fa1e9cb8d664b3606a0bc7178981ecbb9013062ccc5813c5207d616283f79f18 WHIRLPOOL 2d590fa96b930722c741c8bce392a941da81ceeb494c44dccb44474e417706656b879081db2d55ddef0f3c5ce6afe20e2b73d8fd24f67555713c999deeed2708
+DIST kde-gtk-config-5.11.2.tar.xz 154880 SHA256 b73ca01e2e3cd8a349d4357defb57542092f4813a179e41bb6e76a2d54bd156e SHA512 3ee7162c93ff8fa5cbefd26fcabf2e2712afa87e7c3bf7b805adebe3330201add0affe693b0c99a1263df3c95e0f6fdca655b56e87b75de51ef5acab1e133831 WHIRLPOOL 9f849f326202407dac0601474b42f5138c84ce005b8788510b5e36e1aa9d65c661fe260c90a45f874a1a2420b64b47ee3352901c569ad96038bb0a6b5b5768d2
 EBUILD kde-gtk-config-5.10.5.ebuild 1355 SHA256 1ba33a37849ce5016f9b8c8de65eee6aa2562a9d8f9c07500145de5a456196f3 SHA512 7a2e94c5a12cac8841cde25a8f3d6e9e5e4c7704cc3c5799bc57196e5b7243fcc86ddd4b8547dd10bb02aa9a32fcf64fdadf04e2f975102d7c66a2abb2b91c2a WHIRLPOOL 45d4413f5cc2cb21ae720981d998ddb36fb5dbad3b178d770b18bb2cbaf7a97b7d5eefab2522425606f98824ff7daff4f3140cf7ffaf29bf2ed0705ba361c493
-EBUILD kde-gtk-config-5.11.1.ebuild 1357 SHA256 87b5f32567c78c370601c93ef5ecd4d57e5b89ecd23f3d929cf7458d93b02996 SHA512 02368e20b410c9b5edd12a4ab815697368c328ea179609b3a13f8028b5074848e37c24ab6993f2af02fa758b5ba6b5c1c95686eacf2f50c57eac1868ed9fd24b WHIRLPOOL b66f3c6009cd4d73d34676d10d9a46fa64899697c5d3c03d75276cb7f440892e924bb1e574986e5e698ca41beada50b6f90ef5c219f81044d46724d5baef338f
+EBUILD kde-gtk-config-5.11.2.ebuild 1357 SHA256 87b5f32567c78c370601c93ef5ecd4d57e5b89ecd23f3d929cf7458d93b02996 SHA512 02368e20b410c9b5edd12a4ab815697368c328ea179609b3a13f8028b5074848e37c24ab6993f2af02fa758b5ba6b5c1c95686eacf2f50c57eac1868ed9fd24b WHIRLPOOL b66f3c6009cd4d73d34676d10d9a46fa64899697c5d3c03d75276cb7f440892e924bb1e574986e5e698ca41beada50b6f90ef5c219f81044d46724d5baef338f
 MISC ChangeLog 14026 SHA256 3bba54b013e41eec20b01689e913a160c60576849f1a8dad5d423b448b19f523 SHA512 54a92a1b3ec4627e4de2a859794ea41166f9033a39a50938d79a1572d1fb76dd4280d3e0b4800acd955d9ea1d6ccaa4c5ce5fc02d7d66bc1a99dd638bd9a8575 WHIRLPOOL 1dcf4e443eb127e6417dfaaee5439c757f38224d5b992b8716a5b4db30943496dcfc4ee78041b6a131e2601d9feafffcb196dab6f928475bf2bf2fc41dcfb26f
 MISC ChangeLog-2015 752 SHA256 48c8fa3d8341e17f0420cb648e28910ced4b823783b1c3bde8382b1e73ed132b SHA512 2b645f8ed7e7716d68f044bf5a976b23b220f28d90ff4d324a81b3c9f141e71a08f795cbc85a7adb4bde32efa220c1dca01cd9bb56c053085949108c4ff6b522 WHIRLPOOL f0e77a73a3ed410e23946142a28c995fed85ddc1f5ddf8a8eead077641417390dcd6a8450d1df1c75a9d86e7f7aada0c92261c3777b2cb941348fc67da06b48e
 MISC metadata.xml 333 SHA256 360fc891909c5fff73d1c8952051e9cccda6362fd9e13755f7ab1a3554fdd6f6 SHA512 ce7ff5491e0b8e230a07d5170efa584645eeb59b83f5e446569d230ba1b7e86e0419648fb11d91d81dcbe96139524b2371ad9b9266d1b97f147784674c64c326 WHIRLPOOL 699e80c2524af5d8f715ee58a9223062c22b758fed9d4d9a215495783b0ae9ad84b1645aa24c4f8c54f8b735a25c6824a1cf2f52e48bdb69f31a4c4c987a1ab4
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.11.1.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.11.2.ebuild
index ebe684a9ff1f..ebe684a9ff1f 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.11.1.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.11.2.ebuild
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index ce67cb0a0a10..1cd41ba39c50 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,7 +1,7 @@
 DIST kdecoration-5.10.5.tar.xz 35604 SHA256 c355b29165df1d84d640a257ce10c304dd5ba6b46c99e15cb4225dbb747c443c SHA512 23a75d237a607d2cb9b7f9ce4cd1f378e791d2774354870bcabc3232b7546775db6770f840e6bbd2f843421338e4fd56122a042520fc4b10a98929c3cacf709f WHIRLPOOL b7cb85776696e2b043cf5ebe4ceb5a04d2124dc525accaa44ee0f66bb39330da75cc46069e25681caf126f498f73c95433cee75fd1d0dbeb1b25e54e6d5f9e36
-DIST kdecoration-5.11.1.tar.xz 35460 SHA256 f08e053589879dd2a16ce5a0fcde710105e336d7041d21e4f6d5175f996efbca SHA512 ed98f4848068b9c012b5483bca37c8c5662f6589f62dbe5cbb58487148466bc8650038f0c836e1d8939b84a2330a13081dac4fa13d2b03f9fb69513227caeacd WHIRLPOOL 4e3a3097f10305cffcc5cafa48b422c6e9330808fd8c71004ba2ea92635de02c2b0db4a752ed5b34c5570c671369d39d80cba519310db76f39b85d2d34b2c384
+DIST kdecoration-5.11.2.tar.xz 35672 SHA256 6a8bc94675c6387a37087f6921477b406e2e567d8eef75e9f660eeffc31d7062 SHA512 db0c3690f268fd2ee898d4be2ebebd11754ad473a9d057bdd37d5caa4ed1963fb1cf4b0d3f7ef3e6bfecafe9e7ec4c09fa87054427398f3c2ce579be4bbeb0fa WHIRLPOOL 1a1372e14c6a76b1ce67c87e14ce0354dc902f1a1cb576c60f4584c0b55f7000d1054fa38d764d87d41522eda794930795f88bd902e5ec72409ddebc2041fa1e
 EBUILD kdecoration-5.10.5.ebuild 368 SHA256 9f790d5c7f8395aad122528449256835305db400998f9927a36cba5d3ae4c745 SHA512 5a68ec24343ac4ac9f0becbf67338e703e268c2259bbd2c8efd5ab0a98f525927164ca6f6df133d5d9aca2f856a989c04dc49f10ea7753a4684f03be4e2c4fa8 WHIRLPOOL bb73ced82935b6a68c6a9df9a7aac2d60233bcd5b6e002cc93585f1fa5c9bde8184f22cf39737dcc614a95fd5a2d72ece8d6329395be1b9194f6bc3086b2df78
-EBUILD kdecoration-5.11.1.ebuild 370 SHA256 92c9a90da728793d861331affa76736277f17949423f93286b2587eb47e2f9e1 SHA512 f992756060670c4b3cb4ceebc8f25361cb05b2f43c0847c891ab2d9190218b0ec0dd7528319ba3a2851affff8d705fec060d2a2d3dd0e4280f0872ca7645a976 WHIRLPOOL 2def32c1ddee45fd33c507f0fd2dcaa5582da3f9de9fcf7bba9cf88277d248364f4c5e42f7ec2970b680970848878601fbb47560f7edbcb9742b4fd941d98015
+EBUILD kdecoration-5.11.2.ebuild 370 SHA256 92c9a90da728793d861331affa76736277f17949423f93286b2587eb47e2f9e1 SHA512 f992756060670c4b3cb4ceebc8f25361cb05b2f43c0847c891ab2d9190218b0ec0dd7528319ba3a2851affff8d705fec060d2a2d3dd0e4280f0872ca7645a976 WHIRLPOOL 2def32c1ddee45fd33c507f0fd2dcaa5582da3f9de9fcf7bba9cf88277d248364f4c5e42f7ec2970b680970848878601fbb47560f7edbcb9742b4fd941d98015
 MISC ChangeLog 12416 SHA256 7280bd89678fee034c0007215887770bd98b80eae3d94ed51c6efe7dd0f0bf02 SHA512 b118fc960a91089106d461a02ebb97d582da28f4667218181d67fc7aaf29316d7573e2b213802fbaa56d07495f1e3246f9f1df9a4fa9bf2a079f3da25d6e9d57 WHIRLPOOL f0a5afebfd2eb0e4af5670b2f667dbee04b8316aa3157cb8178c37d3a0c936ed7c79e6153f95e5e50303fcbfef656703332f74f2b1756ca4a7ee2899f9a2e953
 MISC ChangeLog-2015 731 SHA256 1409c1f208b3359aaae332ca800c68788b15516e6c2e1950e7620049a9d9c5d4 SHA512 1bdcf36a71d4ceb09bad44612af4d4535d0f5c8859ebd26e0d950e2320d311ff07ee5a86697c28027be137fede2cc2279daf4811925d8358bd178397262088bd WHIRLPOOL 4cbf31fb38d0004e8554c9d793998e328f5ac116c41e9b1f84f1846ea01ab83027abc3b16a8b29457f933f69a9b9357e6c97b47d614d69e9f3d5e9471ed34aa3
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-plasma/kdecoration/kdecoration-5.11.1.ebuild b/kde-plasma/kdecoration/kdecoration-5.11.2.ebuild
index 992ae7692a1b..992ae7692a1b 100644
--- a/kde-plasma/kdecoration/kdecoration-5.11.1.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.11.2.ebuild
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index a080243ec5c1..26e29b8ec4a8 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,7 +1,8 @@
+AUX kdeplasma-addons-5.11.2-qt-5.7.patch 1000 SHA256 7ae862e26d712e54cd9c775bba3faa89a28fcfe3fbb2979b40a1d285ef86ff22 SHA512 cec5bc0bebd88dc2bb0a8d53d80b795188c95d74ce18a539b1b18496dc53a4156a0b8758641b975105c49c98f7a6645d5d181d7401d6e069cd4b846a944132f9 WHIRLPOOL ba67900026c11d1c146e281c2f24eb1fb7960fa8fdb753800136395cfe3f9ab0d89ed2e656e7c29dc5293193b9fbac93eaa4cc42f1a1dc59a01f4f928947e0d1
 DIST kdeplasma-addons-5.10.5.tar.xz 1373676 SHA256 25af1f57b594a4b2a5c629b012b48c5db8d3300b9decd8cd25a20313d150baf5 SHA512 dc9ee0cfa52333b98afe3281914e0ece38caeeb9c29b3fd8a63e5ad657fd68aeeaa4eaf10e7f8ee9470d4b76493ae7249889efb810426b708a213ba4e3c95942 WHIRLPOOL e1ecd7c93aa11947164c6995ed33898708f0ab4b81eacc6c806093d21535a6af7612bf1860f06998e1e4829fc998e1f9f98fd07a37294e311b49037812f2f1d4
-DIST kdeplasma-addons-5.11.1.tar.xz 1382120 SHA256 967eb0f08195e4a8b8b2f3b6c42b6afa18106974276dbfda9e3bc6a842abbc25 SHA512 bb2a8384407c68c12921f9ec26ec53b36e21493dd3f3752fc50408cfca825ffafa518df2a77756fd21353fab8426b2f7a314145f8be9c6355363a8d107f24328 WHIRLPOOL 468494ef4bee9224f7571e3469ac24730e33c1aec308d404e69e13d7287df32703640d822acca6da6b82d5a46922cd4b0ee3cba4d0359814c8146f5cba5cf1b9
+DIST kdeplasma-addons-5.11.2.tar.xz 1378952 SHA256 06af9117a8bfda573141073b73aa5f1755566904866dec92673bb16cd97e3474 SHA512 51ab71a52e7402f7a97f3cfd523176637230570f27bf87c4706d519255725462e1220a3e86d0ff002ce5f74b16b17d72bc071ed3f032a3f9aed494c917afd735 WHIRLPOOL 648b796cdc363d6e6d96d0a5615319874a72f0db1178ac28d695e474d969798783e4817a32d530608a1bf0e533f920771ea7464c864e4ef7ef28b8a02e0abc3c
 EBUILD kdeplasma-addons-5.10.5.ebuild 1428 SHA256 819ed4c9bd96fd15f49ed5d977cf7e7903dcb80fa2fc392f1914383b1de19d61 SHA512 59baaf03c04dc4d304fb42add096afd1ffba9f9a416fab7c1ffd8ff79506bd3e0a12948708e2842319d2e020af5621c1fba695d6da8b39af9fa4ca4558a071c1 WHIRLPOOL 28b5f82c1b9dbc0a5ae0db58e29fed4636d41c9055c89d64cdde809b7b207b83740be43e24e6b1cd443f09d96169c72ab9e7477e8eb39a02ceba7b7f183496f0
-EBUILD kdeplasma-addons-5.11.1.ebuild 1430 SHA256 d1774f16bb874715751d59757b7870e4989ae89ea9e6f7d4112a26bb3349a80e SHA512 a510e2a283055ec74c2be0a453739811c90b26684c8b784bc76a0d6ab42ebd470451af0ed0e9830ba707c42707f780a1aa0833acf31bbb45b5c3a1c44e71e9dd WHIRLPOOL 77629f3b4676f176fdfa289a6d789eb61590fb6b3d4ce62da7f446318340adefded1f047ffc92b890da3ca631d09fdb99e86952bfcea81f5b1be3588c990d63a
+EBUILD kdeplasma-addons-5.11.2.ebuild 1475 SHA256 a37e2f5e6656694b1fa340736de33ef4f5fe683eef91deb81b32d44e044e452b SHA512 4fb8f3efdf75eb7aaee6ed1b7e63bcaf67653f87b7dab2cb52e9d54e21188a57cce7078afd8f8d3cd4b8166b2da3f6d77c9a24a17aba47fe295dc838da422cf5 WHIRLPOOL 9f06c65932409546a0f9487c2acc3b5bcd390046a8c33c675a5fd0ecf09d9dd926ba43d54840411a3bcef02a65362c4f2604dbd813603675d0ca4fca3389fa56
 MISC ChangeLog 14277 SHA256 c356a58b52d5c875540a281e457942db93382c3c1827e8263012724d306df68c SHA512 349891700e3b0c884775a99dffe0148977f6dbd55bb9e6da4d9a70b2133dd47d07b765ba3c7c4112eaa6d0ca400ca31ebffa8904e40bed966e6aff2119ec0e8d WHIRLPOOL cfa135e1fd4bf150f434c016b93823dd7ed231afc3d50169d99ca628ec4eea66a18087d44229ae0b1ef8433a1ac4aead8edecf01a6530e898be48243ddfbef0b
 MISC ChangeLog-2015 766 SHA256 8f5af8ca19fb5ea2f2dc1e64ba256a274323ccbd90bf815e7ff781fc7c9c9235 SHA512 71e1a3db72cce4bc1a2def8e4b7af382ee80e8b9efd42ac71f72d83625cd8b465b5c6b9d1e5276b51290e7da6c0f1dad0243f960e08329ff5c4e15fbd8e4960d WHIRLPOOL 0d0260035858743328c13984c6321f96e35d8be3b12911398a1bd437496d41f1b73ddde97869b40da4b2c74f9d6d2a5f16abef0ff90c95a833a2c30f50088a26
 MISC metadata.xml 355 SHA256 b086e710575447a41d93f1a4cc8668741f764d5f6fa22ec3c63d10f7698eaf2e SHA512 bd9ac9458ccd15750d9659d507459a09c4b5a3297ed6dc91ebec544cff055438a79a28868623cec7e2c08ddcc1352287cbc7dfb9c93774efd14062993f2738ab WHIRLPOOL 1e17db5e7cab457f9df512746b0565a090d8fd315f44e5d82f7054914d6dd7f6399d32d3d467e621fa02c58a712c35d36dbcb2bd7452128ffb27f9741aad99fc
diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.11.2-qt-5.7.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.11.2-qt-5.7.patch
new file mode 100644
index 000000000000..b4afa3c04f5e
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.11.2-qt-5.7.patch
@@ -0,0 +1,26 @@
+From 961078337c823e22691d74925a698d1f28f20ac0 Mon Sep 17 00:00:00 2001
+From: Kai Uwe Broulik <kde@privat.broulik.de>
+Date: Wed, 25 Oct 2017 12:36:08 +0200
+Subject: Use wakeOne() instead of notify_one()
+
+The latter was only introduced in Qt 5.8
+---
+ runners/dictionary/dictionarymatchengine.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/runners/dictionary/dictionarymatchengine.cpp b/runners/dictionary/dictionarymatchengine.cpp
+index 85346d5..27d2228 100644
+--- a/runners/dictionary/dictionarymatchengine.cpp
++++ b/runners/dictionary/dictionarymatchengine.cpp
+@@ -73,7 +73,7 @@ void DictionaryMatchEngine::dataUpdated(const QString &source, const Plasma::Dat
+         /* Because of QString's CoW semantics, we don't have to worry about
+          * the overhead of assigning this to every item. */
+         data->definition = definition;
+-        data->waitCondition.notify_one();
++        data->waitCondition.wakeOne();
+     }
+     m_wordLock.unlock();
+ }
+-- 
+cgit v0.11.2
+
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.11.1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.11.1.ebuild
deleted file mode 100644
index 881f2a38fd29..000000000000
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.11.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Extra Plasma applets and engines"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="share"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kunitconversion)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep sonnet)
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	share? ( dev-libs/purpose:5 )
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep plasma-workspace)
-	!kde-plasma/kdeplasma-addons:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package share KDEExperimentalPurpose)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.11.2.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.11.2.ebuild
new file mode 100644
index 000000000000..79320367019f
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.11.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Extra Plasma applets and engines"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="share"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kross)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kunitconversion)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep sonnet)
+	$(add_plasma_dep plasma-workspace)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	share? ( dev-libs/purpose:5 )
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep plasma-workspace)
+	!kde-plasma/kdeplasma-addons:4
+"
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.7.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package share KDEExperimentalPurpose)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index 11d099b35c8f..ae40f01a0327 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,6 +1,6 @@
 DIST kgamma5-5.10.5.tar.xz 60564 SHA256 610f916b19f8ae74448bc856647aa6037b569971456ae1b8e2d1c1aaca269165 SHA512 2a57b6ab38b6412bb4784fe3e057c2f34ec678b2ed1d3220ba6332cf991f376ea2471128622a657f6d25ca096dc80b39323b6258bfb483e0ca96d278a6973a3b WHIRLPOOL 485f5f1e799a0c0c1bb66fab8b073b19a154d90f1ff0b4de2787cf87cc97b76296e0e11fb0b7e81eba53a6391b6da7a9abdd2cff88d79e383479ea5e2462d3a6
-DIST kgamma5-5.11.1.tar.xz 60468 SHA256 cd6f3c3074dbf3da4418d1a57dd287f9da08b9d37c3a21ab8c7ff8627f5735d5 SHA512 e3bcdbaab8e887d354e55ebc1e68f5d0568e304d52fba754e1730e1f767d4af80f9b01dc9bbf40f995b7985e24a6fc272839666a783128929df023c97d225163 WHIRLPOOL 8cb0e4d5b89acf44d73eb96856ce97bfdbd93c3fc815307ecd28d17f25bad5bae69836a73c6cf76bd7ca2eeeef46a18ae9afc2a60a17c6699176229288979c11
+DIST kgamma5-5.11.2.tar.xz 60452 SHA256 cd14c5b7793d8db9e23e06566565fff972ef4e80177892dd560d2e23a835d24c SHA512 3bcfe0b670129cf1c512765efadc7354abb5172c141d5d6fdcd56f69bd13fad24d9c3ba9be69c69a5de64c57093fc2e97db35c9c1e07e74242c5c015416ed0c2 WHIRLPOOL 377423b20c328ec31fd9a1138f9f7db30485dcfdd28483a96c1d6f7dd4b26afcc062ee1c4af7864020bb1f0a6b11ff20ef2d0bd51a606f925d7e836b7852eeb8
 EBUILD kgamma-5.10.5.ebuild 538 SHA256 c7a23a579519985725e7d2b6931cb80110f5a4403ddb861e2cd5613901171d23 SHA512 85a0c8a5e88aea4cd8d03c609bafabcfcfe914b6b7850200ece75b026c6c37e385cdffa7004f9387909fcc4acd7a15234da856810a3d2665ac2c4a69297e5b70 WHIRLPOOL a18c9f720a483d8e59deff456233721dc5003efee159d4cca42924b25e94ff3d7e2d7a257f99f5a6aab6e9683914b44e781156b123df8b0528b11e4a52359bf5
-EBUILD kgamma-5.11.1.ebuild 540 SHA256 dce2bc3749f476192da4c812e15a7600cbee0d3cf36c2030c51c6a545f156c12 SHA512 539e93a30b62f302b7060b0855d160450d56cd48819b528294fe2d4fcb7297b3b01023f10ed2f67f2304c47912adc0671eac70d78670754db4e169636f711b12 WHIRLPOOL 77b0a69e4e6478b7d0033b8022d818eb60436c7ec28ad2252b2c0408f5afbee9ae0c55caf40d99f3ae8cbae1aff472985eed74b445835bdf96d3a1c1972ad144
+EBUILD kgamma-5.11.2.ebuild 540 SHA256 dce2bc3749f476192da4c812e15a7600cbee0d3cf36c2030c51c6a545f156c12 SHA512 539e93a30b62f302b7060b0855d160450d56cd48819b528294fe2d4fcb7297b3b01023f10ed2f67f2304c47912adc0671eac70d78670754db4e169636f711b12 WHIRLPOOL 77b0a69e4e6478b7d0033b8022d818eb60436c7ec28ad2252b2c0408f5afbee9ae0c55caf40d99f3ae8cbae1aff472985eed74b445835bdf96d3a1c1972ad144
 MISC ChangeLog 9993 SHA256 e67da6b3900ec2cc3201b25298e1376a417b09464fd4a909902860824f58ebf5 SHA512 6051527ae5472db09e4159795075e319b93c7217fc849d50327b3edd0623ab6b735c36b6ffda30eccc30fb57d2e77c0c06b7f4880bf441e1e42104174af326d8 WHIRLPOOL 6dd84abf836a4cc100de40416a26b63550c595a052fa8cc6efd6c445152d345360d5edab33978543d8e8d13fb50577ca751f1e9b34c0955e29d7a898098994be
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-plasma/kgamma/kgamma-5.11.1.ebuild b/kde-plasma/kgamma/kgamma-5.11.2.ebuild
index ab940b8940ff..ab940b8940ff 100644
--- a/kde-plasma/kgamma/kgamma-5.11.1.ebuild
+++ b/kde-plasma/kgamma/kgamma-5.11.2.ebuild
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index 9836ce398e09..09bac045c9e3 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,7 +1,7 @@
 DIST khotkeys-5.10.5.tar.xz 699072 SHA256 3a168921f5c5d5d41ed012ff898e7c5a18b38ed69b868cb188c48d6f5158bdc7 SHA512 2886565c6f859b68129d74084639a4ef7ab37cf752bae902b7841cd6fda6ae76bd196d259e3aae256d3c6dcaaa75d076b7fb28d8437da4a617134e850411d47d WHIRLPOOL 16153e62cc9a05f72e273098f3da82c4d8cdc96855bb0b6defb9d0a615e25ca3c5e7fddc2bf64cbe4965d77657cc1921f999b71e485798bd2c3b544b5a8e622b
-DIST khotkeys-5.11.1.tar.xz 1057604 SHA256 850e226ca36549c560a5ee94a2fefe48f9e0b48c32898a86a66de3a4a20e3734 SHA512 29f91d8e8969aedc6971a2f710394af98d8699a6767885d8aff63cbb9321c9ece5c8a78e178f15ebaa3daf4394ddb4be119e9d17314d370d695459488d36b451 WHIRLPOOL efe71b9c6857dd42d378b95e9ee327706f65e65967bc29a699de8494452138b7ec02d08e4f794e72f446ffa0fd153102ea9b18dfd64c8457ae4741ed8d758ea5
+DIST khotkeys-5.11.2.tar.xz 1058368 SHA256 953ecca1d75f7b23943eaeff2e8b3b1592f042bfe6e7b0c047043f26b6012af0 SHA512 51c558191709c844c76ec5f4f1473882a465636e17e5e84c06a00fb6dfd621be8b4e332b4baa1e4198e9d98d5f81fb40ccdb62516509a3f87f84d7922df828d8 WHIRLPOOL 308f62a940c100666e2cf63a016b3f534f8c09f1f493f49c44e2eeacc963554e5d769a354c442db2432718a98bb35f988b60892a5779570e300ca66a65545e04
 EBUILD khotkeys-5.10.5.ebuild 1122 SHA256 e568f4dd02a7cc41414007f3ce6aeabe7c1127bc3cf140977ce88a15421c3937 SHA512 94eaa494c10b926ad7fcc0b06592322ff805ee129a12434732b085d36c7ce6e35c640a7f1e927d80465d9a017bde92462e179cc31973b689fde57e856d413a07 WHIRLPOOL 5ae0e8b936546e66997bcd6271de3b119c4e94ac475f1edcae05e70a90ef0f560983387ac22c7b58bb3a7b12b6a33bc54f6b314bdfffa2ae443381db91eaa6a3
-EBUILD khotkeys-5.11.1.ebuild 1124 SHA256 a96f06d26ed17f863b0f8bbcf44e63515cd409627039ab545de570fb2352497a SHA512 eb609c2bc0f4a4adf8ba80747606db8f6dcacf69aa20079273b71698bab9873fee10419b44a8872c13cbb5965634022548f82e66e21e86b7348c4c24f34aa0d7 WHIRLPOOL f208d62006fc77cf644667428ebb809efef28f7eb9290b122031dda291f58c610ef810ad841bb3bac8bddb7194339de7842830f283d0256f9ff7b0aebdfece25
+EBUILD khotkeys-5.11.2.ebuild 1124 SHA256 a96f06d26ed17f863b0f8bbcf44e63515cd409627039ab545de570fb2352497a SHA512 eb609c2bc0f4a4adf8ba80747606db8f6dcacf69aa20079273b71698bab9873fee10419b44a8872c13cbb5965634022548f82e66e21e86b7348c4c24f34aa0d7 WHIRLPOOL f208d62006fc77cf644667428ebb809efef28f7eb9290b122031dda291f58c610ef810ad841bb3bac8bddb7194339de7842830f283d0256f9ff7b0aebdfece25
 MISC ChangeLog 13569 SHA256 c12e9f4e53c2fed3f247127c0dee22574abdfeab6baab56c985d67e86a5a836c SHA512 0b95a537202845da537325dd5d7ae868baedd77ebabf87a948cb84c1f31bddd6e72001c6592f0ffc34eac27059010015c85bce966ed7e10b5ec33636db26ef7f WHIRLPOOL aad366fba9d18ec17fe6021ee85c903e35af90da00cf6ee42641ecb621873a4cc31bd59e032811f23751a07feeaa11f041af108f6fa73656c13ce55c0e5dac57
 MISC ChangeLog-2015 710 SHA256 b06943da2add1f72df5c46acab3ae530332fc7af5a9f085638980e3bc012e16f SHA512 84eb6cc88737f556e9188114e86feec564fc594743722225a7ba90b1d5a29cea73bb17d515d8490f0a29775a6b37193b7b8594e1e789199fd0f9d3409f817288 WHIRLPOOL 70d02ed9841f7dd8c4fdeca5c04834bc0671a778edecf4f59e21664de74c228354f9455e5e1110b471df10c4c5f3bb95631dc63ded44209bfc755ad853477923
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-plasma/khotkeys/khotkeys-5.11.1.ebuild b/kde-plasma/khotkeys/khotkeys-5.11.2.ebuild
index 95b8eaf17fd0..95b8eaf17fd0 100644
--- a/kde-plasma/khotkeys/khotkeys-5.11.1.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.11.2.ebuild
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index b7705cbe8a23..d3c7b67735bd 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,9 +1,9 @@
 AUX kcm-about-distrorc 108 SHA256 7d52223da8a798ab8c2ab5aa5e7c964881d9c3b59c24420dfe92fc86e5670569 SHA512 72f1dcaa04bfe435e64c8e584914eb56a15b63f7c6086f5e025f0c497b4fd5b9592d54aafd335f55d303790af274c9cbfa29c6c7ff87875da648ee16d7717467 WHIRLPOOL 005d291058513e92c2b43511efbf95f38f5998e0cbab0eb3ba574e587a87223f723c01ce7ef8165376d95cbbb28f0c21192f2fa852a8eafbb737846340cf5239
 DIST glogo-small.png 24583 SHA256 0afc3eca084c327f8059166b86769f03c9c23e1e765bb47dc3229505abbac0c6 SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48 WHIRLPOOL e161bf40c5e16180fa65217cb49314fb230c45329f4c518d6014083bd71da82d4aa048811ee814fde7fa300105cef16c182688445164ae84d0d700e23641b342
 DIST kinfocenter-5.10.5.tar.xz 1263864 SHA256 5527a3f1bb608dbaf092747c9e0c1ac24305987f31eb10604a536c73af978e3a SHA512 556bb7e369f28ce1203129f02009bc01d3c018e6e0cc7c3c18382fdc7bb6fa54e9056deb5ffbfcb429853b5f0076e537ce01be721cf698d493a531777ef1225f WHIRLPOOL 13974e560d425cceb17972e711bff87da6d47ef52815b1685eef87a188cbddb9a7be3d584a673f6a14a4ea90196efc7c549479cfae59d346a530dc1194d7a059
-DIST kinfocenter-5.11.1.tar.xz 1268156 SHA256 88b1da98f2e27edfe8c1d6f55188ffd8512bfad4bbc1db30d978200f0c717047 SHA512 365d525f40822328b4a1acd4444fbade916186c34c87ceb58b245b2ac1a3227289262109b6ce5ed6364448b09a5ba7afe05c22b16c8e72950b8516c18e9c65fa WHIRLPOOL efd41e2512f51524802574fbbaca42cfe1e6944eecb421426e79c084fe18c6706425f57662e33cd220d029acc81a02e5a14bc90319bd7c850e6319161d5bdaaa
+DIST kinfocenter-5.11.2.tar.xz 1265508 SHA256 147dc458209f18693b77af27db95f58a3dac1dfc538fba484436daabb07d6184 SHA512 a3e0282a944864f7164bd3fd91c40631f0d0af2affd604cb6233f004f52863bb0e3d52121af0ec9001ac0280cd335f6c1221522e3c4b465a9fcf878ee2048a63 WHIRLPOOL a489aab17bf366b4dc3fe3da18354c98f003c714ad855e42fc39b2d5ceca8c88d5243751e6223d5e8e5cd79d0f08c9a24235f26e2e15af3dac7dfe03457dbf35
 EBUILD kinfocenter-5.10.5.ebuild 2420 SHA256 5f36b5992da1c397e26202616550d9977ff6e8e9c1206fd87f321f9873249f08 SHA512 b44310ab7c29838aa0e46f2c2442233e73c3c8cadded35e2584de0e2e236fd5526b46aa7a7e54f29ce4a3d6741ef96ea1b552e3092d3d805449d38549307f41d WHIRLPOOL b850ee7280c690e90c6328a47f88575c231c9f9f5c3fdc693e5a4d1bc9077f5a97ad4fc13fbe30f855a6739249443bf9ec11987b1e9df4d3e61df7832f8e0e43
-EBUILD kinfocenter-5.11.1.ebuild 2422 SHA256 d8a186c5e74e6cb7076fca61f595ef93ceca510ad78bf229c23a029b52f04b01 SHA512 7537b9bb2cd19ce00e6e53c14db071aa637a134dc7dea864a08a7cc5d8ad93e15070323f6e84fcd23a7011ad7b86b078c230b5f208f86415ac5251fc978f4735 WHIRLPOOL 747e9408047602971eada7f0c996c1e0f56342174d916786e4debefd9ba7b1102926d681e9654de315ff529887bc4d81340aa3a1c7a0af4e05119c5364266a5c
+EBUILD kinfocenter-5.11.2.ebuild 2422 SHA256 d8a186c5e74e6cb7076fca61f595ef93ceca510ad78bf229c23a029b52f04b01 SHA512 7537b9bb2cd19ce00e6e53c14db071aa637a134dc7dea864a08a7cc5d8ad93e15070323f6e84fcd23a7011ad7b86b078c230b5f208f86415ac5251fc978f4735 WHIRLPOOL 747e9408047602971eada7f0c996c1e0f56342174d916786e4debefd9ba7b1102926d681e9654de315ff529887bc4d81340aa3a1c7a0af4e05119c5364266a5c
 MISC ChangeLog 13638 SHA256 3608f1b90f6c1a5c6b2e76c2de9180ba6780fe586c3b4fe309ebe76c3874530a SHA512 a5c72159745391bf8847009da09ab13bb42bd8d7c89510256a89ad975bf78db059fb045196ba6ef67954bfd38671638d587551e792c066d6dffc2510fc159d42 WHIRLPOOL 5b10aba8f86ee075518b6f58ddc5e2016f433788c1f0e4d047dbce7585c442acc531fa354ebf89e33161f76df39f468e1ac8fef8ebf39bc5f011e65de45f9d72
 MISC ChangeLog-2015 886 SHA256 30d97ed1e94c75829cd6e8d6ef6a92aa5952ce9ce44cbf1c38e9caca82da34bd SHA512 3cc1dbf2ca67f58abfda919442541cc799300065aa5e4e7556838a197932f894ec4c7d22d1c6ab1c4d318c149ade49436fbefe91f9595ef617b33b3672edfee3 WHIRLPOOL eac6564878602e6b4432ceb9b2a41e486d8849f6fa1b2e842d24754d00e608e4db63e5a510d3c4358e30e628b1e6ac56ad3835d99109bad0d17cdf6736944849
 MISC metadata.xml 390 SHA256 fc6481fcb0dbce14521fe0392a445b1a241ed6be4400a6d4aaa66e30db49ccf7 SHA512 4ea690f0f5ac41b58d840949297d462e0fa7433bdece54d63b08a913d8a9001bf6d144e28d5e672712abf35e784c2b17faf31f0a879d6109417ce95ccdc0ef3b WHIRLPOOL 177d6240e07c2224e80b1c79681253f7c765bd735e301f37c0a0a6a42e65609de5b392175118cfb55dbe1d57f5e55468a419d57a00a0e56c2c23efa848fbebe0
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.11.1.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.11.2.ebuild
index 1acc3e68a9a7..1acc3e68a9a7 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.11.1.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.11.2.ebuild
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index 9421e137fc25..031145c3659f 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,7 +1,7 @@
 DIST kmenuedit-5.10.5.tar.xz 650320 SHA256 5555aacc9b97d8c64073fa5007659520bbf4fc4996f50d036e2381fa0a35e82c SHA512 cf5b332f37fe4e1b89a029f5e9f407063f54a7dc0250322887164c21d69f44a96b5973589ff62ae29f1a7ec50951bfe3840708344c0bc37bccdc8162dc0c072d WHIRLPOOL 3aec1597c1af7e500d7e1187adea8fce2d62dfd79388b79ed42f721e9da1af97a9ac74b92aa6e4e135905c1dbee8c239f698cfff6c922156312f9e6050b737bf
-DIST kmenuedit-5.11.1.tar.xz 652344 SHA256 4621d2f7fc70c3ea82693422b107bd5a0c2009373c251714bca4a0c90ac43420 SHA512 a8545703be04d21640bc98a53594d16c8e2e1d2e9387df1290bfec96377b72172ea17f00e3c2e3d193e6bf329832803608be16b10e90a9c57990b1e7f907dfdc WHIRLPOOL b7aa0bb8ef0d073befb769daf2d01559c832b051b6d4a71897105fb4317a7647f35ad0cc2a6bc5cf1f47b2b4c073b4f781a626095e029632c8cbba568a34becb
+DIST kmenuedit-5.11.2.tar.xz 651428 SHA256 8f96fb8332243a9325ae45af57a6e43e59fa8b79f9944e85200226c68d16810c SHA512 5b2d128b72275f5034072e97ef0f4c2d60108eefea3a1e1859bbce7e118dce103eb69300a74ad4af58499e56649cff8a01f5d1769040491991add911e6a17dc1 WHIRLPOOL 67f4c1205ab585e76b465ed90ca774aa3eafdfc82b75ae20260460a185cc9fe6fbc6204a5fb1b3b5a0ab7371b64bae1e13397a58cad6cdd6244bdcc8854bc180
 EBUILD kmenuedit-5.10.5.ebuild 1051 SHA256 f6565a782d18e0e86f9b614a6d93b9969d085adf122ac17e6b945c720bf96b57 SHA512 eb8acc72057ff4297b49d1c436d9490d60f9802ffc2481945efd6d5dbd32f89c3aea4812eb63fa73926bc80bed99fe0d00aa333b6c95201d57271d69356799e9 WHIRLPOOL 17d8d299e333a715cd7b754e9aab01a62408a477ced9551f07fcc70c6be4878179515ab7e4e0027f39d5179b51f9dd92f0165019d9313a5a09ecdc2b04f14f77
-EBUILD kmenuedit-5.11.1.ebuild 1053 SHA256 72ff099f88067ece4fed5f36614b07222de3ba57a0cbd3c040e4b1403015e94b SHA512 97d8d17e39670100d2372545c7d68aeca878a3667104e365c7eb6b725163c07a3ead3a03a39a245a56f09411723fd12a3a789a67c968c6bdaa48aada15a284f5 WHIRLPOOL faa354b9ba65b3cfc600c1fc85bae1268c4d733ab617c370b3c3ce9cde4ad853f52d38c58052ffd4c09f727801da018332055b028558773c3804237266b0f44a
+EBUILD kmenuedit-5.11.2.ebuild 1053 SHA256 72ff099f88067ece4fed5f36614b07222de3ba57a0cbd3c040e4b1403015e94b SHA512 97d8d17e39670100d2372545c7d68aeca878a3667104e365c7eb6b725163c07a3ead3a03a39a245a56f09411723fd12a3a789a67c968c6bdaa48aada15a284f5 WHIRLPOOL faa354b9ba65b3cfc600c1fc85bae1268c4d733ab617c370b3c3ce9cde4ad853f52d38c58052ffd4c09f727801da018332055b028558773c3804237266b0f44a
 MISC ChangeLog 13100 SHA256 de5e27b22e2a40712e62810d105658887f48ae501e6e6fc3ef96cf5b48dae228 SHA512 4ce8e58a558d421260d46e684afb5de4bdfc4f51ba9013d047827b40a678a291509c3e8744fa988a95eb7d89a10a2583970245025937b447fab3ac36db4f77e8 WHIRLPOOL 29370d8a14da7b3e46aa21f2e34c6dc12bfa92e544cc2f0c140e4131cfb07dc8906d4452dfe1333a1f62342fcedc495337dd3457961048bdb200cb08d513e703
 MISC ChangeLog-2015 717 SHA256 61f99847849af95ed096fca659c86d564875ff0a6666c074fba8435b8c5185a3 SHA512 f3c13bbce2240994128080295e21e13cad10636d5f51f811d59f1486855509904779ac960c49337c2556c1d36afd51bd72bcef7187c37875f865ccfeca729f24 WHIRLPOOL 312583a431fd06fa7f8f765571862623385257f0376038f1b5f2008349715f1847280e592297c2527c37a642cac442b84bfd4d3ea5e3a2d9c066545a77610ebe
 MISC metadata.xml 328 SHA256 0565ece379a68e26ed40c2a58ba6eab4ea532bbb64c3df2d6e37030bf1c14869 SHA512 9286db1913899ebcf8b0da8ae3ebd12b760e2b3631399538210ff9d4b15c7b62e28fd138e75689c5bd03a5d6ee4e412036ac7f10a45a56bee9cb04184036a2e9 WHIRLPOOL 181ffd26f36793fe0a14b4bc198c76be6fde8c35d10919c0b04633242d60b6eaa1657d96bc28e6317c648e0bce965ab2101c1a9f28848c971732bc151f0f89f7
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.11.1.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.11.2.ebuild
index 4ea14f5758c2..4ea14f5758c2 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.11.1.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.11.2.ebuild
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index dd4d8c8f8336..914bc88d8fa0 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,7 +1,7 @@
 DIST kscreen-5.10.5.tar.xz 116752 SHA256 6e9f010165b1abc77c355c730cadecb88e55e1812d0d0db8d84a5acc89c20ba9 SHA512 e51dfc358a008ba2b1d48c35ef1ab80292389a772008a07cf960c6b302cd9275b8afd1b96bd825a2d2564c5e8f207a547970682a1cd5433edab462e521511d57 WHIRLPOOL 84b7d279a0bf983ca96bdc45c2d8fb4b48426d9b9b27ffddcf0d1ae1d86e0352577958087b6baeb4e3134868c4879577e46e89916c9ed3a26fadc49afbf4e91a
-DIST kscreen-5.11.1.tar.xz 117420 SHA256 19bd0d5b17562c1ca9be952c76ad5fd451e289b581bdf17d9cbd338553796dea SHA512 80ca1be6ed70a3fb568fb5e03ce2db0666b6edb15db045ee149e09c9e2c8001cf3876a881eaf2b4004d790c3532f04006a908c94d83936d32b39061735e0fbb2 WHIRLPOOL be0548d64e353f2b26bdbc87e7428bebd57f4f1ee07af0e32177842a1012a8d2b5a5718ee6d889a994b2934a22ed08ac48d30f42663c1a34b9935214c3f0ba44
+DIST kscreen-5.11.2.tar.xz 117528 SHA256 ccd2ee5cc41e7566273e386d71eedfe30da56ca1e792bf9f5441b380dd4f402f SHA512 0ea6cac748f137a7a2cfa65636c5f3c2a45f95ef2723c1990406e9f8ac188e263f101a3b9ff402fd097661b1d29fa3942223f2f18512489c3eeab6847bbb696c WHIRLPOOL aba21dd72a4e579ce81ad96f0e50fe8085e52095a87881165cd6a10dc54faac0c70057944ff3b5f30fb765898d4a01001fda453e765eacc57f5e14a186a009fb
 EBUILD kscreen-5.10.5.ebuild 917 SHA256 7723383c80ce5889eecd702757dac54f8ddac1a849aa35fdae5a2c3f04b0b24a SHA512 2212d44def3665f1b1a887159c75b221d472b323509a92f8641c0b48c3d5ae49a15a87aac908bf2acab53ea4412578982b7f166baa6d90171263c8cd51466096 WHIRLPOOL d71a0842048ba1e216736f3c02db2b7334743159ef99c5fac1067e153e3bf188489c70c35fe50a1af18352cfb2d8033907a4763e0fa24149090aa469c91c5c95
-EBUILD kscreen-5.11.1.ebuild 919 SHA256 f7e562bfa5b3cc42fb3e4e76f292d8e02ecfaf14b5c40cb59f214257c2b1295e SHA512 f20019aa73dfd5624b53e369c07713d270dea775a11edea2dba288ea1888c3f551827bb2933a1e8b2de8761affc03cde80291b078c4a9bf535b4ae210f8cb8ed WHIRLPOOL 80bc5325a208ea745e5aa2cfd935c1e1cb1a320469c1992fa70072fd8ba7faa1df5dc59620616635e9acce47345240bce0eb2276583462f55fa2ce2b2ea1987e
+EBUILD kscreen-5.11.2.ebuild 919 SHA256 f7e562bfa5b3cc42fb3e4e76f292d8e02ecfaf14b5c40cb59f214257c2b1295e SHA512 f20019aa73dfd5624b53e369c07713d270dea775a11edea2dba288ea1888c3f551827bb2933a1e8b2de8761affc03cde80291b078c4a9bf535b4ae210f8cb8ed WHIRLPOOL 80bc5325a208ea745e5aa2cfd935c1e1cb1a320469c1992fa70072fd8ba7faa1df5dc59620616635e9acce47345240bce0eb2276583462f55fa2ce2b2ea1987e
 MISC ChangeLog 13881 SHA256 b59a28161e0f8d6694a3d1172eff179879139d921b8da7b315876c94f439bfb7 SHA512 5a21fd14184898c4d7fa238b8a0caca26a74ae167d85e769f544e79152f2d6bfdf292142e41154418626a3ff963b8745418ff30009bbc384b381238f63437f90 WHIRLPOOL ff247f67c3f488280eae987a0756724e5deeb4dc3f991cd006d7e0c0e02e1e1e9c8aeefaad9c9b81ee93ba78905dd53b3affc0ea2bddd3121892cad962dd97f4
 MISC ChangeLog-2015 703 SHA256 7a1e23675e2074b2151453f9e66b409c2bc9111da004160c731b7fc0dea8db4e SHA512 057871fa468e83bdf0b02c826009714f780d4fa73896df7cdebb33c2b519745317285ba7086907febfe9821e9312c4bffce8925eb429ca7effb804dc2809ff12 WHIRLPOOL 081dbbe751ed6fc6114463768a8c455993bedbefb0e0518bb7cdfe03a6f5a5c78d7b33e5212704ed9ceb97827cee08665e1729669ea9f7cc59a550732c5f4f91
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-plasma/kscreen/kscreen-5.11.1.ebuild b/kde-plasma/kscreen/kscreen-5.11.2.ebuild
index e4365e8b8742..e4365e8b8742 100644
--- a/kde-plasma/kscreen/kscreen-5.11.1.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.11.2.ebuild
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index 880e4fb1eb2f..87ad119f4cc1 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,8 +1,8 @@
 AUX kde-np.pam 217 SHA256 dc59621230f1861a848a9e703eb81bfb442c645569fca8a5300fd0c60279dcf1 SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb WHIRLPOOL 8dec3fbe7969a8c24b022163ba2a9722cf35272afd169ab3884ea83f3217deea9cf3682d5d65e63158514ee452054be7fd6f3253c4c9609a2c336e004ee8a83f
 AUX kde.pam 226 SHA256 dfa8e18f46e008ff33f9e9c86cd845c4afc4212838c061d8580493a416c326aa SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776 WHIRLPOOL 364babc91935c52e518cf539625872006120256312d8eb98af041a539b981e4dc33368c51bc2badf6f15d4f81379d9ac1e39190cf548f6a9052a38a01b000ee2
 DIST kscreenlocker-5.10.5.1.tar.xz 118440 SHA256 777f7a67539f9e32e687525e5b119774ce1c9dd6ebd64339205b52e97d03300e SHA512 cef3a7f48f9cdd0b3967a403848a5c8a37d1253d6d7fc73cdb12feddfe088e7a8a9128f2ae8d53e1847c75d64b369cf92facce725f17654ea085f9d03024a70d WHIRLPOOL 662d46064feda302fe4897c942a87affbd3ebadd31aa8b269df7b6034ca45d6a9f5f24321a552505c0b81a2480b98480666ca1a39d075f129bcafdfe6d3df34b
-DIST kscreenlocker-5.11.1.tar.xz 118424 SHA256 6f0f4bb27183e99857d12dbd363b1596cd350394e1bbea68e32486f80f17f849 SHA512 b12f99433262d5b0170780f12f271dede6237972ccabc8a116c3a47e7c482ab07c4006b33033978dfde9143d39455690d7466f86aa9629eee3e7e4da04f0c5e1 WHIRLPOOL 0c67bac68a835f3d9d763a58101ebc907dc688152a62393208ca7156558766abda7f4b280d6c1c7d4d8ae84799ade9a0608ae0842d6c9fce7d1d6b9989c4e16f
+DIST kscreenlocker-5.11.2.tar.xz 118452 SHA256 bc573c3752ef102e3b0998c79c9d102fc872a11074a13e652c8fb4b4e1b762cc SHA512 ed51ff7ddad6ba84e1d5e685c30263a5209d96c6a9b6d979999c4222c32e822c567c9727cfec4de64ae2b910ed72fe9e1776d900ad7e8cffc147449b3ce287bc WHIRLPOOL 9305f7eb04ad7e9df788b059e9bd665d771a2cea430ce8f61f874728697051ab7ed38ca105c06d981d9164abaf8d78e74db78f9e541dd68c5bb576a8b3a9cfac
 EBUILD kscreenlocker-5.10.5.1.ebuild 2078 SHA256 038e4a7871639ecd3bfabc40f5baeb546aa5cf89491be668d622d573581c4d6a SHA512 c39743d3317f6fdc07ce79d82d7620390015454232897ce854c49aeaf4a98cf05b12950576a25fe375dfeb2f02df865e25707b6527e954a31615fc3a503b24e1 WHIRLPOOL 41ad742fc9d5be6e01dee375d20503708a8fdb5ac001bb71a7328ed9d3082b89dc4143c950384ba934611ba4174c3735d3bb188b10ce296cfa8f317a02d7515b
-EBUILD kscreenlocker-5.11.1.ebuild 2090 SHA256 70dbdac34ea73cb710c61cc41977ca5636f1f5efaedcc1fe91f3174d3872da17 SHA512 5e63fb72b1c0dd2c8e17ff84398acff15581af9ebbea9ad68c836982dafdbb61afc5797dc938cd954588bb855a841426900b52cd2c00b6bfa3291126ab48fb43 WHIRLPOOL a03345358bb61561ef2bccade329d81f31a7a640819c5a252195650734e1551d708f13ef97abeeb842946c6e43dc15eed17c4deeb3b3aa6b4ec228d3b54dfc73
+EBUILD kscreenlocker-5.11.2.ebuild 2090 SHA256 70dbdac34ea73cb710c61cc41977ca5636f1f5efaedcc1fe91f3174d3872da17 SHA512 5e63fb72b1c0dd2c8e17ff84398acff15581af9ebbea9ad68c836982dafdbb61afc5797dc938cd954588bb855a841426900b52cd2c00b6bfa3291126ab48fb43 WHIRLPOOL a03345358bb61561ef2bccade329d81f31a7a640819c5a252195650734e1551d708f13ef97abeeb842946c6e43dc15eed17c4deeb3b3aa6b4ec228d3b54dfc73
 MISC ChangeLog 10807 SHA256 89bb37d66d8a2e6f19ec045c9cc7de715bd311a36a236006816ec108e2ee0601 SHA512 1933fdbbdb0ac597dcf5241a834bacdf855db119541eed3ad0f96562f8f6f6fe3239a52e7423eb2c024d82c89f01a32a821800f71b472a3c2ca01bbd62ea921f WHIRLPOOL e82b9b6085418f60db80e29b22f3ab6e5d433025bcfdaadb353e26319a36f822ba3d37cf8bc1345f3980af5b2deecf16e144c4068d199bb466d8501965c6cbd4
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.11.1.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.11.2.ebuild
index 221164a5e488..221164a5e488 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.11.1.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.11.2.ebuild
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 3804ea15469a..855512868d84 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,8 +1,8 @@
 AUX 05-ksshaskpass.sh 42 SHA256 d1eca5ea29e585245b6014c7d710a1a079146182b53b5b435b6fdf8ea5c55f1b SHA512 780f4d0467bab82295f894f0547ea59c36e8f05cff51c4e64db8a7e8e4215e2d6363550fed16a4336019b2102e5c5bdcfe73524761ba04db3704ddec6efec669 WHIRLPOOL d8aa7937d7828d645757164c59f519cdc24fe3659ad6591a3980fdbae7633cb2314f0df0b7a169c6322b41322dff3a2672c03fbfb1a1f82fd3a86746c818d94e
 DIST ksshaskpass-5.10.5.tar.xz 20316 SHA256 5c4a166ca5d6a9d99f91c8640121f02db2002a1480b299e47995533651508ca4 SHA512 bf55ea1b5b79b43d1720c32bbd569aabdde1516d818de3ab567de95736e967327a58055e1e4f73c895c90b35b8149ecc4e736c9b067a05a13852ae4579d0cd6b WHIRLPOOL 16ae562fc0016d40b73aa7924226af816f2ec38b649eb09d3e70239dcfbdd41e435a3646fa292f64d1224f1a5d1ea9fdf5849f991cafc052f35c993d820f3021
-DIST ksshaskpass-5.11.1.tar.xz 20688 SHA256 bdb23e4eeafe15eb8c828478a54c53f6de42f25cc9dba7b9ac883d5525f3f001 SHA512 549bc3e480db9697cd7be172174cdbc0b5dbd8654ea7953fa6fb422e9fa04aeeb71ba195f292a469e350803933548d7b9289e9ffce95dc433ae82197fb41f0dc WHIRLPOOL 2d663715fcd8f04b4112ed6f6042753169066cc8cda75813704b16e37a8f7556c4696fd1618a14634917dbc0ce3deafd7b42ab8481d44a2fb92d21ddecf4c268
+DIST ksshaskpass-5.11.2.tar.xz 20796 SHA256 19d058562b1454ac80fe1fc748a4c3794db9e01d0e5fb842713745cf27aa7bfc SHA512 223600390a8a1e0ef17eacad6d33f30f3ceb144466a2225632aceb0b8e3c71865813dd78c2821ff4d2203882cc8ec1e2aa154057b59ae4c1ec520fa4550fa680 WHIRLPOOL 88f4978ff5413b9e3e4841e2a36332204aa4b474537d548a98f4ecca5f063c07ec769a2a846e26e68861f07ed572d777ee4f6ae05c802e08e383b2baea210e84
 EBUILD ksshaskpass-5.10.5.ebuild 1258 SHA256 7dc5f25fe5251e44a3041aef24f63da5088651923fac2d644a1b33a7ba53e5cb SHA512 bff03bec28e9118fb931db6258aa842d8922db51439fa10ec82e233e560b5015a4f44c1299f0ac917aba19b1f34f1ca48dd754203edccfc8df8dcdefeae2834c WHIRLPOOL 40e08d9dc6241ada1147f1b08e2d740184b61e5f97c9138ae5416cadbcfa156c0aed734aca123c205d3670ba5ab0f55d3dc44d284c71bcf701add631749fea69
-EBUILD ksshaskpass-5.11.1.ebuild 1260 SHA256 2c178c708e1ff684f96046bee74357ef0dc3d81fe100683c9ff619c41d1d936f SHA512 97a2ae988db28a3719d7a006aed6d1dc23eeda5bbb21337808f4ee7022794ebd6a97a30b63c723e12a2e105b90f9af989eb5078da9e39e7ae16ac5a351b48bbc WHIRLPOOL 4595768b621ce365af5f6a47501ba08d29611910b16d49008da23d4ab27417f35dfdfab0348612980c8f1ac9db1d02340d2b74ec4d78d2c99598f380386e7176
+EBUILD ksshaskpass-5.11.2.ebuild 1260 SHA256 2c178c708e1ff684f96046bee74357ef0dc3d81fe100683c9ff619c41d1d936f SHA512 97a2ae988db28a3719d7a006aed6d1dc23eeda5bbb21337808f4ee7022794ebd6a97a30b63c723e12a2e105b90f9af989eb5078da9e39e7ae16ac5a351b48bbc WHIRLPOOL 4595768b621ce365af5f6a47501ba08d29611910b16d49008da23d4ab27417f35dfdfab0348612980c8f1ac9db1d02340d2b74ec4d78d2c99598f380386e7176
 MISC ChangeLog 12726 SHA256 72c17b4ee2851e93d5be46e96e39a63b2f951479cc745eec8c306d08afb20135 SHA512 3b8a1cf5043fa964a374ede75e53143a0413a9ffc936b0fd018dcd44a7400e410086cf56a4886b84279ce3737b4abcb3aea623cda6cc82f08a72f80469c74c66 WHIRLPOOL 133431b4c9e0ed36fed7c9b52cd68f3acde74d9173701e321786a5657586aadaec493267188b3f40d313f82896213c92acaa454a802b207c285c9665a2b5a67f
 MISC ChangeLog-2015 731 SHA256 e4b4700b24a26f1686d4f56929b8bd1d8784cef16638ede8a2a99762b5c9c8e9 SHA512 fad9111d68254feaaf2280ddfd5828fce76741c57cea3b3aadabbd89a0b22c93feae3b3afc64336fcc3d83ae996d0421d1ddd5a204e22a8fe6b461726ae289f8 WHIRLPOOL 684f73d037d55027ed4b46abd0cfe3da2a0f1782b44406fa14bc511925daa2233cb3d13f7d455e5038bd00d4b7f41d254f697df7ac381eab2e0c09c4b2f6a4cb
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.11.1.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.11.2.ebuild
index 468b1b597c06..468b1b597c06 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.11.1.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.11.2.ebuild
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index 508637b29299..80818039b888 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,7 +1,7 @@
 DIST ksysguard-5.10.5.tar.xz 486420 SHA256 16cba11ec6f046f2d9587c84a1046af3fedd8b9d8d773ad8a90ff824ba029f7b SHA512 ce94cca9a0b2b68355a650d0355d243c02ab0b551add1d4fd779e8baae90e2110d72e204c9515031d1faf028f4cdb752fa351e7404b7df356d65a2b37bc8856c WHIRLPOOL ccf751b34c8e15ef5cdd3d204760e795a91781ac3abe6a67ac67203e97837dfec1c9c2dfd74266ac146bbad9158829ea1ed97f67aea1e44dd4bad5b48b924d15
-DIST ksysguard-5.11.1.tar.xz 488616 SHA256 e11b75b4ccfe325cb988eca0e6c8070438c457b240bfa7f82b014559124fe287 SHA512 f9a30f76c96bca2f2822a23c660c92cafd77b6a77fb53116e8002565a67271e6a9be2e0df7f6173b1d37567d0ba9988217e50a5feed100ec39ef24dbeca6b9aa WHIRLPOOL 606057ef060992f37c20d0c6d540e754adfa5549cea6e0b871d85639758a3822cf2986ad2a2eccfa431892d00abe91fdb473f442310aa9b832a9cad1ca145e05
+DIST ksysguard-5.11.2.tar.xz 489160 SHA256 3408c928921268e6e44f8204f66c076540ee0a1a42f1ce8205e73160f58ec26f SHA512 8288cbfe8fe86998a688ab4b874792561091e2774de48837de0fae8528705134302ba4dc3bfbbfcf57f5a6b36ec5fe438e59827b00fc82eaaf5a637704205ac7 WHIRLPOOL be2e43261d0ea190a2f3b9398624c9f8c661dec2c8f20f77c38eeb363619c204a22ae822674cf1a3bcc9265512c205c42afffc980222736c19d1cdc62a324fe9
 EBUILD ksysguard-5.10.5.ebuild 1143 SHA256 6c72c3ff1d7c2ebe3cd446cf1aaa989c2773fafdacb948ecdfce6480c8f42a97 SHA512 2f2e59859ebe5ea562a57fe3c216d73ea88c568b869ead53b9874d9ea7e7933f7900977bbd645d6d03ceaf665f16925439f499cd55690bf8f275e00d6532d4f2 WHIRLPOOL 6bb02f5db02d645e003a2426ed5c5c4d5e0daff7f09521f9ce8f97130017d2f877402d297069d19eaa987fda7be85a006573d099cdbf01289f40cc0c084cea6a
-EBUILD ksysguard-5.11.1.ebuild 1145 SHA256 f868d8bf7640fb90bb0cab7a5067e9fe0a44ddf656ece9291b4b8038644e9148 SHA512 410d46a16a85c8a0985f73d413dbc86e3210ccf8a7428a130e1363afa2b9ce43ecc68364b73a912f3b69d3b9a86b72fa18ee1fb1d5cb6bb8a4fcc5ce70819b7a WHIRLPOOL ff6409532d6ea389e1434cdefc18927ffb427552a8b8f0830614571e6db3883efb8284306c0f6ce607a66a772f2d9593487bb8b6181d697228fd4560a2f8c707
+EBUILD ksysguard-5.11.2.ebuild 1145 SHA256 f868d8bf7640fb90bb0cab7a5067e9fe0a44ddf656ece9291b4b8038644e9148 SHA512 410d46a16a85c8a0985f73d413dbc86e3210ccf8a7428a130e1363afa2b9ce43ecc68364b73a912f3b69d3b9a86b72fa18ee1fb1d5cb6bb8a4fcc5ce70819b7a WHIRLPOOL ff6409532d6ea389e1434cdefc18927ffb427552a8b8f0830614571e6db3883efb8284306c0f6ce607a66a772f2d9593487bb8b6181d697228fd4560a2f8c707
 MISC ChangeLog 12735 SHA256 5891bad1ab7900e4c46935d2df82a07bb5f5788501d8dd4250bdb8c6cd3477a1 SHA512 0e83b57810054939727d820bcbb729a5c436be2ede605bd07916974374bda40f5465b3356763bda4fe568b3b9c30718edd2af97442182570a07f2f69165419bd WHIRLPOOL 85fce63e8fbbfa1cd3b9cc454c97f00c0a8ad6806b4c585be79525673792c45908597fb4ab836c1533fc8336fb4b3d39fd5bc3a8a8982ac2179048443be8b10e
 MISC ChangeLog-2015 717 SHA256 10f6ee19bb02324b7af1363b33911e7dfbce831eef3ab2f3162203769909e310 SHA512 3c9752f83ec0eaa003a382d0c386f5bf3d5c8bbca1a54a1758f806f06266eac2a37659fd894fd2e22a49ebdff1d9bf0f42f5562d85b5a46895e291264f2ae425 WHIRLPOOL 1157b9160bc78098c94bd8ff1eab2f391a11465b3552efc5a0c55905cf076bc0db9212724abb5f510641fd003e182c11cb79b30a031233d8ebd8227c303cbf0c
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-plasma/ksysguard/ksysguard-5.11.1.ebuild b/kde-plasma/ksysguard/ksysguard-5.11.2.ebuild
index c7d1ee803356..c7d1ee803356 100644
--- a/kde-plasma/ksysguard/ksysguard-5.11.1.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.11.2.ebuild
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index 2d818f65bcec..8d82d38baf7f 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -2,8 +2,8 @@ AUX kwallet-pam-5.10.5-check-graphical.patch 2956 SHA256 ce9c644000e055f2f323d2c
 AUX kwallet-pam-5.10.5-cleanups.patch 6488 SHA256 4985d7935a6f18f7ee7b4743bec5e60f3d07ba111ead772be332c9cae53bc4ec SHA512 19791dfffb8f9978269911cf6d8ef7b3ad1c658f3c377ab6d4f967b821fba49952a67c157a818bf79343162acd9d273bd809a370baa0971a4c9b460caace0335 WHIRLPOOL bbc61549711beaa4b665396f4f3419f11eab24f75aa686adfc0f32ce789bbbbf0f87f7102040b7a8e089807ed7d17756651cdad5fb9d6a14ad8259d3ccdffe02
 AUX kwallet-pam-5.10.5-privileges.patch 1538 SHA256 0bc60ba0e92ccf8ccb137838c649f54277884f3f81d5e12cdd17195e66ed3831 SHA512 010e1be15771d3a3c141fdc3cbeb989c295efc46da885d175c3dd76839cad6bdce3e74937619de6d54a94897a827bc8c78ef73b04b4561c4d7d0e55aee350a9b WHIRLPOOL 50d50ffbe1994d070ebff3d7ef659069c7ec5574f4ef62a2e26924324b09552286f46365255a5ad487ea44942015cd9818582be4267baf3dc1f285931a4009bf
 DIST kwallet-pam-5.10.5.tar.xz 17908 SHA256 c42e444c9c85dc5bbc60bbd666d20ea72162ddd38dc18254c47c48a0ca404073 SHA512 7a2e1a0a85ffc7d9dfd6a1dc8a16d7117f30fc3b983756e28fc11a19bddf99a273842a1774ccf93c5c879a1d899212f6b6d0808fa14eb17260396f5c207e3dc5 WHIRLPOOL d0db78bc52855b700242079d423fbdb1089796f40be994ad1b9109570e7be46eada006ea62dda8181afdf52f834510121b6fc00c1af3e36bbff7512a32e463f0
-DIST kwallet-pam-5.11.1.tar.xz 18584 SHA256 fed02d1a4592f6b0e80e8f1ddc6a3dfd5c7c019b3def2345fdaa8e2771a3377e SHA512 16ec74966dbc333bfa96f5bdc4db9d6e30b8091993c70dc82c3b1e4ae05cb6b0cb34f0c3b293123492cf525d0d4b32f605b47c6b9798c24760e600281144b5bd WHIRLPOOL afb5f7a6b7626c1a501d8531e45a8d688e89cbdcf80c14ef884bd8a5b244c40a9b8eaed7d807135481c1294eefb5a3ee2c2a531f20c06060bdae4314226fcc8c
+DIST kwallet-pam-5.11.2.tar.xz 18632 SHA256 0e14e17eb02544f4cb4d621420949a06f245ba5f85c6c76a8ad71696dcfe24cb SHA512 2577531c59710ade53cc37963d67ff1eb2e6a5852c7127b03eb2290749609b97f9432588b5d4189d647fb0d446afd3bcc2201c726cccc0701a24bd1743bddda4 WHIRLPOOL a1de5d4a845b935adf7c59f318c6d6c80e8f486e8612c13230fe90c09da5f42cfe7ad4228c36e17cb373de56b960bec86295e9f6f3f06f8759e5bdcbe1dfcc77
 EBUILD kwallet-pam-5.10.5-r1.ebuild 1616 SHA256 3a93aeb01ca197930d8ea2085a10b466053a0e9b955378a6cb7a9239800f80c8 SHA512 1246397b1a1ca458613e81e03470aee6b59bec8ce0638bad870bc0944444d918cf5528d163a95b59a7147499e2086bdf48257c94363926f1cab22a1d757e622a WHIRLPOOL 6391b960c337dc90ccdd32ce1baf71e5211f758c152f75882628a02163d4fe90dd2eb3795f88e302491f6c18049e63d6203632d9c547057e98d366870c679f62
-EBUILD kwallet-pam-5.11.1.ebuild 1491 SHA256 5d95c5f2b0e397a8c89d744653c97def8bb6dfc7959c1c8f2a333ca94d1a7faa SHA512 1537774c95e92197665b311a7546d7f75affbe54e2f596e2c9d0bf18089a552bc65520a18ad6c1795294c35ff7a735eb56cc252546dca0fed68b1b13eaa633ef WHIRLPOOL a3e49a131309e04a8df034a314cf5126d21b9678bf1e6fd8f194c96528483a8661476cd8b4fd0abd7f65016bc2c984f890e8f2d945830399286deda090aae563
+EBUILD kwallet-pam-5.11.2.ebuild 639 SHA256 d3fa0d862d67bb8ddb01c519842fd175905d8e502de6a8e45e68f10a7e9f2be1 SHA512 c94025545afd8f4835f77a6c1e5c319aae524775236996ff8f43c4f9a42cb11ee0f803d3c6f0cfdd6e1db30d8f260974aceb3ee2e51fe7db6808f14938041c0c WHIRLPOOL 84770277ef2a633e0cfd77ec85cfafd4d6c674b89291f739f0bd68be95ce87d6fbb095b09cb579353a7dcce5451ba47af69aa926e05f3247de2e354c1e2db3ed
 MISC ChangeLog 12748 SHA256 528680401f76d8b17c8cdaa1f021f290093650c847501765efb38630d01d1c18 SHA512 caa34b5789699d8fd8dbe821aa426c9c6d8a0279481cdd8d53bf41f95d16ec914926d25d726ba6270d7a601f211950b7c4e3a3bd2dd62c62bcb1513af208ae5b WHIRLPOOL eaee260bca455231e33fcda2154be422934a27c946ee49fd5c611eab8956591ddd23d1bcac1d26071283c16425a8ee864fa00d9e2ff8794201d6e07b9c4c51bb
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.11.1.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.11.1.ebuild
deleted file mode 100644
index c91205f1557b..000000000000
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.11.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KWallet PAM module to not enter password again"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/libgcrypt:0=
-	virtual/pam
-"
-RDEPEND="${DEPEND}
-	net-misc/socat
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
-		-DKWALLET4=0
-	)
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	check_dm() {
-		if [[ -e "${ROOT}${2}" ]] ; then
-			if grep -Eq "auth\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" && \
-				grep -Eq "session\s+optional\s+pam_kwallet5.so" "${ROOT}${2}" ; then
-				elog "    ${1} - ${2} ...GOOD"
-			else
-				ewarn "    ${1} - ${2} ...BAD"
-			fi
-		fi
-	}
-	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
-	elog "List of things to make it work:"
-	elog "1.  Use standard blowfish encryption instead of GPG"
-	elog "2.  Use same password for login and kwallet"
-	elog "3.  A display manager with support for PAM"
-	elog "4.a Have the following lines in the display manager's pam.d file:"
-	elog "    -auth        optional        pam_kwallet5.so"
-	elog "    -session     optional        pam_kwallet5.so auto_start"
-	elog "4.b Checking installed DMs..."
-	has_version "x11-misc/sddm" && check_dm "SDDM" "/etc/pam.d/sddm"
-	has_version "x11-misc/lightdm" && check_dm "LightDM" "/etc/pam.d/lightdm"
-	elog
-	elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
-}
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.11.2.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.11.2.ebuild
new file mode 100644
index 000000000000..d591eb59e0fd
--- /dev/null
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.11.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KWallet PAM module to not enter password again"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/libgcrypt:0=
+	virtual/pam
+"
+RDEPEND="${DEPEND}
+	net-misc/socat
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
+		-DKWALLET4=0
+	)
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
+	elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
+}
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index 69cbe2074fab..efd26b79737a 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,6 +1,6 @@
 DIST kwayland-integration-5.10.5.tar.xz 18600 SHA256 be55e85c78635a075946be5fc14ea2dddf7a5b9d0e9911bd2a85d82777863e68 SHA512 fb8342f476c4ca51fa720f8767146ca19597d600877762bb467810b66073de172111ba3aa469c1fb24125a2cf60a87c0158dc90a9c036c48bc0c0ce387be1440 WHIRLPOOL 5994bed7d5b30d828982f72d5e61ad832fb4845d898cff0011a43dfb0e718e72d623c0323ebdca78b1abbd10a7ceea1fb1f880c3f55ae5a15a1dc75e259c9b20
-DIST kwayland-integration-5.11.1.tar.xz 18504 SHA256 70ae95bb9ccc43ca407ec3fc55dca6de20e0ff9d7e48583444c238b6fe6634c0 SHA512 23302934cd77a5ccad03dc36dad71123a1cd9abfe1041afd23cac2b256806453458f404575e78063601526923a56dee5dec62222c3bfcf2a8c27a31ead804424 WHIRLPOOL 860ce5a672b31d2e8717d17f4bfdebc09e7535b56216e779047f0bde26b940421d65f79c53a6109ae7177e85aae3401789602140e84ee9d63fc88c28207b209c
+DIST kwayland-integration-5.11.2.tar.xz 18592 SHA256 5566cad72995326925b1ef0c49c0c3920bdac15a321f553e826634344c72f4b7 SHA512 019a026ef33232f693cd603c4f2340f62a576d71902517f347e1fd2beafb346ec1a8700eb1e7e279838d1664220e058dc2bd71bcfaba3a331da060913835f086 WHIRLPOOL 8f3387a0acd8dc7d8fe8c5784e377f668a3a5391186128ebe99a7424e2f885a0f8a97215783853aafb7dc7847d118e8f59dd2df51e36a6224d794dce3f5a89a3
 EBUILD kwayland-integration-5.10.5.ebuild 526 SHA256 a8321b790c0ebeb633e7ad5cdf07f97aaab83ecf4bbccd364b9049b7a8c316e5 SHA512 914ec77089d49cc2475aafa06dc0666fb88d94cfee0325580f552552e62291d96f0bd6390a907a2f3561f4a8339b1fa3403e4480f945d3ade838e981622dcb71 WHIRLPOOL d9dc47a537f41d75ed8faba1dcb1154e6a5e7493c461135ff796811207f57bd44d4a2e61d58eb1b0189f7df233eae67bfd00e413d5eb97ac19a2b0689e2f5071
-EBUILD kwayland-integration-5.11.1.ebuild 528 SHA256 6c202251e6dd3668acbd01f4b39b9375dcc46941a8659fd7b20ccee8909d10d3 SHA512 873bfb3416f975db3178c840dcc926512bb9b1d9e3d47f65f567b952f0ede0c016d10a8e7d22cba5b3348b36f6e0a8b1ae47f3322a562f0a9911a3dcd8c24d54 WHIRLPOOL 2f8765dbee99b77907dd51fcd37e2c24b01f49470e10b5ba88e2ec4525fc5929ca8c6b86f8f8beff55cc6ac89ae3bac33d6bd21718a6abb87a273bafac950859
+EBUILD kwayland-integration-5.11.2.ebuild 528 SHA256 6c202251e6dd3668acbd01f4b39b9375dcc46941a8659fd7b20ccee8909d10d3 SHA512 873bfb3416f975db3178c840dcc926512bb9b1d9e3d47f65f567b952f0ede0c016d10a8e7d22cba5b3348b36f6e0a8b1ae47f3322a562f0a9911a3dcd8c24d54 WHIRLPOOL 2f8765dbee99b77907dd51fcd37e2c24b01f49470e10b5ba88e2ec4525fc5929ca8c6b86f8f8beff55cc6ac89ae3bac33d6bd21718a6abb87a273bafac950859
 MISC ChangeLog 11274 SHA256 ef539c141d5af3bdcf91577ff2e910c662d859a694e50233a63f3cba3392ab81 SHA512 f2d2dc58223f9842735303d23f0fd8300e8384326d250db2ed236fc9c42dc1e1ef925dc8fa7e0e6ee1934b4d8f6eba03f81528f97cc995d7fd799cc3cb4eb4e6 WHIRLPOOL e0a4d542445961f9d8b237e1e86dadf33985990ea4c89093ab87e64c0718db507fe4410bd6ef3ea1e565083307c3b86b40d6855e78ddf12c3be000565f071953
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.11.1.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.11.2.ebuild
index 6edd40ee0dc2..6edd40ee0dc2 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.11.1.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.11.2.ebuild
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 284624e16069..ab785d27e862 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -2,9 +2,9 @@ AUX kwin-5.10.95-test-optional.patch 1023 SHA256 51c5a31bf05705798f2c11b282992dd
 AUX kwin-5.8.7-glibc-sysmacros.patch 1016 SHA256 7aa9b76fd8d067d952b4c3534dafa195899698a1fb611d9a4d56ee20d43013c4 SHA512 9b8d8754a4e0c8a9421bc7bf04932b5dabfd9c0c7f56fc1ebe6562afcdbb2d3495c009f4cbfa0a8a665e363ffeb9ac9bf3c7a5fbba7f7d1da7571f7cab6908a7 WHIRLPOOL eca63db0c32a6b3bcaf2d5970be4d04f54939b7fd0e87a30b3a63a252f7d5aac189bd41ec9812a25901b4bcef75cf466df22b19a17320ba2553493da87973170
 AUX kwin-gstreamer-optional.patch 523 SHA256 3152d76a9274bdad42b3a436193be79d4d42b5548ba089ed5089a812976d863c SHA512 e8a4106f8754e5e1b426f1ae3141d17ba4469c1dac44f34f0ec7292d3242d7848b5f7748c56f08db576e1f826c171a1020d5fe73e2aa4dfdea813e37c565a4e3 WHIRLPOOL 296aa6fa9f8d26608be031fae75196b1b0b1b1c754038061e8f7e6017af555e9774dfa827ffef18c91df562c1574cc1efa1442f385a2e3e7ea9b6bdc0047411f
 DIST kwin-5.10.5.tar.xz 4674932 SHA256 cc7f6b6c5d86270b30a8c7087f00152b084e67dfd515ae009c2903a0c2b0bedb SHA512 b679dac07b7cc71c9ac7f4755282f8e30d5c2757c7cf9f29ed4f7653c70832140171e1227299a726af8aef1919db83b115dc4091ff80851b0afc53a4cf06840a WHIRLPOOL da12016a617badc6a125a93da8606322476f7b6a1accff17adcb76abaa7043ce161729e1c9ee1b3e33ddc7dbdc6c5fff8e500e1b732189c3d7d5396157294bf2
-DIST kwin-5.11.1.tar.xz 4901116 SHA256 154387df916451236e9c6fb0ebabd59ddfe74c948360bbe97968e94bd745ccaa SHA512 3bce8c8499e1358c8d47c897e235e528a30e5ce41ae33ec227924f207996cf332492025df0f7b74ea34eb341babed30f98bf6c5784a40756e7c0bd5065c53bc6 WHIRLPOOL 17534f6f1df9528c4ae8dc208e14f59066c4bdca73bdf3fd9069f0ebb388e72746188438b0a04bdbf6d7a1a5389b3a7f549cd1f8ba60f6fbad069822b868715b
+DIST kwin-5.11.2.tar.xz 4893220 SHA256 2b215532519dcfda77dd1b40250e131d9e1b01d3f1348c9064b6a940e92578f3 SHA512 2d92676268b2d16eb27e8a44e6ac7b3f2a9126e92f6ec714e6ff64ba25e5ae732f3af126e69c98657af07140de5eb8e499358b58b98cd47a0b730c2a8bca6394 WHIRLPOOL fa355953ecad925be83d85831da781931f62f5113b4292e30296ac877ff8556b673a4f020ff91e65b4632f389bf9fdeb00de3b78e2ec9ebe947f89a9f962e61a
 EBUILD kwin-5.10.5.ebuild 2344 SHA256 0e65bddea3cb5fc33df79b9b3a552f09cf4fa1d524a0f7e761c3aee73438e16d SHA512 d8194a55406f9299772e80cde1afa6363b689efb7bc7a289c72925f92351adbb18c688e7908ccab476eca40a35561a0ef9eb0a2f435b70ee08459268ea20c5a5 WHIRLPOOL 00356360bc7a634e4c53c5ed174ffbddb9a5d83c8375508a896181f353fe5bac2244f0fd5d1512f0c17355f731d3d0cf49b3132fb6cf53048dabb2147fdb0b8e
-EBUILD kwin-5.11.1.ebuild 2379 SHA256 44269cd648042aaedafe83b5a3cc82b7aa12c79c4cdc56f6a15e1d057ef1039c SHA512 31acc822132db0f816481c6c8ba54a42afdafb02b7cfb08f4fc6d0d106dd45a21006099f777b6a4374d6f83ba391924ebd52e5f45840333f8aa23a52871f47f1 WHIRLPOOL 4849980caed1f0cae10e76e8a6eb8329bc7d40051b764884cfb178d879db2122c9eb6fe7ca4fee789df9ea540b67561852fb5e4342f8146f8682809b17db2f9a
+EBUILD kwin-5.11.2.ebuild 2379 SHA256 44269cd648042aaedafe83b5a3cc82b7aa12c79c4cdc56f6a15e1d057ef1039c SHA512 31acc822132db0f816481c6c8ba54a42afdafb02b7cfb08f4fc6d0d106dd45a21006099f777b6a4374d6f83ba391924ebd52e5f45840333f8aa23a52871f47f1 WHIRLPOOL 4849980caed1f0cae10e76e8a6eb8329bc7d40051b764884cfb178d879db2122c9eb6fe7ca4fee789df9ea540b67561852fb5e4342f8146f8682809b17db2f9a
 MISC ChangeLog 13960 SHA256 4ca9508e666f83006191f9f3b8a4c83b8bc4b0d991b8e4fbbde987ab0bec62e5 SHA512 6189a2b2b0ae2b735bff2e3cc3a3c35e79b742a5591961278208aa16a1aea0a9334b08f8e0a6e5168844d04834df133acb38bf41eab2ceb21f8df128add3a19f WHIRLPOOL e75ca32dc95597625bcc21412002a7aa0897f016fb839741c62a37f917d7956c1deca6fde5dce10702ab4eebf044faafa404077f96998d2c6be1cc99aa5d5065
 MISC ChangeLog-2015 1256 SHA256 cc2b18df3332c176520f8b07dfa3d36445deea8e33d69f497c90c2174ad7077b SHA512 27bd734b8a8cf84a00e3e6cb1fa42d177894fc57f1c6dab145a21045cbd0faf6cd22e585700ed2e7d25def7164a53740152ad6945e868421bb7dc48c5993cbd7 WHIRLPOOL e814ba62d8cf5c0f0749362979b60cff51bbf695a62ee9ee61e9389884ae3b909b625a06cb2e8e5de587a98efd2e69d3b05589ffa8d898bbec1751a044b1a52c
 MISC metadata.xml 410 SHA256 086772dc4b2bcb2af67b1363be443b3eaa478ee05d8b839b98f0337a831f6054 SHA512 0aef8e1ddd94f46d2f90a90c5a0408e1068c11684593dc86d1b7681f2be71fbd8f43f33566e15548f17be51da539b8fdd37d173bb5dc65bf74719bc38275d12f WHIRLPOOL 2ddfbd488fc7b53382c7ccc23f1f15fbccac0c66f430011c75676de88bf8795ad444f990e6c187bf9e54c5d801f8b1b6170c1064701aa3185788ac772d4ce884
diff --git a/kde-plasma/kwin/kwin-5.11.1.ebuild b/kde-plasma/kwin/kwin-5.11.2.ebuild
index f701da40dfc5..f701da40dfc5 100644
--- a/kde-plasma/kwin/kwin-5.11.1.ebuild
+++ b/kde-plasma/kwin/kwin-5.11.2.ebuild
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 8bbcc490910e..5eb0f4ebc738 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,7 +1,7 @@
 DIST kwrited-5.10.5.tar.xz 20392 SHA256 894d7f3231e8842676560a5a1e872532e2c70dd302f647e7a2676143c982f072 SHA512 f5a8de41d75a522125d04ab294a02d34850755587ce16e9be43394fa87267f69168325e0d17caa0b1b47901e8cb174f20af10e22107ee646d28150d3b2a3c698 WHIRLPOOL c1a0c4c1ab67d758e76ebf7a7e22ca7abb152cc74da982f63b8888eb417efa88b8f261cc53af230eb8157167e735db44eaa56e1dd57d2fd8eea88e1c8f2585e6
-DIST kwrited-5.11.1.tar.xz 20476 SHA256 40b2f195cac34ff7380bdd1ac635fd55079f86fb8d8814a0b2013ca0e56dc287 SHA512 5c0172051ec30b3d8cc7c6b8a7b6384f05f4fe7088b79ba4b8228418114920a3ca79b53d8a330b2832d381bb355717199151ce919f53fa3397f3c03bcd1450cd WHIRLPOOL e70f62987281bf02ddf9ab6c62a567d2444f0ea2b3267933d65eb25911939b423031b215e8a304ed0f2a0a65a3cf5497e6704417dbc6024c0b40c3f763a97a0c
+DIST kwrited-5.11.2.tar.xz 20344 SHA256 d42472f2d994565bf836c268c89c3fcb07dd535a4da1c204c146de7db71f239e SHA512 f676e0f8c673eca50b998969abc56c889c00983badd2182fd6a2159529f7517a2e71f7213f276c83d4406e046d8f1a15149b099d16615e05fce63f7fa4a14ad1 WHIRLPOOL 790b8f3626461abb6a783a2bb3f564dd9e9ba9b52858dabb8f63b1affeb154f14448225d99f9154719d99a35bb773cad6c4adad04b3e67b1fdb42996dde77d22
 EBUILD kwrited-5.10.5.ebuild 501 SHA256 bacf5097308cce830b122452e0e68e894f13be37bee38c7ca27c0581c32ccbf9 SHA512 87f8762fc6e560229909304a863fdcd5f4dc08ab43c3af16985997fb14aa0a4fea35b6703e719ab7bb188eb615225a3a435306609e853bc83f53840904625138 WHIRLPOOL cd845fcc603684c82743544c7f2d5c95b9f35ae4005989178a88f6081a0d8622346053a48b5aa78f19a861d981a64cdf07968ac11ab4883e176f656aef0a9dc6
-EBUILD kwrited-5.11.1.ebuild 503 SHA256 a1f602f411b4dddced3f32809a3f73438704d2ba27b7873627bff05a96324fb5 SHA512 0b44eebe2da79d8faa842f58bf06897689d63b6cf3495057383e2c3a778e13e5b67538d1abe4260e7c1253f717a22d7f4cc7042723e7c3da487e11a408cb5740 WHIRLPOOL bdec7f08f6cd07ce978c841b75f7bd047645d715758a3b584ac44c902e2a88c52f92ceba7848d8c52a590002dde972a696d1264acf603cc81986f97579c8598a
+EBUILD kwrited-5.11.2.ebuild 503 SHA256 a1f602f411b4dddced3f32809a3f73438704d2ba27b7873627bff05a96324fb5 SHA512 0b44eebe2da79d8faa842f58bf06897689d63b6cf3495057383e2c3a778e13e5b67538d1abe4260e7c1253f717a22d7f4cc7042723e7c3da487e11a408cb5740 WHIRLPOOL bdec7f08f6cd07ce978c841b75f7bd047645d715758a3b584ac44c902e2a88c52f92ceba7848d8c52a590002dde972a696d1264acf603cc81986f97579c8598a
 MISC ChangeLog 12421 SHA256 2bae27eb0af661c886786bb6a4181fbd3a871664a4d643c2ff71d4c4ba27e4d6 SHA512 96a9b50ddb8e1e58fe61351d393f1d37624fb83692b1639bf504650ae380d590a0708f52314233847114bf9ca75ee89cd305464e3b5d1c40184c918dfb22128c WHIRLPOOL 86f07479284bd9754522d492d9e4d4dc481f37917773f8544f8735f4b7b98a493d98092d20282b8559b4eba1d0039947f5941d480f5ee251feadb67dda8d38da
 MISC ChangeLog-2015 703 SHA256 f187fe02e5024bf45b738b25ef947bd8a4ed71a898150c2deb0b172543fd28d3 SHA512 d834565f5bdf5aa00967d121ab8d28a3c692bd80bea9232bae8715268daf388597f7b1d1bcce9de7a9b327f786f5e158853aa6fa4dac067f1f564249e83fd32b WHIRLPOOL d6bbf8acf041125a270bed857a2cb02a5d3188b31a0fe832c584552c35ba60d0f1f63c60aa00aff1e200fe6e61fcf94b9cf12d9edaff92d0bfb7aebe8e2a0ca9
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-plasma/kwrited/kwrited-5.11.1.ebuild b/kde-plasma/kwrited/kwrited-5.11.2.ebuild
index 6f31220af41d..6f31220af41d 100644
--- a/kde-plasma/kwrited/kwrited-5.11.1.ebuild
+++ b/kde-plasma/kwrited/kwrited-5.11.2.ebuild
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index 0b0f67d388b5..c6cdb6e2a71e 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,7 +1,7 @@
 DIST libkscreen-5.10.5.tar.xz 94176 SHA256 c6025440b2e8d81c44ee8063dd2c32c8461d033a8840bbdb6bf65c8e6ece5428 SHA512 5f9306c6c3ad2ba923884786a733e2fb334602e18711e39397819acb790cb4968b5549e3666db49d6db9d646e83b78f52173367fa52bfd68c4e38e0395573d5c WHIRLPOOL 88c81bd043ae9422e7df3ba56eaf4648d7dad943b2bfb95ab00fa0449811e76588b156d3c8e53b17b52744dd8a89059bcc349f41088f1dd18a069d344fb21e8a
-DIST libkscreen-5.11.1.tar.xz 93640 SHA256 bb71f493c021e73657696197ac8658e736769ecd388c7b2ecf91c6ff90333b37 SHA512 780e8c4d1ae8eca50593dda019d0e53ac47bac2f23d4964eaf7c28c8b527e537dfb5a5e525c4aaff231d77183a3f3d0a7f53aee5138e3ba29fbf59c5d6d8d454 WHIRLPOOL ee24072b17500ba4faf38cce7cedc005ceda45f3d23f0c15bb6400a09dbe5324884af0f210e8d37bfff550f4b2dd7aa2fc5ee991e7e4410be4f68e1129e2b995
+DIST libkscreen-5.11.2.tar.xz 94212 SHA256 4f774603aae6735734bbf8da6829b2911ac28d5e9803c32392eec4fc7f3d6ea1 SHA512 29f8488e8b5b40ea5bca00ee3a6a9fb59295be1a964ca389205e669b0b2143823920eeb80e2eba03356d657a50ee2a0ce06a6d6628afdd11f1dfd77d9755b1b5 WHIRLPOOL 294fcb790fa19ff0e39770b0f829a6343a779625814e93084b7cb93dec9467b96f011ef27837cd211780546646df4cb3b450f30016a8efec47af4ee31e45b8fd
 EBUILD libkscreen-5.10.5.ebuild 501 SHA256 b6ad7c4cb64bfcd7792e07803af3843dfaf224f5e89262850d30f85009807d2f SHA512 d655fc1d1230bd119317706fb7327e1499905ac8d47fe4a9ebabfe52c5911795d9f6cd61790354b67089473c3a3eff75298b424b388153a2d8d4f8d53e051465 WHIRLPOOL f4b0ac4716e52f0442fecb82aa090ff5780026f4dc5859f7d108c20ae23382597ee923acc22d06141ed8feaf6e7db592416ec635be938db92a67ee029bcc37a4
-EBUILD libkscreen-5.11.1.ebuild 503 SHA256 bd3924d93841a910afe33d7d95335e6657e67498d07237b06853780a56f8921a SHA512 334a2c1fdc2d631b8c650313990969e8a07563df7afea11ea9ca6a8372447c6aabdbaa11ef0e3fb98e5d74f4d4172448f9220e192cbb940e9c857c7f50134735 WHIRLPOOL c0eb7cf88510df8b901494ad163d284310b3a0d3ce2a5571ffd79de5f49ac1959566e34224ae36fc7729c68f25529e40f9b33266bec113f8129341d4459bab9d
+EBUILD libkscreen-5.11.2.ebuild 503 SHA256 bd3924d93841a910afe33d7d95335e6657e67498d07237b06853780a56f8921a SHA512 334a2c1fdc2d631b8c650313990969e8a07563df7afea11ea9ca6a8372447c6aabdbaa11ef0e3fb98e5d74f4d4172448f9220e192cbb940e9c857c7f50134735 WHIRLPOOL c0eb7cf88510df8b901494ad163d284310b3a0d3ce2a5571ffd79de5f49ac1959566e34224ae36fc7729c68f25529e40f9b33266bec113f8129341d4459bab9d
 MISC ChangeLog 13558 SHA256 6022ae511c1a3193d6d93235e52d897ba41453ac05582d6a7a595ab17e8990dc SHA512 e0efa60aaddc415cbec778d961e4e79d6b2a982671afad6b8ff18d95111c830e1c33528e6d1d87da49550fba09b37ef007cef027e50f38c626b123eabff503f0 WHIRLPOOL 9a2647c4f2457667d526f7a4867098be2246ea1784ab3950c113849cdd67d5c95ea70ad0e0bf94b8b517f99d58fa5a28808fc3a06e87e53209ddeb2f54c77a77
 MISC ChangeLog-2015 724 SHA256 220561b5b6ba555b22c40a630a472202afdbb5bce27c6a208dba1aab4327873a SHA512 aacfbc9af035cfaef009317c495e8a71f527bd1fa47f1287141e6c91da232fb2ff5d1b17c8fd5e09160bc58fb22c28bb8efe9d58c74225c3893e1a75d179fb22 WHIRLPOOL 213f5e96a9bddd9dfcb85b0c12b397b2949f39d244bb32ed26d5b8932b13204a12788e5a1020266123c5a8cb18dc5878d751a40172157424528a159bd6967fc0
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-plasma/libkscreen/libkscreen-5.11.1.ebuild b/kde-plasma/libkscreen/libkscreen-5.11.2.ebuild
index d4b3aab7e797..d4b3aab7e797 100644
--- a/kde-plasma/libkscreen/libkscreen-5.11.1.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.11.2.ebuild
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index 2387cf241278..9d1984b1095c 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,8 +1,8 @@
 AUX libksysguard-5.10.4-unused-dep.patch 1848 SHA256 43d9489a4789e5b372279c9db20434d5fabb0c27d4775c741456e684121c515b SHA512 5d0ce5dcb5d61f6203eb9a537fd40595b6b993a3d130d114bebe2ff3aee050286cb2151371ed78ce5bef0cc5f66c827a8c9567acc574df4e8dd57052de471847 WHIRLPOOL 7dd60ff919277cc8ed58690af758c5bf618055f4ea4e921484a47ef08bf3473748862c8df128075c0460e10713827b89fe6034f87982017ffb76193e8e147faa
 DIST libksysguard-5.10.5.tar.xz 565180 SHA256 d6e72c2c01da59c833b08b72b36b667eab2971471e468118e79681e0bbbcac51 SHA512 18c649a0fabae7b79159ee70fa1aa60c4dd6d179bdb485f2dfe80d0254d937dee811874c19fe204d8ea164b5907b45ba0ca971b4229551bf5f9330e85916284c WHIRLPOOL ebd99dfe0820d8fca7d86098a4f5648df6afcc21e9fe6419a3b292c239b7bdec5c50b566b4382bd5b1b8c1893182424832e43688716342fb74522695439c03e1
-DIST libksysguard-5.11.1.tar.xz 567372 SHA256 15424161b6cd133503a285cfef37d6b71405162e46fb7efd720711b1250905d5 SHA512 046f41e36acc5dd46c0f7c47b7335c2d19213936ab319e92992f8777897b4c10a3734e8274ed93a072270d19eeeda256d18ac5fbea249b423bee57af5b4d1f19 WHIRLPOOL d664a7a3f83032151b0c51af12bd870be66ea2c4640f8ccc62b0c7966ddc5ab47a7e1f293aad10a7e667d0c3286f00344dfb6b756a654946d174508fc1a2e11f
+DIST libksysguard-5.11.2.tar.xz 566276 SHA256 6ed0f6fbe3e73c38f6c6fd883b9487a0a635379ca6883a5fc3ab791a33c9a089 SHA512 256de172b8b6c860b631bb1390b9901fc3a78862a005893b228b035e89044ca09161f9573ad786e6e12801e84f231281f14917c039d396c6919ff33caf668747 WHIRLPOOL 5ee8599f9d555ce7977a56f751d11a1144ffce8b96258f0d634511c092d07603775ccc49f13a7d64d0f6aa95bce0bff9f613fc0c4de0fe4646722fbae7c4a3e8
 EBUILD libksysguard-5.10.5.ebuild 1298 SHA256 133bd0b36989fe6cbb449c6ae194cdf56ba09164a7b017b30c9f43dd8e2972a7 SHA512 5d732ea65941e7b397fbf90e216415be9a18cb8d4b1561790a96d36d5e5c86280fa43815833246f2756ce1e0d043dc1f513502fb8b4a56bf07782aa7b3940e9b WHIRLPOOL 5a828d4fc1ab19cae39f00b0a53de4963b745b2bf6827fed6d6405f6dec5b3a43a97914d25e70e0b1023aa28a3a9e81823667c8f54fc3636b15532cdd48df5f5
-EBUILD libksysguard-5.11.1.ebuild 1243 SHA256 751b4edca9dd8c6cd63f23f656bb001edf3d85fc0491805b79a20bb6bad4a6fb SHA512 137977197d1688f440ffc1b38389389848e718955268d58b2cc87b8748780ea62d33c1b3740b995430723894cd2abad4c35636dc3dcf71697c57b1765cf66bdd WHIRLPOOL 53081e1eba22b0badabdfe2be7f88b30bd09a9166d43ace62e6589cad3df8cc828112645844b0843384371bbf3cd213d306bc74663bb060a03429f197678a69d
+EBUILD libksysguard-5.11.2.ebuild 1243 SHA256 751b4edca9dd8c6cd63f23f656bb001edf3d85fc0491805b79a20bb6bad4a6fb SHA512 137977197d1688f440ffc1b38389389848e718955268d58b2cc87b8748780ea62d33c1b3740b995430723894cd2abad4c35636dc3dcf71697c57b1765cf66bdd WHIRLPOOL 53081e1eba22b0badabdfe2be7f88b30bd09a9166d43ace62e6589cad3df8cc828112645844b0843384371bbf3cd213d306bc74663bb060a03429f197678a69d
 MISC ChangeLog 12910 SHA256 d582278d56ceef2e908fef1a7b3b98338ff68c7a3f54133ab56f57e7fd662180 SHA512 d36ccac327f1ec1a32d65041f0b6dcd761b52b1d42463afea11236c779669b7e8dd5919bb7af76272f064bdbb2a02d19b67e80001193c2fa4028e083086f2ebb WHIRLPOOL 3b8e439bad6ee95d66bf7c844fbb7a0616f4b02eb3e97f96c69b6325de660ded447959916bee7571946c40ee1b4066bc51857990710c087f8566914eabd9e2aa
 MISC ChangeLog-2015 738 SHA256 f25b3433e5325781e228b1190e8988ef02fd255a01d57d2b506d6f292ca8a492 SHA512 0a06ce4d0716ef60b35b05bd2d19374629601458ff233390b06ffd7e6ba455726ca0fb2fe3d0cafbb43b23bdbf7d8c1db7ae148b4a99c2fb45c3809080d1d631 WHIRLPOOL 93bc88aafb4afb5b7fcbf79e8506d77638e0ce86a3ce27a0f2334f52bda342164395b92079539568c8e2c67080b476f9ed7526b8a468ccd2c6bd0ee66d4d269e
 MISC metadata.xml 381 SHA256 77a7ba30607b2643b0ebf8569c3a4c2245a832c6ffd0351ff19860b319ed11b2 SHA512 a504dc62874b82d6df35261af6e3875b0af5879be5c90f9e1c2754d6980bb26aa3c75632d825b8347687a9cf48908a671c807afc574f177a12ab7881c7ef8d43 WHIRLPOOL 7412a0f703560bed72570f3039becee41c0764a83ca395837656dccd8c2ffb55ae23a338da4a8edbe44b1988b326d77b8576c902bc9bc22b8a21fd6268690890
diff --git a/kde-plasma/libksysguard/libksysguard-5.11.1.ebuild b/kde-plasma/libksysguard/libksysguard-5.11.2.ebuild
index ec3503698dd1..ec3503698dd1 100644
--- a/kde-plasma/libksysguard/libksysguard-5.11.1.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.11.2.ebuild
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index 8ddd03b96779..86cae42aaeb0 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,7 +1,7 @@
 DIST milou-5.10.5.tar.xz 56088 SHA256 ff917f7480a2df10e351e92ce07a0c9fdd7f07d05711018adfc6c848934e781a SHA512 5c5bc1d1ec03bf0e74cb6c201ca7bd7ce587cfb2e34a6811e7905e16e1e75ca90601a93a2238068e0a780d6a7371596b70170fcec34b83781da53f8f9dbb35e9 WHIRLPOOL a51cda8af6bd74e0e11552fe3f0e707c7dc531dd3231725b0f33238b32b23a82c58b3023ff21b6ce64bf72e2e5b22c7a30c89d6e581bcd3002690aa60f2b06b3
-DIST milou-5.11.1.tar.xz 56536 SHA256 97a1e69cce3a61386e16647e60869ef2849bb3061ac10e0cdded8688b85cf9ec SHA512 2d3c24c8890332c39252a6fdf3b150b5e773aef9576a302f04de72507547e966d27cba9c2f4265c7def9cac3b015a62d4a8164d1405c686f26d9886a8b229150 WHIRLPOOL afd73f341f7d9eea6871dc770e2adc8d6d17385adc9527dfc84ef7170a7b7af74a3694669649afa3cc4aa34dbc24c500061c4d2f444626a021172d14daf2c3e2
+DIST milou-5.11.2.tar.xz 56516 SHA256 f2090a25d94f3b26c1ce3567708ec068a3202de5f75d9d73747e9e790116ae4f SHA512 e113825a7761e05141d36f67004d9fea67f940b82f0a6c6970d71a69d6904cd66bd65c67bd5e7decd0ed1f9837b08f679a840c6b5cbda96e6782348ba5bc9d18 WHIRLPOOL acc9d3151d3440c74ad42debf3041886ab0f04620887da3fb7ab9f5fdb1d3d7bca4689b9d455834ac3e45b91310db71c73be93c0e85643b8c5cd1457d063156e
 EBUILD milou-5.10.5.ebuild 715 SHA256 23233f13a3291ada9e98aefca836cbfe693114f14a9d418e103b91a53c848ac8 SHA512 1ff9fbf37fd1d3a4b8f59321f993b2060517aa48fd1b613895632488804379e36336a9116df6ba7604f0081fe4e6f388dd6c1b6dbece88bd5381c364ab363e66 WHIRLPOOL a2318ac158984601d54ce7fe51c06deee2a39c3b92ccce4f6980a1177d7d85040233aa77aaae8968558dc2f57d7520c878c9de5352c467b0984606708f831fd2
-EBUILD milou-5.11.1.ebuild 717 SHA256 77f0a461a6fdc3d0c5cbd7df143f891efb26a70376c0c356785b7134f9217491 SHA512 f5cf39581f2b6f7614747eb9263d1c7fc876ae6b37ac72e1cba8ff158a7c9dc5e817334a09bfd3e7e016e93ea2b8e19e6b340c56e3e9adc23217d53db40969db WHIRLPOOL 9ac97215b762753c622579eec286a9a353f9abae43f2709108633747a2135f04a70068363fcd2d27c274d6d7ff447472844996193a9e2edd53dd6efd1caba093
+EBUILD milou-5.11.2.ebuild 717 SHA256 77f0a461a6fdc3d0c5cbd7df143f891efb26a70376c0c356785b7134f9217491 SHA512 f5cf39581f2b6f7614747eb9263d1c7fc876ae6b37ac72e1cba8ff158a7c9dc5e817334a09bfd3e7e016e93ea2b8e19e6b340c56e3e9adc23217d53db40969db WHIRLPOOL 9ac97215b762753c622579eec286a9a353f9abae43f2709108633747a2135f04a70068363fcd2d27c274d6d7ff447472844996193a9e2edd53dd6efd1caba093
 MISC ChangeLog 12383 SHA256 6dfa08b97ecbbbdf00c10f48df090825993fe04f0b753a11f5c0bcb441fbc2a0 SHA512 3daacbe9f5de04b9afc9f37d78bc5e7722ed0578a058936335e37b5aac41a3d2605ae1e37dcf2beebdd8489782f7364d131d19ff300c7b3067382d35c0d5f2f2 WHIRLPOOL 907114f7e05fa4fef9085051612b0cd48a000f333d0308f5d3886c45410492b577e3805945b371dc611f5b626e2624501a7903cda4ffc75c4feffee906bc6a51
 MISC ChangeLog-2015 689 SHA256 89b341efd9fa0f403987c84f25d79e636f9cc67f1f4bdc174c669e0d689cdfc6 SHA512 dd834a6fcdbb601a90febecb666c73eb1b9ecb4ce69fff7ac132787540b7d2dedfa170e6b393cdcf8049e517fca99bededde0d966a9d43dcbead6f980ff63d90 WHIRLPOOL d7750d5b68d197249c2f8de7ef5e013adccadf15a28bde19e1df3763c869dda86e517e8c0298eabfae621727e3358c04299fe0f9e07eee270d9259e83d8ddddf
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-plasma/milou/milou-5.11.1.ebuild b/kde-plasma/milou/milou-5.11.2.ebuild
index 262ee387ac3d..262ee387ac3d 100644
--- a/kde-plasma/milou/milou-5.11.1.ebuild
+++ b/kde-plasma/milou/milou-5.11.2.ebuild
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index 0f25d2bba63c..3cc3674d5784 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,7 +1,7 @@
 DIST oxygen-5.10.5.tar.xz 4468276 SHA256 a97a01d0db02b4b1574f5652a9ff1ffef84b085ed67c2b8f68b3818d56d6315c SHA512 176db69036a3da47544075b9b83059f48d6037be21095ffc622811982bf32ece357a37f501f0528abf6ddd974c5c7d680474c325b752bd2f425c81a33fe94f71 WHIRLPOOL e7218e619045d6df5262f478a1962ab1e4393889ba182912758bf0303a00e09b3efef2ec6e37190fce7c62fd14352afad0142b6edc2ffabf68e784ecc624b9f1
-DIST oxygen-5.11.1.tar.xz 4464660 SHA256 3f0544c0376ac98f063dca14f7c0414a69cff775b1e67e4033922d5630a17e2c SHA512 9d3881e6b818a0a80d156a4db9b8b89a40f99bf97ca3b177498d8adbf5f34cb8a8683097dfbb8001c9378f8b2493c05001655c27fc3b41bde1f1b3f310c82322 WHIRLPOOL 53da73124fa2113ca2527880b2030a1fece716e0f7ccd89befeac4ee645e27aceadbe5aeef5b296ebc2492d453bbbff3c1cc7b1a029875331fb706ada26e5ba8
+DIST oxygen-5.11.2.tar.xz 4472224 SHA256 21a9831d03c25955f5381fa8c27e0afa6b024e2c4bf355a982edd38305e0d3a2 SHA512 98cc4a51a222aab50e20126a8c08525473fa41d8a04f316fafc2a079f77c9024f68d6409e335c8ab50d09cebff2e77f806e48be8b6d6e2b5e1b81e28f432d114 WHIRLPOOL 9e6cc87090af17e71e390bf57caba3efc55908a6081dc8b30c97ddc078249532fa071e2a6effb251febf87169a597e94e22cbd7189062f4d24a9fd2adb278e6b
 EBUILD oxygen-5.10.5.ebuild 1996 SHA256 ca284b286577e826633e45b7bd427ac636d7616a8f59b5e1a7652371d585cfa5 SHA512 22ba19d1265b008ab95f15b19959d53de0bfb09f7fe5fc586606a611a192823274043ac4fc03f6ae324456aef7a4ab959701b45c669efb51119ab8ddaa23bbc3 WHIRLPOOL 1b677166a0b2db59535c17c68a1e52cf74631bde1f29dafc0b397498c942711d2fc8efc905b7dd8dca5bc37050c0b37a3cf0defb8d830d307b773dec3659d4e1
-EBUILD oxygen-5.11.1.ebuild 1998 SHA256 6d7b1460f61285908830117d0824e9e15c9d99ee4a984ce012e44ec020a5a8b8 SHA512 98c37a9a0b15ae1f093eb2204154bbad2118cea67f5c512159f4b9fa554b1905fe58f199ec691e49e4da2af0abb0606a361ef617783d18a2848938cfb2af9985 WHIRLPOOL d3e79f74eb24946682dc8a44a04cb356fb86eb9aaf0722cbec2ab1b8c33b42935e26abc3089f8f67f0ce10a05f71d96d0255ad0a681ae9758248f755103e746b
+EBUILD oxygen-5.11.2.ebuild 2141 SHA256 52af8a93f88a432a5d5ee570c20f223ef8203a2cb6defe961301640429abf4a0 SHA512 5d3c5aedcc34390aebc739aa7362c351c2f53153c6f30db51001db6ff2e0469074b7689aa8f5762309ed4c910a5a63efb51d5693af43efa82e599136f9beeb19 WHIRLPOOL dcc0e399ef4e624e936e72d985809d66a35500566196a2f11b38e890fbf4445f7cdfb7efe2292f65f04c9d73f57156b71f95648dedc01ec754260a4d781e18d0
 MISC ChangeLog 13152 SHA256 cc7b005adc5ed1b6fd423fd68a2b62d1faf1d9bff6f841c481d9615deb09257b SHA512 596dde0ebdf0b7c096d5e1b8f8e13df34f8ff8d68e1f4d6ae347ca7c3ccbd7b24e9148739d9f7ab5907bd7a5f387bdf3699bc863761397d8688d0b98f1a503f5 WHIRLPOOL d0bc9657c46adb679a67a80b759b799b7f0b77ac4ee702faed0ad2f79faecfe40d9755886f897cf015129c75edc8c8b35354e3925ce131f60c34f0323e75828c
 MISC ChangeLog-2015 696 SHA256 a0835cf04e221f63a851870aa2b0c27e96af2934f417944223bc5660c13a2bc1 SHA512 b85804e18ac74f5162097474f3573da3f1d3a7447467879b29f73ceffead39b14fb666ea1c9737dcb033043f70e3d50b7cad4258277dd91a9c2bc5f18772f68b WHIRLPOOL 7cfe39d1e4aaeee37a331d1d9bdaeb86823388604b789c3ca98fc66174ec534bcdb9cbd4d1c64f8bedf4a980823d04608ebcc667dd7388feec564902e19b6faa
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-plasma/oxygen/oxygen-5.11.1.ebuild b/kde-plasma/oxygen/oxygen-5.11.1.ebuild
deleted file mode 100644
index 322e8762a9df..000000000000
--- a/kde-plasma/oxygen/oxygen-5.11.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5 multibuild
-
-DESCRIPTION="Oxygen visual style for the Plasma desktop"
-HOMEPAGE="https://projects.kde.org/projects/kde/workspace/oxygen"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="qt4 wayland"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep frameworkintegration)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_plasma_dep kdecoration)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libxcb
-	qt4? (
-		>=dev-qt/qtcore-4.8.7-r2:4
-		>=dev-qt/qtdbus-4.8.7:4
-		>=dev-qt/qtgui-4.8.7:4
-		kde-frameworks/kdelibs:4
-		x11-libs/libX11
-	)
-	wayland? ( $(add_frameworks_dep kwayland) )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kservice)
-	qt4? (
-		dev-util/automoc:0
-		virtual/pkgconfig
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	qt4? (
-		!kde-plasma/kstyles:4
-		!kde-plasma/liboxygenstyle:4
-	)
-	!kde-plasma/kdebase-cursors:4
-"
-
-pkg_setup() {
-	if use qt4 && [[ $(gcc-major-version) -lt 5 ]] ; then
-		ewarn "A GCC version older than 5 was detected. There may be trouble. See also Gentoo bug #595618"
-	fi
-
-	kde5_pkg_setup
-	MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			$(cmake-utils_use_find_package wayland KF5Wayland)
-		)
-
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
-			mycmakeargs+=( -DUSE_KDE4=true )
-		fi
-
-		kde5_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant kde5_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant kde5_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant kde5_src_install
-}
diff --git a/kde-plasma/oxygen/oxygen-5.11.2.ebuild b/kde-plasma/oxygen/oxygen-5.11.2.ebuild
new file mode 100644
index 000000000000..247a5aaaf357
--- /dev/null
+++ b/kde-plasma/oxygen/oxygen-5.11.2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic kde5 multibuild
+
+DESCRIPTION="Oxygen visual style for the Plasma desktop"
+HOMEPAGE="https://cgit.kde.org/oxygen.git"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="qt4 wayland"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep frameworkintegration)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_plasma_dep kdecoration)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libxcb
+	qt4? (
+		>=dev-qt/qtcore-4.8.7-r2:4
+		>=dev-qt/qtdbus-4.8.7:4
+		>=dev-qt/qtgui-4.8.7:4
+		kde-frameworks/kdelibs:4
+		x11-libs/libX11
+	)
+	wayland? ( $(add_frameworks_dep kwayland) )
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kservice)
+	qt4? (
+		dev-util/automoc:0
+		virtual/pkgconfig
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	qt4? (
+		!kde-plasma/kstyles:4
+		!kde-plasma/liboxygenstyle:4
+	)
+	!kde-plasma/kdebase-cursors:4
+"
+
+pkg_setup() {
+	if use qt4 && [[ $(gcc-major-version) -lt 5 ]] ; then
+		ewarn "A GCC version older than 5 was detected. There may be trouble. See also Gentoo bug #595618"
+	fi
+
+	kde5_pkg_setup
+	MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=()
+
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
+			use debug || append-cppflags -DQT_NO_DEBUG
+			mycmakeargs+=(
+				-DUSE_KDE4=true
+				-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+			)
+			cmake-utils_src_configure
+		else
+			mycmakeargs+=(
+				$(cmake-utils_use_find_package wayland KF5Wayland)
+			)
+			kde5_src_configure
+		fi
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant kde5_src_compile
+}
+
+src_test() {
+	multibuild_foreach_variant kde5_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant kde5_src_install
+}
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 9b89df6efa88..ae48612517a1 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,7 +1,7 @@
 DIST plasma-desktop-5.10.5.tar.xz 6076092 SHA256 15bfd43b9589654f1c8c56601fc392a1a16f07b2979ae1d92d4f9570c514beeb SHA512 992564270216f7bd96dff59bbe35ecb78ceb25b99d5eb3c7c9e1241003aaafafdfb4fd728889b8b95f9252a9a397de95abb9dfa64dcf876c8d713cbd8e1951c4 WHIRLPOOL c6ddda99ee103557ad9591c662d76ea6e7e8a1a4838da58d3070461288b2dc18220a0c552471ab55ec94ce873267c357f372d165bd0b5ffccdb5ecc2df5fc119
-DIST plasma-desktop-5.11.1.tar.xz 8386648 SHA256 fa667688f7c4de051dde79edcfdadd68df62cc65788432413102fbe9e386ece4 SHA512 18795cae591f4169c061287031999cfbe8da77cf77801600fd2afbc379bade10aa5ac71437abda35804f4a589dcc9300d42f308be8aa9341608933fe843559fe WHIRLPOOL 0b1ca9bc308f3ba207fa0df85b6395948c9344924a01f039e0a5479fdf73fc8160cae210b2cd12a008c7b57d6a5160029c33ef76a4f53d7f13adc5fc94d52db4
+DIST plasma-desktop-5.11.2.tar.xz 8372848 SHA256 f867b860cfa8426716e3ee49eeda37a845c53bae63fdbebc942c47ca3d3ee537 SHA512 418a3d4ab6d57da74672427ae181fbaf753caeaba07d0122c96e9985dc66b6959ce5989965e0062eca378ba42a66e47be94919e490ab239d08635da160d8db5e WHIRLPOOL d025d0ab0502745070c2ae3e23765cc7da03e5ca65a8cd6e1cbbe245c200b36daa5af2cdad07213ca8dfafd394c3ddea6d743d46a9da27feb5e923305f604e83
 EBUILD plasma-desktop-5.10.5.ebuild 4276 SHA256 77717e90aceb4c44a2dfe105c6e869a1e61139ba274e06b5ad38e79b7442eaf3 SHA512 d1dcd30d8f8243d13058098d521e4a18640ababa3c78145f9fe9069ce40722b94003b9dead7699de87e9810630f8f67bdf3690867b9757a471ad2b439c18a672 WHIRLPOOL 9a93d3751de4ac3b76bda094ccc6ff34fb8f6ec192f2eba87e01b8f24130379fef5426a03daa7961fa0f377499ddfd717ad63d5d851fc64275c19063a116778d
-EBUILD plasma-desktop-5.11.1.ebuild 4374 SHA256 6175e119168d14858d2934c2ef5a48b3ab173deddc36dfb648345eacfd61f68c SHA512 7da45d9a3a10eee6bee9f5ce6a0f39007368f2cc5a3350144264e172c4823f0d1b4ec13c59bf61d074834470c485cd42b64a5881d0a6d5b4f79d60ebde1afb57 WHIRLPOOL 5f2cd6b674da8ab0ce32a31e4fa1ca759585e576c595d362e481b5a95cbb3cf5aa67771834580aa1c5de543fe3e82ef66b2db3c10193066a5d16f6f883cea9a1
+EBUILD plasma-desktop-5.11.2.ebuild 4374 SHA256 2e8d44061fa0f8fbc847390ecce581cc4cf633f56c78485fe0a0c7e86b3988bb SHA512 7c16aee78de2723b9b27b312fb4f4cb4d82bbcd806099bd552be6334a16b40d9e142f2b845f14ea9a24608bb8a9c2a478658749a24d12a317b68e5dcf236a805 WHIRLPOOL 99be069159fb2687efed16ae6dd1fb9671ca262f2427031cd1ba1ee0d705573c20813347a601612d43b2985e8c5bcc8be72d162804518159d6a961bc6f0b8aee
 MISC ChangeLog 15915 SHA256 a51aaa3e1bb4757bffee181853a50200a9435067831c2a6c62f6b00b995c6c07 SHA512 a62ea3ed92e7800ec596b4ab99b3a8317a597f657329d849ecfd6aa0af2ef497aae2b4b43898d03785549c326fc22b25c6d2c7fd20e1551cb624daab230f696f WHIRLPOOL 0f356c3c740f6048ed82060cd16b5b3e6f630efd22c0df310716ba9692e71bbea560d71b8b54f9cba73f23a3bd51b35c36fe0edebbacc335021d0b2b9356d2d5
 MISC ChangeLog-2015 1003 SHA256 2d8838369a5b9507a87184045c7c5bb097a62ff2d55e873d66cb762cc8179f87 SHA512 721e4e83154e4a24876b2b1db0e9d8722e492e8c46fbf57fca10e3c69e5cb5f7190d314754e5108deed94f72e06b3ca0ee4e3cfe187f759c6400b1fb84bf21fe WHIRLPOOL 771d186b1cc6ef7b1905089c57b63f861642f1d53a3e09a4ccdec4adcb328348d12356a9191dbf3f0126a7c7f2fd2c4c650b04b14f3334063a0aa544443aeb83
 MISC metadata.xml 936 SHA256 c756aa13b3134f8a31ebacd7739d0fa3fcd4f2a5aca7e24521a3301639352061 SHA512 cbdfc40a4ec80d01d0fd11e695259e4525347f4294a4ff786be7b863b4c679daea38187e1a8eac0239396ccea84ef83c5a7cc18dce387829edc69096e29041f8 WHIRLPOOL 7a91f0f4f52f38a3202c3dcfc8b690d8a1378b7d596690a384a6d3c4ef8275236d14866884f2f6d4e4c57151f93e2920e0c57f7ea05985e728ef2025c876773d
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.11.1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.11.1.ebuild
deleted file mode 100644
index 2375b3d568b2..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.11.1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE Plasma desktop"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="appstream +fontconfig gtk2 gtk3 ibus legacy-systray +mouse pulseaudio +qt4 scim +semantic-desktop touchpad"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep attica)
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kactivities-stats)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kded)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpeople)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_frameworks_dep sonnet)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxcb
-	x11-libs/libxkbfile
-	appstream? ( dev-libs/appstream[qt5] )
-	fontconfig? (
-		media-libs/fontconfig
-		media-libs/freetype
-		x11-libs/libXft
-		x11-libs/xcb-util-image
-	)
-	ibus? (
-		$(add_qt_dep qtx11extras)
-		app-i18n/ibus
-		dev-libs/glib:2
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-	pulseaudio? (
-		dev-libs/glib:2
-		media-libs/libcanberra
-		media-sound/pulseaudio
-	)
-	scim? ( app-i18n/scim )
-	semantic-desktop? ( $(add_frameworks_dep baloo) )
-	touchpad? ( x11-drivers/xf86-input-synaptics )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	x11-proto/xproto
-	fontconfig? ( x11-libs/libXrender )
-	mouse? ( x11-drivers/xf86-input-evdev )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep qqc2-desktop-style)
-	$(add_plasma_dep breeze)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_plasma_dep oxygen)
-	$(add_qt_dep qtgraphicaleffects)
-	sys-apps/accountsservice
-	sys-apps/util-linux
-	x11-apps/setxkbmap
-	legacy-systray? (
-		gtk2? ( dev-libs/libappindicator:2 )
-		gtk3? ( dev-libs/libappindicator:3 )
-		qt4? ( dev-libs/sni-qt )
-	)
-	pulseaudio? ( $(add_plasma_dep plasma-pa ) )
-	qt4? ( kde-plasma/qguiplatformplugin_kde:4 )
-	!kde-apps/kcontrol
-	!<kde-apps/kde4-l10n-17.08.1-r1
-	!kde-apps/knetattach[handbook]
-	!kde-base/plasma-desktop:4
-	!kde-misc/kcm-touchpad
-	!kde-plasma/plasma-workspace:4
-	!kde-plasma/solid-actions-kcm:4
-	!kde-plasma/systemsettings:4
-"
-
-REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )"
-
-pkg_setup() {
-	if has_version net-im/skype && use legacy-systray && use amd64; then
-		einfo
-		elog "You need to install dev-libs/sni-qt[abi_x86_32] as skype is a 32-bit binary."
-		einfo
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package appstream AppStreamQt)
-		$(cmake-utils_use_find_package fontconfig Fontconfig)
-		$(cmake-utils_use_find_package ibus IBus)
-		$(cmake-utils_use_find_package mouse Evdev)
-		$(cmake-utils_use_find_package pulseaudio PulseAudio)
-		$(cmake-utils_use_find_package scim SCIM)
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-		$(cmake-utils_use_find_package touchpad Synaptics)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	# needs D-Bus, bug #634166
-	local myctestargs=(
-		-E "(test_kio_fonts)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.11.2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.11.2.ebuild
new file mode 100644
index 000000000000..07c7be406ec2
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.11.2.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE Plasma desktop"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="appstream +fontconfig gtk2 gtk3 ibus legacy-systray +mouse pulseaudio +qt4 scim +semantic-desktop touchpad"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep attica)
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kactivities-stats)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kded)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kemoticons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpeople)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep solid)
+	$(add_frameworks_dep sonnet)
+	$(add_plasma_dep kwin)
+	$(add_plasma_dep plasma-workspace)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5(+)]
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxcb
+	x11-libs/libxkbfile
+	appstream? ( dev-libs/appstream[qt5] )
+	fontconfig? (
+		media-libs/fontconfig
+		media-libs/freetype
+		x11-libs/libXft
+		x11-libs/xcb-util-image
+	)
+	ibus? (
+		$(add_qt_dep qtx11extras)
+		app-i18n/ibus
+		dev-libs/glib:2
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+	pulseaudio? (
+		dev-libs/glib:2
+		media-libs/libcanberra
+		media-sound/pulseaudio
+	)
+	scim? ( app-i18n/scim )
+	semantic-desktop? ( $(add_frameworks_dep baloo) )
+	touchpad? ( x11-drivers/xf86-input-synaptics )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	x11-proto/xproto
+	fontconfig? ( x11-libs/libXrender )
+	mouse? ( x11-drivers/xf86-input-evdev )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep qqc2-desktop-style)
+	$(add_plasma_dep breeze)
+	$(add_plasma_dep kde-cli-tools)
+	$(add_plasma_dep oxygen)
+	$(add_qt_dep qtgraphicaleffects)
+	sys-apps/accountsservice
+	sys-apps/util-linux
+	x11-apps/setxkbmap
+	legacy-systray? (
+		gtk2? ( dev-libs/libappindicator:2 )
+		gtk3? ( dev-libs/libappindicator:3 )
+		qt4? ( dev-libs/sni-qt )
+	)
+	pulseaudio? ( $(add_plasma_dep plasma-pa ) )
+	qt4? ( kde-plasma/qguiplatformplugin_kde:4 )
+	!kde-apps/kcontrol
+	!<kde-apps/kde4-l10n-17.08.1-r1
+	!kde-apps/knetattach[handbook]
+	!kde-base/plasma-desktop:4
+	!kde-misc/kcm-touchpad
+	!kde-plasma/plasma-workspace:4
+	!kde-plasma/solid-actions-kcm:4
+	!kde-plasma/systemsettings:4
+"
+
+REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )"
+
+pkg_setup() {
+	kde5_pkg_setup
+	if has_version net-im/skype && use legacy-systray && use amd64; then
+		elog "You need to install dev-libs/sni-qt[abi_x86_32] as skype is a 32-bit binary."
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package appstream AppStreamQt)
+		$(cmake-utils_use_find_package fontconfig Fontconfig)
+		$(cmake-utils_use_find_package ibus IBus)
+		$(cmake-utils_use_find_package mouse Evdev)
+		$(cmake-utils_use_find_package pulseaudio PulseAudio)
+		$(cmake-utils_use_find_package scim SCIM)
+		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+		$(cmake-utils_use_find_package touchpad Synaptics)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	# needs D-Bus, bug #634166
+	local myctestargs=(
+		-E "(test_kio_fonts)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index 9114fdddce02..427212320571 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,6 +1,6 @@
 DIST plasma-integration-5.10.5.tar.xz 51704 SHA256 56c2adf52399536278dbad3605c1088e214ef6c57c72e06f297da2739be69d95 SHA512 18fbd5c6374ad65119a3df0bb93caa38cc0b4e599be4b20aaf625b7ad1c27a1bcab5efba8dfc7932f0fd64a0ae039251b02dfb0228382a49ed685dd1e8cff900 WHIRLPOOL e272c5e57b4b1af2968b466b34c95abf57bb41e6612c56e3684c64f7fec95da61cec47c773afebc1456a9ff98d8a53a2ca87ddef18c07501dd461cce32630c3c
-DIST plasma-integration-5.11.1.tar.xz 52424 SHA256 9e9662d8d89f98fae1a5682e831abf068a564d720cd8bbd8e99ececb6884fa4a SHA512 e55390c41cc81ef13923b8863de174d48a20f252e38b80061a899ed8e55edc50b827b16cf4c4d8cd1e1c9ee6fe48497c7b4df4bd78de1c65d04afeba62240d4a WHIRLPOOL a478d2f6cfa6abe85b786f60b75d706924ffadbbeec0817f50653e49b8b33397aa8d7c728505868f8e39ef014617245f6126a8b623c39968ddad7d26f1893947
+DIST plasma-integration-5.11.2.tar.xz 52688 SHA256 5444c3bf88bcf50f98ff4352cae4c4e323174ea8aa8f0f5c04bca54973ad7297 SHA512 fec749c1f5da4ac2362f41573f615b844216e271d1949791930bed9a6788b596252962255c732bd4eaac986effaa8bc56e06ab72e8e6aca5b2d5d088e5888c3a WHIRLPOOL 52aa8caf885be7185617c93013e2c92cde5210fb012d2a08012ad4ba79fdf57df63d9c8c25dd3b5a75daaa66fa3eebe448ed73fc18b072d5fc0a9dd824e31542
 EBUILD plasma-integration-5.10.5.ebuild 1030 SHA256 62b2f9e3f0bb293d76201986991dc6878760f9bcb499fea114b7514da2dc9801 SHA512 bd75419ba6dcfaa93b7d386363a95f000da73296fa45085d5800a245bcd700116115205658f35fcc29ba1f769990f4891417c2363a57d2a8a91932da5ed021cb WHIRLPOOL 3c51e40423cd7b1f000a892d7bd38f8d8841db912115384e1129fa0edcee78443dbdd3f8d969cd00cdab5cabacd671f1adba6e1f05d952a2cbd95bb6daa7c796
-EBUILD plasma-integration-5.11.1.ebuild 1064 SHA256 47d9bafa22d5f7ac6a9b2bc475df6e9483702ff94b96dd9d64de03c633f339fb SHA512 bec098c510e05fd2209f0c001405eea583054c3a16fb37e192f5e2064b20c777f00f9d59ab19a38c00716460b19dceac997261159acfd85dc8537a32c22bacc6 WHIRLPOOL 878ed991868d4df27567b0d3413e360dd5311650fb61c71c7b0d8f1ae566759fb43d44bd4817eac28d6cff701ffac7866006d055dcd2b7d4e53cf1d349f4503f
+EBUILD plasma-integration-5.11.2.ebuild 1064 SHA256 47d9bafa22d5f7ac6a9b2bc475df6e9483702ff94b96dd9d64de03c633f339fb SHA512 bec098c510e05fd2209f0c001405eea583054c3a16fb37e192f5e2064b20c777f00f9d59ab19a38c00716460b19dceac997261159acfd85dc8537a32c22bacc6 WHIRLPOOL 878ed991868d4df27567b0d3413e360dd5311650fb61c71c7b0d8f1ae566759fb43d44bd4817eac28d6cff701ffac7866006d055dcd2b7d4e53cf1d349f4503f
 MISC ChangeLog 6375 SHA256 2cdaf8bb610421d940996b272346d33df528048495306cf25628cf5f874ecf26 SHA512 f2bbe24e59e13959ede0a4e5d80fb38dc2cb2ef680c876b5a3771c916a57935e10bf301e6772be6461286b80ae64ed43dd57788d7b4c08cf704fa49e6247ed88 WHIRLPOOL a83d08a760e2f2d6c87e13a82b686406362ddf048508f604a362527ca2ffedc184456e444f55f3802b3dcd1d280f8e7fd98c5a5f7ab3da56c9eb78f56f34f996
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.11.1.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.11.2.ebuild
index 2621b8fe1c94..2621b8fe1c94 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.11.1.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-5.11.2.ebuild
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index a59d14f3ab9d..386501e69dbb 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,5 +1,5 @@
 EBUILD plasma-meta-5.10.5.ebuild 1924 SHA256 c05b09767bb5f7442ca444b3c3bb42d4f4010594d40478430829d116685d807f SHA512 547d3c9271a99e113babcad63691e90179a0fdb596a11fd78240e79aaa78f77858f58b87e138971d18ebba27bb1e57ed2e0e272ef1008de11068a4c7d2f707bc WHIRLPOOL 272e8e08cbd5d6eaee0a00ccb7b436962ee8e7c6b54f68d4096af2a02f9dd3b9dc316e33573546a1b69df3e0d6ec4dd16b5926364d951dc8ccf3ff81e23005c7
-EBUILD plasma-meta-5.11.1.ebuild 2002 SHA256 d2da8ff8a8c11088a2f25f4a184345b3689c306b1ace36199921770610449007 SHA512 afda3a5b3d0b406429ccf29d3532873c494f80e841e242952929daa8e94b6a2fe627130f6ba0dcb0f38d270949e723f2b4e34fd90768b2895596c07bd5f54622 WHIRLPOOL ca7832e7aa9a03c2cb600e73399c062fbc93b0442b9376ce01bacfee3bdadfb4f55be1888b444732fd85c921bd9b9f87871fe16467631bec2426ae3dc944ab57
+EBUILD plasma-meta-5.11.2.ebuild 2002 SHA256 d2da8ff8a8c11088a2f25f4a184345b3689c306b1ace36199921770610449007 SHA512 afda3a5b3d0b406429ccf29d3532873c494f80e841e242952929daa8e94b6a2fe627130f6ba0dcb0f38d270949e723f2b4e34fd90768b2895596c07bd5f54622 WHIRLPOOL ca7832e7aa9a03c2cb600e73399c062fbc93b0442b9376ce01bacfee3bdadfb4f55be1888b444732fd85c921bd9b9f87871fe16467631bec2426ae3dc944ab57
 MISC ChangeLog 14267 SHA256 05406a1e6dd42499e0843e4f85f84c6bc8d60bbe37988c1b23f03b31fc61ebb1 SHA512 6950af147f37de923a6e392ea993946934ae227a23d919a09f8fb3ef3bf451034eae4f12a59bb6dfa95b81da815806d916fe0b273b730e5cec8c3048f18008fa WHIRLPOOL 696b3b07dac6a6b8c8fe4b2d6e9c32a6f4e44cecfc6c5aea6504d722c693e28c4c604f23a2c18a6f5a43079dee621d8833e0f4b34d30418a31c9aa178458e8e8
 MISC ChangeLog-2015 1266 SHA256 9edb3b10cfaf85584321eab42dfe631eff63875185cada7af64102d9db3d8425 SHA512 7dcc24385af986541a3bf4618a7f2c330258e2a8f88264d6ff4803d3fba9e25d632ffe1526128dbd5efba1ce8242583ccef4ac3df6c9d318f8d9307f4648db3b WHIRLPOOL 182812508b339c83836ae3de2be931fbec632b78bf0085c33d3f3640a14528084f66d5bb80005bcc2ec382105af8ff616ab1653158ade9f3305aba38f98c512e
 MISC metadata.xml 1094 SHA256 5f701eb23edb61101ad6c084ecc8a9d0058fa9f3ac74ae984790d8d369253288 SHA512 dbc1efc45b907453ebb2c0e0865d5b6c3be9235686e86b37ca9e3f8b5b73644058590cc59db8545c4f7af68f12c0482e5b9872a813a657a03508abedc5932881 WHIRLPOOL 4476ffea8de2dbd52c5f1971fb493b2316fd3aa0c3f294abf75d86d7b6765777ce48b48d6874e2ba87c60df5dd03e526cf1c848af72b32dae11fe9ab76f6733b
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.11.1.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.11.2.ebuild
index c48b758a807d..c48b758a807d 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.11.1.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.11.2.ebuild
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 4611e65ba828..907c8862b7e7 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,7 +1,7 @@
 DIST plasma-nm-5.10.5.tar.xz 706724 SHA256 7101d07fb1c64cd45591256e756134f85051966762530d8d5a0a93e3ddac9600 SHA512 f2502368e883b4be3dd416be6e294e87cef259ac8c1b7853b63fba291e19ac43c5175c186ee287fb843409251fc1ef97eac87de7929ef48695fc409a0de8e05b WHIRLPOOL 225e7eade60b3c3e585dc42d8b2518c8661ba227a767424cecab8c0bd4cc2f33437e8d17f13cfffe9944bcdc1eacdd64e6588af60a2451ae20fba1e29310ce00
-DIST plasma-nm-5.11.1.tar.xz 694640 SHA256 37fc1e8f343d61badfd257bd21176df33cc2f279b2850075cc7380723c66e910 SHA512 a257262c9a0c30a1cef6ece2f3e0022c968dbb074b7ab5f5bba4c62f688e6a51f33a26aca69d8b56403aa3574c0495ff75b23490f6ae8f0b8354f9c7f4a84e34 WHIRLPOOL c6b2d38e0c74989d59df9eddc8008feaa28321e3164058f9c4bf3be08999bd04967a323ac5e9875c200fc2cf9bc31059ac6cc73b62eb9e23d1f2ee7a6eee4606
+DIST plasma-nm-5.11.2.tar.xz 694320 SHA256 585ae09e97eac0e655aae27977ffbb5b5ea66084f3b25032b00eede606966ac0 SHA512 fe07206c9afacabcd6533266fa3833b358cd41375d9c6175d9581b177b1b60be3e9868463959013166ba82f68467c649badad73d4ca20ff9a982f29d7465cb63 WHIRLPOOL 598bf02cf174d10967632d05206e9baa2aad57a6448a8adcec1370a9b8cd4ce414592176cbbaa89519af440195817401d987133ee891b38a778047632b46b85e
 EBUILD plasma-nm-5.10.5.ebuild 1726 SHA256 b2f54f35dacd45f30ef447f9fbb72dd0e1ad26bf2535b2730c59fb121d9e7bd6 SHA512 097e049b04cbc7902a8eb7ec8eb4948e9f8d509fdbcf7463daefdf5d688404784ab0378a4c5cbb475bf1616f878d38ec2450d9df9991c10fdbd26c23392e0176 WHIRLPOOL 1a87a0e7195837227461df1d41c09cbbfee4e8d3197c60d48fe4416aaecaf7fd5b2ab524e586830866a11cc059a2f142686d8873b671fc2c188f8314bff56171
-EBUILD plasma-nm-5.11.1.ebuild 1728 SHA256 a56a2f4204c947ec481e72c0c9f20d75c73b49676afe49d91de8c6fec7429ee4 SHA512 3cc241647c14078b0009892477529ddf010eefa39c1a8ad56ccfd2530c54a878e4b500aa7d5d442a876fb61e7b361552692cf4fc93350e1718a3867ffcc74195 WHIRLPOOL 91e59ac4b2a4fca9512cceeb95de028e2585a2df1e93a434393b4b166e9830871dabcc03eb4b209d5a897b4612d06b7542db2808995556bfb991bb3c9c51d429
+EBUILD plasma-nm-5.11.2.ebuild 1728 SHA256 a56a2f4204c947ec481e72c0c9f20d75c73b49676afe49d91de8c6fec7429ee4 SHA512 3cc241647c14078b0009892477529ddf010eefa39c1a8ad56ccfd2530c54a878e4b500aa7d5d442a876fb61e7b361552692cf4fc93350e1718a3867ffcc74195 WHIRLPOOL 91e59ac4b2a4fca9512cceeb95de028e2585a2df1e93a434393b4b166e9830871dabcc03eb4b209d5a897b4612d06b7542db2808995556bfb991bb3c9c51d429
 MISC ChangeLog 13486 SHA256 488d604821bb7f533089ea5d815023893117b896b4e05ad388b37e37405a20ae SHA512 2959d0a021d053a86afcd7df04e4dd79a457f1826fb05b8fd2c1d0d0ce2a0478a2d8c85c4e6248fb6e66a72cf3817fb9aa4aedcbb818eeec69e02f8e1b561ca4 WHIRLPOOL 15af946152e73c0909c29f8b92985e45296e2d82c6b583f851249629358b49f9ec9889bd78f41dbbb2bf5122e72225f75991de451b3508842a347fa5a0cb86eb
 MISC ChangeLog-2015 717 SHA256 10bad360e1886e62359446b046ef7f782e76732fd8addb4003895c95f47f5ef1 SHA512 2c9c6092eade0d1af004a0ae8a2130d94c07d69c695e874cd9127e0736734a62a74cadc5e00995023de790a06298754d6f67d1a420493dbaf58aad7a291437e9 WHIRLPOOL ee89760c08b2594221148654d4a0d93970a77a83854940fafe35541e475dc04278e9da230de5c8d641a16363a2a02d13c7ea681bf1e8a5c56f6d11d960c636d4
 MISC metadata.xml 479 SHA256 08f2d72462e2849f3324f416844ce45d094e05ca25cc4e97a49419210e70aa65 SHA512 69a8ce09c5a437814562c315dc7ac3142ac6c71906f37a6ea98e7b76fdd332362cfa76e823d0ee1ec920e92c8f7dda2a557071c758e9937886d7df78943b5689 WHIRLPOOL 0683c6bdd6032ade6587b03ccbb6d755ef39aa6ba5f714a92e3bcdf9be0814e260eed22b0da56dd6c70b3717712dd55f0918068416f850074852ca393cd943cf
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.11.1.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.11.2.ebuild
index 5783a52a471f..5783a52a471f 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.11.1.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.11.2.ebuild
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index 1cce45b0c221..90c6edbbf251 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,6 +1,6 @@
 DIST plasma-pa-5.10.5.tar.xz 79440 SHA256 e15a12e060fd920012fd2ff71d780489b971aad3f810a92f2fcbc37af8e8000c SHA512 63247d099ba74b6beb2b38948115ae1737fae9ab45b36365cb95a5ecae8d58b44c8ecf8f0cc451558c0eebdd2f6e24b055df0ae33f5f627b7cf4965e24880088 WHIRLPOOL 3564fea6732fed5f5f11e404f671f7144e5ba38134f8f5a08d3b7654f0d30a263d0d4e2e09d6983fade55a0ee52c56445adaefb009bcf83459674bd08e9c4dad
-DIST plasma-pa-5.11.1.tar.xz 83924 SHA256 8c741b1867131c7e23cbc8bd2f5fed69e4f224dd4ddc60ef95c632dec82ea63c SHA512 ab8624e749b6a693ef87fa5460d0cccf721bcaae2ac06cef6ab865eec3ed84e9012a4530699bfca46829e019e2d3aa05c4656db57e89c68ac3a5ff3621b58232 WHIRLPOOL fd37de34ce2785cac0911fda746ee799f55813f3b86eef69ef8d6a29d54c38f52df59205bbfbbb70cb61af2d9bee4d4f99394e5e3459239b1c25c4bf0ab38874
+DIST plasma-pa-5.11.2.tar.xz 84004 SHA256 c84a4758fb5dab86df1b32660d66b37d21b7f1e450bd539959c3170f272373b2 SHA512 75218ae0d01830fa866e4e43d2e1520075ed4a113058280fc5d97825be34e63e0913876d2f43ea6f829e8aedcf9d23b89d3f2c3a32f3fa46427b31b5eb2fe6e0 WHIRLPOOL 88ac3afdcb1a72e40e69f5ab06b7d5f6c25aa19f89c57c281bd04ccd5b8406fd2bfce00a4e969305ac24e1e8d1ac786a7878c76ce6526227614e99c6e943b0ab
 EBUILD plasma-pa-5.10.5.ebuild 654 SHA256 e1716555b2d6f0da5a74586cc76d52f00e497d3447127653ecbcd9b95d29332b SHA512 c59dcea6342b3bbad6a304b5dca8ad711afab4a49a26180ebaec9197f04a3fb8bcbdeb2cb48f2de354f52440ff95d69ec8216b20f23018fd69c8e36a78a0f119 WHIRLPOOL 213fcdbcd1f641ad2c535b053d9053c34d17b2f8fb35a8fd8315cae05668ffdb62858bc49594daa6d2dafebb959a2a6831ddf6ff8082de47c42acf026d2a33b4
-EBUILD plasma-pa-5.11.1.ebuild 656 SHA256 5c76cbc1633dc0a1c7410fed4673839a7f98249bcd1edd3ca65ee91352827a0e SHA512 1d49ae8de3d0cc9090e45d7b6913dc702dda2617bf580f07c4a32116dca79dbd9df4ff76aa003f4c67af99cd842fc0ae06e03fa1661a94fa7486479f8b211b8d WHIRLPOOL 7c45b26419c9a46dc94bcce154e352278a57e53e66a16b3976e58e06afb3c5b29680e9f376deae45f5b629fa708fb1d58a93621b81c6fffad2f69b509f5a48f0
+EBUILD plasma-pa-5.11.2.ebuild 656 SHA256 5c76cbc1633dc0a1c7410fed4673839a7f98249bcd1edd3ca65ee91352827a0e SHA512 1d49ae8de3d0cc9090e45d7b6913dc702dda2617bf580f07c4a32116dca79dbd9df4ff76aa003f4c67af99cd842fc0ae06e03fa1661a94fa7486479f8b211b8d WHIRLPOOL 7c45b26419c9a46dc94bcce154e352278a57e53e66a16b3976e58e06afb3c5b29680e9f376deae45f5b629fa708fb1d58a93621b81c6fffad2f69b509f5a48f0
 MISC ChangeLog 10377 SHA256 0301e8607be4e4a26f0a3bf12e2e8a8a1e0b3b164f3794f3ad6c86f1a3e7df64 SHA512 22120cc057bc8da8f5a939b1956a17219f302f26bfe4504069d98e482d3dd60ab233083c25b77cc4f14710959cd50d42adfc917f0fa8394da3f783e36f85de79 WHIRLPOOL ff80bb2101015f7deca4319e62a2e743527a059ed5868b9386e75c3eb1624b5ba36f103ca31575b3d8479b8b959ed921f29b75ca4f01532857c919d15dcaa7e1
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.11.1.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.11.2.ebuild
index fb5fb2344258..fb5fb2344258 100644
--- a/kde-plasma/plasma-pa/plasma-pa-5.11.1.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-5.11.2.ebuild
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index 3cd8321f1035..398bf3779602 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,7 +1,7 @@
 DIST plasma-sdk-5.10.5.tar.xz 246560 SHA256 cb833632b3baa4c9952c0096924acf8b1a0b918d4d162eb136c46631026f5656 SHA512 b29db30ece1778b353d7f6bb321d13e7903284497d9962c56273b0def879f97cea9a48ee2c44917907fb7b7db430d5fe878302a787937f7142c3dbd7ebd6bbfa WHIRLPOOL d4a1a54f13f6f9f4bf07f3f931b6166f603e75d1e17c573f31f4a51b7ca92c74476a78ab01965fa9405de2f7a2266afb81389adb286b5a672aa59ffc69877875
-DIST plasma-sdk-5.11.1.tar.xz 248280 SHA256 76d0b6e88b63fcb21e44c1be00975d203f32ae1db8793167beff97173d22416b SHA512 f28c0cd830eb13d8fd94e2d49cbfef3a3164b324393b2504e082632444f743f846f1ee93f2687a7bf7f8a0419a89b4f43b27736254844c337f3093bc68845cc9 WHIRLPOOL 8c2323136a44f39ea7cdcc64c7d410c05fc597ed8a61d27d614bc2d802abab6555e22c343da247d1751bba1eb5a6c7436d6ed247ee968ed53ef017b79781f2da
+DIST plasma-sdk-5.11.2.tar.xz 249272 SHA256 9d2de297cceed78b8f39e5fa2e70444203e7dcd5f8529b8e1a587b33f2f05e81 SHA512 3b8d87dbe607686b2b0ee6b7c6c4ea5a8311dded988dc2b70226e7fc5c0689ef3e13b2d77797e2e7ebc143271677f1280c35cfd7676592228e59007dcff3191d WHIRLPOOL 2b5de812e5fc523579a81f6de4c5fff45f1692dec8b1b54ee8b09b71b6ce86f93ca9d2f5021457ec9dca2643efcf24a4628b90687359fb7b9b2d9dfc818b29b3
 EBUILD plasma-sdk-5.10.5.ebuild 978 SHA256 255ddc8876cf0c64134c5cfc05c7fe8b69453a3ecc86f16ec5b44bfc0aa74f16 SHA512 6e978e0c4a581408c7ff28e4a83c5cf1f9ad9e6e867de8ec50276a31046fe507d7317ce4a83f6b902b4c5a787492153b4d0680392c6e60ca9ed414d586bffc40 WHIRLPOOL e0939ec3fa75302d76701a40b80aa2e6dad388bbafa6ae09437b850c2b43167ae84b7947a94b653b9c3f4f144eb4da2fe6dbe59a3f3e12776c6c7e6c5bf3716e
-EBUILD plasma-sdk-5.11.1.ebuild 971 SHA256 52940837fc0c0673fd93b2f935c8c8a78c83a253990f305a4d2ad740c40a6e2a SHA512 0cd73341f424d4107d7bdd03afb8236eecdf04491c81ba512f30e7d18af62470e77af8997df2e6b6d336b617d81974e8ea748af16dd0b50e07302a1112600da9 WHIRLPOOL e247984a2c57b73c704afe65f1392f16448ef31e29795becfd002268c484c0bf57dded7718c8dd410a87866154c8ac52e5b26604e4279016f94d41fa1393e897
+EBUILD plasma-sdk-5.11.2.ebuild 971 SHA256 52940837fc0c0673fd93b2f935c8c8a78c83a253990f305a4d2ad740c40a6e2a SHA512 0cd73341f424d4107d7bdd03afb8236eecdf04491c81ba512f30e7d18af62470e77af8997df2e6b6d336b617d81974e8ea748af16dd0b50e07302a1112600da9 WHIRLPOOL e247984a2c57b73c704afe65f1392f16448ef31e29795becfd002268c484c0bf57dded7718c8dd410a87866154c8ac52e5b26604e4279016f94d41fa1393e897
 MISC ChangeLog 13205 SHA256 da7803a134afbafd8462eaeeec90ab5580a7e5cda4332f74f03f3975060a8550 SHA512 513af6dd7048efda529391103b522017aa6cb75f928ecd4f67bceba0a658330106a28bf3a25a9e8bff0bad351d72b65c9aabba9c2c2c1f5274b204930c3039b8 WHIRLPOOL 3e3983d14524fd1be487add36892f0e973e732268d6fd8e19cdc74b7a8bf78868893d4d17c69b212b83ac8e83d3316c6c605351b09788cc8c9d9529c1da3bade
 MISC ChangeLog-2015 1082 SHA256 bc9f481d03954ae56ab2410b81b7000920b51d4c3a22c69c8f891846c8cf2fd8 SHA512 c98e67f51c8ac80bf0f46360059d5063e173ecaa4f3008dd2fb365fcda487a1824fa2f039b15bdada937384e123ae653b4a4388dc369f38aeecad9e6ba6075dc WHIRLPOOL cf88e36a338f6751e3f9264a82c2c4a6c0be7fa4072f915a14c5a5c7b0f9512bda34b7106d31e9a746115e4f346599f0dddfdb27ab03a511fcbae1a0c91171ac
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.11.1.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.11.2.ebuild
index 13fb2afb6409..13fb2afb6409 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.11.1.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.11.2.ebuild
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index 5a5a9e36554d..019623d655cc 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,5 +1,5 @@
-DIST plasma-vault-5.11.1.tar.xz 89804 SHA256 20cc07f21af1dad5dc6a43340d4ac652d5a876e3fe95166c815e2ebdc0948b27 SHA512 7295675cfed876be709865fc35662de1317a9434e66b69b60a616908b0af05822750737a62c5647c5825b713b6473e5d3c5a9176939bece87641901e2265cd6a WHIRLPOOL b325f940f568fc4a3a227f110a43bcc373025c5cf02a9e8857f6750c1ac01f24922dd417814cc77b262ab6fd0a846f425d7dd19fea45e1cfb4ed4bd886700230
+DIST plasma-vault-5.11.2.tar.xz 91092 SHA256 a60258f6978d2cfb122cf7786f4e9cf3c54c4314e47c9a388b6a80552920b7d3 SHA512 3d70263adac3e6daf8717c987d9a0d50bb88003181dea55feb32e963b918b5c7e8a9048debaf6562663a0f35ef0d3dcfbee4ea997acfc8b739c014de478a9219 WHIRLPOOL 8bad0ad63adbad6417a98aaf5d7f48309c748253aa9a043f8828ea65107950f110af59eb0fbd1db4273bcfd478e62b5abd114df0b619e3f5b1fd742e6c1efb6f
 DIST plasma-vault-5.9.96.tar.xz 75152 SHA256 1f1868c42df15e1584bb29efc51b1e533f95f1f8374021a7a12d4945d9b1bc00 SHA512 158196378a8171c1edf7cfb310687f10430957a66436370a3dc468758fb483dc5be6906a02fd161e0ecc56f94e8de9fbd833aa30850148d93d165c15b3a36699 WHIRLPOOL 79f07248eebafcdc9689fadb0c19537a80981c74b3fb7c2ddf70ed4ca5181bae6f326703084c12ddaa33daca50d0090f8e03ffc52f3a039250d27fe5034fda08
-EBUILD plasma-vault-5.11.1.ebuild 793 SHA256 65361848ddcfd1e93129a2e87136009801918800b500a70dafb0817c925691b9 SHA512 d917086da143e452d5f9812bad63e7b2fe328ad3ffc18bd79d87c4e879684b5d7a71a6df5c72bff594ce112c0eeedea35f019a8ec4f281f70f3a0ce0c10e4959 WHIRLPOOL 9136a5dcbc0af3aa86b8d4f77161c4ee98610253130694d7c9a78f10700edc65d6e8ba051c736e24e075996bdc4b08c52362099b861554322a76203ae10fb089
+EBUILD plasma-vault-5.11.2.ebuild 793 SHA256 65361848ddcfd1e93129a2e87136009801918800b500a70dafb0817c925691b9 SHA512 d917086da143e452d5f9812bad63e7b2fe328ad3ffc18bd79d87c4e879684b5d7a71a6df5c72bff594ce112c0eeedea35f019a8ec4f281f70f3a0ce0c10e4959 WHIRLPOOL 9136a5dcbc0af3aa86b8d4f77161c4ee98610253130694d7c9a78f10700edc65d6e8ba051c736e24e075996bdc4b08c52362099b861554322a76203ae10fb089
 EBUILD plasma-vault-5.9.96.ebuild 899 SHA256 ff1064ddf1e26a59ff7c87fc2d06cd45571f6e3f43f2c9686d265a8f7ffb1c76 SHA512 c792ff8c9dc0582b5e051ee051e362563a463104e15999440bbfffd7d054cd16319c94a0d1f1147e07de20d0a0493c4ede78d67d714a58facdc7a9e22953f158 WHIRLPOOL 6f58ce0fdfbf5b4f38fc9688e07e96df02dd1f0af495a8b7782ba4cfca0baab787b4df2a79a41dec267800b5f47cfb6df04ee05ae6617203b4abdb6cc8e7385e
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.11.1.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.11.2.ebuild
index 2e4eb64b0fdd..2e4eb64b0fdd 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.11.1.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.11.2.ebuild
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index 703c8fa79519..f549e2f14f82 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,7 +1,7 @@
 DIST plasma-workspace-wallpapers-5.10.5.tar.xz 45914732 SHA256 0831c8a1749f1bb50558c8113db32e78dac2d607e2c9427b1343c06ed3c4f5fc SHA512 97c55e47fd8aea37d4e32324de76b5c735ec4f23b6860730409e2618220c9fab5aceabb8420dfd80bfbf305d25851ebf7c5a36b815d1a15cf29ed49c0e3bdd70 WHIRLPOOL 2f7e833997a1249e8d69766f8c9f4ef35907b2b3dd5d814e47af36000b110938184abedac1dfc6883da36f50b7337c9dc639d864636ce65af8adc287ec67b360
-DIST plasma-workspace-wallpapers-5.11.1.tar.xz 45911376 SHA256 8c36af9f557320065982bbb557c86bd5a62aca9e91d61fafea6e90229aca8e35 SHA512 57d220348f10cb34ab64031d7d9acb80781156fb96e3fc130d8127b9e668b7f97dce0d094245a53c4ab9219fdd8ec85fc5163e7e4ea9902cd581a84291cbfd11 WHIRLPOOL 0e01549b6c7138995c534fd4d63b0c5382a47f426082525eca186012393b03e520629ec2c16f7fc8c8b81b7c3984f618cc632000cedd5b88caa351f759189238
+DIST plasma-workspace-wallpapers-5.11.2.tar.xz 45915652 SHA256 6153c5e1b1cdb19a29cd5abf8a80e0b6e1b583996c3be84d5ab996d0ce674405 SHA512 8865d26c4f1d83e91e8bda77ad8718645803ceeb5c707b4ee9ecff84fffab2d604a14dfa56b35b163e6b5ccdd470baa1afa828c602d1fd7248a75e5cd6dd999a WHIRLPOOL a892fdda59d35ef590acc797bc22c7a9bac677ccbf72248654975031077f596c5cfda507fffce963e185b3c2beb1fa32276d74d1e532794ae3c7f546b0961ad7
 EBUILD plasma-workspace-wallpapers-5.10.5.ebuild 388 SHA256 ae5a00f5a3ab95dd2160df44ba9ba04c395f45c7ceff9e5d525eb50573d8468f SHA512 2c645befbfae484832a758b141f0b018e1c67276e6e9a3c2e5cd348e9600e87429764a3b43143e2ce85dda2bddc9663101e3dd5d64f30e305c2808daa70123c6 WHIRLPOOL 8277ad78ee132bd1f8fc27e74ead7643e48319fd0eda509801dc9aeb9e7623661fde118fd812cc36b82b465e03c1f4616086bd2acb64a990da93228d3bda7d0f
-EBUILD plasma-workspace-wallpapers-5.11.1.ebuild 390 SHA256 ad1f0be4bb93008083cdc2ce23a7e05f3060ba05a1820c46f2be0ec44eaf1a0b SHA512 453fbed7dbdefbad7e1e6d6158a171a6fe7488d9f340b2f49dcb8514b5d1606449641f38d92e7694d989480cb2fda9f33c542861f45ac6f4418c17e0d1de9f29 WHIRLPOOL 77f9f2a49f44c0819b1eea98094004236317ad34c3c5affffdb211cf0cce716fdc9218bda5037202588613134fbc047d88173f3818a80466e94a937c41676460
+EBUILD plasma-workspace-wallpapers-5.11.2.ebuild 390 SHA256 ad1f0be4bb93008083cdc2ce23a7e05f3060ba05a1820c46f2be0ec44eaf1a0b SHA512 453fbed7dbdefbad7e1e6d6158a171a6fe7488d9f340b2f49dcb8514b5d1606449641f38d92e7694d989480cb2fda9f33c542861f45ac6f4418c17e0d1de9f29 WHIRLPOOL 77f9f2a49f44c0819b1eea98094004236317ad34c3c5affffdb211cf0cce716fdc9218bda5037202588613134fbc047d88173f3818a80466e94a937c41676460
 MISC ChangeLog 15292 SHA256 1477ea3ca25593147591119eb1aba5f45e3cb98a8d9c7d7e7dfbf57de49bb5f1 SHA512 42047a665f83e609ddf2302fcdd1440009f21a34688aa61942cd05e7b781f435651a3a139f9223245d38e5def932167ea097eaf5d4f9888261982e1c566d607f WHIRLPOOL 7b08258ae319b739f433d6b0df25161761ecc4d8b0248372ffb9bd786b22cb5a0b14429f89fc7707f5e1296bf9598ee77626e742086b75e223fe81ae65d20735
 MISC ChangeLog-2015 847 SHA256 bf5a8b6031d352810e6c0f721dc8b4e63f32106903aa1b23a92ecaa2f43188b7 SHA512 ae5abc0abe5a0ec672da71ba8505f09c15cc6c75ebb3bfd87d1ca505da1a844d89b91173412c10e6605558e81a494eaf1321e87df4fa58d0f0f4196244f88444 WHIRLPOOL eb31d39568b88a77c59c5a66e2480d4fd39daa7aceccb7159f0ab1e2c27aacca74e49b47edce401b5635676a7e99d92d7576d318780aa4d6968ab34f35c55c07
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.11.1.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.11.2.ebuild
index a893dcfeb801..a893dcfeb801 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.11.1.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.11.2.ebuild
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 9cd04c5d178a..81b591ed8bbf 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -5,9 +5,9 @@ AUX plasma-workspace-5.10.4-unused-dep.patch 804 SHA256 a47cff150f74b9ad329b5707
 AUX plasma-workspace-5.10.5-devicenotifier.patch 1160 SHA256 3753d491688475786b029290ffb15ea7274fe000ea171b0374c099c41e3e485c SHA512 eace115d5fb4780f785019047c3bcf63b0e9cb2134ec763385b521f7a743401ee7fae13f89207cc83e81ac4cd8639b59ebccdc8892aa46758b0397b408cbf08a WHIRLPOOL 489125fef7b7cf221ee54a8a8f6b267af2c8d808080f93a28ccc4d4162e568ea03b52086e1cbb590d53170f4292ae52e56282a27a7cab1c54fd6686440aa8a35
 AUX plasma-workspace-5.4-startkde-script.patch 1090 SHA256 352ff7af7b30befab0cfe684a82d80b09edb015a4aa633794e7e9025637bee55 SHA512 45149d5a3db48d77da7a74fd0a5faf14c8f99aaceddc725c9056cac315fd3bae78506e7cd74f6548045e4daf73bf2a605a712311018ff11a4a26c7d9f2afee84 WHIRLPOOL 9e15d7a8d79480c7e90d880812858afffbfadea250a634658ed0ae693e729b362508152bbf7eb5ec8de663a2e819c70197347b799a1119d702b683f489e686cd
 DIST plasma-workspace-5.10.5.tar.xz 6945244 SHA256 54927297f46fbc9556d6027880712f94eeccf39f09b613e79fcdc26ce5df22d8 SHA512 2b205c5bf1fbdfd3713594292565ea6922c0d82fd12ef43c82e8bbc18049293a5d357460889e5be7ed2a185dd89bb8b77df90bad5d572b2472486e84bdb8bfa2 WHIRLPOOL c8cc0f57e6dfecb7711557cede3ee86631758d664967d0a21d3a98415f62ded26c651a3fc289c10286c1bd69aff1d3bc66bb3953314502dbaca8510bf5b15621
-DIST plasma-workspace-5.11.1.tar.xz 6369588 SHA256 3e72409aa480079325905d36ceadafc9cbdfaf955d62c16c12b6a29f7b5bc4bb SHA512 e3315a750d03db717277ab7b3d313cd275284cbc07a79488a4c5d2068c52f7a3c364b7963296973ad9f00e391a58495cf0ce152692857ef909a934fc97f14f14 WHIRLPOOL 7791e5b511587067a482a7536071ec537121f3b8a323fc103d5abc4489d9088e5cd7e730012fdd75c7caba63689a95646918ce98acd5379322c4a2161ec596e3
+DIST plasma-workspace-5.11.2.tar.xz 6373292 SHA256 5ce84bdb0b6c2c2e5145e263d9ea61293c3baf49ff4fd2f8c836624c9cca278a SHA512 0538b18e0991e7aad4a3713e5fc0559e75b2929b8d2c2f3a44ea9ed5c236362956f4ec0ce2697ea337ca7cea29af0030d6b5c0dbd01771253b38dde7d81f6c35 WHIRLPOOL bed1ecb52ff4b6604b02a71fe2720ca8045047d10fd0287367c9ce8d0f5604e06ff181fddc1bea72196158c560301c5901011be080eeef378ad7a2cee8e3c4b9
 EBUILD plasma-workspace-5.10.5-r1.ebuild 4710 SHA256 8c11d38c79af62ac798d9868147269dd49e93d9704ac57c85c9ae7c15907bb5c SHA512 d2e43915bb848200ec83a76feafe2d79e7581aba0eadbb15f3b3c6d160b2fd5149fc15808647dffece7d3051212c6235189e66d6011acb0a3b1073e859001a27 WHIRLPOOL 5031f76bfbadcb4ea4ccc2ed17867a9ac3cfd8c72e28925db9cf483921d4405542aa3070f8b87f2d4c1563002d71f7e3e2e4db9fe8cc5553f0f9fd90f092d508
-EBUILD plasma-workspace-5.11.1.ebuild 4713 SHA256 8463480329b88cc9ac1fe79d726422278e9bd859c147558ea59cf0c3db0e1919 SHA512 40b46a411f6476dd7cef9d73a46852690100b02b58a9f3ca06639b586260f746db5b108eff7af8988381733a54f87a6ad1737c42b92b34ea61b6f98b650fb167 WHIRLPOOL 7248a5d63ecb487884b9f1a6b2b9ea9c875f611680bd8dbff688573d3f2eea76c8cd8eef2cf0b366373b82ec4c8bac295f7a9ee245504c8262f603f601b9437b
+EBUILD plasma-workspace-5.11.2.ebuild 4713 SHA256 8463480329b88cc9ac1fe79d726422278e9bd859c147558ea59cf0c3db0e1919 SHA512 40b46a411f6476dd7cef9d73a46852690100b02b58a9f3ca06639b586260f746db5b108eff7af8988381733a54f87a6ad1737c42b92b34ea61b6f98b650fb167 WHIRLPOOL 7248a5d63ecb487884b9f1a6b2b9ea9c875f611680bd8dbff688573d3f2eea76c8cd8eef2cf0b366373b82ec4c8bac295f7a9ee245504c8262f603f601b9437b
 MISC ChangeLog 23889 SHA256 d63097ede59f9698191c8b03ed2c48edf7597d2ea4401ea6902aad6514def752 SHA512 0ff08786bb6bd9c936ed55587741cdc386ac99536f5d4b9d022d2e3d24cedd6f346a961286e9b6c6fa77823a92a19674a5ad2ad6f77bbe713eef33daaaad579a WHIRLPOOL da172894e48abe9460c09d287ccf930241869f9452a61b4f0dcef58cef389225ee85bd9aebd36c528902c6d54a01574644811ff82a475835c7ffc27aa32ec4ea
 MISC ChangeLog-2015 951 SHA256 8f6db22b859a4fe94b8f61bdb77e2de4a58d75feb4693bb22d6618c541dba63b SHA512 85c06b3736f012a1ca2af103c032fe60ec3289444c70eca40e98cf197cf9c4c2b86ed142764ff51b1c79a1798fbb0036473fd0d736ceb82059f9b86a3ec3e5ad WHIRLPOOL 355adff38d5e871462481aa588286f458ea8656b5ff063527eb16f6c84dcd3a3f525d63e11a9a76e1ead3ab764eeec4091b1dd5c6f7f1275214d0762aefb040b
 MISC metadata.xml 583 SHA256 e5ad3ce68124e1af1a376e38a58f0e06a808fd2b2582d9d9f17141b66db3779d SHA512 8b7b81edd1518c2b1ee18d609288c209d197d35f869d687e1019a10f29a2360bd071218ad3facf65217665287b3ceab84a78341e6cd799a7326fd3da2336958f WHIRLPOOL d63829e370115869e1f674a91672ee17b57032a47edf721bb128cb02ceb1e6cc0343cda51c349d11b7e2a6e46f5244461fe12faa1696571520c6962498e68f16
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.11.1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.11.2.ebuild
index f5183edd1941..f5183edd1941 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.11.1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.11.2.ebuild
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index dc745abb33cf..47cc60d28236 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST plymouth-kcm-5.10.5.tar.xz 34432 SHA256 5e1cd096b7b196a7c38abd49da2a13710cc95cd5fdec6c02b6abd7d1b0526e87 SHA512 07244bbd3d102ac9d37bfd056d5b1e2a4b2e56788ed41df4f0492bf8e1032a40beeff3f05b9feac3f8f58a90ca3693f15a7c728b78aaa6c2bc5bfb8665461640 WHIRLPOOL 06a33a1436eb1f963993e8d10bd2e0971da8f9e6f2d37765c00a557d65f0333dfa2eb3684f9b786abbd349876f8db8b90ad593d75cf236c00d5cf49c2c2a24a0
-DIST plymouth-kcm-5.11.1.tar.xz 23968 SHA256 1069f5b3b0baef8013953f4d082fce7c30aba009920ee6c34c3a9dbebe827e70 SHA512 d1c6fb4af6725b8257a2c492fd80ce102cc1d5ecce923c271d7c8d4685ab40ab06272d16c930f3c4d26e132973d7ee906e14e6370d729c0212242425d8e5c5e3 WHIRLPOOL e40d74a5df307cdb28c5d0a9b0e3e6719add04b519a3c1771c4704e3a6bd2a8d13aecf35e5c903dd883f8258760ee3c1ece27fbd81bc5109a6a5e1274d9705ed
+DIST plymouth-kcm-5.11.2.tar.xz 36128 SHA256 c4c91ed9de389c82bb28dc064caf4791c9a6805f396f4afcca8f681b752d2fb6 SHA512 4e0bc1274d8875291902323f8489770ca5cedac8e2a1d71fa2675c717840ae40fab0fe3af155abb2ed9593b7f5b8d68e19596253e35e0fc7696fe9b3b002d7e6 WHIRLPOOL 1fae619a3392417c78bc96883cb5a1177e4be4e2e131ec78a72a3d57e6985fa09673d308e61af01f17fcc2f771644fa63b65b6e58da9c763ff26d4daedff940a
 EBUILD plymouth-kcm-5.10.5.ebuild 819 SHA256 fddeb7c9285464bbf15a0f66d594e22588a2c1fe785a636beaa4f7548331a675 SHA512 d5d69bbe2acb0f2a364e6ff1425a5e55829762c628ea12956a3fd528b52ffbb1c9843538560789bfc43e35afae80b383b0f3a5272068f4849c954e7ba24c800c WHIRLPOOL fc8ae425410fea8e9552cc23c4d986b37de667ad7e102268fcf38231177459f262dc06e7169f5e5f09fcc446478a73ea12a1180a23ddb660739c8fe759fe5530
-EBUILD plymouth-kcm-5.11.1.ebuild 821 SHA256 04ac66b21405d1513f5676072861d9bbabca57d820e1f419213edf804a30e4ba SHA512 c55ed789c87b87312ca1836f243d0dab19196b9dfedef8d8614160cc1156fb983b3fd632c74c0bd92d6c9909107aea96ee437a7b755197ed27b1cdd0c5dfc000 WHIRLPOOL 339562c73f29e928cf4e585da0d482b2dc4d8aacea88e9ae09f21d56fabffee29c9ca6de908ac62fc6af8f8018b5cc340813ce1bd66b3184ab444c494f4dc844
+EBUILD plymouth-kcm-5.11.2.ebuild 821 SHA256 04ac66b21405d1513f5676072861d9bbabca57d820e1f419213edf804a30e4ba SHA512 c55ed789c87b87312ca1836f243d0dab19196b9dfedef8d8614160cc1156fb983b3fd632c74c0bd92d6c9909107aea96ee437a7b755197ed27b1cdd0c5dfc000 WHIRLPOOL 339562c73f29e928cf4e585da0d482b2dc4d8aacea88e9ae09f21d56fabffee29c9ca6de908ac62fc6af8f8018b5cc340813ce1bd66b3184ab444c494f4dc844
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.11.1.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.11.2.ebuild
index cb24f2c727c4..cb24f2c727c4 100644
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.11.1.ebuild
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.11.2.ebuild
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index 5732ce2c63e2..2308870c494d 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,7 +1,7 @@
 DIST polkit-kde-agent-1-5.10.5.tar.xz 41388 SHA256 e2dafa312e4cd4cd01f883408b12efe38aa9d99c9a844e41b6c57c678e9b1495 SHA512 5a309745e0266efb6bd730af40ff801ee41586dc68cfc3db16f2575a4baf04e471bc011ff3034daba41456dbacacd90a305a7089d24759b249be6fad91fde81f WHIRLPOOL 6ff120825bdf99774ec6f77f984aa08a37cdb1fe090734a5097285814a3ed6aa9a8755a3da95d8ba94e6fb324d95c927dd00df7eef241ef0dee9c2c95111e18e
-DIST polkit-kde-agent-1-5.11.1.tar.xz 41716 SHA256 dc98fb142b19cbfe181ec15cc5d7a8f164b2cec7afcc8ed152635a983a96cc13 SHA512 e6aacb0c39ef4b53fbac9a3a19aedeaff178ac899a9231d4b739b7e3e29c7c7416a78ebf96fd5a1e7ed10076f14a2085187556eb969221bd827f2670b0f9b66b WHIRLPOOL 62ac1f295127eb37220cd74815a7827369e8dd613c3aa285047f3cf3b765e5d3effb8c5bfb51826516bbc2d82bda3e0823c63b63344ce6f29980b659043fa020
+DIST polkit-kde-agent-1-5.11.2.tar.xz 41564 SHA256 63f5dab305cdfa3584b5211d53690fb27181410ae439e67a34d71beb06437961 SHA512 388dd3fb993166e202f00a0a118b7f27a0890dadcbeec30029f35dddcb4eef0be9ef22ebe9e53c33f39dc36559bf64170f745ef1760371bc0604281da27b8ca5 WHIRLPOOL 4040bfaf10d0191ed9e9a63b2ab9d0b6f96fb379a6965daaff020c9b8bee274501ed5d6306a3ccaf5d2b96e57259444680c19bed250516acf6ca73139877e16d
 EBUILD polkit-kde-agent-5.10.5.ebuild 758 SHA256 df2bb7b8ca51f818047039264cadae14c6367c58b8d482f813a99830cdc48133 SHA512 73847f3692b50cbce8f39d02c274b5bee0c42ff5b15498135cc5653ca50d2e8894ec967d05408dfb0e7ce937f7638f73a38b59aaf5a73a20a1402f2819611012 WHIRLPOOL 90225a06a439c4144ceb479686892c5a69f5dc2a7307f25415fe15c6a75d33b6dcb1123bf6388b728fb999d6309dc75c76725d3591d993b244c928a63034989a
-EBUILD polkit-kde-agent-5.11.1.ebuild 760 SHA256 896ef80eab1d41ccfe6e267a134725495959895110717f0e0d28c722e83af601 SHA512 f87fe553eb623e24cd84b2a9f4f73b42297ccbd04298122ec263e582c536232dddb8401a14c0d80e16d2ef7834d205b189974c4881d31c0e254aea90be5bd191 WHIRLPOOL a44baf05ec04ebd0e56f3edece0d02e02fbf57f29e08d663b0198c30e83dbd0b1b5a1f1ab8acd2cea1b20d612ff3d8e67b9411554a41d978a78a989f413d46ff
+EBUILD polkit-kde-agent-5.11.2.ebuild 760 SHA256 896ef80eab1d41ccfe6e267a134725495959895110717f0e0d28c722e83af601 SHA512 f87fe553eb623e24cd84b2a9f4f73b42297ccbd04298122ec263e582c536232dddb8401a14c0d80e16d2ef7834d205b189974c4881d31c0e254aea90be5bd191 WHIRLPOOL a44baf05ec04ebd0e56f3edece0d02e02fbf57f29e08d663b0198c30e83dbd0b1b5a1f1ab8acd2cea1b20d612ff3d8e67b9411554a41d978a78a989f413d46ff
 MISC ChangeLog 13133 SHA256 7bf8732c3e2b5bdd2b66c4072a30d3574fa91fb803885f031ab62d1e24d8b8ba SHA512 c6658110d1ac84764ba9b5edda5805dfd4aae32792225af10d91b58131b2e5b3b58e53e49955c970ee19089a56cde589c7ae5ecb842632ea9885b21bec4bd6ca WHIRLPOOL 6f51dee04e89cbfe9c6ee52fa8c84468d5ec41cdf2db69f9d8f5736bc00d6affe551d4bffb3d1ecc4ff53a2c741d9bb4b435b4b5c7a8f564cdbe119da0a5554b
 MISC ChangeLog-2015 766 SHA256 47a995271ef46fd91bd6faa7027d24e4812f7c1d33fde1fdbd76a8e03af67b43 SHA512 20e1caf00055ca297ffa8b1e2f7cb81bfbef9ef356857b8ff58f78d47608d97a3cbf562b1882b5b4ba6fa089efdbf72bfd8f1aaf6eb6f1fabb176488684576ef WHIRLPOOL fe80f9270a3fd3be6675d7e6d9f9cfb910e832738a8ee55098b391ce087ff3c66cd86b5ea41a97dbe4f88162292ff73dd4adb76bdd87dce2eb6f8bf9e329d33f
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.11.1.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.11.2.ebuild
index 750ab00830d3..750ab00830d3 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.11.1.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.11.2.ebuild
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 1f3293396b5d..52f17a3d9335 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -4,9 +4,9 @@ AUX 30-org.freedesktop.consolekit.system.restart-multiple-users.pkla 325 SHA256
 AUX 40-org.freedesktop.consolekit.system.suspend-multiple-users.pkla 367 SHA256 c87dba2cd419821fba055cff908128788fbdfe4eb5823620a02fe410b1cb2123 SHA512 c359ed4a577f02810b56fd6032cce1b59df720598f7ea61e68d74dae2929a2ac81b1db3ffa57e9aa29c594639f3ea6875f2f7cdef214e7f61fd37c153c7b1444 WHIRLPOOL f4cc77de1aff406b93ce9bfa55e8445b2139d9a586f5ebab8e0676c198bb9289f59856293e5ef06ee1861cb6d44e8622bf0cbbb45c40d3b0e82ae42f56e210bd
 AUX 50-org.freedesktop.consolekit.system.hibernate-multiple-users.pkla 308 SHA256 2ad352b081b81e06f60f9705bd177915d3adc0caeb02a32ac9ada49475d7c89e SHA512 f3051bdb62ca0c0e63f35f95cfbf6c8afcc9910fb61be8d78c7769a4e01f8d4a8b5c96a7ffa2b5f8be200a5f23f08ec4201a2d8ffc6230e9468807d7b79d85fe WHIRLPOOL 026e87aa0178293f34e551866341f08cab2af91a49545a4c86460746fceb6b09e2dcc56dd26b5ea75396c9f8a058d1c0562ed0248cee27033fe444ce99134d3c
 DIST powerdevil-5.10.5.tar.xz 360264 SHA256 67774545bc5fdd6edd96d28aa68835444cf5e0df2af80418dccb3ba4f6a3f035 SHA512 17583309138481f6501a0d255c0a32f993fb5ce06f7d88be26ae4ae9dfdea60e4fa803817bd8a021ccb6c020e00a70da0db40d032588807bd36f5f601f536eba WHIRLPOOL 6b768311a80e171af1a7b2fddd4a79a688a6c24b774dbabf05f571dd28bfa0dd699e1cfe13361653da02120e36d0a97208293e8b2e0a5b20b82f6051b9123e2b
-DIST powerdevil-5.11.1.tar.xz 379000 SHA256 18aad71908a2253339a44865029f7b9ceaa30cb5b321a43b3a8c5d2d7e442e0b SHA512 b1af8398012c4f42651874f37401ab40bd9a4656ca0f3a84067a565f54c1a9040cde17aebdc778483bbc541a58dfe9b03b16d7271a2f893a76c2532b47b44868 WHIRLPOOL b2b725d9954e1252dd2702f646606cb9e42c7c1074424d3e111fd84508f0e9872dd671e7495038154c3b8391ae238865be90ea373bedd820cb4d6e42b023741d
+DIST powerdevil-5.11.2.tar.xz 378324 SHA256 9c09c8b2d9b1fb9cbafc12d49710dc07bb75abb20c7a74ca871dd98633125081 SHA512 1253d87d8e5c88a58f6bd0244bc230d4310fcb7cdbc01b6cec2818227d0f9b0fbac9277d02f90a79bf5a36280ba2637ed44b6212a3a3913093941d03c6df4d4c WHIRLPOOL 75a0b8797e6978655e688546122dae369b04efdebe0204788c90b5001313ec4bd98a452b995c9699629cd62b93b6e9be9a60a94835ad51901a72c7d5f3812820
 EBUILD powerdevil-5.10.5.ebuild 2255 SHA256 a015a4eece91ede33cbd5f99a7d4fcb6363975a6185f76bce68d6dfeadc6a270 SHA512 336f61446ac7ab14b7067c81c0bf6275089d869f31015ecc9deab3802c9349f4b3a98d2ef1e1bbf71dd590143b34f04e5c08367d36d77ad59f5aed2f0a2c3259 WHIRLPOOL b7d5041de4b7632cd4a47c09cc3a34d320c37c0f673b0830638a5b81409254884a4f1b4324ee27e6343c653c9964f2ce91a7046cad0426c2c12d08f1c1c17740
-EBUILD powerdevil-5.11.1.ebuild 2361 SHA256 72ce4b74e50b9108b8d81c8eac20b30dfd301dc048c959533a3d9abf41228649 SHA512 b21228339901d113146a0dbafe41271a5b23da50f49ac80677bd9d82195b11df1267c0ba993c99d32516d09761853929d46b08f9c97286879702a25d7fe286d6 WHIRLPOOL d85afe09053bbcca17bf796196da8d74f6ad670a908467438f6a21e222baf6952b53ad8aad5697e6b698698db9886397278c3b78c02e86d5c8f2e59af6744583
+EBUILD powerdevil-5.11.2.ebuild 2361 SHA256 72ce4b74e50b9108b8d81c8eac20b30dfd301dc048c959533a3d9abf41228649 SHA512 b21228339901d113146a0dbafe41271a5b23da50f49ac80677bd9d82195b11df1267c0ba993c99d32516d09761853929d46b08f9c97286879702a25d7fe286d6 WHIRLPOOL d85afe09053bbcca17bf796196da8d74f6ad670a908467438f6a21e222baf6952b53ad8aad5697e6b698698db9886397278c3b78c02e86d5c8f2e59af6744583
 MISC ChangeLog 14870 SHA256 d3d2f49e76a08604c53a70873c5892a8d959605fa431d52e02141cb5dd6043f9 SHA512 9edb6a67576678b8c7ef77993eb6d3cf58090675d83279736c290b350e6d5eec248e1daf87d8be392bf32aa69ed8f2b7f07de01554dbe3479aae33998d418182 WHIRLPOOL c079e1ccfb69688317f066cd2079b7e9c68f2f20408a886708fbf0431319e0db11b45fe6a38d8d4db2588df8e5cb24aa778b13d7549de6c80c3f608725f2082f
 MISC ChangeLog-2015 1159 SHA256 591e40b65d1712dd8e9188966dc58bc425a44093c9571609005746734d558074 SHA512 c4e5a3d9f7f70fda12e3d97d53bb0d0a33be961c1e3b0e4f7b22134e2070de0bdcfbd483ce06625bc4ccfb2e9f749e895b1cf6ab22db07d913dae814d9deb8c1 WHIRLPOOL a196bde0c5cac07ba4d9df2619e973aae990da006787f47a0bae4e89e219c41c3d837397fb8ae3ec7d4c26916b0143b79e9ca9145cbafa203289b5216153fa97
 MISC metadata.xml 642 SHA256 9f76ebfc7f7fc3547f01eaad536e426bca1f5fc81d35a7e9fd25006ff5121476 SHA512 870a09abe650b373cd7a4050308fbcc83da772acaf615c36232701fe53835f8bf9d4d092259da42417f97387ed2b37f19d4f4fffbec31087dfa7188bb8bb7056 WHIRLPOOL 3bd7f68bebb22c73b23b7d127658e1093f124239c836255c7f4782e997aabec50369b7564ca97806e61812425738d85646838e5572cdeea5e451b10453dd8edb
diff --git a/kde-plasma/powerdevil/powerdevil-5.11.1.ebuild b/kde-plasma/powerdevil/powerdevil-5.11.2.ebuild
index 70ee8dee200c..70ee8dee200c 100644
--- a/kde-plasma/powerdevil/powerdevil-5.11.1.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.11.2.ebuild
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index fb173cee92dc..a4ad0a1988b2 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,7 +1,7 @@
 DIST sddm-kcm-5.10.5.tar.xz 58984 SHA256 5c2731f34e76fff4c6a228163426a1777f6658fe08284987341af6665769148e SHA512 d170de912cd6f6172d56704972bc605db4b203a215369c7f9476cab360c992b64236da39f86bb596435b28c83f93cc4ab6bb1efc891855100e1c9fe158a724c3 WHIRLPOOL 6dc5a4eb51a36570cfec0d393a3791d5361a1dd2b04e3efae01c966985a21f1ddb71aefdbbf04a210842470afb328f622057c6e97b4c20d146e2e871d19f2f22
-DIST sddm-kcm-5.11.1.tar.xz 59704 SHA256 29404a38fa1ea931cc34da516dafae5f7663a75201a7a2d036a21e6c27134c69 SHA512 00e09fc2b31b2f4ff52afd07df85d726404095d29a395e50e8edf590bea1450004f47d3b37fa357931f0cbe9b44f2df76f43efeaaad78cc44ad624b24d0903dd WHIRLPOOL c876027535e6e11b562751440ebadce65644cad28868f231374bcb014f0f84378d989882aef6a673f4a0f5345e081aa8d3bab391fc45a8573bf4dd1cc216408c
+DIST sddm-kcm-5.11.2.tar.xz 59588 SHA256 2137c3438dce41b79c36f87dfe72533e4c803741d3aca6c57b9ebc33ffe63895 SHA512 a23b6d7a71b70e627dfcb11a87865959dc5ae0113c3411f78a52ac4c8eca77f76ee6a4afdc5078d0b03136c85ff7b2d668b8d0ddf463e290764d87a061971d78 WHIRLPOOL 46dce2183dfe641983bba74a650ca8dac992219a01e98c878eac456f99e0dc1c4cac0bc3bc1352c9d58d858cebcc617a560e8815395b2358f617d817a09fd050
 EBUILD sddm-kcm-5.10.5.ebuild 922 SHA256 0406196d5f81c38dbee667538fb6042fafdbf1e4ecbeabd0c44837a32bffd4c2 SHA512 845adef014ed191d8a2230e9f68c4b525b0890a3c366fabab67905a08883dc261e85a778cb031243bc848fb05a562ae973a5670ed58e741235f2935e1c6d2d90 WHIRLPOOL 2e375569646e77fb5985e519a1588a5918d3748ebc755d615e3e24888ef75f2e27487b684e52058b0d24d18bde2f21d4f36a7bc19fefc72b1a8ba563022eba0b
-EBUILD sddm-kcm-5.11.1.ebuild 924 SHA256 eb1cacd5923f1dc43f0a61713dfab5ab55fd1e4832b3f41363f77f7aadb0a407 SHA512 550dc2444a65c441feefcbc61767ba14c8df7d244c719ce0bb2876986895c75c916d65b8e2d70e8cba5f6f299721266257cebb016c5adaf24591978758fac5d9 WHIRLPOOL 6eb358cd0790abbd5b010d5c481519829f2904369d1d4fccacdd2ec21d30ed917d7a532932dca25fd22a4fea5c45e1a36590f6e1a91bd75b93723c9c2212a7f0
+EBUILD sddm-kcm-5.11.2.ebuild 924 SHA256 eb1cacd5923f1dc43f0a61713dfab5ab55fd1e4832b3f41363f77f7aadb0a407 SHA512 550dc2444a65c441feefcbc61767ba14c8df7d244c719ce0bb2876986895c75c916d65b8e2d70e8cba5f6f299721266257cebb016c5adaf24591978758fac5d9 WHIRLPOOL 6eb358cd0790abbd5b010d5c481519829f2904369d1d4fccacdd2ec21d30ed917d7a532932dca25fd22a4fea5c45e1a36590f6e1a91bd75b93723c9c2212a7f0
 MISC ChangeLog 12141 SHA256 86700c703790bcfc85dfcc9ab44be1f1d8b3266a0e38fabb708cf218ee8c40f5 SHA512 c33a24c029738447dc8ad912a6be1044ecb88c7c355c06a3d137cbd33d94b0fbe2b344de24fa076cbf1283491dce7749778600100a6dc549d1c2a57517883ea4 WHIRLPOOL d231de675bef80af44cc3a09e2a321fcb88134f7c893f6dadf158f1397d80583e2260f92cbe46f96037b1feb06b22486be6b98c6ea7bba614dc6139fd54a17b0
 MISC ChangeLog-2015 710 SHA256 fe3f1b3f60d0c4c573e273578fbce8affd00d9899c058ab58a2717d3d5f5b985 SHA512 b535bdb4b53eeabde8755c6262ee53e62e0bab2663cdf1dfec00078dd47a0a741283ae8245cef315818ee690b88f70015187cbb15cc4b2908346120eb84e49f5 WHIRLPOOL 11d7b0f838e5e7a3643283853ef119351b74947700fcbd1891071f88e7abdbdee90fb3bee131e08ae4155afb7137a56e5362df36e7be5e659a723042f193aa6f
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.11.1.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.11.2.ebuild
index 866d237ee6d5..866d237ee6d5 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.11.1.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.11.2.ebuild
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index 317a82f47746..c86fb3b950da 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,7 +1,7 @@
 DIST systemsettings-5.10.5.tar.xz 154808 SHA256 22e645fe21dc8b906ccfd2daa1a424f6b661a218ffdec9e289f50b295dbd7c2c SHA512 e756e82c3bb797bad86bd63d4a5c265711d6e169e8e7cde22fcc0c91bb1a4b42d552f0816d58116c5ea495df95345bd247b7949ac13ba090f74ef694632332de WHIRLPOOL c5bf78d137c3933661ef0b0f90517596846e2dc7e5f434ffd90190439b37fa788a59102e8a5c08c2aa4f68dc40e8c611023c6f81546c949dcae19bc20fde2b21
-DIST systemsettings-5.11.1.tar.xz 170232 SHA256 3c1367fa2a32261601d445dcb193e0b116235b1b0f8387d459e39437567dde2e SHA512 d0a5061d97ee4a4891dbc47eb171cec77952534a87ed1ff7a5ff8b996ee46300a964f3b2ac4bc109df4ec4fbee0697a6e83ad075a32884a3fa4de575c6e4b84b WHIRLPOOL e382ee5cbbfe68096d912ab79923d3188643ebe28bb9cd0506c2d5317bced0e9bbab01c59cb51634868899fcea2498b530ebb0f4f2b6f5f6ceb86b8064977ed5
+DIST systemsettings-5.11.2.tar.xz 169780 SHA256 31332049291ce54a93fcfa2d2281313005e3993b49daadbd7411221143cbec85 SHA512 ac2d401758831c09aa1517711c173a3a3fffb5ab2132e3085ca7afe9bc6d0a0fbd22964190c1cf2a2c679ec8ed302b0c36b0eac19f6f5832700473be0db0004a WHIRLPOOL 8bf7054da04c3ab4e94c68cc26c1e7db040b892499d68056a9d5211fcc42d6d432111253ce098f5c4997dea78c1006348d244f306fd2b292c9593c5e18eab1d6
 EBUILD systemsettings-5.10.5.ebuild 1073 SHA256 6440c2a801d444267e22814d1180a0a6aaeb921317f12bf9dee4ca6dabc7e6bc SHA512 ef606976a8d31f5d3129231e68097fe6ee04d570391248e6c73d06c2d3c8207e7c01d3779ec99911c89bcd32f79521e8bc8208439957c94646e67df905d05f33 WHIRLPOOL 7d557db09033b008431efd6263f8a358fc8f4420fc3348793acb4e8cb02fa1ef70a9bea537c2d67fcb4082d123d0d4c2937ea43a23e61d087cdade9114468b84
-EBUILD systemsettings-5.11.1-r1.ebuild 1290 SHA256 45cb6c02110461d4c949e48fe11b695e34f998917930914757e0cf4d89290442 SHA512 e03e558804b365f0006f644c6a6b6af155e068f2ff9fa218e2f3a5dc62cfda36bc2adb7e0b3ffefb6c93a4c3812c885710bea6c02ff198cee6353bf0acde7194 WHIRLPOOL 2088920cfb8950f72d6a4d096f4a2a6b9df419d62905e4616674737ae369dcc20be345afadf521bd7f37b257bea9b0329259941adde36803dd6c670fb55181da
+EBUILD systemsettings-5.11.2.ebuild 1290 SHA256 45cb6c02110461d4c949e48fe11b695e34f998917930914757e0cf4d89290442 SHA512 e03e558804b365f0006f644c6a6b6af155e068f2ff9fa218e2f3a5dc62cfda36bc2adb7e0b3ffefb6c93a4c3812c885710bea6c02ff198cee6353bf0acde7194 WHIRLPOOL 2088920cfb8950f72d6a4d096f4a2a6b9df419d62905e4616674737ae369dcc20be345afadf521bd7f37b257bea9b0329259941adde36803dd6c670fb55181da
 MISC ChangeLog 13696 SHA256 91d37679ac7ac4253fb1ae2fd23d9240b34358af603efe8e91269efeeabb4535 SHA512 af549929608ef264bb7aaf9893fa3d05f1c135ad2470740b251e1a0d0de242597e74d3b6af00c65ebeeed64e2e8b2f253bc9600a868ac3a02e3323476095df7d WHIRLPOOL 2ef6dc94350335ab8f1ddb3b05276c47af534f279540dab70f9ebb0ead7f4920f67fc5b2ac3aa6fc1ced55494ab28507322cca52e3a5980a0f119ec0490ee2d3
 MISC ChangeLog-2015 752 SHA256 bba7fa7b0d94886cadc43b95b8058782406612b8a9045881692191783f8a6cdb SHA512 f95f59e061299f0a15a29f473df03af4caee95119a00a46f681da6a556e422ac502da7f03bedd94555063c404431db201c412bb5084dd446116ac74d8875bc25 WHIRLPOOL 868c009bda9d7f15ef1431223037af3af05484a5e34f406a807f130d5f544d3112680ec2a0884327b08ccb3bad1dd262cf93c3405bc5a87b9d4c67255249df11
 MISC metadata.xml 363 SHA256 73eff597c1a56003bbd8c113b36c6b9892a1ddde54e3ff7eb15542bf3d41ee8d SHA512 c90aba5c6ae443cbdbd45523a53548a5fde61d0eca8af6180eee3f9e0e92e546df3533abf58c9ac2b1a60ffb6dc6751b64f6128be1e8d623e5fc90aff90771eb WHIRLPOOL 6cc6c6b61cd90e9f19faa5ea8393bec3b220ba7e0d8b4d086c1234562c7e84fdbf2ab5dea0cd43cd8750b8becf40ab88682deb157b16440005f4df742ab2bc4c
diff --git a/kde-plasma/systemsettings/systemsettings-5.11.1-r1.ebuild b/kde-plasma/systemsettings/systemsettings-5.11.2.ebuild
index 5ed1e185c695..5ed1e185c695 100644
--- a/kde-plasma/systemsettings/systemsettings-5.11.1-r1.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.11.2.ebuild
diff --git a/kde-plasma/user-manager/Manifest b/kde-plasma/user-manager/Manifest
index 4af0d25da887..ffe3f25d9551 100644
--- a/kde-plasma/user-manager/Manifest
+++ b/kde-plasma/user-manager/Manifest
@@ -1,6 +1,6 @@
 DIST user-manager-5.10.5.tar.xz 544500 SHA256 d84a059f32be294f0da407655c867c559818b6660913ecf8eb503b25c58131ba SHA512 9d2d216415b4c9c67b6cda8c1c177c76e6aa4dc7034faddd48675bc30a4d785e95a0d60cfdd7c654b1cb39a2be9afb1cbdc12a3969c511a4ab8f960f69af1fcf WHIRLPOOL fa8f19dc7c161e549d11cc1ed73cedb141ca95cbd78e1ecb81b4bfebea162c3dcbff07fb50084ec70c97e88c73cc79b4c8f8837a0d77ecd338fd3aaf2c1995d7
-DIST user-manager-5.11.1.tar.xz 545092 SHA256 f552cc895a8d36ad01fc8ed7925deeafd68ff6612bc0a5eb4956d2d150e5e5c7 SHA512 b1e583e101345bb8fcce8ab6b64bfa553c9c8b21871b2428139bc075159c980e4130d757b38ac9cadd1f7675f6da4f8df968f5aca1da4fa8194ac12f4d4501f8 WHIRLPOOL 3f3f6abe9216b2d375d8089d5ff37dca6790c96289c45be29c099295c9b47a486d94afaa04bbe8cc7a97f7e29769d10ed82fad840e6db0b392c99e571f7224ad
+DIST user-manager-5.11.2.tar.xz 545140 SHA256 99c4076a68b756db0841740b6afc5fac35c6712ec216830728489b232284dedf SHA512 8eb65842dcb8032c12e6265e811a4b4f07183952aabc49f7c3b7d85191e87f065685559d6ee8c61b19c8bfc2df9fe0447cefd8271cdbe326c90448659140a320 WHIRLPOOL b486895cc235dab1c91b2db38770400d6b689b5c88e8041583f6772ed11818e7aab632a48983afb656a1f77cf6236d43d5cb3a33cc7e22f5f7f8d140d895abd8
 EBUILD user-manager-5.10.5.ebuild 668 SHA256 20c5aed82c6d290832df893712c77d90aab9116f1d41b0c92346cb2b42a2f285 SHA512 a8e77720a9ece02dc8b210211861727afdaabbb04749a836bb1a00a386098a7fd72ba9ce57dd4a93b88320f0379090dce15798b897dfe965d2277023d36d7c90 WHIRLPOOL a3dbf9b6b64af56080b6a4ab46370e924da3a635112d20905868557a0815d9c5155bfc988fa0a9dbb656c67cd9a3878df2b4cb48eecf3c3c0cef8950faf5286d
-EBUILD user-manager-5.11.1.ebuild 670 SHA256 8ae5d128d82a85f9edf6820de18df2b3556455efcd0455d3523bfead4ea59e6e SHA512 ad56f954fba26c5eb4f3fb923db85b5bc0d56af0491c0380aa6d30fad259adbe47eeefc10a4c22b54dd4d4937c8da5cf1b59b4f63c75a46191ff05a6513e0269 WHIRLPOOL 7c25da378439b833a6f8c6be89553d48ac823b588abdcfed091c5a59d44accba30207b8ded2f8778919242e7eafcb415059e377d1fe9925cae90aac25415168e
+EBUILD user-manager-5.11.2.ebuild 670 SHA256 8ae5d128d82a85f9edf6820de18df2b3556455efcd0455d3523bfead4ea59e6e SHA512 ad56f954fba26c5eb4f3fb923db85b5bc0d56af0491c0380aa6d30fad259adbe47eeefc10a4c22b54dd4d4937c8da5cf1b59b4f63c75a46191ff05a6513e0269 WHIRLPOOL 7c25da378439b833a6f8c6be89553d48ac823b588abdcfed091c5a59d44accba30207b8ded2f8778919242e7eafcb415059e377d1fe9925cae90aac25415168e
 MISC ChangeLog 10571 SHA256 129049cf67b632dd75ec391f76d853b9eb1ab713902b7342551c7c0db6ad6517 SHA512 a24780c15d3488ba52ef22ce8302d0fca1fba1aed90bb68ce59ee96fa60ec89c8437429f98e0f299359a861d6786bd34085815bbfadd16af637dee4bca2594d7 WHIRLPOOL 1f3a6611b0dd86287daeaa693ac45754c18e1f4ae5a48417dab75fa66e032a85f3d247f7f1042029c6710adacc970692d02c1b814ca1aba9a1e932a74bc89966
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-plasma/user-manager/user-manager-5.11.1.ebuild b/kde-plasma/user-manager/user-manager-5.11.2.ebuild
index a8753f4448cc..a8753f4448cc 100644
--- a/kde-plasma/user-manager/user-manager-5.11.1.ebuild
+++ b/kde-plasma/user-manager/user-manager-5.11.2.ebuild
diff --git a/licenses/LA_OPT_BASE_LICENSE b/licenses/LA_OPT_BASE_LICENSE
new file mode 100644
index 000000000000..5ead1a1a13a7
--- /dev/null
+++ b/licenses/LA_OPT_BASE_LICENSE
@@ -0,0 +1,609 @@
+LA_OPT_BASE_LICENSE v12 March 2016
+
+IMPORTANT.  Read the following NXP Semiconductor Software License Agreement
+("Agreement") completely.    By selecting the "I Accept" button at the end of
+this page, you indicate that you accept the terms of the Agreement and you
+acknowledge that you have the authority, for yourself or on behalf of your
+company, to bind your company to these terms.  You may then download or install
+the file.
+
+NXP SEMICONDUCTOR SOFTWARE LICENSE AGREEMENT
+
+This is a legal agreement between you, as an authorized representative of your
+employer, or if you have no employer, as an individual (together "you"), and
+Freescale Semiconductor, Inc., a wholly-owned subsidiary of NXP Semiconductors
+N.V. ("NXP").  It concerns your rights to use the software identified in the
+Software Content Register and provided to you in binary or source code form
+and any accompanying written materials (the "Licensed Software"). The Licensed
+Software may include any updates or error corrections or documentation relating
+to the Licensed Software provided to you by NXP under this License. In
+consideration for NXP allowing you to access the Licensed Software, you are
+agreeing to be bound by the terms of this Agreement. If you do not agree to all
+of the terms of this Agreement, do not download or install the Licensed
+Software. If you change your mind later, stop using the Licensed Software and
+delete all copies of the Licensed Software in your possession or control. Any
+copies of the Licensed Software that you have already distributed, where
+permitted, and do not destroy will continue to be governed by this Agreement.
+Your prior use will also continue to be governed by this Agreement.
+
+1.       DEFINITIONS
+
+1.1.             "Affiliates" means, any corporation, or entity directly or
+indirectly controlled by, controlling, or under common control with NXP
+Semiconductors N.V.
+
+1.2.             "Essential Patent" means a patent to the limited extent that
+infringement of such patent cannot be avoided in remaining compliant with the
+technology standards implicated by the usage of any of the Licensed Software,
+including optional implementation of the standards, on technical but not
+commercial grounds, taking into account normal technical practice and the state
+of the art generally available at the time of standardization.
+
+1.3.             "Intellectual Property Rights" means any and all rights under
+statute, common law or equity in and under copyrights, trade secrets, and
+patents (including utility models), and analogous rights throughout the world,
+including any applications for and the right to apply for, any of the
+foregoing.
+
+1.4.             "Software Content Register" means the documentation
+accompanying the Licensed Software which identifies the contents of the
+Licensed Software, including but not limited to identification of any Third
+Party Software.
+
+1.5.             "Third Party Software" means, any software included in the
+Licensed Software that is not NXP Proprietary software, and is not open source
+software, and to which different license terms may apply.
+
+2.       LICENSE GRANT.
+
+2.1.             Separate license grants to Third Party Software, or other
+terms applicable to the Licensed Software if different from those granted in
+this Section 2, are contained in Appendix A.  The Licensed Software is
+accompanied by a Software Content Register which will identify that portion of
+the Licensed Software, if any, that is subject to the different terms in
+Appendix A.
+
+2.2.             Exclusively in connection with your development and
+distribution of product containing a programmable processing unit (e.g. a
+microprocessor, microcontroller, sensor or digital signal processor) supplied
+directly or indirectly from NXP ("Authorized System") NXP grants you a
+world-wide, personal, non-transferable, non-exclusive, non-sublicensable,
+license, under NXP's Intellectual Property Rights:
+
+(a)    to use and reproduce the Licensed Software only as part of, or
+integrated within, Authorized Systems and not on a standalone basis;
+
+(b)   to directly or indirectly manufacture, demonstrate, copy, distribute,
+market and sell the Licensed Software in object code (machine readable) only as
+part of, or embedded within, Authorized Systems in object code form and not on
+a standalone basis.  Notwithstanding the foregoing, those files marked as .h
+files ("Header files") may be distributed in source or object code form, but
+only as part of, or embedded within Authorized Systems.
+
+(c)     to copy, use and distribute as needed, solely in connection with an
+Authorized System, proprietary NXP information associated with the Licensed
+Software for the purpose of developing, maintaining and supporting Authorized
+Systems with which the Licensed Software is integrated or associated.
+
+2.3.             For NXP Licensed Software provided to you in source code form
+(human readable), NXP further grants to you a worldwide, personal,
+non-transferable, non-exclusive, non-sublicensable, license, under NXP's
+Intellectual Property Rights:
+
+(a)    to prepare derivative works of the Licensed Software, only as part of,
+or integrated within, Authorized Systems and not on a standalone basis;
+
+(b)     to use, demonstrate, copy, distribute, market and sell the derivative
+works of the Licensed Software in object code (machine readable) only as part
+of, or integrated within, Authorized Systems and not on a standalone basis.
+Notwithstanding the foregoing, those files marked as .h files ("Header files")
+may be distributed in source or object code form, but only as part of, or
+embedded within Authorized Systems.
+
+2.4.             You may use subcontractors on your premises to exercise your
+rights under Section 2.2 and 2.3 so long as you have an agreement in place with
+the subcontractor containing confidentiality restrictions no less stringent
+than those contained in this Agreement.  You will remain liable for your
+subcontractors' adherence to the terms of this Agreement and for any and all
+acts and omissions of such subcontractors with respect to this Agreement and
+the Licensed Software.
+
+3.       LICENSE LIMITATIONS AND RESTRICTIONS.
+
+3.1.             The licenses granted above in Section 2.3 only extend to NXP
+intellectual property rights that would be infringed by the Licensed Software
+prior to your preparation of any derivative work.
+
+3.2.             The Licensed Software is licensed to you, not sold.  Title to
+Licensed Software delivered hereunder remains vested in NXP or NXP's licensor
+and cannot be assigned or transferred.  You are expressly forbidden from
+selling or otherwise distributing the Licensed Software, or any portion
+thereof, except as expressly permitted herein.  This Agreement does not grant
+to you any implied rights under any NXP or third party intellectual property.
+
+3.3.             You may not translate, reverse engineer, decompile, or
+disassemble the Licensed Software except to the extent applicable law
+specifically prohibits such restriction.  You must prohibit your sub-licensees
+from translating, reverse engineering, decompiling, or disassembling the
+Licensed Software except to the extent applicable law specifically prohibits
+such restriction.
+
+3.4.             You must reproduce any and all of NXP's (or its third party
+licensor's) copyright notices and other proprietary legends on copies of
+Licensed Software.
+
+3.5.             If you distribute the Licensed Software to the United States
+Government, then the Licensed Software is "restricted computer software" and
+is subject to FAR 52.227-19 (c)(1) and (c)(2).
+
+3.6.             You grant to NXP a non-exclusive, non-transferable,
+irrevocable, perpetual, worldwide, royalty-free, sub-licensable license under
+your Intellectual Property Rights to use without restriction and for any
+purpose any suggestion, comment or other feedback related to the Licensed
+Software (including, but not limited to, error corrections and bug fixes).
+
+3.7.             You will not take or fail to take any action that could
+subject the Licensed Software to an Excluded License. An Excluded License means
+any license that requires, as a condition of use, modification or distribution
+of software subject to the Excluded License, that such software or other
+software combined and/or distributed with the software be (i) disclosed or
+distributed in source code form; (ii) licensed for the purpose of making
+derivative works; or (iii) redistributable at no charge.
+
+3.8.             You may not publish or distribute information, results or data
+associated with the use of the Licensed Software to anyone other than NXP;
+however, you must advise NXP of any results obtained including any problems or
+suggested improvements thereof.  NXP retains the right to use such results and
+related information in any manner it deems appropriate.
+
+4.       OPEN SOURCE.         Open source software included in the Licensed
+Software is not licensed under the terms of this Agreement, but is instead
+licensed under the terms of the applicable open source license(s), such as the
+BSD License, Apache License or the GNU Lesser General Public License.  Your use
+of the open source software is subject to the terms of each applicable license.
+You must agree to the terms of each applicable license, or you cannot use the
+open source software.
+
+5.       INTELLECTUAL PROPERTY RIGHTS.    Subject to NXP's ownership interest
+in the underlying Licensed Software, all intellectual property rights
+associated with, and title to, your Authorized System will be retained by or
+will vest in you. Your modifications to the Licensed Software, and all
+intellectual property rights associated with, and title thereto, will be the
+property of NXP.  Upon request, you must provide NXP the source code of any
+derivative of the Licensed Software.  You agree to assign all, and hereby do
+assign all rights, title, and interest to any such modifications to the
+Licensed Software to NXP and agree to provide all assistance reasonably
+requested by NXP to establish, preserve or enforce such right.  Further, you
+agree to waive all moral rights relating to your modifications to the Licensed
+Software, including, without limitation, all rights of identification of
+authorship and all rights of approval, restriction, or limitation on use or
+subsequent modification.  Notwithstanding the foregoing, you will have the
+license rights granted in Section 2 hereto to any such modifications made by
+you or your licensees.
+
+6.       PATENT COVENANT NOT TO SUE. As partial, material consideration for the
+rights granted to you under this Agreement, you covenant not to sue or
+otherwise assert your patents against NXP, a NXP Affiliate or subsidiary, or
+a NXP licensee of the Licensed Software for infringement of your Intellectual
+Property Rights by the manufacture, use, sale, offer for sale, importation or
+other disposition or promotion of the Licensed Software and/or any
+redistributed portions of the Licensed Software.
+
+7.       ESSENTIAL PATENTS.  You are solely responsible for obtaining licenses
+for any relevant Essential Patents for your use in connection with technology
+that you incorporate into your product (whether as part of the Licensed
+Software or not).
+
+8.       TERM AND TERMINATION.   This Agreement will remain in effect unless
+terminated as provided in this Section 8.
+
+8.1.             You may terminate this Agreement immediately upon written
+notice to NXP at the address provided below.
+
+8.2.             Either party may terminate this Agreement if the other party
+is in default of any of the terms and conditions of this Agreement, and
+termination is effective if the defaulting party fails to correct such default
+within 30 days after written notice thereof by the non-defaulting party to the
+defaulting party at the address below.
+
+8.3.             Notwithstanding the foregoing, NXP may terminate this
+Agreement immediately upon written notice if you: breach any of your
+confidentiality obligations or the license restrictions under this Agreement;
+become bankrupt, insolvent, or file a petition for bankruptcy or insolvency,
+make an assignment for the benefit of its creditors; enter proceedings for
+winding up or dissolution ;are dissolved; or are nationalized or become subject
+to the expropriation of all or substantially all of its business or assets.
+
+8.4.             Upon termination of this Agreement, all licenses granted under
+Section 2 will expire, except that any licenses extended to end-users pursuant
+to Sections 2.2(b), 2.2(c), and 2.3(b), which have been granted prior to such
+termination will survive.
+
+8.5.             After termination of this Agreement by either party and upon
+NXP's written request, you will, at your discretion, return to the NXP any
+confidential information including all copies thereof or furnish to NXP at
+the address below, a statement certifying, with respect to the Licensed
+Software delivered hereunder that the original and all copies, except for
+archival copies to be used solely for dispute resolution purposes, in whole or
+in part, in any form, of the Licensed Software have been destroyed.
+
+8.6.             Notwithstanding the termination of this Agreement for any
+reason, the terms of Sections 1, 3, 5 through 25 will survive.
+
+9.                   SUPPORT.  NXP is not obligated to provide any support,
+upgrades or new releases of the Licensed Software under this Agreement. If you
+wish, you may contact NXP and report problems and provide suggestions regarding
+the Licensed Software. NXP has no obligation to respond to such a problem
+report or suggestion. NXP may make changes to the Licensed Software at any
+time, without any obligation to notify or provide updated versions of the
+Licensed Software to you.
+
+10.               NO WARRANTY.  To the maximum extent permitted by law,
+NXP expressly disclaims any warranty for the Licensed Software.  The Licensed
+Software is provided "AS IS", without warranty of any kind, either express or
+implied, including without limitation the implied warranties of
+merchantability, fitness for a particular purpose, or non-infringement.  You
+assume the entire risk arising out of the use or performance of the licensed
+software, or any systems you design using the licensed software (if any).
+
+11.               INDEMNITY. You agree to fully defend and indemnify NXP from
+all claims, liabilities, and costs (including reasonable attorney's fees)
+related to (1) your use (including your contractors or distributee's use, if
+permitted) of the Licensed Software or (2) your violation of the terms and
+conditions of this Agreement.
+
+12.               LIMITATION OF LIABILITY.  EXCLUDING LIABILITY FOR A BREACH
+OF SECTION 2 (LICENSE GRANTS), SECTION 3 (LICENSE LIMITATIONS AND
+RESTRICTIONS), SECTION 17 (CONFIDENTIAL INFORMATION), OR CLAIMS UNDER SECTION
+11(INDEMNITY), IN NO EVENT WILL EITHER PARTY BE LIABLE, WHETHER IN CONTRACT,
+TORT, OR OTHERWISE, FOR ANY INCIDENTAL, SPECIAL, INDIRECT, CONSEQUENTIAL OR
+PUNITIVE DAMAGES, INCLUDING, BUT NOT LIMITED TO, DAMAGES FOR ANY LOSS OF USE,
+LOSS OF TIME, INCONVENIENCE, COMMERCIAL LOSS, OR LOST PROFITS, SAVINGS, OR
+REVENUES, TO THE FULL EXTENT SUCH MAY BE DISCLAIMED BY LAW.  NXP'S TOTAL
+LIABILITY FOR ALL COSTS, DAMAGES, CLAIMS, OR LOSSES WHATSOEVER ARISING OUT OF
+OR IN CONNECTION WITH THIS AGREEMENT OR PRODUCT(S) SUPPLIED UNDER THIS
+AGREEMENT IS LIMITED TO THE AGGREGATE AMOUNT PAID BY YOU TO NXP IN CONNECTION
+WITH THE LICENSED SOFTWARE TO WHICH LOSSES OR DAMAGES ARE CLAIMED.
+
+
+13.               EXPORT COMPLIANCE. Each party shall comply with all
+applicable export and import control laws and regulations including but not
+limited to the US Export Administration Regulations (including prohibited
+party lists issued by other federal governments), Catch-all regulations and
+all national and international embargoes. Each party further agrees that it
+will not knowingly transfer, divert, export or re-export, directly or
+indirectly, any product, software, including software source code, or
+technology restricted by such regulations or by other applicable national
+regulations, received from the other party under this Agreement, or any direct
+product of such software or technical data to any person, firm, entity,
+country or destination to which such transfer, diversion, export or re-export
+is restricted or prohibited, without obtaining prior written authorization
+from the applicable competent government authorities to the extent required
+by those laws.
+
+14.   GOVERNMENT CONTRACT COMPLIANCE.
+
+14.1.          If you sell Authorized Systems directly to any government or
+public entity, including U.S., state, local, foreign or international
+governments or public entities, or indirectly via a prime contractor or
+subcontractor of such governments or entities, NXP makes no representations,
+certifications, or warranties whatsoever about compliance with government or
+public entity acquisition statutes or regulations, including, without
+limitation, statutes or regulations that may relate to pricing, quality,
+origin or content.
+
+14.2.          The Licensed Software has been developed at private expense and
+is a "Commercial Item" as defined in 48 C.F.R. §2.101, consisting of
+"Commercial Computer Software", and/or "Commercial Computer Software
+Documentation," as such terms are used in 48 C.F.R. §12.212 (or 48 C.F.R.
+§227.7202, as applicable) and may only be licensed to or shared with U.S.
+Government end users in object code form as part of, or embedded within,
+Authorized Systems.  Any agreement pursuant to which you share the Licensed
+Software will include a provision that reiterates the limitations of this
+document and requires all sub-agreements to similarly contain such limitations.
+
+15.               SAFETY CRITICAL APPLICATIONS
+
+15.1.          In some cases, NXP may promote certain Licensed Software for use
+in safety-related applications. NXP's goal is to educate licensees so that they
+can design their own end-product solutions to meet applicable functional safety
+standards and requirements.  You make the ultimate design decisions regarding
+your products and are solely responsible for compliance with all legal,
+regulatory, safety, and security related requirements concerning your products,
+regardless of any information or support that may be provided by NXP.
+Accordingly, you will indemnify and hold NXP harmless from any claims,
+liabilities, damages and associated costs and expenses (including attorneys'
+fees) that NXP may incur related to your incorporation of any product in a
+safety-critical application or system.
+
+15.2.          Only Licensed Software that NXP has specifically designated as
+"Automotive Qualified" is intended for use in automotive, military, or
+aerospace applications or environments.  If you use Licensed Software that has
+not been designated as "Automotive Qualified" in an automotive, military, or
+aerospace application or environment, you do so at your own risk.
+
+15.3.          Licensed Software is not intended or authorized for any use in
+anti-personnel landmines.
+
+16.              CHOICE OF LAW; VENUE.  This Agreement will be governed by,
+construed, and enforced in accordance with the laws of the State of Texas, USA,
+without regard to conflicts of laws principles, will apply to all matters
+relating to this Agreement or the Licensed Software, and you agree that any
+litigation will be subject to the exclusive jurisdiction of the state or
+federal courts Texas, USA.  The United Nations Convention on Contracts for
+the International Sale of Goods will not apply to this document.
+
+17.               CONFIDENTIAL INFORMATION.  Subject to the license grants and
+restrictions contained herein, you must treat the Licensed Software as
+confidential information and you agree to retain the Licensed Software in
+confidence perpetually, with respect to Licensed Software in source code form
+(human readable), or for a period of five (5) years from the date of
+termination of this Agreement, with respect to all other parts of the Licensed
+Software.  During this period, you may not disclose any part of the Licensed
+Software to anyone other than employees who have a need to know of the Licensed
+Software and who have executed written agreements obligating them to protect
+such Licensed Software to at least the same degree of care as in this
+Agreement.  You agree to use the same degree of care, but no less than a
+reasonable degree of care, with the Licensed Software as you do with your own
+confidential information. You may disclose Licensed Software to the extent
+required by a court or under operation of law or order provided that you notify
+NXP of such requirement prior to disclosure, which you only disclose
+information required, and that you allow NXP the opportunity to object to such
+court or other legal body requiring such disclosure.
+
+18.               TRADEMARKS.  You are not authorized to use any NXP
+trademarks, brand names, or logos.
+
+19.               ENTIRE AGREEMENT.  This Agreement constitutes the entire
+agreement between you and NXP regarding the subject matter of this Agreement,
+and supersedes all prior communications, negotiations, understandings,
+agreements or representations, either written or oral, if any.  This Agreement
+may only be amended in written form, signed by you and NXP.
+
+20.               SEVERABILITY.  If any provision of this Agreement is held for
+any reason to be invalid or unenforceable, then the remaining provisions of
+this Agreement will be unimpaired and, unless a modification or replacement of
+the invalid or unenforceable provision is further held to deprive you or NXP of
+a material benefit, in which case the Agreement will immediately terminate, the
+invalid or unenforceable provision will be replaced with a provision that is
+valid and enforceable and that comes closest to the intention underlying the
+invalid or unenforceable provision.
+
+21.               NO WAIVER.  The waiver by NXP of any breach of any provision
+of this Agreement will not operate or be construed as a waiver of any other or
+a subsequent breach of the same or a different provision.
+
+22.               AUDIT.  You will keep full, clear and accurate records with
+respect to your compliance with the limited license rights granted under this
+Agreement for three years following expiration or termination of this
+Agreement. NXP will have the right, either itself or through an independent
+certified public accountant to examine and audit, at NXP's expense, not more
+than once a year, and during normal business hours, all such records that may
+bear upon your compliance with the limited license rights granted above. You
+must make prompt adjustment to compensate for any errors and/or omissions
+disclosed by such examination or audit.
+
+23.               NOTICES.             All notices and communications under
+this Agreement will be made in writing, and will be effective when received
+at the following addresses:
+
+NXP:                   Freescale Semiconductor, Inc.
+
+                                    6501 William Cannon West    OE62
+
+                                    Austin, Texas 78735
+
+                                    ATTN: Legal Department
+                You:   The address provided at registration will be used.
+
+24.               RELATIONSHIP OF THE PARTIES.     The parties are independent
+contractors.  Nothing in this Agreement will be construed to create any
+partnership, joint venture, or similar relationship.  Neither party is
+authorized to bind the other to any obligations with third parties.
+
+25.               SUCCESSION AND ASSIGNMENT.   This Agreement will be binding
+upon and inure to the benefit of the parties and their permitted successors
+and assigns.  You may not assign this Agreement, or any part of this Agreement,
+without the prior written approval of NXP, which approval will not be
+unreasonably withheld or delayed.
+
+
+
+
+
+
+APPENDIX A
+
+Other License Grants and Restrictions:
+
+The Licensed Software may include some or all of the following software, which
+is either 1) not NXP proprietary software or 2) NXP proprietary software
+subject to different terms than those in the Agreement.  If the Software Content
+Register that accompanies the Licensed Software identifies any of the following
+Third Party Software or specific components of the NXP Proprietary Software,
+the following terms apply to the extent they deviate from the terms in the
+Agreement:
+
+Third Party Software
+
+Use Restrictions
+
+Atheros
+
+Use of Atheros software is limited to evaluation and demonstration only.
+Permitted distributions must be similarly limited. Further rights must be
+obtained directly from Atheros.
+
+ATI (AMD)
+
+Distribution of ATI software must be a part of, or embedded within, Authorized
+Systems that include a ATI graphics processor core.
+
+Broadcom Corporation
+
+Your use of Broadcom Corporation software is restricted to Authorized Systems
+that incorporate a compatible integrated circuit device manufactured or sold by
+Broadcom.
+
+Cirque Corporation
+
+Use of Cirque Corporation technology is limited to evaluation, demonstration,
+or certification testing only. Permitted distributions must be similarly
+limited. Further rights, including but not limited to ANY commercial
+distribution rights, must be obtained directly from Cirque Corporation.
+
+Coding Technologies (Dolby Labs)
+
+Use of CTS software is limited to evaluation and demonstration only.  Permitted
+distributions must be similarly limited. Further rights must be obtained from
+Dolby Laboratories.
+
+CSR
+
+Use of Cambridge Silicon Radio, Inc. ("CSR") software is limited to evaluation
+and demonstration only.  Permitted distributions must be similarly limited.
+Further rights must be obtained directly from CSR.
+
+NXP Wireless Charging Library
+
+License to the Software is limited to use in inductive coupling or wireless
+charging applications
+
+Global Locate (Broadcom Corporation)
+
+Use of Global Locate, Inc. software is limited to evaluation and demonstration
+only.  Permitted distributions must be similarly limited.  Further rights must
+be obtained from Global Locate.
+
+Imagination Technologies Limited (IMG)
+
+If the Licensed Software includes proprietary software developed by IMG, your
+rights are limited to a non-exclusive, world-wide right and non-transferrable
+and non-sub-licensable license (i) to use and modify the Licensed Software and
+documentation and (ii) to copy and distribute the Licensed Software only in
+object code form solely for use on NXP Rayleigh products.  If you are provided
+with the Licensed Software in source code format, you are restricted to
+accessing only those deliverables in source code format which are necessary for
+you to carry out either specific customization or porting work in association
+with NXP's Rayleigh products or your Authorized System.
+
+The confidentiality restrictions shall continue in force without limit in time
+notwithstanding the termination or expiration of this Agreement.
+
+Micrium
+
+uC/OS-II and uC/OS-III is provided in source form for FREE short-term
+evaluation, for educational use or for peaceful research.  If you plan or
+intend to use uC/OS-II or uC/OS-III in a commercial application/product then,
+you need to contact Micrium to properly license uC/OS-II or uC/OS-III for its
+use in your application/product.   We provide ALL the source code for your
+convenience and to help you experience uC/OS-II or uC/OS-III.  The fact that
+the source is provided does NOT mean that you can use it commercially without
+paying a licensing fee.
+
+Microsoft
+
+If the Licensed Software includes software owned by Microsoft Corporation
+("Microsoft"), it is subject to the terms of your license with Microsoft
+(the "Microsoft Underlying Licensed Software") and as such, NXP grants no
+license to you, beyond evaluation and demonstration in connection with NXP
+processors, in the Microsoft Underlying Licensed Software.  You must separately
+obtain rights beyond evaluation and demonstration in connection with the
+Microsoft Underlying Licensed Software from Microsoft.
+
+Microsoft does not provide support services for the components provided
+to you through this Agreement.  If you have any questions or require
+technical assistance, please contact NXP.  Microsoft Corporation is a third
+party beneficiary to this Agreement with the right to enforce the terms of
+this Agreement.  TO THE MAXIMUM EXTENT PERMITTED BY LAW, MICROSOFT AND ITS
+AFFILIATES DISCLAIM ANY WARRANTIES FOR THE MICROSOFT UNDERLYING LICENSED
+SOFTWARE.  TO THE MAXIMUM EXTENT PERMITTED BY LAW, NEITHER MICROSOFT NOR ITS
+AFFILIATES WILL BE LIABLE, WHETHER IN CONTRACT, TORT, OR OTHERWISE, FOR ANY
+DIRECT, INCIDENTAL, SPECIAL, INDIRECT, CONSEQUENTIAL OR PUNITIVE DAMAGES,
+INCLUDING, BUT NOT LIMITED TO, DAMAGES FOR ANY LOSS OF USE, LOSS OF TIME,
+INCONVENIENCE, COMMERCIAL LOSS, OR LOST PROFITS, SAVINGS, OR REVENUES,
+ARISING FROM THE FROM THE USE OF THE MICROSOFT UNDERLYING LICENSED SOFTWARE.
+
+MindTree
+
+Notwithstanding the terms contained in Section 2.3 (a), if the Licensed
+Software includes proprietary software of MindTree in source code format,
+Licensee may make modifications and create derivative works only to the
+extent necessary for debugging of the Licensed Software.
+
+MPEG LA
+
+Use of MPEG LA audio or video codec technology is limited to evaluation
+and demonstration only. Permitted distributions must be similarly limited.
+Further rights must be obtained directly from MPEG LA.
+
+MQX RTOS Code
+
+MQX RTOS source code may not be re-distributed by any FSL Licensee under any
+circumstance, even by a signed written amendment to this Agreement.
+
+Opus
+
+Use of Opus software must be consistent with the terms of the Opus license
+which can be found at: {http://www.opus-codec.org/license/}
+
+Real Networks - its GStreamer Optimized Real Format Client Code implementation
+or OpenMax Optimized Real Format Client Code
+
+Use of the GStreamer Optimized Real Format Client Code, or OpenMax Optimized
+Real Format Client code is restricted to applications in the automotive market.
+Licensee must be a final manufacturer in good standing with a current license
+with Real Networks for the commercial use and distribution of products
+containing the GStreamer Optimized Real Format Client Code implementation or
+OpenMax Optimized Real Format Client Code
+
+SanDisk Corporation
+
+If the Licensed Software includes software developed by SanDisk Corporation
+("SanDisk"), you must separately obtain the rights to reproduce and distribute
+this software in source code form from SanDisk.  Please follow these easy steps
+to obtain the license and software:
+
+1.       Contact your local SanDisk sales representative to obtain the SanDisk
+License Agreement.
+
+2.       Sign the license agreement.  Fax the signed agreement to SanDisk USA
+marketing department at 408-542-0403.  The license will be valid when fully
+executed by SanDisk.
+
+3.       If you have specific questions, please send an email to
+sales@sandisk.com
+
+You may only use the SanDisk Corporation Licensed Software on products
+compatible with a SanDisk Secure Digital Card.  You may not use the SanDisk
+Corporation Licensed Software on any memory device product.  SanDisk retains
+all rights to any modifications or derivative works to the SanDisk Corporation
+Licensed Software that you may create.
+
+Texas Instruments
+
+Your use of Texas Instruments Inc. WiLink8 Licensed Software is restricted to
+NXP SoC based systems that include a compatible connectivity device
+manufactured by TI.
+
+Vivante
+
+Distribution of Vivante software must be a part of, or embedded within,
+Authorized Systems that include a Vivante Graphics Processing Unit.
+
+
+Synopsys/Target Compiler Technologies
+
+
+Your use of the Synopsys/Target Compiler Technologies Licensed Software
+and related documentation is subject to the following:
+
+-             Duration of the license for the Licensed Software is limited to
+12 months, unless otherwise specified in the license file.
+
+-             The Licensed Software is usable by one user at a time on a single
+ designated computer, unless otherwise agreed by Synopsys.
+
+-             Licensed Software and documentation are to be used only on a
+designated computer at the designated physical address provided by you on the
+APEX license form.
diff --git a/licenses/master-pdf-editor b/licenses/master-pdf-editor
new file mode 100644
index 000000000000..5f52e51ca0a8
--- /dev/null
+++ b/licenses/master-pdf-editor
@@ -0,0 +1,93 @@
+Master PDF Editor
+Copyright © Code Industry Ltd All rights reserved.
+
+-------------------------------------------------------------
+
+LICENSE AGREEMENT
+
+Code Industry Ltd (hereinafter referred to as the “Author”)
+hereby grants you a non-exclusive license (hereinafter referred to as
+the “License”) to use the software Master PDF Editor (hereinafter
+referred to as the “Software”) on the terms set forth hereunder.
+
+1. GRANT OF LICENSE.
+This License grants you the following rights. By installing the
+Software you accept the License and agree to comply with it.
+
+2. SOFTWARE.
+Install and use one copy of the Software for a single user. You may
+also install a copy for that user’s exclusive use on either a home
+or portable computer.
+If you want to install and use the copy in the network (on a computer
+file server) you need to purchase an additional license for all users
+with access to this Software.
+
+3. NON-COMMERCIAL USE.
+You are hereby granted to use this Software for non-commercial
+purposes without charge for unlimited time on Desktop Linux. Some
+advanced functionality is locked for non-commercial use. Software can
+also be used for viewing and printing documents only on Windows and
+macOS for unlimited time without any charge.
+
+4. REVERSE ENGINEERING.
+You may not modify, reverse engineer, decompile, disassemble, or
+create derivative works based on the Software, or any portion hereof.
+
+5. RENTAL.
+You may not rent or lease the Software.
+
+6. TRANSFER.
+You may transfer the Software to a single recipient on a permanent
+basis provided that you retain no copies of the Software (including
+backup or archival copies) and the recipient agrees to the terms and
+conditions of this License.
+
+7. TERMINATION.
+The License is in effect until terminated. The License will terminate
+automatically if you fail to comply with the limitations described
+herein. On termination, you must destroy all copies of the Software
+and Documentation.
+
+8. USE OF LOGOS AND TRADEMARKS.
+You may not use the Author’s name, logos, or trademarks in any
+manner including, without limitation, in your advertising or
+marketing materials, except as is necessary to affix the appropriate
+copyright notices as required herein.
+
+9. MISCELLANEOUS.
+This Agreement represents the complete agreement concerning this
+License between the parties and supersedes all prior agreements and
+representations between them. This Agreement may be amended only in
+writing and when executed by both parties. THE ACCEPTANCE OF ANY
+PURCHASE ORDER PLACED BY YOU IS EXPRESSLY MADE CONDITIONAL ON YOUR
+ASSENT TO THE TERMS SET FORTH HEREIN, AND NOT THOSE CONTAINED IN YOUR
+PURCHASE ORDER. If any provision of this Agreement is held to be
+unenforceable for any reason, such a provision shall be reformed only
+to the extent necessary to make it enforceable and the remainder of
+this Agreement shall nonetheless remain in full force and effect.
+
+10. LIMITED WARRANTY:
+THE SOFTWARE IS PROVIDED “AS IS” WITHOUT A WARRANTY OF ANY KIND.
+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE AUTHOR FURTHER
+DISCLAIMS ALL WARRANTIES, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NON INFRINGEMENT. THE ENTIRE RISK ARISING OUT OF THE USE OR
+PERFORMANCE OF THE SOFTWARE AND DOCUMENTATION REMAINS WITH THE
+RECIPIENT.
+
+11. LIMITATION OF LIABILITY:
+UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT, OR
+OTHERWISE, SHALL THE AUTHOR OR HIS SUPPLIERS OR RESELLERS BE LIABLE
+TO YOU OR ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
+CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION,
+DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR
+MALFUNCTION, DATA LOSS, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR
+LOSSES, OR FOR ANY DAMAGES IN EXCESS OF THE AUTHOR’S LIST PRICE FOR
+A LICENSE TO THE SOFTWARE AND DOCUMENTATION, EVEN IF THE AUTHOR SHALL
+HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES, OR FOR ANY
+CLAIM BY ANY OTHER PARTY. THIS LIMITATION OF LIABILITY SHALL NOT
+APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY TO THE EXTENT THAT
+THE APPLICABLE LAW PROHIBITS SUCH LIMITATION. FURTHERMORE, SOME
+STATES DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
+CONSEQUENTIAL DAMAGES AND, THEREFORE, THIS LIMITATION AND EXCLUSION
+MAY NOT APPLY TO YOU.
diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 94d57c8bc2cd..645ce9f30ba9 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -7,9 +7,11 @@ DIST neomutt-20170714.tar.gz 2509160 SHA256 40d48920f95ca49ab96eb109b658f5cf6e1c
 DIST neomutt-20170912.tar.gz 2533245 SHA256 9f0d128fe8dbbbddb67e2b629f8b5e52a9d892f82c735845c1708c14e3046657 SHA512 7551da47029667443257d9d370af7217846abf988d1469c4e08f367ef0bce2dfb658321df27176622bbd07e6d46c320380749d4ce05ee39cb1e8d9b6c3e1d7e6 WHIRLPOOL 0dad6380acf5b6f891bcb77388023de27d23e4ea8ad0eb3563c1704de555a2fc54604d47b9b67557c6ab0310e1c365c786a1952f6794b2012594f1c19033ad3c
 DIST neomutt-20171006.tar.gz 2706019 SHA256 86e9d945919438a377828b15f03c8690f639062e44151e219e2f8443ae27147c SHA512 adfa702ee642ce58b11dab1d2b805626d8f90e8cc88731cb7e051df5b785010ac43d90eb14d2a5ace02d3abaf921c9f36f86f627063036bcb7f5724912ca134d WHIRLPOOL 75f2a0c8881b769f1a7acd8c0e7724baf0a2943a68a4029d74d32a5a5ed3203c32ce3704b3271a8e05f02c233273319437a593ffad9df5e1b988f8725f0f2433
 DIST neomutt-20171013.tar.gz 2706753 SHA256 5a7c6302d623b620db03d923a7cd7cf967123a67fc42c117a0dd4b45612e9a55 SHA512 9e4499b165f25091d73868c62b14f950bdfc032444c0cb3619e99a8299d29c3d1f24078e15537e693a3af69ae0681d59e25a73b857882cce2653be593231ffac WHIRLPOOL fde9e7833bc6a469882716d7c9deb4d5146d0a6ffd5769e7d76d952096165b05d29584e057503a1ba3a4887c8afd0efe26401fc9d533250c597527bce8500634
+DIST neomutt-20171027.tar.gz 2682699 SHA256 2d00de2a1cdef4cd59fcf6f894a6fe7e677e1065565f5e01f4dae8e1d910e583 SHA512 e2df0d20c0729abb32d1614c94c08cca0cecad1cb36a380f8210e2df3e353ffc08f66abf1e5e3a1cf4a746437d59c15262ce05ab1a820561466bf7e3a5d6b894 WHIRLPOOL b79f58d4b59c0a4d0bbac46993a4743e659d7b29471ffbef7f291e83b63835629735139b07f911181fed2f8c403c70e7530870330eef6de5733eae9b0dcc6e6e
 EBUILD neomutt-20170714.ebuild 2886 SHA256 9c5ff863ac720202d144e49b4d56d279c1156f330c13b3cb4e42dc053fc708ef SHA512 3c39242e27f38cfa7f3a491ea168b23512aa10a01d95c1d84bdb2034e5096d5e8cca5db13c8bf338e2bf39df4e953bd7ddf512d22954c2206186ab0bee3b0b8e WHIRLPOOL 511a7be9e55fde867abe4c294e861f1569d4e13267cceb712b3d3bcaf164a7d9a8d351cc4cc38f49f11439ad7047b5b45eeead3d620b477f73d4d6e4b37cf689
 EBUILD neomutt-20170912.ebuild 2883 SHA256 62f2e3c7bc4adcfe4c1f48b3b1968def7985ede762c30f2b8170df51831cdcc1 SHA512 aabd31f6bb102f174a1f076dae060decc8f01c11afce8d732ff0666d77a746d78ef96480a0f5c42eb0be73e194e07087d23e8bc418d625dad0a6d98627cff1c5 WHIRLPOOL 908a8c3c732c3ccf499e9868b183514443d9a52db2659ae7b520ca945aa5b0fb2a3dec584a69514c1f9d062d68c7bba7d856288e6bd217df5530274093640147
 EBUILD neomutt-20171006.ebuild 2795 SHA256 50e22a6219807aed7c5cc9824bc51e1c39fc8b83d84df42221bd97574f4aee29 SHA512 8d3919c88ff971891c1c49c8a56bea2a802ba07dc556d85779e13f8a6b67bc4788fbcfbcc0fd287c04e952a110ecee9b0d2420fccf79f1735e98834b037fe9e1 WHIRLPOOL a5094c1458ae6f025f0ad8b5798ca35d45a4ca39cb5f2aec00327cb2f6e2ffb335b20f915f8ea71d098f1c7eee1c2fea38f61b1b885d2da785a39b18ba0d6193
 EBUILD neomutt-20171013.ebuild 2719 SHA256 d38f53585c0208de9d9e1d1d3950d69b371fbfb259c1dfb8d0920238ea2b02d0 SHA512 945c6145c9965a4c3e89b0d75920dddc24848f6ba9cec16e25d937dbac9d0def98c8f770e10b2efb933c26f358a8cd257849f48b5fcde2ea15e104a7e5f8360e WHIRLPOOL c8f4313ee8945ef0931674f4cb99be1b1d8720e4dbb7a2aee60529d37b90a237501119bf67c65925233af63e5e052032e06fc95a61093a6e38317b07718cd134
+EBUILD neomutt-20171027.ebuild 2719 SHA256 d38f53585c0208de9d9e1d1d3950d69b371fbfb259c1dfb8d0920238ea2b02d0 SHA512 945c6145c9965a4c3e89b0d75920dddc24848f6ba9cec16e25d937dbac9d0def98c8f770e10b2efb933c26f358a8cd257849f48b5fcde2ea15e104a7e5f8360e WHIRLPOOL c8f4313ee8945ef0931674f4cb99be1b1d8720e4dbb7a2aee60529d37b90a237501119bf67c65925233af63e5e052032e06fc95a61093a6e38317b07718cd134
 EBUILD neomutt-9999.ebuild 2685 SHA256 36ee62918a16cb2820079573449c39d200891215ad446493bc2004235f854855 SHA512 ea6f93d49a7a4987d7836b3a454b26d9120a67572b442673a98c7dfe60880748ea9101f4bd4eccf5db1f9bcc1a182c36ed8e58f3dcd587b51665b43c262f95be WHIRLPOOL 53d91df7a5e5c041e4a8732ee9803eacc7d09e57ba7011d980ed52d6b91f85ce87f778c10d46f119593e353419d73b40798caa40d90e42d7f1dbf30d94b44bfd
 MISC metadata.xml 721 SHA256 5122d3087be519e71debbfb6c796335ad7e40bf099b0058379bc63dbfc28ea72 SHA512 2fbf2b5d1b13b0845b2545ba99c0bbc15faa0f000f69dba3c307244c1a6aeb74e2d34ee7052527856335e5d8bf665738d4d8bd0e7e9ca53c28b1d92a851e8747 WHIRLPOOL c6c717387be4bef13c38fd86594966e33c2f10fdbfe899335ecc36f01c7d42fdfc991465da1c6a4ec2de1dd68ad7048e8bf11012d26241c724fd189d3a38ffbc
diff --git a/mail-client/neomutt/neomutt-20171027.ebuild b/mail-client/neomutt/neomutt-20171027.ebuild
new file mode 100644
index 000000000000..af4dc6a9e039
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20171027.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic
+
+SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="https://www.neomutt.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg idn kerberos kyotocabinet
+	libressl lmdb nls notmuch qdbm sasl selinux slang smime ssl +symlink
+	tokyocabinet"
+
+CDEPEND="
+	app-misc/mime-types
+	berkdb? ( >=sys-libs/db-4:= )
+	gdbm? ( sys-libs/gdbm )
+	kyotocabinet? ( dev-db/kyotocabinet )
+	lmdb? ( dev-db/lmdb )
+	nls? ( virtual/libintl )
+	qdbm? ( dev-db/qdbm )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	gnutls? ( >=net-libs/gnutls-1.0.17 )
+	gpg? ( >=app-crypt/gpgme-0.9.0 )
+	idn? ( net-dns/libidn )
+	kerberos? ( virtual/krb5 )
+	notmuch? ( net-mail/notmuch )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	!slang? ( sys-libs/ncurses:0 )
+	slang? ( sys-libs/slang )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6:0 )
+		libressl? ( dev-libs/libressl )
+	)
+"
+DEPEND="${CDEPEND}
+	net-mail/mailbase
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		|| ( www-client/lynx www-client/w3m www-client/elinks )
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mutt )
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		"$(use_enable crypt pgp)"
+		"$(use_enable debug)"
+		"$(use_enable doc)"
+		"$(use_enable gpg gpgme)"
+		"$(use_enable nls)"
+		"$(use_enable smime)"
+		"$(use_enable notmuch)"
+		"$(use_with idn)"
+		"$(use_with kerberos gss)"
+		"$(use_with sasl)"
+		"$(use_with tokyocabinet)"
+		"$(use_with kyotocabinet)"
+		"$(use_with qdbm)"
+		"$(use_with gdbm)"
+		"$(use_with berkdb bdb)"
+		"$(use_with lmdb)"
+		"--with-$(usex slang slang curses)"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"--with-docdir=${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	if use gnutls; then
+		myconf+=( "--with-gnutls" )
+	elif use ssl; then
+		myconf+=( "--with-ssl" )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# A newer file is provided by app-misc/mime-types. So we link it.
+
+	# A man-page is always handy, so fake one
+	if use !doc; then
+		emake -C doc neomuttrc.man
+		# make the fake slightly better, bug #413405
+		sed -e 's#@docdir@/manual.txt#http://www.neomutt.org/guide#' \
+			-e 's#in @docdir@,#at http://www.neomutt.org/,#' \
+			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
+			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
+			doc/neomutt.man > neomutt.1 || die
+		cp doc/neomuttrc.man neomuttrc.5 || die
+		doman neomutt.1 neomuttrc.5
+	fi
+
+	dodoc COPYRIGHT LICENSE* ChangeLog* README*
+}
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 5cb2565b3d08..8d16428d6cf5 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -16,7 +16,7 @@ AUX spamassassin.service.conf 333 SHA256 b6f942eb15f2476dbd161db92b8dacec43f2a06
 AUX spamassassin.service.conf-r1 85 SHA256 24c07ff083df9ed68e092ae5a7d9c1e3e457bceaf447dbafcce9d538b907b134 SHA512 270337a79cdd04c82edd11e97e1186d3bee9a97c6ab35496828f30e75893c69a4dc46cbfb7fc26c1dc6de361a6fcb5603eab704f89a10c787ad1b3041e75a191 WHIRLPOOL aa047534f981d2259685133fae61de47334f513ac5276e1413e37609dee63aa88204072009b16896361e70df56007bde77dfa31103305ea5f46955b2f026ec48
 AUX update-spamassassin-rules.cron 1378 SHA256 82aafaa2ba3d7f1d86ac06ed4c561b86c8288c10552fbee1304233b0f0bd1e43 SHA512 90927b7709569a24ea2a233f42b16fce91bfda85e75e859ad85bc7ad16f7ad61ddb32bafc9b5b72515949b9ba8dda597679c24c2be4688d974375faf00bbccd5 WHIRLPOOL 9677bfc0a382dff0a3cdc28e4f9e851c7567b7f86d8ee130933f7a5662f94f1128973ab6032c1e12c69c9a65ab49daad052364944e69843412c637ea4e592ed2
 DIST Mail-SpamAssassin-3.4.1.tar.bz2 2710985 SHA256 a0c1c9808f0684b389594eb8b2ccbace6486546593493f9308c9554563d14651 SHA512 91d50e2ce6520e3e1c7bc66da133a0815be34ced15e26b6e6c17af5a03d5c62f41d8086f25f65084d6634497148cf5439977d7d4a44d7c3e307535beac6629af WHIRLPOOL 1465fcbc0456c9a671087d395c2a9998e3852a47153a0f6770158a2a311196490274c620aab89e2a6ff163defa72b8e785032f9450e7903df355544d957e8908
-EBUILD spamassassin-3.4.1-r16.ebuild 7408 SHA256 2aa1b1d0d1289d61aef593d5af8cf2a7693741c99d3fdfd2e66eb9e7d35ecf78 SHA512 9e3595bc9269ae605f88c6ea200d6c947b527e31cea07ac58d01107a04d98ce759162e3fa9d69cde1d50bcee5118799163cec65b1357426b11c17312793b5044 WHIRLPOOL 3c248e3f1c32e79f7f8a05b3ab2132422008e9be67725832f128c557d520a001a1ead1080c1f28fce127a637799fc495613a62b9a4fb12b82536b9d57b38fb5d
+EBUILD spamassassin-3.4.1-r16.ebuild 7403 SHA256 cd3bec976d087ab28102b957c2eb8dec56c094841397b41a9f9451edb24856ea SHA512 0c7326ee4ceb150d88d30b320e8c44268402d93c9961c9de187354d8804837a7e99b9fe3e7e5b9558e9e48fe7cbc7ce5c9d3ad387015762e85ff29a8f9ebc83c WHIRLPOOL 7079521adbfd266c65135ff9c14ef6a742f180aa97d173dfc02eac6e01237ba288ac0e15a1da78aa40597dd8671555d4c1759f63b8562d4ce7f87517c1f7153d
 EBUILD spamassassin-3.4.1-r8.ebuild 7014 SHA256 fe09355899e12443765c5fd8b2a159030f0b30ae1d26f20d8ad6077128107bdd SHA512 0e71a3d5c7381fdc78c591050367d27f8281ed42789b5f0954af0dec2440b8e6183eb0303ff9056f9a0cf16bdc21ee866ef7889cabbcdc7401b6c49b81d72e6e WHIRLPOOL 7dd4a6550f381ae2249a0be15b85c70bd6f03e9df0d34f6a8a4ed3587deaf3236696cbb302808378e4989b74fc9f4ba67bae12476392639cc5a1dd60671f82c3
 MISC ChangeLog 11981 SHA256 ee39eba652ecdf545257c9addc9f251c27fc916a662b85733a18f3b6c8387602 SHA512 126d51d6ed71aff051cae7663139f0a23c8de136aa30965a77e039a421d8b75ec5382c3ecd1d1297c62acc57f79d9c18532f27f6f4db3efe833855bfea08b7eb WHIRLPOOL c8aac640da1663435b22c558549ce282c8fe22c0200d1aed7686e0124ee6397c7113d6d476e9ef8b6d9618f873bdab680d072ea9f4d424671cf947791904f0d7
 MISC ChangeLog-2015 50434 SHA256 c3346f6e5bc71f22cd441184a6242bb3fe146f0b14e87365e9007e48ee86e5e9 SHA512 575db565453ecb6c9f0b4e0d155647a68b0e6dd57bd4b90d2f41a7dd82522b3ecb5b6401bfa6edefaf2b7bd8f252cebde03e9cbbdf8e8d95dc596216c4a43359 WHIRLPOOL b5600e57eb295607d953b3c8345ec644b2c6e40084200d5ae8e3d14c2d8ff04d2e91d788a1a04ed8e367c4f5aeeeb0da637e684432f623fffcfb7b1c96d78cb6
diff --git a/mail-filter/spamassassin/spamassassin-3.4.1-r16.ebuild b/mail-filter/spamassassin/spamassassin-3.4.1-r16.ebuild
index 3273f6b1706b..ce0444bc8fb3 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.1-r16.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.1-r16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
 
 # The Makefile.PL script checks for dependencies, but only fails if a
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 3579f9add96c..c14a7f2eb06e 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -8,7 +8,7 @@ EBUILD fontforge-20150612-r1.ebuild 2840 SHA256 a4340728a3b639e1b30054add808b06a
 EBUILD fontforge-20150824.ebuild 2630 SHA256 470aaf2590cf93e89f2251606b6a3cf3ede42acf3bf2c37ae129ae9165c175fb SHA512 1d89f56716cf8be4d925f576534c42a2bb8c80cc83be0f6aa39bb05fdbd11a66b8ec0164810253304472343211bd2133189cbd34cf06c996af0e5c6f81d3fde8 WHIRLPOOL 916f74e583f7f910a747cbe1b246165d99143e81b40afcbff1b9aec7c0bd2b54b710f76c2439365b4ecb08daef1a2af8836be6c2b11f45f1a07f944951af3ac1
 EBUILD fontforge-20160404.ebuild 2594 SHA256 a33fe382c822bd385d32867e12b97c22a496b5fc54d606c47a3be1960b289412 SHA512 7918ccbb74ef4f4df82869663fe9ce44bbaf990cfbef951a017f43f5055b742c88f92b04b6b45b9bd0fda09b298a0ce8f3630a5a27a0ac49f88d476737f8a52c WHIRLPOOL 58e45d9b87bea34cf46660bce95e013adf27e047c420b492069362be75aad81edbc1e8debcf7955fc6cb7ef8596e762a4c808b50672c6be83290c6cbcd44f86a
 EBUILD fontforge-20161005.ebuild 2516 SHA256 2d1264deefd6b095a636bfb23efda3927c6fcba67f05fe3d042cc658cc827469 SHA512 f1ad068728e1d88d2469ef4371285e4aec86b3279366085d18427503b5a0e3085f779bff2f0c178c7256c5b1bae29a458567ab124c91aa3403f91bcf97ef9aec WHIRLPOOL 62af3c7f689cec7b6ea55b4e7445b656dbaa98da25b77005567736a1929a5b9bfb75fe5f40c35ac54ee495d30fd5cb6ef44c99493bc15a5fa703bae538f9a7a8
-EBUILD fontforge-20170731.ebuild 2637 SHA256 fc4807db4849c2acf84237799c76ad7b0827a9bbde6ad3d6c5c74f2f2716bcdb SHA512 8cecfa19b39b44699e928a67c4e5a330f8e48e1d45050aa5afc61b54db2453bc8243ff1a04dc06458d7e598e68f6bdf4e014c5b2c3bd8ef519d024e9d59507d2 WHIRLPOOL 75c520d33baa08804417d75788f4405700d4e1a971d7955454819d3b16852a8ca4fde02da879486886865cf67161f505e878646cc66c62c12ce5df9f330b7ff5
+EBUILD fontforge-20170731.ebuild 2631 SHA256 eed638a96ec8769276b1e86e3577b769a5a1de9a664208bf72564536e608c174 SHA512 d6d2a64ac44b1ae6b52b634c380df99b1eb9c7ba7db5275405b7133af55693ac6acbd89a91f6baf5233212d5324866bf0bfd585efb81b2b7c8dad02c7a549180 WHIRLPOOL fc727be3481def972582c729ea66b0fd6fde5515c4fe05eaab68a921d474174d0dacef2c7284b676d5e3e19ba51456ef75bb4e18b5aae598d8aed59fb8570cfe
 MISC ChangeLog 8979 SHA256 4ec854f4f1d62708cf5df72f190b68b0706631a58ab69f0512be043a1f43f293 SHA512 83f44989216d08a96fbc6f43be409f0a97da84e362539f1593f53dacf4cc432ec3314b863a5968d5f1808b41c399b968b4cf8c02002e41328cd10a5cd2bc4e7a WHIRLPOOL c886e4ee71fd6929f55f5e8cb2176c5ee424370cbe08c17eb5bf291d330a3cb930fc00ad9f5f6e4bc6a30246fff3b28e387c00b1aea83628332fe07962a55f59
 MISC ChangeLog-2015 24226 SHA256 78dcbc30a5f0a0eb19149ec7bef221f54aa3282f4f01c449a14faa257b87bd95 SHA512 695bed04a1e5a2141029dc5e1b41788287cd32408fec2323aba8b27505c956cb5e1f77480a90d27cd544ea619060d2b532010f249052bd232b157e6aece7444c WHIRLPOOL 60dadcd8eac86a0a21a3ec904148d3c06230d8b064106604bfcea4ec1bc8f7677561e3bbf2ca2279da199d8e6ff1fadad6c419d8652d37aa0caa08c8733999e7
 MISC metadata.xml 908 SHA256 d442286b554f49b292017b0fafd26be23c0db4b050e1835a5d87a72ebeff4c76 SHA512 973d4967be4eb7aad087ce977a4d94945a8894138604e8d37257dac97f74e98f7fb9a7cad7e7f46abb4c8c39dcb4bd79e9ad26f96838ad39ac1894e154834d28 WHIRLPOOL 43245d814f390c7583f50fae1e1f50f8c99e6fad2142d780b2c11159c4b743e961cbb102287cfe24a0d3d752aaa5df9f2c058457a35c1879effd2235c3023a7d
diff --git a/media-gfx/fontforge/fontforge-20170731.ebuild b/media-gfx/fontforge/fontforge-20170731.ebuild
index 4b1011be16f4..a74a62782e48 100644
--- a/media-gfx/fontforge/fontforge-20170731.ebuild
+++ b/media-gfx/fontforge/fontforge-20170731.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforg
 
 LICENSE="BSD GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X"
 
 RESTRICT="!test? ( test )"
diff --git a/media-gfx/freepv/Manifest b/media-gfx/freepv/Manifest
index 182299fe82ad..0d4e3d9acddd 100644
--- a/media-gfx/freepv/Manifest
+++ b/media-gfx/freepv/Manifest
@@ -6,7 +6,7 @@ AUX freepv-0.3.0-stringh.patch 273 SHA256 de462bebc3460011b4f30af986f417b2836a3c
 AUX freepv-0.3.0-unsigned_short.patch 1787 SHA256 59f8ca984d1f184577b265870f5424f28f49f19582ca57ab56d3d18e981d2dec SHA512 aba4a7b0d882ebce73b5ec823e8a51cec2788efdc4d9000c9d48a3c07a77e88dbee1e24ffdb1a57b2a4ae45b9310b25cf0157c15d73f8fffdf0a2582e8b88078 WHIRLPOOL bb73a0a0c6087b2079cc44981959d0ed0628dcae53cd2adc60d4ca9bd95fbae25aa923c806ec936dd5f43cc69a65e1e188152781b9cd12356e38407cfb113f75
 DIST freepv-0.3.0.tar.gz 175545 SHA256 a66c58616cbe814b2e23c6fe109c3de906dad83a8faa32ea219c182bf15229f0 SHA512 0b207dc25c51b19fd76637743adb8e395c6098d03611612086d66d3f1aa6e4d0c5700aa0e23210082d6aa7495f19d1c3d8f0f93ad11a5236df86d709d5f71a7d WHIRLPOOL 993378bb9ef25e1a1064f9402c4608d0a54588f035f23fc67024b857705ff978a403f86e5140e9ed88b83a6d9ae7a74aa86bf9c0239eb07348904d1eeb9ef749
 EBUILD freepv-0.3.0-r4.ebuild 979 SHA256 e2141c5b9ebc1d8a8cbfd55d6ef71d1f169bf11ea114729fc52146a071afca27 SHA512 7e5243b3abfbcbfbe8a766f581950439e9609bf3ecb899f951df21851acdde5ee955388d89ff9a0ef18e748c30a3d12d41f214d37a01d7955d652837cd4e4f3a WHIRLPOOL 7a1468bf212586dc33d57e9c8aae5384b52730349f34e3b2dc6c4e9cddc29f44adbee0a2408ec8b6e326ccbc7352b4bfaeaf6bfc1f5612434f8d825d05eda840
-EBUILD freepv-0.3.0-r5.ebuild 963 SHA256 6b0a284958d0029abdf9d23b3567f2c8946beb99b427a61b5fbd7e81a346a068 SHA512 162b7095e1fa1f37e3525d75cec993112d4d5aada164fcab1f8354b5522aaaa91087db49709dc810f0ea3c3c86151bf08603c21293c1fb83887d5ccff98af1f0 WHIRLPOOL a2543d1248a6cff166fd5a33bafa0e7901efa04b9c12a3a9087c9548114330e302366d13b624316c9ab9c5b6eca9f09d94b2fe8220944a6f37e67386b7a7a248
+EBUILD freepv-0.3.0-r5.ebuild 962 SHA256 b04eed14c1b0fa7a7e39fbf76038806202576516553e4b33d23f04a12e596584 SHA512 d8334c3e781236335389924050f71d35a91bded5a3e7d14d869ab5f122974ab56a138b9be1086e4b0d577627b73aece6698f5ad9b41263fd43db24c899940a57 WHIRLPOOL 369dc7bf6da8c11cc6e1cc39ad3242480d95039f5fb0162c04e6fe0cc50187eb3dee1aa9051c7cf5fcc202058748f37e29e2ede0f88f98c2d1342af521092653
 MISC ChangeLog 2357 SHA256 6c66dcbb837604ebe9e7cd8c2c6d048b459c47c61a11826db44d882c40b3e6a3 SHA512 2418782b8d38aef14f120f4b3b256b3fc10eb8c0cf7a58b3afd584a20df92c67e4863cb0c2389598bffaa43766ba7c6ca723b992d2c16d3c9ab690770b09f815 WHIRLPOOL e2cbcbcd185dacaacfd2e91c97e73cb2149d36dd912501312267f8572ad866804dd0b77d79cc5dbca4571d204b66f455f8cb4c677cc91f0f326a93c4dbf4068e
 MISC ChangeLog-2015 3391 SHA256 9452c6aa5b8c5b16013d7c5d943900ee5ae9857bd1db94e7277c0dadd5220a9a SHA512 2e656dbcd16f1c33c2bf336f7bce9bf157316c5ad6638a3d5ff524addc0d40b53dc77ea490681861db0451cf19afffba631782cea5d837f31da43a05ae4f519d WHIRLPOOL dd1ed03ee3402e1879fafadbb105bef47ccc08c1d6d5f9a2a88af77221a958e9e6c2c18d81d289d0397a32c2416fb9f7854c308d86e66f0499aa6c401164b305
 MISC metadata.xml 474 SHA256 8892cb002be9ecac033d26cb60b86ceba7d2011b79b541e4cc45229a17ca02cf SHA512 4466402d68177a660716acf3afdb8ddc2074e8ac7ad35f2ad6b31adc9fe938b39cc999dc082fa07f8787be8798a053a6248dac12091a22d32d9fb83a1022b421 WHIRLPOOL d6c4055abefdfc503c1c51319626b573fc5e4ed2924956c5d8ef976958e78bcbb0dea4a42caa8fad2e0d429075e3788e267d18cb47d118e5897738474b68c065
diff --git a/media-gfx/freepv/freepv-0.3.0-r5.ebuild b/media-gfx/freepv/freepv-0.3.0-r5.ebuild
index fb4eeffb23c1..567774b174ee 100644
--- a/media-gfx/freepv/freepv-0.3.0-r5.ebuild
+++ b/media-gfx/freepv/freepv-0.3.0-r5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/freepv/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND="dev-libs/libxml2
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index e44064b532e6..e1abaa3f2d67 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,25 +1,10 @@
 AUX gimp-2.7.4-no-deprecation.patch 1061 SHA256 fb9532406b62a6fa12f8598b142186fad1dc4e937328c8859cb4e8e76d2b19c7 SHA512 3454f3b1a7579b1da4c36b765ae2a54adab13f0a4ecf02c4c0c3c55a12ff7af57d6d0467f663d2ef3de6cda116095f5f662a29cb3d729e0533edd585731a1dc9 WHIRLPOOL 25b645c7e3f39cabe35155dd24c061a088a1800b0a4c154196ff89f4ccf3fc1950a1028d08eddf879cc482ca334bd99bc4c6cea8288e3bf36c0bed657485d984
 AUX gimp-2.8.10-clang.patch 7670 SHA256 a7f057002f7749cdcb07871c3ef69aa73ab28e688ed5782316d5cb1489a0af1e SHA512 772ee0837a214f3ef70e823662fe12e57ee8fd5f800c6508e757b86169b86a5cbd86695870993a66d3726c019d24f79616831bed8baabce3e1d247ecbfe204fc WHIRLPOOL 0baa2a9e7e3370d2b44a180f89c66306aa3f0a6fb4a675ae9fe3413032ce8b6a8a0bd03b33e86453a2a41340e504f641eead1c9b1e4461bb7133ecae713c52fc
 AUX gimp-2.8.14-blend-center.patch 999 SHA256 2fb7bdc7e31a833ddaa75c4ff7bd8ce0595b5a638f3cf9d387e2fd6a0f3764c4 SHA512 1d3cbe9d1b02e2d10ba982265f7d89f593aa6973f76d529dd909f36efe1c9d968360ec208943f66c00f6589f5c679368099e0db579ddb3655c15cb6ce8bdf930 WHIRLPOOL a1f3abe22a966a5490979c580e5c8bd591d0c3a12ae85fb86f306d066f18cc18249eeea2ac5459d99466161b09ba8167a52bb232f69839f383d809ec09e0705f
-AUX gimp-2.8.6-uclibc.patch 1317 SHA256 09dcec105a741627c74214ea8dec1696f921be94d3b5492b417f9a68043979c7 SHA512 0e7da897f0d654d2be233880bc80c869f869698122db779bd23f7b995de53840553a3b877b50f0297e56fc8627888b98b3206c08c03a4d22e748feeabe92391a WHIRLPOOL 0e65f6b620c23b2ff2f9b13fd555fe3c070d73b50b3ba93c61446783861f2f0fd7ecdc2102887e9673077d691e9cfcf05bd848242565776931c7f5bff628396b
-AUX gimp-2.9.2-CVE-2016-4994.patch 3118 SHA256 14f8b33b40b8de61a21276b26e6e908ef42cb19e7ea938b9a213661760af72dc SHA512 5268326b037ac174ca89525c0332620addd28348f2901e3725402c1aa9fbd2718245868fcb44405256a9c60b8b74df9c66850b0af5d80ca3c4ae7a76bbd523cb WHIRLPOOL 984d9198b18bfd7019b1b5e1348e1d7b18e2466f6d7b91ee7656feb64d2bbe9b46b376c29b8a589fea27b687ec58dd1c2255e1a99a346043ed92a3d9b5e4b0e4
-AUX gimp-2.9.2-gegl-0.3.8.patch 1810 SHA256 a10374d1992f3ead5b07d4f7b387bbb01309fc890e1c5cabeb77893bc32ef908 SHA512 215e51f12e0672dad81b87ae31cbc37a14176b357b6576057224b82d3f3b392485f1e12301ccb8cae97a9423a4ab177d9213538f0d1612e46250012ea3adeaa6 WHIRLPOOL 11bd3d0038c15b946fa1cb898d0e47b45dab06f0a1b390f627ec2b093cc4ff6ce6d2ec67c04d458525cc7528cc25f81916300f3609026bae33e56c67e2a19cd6
-AUX gimp-2.9.2-no-deprecation.patch 1391 SHA256 7e26743c6f51e942ddd051481d2ec30c59e691737f3b12bc548784243c4007e1 SHA512 69ec37957a22a8a7dfc40b912d6ba840bbaed6b27f41d1dc2447b36766c201c462a69a7b65014e21b4a4b7f87c0e630795cf64d13cf4bf7397e1a80290e71181 WHIRLPOOL 3242b67f6ca9129a0a55db340127c745de096d41d73b2666196ccaf81718b468c2393f14e57ab707856f91e5ce85787a48025f2a9f986b481ad7a158a50b78d2
-AUX gimp-2.9.2-version.patch 775 SHA256 07c83325eddd9af9be562a0878986c080ac7299954f726f5373db3ebb0bad821 SHA512 fe8894d9e89210b4d0a8584c1ad3825bb720964ad9194e0b088b6dea2e8b354a2d2f662748ea4f3c090ebb66b64c27a5922fa3d3cf3d49da9aa07e552ad608d6 WHIRLPOOL ce67beb429dd92ed1fcb6347d88eee0bf4bd7c0f36d987c35ef5edb4b7733478a253f4b00216e40f3a7964852e4094e1bcab6df73d68e8acb65fd1f5cb2964d1
-AUX gimp-2.9.4-CVE-2007-3126.patch 8937 SHA256 92dad0e1effa13636a02dd7b16d0065ca869432cff5b31366464a495a85bff4b SHA512 c3853f38204e8fcb6e492812f6c684601827517f988592526f41e285766c3ea688d404593bcaae75d8c2ba0bd2910c43f7b0ec5147659cfd2cc5429d38754306 WHIRLPOOL 8ed186ab843ecfbc82f73bf6b50938f3e0e4bb753bce8646b748d69de97d75dc6df5059338ce9978bf49f3cd52e974694beb979affcb29d5e389404be7583a73
-AUX gimp-2.9.4-gegl-bin.patch 705 SHA256 2425c117b68d812c7f1fcdac5e4654485fac0894302e5b1d7aaed281e5c0ce78 SHA512 3280cb607ba5539c17dc00816b9d745849db48ced676c0a6de3752a8ad3b7eb1717eb4b6af9a5a5db96aeaddd5992d23f0d06b2a3a967a6929e0092145594fef WHIRLPOOL 30044fb9dede9454b52d813bc445603e530e553159db90df8d84b5e26e6dc75cd0edda96d9a8080ab5cfec89662156a29d7bd498b4183bff023989122788e432
-AUX gimp-2.9.4-mkdir-makefile.patch 1492 SHA256 7bba311b9df6a17c73087bfc15db0ba7e7b215a7c4839f9fcc69aa2c826f2bc2 SHA512 c8fa19e79fcc2e38af002c472bdcf6656e3297826ba9df9e22335d09e062c84b32b5b39e9d43adc1ce8b9b20bc047e9a7ef3a52d9db39a69e03a2956204c6000 WHIRLPOOL f2ba749e8253dca3c37178aaf72a06b19d0de4582022a40613faee3058eaffcf2fde3c65f0ab89ef1bb2b530498983a6c9b7c98ea5d7585d90c6f49b2f95364f
 AUX gimp-2.9.6-underlinking.patch 653 SHA256 7a59c57012f68040d0a1df490b543566d1cc9e0530a148cc9dd505c2b66710a7 SHA512 3ed27297af495828d9394d7bdd067d416733ae7a3665784ee37b19273d002a585fcb22f30ec6db93164b0f0c7220af6020984820da4c78a356b2ae71fb9e61c3 WHIRLPOOL bbd0ecfc038fea235febb65f8859a327d37c73d40b0e1117292d7dcb05ca53769d726a8f3408f98202cea549affdc5f9a116b828eaa3346f52c904b571b9a91e
-DIST gimp-2.8.14.tar.bz2 20440077 SHA256 d82a958641c9c752d68e35f65840925c08e314cea90222ad845892a40e05b22d SHA512 533f6b931624d36525cb2f3fbc27fe27565d761bbe26873bb5445c06c01523c044d1814363a8cd76b6e381440db4c6e302b0d3f7a9e5aac7f60072770552f1ba WHIRLPOOL 8fd7b0fd5f8627b2df83481f7956727acd42eafcdc9c9116713d60faf8578005c2fb1e1d729f3b2c836a90e9bab063e477f9da5285e5c43a79f2dbe441a0565b
-DIST gimp-2.8.20.tar.bz2 20853324 SHA256 939ca1df70be865c672ffd654f4e20f188121d01601c5c90237214101533c805 SHA512 5cd02854e21098c0d9d929e9131ede628ed520b6c76190eb9f6db38f057cff956e35b0a891d04c3a2e9c9e85c77f82d7ff5e63404187a8df921553763f649fd7 WHIRLPOOL 14b4791e6849629e3794de28d3bab228dc43df844c56c7777b31e36e4db3173e6c5ccda8f8f116b4fbd2dcec31c24de94d9b822f12bdb20ddc372cf035089355
 DIST gimp-2.8.22.tar.bz2 20873278 SHA256 9187a35cc52b110d78124d7b27b68a68ade14a794c2721314bac6134d2a5638a SHA512 84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6 WHIRLPOOL f9d2f2049b3bf91e8abb8a20b1fda93d801d66ca5d58a9710ae618b0289970c5eaf0df8f195de6c41a4f737fc9e666e011ff7061a45356f18cf426cbbedc3b06
-DIST gimp-2.9.4-r1.tar.xz 18510496 SHA256 c3f3cab83f70c1c2c11c6b94157def3a40f1fd335ffda2ef3e191865fc89d97a SHA512 60691506ad021d34a9728a76529fb7ff653f679979f23346ba84f1f9c36606c6bc118b611e92be79af894cba93746c8bdaeeb00012300c23fe995e50c3204025 WHIRLPOOL a042ac4ccbb8172526cc9fa2ff2df7ac35bd9fcd6283778e03f451766176422ddf250229d9a074821b7a991c24bb14058abe49d9739815681d250f6201467a75
 DIST gimp-2.9.6.tar.bz2 25472593 SHA256 b46f31d822a33ab416dcb15e33e10b5b98430814fa34f5ea4036230e845dfc9f SHA512 c874daedb00fbfa4156f0e244b217e221b047cb3bd22a81fb190a5d9d774212dc7802ec215151c6dc87136148bf9f84ca23a0a6340681a53c39b5fa71b2ded89 WHIRLPOOL c0166b2f7d3c0592c940030441f1d918463a5759ba8748c0c3ba0467b8dd15fea364041784e36aff4298e2754ae4f62d5cb83eb4e98531bf50bda1b7603b69c7
-EBUILD gimp-2.8.14-r2.ebuild 4872 SHA256 4dc87684397320cff14f83052aa9a617a90c13122ccf70c3dd49bea7fbda238a SHA512 168718d113cb300f08b77a5975ccd821d75139478664ea5d2d70213ce02486800fd0ff83e235361676d017e50d188e3b833e4a89bb0f0c95d48a73a3c1fa4eb7 WHIRLPOOL ad9b28244096cd4c978bc092d56e94845e8da418f4fd5a1696962f203c7b03d4fd7425d46dafa997ac46c4e893d901eebcff8f7d6045038c901adef15afb24d6
-EBUILD gimp-2.8.14-r4.ebuild 4896 SHA256 50233875990867140a44385421ca141f3252a1ab4c096f4e328ec7458e43b4ed SHA512 54a6c1a00c219df899740c2210415aab9d1e96a4439333027e7d07d0794a920e2737490b75d43375b4b2c48f812ceb07abc3c5f221f4d2bf3afd1772c0fe07bf WHIRLPOOL 30021375ad3362238393be92dfdacbc2444ab9b0019e137ada12d4a9187b79836583bedc2e130712cf30f8b9018bb1f6815a6b943c1018f6e201a0764fdabe2b
-EBUILD gimp-2.8.20-r1.ebuild 4836 SHA256 a1a54864560f650c82deec9083c44305fe7497d3badce21942e244788766fc2b SHA512 cf5fa5734366c0f716a3b4994bd0b7f16fb7f5fff5413b833659905936040016d2b966a95797a51550ffddb964bd2ad453e7f08619c1d376aae458a98869ddee WHIRLPOOL 60c0167a124cd1d7ee56dbadedff6562eefe681c8d2357227b548e189a133b8eb3f69793383178a9d8eb117d0edf0f5519dfdb20901c3358ee60a6dad69223b5
-EBUILD gimp-2.8.22.ebuild 4761 SHA256 309ea05cec920ee5c7715d6114ace627075b199f99165d62b225103846cb0f7b SHA512 3c0fb02fd4667a15f91ffc439913ec29cd66edd9eaace5079077bca69271c6901524a7ef35dd4337c4727145bf42a79c86aa65a8deaee3d5d571f593a7182a29 WHIRLPOOL d9ec98bd757339349dc337d285117ca135409c7b9caff49fde166ab6059b822f78cb1d1f7218ceda8f5afeef54ae65efb655229ff0563a7429eb8fa0725935f1
-EBUILD gimp-2.9.4-r3.ebuild 5147 SHA256 4fe9f2b17e0317cae0b70bfdd0522b9be9aee923a05f2c022ff56cf22636abff SHA512 b550dfd27f1649558ae59f7f9b2d05b95349e8c56ddd1494eec573ea92ad498f42779585f0346a1c4cca21ad970b80caf4167b23ba2676ee6aa208e555edce92 WHIRLPOOL 6dd63363a7b7299588f0d6ed5a1ffe7031cce0856ff611b4dcbb93ebbb2dc5a277e14fe00a7f5460dc096e6cb24137e674d2b9e0247a9efdb704a9dd5134bb70
+EBUILD gimp-2.8.22.ebuild 4760 SHA256 2a1876c2f6102092d1386ccf6dd70543d5d261838e3911c37ba386b024613fb0 SHA512 4911218b41c0b0f21af7fb8e0b31f2958d41dce51f8764bd92f8c4604a54b7e79528c819b5c464186af7c3f9890a5afc77d6ac85caaa47820d8010481c23a3e4 WHIRLPOOL bfab9bad431425d837effdfcbe33a8749e13dd810cbbeeaa8eadb7283276028e53cd3ce2c1119af5060920384e6fd9303b0e0c2f4a8f0400c8ceda3a17e3400c
 EBUILD gimp-2.9.6.ebuild 5334 SHA256 14d4b7242daaa08b7b66566bd425ebbf40028f057b8f8cf62b536cf2dad013a5 SHA512 bb8602bffe9a22b3ddd24ffcc6d08cb0dcf9f8f64052b77f0d948521c60a06ad87fbf0bdc4c0000d146e19d300fc2e76cf01e425b5a63ad15c9b20cb8c0ae960 WHIRLPOOL 47303bb7a1140d946dc5595d4101d7e614d0e87cd605038daab681416acb77d7de7ab961129cb7049a23cd344c60450a8bdcd5752bf5fd0d285fdb7ccd45ab40
 EBUILD gimp-9999.ebuild 5399 SHA256 d080f168060b128c3dfac9757af6232753e701209a61efe1f8d98b004098b7d9 SHA512 a1990254a48dc25e0f47591f500b6605bbbe8abc3d2558a7a72d078ac28698f71f95b0ba4eac28131ea2d3e064d4c64f8741693dc37d5bef517c101092e43616 WHIRLPOOL d337d6b84816e2a65def0852734c759c1875e9e74cf75e99a1fdea6149afa839ec9cc4e2f477ec67a99eb665998c43414b4dca6830eba2fd769cb6502f7286a5
 MISC ChangeLog 11158 SHA256 81ff7305864fda3dca3f0f17d5962d0a070135c39bd281dc8d4473bf407613c6 SHA512 10c4790c9bcc3c2d26f02a406591f379ac9af193e26c5d5c7933c3cbd1525fd9a6dc296680dc7c1a24b4385e4e14077b8fd9be55a5f9562f68b2e5165ea5b143 WHIRLPOOL 3f47da1911e4b4c9725f87808415aae1cddc62ccdb74314cd4af35c1c83eecf56cc4b9941623461f7731a44ff91be635eae1c816b347666919d298efd75bedae
diff --git a/media-gfx/gimp/files/gimp-2.8.6-uclibc.patch b/media-gfx/gimp/files/gimp-2.8.6-uclibc.patch
deleted file mode 100644
index 855e9872f4b4..000000000000
--- a/media-gfx/gimp/files/gimp-2.8.6-uclibc.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 4fb7a436bca3e11abfda8bc23818af0f09714b9d Mon Sep 17 00:00:00 2001
-From: Michael Natterer <mitch@gimp.org>
-Date: Fri, 02 Aug 2013 14:50:00 +0000
-Subject: Bug 704980 - uclibc - base-utils.c: execinfo.h: No such file or directory
-
-Apply patch from Amadeusz Slawinski that checks for execinfo.h and
-builds the code that needs it conditionally.
----
-diff --git a/app/base/base-utils.c b/app/base/base-utils.c
-index 757f58d..44a9e89 100644
---- a/app/base/base-utils.c
-+++ b/app/base/base-utils.c
-@@ -29,7 +29,7 @@
- #include <process.h>
- #endif
- 
--#ifdef G_OS_UNIX
-+#if defined(G_OS_UNIX) && defined(HAVE_EXECINFO_H)
- /* For get_backtrace() */
- #include <stdlib.h>
- #include <string.h>
-@@ -112,7 +112,7 @@ get_physical_memory_size (void)
- char *
- get_backtrace (void)
- {
--#ifdef G_OS_UNIX
-+#if defined(G_OS_UNIX) && defined(HAVE_EXECINFO_H)
-   void     *functions[MAX_FUNC];
-   char    **function_names;
-   int       n_functions;
-diff --git a/configure.ac b/configure.ac
-index 0bbcbc7..15c7cc6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -416,7 +416,7 @@ AC_HEADER_STDC
- AC_HEADER_SYS_WAIT
- AC_HEADER_TIME
- 
--AC_CHECK_HEADERS(sys/param.h sys/time.h sys/times.h sys/wait.h unistd.h)
-+AC_CHECK_HEADERS(execinfo.h sys/param.h sys/time.h sys/times.h sys/wait.h unistd.h)
- 
- AC_TYPE_PID_T
- AC_FUNC_VPRINTF
---
-cgit v0.9.2
diff --git a/media-gfx/gimp/files/gimp-2.9.2-CVE-2016-4994.patch b/media-gfx/gimp/files/gimp-2.9.2-CVE-2016-4994.patch
deleted file mode 100644
index 846318b42149..000000000000
--- a/media-gfx/gimp/files/gimp-2.9.2-CVE-2016-4994.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 6d804bf9ae77bc86a0a97f9b944a129844df9395 Mon Sep 17 00:00:00 2001
-From: Shmuel H <shmuelgimp@gmail.com>
-Date: Mon, 20 Jun 2016 17:14:41 +0300
-Subject: Bug 767873 - (CVE-2016-4994) Multiple Use-After-Free when parsing...
-
-...XCF channel and layer properties
-
-The properties PROP_ACTIVE_LAYER, PROP_FLOATING_SELECTION,
-PROP_ACTIVE_CHANNEL saves the current object pointer the @info
-structure. Others like PROP_SELECTION (for channel) and
-PROP_GROUP_ITEM (for layer) will delete the current object and create
-a new object, leaving the pointers in @info invalid (dangling).
-
-Therefore, if a property from the first type will come before the
-second, the result will be an UaF in the last lines of xcf_load_image
-(when it actually using the pointers from @info).
-
-I wasn't able to exploit this bug because that
-g_object_instance->c_class gets cleared by the last g_object_unref and
-GIMP_IS_{LAYER,CHANNEL} detects that and return FALSE.
----
- app/xcf/xcf-load.c | 29 +++++++++++++++++++++++++++++
- 1 file changed, 29 insertions(+)
-
-diff --git a/app/xcf/xcf-load.c b/app/xcf/xcf-load.c
-index f48558a..244d5c2 100644
---- a/app/xcf/xcf-load.c
-+++ b/app/xcf/xcf-load.c
-@@ -1141,6 +1141,18 @@ xcf_load_layer_props (XcfInfo    *info,
-         case PROP_GROUP_ITEM:
-           {
-             GimpLayer *group;
-+            gboolean   is_active_layer;
-+
-+            /* We're going to delete *layer, Don't leave its pointers
-+             * in @info.  After that, we'll restore them back with the
-+             * new pointer. See bug #767873.
-+             */
-+            is_active_layer = (*layer == info->active_layer);
-+            if (is_active_layer)
-+              info->active_layer = NULL;
-+
-+            if (*layer == info->floating_sel)
-+              info->floating_sel = NULL;
- 
-             group = gimp_group_layer_new (image);
- 
-@@ -1150,6 +1162,13 @@ xcf_load_layer_props (XcfInfo    *info,
-             g_object_ref_sink (*layer);
-             g_object_unref (*layer);
-             *layer = group;
-+
-+            if (is_active_layer)
-+              info->active_layer = *layer;
-+
-+            /* Don't restore info->floating_sel because group layers
-+             * can't be floating selections
-+             */
-           }
-           break;
- 
-@@ -1220,6 +1239,12 @@ xcf_load_channel_props (XcfInfo      *info,
-           {
-             GimpChannel *mask;
- 
-+            /* We're going to delete *channel, Don't leave its pointer
-+             * in @info. See bug #767873.
-+             */
-+            if (*channel == info->active_channel)
-+              info->active_channel = NULL;
-+
-             mask =
-               gimp_selection_new (image,
-                                   gimp_item_get_width  (GIMP_ITEM (*channel)),
-@@ -1234,6 +1259,10 @@ xcf_load_channel_props (XcfInfo      *info,
-             *channel = mask;
-             (*channel)->boundary_known = FALSE;
-             (*channel)->bounds_known   = FALSE;
-+
-+            /* Don't restore info->active_channel because the
-+             * selection can't be the active channel
-+             */
-           }
-           break;
- 
--- 
-cgit v0.12
-
diff --git a/media-gfx/gimp/files/gimp-2.9.2-gegl-0.3.8.patch b/media-gfx/gimp/files/gimp-2.9.2-gegl-0.3.8.patch
deleted file mode 100644
index a3aa236542bf..000000000000
--- a/media-gfx/gimp/files/gimp-2.9.2-gegl-0.3.8.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://bugs.gentoo.org/586828
-
-Backported from:
-https://git.gnome.org/browse/gimp/commit/?id=2e4685013123c584354bc38612527593a815c38b
-
---- gimp-2.9.2/app/core/gimpparamspecs-duplicate.c
-+++ gimp-2.9.2/app/core/gimpparamspecs-duplicate.c
-@@ -66,23 +66,11 @@
-         }
-       else
-         {
--
-           copy = g_param_spec_string (pspec->name,
-                                       g_param_spec_get_nick (pspec),
-                                       g_param_spec_get_blurb (pspec),
-                                       spec->default_value,
-                                       flags);
--
--          if (GEGL_IS_PARAM_SPEC_MULTILINE (pspec))
--            {
--              static GQuark multiline_quark = 0;
--
--              if (! multiline_quark)
--                multiline_quark = g_quark_from_static_string ("multiline");
--
--              g_param_spec_set_qdata (copy, multiline_quark,
--                                      GINT_TO_POINTER (TRUE));
--            }
-         }
-     }
-   else if (G_IS_PARAM_SPEC_BOOLEAN (pspec))
---- gimp-2.9.2/app/widgets/gimppropgui.c
-+++ gimp-2.9.2/app/widgets/gimppropgui.c
-@@ -227,11 +227,6 @@
-     }
-   else if (G_IS_PARAM_SPEC_STRING (pspec))
-     {
--      static GQuark multiline_quark = 0;
--
--      if (! multiline_quark)
--        multiline_quark = g_quark_from_static_string ("multiline");
--
-       if (GIMP_IS_PARAM_SPEC_CONFIG_PATH (pspec))
-         {
-           widget =
-@@ -239,7 +234,7 @@
-                                                g_param_spec_get_nick (pspec),
-                                                GTK_FILE_CHOOSER_ACTION_OPEN);
-         }
--      else if (g_param_spec_get_qdata (pspec, multiline_quark))
-+      else if (HAS_KEY (pspec, "multiline", "true"))
-         {
-           GtkTextBuffer *buffer;
-           GtkWidget     *view;
diff --git a/media-gfx/gimp/files/gimp-2.9.2-no-deprecation.patch b/media-gfx/gimp/files/gimp-2.9.2-no-deprecation.patch
deleted file mode 100644
index 441298a08fde..000000000000
--- a/media-gfx/gimp/files/gimp-2.9.2-no-deprecation.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 81d7607e5159275a9b693a170f7767ffcb548a1b Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 5 Dec 2015 01:14:37 +0100
-Subject: [PATCH] Do not disable deprecated APIs
-
----
- configure.ac | 27 ---------------------------
- 1 file changed, 27 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4de6e53..8528e87 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2111,33 +2111,6 @@ MIME_TYPES="$MIME_TYPES;"
- AC_SUBST(MIME_TYPES)
- 
- 
--#########################
--# Disable deprecated APIs
--#########################
--
--CPPFLAGS="${CPPFLAGS} -DGIMP_DISABLE_DEPRECATED -DBABL_DISABLE_DEPRECATED -DGSEAL_ENABLE"
--
--# Make sure not to disable deprecated APIs for unreleased versions.
--# We must build without problems with future releases of libraries
--# and disabling deprecated API risks breaking the build
--
--if test "x$have_glib_2_43" != "xyes"; then
--  CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED"
--fi
--
--if test "x$have_gtk_2_26" != "xyes"; then
--  CPPFLAGS="${CPPFLAGS} -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
--fi
--
--if test "x$have_gdk_pixbuf_2_31" != "xyes"; then
--  CPPFLAGS="${CPPFLAGS} -DGDK_PIXBUF_DISABLE_DEPRECATED"
--fi
--
--if test "x$have_pango_1_32" != "xyes"; then
--  CPPFLAGS="${CPPFLAGS} -DPANGO_DISABLE_DEPRECATED"
--fi
--
--
- ############################
- # Require multihead safe API
- ############################
--- 
-2.6.3
-
diff --git a/media-gfx/gimp/files/gimp-2.9.2-version.patch b/media-gfx/gimp/files/gimp-2.9.2-version.patch
deleted file mode 100644
index e48614455577..000000000000
--- a/media-gfx/gimp/files/gimp-2.9.2-version.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f2f7a29ba5aceaa38a285f15c3fe8b481d05b357 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 5 Dec 2015 01:15:22 +0100
-Subject: [PATCH] Sync version string
-
-.. with
-m4_define([gimp_micro_version], [2])
-above
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8528e87..21d86a3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,7 +20,7 @@ m4_define([gimp_binary_age],
-           [m4_eval(100 * gimp_minor_version + gimp_micro_version)])
- 
- # For overriding the version string. Comment out if not needed.
--# m4_define([gimp_version], [2.9.1])
-+# m4_define([gimp_version], [2.9.2])
- 
- # This is the X.Y used in -lgimp-X.Y
- m4_define([gimp_api_version], [2.0])
--- 
-2.6.3
-
diff --git a/media-gfx/gimp/files/gimp-2.9.4-CVE-2007-3126.patch b/media-gfx/gimp/files/gimp-2.9.4-CVE-2007-3126.patch
deleted file mode 100644
index 6c515173d9cd..000000000000
--- a/media-gfx/gimp/files/gimp-2.9.4-CVE-2007-3126.patch
+++ /dev/null
@@ -1,291 +0,0 @@
-From 46bcd82800e37b0f5aead76184430ef2fe802748 Mon Sep 17 00:00:00 2001
-From: Michael Natterer <mitch@gimp.org>
-Date: Sun, 6 Nov 2016 21:34:43 +0100
-Subject: Bug 773233 - CVE-2007-3126 - Gimp 2.3.14 allows context-dependent
- attackers...
-
-...to cause a denial of service (crash) via an ICO file with an
-InfoHeader containing a Height of zero
-
-Add some error handling to ico-load.c and bail out on zero width or height
-icons. Also some formatting cleanup.
----
- plug-ins/file-ico/ico-load.c | 103 ++++++++++++++++++++++++++-----------------
- 1 file changed, 62 insertions(+), 41 deletions(-)
-
-diff --git a/plug-ins/file-ico/ico-load.c b/plug-ins/file-ico/ico-load.c
-index c8091d3..8cce94f 100644
---- a/plug-ins/file-ico/ico-load.c
-+++ b/plug-ins/file-ico/ico-load.c
-@@ -124,15 +124,17 @@ static guint32
- ico_read_init (FILE *fp)
- {
-   IcoFileHeader header;
-+
-   /* read and check file header */
--  if (!ico_read_int16 (fp, &header.reserved, 1)
--      || !ico_read_int16 (fp, &header.resource_type, 1)
--      || !ico_read_int16 (fp, &header.icon_count, 1)
--      || header.reserved != 0
--      || header.resource_type != 1)
-+  if (! ico_read_int16 (fp, &header.reserved, 1)      ||
-+      ! ico_read_int16 (fp, &header.resource_type, 1) ||
-+      ! ico_read_int16 (fp, &header.icon_count, 1)    ||
-+      header.reserved != 0 ||
-+      header.resource_type != 1)
-     {
-       return 0;
-     }
-+
-   return header.icon_count;
- }
- 
-@@ -148,22 +150,25 @@ ico_read_size (FILE        *fp,
-   gint32      color_type;
-   guint32     magic;
- 
--  if ( fseek (fp, info->offset, SEEK_SET) < 0 )
-+  if (fseek (fp, info->offset, SEEK_SET) < 0)
-     return FALSE;
- 
-   ico_read_int32 (fp, &magic, 1);
-+
-   if (magic == ICO_PNG_MAGIC)
-     {
-       png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL,
-                                         NULL);
--      if (! png_ptr )
-+      if (! png_ptr)
-         return FALSE;
-+
-       info_ptr = png_create_info_struct (png_ptr);
--      if (! info_ptr )
-+      if (! info_ptr)
-         {
-           png_destroy_read_struct (&png_ptr, NULL, NULL);
-           return FALSE;
-         }
-+
-       if (setjmp (png_jmpbuf (png_ptr)))
-         {
-           png_destroy_read_struct (&png_ptr, NULL, NULL);
-@@ -182,8 +187,8 @@ ico_read_size (FILE        *fp,
-     }
-   else if (magic == 40)
-     {
--      if (ico_read_int32 (fp, &info->width, 1)
--          && ico_read_int32 (fp, &info->height, 1))
-+      if (ico_read_int32 (fp, &info->width, 1) &&
-+          ico_read_int32 (fp, &info->height, 1))
-         {
-           info->height /= 2;
-           D(("ico_read_size: ICO: %ix%i\n", info->width, info->height));
-@@ -200,8 +205,9 @@ ico_read_size (FILE        *fp,
- }
- 
- static IcoLoadInfo*
--ico_read_info (FILE *fp,
--               gint  icon_count)
-+ico_read_info (FILE    *fp,
-+               gint     icon_count,
-+               GError **error)
- {
-   gint            i;
-   IcoFileEntry   *entries;
-@@ -209,8 +215,11 @@ ico_read_info (FILE *fp,
- 
-   /* read icon entries */
-   entries = g_new (IcoFileEntry, icon_count);
--  if ( fread (entries, sizeof(IcoFileEntry), icon_count, fp) <= 0 )
-+  if (fread (entries, sizeof (IcoFileEntry), icon_count, fp) <= 0)
-     {
-+      g_set_error (error, G_FILE_ERROR, 0,
-+                   _("Could not read '%lu' bytes"),
-+                   sizeof (IcoFileEntry));
-       g_free (entries);
-       return NULL;
-     }
-@@ -218,23 +227,33 @@ ico_read_info (FILE *fp,
-   info = g_new (IcoLoadInfo, icon_count);
-   for (i = 0; i < icon_count; i++)
-     {
--      info[i].width = entries[i].width;
-+      info[i].width  = entries[i].width;
-       info[i].height = entries[i].height;
--      info[i].bpp = GUINT16_FROM_LE (entries[i].bpp);
--      info[i].size = GUINT32_FROM_LE (entries[i].size);
-+      info[i].bpp    = GUINT16_FROM_LE (entries[i].bpp);
-+      info[i].size   = GUINT32_FROM_LE (entries[i].size);
-       info[i].offset = GUINT32_FROM_LE (entries[i].offset);
- 
-       if (info[i].width == 0 || info[i].height == 0)
-         {
--          ico_read_size (fp, info+i);
-+          ico_read_size (fp, info + i);
-         }
- 
-       D(("ico_read_info: %ix%i (%i bits, size: %i, offset: %i)\n",
-          info[i].width, info[i].height, info[i].bpp,
-          info[i].size, info[i].offset));
-+
-+      if (info[i].width == 0 || info[i].height == 0)
-+        {
-+          g_set_error (error, G_FILE_ERROR, 0,
-+                       _("Icon #%d has zero width or height"), i);
-+          g_free (info);
-+          g_free (entries);
-+          return NULL;
-+        }
-     }
- 
-   g_free (entries);
-+
-   return info;
- }
- 
-@@ -256,10 +275,10 @@ ico_read_png (FILE    *fp,
-   gint          i;
- 
-   png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
--  if (! png_ptr )
-+  if (! png_ptr)
-     return FALSE;
-   info = png_create_info_struct (png_ptr);
--  if (! info )
-+  if (! info)
-     {
-       png_destroy_read_struct (&png_ptr, NULL, NULL);
-       return FALSE;
-@@ -287,14 +306,14 @@ ico_read_png (FILE    *fp,
-     {
-     case PNG_COLOR_TYPE_GRAY:
-       png_set_expand_gray_1_2_4_to_8 (png_ptr);
--      if ( bit_depth == 16 )
-+      if (bit_depth == 16)
-         png_set_strip_16 (png_ptr);
-       png_set_gray_to_rgb (png_ptr);
-       png_set_add_alpha (png_ptr, 0xff, PNG_FILLER_AFTER);
-       break;
-     case PNG_COLOR_TYPE_GRAY_ALPHA:
-       png_set_expand_gray_1_2_4_to_8 (png_ptr);
--      if ( bit_depth == 16 )
-+      if (bit_depth == 16)
-         png_set_strip_16 (png_ptr);
-       png_set_gray_to_rgb (png_ptr);
-       break;
-@@ -427,16 +446,18 @@ ico_read_icon (FILE    *fp,
-      data.planes, data.image_size, data.bpp,
-      data.used_clrs, data.important_clrs));
- 
--  if (data.planes != 1
--      || data.compression != 0)
-+  if (data.planes      != 1 ||
-+      data.compression != 0)
-     {
-       D(("skipping image: invalid header\n"));
-       return FALSE;
-     }
- 
--  if (data.bpp != 1 && data.bpp != 4
--      && data.bpp != 8 && data.bpp != 24
--      && data.bpp != 32)
-+  if (data.bpp != 1  &&
-+      data.bpp != 4  &&
-+      data.bpp != 8  &&
-+      data.bpp != 24 &&
-+      data.bpp != 32)
-     {
-       D(("skipping image: invalid depth: %i\n", data.bpp));
-       return FALSE;
-@@ -590,8 +611,8 @@ ico_load_layer (FILE        *fp,
-   GeglBuffer *buffer;
-   gchar       name[ICO_MAXBUF];
- 
--  if ( fseek (fp, info->offset, SEEK_SET) < 0
--       || !ico_read_int32 (fp, &first_bytes, 1) )
-+  if (fseek (fp, info->offset, SEEK_SET) < 0 ||
-+      ! ico_read_int32 (fp, &first_bytes, 1))
-     return -1;
- 
-   if (first_bytes == ICO_PNG_MAGIC)
-@@ -643,7 +664,7 @@ ico_load_image (const gchar  *filename,
-                              gimp_filename_to_utf8 (filename));
- 
-   fp = g_fopen (filename, "rb");
--  if (! fp )
-+  if (! fp)
-     {
-       g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
-                    _("Could not open '%s' for reading: %s"),
-@@ -658,8 +679,8 @@ ico_load_image (const gchar  *filename,
-       return -1;
-     }
- 
--  info = ico_read_info (fp, icon_count);
--  if (!info)
-+  info = ico_read_info (fp, icon_count, error);
-+  if (! info)
-     {
-       fclose (fp);
-       return -1;
-@@ -670,12 +691,12 @@ ico_load_image (const gchar  *filename,
-   max_height = 0;
-   for (i = 0; i < icon_count; i++)
-     {
--      if ( info[i].width > max_width )
-+      if (info[i].width > max_width)
-         max_width = info[i].width;
--      if ( info[i].height > max_height )
-+      if (info[i].height > max_height)
-         max_height = info[i].height;
-     }
--  if ( max_width <= 0 || max_height <= 0 )
-+  if (max_width <= 0 || max_height <= 0)
-     {
-       g_free (info);
-       fclose (fp);
-@@ -721,7 +742,7 @@ ico_load_thumbnail_image (const gchar  *filename,
-                              gimp_filename_to_utf8 (filename));
- 
-   fp = g_fopen (filename, "rb");
--  if (! fp )
-+  if (! fp)
-     {
-       g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
-                    _("Could not open '%s' for reading: %s"),
-@@ -730,7 +751,7 @@ ico_load_thumbnail_image (const gchar  *filename,
-     }
- 
-   icon_count = ico_read_init (fp);
--  if (! icon_count )
-+  if (! icon_count)
-     {
-       fclose (fp);
-       return -1;
-@@ -739,8 +760,8 @@ ico_load_thumbnail_image (const gchar  *filename,
-   D(("*** %s: Microsoft icon file, containing %i icon(s)\n",
-      filename, icon_count));
- 
--  info = ico_read_info (fp, icon_count);
--  if (! info )
-+  info = ico_read_info (fp, icon_count, error);
-+  if (! info)
-     {
-       fclose (fp);
-       return -1;
-@@ -758,9 +779,9 @@ ico_load_thumbnail_image (const gchar  *filename,
- 
-           match = i;
-         }
--      else if ( w == info[i].width
--                && h == info[i].height
--                && info[i].bpp > bpp )
-+      else if (w == info[i].width  &&
-+               h == info[i].height &&
-+               info[i].bpp > bpp)
-         {
-           /* better quality */
-           bpp = info[i].bpp;
--- 
-cgit v0.12
-
diff --git a/media-gfx/gimp/files/gimp-2.9.4-gegl-bin.patch b/media-gfx/gimp/files/gimp-2.9.4-gegl-bin.patch
deleted file mode 100644
index 31057b5796df..000000000000
--- a/media-gfx/gimp/files/gimp-2.9.4-gegl-bin.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8d5de5ce62cd0410c9bccaa77725d0cad051faad Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Mon, 18 Jul 2016 17:42:45 +0200
-Subject: [PATCH] Fix gegl executable name to check for
-
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 45b31b1..0e5be99 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -674,9 +674,9 @@ else
- fi
- AC_MSG_RESULT($have_glib_2_43)
- 
--AC_PATH_PROG(GEGL, gegl, no)
-+AC_PATH_PROG(GEGL, gegl-0.3, no)
- if test "x$GEGL" = xno; then
--  add_deps_error([gegl], [Could not find gegl in your PATH.])
-+  add_deps_error([gegl], [Could not find gegl-0.3 in your PATH.])
- fi
- 
- 
--- 
-2.9.2
-
diff --git a/media-gfx/gimp/files/gimp-2.9.4-mkdir-makefile.patch b/media-gfx/gimp/files/gimp-2.9.4-mkdir-makefile.patch
deleted file mode 100644
index 661ad699f5de..000000000000
--- a/media-gfx/gimp/files/gimp-2.9.4-mkdir-makefile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From c081a26345ad1c5bdf6f4ffec27bca517de6d594 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 23 Jul 2016 01:02:10 +0200
-Subject: [PATCH] Fix creation of output directories
-
-https://bugs.gentoo.org/show_bug.cgi?id=589394
----
- icons/Symbolic-Inverted/Makefile.am | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/icons/Symbolic-Inverted/Makefile.am b/icons/Symbolic-Inverted/Makefile.am
-index 2981cfc..f3fe6a5 100644
---- a/icons/Symbolic-Inverted/Makefile.am
-+++ b/icons/Symbolic-Inverted/Makefile.am
-@@ -10,14 +10,14 @@ include $(top_srcdir)/icons/icon-list.mk
- # As exceptions, we do not want to invert some icons.
- # Just use these as-is: gimp-default-colors, gimp-toilet-paper.png.
- 12/gimp-default-colors.png: $(top_srcdir)/icons/Symbolic/12/gimp-default-colors.png
--	mkdir -p `dirname $<` && cp -f $< $@
-+	mkdir -p `dirname $@` && cp -f $< $@
- scalable/gimp-default-colors.svg: ../Symbolic/scalable/gimp-default-colors.svg
--	mkdir -p `dirname $<` && cp -f $< $@
-+	mkdir -p `dirname $@` && cp -f $< $@
- 
- %/gimp-toilet-paper.png: $(top_srcdir)/icons/Symbolic/$(@D)/gimp-toilet-paper.png
--	mkdir -p `dirname $<` && cp -f $< $@
-+	mkdir -p `dirname $@` && cp -f $< $@
- scalable/gimp-toilet-paper.svg: ../Symbolic/scalable/gimp-toilet-paper.svg
--	mkdir -p `dirname $<` && cp -f $< $@
-+	mkdir -p `dirname $@` && cp -f $< $@
- 
- # Other exceptions: inverted gimp-color-picker-white|black are generated
- # from each other.
--- 
-2.9.2
-
diff --git a/media-gfx/gimp/gimp-2.8.14-r2.ebuild b/media-gfx/gimp/gimp-2.8.14-r2.ebuild
deleted file mode 100644
index d697e22cff94..000000000000
--- a/media-gfx/gimp/gimp-2.8.14-r2.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev webkit wmf xpm"
-
-for lang in ${LANGS}; do
-	IUSE+=" linguas_${lang}"
-done
-
-RDEPEND=">=dev-libs/glib-2.30.2:2
-	>=dev-libs/atk-2.2.0
-	>=x11-libs/gtk+-2.24.10:2
-	>=x11-libs/gdk-pixbuf-2.24.1:2
-	>=x11-libs/cairo-1.10.2
-	>=x11-libs/pango-1.29.4
-	xpm? ( x11-libs/libXpm )
-	>=media-libs/freetype-2.1.7
-	>=media-libs/fontconfig-2.2.0
-	sys-libs/zlib
-	dev-libs/libxml2
-	dev-libs/libxslt
-	x11-themes/hicolor-icon-theme
-	>=media-libs/babl-0.1.10
-	>=media-libs/gegl-0.2.0:0
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	aqua? ( x11-libs/gtk-mac-integration )
-	curl? ( net-misc/curl )
-	dbus? ( dev-libs/dbus-glib )
-	gnome? ( gnome-base/gvfs )
-	webkit? ( >=net-libs/webkit-gtk-1.6.1:2 )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper:= )
-	exif? ( >=media-libs/libexif-0.6.15 )
-	lcms? ( >=media-libs/lcms-2.2:2 )
-	mng? ( media-libs/libmng )
-	pdf? ( >=app-text/poppler-0.12.4[cairo] )
-	png? ( >=media-libs/libpng-1.2.37:0 )
-	python?	(
-		${PYTHON_DEPS}
-		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
-	)
-	tiff? ( >=media-libs/tiff-3.5.7:0 )
-	svg? ( >=gnome-base/librsvg-2.36.0:2 )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	x11-libs/libXcursor
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	postscript? ( app-text/ghostscript-gpl )
-	udev? ( virtual/libgudev:= )"
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.19
-	doc? ( >=dev-util/gtk-doc-1 )
-	>=sys-devel/libtool-2.2
-	>=sys-devel/automake-1.11
-	dev-util/gtk-doc-am"  # due to our call to eautoreconf below (bug #386453)
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-S="${WORKDIR}"/${P}
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	G2CONF="--enable-default-binary \
-		--disable-silent-rules \
-		$(use_with !aqua x) \
-		$(use_with aalib aa) \
-		$(use_with alsa) \
-		$(use_enable altivec) \
-		$(use_with bzip2) \
-		$(use_with curl libcurl) \
-		$(use_with dbus) \
-		$(use_with gnome gvfs) \
-		$(use_with webkit) \
-		$(use_with jpeg libjpeg) \
-		$(use_with jpeg2k libjasper) \
-		$(use_with exif libexif) \
-		$(use_with lcms lcms lcms2) \
-		$(use_with postscript gs) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_with mng libmng) \
-		$(use_with pdf poppler) \
-		$(use_with png libpng) \
-		$(use_enable python) \
-		$(use_enable smp mp) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_with svg librsvg) \
-		$(use_with tiff libtiff) \
-		$(use_with udev gudev) \
-		$(use_with wmf) \
-		--with-xmc \
-		$(use_with xpm libxpm) \
-		--without-xvfb-run"
-
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-blend-center.patch  # bug 558878
-	epatch "${FILESDIR}"/${PN}-2.7.4-no-deprecation.patch  # bug 395695, comment 9 and 16
-	epatch "${FILESDIR}"/${PN}-2.8.10-clang.patch # bug 449370 compile with clang
-	epatch "${FILESDIR}"/${PN}-2.9.2-CVE-2016-4994.patch  # bug 586666
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	eautoreconf  # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
-
-	gnome2_src_prepare
-}
-
-_clean_up_locales() {
-	einfo "Cleaning up locales..."
-	for lang in ${LANGS}; do
-		use "linguas_${lang}" && {
-			einfo "- keeping ${lang}"
-			continue
-		}
-		rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
-	done
-}
-
-src_test() {
-	Xemake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python; then
-		python_optimize
-	fi
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	prune_libtool_files --all
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	local gimp_app_version=$(get_version_component_range 1-2)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
-	_clean_up_locales
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-2.8.14-r4.ebuild b/media-gfx/gimp/gimp-2.8.14-r4.ebuild
deleted file mode 100644
index 0f09309d6927..000000000000
--- a/media-gfx/gimp/gimp-2.8.14-r4.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm"
-
-for lang in ${LANGS}; do
-	IUSE+=" linguas_${lang}"
-done
-
-RDEPEND=">=dev-libs/glib-2.30.2:2
-	>=dev-libs/atk-2.2.0
-	>=x11-libs/gtk+-2.24.10:2
-	>=x11-libs/gdk-pixbuf-2.24.1:2
-	>=x11-libs/cairo-1.10.2
-	>=x11-libs/pango-1.29.4
-	xpm? ( x11-libs/libXpm )
-	>=media-libs/freetype-2.1.7
-	>=media-libs/fontconfig-2.2.0
-	sys-libs/zlib
-	dev-libs/libxml2
-	dev-libs/libxslt
-	x11-themes/hicolor-icon-theme
-	>=media-libs/babl-0.1.10
-	>=media-libs/gegl-0.2.0:0
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	aqua? ( x11-libs/gtk-mac-integration )
-	curl? ( net-misc/curl )
-	dbus? ( dev-libs/dbus-glib )
-	gnome? ( gnome-base/gvfs )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper:= )
-	exif? ( >=media-libs/libexif-0.6.15 )
-	lcms? ( >=media-libs/lcms-2.2:2 )
-	mng? ( media-libs/libmng )
-	pdf? ( >=app-text/poppler-0.12.4[cairo] )
-	png? ( >=media-libs/libpng-1.2.37:0 )
-	python?	(
-		${PYTHON_DEPS}
-		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
-	)
-	tiff? ( >=media-libs/tiff-3.5.7:0 )
-	svg? ( >=gnome-base/librsvg-2.36.0:2 )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	x11-libs/libXcursor
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	postscript? ( app-text/ghostscript-gpl )
-	udev? ( virtual/libgudev:= )"
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.19
-	doc? ( >=dev-util/gtk-doc-1 )
-	>=sys-devel/libtool-2.2
-	>=sys-devel/automake-1.11
-	dev-util/gtk-doc-am"  # due to our call to eautoreconf below (bug #386453)
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-S="${WORKDIR}"/${P}
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	G2CONF="--enable-default-binary \
-		--disable-silent-rules \
-		$(use_with !aqua x) \
-		$(use_with aalib aa) \
-		$(use_with alsa) \
-		$(use_enable altivec) \
-		$(use_with bzip2) \
-		$(use_with curl libcurl) \
-		$(use_with dbus) \
-		$(use_with gnome gvfs) \
-		--without-webkit \
-		$(use_with jpeg libjpeg) \
-		$(use_with jpeg2k libjasper) \
-		$(use_with exif libexif) \
-		$(use_with lcms lcms lcms2) \
-		$(use_with postscript gs) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_with mng libmng) \
-		$(use_with pdf poppler) \
-		$(use_with png libpng) \
-		$(use_enable python) \
-		$(use_enable smp mp) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_with svg librsvg) \
-		$(use_with tiff libtiff) \
-		$(use_with udev gudev) \
-		$(use_with wmf) \
-		--with-xmc \
-		$(use_with xpm libxpm) \
-		--without-xvfb-run"
-
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-blend-center.patch  # bug 558878
-	epatch "${FILESDIR}"/${PN}-2.7.4-no-deprecation.patch  # bug 395695, comment 9 and 16
-	epatch "${FILESDIR}"/${PN}-2.8.10-clang.patch # bug 449370 compile with clang
-	epatch "${FILESDIR}"/${PN}-2.9.2-CVE-2016-4994.patch  # bug 586666
-	epatch "${FILESDIR}"/${PN}-2.9.4-CVE-2007-3126.patch  # bug 618310
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	eautoreconf  # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
-
-	gnome2_src_prepare
-}
-
-_clean_up_locales() {
-	einfo "Cleaning up locales..."
-	for lang in ${LANGS}; do
-		use "linguas_${lang}" && {
-			einfo "- keeping ${lang}"
-			continue
-		}
-		rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
-	done
-}
-
-src_test() {
-	Xemake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python; then
-		python_optimize
-	fi
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	prune_libtool_files --all
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	local gimp_app_version=$(get_version_component_range 1-2)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
-	_clean_up_locales
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-2.8.20-r1.ebuild b/media-gfx/gimp/gimp-2.8.20-r1.ebuild
deleted file mode 100644
index 36bb5254dd15..000000000000
--- a/media-gfx/gimp/gimp-2.8.20-r1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm"
-
-for lang in ${LANGS}; do
-	IUSE+=" linguas_${lang}"
-done
-
-RDEPEND=">=dev-libs/glib-2.30.2:2
-	>=dev-libs/atk-2.2.0
-	>=x11-libs/gtk+-2.24.10:2
-	>=x11-libs/gdk-pixbuf-2.24.1:2
-	>=x11-libs/cairo-1.10.2
-	>=x11-libs/pango-1.29.4
-	xpm? ( x11-libs/libXpm )
-	>=media-libs/freetype-2.1.7
-	>=media-libs/fontconfig-2.2.0
-	sys-libs/zlib
-	dev-libs/libxml2
-	dev-libs/libxslt
-	x11-themes/hicolor-icon-theme
-	>=media-libs/babl-0.1.10
-	>=media-libs/gegl-0.2.0:0
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	aqua? ( x11-libs/gtk-mac-integration )
-	curl? ( net-misc/curl )
-	dbus? ( dev-libs/dbus-glib )
-	gnome? ( gnome-base/gvfs )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper:= )
-	exif? ( >=media-libs/libexif-0.6.15 )
-	lcms? ( >=media-libs/lcms-2.2:2 )
-	mng? ( media-libs/libmng )
-	pdf? ( >=app-text/poppler-0.12.4[cairo] )
-	png? ( >=media-libs/libpng-1.2.37:0 )
-	python?	(
-		${PYTHON_DEPS}
-		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
-	)
-	tiff? ( >=media-libs/tiff-3.5.7:0 )
-	svg? ( >=gnome-base/librsvg-2.36.0:2 )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	x11-libs/libXcursor
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	postscript? ( app-text/ghostscript-gpl )
-	udev? ( virtual/libgudev:= )"
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.19
-	doc? ( >=dev-util/gtk-doc-1 )
-	>=sys-devel/libtool-2.2
-	>=sys-devel/automake-1.11
-	dev-util/gtk-doc-am"  # due to our call to eautoreconf below (bug #386453)
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-S="${WORKDIR}"/${P}
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	G2CONF="--enable-default-binary \
-		--disable-silent-rules \
-		$(use_with !aqua x) \
-		$(use_with aalib aa) \
-		$(use_with alsa) \
-		$(use_enable altivec) \
-		$(use_with bzip2) \
-		$(use_with curl libcurl) \
-		$(use_with dbus) \
-		$(use_with gnome gvfs) \
-		--without-webkit \
-		$(use_with jpeg libjpeg) \
-		$(use_with jpeg2k libjasper) \
-		$(use_with exif libexif) \
-		$(use_with lcms lcms lcms2) \
-		$(use_with postscript gs) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_with mng libmng) \
-		$(use_with pdf poppler) \
-		$(use_with png libpng) \
-		$(use_enable python) \
-		$(use_enable smp mp) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_with svg librsvg) \
-		$(use_with tiff libtiff) \
-		$(use_with udev gudev) \
-		$(use_with wmf) \
-		--with-xmc \
-		$(use_with xpm libxpm) \
-		--without-xvfb-run"
-
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.8.14-blend-center.patch  # bug 558878
-	epatch "${FILESDIR}"/${PN}-2.7.4-no-deprecation.patch  # bug 395695, comment 9 and 16
-	epatch "${FILESDIR}"/${PN}-2.8.10-clang.patch # bug 449370 compile with clang
-	epatch "${FILESDIR}"/${PN}-2.9.4-CVE-2007-3126.patch  # bug 618310
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	eautoreconf  # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
-
-	gnome2_src_prepare
-}
-
-_clean_up_locales() {
-	einfo "Cleaning up locales..."
-	for lang in ${LANGS}; do
-		use "linguas_${lang}" && {
-			einfo "- keeping ${lang}"
-			continue
-		}
-		rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
-	done
-}
-
-src_test() {
-	Xemake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python; then
-		python_optimize
-	fi
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	prune_libtool_files --all
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	local gimp_app_version=$(get_version_component_range 1-2)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
-	_clean_up_locales
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-2.8.22.ebuild b/media-gfx/gimp/gimp-2.8.22.ebuild
index 51de3fe64779..fc037aaa8de1 100644
--- a/media-gfx/gimp/gimp-2.8.22.ebuild
+++ b/media-gfx/gimp/gimp-2.8.22.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gimp.org/"
 SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
 IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm"
diff --git a/media-gfx/gimp/gimp-2.9.4-r3.ebuild b/media-gfx/gimp/gimp-2.9.4-r3.ebuild
deleted file mode 100644
index 8c75005f2e51..000000000000
--- a/media-gfx/gimp/gimp-2.9.4-r3.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="https://www.hartwork.org/public/${P}-r1.tar.xz"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86"
-
-LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev vector-icons wmf xpm"
-
-for lang in ${LANGS}; do
-	IUSE+=" linguas_${lang}"
-done
-
-RDEPEND=">=dev-libs/glib-2.30.2:2
-	>=dev-libs/atk-2.2.0
-	>=x11-libs/gtk+-2.24.10:2
-	dev-util/gtk-update-icon-cache
-	>=x11-libs/gdk-pixbuf-2.31:2
-	>=x11-libs/cairo-1.12.2
-	>=x11-libs/pango-1.29.4
-	xpm? ( x11-libs/libXpm )
-	>=media-libs/freetype-2.1.7
-	>=media-libs/harfbuzz-0.9.19
-	>=media-libs/gexiv2-0.6.1
-	>=media-libs/libmypaint-1.3.0_beta0[gegl]
-	>=media-libs/fontconfig-2.2.0
-	sys-libs/zlib
-	dev-libs/libxml2
-	dev-libs/libxslt
-	x11-themes/hicolor-icon-theme
-	>=media-libs/babl-0.1.18
-	>=media-libs/gegl-0.3.8:0.3[cairo]
-	>=dev-libs/glib-2.43
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	aqua? ( x11-libs/gtk-mac-integration )
-	gnome? ( gnome-base/gvfs )
-	virtual/jpeg:0
-	jpeg2k? ( media-libs/jasper:= )
-	>=media-libs/lcms-2.2:2
-	mng? ( media-libs/libmng )
-	openexr? ( >=media-libs/openexr-1.6.1 )
-	pdf? ( >=app-text/poppler-0.12.4[cairo] >=app-text/poppler-data-0.4.7 )
-	>=media-libs/libpng-1.2.37:0
-	python?	(
-		${PYTHON_DEPS}
-		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
-		>=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
-	)
-	>=media-libs/tiff-3.5.7:0
-	>=gnome-base/librsvg-2.36.0:2
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	x11-libs/libXcursor
-	sys-libs/zlib
-	app-arch/bzip2
-	>=app-arch/xz-utils-5.0.0
-	postscript? ( app-text/ghostscript-gpl )
-	udev? ( virtual/libgudev:= )"
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.19
-	doc? ( >=dev-util/gtk-doc-1 )
-	>=sys-devel/libtool-2.2
-	>=sys-devel/automake-1.11
-	dev-util/gtk-doc-am"  # due to our call to eautoreconf below (bug #386453)
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-S="${WORKDIR}"/${P}-r1
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	G2CONF="--enable-default-binary \
-		--disable-silent-rules \
-		$(use_with !aqua x) \
-		$(use_with aalib aa) \
-		$(use_with alsa) \
-		$(use_enable altivec) \
-		--without-webkit \
-		$(use_with jpeg2k libjasper) \
-		$(use_with postscript gs) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_with mng libmng) \
-		$(use_with openexr) \
-		$(use_with pdf poppler) \
-		$(use_enable python) \
-		$(use_enable smp mp) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		--with-librsvg \
-		$(use_with udev gudev) \
-		$(use_with wmf) \
-		--with-xmc \
-		$(use_with xpm libxpm) \
-		$(use_enable vector-icons) \
-		--without-xvfb-run"
-
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.9.2-no-deprecation.patch  # bug 395695, comment 9 and 16
-	epatch "${FILESDIR}"/${PN}-2.9.4-CVE-2007-3126.patch  # bug 618310
-
-	# Bug 589394
-	rm icons/Symbolic-Inverted/Makefile.in || die
-	epatch "${FILESDIR}"/${PN}-2.9.4-mkdir-makefile.patch
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	eautoreconf  # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-			GEGL=/usr/bin/gegl-0.3 \
-			GDBUS_CODEGEN=/bin/false
-}
-
-src_compile() {
-	# Bugs #569738 and #591214
-	local nv
-	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
-		# We do not check for existence as they may show up later
-		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
-		addwrite "${nv}"
-	done
-	addwrite /dev/dri/  # bug #574038
-	addwrite /dev/ati/  # bug 589198
-	addwrite /proc/mtrr  # bug 589198
-
-	export XDG_DATA_DIRS=/usr/share  # bug 587004
-	gnome2_src_compile
-}
-
-_clean_up_locales() {
-	einfo "Cleaning up locales..."
-	for lang in ${LANGS}; do
-		use "linguas_${lang}" && {
-			einfo "- keeping ${lang}"
-			continue
-		}
-		rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
-	done
-}
-
-src_test() {
-	Xemake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python; then
-		python_optimize
-	fi
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	prune_libtool_files --all
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	local gimp_app_version=$(get_version_component_range 1-2)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
-	_clean_up_locales
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index 3d91b3f78846..367b8f9f2e53 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -3,7 +3,7 @@ DIST gphoto2-2.5.11.tar.bz2 785251 SHA256 392844d6a06512b0d85e7983a5a0c85c8039fe
 DIST gphoto2-2.5.14.tar.bz2 784442 SHA256 9302d02fb472d4936988382b7277ccdc4edaf7ede56c490278912ffd0627699c SHA512 47cb0d212673c9c0dbc996e0a67191a307599c844293a67184bd1529d9e3b417e154c6de64f4563f6f7e599a1bd6b127266f85f5baa97bd7d86922405bf45331 WHIRLPOOL 333bc0925b36ff5254a5e1d740536129ed08bdbfde7c57ba337aec7fe8cd2dcf8720ab6e1b13dc469b86cd10918926daa65f378e12cf0f29ebe2ff71a5cf62d4
 EBUILD gphoto2-2.5.10.ebuild 1258 SHA256 07cf6cd804166f391501dcef1689ee97c905e56845c3cf5f3ef6b8f1797bee86 SHA512 3566fa93cf6afa51f4673a862c9f26689a8d64e127b9eb8f268d278335171333051ea7bb809efce21d4ad69a4b8936af50db3e2d02b8e22b5298147a3494c341 WHIRLPOOL 7d9468c6ea58253239f22110bf9d31f3be2073e39c23e8fe5613d04fd8aabcfa500ba3135b172573c85f48a5471f6f43d420bb7d3b0b25c20a9d04bc953042bd
 EBUILD gphoto2-2.5.11.ebuild 1393 SHA256 7b34c6f5dc94184f5e135fe78cd8f31e9cf673d34da511343fecf9ca010effea SHA512 c467516e247d1c0b6579ea1b5e0b6e706883a52ffc8848ee6a5d8533d69387d675362621b47a45c5b2fc1f4681aa9793d6dd2e1421da7e04f1a8895163bc397a WHIRLPOOL f64749e0a108cbda6cb2dd12d9ae8b15500a3a04c1ccbb446c48fb57221f76faf5aa480e2682a2c86791e9c6b6d87dd5b3f8c0d79d241ff4cfa7df93210f75eb
-EBUILD gphoto2-2.5.14.ebuild 1395 SHA256 57c0931bc658869c369a096e52f016aebd23a067e4ff06e3584ff1a6a30e6235 SHA512 4e1e4f15318b933a1580585630a652c3c481c5ed774d71091951b73c22d52d8000f5bcb804cbf14bfee3166cca21c011569432d1d120599cfb78e4eab5bd389f WHIRLPOOL 8c5cff1ad27d493f0ea924ef718b153b6dda11cd7723764120ad14aa414ce0445285cbd1e0bff7600159915535466415e3dbc9a00d33e5cc9a703ad809b10033
+EBUILD gphoto2-2.5.14.ebuild 1394 SHA256 6ab0f48523a5c5dcdd8b170fe6579a463425a19b8054f5e690caeaa64016b99b SHA512 784091f949aaa895bcc0a4b04f8b9ccb7c7953adce5c512ed9019b72fc321e2951f426fb413cefeddcd572fcf853e9c19173b864aaaeb870341617b85d1970ab WHIRLPOOL c91431f176da9f4635084ca67c85c37fd947d0caddc135e9cba234e674b571e486f68e5ec05d0ed53b12a0942481379b06fe9b71f3a03a63254bbf23d2eeb250
 MISC ChangeLog 6553 SHA256 f8ecc7ea4f29c4d7685825c7202177b3f921a5d1aaa3d3b651939d50ddc147ee SHA512 76d83584319485d19314f6432533aeb8adc43a99c8f34151a21ddad065f17286eebfba52a0d1c515dc60dc2b85fe434a1b0c5276529a150830152f63d7975d8d WHIRLPOOL 49228705dce8fa812215b238c99811f41dc91a771b4d3c410cdafa0027179b7b2a5a580c7d05c24895fd894f70735240d4c233aef8cb540797a4b27484cd20dc
 MISC ChangeLog-2015 21574 SHA256 08159f5e47c8d762386fda5cfd18b4317a6598d1e4d7ae4489e8afea5ebe1436 SHA512 ff3248b17169cb0c25ab4da00cd589797609a2b73cb65f6930acd42efd91e3244571655209f7fd524984f5fe6bc01c9da699eb2e47e8496b7b57f36e79614692 WHIRLPOOL 5f8936414452b2308b2c108ac4f1d8ffb76bcc01020f96ae788117ba96324227e55176308de07880ec17771b7571de501050030e8ed5fa37f97be42ae494803c
 MISC metadata.xml 449 SHA256 9e3d5c2509e7e36290a192a72f04825f111c9cceaf386756aa544c5094226e1a SHA512 f938819a203e0119b1d81aa1dc812717d6ef02c3012f8ed667db452c7712bb7b142cee36d519ec33f4cf65ebcba7a660e2f67f6b66087ec6be832a4987e10c53 WHIRLPOOL d61f1a2cafc04238d88764b8a3202744de7536cd6b29232a96547920bf852220961ff0436757ab4087fbae05d5efea22703a0282d5585043df1d1d1f232a0b84
diff --git a/media-gfx/gphoto2/gphoto2-2.5.14.ebuild b/media-gfx/gphoto2/gphoto2-2.5.14.ebuild
index 9866396a715e..543181c28e42 100644
--- a/media-gfx/gphoto2/gphoto2-2.5.14.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.5.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="alpha ~amd64 hppa ppc ppc64 ~sparc x86"
 IUSE="aalib exif ncurses nls readline"
 
 # aalib -> needs libjpeg
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 8ef5963f9ef4..cf20a4c25140 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -3,7 +3,7 @@ AUX graphicsmagick-1.3.19-perl.patch 491 SHA256 98899a22071a112e332bbe2dfec119e0
 DIST GraphicsMagick-1.3.25.tar.xz 5387880 SHA256 d64bfa52d2e0730eff9ce3ed51d4fc78dbb68e2adaa317b2bb3c56e6ee61ac9f SHA512 d62d6aee96d7b8444f1aa206b0c5cbbed9511612cb71d667af072ea52b68dcd11088699debc58faacbb014ad83fb8c2b3e474220f506069f7b5d22f0340f8ef8 WHIRLPOOL 8c2ffccf588495b78e0d84737e83ae396cbe86efa5dfddf6ec440626829d7b83f036771ec8be585dae58c3076eba8190ee809f0c09fc74c744efec96480a634b
 DIST GraphicsMagick-1.3.26.tar.xz 5400564 SHA256 fba015f3d5e5d5f17e57db663f1aa9d338e7b62f1d415b85d13ee366927e5f88 SHA512 b33ca0f1c858428693aee27a9089acff9e63d1110f85fa036894cfefe6274e7b2422758ea39852f94fdb4823c9c3f3c44b0d8906627503301f5928096f739f22 WHIRLPOOL 8c8874c34be6c921dfc5623352a04d2cf502f2b28aebad1f8d63c1067d5ffa7af6a22e9b9b7095bd98674ffc5c456434598145721431d1d5f7c7e68ab362e238
 EBUILD graphicsmagick-1.3.25.ebuild 3162 SHA256 9772c4d5ffdfbe07e98e4e9597f845925a1b5a29c8890e4c7e64f130bc9d5f8a SHA512 ec889b617290ea3163b25be55260dffc754867db2f730104de45b465e90ad31550fd451c813d52dc611e66f5a2639e5d4923e48e25a5ca49ccd8797183385c32 WHIRLPOOL 617d7a9a3c1ad531e39107a9c1dcf3497e6adee6cb72e4f515afb70e2e273ff9e7f8e320253bed59cb028f913aaa1fc6bec36e96380237cc2583f8a67f8c7bb0
-EBUILD graphicsmagick-1.3.26.ebuild 3278 SHA256 7e0c63e4ab0762183d8a7a5bd3a04734deac5dd81c4ca98f001fcd468c84cfe6 SHA512 1b848435b0c903ed29086213942809ae7befb62a352aced93f20024e97f832b9119a18022a29498fd8dd9f24c60dd23718310346d98c9fc9e331237cc744f345 WHIRLPOOL 4a8753d55d97fca1011d696ef744248facfe554b1e07b5ed91b4e99449b9a88d4d19e2c50ace40fc85f7a41fd39021179982189119f6151d2ade37b725b402c6
+EBUILD graphicsmagick-1.3.26.ebuild 3275 SHA256 c539191152533711c283ea1d192372bf980f4cc8f9fcb5dd1d7359231865c86e SHA512 a28b4b47c1d4c7860be37b8480ecca5055008157969f208878c951068ab901cded604370663154c95f742c011a98554ac67e1f97a8e0b3a052cc01c8cb6a6696 WHIRLPOOL 59d0923c3681b972536afb4c19ff72d06f48f5c0b95ecaacbb0185d771168b8b00f0bc8ad5c7d62c849472e2f25eb11cdeb850580256f41767a1110b32bc6633
 EBUILD graphicsmagick-9999.ebuild 3283 SHA256 604914952995e6c0e53f6b86df71007a8e9c3b13a6351546b82060e3a5970817 SHA512 361ebf78cf28c28073a786931e0470e8bbf0da188edd5c9b68e51d1c3cf04916ead74e743b9fd8e5980bb9de37c4d639c5c32fc630665d55e6fc9c4717a15480 WHIRLPOOL dae4588534d0b627051adae32c8ac6d9b10593bb7e9c6a443e2f9979a5fc9ae9e59d2ae501e90989bcd23bd6361617b1c7f3219a4310e3a26dddf0a5e2338e26
 MISC ChangeLog 8279 SHA256 942d53bb0df3374e5a890ba0fa3b6410a4570e4f32a6140422760aca294f2729 SHA512 4e57e7d633fa10818e13e5b66cbd914a8d359bd1982d828c11328cb52eb00994b0ae62e1917722085736c16e06677da0e67e76b92eb38cb130f13adaec362e05 WHIRLPOOL 21c6e65a2aa94a1588479e9b42943c774507f49127db5c056c3b9d6652562cec97d32e68817052c5a8e95fdfa4f36e710a22e3c55e08fcf88ab31e32005d3b3e
 MISC ChangeLog-2015 14451 SHA256 22b7127860406f4d3c6e56317c76c6765e1fe46a790f238506c83101199c9a92 SHA512 50e9a3c6b90e6ec809048762d154a075f4e3c9468bdfd8d1cebdd4cda067f82a9e58380c7c74565058de80cc4a180558613d9c5c7459bb5b13335b6a84db0cc0 WHIRLPOOL 7820861ab3397fc23dd4a497cc4860beef98393d0e6ed95b82dc35bae54357f8ab4bf2ac6c270fa7bfb6fbcea959f955272cee989b0ae8cc4715226464d6a741
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.26.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.26.ebuild
index 988d761ed6ae..1c81eee7da7f 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.26.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.26.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
 else
 	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 5b760a0a195f..1a85c9687817 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,13 +1,17 @@
 DIST ImageMagick-6.9.9-0.tar.xz 8780640 SHA256 0a8a091dc4f57ec486e03285a1c30dc3f062d58133f848b6274dfc6ae5dbb60b SHA512 ddd2042e5d9fd2ee9ba91f65c7be3f0cf1a8ce340be9cefaaca2517073d2319b43b7190c5302c92e845f8e250d87681e375aec7238ca93401b42dd248776e338 WHIRLPOOL 603965b07098c3963ab5c089ee4a3fa4b1d36eb8fa52d1e5c22d2dd9bdd6b5ffa165713274fb524991faffe447ce7df14df40c8848f1436e7b86c25d901eda45
 DIST ImageMagick-6.9.9-18.tar.xz 8797460 SHA256 121dd50d051488e908306d7d1ba624781f5ec9532d30a2281b4a2bf6f26ee0b4 SHA512 b18733e01c3f41a221a691ceb992bb2e7ecabbdd1b4765c5dd46f00c2047db8534acee9659aed55786baa00062946353bd02ac60b0609caf21f87fb34a40d290 WHIRLPOOL 9077ece10f3ab8be3334816589640523bed69eef1a3cb789653cb9b260caef6721ef941010f806b00a65f8bd5a9bafa87578163b2b92888f488cdabc49218408
+DIST ImageMagick-6.9.9-20.tar.xz 8994128 SHA256 72131caaee1c673923709f7353b6731b43a2735b29110deac5121db403b07f0f SHA512 36c241490ee41de5cd72e5bc297ac2353a0d4574337776445798b0c5823f491304c3f3a728d420d03f66b652eafcdb68ec2992347321ac3919c1d72c0afdb849 WHIRLPOOL 757763b393b2ebc41d264c3e49f42bbfab1a5bf1e0bf0507d944346500fde299280ed9e8710b8f02740bf72934a58cd85afd8cba31963a452a6de9bdaca27f94
 DIST ImageMagick-6.9.9-9.tar.xz 8797832 SHA256 59eed394d295d651e49ec0f3cfe3f0bb7aeccc28bd7a32360db9f8fc4bf9f25c SHA512 d024f753e1bf234e38736935f38a9bf82969ca77130059383f9d1871a39f68d7678a546d2786d57d602744e2008909df3f2ab08e1207b4c97c0952e7b03876d8 WHIRLPOOL f56279a778c81b6a1b61b7e47f24de25b4758c6d46fabf1f63c6847dac151297ec6bd76e390b3f21b0521963b254771ad9779ed3b4e62f0d77e94f225ec595ef
 DIST ImageMagick-7.0.6-9.tar.xz 8550004 SHA256 aa8cb89dad36b555d8ca497f207008a56b315727c9b5d6d7b28f8f9e3ee7ac25 SHA512 5756d2605cbfbd876765372e954aeefdcdf60f1ee364ce40c3302f8958c510e6f0ecf47a3ee3c264eaaade1504bdae068118eb2cb96d418237f7f53da94a6c11 WHIRLPOOL 602c18d89b4f463d1bbd96d2a9e75c3dd2c2b11419ebe8611121f3a8d6c9ec82798cc5b1183d2f8c2cf7e174695faad4b35468540e3ee7a8c58de4a240035dfe
 DIST ImageMagick-7.0.7-6.tar.xz 8556160 SHA256 52ae1acad9cfbba871b9d3cf033235067a49a20a510c1d6228a4fb3372d5b50e SHA512 9dff09a29b94f0de8ede82473820860f812edf3fc8edb0d1f8daa21c127d3e7831047f33ab22c407f2803a03561b690a52525672da837bbab1a1255156b4e6ff WHIRLPOOL ca21db0a46d055e7bc3a942e70f785599eafbd44e325dd6a33bf42dd19e655ebb0143a12d26b460d9708600e3925aab97f7ce403fbadb65eb14cb90cb3254313
+DIST ImageMagick-7.0.7-8.tar.xz 8797060 SHA256 547826f95a23ad3a1a6a514c0bff16ae875f6b7211809dff566e5994f65a0313 SHA512 0852df3bc996032a713ce6dc274cc36c3818c1c8304223de391e58bce8230aa12ac9778b4b28278c0ab4e42f2a7b4094052a5e4e6e4208329848948237fb41d2 WHIRLPOOL 13a6baf033b4caa0543fa36e4d91d82dc03b7875582e63a0803f152796041870b798ee8fdb0a923b6da08836fd7f1be5faffe36cf5e3241cb8154c3287ce294d
 EBUILD imagemagick-6.9.9.0.ebuild 5158 SHA256 4822fa883719ae3c6bb7d9e0056326f7a4970483c617c1becb7db7fac2068f7d SHA512 ddec64d6ede1cf433bce3a4da1fb74c0346349b922cc1dd164acfb6cce99df1c207296a2334a7b59163a34250e91a80b8a7cb4a607fbca1bdb84bb3ee3c9f36c WHIRLPOOL 6e34e09dffaeaa9da599cc2b3536f16a455c6dd0fc872ff3ac7b8b07040ca77f487bdb7d09d54992356584bfc7203c7124952dbf7467f46f9fff2620bae82abb
 EBUILD imagemagick-6.9.9.18.ebuild 5128 SHA256 69585ea6cefba51c7f455a1ae8b70ad42b55ca1dee9cb4e592daf6817096e65d SHA512 86114b9cd2ffb6aa94808060abb78a03897e7ae0611b3c326ba60fe2ff17506209c413fc863a32ac63ae36d24ae2960cdc931b7b0493a8cb04189fa163990c68 WHIRLPOOL 940edc57060600983539f50dfcb635e36e9a642fa5cabe4874f95acc8a1a37b2fe96b2b715b546feb9aa7d30d75f8e5adf5af0f731f3c3b455428e34747c23d3
+EBUILD imagemagick-6.9.9.20.ebuild 5128 SHA256 69585ea6cefba51c7f455a1ae8b70ad42b55ca1dee9cb4e592daf6817096e65d SHA512 86114b9cd2ffb6aa94808060abb78a03897e7ae0611b3c326ba60fe2ff17506209c413fc863a32ac63ae36d24ae2960cdc931b7b0493a8cb04189fa163990c68 WHIRLPOOL 940edc57060600983539f50dfcb635e36e9a642fa5cabe4874f95acc8a1a37b2fe96b2b715b546feb9aa7d30d75f8e5adf5af0f731f3c3b455428e34747c23d3
 EBUILD imagemagick-6.9.9.9.ebuild 5128 SHA256 69585ea6cefba51c7f455a1ae8b70ad42b55ca1dee9cb4e592daf6817096e65d SHA512 86114b9cd2ffb6aa94808060abb78a03897e7ae0611b3c326ba60fe2ff17506209c413fc863a32ac63ae36d24ae2960cdc931b7b0493a8cb04189fa163990c68 WHIRLPOOL 940edc57060600983539f50dfcb635e36e9a642fa5cabe4874f95acc8a1a37b2fe96b2b715b546feb9aa7d30d75f8e5adf5af0f731f3c3b455428e34747c23d3
 EBUILD imagemagick-7.0.6.9.ebuild 5134 SHA256 8af6a6b8deb0b4e8de1796d6d13fd6fafeb732b95fe421a46ea4da39dc662ceb SHA512 e16e30d01265170f4e39cce0d9d4385246dbff419d021f80bae3c1138b076b14e8cfb58fa8e4adde535c2866c62d3a2c3fac4adf07be5c118e0ea15d3b5c6ae0 WHIRLPOOL ccd9a043a143f3da3af17dcf5253ed1cb66fd34d9d343239d4a65bdbb63855a8c5727610ad352c8dce6289316a315e8ae3799947096028c2b5cc10553c4f56a2
 EBUILD imagemagick-7.0.7.6.ebuild 5134 SHA256 8af6a6b8deb0b4e8de1796d6d13fd6fafeb732b95fe421a46ea4da39dc662ceb SHA512 e16e30d01265170f4e39cce0d9d4385246dbff419d021f80bae3c1138b076b14e8cfb58fa8e4adde535c2866c62d3a2c3fac4adf07be5c118e0ea15d3b5c6ae0 WHIRLPOOL ccd9a043a143f3da3af17dcf5253ed1cb66fd34d9d343239d4a65bdbb63855a8c5727610ad352c8dce6289316a315e8ae3799947096028c2b5cc10553c4f56a2
+EBUILD imagemagick-7.0.7.8.ebuild 5134 SHA256 8af6a6b8deb0b4e8de1796d6d13fd6fafeb732b95fe421a46ea4da39dc662ceb SHA512 e16e30d01265170f4e39cce0d9d4385246dbff419d021f80bae3c1138b076b14e8cfb58fa8e4adde535c2866c62d3a2c3fac4adf07be5c118e0ea15d3b5c6ae0 WHIRLPOOL ccd9a043a143f3da3af17dcf5253ed1cb66fd34d9d343239d4a65bdbb63855a8c5727610ad352c8dce6289316a315e8ae3799947096028c2b5cc10553c4f56a2
 MISC ChangeLog 20380 SHA256 10035fab48a5e4cf8e34a2012a5db0ec65d4031b7df442d1a53dc2b7230ef9ee SHA512 b4021c1454a9df5c9bb50090122f997cf0f00664c568cf0def90af7e096dd2bbf30fdf9f7773468ae50c0367563384e98c8dc5cfc279b5b00f02832570c4f6d9 WHIRLPOOL 9bcc31f87c6248716fd48ecc5d2e5d07e0269e887f9dd8ed10a9b24f73d2c0795395c0711abea8767b9b399acf407bad358b0592ddc13a82414e920b82eca638
 MISC ChangeLog-2015 87760 SHA256 1834d883d60f41b0d6e6f851379779e4cc99fb52433b977af8c8e9b3782559d4 SHA512 3c1e2ece8d51a1e2aae9688411cff7d4cd5e31fc36e7958cb6ece5733a1feb2329e4c299d64cf894537c94c6dcbe79c097c493ca4438d38d707d0dbaae824a0a WHIRLPOOL 1e98ac43b05ce9b8eb9141476f6f1af383daea23ceb27cf8f12c89048980ebeaf30f147f665ea5eafa7df6363c73c073b8e1c09d5665736e0d67bb73f265308b
 MISC metadata.xml 984 SHA256 14ff1c5241377a5857c52b45fb317ac531afa99b6a01b6f55ec21d6e59a09dcf SHA512 39a4c5aa27db2de81ad4621bacf43baf96415eecdf836fb2024890634c025b29f2b41dc003ac4d6f87b2365c1a4c68b6af2b9e169b3137bbee3e0a6cb435c5c7 WHIRLPOOL 4df1670e22b5393b0e64408091f5874839f8c89b2aeb926f13b1967bf3bd65fa18617845788e4a31906fa4ebc76fc68e2d5cd16de07f89ad3944e07f63bb5898
diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.20.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.20.ebuild
new file mode 100644
index 000000000000..d91b5ff35eef
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.9.20.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
+
+MY_P=ImageMagick-$(replace_version_separator 3 '-')
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.imagemagick.org/"
+SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RESTRICT="perl? ( userpriv )"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-gfx/ufraw )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-proto/xextproto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	local mesa_cards ati_cards nvidia_cards render_cards
+	default
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
+	emake check
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.8.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.8.ebuild
new file mode 100644
index 000000000000..fc7b7060e362
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.7.8.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
+
+MY_P=ImageMagick-$(replace_version_separator 3 '-')
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.imagemagick.org/"
+SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RESTRICT="perl? ( userpriv )"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-gfx/ufraw )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-proto/xextproto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	local ati_cards mesa_cards nvidia_cards render_cards
+	default
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
+	emake check
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
diff --git a/media-gfx/imageworsener/Manifest b/media-gfx/imageworsener/Manifest
index e037cc10b962..0b75bc4ef82f 100644
--- a/media-gfx/imageworsener/Manifest
+++ b/media-gfx/imageworsener/Manifest
@@ -1,7 +1,7 @@
 DIST imageworsener-1.3.1.tar.gz 661055 SHA256 beb0c988c02b1d461dccdb3d6c4fc229316a692ea38689874013ba349dff66d1 SHA512 a44589e720bc91662e286096f744347e3ec3669c33791f81c3f2aeb9d0514ed909dc73615db1d7631139df72aba9ccfbada61b7dcf82f6ffac622ab64a186b49 WHIRLPOOL a7d995a63f9e637ce4ab5da4967ef8e1b8a9108b4ace256e6ddf2b33c9a5445cd85caf74f83f51635789971676124c5b175c16df2cccf85f93e6544cd59ba096
 DIST imageworsener-1.3.2.tar.gz 661710 SHA256 0946f8e82eaf4c51b7f3f2624eef89bfdf73b7c5b04d23aae8d3fbe01cca3ea2 SHA512 99b30ac838f437a85985eb830d0557f22c69bc40ef2dafe3493f145b70a89b72699e134f061719fa0dcc8b585ed2b418a6afc0c2f7ce67e2e9383d48a7b7b668 WHIRLPOOL 439e38478334fb66455a77fe674a58c9392f009420f9465e533f0101824e18d9c537910af6d5eaa1f0f32f8ee22b710ec2963f9003e6e39bc92e44115f6b7abe
 EBUILD imageworsener-1.3.1.ebuild 1007 SHA256 5d7b952adb0fc2442a0b804c99edb4a74b83541e911f105ebcd20e01b6ef98ec SHA512 bfe07f2ebb359e3b53cf2f86a7bb766084633b6a5f14a0aba8d8997797f5a36da8e81a30ba62715d73461bdbdf56dea887951663d8891a1514b1dc8c31f398e7 WHIRLPOOL 32c7c389eb8ae64b07158a36b8839ffab1bf8fcae3df97840da48894a684a31716939b0db499439d2fcecf11b1f11017f3da2fae76375be2294d3cafab77c93f
-EBUILD imageworsener-1.3.2.ebuild 1009 SHA256 93f9ca4629e67ff17afa9fed917db52088de588997a5c009ae3c41b6e698d91a SHA512 2807e1a69dd14048d592a1aa7a3ed8aae752d1bdcfe41ccf79c37acf05c2f1b16ceb10e3cf96d7ed7690282839ecc10ad519ffe7efaa90c089b54127b2fcffb3 WHIRLPOOL d951478d68048140971610e723a7206d80dda451f8c9c951837f057f2f9e89ba4b5c687437a083f7320d56a60d098000378605176bcfc0291072cf932ef66a44
+EBUILD imageworsener-1.3.2.ebuild 1008 SHA256 a5f5c46ed34fa4ec084a1951f5ab2f7e946faa854f42dc2386c7d1d4eb373b60 SHA512 72c50b8541e541e664b0c8277b590a77225365e569db65d78db4eabd5fd1970d411c8e770a83ca9605597a6d22eea3469c52726cd93150ceddb0776cbc3fc784 WHIRLPOOL 432615515138d26b7f3398d81f1ac898d98b7c78e53e9326543349366bf61bb83f51dd02dca35e52c04abef89303e0f4da95616a3d6cd3ebfe149283fdeebf3e
 MISC ChangeLog 2880 SHA256 4b8517955d6e569a2e82cb4c3b8dc899f72be4221acd2b1c195b1c0ac4b7f7ba SHA512 9efddf99bb2f5951768f06d750390b977b005345bf0480ea4fcb0910dd05dc127e70ef79fb982eb5d5a0a7a5b4803c694c213b1ed97c8a0f785fe5d24d585fa3 WHIRLPOOL 5eca88843ec7e23725a166d40494b1904ccfe8a53c01e4f5056e4fd00c5020b5d74a0a25cc4a7478c5aeec7878e6a701f4b625363bb12c3f024f30795706f83f
 MISC ChangeLog-2015 4803 SHA256 de31e91ac68d5ce7c33e999f39d72dbd91db0dd49e232a11f819faa9645a217b SHA512 1fb53a2cd82449db3ed3c853f93a4fa73e079052dcdf0e650e049a4a433481ee39685ba01005522bd8df76960cffbb87825c94b6f98b0fbdbb9840a6a2fd15c7 WHIRLPOOL a2ef88194d3b0255b0dc8dbe46ddfcb6fbce30e6ddb0e30a5bdb51d41c4d2a5a14b53bdbddda9f6818ea320b00cb9b21b1fb7cfe3a58d5c41bb44e91eb9a0049
 MISC metadata.xml 317 SHA256 5d10bd548020dee0cd77c547cb2cf7da3c2e0325320bf519e2c82b53711d6640 SHA512 128c5649fb194a4fef505f3445de2e4f114a966ddde1af3ac3ca5af23b260e0c038b743a7f95f7cc5e3268aeebbdfa9afeca7d152b5cb7a297d69c1ad4ef4e6a WHIRLPOOL babda29d7160676bdc4920a0f5a2f83c84f6978188cc04227c6b02df5f5f6de01956a55ce7e6fe1acbde094fe4a015d20453414ab550d80cae187bc1af9bc9f7
diff --git a/media-gfx/imageworsener/imageworsener-1.3.2.ebuild b/media-gfx/imageworsener/imageworsener-1.3.2.ebuild
index c03573408ae1..c13007166677 100644
--- a/media-gfx/imageworsener/imageworsener-1.3.2.ebuild
+++ b/media-gfx/imageworsener/imageworsener-1.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://entropymine.com/${PN}/${P}.tar.gz"
 
 LICENSE="MIT-with-advertising"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="jpeg png static-libs test webp zlib"
 
 DEPEND="png? ( media-libs/libpng:0 )
diff --git a/media-gfx/kcoloredit/Manifest b/media-gfx/kcoloredit/Manifest
index 7b484216d0d9..c8cf906816af 100644
--- a/media-gfx/kcoloredit/Manifest
+++ b/media-gfx/kcoloredit/Manifest
@@ -1,6 +1,6 @@
 AUX kcoloredit-2.0.0-underlinking.patch 554 SHA256 bc92a15ca63dbfc2ef1289df4aa653c2c5532adb8bb3b6fe56d1036a94339d90 SHA512 6a3640bd91e659f6971a651ffc5872ce7e7d8949f0e68a52e8ae8e65888cc2f322882fe7dc5305d727919855c3a73ec059e28e9ad536f53b88064ba79510143d WHIRLPOOL be0b4a21fa9897a63ae2804fe81bab7ed1944c075f6238519b075e61bdb4b0a555a9e33f18ef660e93e0a29f6a89febe0d897266e871b81369ae446d4b412868
 DIST kcoloredit-2.0.0-kde4.4.0.tar.bz2 156462 SHA256 37712000c5c6990deb3a43e55b463704dc736a06450df9dafa1a030afcf79e6e SHA512 93a418e475bb8f494a90c409c60573d3d7936921b7dac5b1dd669d0934123b234df013c0b1a594f211c33200b62d3b8edef80a826f6f75da110ec8a1af99a140 WHIRLPOOL b812867b5c02eae2ef4fbbd2eb29f1dd83ae08c135faf96998e56b56192b632d2dc8992f5ced922d93ba0ad36e8d21b4eeec6239433f96fb69453fbb1777d0a8
-EBUILD kcoloredit-2.0.0-r1.ebuild 772 SHA256 43b45d7caf80460b15b911ac2e8c7f1500e9f19b6cc77bc7bbe7a26d90cc3da9 SHA512 d46d7068072057bbfeeffcc696c694b56b6323c45f0cd3dd1709d189ff5ab28654a16f230f9cbfeea0ac8403df5d0cd3f7f216fa64cef2cae8459f816e65a18a WHIRLPOOL 29cace3c739b820821a701fddc4698d4da95832f1e38aafcf825c7773b6c6e37e2a27e96bf0ffc92e38d5fa021e0b8ad69aebf7982c66ef8b59b588d5d164d67
+EBUILD kcoloredit-2.0.0-r1.ebuild 751 SHA256 a47bf2dae1f5c5b4f7b0b2d5be5f1dbf298f97c86195440feb29acca4b6337e0 SHA512 8e18ad1808c200a9c74977449c88e0c4128f1d072150d8e395ee913408a8e191ae055367bb3c297c1fafde4c2765bc37afbe2f8d533d5a016b411ba3ad286fba WHIRLPOOL 66dbe465634eaa27ddd4fc230c05d4a8863399055e9f3c41ffc87065816d58ec782fe897fbd56e94c2802825f312d34c5db52c20120c63004a71cf22d0e9b5b7
 MISC ChangeLog 2665 SHA256 1fc336ebb0826561d0240594d6438edbe4f0dd34a1e8b79c56632bfcdff0621c SHA512 b4e6242cf2300a574356a98475c93625ce98fba2059f7108d87dd0bc460eae8d6ed1c406cbd10e3303bf9563889dd7a7c4b3b9f828bcea9375e420790bd26acf WHIRLPOOL 39a6f7ca0a260e3f8347a88ac281a9734f7fc322e07507ae3b12e1e80ed50be615b4001713b1f22ec7878eb32518d67ef3439a8c7066346112f3d25b5f122524
 MISC ChangeLog-2015 1319 SHA256 72a024cd8763a418666207dedfc03e6466ff2b6cca4b4241c585896b09670fee SHA512 d99a9af7d9a4e854bb601495adb3f7b1659f6cf67267fa3e3c598c8c9aef3d7927901f22a2121662043538bc4d3a9004dfba5c34fda65cdd7954ca1a938f3d72 WHIRLPOOL 63b5f9f0056a270bce6800e387645edbb12ee4a967eb22cd6d9852390b97d2abaf1daff0c9526498f63474f087dae26827fa71a0bd4cb3a1b9314b01caeff641
 MISC metadata.xml 245 SHA256 ae3610b0005f668b7174e8c49c0170e7642e895c8e13e7e2fedcfefee6940e1a SHA512 90bcfe500baf163912aaffc9958c9724c4a97cfca294cae6c2eea938f4ca7668c84b132b6dce55767efa47a28b9e87bb75e79634b59079ab8ef3eff3ea95968e WHIRLPOOL 7abb1ad699d5aa3a0a0ebb0e8704df297ad9a662698cb59d1b48700aeb787e6208540e1e84f583a46bdd9975e27a75f04f7463585790b4e7865d0edfdb1e13ae
diff --git a/media-gfx/kcoloredit/kcoloredit-2.0.0-r1.ebuild b/media-gfx/kcoloredit/kcoloredit-2.0.0-r1.ebuild
index e18480d2ce24..6c7fd97bbb03 100644
--- a/media-gfx/kcoloredit/kcoloredit-2.0.0-r1.ebuild
+++ b/media-gfx/kcoloredit/kcoloredit-2.0.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 KDE_LINGUAS="af ar be bg br ca ca@valencia cs cy da de el en_GB eo es et eu fa
 fi fr ga gl he hi hne hr hu is it ja km ku lt lv mai mk ms nb nds ne nl nn oc
@@ -10,12 +10,11 @@ KDE_DOC_DIRS="doc doc-translations/%lingua_${PN}"
 KDE_HANDBOOK="optional"
 inherit kde4-base
 
-KDE_VERSION=4.4.0
-MY_P=${P}-kde${KDE_VERSION}
+MY_P=${P}-kde4.4.0
 
 DESCRIPTION="Tool for editing color palettes"
-HOMEPAGE="https://www.kde.org/"
-SRC_URI="mirror://kde/stable/${KDE_VERSION}/src/extragear/${MY_P}.tar.bz2"
+HOMEPAGE="https://userbase.kde.org/KColorEdit"
+SRC_URI="mirror://kde/stable/4.4.0/src/extragear/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="4"
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index 04befe227469..3a83e6ef59fc 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -6,7 +6,7 @@ DIST librecad-2.1.3.zip 26086377 SHA256 f05af030c71192109c1472c6fd24696fcb564b2e
 EBUILD librecad-2.0.3.ebuild 787 SHA256 a087564ddc87dfbba192a6dc0ba64c82377b2f1297e99b6b96426c529c7150c5 SHA512 5d34f9e791018f75a990d378f41c077458411d96ed40729a1b34afe527849e7fc3d245a02941dc95ce1582e3ffb935aec50efc926b57b98d3e5f48e7378b7325 WHIRLPOOL b6126b602a1b4cc6ff70716f6c9f55a2abd47bd8ded819c0d972067ee3a8ed2fe5cf866f870f3e7cccb273c03d35887585ed16a4208dc667beebec87c0e34d01
 EBUILD librecad-2.0.9-r1.ebuild 1374 SHA256 1600c97892b529ba6351b100a154900f48decb9760b2d0a69b497ac72b7e0b7c SHA512 c41f56a05b3f98f10947ec5c648796ad138fd9ae013e7b64045cc3a66ac74e075c962c02cbef5ee5e40f1597927a903fd5a177ebb3c84cd74efd7e4a8e97c2c5 WHIRLPOOL 1804543552d695fc241ecc801ace60ecbceae14949bda17d3acc8acc121fa3faffb085536921b5ef0e6eb2a10f8f3e53c2660b81dfcfdd79c46dcd9ebe92ad7e
 EBUILD librecad-2.1.1.ebuild 1418 SHA256 9429b50129a99a5e3dfa3cb260b6a6ae18506d93ae394297b3c191932efa2f33 SHA512 2080a1913324c030b6f7f3a2e21c96b894ec72ca335dc04c5594061d0a06637e9b40e7fae20920832012a5317baca4987971fe4e7cc86dea6c9cd40e4e2d9ded WHIRLPOOL 9427494ed2a759213afe6cdd7f9292b05832e86a7d724c43e71d13d42c670b65e4945edbaeb585cdcd245a2eeb39802099d07963d07f88acf2e5d5b84e1f7a79
-EBUILD librecad-2.1.3.ebuild 1420 SHA256 fe4eca56dab477f0f3095af4ca3e4227b969341d04dce2dccf05e3aaadf55a80 SHA512 27921a4c2358950008d22d970a5e5bc2362986fe84fa238f2bd550b29c1710793ef18e09d1bcee4e7440362dfcd2a817604f1a4a1836607de5428d820a9dfa70 WHIRLPOOL aade99001dc41e9258d8d652a29f2f56e29449db44e2d0596db27e0f2bfd6ffac4ac1191780e095ce6851cfa4b565c50b1b2c01a92ce5bc8630c75b8c086f135
+EBUILD librecad-2.1.3.ebuild 1419 SHA256 289e541c7af243e2a43177e7389707e789aa4a29fe575e3bbbd81b78eef611cf SHA512 6688a703ae6c0fdfeeb86bc1e3a8eb5b3a029542801d9632072409547e6932420ffb8f847b0b493379bd27449e0a3338f7fc9fb8c5ec719a4032a36b9b69c2d2 WHIRLPOOL 84988028ebe4a6e31e845efe4f430cd1027980c8cc618e65fee39ef60d2f09650616f95a032038799c75889bc90406746be12adf81d7dfb9cafcab82b59ad22e
 EBUILD librecad-9999.ebuild 1344 SHA256 9aad45475d3b78580db74de6c15b73b9d2e6266f687f4f19d1de769f3efa5a3b SHA512 722322ffaab726f066da0497261ba9d9f4eedab1f885e1d19b587bfbae5745cfde7399c24767f303a9c76a7d456d7564b3cc9d872b875be2a4cab8c499e6589d WHIRLPOOL 1d501cad46064352011e023664893101b5ec1b2209e154910f28d4fe539f46cfd6d2f28543185491901c7a62d1098426e8d1ab04d465001ac2b23d036b5cfbde
 MISC ChangeLog 4238 SHA256 cc0a3f5a63cb6a1d89c51b51c59c5aa9f87e66c3962de8799b51e9ed4256a045 SHA512 b00eeeb651418d48bef394da12b7d03ce690a4b48dc9af347a9548f093c784be0e9876ad2868442861ba939f3e881f3fcd4ade4ce1a1c66f73950c85975c8ead WHIRLPOOL f1d972276c6dd18bc67720ad2097d90cecd1b26fc3bb4388c3904ed33343bca20a425a2bc634a38c265a9c7ef64af31aec5e5e7a23590a9658f1cbfe6dfeb4cc
 MISC ChangeLog-2015 1255 SHA256 8defefb92b3ae4ff96ed33f893b761807d847860e604cf29f18eb181d83cb8fa SHA512 c33d1fe55743ad6bdca17ea9fc0bcead93f737f94271a05c7cd8b61ce2b099b12b9c1d8b9451f75a7139ad6735f09c8f34461f96855ef4078a3e14312617f2e6 WHIRLPOOL 2d0c89179f9d2ecafb0cd231bdc8f1a7dff078360cccb4497f7286d267aa1ac17bf3bf4ca82f344a1b44de03de9135ae5586ee1ec6340e8cd261fdd30d659132
diff --git a/media-gfx/librecad/librecad-2.1.3.ebuild b/media-gfx/librecad/librecad-2.1.3.ebuild
index 5a20c3bc2c43..b2e66a3c306d 100644
--- a/media-gfx/librecad/librecad-2.1.3.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="3d debug doc tools qt4 +qt5"
 REQUIRED_USE="|| ( qt4 qt5 )"
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index f82de386c787..71d62c67bcd2 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -1,8 +1,8 @@
 AUX 50openscad-gentoo.el 167 SHA256 45ed16a3c90a663d3ad95cef44dfd5c653deb5a3e60d978c03d63c2875c6141b SHA512 ce669eba45ab90e9dbcd770a7470ca9ed7088b1acabbc876fe4d31dc7a6edd36076063e4bd417d348c3e073113e3ad2bc2dd0ac89e02d3d8aeca7627ad7d2a1e WHIRLPOOL 0840035c763c131962132c894ba0b32102e815eb0810ee98c8541fef5e09d673313f491399d3196eb3dd089079ab3fd2154c4703c7bb1cf0c4247e80fc16e0e5
+AUX openscad-2015.03_p2_uic_tr_fix.patch 345 SHA256 c1efe3fae4ce1e2ab23d2b5072f6c19adea8ae295c6ae14913f70a76ad1bca48 SHA512 9f4bd1deb85a52e1ab8fd35b384552f902b03d1f06b58144013e722d906604b96c17abf4e4074042487c945419c51432e639120ddecda143a6cb9a2b902548e2 WHIRLPOOL e187c01aa30577f41eac30b2744133eb7f346d9dde96c8b2bc0f8fad1c388c5e8b64fa74da2fe1cb9d2c4b123baae21b5a4cd7d0bd965a58cc99f672805a451a
 DIST openscad-2015.03-2.src.tar.gz 13307974 SHA256 a2535bb9e27d96e10e1e19268a596155164c7129d410a0c7f96edc2d09400083 SHA512 66e93715987a5211ce15c10ea39a9fec3296b606ace0aba1cda019635d5b26021457c8e49f389daa90a0da02e41007eab662e1ed6608cb51c24de00253b9783f WHIRLPOOL 1454a22464f5dcf9726d5bb4fa5f7c080e419e44a3877a5ac43590e2b0552ecb169a9d2a9e15868c8020ffcfb894fc84f0269460f032f516ec9286f27155ca73
-EBUILD openscad-2015.03_p2-r1.ebuild 1066 SHA256 9465089bcc969fe54a16dd7009beec94c7b7b81d82c342f2b448e8479c7f655f SHA512 483d549608f9d1627922023c45ce185b653cbdaf812c63a8da01108c2148dbc7e716e74d7e0c1df061c6ccb9b4d99f1eb177ea09ce733f329b765ff1b288dbb4 WHIRLPOOL 7abd4385079ed046f54f01f06cee57e9ab012508d3f4ec9fed6941fd57cfcbdee31650e3af21985b6cc669499f4074bd5a784b080164ad52d4e97182baf15a6d
-EBUILD openscad-2015.03_p2-r2.ebuild 1328 SHA256 11602631d73cb370e2a5ae3072f62d7a542d437dc3904e316d25f2a3669b9070 SHA512 dd31cc128432763c3f02678363e5bba28798831aa589e0e613fccbd4cb3113947ca4b28a231dd9ab1c01730403829b4cc0dfd6f40b59c476a8b22f45129bc521 WHIRLPOOL 7efee2e250170c8a7ee157ecf497a0666063ea115047a309ecc020b6931b1e68d0109632083f65ec15c460dc58f0a163d783d5399965c57fbd23d2e7db4d60c0
-EBUILD openscad-9999.ebuild 1157 SHA256 defcb6541bec05738a084677760d6711963f5b0430e5caed96c541caa6a10176 SHA512 f581512ac8edb8086f77296886ce32e23352cc36a5e8102cd96e915d0b964a5b564e16dc367da94857b1928248607bda447970745b46c2c61d0507b8d043b8ae WHIRLPOOL d5cdcf56f667dde69c640e21919ee95250d445d1fdc535a73b4b476252a6b4662f24b62750b3f23bde2a7f9d793f5c5d92f15f2ff417c260be784faf56470e45
+EBUILD openscad-2015.03_p2-r3.ebuild 1533 SHA256 c52b438c5e50cdfdebba0be90b04e6831c814088cbb59c52cc5d987f4bd7835b SHA512 9f567f997e1f6b0f3dbe58e24678b0d3d271d4da224fe180189a3b73dce5dff5f837834d8f88981f1278d09d0e6a48f269460a6299651f244fe2836e66e8340d WHIRLPOOL 2d2d323199899700127ec43181edc0f1e297d3a0e5d428969daf866a5644e7819332a417970de365dfc6ca43a6385810162bddbe69a336883b5534f44e1b622d
+EBUILD openscad-9999.ebuild 1317 SHA256 ea3c6836b5c70f1104bfaf3e59baec2842012ed00ad4809c56c831ad38bd14c2 SHA512 e3e8711944d81ed93be206e2fcd15883b3716411854986232ff0a0acdd1d4bb75b7f9634df1578649584a2c9bced88c40fb3af840aec4a12838c3407ee01c209 WHIRLPOOL 3ac23511a49428bbe5ada40cc36c28f24f45288a9e6aa51d8ba69bdb760f42d15b67a776799518c5b34354552c9a032b0418f5107f7c985eeb03e5f0d7ae656e
 MISC ChangeLog 3209 SHA256 9d2fba0d7e98e0171fc2dad0642b3f0ac0e2422d8d6beb490c466daecbe51c81 SHA512 450299105f20f6c7eeb51dabdc6b7ba99f72d533ee0b02a82f924fbd8b57869578d9ecf723caf11d9db3fd26ffb268bb71243d9937345a41cf1f6740b824c235 WHIRLPOOL bc009a72a50a52f93bb5e1ced3bffe36bae908a46887f74848f2406c7d57446a59e019e5c4ed7d3481f4781a7ed921acc87b77740e3b134b829fa1cf9f48c304
 MISC ChangeLog-2015 1547 SHA256 b428dfdef4d7fba0346aaab3071a34b669793adcdc3ff47fdbcfb9c641718d9d SHA512 2cdd2755244984c643f4ac3681bfb9c6f2c3b17732863cf619f7514a200a6535c8b276e3aacda6a2d5464be954b8e07a13a90ba2b746904711ad18342ad1197f WHIRLPOOL e81a768275199a46ccf27af4f69b8d175b319d3167c893b710a7cf768d037accfb2bc0e217f76391281ef83881a0fe4eaca867ac9641c23d83dd143316d4d931
 MISC metadata.xml 830 SHA256 486a5b64ebd3b6b0fbb0be8b3cfde01f73e8735020f7ad90fec6754abd63cf08 SHA512 8c12064c65b8ffca0ad8ec585d3de5ed4ac17bec6e4c7340aba2980d2ddb047d1f7b0c5405cdb4b72869749f6ebaddf29bd6fa03eec8e71c8fa2ea3910767617 WHIRLPOOL 1d8b8520425bf31857948e1d80c8f29c1d2bedd36f05638262fa7db8caf1b980ae396be5def4ed9dcfee12e0879a4442166125bd33a9c51bb54ba9a997500bf2
diff --git a/media-gfx/openscad/files/openscad-2015.03_p2_uic_tr_fix.patch b/media-gfx/openscad/files/openscad-2015.03_p2_uic_tr_fix.patch
new file mode 100644
index 000000000000..ef0bcc421eb7
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2015.03_p2_uic_tr_fix.patch
@@ -0,0 +1,14 @@
+--- a/src/qtgettext.h	2017-03-22 00:17:29.808058905 -0400
++++ b/src/qtgettext.h	2017-03-22 00:18:55.251184835 -0400
+@@ -22,5 +22,10 @@
+ 	return QString::fromUtf8( _( msgid ) );
+ }
+ 
+-#endif
++inline QString _( const char *msgid, const char *disambiguation )
++{
++	Q_UNUSED( disambiguation );
++	return QString::fromUtf8( _( msgid ) );
++}
+ 
++#endif
diff --git a/media-gfx/openscad/openscad-2015.03_p2-r1.ebuild b/media-gfx/openscad/openscad-2015.03_p2-r1.ebuild
deleted file mode 100644
index 1b882516d55d..000000000000
--- a/media-gfx/openscad/openscad-2015.03_p2-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils qmake-utils
-
-MY_PV="2015.03-2"
-
-DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="http://www.openscad.org/"
-SRC_URI="http://files.openscad.org/${PN}-${MY_PV}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="media-gfx/opencsg
-	sci-mathematics/cgal
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4[-egl]
-	dev-qt/qtopengl:4[-egl]
-	dev-cpp/eigen:3
-	dev-libs/glib:2
-	dev-libs/gmp:0=
-	dev-libs/mpfr:0=
-	dev-libs/boost:=
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	media-libs/glew:*
-	media-libs/harfbuzz
-	x11-libs/qscintilla:=[qt4(-)]"
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND}"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	#Use our CFLAGS (specifically don't force x86)
-	sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro  || die
-	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
-
-	eapply_user
-}
-
-src_configure() {
-	eqmake4 "${PN}.pro"
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-	einstalldocs
-}
diff --git a/media-gfx/openscad/openscad-2015.03_p2-r2.ebuild b/media-gfx/openscad/openscad-2015.03_p2-r2.ebuild
deleted file mode 100644
index 67206bfa9e1f..000000000000
--- a/media-gfx/openscad/openscad-2015.03_p2-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp-common eutils qmake-utils
-
-MY_PV="2015.03-2"
-SITEFILE="50${PN}-gentoo.el"
-
-DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="http://www.openscad.org/"
-SRC_URI="http://files.openscad.org/${PN}-${MY_PV}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs"
-
-DEPEND="media-gfx/opencsg
-	sci-mathematics/cgal
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4[-egl]
-	dev-qt/qtopengl:4[-egl]
-	dev-cpp/eigen:3
-	dev-libs/glib:2
-	dev-libs/gmp:0=
-	dev-libs/mpfr:0=
-	dev-libs/boost:=
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	media-libs/glew:*
-	media-libs/harfbuzz
-	x11-libs/qscintilla:=[qt4(-)]
-	emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	#Use our CFLAGS (specifically don't force x86)
-	sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro  || die
-	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
-
-	eapply_user
-}
-
-src_configure() {
-	eqmake4 "${PN}.pro"
-}
-
-src_compile() {
-	default
-
-	if use emacs ; then
-		elisp-compile contrib/*.el
-	fi
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		elisp-install ${PN} contrib/*.el contrib/*.elc
-	fi
-
-	einstalldocs
-}
diff --git a/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild b/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild
new file mode 100644
index 000000000000..095f06b83030
--- /dev/null
+++ b/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp-common qmake-utils xdg-utils
+
+MY_PV="2015.03-2"
+SITEFILE="50${PN}-gentoo.el"
+
+DESCRIPTION="The Programmers Solid 3D CAD Modeller"
+HOMEPAGE="http://www.openscad.org/"
+SRC_URI="http://files.openscad.org/${PN}-${MY_PV}.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs"
+
+DEPEND="
+	dev-cpp/eigen:3
+	dev-libs/boost:=
+	dev-libs/glib:2
+	dev-libs/gmp:0=
+	dev-libs/mpfr:0=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	media-gfx/opencsg
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	media-libs/glew:*
+	media-libs/harfbuzz
+	sci-mathematics/cgal:=
+	>=x11-libs/qscintilla-2.9.4:=[qt5(+)]
+	emacs? ( virtual/emacs )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}_uic_tr_fix.patch" )
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	default
+
+	#Use our CFLAGS (specifically don't force x86)
+	sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro  || die
+	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
+}
+
+src_configure() {
+	eqmake5 "${PN}.pro"
+}
+
+src_compile() {
+	default
+
+	if use emacs ; then
+		elisp-compile contrib/*.el
+	fi
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		elisp-install ${PN} contrib/*.el contrib/*.elc
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index 95b2d2430823..60c555369540 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit elisp-common eutils git-r3 qmake-utils
+inherit elisp-common git-r3 qmake-utils xdg-utils
 
 SITEFILE="50${PN}-gentoo.el"
 
@@ -16,32 +16,34 @@ SLOT="0"
 KEYWORDS=""
 IUSE="emacs"
 
-DEPEND="media-gfx/opencsg
-	sci-mathematics/cgal
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4[-egl]
-	dev-qt/qtopengl:4[-egl]
+DEPEND="
 	dev-cpp/eigen:3
+	dev-libs/boost:=
 	dev-libs/glib:2
 	dev-libs/gmp:0=
 	dev-libs/mpfr:0=
-	dev-libs/boost:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	media-gfx/opencsg
 	media-libs/fontconfig:1.0
 	media-libs/freetype:2
 	media-libs/glew:*
 	media-libs/harfbuzz
-	x11-libs/qscintilla:=[qt4(-)]
-	emacs? ( virtual/emacs )"
+	sci-mathematics/cgal:=
+	>=x11-libs/qscintilla-2.9.4:=[qt5(+)]
+	emacs? ( virtual/emacs )
+"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
-
 	default
+
+	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
 }
 
 src_configure() {
-	eqmake4 "${PN}.pro"
+	eqmake5 "${PN}.pro"
 }
 
 src_compile() {
@@ -62,3 +64,13 @@ src_install() {
 
 	einstalldocs
 }
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/potrace/Manifest b/media-gfx/potrace/Manifest
index d1c3b379f0ea..66b93a9e9806 100644
--- a/media-gfx/potrace/Manifest
+++ b/media-gfx/potrace/Manifest
@@ -3,7 +3,7 @@ DIST potrace-1.14.tar.gz 649685 SHA256 db72b65311cfdcb63880b317f610d84485f086e15
 DIST potrace-1.15.tar.gz 650840 SHA256 a9b33904ace328340c850a01458199e0064e03ccaaa731bc869a842b1b8d529d SHA512 c9a8edd4f3339da587b9b32e12c83c8f7b993c7c23f551fa267545d9411679bc024924e23596ed1c83985693fc894b65dfa9f860275de395d9e0a88da37a4f02 WHIRLPOOL 6b5718dea33fb5597a56d8a8893198a342f6cf1c612ed4ea7b94417b9aabf31b3ecfec69a2dfcedb48430cfa09fdf987ab083a4b1298e73c4d163de93d48c8ee
 EBUILD potrace-1.13.ebuild 830 SHA256 38039d47f32b3a609d55ec3172bf468149ef3c9a5da63c4cff09e09da8858768 SHA512 50d4a9ae0d69dd85cbc22aed2a862e649b2bc17883e1bd782e9d4976d97807dbb7e69b67c073c800bd14bd92eb024af2f42b58e58c57f1d156e1ec72403fc268 WHIRLPOOL 26df7fed083ea4b31bc12d43dec22b47fe96c5d3e69344db19a709f49bd37b4b9b5c9722d28b99d4dd5a820d9a95fba706abba6fe1cfcbd435b921898447c7b9
 EBUILD potrace-1.14.ebuild 837 SHA256 72f311d037a3543576f28bdd7172a71988635440e8f76def597508dfb948e431 SHA512 93cecd52cab437f70eed160a7b8f12789aaf98e3c9d9adf4615b64924806dfa16a80747678d97d9343eefdeaae30e6c1d951f562f6911a0ea45f28a571132c08 WHIRLPOOL 9f8aebe38abef0c0586a3fdc4036669cbbfe08aca0301d5e3324c491febd821484f0401f5b145b2b7b942ca253e265819b11e89f17ee81163853650e679c68a6
-EBUILD potrace-1.15.ebuild 828 SHA256 6d9e54f67a8d726285084206abe0aa3f61a79b10005424d102d05d1c3426df24 SHA512 d5423004423922585dddb4719b19bedcb1e0eea48d80f0fdc03ab18db8786ebc9f8aa2544d29da135a65d7e82b3565cec89af28d7f64d4d6da74d14f0ee2947a WHIRLPOOL deee6b471493c61687eb40e9343b6fcbdb8cdec0cfa9b0c508335fd8d6dd43dd6e45106a83d3bf2a19e402d6185a26925e7095b0b19214df30ef49b9cff2ab06
+EBUILD potrace-1.15.ebuild 825 SHA256 6493d7b99381963b94f36e7da712225488c23f813c919fe1108b3eaeb807c5a8 SHA512 3d4f1486e07d00ed5f1624617a7c3632cf4d64fdeb38e5d10fd6cb554148128eef2e02091e4b1387f5f619b8b4e27061fe21bc5ec3e3e8f1590b29b2a9f3929c WHIRLPOOL f6a9b9a36bca2d55df3b368c75c63e1af70a3cfea3241d1482f96febe122e5c96d83c0a02f210a9e96aba0da56dbaf52cc9c1995996ea16122c918a464624c1a
 MISC ChangeLog 5086 SHA256 64488097ac31f9a46d377e30ea525b4aee1be34dd0379f5f085e07cf50048497 SHA512 cbefb651a0d1ae719eac60f5c3f99ba687afae36fc78ca65bd639bd4cdc0b8ff79b70e7438024ac07b4927e3e34aa92381b3086e231119a798a9b55b21d99c01 WHIRLPOOL 4670fdeaed00a769216a5d2a62500b49389c72acbbcd4416539f4373e2ddd092dee1651a05212306f6482bf3cba181cc1d0205a0064c5aa484b8eae9bfb6ef37
 MISC ChangeLog-2015 7442 SHA256 94d6987bdff3012328e7b4a6990d5af3401780651106d75e8261f08920216984 SHA512 d125d31f06c6466804296fd42d445a97908bb1074c04cd478ce5080dedddaa5a462b908be002351e84d88aaef3895c587cf389fd8d1501b46bf074e77f84be4a WHIRLPOOL 20bd35440fc87380d77e3ffc581f50ea215a85173b3f7f2603aaa776b68a660e37abfe4d5587550d6fc7fac091ffab5009b225b9ae98320a93cb6266af208785
 MISC metadata.xml 534 SHA256 7c0c57bc2be2d8b0466ec1c0f2fb3b3636990b35914fab0d6921d16e510817b5 SHA512 00f7a8a90caa7e7d9920929733f084d41baf72c45dc998255c54964eb50f6ec70d6af8666463fdefca27f95156834f1c4e9676f115bbb86538e979967a73b6c3 WHIRLPOOL 0d2ab5e46df97eb4af4d7b94e9c54746e72dc73307eeea103385eaa55f1c1e6a2bf3b4cd092813913bfcb46068a2df4ea8d6b8759b0b768f88f63f92891fae16
diff --git a/media-gfx/potrace/potrace-1.15.ebuild b/media-gfx/potrace/potrace-1.15.ebuild
index a9207deeaad6..d10f4eb289c0 100644
--- a/media-gfx/potrace/potrace-1.15.ebuild
+++ b/media-gfx/potrace/potrace-1.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://potrace.sourceforge.net/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="metric static-libs"
 
 RDEPEND="sys-libs/zlib"
diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest
index 9494c27aec86..b52148f37855 100644
--- a/media-gfx/rawtherapee/Manifest
+++ b/media-gfx/rawtherapee/Manifest
@@ -2,7 +2,7 @@ DIST rawtherapee-5.1.tar.xz 10785516 SHA256 fb742065a6b2e1b89df67c70395e52ee1ebd
 DIST rawtherapee-5.2.tar.xz 10819936 SHA256 5c32679bfb77eca36c26288483be75696086459b7a59bd4437e371ea1bf827b6 SHA512 ed2ff2e96ad4f0c50ebbc8a232d85b8c5b118bc956bc26aa72beb4741f464c46900aa668127fe7bdc963fabb5c2e2931c50cf784d1fc4fbc4dce3090412a1b5d WHIRLPOOL 02c71705b76df25e86b6ba5bf6439a3a2966e84dfa968b0a82c1dbe0c6297af826d2ffff6e973a56db21f5821d0a4eead6c05422bc6cb36269ed18b829bad1df
 DIST rawtherapee-5.3.tar.xz 11042548 SHA256 97959c946b7cc346affce53efc4bf6eca4125873343f96d1fbe43a5c717f3ef8 SHA512 8a9a7fe98ba0c8e03e964c809afc90afcc03a31b8b88e0f9e2ab4ecdc1fbe4712231f692d0585d95d638cae7171393e01860296149fc9dfbd86ecb35c3709284 WHIRLPOOL 4ad4824ec499a3c10ca20fae5d95e36bc5503a5c878219d4fae12116b96d99c8f02a4017932e753284a93d6d01302cb64363fb953af600fb223b11758ae286ff
 EBUILD rawtherapee-5.1.ebuild 1607 SHA256 c434abbd2b014b317900772263dfd4edd5415fe990e6daa6a6e25509378fca20 SHA512 77658a33529b11d2369505aae9de5d56cc49069121087fefeec75aada1e87f2b211649b449633d6f00f709ff08ec409628ebfe55c6ab244a8cc524585e05b7c8 WHIRLPOOL fc72ba619e420c4f8e934c97a026581cb8e5afd24210d16863911c2e90dfcd52f827985edbd967e8c8cb510c563303b080365484ed348ca37eda90b034414612
-EBUILD rawtherapee-5.2.ebuild 1647 SHA256 e3200a30d06546236d73fc61b8af9b635e658b9f354c9bd9a044d44b421bc215 SHA512 b11dacb8626aa54171b5edc252b8cd8411f7e9a4e2e9691cf4ac7cf2eafd704777e772e24acba8d2193cabb5f7db1be6aa4490ec5799c28f149108575077a7b7 WHIRLPOOL 872d63ae77b567cac0399027016ad46784bea3ce9a9ddd64a6c8004d447cb0aaef61061478bcb584a4552fb4e7f42d23f59b2d6bf12e6bcc07a57f84847aefa9
+EBUILD rawtherapee-5.2.ebuild 1646 SHA256 c8bb59565b01ee05db90fbbd4fb099a603b428dcbce985a4f877c244f10402a9 SHA512 32fe6f2cda16427c083dd42a1f0a8e4977bca4bd37e1b19cc9f513cbff062b4a0273c9c6ab153c4fea044535125aef9c5a837318fc206a656d9861bc42ac06bd WHIRLPOOL 7c67e257db7dff66d65c48bdffe4069166adb4382e6b0d1c6823d7642286824330cf13e6acba948f1aa5e5a51047c92a7d1875c6328e721041bf14cb33bfd4c4
 EBUILD rawtherapee-5.3.ebuild 1667 SHA256 3c368a540611ca4134479ca6513ffc3eae47f0c79d20f958522476cd731e25ba SHA512 d1f0044b321b3063504d17ac9944d9173237f80401c543c99fc8f40d5b182e3f6f0d1f6070687069ebd2a1cba3f89d1fec649f3e927bdaf6f8e55c5e37a9ac4a WHIRLPOOL 5114886ecbed5867eabaa781ea27cbe829047ba76c7618b4ac1c623bb9f27dd56f135ed750d34b1560a8f121d2235ca6bb30200eb401c905d8c97833a9c319c0
 MISC ChangeLog 4079 SHA256 b09230451fbe05e2b78eb65414e13f2d891cbbe252a05f90f89c2f3dd8a0170f SHA512 4e60d418b89c6d702a30bdccbf483bd2742c851a8b89af6a72d6e35969f6f99df5fccf41c2b3e27ddc7eb600d5145e584f342a726f838acdfc814ea1141b22aa WHIRLPOOL 0233cc875277cb17e70ac29ca511d3605e69c9ed98315be59779c7e870ff2e5e31516010d633eb2f50af0a2ce12b1d0d06cabb0d0e05a3bba2ed2b689ac90196
 MISC ChangeLog-2015 2958 SHA256 43fcd2365c6cff209cfafc99ccc550d5bca515913871cdd68c9c8f675e7d55a4 SHA512 f46eb64555da7fd7688d2ff156d9bd978933573143ca0bc5c777d876fc29fe6a97d396f5d8574e8d135ac2ecb75558f787de9fa9747dba61d025ab6d1b2cb5c0 WHIRLPOOL 88ef16a5e46a351920c0b0e25ccdb1d993d072ebda44e09174e991c525759a1cbd30163148abbcb3164966571fffc4a693810619e19375983975f9a3256a7918
diff --git a/media-gfx/rawtherapee/rawtherapee-5.2.ebuild b/media-gfx/rawtherapee/rawtherapee-5.2.ebuild
index 38848a678a86..02b87f290394 100644
--- a/media-gfx/rawtherapee/rawtherapee-5.2.ebuild
+++ b/media-gfx/rawtherapee/rawtherapee-5.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://rawtherapee.com/shared/source/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 IUSE="openmp"
 
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index dcedbbbc7819..7b803236eb27 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -9,7 +9,7 @@ AUX saned_at.service 434 SHA256 4892a381f3bc05679c4b20307046cf37c22bc2a17b141cb7
 DIST sane-backends-1.0.25.tar.gz 5955016 SHA256 a4d7ba8d62b2dea702ce76be85699940992daf3f44823ddc128812da33dc6e2c SHA512 b9548646fff13558a4da4a4e9e8bad730f05121bcc65b72d24ded3bfddc6fe574e08c39c8651544b8fbfeab036fffd76cc14d76ef5d5d47e7513a2ce3afcc9df WHIRLPOOL 557a3ac8785c0dd7f98aa55d5edaf76fb5b2b3c86a2431bb40b5b132ac05de3abcb250a8bcf8ed188868c4f124ce0a323a92a5a83c7b44a20908fe40ca323711
 DIST sane-backends-1.0.27.tar.gz 6430188 SHA256 293747bf37275c424ebb2c833f8588601a60b2f9653945d5a3194875355e36c9 SHA512 c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5 WHIRLPOOL 62ac1f4d4601bb2189212f021c23a48067ebdb5d900c2259ae4acdb6f94292c20689d9889bb11861b78be5ea7c3f76e815154e032f4bda76efcf901a97895cdd
 EBUILD sane-backends-1.0.25-r1.ebuild 7883 SHA256 31a194a93efa46cbcfd597e3f4ec28298230b5bdfc69c6942698a4ab63ba3b78 SHA512 2f201d80d12b5138f979b23932101eee82b9379b3110265b02dc8cb2664b9ce803ea774f4278aa52f65a3cb8c3261dcae50183ddf1e2c64be5a79e5209d154f3 WHIRLPOOL ead801902f9f94b9717be3aa45e50727fa8a0823257fadae3fa8e54c586cb7d47689e26a380cba0f800cf7ff558e1c2f3972df7ab6965fe1d0cff9829e18231c
-EBUILD sane-backends-1.0.27.ebuild 7922 SHA256 01d5e5d3c6cb7a971885d76a7f8ac77446dbb9904fd15e01c6b32c257667a7f3 SHA512 8aa67a03e2e552a62bb5b3a7062079bad280c64e2cbebedb2f1dc5f9d3d54f2209246dbfb4842479717454423bd4c61f28fa5551567691e9c6852eab44e7e7e8 WHIRLPOOL f3f2ef3c80363f9471f7bce7b9164117c785fb2f4a7ca6188d9a0c3b847495ae189eaefdb6feafe6b9e4f28198c3899014e254579f30a1675fdf233d5783d3eb
+EBUILD sane-backends-1.0.27.ebuild 7916 SHA256 efa7ba10a5ea4020248edb721abfbc80afaea2cab9f8f44f3abb3cbd3a115ef1 SHA512 184dc4eeaab197fc255b664d4ca0b67c9ea45d5989857f8e2829058790d236e5b9017c1039329d3d07be00a093bb5f65959b927d18c2cd4a354fa5433e025d28 WHIRLPOOL 9f19f66d4346f6379042a90359af3a202b9c79e013f85410816cd55b113ac9b66deb1c802504391f9b016b8a4f70824276bc647d2bb68d7f9a1e67d08336a084
 MISC ChangeLog 5821 SHA256 fa6f96e052c8dfd3e34b0a775e9a2604c9f4b45bb3b2200c40f151e65a467773 SHA512 c8085e7371914acdca025efe83cf25226c32dc58213362b5292cfb54a36a7a8a3e91b196dbffacb5f7d3e886ac006da977a44cd697174dc747abdc8a4b6893ea WHIRLPOOL ebbe0fe42598e339f80cff820d7480be897f0311a5724d8aa7851c1f2b3e24191f35b10faf94d072b57016cb0d558353527202db56629fba288a0deb364ce38d
 MISC ChangeLog-2015 47640 SHA256 c6257e3d197ffa048e4c1e7f01ba4a2516965237fb15dcee476cc914573d3114 SHA512 fbc5f5ca0c8e3c0ad1f2ec241c13dbd5a17d42bd8fd38541f1fccd2effa6e858a996fb4758dbe9a8afefb7586df42094d78de936f22986d5138fbf20241a9e37 WHIRLPOOL ad673ba6b449c6cf6f93cf536fb8fdc8230a24d61048430f9c65bfb1a0b61ecc09543f846b0a838734034a383fd3f190af580175a507802c3fac067f6c88ec20
 MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/media-gfx/sane-backends/sane-backends-1.0.27.ebuild b/media-gfx/sane-backends/sane-backends-1.0.27.ebuild
index b74b5565a8e7..44e4255d32b9 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.27.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.27.ebuild
@@ -137,7 +137,7 @@ esac
 LICENSE="GPL-2 public-domain"
 SLOT="0"
 if [[ ${PV} != "9999" ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index ed59dc1a4a0b..b401b43c1e3a 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -5,6 +5,7 @@ DIST shotwell-0.26.1.tar.xz 5593092 SHA256 0a60cc8a132fd962ed8c73f82b3f8ad7cbf10
 DIST shotwell-0.26.2.tar.xz 5575388 SHA256 4f65283d54772ef6344b8e8acb242f06b7f5b3f8e42ccb292b02c06a8dc2323b SHA512 a38681cb1b192372381d67abdc6c088c80fcc1db0d8d328330ee8f1ab78608c742de5e33030ccb1b941f1583a2b7028caadf61ce10ba7f2a93863bd2c3019813 WHIRLPOOL 1b8ba18aa63b033c00d55f1cdc2e95d8232f32c8d1e438cbba90b7e2e8cfb3fe454934686363d81cdda56beb19e1494f8ed69c7edc29398b54ff23216516225d
 DIST shotwell-0.26.3.tar.xz 5581204 SHA256 fb83e4b0b3d2fde62f3870e01294269fa099a94cfbcfcc614ab6b09387690ee5 SHA512 8d54ffec947b81517840f4f9d223edb6673e6ef66c6cc4333c2353b7c197c0630c10fbf7ae5d3ff5963322f19e5b7adfd6aac5e391262c6edb3b22a01de9a18f WHIRLPOOL d5f6a4ecba5417ce66bf30479e5db7810c7887f044769de7d28c2effcd5da8e093dd4d485c9e433c73451b829385e99b7bf9e48616935aea60263aef635eb332
 DIST shotwell-0.27.0.tar.xz 5574988 SHA256 42851935652986f000d96b4c6ac4180c96942fd63e437dee3179b249c2b87c0f SHA512 e7b5fe153fff96e04507588b4b8a1e71c121787cb6d28b7e14bb31824f1a09ca1948edc4bccfa069b2ffebe1ac753580257c1af4b7aec0ed49af74944ee91fbb WHIRLPOOL bf188b53f841c65acc0d3589fce5ca39b1e6c0f7b867f88b7018104f211c5677f6f0906b037ab54aafdfc3bec87d29076f97ce3d286f50c852690862b8e919ea
+DIST shotwell-0.27.1.tar.xz 5619824 SHA256 095d9f9784cb34889110cdde8110e67a592c6141318b7edae666070d363e5bc9 SHA512 b26c25b45af305903cf0698e65d5230820dda447b70175c92a66e25148e47d620847b3fa2b3bdb8d70656186d5b30d98edf3eee4138f07db9f8260e81a95a7d6 WHIRLPOOL 4bd4ad2f5628cd1b2b46bf6bb87924452f1d4650fdce6c0d2be7b7fc9f9f958252dc88d131d7ee6066657676ae5895f99803b008d6c89d7b2b7937d3376cf2e9
 EBUILD shotwell-0.24.6.ebuild 1444 SHA256 cc93d5222c7737d1e6d30a2743ae427ada01d47ef56d71592b2116619db15d6c SHA512 559e06d8bed36ab72880dfb409d4151d9ddc040201f4bd144b67202cd103db09c1b3a428b94c5875ac50159da0e22beb7e3242e515cb8dea259dfae75f383dd9 WHIRLPOOL 87b587000f690d01e496ba6f4002407479b22c3585944ba9c6a87e8521713e5194ea37aca26e93415339e57d334916ec50a47b02e14a66b851eeeea918e1892c
 EBUILD shotwell-0.25.0.1.ebuild 1471 SHA256 57474445740c569581f9d436af8cf18ac9ff801b53817b8043db746ef57005e8 SHA512 ff395918298ad2b4e7725149177ebcf19b30f517e3e78ec4e62aa421e4cc61ccdc41be2c4234301f10df1ec5d8e8a188f17f69048dc0decd3b77e0a2bb52d67e WHIRLPOOL 5d19ce22ee8d4a59f0d1560f3d364fa4171567b5a5085e4568d2d0fd1b72d62316b046d9e251c5e81e2385076661ed9a7e329a1883ba12b32b84125362fa7233
 EBUILD shotwell-0.26.0.ebuild 1471 SHA256 f32d9a02c4ff2ffd66640295dd863b81c5b0419efe0a148225539b274cf27e12 SHA512 7738e3cf9e6e545005071c01500ce091b1908b651162187bb91ee88bd954371ce9ed0962f76d4a688783f6a27374835d6c517a7c9b2c477cbca0f4b1ecbfa521 WHIRLPOOL b5fec5a1179affb17f740722c65c44bc641e519cbefb6b7daf67bf3f4934240a632dfa0724b2978c1dd3861409beea5aecb6491c41312d06668660b02347cc6d
@@ -12,6 +13,7 @@ EBUILD shotwell-0.26.1.ebuild 1471 SHA256 f32d9a02c4ff2ffd66640295dd863b81c5b041
 EBUILD shotwell-0.26.2.ebuild 1490 SHA256 2e92e974cadac82566552e6e78f87f3ad9d3281ef59c4c66121480aa16e2dbaf SHA512 c8f6fb632fb4b49aa60cbb5cbc572aaa191bbe047d434c6bd6b97a3bc9bd61540d7ab31fec1121d8faad55e622cd39e1bc10f1d2139f54daa58346542c162cf6 WHIRLPOOL 6ca3cab60f3e496e607a526b8ec94d58ec38fee1bbd9c027818c4fbee984c84f2ff7b34fa70502498e5ceb7810601f28e7a204973edee6037edc50e2488ad47d
 EBUILD shotwell-0.26.3.ebuild 1490 SHA256 2e92e974cadac82566552e6e78f87f3ad9d3281ef59c4c66121480aa16e2dbaf SHA512 c8f6fb632fb4b49aa60cbb5cbc572aaa191bbe047d434c6bd6b97a3bc9bd61540d7ab31fec1121d8faad55e622cd39e1bc10f1d2139f54daa58346542c162cf6 WHIRLPOOL 6ca3cab60f3e496e607a526b8ec94d58ec38fee1bbd9c027818c4fbee984c84f2ff7b34fa70502498e5ceb7810601f28e7a204973edee6037edc50e2488ad47d
 EBUILD shotwell-0.27.0.ebuild 1490 SHA256 2e92e974cadac82566552e6e78f87f3ad9d3281ef59c4c66121480aa16e2dbaf SHA512 c8f6fb632fb4b49aa60cbb5cbc572aaa191bbe047d434c6bd6b97a3bc9bd61540d7ab31fec1121d8faad55e622cd39e1bc10f1d2139f54daa58346542c162cf6 WHIRLPOOL 6ca3cab60f3e496e607a526b8ec94d58ec38fee1bbd9c027818c4fbee984c84f2ff7b34fa70502498e5ceb7810601f28e7a204973edee6037edc50e2488ad47d
+EBUILD shotwell-0.27.1.ebuild 1490 SHA256 2e92e974cadac82566552e6e78f87f3ad9d3281ef59c4c66121480aa16e2dbaf SHA512 c8f6fb632fb4b49aa60cbb5cbc572aaa191bbe047d434c6bd6b97a3bc9bd61540d7ab31fec1121d8faad55e622cd39e1bc10f1d2139f54daa58346542c162cf6 WHIRLPOOL 6ca3cab60f3e496e607a526b8ec94d58ec38fee1bbd9c027818c4fbee984c84f2ff7b34fa70502498e5ceb7810601f28e7a204973edee6037edc50e2488ad47d
 MISC ChangeLog 7190 SHA256 773b9627fea502e816fd8f0d6fa87aecea876df1ede05553674b965d5b6d31b0 SHA512 5f8f1609f2004dd16e2fb363e86e7645aac7f3a41df4aa5a4959c994dbcbf62cf04b3d81529c57c8f5ba566d64fbd2b924daf01e5041f98424f75cda231f08bd WHIRLPOOL 0015e57b0dfe756c550c518238594d65660320dcd50c1080f73b7268276488aaa2fa22315841073aaff2186f4e168c4cb405cd40868d0de09a5de76036091c9e
 MISC ChangeLog-2015 13149 SHA256 0b668b615c618f17e7eb199ce770c1fcbcb48b6aab0a083be255d95574ed978f SHA512 fef2294c2b0339c44f9e5e54c7e9ca0003f11922d7693a9b1f783cf563419e09b93bfdcab2ea6d9da4cdfcbd83c0ad6c9100798657608b2f5586da9e576e4d83 WHIRLPOOL 7af1af49b2749c05649539f210beb19984b509c6306c47b6ce5115e15df7b6a1da94a0aed9dc6b1a99eb2b970791e1af9b3a2157d76939906ce6b3d80aa27bd6
 MISC metadata.xml 900 SHA256 7d9af9a94d03e3160b11dbe853ecb557d69d821997e726e9993162b27b6ac094 SHA512 aab4bb7556cb7fc926b59e68d16a2425af57cab5ae80c68ce2dd650bf49b9e3872771fee51552aa0aba9c50167a33b1976700f65bbc1531de44ac638cdd4a0be WHIRLPOOL 59272edc66c987a57f49452d2799174c9c2234e8c0bf613dc2abd2fb01b6ea23b343da308148316ad829a916a4d579df7f8592f63f64dfec281bba574c5c235b
diff --git a/media-gfx/shotwell/shotwell-0.27.1.ebuild b/media-gfx/shotwell/shotwell-0.27.1.ebuild
new file mode 100644
index 000000000000..0cafa2080fcf
--- /dev/null
+++ b/media-gfx/shotwell/shotwell-0.27.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+VALA_MIN_API_VERSION="0.28"
+
+inherit gnome2 multilib toolchain-funcs vala versionator
+
+MY_PV=$(get_version_component_range 1-2)
+DESCRIPTION="Open source photo manager for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=app-crypt/gcr-3[gtk]
+	>=dev-db/sqlite-3.5.9:3
+	>=dev-libs/glib-2.40.0:2
+	>=dev-libs/json-glib-0.7.6
+	>=dev-libs/libgee-0.8.5:0.8
+	>=dev-libs/libxml2-2.6.32:2
+	gnome-base/dconf
+	>=media-libs/gexiv2-0.10.4
+	media-libs/gst-plugins-base:1.0
+	media-libs/gst-plugins-good:1.0
+	media-libs/gstreamer:1.0
+	media-libs/lcms:2
+	>=media-libs/libexif-0.6.16:=
+	>=media-libs/libgphoto2-2.5:=
+	>=media-libs/libraw-0.13.2:=
+	media-plugins/gst-plugins-gdkpixbuf:1.0
+	>=net-libs/libsoup-2.42.0:2.4
+	net-libs/webkit-gtk:4
+	virtual/libgudev:=[introspection]
+	>=x11-libs/gtk+-3.14.0:3[X]
+	dev-libs/libgdata
+
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.7
+	>=sys-devel/m4-1.4.13
+	virtual/pkgconfig
+"
+
+# This probably comes from libraries that
+# shotwell-video-thumbnailer links to.
+# Nothing we can do at the moment. #435048
+QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
+
+src_prepare() {
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure --disable-static
+}
diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index 7b1b6fde00de..f39e42895578 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -4,7 +4,7 @@ AUX slic3r-1.2.9-c++11.patch 1102 SHA256 4b32b987d1e46cbda9f791dc46c76fa73b65178
 AUX slic3r-9999-no-locallib.patch 15462 SHA256 c2114dd607da51416facadceaae1ba459ac3b63c2ccb01195a447c93da31218f SHA512 cdf791f721ab3a2356631ee9c74c796c48626c8313dd31dab59e880ab181734e892fa341bbb1a648d35303f4fb4a8e3c4615d360c317438876f67de1ef9f9187 WHIRLPOOL 4d571798c249d4e36cd06a72ed1a9d5267c02358fe2c5cc5237cfbf706ef98e7666c4516e957e3f1a109f459f1ec4f059aeb43c0eecd8bca409a77e476a9dc45
 DIST slic3r-1.1.7.tar.gz 2079200 SHA256 8e1f68a71d78686cf6957ee7665757a4e7d14646bdee262cef76cba47b3f0d50 SHA512 0c3a12890f57f422084b20152ede3467a8624db4ba8be774258df0af963c1f6f41fda7d96967f6355bd95727539e6aad51c30cf45284a7ee3fff294839acc650 WHIRLPOOL 18c95a59acff51891251852d59d4bf33b9c1ad8721f581e3c9f55b56bb62e087d030ecb701d16b07cca4567f142ea3b0693c0ab436f1c25b28d02b4a1ce351cd
 DIST slic3r-1.2.9.tar.gz 2165322 SHA256 f1c231ae56039ccd4ecf624e288c1362cab49b0f751a4663857b916b7fa51f2f SHA512 c0284f40de43c54e775baccdb2a67813a6ca4b69db78a788f2023b3f34127e780e6d0160144b9df1e17a2992b3255ef9a372b61a594f503b21efad7334387a51 WHIRLPOOL fc3bee0188ab7bd54ac19f3d874acb20dd8614594b79a8539001fd9a682f10c3436ef477d60458c49c7028c8b4bb7bf8585b4b53e73ac3a411d1a18720820eb0
-EBUILD slic3r-1.1.7.ebuild 2911 SHA256 2c743cd075b7593ac26b6e955dfd0a9f15cad1ab9105c0facfd131462d866436 SHA512 2fee10cde9c132cd7b6d142ea6b5550a294a2d366ca5eb88599567d0d13d1d5a837d63018836e7cd677a3e558180e4297bf6e4fceae51f2f9b48c9809cc44014 WHIRLPOOL a339035714f59b52f320945b1f174fb693a6deca39f835bfcde4d8aafe0f25844775b052dcdb629364151ca05dd12f159777d0bdda3cb5338ba19d4d22ed080a
+EBUILD slic3r-1.1.7.ebuild 2910 SHA256 845f7d8b9ba7b90854eef3f9b223b13b2383e10dcbab09eed309600d9fc66b5b SHA512 2467d4dbbc63d49b891dd24b68b6682c0d0ef2c0dd2f7576eb7a7d161f9c07da5b78b3bf0064ff7cb3ddfaa2dd6634699c85310c8a64fdc90974d8df5e669fa9 WHIRLPOOL 5cb3ded56c96e813e08778d232c556a5c5bf13ff1b387cad45a2c0039e94c1e804e1761eed937a41b204fa5fa3cd1b686042c7a8ebec952b80cf4a89e4d0e190
 EBUILD slic3r-1.2.9-r2.ebuild 2472 SHA256 ac4365ff678d841529fcb852175ade6e046866360fa71c028ed07d77ce0781a3 SHA512 9937794276d490f75476fa39208f7726d0ad83534acb84ab5818cd1849c580cf3ce2c9f01b9eeaaee9ed9d4f49cc24bb9c4b95c4b45bbd70fd304678e0246795 WHIRLPOOL 7def4a7a52cfc9ecac2cf8266c4b216d763a7d33a59e0e50ac379811eb8b92bef9d7721e04a616aa05c420bd5c792ca03e456e5f7db2c1eb97fc74719634cc02
 EBUILD slic3r-9999.ebuild 2621 SHA256 c343bc2bdac0ec1e67253fb21aa9487fbcd6a80eec433b5990ac92e8d28e06a4 SHA512 bfff6a690433fdd85398d841c738578e44569eb58df43b602502c062419a77b3786288944414b3114538cbc278ccb029fa074ce44e4f2fc919209052888dacdc WHIRLPOOL 32d0d5369d4b4996258f2f448a520d4d97e5d11110fcb07b91367a93377e5a8ab5fa0442407841cd7421cc15c0d9467a844f561d353542e5f1e9c51e2f4b6663
 MISC ChangeLog 2206 SHA256 ef4b15eee040ebed9c2b0bea2d05a3512704677666eec33ba9d92221b8fbcb57 SHA512 acc6da2b31a88912904a884e29a364d77c9be66f3c904effc49575d554daa4882582acbbae779fc72793f66dd86a2bf526c8e02c761cc2ca946b86faa581ce7d WHIRLPOOL 25f2f8ce2376f1619443dfcd058fffd061490ce8c9d620987b6331c6c03de6f691dfaec474c6516989e953a6886d27c8ff3419e1da4810fde19b68e6edb8971b
diff --git a/media-gfx/slic3r/slic3r-1.1.7.ebuild b/media-gfx/slic3r/slic3r-1.1.7.ebuild
index cc961a803fea..a4f86fd3ff82 100644
--- a/media-gfx/slic3r/slic3r-1.1.7.ebuild
+++ b/media-gfx/slic3r/slic3r-1.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/alexrj/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="AGPL-3 CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="+gui test"
 
 # check Build.PL for dependencies
diff --git a/media-gfx/sxiv/Manifest b/media-gfx/sxiv/Manifest
index ae2918d75a83..286703f5b9b1 100644
--- a/media-gfx/sxiv/Manifest
+++ b/media-gfx/sxiv/Manifest
@@ -1,6 +1,8 @@
 DIST sxiv-1.3.2.tar.gz 46560 SHA256 9f5368de8f0f57e78ebe02cb531a31107a993f2769cec51bcc8d70f5c668b653 SHA512 3bcf67a778a3e40cb6ae6b6fcc685cd57e303265df34c8a56d6ebb8ad0237e7136e738c44fee5c5504c73e4722d017f1e746691fac482568b2a960931f1ecdd5 WHIRLPOOL 8b02d693cbe8be31f81de8a0d69f218fbf2919f937fadc93657db4837bcb41e05c7b41ecbb24bfc559a1edda2d8b9f0ad14cb2118264ae52d14ac883e82dc56a
+DIST sxiv-24.tar.gz 47148 SHA256 511dc45d12962af9c31c3068ce6bca4b832a6263946b27befea49a48cf019110 SHA512 e4c9d4e18b4f1999b6441256b4c0d4683a105f1f64d4f754d6f9bc4f467ee1ccc6b6996cec8a210276c5fbec59417627fb838cb4f7be37cce32fa2c5d45d347b WHIRLPOOL c953f72732ec98a3cb140925f9974163682632787674c5145e400fc831fe558747a3ebc3a4dee3d199b5f0130620b93f7154dad9ed7d12b410b41562174fff88
 EBUILD sxiv-1.3.2-r2.ebuild 1459 SHA256 83330a2ca3fcaa9414af8ca1891275fdb1502b74de7cccb9fc69d2084cb02163 SHA512 51a5493a1e8c5d31b31348f4c7ee30490f4b518e31713c48cae031cd3ecf4f280381ffd548c753450a6f27b092e87314ecf41c5f5f5998a032fdf1a7bcf8f612 WHIRLPOOL 36e55570496ac62bc79c10c45046aef535d1527ada69294084452949883f198e49b4a94314678b2fa9212b05f14e4f7653572cae5793074985ad89c57f94aa2e
-EBUILD sxiv-9999.ebuild 1258 SHA256 d6734ae3b51148e01829cf6fdc7898900c95ac220f1e144620216153ec860d2c SHA512 b7cbf84906936199ffbef5b4c8521422eeba10e56184628292139c9a7e52a068eb7b6e662bf768dd657931f4b853c76a33b1ef0f0a88f81aacbb2bd6db7db641 WHIRLPOOL 4320b4b89406a4b2d26a66392e3dc153077a73a800016d3995c018a477681458b12f9d4a625a9a66fe45ce5d17abaf46b839ec7969438bd22fef44459e4fd837
+EBUILD sxiv-24.ebuild 1221 SHA256 7b361fa43e84ddb7c23fe4242eadd54924819c69347fad9130a35198208c2480 SHA512 50b2442c860d83a39f666913ed497958a01142ec6e685affe8d39dda0246d7e3960a2cc52672e3a9eb8e92974442c4353f07c05d0cef5eebc3dd143873ccbf20 WHIRLPOOL cba17d81f8acb26a6e06b6288c05bdeda6687b73a603b3e0bf38b2df442941e8f3bda2646f57230e39214970aceda86efa76d1efbd2edf76d1501cd0499db7a6
+EBUILD sxiv-9999.ebuild 1221 SHA256 7b361fa43e84ddb7c23fe4242eadd54924819c69347fad9130a35198208c2480 SHA512 50b2442c860d83a39f666913ed497958a01142ec6e685affe8d39dda0246d7e3960a2cc52672e3a9eb8e92974442c4353f07c05d0cef5eebc3dd143873ccbf20 WHIRLPOOL cba17d81f8acb26a6e06b6288c05bdeda6687b73a603b3e0bf38b2df442941e8f3bda2646f57230e39214970aceda86efa76d1efbd2edf76d1501cd0499db7a6
 MISC ChangeLog 3248 SHA256 2474ca34b0819b4dcc9643ccccf9779c1bba67a7045c1d572802aa36c31c2ec2 SHA512 7b8ee0459d914f72fad32b836d7c1ab751c1724c6badce5a5a5beb1bc2eaafa175c99aded8d1d6afea55c0dbbdee799f09e5e784397405f6452642eb5fbf82d8 WHIRLPOOL eaad3123a61ec6f3bf02665e0da71e3a5bac1b739dcd9230e842e90942a783996f455b79b0eb3c84308f2115a451bdb3403045d8a60052253414ed0a981ddff6
 MISC ChangeLog-2015 3032 SHA256 d32d7e3e8804e3161fc06781661b9ce6e1e76db7b3c3e7e266b0bb8bf57c659e SHA512 c2afbb46e5598e39a5d143552fc5179722f356fcac5971f08ac3a10c731c0ea0d1529db9d870427ad167a86f425f26edb59630ef76e20ed48c2586e4fca8e72c WHIRLPOOL ab4f842af814b346d47054277e58411b954a470c31919a19a84983b0cd6e651b350cdf09046cd4cccb5defa3478d519c209a9e664bb07b6e574c3e71e0067221
 MISC metadata.xml 347 SHA256 0e9bedb2007085ad5f1280eae4c796d35b76d5e36ef8bdbd1a7021924d6d439c SHA512 9aca2dd50b12a3bc6a0175bf8fe1767990b519ba92f91eca79137383901119fb7002b0e31d817a287ec08595d32c0074d92aefb0b0ae14c8e4c0b6b366e28515 WHIRLPOOL f78ac0c0a3e24f0fc15d5f5ecf18c0a3012bc50265584f519c125ed2a0f9bbd07248766a30485f6cf42fc9030c8ff88e6aa670e29b435980df38bf03fff34473
diff --git a/media-gfx/sxiv/sxiv-24.ebuild b/media-gfx/sxiv/sxiv-24.ebuild
new file mode 100644
index 000000000000..778e21dde204
--- /dev/null
+++ b/media-gfx/sxiv/sxiv-24.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils xdg-utils gnome2-utils savedconfig toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/muennich/sxiv.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/muennich/sxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Simple (or small or suckless) X Image Viewer"
+HOMEPAGE="https://github.com/muennich/sxiv/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="exif gif"
+
+RDEPEND="
+	exif? ( media-libs/libexif )
+	gif? ( media-libs/giflib:0= )
+	media-libs/imlib2[X,gif?]
+	x11-libs/libX11
+	x11-libs/libXft
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	restore_config config.h
+	default
+}
+
+src_compile() {
+	emake V=1 CC="$(tc-getCC)" HAVE_LIBEXIF=$(usex exif 1 0) HAVE_GIFLIB=$(usex gif 1 0)
+}
+
+src_install() {
+	emake DESTDIR="${ED}" PREFIX=/usr install
+	emake -C icon DESTDIR="${ED}" PREFIX=/usr install
+	dodoc README.md
+	domenu sxiv.desktop
+
+	save_config config.h
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-gfx/sxiv/sxiv-9999.ebuild b/media-gfx/sxiv/sxiv-9999.ebuild
index 97e80c6e0ef6..778e21dde204 100644
--- a/media-gfx/sxiv/sxiv-9999.ebuild
+++ b/media-gfx/sxiv/sxiv-9999.ebuild
@@ -30,16 +30,12 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	sed -i '/^LDFLAGS/d' Makefile || die
-
-	tc-export CC
-
 	restore_config config.h
 	default
 }
 
 src_compile() {
-	emake V=1 HAVE_LIBEXIF=$(usex exif 1 0) HAVE_GIFLIB=$(usex gif 1 0)
+	emake V=1 CC="$(tc-getCC)" HAVE_LIBEXIF=$(usex exif 1 0) HAVE_GIFLIB=$(usex gif 1 0)
 }
 
 src_install() {
diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest
index c4510c67c101..bffab05ef06a 100644
--- a/media-gfx/valentina/Manifest
+++ b/media-gfx/valentina/Manifest
@@ -1,12 +1,7 @@
-AUX disable-tests-compilation.patch 638 SHA256 e0470715543dc081a633a4dfa2d656fe225f2e547d2f8c922c440a4867db7a09 SHA512 865c32420acd1d406e1e1a896d520d399960bcc834ad467cb93fd66d6a9f25559e52a06e780050214601a78e630ebd0c236f66b3cdce6db4f5f511f217898bc2 WHIRLPOOL baa2ef5cb5cb301c6b71799ec6d6e1b0d560385bd3cd9233abe513b0c4c91537ca59e0beeb8225853bed4ddd981d9da014354ea40c87253042247739370fe71e
-AUX fix-insecure-runpaths.patch 2338 SHA256 8577b422ca3e2003799fc9d7589101ed6bdc36ea0c470cddff62db83936fdb38 SHA512 2f175c1b787cff5e565b896de1c23199230c87dc84eb0b5837b1fed4166b84d4d3430b953fc6dd04c0276593fcf4db9190b2346fa8d62b9b2f0443f435e786fb WHIRLPOOL 6828629adf6de488e981ec17545dfba186bd9e02f40eb20c7ccf17c805c53481ffedddac7663fa7ece1e8a37fedadebf8190119c592953ce07bfd355413d4fcc
-AUX locales.patch 962 SHA256 e9c938a3e1958f4a1697dc1a434c38352a1be4728553ecd23697484c164275f4 SHA512 5d5d10d9cfd13738126ef3bff9083ebd6c63f5c9c6902ded0d664214451739eae0da43e5f7059cebf672342e400d5cf71d2b9fd104ac4d2e118bd1a2f20d6bd7 WHIRLPOOL 49f75bcaec9ad57cccc88356831b2d8e73cde503b0d64f9feddf2c9e5640d36313db823b5bc9a69285811c4aea00384510951123dd3adc8e078647d40ece4c8e
-DIST valentina-0.4.2.zip 21431337 SHA256 7d80d7cf49250cc48f7ae791e1ee3a8de2216f818fe100b883302099d984de05 SHA512 e04615fe0d79e8d0adebaea1808ee123d979babcd9f9320e897921aeda811ece37aff20575fb4bc033f21a91b498f409dbf1a4b8999e8b3c841c2f842ce41263 WHIRLPOOL 59714a19dee39cadc86f5542e52b4424fd7724bbbf5c9e3f6f33ebc48c313bc2b7c5f3f11f82b660f9a2619d05e76bc91f65201c95ae1473efaa540e132020d9
-DIST valentina-0.4.5.zip 21431337 SHA256 7d80d7cf49250cc48f7ae791e1ee3a8de2216f818fe100b883302099d984de05 SHA512 e04615fe0d79e8d0adebaea1808ee123d979babcd9f9320e897921aeda811ece37aff20575fb4bc033f21a91b498f409dbf1a4b8999e8b3c841c2f842ce41263 WHIRLPOOL 59714a19dee39cadc86f5542e52b4424fd7724bbbf5c9e3f6f33ebc48c313bc2b7c5f3f11f82b660f9a2619d05e76bc91f65201c95ae1473efaa540e132020d9
-DIST valentina-0.5.0.zip 21431337 SHA256 7d80d7cf49250cc48f7ae791e1ee3a8de2216f818fe100b883302099d984de05 SHA512 e04615fe0d79e8d0adebaea1808ee123d979babcd9f9320e897921aeda811ece37aff20575fb4bc033f21a91b498f409dbf1a4b8999e8b3c841c2f842ce41263 WHIRLPOOL 59714a19dee39cadc86f5542e52b4424fd7724bbbf5c9e3f6f33ebc48c313bc2b7c5f3f11f82b660f9a2619d05e76bc91f65201c95ae1473efaa540e132020d9
-EBUILD valentina-0.4.2-r3.ebuild 1680 SHA256 694ed67737d623eadc5106ef05d995fd04b99b44431ea7fbcb8780111eec7591 SHA512 7c052a184d6908c43e04550b21f15ad6599ebd600ab814aa5ea55e3fd07823452310e473d4c5f940ef05b125bfe0e714ee345e6adf739c4ec109990fd8c93ffc WHIRLPOOL 6989393484bbf8065537b3e27cb70dcd02c638af3765bd1ba18c13ff1b5665f20f1373761cec3489db516651320b3e63ace4d527f7601de9f196e11d8cfe3878
-EBUILD valentina-0.4.5.ebuild 1680 SHA256 694ed67737d623eadc5106ef05d995fd04b99b44431ea7fbcb8780111eec7591 SHA512 7c052a184d6908c43e04550b21f15ad6599ebd600ab814aa5ea55e3fd07823452310e473d4c5f940ef05b125bfe0e714ee345e6adf739c4ec109990fd8c93ffc WHIRLPOOL 6989393484bbf8065537b3e27cb70dcd02c638af3765bd1ba18c13ff1b5665f20f1373761cec3489db516651320b3e63ace4d527f7601de9f196e11d8cfe3878
-EBUILD valentina-0.5.0.ebuild 1691 SHA256 e00a88d4684586cc421da43acde0f003a73ee0932a25787942e621fbe6f12ff2 SHA512 1e3b91959f0c1cbd51d5db5e301ee57472697ebaa62d26fa5319f59c8d94ed48c870b01acff835200b1a35834eab8ac725d89ecfa012229a08a678832eb1e5fd WHIRLPOOL c4f9c9c076159ec7d10979c8b428b1a24a8203c00fbae24de1940431e6608f1d2de6cfb5db5180fbb0ef9b4d7bfa23f66bfdab6ab3b36b4aff18cac9187e5571
-EBUILD valentina-9999.ebuild 1495 SHA256 f25593ebdc9dbf28a86de5d9a10724b333f06005755a2bff39357b3a38b36012 SHA512 bf83b96f858211faefd67240eda8718467d456edca4e0ef8524fb4603a33057f9eacad0b4e2b584e36d385ba29c52f5c2f8dd157a9816ec6fd94f7356a5eaf44 WHIRLPOOL 68d8c42a7b0c99d80b586e893769d45a81727f584762c6425a420673016f659056c3bd553a02a5a14c0c9a21aa424aa28f586fbf191af6a844d54a9251e23871
+DIST valentina-0.5.0.zip 37175844 SHA256 f750027814e765b169c41934927f205350525b947f50559fd9bfcba016e095cb SHA512 3e69f965de1f8179850a8c6a5a0d3b5e87384158191b9c4a3647a5421d1efe567e98298bd8f47a8288eac358520469ae7979a4a61df64ccfbeb1a36fb231efcf WHIRLPOOL 271b471f25a59f356cca5b2c00e1a200e504c5184d2001e93c954ce0c921a56585811029e79e424f91c8550d44ea498d501f0f05c8aff62981cfc8be339ae673
+DIST valentina-4798.patch 25302 SHA256 3ff7b9555933fb361aad3b96b8486b2d5e4988fb0ee34f3fc98609d0673e3baf SHA512 c3adbd2caa4cfb73960de850b29bee881fc408c9e4032e1fa2f29ba80b91abaa194738ff1cfb607657343990a166ad310387a66ceca546ffae0543d774bc53b4 WHIRLPOOL 245496681adb86b6662b29426bfac11d7db6e9d7b2ab48e89d6508c5211fdc520bac450d1af051c066e00e914608fdc412cbae38dc0230dfc0090c0af6c4f979
+DIST valentina-4802.patch 6733 SHA256 abee2e871f9f741cdf26ac151dca24a0cfc9d3f22bbe2abfdb88ad7c42768c96 SHA512 5628599c1dd208ba9ea8ea5e518bf6aed5ef11aa750670335478e5af49d6e9f235901c79d6483b1897f8288259fd06b463462eddcd062c4920ff251430998ff4 WHIRLPOOL bb4f89a44eb5204192b680ba29226d04439b2326b37992e7a8623e713a94f20ec3043f31a059037f90a24feb2d283773f21c06f1777e4f61bf5f7a8d5f7d54af
+EBUILD valentina-0.5.0-r2.ebuild 1895 SHA256 c7afe5e5e9490a4a1a270ff8b71d1315d1ddc7372ae2e52791562b0d0f2d2c42 SHA512 a099c0f97f93dbfda53db352babb77ca7c3edb9f12b2cbc1a0ea19d388d817aa5eb41cd65a0c9e8f9e417cca223128e40f119322a892c51a51ddb7fb01e78cb0 WHIRLPOOL 0fd35cd298f8cc3e4c221a813d0e922f1209c8af880c45c52cc169a0bbf40886b388ebd3a29274508652c2e5cfbe259624a42ec4c4ec68933c952ddfba8fd364
+EBUILD valentina-9999.ebuild 1506 SHA256 dde5197354956241392c968ccc9ad054a7c9192a47b7d286498a58e1550b7efd SHA512 579149341dc7c3003a7d8ff3758df7247f50d8cfeba02f0882a9fa0ee37451d7fa4dc6cf0a1f3fb61582c4a73e8c37028558d12787f8a68bdce54a68b6cd9ba7 WHIRLPOOL e17a7bce22735140a0b50286df1b241b102087a2ba8eb0b999cef2fafb02ccb33497b8ed9e52b78073523fe97c21f3bb9ec14e7c2d2238f3eba3c4f5ecae373c
 MISC ChangeLog 1824 SHA256 c9cd62e8638f7b0a07eaffd1480f4beb5aa1db6a91e3d1508c4c375376acf2a8 SHA512 6b38eca5b440d9447012a9df4c07c37a55a3dd080ee5574ee0206887699aed67bff99c62b030f34af0b70a781c5500b20b52478682d5cab8fec58aa0ffe550c1 WHIRLPOOL 9c5ece1064115966c6d77ea73b33431ccfc6eb0235327de98aa400ea5e0f8125a85a5c60f4063f42824c779476b7011ca5628cf940d37199a021f10d55a675a5
 MISC metadata.xml 334 SHA256 2dc8bd9c92e9635eb050e38cf27a44747254780fee228c02851d6bf81cb9107c SHA512 d1264aa0d26ba75466c5572c37ca6fd384d4e6db392aca0e47d4b1d0bd3ef7e035fed51c460af1bb258c500d1cc9211ec2e85db3e3aa158d378fb1389a3ebf03 WHIRLPOOL 8f46171b3aa2ba25836342ea2cd509b1e08fdf6f3126747931b9392ba3fef549f47cb33f68fd4bfb633b04cb884e4d494ba86d2c37a287cce57d0ad8172426a9
diff --git a/media-gfx/valentina/files/disable-tests-compilation.patch b/media-gfx/valentina/files/disable-tests-compilation.patch
deleted file mode 100644
index a819a02a336b..000000000000
--- a/media-gfx/valentina/files/disable-tests-compilation.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-# HG changeset patch
-# User Roman Telezhynskyi <kroluku@gmail.com>
-# Date 1455906661 -7200
-# Branch develop
-# Node ID 8edb1b0f161a5f472a0e6a8a8b5b8a1ae7cf33c5
-# Parent  42a73e7a17757ce9d12e16f616a41f52efdf4b91
-CONFIG key to disable building tests.
-
-diff --git a/src/src.pro b/src/src.pro
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -1,8 +1,17 @@
- TEMPLATE = subdirs
--SUBDIRS = \
--    libs \
--    app \
--    test
- 
--app.depends = libs
--test.depends = libs
-+noTests{ # For enable run qmake with CONFIG+=noTests
-+	SUBDIRS = \
-+		libs \
-+		app
-+
-+} else {
-+	SUBDIRS = \
-+		libs \
-+		app \
-+		test
-+
-+	test.depends = libs
-+}
-+
-+app.depends = libs 
diff --git a/media-gfx/valentina/files/fix-insecure-runpaths.patch b/media-gfx/valentina/files/fix-insecure-runpaths.patch
deleted file mode 100644
index a98a069dfb5a..000000000000
--- a/media-gfx/valentina/files/fix-insecure-runpaths.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-# HG changeset patch
-# User Roman Telezhynskyi <kroluku@gmail.com>
-# Date 1455895311 -7200
-# Branch develop
-# Node ID ebb8c53b8fdc09d2542ec6b8a63585be63c02725
-# Parent  a29fbab1f3ac59fda0e81bf1e99d153b5f47bd7c
-CONFIG key to disable setting custom rpath option.
-
-diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro
---- a/src/app/tape/tape.pro
-+++ b/src/app/tape/tape.pro
-@@ -348,10 +348,16 @@
- # Path to recource file.
- win32:RC_FILE = share/resources/tape.rc
- 
--unix:!macx{
--    # suppress the default RPATH
--    QMAKE_LFLAGS_RPATH =
--    QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}"
-+noRunPath{ # For enable run qmake with CONFIG+=noRunPath
-+    # do nothing
-+} else {
-+    unix:!macx{
-+        # suppress the default RPATH
-+        # helps to run the program without Qt Creator
-+        # see problem with path to libqmuparser and libpropertybrowser
-+        QMAKE_LFLAGS_RPATH =
-+        QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}"
-+    }
- }
- 
- # When the GNU linker sees a library, it discards all symbols that it doesn't need.
-diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro
---- a/src/app/valentina/valentina.pro
-+++ b/src/app/valentina/valentina.pro
-@@ -476,10 +476,16 @@
-     copyToDestdir($$pdftops_path, $$shell_path($${OUT_PWD}/$$DESTDIR))
- }
- 
--unix:!macx{
--    # suppress the default RPATH
--    QMAKE_LFLAGS_RPATH =
--    QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}"
-+noRunPath{ # For enable run qmake with CONFIG+=noRunPath
-+    # do nothing
-+} else {
-+    unix:!macx{
-+        # suppress the default RPATH
-+        # helps to run the program without Qt Creator
-+        # see problem with path to libqmuparser and libpropertybrowser
-+        QMAKE_LFLAGS_RPATH =
-+        QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}"
-+    }
- }
- 
- # When the GNU linker sees a library, it discards all symbols that it doesn't need.
diff --git a/media-gfx/valentina/files/locales.patch b/media-gfx/valentina/files/locales.patch
deleted file mode 100644
index a9084627df57..000000000000
--- a/media-gfx/valentina/files/locales.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/src/app/translations.pri b/src/app/translations.pri
-index b2dd2c4..87c55f7 100755
---- a/src/app/translations.pri
-+++ b/src/app/translations.pri
-@@ -9,22 +9,27 @@ PMSYSTEMS += \
-     p0 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 p15 p16 p17 p18 p19 p20 p21 p22 p23 p24 p25 p26 p27 p28 p29 p30 \
-     p31 p32 p33 p34 p35 p36 p37 p38 p39 p40 p41 p42 p43 p44 p45 p46 p47 p48 p49 p50 p51 p52 p53 p54 p998
- 
--LANGUAGES += \
--    ru_RU \
--    uk_UA \
--    de_DE \
--    cs_CZ \
--    he_IL \
--    fr_FR \
--    it_IT \
--    nl_NL \
--    id_ID \
--    es_ES \
--    fi_FI \
--    en_US \
--    en_CA \
--    en_IN \
--    ro_RO
-+isEmpty(LOCALES){
-+ LANGUAGES += \
-+ ru_RU \
-+ uk_UA \
-+ de_DE \
-+ cs_CZ \
-+ he_IL \
-+ fr_FR \
-+ it_IT \
-+ nl_NL \
-+ id_ID \
-+ es_ES \
-+ fi_FI \
-+ en_US \
-+ en_CA \
-+ en_IN \
-+ ro_RO \
-+ zh_CN
-+ } else {
-+ LANGUAGES = $${LOCALES}
-+ }
- 
- for(lang, LANGUAGES) {
-     INSTALL_TRANSLATIONS += $${TRANSLATIONS_PATH}/valentina_$${lang}.qm
diff --git a/media-gfx/valentina/valentina-0.4.2-r3.ebuild b/media-gfx/valentina/valentina-0.4.2-r3.ebuild
deleted file mode 100644
index d64507ced9aa..000000000000
--- a/media-gfx/valentina/valentina-0.4.2-r3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qmake-utils gnome2-utils fdo-mime
-
-DESCRIPTION="Cloth patternmaking software"
-HOMEPAGE="http://valentinaproject.bitbucket.org/"
-SRC_URI="https://bitbucket.org/dismine/valentina/get/v0.4.2.zip -> ${P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome"
-
-# en_IN not supported in Gentoo so not added here
-LANGS="cs_CZ de_DE en_CA en_US es_ES fi_FI fr_FR he_IL id_ID it_IT nl_NL ro_RO ru_RU uk_UA zh_CN"
-
-for LANG in ${LANGS}; do
-	IUSE="${IUSE} linguas_${LANG}"
-done
-
-CDEPEND="
-	app-text/poppler
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/dismine-${PN}-44d43351cb59
-
-src_prepare() {
-	epatch "${FILESDIR}/locales.patch" \
-		"${FILESDIR}/fix-insecure-runpaths.patch" \
-		"${FILESDIR}/disable-tests-compilation.patch"
-}
-
-src_configure() {
-	local locales=""
-
-	for LANG in ${LANGS}; do
-		if use linguas_${LANG}; then
-			locales="${locales} ${LANG}"
-		fi
-	done
-
-	eqmake5 LOCALES="${locales}" "CONFIG+=noStripDebugSymbols no_ccache noRunPath noTests" Valentina.pro -r
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-
-	dodoc LICENSE_GPL.txt ChangeLog.txt README.txt
-
-	doman dist/debian/${PN}.1
-	doman dist/debian/tape.1
-
-	cp dist/debian/valentina.sharedmimeinfo dist/debian/${PN}.xml || die
-	insinto /usr/share/mime/packages
-	doins dist/debian/${PN}.xml
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	if use gnome ; then
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/media-gfx/valentina/valentina-0.4.5.ebuild b/media-gfx/valentina/valentina-0.4.5.ebuild
deleted file mode 100644
index d64507ced9aa..000000000000
--- a/media-gfx/valentina/valentina-0.4.5.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qmake-utils gnome2-utils fdo-mime
-
-DESCRIPTION="Cloth patternmaking software"
-HOMEPAGE="http://valentinaproject.bitbucket.org/"
-SRC_URI="https://bitbucket.org/dismine/valentina/get/v0.4.2.zip -> ${P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome"
-
-# en_IN not supported in Gentoo so not added here
-LANGS="cs_CZ de_DE en_CA en_US es_ES fi_FI fr_FR he_IL id_ID it_IT nl_NL ro_RO ru_RU uk_UA zh_CN"
-
-for LANG in ${LANGS}; do
-	IUSE="${IUSE} linguas_${LANG}"
-done
-
-CDEPEND="
-	app-text/poppler
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/dismine-${PN}-44d43351cb59
-
-src_prepare() {
-	epatch "${FILESDIR}/locales.patch" \
-		"${FILESDIR}/fix-insecure-runpaths.patch" \
-		"${FILESDIR}/disable-tests-compilation.patch"
-}
-
-src_configure() {
-	local locales=""
-
-	for LANG in ${LANGS}; do
-		if use linguas_${LANG}; then
-			locales="${locales} ${LANG}"
-		fi
-	done
-
-	eqmake5 LOCALES="${locales}" "CONFIG+=noStripDebugSymbols no_ccache noRunPath noTests" Valentina.pro -r
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-
-	dodoc LICENSE_GPL.txt ChangeLog.txt README.txt
-
-	doman dist/debian/${PN}.1
-	doman dist/debian/tape.1
-
-	cp dist/debian/valentina.sharedmimeinfo dist/debian/${PN}.xml || die
-	insinto /usr/share/mime/packages
-	doins dist/debian/${PN}.xml
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	if use gnome ; then
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/media-gfx/valentina/valentina-0.5.0-r2.ebuild b/media-gfx/valentina/valentina-0.5.0-r2.ebuild
new file mode 100644
index 000000000000..3ba76fa3cd6b
--- /dev/null
+++ b/media-gfx/valentina/valentina-0.5.0-r2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils gnome2-utils xdg-utils epatch
+
+DESCRIPTION="Cloth patternmaking software"
+HOMEPAGE="https://valentinaproject.bitbucket.io/"
+SRC_URI="https://bitbucket.org/dismine/${PN}/get/v${PV}.zip -> ${P}.zip
+	https://bitbucket.org/dismine/${PN}/commits/d78ca13c4891ccf3542b0704a7d66af0f9b02938/raw -> valentina-4798.patch
+	https://bitbucket.org/dismine/${PN}/commits/98e869c4146204ef31822087fa826cfa1cd7e0f4/raw -> valentina-4802.patch"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome"
+
+# en_IN not supported in Gentoo so not added here
+LANGS="cs_CZ de_DE el_GR en_CA en_US es_ES fi_FI fr_FR he_IL id_ID it_IT nl_NL pt_BR ro_RO ru_RU uk_UA zh_CN"
+
+for LANG in ${LANGS}; do
+	IUSE="${IUSE} linguas_${LANG}"
+done
+
+CDEPEND="
+	app-text/poppler
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/dismine-${PN}-31c95eadca8b
+
+src_prepare() {
+	epatch "${DISTDIR}/${PN}-4798.patch" \
+		"${DISTDIR}/${PN}-4802.patch"
+
+	default
+}
+
+src_configure() {
+	local locales=""
+
+	for LANG in ${LANGS}; do
+		if use linguas_${LANG}; then
+			locales="${locales} ${LANG}"
+		fi
+	done
+
+	eqmake5 LOCALES="${locales}" "CONFIG+=noStripDebugSymbols no_ccache noRunPath noTests" Valentina.pro -r
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+
+	dodoc AUTHORS.txt ChangeLog.txt README.txt
+
+	doman dist/debian/${PN}.1
+	doman dist/debian/tape.1
+
+	cp dist/debian/valentina.sharedmimeinfo dist/debian/${PN}.xml || die
+	insinto /usr/share/mime/packages
+	doins dist/debian/${PN}.xml
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	if use gnome ; then
+		gnome2_icon_cache_update
+	fi
+}
diff --git a/media-gfx/valentina/valentina-0.5.0.ebuild b/media-gfx/valentina/valentina-0.5.0.ebuild
deleted file mode 100644
index 172cf895fa38..000000000000
--- a/media-gfx/valentina/valentina-0.5.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit epatch qmake-utils gnome2-utils fdo-mime
-
-DESCRIPTION="Cloth patternmaking software"
-HOMEPAGE="http://valentinaproject.bitbucket.org/"
-SRC_URI="https://bitbucket.org/dismine/valentina/get/v0.4.2.zip -> ${P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome"
-
-# en_IN not supported in Gentoo so not added here
-LANGS="cs_CZ de_DE en_CA en_US es_ES fi_FI fr_FR he_IL id_ID it_IT nl_NL ro_RO ru_RU uk_UA"
-
-for LANG in ${LANGS}; do
-	IUSE="${IUSE} linguas_${LANG}"
-done
-
-CDEPEND="
-	app-text/poppler
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/dismine-${PN}-44d43351cb59
-
-src_prepare() {
-	epatch "${FILESDIR}/locales.patch" \
-		"${FILESDIR}/fix-insecure-runpaths.patch" \
-		"${FILESDIR}/disable-tests-compilation.patch"
-
-	default
-}
-
-src_configure() {
-	local locales=""
-
-	for LANG in ${LANGS}; do
-		if use linguas_${LANG}; then
-			locales="${locales} ${LANG}"
-		fi
-	done
-
-	eqmake5 LOCALES="${locales}" "CONFIG+=noStripDebugSymbols no_ccache noRunPath noTests" Valentina.pro -r
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-
-	dodoc LICENSE_GPL.txt ChangeLog.txt README.txt
-
-	doman dist/debian/${PN}.1
-	doman dist/debian/tape.1
-
-	cp dist/debian/valentina.sharedmimeinfo dist/debian/${PN}.xml || die
-	insinto /usr/share/mime/packages
-	doins dist/debian/${PN}.xml
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	if use gnome ; then
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/media-gfx/valentina/valentina-9999.ebuild b/media-gfx/valentina/valentina-9999.ebuild
index 26d48b1311b8..3c119be7617c 100644
--- a/media-gfx/valentina/valentina-9999.ebuild
+++ b/media-gfx/valentina/valentina-9999.ebuild
@@ -3,11 +3,10 @@
 
 EAPI=6
 
-inherit mercurial qmake-utils gnome2-utils fdo-mime
+inherit mercurial qmake-utils gnome2-utils xdg-utils
 
 DESCRIPTION="Cloth patternmaking software"
-HOMEPAGE="http://valentinaproject.bitbucket.org/"
-SRC_URI=""
+HOMEPAGE="https://valentinaproject.bitbucket.io/"
 EHG_REPO_URI="https://bitbucket.org/dismine/valentina"
 EHG_REVISION="develop"
 
@@ -51,7 +50,7 @@ src_configure() {
 src_install() {
 	emake install INSTALL_ROOT="${D}"
 
-	dodoc LICENSE_GPL.txt ChangeLog.txt README.txt
+	dodoc AUTHORS.txt ChangeLog.txt README.txt
 
 	doman dist/debian/${PN}.1
 	doman dist/debian/tape.1
@@ -62,7 +61,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 
 	if use gnome ; then
 		gnome2_icon_cache_update
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index ffc9ebd7357a..a558bd81b02b 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1,10 +1,6 @@
 AUX avidemux-core-2.6.20-fix-cmake.patch 1020 SHA256 a0c99d111a0463af8591711f3c4dd5d56c7becfac1d3acfc71bb34d3396e760a SHA512 82f4a5c3328d593bc5b2dbabc339eb19ceb6bc295984ca1fda4efbfd0f0a3687d39d07f36cf4338230396db849012f3d8ea053404f78317712741571cf060f0e WHIRLPOOL cd238f29eeb2efdc6e142eac16b50ab02cb4896442700707363949b38c0b4d31f4cabe589090bd63bf9ebe4b1b1c99060967a3af222ba31c87a4be432331c49b
-AUX avidemux-core-2.6.8-gcc6.patch 2442 SHA256 23fa42b51424b0bc5f193ffae4674c37260fdef10057e8927c3263887019c79f SHA512 96de07011cb52f1cc49a2f7490ded579be16365b3c0d1b075d84968acd4838c6661a4587f75441d19e0caa95ff506510f3834fac105a8a946cf983c2f6a86a7b WHIRLPOOL ae07b7ad7b398ee31afa17aa92a0227cb70f267acd319b162b728d8d61d59465a86d4b4d4230207eb071d53b2793c207a626b7c0be094d057f732354aaaeaf04
 DIST avidemux_2.6.20.tar.gz 20172362 SHA256 03c6cb7fc9eb74688b4fcd5eb654ed7b9c4ffc717a72cc09b08a2d10cdc7ef9f SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103 WHIRLPOOL 2e2dc21bed49eeb0cdfefe75fe51f6a84226e7e8e80b063bc0b3d8711a6b91db710611dc0ec06575be69ec8e24f2f9e5b5eb363b9c095267729e85e162a4ce38
-DIST avidemux_2.6.8.tar.gz 17380534 SHA256 02998c235a89894d184d745c94cac37b78bc20e9eb44b318ee2bb83f2507e682 SHA512 57a4042f1a9d46462850871d36950215c5ffb5b66ce2f2cde09d747e946c05adb7a550ac7763c96f4c1bcb2c39881407d9d88bc64c93053741091751495ba0b0 WHIRLPOOL 29f8a6039d82e686e8dfbfc7b23658921834238a4cc6c4de338afdfdc032a9a7cba1c8236789aa6dbcab318ec14c344c19563f153e6cbd63cd265c5fb15b44b6
 EBUILD avidemux-core-2.6.20-r2.ebuild 2592 SHA256 3243878267f5983c2654057afc06aa02a240d46507e68ebced6b5432a2c00359 SHA512 3e0c2cbb97f734a7ee9d386241bda083fe41d9f0777bad50db6f017fca121aa0cbe4e699d28a6499d7f94b0238da6fa7bc96f9f0bef359a64f000b27b562efad WHIRLPOOL e67cd3046fee8471178d6a44b56ff487cb1327c59e2989a33fe4b0e3ff902cbee9b835d4bafdf00f27d5af1fcaadb606ee3262f39ebf59a8c142ce9a5f54edef
-EBUILD avidemux-core-2.6.20.ebuild 3021 SHA256 c83445c6c508376598db70f75b92162a7d1b2ca5ea53d97ae10d3b5d8f5b42ad SHA512 88b85a8458345567fb6529af137fed0c5d445452a5fb58e8bed434ae8b8cfd821368eb04e0901976701b364c34be3adadd393bdafe890459b95214039ceaa321 WHIRLPOOL 4adb3f40ce95de30b9c9a58da30928c540fb45b3f5615ee234c998a0773db88c6ac2f68002ceb7e952b7696cd6e7c3fa68f1696a91eae80512a5b333667cfb98
-EBUILD avidemux-core-2.6.8.ebuild 3165 SHA256 dada7c05d9a9a312fef405c172d26bc4a861b58ab05df6ca859df37e3796b09d SHA512 cf13c426ff523b899d8c1cbc0d1458f8210f41fc2c7fa1e7962b941a0aebcd5586ccaef68c65cfefb8d868662cf4c31a91d95281c573870fd63350081384b581 WHIRLPOOL 6de28aa915516da1fdeff1e7e0f386aa0abdcf4a1af5f2577f896780170856ada7e9a562a4d5b5b216435d0e23abf9e3ee705805dae7558bc2839f68eeb3a83a
 EBUILD avidemux-core-9999.ebuild 2544 SHA256 da29bc162f9ca6c9cf6011b19c3b9020b130d31d6754ee7cad3493b4d74e3567 SHA512 de9308bc45c70d19d14d0751131027f3f4443bedc7bcbd1f1de8823448ae38684f7c4f8fb107e65db00a402cb4e72327a8d47283218be920cafda97a6fc7cb3a WHIRLPOOL ee3f3385530b6b9bdd74d229edabef4ca62ff902f45e9c24a0450273245b7b529673fb3845807b84d1cee22e4bbff101d0362107e66add3700db74f155d9e76c
 MISC ChangeLog 3269 SHA256 c1934934c5c1b2a768e73ebda234d4e209a7f3a734dbda75e6fee5bcda70397b SHA512 9d29abd3feb4c042d8f3316b15fa15f8f28642f2c8f63063d7828cccb7efff3225d3c4515fc3dc26fd6f2babba277e48e7c9e1adf453146f25b66742e44fb103 WHIRLPOOL b8cb1cacf19021d8a0891ce41676bcbd6e5ed21d209af42f0603a3c12a8d2c78a4a522f2ad6c6180f66ee440a9b37d56e87a767050efd1ebcfcfc0955ed2d3af
 MISC ChangeLog-2015 4820 SHA256 40f82912cf09dcfc5ab20cbe992fafce6cf8dd376a4346f40b7b9383c1a8d5ce SHA512 c1a1eb6d72c1b0c2e7340338b6cc4e33adb3885015e6c837776bba225a868b1660de061fd9e2f11409011a17420e6109e9a375222d59cd775d2243f1b73245db WHIRLPOOL 88117b9d06f4c718d3a7716526d6be4d88ca519a89a5d3ad88ffdd4949b9aa159e5d76d5bddbba650126015eac9003440bfd1bbb2605b24040d230452d839f35
diff --git a/media-libs/avidemux-core/avidemux-core-2.6.20.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.20.ebuild
deleted file mode 100644
index 3a7af781cc14..000000000000
--- a/media-libs/avidemux-core/avidemux-core-2.6.20.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-DESCRIPTION="Core libraries for a video editor designed for simple cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-SLOT="2.6"
-IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau video_cards_fglrx xv"
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}
-
-	inherit git-r3
-else
-	MY_PN="${PN/-core/}"
-	MY_P="${MY_PN}_${PV}"
-	SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
-DEPEND="
-	!<media-video/avidemux-${PV}:${SLOT}
-	dev-db/sqlite:3
-	sdl? ( media-libs/libsdl:0 )
-	system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] )
-	xv? ( x11-libs/libXv:0 )
-	vaapi? ( x11-libs/libva:0 )
-	vdpau? ( x11-libs/libvdpau:0 )
-	nvenc? ( media-video/nvidia_video_sdk )
-	video_cards_fglrx? (
-		|| ( >=x11-drivers/ati-drivers-14.12-r3
-			x11-libs/xvba-video:0 )
-		)
-"
-RDEPEND="
-	$DEPEND
-	nls? ( virtual/libintl:0 )
-"
-DEPEND="
-	$DEPEND
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	!system-ffmpeg? ( dev-lang/yasm[nls=] )
-"
-
-S="${WORKDIR}/${MY_P}"
-CMAKE_USE_DIR="${S}/${PN/-/_}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if use system-ffmpeg ; then
-		# Preparations to support the system ffmpeg. Currently fails because it depends on files the system ffmpeg doesn't install.
-		local error="Failed to remove ffmpeg."
-
-		rm -rf cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package buildCore/ffmpeg || die "${error}"
-		sed -i -e 's/include(admFFmpegUtil)//g' avidemux/commonCmakeApplication.cmake || die "${error}"
-		sed -i -e '/registerFFmpeg/d' avidemux/commonCmakeApplication.cmake || die "${error}"
-		sed -i -e 's/include(admFFmpegBuild)//g' avidemux_core/CMakeLists.txt || die "${error}"
-	else
-		# Avoid existing avidemux installations from making the build process fail, bug #461496.
-		sed -i -e "s:getFfmpegLibNames(\"\${sourceDir}\"):getFfmpegLibNames(\"${WORKDIR}/${P}_build/ffmpeg/source/\"):g" cmake/admFFmpegUtil.cmake \
-			|| die "Failed to avoid existing avidemux installation from making the build fail."
-	fi
-}
-
-src_configure() {
-	# Add lax vector typing for PowerPC.
-	if use ppc || use ppc64 ; then
-		append-cflags -flax-vector-conversions
-	fi
-
-	# See bug 432322.
-	use x86 && replace-flags -O0 -O1
-
-	local mycmakeargs=(
-		-DAVIDEMUX_SOURCE_DIR='${S}'
-		-DGETTEXT="$(usex nls)"
-		-DSDL="$(usex sdl)"
-		-DLIBVA="$(usex vaapi)"
-		-DVDPAU="$(usex vdpau)"
-		-DXVBA="$(usex video_cards_fglrx)"
-		-DXVIDEO="$(usex xv)"
-		-DNVENC="$(usex nvenc)"
-	)
-
-	if use debug ; then
-		mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile -j1
-}
-
-src_install() {
-	cmake-utils_src_install -j1
-}
diff --git a/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild
deleted file mode 100644
index c47717b8c3d8..000000000000
--- a/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit cmake-utils eutils flag-o-matic
-
-SLOT="2.6"
-
-DESCRIPTION="Core libraries for a video editor designed for simple cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-IUSE="debug nls sdl system-ffmpeg vaapi vdpau video_cards_fglrx xv"
-KEYWORDS="~amd64 ~x86"
-
-MY_PN="${PN/-core/}"
-if [[ ${PV} == *9999* ]] ; then
-	KEYWORDS=""
-	EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
-
-	inherit git-2
-else
-	MY_P="${MY_PN}_${PV}"
-	SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
-DEPEND="
-	!<media-video/avidemux-${PV}:${SLOT}
-	dev-db/sqlite:3
-	sdl? ( media-libs/libsdl:0 )
-	system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] )
-	xv? ( x11-libs/libXv:0 )
-	vaapi? ( x11-libs/libva:0 )
-	vdpau? ( x11-libs/libvdpau:0 )
-	video_cards_fglrx? (
-		|| ( >=x11-drivers/ati-drivers-14.12-r3
-			x11-libs/xvba-video:0 )
-		)"
-RDEPEND="
-	$DEPEND
-	nls? ( virtual/libintl:0 )
-"
-DEPEND="
-	$DEPEND
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	!system-ffmpeg? ( dev-lang/yasm[nls=] )
-"
-
-S="${WORKDIR}/${MY_P}"
-BUILD_DIR="${S}/buildCore"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc6.patch )
-DOCS=( AUTHORS README )
-
-src_prepare() {
-	mkdir "${BUILD_DIR}" || die "Can't create build folder."
-
-	cmake-utils_src_prepare
-
-	if use system-ffmpeg ; then
-		# Preparations to support the system ffmpeg. Currently fails because it depends on files the system ffmpeg doesn't install.
-		local error="Failed to remove ffmpeg."
-
-		rm -rf cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package buildCore/ffmpeg || die "${error}"
-		sed -i -e 's/include(admFFmpegUtil)//g' avidemux/commonCmakeApplication.cmake || die "${error}"
-		sed -i -e '/registerFFmpeg/d' avidemux/commonCmakeApplication.cmake || die "${error}"
-		sed -i -e 's/include(admFFmpegBuild)//g' avidemux_core/CMakeLists.txt || die "${error}"
-	else
-		# Avoid existing avidemux installations from making the build process fail, bug #461496.
-		sed -i -e "s:getFfmpegLibNames(\"\${sourceDir}\"):getFfmpegLibNames(\"${S}/buildCore/ffmpeg/source/\"):g" cmake/admFFmpegUtil.cmake \
-			|| die "Failed to avoid existing avidemux installation from making the build fail."
-	fi
-
-	# Add lax vector typing for PowerPC.
-	if use ppc || use ppc64 ; then
-		append-cflags -flax-vector-conversions
-	fi
-
-	# See bug 432322.
-	use x86 && replace-flags -O0 -O1
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DAVIDEMUX_SOURCE_DIR='${S}'
-		$(cmake-utils_use nls GETTEXT)
-		$(cmake-utils_use sdl SDL)
-		$(cmake-utils_use vaapi LIBVA)
-		$(cmake-utils_use vdpau VDPAU)
-		$(cmake-utils_use video_cards_fglrx XVBA)
-		$(cmake-utils_use xv XVIDEO)
-	)
-
-	if use debug ; then
-		mycmakeargs+=( -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1 )
-	fi
-
-	CMAKE_USE_DIR="${S}"/avidemux_core cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile -j1
-}
-
-src_install() {
-	cmake-utils_src_install -j1
-}
diff --git a/media-libs/avidemux-core/files/avidemux-core-2.6.8-gcc6.patch b/media-libs/avidemux-core/files/avidemux-core-2.6.8-gcc6.patch
deleted file mode 100644
index dbdf8ff93a8d..000000000000
--- a/media-libs/avidemux-core/files/avidemux-core-2.6.8-gcc6.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/avidemux_core/ADM_coreUtils/src/prefs.cpp
-+++ b/avidemux_core/ADM_coreUtils/src/prefs.cpp
-@@ -44,8 +44,8 @@
-    const char *name2;
-    ADM_paramType  type;
-    const char *defaultValue;
--   float    min;
--   float    max;
-+   double    min;
-+   double    max;
- }optionDesc;
- 
- #include "prefs2_pref.h"
---- a/avidemux_core/ADM_coreAudio/src/ADM_audioStreamBuffered.cpp
-+++ b/avidemux_core/ADM_coreAudio/src/ADM_audioStreamBuffered.cpp
-@@ -46,7 +46,7 @@
-         // By construction, the error should be minimal
-         if(newDts!=ADM_AUDIO_NO_DTS)
-         {
--            if( abs(newDts-lastDts)>ADM_MAX_SKEW)
-+            if( labs((int64_t)newDts-lastDts)>ADM_MAX_SKEW)
-             {
-                 printf("[AudioStream] Warning skew in dts =%"PRId64", \n",(int64_t)newDts-(uint64_t)lastDts);
-                 printf("[AudioStream] Warning skew lastDts=%s \n",ADM_us2plain(lastDts));
---- a/avidemux_core/ADM_coreVideoCodec/src/ADM_ffmp43.cpp
-+++ b/avidemux_core/ADM_coreVideoCodec/src/ADM_ffmp43.cpp
-@@ -30,19 +30,19 @@
- #define WRAP_Open_Template(funcz,argz,display,codecid) \
- {\
- AVCodec *codec=funcz(argz);\
--if(!codec) {GUI_Error_HIG("Codec",QT_TR_NOOP("Internal error finding codec"display));ADM_assert(0);} \
-+if(!codec) {GUI_Error_HIG("Codec",QT_TR_NOOP("Internal error finding codec" display));ADM_assert(0);} \
-   codecId=codecid; \
-   _context->workaround_bugs=1*FF_BUG_AUTODETECT +0*FF_BUG_NO_PADDING; \
-   _context->error_concealment=3; \
-   if (avcodec_open(_context, codec) < 0)  \
-                       { \
--                                        printf("[lavc] Decoder init: "display" video decoder failed!\n"); \
--                                        GUI_Error_HIG("Codec","Internal error opening "display); \
-+                                        printf("[lavc] Decoder init: " display " video decoder failed!\n"); \
-+                                        GUI_Error_HIG("Codec","Internal error opening " display); \
-                                         ADM_assert(0); \
-                                 } \
-                                 else \
-                                 { \
--                                        printf("[lavc] Decoder init: "display" video decoder initialized! (%s)\n",codec->long_name); \
-+                                        printf("[lavc] Decoder init: " display " video decoder initialized! (%s)\n",codec->long_name); \
-                                 } \
- }
- 
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index 48703f4a80c2..2836008ce38c 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1,9 +1,6 @@
 AUX avidemux-plugins-2.6.20-optional-pulse.patch 743 SHA256 2ce7cd2717ef971ad5d16d442a41ebd3380a9289d160be01995ca095ce03da79 SHA512 dcec29c63aa7eb828fc1aaf4b54edb76290e3c7655b00002efa8036f0572b1c0111c30e873b925bb606e8e672e177ba8d103100b1fb55dcc830b83e4a5556710 WHIRLPOOL 9a39bfcc38d500fc30dbcfc2110e14ac1f781a78f6e75662d66f0262a0e5e1021709350da3c83cfc1faaaba5f9035d4163169935492558885a2eddc961a156f3
-AUX avidemux-plugins-2.6.4-optional-pulse.patch 787 SHA256 c95b6e56c51aa41894aa963c8568289968d07b8d685a3d7ed0d5ed74ade9a453 SHA512 783963cfb21e0e6510b80a56ffd2eb93dd94c79ab9f81ec91d82753734c7fc545c14d61f19abcc6ee935b05791182e83b5ad2db84d5286d220f7bfa013413dd6 WHIRLPOOL 0f91cd59f61d9695d1fedcb3efb6cd69520ecedc982cb2b74167c452db36174c8b24290191f35cd319caa5e2b4a360252ad1b11ec794266a572e6eafd9d72501
 DIST avidemux_2.6.20.tar.gz 20172362 SHA256 03c6cb7fc9eb74688b4fcd5eb654ed7b9c4ffc717a72cc09b08a2d10cdc7ef9f SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103 WHIRLPOOL 2e2dc21bed49eeb0cdfefe75fe51f6a84226e7e8e80b063bc0b3d8711a6b91db710611dc0ec06575be69ec8e24f2f9e5b5eb363b9c095267729e85e162a4ce38
-DIST avidemux_2.6.8.tar.gz 17380534 SHA256 02998c235a89894d184d745c94cac37b78bc20e9eb44b318ee2bb83f2507e682 SHA512 57a4042f1a9d46462850871d36950215c5ffb5b66ce2f2cde09d747e946c05adb7a550ac7763c96f4c1bcb2c39881407d9d88bc64c93053741091751495ba0b0 WHIRLPOOL 29f8a6039d82e686e8dfbfc7b23658921834238a4cc6c4de338afdfdc032a9a7cba1c8236789aa6dbcab318ec14c344c19563f153e6cbd63cd265c5fb15b44b6
 EBUILD avidemux-plugins-2.6.20.ebuild 4706 SHA256 70eeed1eabbff20311e11ffe1407d6da05cf4a8637464def34006d5565b8a57d SHA512 475ecaf3baff8af51786330f641d3d05a6f293e7c026a5dd003e0ace5c3eca6395b9136179f837f3bba7b36f532e530d83c26c0fae1df60e31d8f81a2cbcf097 WHIRLPOOL c7ab0a17b15c082826a21c9322b0baa3fa9f9d42d8d5b80e0a7777b1627abdad3c45474ae1b04669b0beaebf647f3775db0de56a8bd2f898756c8dfda2a20b11
-EBUILD avidemux-plugins-2.6.8.ebuild 4071 SHA256 8a3178bfc25aabb41e389ff9c0d52e09b7767a1bd521db0303f325e67dbe208a SHA512 7ee9144a8109c0e35a77d868891a46d18be67cfd56077a964947929a6b81a1cf04d166fc164ced26b9e56cfa9bbfe73283b7a1db2f8636f39f40b3a665a3b6da WHIRLPOOL 6f6ba24829ac13ff0e2f530967b948f620edf8608b34aed1419b461de74f3866ecc1f4d7a202a22ab9a39f8845a25a97d54e47a6ef18f449dd165a6bd94dbc0e
 EBUILD avidemux-plugins-9999.ebuild 4706 SHA256 70eeed1eabbff20311e11ffe1407d6da05cf4a8637464def34006d5565b8a57d SHA512 475ecaf3baff8af51786330f641d3d05a6f293e7c026a5dd003e0ace5c3eca6395b9136179f837f3bba7b36f532e530d83c26c0fae1df60e31d8f81a2cbcf097 WHIRLPOOL c7ab0a17b15c082826a21c9322b0baa3fa9f9d42d8d5b80e0a7777b1627abdad3c45474ae1b04669b0beaebf647f3775db0de56a8bd2f898756c8dfda2a20b11
 MISC ChangeLog 3761 SHA256 68ccdf9757ff5e0f74c592bca09d851073735b24d09f60752b30c1bf58c41d4f SHA512 8f94b86d56d47099f7c7d0249c4adf9d007623a88ef085f82b02aa30a99ab27d37c069658724e31b46f8d226ee678b28c69bd1a782be2059423fa1bfb0c3d2af WHIRLPOOL 2e6fd95c315af987d08b4930aab1524fc67ed59743fb8ce802ff869aa78b455d5ea2c8ae3a337d4c7244dbaa3def2ebdec1adff8c572fd5834c48411f91b862f
 MISC ChangeLog-2015 6171 SHA256 c84b0e215cc8bbe441059a4dd3d6b8dfbdafaff5eb413147c6bae05c55ecee65 SHA512 233280790085ff124bd1558ce7ee8a92dd8d17a4e7dded89ad6cec3ea19d037fd12ad45e6bed2f0e6a2d30c1151e6122457e4086ff1bc37f3fd14b8c09b40097 WHIRLPOOL a059eaff3177d67d3bf51ec156f9d579af208d4b88a95b2a5236188a2b4a2424dd734b383a3aa196161b855472aaa33b381d0ad28aa959af8b65173fbbe68c8a
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.6.8.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.6.8.ebuild
deleted file mode 100644
index 215b8e16ef21..000000000000
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.6.8.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eutils flag-o-matic python-single-r1
-
-SLOT="2.6"
-
-DESCRIPTION="Plugins for the video editor media-video/avidemux"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-IUSE="aac aften a52 alsa amr debug dts fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx opengl oss pulseaudio qt4 vorbis truetype twolame xv xvid x264 vdpau vpx"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~x86"
-
-MY_PN="${PN/-plugins/}"
-if [[ ${PV} == *9999* ]] ; then
-	KEYWORDS=""
-	EGIT_REPO_URI="git://gitorious.org/${MY_PN}2-6/${MY_PN}2-6.git https://git.gitorious.org/${MY_PN}2-6/${MY_PN}2-6.git"
-
-	inherit git-2
-else
-	MY_P="${MY_PN}_${PV}"
-	SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-RDEPEND="
-	~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?]
-	~media-video/avidemux-${PV}:${SLOT}[opengl?,qt4?]
-	>=dev-lang/spidermonkey-1.5-r2:0=
-	dev-libs/libxml2:2
-	media-libs/libpng:0=
-	virtual/libiconv:0
-	aac? (
-		media-libs/faac:0
-		media-libs/faad2:0
-	)
-	aften? ( media-libs/aften:0 )
-	alsa? ( >=media-libs/alsa-lib-1.0.3b-r2:0 )
-	amr? ( media-libs/opencore-amr:0 )
-	dts? ( media-libs/libdca:0 )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	fribidi? ( dev-libs/fribidi:0 )
-	jack? (
-		media-sound/jack-audio-connection-kit:0
-		libsamplerate? ( media-libs/libsamplerate:0 )
-	)
-	lame? ( media-sound/lame:0 )
-	pulseaudio? ( media-sound/pulseaudio:0 )
-	truetype? ( media-libs/freetype:2 )
-	twolame? ( media-sound/twolame:0 )
-	x264? ( media-libs/x264:0= )
-	xv? (
-		x11-libs/libX11:0
-		x11-libs/libXext:0
-		x11-libs/libXv:0
-	)
-	xvid? ( media-libs/xvid:0 )
-	vorbis? ( media-libs/libvorbis:0 )
-	vpx? ( media-libs/libvpx:0 )
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	oss? ( virtual/os-headers:0 )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.6.4-optional-pulse.patch )
-
-src_configure() {
-	# Add lax vector typing for PowerPC.
-	if use ppc || use ppc64 ; then
-		append-cflags -flax-vector-conversions
-	fi
-
-	# See bug 432322.
-	use x86 && replace-flags -O0 -O1
-
-	processes="buildPluginsCommon:avidemux_plugins
-		buildPluginsCLI:avidemux_plugins"
-	use qt4 && processes+=" buildPluginsQt4:avidemux_plugins"
-
-	for process in ${processes} ; do
-		local build="${process%%:*}"
-
-		local mycmakeargs="
-			-DAVIDEMUX_SOURCE_DIR='${S}'
-			-DPLUGIN_UI=$(echo ${build/buildPlugins/} | tr '[:lower:]' '[:upper:]')
-			$(cmake-utils_use aac FAAC)
-			$(cmake-utils_use aac FAAD)
-			$(cmake-utils_use alsa)
-			$(cmake-utils_use aften)
-			$(cmake-utils_use amr OPENCORE_AMRWB)
-			$(cmake-utils_use amr OPENCORE_AMRNB)
-			$(cmake-utils_use dts LIBDCA)
-			$(cmake-utils_use fontconfig)
-			$(cmake-utils_use jack)
-			$(cmake-utils_use lame)
-			$(cmake-utils_use oss)
-			$(cmake-utils_use pulseaudio PULSEAUDIOSIMPLE)
-			$(cmake-utils_use qt4)
-			$(cmake-utils_use truetype FREETYPE2)
-			$(cmake-utils_use twolame)
-			$(cmake-utils_use x264)
-			$(cmake-utils_use xv XVIDEO)
-			$(cmake-utils_use xvid)
-			$(cmake-utils_use vdpau)
-			$(cmake-utils_use vorbis)
-			$(cmake-utils_use vorbis LIBVORBIS)
-			$(cmake-utils_use vpx VPXDEC)
-		"
-
-		if use debug ; then
-			mycmakeargs+=" -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1"
-		fi
-
-		mkdir "${S}"/${build} || die "Can't create build folder."
-
-		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${S}"/${build} cmake-utils_src_configure
-	done
-}
-
-src_compile() {
-	for process in ${processes} ; do
-		BUILD_DIR="${S}/${process%%:*}" cmake-utils_src_compile
-	done
-}
-
-src_install() {
-	for process in ${processes} ; do
-		# cmake-utils_src_install doesn't respect BUILD_DIR
-		# and there sometimes is a preinstall phase present.
-		pushd "${S}/${process%%:*}" > /dev/null || die
-			grep '^preinstall/fast' Makefile && emake DESTDIR="${D}" preinstall/fast
-			grep '^install/fast' Makefile && emake DESTDIR="${D}" install/fast
-		popd > /dev/null || die
-	done
-
-	python_fix_shebang "${D}"
-}
diff --git a/media-libs/avidemux-plugins/files/avidemux-plugins-2.6.4-optional-pulse.patch b/media-libs/avidemux-plugins/files/avidemux-plugins-2.6.4-optional-pulse.patch
deleted file mode 100644
index 78650aaa7c02..000000000000
--- a/media-libs/avidemux-plugins/files/avidemux-plugins-2.6.4-optional-pulse.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/cmake/admCheckAudioDeviceLibs.cmake


-+++ b/cmake/admCheckAudioDeviceLibs.cmake


-@@ -158,6 +158,8 @@


- 


- 	MESSAGE(STATUS "Checking for PULSEAUDIOSIMPLE")


- 	MESSAGE(STATUS "*****************************")


-+


-+	IF (PULSEAUDIOSIMPLE)


-         IF (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES)


-         # in cache already


-          SET(PULSEAUDIOSIMPLE_FIND_QUIETLY TRUE)


-@@ -198,6 +200,9 @@


-         MARK_AS_ADVANCED(PULSEAUDIOSIMPLE_INCLUDE_DIR PULSEAUDIOSIMPLE_LIBRARIES)


- 


- 		APPEND_SUMMARY_LIST("Audio Device" "PulseAudio" "${USE_PULSE_SIMPLE}")


-+	ELSE (PULSEAUDIOSIMPLE)


-+		MESSAGE("${MSG_DISABLE_OPTION}")


-+	ENDIF (PULSEAUDIOSIMPLE)


- ELSE (UNIX AND NOT APPLE)


- 	SET(PULSEAUDIOSIMPLE_CAPABLE FALSE)


- ENDIF (UNIX AND NOT APPLE)


diff --git a/media-libs/faac/Manifest b/media-libs/faac/Manifest
index 7908456d974d..519b5684af83 100644
--- a/media-libs/faac/Manifest
+++ b/media-libs/faac/Manifest
@@ -4,9 +4,11 @@ AUX faac-1.28-inttypes.patch 1392 SHA256 b135e8441673727a3dbfa8b5237896f985f5505
 AUX faac-1.28-libmp4v2_r479_compat.patch 4741 SHA256 4d1d67ad908fd1887212719a12dca6d786784eba7509b84c39b51bf00fa36911 SHA512 7b79664fbd912e069b2c0ce49f97a29db03ed3f339bdf6ef5a4cc668c585a56fbb900b6cf40c014ad40f5e559aa048a9340aab30d393420630c433569393fb5b WHIRLPOOL 5783e0fd48aba3b0d292bc50e931c7f00658f93438079506b5346e85c2cbeddc7e94a8694a0fefa50f99469140b8b56947fc63b67a1d2a254017d9dab065977c
 DIST faac-1.28.tar.gz 678891 SHA256 c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df SHA512 0ef721ad28835e95cad41afc0cb6130e1ebb634cb6dd4b40f649bc2269b7bb5bf2887f6d8f023c74628d521f8bdf55b4dd070f972ecff162a5fe0384e026235b WHIRLPOOL fe56f3c2b40670f03e0c1880b253d7f0cc6e318c0b407f4e57fb7eaeac8692c6de9829402e670ddc0f397396935131ade0f8dadfc89b88fcdedecbf404e1b54e
 DIST faac-1.29.7.8.tar.gz 477443 SHA256 316fff598764b93485dc5fb41379768b8c69348bbbb87e0e30ce28b1da487251 SHA512 b837e2a884eb86e70e812404109b6ff5d25c60dd5f98275ed7515836f67afe19c940a4b2574d7fcf7bebc793f5bb509c6ebad37281fe1addf95f815e00ea41a6 WHIRLPOOL 201822a65b0f3855b148a01ec761ef6ee50bbbee18649a41a3a1d03c45096959ac7c2177beaa455f37654290318d708b20880150a67c2b54f5762d2950bc2c69
+DIST faac-1.29.8.3.tar.gz 483404 SHA256 3d85267b394dd8ebd5dd88845b25bc5e5e4fc88ac5affb8a2807f50368dc3b41 SHA512 2f17d87245c5cdb1ea37f21fb67f5a239f24133bb863bd635bb1f223d8d54c13d23ad43e93954a89361109c39b01e3b506ee791ffdf52741f76feb8bd1ed316c WHIRLPOOL 72f601a8c1ef9901e0037db9dc99a873997bce366ce79aef5d08fc5fa2edb7baeeb0c9738d416cd058720b2a52d14288410ce51beba76d864b45fff30a6526e0
 DIST faac-1.29.8.tar.gz 470998 SHA256 ea0d508cd1aa9d1c00998fa922dc8a4a1535892c204483cba27e5d55bec48973 SHA512 aff0a87f12aba69564956a4d19f56234e38e6cc60f19d77203fb731d31f7aa8763efbd3a636fdcf84229df8c9a9b99666dd667ef5ae5745b41cfd1fd863b79d0 WHIRLPOOL d159af80f7fa4edc1234fab65178060b8ccc370069ec40f56d68f7a71fbd56b94ff33383da7232e98687ac8426de81685ec72301a3a5c1eca566c01de426730d
 EBUILD faac-1.28-r4.ebuild 1716 SHA256 db27c7850f62948c0d91580cf62bb39a1e88415880545ef8d427e9a44ace9b4c SHA512 86a56132cd2b52e5ef8ccbfc2c31969b728cca8889ca15fd5980950c2f6974404d40aaf7499e692a36292e9335d0aff31504f2dd3e0d6a44996bb56b9eeb3ef6 WHIRLPOOL fb30f4461f8b453257e5fb84f0810a5f183863207bab64dccf98e147d187561312e3ea9bd4c9f1c801ee4ec043a57f3a71ae7e5665ee0d89b09994545bf654e2
 EBUILD faac-1.29.7.8.ebuild 1200 SHA256 311b5c1b01f255e7b15d1be06fc8b137c8c8fd046b790f4038bf15cf0cdf5c62 SHA512 230d21c783b52aa838c1d25ee7a964b2d83fa9efb0686d1be03de56ade1075a70a2a0f0053e72f2121a7323496fac834f485f60ae0578d74ee1253b7212f46f1 WHIRLPOOL c54c19f6b0229d9758d717ee893283c1e7de15ebaab6b991c579586feb1c4b1b4cad91481029654e893fa00886b7f5978974ffad7647daf073edac6fcc73cf74
+EBUILD faac-1.29.8.3.ebuild 1143 SHA256 def9dbec42c6de23369954fcf738c3d313bf2c265606c70b5f63375f41b68e41 SHA512 2c9f0d2767acdba0a5a99e19e741816fd49b01b16e4e49c13a910ea53171f84b165fa53219516fac9b661577a9616debbbd6885713a184dca424ee3ff23339b6 WHIRLPOOL dd3533de951b1d1d2dbdbe8fde3b6b9e31267716b335d9e59a8041d3177f53eee198c66c20604c4c6f6ddb4903a7a4bdcb51d9564a21972ddf910cb9d488440a
 EBUILD faac-1.29.8.ebuild 1143 SHA256 def9dbec42c6de23369954fcf738c3d313bf2c265606c70b5f63375f41b68e41 SHA512 2c9f0d2767acdba0a5a99e19e741816fd49b01b16e4e49c13a910ea53171f84b165fa53219516fac9b661577a9616debbbd6885713a184dca424ee3ff23339b6 WHIRLPOOL dd3533de951b1d1d2dbdbe8fde3b6b9e31267716b335d9e59a8041d3177f53eee198c66c20604c4c6f6ddb4903a7a4bdcb51d9564a21972ddf910cb9d488440a
 MISC ChangeLog 2766 SHA256 bdc61025dd8ac5f1fd720007d05ed5cb30b517aa84da837f0a77d7b13b4d97b7 SHA512 aece8dd67f8b9bdeeebb412bc78d711d23d1d20a642a68d3610a5b626d4a07af0cc6f9f34b038b5776a290d6a1a395e4828325170bdf02152c6ee0eadd80356b WHIRLPOOL c0f8ff388fb7783ee66e147f687a529366fc6523a496f5ec765f70e95451f6360571af45e0d48f4ea3739064ab0197984c4661bf6ca26a4ab2b6e3e0995c2199
 MISC ChangeLog-2015 13602 SHA256 3075cbee9829e14929773af0ce5e942d18e400fd931612827c7aeee1551d39c6 SHA512 6a66fa11bd38a811b4d8c74778a676e0cf5d431a6972fa8839a51c3f087fcdfeccf4a7725b214a461ba32beab2311a83e0011f317d15b8a6d557007ed1d35545 WHIRLPOOL 07d9c4185664e19816b333a23e6c6c14ea426c9c465d2ffa593d5745b72a9e24e3c63d82e490e100d4027d882d6a896ab5b173d347eae2fd94c4f0a48f4a004d
diff --git a/media-libs/faac/faac-1.29.8.3.ebuild b/media-libs/faac/faac-1.29.8.3.ebuild
new file mode 100644
index 000000000000..384836d70d7c
--- /dev/null
+++ b/media-libs/faac/faac-1.29.8.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+# eutils for einstalldocs
+inherit autotools epatch epunt-cxx eutils ltprune multilib-minimal
+
+DESCRIPTION="Free MPEG-4 audio codecs by AudioCoding.com"
+HOMEPAGE="http://www.audiocoding.com"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1 MPEG-4"
+SLOT="0"
+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="static-libs"
+
+DEPEND="${RDEPEND}"
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_prepare() {
+	default
+
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466984
+
+	eautoreconf
+	epunt_cxx
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(use_enable static-libs static)
+	)
+
+	ECONF_SOURCE="${S}" econf ${myconf[@]}
+
+	# do not build the frontend for non default abis
+	if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
+		sed -i -e 's/frontend//' Makefile || die
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	prune_libtool_files
+}
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index 1bd2743954d3..e27af8764e9c 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -7,8 +7,8 @@ DIST gst-plugins-bad-1.10.5.tar.xz 4737820 SHA256 c5806040bb83b43be86ce592e6a19c
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 SHA256 36d059761852bed0f1a7fcd3ef64a8aeecab95d2bca53cd6aa0f08054b1cbfec SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661 WHIRLPOOL b4c1262a0ca63331f5cb38fecc6a26830234712d6d4409aed495b05e7cfe13760bf056767e54e17cb9899c3671f0a05b90199d80d0b47bacb2ee6d27b89a5457
 EBUILD gst-plugins-bad-0.10.23-r4.ebuild 1565 SHA256 9f8b93315fed3baf4b2fc16b482819f84792692859fdb467016e32a4347cc5ff SHA512 6c68c102487868c23bc177aa65a9a734f7e2cd89bcca5af827d98dcfb61d26a84b09a07d4ec6d7397a17ffa57ab33fdbfc5fc290bb9eb397209150da86ebb492 WHIRLPOOL b126e9adda14114abc266e388699035bb7a8d2d1b54a981399bc429013228c685fedef1f4fc1b090d906f2b52385127fed2ce8cdd099136a20961581f9b96d00
 EBUILD gst-plugins-bad-1.10.3.ebuild 2938 SHA256 e5d9eb1da9cf958ca66a4d29c1b1df24fed8309ff47181c60975e26930d6fce8 SHA512 0c951c010174d1a514c9e5b378ff36ddbd08ce104261f8080157fd0650e13e7baab1aaaafee389068d97cd5701bbd2da57267fa872798c644ae0063812065654 WHIRLPOOL 93036a9336df1f2cb2f907e39f744003be5ce20675f4e50149e8dddca725bc37e6787b9a4bc8381db6dc6916bb77be094a61b4fb4e911b358c3834f8f55d1100
-EBUILD gst-plugins-bad-1.10.5.ebuild 2698 SHA256 9f015246eb63acd3d82882b3243cfe99ff4fbd3d2f862d5f20a595f8577ced88 SHA512 f29919187b2c7d14ea519f5a9c1967f6ec64ebcb73edbff4cbee82dcaef4c95c29317942dda435f7906524b702fd6f8884a2e13e30cc05793c4c41b8ea102910 WHIRLPOOL 98a8e9865c83cee08b71a600d3f9ec377b507d12b263a940722350ae32b5f6e0b460d8db80e0792b947f565c22c906189aef4ddbcfa87e53ee83396483e2828b
-EBUILD gst-plugins-bad-1.12.3.ebuild 2788 SHA256 cce76ecbbdf22c273b1a822d0df06788feccd6f1705c9bc0e57870c0f5b71327 SHA512 a7a039d11dcd6aa371cbc1f61afde96e243f7e435c2139d0d8e89ff63486e5f4f4f2109cbd0681036ae9f05c82372d46e570d10aa647b7b8159bcc0195f3bbaf WHIRLPOOL 06176ceef03808e9045e72878bbb7915f7cdb7494bf7a4ce043122e398702cc3e0d1358f221729f9f445f012c8ddb5d2f31b4036b805dd01e04b13c7135f0f4d
+EBUILD gst-plugins-bad-1.10.5.ebuild 2696 SHA256 98a1c5a98f8fa418a3d75acd03b8c91493bc17c9f7df4d5b44828d5df81491cd SHA512 3702ba22b3747a965155d1d2a51e9d973e582eb80bf1d4a13ccecd0268ae68d2fd7e5246af699ec4292604f648b90053e43b45af57ea282c3779381ce416e7a5 WHIRLPOOL df90435722b02c9c16cbda62aec17a16af6c86c94f81570f4b48bc920198ee1c7e2e5b6d9e1552f7dbe3b1a72bc278bae1d995dd3a6acff2285fe1f495eecdfa
+EBUILD gst-plugins-bad-1.12.3.ebuild 2820 SHA256 cef91e7fe9566377e0c4d074185fe904f08058d402e9a4fa2d49db369a6ad9c8 SHA512 38169ab046255c38395f3b00c43c33c359efa1360cd4a948df19aca848a8a4af1421ef1d12130bf702adfeca6b19ae0c13a954bae511bfd52e375418347ff70c WHIRLPOOL abaf6da5633e9224d6d398b4485246ef35dcceebd38f663308007fb8faf13c4b2345b7b7bee50b616fb2d57c7eb4aa6392b0969da301c6fac44260129373924d
 MISC ChangeLog 14215 SHA256 b13d5ffbe7b8417513ac12c75adbab4dab0ea365c903469100500d6a26d02b1c SHA512 70f8df7a2140dd23bc290e6eccdcde7c68d69cb3246d7e8211ac25cd48a7953aa91a45af9faf0898e7f03a356c846e57881cd7b3c8b9790da54d34068db9824a WHIRLPOOL 0af8b5d8cb5f77baa87943c61e760f13aae84a1b93af4c188220a830e50446880325506b59e8d0d17f68e22bb4bbd526b3f843777221cda71e03619fbca68f70
 MISC ChangeLog-2015 26431 SHA256 a6991e05a4fc40b12ffddbe2e7aace9ac94c587889a11e07981c23920cbc15cd SHA512 6c68700e7de319e6a14ee7bd14392a17a91a717d4845b97a2095b72169d1e10e4826261356ba83e809b7414c8ca38a96f763ed0354ccd8200238019ec1c0ac61 WHIRLPOOL d6185195dd65e36bfe279ecfbdefe1b3303afded07d26313fa89261affdeaf5ecb3bf52df484fb3581b5e6a2c142eb9ae17f4e8db3afe40c9130384f48123e25
 MISC metadata.xml 439 SHA256 0d47c088a91721e575fc97e2f70ec0e4d12f4c1b05715d6969b35aad2b2daa47 SHA512 9bd27a1a513fc2d697f7d0f2ceb7fa0701c446fe21b597256afd4c2c1f44145e875323ed1ef6202bf7b85472ab4aab43a4b6db5795bb1d28ff53a2a7e484055e WHIRLPOOL 859dd6b40cc1b91489142eb45e40e178968cd534a6fac416fcd2e6078b45cc2c2fa445dc628f94f08c9b5ffa40356a11fd8696546b0b1e38fa1049c84ec9a6c4
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.10.5.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.10.5.ebuild
index 690d068d1fed..d523899677d3 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.10.5.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.10.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Less plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 IUSE="X bzip2 egl gles2 gtk +introspection opengl +orc vcd vnc wayland"
 REQUIRED_USE="
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.12.3.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.12.3.ebuild
index 4856dce20a76..bf14c1dc536e 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.12.3.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.12.3.ebuild
@@ -12,11 +12,12 @@ HOMEPAGE="https://gstreamer.freedesktop.org/"
 LICENSE="LGPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
-IUSE="X bzip2 egl gles2 gtk +introspection opengl +orc vcd vnc wayland"
+IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vcd vnc wayland"
 REQUIRED_USE="
 	gles2? ( !opengl )
 	opengl? ( X )
 	wayland? ( egl )
+	egl? ( || ( opengl gles2 ) )
 "
 
 # X11 is automagic for now, upstream #709530
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index 880a6c3713be..e17a50ee3f8d 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -6,7 +6,7 @@ DIST gst-plugins-base-1.10.5.tar.xz 3060092 SHA256 1c401a79bd1e4521c6ef1b66579bd
 DIST gst-plugins-base-1.12.3.tar.xz 3117364 SHA256 d3d37b8489d37fa0018973d850bd2067b98af335fef2fa543ee7d40359e3cea5 SHA512 d32f71836e25081b00040709a2184da85489e5af90902a0b27b820a478f5805bde93a04cefaeabf36dde53c16ad12f2816777cc195f1e027f19d1883e088e2b2 WHIRLPOOL e81c3183a70b121412bc455a4f93501e2fab7bf241a66f903446115891ab66ee78d570b01a4eaa5eb7971a7233f3fabf10a71c398bb4205beea6dbfb4280bcdf
 EBUILD gst-plugins-base-0.10.36-r2.ebuild 2274 SHA256 bef096da022febcfb2971a89040b32449fa08cffdd1423d6be637818acfcf0ca SHA512 2455419d70993b01fd436a2954df6c811384338a0d4a2ca3a2c04e83a2602c0d6aefd2bef29d64d7535ee2a767390d5910300f0d2a8351435c360f32c83869f2 WHIRLPOOL c1f9370f06dbee02169a939e6d4f5b4773a7191ce39ab69f8843aaa3c45e9b2ce5fce250721c103defba77a8b026cc40855baae85f5530c3834c8ec0756bee66
 EBUILD gst-plugins-base-1.10.3.ebuild 2610 SHA256 7e6dac99f0c757a167e68c85ce3353c316346a6f95cfcc279115d49396027bd7 SHA512 6c489088a402209b0a73334b0f9f6aa944776de4fbd69e1ae8f6acf7fd8c74fd7b0f40ef15fe88722adc5493fa1371a7204f4afc2d20730d16a2c9d96f95e61b WHIRLPOOL 4535c39a593c7d10554e8cde23d4c16b09e920e683859ebf4f2dc8fddb382648c0923ce56376988babeb2961b09190cab709b3ba0059e61dc892f7aad754fc5a
-EBUILD gst-plugins-base-1.10.5.ebuild 2613 SHA256 d58625604ea729d44b81e76e610a05f3889db2a9056b1eb8289c75aaf90a154a SHA512 22be840b45b01ac3e840df6be9677b985f2febaef13954d677cdb5e2d5fa9ab0055cc25ea382c61eaf8499f60f37e80d78700f3ce0626ab37400e0b511cafc8f WHIRLPOOL f2c92c24bb5016bba7cc0f8431a6815e1aee8a03af8f54915297b86594686b1f67ccaddb1e560d437c9999e063013c413edcc96764f6151e26e119a61707eef1
+EBUILD gst-plugins-base-1.10.5.ebuild 2611 SHA256 ce6c710fd2603ba19cdae68b399a705693d013181e5248559cedc8ed75092ab9 SHA512 1a6117687e38e46e42db0cd1f2324ae0ac34e3420766fcbb5fe568517ad72b22138c91ae35cc969f8e2b6dba62f6d10b9e0af7aa53537f49e7005af4a4a4b365 WHIRLPOOL acb5b7581c7a2cc3bac2710b8702e9e6a67d1dbad14bfa9d79bd1fa3e90ee97941505f2beade219811f17c1c243377a37eb72b80e8fda064f3f7591050e354ed
 EBUILD gst-plugins-base-1.12.3.ebuild 2727 SHA256 e830b315e8de13c947a14e5773d1b7cd8d67b77794153d05247de9e3f1b48f7a SHA512 55982326fdeac4ee1b7d321d96174a0965fada70471819491236c6c188135c3ca77a172566481e0af19b18adfdf3976a6fbc956e25a55c97f04cc4d8b9bba70a WHIRLPOOL c4240744142f97f4d213d5c13b2b2f285a04ea72f64594659eb8452952c2f75e40f0b1c2a444787df84773647fe970fd70d1a9af03479a6de84238a86835f5c4
 MISC ChangeLog 8640 SHA256 2d734dec624157e16a1875f0e319d884d1612599eea58bbe57cc2840a9f967ab SHA512 fed53470d7c199c61023ed7152ca2fc4e7a5e5091227d9f6f978988c75c0e95192db5818ca92a23d80d88f97af55a5db7502464eebac2075c14bb378327b094f WHIRLPOOL ac1f6ad3a2e002159addb18559d9b682e39892c00b002a746a745cf77401c50fdccc9e61d197f54ecf63fa5d0dd4ae42aaa91adacd63d9a5bd7d97f30c4d03ee
 MISC ChangeLog-2015 40462 SHA256 2c92fb66bc025b6df621dd767fbac06556cec8de6c92c67d3c9d2b30dee11253 SHA512 e921da8c724d0cd439e3d8ef6149f7d16ecbf5cc82fb4f690eff703322345fde04d242c885b4177f7eec22b5cc208363ecb0ffe2d0218d6b1bd57571c7397671 WHIRLPOOL 5526220a5799ec69ded0659e0f2697f786fc6652e99de06d9a71866c3895bc3686772d1431d399cd9cd650aedd97d6a98f7848bffb487c8f099667f5ad200337
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.10.5.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.10.5.ebuild
index 1889d6c51808..2771db437341 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.10.5.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.10.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-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 ~x64-solaris ~x86-solaris"
+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 ~x64-solaris ~x86-solaris"
 
 IUSE="alsa +introspection ivorbis +ogg +orc +pango theora +vorbis X"
 REQUIRED_USE="
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index 2dd605cd234a..52d4ca1d2871 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -5,7 +5,7 @@ DIST gst-plugins-good-1.10.5.tar.xz 3425088 SHA256 be053f6ed716eeb517cec148cec63
 DIST gst-plugins-good-1.12.3.tar.xz 3487448 SHA256 13e7f479296891fef5a686438f20ba7d534680becf2269ecc5ee24aa83b45f03 SHA512 8ed96d2b2c8724659cf8163be5246ec30c8a92d70fc6632e207ad258cff5624d6fc03576e6e674011bb88a4825c8ce225545bc7e60cdf66a173d9e1d4bfbbaa4 WHIRLPOOL 9255759738e14f9a6aee1122d7f2bd7b23266e33bdc834e2942ac3a1fbb9389fed504d4769c1ab50c35b8a319c351f8373aca8cf09bd138bbaf7bef4fc51894a
 EBUILD gst-plugins-good-0.10.31-r2.ebuild 1661 SHA256 682adee96b1c895a263d4a218711c47ce94c81c1f12d14186522ae5c5c6dd53c SHA512 a66cb0a552686b588d54a962e9888c29edcf49442aaefa665b753658e31a96b108b07b7fa8033eb4bd7f0535a2fd4b3a6fa8ecc1a91649fd3ab0456e91c01f0c WHIRLPOOL 2f05ebc5dc0bd2b46bfb1d99abb3d9ca5c68f7a91a3d14177401c7815d9d4dbb10f5645e8df125abe37d28b54ec20e47c1c11dbe397089341d1ab1d5dd5a503b
 EBUILD gst-plugins-good-1.10.3.ebuild 1430 SHA256 4a13fe73cd33267bf6089eb803d515b1b4c5315a652f796a936f19358125a403 SHA512 3f468cfa4b74dd8f98093cb6b9acf9cb46b172e17de538f7689dd7463be13363bdd89509a2bd38867d80692017ea4eae0178885bf2c2e4bbc602dfd5c1775420 WHIRLPOOL 577080a8325ff273699c5e8d4c45f5729bb9e1333e4d5b5028494dbd0ea997e5d90f4475d82b662ff8c43940c88159840a6c3fb3d159722d7effa591693bf86b
-EBUILD gst-plugins-good-1.10.5.ebuild 1433 SHA256 a76e32ee9334f942a89b7c73d61e73faf6d5bf055edc1a84308794a846ca014d SHA512 0787f02dd7963dc6fcafae1e244e72865c5367e21b3534aaf5b03f88d96162036cdbec9c31bb9e1aa705eb3a40ea3549a447dbf644f215d29a4bf836ad7a39a5 WHIRLPOOL 50007f69c704e12a39988c682d88527f1e2117f84cdeef6a2f9abe90e81699edffb84401057021576ac20c578858fdfbdb4df238691ba64120c47cde5b278a92
+EBUILD gst-plugins-good-1.10.5.ebuild 1431 SHA256 808f055e76a6b9b4c7ad6acaeecf3c8149eccaeea85ee8869a2c403fb59101ee SHA512 1fdf863ad41824673b05df92cd44897769209ef5ec1b2780f5d4dc927e1929989cbffa350e4549e70095d7cdd8c9c54f05cbd9eefad566a597a31f60302d43bf WHIRLPOOL 707a1386360a4398cf388331be1d938275214fa3c4b05a2b3e299475316eb847fffe6e6542313e1b729380b6818bd56b4c32022777dfec1b9713679056589daa
 EBUILD gst-plugins-good-1.12.3.ebuild 1438 SHA256 9df3f4d1fab62b94760472f0960f9c3d2bd5e30d05ae6667674bc342159e4399 SHA512 888f59f0172b6160ac387d415292e6e3821dea27312b02b61cc0e230c06537cc84b1f9d20e134e8df1fab16397604d82c294a6c3839a64d03b653aee54fca64f WHIRLPOOL 136150dce2acd3c5f7e9f8c779c8f096db214b6a260f74fcebccbecbc377bb928545d4cdc0f89eb307dbaddcebc06157c7985114e709bbe7295d1813837b7808
 MISC ChangeLog 8784 SHA256 748f079dd2d253230fa122466fc4450680e28cb1071c44e8d0759de5be28fa26 SHA512 d737a2536e66c2abecb384ed99b875b2de81adf65a84df426e87e74c6b45c48e5ceb12c2c860f2be15bc55825c6ea312535eb3004054a2ea2543eef429368582 WHIRLPOOL 14e6d21030ee55f4793670e1a8b18bec7f0fdb9fe789e8c1537e6348484490ba71fde744322e45c2c4817997f97559ca1024045fa7dafbd5c1bb3b4230b98add
 MISC ChangeLog-2015 31456 SHA256 06775798089d3617b3b0d6c49fa6c2b05ca4a02c6c3eebb6e896dfa299271d82 SHA512 c40ce40e61099a3236e79c28473f113f09cc387e49152f80a04bb3c58882c44ddc7e4206e38384c874f7f36dab0ba9d0c321cd95f08a841869cc4b8434615629 WHIRLPOOL f945a177f90d58eaa63869b0d6782ac55768a106576b1acee1c75e962512748ceab3b39c5e052eb48c5f765bb52dd82a5c05f0d12c88328076deb2c81152510e
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.10.5.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.10.5.ebuild
index 78fbac822790..4766f9aa95a0 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.10.5.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.10.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-libs/gst-plugins-ugly/Manifest b/media-libs/gst-plugins-ugly/Manifest
index 8bd628390f80..6a5dca48f142 100644
--- a/media-libs/gst-plugins-ugly/Manifest
+++ b/media-libs/gst-plugins-ugly/Manifest
@@ -5,7 +5,7 @@ DIST gst-plugins-ugly-1.10.5.tar.xz 908604 SHA256 d6edc046350809c967f5b058c5c2e5
 DIST gst-plugins-ugly-1.12.3.tar.xz 903784 SHA256 e88ca584c94ea78eeecbf3af00ef7f134b66bdee7408aa4aa6c547235e060052 SHA512 9ca5769c325df3d2d97ba83d785fab08da5119f6d26c4ac4db72853af143477ea8fb7087464a8614b6e59f384463ac01087ee76cec2af8acd80a4dc15e392e34 WHIRLPOOL e908fb96fc5694c10c16b7e5aeae4a6f7945aaa324074cacc3ec10b84b53ef738ee8c77d6f0983a02e7868275ba26ada14153d7046d85bfdb57f310e59793657
 EBUILD gst-plugins-ugly-0.10.19-r1.ebuild 1058 SHA256 92f6846cd10985045ad3f0c08f7ba217e0b1fe3e4b52ab6c1beec8ab5c903d6b SHA512 32c32c59686f099e1e5a9c2b75aad193fdcff900734d8dee31129a00cbdf84e219ae86c89bc6e35f4c5fb54532183cbe24683c463ce45e92c26041267e5ee1d1 WHIRLPOOL 98b3e57315e0e6a77188a57aec1cfae748a812e0e0dfde081a55e97b45bea95c279338208e25befa087046422047669cd8be8f7ce5cc218899fc7ff6735cb88b
 EBUILD gst-plugins-ugly-1.10.3.ebuild 1016 SHA256 3c5a400ca948204365f92cd9dceefa4b28eb3fcba80fe4c36bf0443974a4ed9c SHA512 37d9b275967f830b1b0a6463ae1fafe0e88cd4a0e808db1901208e7b12a2fad11a5feb9b334e8c814b976ae8f37ba37a672f23d551605cfeff6e68c1bba5af7f WHIRLPOOL 85c2c5bde1281aadef40dbc97ad5847de14f7bc5263c293147d0d199daa887bcebab35ddf0f1238454ef819dea3c88fa75f261112d06ef7dd3b0e5adc08ed687
-EBUILD gst-plugins-ugly-1.10.5.ebuild 966 SHA256 04cdf656f32a11520402a2dbd4ca13be8c0fd58ba86f7091a19eeb3177c49203 SHA512 d5dd1f25610b487e2f0df79a8b9439dae39199c4b8d2838cc6c55e445ee72c3d8fbc13143066f691bd7706566f469235c044f458f30524e70f344d52cc856b0c WHIRLPOOL b00d3f00c9df9c1b51792c849baa8fa244eeef8fe62842388b77dfa1c05d7bb757cad849467a08f8c6db25e1f5b49e13403fa72483a075327ca3063696c482d8
+EBUILD gst-plugins-ugly-1.10.5.ebuild 964 SHA256 7168932df48e01144e9a452978a3c66c2e40d17a59995c0348f7b9457dc65bc8 SHA512 c556c4076298ac9bb71aa8401614a04e102825fcf20e65e70b3d620119b5a212f15d46bac2a77e2a46a2ddb4c4ceae03a520d783a69eec9ece05bce21a5f5e6e WHIRLPOOL 6be0e29bc8f2a7d0bb2ae95ec7ed26f6a21d94cff8fb0e9b129fd32d80d92d57fc2cc5815f8602da4f09c7329e1952625973e060b56ba44d69bb5d5d039045ac
 EBUILD gst-plugins-ugly-1.12.3.ebuild 971 SHA256 c96fa66d4f6e2da082b8f530f383a3828d79c2d51727ceed9f34ccbca1be2e16 SHA512 c4f64dff06e2354ffed1082da50ec248b7af7df4a8b8afe83685148c0aa59cab31545b4ef5db9290336183f7964dd140fabdf0b7f7b4de89200dca428607e4c0 WHIRLPOOL c2fa59fb21d3892026612c41bd8bda4a9653eb5c57b9d9b52e2928675bfa5c62e3726a38a84499998fa066b9d4cda40eb2098b439f91746cbaa9d6e5211e5a07
 MISC ChangeLog 8370 SHA256 e509a71fd18a14d1a325b3a7e0909daf5c401add3d86b8a5736e329fd07cef31 SHA512 18b03f639e755782a8049fa53897aec4735a14aa19062db69ba3dcee9af90f6d9a13619e449d12e482e43a5cc19676793dff4b01dcb1cb571402f73fe3c5085e WHIRLPOOL 09c02be0bba93c8071a11151a5b10c82e41f1450ddba9346d60a499b433f5156824dd9a02dc020a4390da505aad7fe2120bef8826c09fc37da4598978ce2f5a3
 MISC ChangeLog-2015 23526 SHA256 e1198c3107dec2b64def328a538d8a1851a1fcb6193bd9067513cdc104190293 SHA512 51c3954b07348f94e55b444f1a00455fcdbda5d4527d2d9bdc116692723f9ea67d951cccc2ab8ac00952763d5d329a78c9b0b8397ea137adfde6757be2c38c22 WHIRLPOOL ca9d7b4e64268988b92d02ffa9f8dac9de83ae0af8b7ded393ba4df891db167524ec6f6dfa1028e9c85ed44246f60606d529fcd70f6cfb208f69f4a26643dcb5
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.10.5.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.10.5.ebuild
index 915318a0f10d..bc54a1cb339d 100644
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.10.5.ebuild
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.10.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index db83fb75c955..8f3ce7cf1e49 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -7,7 +7,7 @@ DIST gstreamer-1.10.5.tar.xz 3798304 SHA256 bc06243600817f637029da29d089d5908d1d
 DIST gstreamer-1.12.3.tar.xz 3175480 SHA256 d388f492440897f02b01eebb033ca2d41078a3d85c0eddc030cdea5a337a216e SHA512 fceeeca4314aead7ff358db3474bd6fe1eef70f745a6ba20505da6c0caaea6ea6317246dc66c23edab396ca811a610c52fa930f8f99c701241ae7f15857aa2b0 WHIRLPOOL e9004b36af5964a3c0e947ea46fa643967a385d8bb0e92b60fc7882c3129b8ee576b93296fea607e115aaf196d0a10871862088688a6f6a3621ee0e69692ab8b
 EBUILD gstreamer-0.10.36-r2.ebuild 3975 SHA256 2231c1166a0e2fc9d8bf881132d0e17aa82ad76e93aeb35814259f3a54fd3b3d SHA512 b3e544ebed44ab38c1fa3dea0dc776abac7920a3674d12ad09b82ace577d5ee2cc367647165da15d227e0a12670248557fb7431eb9b764468feac8040c6f2623 WHIRLPOOL 76ba8f6d005c0031b93a0cac28da317aad83a4fbc465b1e326a0bb2ac72ce2d21ff5d337f1a2310965b88b32796a2f423019e1832cda2346c34936b8c4b051cb
 EBUILD gstreamer-1.10.3.ebuild 3464 SHA256 35af18c95f25ec63ee6e96d23fe1558f1b623f72a8c8d4b02ce7d771857de8f5 SHA512 c91c0e6e44d7196743070f1f0aa738a82929f1c5fe18cd12d8ba4e7df818e08f44016b06547ac5ddd0e9dc858b5b090470779319aa4f94c7e6eca638967b7ae3 WHIRLPOOL 0b7e2cd7e9e80d43c749d2682689823254cd2feb0e0ece4bac70ada86730c64888a3c29d7e7a805e64854a9feacea8fa3ff60dec10285603c6a66efd2251e3af
-EBUILD gstreamer-1.10.5.ebuild 3475 SHA256 43a2b6b302d4e0dbc2235dc031b7785db004879ec350836ff448a89599db7876 SHA512 aad101767cb3df8e70d4166ec67009ea4a030992286324d0727aed7e1c4ea9842dc34255760c51d66c817809782b85f3ebfe2c881463cb9193516bb8ae57fbc4 WHIRLPOOL e450817cc24c16b10f14660fd8e02848a79867aa2a202d2d913b5185069130a8a5bf397c92a4ab4594cfddce30475787959e1d5d1ea71867ac8629f604ced93d
+EBUILD gstreamer-1.10.5.ebuild 3473 SHA256 4a3b82e61e285408f96362e26b4633e8990e1a8a0a3ac785ec34f5f1e70a4b77 SHA512 2d032bb18978ab3266e15928342699b7a36991b59d44c99d9159bcf8b90d296d9b0ffcd9f16926b5c2a9a753c1fedcdf739d478cead723e1cf9ac193401ad91a WHIRLPOOL 547ed5e949f5bb242625529d781dd455634582b0d031a2db61b81b16d1191a96e7eab53e9286fe27107182917bc07ed73524300c1241a510f66762ead67fc641
 EBUILD gstreamer-1.12.3.ebuild 3317 SHA256 6d06afb231875dbfa79c2071cbcda184efc187863b4d5a1af0b04900d92f2d28 SHA512 09bd0dd2379d55f5671cccfa7837676e726e1cd5530b42cf63c3de3742fa3aa1a74706c1c926e9f553df1daa4043c010edf9783916094cf6d01b6ca85f703865 WHIRLPOOL 2c8e448e9556054b085ce8e147662f03c112eadd042042b88b7d5857ec3e9a8d95f2a94690197ac8cb24822d9424fe4b9029dc25bae428fa1899c9356b911820
 MISC ChangeLog 8762 SHA256 fc5ded641546c9e081f8fb20662e0e271a154c3087d998c2ce20698edb840bb5 SHA512 6bb4e28841eebf7c8c9eb30f5c44aaaa2946c090bba8277d62950e1f1c4285e7762f62c7a33367daf487620d69fac344d816d2f7de8ee5f90debba4ffb9fd6e3 WHIRLPOOL 59646a3a824f8c8bbfe82cf7b71d93ac1f8f0fad88bd94d2a7974194153842117f767ede8cd29a0cebcae92d5ee01143490cf40d486903fa0cc6c1ba39e86401
 MISC ChangeLog-2015 53039 SHA256 0cde866a9bc1acf9e5006a41315e7713890ea89346de132a6c12dff47d092ccf SHA512 c6af4351b82ab48605b7b52e05ad53c395d65f03de5de2c44e5592a216be6b844ddcdd2406e5ea52986bb51d385b5793a3b1fe3394eedf07768816202d2785b9 WHIRLPOOL 1aa2c097ff5e064cea22aa339800afe51f546010f5994a33705265249cf4265b12f07ef2d7842c63766d96f394ea8b696349b3707b3563e5de3541456e8ea8c4
diff --git a/media-libs/gstreamer/gstreamer-1.10.5.ebuild b/media-libs/gstreamer/gstreamer-1.10.5.ebuild
index 5ada0d33b3c5..385bf7a3dca8 100644
--- a/media-libs/gstreamer/gstreamer-1.10.5.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.10.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-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 ~x64-solaris ~x86-solaris"
+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 ~x64-solaris ~x86-solaris"
 IUSE="+caps +introspection nls +orc test unwind"
 
 RDEPEND="
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index dc33c2d45508..694a4e46fccd 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -3,11 +3,13 @@ DIST harfbuzz-1.4.6.tar.bz2 1475086 SHA256 21a78b81cd20cbffdb04b59ac7edfb410e421
 DIST harfbuzz-1.4.8.tar.bz2 1587622 SHA256 ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131 SHA512 056a2c02f803439b39086e3ea988e424f5512b3213844f9008c62f5448a8ccdba525f532e7ed54641820a4ef6dc5bc4d13d4f7bfb39ff904f5939c855d294152 WHIRLPOOL c5b17719b0a362d775cbebf081bb6bd946c3a3401a7ed292ae0bc021abe2b4a18a5fab3adc8e65793ead45d665b2b45b04ffaf8ea2924c4325b6fd39d1b1abf6
 DIST harfbuzz-1.5.1.tar.bz2 1615704 SHA256 56838dfdad2729b8866763c82d623354d138a4d99d9ffb710c7d377b5cfc7c51 SHA512 e5235c9fe4524059128f97e2773056533803b40db70c18b43c8dc6e27a970efc40d9ce6e8754ae7075c245cf8f4386b33e922a6edb3b6a722a596cb7759b8b36 WHIRLPOOL 8cf092ffcf42b5744041b3e2d40ce720a2a089964bb5d8d6a3ed5ccb846df8f3f44e6182744cb7b8c132e2fbfcc93c13fd974c2faa0adcf66961fc3b9863563d
 DIST harfbuzz-1.6.0.tar.bz2 1625615 SHA256 5037ac0efc85a02a334965e66c1053d9dc9ed6833eae9739bd85bc33c83167c9 SHA512 392c7055d7fe9bc3fea07e62fa9d00407c98d502de7b42937f434c6127f660521706d3b2c0afbc61ad636676abb50bafe73afb15b9090f0fe1f75443f1f34706 WHIRLPOOL 55b0c66500cfe099a5b1658fe89e5e44665158f86c82851c0787a417d6bf4d914c31fc2324b4816d7ed948e220a9cd0eea6dc0dcdb87c217dfe4f28c52105ac3
+DIST harfbuzz-1.6.2.tar.bz2 1639114 SHA256 ceb8cbd652829b5fa680a71d89cb79cac7afa104e9484fbd23a24e71c0d6e80e SHA512 90fd16267b19dfcb9fba0553555405df46b7543f48476bea3d9f59bdc809c8257f05bd0436ab32a3582a3f8dbef7448ba10485699d1435b56d8c247e2fcfeff3 WHIRLPOOL 8081a1d82d82b95f47162834ceb05134a1ddeb6aefb1d81c9483bba1440e4e146e92d9fd205ab63c54c6b36d0097b0ad19a966ea184e6ef6bfe35426d6899db8
 EBUILD harfbuzz-1.4.5.ebuild 3090 SHA256 3e25f7c841947c870a770c0dc07a46bdf0873d36acb39fc7be193d3bf0b9d712 SHA512 bcc8829b5f60bafc34337d1cbf2c88bdcceae0e55ab28de5a0972bb83046e4895cc35705346b562310f281a2b357bb57d6fb35e3ec8eccd627e4a3de96e44f24 WHIRLPOOL 98cb6c1d7386ad87714dfe46b5a1cec1a67571214fa479778c97abd202aa046ceb696b6f698a54c7db1970a5e62a7c4b14d19ec03a0365a9b6c40de8de338ab4
-EBUILD harfbuzz-1.4.6-r2.ebuild 3170 SHA256 24e217f5d165cc552f780c110f6d6dd4e2dcfb3892b2de6aa0373576b5d08b90 SHA512 819ffe013f26fafd008f12771b9fcc00f656dd62d726f9465b0a0f6424038b3d8ff816f1fa4f967873363a7e1b5d55b7a5b27dbd649fe5edd3499bf367b6b5e1 WHIRLPOOL 44e15b643d610668ead56848154ee6ee48e82fcd3d392a3fde155d815b896ce279bfbf4547790dfdef349d320a066298a5d3f3a5f3dc766dd38e7ea091b662aa
+EBUILD harfbuzz-1.4.6-r2.ebuild 3169 SHA256 5ef79605f011b62d6967a9dcd208a894f5e9443db57dba7bb47c7caa719c21ef SHA512 8126753c04002df17e796bbff1e1665d78ab1b8e2ab0d212ea61fa5a6b315a2e86d9862db442ff44ee55df1341e4eeadb2177558a91bd239a45b386d82cab707 WHIRLPOOL ea157543a5a1cf3245f44c00fc04af9f68fe3993b3f955a516d08e514b8613300eac978857d1c687580df29ba4da0f20c2f1ea5d581066ad5f32e36c6cbd6ce5
 EBUILD harfbuzz-1.4.8.ebuild 3163 SHA256 da7d940ce1367631e8b2052e66b41ab2408f108c2f7ad98598c11e3d0ea87246 SHA512 9bdf551bb6f9667eed236e9f5cca9be01a68f78110bad24ce707c797db24d9a1aed5d1e3ebf549511897985d867190a66758af3501f68cff27a797c7e83159f8 WHIRLPOOL 9ec055420d40f9b13c55d90e8541c908b9dab5e1abad03f3ad690201c55766f956f76a9b006e3a7e1b96636a1f73aaf4224d2c582fd4d6b74b9070650a432dbd
 EBUILD harfbuzz-1.5.1.ebuild 3163 SHA256 da7d940ce1367631e8b2052e66b41ab2408f108c2f7ad98598c11e3d0ea87246 SHA512 9bdf551bb6f9667eed236e9f5cca9be01a68f78110bad24ce707c797db24d9a1aed5d1e3ebf549511897985d867190a66758af3501f68cff27a797c7e83159f8 WHIRLPOOL 9ec055420d40f9b13c55d90e8541c908b9dab5e1abad03f3ad690201c55766f956f76a9b006e3a7e1b96636a1f73aaf4224d2c582fd4d6b74b9070650a432dbd
 EBUILD harfbuzz-1.6.0.ebuild 3163 SHA256 da7d940ce1367631e8b2052e66b41ab2408f108c2f7ad98598c11e3d0ea87246 SHA512 9bdf551bb6f9667eed236e9f5cca9be01a68f78110bad24ce707c797db24d9a1aed5d1e3ebf549511897985d867190a66758af3501f68cff27a797c7e83159f8 WHIRLPOOL 9ec055420d40f9b13c55d90e8541c908b9dab5e1abad03f3ad690201c55766f956f76a9b006e3a7e1b96636a1f73aaf4224d2c582fd4d6b74b9070650a432dbd
+EBUILD harfbuzz-1.6.2.ebuild 3163 SHA256 da7d940ce1367631e8b2052e66b41ab2408f108c2f7ad98598c11e3d0ea87246 SHA512 9bdf551bb6f9667eed236e9f5cca9be01a68f78110bad24ce707c797db24d9a1aed5d1e3ebf549511897985d867190a66758af3501f68cff27a797c7e83159f8 WHIRLPOOL 9ec055420d40f9b13c55d90e8541c908b9dab5e1abad03f3ad690201c55766f956f76a9b006e3a7e1b96636a1f73aaf4224d2c582fd4d6b74b9070650a432dbd
 EBUILD harfbuzz-9999.ebuild 3193 SHA256 3cbab4ad2ac6923ac09746d29192c35a604fd1c4945fbb3167544a6990b299c8 SHA512 270388b8d4368ae5dd996a2e53bd54091265ae666d14a2c937facbeda4040d78f1dbff883f5ec0e16c335f489dd3717c851136192fabb4870b7c65557f4bdb8d WHIRLPOOL bf7c8fb4f8af04bbf74322b943b448535586c050ac96a0149ebb267f358ff5ccb08653b44b6a29a5fa8a57a2ace0a2b6d8066c489b422aa9533bb8a409115784
 MISC ChangeLog 13106 SHA256 4ec97a88f0b61a71659b51c57ddfe9205ab268f09b02f2493ab699f2a07a2791 SHA512 2490c6eb077f4862c13e5cd64ff433dd590daf30deb27948ec1af9e4f5be23517ddf4c9d20cec199802b1e9f183fe96ba2e7c547877f59841141f37418e3c34b WHIRLPOOL cd19849105dc5033e80e96a402cd026f1be448fdaaa186ea8a4949f768b368135d3c17caadffbdebbe2875b30d72c67f1de6eb8040c101c47e19dbe25efa8f1d
 MISC ChangeLog-2015 16457 SHA256 595e9fc359dce6b1a589cccb849f9a2e794567a0e42d95608274b0e74b32f1ce SHA512 bf7caead5d77dd981c085c3b689661224885110bf00e3721f12d8eb8d4ec0273d1470c7b1ad6f85c914e8c7b7754557586b370718bdb5f8babf0c70bf49a6d16 WHIRLPOOL 17b53a3b97fe7d64be9b07a9f64f28529e9671d2fde6365b25160662b0a758be00c51e94c0e30b4337e0f7ddaa9461ad6fba248a0d576958e79d367ffdd445df
diff --git a/media-libs/harfbuzz/harfbuzz-1.4.6-r2.ebuild b/media-libs/harfbuzz/harfbuzz-1.4.6-r2.ebuild
index f11bb8d457dd..2ed3bdb8684c 100644
--- a/media-libs/harfbuzz/harfbuzz-1.4.6-r2.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.4.6-r2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
 LICENSE="Old-MIT ISC icu"
 SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 
 IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
 REQUIRED_USE="introspection? ( glib )"
diff --git a/media-libs/harfbuzz/harfbuzz-1.6.2.ebuild b/media-libs/harfbuzz/harfbuzz-1.6.2.ebuild
new file mode 100644
index 000000000000..da388e5fba70
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-1.6.2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
+[[ ${PV} == 9999 ]] && inherit git-r3 autotools
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+[[ ${PV} == 9999 ]] || SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+
+IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
+	>=dev-libs/gobject-introspection-common-1.34
+	dev-util/ragel
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+		# on Darwin/Solaris we need to link with g++, like automake defaults
+		# to, but overridden by upstream because on Linux this is not
+		# necessary, bug #449126
+		sed -i \
+			-e 's/\<LINK\>/CXXLINK/' \
+			src/Makefile.am || die
+		sed -i \
+			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+			src/Makefile.in || die
+		sed -i \
+			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
+			test/api/Makefile.in || die
+	fi
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+	elibtoolize # for Solaris
+
+	# failing test, https://bugs.freedesktop.org/show_bug.cgi?id=89190
+	sed -e 's#tests/arabic-fallback-shaping.tests##' -i test/shaping/Makefile.in || die "sed failed"
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	econf \
+		--without-coretext \
+		--without-uniscribe \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_with cairo) \
+		$(use_with fontconfig) \
+		$(use_with glib) \
+		$(use_with introspection gobject) \
+		$(use_with graphite graphite2) \
+		$(use_with icu) \
+		$(multilib_native_use_enable introspection) \
+		$(use_with truetype freetype)
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-libs/herqq/Manifest b/media-libs/herqq/Manifest
deleted file mode 100644
index a77ced18dbb9..000000000000
--- a/media-libs/herqq/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX herqq-1.0.0-gcc6.patch 644 SHA256 d65f24cf2caa81cc93fb40e52b94017a51cc395ca81327f86e9c48462e9fbd60 SHA512 8a6c0b3efb4c2dc5acc53fb2353deaa9a601669930c44c7813b40dc616c4d7346c8f4373c32c7eb70d992e5fcffa4621687f468b3303987a26059b88c1c7dcd3 WHIRLPOOL 87ddf2e7603dd881d28034d0b36ed1a3b4b7fe04199313bae6dd420cdb3953957a97e15d7ec0643d455d53bbb0b4a168eff19cf49e96fefd86b501852864db94
-DIST herqq-1.0.0.zip 1070813 SHA256 cbcfc76f72d561d822a7ff5374b97e80d1731b610a5c257edbf5c013bfe6748e SHA512 57cc45aa2a29110723f3e8d96307eb200c5e928bda5832a21f6d40d4e374050984227a9e0ba5b556e49c5fe9680b789d201db54f698a6294d0a32447f8ccae7c WHIRLPOOL 493351e9f1a75adc0dc4ba647609ce788d050adb15b9e573e82369e455b618f497adf00ef553c70f291a8bb90b42382312120e7559a247c52bcf4ba59781452a
-EBUILD herqq-1.0.0-r2.ebuild 956 SHA256 639bdea610a107aa7d14db4e3573e9dd6a270cbca2e719025264348b7910eef8 SHA512 d7258619eb60553f04ee1154490c07a2c10ff85304854aa521f7251582c34ad2752b5f03363e316eb43c8ea8a9d0b2c6e90af89fcd9477047a66c5c05f195029 WHIRLPOOL a8d5916f9e187e398b5dc5bcf08e2be5f7c9a7a8e02cc97d4ecea401c6939ac8a1628fa21d6cf0316a57208cfefdce299bdf4ea0429f624716efce23d10921a9
-MISC ChangeLog 2669 SHA256 b75a818361617e71c43d7b2269c2988281c47b9db3869a5803fe92ff29ddeffc SHA512 4d87a3b0d4ac6730343e70e32a9b43ca389f815a47f2b52b69d31c2203a59a15469b0698c3d7bc93f7a04f00c56ccbd514bf131a4ee52ee9979f57b73f885327 WHIRLPOOL ee19057453e0fad466e1464eab2771f9190b77273adb13ba4791e4cd8f7a39e23c0e8464e15237dbc625aa179bf15800b75ce01d57b070dfd527f6462f923090
-MISC ChangeLog-2015 2499 SHA256 5931994aeea7b12d2d2120ae565088aece3e8790db147e0f62a3b302f7ebc641 SHA512 351d81e7c9e8caa5fb5e49d5d80121bb0694adfb1a9e21b1a78ac58d50033ab4b41414641f1b0a7c9c5a8e1d92e73cae1a803d30a1b8c2888e80db8f468d3cff WHIRLPOOL c25298ddad089792b6e64f134d04b4bab202228cd62b8fdf264dcc6a924c5a48f9e5213e8035aaf9ce647e1feaaa92555ccf6ff02b13afe61f9eec8c274c20ca
-MISC metadata.xml 324 SHA256 b6fae249343bef8f087bc900935679b1d9c3c441b68a86439445aa958925ddc2 SHA512 1eac5be3be594e13a6db5438272e9525b80b95fc3c0240d7e64f5ba7ad29c6532b8f78e2c8c4e7465fc94331ffc568678e803480cc84ffe9013e5c1bf1eed703 WHIRLPOOL de9a5456b9a95651538a0c4c26bb24c761fd39cf962cd5586251cacd2ce9c6cdf4777e13659e5ce99dc6b34502ca371fe131c5eebd2bd037a0eaeb4d18388c87
diff --git a/media-libs/herqq/files/herqq-1.0.0-gcc6.patch b/media-libs/herqq/files/herqq-1.0.0-gcc6.patch
deleted file mode 100644
index a30d86ef1ca9..000000000000
--- a/media-libs/herqq/files/herqq-1.0.0-gcc6.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Fix build with GCC 6.
-
-Gentoo-bug: 594188
-
---- a/hupnp/src/devicehosting/devicehost/hservermodel_creator_p.cpp
-+++ b/hupnp/src/devicehosting/devicehost/hservermodel_creator_p.cpp
-@@ -493,7 +493,7 @@
-             QString("Failed to initialize device [%1]").arg(
-                 deviceInfo.udn().toString());
- 
--        return false;
-+        return NULL;
-     }
- 
-     device->h_ptr->m_deviceDescription =
-@@ -560,7 +560,7 @@
-                     "[%2]").arg(device->info().deviceType().toString(),
-                                 dt.toString());
- 
--                return false;
-+                return NULL;
-             }
-         }
-     }
diff --git a/media-libs/herqq/herqq-1.0.0-r2.ebuild b/media-libs/herqq/herqq-1.0.0-r2.ebuild
deleted file mode 100644
index 760c9c8a1c7a..000000000000
--- a/media-libs/herqq/herqq-1.0.0-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib qt4-r2
-
-DESCRIPTION="A software library for building UPnP devices"
-HOMEPAGE="http://www.herqq.org"
-SRC_URI="mirror://sourceforge/hupnp/${P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="doc"
-
-# no release of QtSolutions using bundled libQtSolutions_SOAP
-RDEPEND="
-	dev-qt/qtcore:4
-	!media-libs/hupnp-ng
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
-
-DOCS=( hupnp/ChangeLog )
-PATCHES=( "${FILESDIR}/${P}-gcc6.patch" )
-
-src_prepare() {
-	# fix the .pro file for multilib issues
-	sed \
-		-e "s:PREFIX/lib:PREFIX/$(get_libdir):" \
-		-i "${S}/hupnp/src.pro" \
-		-i "${S}/hupnp/lib/qtsoap-2.7-opensource/buildlib/buildlib.pro" || die
-	qt4-r2_src_prepare
-}
-
-src_configure() {
-	eqmake4 PREFIX="${EPREFIX}/usr/" CONFIG+=DISABLE_TESTAPP
-}
-
-src_install() {
-	qt4-r2_src_install
-	use doc && dohtml -r hupnp/docs/html/
-}
diff --git a/media-libs/herqq/metadata.xml b/media-libs/herqq/metadata.xml
deleted file mode 100644
index bd3a0aba204a..000000000000
--- a/media-libs/herqq/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">hupnp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-libs/lastfmlib/Manifest b/media-libs/lastfmlib/Manifest
index bb7ba0d2aab9..8bd1ffadea1e 100644
--- a/media-libs/lastfmlib/Manifest
+++ b/media-libs/lastfmlib/Manifest
@@ -2,4 +2,4 @@ DIST lastfmlib-0.4.0.tar.gz 333224 SHA256 28ecaffe2efecd5ac6ac00ba8e0a07b08e7fb3
 EBUILD lastfmlib-0.4.0.ebuild 727 SHA256 6acb06f26641be277a05b96a664066229db1dfeeb2d3e23fefd40cc9e1c665a0 SHA512 610c65e7c22e0540ee9bb4d41c97e8ebe4645b95d4e216bc06e00e4e3214eb2cd9478a41def1890a8514dbed8c92f96e88badbc30b9df69d3756a57787fe69dc WHIRLPOOL 48566d0f7f8e3a2ff2b0e108a2485c22cffdb3c4ac0602f4240eea1681fccd770650c190511394915c401791b643eb909ce9f7bd57419995389cdab535125d72
 MISC ChangeLog 3519 SHA256 3442259d9b7e86880bdb3cc3d054bf5214f654ee5e5c98e61dec5d6cb484ceaf SHA512 ab1b7a34c24b3df305b75f10c3c07b9d181d14f889f47f81b46ad8c2508c02e13f86d865179533ed8fc8134dfe49642f6e8b21aff5afa3d11a168616191d9f62 WHIRLPOOL a8e5256e851f8d5338edf2603d05a7a4fb2aa37e4aef1f4316a4589f61de8d7ebf9a14e6e71da557ec5d865dc736f8d29e427ee87c353f8156166f036bea89aa
 MISC ChangeLog-2015 1856 SHA256 b18dbab0c18051c7ceeab53345840accb9ac680aebcbc69a3ddad50444702d39 SHA512 70c09646bbc163003a1bfde889208d2f46e3ac373bbb006430e81bbc9c9748799cd026a0286411349157f03c118e2e21c1d377fbdea7361a6bdcb0b86ea14466 WHIRLPOOL 4b6e2c2e38a4b5ffcc5b3ed7f770b4a1b0ba1434c612040736cb6343cbe200b835e0bbf9cf5973c19e557f4fb0f6e9e05b8d7c0158d75813e7a31aee3da058a5
-MISC metadata.xml 563 SHA256 036bf68f89d6ab3ea0b18aed6d02e421908a3be5c61eb62d92a183b603aefb21 SHA512 dbaa57c5bd564d7a76397e42c9580d673888c3f653145e06d642f4a0d9d9555fb9a15cfa03bfd29a85470cd24f0b5175bc18206886232556ac40490de82ad050 WHIRLPOOL 480502f25a72208d1e763dc0662e6cebd914d48882cf1a9acfd2263cd2c8d784f1e4dc90338168ef411e2d5762c723bea6c826655d2df308e5823b995871b9c0
+MISC metadata.xml 335 SHA256 aa6bf89865858baa93ce55301923eddac6f925d7b08bdecfe1d5c798a5c872c5 SHA512 ecbb5547e38a68d686192d03224578355575915d90db53615a0b9aba928e4e2d1eec4b40a08da2eb8fb8e1a26a8b06e861cbad9b31a6af61087fe048e98b814f WHIRLPOOL 18afa429739f63efff343213163ff699c0c31e586d45c1316d8ad8a852f9db6e31c94687d49a1e56232ff66702be2adb0fcd4c2cac22785e45e96385031fa2b5
diff --git a/media-libs/lastfmlib/metadata.xml b/media-libs/lastfmlib/metadata.xml
index d482088a8a1a..dbff49912953 100644
--- a/media-libs/lastfmlib/metadata.xml
+++ b/media-libs/lastfmlib/metadata.xml
@@ -5,14 +5,6 @@
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>dirk.vdb@gmail.com</email>
-		<name>Dirk Vanden Boer</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">dirkvdb/lastfmlib</remote-id>
 	</upstream>
diff --git a/media-libs/libfpx/Manifest b/media-libs/libfpx/Manifest
index 57a5c84743f5..30a6edc5dda6 100644
--- a/media-libs/libfpx/Manifest
+++ b/media-libs/libfpx/Manifest
@@ -2,7 +2,7 @@ AUX libfpx-1.2.0.13-export-symbols.patch 347 SHA256 cc7213fdbd6dd2801d8e28cb72f1
 AUX libfpx-1.3.1_p6-gcc6.patch 840 SHA256 5708eca7d663828351545984d4c8e8a1aa51e62fe40cdc266cd3be0f42405e0c SHA512 064e9f0f69bf66a93e6560a680b8680809260f6a4a6811f9568d9ef5230382a60e9bbd76680731434a4cae2570e6dd834ca3fd51e8c356ef949c1cf75f2c5af6 WHIRLPOOL 92a7c1488172227c0ff758032e1031f628870ab0ca04dd42c2790a86e87a9248f7771bb6c95172c25a1e2fcc5fd3fda79941197a74f73cffda7e5ed89b72c4d7
 DIST libfpx-1.3.1-10.tar.bz2 2358246 SHA256 21e968ba90e7f091fa59e5baf72ff3d2150adba07fb4e37e9f495775185b4bba SHA512 afa96b240ead4d3c56e8e6c66db188d1f4441e7b4d08e12e0e96359cfa2cea9eae5625105d87df65ceacd97d84a386876c62dee5bc1916c420755d9bcc4655d4 WHIRLPOOL 705074b5aaec62274b18a4aee8d710b52708bfc45aa7ebdd6fe27da628b0248e3db1f6cb99f129dbf6cc955854ff67517353d489e1831acd6850842c237ec9bf
 DIST libfpx-1.3.1-6.tar.bz2 2358328 SHA256 84e663bb23619e19195777a7c5d348046756f28cffda3d0ea2160ed0b55a698a SHA512 d33bc59f091100f4e0f7db396ba2f3a93951b348f8b175070fa23186f7ce488e71b7be43a45ebd9a3af21affe5342f63955df8549ff15582f8b29e67601531fb WHIRLPOOL d107a1ee69d018699567761603ce21ba6f6b80e25d5e3e53f6a76ef262602d0d344127c6a0c7f372c2da60a3b293882184513d4a77e674c32b384d5c8798a4bf
-EBUILD libfpx-1.3.1_p10.ebuild 1001 SHA256 08d84c52605870d9aa3eb57f5045be7b8115bff78bb5f9906bf0ab3ba05cc795 SHA512 de761e2fb45e046c4683a8da05b243960c19967780f33af2327c09474c1db709b2707d3a82713b16cb1eb39fe20d7cf159884712539de5bb56dfc3f1a2735b9f WHIRLPOOL b9b3eba2d3977225df59f1ccc6135d6ccdff21430ec958b8464d4ed9343f2a74663004d9fc68f6d662e8e959e05e654b8bc4487799253fb8196f0e938f7e7c92
+EBUILD libfpx-1.3.1_p10.ebuild 999 SHA256 7dbc3f17d6124674c80e480574f44178099feb9d1b4dae06834a818da2f45859 SHA512 380b54c905c497dfc4215873e592c08e1c27511bab27b80600ac1fa3e7241722c1a78bd0841286ff8f58c862d403f246f1e488548cb6db40cd062197df9f3feb WHIRLPOOL 6fe3c5649ec92615fc2b4c1eccbbda2df42ed7130f633d57752d61c8254bda446d9c3a8272ea1bb1f43cde0f128340f6795840e18bcdafccaa54c52663e17396
 EBUILD libfpx-1.3.1_p6.ebuild 1027 SHA256 e3fce497ebc8febd23c3c8441eba6d66c29a65ce5e2653d3f345e449d05a58a6 SHA512 34418eb51824d3250da69eb119295b5785c4020cf05adecb6a04e62481ced8f893cdcdb5ca08e20887ef276a22baac68c0669e020d846e660714b0c025da8fe4 WHIRLPOOL 35d3010f6d2868f6aae070d13b519c36adcfc2ad1a4fe2937147296cc2be9c711a06e3745133b50fd88259f2322bff5e2b5648f66e1d400abed762852af037e1
 MISC ChangeLog 4512 SHA256 ab205b78037322cee59456141ac1241a3362fdcc4d3213fd747e2c58978f20b2 SHA512 cab37297528ea0da853839982e57536ab956ded26761c1c637a339368725c961e944f4e74e9baf48935e403a3ed1a4a0a3c69a36adb4330d848cb929a67e6444 WHIRLPOOL 1f5df4ba45ef2502010072dec52639005d38a3870e7e834dc3f3285de9d996a9e9f9685c818e942a74c08fac949aafdd1ddea082ac230404d6900201699b1fa2
 MISC ChangeLog-2015 4245 SHA256 b71b1ab48950062b50d8eed5c62148e2cdd99169fd1eb68154afeb9e59fac1fe SHA512 6858bc6cd2db2f162ca496934591dd16c0a8f6257d002d1202c45f39785c313e3d180e2c8e85e816b6b00c4155c9d346a43c4440fc2b39c60451b9cf6839899e WHIRLPOOL 1d0cdc173b114e5a53633f219b43774b5a4a9f9909b02f55cb858d6ec35ee95d9de72d0ef705db006854d12b6c85967ec6189babde02be3c9cdec0ffc51e41f8
diff --git a/media-libs/libfpx/libfpx-1.3.1_p10.ebuild b/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
index c985285a9957..4d9264fef0c8 100644
--- a/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
+++ b/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://imagemagick/delegates/${P/_p/-}.tar.bz2"
 
 LICENSE="Flashpix"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="static-libs"
 
 S=${WORKDIR}/${P/_p/-}
diff --git a/media-libs/libkate/Manifest b/media-libs/libkate/Manifest
index 4bd80152b599..9cacdfd82a6f 100644
--- a/media-libs/libkate/Manifest
+++ b/media-libs/libkate/Manifest
@@ -3,7 +3,7 @@ DIST libkate-0.3.7.tar.gz 728239 SHA256 b9af203bb731de961807ad13820911fab57230d4
 DIST libkate-0.4.1.tar.gz 906896 SHA256 c40e81d5866c3d4bf744e76ce0068d8f388f0e25f7e258ce0c8e76d7adc87b68 SHA512 2635237753abc0f6c43fc07bd0ecc57c2f3c893efa6c62ad08de9191045612477302ed45acd61cdfea7447efd654ebbe0ed2d6a2cbf867eb834581d7ee43377b WHIRLPOOL 8693527ea8680eded864aae49df840e2071eee434391f828b07224b4af279df0fbc6744af6be8a435aad5cdfb3124df10170bcead7b20a6d63ee3dacb1f28d1c
 EBUILD libkate-0.3.7-r1.ebuild 1171 SHA256 a97a04d101035960e241fb00dcdb6da4537e5a67115e5914c335e3a5ba940070 SHA512 ab8f7fe7707aa90a72b362072dd4096a737811bf5da492cff71211df6006fab80d88a3d0a759e91a3dc7669a1af80e8aaeb27017adb9818a3b309b45a046205f WHIRLPOOL 338c108677e5cc9836a3faf0a8dff492e7d0d07a92a054da1b53e03ed0e5d2fe830fa792a41983ea14cde7d088efa0e52d49d97adf1b8421d9a3fe1200515ce5
 EBUILD libkate-0.4.1-r1.ebuild 1170 SHA256 59882b543aa1f2cf549d122c7a17ec5ae766fa4f525b383b5d7b819ff27ce819 SHA512 8a9cc877df61e2dca2425ebb7cc3f63cf15e95a55fc4bb9c0cea0357aca911f3d2f86dbd2a0b0cc2cd8a5b974b347484d71c2b34c5cbc38f6b8562bcf2c3bb6f WHIRLPOOL 2e398c043125f7b385151e99bd101768e4e3e5eaf75008856079bafa80f56b6c49f8bdd699895588d49df94ae1d86a4127f5ca26be6937f9c6990ac787abb0ee
-EBUILD libkate-0.4.1-r2.ebuild 1167 SHA256 51a1dcf74af201411dd363566a10b33cf9deb06149440783b24fd14d39c634ea SHA512 c26cf6806c1118251c9164a4067d7f50c0bcdfa57412b62cda4c1a1b8b64a796395203d98f47a87eb7e81a60609e61462e40fe6842d427b44359f5737cd74412 WHIRLPOOL efe3271fb06bf3bf94d565ea8c7e739bcc0dc743013ce354aa3d5e0bd373bde0f97b8cda26067326328b95742f5df8dc57ab2dde4b8432dfa89727e66bd05876
+EBUILD libkate-0.4.1-r2.ebuild 1166 SHA256 b065ae4b75d5bfad5d5eff18db495158bfd9a0b950edb030b242f8340b9821e3 SHA512 ab2cfef533f850f2c2ae22ce75ac7ecd4eecfe64bfa534881aa66badfd2d4a92fb9802cfdf836b3a6ae773f3b13f42b63aded283c76ee0776a158837206afae2 WHIRLPOOL ea21a48a81f31ece62f7dd49cd946ebe13348dc7c3260be931a983ca624f3d5a39ff8f4a96739847e7cfcf00997722a999973ab501713a89a7f808eefdf74388
 EBUILD libkate-0.4.1-r3.ebuild 1318 SHA256 5e289014f7e3d40286ade06d3c30338babde788ebdd787be2908ec80025de72f SHA512 692ef685b3bb8a6b8f7cab63f9884407322d608c8705611cbc6298b2b94f0b4b4850a3a7d828256472da32247a7685c957fe414e7b7c46ef152139e58e779237 WHIRLPOOL 11cefb7d4125a6b0affc7c292cf2e02eba64ac66081ec6c9919f0d7090c2b912341e5d50a56755647188437f8a95d87e998d70f9f758006bfe7defa33c859117
 MISC ChangeLog 2982 SHA256 dfc0738e4d7227466cbe20cf1e7bab7987f9b63cca926020f316493a34439e16 SHA512 c6e4699066d3044c8f1e88e9104a695cb48952fcaf367372c49cd38ee6357b942ab4c9aa1b9d1098ce081c2f16fb00ea459b652ac70759f08a71afdeb8a81604 WHIRLPOOL bee0320e9722cc450d1c3418386ca3d02bcb8671f4ff9dab20fa99b6737d081ea3f3816542ac6dff3eece108e95caff9b6e5793f249d495b669d97d3ca272c03
 MISC ChangeLog-2015 7354 SHA256 2cd5d45a330f84e5f79e5976e4e5617dfad9e82a254dd8e3191a351968bf945b SHA512 11f4819a0586de7aee8fb3cde573c7967debb0fff9245a7fe655c456257900a8956d34efcf55fd3e04d79af740b2011284313202762786e6a8989bcb342acc76 WHIRLPOOL 25a231e1ecf85f3822824bf25d4f656ffd87d3e659185498239401ebbc4e8c1c7b355c285bd941c726d613bcb232e27a46959f02ed9421bd9232bee02d2aac2b
diff --git a/media-libs/libkate/libkate-0.4.1-r2.ebuild b/media-libs/libkate/libkate-0.4.1-r2.ebuild
index 44a54abc3c51..035f70aa8eab 100644
--- a/media-libs/libkate/libkate-0.4.1-r2.ebuild
+++ b/media-libs/libkate/libkate-0.4.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://libkate.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 IUSE="debug doc wxwidgets"
 REQUIRED_USE="wxwidgets? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index 0e7cabbf7637..c82ad8238641 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -3,7 +3,7 @@ AUX libprojectm-2.1.0-multilib.patch 1245 SHA256 26466ef3983e7491b1cc49ca21edede
 AUX libprojectm-2.1.0-path.patch 593 SHA256 887ef4d5ef8c37dbbee6ef375f47e031c4ed7a95ab506b8bc8ee376069984631 SHA512 c2c7a26de1166dada74e7ee3c50da9548992eaf3e3d3881e637ccbef76649c99639f0e2d64e2db4622ce1beb90670504222de3576efc13c35527f9ef064b5bc3 WHIRLPOOL 1965eb4fc9121f273ee2902d4b18ab05721246415286f4082a757013290d23238205526414dbb18a779c77d75bd42178e6abe7ddcafc56a6d21cf67a4a5a41ad
 DIST projectM-complete-2.1.0-Source.tar.gz 31130351 SHA256 513204f033006bd3dcdf8aada196d816d6b7187266ddcbb1594d0285cc9406ee SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f WHIRLPOOL f60ee006dac8465a17e1397a9331bdabd7a3967455f9e16644e1ff5e544ab1662b3aa8a2b428c0258f0b38c91513bfbda3cd29b4419e05e64aa410e61ad03972
 EBUILD libprojectm-2.1.0-r1.ebuild 1487 SHA256 b3f652811648f9f98633ac7fba6cced100f67e41ccc223d0e620d14b69d8e557 SHA512 c193f1203dfc28da59eb4d953f172c5f47efaaa661d9d25401e83c9ef9c68c0a3740ee86bd533cbc71b19b0ddf2c62fc1cb02f1169e4c5d73e74de7d9e48df55 WHIRLPOOL 2ed1dd241c47562df31eb1020b00aa53d1e98bbbbcc7729466fb85bdeac1d64ee088a89075f1cfc4b07dde878bea69f4992afc6d8a8256c72de81635ad2eb853
-EBUILD libprojectm-2.1.0-r2.ebuild 1497 SHA256 e00d0ae53c8307c6acad8848241eeee5c9b12c7086852b2f590a6cb0da9e86db SHA512 d07bc47023b71df8674520e5702f85d4207b462903e806a262f3249c13c9b1e0f9cba98363116fabee2751f375f2d9c6f994c88552e930efb0fa308bd671c106 WHIRLPOOL 0f35ac2d553ac327c6ec1502cdfd2ccc6dffda925534cbc436c32d47d21a34846a7c4b1706acdc6c8c8108b101ed561268fd18099078da5ab9da9fa8f99e144e
+EBUILD libprojectm-2.1.0-r2.ebuild 1495 SHA256 6757f5cd1011dab149954ba7c640dee3a2210fd4688b864209da1334b93dbcd8 SHA512 2d987d7c8463dd5031d9c8198bfe5e4918f952c357b3208a7e2afd0e81afc915889506a63c457541f81f37e2b9b337f2d43d0922e1be2cf766180d35efe79ae1 WHIRLPOOL 860bf6420a06d667d1b09dd3800d1834f9f85879ecfd7a1d7dca3b672042568f1b9026e7161348a6e9ecccfc830fc81ef7431ab0ea3e4cd55ca9dd41687a4aea
 MISC ChangeLog 3306 SHA256 de2e37250d05afafe9dc7140acb819626d8097157529d375687f8cdf657ad3ac SHA512 88a66209f27a1b84a0c343b9d1191d83f412ab1a8afd9d071ef945ab3cf005f63dc60b5e0bbeeac0d5eba440dc45724c10986b1c4cd64e80eeeb7077393818b6 WHIRLPOOL 12f14de7ceae134005203b3047afbb235f45dce9e3b4c11131498db27d9c773b4711253f8c122c0f441d9958d5436fea031768b7e79479e82f4a6f18482fe1b6
 MISC ChangeLog-2015 8622 SHA256 78cd5658f1b616e8b74a9363b0316a9de9292dd1b841a3bc43dbfed51a69f8c5 SHA512 f72fc69541b07f8d832268350f3aa534c8d3916ec11a503d1a39841a312ce062848413132a2d0e6374f61259c30f909532f92cecdb8e5fec87000e3bd9b4089e WHIRLPOOL ff27c28a08dbaf3fabf131444473e80d680de96e75381b2511afc5304b85b79ef7df341a058b2ff340c90f36223bc88c205da6435c617324c27e993fec623a2e
 MISC metadata.xml 331 SHA256 7980d09ed08ac1b06efd12fa6022b052f892c81eb21e0af43115341b4bdfd1ff SHA512 59a9da9a791cafc359a9b09d67c4f7bffdf48021e92f2974d0ed1477f5923690f5a40ff82e171a55a86ed997d7c30c445a8f83890396aae00f66656eb082b740 WHIRLPOOL 364e9e4036552c4311c7ea3f7ec078fc120ce2f2cb3c8476ffabf4cd18cae4dd49f8cb7335a32d0e75a5da5c81573b9bf581855fce96c987136400bb8fdc14f8
diff --git a/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild b/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
index 11a9dc916e9d..c46fb689a313 100644
--- a/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
+++ b/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/projectm/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug openmp video_cards_nvidia"
 
 RDEPEND="media-fonts/dejavu
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 4df29b61c081..440dd7a85290 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -5,10 +5,12 @@ AUX libsdl2-2.0.6-static-libs.patch 2373 SHA256 8baa14187f600e8de74a1d128714bcb9
 DIST SDL2-2.0.4.tar.gz 4136230 SHA256 da55e540bf6331824153805d58b590a29c39d2d506c6d02fa409aedeab21174b SHA512 dd0a95878639856c0f4b8a579ace8071379ab64519fa139b22d3ed857a0f0db87a75bc8480c7207e02fbffd1fdbd448e3c0b882c451675b0e2f1a945af02e1d6 WHIRLPOOL 2203061d32d51552e5bcfaa9752de5cb3173c0c733698894de177f9a0c1bad73706633e2d232f9b893e4c3736a93aff00ae94eb044b19a05a1cdd7a4c030b574
 DIST SDL2-2.0.5.tar.gz 4209352 SHA256 442038cf55965969f2ff06d976031813de643af9c9edc9e331bd761c242e8785 SHA512 6401f5df08c08316c09bc6ac5b28345c5184bb25770baa5c94c0a582ae130ddf73bb736e44bb31f4e427c1ddbbeec4755a6a5f530b6b4c3d0f13ebc78ddc1750 WHIRLPOOL 77aff6af67c29aab175f812be0aebbb65a757bd942de872b8330cb7cfabcd4abe0abd0c21b56bd409fb623b97c71981be5807e47dc03bf773aac85361582b796
 DIST SDL2-2.0.6.tar.gz 4420311 SHA256 03658b5660d16d7b31263a691e058ed37acdab155d68dabbad79998fb552c5df SHA512 ad4dad5663834ee0ffbdca1b531d753449b260c9256df2c48da7261aacd9795d91eef1286525cf914f6b92ba5985de7798f041557574b5d978b8224f10041830 WHIRLPOOL ad39ec811ac6f305a58352e1f332e9c29a34587c0eb2c9f163e76f93565418bd910210aea8113f53ca46bc745975ed8cc7b228f517af0a99d782fef44c4e0783
+DIST SDL2-2.0.7.tar.gz 4432499 SHA256 ee35c74c4313e2eda104b14b1b86f7db84a04eeab9430d56e001cea268bf4d5e SHA512 eed5477843086a0e66552eb197a5c4929134522bc366d873732361ea0df5fb841ef7e2b1913e21d1bae69e6fd3152ee630492e615c58cbe903e7d6e47b587410 WHIRLPOOL 45c8ee79e193dff3b16a11e4e6a8d7d75e9c6cba797709155015e0d7ac4ef5873e98ca239fdfe37c85d9b3d5d1bca4c3259ae6d7e0f2dd0a69577ada3fd8413d
 EBUILD libsdl2-2.0.4.ebuild 4755 SHA256 1b95e513c3f963ff37b9e4ffe788561a9a7c37dbe2e5b4a92cfd81808cbfa0f5 SHA512 a3ee75d9916d1000282f30a7e7a6587ca5b523d08d77a3a0efc220e64ee552df462f1fd9d8f1128dd6b67e799e3046101dc1c3dc0aa30f90a12f0e58f2413210 WHIRLPOOL 728d2749a7aabc6abd66cd513c823d05ff2b875953ba0f0a5b75ecb52ad8b20f6d2b7d2741f7ad06787fb70f31381757cf6787ae363fbf5f4d6bed65fc3e2923
 EBUILD libsdl2-2.0.5-r1.ebuild 4833 SHA256 bb1f34d9cb5aa7dd1e1f19db22e6aded0869d6af5bd929ece2f94791ed600d8d SHA512 9cbb0dc1fdb10c1d2f4c88615874c9c712dc864f8e65629bd0943aba3131dbd9f401a4a64e7b43a6ac393f8c69239e85ee0135ee886b47569dde4f20c4c098f5 WHIRLPOOL 8d44901b1aca11b1ed4aa70eb2bc9c617b429a362bf732e793dce6f0809fc6b11ab6ecfa11071c7aa1fb808018964bd1a7c23bc905de409c8a3d5957ad36794e
 EBUILD libsdl2-2.0.5.ebuild 4791 SHA256 c3c15eb2967f2a35f0fed5fbfe12cbeb4368be3d56752eb22eb72da0bd4e1a28 SHA512 a7ee500df710579bd4be766935984871a0311307b78f35d42cb7459c25d298fe66b00283d044e8ab7353722b30ab5f52327840e87cc08d9ff6fa23e4b4f84e66 WHIRLPOOL 829bb0a737d7fba58c8253455a54914e93e0eca6b7e1dab9f5288e674c45e78a1f5c585d97341fd815ee3205cfdef8d8d9d624f0367503cd6e6fa8532e3927d0
 EBUILD libsdl2-2.0.6.ebuild 4871 SHA256 02adfe1db546a81708f28c02ceeda69769ef4b7d48b695f7470871bc2bbc0b7d SHA512 4ef9025d47d7313788d344ae3addd5256e66d17acf42b5f95557a603077c57e3c81b2932cd1198f59dd5108de81c66757b12d36878f08a7a61d50a9323644ae3 WHIRLPOOL 55d9743974e7a36ed81a7ce3d72bf8662e25ffb8788504250813dab9b40e42196c760df96f7d33ab40fbb14bbc1bb501423c87027291dec37cd74f10dd6d53aa
+EBUILD libsdl2-2.0.7.ebuild 4871 SHA256 02adfe1db546a81708f28c02ceeda69769ef4b7d48b695f7470871bc2bbc0b7d SHA512 4ef9025d47d7313788d344ae3addd5256e66d17acf42b5f95557a603077c57e3c81b2932cd1198f59dd5108de81c66757b12d36878f08a7a61d50a9323644ae3 WHIRLPOOL 55d9743974e7a36ed81a7ce3d72bf8662e25ffb8788504250813dab9b40e42196c760df96f7d33ab40fbb14bbc1bb501423c87027291dec37cd74f10dd6d53aa
 MISC ChangeLog 5036 SHA256 d1346c5a7e7ba020de8f72d1f638c8fec4418d962cf9188b9518af6b93b0dc2d SHA512 d2a1dc0decdbd5b0b5754ee4fd14667e41d3e01927b8bbc1cd4bdb4b7499dfd326cdafbebfc80ba9daf8ba4a44a388ccc8d636b17dcfdb949122a7b0265d0871 WHIRLPOOL 03843cb5a80f4bc3f9908355f6c8414278bd69da91a5dc4ce4435c8c25c71412f06278e937d193e9735e762f8dad230e7e626ff71627f3de50fa12475ffa8561
 MISC ChangeLog-2015 5311 SHA256 e543afa31a118561233bf9060d1719933f81ca15415e4798bfb0c4bd8711119e SHA512 09400d6937e900025ffdf6b3d39ef2202b7a9a83df98fed2354e4fe85bcbb1d0f966e608088f1c372bba9559c0ece17405ee0d5115502e84f11642d7789d7c02 WHIRLPOOL c91ea0b26d40e85fd2bc8404d3f6b94cfd670d3e75915482111420012a18ce355cbffb18382cbd81aa5e337227f60399c522aa51dc9905cc591319900a27b96d
 MISC metadata.xml 1626 SHA256 437d69fbda00c8837a4fb18ecfb6ecb1615004434844241aa15c57e7a57a8947 SHA512 bca03557793cab7fe23ff7073add8bc112f4046326dae99cda4079b3adccd56b9179c871b04e97174c178d90b1b82b3f6ff5f42f53a705d4a22c9732e57787de WHIRLPOOL 6d2aea6011e9953b9b1c0e394d0ee54b52173c3c51e12971146d285077e6f199a322e1933387039adfa239456a412ff7274daa8e26260c9943565a029f1d22a1
diff --git a/media-libs/libsdl2/libsdl2-2.0.7.ebuild b/media-libs/libsdl2/libsdl2-2.0.7.ebuild
new file mode 100644
index 000000000000..4117b57c829b
--- /dev/null
+++ b/media-libs/libsdl2/libsdl2-2.0.7.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: convert FusionSound #484250
+
+EAPI=6
+inherit autotools flag-o-matic toolchain-funcs ltprune multilib-minimal
+
+MY_P="SDL2-${PV}"
+DESCRIPTION="Simple Direct Media Layer"
+HOMEPAGE="http://www.libsdl.org"
+SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+
+IUSE="cpu_flags_x86_3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver"
+REQUIRED_USE="
+	alsa? ( sound )
+	fusionsound? ( sound )
+	gles? ( video )
+	nas? ( sound )
+	opengl? ( video )
+	pulseaudio? ( sound )
+	wayland? ( gles )
+	xinerama? ( X )
+	xscreensaver? ( X )"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+	fusionsound? ( || ( >=media-libs/FusionSound-1.1.1 >=dev-libs/DirectFB-1.7.1[fusionsound] ) )
+	gles? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] )
+	nas? ( >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] )
+	opengl? (
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+	)
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] )
+	udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}]
+		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl,gles2,wayland]
+		>=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
+		xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
+		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
+	)"
+DEPEND="${RDEPEND}
+	X? (
+		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+	)
+	virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/SDL2/SDL_config.h
+)
+
+PATCHES=(
+	# https://bugzilla.libsdl.org/show_bug.cgi?id=1431
+	"${FILESDIR}"/${PN}-2.0.6-static-libs.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	sed -i -e 's/configure.in/configure.ac/' Makefile.in || die
+	mv configure.{in,ac} || die
+	AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf
+}
+
+multilib_src_configure() {
+	use custom-cflags || strip-flags
+
+	# sorted by `./configure --help`
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		--enable-atomic
+		$(use_enable sound audio)
+		$(use_enable video)
+		--enable-render
+		--enable-events
+		$(use_enable joystick)
+		$(use_enable haptic)
+		--enable-power
+		--enable-filesystem
+		$(use_enable threads)
+		--enable-timers
+		--enable-file
+		--disable-loadso
+		--enable-cpuinfo
+		--enable-assembly
+		$(use_enable cpu_flags_x86_sse ssemath)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_3dnow 3dnow)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable altivec)
+		$(use_enable oss)
+		$(use_enable alsa)
+		--disable-alsa-shared
+		--disable-esd
+		$(use_enable pulseaudio)
+		--disable-pulseaudio-shared
+		--disable-arts
+		$(use_enable nas)
+		--disable-nas-shared
+		--disable-sndio
+		--disable-sndio-shared
+		$(use_enable sound diskaudio)
+		$(use_enable sound dummyaudio)
+		$(use_enable wayland video-wayland)
+		--disable-wayland-shared
+		--disable-video-mir
+		$(use_enable X video-x11)
+		--disable-x11-shared
+		$(use_enable X video-x11-xcursor)
+		$(use_enable X video-x11-xdbe)
+		$(use_enable xinerama video-x11-xinerama)
+		$(use_enable X video-x11-xinput)
+		$(use_enable X video-x11-xrandr)
+		$(use_enable xscreensaver video-x11-scrnsaver)
+		$(use_enable X video-x11-xshape)
+		$(use_enable X video-x11-vm)
+		--disable-video-cocoa
+		--disable-video-directfb
+		$(multilib_native_use_enable fusionsound)
+		--disable-fusionsound-shared
+		$(use_enable video video-dummy)
+		$(use_enable opengl video-opengl)
+		--disable-video-opengles1
+		$(use_enable gles video-opengles2)
+		--disable-video-vulkan
+		$(use_enable udev libudev)
+		$(use_enable dbus)
+		--disable-ibus
+		$(use_enable tslib input-tslib)
+		--disable-directx
+		--disable-rpath
+		--disable-render-d3d
+		$(use_with X x)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake V=1
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+	dodoc {BUGS,CREDITS,README,README-SDL,TODO,WhatsNew}.txt docs/README*.md
+}
diff --git a/media-libs/libsidplay/Manifest b/media-libs/libsidplay/Manifest
index da9ecbbdb518..6e0f701b544e 100644
--- a/media-libs/libsidplay/Manifest
+++ b/media-libs/libsidplay/Manifest
@@ -8,7 +8,7 @@ AUX libsidplay-2.1.1-no_libtool_reference.patch 558 SHA256 da3e9a251dc104d6463fe
 DIST libsidplay-1.36.59.tgz 390097 SHA256 3da9b38d4eb5bf9e936b9604ba92da0594ef38047d50cf806a8e11c400008024 SHA512 e7b0859e1389683d3e6aad7040b78ba37bb0a393c85f68ddb8a064371f978b34cc2e951ec564fa1117d12885cd976d10b02937e132d9a11badecd8652cf4d410 WHIRLPOOL 121e985c861454c8755c4c6fe8066936bc0149c89ca9197ee23d03657f4e87b48e8f1e2c9e26202b04a1291746782be62cff86f16384ce9a9a50f885af9f4279
 DIST sidplay-libs-2.1.1.tar.gz 1900252 SHA256 e9a24ada48215a46d2c232a70c5601bc9505e997f120e8f2ba3713e09e28d1f9 SHA512 754cd41f3d2d76754049522c395022bc090f99ea838e6d1ffb8d7689f3aedad9b3879be0312d0af49ba108563296c1176d1e533d1151d5b33368bfda0a1910e3 WHIRLPOOL 53b4bd66bbac0bfc29514981f34e19fac41bae356d06e727f3a0f2ad2bedcb1cd815d22656bcf06460e9d908a91433bbdea029805af43b1cd97310f230f1c89c
 EBUILD libsidplay-1.36.59-r1.ebuild 828 SHA256 971ecc2c56220ce7860345553016d46affea606e474fea2b322edfa0b800c8ea SHA512 c26f2a40f0de6918e22c90682484cac1e08c03b764859596f4d05fb0df63eeb7c6a1e9415d70e7fe219cbe43ecbc2d50374741292c290852caaa626f32dae315 WHIRLPOOL 9cb73ff43a0b5151160d1cb0ab8b0e25a67d477793f1eb0f7dfb366ab1bf3f20746f4e298a0ab57f027d0d65710c33455cd4c54c723507e498b41fb25d281592
-EBUILD libsidplay-1.36.59-r2.ebuild 773 SHA256 c897895c3281efbbb941378402d92fef4b97cdd055c62bb7c8c51a0a57d1e183 SHA512 55d4adac47f85dfcf412ffea7618463aee1e9c6c16bd39b127bd74b30372d06d7f5a20c6882f48ffab67909a2eb77ed2ff3e85180f8e0e2b5a8dae52fae01d4a WHIRLPOOL c26acc83a0ec3b68e9f7f85a3716202736c9e5d3b7b077132798afd86f3581ffb3eb662f403cb22d79082e28f9dbf1e5868faced102dda3ff560533fc163806d
+EBUILD libsidplay-1.36.59-r2.ebuild 771 SHA256 0df8a3c4dec80fec0e3a71db64102ba054d5eb8dc44dfcca470c80a4ed1c75ed SHA512 f3e23d27d732a8a2ce5af832f84e5a46b2963d2b07d3b75cc74221f14f8599653119c425f80279933ec75db5c6b71a9d1232c2609fb5af1f7ee53c2e3e4c8937 WHIRLPOOL 45c126404186d23865ffd025dfb1d4862030879ce2c03645336df9498efb36bf76eae906cd4307fb55d23e106643ee8ba8b62963f898e712679942066f7d0d0a
 EBUILD libsidplay-2.1.1-r4.ebuild 1306 SHA256 249398e10eec106a4446e2553706ffa29446f7066c7842e4ef70b9f7a7bf1386 SHA512 c6eda0b230c217b3dc300810f974cb12804f6dc2785243dad68993b2e2ea094c0cf329f7be70d8abf3af6f2d6d493b1b2d6404095382480ab1f9a38fa8b43478 WHIRLPOOL b0c89e18a2f4d77ef7ef498526059924b657d6e36cbc96bf167892bb4649dc6b5e6dbb61484d06b6bdff1e074b398c622d228de663bf52d1f2ed661693f0521e
 MISC ChangeLog 2706 SHA256 612e6b82838bc73bb469f9800dd3c0f0c5f9de2011fc4c1c698b6bf53343184d SHA512 067b228ea2139e394bbe0be1b385d67581f3e26d87db5211eac26a35bd482bfd2c68ea7862dacf761caa1bfe547a4bffceaea38689c2310234a6c2b271ffe4cb WHIRLPOOL 51c6495a433865d3a1eb2213a2f10cfebd7fbb063e41cea37dc16bebc0f790f9887f82788470d574ef6aee478701ee6ccd316333a04b9317a771b04f07e12efc
 MISC ChangeLog-2015 8812 SHA256 1d50d5e87a00f3d19fb78141a7de8ebbc2a20380bcdcd7c2a7be4ee82cf1afa8 SHA512 557c317bccb2faf698e5a7bccf0f41b0d7376b0c14cc177ca321282cded6a441da7d31e3682c81cbc7e0aacedff4711684a0100bca614d91061622a84d8206e2 WHIRLPOOL 61303f97477701df0761fb08dee999b4515aab340a3c89e095d62d2294b613fbf96353b690e604374b949ecf66e58b6a4f90304b92637d33cb2b8e15c3192db1
diff --git a/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild b/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild
index 646cc2810af4..3f64cb26126d 100644
--- a/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild
+++ b/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://critical.ch/distfiles/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~hppa ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="static-libs"
 DEPEND=""
 RDEPEND=""
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 3bfa9a202049..d3e777d34591 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -14,13 +14,13 @@ EBUILD mesa-13.0.5.ebuild 13605 SHA256 94df75dbe63d76d35074eda2826bce65641f4919b
 EBUILD mesa-13.0.6.ebuild 13553 SHA256 dd0b9f71b641c3405038f640fc8a2a1f04d60447682598e744f52b2c1d51c1eb SHA512 715a50c81cd752dd46b24b41da5e964cfffe13d6870ef9a9f6f18c22adfedd516ffb42845735fb52fe40d4e6ffc7507ee96c569ff3dae89503f3dece72b2647c WHIRLPOOL e2d2086ea547c2bcf34ea4ad19925e6b30bac63809cd311edc6b2a6df3b310d3aa20c706367418b5e142425461b0877d3e2602839beda2f44c8fa7db92c927ec
 EBUILD mesa-17.0.6.ebuild 13560 SHA256 796db0fd56888084e6d8daec8179c65df2eed1dcfe6b0bab80e0c13f81658d22 SHA512 7caefbaed248f2dffd5cc9bb8fe769d3e412c71659f462b9fabed173766b7dac449707d7e80caaed1f3e81ef01c169c6b366376bbf33b8bd4dfc8771f5e6d334 WHIRLPOOL 4f2ba8010bf86e048849a9e7e61c1984bbde4ec23afd9da7d60807b03c58e63dc723b50c0f7118e995a0ad778eb30e00cf3c0b9a596f0d41fff5e2ef24f3efc8
 EBUILD mesa-17.1.10.ebuild 13436 SHA256 dbf163c9d77fc1b9d0ee3af9563d6b27c850865c3f46bd6d698f9dea36fbd749 SHA512 b29bb8f80706f2bdf5602951b346901c0357e81e3e73afab1ca6ccdf1c1037660f6b66d05c999563bc22d0da68416c68368b8d741e1c961164161d8b5dd41170 WHIRLPOOL 1fec4c936b3559d718ad56b2d6def5dfdb95c517c72b33eaa668d8d4c4fae626a58e576e0f5ae7182e47c2da4b9c1d29001ef9627adfe5241587023da4adbd50
-EBUILD mesa-17.1.8.ebuild 13433 SHA256 b8347a902f1b22df5b64751681cc20a09f1f9be46f7f18141b9f99a7382f313e SHA512 f96e7745cb532f82e03fbb33b9098ba1d16168469db6b0f4168af903fade8c84358bc774fabc89b804c2bea12143b8279b454dde6325bd851eeee7a30146b0d6 WHIRLPOOL 62c51ae9e6b7a69cf9ac62fe732fe3f745e2baeab614120350d3930aeeb111835699e87a5b29647c962c60407a92ddd36482892921f799598eee24ea7c9d76f6
+EBUILD mesa-17.1.8.ebuild 13432 SHA256 d7ad46528ac26c9b0823fcb378ab5522b3747398d3ef5f456f39af4c593b530e SHA512 11139f3fce14046f534527784bf6f377cbee7453f72a2656f4d2240f9e83e94335b2a42434902f6f5e1f1bba7c7eb6f35083721d8f57e14f365065681e9e1834 WHIRLPOOL 31d0156f084f9e3abfe7bc72b67e42597deee915a5f6d0bdc78e65da8d6f91765cdb61dd536f72926ec8509a5f1b491f526bcbb8d4c77df47d4035dfe5ed531e
 EBUILD mesa-17.1.9.ebuild 13436 SHA256 dbf163c9d77fc1b9d0ee3af9563d6b27c850865c3f46bd6d698f9dea36fbd749 SHA512 b29bb8f80706f2bdf5602951b346901c0357e81e3e73afab1ca6ccdf1c1037660f6b66d05c999563bc22d0da68416c68368b8d741e1c961164161d8b5dd41170 WHIRLPOOL 1fec4c936b3559d718ad56b2d6def5dfdb95c517c72b33eaa668d8d4c4fae626a58e576e0f5ae7182e47c2da4b9c1d29001ef9627adfe5241587023da4adbd50
 EBUILD mesa-17.2.0.ebuild 13466 SHA256 4a0ec5433959232820e767d338943dd9c4da54614d165f1d44492b0ed11f95fd SHA512 27302424779fdd5a173f9ba07a0aa75c3efff98314741f9510cce3b6a157baa597d624ce35912abc1faac1b22d14d8cced08300c586be309193d4e22a69ff6b5 WHIRLPOOL fc08a3c90df865d65fb40379ab776043b6d9c96205af9be1f269b7888221a112a8228233cef3a481289fccfb69ee39f5ad2d313a639d6fa52a0f7d3a69ecee1a
 EBUILD mesa-17.2.1.ebuild 14923 SHA256 2b96118b576ba0c40c9453aa832e1a2394b6fcbb3a581d4aa0c640dd536addf1 SHA512 ea96f945aa670ac38147688876fe6c302b6deb41223af6134ac8b958802d1733c5d509419786c8ccd4647fb62ef6fa1e94e9bac7cf1b67c89c606c9090435d9e WHIRLPOOL 59a8b64c5fa8a441a2afea56f08e6b5a09d9186b76f86007f8b16fe3ced33b664130d7d81789104d60a92b6a56e6a36c7a40d4020918e4c59a8f5ff52ef3a065
 EBUILD mesa-17.2.2.ebuild 14923 SHA256 2b96118b576ba0c40c9453aa832e1a2394b6fcbb3a581d4aa0c640dd536addf1 SHA512 ea96f945aa670ac38147688876fe6c302b6deb41223af6134ac8b958802d1733c5d509419786c8ccd4647fb62ef6fa1e94e9bac7cf1b67c89c606c9090435d9e WHIRLPOOL 59a8b64c5fa8a441a2afea56f08e6b5a09d9186b76f86007f8b16fe3ced33b664130d7d81789104d60a92b6a56e6a36c7a40d4020918e4c59a8f5ff52ef3a065
 EBUILD mesa-17.2.3.ebuild 15003 SHA256 776ed79613f55242943c6aa2554e7845401524d7b8f3132372f476355e966af8 SHA512 32f832d8898932935cb1985a5bab4dc4c70f0baf29657be7b409f53578f205591ab8bfec3a6d77c827ebc20114de3c8292ad1defca26ceff615764d5dfdacffe WHIRLPOOL ba82e86a2fd48c3c2a9a71b348b8af390f2e0f2f70803ce9dca9ec4b4ef3a758b7a4a31d971d594e32648cc7f6e2a9fe7cc550f7031db3766c32cf8daa6b3670
-EBUILD mesa-9999.ebuild 15063 SHA256 f9217ddf8ad87c74a80bd69058012c7f587ac19bd247f1e3e9fa8539c5333088 SHA512 c8d5712d6336541b4549bb35062c07a4a14cd299578f365f3bc7c6c282c04bc856fd557960186a89f3f1119a88eec7d508dbc515d2dc4f89f8bac7ca297da4ba WHIRLPOOL 8628d5cbe0e1b2597c1ff3daf483c31620daeb0da06b9806caf4c66016bfbe632255b52fb8d58cdb30e081ca72e1d0e64abc85b2edc21a6a9415de241915460b
+EBUILD mesa-9999.ebuild 15077 SHA256 fa6245e6fa6178a3d5c87190ef82495884363c1de0af4262c39c58b43a5a6b48 SHA512 28de16abdec86b4726819ad16e6f077fc11c6df6495dfeefbee73d5b762db6b1f02cdfb26e126b20cdde3f65bdcd9f555f1a44827ecf5b4d05fbd21d95de0770 WHIRLPOOL aff71e4508901bc8ea7a2a27572edbda0e3209c39746728d7aaa64f411e2114b7d536526c5c2343adc3be79e7d408b9c75474b69cb02a2ba8af7464a6583b033
 MISC ChangeLog 21209 SHA256 d14f068aa33c388215fda4fe7471524fc8a0cbe19ca2bf4bd7797f3a605bdd96 SHA512 b84d9940b71165e4245b2cd4a6b531ff5837a2656ebf95a71e5b27a9fefcd13e9558687aad79ece814c4af0f0847b69eef7bad4745574f8b8acff040ec9fd9ec WHIRLPOOL e3b472204d51b863b38008d1297ec6e2614b4cfe70c8d2ed0d8609f1856298068a6ac18c226c3403e61173d0494009e809692e882794749403e4bdb4247e7589
 MISC ChangeLog-2015 103777 SHA256 4b0a5d5630eac8d95c57f5bd440e8f743db364db91e3027efb52541230383724 SHA512 acea97a4adc6157a818db9afdcda514cf050cd85c5619531063c2acf74642f86c286b413976404c50d9af3cce6c4da2edea087c7a43ffec2516436a3f47d3e56 WHIRLPOOL 2c7a7b3baae65fcc0234689e1e9cc70cb89b80c96fc28eee359489c485bbe8f401605352b4f6dde3b5b58a3ae39cff8b6c81c6be5e5ee1f1d68aba8b91cbe226
 MISC metadata.xml 2536 SHA256 d19b63eae85e1a25553e11db8b6e38b31f55810412d7e48680bd78fda4fe4808 SHA512 1cd7e6d44125ee93792e403205fa07b434867764f31135e26997518e5b848ffdc57af6b3591c541531bab45c9bb629b88638001a03c314347c708f743899e666 WHIRLPOOL 561a884f9ea3bc15d070e52e53cf3ea461a94ee33f0b06778595c83ab9e35311367dbe37a681201d19cb0c9610fe7eebfb295e1cf116c2b040d286ee579676ac
diff --git a/media-libs/mesa/mesa-17.1.8.ebuild b/media-libs/mesa/mesa-17.1.8.ebuild
index aa151c968120..07313a557eb7 100644
--- a/media-libs/mesa/mesa-17.1.8.ebuild
+++ b/media-libs/mesa/mesa-17.1.8.ebuild
@@ -25,7 +25,7 @@ if [[ $PV == 9999 ]]; then
 	SRC_URI=""
 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 ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index dbe0eda926a7..b108f76ef3ed 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -53,14 +53,14 @@ REQUIRED_USE="
 	vaapi? ( gallium )
 	vdpau? ( gallium )
 	vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
-	          video_cards_radeonsi? ( llvm ) )
+			  video_cards_radeonsi? ( llvm ) )
 	wayland? ( egl gbm )
 	xa?  ( gallium )
 	video_cards_freedreno?  ( gallium )
 	video_cards_intel?  ( classic )
 	video_cards_i915?   ( || ( classic gallium ) )
 	video_cards_i965?   ( classic )
-	video_cards_imx?    ( gallium )
+	video_cards_imx?    ( gallium video_cards_vivante )
 	video_cards_nouveau? ( || ( classic gallium ) )
 	video_cards_radeon? ( || ( classic gallium )
 						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 513ae0a5921e..6f9ff69deddb 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,8 +1,12 @@
 AUX mlt-6.2.0-ruby-link.patch 689 SHA256 1dded16d00052d5d2542175ab1a971b52dff473d319747aa4d97ae668e1cac2c SHA512 54b468fdba4cc9fd92a06e31d7b59e602c4c8541f6d227a56b8a028e7be8f580541838ce5d8e5d9b841a0ff8ab56ab96a40990c9e86e15952da51ae4ce825b15 WHIRLPOOL d19ce04c82a1e6e16308aba22e4180b7655dd9f862bbf8fc33b10f957d8761e0177bb0721183c133116e38aee761a378f3035c23b4bd6c3680992dd6f77b2d90
+AUX mlt-6.4.1-glibc226-1.patch 1224 SHA256 0a3c41b54d660fc174556321e248265a055c6da26a7378566d55d3d5862afaad SHA512 d2113579e75061dbd9f873828ef115a6da3f39300dda9b02573792b1e18b0ef662b4cce58f9d6f7c1fecedbdf7fe8d74deb34cdcb90a9bf64fd1c08a89f15810 WHIRLPOOL e6e5bf4a16ef3b393521df6e1303c26df1ae09ad685ffa253d8003e2589133603bac8db6582b94cb36e00816950c21f320be8a8f98f3474b535bccb9008aaf9b
+AUX mlt-6.4.1-glibc226-2.patch 732 SHA256 fb8a13b16b3d7f9bd51dca6a6d4c56738cf056e37d1e230ff9fadbcf2e64bb10 SHA512 3a696bb3ffbc8940b39fecf3dbee21d938a417fdd28aaf59d17b184a941bf2b45bbfde40f9b84e358517cee5db2da47e19f69488ca518a255267241c8dca7db3 WHIRLPOOL c6759432734694508e843811c9892506d9b1f862b00b99a1720da5d0cc87578426ea7fa9d99fe945537e2085533f411088f3152928b17f5e365a1f9bb4d7ed08
 AUX mlt-6.4.1-libebur128-unbundle.patch 4162 SHA256 4872117b2b43e3bb82f96f9bb531860e71fe3e8e730a4123965506213ae209b9 SHA512 70db75522fce9ba8b296cb86c4574ba499e6274eb1cab3170e0524cba76482af4fde49a2c422215461ceb6f1258c00e535914c90c177b93893c2b330ad0cd08b WHIRLPOOL 62ddb1ee6fccfffa7f8ec275e38b5d9acfae3fb105490b57c6cd6a1bbd52cf244e5ebea20005e1f272adce10185e261aaa7b95683d275b5d5fb1004b5d42cdaa
+AUX mlt-6.4.1-opencv-3.3.patch 1346 SHA256 61d168b826741cda400f67380c5ae9fa6245f3d0527338e1494da4f8ab76a8f1 SHA512 5bab43be1a0e85764a7a80f58a1f211aef737a6ccbe3d9080e12103235891a0418aa8505268a71632b737834c9a5eb379bdefcb24f63862a596860dd118ee622 WHIRLPOOL aadd587d4accd29ccfcecba0fbf3372a1ce4bbcd58dc70410af50db7043bf51cd4b8badd6d4866174a4cd08140f74f65af68889e3fe44071170d5deec926f6a5
 DIST mlt-6.4.1.tar.gz 1344030 SHA256 87583af552695b2235f4ee3fc1e645d69e31702b109331d7e8785fb180cfa382 SHA512 b082274e2184a0496f496517ddbcae33bab44cd1f50c1708942b7a24e5861ba97cae9fa21ec41ea21d662cbf56e2e2e66caa707a100077ef6e13aa7140f7a9fb WHIRLPOOL 5b89a42bd95be98e5461d5dcf2dd0f2fe481b519078c54fc461ff8561a2cc29eb18027061efd6a4d53b2a3c15bf4605add57fdfd98a49226eaf3abc738b73962
 EBUILD mlt-6.4.1-r2.ebuild 5611 SHA256 87e2762bcdf800c70aba822c5296aee427b64548ee31004d9898d301c382d735 SHA512 dc24d3812d5452b056ee7e7192f22712177aec8cdf5470e76314a7335f7a8ba849f5dd629b9d6f5c9f873a4b03181cb00914398406106b1aec682b8e8f0bed20 WHIRLPOOL d0b3531890c74ca1535992ddaaf09dc8edde6a2ebd4771509adeaec1d602160bd62526bcd52a4e51ef8bdf62f4a915cc9d2fe74b13a37032ef02f9d9c158bdd9
-EBUILD mlt-6.4.1-r3.ebuild 5695 SHA256 f5521d1ecb1d037fab839aa453d125487dbe938625c02b8a7be8230f51f78f68 SHA512 f09276d5c07f0e3530c6bb78bf62910eed4160375f790a2576f92714f6925329e88bb85cc4ab97899c2b37d709a9d35ae97f9a1fe9ec864077469623ce91d695 WHIRLPOOL e94808ed34d5f497b0ce887a1d096ba2b56770688c2d8c51efa19d13ecf2c2aa388dbbbe774233e0994977da4ca7ee0796664cae27fd763384794dde0d669abd
+EBUILD mlt-6.4.1-r3.ebuild 5740 SHA256 5fb64cd944e2766e6c25e40c116b9f9ae3866e8511a1ac0965cbf6228197f478 SHA512 bd60ee226c895d492215aae324c03a971af16c8e81b90c6a67c6ade0e39437d0e506407a69616bcf48ac15e1c63d9f31c1fa31f61f8fb952f8eb306ce583adaf WHIRLPOOL 3e4525d34ffefbe93e5eed0a98d4f1ea9003d1df1ffd5dd2a166b51d44bb4c0b87c251f4c9951fa60e420d21a4a1ef79cb68c456fe5d9917a5bf776bdaa00cf1
+EBUILD mlt-6.4.1-r4.ebuild 5814 SHA256 4ea03713e2e9af9981dad48bb96be51011684399fc77ce8017fdc220a9741378 SHA512 c3cbfa307c8b2e6b163e46d3a6ce0daa0b2ba45b3316c5ca55d4de79bcfaba3019416854bd2594d1cb538a5731e343468bc3fa0e408ac67c6f1935cef17ce0cf WHIRLPOOL 20dc81a231908bc315a5eb396a5bd5cd443cd406410be7e4e3b55bd5aa34059854a9d6d530d5bd838e2e0e810cde9ff982af38cd115074bd29b5901385c74427
 MISC ChangeLog 7686 SHA256 18446c0ec5118510f377ab8b8f40ee3740acc91467c96b7e7e6a1249071042c0 SHA512 c46342484514eeccf9aa8febcef9124251282a837881ca810f2eed3b0e80c6a049de0b666feb75a3e5416a4090dba8c6fd8d4394d178512acf5019b7e066bca9 WHIRLPOOL ec9d22690d6e07969f4bdaab649de2d5410e083e7b57f7c4d349a19dfe4378183dc540111c34e2719a4f1b769b4564ee70a83707aceee0211e571a0f5bdc28c0
 MISC ChangeLog-2015 17633 SHA256 b35b70222bff7554b6e4173e6aa0efc79a1eb996fa97d2e27629f4728c8581e0 SHA512 b408d322a82ab8558ab7048739a5dacd1298b5d02e6a1f32bdb0da9fd2c1f6ad44d463f536f2592cb02537cc0fafde8d9b57ae92c47847f08afff43ef732c0a6 WHIRLPOOL 254f90f3f76a534c1e1bdbb2126e5778601c55c71df41bcebda7a3959fb62d1b023d2d374028f3c08c02f7106678ad8cf8b3d6f2c3111713365ffcc524da09a0
-MISC metadata.xml 1533 SHA256 3358c96e30e1bc43963a64cfb30ad096a3d39a89b64266ed62be366d2ad3776d SHA512 4102761541c972d509d639e012a126dc4c7e5547bc31027e2bb5654a1ca04ba82ab7c9a7cae2fdeae98a5c7e0227bf98deaa8a737e56146afd35d43a5a26499c WHIRLPOOL 0e141c87b6cb3244a05d9a4e9b9d3d49a1d3e03ba8b8b0cb051eef65366dcf3263350b1426dba2c619fa69ac73e2c81afc453ea07ced7ab54867b6ffe858c556
+MISC metadata.xml 1501 SHA256 f1723731cc9d4d48fb2c87dea4c7a6205038ecf2f804408759cc813b131219d0 SHA512 e3afcec0da4ce1e08e77b0c1a43a7dfb082282da02ab3aa694035bd0c229640b7094ceca0cac0834d33e3b49bc22e924fad0e5d167ea961934f03703eb39cca4 WHIRLPOOL 2ecbf7d62271b255c04d2d954fecb1e9b41404c214d72648daec718377e08b2515339751c5a8b0aea76d880a153de31e742d3e2c35ab95801cdc7eb641df547f
diff --git a/media-libs/mlt/files/mlt-6.4.1-glibc226-1.patch b/media-libs/mlt/files/mlt-6.4.1-glibc226-1.patch
new file mode 100644
index 000000000000..2f486939d8f7
--- /dev/null
+++ b/media-libs/mlt/files/mlt-6.4.1-glibc226-1.patch
@@ -0,0 +1,40 @@
+From 2125e3955a0d0be61571cf43b674f74b4b93c6f8 Mon Sep 17 00:00:00 2001
+From: Dan Dennedy <dan@dennedy.org>
+Date: Sat, 26 Aug 2017 18:31:47 -0700
+Subject: [PATCH] Fix #248 xlocale.h was removed in glibc 2.26.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Reported by schnitzeltony on Andreas Müller.
+Patch by Dave Plater.
+---
+ src/framework/mlt_property.h | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/framework/mlt_property.h b/src/framework/mlt_property.h
+index 404d513f..043f530b 100644
+--- a/src/framework/mlt_property.h
++++ b/src/framework/mlt_property.h
+@@ -3,7 +3,7 @@
+  * \brief Property class declaration
+  * \see mlt_property_s
+  *
+- * Copyright (C) 2003-2014 Meltytech, LLC
++ * Copyright (C) 2003-2017 Meltytech, LLC
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -31,7 +31,11 @@
+ #endif
+ 
+ #if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 900506)
+-#include <xlocale.h>
++#  if GLIBC_MINOR >= 26 && !defined(APPLE)
++#    include <locale.h>
++#  else
++#    include <xlocale.h>
++#  endif
+ #else
+ typedef char* locale_t;
+ #endif
diff --git a/media-libs/mlt/files/mlt-6.4.1-glibc226-2.patch b/media-libs/mlt/files/mlt-6.4.1-glibc226-2.patch
new file mode 100644
index 000000000000..d992ee32e06c
--- /dev/null
+++ b/media-libs/mlt/files/mlt-6.4.1-glibc226-2.patch
@@ -0,0 +1,22 @@
+From fbf6a5187776f2f392cf258935ff49e4c0e87024 Mon Sep 17 00:00:00 2001
+From: Dan Dennedy <dan@dennedy.org>
+Date: Wed, 30 Aug 2017 09:08:16 -0700
+Subject: [PATCH] Fix glib test macros to include locale.h.
+
+---
+ src/framework/mlt_property.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/framework/mlt_property.h b/src/framework/mlt_property.h
+index 043f530b..3ecebd67 100644
+--- a/src/framework/mlt_property.h
++++ b/src/framework/mlt_property.h
+@@ -31,7 +31,7 @@
+ #endif
+ 
+ #if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 900506)
+-#  if GLIBC_MINOR >= 26 && !defined(APPLE)
++#  if __GLIBC_MINOR__ >= 26 && !defined(__APPLE__)
+ #    include <locale.h>
+ #  else
+ #    include <xlocale.h>
diff --git a/media-libs/mlt/files/mlt-6.4.1-opencv-3.3.patch b/media-libs/mlt/files/mlt-6.4.1-opencv-3.3.patch
new file mode 100644
index 000000000000..0a3732da2e30
--- /dev/null
+++ b/media-libs/mlt/files/mlt-6.4.1-opencv-3.3.patch
@@ -0,0 +1,33 @@
+From 622ff3acf6256739bd547ade1ceca0e6df5022e6 Mon Sep 17 00:00:00 2001
+From: BoboopTeam <BoboopTeam@users.noreply.github.com>
+Date: Thu, 7 Sep 2017 22:14:48 +0200
+Subject: [PATCH] module: opencv: Remove deleted cv::Tracker::create()
+
+This static method is no longer present in OpenCV API, this workaround should fix compilation against OpenCV 3.3.0 and newer
+---
+ src/modules/opencv/filter_opencv_tracker.cpp | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/src/modules/opencv/filter_opencv_tracker.cpp b/src/modules/opencv/filter_opencv_tracker.cpp
+index 48ffb56b..3cfc07d2 100644
+--- a/src/modules/opencv/filter_opencv_tracker.cpp
++++ b/src/modules/opencv/filter_opencv_tracker.cpp
+@@ -111,11 +111,15 @@ static void analyze( mlt_filter filter, cv::Mat cvFrame, private_data* data, int
+ 		data->algo = mlt_properties_get( filter_properties, "algo" );
+                 if ( data->algo == NULL || !strcmp(data->algo, "" ) )
+                 {
+-			data->tracker = cv::Tracker::create( "KCF" );
++			data->tracker = cv::TrackerKCF::create();
++		}
++		else if (!strcmp(data->algo, "MIL" ))
++		{
++			data->tracker = cv::TrackerMIL::create();
+ 		}
+ 		else
+-                {
+-			data->tracker = cv::Tracker::create( data->algo );
++		{
++			data->tracker = cv::TrackerBoosting::create();
+ 		}
+ 
+ 		// Discard previous results
diff --git a/media-libs/mlt/metadata.xml b/media-libs/mlt/metadata.xml
index 6bb3994f390d..9cf408a58aae 100644
--- a/media-libs/mlt/metadata.xml
+++ b/media-libs/mlt/metadata.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>media-video@gentoo.org</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>kde@gentoo.org</email>
-    <name>Gentoo KDE Project</name>
-  </maintainer>
-  <use>
-    <flag name="compressed-lumas">Compress the luma files in png.</flag>
-    <flag name="frei0r">Build the module for <pkg>media-plugins/frei0r-plugins</pkg></flag>
-    <flag name="melt">Build the melt commandline tool</flag>
-    <flag name="lua">Build SWIG bindings for Lua</flag>
-    <flag name="kdenlive">Build support for <pkg>kde-apps/kdenlive</pkg></flag>
-    <flag name="opencv">Build motion tracking module using <pkg>media-libs/opencv</pkg></flag>
-    <flag name="python">Build SWIG bindings for Python</flag>
-    <flag name="rtaudio">Builds rtaudio consumer for native audio support on multiple platforms.</flag>
-    <flag name="ruby">Build SWIG bindings for Ruby</flag>
-    <!--
-	<flag name="swfdec">Use <pkg>media-libs/swfdec</pkg> for reading .swf files (Macromedia Flash) instead of libavformat.</flag>
-	<flag name="java">Build SWIG bindings for Java</flag>
-	<flag name="perl">Build SWIG bindings for Perl</flag>
-	<flag name="php">Build SWIG bindings for PHP</flag>
-	<flag name="tcl">Build SWIG bindings for TCL</flag>
-	-->
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">mlt</remote-id>
-    <remote-id type="github">mltframework/mlt</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<use>
+		<flag name="compressed-lumas">Compress the luma files in png.</flag>
+		<flag name="frei0r">Build the module for <pkg>media-plugins/frei0r-plugins</pkg></flag>
+		<flag name="kdenlive">Build support for <pkg>kde-apps/kdenlive</pkg></flag>
+		<flag name="lua">Build SWIG bindings for Lua</flag>
+		<flag name="melt">Build the melt commandline tool</flag>
+		<flag name="opencv">Build motion tracking module using <pkg>media-libs/opencv</pkg></flag>
+		<flag name="python">Build SWIG bindings for Python</flag>
+		<flag name="rtaudio">Builds rtaudio consumer for native audio support on multiple platforms.</flag>
+		<flag name="ruby">Build SWIG bindings for Ruby</flag>
+		<!--
+		<flag name="swfdec">Use <pkg>media-libs/swfdec</pkg> for reading .swf files (Macromedia Flash) instead of libavformat.</flag>
+		<flag name="java">Build SWIG bindings for Java</flag>
+		<flag name="perl">Build SWIG bindings for Perl</flag>
+		<flag name="php">Build SWIG bindings for PHP</flag>
+		<flag name="tcl">Build SWIG bindings for TCL</flag>
+		-->
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">mlt</remote-id>
+		<remote-id type="github">mltframework/mlt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/mlt/mlt-6.4.1-r3.ebuild b/media-libs/mlt/mlt-6.4.1-r3.ebuild
index 0e847602b09c..326ab2493b78 100644
--- a/media-libs/mlt/mlt-6.4.1-r3.ebuild
+++ b/media-libs/mlt/mlt-6.4.1-r3.ebuild
@@ -16,8 +16,8 @@ SRC_URI="https://github.com/mltframework/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="compressed-lumas debug ffmpeg fftw frei0r gtk jack kdenlive libav libsamplerate melt opencv opengl
-cpu_flags_x86_mmx qt5 rtaudio sdl cpu_flags_x86_sse cpu_flags_x86_sse2 xine xml lua python ruby vdpau"
+IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r
+gtk jack kdenlive libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau xine xml"
 # java perl php tcl vidstab
 IUSE="${IUSE} kernel_linux"
 
@@ -30,25 +30,23 @@ COMMON_DEPEND="
 		libav? ( media-video/libav:0=[vdpau?] )
 		!libav? ( media-video/ffmpeg:0=[vdpau?] )
 	)
-	xml? ( >=dev-libs/libxml2-2.5 )
-	sdl? ( >=media-libs/libsdl-1.2.10[X,opengl,video]
-		 >=media-libs/sdl-image-1.2.4 )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3
-		media-libs/ladspa-sdk
-		>=dev-libs/libxml2-2.5 )
 	fftw? ( sci-libs/fftw:3.0= )
 	frei0r? ( media-plugins/frei0r-plugins )
-	gtk? ( x11-libs/gtk+:2
+	gtk? (
 		media-libs/libexif
-		x11-libs/pango )
+		x11-libs/gtk+:2
+		x11-libs/pango
+	)
+	jack? (
+		>=dev-libs/libxml2-2.5
+		media-libs/ladspa-sdk
+		>=media-sound/jack-audio-connection-kit-0.121.3
+	)
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
+	lua? ( >=dev-lang/lua-5.1.4-r4:= )
 	opencv? ( >=media-libs/opencv-3.1.0:= )
 	opengl? ( media-video/movit )
-	rtaudio? (
-		media-libs/rtaudio
-		kernel_linux? ( media-libs/alsa-lib )
-	)
-	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
+	python? ( ${PYTHON_DEPS} )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -59,13 +57,21 @@ COMMON_DEPEND="
 		x11-libs/libX11
 		opengl? ( dev-qt/qtopengl:5 )
 	)
-	lua? ( >=dev-lang/lua-5.1.4-r4:= )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( ${RUBY_DEPS} )"
-#	sox? ( media-sound/sox )
+	rtaudio? (
+		media-libs/rtaudio
+		kernel_linux? ( media-libs/alsa-lib )
+	)
+	ruby? ( ${RUBY_DEPS} )
+	sdl? (
+		>=media-libs/libsdl-1.2.10[X,opengl,video]
+		>=media-libs/sdl-image-1.2.4
+	)
+	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
+	xml? ( >=dev-libs/libxml2-2.5 )"
 #	java? ( >=virtual/jre-1.5 )
 #	perl? ( dev-lang/perl )
 #	php? ( dev-lang/php )
+#	sox? ( media-sound/sox )
 #	tcl? ( dev-lang/tcl:0= )
 #	vidstab? ( media-libs/libvidstab )
 SWIG_DEPEND=">=dev-lang/swig-2.0"
@@ -86,6 +92,7 @@ RDEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.2.0-ruby-link.patch
 	"${FILESDIR}"/${P}-libebur128-unbundle.patch
+	"${FILESDIR}"/${P}-opencv-3.3.patch
 )
 
 pkg_setup() {
diff --git a/media-libs/mlt/mlt-6.4.1-r4.ebuild b/media-libs/mlt/mlt-6.4.1-r4.ebuild
new file mode 100644
index 000000000000..f644ac3bb1f0
--- /dev/null
+++ b/media-libs/mlt/mlt-6.4.1-r4.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+# this ebuild currently only supports installing ruby bindings for a single ruby version
+# so USE_RUBY must contain only a single value (the latest stable) as the ebuild calls
+# /usr/bin/${USE_RUBY} directly
+USE_RUBY="ruby22"
+inherit eutils flag-o-matic multilib python-single-r1 ruby-single toolchain-funcs
+
+DESCRIPTION="Open source multimedia framework for television broadcasting"
+HOMEPAGE="https://www.mltframework.org/"
+SRC_URI="https://github.com/mltframework/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r
+gtk jack kdenlive libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau xine xml"
+# java perl php tcl vidstab
+IUSE="${IUSE} kernel_linux"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+#rtaudio will use OSS on non linux OSes
+COMMON_DEPEND="
+	>=media-libs/libebur128-1.2.2
+	ffmpeg? (
+		libav? ( media-video/libav:0=[vdpau?] )
+		!libav? ( media-video/ffmpeg:0=[vdpau?] )
+	)
+	fftw? ( sci-libs/fftw:3.0= )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gtk? (
+		media-libs/libexif
+		x11-libs/gtk+:2
+		x11-libs/pango
+	)
+	jack? (
+		>=dev-libs/libxml2-2.5
+		media-libs/ladspa-sdk
+		>=media-sound/jack-audio-connection-kit-0.121.3
+	)
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
+	lua? ( >=dev-lang/lua-5.1.4-r4:= )
+	opencv? ( >=media-libs/opencv-3.1.0:= )
+	opengl? ( media-video/movit )
+	python? ( ${PYTHON_DEPS} )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		media-libs/libexif
+		x11-libs/libX11
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	rtaudio? (
+		media-libs/rtaudio
+		kernel_linux? ( media-libs/alsa-lib )
+	)
+	ruby? ( ${RUBY_DEPS} )
+	sdl? (
+		>=media-libs/libsdl-1.2.10[X,opengl,video]
+		>=media-libs/sdl-image-1.2.4
+	)
+	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
+	xml? ( >=dev-libs/libxml2-2.5 )"
+#	java? ( >=virtual/jre-1.5 )
+#	perl? ( dev-lang/perl )
+#	php? ( dev-lang/php )
+#	sox? ( media-sound/sox )
+#	tcl? ( dev-lang/tcl:0= )
+#	vidstab? ( media-libs/libvidstab )
+SWIG_DEPEND=">=dev-lang/swig-2.0"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	compressed-lumas? ( virtual/imagemagick-tools[png] )
+	lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
+	python? ( ${SWIG_DEPEND} )
+	ruby? ( ${SWIG_DEPEND} )"
+#	java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
+#	perl? ( ${SWIG_DEPEND} )
+#	php? ( ${SWIG_DEPEND} )
+#	tcl? ( ${SWIG_DEPEND} )
+RDEPEND="${COMMON_DEPEND}
+	!media-libs/mlt++
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.2.0-ruby-link.patch
+	"${FILESDIR}"/${P}-libebur128-unbundle.patch
+	"${FILESDIR}"/${P}-opencv-3.3.patch
+	"${FILESDIR}"/${P}-glibc226-1.patch
+	"${FILESDIR}"/${P}-glibc226-2.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
+	for x in python lua; do
+		sed -i "/mlt.so/s: -lmlt++ :& ${CFLAGS} ${LDFLAGS} :" src/swig/$x/build || die
+	done
+	sed -i "/^LDFLAGS/s: += :& ${LDFLAGS} :" src/swig/ruby/build || die
+
+	sed -i -e "s/env ruby/${USE_RUBY}/" src/swig/ruby/* || die
+}
+
+src_configure() {
+	tc-export CC CXX
+
+	# bug 589848
+	append-cxxflags -std=c++11
+
+	local myconf="--enable-gpl
+		--enable-gpl3
+		--enable-motion-est
+		--target-arch=$(tc-arch)
+		--disable-kde
+		--disable-swfdec
+		$(use_enable debug)
+		$(use compressed-lumas && echo ' --luma-compress')
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable gtk gtk2)
+		$(use_enable sdl)
+		$(use_enable jack jackrack)
+		$(use_enable ffmpeg avformat)
+		$(use ffmpeg && echo ' --avformat-swscale')
+		$(use_enable fftw plus)
+		$(use_enable frei0r)
+		$(use_enable melt)
+		$(use_enable opencv)
+		$(use_enable opengl)
+		$(use_enable libsamplerate resample)
+		$(use_enable rtaudio)
+		$(use vdpau && echo ' --avformat-vdpau')
+		$(use_enable xml)
+		$(use_enable xine)
+		$(use_enable kdenlive)
+		--disable-sox"
+		#$(use_enable sox) FIXME
+
+	if use qt5 ; then
+		myconf+=" --enable-qt
+			--qt-includedir=$(pkg-config Qt5Core --variable=includedir)
+			--qt-libdir=$(pkg-config Qt5Core --variable=libdir)"
+	else
+		myconf+=" --disable-qt"
+	fi
+
+	if use x86 || use amd64 ; then
+		myconf+=" $(use_enable cpu_flags_x86_mmx mmx)"
+	else
+		myconf+=" --disable-mmx"
+	fi
+
+	if ! use melt; then
+		sed -i -e "s;src/melt;;" Makefile || die
+	fi
+
+	# TODO: add swig language bindings
+	# see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
+
+	local swig_lang
+	# TODO: java perl php tcl
+	for i in lua python ruby ; do
+		use $i && swig_lang="${swig_lang} $i"
+	done
+	[ -z "${swig_lang}" ] && swig_lang="none"
+
+	econf ${myconf} --swig-languages="${swig_lang}"
+
+	sed -i -e s/^OPT/#OPT/ "${S}/config.mak" || die
+	if use qt5 ; then
+		if ! use opengl ; then
+			sed -i -e "/^USE_QT_OPENGL/ s/^/#/" "${S}/src/modules/qt/config.mak" || die
+		fi
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog NEWS README docs/*.txt
+
+	dodir /usr/share/${PN}
+	insinto /usr/share/${PN}
+	doins -r demo
+
+	docinto swig
+
+	# Install SWIG bindings
+	if use lua; then
+		cd "${S}"/src/swig/lua || die
+		exeinto $(pkg-config --variable INSTALL_CMOD lua)
+		doexe mlt.so
+		dodoc play.lua
+	fi
+
+	if use python; then
+		cd "${S}"/src/swig/python || die
+		insinto $(python_get_sitedir)
+		doins mlt.py
+		exeinto $(python_get_sitedir)
+		doexe _mlt.so
+		dodoc play.py
+		python_optimize
+	fi
+
+	if use ruby; then
+		cd "${S}"/src/swig/ruby || die
+		exeinto $("${EPREFIX}"/usr/bin/${USE_RUBY} -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')
+		doexe mlt.so
+		dodoc play.rb thumbs.rb
+	fi
+	# TODO: java perl php tcl
+}
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index a6d0ff1ba95a..a53cb7430704 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -11,7 +11,7 @@ EBUILD openjpeg-1.5.2.ebuild 1999 SHA256 f4ca14db72158a11dce863f110bf14087306cfa
 EBUILD openjpeg-2.1.1_p20160922.ebuild 4104 SHA256 7f7d0cea0ca74883a5c294b03862178a0e9064449c0411b08caebe32bda4d39f SHA512 3759a99a8846e7bd48dca6479dc2f5d8c3a6e289c0e0facbfb09b5c0fe8f61a7c56a44510837d9229b7d0e4f437a2bec3cf0abb7fe54b7c946ed069e8f97f1c1 WHIRLPOOL e4207a29cca05e886076f68fa11d2ef50ca7f62d9e8bb7e58bc38046cd06508866a6313a5e1dc16cee8191f2cadb3584f05295dae291ef19c20e102acba6d2f8
 EBUILD openjpeg-2.1.2.ebuild 4013 SHA256 4811c5792ba14a85a6d81a6c5eee57ac047be8270905b95edc17d325c7adc1dd SHA512 b25b772e1dba9af812d82d1a416c7bbd025ccf699e72999fa8d7df45871417bc716436b81a4ce6917b359e3edb95571f58deb70dd49f2bf3889157d91a6ce688 WHIRLPOOL 94ecdacf84872d1dd2e0ce16b0baf481dc27d1fdb67d04ccfa72e0064f35739edde807e61ecd729851c690cd4192b36d54d9d107aef1cca13d699f740daa58b2
 EBUILD openjpeg-2.2.0.ebuild 4008 SHA256 fecf7181aa4b482d10ddcf78707da55cc333e0718840cd3731853b5b8ef38a24 SHA512 67d000a44837aa623b08d95b66a14b1f6a95ba4e03729fec93eabd983295ac9bfe14b2a2f107b047095203598826bd9c9e7936d4737f1fc11bc86fce60f8066a WHIRLPOOL b7460645bdb6412da1fa2e3adc4196c5578d865ee436adcc297ba9b08bf3920470db63dfa18f455b24f72687c5583a7a675bb4302095aaa0adbe6f740986ac08
-EBUILD openjpeg-2.3.0.ebuild 4124 SHA256 2df60f6250c51a13972cf2310908ac2e4abe6eca87b17f588a198f8026f65130 SHA512 ff16bab1cfabdf29a8674543a20f98ce0460c71ef885bc3415246e1fea519d7562f9da427819d9d195ac21706b082324d2476a90f655fcdbfa7c6f6e5a2cd1ac WHIRLPOOL fb8a1cbf442c943f0bb42a8dfd0acffdbfd970a8b432007a9a7671e4de40b1a0fce5ed8dff177db6849f4a1179962aadc1d13bd219610bd95d318198d2241eaa
+EBUILD openjpeg-2.3.0.ebuild 4123 SHA256 c6197b4b32ec00b6a74835a4469cf1d496f537e8fb00a2fa5d9f474a3c612089 SHA512 79638cee72d7e0999af5cb117de7310cf3def54fe47b0c06e9d0d8738beb21fe9cf69bcf170af0ed978ee36f4221239cdb98fa7e683dcbeba0a0fa31548d4366 WHIRLPOOL 8d1459e541e6196998cf6f35671ee5b4aa7b52a9caf3ff58bd9b52aa3e5d25b2d8e2f4062267f03fc73b2102e70f4d8c88cc6210a9dfea321be41d47c51e0608
 MISC ChangeLog 7107 SHA256 ab91aa79e988c8ada9fdcd3eb581d62b34f06a4d104898fe6a0692b3822a4841 SHA512 34c554fb7c5b542c4a18b851f5aa9ccdcc47f41ca9815d8a5ebfef6fae9ae65b7265de897980c5adf7a57b1b6fcf7bd6ac0a37b945861a317a578b22b2869e7c WHIRLPOOL 75abb312e47fdf966b704d3dafafa73601a44d32930d243a32e50af0013bb9e286d08777abd2b6a0ba965749d39c94d61a8dd29751fd5d49a14b58446985359b
 MISC ChangeLog-2015 16632 SHA256 16e64b73b25390f6136c6685474f98e28e09511117c2cfd3e80199cadb59e362 SHA512 73cc1e6014a2a2bb5941d794d5b8b8f295ce8a207ecf532d67504ef219eb28ecb722d2fc913de8543abbd94dbeca89193bbb68d9dfb9a1dd774c1018efa0c37d WHIRLPOOL 4297848b013d0c4d5e65238759d36e610010e7e3ea7c4467d5e495fd3c88ce989d78170ff17b2ff69cb991fdb2d1a5772cdb32af952e694691e2a079e0da39a7
 MISC metadata.xml 455 SHA256 b4fd557d0fea3afd283e339e0c37bfa73e89d3e9b5714b218c610c1a50db0fa4 SHA512 b956f115708b8afff16126117cacfa9bb51fb55660e19cb6b295081d81790c5c6e8858bc28193f3d9a5b0da66189490938c83c32124e33dedb37ea4a8c8ef99d WHIRLPOOL a020c98df36a2844fcd319067e6778dc07558368421706da6220a591ad8c21bedc4e572ae959e09a7e48d4adf4dd26a0f6bfedfe1e763068882ef8ec871a03c2
diff --git a/media-libs/openjpeg/openjpeg-2.3.0.ebuild b/media-libs/openjpeg/openjpeg-2.3.0.ebuild
index 1ca19e3377f6..4bb165d93fb2 100644
--- a/media-libs/openjpeg/openjpeg-2.3.0.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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=
diff --git a/media-libs/sdl2-image/Manifest b/media-libs/sdl2-image/Manifest
index 353d5c4401e1..4398d20ccd2d 100644
--- a/media-libs/sdl2-image/Manifest
+++ b/media-libs/sdl2-image/Manifest
@@ -1,5 +1,7 @@
 DIST SDL2_image-2.0.1.tar.gz 7797848 SHA256 3a3eafbceea5125c04be585373bfd8b3a18f259bd7eae3efc4e6d8e60e0d7f64 SHA512 99ed5f7b69966cea5fcf9173e7270167c24b55ab459774f10dbf90f26dcb9d5f118971ffd4e583a83148976f44ca166474669398a561169d24ffba80f852306f WHIRLPOOL ba4a78ae19ba1921b0d11208f93390cc0ec31aed86f302c2b8d4ac8c55a8e783c29a3180d8557309b2874d74a081734256e9cb0d8215b369090abddf64bd0a7c
+DIST SDL2_image-2.0.2.tar.gz 8680980 SHA256 72df075aef91fc4585098ea7e0b072d416ec7599aa10473719fbe51e9b8f6ce8 SHA512 468f1a5aaee0b6920adb80df21aaaa41bfc5c642b4a00ac60244a90c5e9f27b092b73bcdd2c5520aa1de2759e8b174686b186a51f2d07e7e188ce2cd10519724 WHIRLPOOL 7ff628bd65b70663c42537d31877f8929ca317a8ab71c64c72522a92b86906a7774dcdc60e57ca4f5e67204fe4bf134c64fd9006366ea32c0ab481b0f9e5b9d7
 EBUILD sdl2-image-2.0.1.ebuild 1513 SHA256 37d0d29f5cf6e48328e45634a691daddb4ae990374ae2511ae221a1e02ad71c6 SHA512 f3da0090838a632b6a6999671e1c89b907f601d80f7c9e09c98480ed117d7f8c5e210c3febb492cb0df9e47c5b5beae01d0bcee60aaef3e53a31588f959d5266 WHIRLPOOL 79c8f0e5b9c3dea8963733931e4258569a168e5cb82b539096ac9f140e46a1b221e29e73f61fca255571e506d5054303ad9c102ce9ddf8809972303c4f6cb6a8
+EBUILD sdl2-image-2.0.2.ebuild 1526 SHA256 a0564f14d31bf6ab5a3cac05e0c2cb3b5cef17ea8e1eb2947a0313cab5280acc SHA512 23bce8ebe254a12f4b10b71c8b1429d7b7c58225f5b59d8dd69e90be51d73ee9c8406066909601e0a802d4be14c0792d5ab6254f59def37da6f1d524fccfa8ea WHIRLPOOL 09d7d816df799428636ef929e3b1cd20c10859c4b140475b775d86091b5edc91aa58a055883bc1ad629b70168aeb4ee7fb7984e094a6b37046e2e3a4bd16e35c
 MISC ChangeLog 3606 SHA256 45c186c1382a593cf39ab74d450f2bcdbfb66dad6d4902abdffef3c62d438dca SHA512 b99296c7206e8027c687e372a88c29056e51166a7019fe0c14ee116e4077e708053e57f712d60cba691f803034c483290e6b1630fa80c9e11c0836b3a967aa9b WHIRLPOOL 4970b1b8155102eaed2552aaac65bcb02bb158e3e9ede32bea06012a562533f4d8074f57fb7036eff16377c86dd109ce73d00038b5e7385a46aac0043d89a84d
 MISC ChangeLog-2015 1105 SHA256 5f3cbf870a93886092bdaf7bd49eb23777d56a8e63a4d54501a6c382af4df859 SHA512 1b4b0407964aacdfe9c24a40773718afafafc27cfd186b3b736c0c59bc835df51614cc5218ce48a3a927d6f74f22bb4ba759648f87f30dfd995c045238e755af WHIRLPOOL 89bc06fd27fae8cf3de9d024b25a175317025e34653f329d609cf75878a315d5defcaa8aa0c512e6e4627dff73956d3116400ba52567bca7895d6f1909df562b
 MISC metadata.xml 326 SHA256 d3443006e81a3c08b3227244fab49c4c7fada0c40176c4a80aebcbb91cd348b4 SHA512 144746a2179b9af1bc4adc7f08e2d6c798a4b9b3d4391719c899447e96f14cbdac47facdedf9e1ba9d81f650d647ab793d83a227f0a0321cafdb96ee5ec51d34 WHIRLPOOL bdac469c0aa2b64cf584bce2a387eda8066cf6d4d930e3966dc5b07632fdb2f13cc62a4795c33ce301a168a04cec0457501715ed65cb1b972ebb92039eeb20e9
diff --git a/media-libs/sdl2-image/sdl2-image-2.0.2.ebuild b/media-libs/sdl2-image/sdl2-image-2.0.2.ebuild
new file mode 100644
index 000000000000..c3b1db990775
--- /dev/null
+++ b/media-libs/sdl2-image/sdl2-image-2.0.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit ltprune multilib multilib-minimal
+
+MY_P="SDL2_image-${PV}"
+DESCRIPTION="Image file loading library"
+HOMEPAGE="http://www.libsdl.org/projects/SDL_image/"
+SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gif jpeg png static-libs tiff webp"
+
+RDEPEND="
+	>=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
+	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-3.9.7-r1:0[${MULTILIB_USEDEP}] )
+	webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )"
+DEPEND=${RDEPEND}
+
+S="${WORKDIR}/${MY_P}"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		--disable-sdltest
+		--enable-bmp
+		$(use_enable gif)
+		$(use_enable jpeg jpg)
+		--disable-jpg-shared
+		--enable-lbm
+		--enable-pcx
+		$(use_enable png)
+		--disable-png-shared
+		--enable-pnm
+		--enable-tga
+		$(use_enable tiff tif)
+		--disable-tif-shared
+		--enable-xcf
+		--enable-xpm
+		--enable-xv
+		$(use_enable webp)
+		--disable-webp-shared
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi && newbin .libs/showimage$(get_exeext) showimage2$(get_exeext)
+}
+
+multilib_src_install_all() {
+	dodoc {CHANGES,README}.txt
+	prune_libtool_files
+}
diff --git a/media-libs/sdl2-mixer/Manifest b/media-libs/sdl2-mixer/Manifest
index c17ef5367d43..dd8259bd463b 100644
--- a/media-libs/sdl2-mixer/Manifest
+++ b/media-libs/sdl2-mixer/Manifest
@@ -1,6 +1,8 @@
 AUX sdl2-mixer-2.0.1-mp3.patch 1169 SHA256 9c9495c7438dcb2ecdfe8b8416ffeca30693a9442b8387ff881d292066b0b50f SHA512 1c649be61ece8715b2a426a041fa548a8cf0d34cf75d3a0e0b37cec40b71637de954b12f0dcadf3cf632fa2897a2b91223ddca89dd863fadecc8ed055546933e WHIRLPOOL a2206ac44030243f3294e1910a93247077710a167e2fdbf3801a198b2776a54b346d3ef3c3c5271c10e9c75576e7af297a6565b2cf244261b00c4da124ff3b7a
 DIST SDL2_mixer-2.0.1.tar.gz 10213891 SHA256 5a24f62a610249d744cbd8d28ee399d8905db7222bf3bdbc8a8b4a76e597695f SHA512 bdf2b4fc302f9c3b41d40bfdd5132081439e6021e915f191e478235b7b6565e7b4c43e1172d2055066ad505e2bc70876123c58f5a67218b207c829ee66a84b9d WHIRLPOOL b9ebeaad35ed92e8de111872d17ceefdc996ebbbb91f3b35fa9ab62573fae972e1a1626cc86141260c69af87a53a0880230ec399fe06fa3c5a98b20d82be8515
+DIST SDL2_mixer-2.0.2.tar.gz 9620763 SHA256 4e615e27efca4f439df9af6aa2c6de84150d17cbfd12174b54868c12f19c83bb SHA512 c40b5ac93933df1cc932e7afe796ad6765aafb24077601a23f98ac625a83341079ad903c164eafd022aff6011872e7a7956eebd8e3d3edad1bf5dc7eb9c306b7 WHIRLPOOL a7723fe6d0bd99022465491191e164d1bd7a8b81c13ae6e5217fafe649d75333f6a0e3bbc1a8f541cc48428319aaf88ac814a5704faf562570de1c2df45ae692
 EBUILD sdl2-mixer-2.0.1.ebuild 3510 SHA256 e1a9b8f94496a7ac3fec49c1e742257885f6efdd3a31b95d73a107998d8ec5c4 SHA512 5278be9bccece87ae64304d6b498a07276be540c0b2f2364fb3de98b3a8e16661e9d6962e6bdf46939428d0a2f6ea68383021f36c513ab56e41f9d240544be23 WHIRLPOOL fd4d95e65dee2517a53bbd1dc5b1b859424c19454830879654c5dc7324328012d382200b2bf04e1c7cb0c0dad8bd2494877502f7137f8e3af69808fa65220e53
+EBUILD sdl2-mixer-2.0.2.ebuild 3214 SHA256 7fba2647f5a77322c44545910f70d0fe30fe42b744e4a61aa848ff0ec6d9b196 SHA512 dced4d10984b5c658447c2add19dcc34a733f934c07b441d4e6d93daac20e2edac8cb36fcf0514d29f3419d42ff6ed054bb162bb67e54a5c76d0ae598bb220f1 WHIRLPOOL db361b262ca9c71e3883951c3b240289f92c901a6eb0d4563eb774d13b2da5486232df9fcd4f13f1765b4afcb93b6186e4640801191478a3d3c3e7d335be8ed1
 MISC ChangeLog 4629 SHA256 5748d9ff7d5ed0bf27223d5d308baae567bb309d10f3fc524e2dc2ee7a158c06 SHA512 8b63afe1aaf103310f0e09e5aef04f37dc2b117b01dcea5b186c4e70ca5e86275f3f0f6843e38c300dc98205c22d8addf13a7b483befde2896d84990266d6cd9 WHIRLPOOL 953f104c6a21ce18d68388bdcb9d065c496add32beaa20ff4ff823cadba3110ea0efba7ba550a15486ac73d638efb730533dc6346fabc8abe95ebdb5fac36852
 MISC ChangeLog-2015 1350 SHA256 11ce685f498ebe30088af64d6dac0af70ab770317836d1f013c1ff7520bf92c2 SHA512 2db91d52f88014ab4bec7a392fc96dab2176243ee69491e998b9c3af5c29af572a4a240450fc2681b4d78304c7f5a1adbf64a41d7b9777e7ae97059c477f75fa WHIRLPOOL 2282a661d07be7b84a5eb056abf1a90363746d542cb503f7e5fe72d7bc09ed1a8a4bd87c5ba8e3a87ce4b635fe8944078b5683997b5f2246026cdb131bb2400b
 MISC metadata.xml 751 SHA256 9a3f24166cb6d419004fc9ae812f2ed2737b41d1d72243fd66fccba417ae79fe SHA512 2376560d848b86e6d3b1728f581cd43bd812b8bfa4e89eb839f2505dfd3f75cfbc3c82bd9a91e571f6021e6ce7ea39df99d964fd29d0159f241539e86d65ce4b WHIRLPOOL 143ddfdefc60cb3f55b905c1a5275fcf89c831ef696859ba9e3805e865013b9b27f2e7492aed9d1c3357cfc0a591f11795985e60053e54c6b42d9d9ba59ec844
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.2.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.2.ebuild
new file mode 100644
index 000000000000..d818f3bf9bb1
--- /dev/null
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.0.2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit ltprune multilib-minimal
+
+MY_P="SDL2_mixer-${PV}"
+DESCRIPTION="Simple Direct Media Layer Mixer Library"
+HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/"
+SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity tremor vorbis +wav"
+REQUIRED_USE="
+	midi? ( || ( timidity fluidsynth ) )
+	timidity? ( midi )
+	fluidsynth? ( midi )
+	mp3? ( || ( smpeg mad ) )
+	smpeg? ( mp3 )
+	mad? ( mp3 )
+	mod? ( || ( mikmod modplug ) )
+	mikmod? ( mod )
+	modplug? ( mod )
+	tremor? ( vorbis )
+	"
+
+RDEPEND=">=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]
+	flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
+	midi? (
+		fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1[${MULTILIB_USEDEP}] )
+		timidity? ( media-sound/timidity++ )
+	)
+	mp3? (
+		mad? ( >=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}] )
+		smpeg? ( >=media-libs/smpeg2-2.0.0-r1[${MULTILIB_USEDEP}] )
+	)
+	mod? (
+		modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+		mikmod? ( >=media-libs/libmikmod-3.3.6-r1[${MULTILIB_USEDEP}] )
+	)
+	vorbis? (
+		tremor? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
+		!tremor? (
+			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+	)"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		--disable-sdltest
+		--enable-music-cmd
+		$(use_enable wav music-wave)
+		$(use_enable mod music-mod)
+		$(use_enable modplug music-mod-modplug)
+		--disable-music-mod-modplug-shared
+		$(use_enable mikmod music-mod-mikmod)
+		--disable-music-mod-mikmod-shared
+		$(use_enable midi music-midi)
+		$(use_enable timidity music-midi-timidity)
+		$(use_enable fluidsynth music-midi-fluidsynth)
+		--disable-music-midi-fluidsynth-shared
+		$(use_enable vorbis music-ogg)
+		$(use_enable tremor music-ogg-tremor)
+		--disable-music-ogg-shared
+		$(use_enable flac music-flac)
+		--disable-music-flac-shared
+		$(use_enable mp3 music-mp3)
+		$(use_enable smpeg music-mp3-smpeg)
+		--disable-music-mp3-smpeg-shared
+		--disable-smpegtest
+		$(use_enable mad music-mp3-mad-gpl)
+		LIBMIKMOD_CONFIG=${EPREFIX}/usr/bin/${CHOST}-libmikmod-config
+	)
+	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	if multilib_is_native_abi && use playtools ; then
+		emake DESTDIR="${D}" install-bin
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc {CHANGES,README}.txt
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	# bug 412035
+	# https://bugs.gentoo.org/show_bug.cgi?id=412035
+	if use midi ; then
+		if use fluidsynth; then
+			ewarn "FluidSynth support requires you to set the SDL_SOUNDFONTS"
+			ewarn "environment variable to the location of a SoundFont file"
+			ewarn "unless the game or application happens to do this for you."
+
+			if use timidity; then
+				ewarn "Failing to do so will result in Timidity being used instead."
+			else
+				ewarn "Failing to do so will result in silence."
+			fi
+		fi
+	fi
+}
diff --git a/media-libs/spandsp/Manifest b/media-libs/spandsp/Manifest
index 46abd4c38df8..bfd067c75cb2 100644
--- a/media-libs/spandsp/Manifest
+++ b/media-libs/spandsp/Manifest
@@ -1,7 +1,7 @@
 DIST spandsp-0.0.6.tar.gz 3309837 SHA256 cc053ac67e8ac4bb992f258fd94f275a7872df959f6a87763965feabfdcc9465 SHA512 16bb215ca89a39282e832403f69bc4c98ad3fe35ab3a6eb4731ee5029a6acd9b2df243c3701de845441cbdc16c88b3cd398ef15dc3502e45d5aeca8a161917d4 WHIRLPOOL 83aad8c11aeb3e0686cd35d2987602e4d9f4001f29463ece18d6843be855ad32f9a3fd8cba2842a1c8dc9f91acde1b776400b4317c93d0201b9039b0990f500a
 DIST spandsp-0.0.6pre12.tgz 2566669 SHA256 81820ab80be853ecfea79b75e5b5cf592ff7083853cc22ced46d57da47f9d0e8 SHA512 19a7fe491b836fe604373aa2d31d4b35dde19e593a8f3d5d2a4b866ea69a137ba5ebfd43c34f74e8f7800a7eb1ba93d1a0401540e310bad2b73aecb17c45de0b WHIRLPOOL c7ddee4f308af16dd77b612df0ce339ff89c8ec80cb77139d460299a76e291c334315f0ee48a51a6a6af125f1dc0d824fcf43e03fb206a909b5fec159e1cbf01
 DIST spandsp-0.0.6pre21.tgz 3278758 SHA256 bd152152bf0b204661ab9439c5a649098bcb8cefebcbfa959dd602442739aa50 SHA512 6f846021cd6a1605d371a8e5d1ac3a5b6adc5b85de2517e24a5afaa57b4864202c2d16c1196959f7f11d866732d17d301d2d37121228cec75077678f8fc3e488 WHIRLPOOL e3c375888c562a933ca9be22a916d57b538ee702b77d0e4ce078eadd93e8701e1bcd76296ba6b88934888a4a3f5b6c216441a5e5f8aea8134984fe4213f38736
-EBUILD spandsp-0.0.6.ebuild 2031 SHA256 ed3c7d8aaad8dd2651aea0dda2ef4e21999611acd16da3796d2b8050858d2aeb SHA512 4c3283e72fe68f46ad429b39a0b70cbdac1c75a90c71af96d24c14770460d38011d83f95ec3d533d11bd1e39c60403f57b7649e57e7790ade8554b133a6028c2 WHIRLPOOL 1c821529810d5c92f60af4dfccb9fab4ab2cae06fa269bbcdd2d9ee6339f4a2623e6c02d0aa55876eea2b309f0824f25e64174e9fdad0159a20f9df9dc4231bb
+EBUILD spandsp-0.0.6.ebuild 2037 SHA256 cea0964d450fd0f7503ec2d9598e6adcc0a4517f4cf688c3b7f4551caa767c61 SHA512 21ae0905cffe4a40351114c0292aef1847d6ed8db354319ef8a905399f96ee3dc8b1fb267e710d41994fbb9f482d870575689de657e301f4dec7eef12235e0e7 WHIRLPOOL 7195701f4d5e7b2131b2bad2ed861587558484b3e785ca01929f964d9b9a464ed7acfd8a4fbcb381c7e1538376e35a114ad7cb9f3c3acea309d192b1144749f6
 EBUILD spandsp-0.0.6_pre12-r1.ebuild 1286 SHA256 829bad029a5fe055e4c91fb1fba9be2c56f79d21b92a9226038fa8b69850d1f0 SHA512 4e067b539d08b5369cd3b6b290400ec725238de997e6a4d1fd48bfe2d7b3b6fa5089ad282bdb7796b8c925b9b17cdf4702c5c4c19e7f9dc4f5d2d0fb65048ea2 WHIRLPOOL 23e23173c49f753aa8f112e547d9ddfe83c6409319c1d4d6635b161cae5d0a3e2c33e143346990cacdfc9ae2541c9fa5e9b177d023e6104084aa0770adcaad7c
 EBUILD spandsp-0.0.6_pre21.ebuild 1420 SHA256 7bb3ccf99fa862748dfe5ef0581e8d3436cd10022d3480469fb7f703d0b6e100 SHA512 7b7a36520e5f0f76d066078df5d3fd277540c1f7670a4beed8f3166e35f0be7eb67dace9e303586197919ba70ca00805eef0137dc3448f8b046d6b60d18f5099 WHIRLPOOL 251e8751eaa68b9aae53db4923af6d4f3131a81d9fffa461ba9989bf37b56f367626dad1c199464406f8990d66b6cdc7ecf981ff5abd2c9e8b4497f01dd46d50
 MISC ChangeLog 2707 SHA256 dd5cdd91b8b535c80bd0a45ab42322f7dae128d1659b3c061f18b1b76b17df44 SHA512 027e618d045811e1b590696d1af9385edcd15b5661162f0e58aedea2058acfa18cf5bcda74ddcab5ea08d6552eb8ab9aa891f7ce958e63fdedf7a2121a4b1cc7 WHIRLPOOL 0bdad222c23c1485f286a0fac494f42a9b60f4b72deeea4eeb6243cbbf215b0ee277debf5c70ccdbdc75a1e2d8f67e693fdbd50fca36868763fb55d584fbbf15
diff --git a/media-libs/spandsp/spandsp-0.0.6.ebuild b/media-libs/spandsp/spandsp-0.0.6.ebuild
index 042b3bcb6317..760d0a1624e0 100644
--- a/media-libs/spandsp/spandsp-0.0.6.ebuild
+++ b/media-libs/spandsp/spandsp-0.0.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.soft-switch.org/downloads/spandsp/${P/_}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="doc fixed-point cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 static-libs"
 
 RDEPEND="media-libs/tiff
diff --git a/media-plugins/caps-plugins/Manifest b/media-plugins/caps-plugins/Manifest
index 98bb64721173..7fcdf56201a3 100644
--- a/media-plugins/caps-plugins/Manifest
+++ b/media-plugins/caps-plugins/Manifest
@@ -8,7 +8,7 @@ EBUILD caps-plugins-0.4.5-r1.ebuild 837 SHA256 26e2e5d9d22d5686e818543df37de2aef
 EBUILD caps-plugins-0.4.5-r2.ebuild 1069 SHA256 97093fb9db73ae22ecceb8f9e1688fa97bca7f5afd7a460fc5885a5464aa657c SHA512 b17487b286abfac6148641f3aee5027fdbf8a12da578afca197a8e913dfd44de5d1d9440219c242ca1e4044f7b1b4f3d5ee061ed6ee2bb2b7757f8957f27534e WHIRLPOOL d0fe4e15760c348a71d2cb07ba89fd8756da6753523dea6e84436da6a92e32a4c81d95edef179c31cfcc4d9b4f6512e4c7bf739e16bfc715d4af0702f5397ec8
 EBUILD caps-plugins-0.9.15-r1.ebuild 1011 SHA256 fb93935b49f425fbc6d21ebbb02cc22ff91cce4183a660651f5df2f88b27730e SHA512 0771427f4e46f3f207ecc9de30d93ffe268d3525e674f03a20c1ad203bf981145499b8256ec25fb482d8c052e7217b85d7be470d7569bb1bac91c20fa795834e WHIRLPOOL 704df55bc91e29d0690799caae29440aab3e4e0e6b83460871ecf039e07e624d356ff9e8adba9dade99d05a0e3e201e041b1d663ab36973d8edf6c22e06116ef
 EBUILD caps-plugins-0.9.15.ebuild 1097 SHA256 b7addc3faa94dda071d1ba6b0c44772ef85bb4f334f3fb85e539ac3711ec0219 SHA512 d93dd029180ee3356b45898051c9635014b9dfc831bfb37cb3922fbd1fe42e01fa696edfea9bfb54628f1251cd2f511b18739640df3d4d7c5518e62d3d7a0a22 WHIRLPOOL efea8fa6c5d646bbf78ab5886e6447e8c8eed1756d7cf127c5a700612d84673f9fc2218c71b21c3ede360ce1ea907b957c82ce204be3d26c412d2f6d16c22eef
-EBUILD caps-plugins-0.9.24.ebuild 884 SHA256 77ea3ace39c1f4726bf7d68a93d4daaf5628b6649f372cabfefffda64938ac36 SHA512 b75c4e5ce2559776dd4b644ebad51972b0acf326c484be7f41cd3e74f7f983694a21a1312cef19dfea2d0cdcbf04f6f641c1bc3f751d6881e2cbd3ecd6f8d349 WHIRLPOOL 6a78a1dea1184ce6777f8db0cd6768520502bf662ceb76de84120c42046702ecf3f460ec896dfcbeeedbf82f31418e8d66ac896e2389e6aff329eeb06360c79b
+EBUILD caps-plugins-0.9.24.ebuild 882 SHA256 039c2b38d93c2f7b88cb5a7b5b022016b85b50c3284586bba6423be4d9be8ef3 SHA512 e64a7df061e4c2278fe0b49cfcb4ae96da7685ff1c96ac07edc9b4dd31ebb07d6f671eb3a82e020a1d56ca9cef7a3d99275f330df5cd55dd1ec75f5f0bf0a882 WHIRLPOOL ad2959545969960c3315bb543d190ba879fb22de61c49324a1920fe0fbf3a97e0d451715caec0ca24ba3a5106c2a856c2b243ffa746e357cacea69ed0cfdae6a
 MISC ChangeLog 3005 SHA256 e9e021d39136280a8c231ea11a72408dda1519016a062ab205c59f0da902b448 SHA512 3fa1019421d20f7c6d23d05c2818cc3aba0e0efd9fb474e73efac9f07deb5d8073e3f4dc3b06e1ecef234099d6268ecab7044cef87ce62cec5e1e5372f937eec WHIRLPOOL a23c931732829c4d915dee60b923fcc4b66c6d31e18e1ee5fab0320ff7eeb4a0bca80d9d109b0d24ff6eff0c4e4885e6ae9068b7029002cf7d885d4fa95a2829
 MISC ChangeLog-2015 5955 SHA256 cf0989428f0b86cd958ba5147d6e2dd75e6e89a02cef21ce02a9b9139949bffb SHA512 3ac9a2409a40b605b314691fd1e4a70f0671e8acad703068b96630e4cb713bb78283d76ae0cad035097db17a0f33a10ff3138df0fcee5096c38a693d7ab7d4e5 WHIRLPOOL 91bb0112fa9cdda70da34e8184e80cc532516602233622648fb7ef922e9893f4c9bf226c453e7a8a0ef2f3cfd94a3369b8c1dc5306e21917506267a518b4342f
 MISC metadata.xml 513 SHA256 6531be9c3989aa7cc81d689008bcf3903375a83348eb1b7ecbd3b3c3d0221a0f SHA512 d528c2eaf9dc0a9a243ed3ec6ceb80a1ce72f4d5f144c2b7c9917d3a84914e896926bdf2c443ae113ccec7c83f37e4c8b284db9af48962f82b7b67f0a95b272e WHIRLPOOL b96d39b0fc7fa61924e9ed087a6a061946d687f21186c1120c664803ef4ad20eb4076d4f46f2e1de94acf392cd03baf995efc188d3c1404e902908951c9874ae
diff --git a/media-plugins/caps-plugins/caps-plugins-0.9.24.ebuild b/media-plugins/caps-plugins/caps-plugins-0.9.24.ebuild
index e7d1db123cbd..607d8447c910 100644
--- a/media-plugins/caps-plugins/caps-plugins-0.9.24.ebuild
+++ b/media-plugins/caps-plugins/caps-plugins-0.9.24.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://quitte.de/dsp/caps.html"
 SRC_URI="http://quitte.de/dsp/caps_${PV}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="media-libs/ladspa-sdk"
diff --git a/media-plugins/gst-plugins-a52dec/Manifest b/media-plugins/gst-plugins-a52dec/Manifest
index d5732d94a7b1..d84c79084d15 100644
--- a/media-plugins/gst-plugins-a52dec/Manifest
+++ b/media-plugins/gst-plugins-a52dec/Manifest
@@ -4,7 +4,7 @@ DIST gst-plugins-ugly-1.10.5.tar.xz 908604 SHA256 d6edc046350809c967f5b058c5c2e5
 DIST gst-plugins-ugly-1.12.3.tar.xz 903784 SHA256 e88ca584c94ea78eeecbf3af00ef7f134b66bdee7408aa4aa6c547235e060052 SHA512 9ca5769c325df3d2d97ba83d785fab08da5119f6d26c4ac4db72853af143477ea8fb7087464a8614b6e59f384463ac01087ee76cec2af8acd80a4dc15e392e34 WHIRLPOOL e908fb96fc5694c10c16b7e5aeae4a6f7945aaa324074cacc3ec10b84b53ef738ee8c77d6f0983a02e7868275ba26ada14153d7046d85bfdb57f310e59793657
 EBUILD gst-plugins-a52dec-0.10.19-r1.ebuild 399 SHA256 72624d09ea9045eedd49292a49d0ca8ffdd42f8477b72cb68259824d702b5216 SHA512 81f762ae4e234a7a3f1cfa82ec0efb712cc61da6b4944b0242d5d7d273f3bbdf01f3f9471860778b23a75b654d7e59f2bc355f7d8d68faa81672630d17aeaf40 WHIRLPOOL 62adbac629ee086b3733fac66a0e3b75c0d6fee06336928c35a996da23b797fa771acbb26ad05cfc05c3cb0ffadc6c6d56631d4edb0c50d477c6ab813d3e0e76
 EBUILD gst-plugins-a52dec-1.10.3.ebuild 457 SHA256 023fc209e8ec6a31d4b1677199f809ce78ca98d2f37c357108a5d215030057b8 SHA512 0f36598fccd734c21612ace294774ac41f89221f5391769cf2a755b7b00cbb4efe119e7e3d1e4a21c19d1dd11ac4ae736caf6af0618eddf56d06d1bd9522334c WHIRLPOOL 30744094bf0c74495174745dbee9e70db34f8cdf0611d34d5470bb4d676fbcf97a44fc8051214ab19cb77e4ae1a3073cd647b5e0353649dafeed73575cc5359f
-EBUILD gst-plugins-a52dec-1.10.5.ebuild 467 SHA256 a329d2e0bc337c42b02f71bd4c760478bb8e066f9ccd45e74fa2b1a5973c2c36 SHA512 bd18449a6dca6cb30d0dc523e72330288266e414acd1ba695367ae738f0ef5a5947f8c1e202066b60a90f5e1ab0d0225a058885fbd8a371c8a5587624e1a214e WHIRLPOOL b5e96ea90bba094c087689b8884a12f826806bd9aacb73795bc2d2f4df842ef55f7f8220da71b32b653dbefc0b52d5d11437ee6526fe187da28343c573113fec
+EBUILD gst-plugins-a52dec-1.10.5.ebuild 465 SHA256 b4b0f4a94e518c6dc5302412c7aeeb2f4737e209882489e048c2bf06271f6a20 SHA512 1b5d75c2721e6048a97b279aac957f1f0664ef8641f4c361fafaee0d46a5004cb08c97cc85dfb6008039531d98869ec2555bd2bf6558100e51e76f156ba67698 WHIRLPOOL dadd804c76e57e3adb9a3148ea97b7dec135d7cc39d4eb9702e31fc098c170ffdb2abbab594d04cbe219925e1d640d21ed559ae6fba038ff3b4d687f37d4365e
 EBUILD gst-plugins-a52dec-1.12.3.ebuild 472 SHA256 7e48deed116cb367be1e7dd2d91ce2ee3e186cc9b1808e1db5011540daf373bf SHA512 e8747ac65fc42082e053be75982f95bc786eedbeccffa088b3026677ca96582a2f6be3142c8dc89b9b4452dbd7ec15ea52a79dea3f540382fddac4cee54079e4 WHIRLPOOL 3d35794b3035ecab99e6ce2a4f074d08f271defdecc4221f3dbbc9a07a458228bc242cb566c6e9d97d6bd7e96504d32228a17ff7fdfa3eb5535c8d3277002061
 MISC ChangeLog 6232 SHA256 77829b1ebfac4c7a1cc44b5ba56b84962abc4bb284f0b63dd68266857b4e7281 SHA512 155227602c27f12e1a90ab3be46969e5b86b748e23079aa0340342b0b9f9a78f897fe8a9fa43ca34af9fe91cd3c1540f7998a3b078fe5a61841e711704b74e60 WHIRLPOOL 0d86e0e9898f7cd89017110115fd87a84091ddcdd9b17c7c535e8df7b810c121690d95faa260d67f2f253ffdf785f3ebef4844e4672c47344d1c1bf71ee29218
 MISC ChangeLog-2015 27115 SHA256 1f204fad289b8b6b94cf5e068dec3dd7252167925b1ea56365b0a1c08972ea8f SHA512 9a2d24c4173be1b081e1134ea2f3a0bb1174da450ad2b35aa27ed1f707ad809785fa68caff6d98c0778241aa37d7f64cc3c3bd1b368245848560c9779d43b9cb WHIRLPOOL dac705771b44b4446c9ee1fa89f46c6bbbdf1857ec46ab5b8ca14523290ee9eb3a38cee74f5263a1a5fcd72b8d4c21e493799f364b6af001c23cf943282c495a
diff --git a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.10.5.ebuild b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.10.5.ebuild
index e0183c5b3b1f..f54e559c6179 100644
--- a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="ATSC A/52 audio decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-assrender/Manifest b/media-plugins/gst-plugins-assrender/Manifest
index e7c11c909920..e93eaf252730 100644
--- a/media-plugins/gst-plugins-assrender/Manifest
+++ b/media-plugins/gst-plugins-assrender/Manifest
@@ -4,7 +4,7 @@ DIST gst-plugins-bad-1.10.5.tar.xz 4737820 SHA256 c5806040bb83b43be86ce592e6a19c
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 SHA256 36d059761852bed0f1a7fcd3ef64a8aeecab95d2bca53cd6aa0f08054b1cbfec SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661 WHIRLPOOL b4c1262a0ca63331f5cb38fecc6a26830234712d6d4409aed495b05e7cfe13760bf056767e54e17cb9899c3671f0a05b90199d80d0b47bacb2ee6d27b89a5457
 EBUILD gst-plugins-assrender-0.10.23-r1.ebuild 397 SHA256 8b79d628b9b252f4dd0c6579e3d03f0480400b1e49fe52c6b93c0d60a224dcef SHA512 cce12435dac51172f7f263bd8c0c0ab33be80a6740584e1dbcb5b707ebf62c034e5d4da247e54639c1a6592cbe7d8be055d3f7b335331cb18629b52c279d18a6 WHIRLPOOL 617bf7fba524911298ef8cebacd762796ac150fe0bfae9ed003edf752dab50f6e453a0b56fe6354300e20b21faf245f2daa5c70f01fc1bb161daf886d1d109f6
 EBUILD gst-plugins-assrender-1.10.3.ebuild 396 SHA256 05e83a80a61be6a3a07e81195e0daca82a81292a311bd524dc39f6da4c97a7cf SHA512 97f86c143a75ac205e5069cccf46975b2735d56caeaca64f9405889ddc7791c7aa8d3297562478482ad2e446ba6dc414d903aca30786e9a973ff9b000485cfb4 WHIRLPOOL d461dd52c846561df7390fd8a50aa3c2a0c14fb38a54707bff1f223a0999d5a2266e991e58dc6498b48807d9a849e3ef0e2bf9bca5f5759bdcf57baf07565c4f
-EBUILD gst-plugins-assrender-1.10.5.ebuild 406 SHA256 5d1d7d877006f7ed923cb7b349ee571110ac91d4688ef27c7a79f271afa6d680 SHA512 a1b6fec5ec325ac85c22934281fbad0477f825e6ac9969a7b8453a52e71396a24b819f53afd4e66a6e3db4b8d69740d733ff0a5b04a346c8594de0350c7e55fa WHIRLPOOL 1bbf2350999ce5c251be56374e2628908ec464a0a9c071ca1fd56d50fb7e998e3fd73523d1449472ef23c8103945a2eccbc588e9a2f49ff202872e9e5a53d30b
+EBUILD gst-plugins-assrender-1.10.5.ebuild 404 SHA256 24878877d555fe0dbff80d2eb080e7a956f5eb8427071f519881c013914f39fb SHA512 8892888660afc0519ce3b226964170a111119ffdb44b979424572bad76cd493dac50c53c16965eb4e1f955e9e38f119fdf38486a879610e7e3a5e805e1e0f51d WHIRLPOOL 8d01b9751f54342dd7443e0f560413039a2b80f33679ee1b236adca95c6856d43725e247ee041e31af03f79d090e27ef05d9352a998fd310e1670bf3ffb55cf1
 EBUILD gst-plugins-assrender-1.12.3.ebuild 411 SHA256 f16a67a8f77e38533a7dd754205a403515c1d3e1990cee6cceadfcf5c68894e7 SHA512 75b73981664601eb5b7e5867d15ee48a53fe60ef567979dd02b1046e882d51f065160b48e8e94ba572639c124c7be60bf9cccf9ad67427aa36b040ef2cae5fab WHIRLPOOL 49b9bb72323b3e00fd03286baed67593a74b8bba28c58fda7c1270947338f164978d86573f373ef85be262da1349b7d5cc876f807e68751d210b160a97975237
 MISC ChangeLog 6227 SHA256 b7170e5ef4566c616dc124bafd0b8ba015cb349b883c360b9442fb2c76cae996 SHA512 d232f41d12681f0be9053cdccba13ebce2268b9d8a8a418a7af1e9f980c59dd847dd110a6d90d2a5a8779ba5c8abdc9a14872d7430f7d0fc1ca7e0ef38a6b6bb WHIRLPOOL ee2f3123c32338e403d5866cdb531dbb86679781f8b5a1c52f1166dfc555276e59bbadc51563940e4240ad86027107ff1ab5fc4b473adf9052012a33394591ca
 MISC ChangeLog-2015 12637 SHA256 78fc3d2ff5019d9396cd12870d2c091618586b37d21eed1d2d205906b1047e67 SHA512 7e3534db76d14716acd2bcac00872b2464d9f7299c9784f0bfe49665bec0c1cfdcc5cfabfbf960faebd5a2f6aa49ef57ebf868df62caa3607ca99edd39f4ce22 WHIRLPOOL 71aa1cdacd219e4e1065af74a51b15c0a4ce366441777a5c2c6cf72a1525e77d619c833267e233d3655a4d98028da00c6b05d48652847c3f806f1dda191007ca
diff --git a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.10.5.ebuild b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.10.5.ebuild
index 5c21611642d6..c2547782f88c 100644
--- a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="ASS/SSA rendering with effects support plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/libass-0.10.2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-cdio/Manifest b/media-plugins/gst-plugins-cdio/Manifest
index 35291cbb059e..6ce0116ccdd7 100644
--- a/media-plugins/gst-plugins-cdio/Manifest
+++ b/media-plugins/gst-plugins-cdio/Manifest
@@ -5,7 +5,7 @@ DIST gst-plugins-ugly-1.10.5.tar.xz 908604 SHA256 d6edc046350809c967f5b058c5c2e5
 DIST gst-plugins-ugly-1.12.3.tar.xz 903784 SHA256 e88ca584c94ea78eeecbf3af00ef7f134b66bdee7408aa4aa6c547235e060052 SHA512 9ca5769c325df3d2d97ba83d785fab08da5119f6d26c4ac4db72853af143477ea8fb7087464a8614b6e59f384463ac01087ee76cec2af8acd80a4dc15e392e34 WHIRLPOOL e908fb96fc5694c10c16b7e5aeae4a6f7945aaa324074cacc3ec10b84b53ef738ee8c77d6f0983a02e7868275ba26ada14153d7046d85bfdb57f310e59793657
 EBUILD gst-plugins-cdio-0.10.19-r1.ebuild 418 SHA256 7ae2ef0cc226ae2e00a2f63fcda2c82826de8507bb9845cc3222e73c374b6fe6 SHA512 9df5ba64af0b1bd1d99e46851f6184f889386898d056d2c82cd6c5c023ff183bf59a6818c401f8ccd6a62beadd6bdd77a2d447f250c0472c5f54b46013d6dbb6 WHIRLPOOL 394076e99fd6b30f1bf2fbb2e976846e9a144350b352a3894ae284a846ef55fa261bfc22699a1fb7c672516e48265ce0888965362aad1c756ab5e23265dbdffe
 EBUILD gst-plugins-cdio-1.10.3.ebuild 390 SHA256 1b1b995782930a930bd7c17348570a5116fc0203ec7c92d465f6cd18dee6d75d SHA512 8aac3993d99e666afd6ad8024e59a71786cce60d22b6023e16342325fcceb6ead8419fe80f4b740d26dc63a201cc0139b5292b934118e056dad45e83bee1b337 WHIRLPOOL c7904201a734d742a45bf695935b41784feaeca02e9666364804248ca80d14a9aa816f0ee1deb078faf8e91807368c859dc42f0c9be0e0ebb64b10f5affe1dff
-EBUILD gst-plugins-cdio-1.10.5.ebuild 392 SHA256 ab8aa39d295c0ef3d1513c7f51f4e96b1bd89aab55b15d6e6c8766dc3eef75b5 SHA512 99a96b58e5fa7f375f5ee449307328fd0aaae0da054bb26ac8c9527e8122f1e9147ed206770f86ff5f67d80a6b624981b00a12449842f710b757dfef24a50fed WHIRLPOOL ffdcf06b85e4081f837e70b26f7bbe4ba8bd4a44d782b5cbaea28056b45fbec934e3af49ff2d39a0b5d997f8812ba28a0796ae62f0ffa800a6362871e644d558
+EBUILD gst-plugins-cdio-1.10.5.ebuild 390 SHA256 1b1b995782930a930bd7c17348570a5116fc0203ec7c92d465f6cd18dee6d75d SHA512 8aac3993d99e666afd6ad8024e59a71786cce60d22b6023e16342325fcceb6ead8419fe80f4b740d26dc63a201cc0139b5292b934118e056dad45e83bee1b337 WHIRLPOOL c7904201a734d742a45bf695935b41784feaeca02e9666364804248ca80d14a9aa816f0ee1deb078faf8e91807368c859dc42f0c9be0e0ebb64b10f5affe1dff
 EBUILD gst-plugins-cdio-1.12.3.ebuild 395 SHA256 1f7af9f9d7007ea392d8503cd2eaf65fd4f63f236b36086637164e790dd9acf7 SHA512 b00cf9842c219582da473a4978692f27124dff1a82207405e35b90966a1215c8c6cb66508c2b2f1e577454c48a987a0cd6422d71cc33e3491af1a9befa2296c7 WHIRLPOOL cd963e05248369091875e8f530f0c8b952aa59a6a0721d434a6870071343beb5d9c510f12ae02a4491fb91392d6a5973064839312c3a3983d61f3e511aa566cc
 MISC ChangeLog 5659 SHA256 28c2f0fc181e0980e94753db6aadbcda544dc5dcfe7f897c44d5959473475c09 SHA512 86d218eb9eb52b83950a4447f55f004b5c7c2cc89a7aff19dd5ba3852b6e302dffb56cd0417960ad0e10edc016848e0c1cf8ef037a4f3662ef2d7ea83745e99e WHIRLPOOL 41803038b4bfe6e805332b3ab8f3e21a80218bae5c7f3322eb3dfb37a5abfb9b21ffe3c2cc8264d7a73cc72909c406ceed22b065fbcdd6f01460b9a6369b36a5
 MISC ChangeLog-2015 15184 SHA256 c1200aa1fe69fc59baf84768d446e6141e799b421dc844e9169d5cff3d95b6b3 SHA512 bd6acba4b2197d24ae8fc2bf10e8bbcc140ac84ec1dbcccbb9782bfb2a3836121e20d18407291745a5a5f1a842875b0f8c01094338f8e07b64c9f20adf0bcc7b WHIRLPOOL 1b61b58260ff39bf00eea36fb70c4412bf6ac316b5ff4cbb6d1759a724a0d5ba5ad71d1bcaffa715dc568bd064f795e63dd8547de1627c592d7d641c98d36f5f
diff --git a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.10.5.ebuild b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.10.5.ebuild
index 8bff3e7e0a14..5f1f00345319 100644
--- a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="CD Audio Source (cdda) plugin for GStreamer"
-KEYWORDS="alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=dev-libs/libcdio-0.90-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-cdparanoia/Manifest b/media-plugins/gst-plugins-cdparanoia/Manifest
index 91ccaa7caec6..fbd879232c20 100644
--- a/media-plugins/gst-plugins-cdparanoia/Manifest
+++ b/media-plugins/gst-plugins-cdparanoia/Manifest
@@ -4,7 +4,7 @@ DIST gst-plugins-base-1.10.5.tar.xz 3060092 SHA256 1c401a79bd1e4521c6ef1b66579bd
 DIST gst-plugins-base-1.12.3.tar.xz 3117364 SHA256 d3d37b8489d37fa0018973d850bd2067b98af335fef2fa543ee7d40359e3cea5 SHA512 d32f71836e25081b00040709a2184da85489e5af90902a0b27b820a478f5805bde93a04cefaeabf36dde53c16ad12f2816777cc195f1e027f19d1883e088e2b2 WHIRLPOOL e81c3183a70b121412bc455a4f93501e2fab7bf241a66f903446115891ab66ee78d570b01a4eaa5eb7971a7233f3fabf10a71c398bb4205beea6dbfb4280bcdf
 EBUILD gst-plugins-cdparanoia-0.10.36-r1.ebuild 438 SHA256 c87d6b992eea72a252991166564bac1110f749a9185f241d8deb3f033a1235d3 SHA512 8be7db6c102859a541cf40301567414398e0cd7cc51435956490af1a92a403444d252260178de83f48453ce701020d963fa0f95ff3bad03c1b7973a94ab5d4a8 WHIRLPOOL 93861b5073f63d7cc90232ca29d9dd99d134d0d5e02e0797ec8479a57a4624ff248fc098debac3fa5f2b677a33bb765411103aa7db279024344516e345b685e2
 EBUILD gst-plugins-cdparanoia-1.10.3.ebuild 463 SHA256 b792fa840df517f0e8e5d717f737fe919db73c65145e42b0a71498c21242c204 SHA512 4165f2c07b73f2575e101c359a075df2f2b3198a0d9fef44c27c3d10515a1503395676d0412ecff52f35ea9d2cb2565f428cbbf418395f9edf8d7073eeeee392 WHIRLPOOL fdc9f929b432910396285447a937551b9a89f7ceb38d9e3779308fe66dccb4d426b24b82238d4153163f59c00758db7ecefac7585d665a0d42e1407fe68f854c
-EBUILD gst-plugins-cdparanoia-1.10.5.ebuild 473 SHA256 50383d059996b9ebee3fd592d0c8269582af7b6e3a7360e6be3fdddc725d2bf0 SHA512 3460881084d172e180e3d8689215827969c0c8e005ec86942384ed080b97f895cea2ef43fba8b562c77a1a9b806da7aaf2f0337a95609cd7706df3c503456f46 WHIRLPOOL abcfd1e9d464f7cc7c046b80a703c0839d0fab4c03a982f4ee1cfdd0cae12e3dab856ad84bb052b3d9332bdaff0023a8ce7f3c6a6753ffd323601f22de2da490
+EBUILD gst-plugins-cdparanoia-1.10.5.ebuild 471 SHA256 78f499d50a5da7f5415535e653f0618a61582c2ef5fcb76a2c894cce543411e7 SHA512 03a4db52375aca09c49aa49cd27a8c3d82a22e4d53c0c486144ac964dc8895652fa36bd800e9b8834c9bd7880f94742fd62d0944239421a210f199d525590e61 WHIRLPOOL d6786fe316a2e6e9d051865e58d0d7a2c42ddd0c572b8fb1d690cde511445609eafe5391562972226fc4bd53a1aa180bd919a5c00328f4012df8a38d53e75936
 EBUILD gst-plugins-cdparanoia-1.12.3.ebuild 478 SHA256 67432f0faf9b625e503dd2ed5336a32c52c0a26bfa51207ab5208be21ae6c5b6 SHA512 17319e09a914d3f031ac45d22b8a599c004b0242594ca35ba001f52acd1bdcef674b82c85019807d2e050cb23f3d3885f968eb7065f32eb6f6b797f8e6ea758c WHIRLPOOL b4e7e375123aed96cf86cbaa56a62d0c5357f31ab444177d1786c15c53c8ecb4d068bdab4e1e55ac860cc6c73f218fe39fae4b9e700352bb5c9b0b26ca5b7efe
 MISC ChangeLog 6382 SHA256 1b83e7c189bba9b263f6167aefa8d74d8cb60a40cc5c4719985fc82c720efb11 SHA512 f952484ea821bb43006c188f6187d24aae1951e26daac06ef0d0114e6879c9748c00e683f32cd22a7fafe89fe6e57ed209892a5da6774d541a442584dce41450 WHIRLPOOL 603cd7433b06febc04e5bdd6f88072de2f171abed6b684ae864dd8df131c84d8c9345ccf18c05e5d01db010d4bad1232fb24db5502607838066621eca3d5e909
 MISC ChangeLog-2015 35057 SHA256 2ebbffdd9404f59c1a123c582188eba5d76e42228a73bf06e87c092bc46e19f5 SHA512 328ea1c40f95d36690a73ad6d6413f26924f11c79d3a9f587d1eba8fe4ad57a344c5e0b65767bac34a27dd8c72a4332ae2a796c4b835b0ff04e04a024e1b4bd5 WHIRLPOOL 1083a8872f12eaf705c1480fb75deefde9256c909408007deacce0d2e29f352c560a2bb9b62e51ed0644ebcdb0ab869ac4d01bb3fc8c085d60a19df70139d201
diff --git a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.10.5.ebuild b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.10.5.ebuild
index 12dafc31a932..b4431b29b121 100644
--- a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-base
 inherit gstreamer
 
 DESCRIPTION="CD Audio Source (cdda) plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-sound/cdparanoia-3.10.2-r6[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-dv/Manifest b/media-plugins/gst-plugins-dv/Manifest
index 8ba41b10d91f..22e811bcf97d 100644
--- a/media-plugins/gst-plugins-dv/Manifest
+++ b/media-plugins/gst-plugins-dv/Manifest
@@ -4,7 +4,7 @@ DIST gst-plugins-good-1.10.5.tar.xz 3425088 SHA256 be053f6ed716eeb517cec148cec63
 DIST gst-plugins-good-1.12.3.tar.xz 3487448 SHA256 13e7f479296891fef5a686438f20ba7d534680becf2269ecc5ee24aa83b45f03 SHA512 8ed96d2b2c8724659cf8163be5246ec30c8a92d70fc6632e207ad258cff5624d6fc03576e6e674011bb88a4825c8ce225545bc7e60cdf66a173d9e1d4bfbbaa4 WHIRLPOOL 9255759738e14f9a6aee1122d7f2bd7b23266e33bdc834e2942ac3a1fbb9389fed504d4769c1ab50c35b8a319c351f8373aca8cf09bd138bbaf7bef4fc51894a
 EBUILD gst-plugins-dv-0.10.31-r1.ebuild 409 SHA256 73c85f92757fb39e89eb9a10f7cd2ae4eec7f092c697d77b010a4980f2ae0f0f SHA512 5eb3d45d44139eb190c0ce873a62b6543cc88e38ab37205bf33209811675a412d7d5bf3405c10b513f60ead3772299cc5725df3a91788a7c504d7c81251de9c9 WHIRLPOOL 7ccd7b57e7f559217d3c6126e0a1b11006a022fedc52a7e13d41c15146751a69bfe5f7837934078e66ae4feb4e0da072ab2d7f7c00b59e140ad3602ffff46508
 EBUILD gst-plugins-dv-1.10.3.ebuild 406 SHA256 57445af594e717b43f80406dc6f3e64934ae5935c3b60491e90d631a3e52ee9a SHA512 799a310b501994fdb54f4c7defeb85569be588ab9c2d76aac018a16003960b3ddb1a5e9d596f75a4deaa05f103ac0d96bd6999cfe470fb4b677070256d89d596 WHIRLPOOL 1b44f57c0fd530dc297cc17dc05471b4cd2e75719763f387c4bab11da8c98aaa5813bd740fa7f8dba41edd5bef772eff95a2d929e448092dcf63250c09054da4
-EBUILD gst-plugins-dv-1.10.5.ebuild 416 SHA256 e8359bca1b41c8cbb788a0ce3444f3d79c206bcda71c26313237e47925ce6d3e SHA512 8f63e85a8c449b64f73cc3aa583041118d9cd2a64299b55cd15205cbfdf288cac585038c75917a997f3f1860ed1a2e6ff45ce7c6e202dc43bf5fc30a597bcf77 WHIRLPOOL 5249b67f410c9737a4fa1b2a203fc8b113c74fce94ce3fbbabccc851b302ea1a00b60e04fd072064873982754dbd9af6f635aabfc712ebbecef331754dc67042
+EBUILD gst-plugins-dv-1.10.5.ebuild 414 SHA256 bfbc0658e849405ea855165db290c8026fd44a05ed62a36f01a8dffb637d62ea SHA512 91fb0d2bef05e76d6e678af93dc56cc2bca0bd0a556f99c92b17b9bbc89cde8e1117bda7db404d6aed2b8da3570debf2f0147fc24c268f4345df915febe64165 WHIRLPOOL 97e0ba8c9291fe6a56ac1536e5db3df1bbf0b40968a5aa5154f2b580f86e1a6a53d17d5a6d8b574f48ce693807a7ff0d52d4e4bf143050d08b668914d8ffbcd0
 EBUILD gst-plugins-dv-1.12.3.ebuild 419 SHA256 9c0044ede83c10c1044daa2fe8ce6aac7005cf0fe8d55f25081ee46946ed6ac6 SHA512 a0b361c6e6b8491c26b32b069bba78a8abefc104a37d180dfacba5f9cde6e9ff08568a0a530932baa9e008fac24e89f420c7d7ff700395bcb91236f8aaac6459 WHIRLPOOL eec972bfcca6f918d95860d2d91eb1de8429a1104a66de3381121e04e0728c1ce8784cac60eb2680f8c1326a451f277f81ce34b4ed727cb54f63025ccddaa353
 MISC ChangeLog 5719 SHA256 0c6ebff84a04614c469a5cd15531e8d4285bf8776fd60b1ca48f14c9caebb5a2 SHA512 3a702ce74fcaef09eada13c7341ccfb4f7d2a045d8f0f1423247334771f2f10d5f58052859af235c7978170e255881417276272809e67857cb69a50c1956fd06 WHIRLPOOL 83b0007d084e7c8eb3ae902ab5a15853da486f56a3c15b0088240338809130c2e09abf1618dee833499eba95b9cb3382ff7f520bb27c5a66f46175ca98403caf
 MISC ChangeLog-2015 19103 SHA256 22b7e07504a7e44a68f86686067591a6c43faf878a76be7450efcfcb69050463 SHA512 95fdeedbc5e72cb85da1c6c711179f039d57f10b768122be31c82e63c58640817b6b6f9703dc1b74c3290b25d98831dbdc1732bf5ef70e409e5b41b2e6701469 WHIRLPOOL 9acd83b7eac7d72aaaa24fd906500944091d4138e633e0fcfdffc8cb54a5a71dd35ff0630cb337568e046b7c24b142260896a4d40e20671c58f449121255fcc4
diff --git a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.10.5.ebuild b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.10.5.ebuild
index ce39e9d64d54..9b1837c637f4 100644
--- a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="DV demuxer and decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-dvb/Manifest b/media-plugins/gst-plugins-dvb/Manifest
index 01a4d16511d2..09317c52e07a 100644
--- a/media-plugins/gst-plugins-dvb/Manifest
+++ b/media-plugins/gst-plugins-dvb/Manifest
@@ -4,7 +4,7 @@ DIST gst-plugins-bad-1.10.5.tar.xz 4737820 SHA256 c5806040bb83b43be86ce592e6a19c
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 SHA256 36d059761852bed0f1a7fcd3ef64a8aeecab95d2bca53cd6aa0f08054b1cbfec SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661 WHIRLPOOL b4c1262a0ca63331f5cb38fecc6a26830234712d6d4409aed495b05e7cfe13760bf056767e54e17cb9899c3671f0a05b90199d80d0b47bacb2ee6d27b89a5457
 EBUILD gst-plugins-dvb-0.10.23-r1.ebuild 321 SHA256 ca08ae617b6406154f0d0f39f12a5317870b68b85131ff31e35bf4a70ffcce38 SHA512 2853b009153861de3710fb1facb4b0f08a8b0cca9ead928f7b8dd773d32de9ed373c2884cad48345ae44356fb8ff00d31652d4f9f1a34a9fa5d8e3629bc63def WHIRLPOOL addfccb0ff745b14e9b26bd00b21bd127ac7f9280e486504e8e3a790159e15de73026a1c599b1018d3706d1e1cfde8a6a5a1ecbeaed8cd75e8e7cab8155015b1
 EBUILD gst-plugins-dvb-1.10.3.ebuild 400 SHA256 c8abf41da7336bc0ae8db8c1ad0143ce0b281730d6c334996fd992114790fe75 SHA512 a740439f5bb8d2eafc147f41790e81db1474efa80b61d61ca27b9fc71594c5476165b82c0020914fa255197ab46b501792f2ad0c8ee4c4cbe25f700db678de98 WHIRLPOOL 38ab5074c0cbe9cdb0a8ac51d0d0eba4fb5334651245eaf0d7495d998161b9c6bc42b1dac3e893f7f32782bd712e26fbd35a3bd45f82fadcc290ce1a456f5b02
-EBUILD gst-plugins-dvb-1.10.5.ebuild 409 SHA256 f3e74cf461322bdc5d420f870ab196fe2000f23dcbc022e53cd51a8ed9e6cb6c SHA512 fc3755b02f2701bdf946c18fcac1c8cdeccc40acec62608dc8a33421ec59ef978109686b946a6f665b6d1cfe0f312792039e214b940adf8f887933828775b09b WHIRLPOOL 4091d7f671ca90bd97c0e6df057a4ddc3ca0b1dd99eb1e4dd977502ce94cada376984e375ae6698cd8f2a1c73c91bec917ebfae1e7edfe99cc9b2a0459d66e4e
+EBUILD gst-plugins-dvb-1.10.5.ebuild 407 SHA256 8a407dc650706e3dc8a8859eb950650b108e6081d9c7503fa2dd513d757176c5 SHA512 f4ede304cc3f3dfa6472c4516ffb0bcda46f8f849b0c7bd3754b3f5f59a84fc08e046ebaf01510e4c7e986a4b1fc94be9a29229b192d3bc6baa2a1dc8e810ba4 WHIRLPOOL 1b7335adb26fd4dd4e164a9a8f31aa744fb8673fc90cff0c5d7757b9a0e40a93cf48e80710fe6f24238e2a900794bb17ca94ea24bb32eb0cc6eb75a834353596
 EBUILD gst-plugins-dvb-1.12.3.ebuild 413 SHA256 b0f4a193ec001b293da612d717edd223ee1c02be0e49fb840551571cd6d3497c SHA512 16d4e9a5d649cfec49f7f145f5a6b84af12e7472bf1db391946b6e3f5fa7c0cd9f3a8f4ad982c025103260ad0e8b9e956db99d4db6ec6b509b2c3e6e8390eb37 WHIRLPOOL ad5a9b4d1f3734932cbf3b31e04412cce578eedcf08251ee98b607206c35c57ffa194007206ded91db39b4f8a6f42923f04bdd591245529878da0a3d15f98f6c
 MISC ChangeLog 6222 SHA256 a39ad437d96b2b01f82e8ccb322075420b5da97c9a4a35dfbcde599b09eccea3 SHA512 9bacd6e4af9a4e7506ac5f4e71617c4135474d7b76e1cd147aaf3f41174fbb1509901a491cd18c1c2567753cfbc48163228782840409593d8816e1171b874e77 WHIRLPOOL 117f35badecb1b7f2676ab70a62d8d146a811af41a68770c1443f116d7ff60c778278ed158395a3b5f5736af40ef611ab5d35c53ace4d8ed052ce633ee3650e3
 MISC ChangeLog-2015 13643 SHA256 862201f67167b208a0e130a5b083948eaaf357ad2b9faf4c4bd72739706ab897 SHA512 e71f4e9323e90939967b65c5d00a2e36e2d344cbb222f505bfa4ad3e6d22d8c81b33640b619bdb20ff8d5a1c1537652a3bbe180ada195f85826b30c6b0202625 WHIRLPOOL 4b938c219157988e431817df8fcdba3aa0a60dcbac33d5755967e16f5011577fc0b40995c44178463386673e9444df432331e64a23b949ed68795f02e19fa916
diff --git a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.10.5.ebuild b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.10.5.ebuild
index a08a1f606dee..92ceabd09b82 100644
--- a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPION="DVB device capture plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="alpha amd64 arm ~arm64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-plugins/gst-plugins-dvdread/Manifest b/media-plugins/gst-plugins-dvdread/Manifest
index 43fdfb889911..904572946073 100644
--- a/media-plugins/gst-plugins-dvdread/Manifest
+++ b/media-plugins/gst-plugins-dvdread/Manifest
@@ -4,7 +4,7 @@ DIST gst-plugins-ugly-1.10.5.tar.xz 908604 SHA256 d6edc046350809c967f5b058c5c2e5
 DIST gst-plugins-ugly-1.12.3.tar.xz 903784 SHA256 e88ca584c94ea78eeecbf3af00ef7f134b66bdee7408aa4aa6c547235e060052 SHA512 9ca5769c325df3d2d97ba83d785fab08da5119f6d26c4ac4db72853af143477ea8fb7087464a8614b6e59f384463ac01087ee76cec2af8acd80a4dc15e392e34 WHIRLPOOL e908fb96fc5694c10c16b7e5aeae4a6f7945aaa324074cacc3ec10b84b53ef738ee8c77d6f0983a02e7868275ba26ada14153d7046d85bfdb57f310e59793657
 EBUILD gst-plugins-dvdread-0.10.19-r1.ebuild 344 SHA256 96ae5b57f7b6e546cd29746be13ba961d7d39651a05b18bef3538aab9ab73b8e SHA512 abdd7868cdff669bdcb5ccf31f41b2cb47615967aced3d1edec5f02f025be814fe3ab0ed1afb49719f3b329ea64320a26971459078efe3192c8bd2e320b9f4ac WHIRLPOOL f0bea1feebeed2d89d00418d95d6a3280dbc90d63c3ce318afab5725e773685fa61556f06d21cbb0341a72ef7b49ca525cbf702bb4653c88c9f503499e2ef711
 EBUILD gst-plugins-dvdread-1.10.3.ebuild 387 SHA256 4eb917abb69289d69917aff45228eb9a94ea51b3fb1a5d611e144fc3a6d6ad45 SHA512 3efdad0ac9f1f0a4bde8d35da3086cf2615e3e2cf1238ad67bd3af310ed220cc21f67578efb100524dc76dd3a64fa23106246fe05605082d81fbd4eefa1e73b7 WHIRLPOOL f6d6c8d6b0a211c5ad39a701bc798adeea453248cc6a13f4520c53917c3ad85de42385f997c85c3025811803273e4a622c0242f77c6c478a968c64eb058e71c3
-EBUILD gst-plugins-dvdread-1.10.5.ebuild 397 SHA256 57b9371cb5b2dcbb29b1b31fd5498dc897bb02e5f5992c62eb3da120f0b0d40a SHA512 2b729579c39d9bdcbb2120cfd798eeeb5756b9852df2d0c989e96f380055482cb423b93e1d9228326830f130415a99da79d383cf5b707401419d0d10c0835838 WHIRLPOOL 9ccd67c31ac2d524a91dfd0d7b8e78566c829d6a33509af90490393c0e8091e24cb9809b1e05d9ffa11f8a9598c22f341799819c78ba802d390c205f69bb5b77
+EBUILD gst-plugins-dvdread-1.10.5.ebuild 395 SHA256 9891342373ca69174d054b2058a27a08550bcadb5dc7c43b3aefd358e95bf890 SHA512 67064cdead39221925ad1373e192ae65ddf2d1827c24276183adcce3f279550546c854ae8073d54ad74595fa3c3357379337aa6c6df474a3f62ed126d2dec1f8 WHIRLPOOL ac0f125e32d209ed8e6f87302e7493ac131e5446668c12713cc6750b54c23fa6ec39c3f6a7db8197ad0baba337fb2afe305295bea9c8114c54996654171a07ac
 EBUILD gst-plugins-dvdread-1.12.3.ebuild 402 SHA256 a6f91b9421ba4f6e126cf3da664dc5b7eaa43d2ad6b50a3a4fc5521fee135ca9 SHA512 f5846aa898e1bbfe34c5ad5b84a9c285ecd2bc077b69816b8d6400f9f426c7cd0ca2ad62b24d3474eea88ff84d1eaf80cd53a721136d86599419c09ca422bb2b WHIRLPOOL 46d52f0002bdb04d19c722cbcf56674dd6b9151ebbc2a3312de9aef965db08d0c527dad89d206f5f29c6a9aab2ba0da934147cb38f9c62dd77cbd08e8b55e4bd
 MISC ChangeLog 6279 SHA256 07957862a19bc51465492e2d01642c6207968d93d202c81ed16108f2bcc1b8cf SHA512 ca3fde8d77f23fedeaeb1ae23a6d18ab37b4e2851564d54e01158b5e023daef8e54cb4f006b56acb4aaba899a1cd3cc617b201e4abfb0c0f6769382934c82eba WHIRLPOOL 805d84b0272195beba624463fc9de16b084aea4642a1a11c955e704321a4eff54a0f8996bf3f4cbb4e29c8e39571b8f1714d79fb6d5e671dcef94ef877e33deb
 MISC ChangeLog-2015 24884 SHA256 432b85d44170a9b0c24fb4cfdceed85ff69b819af5b8221c04b08fa343bbdbdb SHA512 a31f7f576efdf6d925c071f47850ce6ef23767b306f3ae35f8e9d09c1790bda9742da9bde982a5846d579fb888f8d834879dee1fc740098b6e18856c6b9a9586 WHIRLPOOL 69f34feffd46e65af22d0278aff61ec1ae92c7aa30b54b819a44a048874bb781411426528c3a2cee087566bad28d5b5a67c70024b9f9addc49723dcb9e284f29
diff --git a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.10.5.ebuild b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.10.5.ebuild
index 5a59b88f70b9..307ce07db5eb 100644
--- a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="DVD read plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/libdvdread-4.2.0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-faac/Manifest b/media-plugins/gst-plugins-faac/Manifest
index 9d5078df345e..045b81f6091c 100644
--- a/media-plugins/gst-plugins-faac/Manifest
+++ b/media-plugins/gst-plugins-faac/Manifest
@@ -4,7 +4,7 @@ DIST gst-plugins-bad-1.10.5.tar.xz 4737820 SHA256 c5806040bb83b43be86ce592e6a19c
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 SHA256 36d059761852bed0f1a7fcd3ef64a8aeecab95d2bca53cd6aa0f08054b1cbfec SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661 WHIRLPOOL b4c1262a0ca63331f5cb38fecc6a26830234712d6d4409aed495b05e7cfe13760bf056767e54e17cb9899c3671f0a05b90199d80d0b47bacb2ee6d27b89a5457
 EBUILD gst-plugins-faac-0.10.23-r1.ebuild 308 SHA256 aa6562d1305c8685a9bc666f679d1e804adcf6897d24a28f34ee6fefd3acf89f SHA512 f27ed34767f0e948b9bf03baa96359690783610771ee0b6421a30e7997c38f7abcb079060ae5b51c43a6a93b097fedf891a97ac999e1dcb5b1da04cee8148504 WHIRLPOOL cb11fb29e98b902678bc8c0a72969275b083b741e630c53cb6ee99acdcf3893fcd8de0d65b38a2fd77aaca8f6feb91877afacfffe28fa29df48e66f7e50bf864
 EBUILD gst-plugins-faac-1.10.3.ebuild 359 SHA256 6805e95850950bcf70aa49596bacf3f50cafc760016485e5dc5483c5aadb470b SHA512 b2077a786f13606f36d48f6091bb0221255df7597b3f47d0e09d04cc8d1939dd5199dadeab5f534cb7f1baee4e6503db74ebdc1b50e4660aa1013836265e6210 WHIRLPOOL 17ccc3f25d3875100f96a51e366308b37caddfded0896b8a1e8b135d0444e196b16eec0ba5cb024a07724145c2bb6af9f3effdc4629319a4705bf3f0d254f548
-EBUILD gst-plugins-faac-1.10.5.ebuild 361 SHA256 865343926025fba45f13dc8a79f6f59c4ce6ef5e95a28daff87640bf75e3e4e3 SHA512 d57df34ebd521ee6107f91cf1ac9815239565408d1e83dfac1078f28766b57385b1f18f04d67a4c8203a63a928071b463b35c0c45eba799394c857624abaadc7 WHIRLPOOL 53797814f32247fafc2746a10785ff67244ef1a7e81cc6f44ceb6b32d75f77cba36ae3ffc5fe772ddcc2c0d10222ca10b1ec25b3be82d35d1db23dfdb88e5753
+EBUILD gst-plugins-faac-1.10.5.ebuild 359 SHA256 6805e95850950bcf70aa49596bacf3f50cafc760016485e5dc5483c5aadb470b SHA512 b2077a786f13606f36d48f6091bb0221255df7597b3f47d0e09d04cc8d1939dd5199dadeab5f534cb7f1baee4e6503db74ebdc1b50e4660aa1013836265e6210 WHIRLPOOL 17ccc3f25d3875100f96a51e366308b37caddfded0896b8a1e8b135d0444e196b16eec0ba5cb024a07724145c2bb6af9f3effdc4629319a4705bf3f0d254f548
 EBUILD gst-plugins-faac-1.12.3.ebuild 364 SHA256 b91856b26cd8cdcc67b5c0d522558ea53e1fcbfcb2a8f4a35e711cb4e461df11 SHA512 98670623c5b6845bef418698e5a245c8cd0a2a7fc281a1776489a8a15e4ceef55bec0b06f6397bb8e28de81c31d908f435f2c785053005409666e2507f0abd59 WHIRLPOOL dbd3e6e72d9a4169bac3ad422d06f3c64d8a42d3355ce646d08a1935d9bb56a133e2a3ea2b88ac0b4cbd7227193467b1fd793ee75bf7a12b36e88bb2b42518fc
 MISC ChangeLog 5616 SHA256 dbf33b3fe09a093b81a1e2f8a13895ec447496f14193807995d6a3aa4fa21d74 SHA512 e44f8ff6a0a9eb7b14aa667c3214af5bc2895f53fbddb9aa7d0d12c64ba6573827a409d7e87c46f8a08e4239865e96692c3cf058d2829a3a78d63a63263b7a36 WHIRLPOOL 5266e59c9b360879e6ae9821d51cc34710bb3a14c25001376f4048324d1bfabd462f8588272fb218642c18b0575a64285ea8fecc913cd29747bfc6ce0fab2389
 MISC ChangeLog-2015 15604 SHA256 743dd02b6defd89da1c00b69caa133c416fbbe762e02276f90999408078b8419 SHA512 d63f02b09eb2d00b3089645b50e4c6f4b24eb78b932b17c8dcca5c666fc136a98b7fc95ea5a2bb01784307e9d087d24b0b1cd3db8249f40cf1c31d9257a36fc4 WHIRLPOOL 6ab930e2e9ae3e8f16a1bd8b8252d4107f7f338ec0959ec590e9112b2e4abef5d063bbf85e706e8c8a27d90160b39e416e9a7d0e904541f815c687ce668fecc9
diff --git a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.10.5.ebuild b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.10.5.ebuild
index 8bc9f1ea5eef..cb38add518fb 100644
--- a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="AAC audio encoder plugin for GStreamer"
-KEYWORDS="alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-faad/Manifest b/media-plugins/gst-plugins-faad/Manifest
index 9a84749215ab..f47a9785c075 100644
--- a/media-plugins/gst-plugins-faad/Manifest
+++ b/media-plugins/gst-plugins-faad/Manifest
@@ -5,7 +5,7 @@ DIST gst-plugins-bad-1.10.5.tar.xz 4737820 SHA256 c5806040bb83b43be86ce592e6a19c
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 SHA256 36d059761852bed0f1a7fcd3ef64a8aeecab95d2bca53cd6aa0f08054b1cbfec SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661 WHIRLPOOL b4c1262a0ca63331f5cb38fecc6a26830234712d6d4409aed495b05e7cfe13760bf056767e54e17cb9899c3671f0a05b90199d80d0b47bacb2ee6d27b89a5457
 EBUILD gst-plugins-faad-0.10.23-r2.ebuild 491 SHA256 107224312e87d42c32e26a336f03ac4ee9fa60dc17669d2b947960a131421267 SHA512 921f66afbb23c737d62338c425952835bd7fad9572d2638a06baddc54596323e7a059b1330001f42a875b5263baa1e9bc591818120b00fec49e216e915664bb0 WHIRLPOOL ad010dd29f222d5f62eaafb578e95745cf34e3ff1d639e5c5c6b585b8d5dcfb96028335d9a92b086f59363713880445f3f76713e413edada420bda8c7b46f45d
 EBUILD gst-plugins-faad-1.10.3.ebuild 372 SHA256 1cb7f5e48787fc80fdf0df70487457e3771e235b3788d64fa81e202135ec7e9b SHA512 a135e790e6879ddb52e9b871c17d2dfca976a2a41b601d826ed95eeb66dabc7f878cd8ecb6c62ecb98bee8fcdd3573b1bef99f9b0072960fd9da4363c6fd7795 WHIRLPOOL a8917f7b2056da51ebc5fc6baea3def77b07f9a3daeaaae8c3f0da3e5e3457b9be60bcc7ea66cd2b9c42249b8093485cf9888bce413b05902dc249a8756bb49b
-EBUILD gst-plugins-faad-1.10.5.ebuild 382 SHA256 67b66a0d3029812811aae7670f2e13e753c14fc8c2713678ec967562d287f227 SHA512 b50b2dfe08c20c96391b0a8f0b24fef8a7ded1863288db13c6fcd8f8e6be5c87cf3a215f385d2631f86e97e1ee4ef8e77eb8648dc2266039e4b9af4751141f8e WHIRLPOOL 4b3638ccfd6b2ad65019ebed463babdd73f079bb24347024cc96d236c91a904d28c8a09c13480136e4b2bf979a3f6b861a84c39122c6c393468db1ae144f2ee5
+EBUILD gst-plugins-faad-1.10.5.ebuild 380 SHA256 3e0a8aabb5443b2dafbaba43db028d77e562764096026bfaf5dc8b8fd38d2aae SHA512 559fd0c4257c024aa126fd233adb1baa26d7f4434f48b69255b5f1d149c2a6b992ee56812f1d58f33457586c375e7bb71ae3a40d10798445a9d4549498f5063a WHIRLPOOL 4106938fbfe896a9ea6d90fe59c666c65952477260cb915205af1df9ed1903bcd85dff3c9d177190f50157a5e16a2d09190e0bd4c13a7a5e29d65c1cc1f4faa9
 EBUILD gst-plugins-faad-1.12.3.ebuild 386 SHA256 2ced6499687e48003b3ac4b6161148354fde3ba558110a8051fd998c01fdd2f8 SHA512 b8f9fed99147b214d0eec5e3609e8a374e066f8cf1419537ecf2661adc19c07f0a3844d7c1b74ba04661f81078efd724a1d40538346fec0b067cb3c3adf2fcde WHIRLPOOL f79e7c3e59476d6eea907b45108d716092bb5dbbd3ecad7c20d4b031c72fae132933850cc140c8bc929ca2e279d8167fae2ce1255a5ed0373f3fcac5f92bc775
 MISC ChangeLog 6058 SHA256 6054d5e0067db9ba4c8ce8c9ddf8476525ce39315f4882347f0b41fb3ffd9593 SHA512 f67bbd05033c8856ae65ce119b705b58c2667709d2298638dbe10cd742650332eb7f65ac9977466f0c59345cf85a3b9caedefe16a11616c17846e73733ecf07d WHIRLPOOL 7bcf3f2f548a410e6f5a909618fcb212a8b41339d4ff908a9196158fe6bda2e47eb0aa5396bdf30a08b4799600e3e7a223af40f88b760118123b30e66776f7c0
 MISC ChangeLog-2015 24805 SHA256 411f1c63251e7e8749072cf280b6f30da96a1f26125e716e93caa6a584bf8d3a SHA512 b918dd31bc753beaec40f73d288478101907a2f2a480eccb538c9b283b4be74d7ca37c913a47a6274dd24f37d658162e5b7314c5d3d5398f12605e9c36bbd04c WHIRLPOOL 2f877bed6c2743cc9ff7c97b384d648ef5e5f7041813ea3a4b37828aa87a606c4d65c795b69bf7de73e1c507cc366f746cac4eda9897708146994e23137a0009
diff --git a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.10.5.ebuild b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.10.5.ebuild
index 603ffdaf3ddf..9dde16beed5c 100644
--- a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="AAC audio decoder plugin."
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-flac/Manifest b/media-plugins/gst-plugins-flac/Manifest
index e568f3e26269..03e7a5b27753 100644
--- a/media-plugins/gst-plugins-flac/Manifest
+++ b/media-plugins/gst-plugins-flac/Manifest
@@ -4,7 +4,7 @@ DIST gst-plugins-good-1.10.5.tar.xz 3425088 SHA256 be053f6ed716eeb517cec148cec63
 DIST gst-plugins-good-1.12.3.tar.xz 3487448 SHA256 13e7f479296891fef5a686438f20ba7d534680becf2269ecc5ee24aa83b45f03 SHA512 8ed96d2b2c8724659cf8163be5246ec30c8a92d70fc6632e207ad258cff5624d6fc03576e6e674011bb88a4825c8ce225545bc7e60cdf66a173d9e1d4bfbbaa4 WHIRLPOOL 9255759738e14f9a6aee1122d7f2bd7b23266e33bdc834e2942ac3a1fbb9389fed504d4769c1ab50c35b8a319c351f8373aca8cf09bd138bbaf7bef4fc51894a
 EBUILD gst-plugins-flac-0.10.31-r1.ebuild 402 SHA256 6dfc9d554004265358684ede366af30a2629e98496eb565c5746223539cf74be SHA512 1d0231e51a2320544cb5ff13381b288693f6c43136ebf5452ef3ce46755fe0b4ed976a678d09cb2e4eabff13d3aa1f6b8b28c67b1cf26de93c5111944805474f WHIRLPOOL e6a326a48c279c9d3be3854deef7023a01d73508cb96b8f4dfa08c30dda88358876901cf0e4447a916a5c7e5136debe36b71264041774526ae2c7f2855a13e79
 EBUILD gst-plugins-flac-1.10.3.ebuild 406 SHA256 4507a5180218094ae34d298a35c01d82af205341de2a75194b4b66133ec6e019 SHA512 929cb39cf73931ea5a48c4ca4b70bde62df53129147cfb276ff4a8e0a8f1056145c337b1eb55fef7f6d93f6223b288996af8a3f723638011efac8892629d76f3 WHIRLPOOL 652b5f44e0d50a662b210ffceae75a5e9ca49a422fcb5d8b8cc30bf1f173ff7a007e7dc3bc521081fb53ab1ff55ecc622a8e047f0ed6e0488d5b51d61e297725
-EBUILD gst-plugins-flac-1.10.5.ebuild 416 SHA256 571a6699d749a4e62ef7d987aa45b727dbcd080bdfdd289a94c00e3a6e8323fc SHA512 e6cad50a771f2b4d967e01e46870f8893bfe514972b41abc8fadede8f4e3e5222146c02bfdc59df5ab03fadf19c71705e8042d61df7d787dcacc2235a9d1e390 WHIRLPOOL 00f1dd63cc11c57e53a2a3a5118807ca190a57198e7a03b429564874a519bd7498ff4104f3765ee91efe9aceb126c174f3a0f5bcdb1c1dd4d62cd69f6572d7c9
+EBUILD gst-plugins-flac-1.10.5.ebuild 414 SHA256 dba32234fa9444b016d2e491fce9749e1a5b54e8f6232141550f6b35b1002568 SHA512 ee5dfe771cdf2862e2865b48f226aaaabff627363fe8bc876589e8a4cc35b8a00cce06fb665ba3bf4b9f0407c4932796346a6935f3b7f4ebbf4dca5aba79accf WHIRLPOOL 14605a8f1855eee845057381213a3a7768718ff9097a6c7550205c9f5cd0015a4c11508dbc73ee474351aa920d8ed127715c6b81f938267f1f7c56f1966118f3
 EBUILD gst-plugins-flac-1.12.3.ebuild 421 SHA256 ec04a90a0aea42b790021be325c7522b239e79969c89664f3b36c5be8d46e0cb SHA512 b7e911216cb80fdb22d3984b97201620f8d84e197702013bd92af6f28b40882d145769aedfabb63ab68abe27635421bc9b840530810d634b32d162b70dc522e4 WHIRLPOOL 27642098a30188d8d626456d6844b75d74cdb11551d4f335920c7e4f0f5f28e24d2264e9d2f126da8646cf9e33944eef0a1750f9da25549ac384762e8159b0aa
 MISC ChangeLog 6264 SHA256 340a128ca29f7b66090b37228dfc0ec2891c6e6e81e56c8290de9f7a7b62d6b7 SHA512 0e80462db35e2cdd408f30d69f0f2a1b44177758518952cd87adb6b90c807280ba4c225eb7bb62ef56a74e3b40f479df0c5e3aedc2f362912a009ba0b9099129 WHIRLPOOL 8e8c10f605d3594333dc384dcde7bc3a3b181e66763926dcf2c3eb0efa00bfcb9d3b2bbe85cecf0dfae1de92e337aa31a04e6d27f84a646e72c1875f75ce3196
 MISC ChangeLog-2015 31765 SHA256 9da4c4fb7f548b2a9b7139966aca554af121a9f1f53e10561d06fc1250407db3 SHA512 22ea204ec26b6f2ef7cd303e3e1b825193e04160416befbab67df1acf7a10459786bc45ba22f6b743dff6b4963ee0137049b76f048e84241853c57fb7ae5e18f WHIRLPOOL f7f5849e53c8a8f9bb4942c342f2298149b8519bcd02d52030f96560cb9f6d7953be43091d751d957d67b83674730307465d50e900ad9de0dc473f6e1c98cea5
diff --git a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.10.5.ebuild b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.10.5.ebuild
index e627ea5c19e2..7173ce61256d 100644
--- a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="FLAC encoder/decoder/tagger plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-gdkpixbuf/Manifest b/media-plugins/gst-plugins-gdkpixbuf/Manifest
index 00977f207f43..ef8c5c2ea3d5 100644
--- a/media-plugins/gst-plugins-gdkpixbuf/Manifest
+++ b/media-plugins/gst-plugins-gdkpixbuf/Manifest
@@ -4,7 +4,7 @@ DIST gst-plugins-good-1.10.5.tar.xz 3425088 SHA256 be053f6ed716eeb517cec148cec63
 DIST gst-plugins-good-1.12.3.tar.xz 3487448 SHA256 13e7f479296891fef5a686438f20ba7d534680becf2269ecc5ee24aa83b45f03 SHA512 8ed96d2b2c8724659cf8163be5246ec30c8a92d70fc6632e207ad258cff5624d6fc03576e6e674011bb88a4825c8ce225545bc7e60cdf66a173d9e1d4bfbbaa4 WHIRLPOOL 9255759738e14f9a6aee1122d7f2bd7b23266e33bdc834e2942ac3a1fbb9389fed504d4769c1ab50c35b8a319c351f8373aca8cf09bd138bbaf7bef4fc51894a
 EBUILD gst-plugins-gdkpixbuf-0.10.31-r1.ebuild 476 SHA256 ccfa80950126c5349a66b31393212aa0cb9b30e1c06d2bab85ff1e44695429ab SHA512 a5fcb6e80f02bb9695d8dbad1333aa63ef3a9d24da2bc2f6dc2074f69a5a74369567f4652899837ea496ee2018090f2bb6c86495db045af2e1e8b0ad531d64b6 WHIRLPOOL 1ae7b4338f58a9c566b1ff6c99c61771e26e35b746804269b2ac9a25b03b525e0a48daa76fa241af9cba5d15d14302479df17f0bb6ff632664c4526981a8eec7
 EBUILD gst-plugins-gdkpixbuf-1.10.3.ebuild 480 SHA256 e235a17905c4457e87f5f3827c5b108cbf338a46c98fa13ada55ada05c836a4e SHA512 ea0e8108abf1af0d12f7a307c9df4c565fd6b75b3785c23196278a0ff5d64380f442c3f58e421e07ebed5fc07737b2fa06d762a74d8263dd3987d8d44f4fed0d WHIRLPOOL c5bf1649931ac70f3274943b900c67f53f82fcdf15c9714384228aad99514feb518d24a3e2b8a6ec7133e8f2ad6b2f44f7341714ac0b5006aae0f8dc95a9df29
-EBUILD gst-plugins-gdkpixbuf-1.10.5.ebuild 483 SHA256 f32e47cc68329d6815e1ddaf97055ffab896b42e6797129f12257a7dfbda23cb SHA512 8fc5b408e0f7d3aa421fb06d9bb6e1fe7e8edbf4884667d407a1299447d4f1ff609020aae908f48ae542bc35d39efc3a4fd18022d894cfdcda1cc5d80cf90306 WHIRLPOOL fde045eb1940e96832ec88be287e71f9d028e415ec0d160479d8e8ac82a78bd049e5bc083c34d9c737dc2aff6c78c0e86602a9d3c835c7693be452eda076c8b5
+EBUILD gst-plugins-gdkpixbuf-1.10.5.ebuild 481 SHA256 a93579a6302cd5934b1f190e1770cc3727d7074d3481cb9eb16fa411de112a48 SHA512 287410cc6ae4797d684bcc3cd82b00ce9f6dc9d4d06835ae984096d8a3f7f74b7f5e0a703c9cd448a896701f3af8ad3e116571a831901142f365eb0300ef0db6 WHIRLPOOL f59234245d8d294795a29cfd7c8b1158661d3d592641b7bc643deb97c38fa5797d30ee35b2e149bde93128694eb35df8104c9955d3568652ea844116c1629df0
 EBUILD gst-plugins-gdkpixbuf-1.12.3.ebuild 488 SHA256 cde5cfeb3dd83b8cfec873b5f5a537f80c48756f410c4f98a437a185e2a7cd7d SHA512 7ffd20052afd20d1f201a542cbae15f54dca12308dd7346d838e058a79262e17c5d98e745fab6f71b786c3f5b590201472a328d3016daaaa7ac6b63a183e598d WHIRLPOOL 9d3adab85d6cb20631183097a23e6e5a67f25ee07a6204cec5d8a612a87e100e7c37b69bcb7cfacdb1031ab04e72785d75f05fffe0cbbbce742aeed43083e9cd
 MISC ChangeLog 6348 SHA256 b5c2a045f6bdb1a8681b8d25469229e85726718f807205e78db5858019798a7e SHA512 861ce361233e610b56dc52cace43b41932552e948a8665f785bd009872b1d790c00df28021550dcd269e9e4cc0c585ee7aad34866e7676dabcab3a8177b96433 WHIRLPOOL 73420fa8023682d2a24a7561ca0ea2ad97fd2cc5bd695583f0e496dbb81cee44e2c736010ba73ae83eb6ff3eb52a58c2023116a89e52ab2de7075a0c832b5821
 MISC ChangeLog-2015 9099 SHA256 3a6d4eb9723b8812f0f418eb1d6f62008d86fb8c61180553ae8be03ec83da6ba SHA512 ecd5a3688929c2744f8f3602b7911c5de6da784b57ba1eb3b16e4aaa3fc2bb49b4bc588022e9ef18548c8269f157b4df0c8b7e065e5a2b254db2c16a6842b355 WHIRLPOOL 70c9f01a0ce378b524a813c5970c18d4e77c882344255df0dced2256388831334463d31c9981576faacb9a78cb79f1d43b7a9476d2d73ddfdec4079ad22923d6
diff --git a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.10.5.ebuild b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.10.5.ebuild
index dc4451af198f..9575d3369ed9 100644
--- a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPION="Image decoder, overlay and sink plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-libs/gdk-pixbuf-2.30.7:2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-jack/Manifest b/media-plugins/gst-plugins-jack/Manifest
index c4211e4b5163..7d16c1611fb9 100644
--- a/media-plugins/gst-plugins-jack/Manifest
+++ b/media-plugins/gst-plugins-jack/Manifest
@@ -4,7 +4,7 @@ DIST gst-plugins-good-1.10.5.tar.xz 3425088 SHA256 be053f6ed716eeb517cec148cec63
 DIST gst-plugins-good-1.12.3.tar.xz 3487448 SHA256 13e7f479296891fef5a686438f20ba7d534680becf2269ecc5ee24aa83b45f03 SHA512 8ed96d2b2c8724659cf8163be5246ec30c8a92d70fc6632e207ad258cff5624d6fc03576e6e674011bb88a4825c8ce225545bc7e60cdf66a173d9e1d4bfbbaa4 WHIRLPOOL 9255759738e14f9a6aee1122d7f2bd7b23266e33bdc834e2942ac3a1fbb9389fed504d4769c1ab50c35b8a319c351f8373aca8cf09bd138bbaf7bef4fc51894a
 EBUILD gst-plugins-jack-0.10.31-r1.ebuild 422 SHA256 9c1b35ca68aa927fe52526fa38341dfcdcc6cfb394d62631acf9f4d8f13c1c0a SHA512 3cc92fbb1b8d6c8b9a0a1307f3148df3779cd711cd66f5221e75118da6393697d086f6f27364a36fe37ce95f79ffbfb13517a51575c06ba130a2740109375105 WHIRLPOOL ba081c798920e57b796e62a01311358c6c5843d944e0d97382304b7fcff7f54667bedae9ba9618cdf14880f655cc3316316d6d53c74055e348d54d80eedd67f5
 EBUILD gst-plugins-jack-1.10.3.ebuild 373 SHA256 4aa165af0a4bc4145cfbf0a3891faba3ad10d6e775dec0e5aad2e70966535585 SHA512 eb5ea645720aa3db5570e133eda957b28d9269b9b468e00f746013e13f7b7733770c70f7047097b65e8a1b30a28f14429aaad0b5b5f0540bfad190e7a787641e WHIRLPOOL 7983e880e607ec47656e2d07cba4d92a6122ca11c5be8d5da98dc419f6268204d033550b20eed4c0654fc6fe986ba575661e1379f25a9ae4536680a67c51ba54
-EBUILD gst-plugins-jack-1.10.5.ebuild 383 SHA256 e5c5554a8ff5a3260a2909e6f822ee362d68f0a22eb14c3bb2ef55e12d57b986 SHA512 bc7b4cccef06299997dd4ee023ee21464dc0f1acacb7b07eaf548a2c0d726db511bedaa37c3042f18dbe31a05dc85c6ea3010ede0fcd662f7fd3e76e47cf929b WHIRLPOOL 3f40cb454f866590660b38ed6df80ac7f99fb02ad606f45dc5b7c1dd70eced0bc70dcbbc606a99d2f867911dc6c49bc28c50b29d6fd12cd49e1f29d11b8fba02
+EBUILD gst-plugins-jack-1.10.5.ebuild 381 SHA256 73d2caa853255c5af8a2741df50b4dc643d3f62757b5103bd6f342e9c4c4cd37 SHA512 5cbd3efa174b413b907f0b4c80605a9eaf25ba1a1f7374690d6a9362462519c59a5583e8d1aa38ffcd88d01485456d198dd22a9834923f19324c5fd56988aab2 WHIRLPOOL a8450047c3d6e482cea1a15e32a7a95063173f2fd7b2909a5f93d1b6c8af29b75f04ee011875dbb907115367ef430c850a9804343aa364bee1e35b9dc1f7429d
 EBUILD gst-plugins-jack-1.12.3.ebuild 388 SHA256 429b9d1878e9bfe159fcfe9e962b5992244d5ff1764d4adb64c9043b75aa9204 SHA512 9bdeb86863fa51fb31ade373875aa36f45a80b07816650294f926b2244c2c3ad39ddde48a99e93cfed57804ccd11c59d25849f53f2d170cbf61c4a198e6d3df9 WHIRLPOOL 05e64e46f67e39021ed9dec7ad3364279a7f6466ad14e03dd477a50dec7d7404ec4d49cdce2b992af9fe739ef40d1f6e794fef81ca4e3ff4b1edadb54590fafa
 MISC ChangeLog 6268 SHA256 00ee8060a179d729c223ae5bc5c3c9ee678d2e2f1a78b4f72a00670cc3277c64 SHA512 1aad2baaf5d92c839f8d51c34255ef234d71fa29d76c1e32b44969a233ced4f95e7d0e62ee22f2c5b2507161e7bbbfce34a255ae650ea5950e2c2b9d06213429 WHIRLPOOL 2e4ad26a14f8a2e02d9ddb1cdb9dc5d6fb7afb552552a7d3fefd7e59d8ae6c71f898026f318da7ec87eab3ecc05283825f8c5a4dd26a9fb88270fda29d46a08f
 MISC ChangeLog-2015 12984 SHA256 615f70863aa21665f969c0e2d8dac551ce9d53f2057a34fd760b7ccc5ddf3864 SHA512 1ab1e54a32912cb8c7d98be82aa3d141c5267d4e0be6c227fe8c42fe47df247bffc3295b090f1868963af7c33322cec56893c5deff1b8e8daa9fdb0c1a90c9f1 WHIRLPOOL 2152c134b52ccea7aa17010e30f8bc3f85fec6411c3dfeb85809673318a8ff45f14d072493c78660c644fb8bfadbbe01627ec503aee59404a1c833ada9826e4b
diff --git a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.10.5.ebuild b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.10.5.ebuild
index 8755ec47fc3c..4726bcf2739c 100644
--- a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPION="JACK audio server source/sink plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="virtual/jack[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-jpeg/Manifest b/media-plugins/gst-plugins-jpeg/Manifest
index b816716b3e9f..f89b3dfe921f 100644
--- a/media-plugins/gst-plugins-jpeg/Manifest
+++ b/media-plugins/gst-plugins-jpeg/Manifest
@@ -4,7 +4,7 @@ DIST gst-plugins-good-1.10.5.tar.xz 3425088 SHA256 be053f6ed716eeb517cec148cec63
 DIST gst-plugins-good-1.12.3.tar.xz 3487448 SHA256 13e7f479296891fef5a686438f20ba7d534680becf2269ecc5ee24aa83b45f03 SHA512 8ed96d2b2c8724659cf8163be5246ec30c8a92d70fc6632e207ad258cff5624d6fc03576e6e674011bb88a4825c8ce225545bc7e60cdf66a173d9e1d4bfbbaa4 WHIRLPOOL 9255759738e14f9a6aee1122d7f2bd7b23266e33bdc834e2942ac3a1fbb9389fed504d4769c1ab50c35b8a319c351f8373aca8cf09bd138bbaf7bef4fc51894a
 EBUILD gst-plugins-jpeg-0.10.31-r1.ebuild 426 SHA256 b8361fda460998fd148ba649e56f9058006595454d64b6f6d43d6ff08d128a97 SHA512 585c281477672f655746d9b0872b825c7cfffdf839ea9940c8c5bb0318aff5a2e4c0284f3c136ba828019170de8824535b5ef8107c885fdcac2cfd6fbfb0b2da WHIRLPOOL f033abe73121d221b194b91df5e2911e3e90c5f028b6497120d0e6e88ea1053813ecea5f27925cb2bb14ae8c919add424838f61278c4aec6b1bb7ca167f595e8
 EBUILD gst-plugins-jpeg-1.10.3.ebuild 368 SHA256 b5b91c3d70f3edfe17cfcceeb8c714c38a42c3e188e08e7aaca9809082ef12ea SHA512 6af378748ae717d3e7e077fcc9b3e4f5eab285224475a1e9bb031815c51734ded49a319c9e10c8bd4d778e96e2d08fb1a6087c3c172b7f94fcb758694f50a371 WHIRLPOOL 7b770b98af31a84130f4fd025df850bccdd3b534e5e0098abe3fbbcc5c7b0f18b5b3bb5c49d986ff0bc586e83563248452074903b12aea35597597e15d73f572
-EBUILD gst-plugins-jpeg-1.10.5.ebuild 378 SHA256 72eb7332b5c20e689efda44e3fd9cf1ff6fe2407b78db1a6f65e1d813646bf90 SHA512 574d2ed67c7981ba2c0bbc9926a367db5676fee4f222925535f651ead62afae2ea3b2a3d31a8c8d029756a720844a28500001d341d614fb47cb22f7daa9c6c4b WHIRLPOOL edb9038b4794d5ec2a744ef7564c937b5f74d6e460545570d29ee47eb2cbb9374bc1974b9469002e95586bbd3c007f3d6e0d7c2f26a4c0ca28fbb1866ad63d7b
+EBUILD gst-plugins-jpeg-1.10.5.ebuild 376 SHA256 c29c8ce55e57a1f30f89778da2bd33fb32a35ab8764f6e09e1e4b8e5ac8a9612 SHA512 9d0fc3abfc09554941a7bd72bcca6887cd8c4ffeb45fc63ce2c5a783aed54aadceb85f299b7eafa6465b235cbda915e7b052fc98b2ee825204d41d5484d0d3cf WHIRLPOOL 6a5f1ba2077b85c06e13d18a99dc23f9b34bd7f06546811441561da2a069856348bf2d0c2d40930e746c94b7605556c5437059547d3a58ac802a227fce28ff39
 EBUILD gst-plugins-jpeg-1.12.3.ebuild 383 SHA256 d3d616d4c1847efdb3e76d8ee6582ecfac81381d58819e28c5f1c78c84977788 SHA512 04060f094a9eef9287bfad4a524de7747ffb675f6ad51dcd1716d4cbf1d1d827ada106fd227fb488b79b55fa3a55aefac78068bc70371c77677e9ed79bd866c6 WHIRLPOOL 75543252de660085ed58b410cf4dfc1c3cb3ea7a702ffcbd527867c8420d36ce68b9fd6a140b6e301e6ba1cc2ddef378418d9598b18d49d8cecd778325fe21b1
 MISC ChangeLog 6399 SHA256 38f2f69031a236579150fd7e6b21f78da15c790f0a1a055a46bc4c0d2a723ae0 SHA512 80954f37a046d1d31f07bf9d95b288daf4a03614edbe5e9ed74e6ece67d7a22cd44c15120bf6e2bc55b30c8b060bd87aa980a7c55a5dfb08e8df02148af04641 WHIRLPOOL 87d1c5213a0571d8d1f590c0f7a70607651775d69d0ca54ef21c40fbe771c15de790b5f918e3d1952a034c276d336287701b9923a91b1f2f11fe834ee63e679f
 MISC ChangeLog-2015 24510 SHA256 324e3a349959bd7f26ea980ebe32c80bb998c38c6c5c81e5d71b4d620a22f6a1 SHA512 6fff56ceb4d3b3b59ce7c808e65b94dc78076afd2f63f6a65bbaff85c2277f0b368d5e40a401e0762d9ff5bc8430f491c827a41efa169db086d54cfd5c61a881 WHIRLPOOL c8ac3d5f26201de558d0952c03b80943c5771c7e3c2d27de9c1e44da6ae058ed12f2490f085c22e485887394b97233fa3811b605df192025844bb9f36d7de340
diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.10.5.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.10.5.ebuild
index 98a4d2d55013..5f2f8d760af3 100644
--- a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="JPEG image encoder/decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-lame/Manifest b/media-plugins/gst-plugins-lame/Manifest
index 3b79a95fcfd5..2baeec4f232d 100644
--- a/media-plugins/gst-plugins-lame/Manifest
+++ b/media-plugins/gst-plugins-lame/Manifest
@@ -4,7 +4,7 @@ DIST gst-plugins-ugly-1.10.5.tar.xz 908604 SHA256 d6edc046350809c967f5b058c5c2e5
 DIST gst-plugins-ugly-1.12.3.tar.xz 903784 SHA256 e88ca584c94ea78eeecbf3af00ef7f134b66bdee7408aa4aa6c547235e060052 SHA512 9ca5769c325df3d2d97ba83d785fab08da5119f6d26c4ac4db72853af143477ea8fb7087464a8614b6e59f384463ac01087ee76cec2af8acd80a4dc15e392e34 WHIRLPOOL e908fb96fc5694c10c16b7e5aeae4a6f7945aaa324074cacc3ec10b84b53ef738ee8c77d6f0983a02e7868275ba26ada14153d7046d85bfdb57f310e59793657
 EBUILD gst-plugins-lame-0.10.19-r1.ebuild 338 SHA256 a65a32a7abe3d5f5b2df423faef483896bf1e1d13f9b5cd27039f132c64c6a56 SHA512 13a168e21fdd2b0651d93d45689b5447b60f47bb98d6c43a2c0de7a4007fa6bef2847df7a2cd881a72655b003034cefcdddf154130cb769ddc5aa91d5ca61455 WHIRLPOOL 55a47959b6ecec0372a3d1cb11274ae1f872d4bcef1f124b6dc357328dcb9cf79bb9543e4fe6a621891723e3589ea898ae898e94aaad1ff820ca1bdb79a856f8
 EBUILD gst-plugins-lame-1.10.3.ebuild 384 SHA256 7cce55766393d86d7c5d504a3f3fa9d2e95d4b6faf1dbf1101e43df65da3eebb SHA512 cedcee19d2bfb77572875ef2fed0da2e14e583325223a964e496cd6ef2515d464792128128ef7f0f4840dfd16de63c726d0dbd75a380e8f9ec7b87b92d2d6758 WHIRLPOOL d2d45bc649199f74604a148d6b56ff14aeac3542333ba16518caaf9bc0452c53388a59ea69b68ad2260593de7a6892f33d349fa5cb7c7e24abcea91127a8a694
-EBUILD gst-plugins-lame-1.10.5.ebuild 394 SHA256 a179fb318fe3c2e188e6e2da10040aa750be3e3d41a73dbf2734c4d1c885f18d SHA512 45cf7c68f2fcdce7263d1e8b5f29323f3176eaa4318e00ef9931802095406e0b265dfe5574a272ab952c5095665665678e79c7c38e799993224b9f08a19b996b WHIRLPOOL 94faaeefce4a7e7021c4899ea413fc87d6be647175f1106fcda930cdc9ab9ffc010968db483dad483fe09add0f3c595a86a300f759609e664003823fb4d071b5
+EBUILD gst-plugins-lame-1.10.5.ebuild 392 SHA256 3166597ebe08d9938dc5f94d5df2b4ebb5655622bb8248d2829efc65ee72046d SHA512 46c22626970dad6f400d3ef8d0fecb7ed0558c674e9ae8ba14d50b9c8205eeb974fcbfd313f7532f5bf92a1d7c4cd3cd1f0b2e3e5a51f408d964a61305596647 WHIRLPOOL bf2d9c0419554f1748de4b94774631bcb046f42a8a097378ecd67d3651f89a598b42768dcaeb9eab0ebd4533735889733a45d65a3c43053652b21e878cfc6f37
 EBUILD gst-plugins-lame-1.12.3.ebuild 397 SHA256 c953cf8deecc6bbb42b09f911ec728c92e8039caaafc86fb3b3fa40644989e91 SHA512 0d2346c05b0b8295e02b45b5dec17f35cdc35e6281a50e14ebbbf802f5238136cb73ee60c0e69c5f4baa2c700867f84b6ff8677671e73ad28403d28d06c5922d WHIRLPOOL b189faa396ef801aac0d6ebaf70152fe57db02e56969caffe8edd4837d2085d68381412e5f1b22596be347b1c216e55fe7b7eac67adfe757d3b557c632991eab
 MISC ChangeLog 5676 SHA256 36ec8f825404ada6038657c3d55652a256d91bb0f2403730300f38c31aa0ee79 SHA512 d3da6c98aad07d9518d1db163b95fb9c89dd31b482945b3ead036c0ccdfe472115d697b5786e2c60cd97c9d1b1606d4eef263d97b372cc9010c4003d71301e7b WHIRLPOOL c3b4d579c7eb64b4320d946587c45681cc17c8c1fe3be67f699cdc8d13656e22ad60c0cef25d6e3fe6755609854000e8abc9af59359738f547200e1f564a6ffa
 MISC ChangeLog-2015 22200 SHA256 0e7dbb4f22f71028e2019ff426b9e4faa47507975ed7828974f8133c8f6622b8 SHA512 0f0cf6de641558b3e9a31b15ac9209ff3a0e5e0b509fe5af46a2583a6ac0b766446b2c685ec58352aeb199c140ac43b166dd783cbad521009c761777a6bfb469 WHIRLPOOL 9e40bc0ab98b230a8b78d9a4a5c3a67a3e18c62cf54c23506b7aa66a53f8a384aedef05c561844fa63f7b1eebd7e500200c8b25e5ecc93a23f73c9354d98ecb2
diff --git a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.10.5.ebuild b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.10.5.ebuild
index 07df71eb10ba..cdbf83d365c6 100644
--- a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="MP3 encoder plugin for GStreamer"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index e866ec471d00..2067d7cd3573 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -2,7 +2,7 @@ DIST gst-libav-1.10.4.tar.xz 8535052 SHA256 6ca0feca75e3d48315e07f20ec37cf6260ed
 DIST gst-libav-1.10.5.tar.xz 8545300 SHA256 e4d2f315f478d47281fbfdfbd590a63d23704ca37911d7142d5992616f4b28d3 SHA512 a0636a3b32a5c20eba69a0002fc549facebb0211774e13dd526a3a1eb710f3342662179af6275d619d5075ad0f6dc7068b9950cfb0c60e3ad48249475b39216b WHIRLPOOL 3b3ed00516ab8c4599ec249619390f4c4d478299bb5e14c2bbf532ab67d57881cf0584d33c78a6c5839008179b7815add6bf95437c7f2c65408469f9c4167457
 DIST gst-libav-1.12.3.tar.xz 8791724 SHA256 015ef8cab6f7fb87c8fb42642486423eff3b6e6a6bccdcd6a189f436a3619650 SHA512 33b380b7094afe1db57103eeeca5ae13db98a5bee6785f884a7ec8abb93a94f702eb52f0515f4fa27a0f157ecb0757cf3576df335dc456254f9a82567f5ab7a8 WHIRLPOOL 0d8a1189fb75f1c324309175e64548fd93dc69a914d71425f4028ac7c54b95b69555276a20771e47e4266135080aa54c2056e999808ccc6b203ae33922e47c5f
 EBUILD gst-plugins-libav-1.10.4.ebuild 2151 SHA256 33482fd87191b9c3a039f3d3825218de8ed8fa103df0f34dd2ce2a12f193db0e SHA512 b6e4d6d20843ec2855c2890f1c7f3733f57766c6b05aadbd97e20b8d115b89995c39ef048180136ea298fef5a1c9b0a9629d8240c227009c2aff2fe04aad3c34 WHIRLPOOL deda90d73de12ce581963219cda327d2dcdd015744a16ee03b23d40283541bf9320b850875ed87a8d58ad805e4e00406077281567067c0e0b72ea3d881834dde
-EBUILD gst-plugins-libav-1.10.5.ebuild 2161 SHA256 32d6643160217efc756c5c8a6e49515ddd54850aea7756d9097d284b47e19301 SHA512 7c4bb27eb9f9ac584a659cbb0ade3680f30c051f3d3f5de7b078caca4974429308c20c7272f7d7e77670d981230dc35b08486e56a7db375820aed3bb9ab1fe06 WHIRLPOOL d0875e3cf3c97edb0a09f6bacd10adc3acbf806dfe9419e5a008ccc4c50a1f3835ae58385350b96528fb83e30489080582d1c6b986e47ca69956fce7a268fab8
+EBUILD gst-plugins-libav-1.10.5.ebuild 2159 SHA256 88e49bcf4934e30aa814b78d6269b950bf147192178b00423ff93e5ea255222e SHA512 da0df02502a3434bf9b4a961c86c6f7b6611dcefb74a8a7eca815bb5a08bc21ad557f6f2d38839a0f19d10836a14a043bfa821eb8b75c705a46297106db23f8e WHIRLPOOL 5b2c50057e57283851a794001c3960bdc308364456034ff99c1b3469cc127f89c82b258f4619c027ca5b12ecfb49d63eb1f5acb8a2d5320a135022a2eb6f3e32
 EBUILD gst-plugins-libav-1.12.3.ebuild 2166 SHA256 4c0398a7d229f7b0d50ce12f12cf2e0f600019263cfd6875421b55b267c7572d SHA512 0ac14ab4ff301cf89bc86c32f25249909a6c54cd202082dc5a33f9623cd3975b78c057e8264c3c815ad6b17165a20f6c7e7537e7c9a25cc496d525b36acad804 WHIRLPOOL 388173a72ad8736d776bc35fcdef47750d80b2dda2cba0569a05bf075943cdd9fd493f6ad5b8f0de06ea0068b9ad8a4bff24ef10b04925fb908b72c826b2823d
 MISC ChangeLog 11015 SHA256 27c77a7a8dc8e5fde3c3df0a9e06a46269925b8b849cdd122f71936a25008de7 SHA512 b9c176008bfbd35918b535e62210701a7e833bbd007e87dd94d5be7aad3d1c3c23f4264bfb8d107a6ce80f3bb3e2af1019fab2dfb97d57c231fa0b6a19294199 WHIRLPOOL 591fe2bf75cd6f3d9684e4c65ab8a131af069f71fbfa9268b8efd4116db21d2094094ef0401d6aad9aaa538b2972fe204a9757e7996b3f522376157be5df13b8
 MISC ChangeLog-2015 10892 SHA256 c94d3fbc0188b6b40ba41f0a6d5d2b92e4d4821d73f6faf84181c24c257fbf64 SHA512 072a909aa99e21c0deb77044e09279372a9bd28b7620b6d9579587547160cd0413692f2ed4e39ff86c30986cd4652e47a03c225027bfcdb76c4264af3d36d476 WHIRLPOOL 35364e366fc9d8acb73070f86a8c437433f375aa25c28b913af1d05e9d888d5a35586d49562f073b6ece8550de7b9d33dfb758ca10a63f8c8a480be37e027855
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.10.5.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.10.5.ebuild
index 854af905c9fe..fc5a98ddae1f 100644
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.10.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="libav +orc"
 
 # XXX: bzip2/lzma are automagic
diff --git a/media-plugins/gst-plugins-libmms/Manifest b/media-plugins/gst-plugins-libmms/Manifest
index 6588ac16710d..204264d517c2 100644
--- a/media-plugins/gst-plugins-libmms/Manifest
+++ b/media-plugins/gst-plugins-libmms/Manifest
@@ -4,7 +4,7 @@ DIST gst-plugins-bad-1.10.5.tar.xz 4737820 SHA256 c5806040bb83b43be86ce592e6a19c
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 SHA256 36d059761852bed0f1a7fcd3ef64a8aeecab95d2bca53cd6aa0f08054b1cbfec SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661 WHIRLPOOL b4c1262a0ca63331f5cb38fecc6a26830234712d6d4409aed495b05e7cfe13760bf056767e54e17cb9899c3671f0a05b90199d80d0b47bacb2ee6d27b89a5457
 EBUILD gst-plugins-libmms-0.10.23-r1.ebuild 327 SHA256 c1c423792724ec0e909feebe7837b826cfab907fecfc81552bff85817fb14a79 SHA512 634932db7bd44c120212219a943533789973660699f488110c2d52722ac4d63e295723b7c1a7b701544e5d04f3a28253cc18c3841ad757235ab98293bb5800d4 WHIRLPOOL e07d558762bccf5a7fd5096cfd23e5d839e1c127112b80f0d36436b35ff28060649a3c110042ebb82be7394a8ac9abe7d0422dbbd9f55251a6c4b2275edd99ed
 EBUILD gst-plugins-libmms-1.10.3.ebuild 397 SHA256 a2185c45112ca4d2e7cb4c5b7fe620743487659592e3b204f22a81c26752037a SHA512 ed7214b3f10c75fc721b1f543f9cf7e03af40b4a25e2db8806b1daa935f494583e2f43612dbfb2fcda0b6c2133c0793b3dbb57162bf5b0ebe741a5ab6660fd47 WHIRLPOOL b1c5b68b227b46439ed404ee7438a70d14532e6d307eca25481a1e69ce1e08e036385a28a753291af1c245c1539c63c91638bdd9f78ff614a8c7f453b3a54d66
-EBUILD gst-plugins-libmms-1.10.5.ebuild 407 SHA256 694a7ee04055e5cb14f06c3f5c4011e917463ecbcb110b2d2934b0f0a587262b SHA512 3db4819c8182353b2d7b7cde6dfab9c93eb05412353d9900f98cd22b64066be6d8472623f762a11d154acf40ae667e197dbde0846416975bf21ca048cf276a68 WHIRLPOOL 2594aac431b859dc0521c46b90d7d25a25fe571c92ec2b9fb7ae55758189cf8130e98d01d444ba8f476111c524e183229ec401bba8379819877dfdfeb34eb274
+EBUILD gst-plugins-libmms-1.10.5.ebuild 405 SHA256 c790f5cb828b6fe628713860ee3e9d78a50f0814e082b2d7268cc359a39d650d SHA512 f9bb1f00a32e52fb8a6807042a0d29593e13a67576a4d3d7dab321eff7123298e4465a8e0a28631b861b1bd1138508faf1260826a750adf02b685888dcd7c4b5 WHIRLPOOL d14b15e5d99485c33da607548738b45afbc551936e98b21a74a5e2d85a8ec8f9a24994aa0b8390d676d9641fa269274fd0b766c98731531df61367bc4bb1f404
 EBUILD gst-plugins-libmms-1.12.3.ebuild 410 SHA256 101e17ec6eedef6f3e902fe8b407798963e22d9eb816c6ffddc56294431a95e7 SHA512 dda407ddd1a12706ebcff846c38642bdbde883d14ffc54c6d55d8f1aa9cb479be5cdb9f555ba71e87d92942dd6a92107ef286a7a746b228c5098e9686e816d4e WHIRLPOOL 5d47653ca4a3b53b4ffaf8f421f269d2dc2c4d3fb90af06b2e677ba4adfc62781ec5394d952ea69d358b1472f35829b5a326acf5ec01cc57050de8b778de72e3
 MISC ChangeLog 5848 SHA256 9bad32a1ce7b3f4be39e7483427fb8abcf3d6e4a315e7eb8127f2369a690f51d SHA512 16ff944722ffcf2ad00fdc9ad1aa881caf6f2be9d414fc464632d744b56aaccf4f92421c86e0513e8ccb190f07921d0e5bf37350064fc6983f06d7edff102e09 WHIRLPOOL 5ad644bb6b2d20447fa3f2818c759b0ee90fd7a119478fb0e5bdc5bed29639475e273adc6566ec2fdd0e16da9db7eb4a88314183d28331c7c7e8c766a748ad6b
 MISC ChangeLog-2015 17172 SHA256 e378e7fbe7e65c2c8205635ce5bc39fe28aa941c5f352061a183599a7e78715b SHA512 075921ed7171adf6fe6e96a8d1eacc9ea02b1482e1a39c3964eb207a7d72b9c88c67c4360dbcb2def633b5fc4aea11a9d3d1fc6feda9d1c240bf0eb58c08b3b7 WHIRLPOOL 1e545ae3a3e24835c4f78f3196474398bd9c6fc108ed5d1881f21830b52b4a0d19f2ad4d1a0bf25768d1cfb6c4a58f30d99c75af90b50a9a82a46525e72bd4a3
diff --git a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.10.5.ebuild b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.10.5.ebuild
index 8d0bee3b61d4..0472052bfc17 100644
--- a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="Microsoft Multi Media Server source plugin for GStreamer"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/libmms-0.6.2-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-libpng/Manifest b/media-plugins/gst-plugins-libpng/Manifest
index 096086a04b7c..dc3a25e8b9a9 100644
--- a/media-plugins/gst-plugins-libpng/Manifest
+++ b/media-plugins/gst-plugins-libpng/Manifest
@@ -4,7 +4,7 @@ DIST gst-plugins-good-1.10.5.tar.xz 3425088 SHA256 be053f6ed716eeb517cec148cec63
 DIST gst-plugins-good-1.12.3.tar.xz 3487448 SHA256 13e7f479296891fef5a686438f20ba7d534680becf2269ecc5ee24aa83b45f03 SHA512 8ed96d2b2c8724659cf8163be5246ec30c8a92d70fc6632e207ad258cff5624d6fc03576e6e674011bb88a4825c8ce225545bc7e60cdf66a173d9e1d4bfbbaa4 WHIRLPOOL 9255759738e14f9a6aee1122d7f2bd7b23266e33bdc834e2942ac3a1fbb9389fed504d4769c1ab50c35b8a319c351f8373aca8cf09bd138bbaf7bef4fc51894a
 EBUILD gst-plugins-libpng-0.10.31-r1.ebuild 361 SHA256 e7921382171e3ab3de7d5a18730e77fbbdd867f32f6baa2a44a333a1cd213484 SHA512 2a43a507e1403266467bb352ab5de0746bbceedf1b9bf72d41a9f86410856f2b4f782acd3ca09b1cae9cc821d60d03508ef63b8d0b313550e650286577939365 WHIRLPOOL e44dc7efe2b4e8027fb189da6d00e9725f47e36c19bf772f8febe2da4f948e18d3a546345b87bcee39930277d093c9a99b3560931d7b4fe6846566f105bae360
 EBUILD gst-plugins-libpng-1.10.3.ebuild 366 SHA256 86ab15c0516f0a8fc3a0f7021da63404b6982890039c46cb69791da434085b42 SHA512 50cf86240470757ea7d3967656a0f3d53d15fb33f1bb3b787bb55f5cdff0c14ef274f66ac1134df9f69f6fcb9efc59090f0063393fec1dcfd53f83fc940d9951 WHIRLPOOL 662a08a9db6a4242238975461718acdf3f03b28be136211ada890872b11957d964fea1e6857c1d29f812c64b2e3dd4890400d2e2c7ba991a0c433b6054fcca9e
-EBUILD gst-plugins-libpng-1.10.5.ebuild 368 SHA256 ea075a2b4e69d64eda51e8758296752f207f95f2803cad1b42289e87d93f6a95 SHA512 e0f78e0082f4f514d8189585fa1d3d260972bd89a3ad4fdbee40b72c9f4e934d7e7c3cbb0a6339f6eb477886fa47c3ee19437faee47297d78e7ea4e3e7f61694 WHIRLPOOL 0000a985b8fbdaec11369256fb0edb5557d4c4d601353c33592b154a07fc1274f1ebff2653cf8d2c293eea884859d5e73e75cfd6376bae8b553b3e58ee21acf4
+EBUILD gst-plugins-libpng-1.10.5.ebuild 366 SHA256 86ab15c0516f0a8fc3a0f7021da63404b6982890039c46cb69791da434085b42 SHA512 50cf86240470757ea7d3967656a0f3d53d15fb33f1bb3b787bb55f5cdff0c14ef274f66ac1134df9f69f6fcb9efc59090f0063393fec1dcfd53f83fc940d9951 WHIRLPOOL 662a08a9db6a4242238975461718acdf3f03b28be136211ada890872b11957d964fea1e6857c1d29f812c64b2e3dd4890400d2e2c7ba991a0c433b6054fcca9e
 EBUILD gst-plugins-libpng-1.12.3.ebuild 371 SHA256 26f2ad9c96dfe5a016a598eb116fe6977c3ed173dc8df3aec4fd5d8ceb86896d SHA512 ad69b2a266760ab88bd059f5dacf243fc337da87982b72b15fc9312da2d442ef7c565f380df5c782cea227a536019e4173ca5a081645264a1439e8738413b069 WHIRLPOOL 642c2f7a80ef60bc6bd70a1d0c65631b5a07efb3b661c8f45380e953797bfe9e35b09c748bde0b1bcf27e7907a2bd63e22e571d3d26dd1675f0831ecc22d6803
 MISC ChangeLog 5669 SHA256 d32123aff4775ebdce3c9065f0848370d79219c9ac21361790382762f9dc1d2b SHA512 81fd197a07c0dad438ef0f2f73c0dbf57931f4d0ec5fca0b968761d979aa53558de55d3f8e9937b5d8aa322e79e5a2d8edd13d1fec43216c0c172ba21a347e69 WHIRLPOOL dcd1afa5194a0e9b5e7214622c5ed3d81d45b19b93c7966b7b8bd21516dba8fd75879f064f853c71cb9de903b13f61909fa1829cace4296c904c230aea3d45b5
 MISC ChangeLog-2015 28198 SHA256 f96f7a243fec76e6c92c7851f9060962a070ca6adccb329d9cd8fb4b5c186891 SHA512 ce24b99f6c38c53050ba067c8c87820d8b0aa539ccbd3579e7852736b4e668a995afd25880144fda45a8e453faf223623d47073b640cf3fbdd4dbcebb3d6abad WHIRLPOOL bd4c2cb611e55c6270c4b5ead88627a979755188614be713a2162fc429caa7289bdd2026fc24946bf3137d4c4f0e5f22e887b2bbac561abde80f31ace46f116f
diff --git a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.10.5.ebuild b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.10.5.ebuild
index 8de2a7f8e7a8..49998c80c11f 100644
--- a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="PNG image encoder/decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-libvisual/Manifest b/media-plugins/gst-plugins-libvisual/Manifest
index b9394b8833e7..119aee509e71 100644
--- a/media-plugins/gst-plugins-libvisual/Manifest
+++ b/media-plugins/gst-plugins-libvisual/Manifest
@@ -4,7 +4,7 @@ DIST gst-plugins-base-1.10.5.tar.xz 3060092 SHA256 1c401a79bd1e4521c6ef1b66579bd
 DIST gst-plugins-base-1.12.3.tar.xz 3117364 SHA256 d3d37b8489d37fa0018973d850bd2067b98af335fef2fa543ee7d40359e3cea5 SHA512 d32f71836e25081b00040709a2184da85489e5af90902a0b27b820a478f5805bde93a04cefaeabf36dde53c16ad12f2816777cc195f1e027f19d1883e088e2b2 WHIRLPOOL e81c3183a70b121412bc455a4f93501e2fab7bf241a66f903446115891ab66ee78d570b01a4eaa5eb7971a7233f3fabf10a71c398bb4205beea6dbfb4280bcdf
 EBUILD gst-plugins-libvisual-0.10.36-r1.ebuild 517 SHA256 768b5540218546a8e5f64fad03f4b0bcc6cf08beb79ce0fd9f1f28e0fc9c392e SHA512 54c26a7c8f82a1e2c7fa1f7fece6112bed1d6205d188a1368c5e101641d81009361b28e67caa8daf827817bbfe33a260eed0fc747b78d9ce18d8dc2ff8f7d9c0 WHIRLPOOL d0995b602fe740f2413a40b1ee8aae88bf4da3a1aec79017f9411d4ae62f58ac953cea05e92b9374b21462fe222fa7c3e35358163890cce2aaed4eebe58b420c
 EBUILD gst-plugins-libvisual-1.10.3.ebuild 616 SHA256 77cc3a1aefda8a99720c89302a4ec0ab1ff354f712e307dc8640e197272fd576 SHA512 fb760d386530cf0d08bcc5a1d3bb816bf68434d1278556a11232393d107d90f9a0cb956698410a7a6d1dda42cf24cea3849588b28bbcdf83330923d3b68f80aa WHIRLPOOL 7f6a0e41d8d499e5411e1be069315bc0aa8a7f22838a22f4ac1fc50c5df37a84a84f834b8a2ba4fcae19942df02fc17ffc78c3058e43c48a2653180b8c6758fd
-EBUILD gst-plugins-libvisual-1.10.5.ebuild 626 SHA256 8252bf4dbf6053e7eb49a92494f08b955e0f0433fd25b20a9df85c76cc6c54f0 SHA512 659f3c2c313db9d023630dcaa01df20775530135f259bf2a6d9d0f59162034295123b09c113a5ee143689e93680a059e65cde82a379bcb680a6759816a17158f WHIRLPOOL 1700a013ebd14a4d504bfa605f7e453304f41803015c542aa291bdf002e9f8fe228f49a7a829b0500aa24e27a49f839393ef02c639f98c0fa220356e174fd06b
+EBUILD gst-plugins-libvisual-1.10.5.ebuild 624 SHA256 6f18e0f587123b3f6d4126b23def3d9c7b2f794fd4e7fb368c6ba44e1d72effa SHA512 d1ffa8dbdf18989fbb9bc4c9c5e0de20890accb2cd11c0d13f302bd71f148282af48e15b3076275f6e3f5c6a98c4f09ff8232e1f61f59bdd9eacffdf8b3189e5 WHIRLPOOL 1284fce4a6f44fd6b1cbf29e034f21c9e4d1c31f5ae65ad1c87a782701113c78ea588cab788f514866ce488a01d79586a2a0a899b6d2b239a75302b48d075931
 EBUILD gst-plugins-libvisual-1.12.3.ebuild 628 SHA256 c85bb5dfbcfa1624ebd47b010534a63c0d457bdc4d342fad09b91b0c26826d65 SHA512 43ee6f8c1e3e87bb3b78ed41a8288369915e1eb411bc730197a3ce39ffbc321c40c87cf295ee39c144112f7f1c742b943dac9fc7317ea01b1d0004b3c5a9f21e WHIRLPOOL ad61518dbfbd11e94554193691210c81e0b373b2fcb0ef9ff9bb1a5d7b7e7fa8c5e2953f54ff0e32737dd8f9caaca985be7d615503c5f0c966d730280da2c777
 MISC ChangeLog 5911 SHA256 a05ca97599e8553683420451d0b635662a1bdb01086deb3dbfdc4280e06181a9 SHA512 7033c2d0e1e83c1c3b3fbd74cb67b712d7e9fa0e1c7267170344a8279654e9f045530486843bcfd8e82ad57009bdf1abd19f1626099576119e02ffba09166892 WHIRLPOOL 4fe882a043b47cb63595a1293581b9483689c9c808584b8cd12f391e9172e4843e50d353d1bfb03df09ecbb1fa7d9e481c82ad88c217f8975a157ece4d7b6650
 MISC ChangeLog-2015 24905 SHA256 3fbbaebfc4552eec0cf25b6297070dd6587ce94ded5e04897aedf11e78f846d2 SHA512 5e9810254c2807bb230476ac8efaefc837274bed288b9bd3cd0124924296e8a04e60b806ac621c32560dcc0efeb52437729c89e1bca123abfecd39f4560d1faf WHIRLPOOL 1403fcd514c4b9a631472ee843988a806f1ddbb303c620b680dfce85a7d622cf463ccd1dd9b17fe9829f941e32a63cee1033d2ffb223650c41829219ab9e310e
diff --git a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.10.5.ebuild b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.10.5.ebuild
index 7c0762da7a77..11a4e1e49beb 100644
--- a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-base
 inherit gstreamer
 
 DESCRIPTION="Visualization elements for GStreamer"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-mad/Manifest b/media-plugins/gst-plugins-mad/Manifest
index e718b2d6fe13..a4207d4c2295 100644
--- a/media-plugins/gst-plugins-mad/Manifest
+++ b/media-plugins/gst-plugins-mad/Manifest
@@ -3,7 +3,7 @@ DIST gst-plugins-ugly-1.10.3.tar.xz 907352 SHA256 c91597d03abff9df435ad4892eae44
 DIST gst-plugins-ugly-1.10.5.tar.xz 908604 SHA256 d6edc046350809c967f5b058c5c2e534d99d1d69fe1b26acd849e87781a7d7fc SHA512 575fdd345d54af3a9c7f7b78955b958898ec4658f65da87022db39d04d8d1e941233c24d4eacea5bca28de0e9424579048ad2b25dd308f96a79e1515204e1a7a WHIRLPOOL b44163c21fda4444d55407849e9d03cdd9801aae79854d339ff072447f4140d54083fe4dba9e3f8fbcf9451270089e5bde3a3bb833c9f8f0c4f095386fa0e6fb
 EBUILD gst-plugins-mad-0.10.19-r1.ebuild 372 SHA256 f806293504b6570d22d2f48c0b75e77887f84f3218f65def6b52f0e309342f67 SHA512 e49731f497da252d7ffb61d57761e4185c8bd9fc657ca26eb7a1ac73ad82fd416a0f980d28e433511b9ad2b855d141a10ae064be39ab50febe5feff7ed0fdc5d WHIRLPOOL 069effcc11a37d72a332739e0494561bb2638f5c64d1c9ca939877e62ae8a4767adc9c9389ad79d91857d3b2e5b9bcb1b70969434986402e2f9fe6a5dfcad2a4
 EBUILD gst-plugins-mad-1.10.3.ebuild 418 SHA256 271af4362fd6c24658639aac4fda3ecd190736ce2ad4d22da9b2e981742f7d5c SHA512 43564ca6acb441438e582dba2ccf9ceb65fed90b2afc21a0409f4e1e1814a05872a14fc5bd10556697a08f618eb2f820b8283b28047105a7593cce6ffae9c454 WHIRLPOOL 34dd78c22849154e9b797713e659abda9ad192f16710930cd2beb943debad8bc95f9b3906c337174b856a512558d7a6fbe3ca2c32f38d7d43f200aaa970704e4
-EBUILD gst-plugins-mad-1.10.5.ebuild 428 SHA256 48d70c231bea0eb618e8fd6951602c53d682a3dba92ce063aaabfedebbbba4ae SHA512 93f54a5baff39a0fcbd02576cd497e889cf922e760917d5f1ab8ae34281f14490a81eb38a9cab037cace8464ed580488c0abc3505e9d218d2e0985f6a26b9901 WHIRLPOOL dabefe8367a96030b19e3c22020ba30ff44bee79e71736c853b684c79101947ec2d549e74abb129319b627ad1493875e0497ee99ed2a7a1a658c546d4902e2a3
+EBUILD gst-plugins-mad-1.10.5.ebuild 426 SHA256 97101705d8233dd243d8ba41d5021a624a018ad5ff31dc1e47c54e84fbee8008 SHA512 d11fcaaa378feb573e399bb62e2127479e054763237b44e2bafef2cd0f1bd34e0f2ee3651dba59c78f82007155bf81757e20d65350787ce52b49d5b711383475 WHIRLPOOL e5468539b46cb4e37faae338111a78a4a2eea448fab9f246e6eb85f03d892a9fa47509b693a3bae32499fa23abbb76e3a5ca1562126ef0c18af0a07a9e1edab4
 MISC ChangeLog 6301 SHA256 0b81466d7cafa46bac61311d6f9366d5adfcd23a587dc3d49410d1ef48cc4d17 SHA512 4550cf50c8449c3000ab9c1579954d21d4b2a96acb28e8d5111ce7f53632eea2a53a11baec1428645c4662cf68edecec90521afeae0b04770506bb82d9307a20 WHIRLPOOL 872fd8cb0db0151d50e20e4978e45b2720e4f153f22a379fbdb6cf9ade45d1a4409ab51ba5ba3cdd7bfd9feb6919da94f91219cc786888a0f1bdb66b8cac7e41
 MISC ChangeLog-2015 30506 SHA256 788967cd66641722b0b40d493899f98bb3f99e9bd89c7dd8a9ad0b587088b71f SHA512 34b28c5748195ed15dfb627bf03ff108c690d5c51b3eea962d5bb44cc00fd675fc3028fce64f1e9176c36256598e634d68c5b498c21677e6a04e185e749592fd WHIRLPOOL 6031de781b29d38f74ae4ae5b40753ed3a79e7807176be80f2c5593d21a71894a93341571801db8c23249fdd55c1d882b38e736ad1efe47b5c539cc04afd7747
 MISC metadata.xml 262 SHA256 aff3dcfdbd8f863806436de702d542cc89c7d5a9b8f4224b71c6de4555d9b090 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0 WHIRLPOOL 81b06b984b66fa01e67d2803859238d53791739041068f4778a3d0b70038ad567b90d0cf7819191d7747c86d5cd03556d7f81d5efafef1006a901d516e3db703
diff --git a/media-plugins/gst-plugins-mad/gst-plugins-mad-1.10.5.ebuild b/media-plugins/gst-plugins-mad/gst-plugins-mad-1.10.5.ebuild
index 7a2e427c28eb..d88a2f09f330 100644
--- a/media-plugins/gst-plugins-mad/gst-plugins-mad-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-mad/gst-plugins-mad-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="MP3 decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-meta/Manifest b/media-plugins/gst-plugins-meta/Manifest
index 17868f48e986..329cc0be4e6c 100644
--- a/media-plugins/gst-plugins-meta/Manifest
+++ b/media-plugins/gst-plugins-meta/Manifest
@@ -1,6 +1,7 @@
 EBUILD gst-plugins-meta-0.10-r11.ebuild 4379 SHA256 3bc65686543ea3e6c7f9154231f5ae66625e304c0920ba5a916f8f56b9f55c06 SHA512 abb076159bfc3ba50cd74b8546b5194945e6d1a93c860024e20c514983d1e39e04f15509640ed01761b00c6efa1d8a8bec8bbd1a5e3215a0428922fcd52d2cd0 WHIRLPOOL 3e35d69bf42214f25075767112427dd6f9e83281fd26bf155abe9784579053258b94c8c16161a3c0f81aefffe1a99d422638931306a109063d6023f8f9d1a2bb
 EBUILD gst-plugins-meta-1.10.3.ebuild 3872 SHA256 0cd8fee6e4d5076f4f8328c6b4c35a698bd5ad4b91d577c50a255fd4afb0089d SHA512 1b72f3c6387266b4f52b8610483ecbf3b4d7daaca0012dbcef690fba0d3d97b9cdcddf2f7a3c0464629e72286364c9e6188df8a76f0933c0aef7533fec27ac2a WHIRLPOOL f7ce968bbf156de66b6f751a749fa2893144d6c1ed836019e5e189d2a300efce35efa6d087536dac6982364c9eb02a6c91649151eaa3afae0773ae4018207d25
-EBUILD gst-plugins-meta-1.10.5.ebuild 3874 SHA256 fffc00832e480ed18fbc7056030d32a087058402fada7ea2ee675ef6a7dddcb3 SHA512 22dba426578748d231bb7972b728a1441083758e1fdd5698c161826969148a8359ac0034a006f773f784c08ca4b6be81b74d1f9f97a3845d3ac7539a199eff7c WHIRLPOOL 9039caa08a153f0ff284907e6c6e11cad7112846fe9032c41eaf9bd2a90c8ef5116134161fbb3e7c00fb02bd8ec2eb8e90cdfcb455127071ca483d6dfed68c53
+EBUILD gst-plugins-meta-1.10.5.ebuild 3872 SHA256 c196c073108979d1da3809968b0aa163b5f3b5af24be502e353d253288d4bb43 SHA512 a165de9b05ce9eee6685e5369f20d953843079ece36f9d44fed562ec72ce719a6a51c999a567a74b23d99793463c5478984e77835970c990338c051d66ddc0f7 WHIRLPOOL c6195abf845c87ff802b99f2638fa8c86fe1c314f5e0dd35deec9329df56c7a5e430306b9e699210438166b6f82a4989c83b42fb7ecabffa44bb3c5ba5aa3849
+EBUILD gst-plugins-meta-1.12.3.ebuild 3710 SHA256 ee87109233693d5e089a9b254ea67f81ba77124d364b4548f6824c27410d3eb6 SHA512 5308b522fb4a42d5920e07e5c93271d0eb301a7ef2ec70ab2ab459f59660b68e7814065453760f68f3685f3375c9131fd1573c585d585c19a642d868bde4a3de WHIRLPOOL a17af749b1138e2471a502e04e9638a2e489e1e4c19cdb2f672a1d90fb02245aa7fb1b4beb6968c6cce20dbeb34b1c03a44e20cda757787a09c26c82ad856437
 EBUILD gst-plugins-meta-1.8.3.ebuild 3816 SHA256 c90d27883467ff7dacfaa9d7ff5d516017860d4353521cec10034cc6b4e32c25 SHA512 30dd925c5ee2ec2ff88a9a862dc605211d02ed7c5293d336c6432c4e826b1c5445c6c4fbcf4975128a1f5c98333a4bd314163d5fad0cfc5c5a5e9d46eb8474bd WHIRLPOOL e9ddd51162e18623a84d98d053b718f3646eb035ba2240177eeafc58fd8bd9519eb0eb4b87911f3b50916f0bce85d32ebafb14425f3292e73eeecc85e36d0d05
 MISC ChangeLog 6527 SHA256 468f6ff39fe2053c2095d3c13864fe7bd5a62a1ff6bfbc3b4c6981a9f3d17d3e SHA512 4a785255b7438e3b914e321b89c0d4002d23846d609068788d00cb853baf7bfcb703db887a2cae76b91e1cc82a7021410ef8ac8f031948106633a95310b167be WHIRLPOOL f56226d5e83ec58ebdcca8dfb289ed1b056b579f03b01f05d6a0a7835dcf7b14d4cca61c42dadf0e7d69ac73238d5fec65e536762898944a9c575dc163015276
 MISC ChangeLog-2015 18779 SHA256 f15461e5116099d1e2cf39b10e97fba7f971880fbfd9bcddb3b1f7dca6f59504 SHA512 e527ea825577a8027116c2ab8489c083f5a444a3af2680ca62409a7a23cbdc804d80d82043cfe165d57a718b09e099533abbea637a8f54e3d1d3a2458ab9eee2 WHIRLPOOL d0fec2261b7110d39314ca3a9dac75c9030066832ce5436edb43e68a7db0a5c758d78e583800aa8cebd56dc8fb8a855449cd6f6474bfc8fb4a5e929fc6300dba
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.10.5.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.10.5.ebuild
index d48346c22359..5d0bf3e0589e 100644
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.10.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gentoo.org"
 
 LICENSE="metapackage"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264"
 REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
 
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.12.3.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.12.3.ebuild
new file mode 100644
index 000000000000..afb5dbf2a458
--- /dev/null
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.12.3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-build
+
+DESCRIPTION="Meta ebuild to pull in gst plugins for apps"
+HOMEPAGE="https://www.gentoo.org"
+
+LICENSE="metapackage"
+SLOT="1.0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~x86"
+IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264"
+REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
+
+RDEPEND="
+	>=media-libs/gstreamer-${PV}:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:1.0[alsa?,ogg?,theora?,vorbis?,X?,${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-good-${PV}:1.0[${MULTILIB_USEDEP}]
+	a52? ( >=media-plugins/gst-plugins-a52dec-${PV}:1.0[${MULTILIB_USEDEP}] )
+	aac? ( >=media-plugins/gst-plugins-faad-${PV}:1.0[${MULTILIB_USEDEP}] )
+	cdda? ( || (
+		>=media-plugins/gst-plugins-cdparanoia-${PV}:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-cdio-${PV}:1.0[${MULTILIB_USEDEP}] ) )
+	dts? ( >=media-plugins/gst-plugins-dts-${PV}:1.0[${MULTILIB_USEDEP}] )
+	dv? ( >=media-plugins/gst-plugins-dv-${PV}:1.0[${MULTILIB_USEDEP}] )
+	dvb? (
+		>=media-plugins/gst-plugins-dvb-${PV}:1.0[${MULTILIB_USEDEP}]
+		>=media-libs/gst-plugins-bad-${PV}:1.0[${MULTILIB_USEDEP}] )
+	dvd? (
+		>=media-libs/gst-plugins-ugly-${PV}:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-a52dec-${PV}:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-dvdread-${PV}:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-mpeg2dec-${PV}:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-resindvd-${PV}:1.0[${MULTILIB_USEDEP}] )
+	ffmpeg? ( >=media-plugins/gst-plugins-libav-${PV}:1.0[${MULTILIB_USEDEP}] )
+	flac? ( >=media-plugins/gst-plugins-flac-${PV}:1.0[${MULTILIB_USEDEP}] )
+	http? ( >=media-plugins/gst-plugins-soup-${PV}:1.0[${MULTILIB_USEDEP}] )
+	jack? ( >=media-plugins/gst-plugins-jack-${PV}:1.0[${MULTILIB_USEDEP}] )
+	lame? ( >=media-plugins/gst-plugins-lame-${PV}:1.0[${MULTILIB_USEDEP}] )
+	libass? ( >=media-plugins/gst-plugins-assrender-${PV}:1.0[${MULTILIB_USEDEP}] )
+	libvisual? ( >=media-plugins/gst-plugins-libvisual-${PV}:1.0[${MULTILIB_USEDEP}] )
+	mms? ( >=media-plugins/gst-plugins-libmms-${PV}:1.0[${MULTILIB_USEDEP}] )
+	modplug? ( >=media-plugins/gst-plugins-modplug-${PV}:1.0[${MULTILIB_USEDEP}] )
+	mp3? (
+		>=media-libs/gst-plugins-ugly-${PV}:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-mpg123-${PV}:1.0[${MULTILIB_USEDEP}] )
+	mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-${PV}:1.0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-plugins/gst-plugins-opus-${PV}:1.0[${MULTILIB_USEDEP}] )
+	oss? ( >=media-plugins/gst-plugins-oss-${PV}:1.0[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-plugins/gst-plugins-pulse-${PV}:1.0[${MULTILIB_USEDEP}] )
+	taglib? ( >=media-plugins/gst-plugins-taglib-${PV}:1.0[${MULTILIB_USEDEP}] )
+	v4l? ( >=media-plugins/gst-plugins-v4l2-${PV}:1.0[${MULTILIB_USEDEP}] )
+	vaapi? ( >=media-plugins/gst-plugins-vaapi-${PV}:1.0[${MULTILIB_USEDEP}] )
+	vcd? (
+		>=media-plugins/gst-plugins-mplex-${PV}:1.0[${MULTILIB_USEDEP}]
+		>=media-plugins/gst-plugins-mpeg2dec-${PV}:1.0[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-plugins/gst-plugins-vpx-${PV}:1.0[${MULTILIB_USEDEP}] )
+	wavpack? ( >=media-plugins/gst-plugins-wavpack-${PV}:1.0[${MULTILIB_USEDEP}] )
+	x264? ( >=media-plugins/gst-plugins-x264-${PV}:1.0[${MULTILIB_USEDEP}] )
+"
+
+# Usage note:
+# The idea is that apps depend on this for optional gstreamer plugins.  Then,
+# when USE flags change, no app gets rebuilt, and all apps that can make use of
+# the new plugin automatically do.
+
+# When adding deps here, make sure the keywords on the gst-plugin are valid.
diff --git a/media-plugins/gst-plugins-modplug/Manifest b/media-plugins/gst-plugins-modplug/Manifest
index d364c02110a2..1e1b532cc83b 100644
--- a/media-plugins/gst-plugins-modplug/Manifest
+++ b/media-plugins/gst-plugins-modplug/Manifest
@@ -5,7 +5,7 @@ DIST gst-plugins-bad-1.10.5.tar.xz 4737820 SHA256 c5806040bb83b43be86ce592e6a19c
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 SHA256 36d059761852bed0f1a7fcd3ef64a8aeecab95d2bca53cd6aa0f08054b1cbfec SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661 WHIRLPOOL b4c1262a0ca63331f5cb38fecc6a26830234712d6d4409aed495b05e7cfe13760bf056767e54e17cb9899c3671f0a05b90199d80d0b47bacb2ee6d27b89a5457
 EBUILD gst-plugins-modplug-0.10.23-r1.ebuild 448 SHA256 9d854effeeeb481bee267228c31c2360cc3ef84f00252f5dff816701817be77f SHA512 fca50e87abf1b0da7daec6b60c57656cd66ffc3a260694866eb63ff0118bf72f156efb9578c4506573da42ad9c011a2a38e08193bff1c1c815d5c386aefcfa50 WHIRLPOOL c196714a4f9840680404880bc925255e672ffc950be4bc75404c9ec73ac4a2b39ae274676223078a1cceaa1f464a65ba884ac607c7d3f2121b87cc43b533e919
 EBUILD gst-plugins-modplug-1.10.3.ebuild 356 SHA256 d2adc3f14075d8be152263bdc167e93f25b74cf4411a49d169d7313453a4cfe7 SHA512 897854475f1b7d8fcd4550b75febefb57ddb424e069bbee17592bbbbce28fbf518e45c69576611ea44b78b4ab64fbabd050b9a322956069e051849fa826a9c03 WHIRLPOOL ed3285d59eab4fed7b62ceacd506ed9d4e568068c3fe5732bfdee951839c7bbf3a9962364b748b630b4610ab3f3bd6b27a6421eb3ede615046bcfc239b69dd22
-EBUILD gst-plugins-modplug-1.10.5.ebuild 366 SHA256 151f50353f0552633f8b4d1ba59352e6abba99d19d865b5690672fabe3a15ad5 SHA512 981f33b3ff5219c18c67e29e007c8ee3d1c0581c1e0bc3615738b34c27bbc716f6275548a238a289ad9a0d2f4a098a13183e0ffa2e6a18a573567bf1e8dde1bd WHIRLPOOL a57d6fe0f40669026632e1a8b818786ef61a07448a1390e90adda17cbc85efd30e1babfd7baff062a07b5b8617d688989fd16a8c6dab9b1421a3a94223e7e10b
+EBUILD gst-plugins-modplug-1.10.5.ebuild 364 SHA256 2bc879bf57cfce001c22398954f55b992f581e9ec33afb9744c71c997165b14b SHA512 2cd98ea21e4e0a59d1b016536f43540e8cbc06537c5b6e71de66404ce353202974725eded4b36b0f038b27180fa52ad17758a785843ec0e1047d27e2975489ba WHIRLPOOL 711fddb5ad4c36870a78ad1dbafa864b731b91890db2264f59def7bdd6ff5b16d86de84dfeeb8d080949b3aae7f2c3590e65cfabfff9230dfe9d643058b03de1
 EBUILD gst-plugins-modplug-1.12.3.ebuild 368 SHA256 50cc0fc85d96a3d77116d9e18c535b310dadbda27749b8426d9458f4bb118d40 SHA512 b71b941d5035a633106864fbca9c7d97f44255edfe3ec73da23b5ad18ec560a9901175800cb0a836c7f29ad7a9b9e27205e5db213e257b19e160e104826e9bc3 WHIRLPOOL 0ef938fa6c436ba17be40d1f29083ea018da97ed17764527b4602b69c18ac7dcee2dfcead1eef56a725f147ba280ee3d7f7b6598044a78b560177b72ada7c600
 MISC ChangeLog 5622 SHA256 0ede60523bf6959e38b8ac0cf8f3df3c62d68b07b8e1ca3d991c560f472c85b7 SHA512 59e7e2d33d86aa869c8f1c79b604f279eba45e7e30590b176c7fbaf15be652b81e18d179ff8e9d1d47f984950ff6001110c81964c7c62fefab3650eda39d4236 WHIRLPOOL 99a3183f7d5b697320156be0e730be0c5cab10fbe8c69a59ce7c34bcfeceb168f1866540939eef96704c07befc31d2f8043c2f92f7bfac1d72646d7004861928
 MISC ChangeLog-2015 11938 SHA256 78125964511409aae2826e2832bac3cda23111b8b8f6cbcc9a2465d09015c93d SHA512 ac61c249f11821f083abc8cac3417d08287a69741f4c0faedb75e980858ced468081da134fcaab21e13d1045d3125b2ced4c073161cdeb7930fd082e70dfb414 WHIRLPOOL ef7f2e567a3ee6595f1a8c1a63abf0216e5af051d9a6471614c1e823496dc34c7304c9d5145df33f31e16655c16fcd014642e94f15c85035fe6b150661481697
diff --git a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.10.5.ebuild b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.10.5.ebuild
index 2e31469de889..32004ac6a06b 100644
--- a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="MOD audio decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mpeg2dec/Manifest b/media-plugins/gst-plugins-mpeg2dec/Manifest
index 1f3abcdead79..2da14347e981 100644
--- a/media-plugins/gst-plugins-mpeg2dec/Manifest
+++ b/media-plugins/gst-plugins-mpeg2dec/Manifest
@@ -4,7 +4,7 @@ DIST gst-plugins-ugly-1.10.5.tar.xz 908604 SHA256 d6edc046350809c967f5b058c5c2e5
 DIST gst-plugins-ugly-1.12.3.tar.xz 903784 SHA256 e88ca584c94ea78eeecbf3af00ef7f134b66bdee7408aa4aa6c547235e060052 SHA512 9ca5769c325df3d2d97ba83d785fab08da5119f6d26c4ac4db72853af143477ea8fb7087464a8614b6e59f384463ac01087ee76cec2af8acd80a4dc15e392e34 WHIRLPOOL e908fb96fc5694c10c16b7e5aeae4a6f7945aaa324074cacc3ec10b84b53ef738ee8c77d6f0983a02e7868275ba26ada14153d7046d85bfdb57f310e59793657
 EBUILD gst-plugins-mpeg2dec-0.10.19-r1.ebuild 425 SHA256 4046a22be11e3f2356efe4a44f2f4f080b7616d96082d4f4ca4d6f0e6ea396be SHA512 5e0127181a8fdac077ba6919ee56ddcccecb8944bc63f481c4880bf933545bb56f3213f561a3214505933f3ee24b6aa7a96c01549f4d60ba14bb763c7eff922c WHIRLPOOL 7ac8f4e390fc812c0b0b8ddf417d0fd91014905356b5538c89966948ee003d9f1b1de3a35508cc64a062344e70f8608835afe7d298aabd527fa94b5cb73ee19f
 EBUILD gst-plugins-mpeg2dec-1.10.3.ebuild 414 SHA256 0ce441cebb2b857d03af30283f2b9e002862e24d2e41edec5abba1b2e8a2571a SHA512 b4c77bddf8ad80c18dafc55661e8839e119fcccb0b8b59d17579ce3ddea68e81397cb8d4d7be443cf5165be989c5cdebb0992ae93bcaa3c866542db13d2ada4d WHIRLPOOL ed015bd26c2eafd814c0ee44fa4bf1a3c504be27439468faa709846687c4bcd64cbe5d4905caea8b7e356e9668396f086c7026891245db470b1a7eb7601d437a
-EBUILD gst-plugins-mpeg2dec-1.10.5.ebuild 424 SHA256 6ae5f1203ea7f7d97540501ed89d6b4c0b2d1bf588f0223217e2fde213134f12 SHA512 b5e4be939b55be17a071a82fde790203365c3a0acf01425b5a2ae8536300afa1081b8404e568e7ea9af4c1a09e6bf84526acda04013928ac560d93b0eb84cbcc WHIRLPOOL 5f649c89423591b3abf17732ce388d67fa9ea4c1b69894a1f42c994f1b494461e47db09294d8b34de582aa0f5e08a8db2fedf1d15b011b87aed60466c58f3ffc
+EBUILD gst-plugins-mpeg2dec-1.10.5.ebuild 422 SHA256 8b785214c2cc754df4b7619833c1e95af22d760ffc18de849ad5c4d3fed145ce SHA512 301137291bac003fb1c771971f38a14d805d86b1a2a9296ff088d15fa635ae7253c891ba61475a3a26b12ca47b158b687659fc45a4c815c144040aa99b2d3fc2 WHIRLPOOL a109f5659f135b213872caace288e8fd3963ef5c0545ab95bd12fc786516335ffa131196e0d3e4d0e6efb5fe89b46890fd1c87b87431a126a8988080c4d90ccb
 EBUILD gst-plugins-mpeg2dec-1.12.3.ebuild 429 SHA256 02d8aeec7633f5e1d39aff2efe9ddb212ea79443f662930e69036a4c6a708635 SHA512 aa86397c5dcb6326b30bb23ecab8613a69c19559ba241cebe3008522fd5fb7c276df4dafa16355027e70dd9dbcb9efb88e5ef22ed13017c714c194349b20e140 WHIRLPOOL c300e943d68b7edd06e6410af3100d03945cb76c534a3d8378fa7944f772b30ec16fa753d25d5f7801ad816b887741159da4fce35ad0a699080be394b7170002
 MISC ChangeLog 6505 SHA256 59b5b767edd6ad7e0150c65ebc36c24a724147e1396084a882cc0767e2bd4331 SHA512 e6773f251db2423585cdcfb80e2a7e1201e1bbe8d62df6831091a70ef367cbbab21f4b21159f6a71b38317fd62a9a7b051fcd790a1b50ee9365938b406ba2152 WHIRLPOOL 8f35ed7ac13f49aaf916a0258ab1e23f3073ddbc1ccb20e293c0470be3e368b272e9a519abcf559e9ce090b0f74fbb5dc8faa209388028a773db65a131d9acbd
 MISC ChangeLog-2015 27194 SHA256 6a809df7d938de18bfa51aa279e1d2e6c6ab60dbb9f93707284de4f618a6b12a SHA512 822f3117a9f41af665821bef19ddbe1a4310f4dffa5cba14ba9f3b5313ee137438bc63ba4ef064038f6035c912d53e9eda3b5c7bc092b0676c6eafb59956f7dd WHIRLPOOL d194dc9b72fc987b9ec279b27e9c952fb86f926ae98d46fbb224113a79653b1944d8d002a194f67724866d4089b096d8879325bc4a3ce226d50e9b4e5d7fbe4c
diff --git a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.10.5.ebuild b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.10.5.ebuild
index 79f17b486c88..cc1d50809ac9 100644
--- a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="MPEG2 decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=media-libs/libmpeg2-0.5.1-r2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mpg123/Manifest b/media-plugins/gst-plugins-mpg123/Manifest
index 4b76bf077f08..7ca1de4997e1 100644
--- a/media-plugins/gst-plugins-mpg123/Manifest
+++ b/media-plugins/gst-plugins-mpg123/Manifest
@@ -3,6 +3,6 @@ DIST gst-plugins-ugly-1.10.5.tar.xz 908604 SHA256 d6edc046350809c967f5b058c5c2e5
 DIST gst-plugins-ugly-1.12.3.tar.xz 903784 SHA256 e88ca584c94ea78eeecbf3af00ef7f134b66bdee7408aa4aa6c547235e060052 SHA512 9ca5769c325df3d2d97ba83d785fab08da5119f6d26c4ac4db72853af143477ea8fb7087464a8614b6e59f384463ac01087ee76cec2af8acd80a4dc15e392e34 WHIRLPOOL e908fb96fc5694c10c16b7e5aeae4a6f7945aaa324074cacc3ec10b84b53ef738ee8c77d6f0983a02e7868275ba26ada14153d7046d85bfdb57f310e59793657
 EBUILD gst-plugins-mpg123-1.10.3.ebuild 324 SHA256 ba4135dd884a820043f7f7f94e105233f7da7fc8c00f6db44058f145dd4442da SHA512 bdc83e570c6313afb11a8818ee7b2e1af5531a203f801da9c156718caa617d2549d1577e7418ba94f2f66dd1c380bacf9f046e8b19d132a1b1e477d9a85567b0 WHIRLPOOL 8c838eb523f26cf38a8ef1c0364c196f76825c084cd716093611db6994663e42baa18895f5bb2f81ecca8b9839b7d342d3a54c064c87e4887348427b9f474065
 EBUILD gst-plugins-mpg123-1.10.5.ebuild 331 SHA256 269b7ec03f4c96b992c0ae4db6d2cdd66432c701f4b1ad7148c54aefc53842f7 SHA512 92411998c25c358e3d66dec4c10c8a8fbfe4812513d28c5dc2787166bc1bfd4a683e62baad97624ef028fe32b3b855ebe61086d73e10447d62d268473e208a7e WHIRLPOOL 7f3a3fa51944a7be2f3e7ef6a5738f17db5b2b50ff006db38d04919e7314d509e51eb5c99f52ad385ce3dc5b9927f3884154f195971bdfc06f220d2f9228e595
-EBUILD gst-plugins-mpg123-1.12.3.ebuild 332 SHA256 7d05d182f41191dcfe28b12f36d83dca7a8148094d583d625b6c4a0e4434fbda SHA512 bf1b032c8637854e46c4dc96b7d47bb4bd3f944b8a645a0b5073b89543a7862feb8ae75ac7209f24387baa78415909158a7fd8bfa776f6c525d14339af9f3d95 WHIRLPOOL 56603f43f1a7f69574ad5982971f8b1c44944d9520360a9046a681ebb609d243a872c4bea24139772a300fd5dcead67c99988c5225626b0c290ea6897d081cba
+EBUILD gst-plugins-mpg123-1.12.3.ebuild 338 SHA256 2007232931503129c8ebb3112472095bb287246d3a2ff728386e9e24e9702806 SHA512 29378f2cd32c4a8b949d72a61d7f0cfe550c77ecf44bb875a4083f32f7c52ae573bf96d25603b480ff3db8f2c63f6313defad17853f169847854f1f2215438d2 WHIRLPOOL b4d6fc6eb2c7564959d3b32769eb01c9c7056aa625410145da4b40958ff6dc77fd524e1dfae2dfe66345277e53b774a0b3fe1177909e9a43b68e67a1dc29d2e2
 MISC ChangeLog 363 SHA256 adf4f72efe377ad286f1251e235ac954dff818860ce30585b0842b7a63a2a96e SHA512 a485c2a3f6409d9268966bf5640e5b5e4ce5d0d34df7d63e327e0f4a38cb92d4ad19e3fd90bea819d1d9e44df7121316a4a20458c27d2707cb59c67fdb353ea9 WHIRLPOOL 97e4e8be2ff2c131dfd6724644a952241205f6e167b22b88647106f43681ab5b3dcefd9ef0099c8a763bca85fd57d2c6de6398c21d76d7b069b9431cb05c6cfc
 MISC metadata.xml 262 SHA256 aff3dcfdbd8f863806436de702d542cc89c7d5a9b8f4224b71c6de4555d9b090 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0 WHIRLPOOL 81b06b984b66fa01e67d2803859238d53791739041068f4778a3d0b70038ad567b90d0cf7819191d7747c86d5cd03556d7f81d5efafef1006a901d516e3db703
diff --git a/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.12.3.ebuild b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.12.3.ebuild
index f04ae18e51d0..efb43b4238dd 100644
--- a/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.12.3.ebuild
+++ b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.12.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="MP3 decoder plugin for GStreamer"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-neon/Manifest b/media-plugins/gst-plugins-neon/Manifest
index ea4d162579eb..35c1a839dc0e 100644
--- a/media-plugins/gst-plugins-neon/Manifest
+++ b/media-plugins/gst-plugins-neon/Manifest
@@ -4,7 +4,7 @@ DIST gst-plugins-bad-1.10.5.tar.xz 4737820 SHA256 c5806040bb83b43be86ce592e6a19c
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 SHA256 36d059761852bed0f1a7fcd3ef64a8aeecab95d2bca53cd6aa0f08054b1cbfec SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661 WHIRLPOOL b4c1262a0ca63331f5cb38fecc6a26830234712d6d4409aed495b05e7cfe13760bf056767e54e17cb9899c3671f0a05b90199d80d0b47bacb2ee6d27b89a5457
 EBUILD gst-plugins-neon-0.10.23-r1.ebuild 485 SHA256 decc298ba2fff16159ba839dfece14db9fd0cfbbd94a7450f3ba2fb8361ba4f4 SHA512 fe45be60e56ac658bebf737e85e52865eaf86a5fa4087554138205b4ad65d7caaffa4d83b29f8c55e9336b13737c37a0bbe73cc3bf9b1b190fdfba2a9e1d5743 WHIRLPOOL d3f6848d41f7cecbf58a9f1803e96dbef51ed1deeafe783a895f307586e2322e5d09608cd01e183740c4ec347f5eb86fbd006d942a01283c4a742de672882b3a
 EBUILD gst-plugins-neon-1.10.3.ebuild 339 SHA256 5eacb37cf73e292331f026e91f8114628ac2d3bdd4d71126be2b6eaaf64defc1 SHA512 e192628e85061647862a8eaab1007e104a2643aae9b4f4cb70168476fde1f9e81d041052cd478bea05d0108bb4c0fc67d2b4747a088f3756adddad33c0be610b WHIRLPOOL ed36b65141d862e0ce3f851aa94679354fb019de967398a049ba5551b791fae2f0dbb38ffdc8155bfbfade1c5eca036deb0e0fb47fdb89d5c4c24cc2128e23fe
-EBUILD gst-plugins-neon-1.10.5.ebuild 341 SHA256 7fb23e5c27c5ab3d66d30b248cad6c56d0d268fcc194dd41db826b271fcf8d8e SHA512 fa4be5ab40627900958ca759b610d10810fd623e502b5d7a6d2eb108c777b7ff97d439dd1475eb66b7336e23b869f235449bf7cd8598585e0978a5b1788cc81f WHIRLPOOL 9fd56ed2fc16ba70a53f82ef8aebc0169935b400f1e705c7da2bcfbc711c10d70333369bba08cd70c2aeddc163a2ba61594e3d53d20fa3366b0dc17c8f39ab03
+EBUILD gst-plugins-neon-1.10.5.ebuild 339 SHA256 5eacb37cf73e292331f026e91f8114628ac2d3bdd4d71126be2b6eaaf64defc1 SHA512 e192628e85061647862a8eaab1007e104a2643aae9b4f4cb70168476fde1f9e81d041052cd478bea05d0108bb4c0fc67d2b4747a088f3756adddad33c0be610b WHIRLPOOL ed36b65141d862e0ce3f851aa94679354fb019de967398a049ba5551b791fae2f0dbb38ffdc8155bfbfade1c5eca036deb0e0fb47fdb89d5c4c24cc2128e23fe
 EBUILD gst-plugins-neon-1.12.3.ebuild 344 SHA256 89439e6bc53ebe6e0f2deb6918e9c454ef27e78b2cd9aa28703919e29cea72ab SHA512 457e3381bb05572f04a6de26103155c4fc9e10c1a323a56af72712549bbe00f60db137aef0ad4bf5dbeaabe3221ee41825346b59b8591f363624d019c035a366 WHIRLPOOL 25eb2b8334d879e50bfe62d5ef1d3a913bc8b282d1b58484e480899c2ef442b7a173a152e42f8239884ba77e3ceb15551eb70ed1e1e70cfb02e822061eeb7155
 MISC ChangeLog 5801 SHA256 9e70b908230d2be2dd8549a8e6c6261b9a45bdf99a8e69b8f58f3735d1b76d5c SHA512 a8f0884663840abb77668f0b48dbbe64974a3b742715b3f2a8edd60389ca0370687238817ff20325a0dbd97bbecbe6644cec6c1655f3efcd7d11e12488a81377 WHIRLPOOL 43d10d46ddc1eb4d54aac85af4d58c6129ac59b403c7261ba9d57ce42ca5ad041360c8d6d4a3ff3f2e5b89f71771bcc11c86e450ee59bc69271275e607e57a4d
 MISC ChangeLog-2015 12789 SHA256 313207486b02f50e32b5c8d005703fc65e85b836eacf1e6bfc97bcc8636ef1de SHA512 44743aa9f5aede195def45b844adee583d1a85c3940dfc3dd49a8bf07fe7e043870b5279fbc14d4dcb897bafbaf8b26e522da0e4ade66e7e753162ec5a3d4b98 WHIRLPOOL 36ff25c3c1dc69e503cf22552f41e5f3e66478d5f27035cb0323e925a8e902657b7754009a8197fb6c4d4544486dc6e5990c0a3fd39abafeffe2a43f9f8ee42e
diff --git a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.10.5.ebuild b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.10.5.ebuild
index fe2708d6d43c..a973bf092ad3 100644
--- a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="HTTP client source plugin for GStreamer"
-KEYWORDS="alpha amd64 ~ppc ~ppc64 x86"
+KEYWORDS="alpha amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=">=net-libs/neon-0.30.0[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-opus/Manifest b/media-plugins/gst-plugins-opus/Manifest
index 36d88409b40d..4dd7bf61202e 100644
--- a/media-plugins/gst-plugins-opus/Manifest
+++ b/media-plugins/gst-plugins-opus/Manifest
@@ -4,7 +4,7 @@ DIST gst-plugins-base-1.10.5.tar.xz 3060092 SHA256 1c401a79bd1e4521c6ef1b66579bd
 DIST gst-plugins-base-1.12.3.tar.xz 3117364 SHA256 d3d37b8489d37fa0018973d850bd2067b98af335fef2fa543ee7d40359e3cea5 SHA512 d32f71836e25081b00040709a2184da85489e5af90902a0b27b820a478f5805bde93a04cefaeabf36dde53c16ad12f2816777cc195f1e027f19d1883e088e2b2 WHIRLPOOL e81c3183a70b121412bc455a4f93501e2fab7bf241a66f903446115891ab66ee78d570b01a4eaa5eb7971a7233f3fabf10a71c398bb4205beea6dbfb4280bcdf
 EBUILD gst-plugins-opus-0.10.23-r1.ebuild 483 SHA256 c1862835616e0991b1ee085878a52cf37a4b96d61031127555b0142eb16e2320 SHA512 5bdc5e46ed34feaa7b63fd6f5dadb6e6c7b623b05a6c22b0f5e893f0f6c1e9a243d6265f865dc509d460822429d446833172ece1549564d676b1154d2ef8cba8 WHIRLPOOL 51c6bb5f9e8b5f39624ac66432eb45f9011b59925ed7c4ba10efdee6088473341a02f973a69e143e620d44b5cbd00d9ea0fedf56a018eeb8a88498b016274ee6
 EBUILD gst-plugins-opus-1.10.3.ebuild 651 SHA256 1b7252e86021916ae2882038fb01584f9a11c9916703917fbc18cf0d3e88fe54 SHA512 4684abff63c305f0366a49792951a797811bd08e87ffdbee77217e70d1e44a3150f19321ba733710a98136a68fd9d6ffd2116b75f7793e1375b79ac7f68e5ed0 WHIRLPOOL 7ad28700025f35e53f94c82ad73ca55045f8af46ed2fc67c109ea6ec1e62e379fbcf0354f54b3884b7a5f8972843bd84bf86b7ba392afdd91b2b83ab885a45eb
-EBUILD gst-plugins-opus-1.10.5.ebuild 661 SHA256 e7c3685caa2d07f626ca39f86e650648ece77bdd0a2719eccac970bd418e9425 SHA512 9c2bf259bdf1b10bbe9c31ef7a4ac755c4797beada2517a0dc15da5c65e5904b2a82ed1f9f67e58d7653b2a0d6e0847d742d11c0e93c09b92c01c7f5304e31ed WHIRLPOOL 1aebcb59b77b6b9d420482f2a5751262ffdd14f1973e62c85b03daca3170ad63741fe3ab5559ecd6f156d03c73d1f135c1579cc4eb986192219feb44879dc4e1
+EBUILD gst-plugins-opus-1.10.5.ebuild 659 SHA256 cd29fb7be9ae6b1e59814ed6194cf19feb09788254d361cdc6df78dcb495c7b9 SHA512 0bdb31e2cfa6d94bbd40cb167b72b669bdc0da246dc2a15707a32753b4c5cbd0ddffa4851f07b1fb2f9d4a36d60571271106b9c9b3c6ed9662863640e552fa70 WHIRLPOOL 69f2816ad934d07fd48709f30e3acfcbb24067c1d03216f51de92db6df7d845c0db2354e2a80b30d3ae425e2cd3e135a9d4864da0e0c8e89846dbd84ecbbba03
 EBUILD gst-plugins-opus-1.12.3.ebuild 666 SHA256 0439e75e1e4c1e17c5caebd4ebeb5c7f5f7c89873e6df6381ff8f0f5424126f6 SHA512 6c55dde4ed30097c6c3f4667f131c877e6d049eccea96ee220c529865839443ff1606f3d7ebfcd0ac2969c1e1fe413d0bcd4961c1f0713668807e4f279a7ad18 WHIRLPOOL 7768fa93e3ab10e0326b3bb1242cf571e3cc931e81c5a7b5ec4451cd8bdcd96cd7bda25f7cca6e0f3bda31423b40237a0c1e96d71db0d46e48da02406887a7f4
 MISC ChangeLog 6906 SHA256 00bc24b49210ba95f69739c59127dbf80a63e0d1bca39b624f9842daace37866 SHA512 0b8504c5816d5c410a4090e3b5d3e96350223625c56906303520a943d9540deddae9e69f3ce548a3aaccfee8fb6c5bfa350df8cd99f1f752cd37134335aa3272 WHIRLPOOL 51a877a81378fbc25577f77c404977404fffcb8638126a9cd59ce01da7842a2558aabb804d1a21b9ba713e403065c5d62f6ae9b3a4e077e5d434aaf2ecb7cb50
 MISC ChangeLog-2015 10879 SHA256 ed9445bc3dd96f9a115df8a231afe9df7200714a72fdc88b11478f4ecc8ff7b3 SHA512 4a86de4a611e7372d8afc4bdb0acdbfc17bc768ac1fe7405375e4bd4d006ad54b205fdddaa93fd71179ab4dbc8fa87ca8a3696aa0c9e4d0e359790742abeb61e WHIRLPOOL 585f16af61c5d9065984fac8bf8e7548bb254e3e2d8c32512df1fe946502322e2d8270d9baf076e0c699658c7fcc01e0f348036842ea07db29786f2e6838c9a3
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.10.5.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.10.5.ebuild
index feda8a261319..3d5b85af65c9 100644
--- a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-base
 inherit gstreamer
 
 DESCRIPTION="Opus audio parser plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 COMMON_DEPEND=">=media-libs/opus-1.1:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-oss/Manifest b/media-plugins/gst-plugins-oss/Manifest
index ad6a987ac9a4..ba66633b9b03 100644
--- a/media-plugins/gst-plugins-oss/Manifest
+++ b/media-plugins/gst-plugins-oss/Manifest
@@ -4,7 +4,7 @@ DIST gst-plugins-good-1.10.5.tar.xz 3425088 SHA256 be053f6ed716eeb517cec148cec63
 DIST gst-plugins-good-1.12.3.tar.xz 3487448 SHA256 13e7f479296891fef5a686438f20ba7d534680becf2269ecc5ee24aa83b45f03 SHA512 8ed96d2b2c8724659cf8163be5246ec30c8a92d70fc6632e207ad258cff5624d6fc03576e6e674011bb88a4825c8ce225545bc7e60cdf66a173d9e1d4bfbbaa4 WHIRLPOOL 9255759738e14f9a6aee1122d7f2bd7b23266e33bdc834e2942ac3a1fbb9389fed504d4769c1ab50c35b8a319c351f8373aca8cf09bd138bbaf7bef4fc51894a
 EBUILD gst-plugins-oss-0.10.31-r1.ebuild 367 SHA256 2c1167764da87a25198289d6b6dabc23c9c73268d6df1a03a19db3b8b6f60419 SHA512 cf6f4d422bf392ebe0695262b8468fca446c5451ba36c5ffe4ccbb3ecf867a2f373124edf1670ed211bfa9ea39d8f5afa98e245920ec9a14527037b9d5c8ddfa WHIRLPOOL ac07caeb4626c7038e03b723142c9d90966cfed401d1af0341ae0289ba73b200719c992ce4980df956231ece171c4a03eee3fdf4cc07b9b05555d35b2cd94367
 EBUILD gst-plugins-oss-1.10.3.ebuild 366 SHA256 f390fdfaee23d4976fc0cfd4d87b94d5f4504dbf5fdf49d0a1a0eabf333fb9b1 SHA512 ce2327f0b38efdf4f0dd833f07db7e4acacfc8e172593919b16e6088ab67a3fb8d6ef08770e58748cb5bf370b530e975e131d9f2bef0c988789bd89eb31ac051 WHIRLPOOL c429fafdd9d664cbb83c7d1bb85300e955d9b46110249f2a2b4b89d860534fc2462c52c75429e4962bfb10ef227fc092d9046bb18e25f910bc6d1e07dee6c549
-EBUILD gst-plugins-oss-1.10.5.ebuild 376 SHA256 8099c12ba8f42fd70210b5e230fe2350a0a81d35bb9562f467965b508e98250f SHA512 8e46c0ecb30226c8484b52eef3e77065e308121ae64357ea8a19639aeb30aa202e34b2a923a0422046aab4b84684f712a60fb18964b3af46fc862de430c55d5e WHIRLPOOL 677e9ab04fe4e14ff021aacd84d78cfc2f1572c26a57bb4c442394e59932e9274c16f81b66977a7b2e9d3dbde04f7be7b6a2fe23ed6e3811e5dda1fbf939c3ec
+EBUILD gst-plugins-oss-1.10.5.ebuild 374 SHA256 40e43f042b9f561899c9bb6221b0abc0acd3476bde370ebb3456c8053ade72a6 SHA512 c1f1f3da2ec694311f277ba8a8e155e2f8b0bb617b05dc301f8e2ea8aef3185684c2eb65b1ff97342e4c13e8031ea609fb86eaf75684fd8c2baa13810ea32096 WHIRLPOOL a09616f6400cb130a1823ca26c3de24c930f6d5332f47304d0a93c2ce2b4bd5069965a696dce0b52b19bd0c4e127aed7896ea8722d7d7392333e6aa30bdd708d
 EBUILD gst-plugins-oss-1.12.3.ebuild 381 SHA256 60f44acb9e40f3193c2fa53181cc917a8500c78050135585c7bf3d91f9b74906 SHA512 296dfe4640ae020a80b3c3a45d9fe8ef3e6c5e0053827c4a790815fd24da81797809069a29f9747ae0963787fedc75baf91934bc738c847267fc224d9a194cea WHIRLPOOL ee4d53eb83dd4c334f399c4e03857406637a8e18eafbf93a72868d1af5ec61e84ff7c119debf482eb191fe26c41f40e44cabae8ebac3947a7d138bdfedc32e9a
 MISC ChangeLog 6410 SHA256 285efe46f5cc4ac43c33ec5bb1fbaa8b0628e6be7465948092c8c579da6f6fa1 SHA512 84e0b77399f479371e0ef84294d994337076c7b51baf1ba20bd0ae26ad344a68c36c41510559831c549f181102a2ad36cb483d97c98978d0ebaad389858a1d7f WHIRLPOOL c5934232d329b3b02eef41abfe35fe7430e6d0fc67cfd02d2ea265393ab42161535b7f8258b703661a917aa88d58a4f14b0f138da82386bf4b4dca750a39bf42
 MISC ChangeLog-2015 32328 SHA256 294d58553a9c861a6e552664eb9e5e360e47e549b6d9bfe474747e9ce561f2e3 SHA512 e24089af6bc505983b2bd6664cc8d2950e700724c9605be73f4297e9de3322ee2a6f1911b07eb92792b3cfd6872c9743b2c6647578eaa9487e5a7be635b74392 WHIRLPOOL 6c7410bb4b968b6d043b0138f731af6775356cdb50dbc1a09ce87131a420d6a17d828a2684bd095fd1ef9dd67ecbb54e6cdcc17f3f785674349cdd658bf4d49c
diff --git a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.10.5.ebuild b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.10.5.ebuild
index 2b80c9d6528e..c60d3a82c7e7 100644
--- a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="OSS (Open Sound System) support plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-plugins/gst-plugins-pulse/Manifest b/media-plugins/gst-plugins-pulse/Manifest
index 25b778d8813a..b8e149b503e3 100644
--- a/media-plugins/gst-plugins-pulse/Manifest
+++ b/media-plugins/gst-plugins-pulse/Manifest
@@ -4,7 +4,7 @@ DIST gst-plugins-good-1.10.5.tar.xz 3425088 SHA256 be053f6ed716eeb517cec148cec63
 DIST gst-plugins-good-1.12.3.tar.xz 3487448 SHA256 13e7f479296891fef5a686438f20ba7d534680becf2269ecc5ee24aa83b45f03 SHA512 8ed96d2b2c8724659cf8163be5246ec30c8a92d70fc6632e207ad258cff5624d6fc03576e6e674011bb88a4825c8ce225545bc7e60cdf66a173d9e1d4bfbbaa4 WHIRLPOOL 9255759738e14f9a6aee1122d7f2bd7b23266e33bdc834e2942ac3a1fbb9389fed504d4769c1ab50c35b8a319c351f8373aca8cf09bd138bbaf7bef4fc51894a
 EBUILD gst-plugins-pulse-0.10.31-r2.ebuild 451 SHA256 e747dc204afcb71e03629063a63d84cd1cf20e4ecab6433ff1d9ad8bd8a4f785 SHA512 762cc23f92d89251b3f92c57d796a0acd0c4904d6a0bedc475d54eb5f475949a34cd0d3ed5384922a35a15448e9ed81ed9efe4ebb8aa25f5ef9158a4f981311e WHIRLPOOL 36a5219720b5c06e801872158ff2dcde7389588af539514711c457e5973370bf2ca7afa441764ace53361eeb45b5451ebd7a6af0585b811c266a601da01ff998
 EBUILD gst-plugins-pulse-1.10.3.ebuild 447 SHA256 eec50fefc485ce784e34b2fc265c210e12739acc1a5749ae6b3197c3c0c8ec4f SHA512 75637b8d8746671365ad636806d70ddf7614677d3d5c80e465b48532a74dd9c0e0050576fae6eca7ba70880f763cc06502980461f2373aa2214bc6ccf347f47c WHIRLPOOL d84e476055e8ffedbe6a9d43051972ba7eb997625ec500b482d9644c997f47644d229f854efb3cf9dadd8fd25ab92e4367ea52db4445513a6991985057cb915c
-EBUILD gst-plugins-pulse-1.10.5.ebuild 457 SHA256 b86c7e2a94219a62fd87d2da82c17b8606514397520066b54d76b3f22faff448 SHA512 5f2ae640aad90bc0fbbbb57ea1627ca0bf0f89e755a05cc14af564ff6d692b0dc0adbd44b41dd86f43b0a7af8e01ac13eb4d0f5732e48ee9137501a69f584296 WHIRLPOOL 94132615c893cdd2ce3df7269988e73caa27f443f2074e69c5af2fca85c0779f5bdc7a729cf49fb8ff93eec80ea773775ab9a9b6cd8581079c75861053cc5c9b
+EBUILD gst-plugins-pulse-1.10.5.ebuild 455 SHA256 0172f0736f5541e78f46e9e768bf99a7a50e4807dffd3400eb52744bf7b4f6ee SHA512 92b65c090e2c70990b29dba5ed5d5305220dcfd365bb1e1f682a383d3f9f3e474d1607cc4abee2aac734ac70e53bbd860c30a4815b9fe99f4caf37347ffe7538 WHIRLPOOL ba4c906351383b6dcdfe5aedfac24bcee469d47ff2ad748946aadbb9314d66cbae0962b3a0caacf7df1b21bcd4e6599c4c094267efef3e3924f7297ee1e76c70
 EBUILD gst-plugins-pulse-1.12.3.ebuild 462 SHA256 46ba7a1e597dbb4e51ab0d0a036a5139c13fa78067004f166196852fb156ee30 SHA512 10ff8b21da7fbc981200cd3dfbff3cf4c6316563946c6380f8655922701ab9c1fb79e9c22269f3dd75ab08ec822a517b9c202907c8d0b093d651b9da7f4d71b6 WHIRLPOOL 848582bd1b762a141a284d00bff7ff42814f80773b33dac7446702f95b3d40d40df042fce6d466ef37fb85274363f6ef8bfeac61fe53a48196ae37791d777208
 MISC ChangeLog 7353 SHA256 e38c9cec8833d8ce407d7c2e1d6e35eb38b755b008187f7c2eb099115436a44f SHA512 6d1a194a9e29ddce4d7882097c44ac9121a752bfbd2f46044f2778d9f78bbc46a5ddea6b2d16fa83b6611e6313437d0e58c22dd6421659a897abeadfc17e386b WHIRLPOOL 1e451556d6e9b5a37a6cf00612a4ef220ef0977e7c4617dbb0c44bee55f271bac68fbb67ba5d1a238c7259b15a6281c24223429f9c6a8bcf82572c9b71fb3fc5
 MISC ChangeLog-2015 20826 SHA256 0a501d020c1d25a5ddd12e210bf0fdf5101966bf4b9f5e44f3d9bdc46373d245 SHA512 3d626a03591f0ba620ddad16e9038237cd29214c3fc72191e1d5eba771b886bcec2501d9d1fe36caa1d011e19f57633cadb1d4748c3476d11ded11da4e8e4326 WHIRLPOOL 1dd3db22bbfd8899e5b2570f80dc1b91f274b488d9665ee96a5141b51a16f72d641b915d386439060c181c58758e097f7833754c6c6bb56e2bfea84618277955
diff --git a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.10.5.ebuild b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.10.5.ebuild
index 8e7ea115705f..5c8afbd13d87 100644
--- a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="PulseAudio sound server plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-raw1394/Manifest b/media-plugins/gst-plugins-raw1394/Manifest
index c7d4117be598..a5d1c29db845 100644
--- a/media-plugins/gst-plugins-raw1394/Manifest
+++ b/media-plugins/gst-plugins-raw1394/Manifest
@@ -4,7 +4,7 @@ DIST gst-plugins-good-1.10.5.tar.xz 3425088 SHA256 be053f6ed716eeb517cec148cec63
 DIST gst-plugins-good-1.12.3.tar.xz 3487448 SHA256 13e7f479296891fef5a686438f20ba7d534680becf2269ecc5ee24aa83b45f03 SHA512 8ed96d2b2c8724659cf8163be5246ec30c8a92d70fc6632e207ad258cff5624d6fc03576e6e674011bb88a4825c8ce225545bc7e60cdf66a173d9e1d4bfbbaa4 WHIRLPOOL 9255759738e14f9a6aee1122d7f2bd7b23266e33bdc834e2942ac3a1fbb9389fed504d4769c1ab50c35b8a319c351f8373aca8cf09bd138bbaf7bef4fc51894a
 EBUILD gst-plugins-raw1394-0.10.31-r1.ebuild 517 SHA256 b514021c4c49ee2a71ef1eb6d1ad687488bfb7a3524feb9dbc865269489d5ad2 SHA512 895bf265fa6c2dce27a71b5487c6084bb67f9a12d299e6eeed6171b7bb8fc60357793200426e88fd8a461601e4e5697b2b659dbae85db8e6ee94c07efe6dbdb8 WHIRLPOOL 7778a6b5b43a5813f9addc8b3d2bb5ef4e1a95a1c47669309cf2900814ed5f49a9575e151d69dd3295d91b3d45e8d235d564f6cebb168bcf02d6bf16371abf18
 EBUILD gst-plugins-raw1394-1.10.3.ebuild 517 SHA256 28f46417a1e518f533e5cb7f139855a7330c651cce80a3cf3e3a5bb1008c4fa9 SHA512 9b21e9c4ba4924b44fcacbdd1d1411bfc4cde1530b6f7e0686aecbab018f17d83bbd18d4db08922e06b92624b14ba1cdc6387b2e52cf53975f08a950f7cb9417 WHIRLPOOL 5df954f6a0b095417605b2c1556cf8f363e434b22a46438ca9b57ae2d0d2bcff382ba2d51b827d47edff9926a708d81c280db0dd9bf05f88e28736f29ffab4a9
-EBUILD gst-plugins-raw1394-1.10.5.ebuild 519 SHA256 da53807d8dad19480b7f54dd36264b59b8edfc25284cb1e9d7f84e651fff84de SHA512 841d322a64281e54aca1c5c451c5b336a7155e4d6b9604911993e1d7508e6e347c8ba72a6d97567478a89f0469d447d0f1f8eb3ad9f4dd150765009731db3557 WHIRLPOOL e2ea60feb0021383830f578184b2f1168611c3961c4a762400c1b1c271e8925006f3775103660c0771057dbf96c76660c0de147fc048d3e7df019190101586a5
+EBUILD gst-plugins-raw1394-1.10.5.ebuild 517 SHA256 28f46417a1e518f533e5cb7f139855a7330c651cce80a3cf3e3a5bb1008c4fa9 SHA512 9b21e9c4ba4924b44fcacbdd1d1411bfc4cde1530b6f7e0686aecbab018f17d83bbd18d4db08922e06b92624b14ba1cdc6387b2e52cf53975f08a950f7cb9417 WHIRLPOOL 5df954f6a0b095417605b2c1556cf8f363e434b22a46438ca9b57ae2d0d2bcff382ba2d51b827d47edff9926a708d81c280db0dd9bf05f88e28736f29ffab4a9
 EBUILD gst-plugins-raw1394-1.12.3.ebuild 521 SHA256 ac0b051cb1138cf30747362722c3ce55af0dec14bea37b59f127a5b347001772 SHA512 9c1476bb230b28c5981c81db99afef434c885b63786fcd6d48a4ed78e2d1fa56524ba06cdb324e3dc540156677d15309aad8afd6675d4419c61a6fdba0c3a63f WHIRLPOOL b0f79a141a8b44f8f8d83245719ff37d35ec3a2bc48b97d47ef11b1ff376b221551b46b1afc5419d6285b48d2ba52399e2efb63da610d7ac3b81614d43c1d322
 MISC ChangeLog 5269 SHA256 9a5f9f3d5710880da14c55f56eb178c9c59834ea46c5180cf9d0254d0e5c722c SHA512 82d237793940e2c0472438a2fb523954c0eb9002a696529d24abed8ed52cb5591203338a950f4b93483507ba8d9b168e8e01c7a1ab68dc1afd4482d9b7ad8f10 WHIRLPOOL 17ef33300a74a3f8200b12e1f7f8c97d997ef20aac1cd0b74c4f004db053c998edfa3a02b6f3ae01000cdaf1ecc71d8b48a85e2166c22f7c6459690bd383eff4
 MISC ChangeLog-2015 17026 SHA256 69e4991501fce95c81b5f1d09a66d8ff2b558a4b824977561976f31c899fb646 SHA512 74bc7cec2e816d055cb7bb8f4a4a6a7814014e4ba0f105c4c4d8e71ac73b420d6d20104d4eb6d7b78be005af9401a10e3da794c7a089f01ad1858ed47f3292f4 WHIRLPOOL e6b752608d4748b94a5cd5e2a956f796984172e553d20910201b25adabedeb2c9feb1ab37fdc62e6540949522069e535a634a76850c19f94b0154fead4870d39
diff --git a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.10.5.ebuild b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.10.5.ebuild
index 3a67500c7a5b..c963dcbcbd75 100644
--- a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="Fiwewire DV/HDV capture plugin for GStreamer"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-resindvd/Manifest b/media-plugins/gst-plugins-resindvd/Manifest
index ed74654be561..b357a648d50c 100644
--- a/media-plugins/gst-plugins-resindvd/Manifest
+++ b/media-plugins/gst-plugins-resindvd/Manifest
@@ -4,7 +4,7 @@ DIST gst-plugins-bad-1.10.5.tar.xz 4737820 SHA256 c5806040bb83b43be86ce592e6a19c
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 SHA256 36d059761852bed0f1a7fcd3ef64a8aeecab95d2bca53cd6aa0f08054b1cbfec SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661 WHIRLPOOL b4c1262a0ca63331f5cb38fecc6a26830234712d6d4409aed495b05e7cfe13760bf056767e54e17cb9899c3671f0a05b90199d80d0b47bacb2ee6d27b89a5457
 EBUILD gst-plugins-resindvd-0.10.23-r1.ebuild 386 SHA256 d57fd4df30cc1b051c627db7309b199cffc4b9bf4f1c0506748fa965cb125cad SHA512 079db94e47930bd7886e03e3a51341709880847f945abe2ff4c75c54755850417b29cfa5e71fb0f710cdcc81cd858949c6e99744a4f7896395db299a97dca7f0 WHIRLPOOL 537a19f1d0464374604538292d7105f8155c6ce6c542106e5e6bc1e0b64bcceccea3ea8f1639ab4821bec7686896b141a409ef7727515c3e119b6fe128385332
 EBUILD gst-plugins-resindvd-1.10.3.ebuild 441 SHA256 a6382aa1f7dca879def78509acd2e529116d0f8ae0e427c741fbcd6db7177940 SHA512 8ee40721345f21875d9fbfecc691736d9d2c55c4dc54d5807e282f9470efdb4f5f7741c770db9e54312bdffc7aba50381dce13d173281a3febcf88f3c434a4c0 WHIRLPOOL 833dc7e7ce28bb007172b268aa6ed19289952fc9cb4dcfe0318fc2a78028874c22530511d85ff54936dd67b38a517ece4d6e33282a5dc88de5a2b68c51b3ea29
-EBUILD gst-plugins-resindvd-1.10.5.ebuild 451 SHA256 8448316cb05ccc6d5d1319b343e1cf3168ac045e60622d1ab2b1fa9ad3535974 SHA512 e29c989c5b782e0a7b115d1fe63c8c6bd31da939e4acad2f2a51247fdda7385eca1a61b3e00342098ac14508752511f4b530c88e0498325ce12fdfd285622a22 WHIRLPOOL 8ad30b544aafb41094b88335137b86875f586c20f62b5d4fe6ee2c4eaca04a8936bfcf01c80ca2b32000c444d8cd72d56994f311036a9c766c41570ec401b402
+EBUILD gst-plugins-resindvd-1.10.5.ebuild 449 SHA256 e5189550c61a4983b396cf72db27986c4c3f0c90f97cecf42abf8767e32fd114 SHA512 efe38bb761d23c55a65bf05c6aeca8c9a4de775556faa59be6f1642141ec66f1232b4f0e4ce26e405700691749f9619cd6bb8daa867f3e9322ee21907bcb7e6c WHIRLPOOL 0ab5f130f19bf1c0eff5d333c48458726231819d521b1889edd1bf9c9dd0e96a92050ddad162e0efd3987364c9b7d4aaf95afd5cd67b46111b7a816bd044e97d
 EBUILD gst-plugins-resindvd-1.12.3.ebuild 455 SHA256 6543e4fea28452336179d7754ac724db79f7088e3b00141d9a11c294e4f4c95d SHA512 702ccb6c376c44e5ae8d5722d87f84423efef349550dfe0904056b63dabc61b0fe1305db532d9af290e007d8ee8a093260580e8cdfc395cc7f2ee74bf73a35ea WHIRLPOOL 5e99de3378ee810dce4e638e862dd62bd69b896050e79a43742d6881be20c71e1a3358e8fa15a35ac8c691dbf995b50b91199ac9159c40f6b7d601dc49d1aa6d
 MISC ChangeLog 6494 SHA256 9f7412c8e81687edfaa3284ed52b6f3acac4687d53263ebb088668470d20f80b SHA512 7befd9f3fdd170ad58f4a9f429442bde0d5a990ff5b961b047d8b6d381d8efc37ccdd0c8c1c901eb9a8cbe86f4d64fc0ab51f361376fad0112ce75bb5ecf7f68 WHIRLPOOL cd4336e556004a01713f3c28731ceef86833d9fce2c8a198a323ca4f5b2cf0d9cfae6fef6ea89ffa7e28dcaa7d6e4c28e9a57992f1f19f95c8e7c4ed3ffd0d14
 MISC ChangeLog-2015 14266 SHA256 4350717d33ff010771f5c6bc324b773230293673ff06de926571b7f4e603ee85 SHA512 6f1b5d9ca5c190e09bb467d359e3719e20416e4f212a174dac3509b0c27ee8bcbed423507dc5dc63e0f74f1cbce0dd515f1c8b6e1b33d321e5b6b1821d20aaf0 WHIRLPOOL a2897ee52781b797fc2862145500aa9226dd4234b2acd668e301b87bfb5f12d9a4d6992396fb83763e4db3bd0aaaf090383b73771d0e4f4972971acac5296e91
diff --git a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.10.5.ebuild b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.10.5.ebuild
index 352e8cb4b4fa..04161f0f6b3b 100644
--- a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="DVD playback support plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-shout2/Manifest b/media-plugins/gst-plugins-shout2/Manifest
index fec25391af62..36e8f4b8454b 100644
--- a/media-plugins/gst-plugins-shout2/Manifest
+++ b/media-plugins/gst-plugins-shout2/Manifest
@@ -4,7 +4,7 @@ DIST gst-plugins-good-1.10.5.tar.xz 3425088 SHA256 be053f6ed716eeb517cec148cec63
 DIST gst-plugins-good-1.12.3.tar.xz 3487448 SHA256 13e7f479296891fef5a686438f20ba7d534680becf2269ecc5ee24aa83b45f03 SHA512 8ed96d2b2c8724659cf8163be5246ec30c8a92d70fc6632e207ad258cff5624d6fc03576e6e674011bb88a4825c8ce225545bc7e60cdf66a173d9e1d4bfbbaa4 WHIRLPOOL 9255759738e14f9a6aee1122d7f2bd7b23266e33bdc834e2942ac3a1fbb9389fed504d4769c1ab50c35b8a319c351f8373aca8cf09bd138bbaf7bef4fc51894a
 EBUILD gst-plugins-shout2-0.10.31-r1.ebuild 365 SHA256 c61f8de34cdcee86e538887b8ac649ee31926b5ba665da4673736d5bcc432bee SHA512 c3b6f5fea3129b6345bfbdba61ed39b27d97e1f090780d66a4bad31722a578ab5b5248ffd526ec769fc12a36264d8a2f741a5775e19e919f81618342cf0f68bb WHIRLPOOL 56bbaede410fea52124e18837cc04badd6766ec6fd4a10d415e2296f17450b326aac85a54288bdc0032ac5f51241dfd172372167baff844dc12aec11f5ef1a58
 EBUILD gst-plugins-shout2-1.10.3.ebuild 349 SHA256 6241af83de987d07d425e53511865e7b9a55ab00b4dd94cf72c072c3cc0b4ac6 SHA512 a8191dd2f059b64c3b486d28d8c24896440b4862ffa5b06bd4fd99bbcb3bba306028ef727e10fa8d355ccb096a490ba611ea15ac456af46286c4d211510ddd4a WHIRLPOOL 95226b5a5bf832c533855531e9f031e5106a23fb77077cd38441ca5f42b7d06b3e9ebb4576f8ee6ec64b554a4e1daa1706ae3e0057dc455c8e2e1e1afa3d339f
-EBUILD gst-plugins-shout2-1.10.5.ebuild 351 SHA256 c6ff09da98ca9583d179717b2255fda3a41ef2a869473f7f1e5904c0e5ac41e2 SHA512 490dae83987468c0168b4b537bdea48f9df673aeb6cd4ad5785fff8d6e9311d24d3545d2b7b60cd5b9d574001b25679062ab25bf57e20a3e102d3cc890605254 WHIRLPOOL 0cb3107a5c19eacfc12e2d6d5136636437e4da4f23ad7530ea2bcd207d1c4105a08f95c90dcb33abd791d2b13941892455e0133e49cee83d3d1e7e677879132f
+EBUILD gst-plugins-shout2-1.10.5.ebuild 349 SHA256 6241af83de987d07d425e53511865e7b9a55ab00b4dd94cf72c072c3cc0b4ac6 SHA512 a8191dd2f059b64c3b486d28d8c24896440b4862ffa5b06bd4fd99bbcb3bba306028ef727e10fa8d355ccb096a490ba611ea15ac456af46286c4d211510ddd4a WHIRLPOOL 95226b5a5bf832c533855531e9f031e5106a23fb77077cd38441ca5f42b7d06b3e9ebb4576f8ee6ec64b554a4e1daa1706ae3e0057dc455c8e2e1e1afa3d339f
 EBUILD gst-plugins-shout2-1.12.3.ebuild 354 SHA256 f511f69cb96cc2c30b23e1fa2356402bbcf59313404ac090cc1d495d339aaf5f SHA512 94afb53d94bc7c685ffb31d614c8b37bf509f2ac8de5cccb4ccba77b716d89005b61e422096ee88343b2c64f33def49c7d550c284326494bbc08638a48761111 WHIRLPOOL 2b28e1689af6e37c68e7b83d7487339e5f0d4d9a272c6f95a59490254d2f88b8993d5d758330bebead5fad873d3259c693881e4b79bf8815cb3e3a83b1fd90fe
 MISC ChangeLog 5819 SHA256 c17143fdcf631c0fb3d744c0cc2fed9534b9edacd53473466076e24e49046a3c SHA512 31928e641b9cdef352410398cfbd2068d2a1fdb85bb8f756171ee52fa2f5b7790ac03d04d22cb00928425bbc5dac86169cd7a446d010a231032e452558d239b1 WHIRLPOOL b85b87bf423ec6e1b7b86ecdf86ed1fead0dde50cad5fb15dbe79fd44a434b28cb53836abb8f41435be88cef73764da128065efe6ae1b84afa50e393c025f652
 MISC ChangeLog-2015 17617 SHA256 d2bffc1d8813f866cc3aa09cb998ae1dfa2b3eb80543a962ef2dff742894a311 SHA512 95a9d35bcad8f720c87d1d1498ef24bb49ed0c0b2390a6e3311e5ce3dd48adcf2e8b502056fdb0bfa658d285ee93a0fcc060e0b4abe8ada2428fbc0d05527921 WHIRLPOOL 977c99e6d9e3a09f22b3e25a7222d732eb42a5c470ab392db6637c280fe04ef5d81e47c0be4dd84fb225de1e41cc2c30a73fd99d959bdca560783507bc4144c7
diff --git a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.10.5.ebuild b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.10.5.ebuild
index adccf555558e..50c2d8ef2844 100644
--- a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="Icecast server sink plugin for GStreamer"
-KEYWORDS="alpha amd64 ~ppc ~ppc64 x86"
+KEYWORDS="alpha amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libshout-2.3.1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-sidplay/Manifest b/media-plugins/gst-plugins-sidplay/Manifest
index f120bb6bdcb0..08b5f9525598 100644
--- a/media-plugins/gst-plugins-sidplay/Manifest
+++ b/media-plugins/gst-plugins-sidplay/Manifest
@@ -4,7 +4,7 @@ DIST gst-plugins-ugly-1.10.5.tar.xz 908604 SHA256 d6edc046350809c967f5b058c5c2e5
 DIST gst-plugins-ugly-1.12.3.tar.xz 903784 SHA256 e88ca584c94ea78eeecbf3af00ef7f134b66bdee7408aa4aa6c547235e060052 SHA512 9ca5769c325df3d2d97ba83d785fab08da5119f6d26c4ac4db72853af143477ea8fb7087464a8614b6e59f384463ac01087ee76cec2af8acd80a4dc15e392e34 WHIRLPOOL e908fb96fc5694c10c16b7e5aeae4a6f7945aaa324074cacc3ec10b84b53ef738ee8c77d6f0983a02e7868275ba26ada14153d7046d85bfdb57f310e59793657
 EBUILD gst-plugins-sidplay-0.10.19-r1.ebuild 308 SHA256 5c19c7286d57b53e074fcbc66571f235db59fd4b0b701281d8aea02611efc1b3 SHA512 3dec5c4c01d3fad1d703a16acb726da7f438878acb859f867fc4e4747a8fa4407df11d054328b8f90cb84b22946924464f677a7a1373d409364b906d9b0a695c WHIRLPOOL 7d635feb1fbf2a1a3af3f6047f417979ad1f9b27f64773b78bdcd3209173b1d97228830a4462c15323f4766083ea54cf3a6fda10f8c88233a717e138bd1f970a
 EBUILD gst-plugins-sidplay-1.10.3.ebuild 354 SHA256 c80ac8e7a3e8b21b68a96dec36bf9b8b5c55840769ae068358257d5a65c425e4 SHA512 59f043f64ad3e015f63a13f8b550a38827a2500602721d322d35a28190fdbb8afa379dd7ce20e1ed26fdae5265c5ce55047a5ed9e3f832047ac651711bdda5c2 WHIRLPOOL fe1bbcf3ce1192fa94fa36612ea663c372fa0541775ce1f1b653f384a8291ff4344f7f334fe51587ffb63c1a66d9724bf3add7475f93a9b3fe8d225e92c9f8a1
-EBUILD gst-plugins-sidplay-1.10.5.ebuild 356 SHA256 b8d91af520f3faf43fd7c31b59bb6d5580636cb90299a33c65232cfc1a4597f6 SHA512 0a183cc22339e56a4dcb04b736aa179bd76ed0f8946c108f9a3390091809cd635ea7865bae5541283075a711e2c21f4daf6b533265cd69cff8d751a695959329 WHIRLPOOL 5a6211b70f56aacdad061f6b79b05738dc8a0f9b726f71ed61c39e46d832d0c7e60cc63e66028748841c7bc9aaac3645b214494f62bd811b922ffdcbb2c622f0
+EBUILD gst-plugins-sidplay-1.10.5.ebuild 354 SHA256 c80ac8e7a3e8b21b68a96dec36bf9b8b5c55840769ae068358257d5a65c425e4 SHA512 59f043f64ad3e015f63a13f8b550a38827a2500602721d322d35a28190fdbb8afa379dd7ce20e1ed26fdae5265c5ce55047a5ed9e3f832047ac651711bdda5c2 WHIRLPOOL fe1bbcf3ce1192fa94fa36612ea663c372fa0541775ce1f1b653f384a8291ff4344f7f334fe51587ffb63c1a66d9724bf3add7475f93a9b3fe8d225e92c9f8a1
 EBUILD gst-plugins-sidplay-1.12.3.ebuild 359 SHA256 923f3bc1478b880b9854e772ef04fde795fc1cdfdffd4a3e34a448be2ab96e46 SHA512 b69035b94d1d02382678a093a3479f605c8856b188ab66a32f190236819c52e1ad6b319a4af8bda012cdfdd45d421b2388947f48345483955a16479983a5f044 WHIRLPOOL 38e0f11bad53be7c7aa0b382eff789dce246758b3d75ec66a0dd8a8b7dead45fa541b721a6b51fdcbecb49170fc4007b0cf5ec84fd28180efb6234706f154092
 MISC ChangeLog 5747 SHA256 40481442a39fc3013228b6d7e50a1f1780ace54259181147bcedb3628c8f4761 SHA512 42b6e53c4f3cfcc09d37d21879b9139b83cfd9216c9d190f037ac3e25b67688f4a1b0f730304f48a168cc9a7fed9cb50a34f63b5e203c59e1b80060529f31287 WHIRLPOOL 721124ee69f76b27919d4aa5e7502687f053f0980585bcf377a7f122488a1e40f1394580f53f855632afc639af3985dd12734ddada4bad246b85b2e183b306dd
 MISC ChangeLog-2015 16393 SHA256 515dab8b02004fda9399cac1adba5213896c4d7485f54f34a179d78b4f324ce0 SHA512 e4a489c9a64adb86c541604b960178d398b631c289f84e38a58b0266afb1254bd83fc9c1614cda1cfdf2be7e33015c23487530e19f3b9ad84add8d335ec21f26 WHIRLPOOL aaa5ff8d3229e9ec177da0d315abbfb07d670909fb2182b332733899873b4d952327f9492872718846dfc9488f9a78005c868000618a41cc8a5e29cc4e922456
diff --git a/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.10.5.ebuild b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.10.5.ebuild
index ccc674a4298f..f431f70b83c4 100644
--- a/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="Sid decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libsidplay-1.36.59-r1:1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-soup/Manifest b/media-plugins/gst-plugins-soup/Manifest
index d5bf2c2dc9fd..8b427fecf0f5 100644
--- a/media-plugins/gst-plugins-soup/Manifest
+++ b/media-plugins/gst-plugins-soup/Manifest
@@ -5,7 +5,7 @@ DIST gst-plugins-good-1.10.5.tar.xz 3425088 SHA256 be053f6ed716eeb517cec148cec63
 DIST gst-plugins-good-1.12.3.tar.xz 3487448 SHA256 13e7f479296891fef5a686438f20ba7d534680becf2269ecc5ee24aa83b45f03 SHA512 8ed96d2b2c8724659cf8163be5246ec30c8a92d70fc6632e207ad258cff5624d6fc03576e6e674011bb88a4825c8ce225545bc7e60cdf66a173d9e1d4bfbbaa4 WHIRLPOOL 9255759738e14f9a6aee1122d7f2bd7b23266e33bdc834e2942ac3a1fbb9389fed504d4769c1ab50c35b8a319c351f8373aca8cf09bd138bbaf7bef4fc51894a
 EBUILD gst-plugins-soup-0.10.31-r2.ebuild 545 SHA256 03fcf35e8d7c4ccf83d295e64ba9da1afe935b02541ecd10e97da792cc1f014d SHA512 a204577538e6ce251baa4e50148d91800c0a541b07032b8ce9e7ea02b77413add2c8c0409540158e003c9ccd4cbec116d6723473347efc8c8b5227af6ddf9f7a WHIRLPOOL 1f2d497701e04eb170464c2c1597ff2327742c4b7629856fcd20c8840f255784abf9e957f0ed1d48b5bdcfe9d4561160a2da5c14539d67bffe977f69be876ac0
 EBUILD gst-plugins-soup-1.10.3.ebuild 417 SHA256 84af27e63b9c6ee038399948f3df548d98208c46ffa181569d342f7c0c147c10 SHA512 4cc33293e5185f2001aad7a1e772a554a49d40705b2779c127fb9eb60a86b09a10c6fb1dba069b15c6efb7d6fccef9482b06eef58d6b5ba7caf8ba6e0632c483 WHIRLPOOL 6145d7ea695e685316f5d78a8ec097266af7662deaa578b5cc9e37d97ef42a866a50947005121018fee97ef4f17e1ee05425598bc1e9c8ae0bd84315346811c7
-EBUILD gst-plugins-soup-1.10.5.ebuild 420 SHA256 25fbbb4d228b0fd0c73c8776afb28fe905795b5247511584d81b601e0d90910a SHA512 386a05fddc5b142ea6df177f716cb47d92abe26204c489b368a32cd17aa9cd19e09857318afe3e4c50916607474b63d65662cbcec2d631b1cbbc65fee9e719e7 WHIRLPOOL c4250b9542e4ed7c001ec223168731192cf571d1cc942326eff997db59d30e2b0795ed02e7d6717b50ebf7793496efa8ffb830e1aa09a6667f9fc6368daf068f
+EBUILD gst-plugins-soup-1.10.5.ebuild 418 SHA256 2810f22ea3404aae43f1882907defac001f58f01adede348e4c8ef3beaf70c3d SHA512 18411808eb794ba5375cac4ad25af713aff0455df63f480cab98d6fbaa00750cb93c9188f0677490c02148510badc3cf36405e0bfd73401b93d1d839964de500 WHIRLPOOL eb1b44f1aec57f3aeba7306bb4b50327e727e127938f77355370a1ee7e5de8a7d4cd2ba44c0c22d96ed5b363b484a3c04cb3a64d871c04090431267f6b848f24
 EBUILD gst-plugins-soup-1.12.3.ebuild 425 SHA256 a6a9a612a485c9f11ae1e7d2e238bf65e3b4f8af5ad2f2b185d851de3428534b SHA512 a78b0081d4db73e5cf79026705977befe5290d4ad3e316fb0993c4e6f837aaf99fa8b3bd6bbaeb48df4ef7596e871499ca77371a807b4236ef90b8773112f14e WHIRLPOOL aed345ff6d0db9f7caaf595c0fbbbff941169b587278b180c9bb5f79497319ad6705ddd0459a625cc50b5fb44ed7c6a96963f5bdf960b6abdc6482b6353abe07
 MISC ChangeLog 7084 SHA256 fb5a3752f4ad3cf3267c217f08f651e5c47f0463edaa24b5c7cfa8f3213393cc SHA512 f7dfbd26763a9ff3be139bb962d7677394f3267ee3f607b26a2a4e9e2b09f16f5b58ab6bfd9c08ba4b309468957336f19dfe40badaabc950e44e5a63eb22cb9f WHIRLPOOL 2757ba671719af59e864faf57adbdc08786fdb8993d78002b010d845aa93699665bd12bf60b2258f264ebc1597f9a8a4c7f297cf0097d5bd0df8b9d574fd852e
 MISC ChangeLog-2015 20062 SHA256 ebe0abf9fedd188ea416524d3477cf7dc43205b6e02a1f52d7c45524a56291d4 SHA512 5b6288a56867c38675ee01e27bd48643e9c5a5342da247347cde006258a8014f2b7e9d6af1ca8a18cfc383bc6c3938aeae61a386acc2838bea19f28b9c0276a9 WHIRLPOOL 03596a77a93babe96dfbfa59d610a1422ad1e56ae14dcdb99971d20ca8d138470ea480e647c32b148b4eb81f464b27e30c2d676b26de1b18aeb0402f80a55f63
diff --git a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.10.5.ebuild b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.10.5.ebuild
index 19beca8d6a80..95b2d1e24e61 100644
--- a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="HTTP client source/sink plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 IUSE=""
 
 RDEPEND=">=net-libs/libsoup-2.48:2.4[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-speex/Manifest b/media-plugins/gst-plugins-speex/Manifest
index 68c31a47d9ff..f1620066b894 100644
--- a/media-plugins/gst-plugins-speex/Manifest
+++ b/media-plugins/gst-plugins-speex/Manifest
@@ -4,7 +4,7 @@ DIST gst-plugins-good-1.10.5.tar.xz 3425088 SHA256 be053f6ed716eeb517cec148cec63
 DIST gst-plugins-good-1.12.3.tar.xz 3487448 SHA256 13e7f479296891fef5a686438f20ba7d534680becf2269ecc5ee24aa83b45f03 SHA512 8ed96d2b2c8724659cf8163be5246ec30c8a92d70fc6632e207ad258cff5624d6fc03576e6e674011bb88a4825c8ce225545bc7e60cdf66a173d9e1d4bfbbaa4 WHIRLPOOL 9255759738e14f9a6aee1122d7f2bd7b23266e33bdc834e2942ac3a1fbb9389fed504d4769c1ab50c35b8a319c351f8373aca8cf09bd138bbaf7bef4fc51894a
 EBUILD gst-plugins-speex-0.10.31-r1.ebuild 397 SHA256 e930c693bce70fe04470db9de827e822dcfb7f311b6bd644eb77ff4a6c0b0b8a SHA512 1ae0a70f8ea59bf9f7ffd95c4ae30565db22daa8ca9dfeac0c4207c588d58cd1ec431bdbb4fb33efa233af5a59f6e6f8169b234664fc35dcf33151fb076fa510 WHIRLPOOL dd4cf185fe320e87f4ca6b7e4736bbcdd5f9d0870b1d3543c400bf67d6f978127a5d1439e6b7a0eb7d87757d3fa33e7c169ef6eb2083fe9313b08763b3034a70
 EBUILD gst-plugins-speex-1.10.3.ebuild 382 SHA256 eda83e76fb3d0933d339dca57d088d382d5032e436b60014b7d4bcc5d0b51164 SHA512 8fb064d2c47f60a84b30ba96a87edb00986c04046e2e699393fd2ba197e4df66e1c821a30a69892d8abfb49ca0a15d3b548d2c5da0d626d29c81562cd44ccea4 WHIRLPOOL f724c6c69f3474b4209a6fc50769db4544ada84b14a117717f63459ff62b4336eea309f57abe826bca4b041d5f19ab4197764044f0abc7b1e019ece3468b09ea
-EBUILD gst-plugins-speex-1.10.5.ebuild 385 SHA256 54bf7332d91bfce84173bf74bd89548d5b443d5da35400c2aa28ba8a43d53b84 SHA512 bb839a7f37d8d1ebb37608e258bcc2ff98c73c5ee5efae75c03af591ae5253787ef9bac86c0db402345f53daa532cec189960f8be4a76af453c886c76c80d0a2 WHIRLPOOL 866afe3394b015a7c32d300a58821a6fb3b61f2ae2bc9f9214ff1fd992ed5fe6df59b3c5a6cdabb148f4d794148f86ac42319fc70e3f3f0d84d30c35cc0ea629
+EBUILD gst-plugins-speex-1.10.5.ebuild 383 SHA256 43958472bada933165b77ad6ccc6279cd6ffd56e86a8c8818794cef32c19dfc1 SHA512 813fb34caa66ab006f5302322644b01bd2e8d7c38ffdc6e18562461b4698e2ce233756e5e1a7578a43cd64d3ba1b5ef426822bc8bfa1b4078f34f841754478b9 WHIRLPOOL 5a7fd0d0da06c256d082f57b842639facd16e8606463ab745847ad0436bb15cbd708db6939da6bd4c9ec45bb70b676b78a88eee33102df462284190803ed83d1
 EBUILD gst-plugins-speex-1.12.3.ebuild 389 SHA256 401cf8fb51a1ed58ef807d35066b7966e228464c9213a9385857f8426ab64f56 SHA512 cb95b752e7ca6e38e4c4da7be1cc5c00996d16c190e22206efc42ef93a570375c7658cfbfab1b07416d150c680fc74a277d4b19158d64d7853ea20f830b750a0 WHIRLPOOL 96cd8efc6b594a1d905770178d24c2f5b99d7595e4ea0794230f9d0c0b719e22f1baa9a05213928b9d2571c61c00e642ddcbc487a93eb6b5afa5200f7eb482c7
 MISC ChangeLog 5852 SHA256 04b2473b1d7cc03ffb8a26771fd68ccbbd50e6d99be129320b6a668a09da27b5 SHA512 02815b470f43162e9c55973c4c314b973699d234e0f9cb520e2aacb07e63b88cd9cd169ebafafc6b617d9054035b7f4c404223311f7ad6fe64aa5c9ef3f9ed1b WHIRLPOOL 515accfbcd413910ef913bd9e908284114e0f3f7671f7175e387639958874b669ed765b13423aae3b4f70ea4c0925934ea0533a23a50c7b5a5903fb0e00c028c
 MISC ChangeLog-2015 24001 SHA256 6acfbf574bd01ba550fc61d4703a795668c98ad7f309133d79ece3fa6e29f544 SHA512 ada9a0997abddffbeb2daec76d3cfe197025d2b91dcad8f8ee1c29dd5ec956898f37d4a2b6a25336965199ad387539793404727b14bf69714104eab6f86758b5 WHIRLPOOL 1cee41516847d5092e3f9f9474db45fe6ad22201b0c60c38a16625898857de842201014bdf3f27efa0798d664003accd5d1b8a965f0a3ac1dd490e83e9e3b1bc
diff --git a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.10.5.ebuild b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.10.5.ebuild
index a09e4173ddec..5b47f59d34d6 100644
--- a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="Speex encoder/decoder plugin for GStreamer"
-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=""
 
 RDEPEND=">=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-taglib/Manifest b/media-plugins/gst-plugins-taglib/Manifest
index a749ee8bf652..c678a7e395b9 100644
--- a/media-plugins/gst-plugins-taglib/Manifest
+++ b/media-plugins/gst-plugins-taglib/Manifest
@@ -4,7 +4,7 @@ DIST gst-plugins-good-1.10.5.tar.xz 3425088 SHA256 be053f6ed716eeb517cec148cec63
 DIST gst-plugins-good-1.12.3.tar.xz 3487448 SHA256 13e7f479296891fef5a686438f20ba7d534680becf2269ecc5ee24aa83b45f03 SHA512 8ed96d2b2c8724659cf8163be5246ec30c8a92d70fc6632e207ad258cff5624d6fc03576e6e674011bb88a4825c8ce225545bc7e60cdf66a173d9e1d4bfbbaa4 WHIRLPOOL 9255759738e14f9a6aee1122d7f2bd7b23266e33bdc834e2942ac3a1fbb9389fed504d4769c1ab50c35b8a319c351f8373aca8cf09bd138bbaf7bef4fc51894a
 EBUILD gst-plugins-taglib-0.10.31-r1.ebuild 382 SHA256 fdf3e6e0b8c647d5cc98b41592583b774146392733e1ee543d8036838ec4d497 SHA512 169755c78931a29a3f7b0a4b8b0f430b2ad8e4e6990806d49fea709645d8fd90256d34fc734ea04c479872a87b44ad486866bd80c927449b3c8cd0cda7308585 WHIRLPOOL 6be127f631d3cda154571fc303d9892afefa4fb9ab2f42b7f6ce45c32d51d3db1a51373dd39700ceae12a62f3bc802d8032be94cbaf50beecd5482e4fec99a1b
 EBUILD gst-plugins-taglib-1.10.3.ebuild 386 SHA256 2d6995dbdaee3251df81eaf7c718b081c8c2826b2bc47ff98935328cfb54478c SHA512 6ce9aee34034c83f1883ef780b3ef7f123a9fe99aa055319ec04b41ced62b9040100786ea9833ca80d3d153c4efb905f9cc7c87cab97621fa1fa0196377bbbe3 WHIRLPOOL a4e490bbb3a15bc7e4949a4deffea96c973b31d5c5b230d62956e23a46ef58c2a2f7454d99136b99115a0e98138b7a0c40ed77d19e28eb9e9d05ce2531f1c90c
-EBUILD gst-plugins-taglib-1.10.5.ebuild 396 SHA256 5618ce31f9e53a4d0643975e2ab0e7a4dd2fe2a626a5c6e21157265d4f4631b2 SHA512 b0b0053abd59a36229a5f6e91d661778f2949237b9068a7d1a7117ba81e85fdf168349243909c9a68e77488ff421b37f965c040b0d7a3be2c8a69f1cf7fb05db WHIRLPOOL c29dcf866ff8a3c5af072f499ec8323910b4817e8bfe28c123b34f6b494798814aea23f007a17a836d507bde40728f10a572e714ed351707cf7c618977cc5d14
+EBUILD gst-plugins-taglib-1.10.5.ebuild 394 SHA256 d365ccc349724fd38edaf09bf25746f9fcd9ac1f3cdcd3afdc2627cdcfe82704 SHA512 f42211a013f3f21d86bb835ec43c27cf8a120efe823e18bacd1b63fc83e808763ffce27f37c6e8ca062c1bf70b9336a7be7ff5919ec85ce18a7d4faa72932b00 WHIRLPOOL b37af8307e1af2de24b5204168c06854ac7c9c1c1f117a2b99dc09cf10867f758938b4032ab95ad68aeeb52e44ba42d8a3760bd41f586f483b09b2c31cf49816
 EBUILD gst-plugins-taglib-1.12.3.ebuild 401 SHA256 54fdb2231e0bcb48581c6230a36a4d6d7da9189ee37a4382a7af03232991aa58 SHA512 ea7acbd576c02cb33a64bddc0be72e20a5b96007a973f467cf2cfffa55bfdc5def4d6acb9dd12e500a8b99f7b886eefaf05e9db18a4610a6605037d7574430bd WHIRLPOOL a44244d63a45166220cdbb5ba458b74e524dbd9abe33688bef7f0bc7d37952d8cf33715b3efbfa437e75bd012979e930a544577220497503477dbc7141460d20
 MISC ChangeLog 6232 SHA256 e20c771800ce0c1272ffbcdabe85c69aae13309175be129227afa5b7639a2c49 SHA512 2897017e6192e7a031b3da0ce7316d1bfc4caf263cc9f2996871bf5d9fdfd1acc35c4ebc9db955e96b90e519c2971bad33ea1f921bf82aad14fc5c805119b553 WHIRLPOOL a9b7104a233bc784c17221a5b8e9675b748dd6efb1b61f42b94b2395ac2962590abcefe1eeb3dc2e2d57ac3d0d152aa175cfd32fd656562647cbcf7febd6bbbf
 MISC ChangeLog-2015 22158 SHA256 66214da981e8ffb13b2caf24e5dcc75621efd0ef4f189f733fcce3c9d1ec3511 SHA512 073e63526aea90f01c63871d807af1e8ced7331bfccbcfbd09f50883159118f39760f906c69a3df4331ed63d39b8434dc49b3fee8089efe8cdde502157446fc4 WHIRLPOOL 9491804d4419964d24f67ce0b212562a338c12767a3ca5eddbbbbba845530f4d73d38c7bece947785de3ef641514d516a38ad4bad3d99a38905e90c4ca3c1200
diff --git a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.10.5.ebuild b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.10.5.ebuild
index 26a6a1ae9099..884c49276be7 100644
--- a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="ID3v2/APEv2 tagger plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/taglib-1.9.1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-twolame/Manifest b/media-plugins/gst-plugins-twolame/Manifest
index 2e27b2ba3dd8..734795047dd2 100644
--- a/media-plugins/gst-plugins-twolame/Manifest
+++ b/media-plugins/gst-plugins-twolame/Manifest
@@ -4,7 +4,7 @@ DIST gst-plugins-ugly-1.10.5.tar.xz 908604 SHA256 d6edc046350809c967f5b058c5c2e5
 DIST gst-plugins-ugly-1.12.3.tar.xz 903784 SHA256 e88ca584c94ea78eeecbf3af00ef7f134b66bdee7408aa4aa6c547235e060052 SHA512 9ca5769c325df3d2d97ba83d785fab08da5119f6d26c4ac4db72853af143477ea8fb7087464a8614b6e59f384463ac01087ee76cec2af8acd80a4dc15e392e34 WHIRLPOOL e908fb96fc5694c10c16b7e5aeae4a6f7945aaa324074cacc3ec10b84b53ef738ee8c77d6f0983a02e7868275ba26ada14153d7046d85bfdb57f310e59793657
 EBUILD gst-plugins-twolame-0.10.19-r1.ebuild 314 SHA256 bc53da2dc031df0514cfcb4f03ab62f358da477ce3ee6a59609eb2c59fd44b12 SHA512 a8e948e4f0137097c3717a28fc4c506db7bea4635258275a84d9175debf26b7031be85ae44fdfa0ec81ea00923c6ef813786da2a1329b59afa4a9182e8dd0171 WHIRLPOOL 848d35ac0aa8ca7ba2b40b36ccf8c7c2d41a1f4a46ec966c2056e940a3afb42078ddccc9455714859c9fae421bc0f6542454160af9a38b60a087097d7ede3972
 EBUILD gst-plugins-twolame-1.10.3.ebuild 362 SHA256 6608a95d4831afb9a980e5e4cc193ac331c20feb0e6eadd30ce7df2ddd7fb224 SHA512 2cc9e5ee0ca4702f7942806fa6d70ce4e4413b1eeb1d890906ef75bb5c29407ee7a469d86c67e33dddd2a689815ce61e04de0487144cfb0129c19310e4ee9c6d WHIRLPOOL dd0b6906c9dd2171f03255767f0529c217678b32458ed93cb720e9b3206fefb03f134e53887460db00c96dea57db5bb7fc3f190262dffc62fd16c5f05163e588
-EBUILD gst-plugins-twolame-1.10.5.ebuild 364 SHA256 43e6bdc8b214d058e15abe6041297e0776dc57f60b90d321d1ce3314b13a851e SHA512 371b5a962916b3ddf3d46fe5c7109a8cd80f25bb4dc0c21a5c51d646b1936201393d9f0b1e2df08fe3c9895ef32b4ef461f65f144794524360311d95ad994125 WHIRLPOOL 77e7cecf2b9b0701a28be6f73aaab1108425263fb4a23037f3455dfba99c99ecfc993dc227b01407e2ad454b834d6462759e0e826dec727e013d6b5cd52c91ed
+EBUILD gst-plugins-twolame-1.10.5.ebuild 362 SHA256 6608a95d4831afb9a980e5e4cc193ac331c20feb0e6eadd30ce7df2ddd7fb224 SHA512 2cc9e5ee0ca4702f7942806fa6d70ce4e4413b1eeb1d890906ef75bb5c29407ee7a469d86c67e33dddd2a689815ce61e04de0487144cfb0129c19310e4ee9c6d WHIRLPOOL dd0b6906c9dd2171f03255767f0529c217678b32458ed93cb720e9b3206fefb03f134e53887460db00c96dea57db5bb7fc3f190262dffc62fd16c5f05163e588
 EBUILD gst-plugins-twolame-1.12.3.ebuild 367 SHA256 b70ab78b24e4fb994931cb623fde776cb7d1544888abb4d4f1b88983321a3474 SHA512 6f3d6cc14775fd506aeb87d932ecbc2055256f2303966bea59f4b9cd53cb073b827308de252a94d6f72aff511e2a2c6d160382e0273aa52f5be6daf0600d6403 WHIRLPOOL 2d99d96f734a120c07043eeeee513ec0dae4c97c6bf0d9c214bd93edf4fb2ec15872193dded1f0cc63213abf9129f2d1779225760a8faf8530e48b02c7c270b9
 MISC ChangeLog 5747 SHA256 37662855b1b7923f29d3bfa5040bf096a6e2905ca3f53e52794cea417349a2a7 SHA512 ea397f7e4c87376e416bc51976b47eb7385b6d9143dec911d8d9e61ed7223a69207eba0658a25b49f49cb45b3bd9dc862ffd80f17203791e9f13da4ee1d968fe WHIRLPOOL bf9068ba996325fcd396043a5d1b1464816a7851a725104c7e66a08e185a5079d07a8fa2d7dcd7337915af02238ad58ed14d3cc73e1eb4fcc5818911c137651a
 MISC ChangeLog-2015 12951 SHA256 e5fb4bb3a3fd59a15cd39f40bc7b0f92741fdff5349ad05002729c46ea65a052 SHA512 00ff7ad049638db366b9ef9da8b1db47b9d0b8ef94b4356e285b8afc1a76816c815b1aaf0164257e325f5c1d0977521263df1ce9b02318c74af197df5ff2f4d0 WHIRLPOOL 086a9aa3d7e4b738b38df8915de13f6873d134dd05c927d08dcd8d9bc04f650388fec300ac496f3920c0618fc67fd4a8bcb486c18427947eef1cfd9074776261
diff --git a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.10.5.ebuild b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.10.5.ebuild
index eb9e16de5a59..ac7b6a12c472 100644
--- a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="MPEG2 encoder plugin for GStreamer"
-KEYWORDS="alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-v4l2/Manifest b/media-plugins/gst-plugins-v4l2/Manifest
index 815e2832c5be..91afe6306fa6 100644
--- a/media-plugins/gst-plugins-v4l2/Manifest
+++ b/media-plugins/gst-plugins-v4l2/Manifest
@@ -6,7 +6,7 @@ DIST gst-plugins-good-1.10.5.tar.xz 3425088 SHA256 be053f6ed716eeb517cec148cec63
 DIST gst-plugins-good-1.12.3.tar.xz 3487448 SHA256 13e7f479296891fef5a686438f20ba7d534680becf2269ecc5ee24aa83b45f03 SHA512 8ed96d2b2c8724659cf8163be5246ec30c8a92d70fc6632e207ad258cff5624d6fc03576e6e674011bb88a4825c8ce225545bc7e60cdf66a173d9e1d4bfbbaa4 WHIRLPOOL 9255759738e14f9a6aee1122d7f2bd7b23266e33bdc834e2942ac3a1fbb9389fed504d4769c1ab50c35b8a319c351f8373aca8cf09bd138bbaf7bef4fc51894a
 EBUILD gst-plugins-v4l2-0.10.31-r1.ebuild 829 SHA256 e2fe887eca337c765194464aefbbf066763c85d8904357ddac44607d414f5793 SHA512 38b460f13965a518bf6910a0ffa60a1bd89c68bed5ee2eb07873bda27dcc55260ef6f4520b6a8dd97a8a4cc62215762b6003441d8df4484133dda6586a13ffb4 WHIRLPOOL e4290329e4e2728a4a7949ed0900f36bb267b5edb762297cac4c775716795f4d496a280f2ffd29dc2cd4c11245a06938d58347d068d60ae3de8ff056ca37b0e5
 EBUILD gst-plugins-v4l2-1.10.3.ebuild 652 SHA256 e396cf3cac43ebfdc68bf7ead9302ea54d45c4b4d2a722b44ca43f65dfe4ed96 SHA512 82b9ea95f44afcd572389ca5677fac76a7be82dbc1c77607a8556396aae0b3045bcca2bfabcfb2666c458d14c04cfa7bbde7328c7e13055d4873afcdb6672944 WHIRLPOOL f53a1ac30874141aedb66ab32e22ca13a3a2f664fbcfc3cda9305fcc2899c6b071434f818c1ff6f9f69ba322d1361a23304e6141e60bf6851f94c57c177220b6
-EBUILD gst-plugins-v4l2-1.10.5.ebuild 662 SHA256 38d6cad33b95680f5edb913445c72dc106f43826f19aedcf121ba5ff8f648735 SHA512 0040c2d7e84c89127389c0c41e114fbaf07a7cae119ab152a93984b3d2af090734afe6aca648584031f45b2a38e09c766601f24063c51bccc3b55d72888b9afc WHIRLPOOL 4101cc7bb3fa0d6a73cc333c7707efa1318fea33a05711b4d177e6112c2c2393249e3450d53144f75d242faaaa58a46498503f6ba40fcb80857492664257961c
+EBUILD gst-plugins-v4l2-1.10.5.ebuild 660 SHA256 ecbaf723089fdf9d6afc61dfbb09ec0d776d084c11b7ead43a69374398390d6f SHA512 69b594af123ed0a1b9c657a3f05acf9b7e82c66f0de4d726321ee558089a1dd201a86b0aaf71a5654d9a5e8daba8ba9f7feb0f0b56596bf486707d4346c7ee40 WHIRLPOOL 31afaf9b3cee15974adbbc27b0213b52fb8fab3a86c0bbb5987cf13ad5dedbfd6ffbbd7ff21363afdfe29f6529f32f0cc112a79e17a9ca76d92ca8ed7c6fc1e9
 EBUILD gst-plugins-v4l2-1.12.3.ebuild 667 SHA256 7ae9487001d3ccf0d53a70e390c4f15bd8ae5169ac1f808e0872dff06af14bd4 SHA512 54f1b9a03947e6c68c857c4c94a2e0a4e00b40bd370b37b3236212ae391585cb0f43e2a11ccd03c865a7b9583c407cbc18a5294fdebac4c69a06256c18b9df9e WHIRLPOOL b0c97caf794b13d28c190111b64312a32dd36b91fddb33f2bd1a100b346f07705f8c9d08e15494f1e732745524ef7e54294fa0384467125c4faed2df3e1e424a
 MISC ChangeLog 6270 SHA256 ab6522b2214f9b036008482aa2c85bd19d0d9cd08231c3b4cb66bdeb2efc573d SHA512 61e9ab83c2f9056c2fed788fa4a23433ebebf5d8bd203fc0ac9489d696a06e86850a49f80934854f93db07646d7c0f864c26b093425605ab89444979647b33fa WHIRLPOOL 25428d9d57553f916f1b075c1ac34cf07d0029cea024fea15b32d0c27374662e4ed13e93d1628396320383adf5026372a8f6f3404856a5611bd0bbc901e74455
 MISC ChangeLog-2015 23417 SHA256 d9f7d5b463657a3c09b7d8a481f26ab32c910b7af2dc7b92921f378077a9b465 SHA512 427f5bf624001a034ac0d0c2cee04cdd9fac08ee5e98bddf4bb198a942dd943c5aa33edbdb3aad1799a0981dbb7fd5898b23bc588e45695515d9b8b0a1f14f99 WHIRLPOOL 9b6483907a863108f8eb32fc2710f0a76b8f7cb86497c4c2727dd6d54061d9921010a76a66de1fb98ba8c7f4f1d9386e4eb516e8b7e42ac0f3ae26118152b2a1
diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.10.5.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.10.5.ebuild
index c30d88a33de3..908ed6488e99 100644
--- a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPION="V4L2 source/sink plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
 IUSE="udev"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-vpx/Manifest b/media-plugins/gst-plugins-vpx/Manifest
index d877e335facc..7f0850187019 100644
--- a/media-plugins/gst-plugins-vpx/Manifest
+++ b/media-plugins/gst-plugins-vpx/Manifest
@@ -2,7 +2,7 @@ DIST gst-plugins-good-1.10.3.tar.xz 3426164 SHA256 4e07e93e34d4b93208f1579c21e7d
 DIST gst-plugins-good-1.10.5.tar.xz 3425088 SHA256 be053f6ed716eeb517cec148cec637cdce571c6e04d5c21409e2876fb76c7639 SHA512 556bb5f95f3d52722849b5abf2ece1abeba9eae556aa2bebccaeda419639aa93b517bacbe74a0b3c0ce481d1e56ed2793de892a3054fdb06ec9652e207d69e16 WHIRLPOOL 01405868de1faee643f1b9653efaf0a822a85a02d6c04ff98b93e9dc8339671111005105aeb4cb2d5b6c86e69c943d12daff6fc35e94c002b12e805f9605eac6
 DIST gst-plugins-good-1.12.3.tar.xz 3487448 SHA256 13e7f479296891fef5a686438f20ba7d534680becf2269ecc5ee24aa83b45f03 SHA512 8ed96d2b2c8724659cf8163be5246ec30c8a92d70fc6632e207ad258cff5624d6fc03576e6e674011bb88a4825c8ce225545bc7e60cdf66a173d9e1d4bfbbaa4 WHIRLPOOL 9255759738e14f9a6aee1122d7f2bd7b23266e33bdc834e2942ac3a1fbb9389fed504d4769c1ab50c35b8a319c351f8373aca8cf09bd138bbaf7bef4fc51894a
 EBUILD gst-plugins-vpx-1.10.3.ebuild 439 SHA256 3bda1336e685f13f4675ee22b2e7688757f15b4ebc443133a61952bc2b724a37 SHA512 a062a53fc23b7e095a3a5995e6ebe064d5dab455993fad2cdcdff6fa93c2d985142115c2b4610c9a451211adbfb01b7b63d466d219bc05c3943d9fc3f9fdffa6 WHIRLPOOL 665609786b3408200734e11d2936e9d2e5c0405bdb902afd153cfadc791f5b3e02dfcbe0979837799e2a17e60d043511776599595f6362007f7c5142f6cb7dd4
-EBUILD gst-plugins-vpx-1.10.5.ebuild 449 SHA256 16a6f5747325d7e1250ba656ef43036a6056777fbe5d791cc6a43a09bc363c27 SHA512 85cd40bc6875d82818f4d0da355301141611c014200d864971eb2e99ba5ce3cc660c45bbae3bef257218f1bc0b44727d210c3292309b4084a6359d11bcd57cba WHIRLPOOL f870fd855dfeeeb015984527a5baa7a7699cbc6247d71d6d667233ce2fbe295515139f613af5ef5209608100cb43b3229f2aaaaf3d8069f61297663b97e6aded
+EBUILD gst-plugins-vpx-1.10.5.ebuild 447 SHA256 dffc40556f97ee8c0f3165c7972a783b576de3daae3f85be1861a50848614c1a SHA512 81ed4eb4ceff3d6ffac5939a814d72ca5e64274cd359fb1f5847ecd0817d613450efda265b921ccabdfa180f8c8cc942b70531492769c4929fb6a4f690f8b5a5 WHIRLPOOL 1e0c73e39a328e2443561ca18b1016b9d3d89738cadf2f95730867be07089cc1b7538b0d8fbd5838186866f52b2dee9ea6c448738c83240dade42e47c5cf0f7b
 EBUILD gst-plugins-vpx-1.12.3.ebuild 454 SHA256 6c8d1a342f91c28bbe0bad11d0c90a2cb43f841ff16efc1fca8d2ac08b7ba5bb SHA512 b79662dfb5b82ccc259c1a20494ce3c532e6621fcc92ec905e8cf3447aaf9992810de086c27d6b4ee0654e224011d66d7c27f6c897366dcdccf27bc7ef35ad2f WHIRLPOOL 3f6d4925c049a516935c2013259c8452b3ce488fca1e8d413ca786d5729cd0c009784c368bd84342d0e95a66d5554aa485e176ee175866f488d9f375f37dfc5a
 MISC ChangeLog 6229 SHA256 4df5341010c9dbd9d38e240daa9a061efb27e506968aa2cb0b85fd1b6046a984 SHA512 e41875e2a9f3a8c54925e83dbb5ffebc425c81c0a183aa8ca0d19fbcc276ecfd8ec85ffd9084fbd483c0cc6e85a326b663350ea360be122a431f60e668adef93 WHIRLPOOL 8e28c88f6bcd1220da93cf02ad1d64ba837891533fa7db94781aa7419573639d7edb23105c4640605043af02f5cd64422910fcaf405e4b20c9153c9246875b01
 MISC ChangeLog-2015 6791 SHA256 2597c8ede46d43cd03af90ebddeb86f8d4daa82b10c224a8a9490d818abe4616 SHA512 f2d09abea9ebd82d70f08ea09d6ea99fd6a49ac346b71a133fb912047622b2bb070af111061c2b05fbe458235d99a1b79582a0fbc783ae9c09618780f0ef8910 WHIRLPOOL 3ccc2a62fdd78bf24a7adfaf1f692dfb997d7c50cc78bdcd14ee3fd747c55188df398f85ffa90bd2c2846b546ec935f6f197e6f7acd0b509aab272eb0fb67dab
diff --git a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.10.5.ebuild b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.10.5.ebuild
index 667df7026d26..37b081ddea18 100644
--- a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="VP8/VP9 video encoder/decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 # VP9 is under experimental, do not enable it now
diff --git a/media-plugins/gst-plugins-wavpack/Manifest b/media-plugins/gst-plugins-wavpack/Manifest
index 4c8c2c7b7b1b..f8b49d4392fd 100644
--- a/media-plugins/gst-plugins-wavpack/Manifest
+++ b/media-plugins/gst-plugins-wavpack/Manifest
@@ -4,7 +4,7 @@ DIST gst-plugins-good-1.10.5.tar.xz 3425088 SHA256 be053f6ed716eeb517cec148cec63
 DIST gst-plugins-good-1.12.3.tar.xz 3487448 SHA256 13e7f479296891fef5a686438f20ba7d534680becf2269ecc5ee24aa83b45f03 SHA512 8ed96d2b2c8724659cf8163be5246ec30c8a92d70fc6632e207ad258cff5624d6fc03576e6e674011bb88a4825c8ce225545bc7e60cdf66a173d9e1d4bfbbaa4 WHIRLPOOL 9255759738e14f9a6aee1122d7f2bd7b23266e33bdc834e2942ac3a1fbb9389fed504d4769c1ab50c35b8a319c351f8373aca8cf09bd138bbaf7bef4fc51894a
 EBUILD gst-plugins-wavpack-0.10.31-r1.ebuild 397 SHA256 b3444618aeb03c28701fafc754bcbf6ea11bf9c71a1b47a967df5d3a4c938663 SHA512 c68e2de726862d5ced9680237511046c157fc0ea8cfff51bed4f9cc08043b6cc2a9808b6692ae751aaf57484e8543a609955c1cf22ef6c22df28a9d5f9ce2f2a WHIRLPOOL 48d21526413159b7cfe36b96a0868c964b79225e4b6a194569298fc2404059494214c4ddc777e4a87223273d93a92b9b0a88a9d7a67be333a0b09ae0583901e9
 EBUILD gst-plugins-wavpack-1.10.3.ebuild 390 SHA256 e187134f499b2f870e1e283b3c3b783b294ad72a87896d7eafc03b3ae234e1c3 SHA512 34a00931bd2435b24aad440973fed4f215563e9e8a2c9eadea3e3cf87cc27633d31d8a928dbfb05743012682d99bb42dea2728980adc4f77b18a502f93f6ad1f WHIRLPOOL 1554b7486d512e86403b77138d1a60663da8da7afd7aa339018619c6966d54dec018b3d6183ced1ddb428dfcf6d2ed7926d9c6efc62e617c7d6e92672071be60
-EBUILD gst-plugins-wavpack-1.10.5.ebuild 400 SHA256 766f250e3c44c6b8d7e8ac9684ce133b4cd2d2756077b8f497feb9f804ec15c0 SHA512 e1e58a9a1161f1e9175227ce5bbfe13a489c5e1c357cd6b146bca51982fcca6adfb2932202776e1c9cc4972769f5c38351fd3767cad1abc97b107b7e63684a44 WHIRLPOOL 61e4298f10ca31a3e10911220f56e139d10a77fabe9718c5bbac929849b0e6e536b1e4e6ddbec4020fa116855a69d7011474bc21c39a41bdf2ddd2fc4dba8987
+EBUILD gst-plugins-wavpack-1.10.5.ebuild 398 SHA256 027888538c3524da2ac2b935dcefa08125318d10e055a0ff7eda238070be7746 SHA512 ee7b705665a37707e94bdf85ac00da703ae5bf9a0e9eb990b9cab6a9a31b4ca7c13ef6ff95b32bbef799a8472c48913066dcfb5a84d6a734b8b9b501c9cc1d1d WHIRLPOOL 37a35aa03477d789a1eaae303f17f33e1e10e77a1055e95bb328522ca724c50b6ea9237a7b03c4a82d0b906066bf2d33ededb93aa95eafa61ea3528cd9690d56
 EBUILD gst-plugins-wavpack-1.12.3.ebuild 403 SHA256 1389d5e45040a19776fcd4fb59d38acfd33660510d64b713eaa199f0082ee946 SHA512 ac8c5f5ec34ec28bc625a5b176fd31e6b6827be22e401693dd96c5a3563922906d4a8109da1517c0373a4b0bdae3a9fee7c4ccd63a8ce461015acde25281ed7f WHIRLPOOL f22979cdc7373c90728f81d6b6c08d6e607f8c618809421a800048efef8080d0e56f0e007be0cc2f08ee01bf2a0ebfb13f80413eb9c1eb3c500664d86a8b4385
 MISC ChangeLog 5904 SHA256 aed1512cf6b346577e02b39d6436a367f563e9ec39b68628152bcbabda83532c SHA512 61e838df9f318637bdfc318f26bf24961fb047daea5622a4293127bc0fde39f3b5e9cf9924e5432b318577c927ba5ce10bb0850c4136b956678d9ede2cc59454 WHIRLPOOL afcf0d22cebf10019b96733874b726387f46d10ca47105d3d5b5dff056ed3ccec4ef2f3c600e72b6f19a2f3838a8b7868ba266ec0b7ff71ec6d319b0a540d31a
 MISC ChangeLog-2015 15467 SHA256 32e2040226b0e117d31e785c215e4973e115c48c9ae3a7abf4fb2291a27f3747 SHA512 103e3be672da13bff0f65fbfe43cb61437154f03f7a1a4e917d3dc768d7699cf7a8605b573c37db8dacaa08e2cc99b7ee59c8815568e757081099e779154103d WHIRLPOOL 52a16cd8ef5f2103b92bc6846224bfbc2775d0e85a6d95b185deda2d773733bd9d951a0f8896a61fb15f778e9731e9b8930a24d39c70886fdfb1cee6b1e1d66f
diff --git a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.10.5.ebuild b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.10.5.ebuild
index 212ae34c6261..d4a2916bb6e1 100644
--- a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="Wavpack audio encoder/decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND=">=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-x264/Manifest b/media-plugins/gst-plugins-x264/Manifest
index 8a58a771863e..85d01549203f 100644
--- a/media-plugins/gst-plugins-x264/Manifest
+++ b/media-plugins/gst-plugins-x264/Manifest
@@ -4,7 +4,7 @@ DIST gst-plugins-ugly-1.10.5.tar.xz 908604 SHA256 d6edc046350809c967f5b058c5c2e5
 DIST gst-plugins-ugly-1.12.3.tar.xz 903784 SHA256 e88ca584c94ea78eeecbf3af00ef7f134b66bdee7408aa4aa6c547235e060052 SHA512 9ca5769c325df3d2d97ba83d785fab08da5119f6d26c4ac4db72853af143477ea8fb7087464a8614b6e59f384463ac01087ee76cec2af8acd80a4dc15e392e34 WHIRLPOOL e908fb96fc5694c10c16b7e5aeae4a6f7945aaa324074cacc3ec10b84b53ef738ee8c77d6f0983a02e7868275ba26ada14153d7046d85bfdb57f310e59793657
 EBUILD gst-plugins-x264-0.10.19-r1.ebuild 371 SHA256 4519dcd7c6b02fed9e1ac4fe02acad8138c86cf20dfde564e97ec4a2df43ccec SHA512 fdebb49be3b19acc8c26fe33ec9b1fd86a470bab91a7e9eb02fab2e503acd83f7060ddc26e45bf3b5e79be677f916295097c9f72afbc04d2999b84de836556bf WHIRLPOOL b5a60968f847e799f86bf2cfe4b14f4798c1d4705fa5957218137b9d3ce2b36ef7fe8c527078090e5c912ff7558fa33291f047e463b16c6b9e0d9612e99f7b61
 EBUILD gst-plugins-x264-1.10.3.ebuild 425 SHA256 5c246c63eb7c658ced3bdcbefc23f086c299f7255f95d9f9a2f02d82f98a781d SHA512 906051edcf897892927c57536df56e4408e979c59a6f05c93c88687e3b7daf3c56bf8b61821abc0c111f3a4936c79639112585355019f1005eb04ec4ccd0d4ef WHIRLPOOL d2f2a518c98d65524bac90d8c8c245053a5c10a6836f0a9331ad907c5558f7ae2b5806772010f7892ab2eedee9551ec81990a73585d51c0920d88f370003f6e5
-EBUILD gst-plugins-x264-1.10.5.ebuild 428 SHA256 c1df03816ed000bc73c48c9befefd39ff8bd0fa3bfb42bf5ea109cdacf4858f0 SHA512 cc307ba1a814acd8d8a25c9f230dadddfb3eb6bb007bee7f619263872baad86bbaefb9d0ff5eed576e7ab8e82190f7d93534bd60cef6a50aae1d7da097fb2ef1 WHIRLPOOL 87764663978acd801005e2221a422bc3517f24f46619a4eb41238cc3a9af2aeaf78bf0f6d37e18c7e62f166eb878d537e406ba98f83ccfe5f8ece17cd0832b36
+EBUILD gst-plugins-x264-1.10.5.ebuild 426 SHA256 2bc3c3eaaa58900e3b71f5afa789b8fcb51d515bd7a81e46e74e7c6b10892d01 SHA512 7026fa31a792535c30c349323ebdf893491268ef8f3443f512684b6264a997e5e6cb7a0e9de3df5aab78c349815ac53daa81aee7fdf9ca2ed7745aad3f2486b8 WHIRLPOOL d694fc215b0e79d0018de7e8505f9cd4d0ebf9bf62c7837a7a701f3c92dc489a3461f4a2e2ab2eb76d7c997785cc2b48cd7b8824e2404de8dbff86b478f611c0
 EBUILD gst-plugins-x264-1.12.3.ebuild 433 SHA256 40742be4e9e064155744173ff157708b6daf59de6d30c5a2454ce7485fef3674 SHA512 4750eae96abbcd9272ef69d09fc9da45c903bd3bf8b8b56397ce39b67c7dc3b3496db147eef1bf73468a56c8f187473ff24eb9deaa383571938ffb6ad59712b9 WHIRLPOOL 4366941162818cecfec1a5bd45a09668cf7b8a24bff272b7f99261a40d46c789454a63a33d3d7ace0591bf631accad3b9e8242c5a49f22aa87a31a1c302d11dd
 MISC ChangeLog 5846 SHA256 c834cb7bad4071b452ec168d146262e0755bcfad0933478565d3fa5f39984b90 SHA512 2b1cba6e45548e83e4f80ca369fc082e08f8317b15eb0e1eb8c14eebaac3b9f87f14a43dfcc3567dc01bb7b80324295d120acb45962738714b85b539b2f0a2ed WHIRLPOOL 277299720e0f34ad9a973f3ddb8932c2033251112e9d4b9a171267034d2e2a8602dbd7e08c5ffa38dca8ebc31ebc63415c7e74536a3e749f93814c2dcb88f34d
 MISC ChangeLog-2015 13164 SHA256 9accdbf9a7be6edaf65bd540b6d00e812d8ec6de7ed1dbafa7413f803f691bfb SHA512 0010be4a35f849e3e90bfe2ed228fb61423311131d06e638f557dfa5c87e6a3ca828e22bb0a7b6b8529f17d4508e5266bd06fbd40b71d091f347369621a44ed5 WHIRLPOOL 372e0973ad11c08d45e049a4a312901452ca7787a81bceb61c20a476b0f8f0d85e724f370a189ea915211b49f6787795b363788cdb3f0e9c476827a015e64a55
diff --git a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.10.5.ebuild b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.10.5.ebuild
index 1569cd01f4a4..1692377ee586 100644
--- a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="H.264 encoder plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 # 20111220 ensures us X264_BUILD >= 120
diff --git a/media-plugins/gst-plugins-ximagesrc/Manifest b/media-plugins/gst-plugins-ximagesrc/Manifest
index 870216766a08..7ab1792bb3c9 100644
--- a/media-plugins/gst-plugins-ximagesrc/Manifest
+++ b/media-plugins/gst-plugins-ximagesrc/Manifest
@@ -5,7 +5,7 @@ DIST gst-plugins-good-1.12.3.tar.xz 3487448 SHA256 13e7f479296891fef5a686438f20b
 EBUILD gst-plugins-ximagesrc-0.10.31-r1.ebuild 785 SHA256 eab56f846adf3486d8db1a49fa6067637d048a9430d69c8da9f0b44713ac0ba3 SHA512 5d99881342ab4a484ada960f520d4b0bfdf012148fd4da5b100c9d8cca0458bef15f437bd94aad91d9f050052e9f64be1dac4056147c3531b44f8261981a491a WHIRLPOOL 73aa3d5c03aceb2c8ff32513ad6e1dcaf173e714020a1125a89ecb49ec1e8edaa4594a960f139e496baee056d811fa87e63a7809aa76a518cb8bf9551c16a772
 EBUILD gst-plugins-ximagesrc-0.10.31-r2.ebuild 849 SHA256 1912b1bcdb70ecff7db12e92dc12ea474d86b0d95cf7b08c097600b44205096f SHA512 b4b219838acaf7807a9a3d5644440464197e77b8e26b3b9085755605882845e249d7fb43071fe5540a1b8b85f844d2629a2a8a6991ff04d7ff4a9366634723d1 WHIRLPOOL ac6b1c1c07c833beafd0c2a98b5756794e8c4bbc14bcbaf47b753cb6e50d3f8853a32ab488c5884b39cdb8a1bee25d270ad95a567211241c5ca673c94aec87c2
 EBUILD gst-plugins-ximagesrc-1.10.3.ebuild 861 SHA256 7b1da8668498e0b2a968afed37a9b11dce0a7597a309835778c66660dbf1c8d9 SHA512 4fc077fb27a2324eb69e0d00da96060a82f19d1cf34719c8e35e0b547ee105d4aefa4da951bc57323ee746aaf7ace92301c4270f71824cb5cbdc38e80edc673a WHIRLPOOL 938c3ae1efa1cf8710c8e670cace6b30e2e04e63d1978f0352a22a3450dc4b542c24b613f900210bf4c1e162223f8bf3bdb11dcaf926ae6d3d533f92bf1a19a7
-EBUILD gst-plugins-ximagesrc-1.10.5.ebuild 863 SHA256 3e1a9d26e435287891964a19180efaffb69a9ee8cd68001d6f6e5d77890e71ad SHA512 9d9ddab78812957c417f0ca8f9c776b6421d93b0ea4933a969e95324d4fcdc90b8dd3fd459e3159c2ee90cf32a5b293125f1e7a7f3e7d08f138362d44ccea9b7 WHIRLPOOL 11cca5ce232d655eb9a45cd87f1f293b699f59ac3120c1b35fb2d51dcdaf4dc07df0fbb90121ab7961ba30f7e1741f2be996a7b64f621dec970a215605a405d5
+EBUILD gst-plugins-ximagesrc-1.10.5.ebuild 861 SHA256 7b1da8668498e0b2a968afed37a9b11dce0a7597a309835778c66660dbf1c8d9 SHA512 4fc077fb27a2324eb69e0d00da96060a82f19d1cf34719c8e35e0b547ee105d4aefa4da951bc57323ee746aaf7ace92301c4270f71824cb5cbdc38e80edc673a WHIRLPOOL 938c3ae1efa1cf8710c8e670cace6b30e2e04e63d1978f0352a22a3450dc4b542c24b613f900210bf4c1e162223f8bf3bdb11dcaf926ae6d3d533f92bf1a19a7
 EBUILD gst-plugins-ximagesrc-1.12.3.ebuild 865 SHA256 9d63bdbd334bf099db67b0ca8cd510972c464a3605762568713afc98f0934dae SHA512 1afb845b103a80aa66cd851a3a79c10c97c5743ad51da213f52fd8f43b686a135da69757e86cd5ae5c14b0e35ddce9b28c1f2f26ae5c184f54a3276c6614f587 WHIRLPOOL 57cc004c2ec2e414cb37a36327dd0bda4b39824d7bf435bf2133e7d6b1141644e3e269c1d4dedbb231b62f39b93cc92feab2d5b2c6324321b84ff85835c9b14f
 MISC ChangeLog 6452 SHA256 f1b38cdd455ed3e1104f585428b19455cc6d6292e6990f3be141b4d4f84f83cf SHA512 d8e1dac7ac2257ea6a5ee5304a48f68003079e4d8e6147f54565038a2d9ecb463ae8fefee6f82608918542ec60c17ec7f902fe999de6de3505b56112de42c021 WHIRLPOOL e455cd1f2ef75fdea5678c95672690b15c963dea1a057837db2e6f37bcb2852f3f1e8baf9c95ab6e4194451bfa206d4bebda48ecceed8fb0a2848b67e0b3c0e6
 MISC ChangeLog-2015 14307 SHA256 1734571211be6f21d76dfa63cab8b5f27f7e9f8dfaef5c0c560fe55412eb2c5b SHA512 28646505c2783b0b2330e7a3be6ac34e69c1d299f53390e30b1f6e3ebf367ac6cd9b42caa2f6331ad951300d6c2193bb5b1bb712466113224bc11a0681fd644f WHIRLPOOL 18ab045f95e2cdaa86e1612a7868cd406f75dd3cee83880a114544f762912268fa7e34990098a011080d8e7a7eccdd5bd66e7c341d301a504f1216ed1082e4d0
diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.10.5.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.10.5.ebuild
index b7788928441f..46d150ccc6ab 100644
--- a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.10.5.ebuild
+++ b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.10.5.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="X11 video capture stream plugin for GStreamer"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/qmmp-plugin-pack/Manifest b/media-plugins/qmmp-plugin-pack/Manifest
index 0f1e224f1254..f801dcfb5d87 100644
--- a/media-plugins/qmmp-plugin-pack/Manifest
+++ b/media-plugins/qmmp-plugin-pack/Manifest
@@ -1,7 +1,9 @@
 DIST qmmp-plugin-pack-1.1.3.tar.bz2 83314 SHA256 e049920ec6cb7adf296b603c4268f615203e6c1cd0c9de2440b5b141e2e88377 SHA512 05d412da4b0c892b415c7e6a8248c90196da5544be027fac32a051c2e3a187f089e57086ca6858d7591bc7b81838e2ac5e4019d418c95ff3bfb4f7a100f8ecae WHIRLPOOL 460b5f7bf81278ad729929e38b4eb345759c918b41ce5e36ec746d25d9d5c267607dc9401f873d15747e1a3100bfda5cbf02bc7fc085d41ec77d5289f8a3b359
 DIST qmmp-plugin-pack-1.1.4.tar.bz2 84240 SHA256 029fba40353f6b883e0d662c65fdcbf9a23a8f081c1a9438f2ba6772b40d4ff5 SHA512 a7179f87b55279965107bc70f28c1f842a2eb249bd1897ee171b5a638eafebe3cd74da68ed512652e17c41abb7395e8c4ba1585c08d499fbf5d016522c60ea4e WHIRLPOOL 53a61c846a18c9bdea6072e99f1c0b80c0a34bd0b5ebcfe69f63e9936391e2acd07eb59c1d54454a845adad784259db042ecf926e5340035c6dac35bd3cc47d1
+DIST qmmp-plugin-pack-1.1.5.tar.bz2 85567 SHA256 c25b4ad3a8e03ba98dbafb48a0a99e597e998f78cd1c33174e4ebcd7ac749bce SHA512 5a4533a0332509ef527e8876ca450550cc0b5cd9edc3feca9c3a13168e6ed57f9f1d43f3601bab7cad5f07ff16df07f7b4270b2b14818c143fabdf2359f8391a WHIRLPOOL 1b1766846e5203b94a7941511ac50502562c86732357b260ada83333bed3c57e4960daa031b7e4c82560349f887e808ed5ad0ef0b2a2edfa82eca6f63ed08258
 EBUILD qmmp-plugin-pack-1.1.3-r1.ebuild 607 SHA256 964d6fad80f6bba8e3ed8a6651249631a266f17f13b7d63fc8419905de59ef16 SHA512 804046131cd3e04767c0ced665afb883d12e06856334d2a314a42c1d876dd47330e4274679d7205e09794d44322b900e0c085faa865678d1d8f71d776d6563f1 WHIRLPOOL b2ab668b036e1bc66d5c3f2ba3ee4d694d4c73ee059eaeb665f8eac13139894b7f73c06a317ceff25fcae6a43164cdec772d7122c2fae041916b8f5ee43c5ba0
 EBUILD qmmp-plugin-pack-1.1.4.ebuild 609 SHA256 4d7abdbdccfe4680aa03f01eb3ccfbc546df82f15d0ed2113dc6ae489263ad0a SHA512 e08386069afef17b29f0b1fd3879aa5d34d9ac003dc95c45e7478ee4c4cc482c9782a225b1d7cc5e20ec5bab39409abd4507b19734189554df7bd2c79087c6a3 WHIRLPOOL c919c03c650efa3a35d2021500a73e0fe80d2d1bd0b905dd221d12740b8fce2dd13864e8e4324c68c0ae55f74b3db3332d01ecd9bc9af133a0c695a4a09ce898
+EBUILD qmmp-plugin-pack-1.1.5.ebuild 609 SHA256 4d7abdbdccfe4680aa03f01eb3ccfbc546df82f15d0ed2113dc6ae489263ad0a SHA512 e08386069afef17b29f0b1fd3879aa5d34d9ac003dc95c45e7478ee4c4cc482c9782a225b1d7cc5e20ec5bab39409abd4507b19734189554df7bd2c79087c6a3 WHIRLPOOL c919c03c650efa3a35d2021500a73e0fe80d2d1bd0b905dd221d12740b8fce2dd13864e8e4324c68c0ae55f74b3db3332d01ecd9bc9af133a0c695a4a09ce898
 MISC ChangeLog 7220 SHA256 8153dbf9fef8d3c9b6cb8707671c8a5815ca7f418a837bdd860faac1d88ef215 SHA512 470a2a54c351138880eaf6f49a46bc8ba6494fad87d36c308265092201efbab0fb68daba65294aa3c856b6e459ea725197f371918740b7f784d5c77e5ec9b756 WHIRLPOOL eee1b10c466c9b741d50a589478e2dc463b141f7d6dc776845dde79d80140cf6e2527eadded6a07cf4de18c7d03f16e8d16605e3b555e3e3661d0b672cb72208
 MISC ChangeLog-2015 5128 SHA256 4d64c5a5d82c41f8726e9c74a28d0f5879a34d5f5e7b4871f5ec954ddcbe26e7 SHA512 144f821d9713cd5527b0132289dd26612e68842f88e9385e4174d74446b8dc6c4e6ca5255bb9ffecbcccaf85447eac95452187a3c3560e9e8026640be5eaab07 WHIRLPOOL 1497dd29614400d84570b257a52266c0f2eaf4116c3c09b162b6b9aa99a353d316af546ef40b390d9555ae24bc6c052c41daa9a6afea361e51ba5323a9aee767
 MISC metadata.xml 364 SHA256 05588859e11ef93bd63f66f76ae31eb05d7e6090eb6e5218d3c327ff55b34c42 SHA512 e9648b0c756fe89213e4e3e20ba85562794c495a2112a66a68369d6c6f3f20a420edeb4a00c27ba4b4e3306d8beff2e6f9cf63ab08fe420e342c31fbc0f9d222 WHIRLPOOL a3b317866a2bb234836483901024ac136ffa6363aa37d25216e142888589fbc88ffcb138d0d5b41ed916622c81a41be3564dd5f43440dcf47c08f1059613b959
diff --git a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.1.5.ebuild b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.1.5.ebuild
new file mode 100644
index 000000000000..49e69f5a6e3c
--- /dev/null
+++ b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.1.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils versionator
+
+DESCRIPTION="A set of extra plugins for Qmmp"
+HOMEPAGE="http://qmmp.ylsoftware.com/"
+SRC_URI="http://qmmp.ylsoftware.com/files/plugins/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/libsamplerate
+	>=media-libs/taglib-1.10
+	media-sound/mpg123
+	=media-sound/qmmp-$(get_version_component_range 1-2)*
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+	dev-lang/yasm
+	dev-qt/linguist-tools:5
+"
diff --git a/media-plugins/vdr-lcr/Manifest b/media-plugins/vdr-lcr/Manifest
index ba5697548509..7ee5e265b81d 100644
--- a/media-plugins/vdr-lcr/Manifest
+++ b/media-plugins/vdr-lcr/Manifest
@@ -1,6 +1,6 @@
 AUX vdr-lcr-0.0.9_gcc-6.patch 2839 SHA256 442232df8271cbaf3e040bd3ca70ef53ad6eaaf233a3c81ab4e08fc41edbb5c6 SHA512 85e3c1493c56c8fc17633fec9549e69aa569ec5f2b8783ff3a97a99e90568186f4ae6f5e2e4558a891f3f10064403d2747fd5487ee1246e106270e4f3fd2f0b5 WHIRLPOOL 8feb19bc849a0ad9a6dc907808af38a6b3cf1103e38e4adf7d762712b7c337560858b717ea66101574f565986e1c190b5ebeee918e4772c955ab16565f9e781a
 DIST vdr-lcr-0.0.9.tar.bz2 33314 SHA256 35a80d3662483fd2ed94ff5edb246dae4ac2e6b69bc03376028b3e19f9e0dd7c SHA512 b300f465b3b4fbd0cda33450f6408406d40a952d12fe7eb0fe9e5cd226765e79576550ee78b4c74030d4d32adfb70b2f05711dbae9e7070f9455c430b9c19582 WHIRLPOOL 5e34c65f2e2de30a9420344da4d951e3885e9b924eab6b3d58533381ee4301051cd95f1bcd49abd2d298fc81b365eda4471ea6b72909910034b7471e847873fa
-EBUILD vdr-lcr-0.0.9-r1.ebuild 886 SHA256 481e75a4b4fcd85b7a15b21c2fd8af2c34766848b39358ac30e556aa0963489f SHA512 3c18732164e1d2187b866e712f5ea68ecd497a0416558455e53e2c4403009f240134d4688cdeea2236122a7379317439f0b3d33a66f8b77a1ff4e9196c615fad WHIRLPOOL 2faf7a559907bf048159f7d25085ba7bc5cb2fd4c7649f94477c576d4dba57a7692a3211da32a675352899c1f67bdc798a683cce05ef08ea92898264993cd7fa
+EBUILD vdr-lcr-0.0.9-r1.ebuild 885 SHA256 a0669f3cc9807c5c30a959b853d829f8825b2fa93434b68a2dc23fcd33086832 SHA512 5de9c8fe8c922afb9b5d2ef6625b9075e4dbf7c533be0dbc655afa2226732a81eda4974f63b2f83a8a6d38edd55187ce1dac9a0f7d411233323462ad8556984c WHIRLPOOL e3e1638f0ef46e7e554d889f43ce90581b3fccc7fa2b89083e4bf6fce60b7bd2e97cb37d0db6878eb376409721448b3c464e83c6aff9b5b5572cd9317c68e727
 EBUILD vdr-lcr-0.0.9.ebuild 832 SHA256 59b067220c562c08b4dc5cafec5bf2abda328fb92ffa65abbdba6ca4286c7b3a SHA512 80feaff208bdddcc1e8d0669d1dbd0c1ff7972aabbf8ba55dcca77a4f1b0a716b46be738e520fbc4a3280ce63325248c791248adf03861da1fb86d73ea606400 WHIRLPOOL ae86b082060db7bec91d6efddc0108f75aa5be193882c1c681765da7b348730c329c0752d89576a690fe3f94034e1106a48abe328fe496314959c65dc7685329
 MISC ChangeLog 2672 SHA256 78853906490a34377d1b3acbe9fdb6ba145ca485d5b312b1c1d0617f568c061f SHA512 8d8fec89c270cc4aefce6f1239fb26e1dc8e88867d866119295c66d2af3af8a4928bf2d68a440f7833e437c792f9db0235222b9cec01aed505ac09d7294eb1fb WHIRLPOOL 337231a57f823536fe3250e956820fc1114d467a62990bdcc86c5f166292a8788b6cc0ffe7fbf774b0d1a880b4acace9365380d0e135d4745670897f7e34ea5f
 MISC ChangeLog-2015 2240 SHA256 9fe4ae3300523f37d03400ad3798363c252d172c7ad88f6b3d44d2e08c69bc86 SHA512 3f9dbf19358395f4dd9b67ad5b0b6f93680b597b7743036040e701335fef8ced20683fc69a770510a66328df0b1fd19bd6c970d77af12992d26609949e1bb62f WHIRLPOOL 98b5e315bf064e5079a60f5c652723f670cb640404b9dc1dc0253399d4f0384097b44acd411c489f0ebb85cb440033d7265ae50290a6a9b4688b4698857c26c9
diff --git a/media-plugins/vdr-lcr/vdr-lcr-0.0.9-r1.ebuild b/media-plugins/vdr-lcr/vdr-lcr-0.0.9-r1.ebuild
index 57fa18fb2f60..b8d8aa769cf4 100644
--- a/media-plugins/vdr-lcr/vdr-lcr-0.0.9-r1.ebuild
+++ b/media-plugins/vdr-lcr/vdr-lcr-0.0.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://lcr.vdr-developer.org/downloads/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND=">=media-video/vdr-1.5.7"
diff --git a/media-plugins/vdr-mailbox/Manifest b/media-plugins/vdr-mailbox/Manifest
index 9dc5d49a0802..3881c2f05c01 100644
--- a/media-plugins/vdr-mailbox/Manifest
+++ b/media-plugins/vdr-mailbox/Manifest
@@ -2,7 +2,7 @@ AUX vdr-mailbox-0.7.0_gcc-6.patch 1247 SHA256 bc620815bd6b71d13ce6ef81d83c79200e
 DIST vdr-mailbox-0.6.0.tgz 176093 SHA256 af0e776cfd967163e09fc442dbf9a2bb3ad26e9f5a5aa95781775920fdbf1a41 SHA512 7a1fd4d21198a8a52caa1b47aa1700e66751fff7b4b53aec09561c390d38c918d0de7822566d8f4b6add83fcf421bebc0faa3d7feeb8b815d0080be51fba60c9 WHIRLPOOL 02c67c3b1ab1f892f46d882d63b5e988bf7fe147cb7cbdf58d3fdad208f23b3e9aea6b8a693b455f74021a3797566bd82ed9f299cb5e558538a8913172fbbf8b
 DIST vdr-mailbox-0.7.0.tgz 171886 SHA256 d1f5af5f6976f2a0af9ad99ac1fe60e4244269b58d36e59de808612709e4ed76 SHA512 ec20b675e9c92fd2e8dda1e2bb1799a6b725e0a8a879e9f45f3876bf2ef2a85fab3303c94db669e6f259cf6ef83cd417260fcbca5290c74c59f5585a1c28be3e WHIRLPOOL 1eb715b1e52951f36cb10157a345124301bbde4d42bc5120155a0432106a8aa5f54773560ea4f077eb21a08b85363a9b4955a887d3a4be7df6d60dd280f725df
 EBUILD vdr-mailbox-0.6.0.ebuild 412 SHA256 40d55fe7f26d0292ad2d0857e7e7493036f0a0adff1043f79502f64945555322 SHA512 97440d99db88f8c034fb0284b421e53a1825ba700a5b42546551bbb2fc165ed7c3b76f9bee362d85a5f520138f58779dacfd9b2a7ef428231b99fa1931429838 WHIRLPOOL 54f419dedaf13a60976840379ea044d8f7e322fb6bfec6b5705b5b22bc675d831abe8541884b7653177a26e00fb6db6a02ecfbdce8f343af8e67151d7db3347c
-EBUILD vdr-mailbox-0.7.0-r1.ebuild 502 SHA256 a4cd5c39b41f51735241fae11978ad4ace32ea58087a808a8c639a69163759c8 SHA512 c5b539b5265c990fc26aa736aef0aae52ca600d20b27de91734c5e8620ab35f8a3a7fd11ff4c82511b62694f15ff407b7ca46158a8f736892c7ae1092ceb17ad WHIRLPOOL 9bb200bbe75260ce2f86228b918e96949a8eb7e8a122a8562a9e4df4d59fea362e18ae000c46c3af0d7f61072d2a2768d1dbedb23410ba7e0756ec1e1e27cf88
+EBUILD vdr-mailbox-0.7.0-r1.ebuild 501 SHA256 9e0162cc70468b8005c27040f73dae3986c170724c7ad33d8e8b7a8808a5c430 SHA512 65aa5f87b9d046349f51dde11b257ed294d54a5e46fe6f956d0045662bec1458e2de06ec229ae21e0cc092646dcda2b2bb8fe39808f8e8f303b32c4a646c121f WHIRLPOOL 2a8af9f0098eedc356eeb16c4fa9a985522b70cff64880c4db4a4affc191675188d1465f3fa07c557db42bfaf13942ac0b8fe3a958563fd1ea4d03b65729975b
 EBUILD vdr-mailbox-0.7.0.ebuild 458 SHA256 7733be4fafca5af505197b677cd2b7f09390d4dd434cad169bd72fc2003f5b2f SHA512 322e1294a830abce61c00d49445a5f02066db6ce0f36dfb85aa0aef806bf38a99967160dd26cb52f0afa238590024ac3a4df6223feb31c163fa3f81b16538621 WHIRLPOOL 35e560f831fb0706f292e7fa5958b8c25932de71f6abbea719c356ce336fdd9c1bd95a5f92083a870e26af605bd99d4c1f10355ab51b7f0b2137d26d2741de27
 MISC ChangeLog 3283 SHA256 7cc04598a95d1bcd57c398ba4acb3e9073733fdf0aee3956d5cebd159955e962 SHA512 a2bce153b7fad9382f03e154f3371a52954e919ae10a06ec852ee8bd0b4b316d8a2f1a85b1800e5a7bab2d1e856ba655ae0b6af904d68022f76925a13e3d69c9 WHIRLPOOL 84af3e4a935f8eef213b0828085b910e3fe5ba3762a5fcd9594c73a6ebe422e0ef97bb078e6a0287cd49cc13b14b493265c530b53425bfdc8f8f9df2ae50bc73
 MISC ChangeLog-2015 1675 SHA256 ca299392966c7a930594971756c5c8f0daa439c154b7b3b8daa5611205ac82e6 SHA512 a0e0d027a3eda5fb741e144a0d3c0b023a83f9f4db44ae39afba81aa494507db5c0526afa1bc006c95e348163f998fa78ad68956598c17324ea2d3ae8f83dde5 WHIRLPOOL a787c92131a9bf97296f3b5ed8abbbdd1726dc54b642aa14c5fbf6f7379512bea1dca5825f0821c57261ee5ed1123586100677a9e1dfd2d58331e0d0fcf92813
diff --git a/media-plugins/vdr-mailbox/vdr-mailbox-0.7.0-r1.ebuild b/media-plugins/vdr-mailbox/vdr-mailbox-0.7.0-r1.ebuild
index cd219661c45d..06304bcd3c2c 100644
--- a/media-plugins/vdr-mailbox/vdr-mailbox-0.7.0-r1.ebuild
+++ b/media-plugins/vdr-mailbox/vdr-mailbox-0.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://alex.vdr-developer.org/download/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND=">=media-video/vdr-1.7.41
diff --git a/media-plugins/vdr-rssreader/Manifest b/media-plugins/vdr-rssreader/Manifest
index d295af763baa..fcabbb6efea0 100644
--- a/media-plugins/vdr-rssreader/Manifest
+++ b/media-plugins/vdr-rssreader/Manifest
@@ -7,7 +7,7 @@ DIST vdr-rssreader-2.2.1.tgz 26518 SHA256 ebad68c40e434b1dbe29cd202f8a1def56b742
 EBUILD vdr-rssreader-2.0.0.ebuild 637 SHA256 76fb964521161684ef9716e493c40f6861a9a26f7ee36e293cdf3ded1b3a3d98 SHA512 d836531a0c0e39b0fedccf210732e3ccd4c807c9b08214894be19a5a246ce51467331a255505d8f19999b1fa56cfd4e3adb0af75acc301729a13cecd67a00476 WHIRLPOOL bf3b4a1c74d1ba02c9d86beb3891166d50f7f8402d87b520ca05d9cef07876bdcc5eb78ce9a5a238609b8d964f3d77ca6ba4bb19c937d11e3b7f176a8fbb3534
 EBUILD vdr-rssreader-2.0.1.ebuild 646 SHA256 5e992fcaf517c24b7f6e56e5cb65cd6c60e1bf5ed8474c69a1f9f7fbfef1fd9d SHA512 c22670c2adf398007cc5fbc8eccbb54f5bce43e4fccfa2f10abc8d5f9cdb74577a94bbf640c8076429c7afe2ba36e5430c404292d2149d17fbeb2793bf080fe7 WHIRLPOOL 4c7cb3ee008cf716a3aef45d10ffda0d5f062efe29c47e98ff2501e94bf08e81686b3ac25a05ba70baf4c0415e13d03c608543228bd388a5c21db050a0259616
 EBUILD vdr-rssreader-2.2.0.ebuild 646 SHA256 84f202e96a7549db6780cae0fcfff44480c5006282814f353bc5deb724f6c6ab SHA512 af7b583cb977265a3134d8b9ddd93fac3d2bec5e649d92d87bd154624af9ef6f9c60206de7b5734aa6b9fcb4170de9f913d0b293075941a392af2d31a933fce1 WHIRLPOOL 1d1f4de68800ddd95bcaf2972ce0166671adf3f009a4025c5460a05bd5940d66f7ce4c8298dc3afb073ea5777b0cf1a6153a5d020620aea1c9ba283917a4fbe4
-EBUILD vdr-rssreader-2.2.1-r1.ebuild 680 SHA256 8ceb18d85cb99dda7db5c42a08ecfe8963207566b6d481e0f4586711f9dc8bbc SHA512 bfa80f1269dd08fb0cca0889bf2fbb1e44b62e815e303bba627643e3a1e371f4db77873659ec5a74a1b4abcae31ad1e3b8cffa9ff5d0a7cf89d921e6e8c3467a WHIRLPOOL 1bd23da2c73465d717b0b4e44597eccecd8692e6aaf89a8e0b8a2fc1648f5facfad7db00f7502843408bf7036c60a1bc4598a23972960d7164fadb02414b8440
+EBUILD vdr-rssreader-2.2.1-r1.ebuild 679 SHA256 5fec6a85eed279cc33f8f6a37e4b54e7ac94c3d3c08b68001258293599787503 SHA512 b70ab95992a54257c6a5d5e85ef3ae5fd2a54b03b1d9d46ee5c43ca157a384972387ee79dfa4bf3eaae1dcd4ff33fe5de9bdaa6c3a8311e155c771f6d0a37d65 WHIRLPOOL e03d681aae976e28375eafc11c3bc27cb537392122cc442889a1ab78886e325cdc8e5aef2e069bf23374b3a22c7f5b25c03a9e76d0a318ec2d07e0a49073a068
 EBUILD vdr-rssreader-2.2.1.ebuild 646 SHA256 84f202e96a7549db6780cae0fcfff44480c5006282814f353bc5deb724f6c6ab SHA512 af7b583cb977265a3134d8b9ddd93fac3d2bec5e649d92d87bd154624af9ef6f9c60206de7b5734aa6b9fcb4170de9f913d0b293075941a392af2d31a933fce1 WHIRLPOOL 1d1f4de68800ddd95bcaf2972ce0166671adf3f009a4025c5460a05bd5940d66f7ce4c8298dc3afb073ea5777b0cf1a6153a5d020620aea1c9ba283917a4fbe4
 MISC ChangeLog 3423 SHA256 fd58759ca48187466c0f9483bb591308664d1c2905299f0d04eb4bdb332e50f8 SHA512 675ffa4a11f466390c144b8939e2dac7cbcefa2a814b2026ba732062a84e671aed73b12a1db7955fc75d5e1c346590a73875460341ce3f5ef94656b1d1990152 WHIRLPOOL 242ad9f75a2ee12cf19108d81a33d111df4154a5dffa348ddc8ca5ac3950ae62eed47c2fb783fff3fbb75187be5044a5f2ad900a2499c853b96c98e0e8d2c0fd
 MISC ChangeLog-2015 4304 SHA256 05d95c5825b52921623e63f3993fb7ba6d2eb58c13a422b22befa8d392110cef SHA512 3e3fffe894c129bfabd0bbdc57c77b43d41fb8111922c8a1d1be48414d22cb2bfa3006448111ea00e74a23cd2a0f7160ad4904009313fd794035f869c10440c9 WHIRLPOOL d41d017d2425754655dd7bd85e7eb170ef33e346a40db5ac146acf72476ccbd8e5e1ddde3a01f018920dd9f2c852ba73d3e303b06f4a17472187a3f441f22cc2
diff --git a/media-plugins/vdr-rssreader/vdr-rssreader-2.2.1-r1.ebuild b/media-plugins/vdr-rssreader/vdr-rssreader-2.2.1-r1.ebuild
index ae6a0805e41c..c79e21ec81d0 100644
--- a/media-plugins/vdr-rssreader/vdr-rssreader-2.2.1-r1.ebuild
+++ b/media-plugins/vdr-rssreader/vdr-rssreader-2.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/files/${P}.tgz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND=">=media-video/vdr-2.2.0
diff --git a/media-plugins/vdr-sudoku/Manifest b/media-plugins/vdr-sudoku/Manifest
index a9a2d2b708a5..2dd7cec1efe8 100644
--- a/media-plugins/vdr-sudoku/Manifest
+++ b/media-plugins/vdr-sudoku/Manifest
@@ -1,6 +1,6 @@
 AUX vdr-sudoku-0.3.5_gcc6.patch 621 SHA256 4b721dd5e58c21062ed8b70d0695e0847ffc78f7495047cdf0fcf2b26a534c1c SHA512 571312f6f2d4fc34eb7d568bc940ea9a76186a79b3d1224161efe36e11249263bcee918b78b3aacddac15599039c447b85bf1931e9c7e49657b15fc73c85d371 WHIRLPOOL 8bc0dda634ff90b2b9b7c3637c3acb6117dabfab05ad45a95f1c9e28771c7b8f8a41337fb86c556badfd22ddeb101dbb170f43c31ec8d68740977161030f7f0a
 DIST vdr-sudoku-0.3.5.tgz 56706 SHA256 37e2c77c15579f5a8dde928f96a68553b18c2182413891f66ebc34f7b93e5b71 SHA512 142a944d31b59c757281cd7dd80985ef22b18b9ac2d8d99ff5d6b60d21d80e28c8b8c9e37bb0a75521857d95817ecc6ba6f305b3d83adf59f3f2e08c39992fc8 WHIRLPOOL 44fca0ced981594cbba288c87a09a91cd1e81e3973db7362b8cfced26a3ca7b7e3c7a522d0f689ebc428d64c9d89518e498affef6e278a359eb1db8443cac051
-EBUILD vdr-sudoku-0.3.5-r1.ebuild 547 SHA256 f60326e2b925bc2c5a6c3394bfe4409c021b8e884eb25719f24bdb18c3576758 SHA512 720b1808a44b5b14a4644374398e41cef6f36b8d46a8a8d881455d5f8f26003fdec3144ad2b552847e60e8d36000586176cd922a8f47bca3bed5e682e6f029f8 WHIRLPOOL edb4429182e932a2e787e378df7a44ca4bae543130a30b984cffec32ee0ba7db65f96b57e4cbd1b5492b523fff3aefd2e83b21af991371ca2b13785293450454
+EBUILD vdr-sudoku-0.3.5-r1.ebuild 546 SHA256 d2df096c5e5755bc46c6eb11fbccc9f563d83c5804dcd071980fbb35596559ab SHA512 dc714c05d1640d2c2fa9ba4cf26f0f5b3e6a4037232149da490cd667484f339c873e7c66fb620db087a1979f6088ecf957cd2f74fb0ad712b182b724471b7ab5 WHIRLPOOL f5fae7dcef40433187c95df676a0a83416a6a6a1abc34cfe3e8c924751a0e16e6039488b21f01173156ea8ba2cab8cf78d9ecc9332502179f752d1e26fa6675c
 EBUILD vdr-sudoku-0.3.5.ebuild 502 SHA256 99732e5c66d9c47e83b8f1295b3f9ad7a1a509cf5f7533aee6aec247e2cc9c14 SHA512 c0843ea27b896ee8fd842cf8cbac941bfb201c48e81ca3cb51e20021aa7e169fe904288a0c26702ea549d1e4395c11250b5e0091b30c4a4c8565d449ff65b5b1 WHIRLPOOL 8bb1f6a60e33afbe7c86c407ecaac518630fdbdcabe773702f2ac85c413c39d972162dae7b187b017037217e3a133eccdc439d8250461a7c3111a17915b7ffb7
 MISC ChangeLog 2726 SHA256 8eecc23de810aee3262a0f5f2f2dda701a610e398973caf56bedf48e32357e94 SHA512 0698e570dda311d0a2b61e3d04db9dd508da10c8e03ae13bee5bde517b610e973b72bea3d24f3acc8f0c1ef32c610742c82c0a5b3a864f45e2a2f53390c71235 WHIRLPOOL 28c41fa44ef0813ec6a574cc241098ba7724888e017529ebbc2783ef07f20468e703ad1ca9af98fb1b0ef2e8b9f0a43e3554de621c45d1b97a1c5696254bdddb
 MISC ChangeLog-2015 3623 SHA256 003336a62abb056f65d7ef7cf0e9629bf941065f3c2334101bfbad076e9d57d2 SHA512 f61ebd70111616df600018bc9307840eeb7623ef02b9fc27cee9274c8aed3855948c0782f30aa3181c027a33f90ee757794579b53b19dc82d09beaa825cd05ef WHIRLPOOL 5f37a11abcecbac01eb5616691479f5b18100812fbc339f91e17f67aa668cedad2a536281986822aef344676462438857355bd439716b2a8025ce7f243747e49
diff --git a/media-plugins/vdr-sudoku/vdr-sudoku-0.3.5-r1.ebuild b/media-plugins/vdr-sudoku/vdr-sudoku-0.3.5-r1.ebuild
index 49d5e6a95e06..c4e03eff2560 100644
--- a/media-plugins/vdr-sudoku/vdr-sudoku-0.3.5-r1.ebuild
+++ b/media-plugins/vdr-sudoku/vdr-sudoku-0.3.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND=">=media-video/vdr-1.6.0"
diff --git a/media-plugins/vdr-vcd/Manifest b/media-plugins/vdr-vcd/Manifest
index 920da95e81e1..74dde73f8927 100644
--- a/media-plugins/vdr-vcd/Manifest
+++ b/media-plugins/vdr-vcd/Manifest
@@ -7,7 +7,7 @@ AUX vdr-vcd-0.9_xgettext.diff 7167 SHA256 d8f15a2bb3672d3aaf1056b6b34148861167bc
 DIST vdr-vcd-0.9.tgz 33687 SHA256 2bd719062db928f9193127a0936c1892cb8cb19b3c88e32a41cd9c25e411c37e SHA512 d1d58a5395877da38ee16f6b338e957781a4369497b9a3f92b80ce8b3577eb4a2387108d1da8889c3195b49c3b0f0e6baebc9c1868a35d7727de0c2b6e81469b WHIRLPOOL f47d7bfe21157168d4236431fcc9536b697e4f96cc58898ced746b62617115d5e91bed3137270832b4a42345571347bb10b1e90755f23ddb678fccaeb32c9929
 EBUILD vdr-vcd-0.9-r1.ebuild 667 SHA256 06d5c96395e944b67dc685ccd707296f8c559c223207299711e6785daf90a316 SHA512 96f9ac3fda69c368ecd50052b3fb8465c61ae2c61ab303aabce73915e5a06ece384908b282a0adbba1451b4a3ad999c5164a6418f6ed224aaaed15ef61bb314d WHIRLPOOL 8071ec311cee59a4040e9fc9fd153951a35b282e251d0a131fb53addf72e053c8b05bfb30ed6ea5c215df3d77a236cb241b469aab6f5dc1dbe4aad276fea2421
 EBUILD vdr-vcd-0.9-r2.ebuild 710 SHA256 09b9611dc3ed40c228a1d2a46ca420a5c7077687a4076a9593c846f14a7da49f SHA512 18b15b53b93921136f0c5433a92adb447c87d23a0f5956d0dcce19682f63b65264e34e3f432caebc5cba340b9d89c44f36b013476f2ed23cb20fb1e0144a0701 WHIRLPOOL 456afeb3bb4e47cff7118d7ccf6b50062263a7321592618b2782f28573103f57bbe9468ff0dfc2f867704ca6504db4553851879e9f9ac77dd6ac4ad20aadb786
-EBUILD vdr-vcd-0.9-r3.ebuild 743 SHA256 9d4a6298bcc8aee24ea34243dd96df144b8c3450816770ea8941876370639e9c SHA512 a7c4a453ac1927cabd521fd44ac314c10fcdaa5c9a58e624a9017fb315b57c54c0bec573e35ed6976827622cd6bc1eb2ed94f77a83045159ae89e50e855c01ee WHIRLPOOL f161ddab9228281e2d82198363c59f4f2dc57ab104720cc301cd4e3a4cb7e3d6f2f2177c17e0a797cb617015b5147d4ad16031c975011cebe64aecbb84e2cb13
+EBUILD vdr-vcd-0.9-r3.ebuild 742 SHA256 58f57537162c94c4a8d89aba87d4ea5a5abecafa6369ac88311959e86bd4d356 SHA512 ce05b1db012743515bb96b4a4eb8b7706fdccac3e39f150e6d1dfa03ca5a4179bbffe0a4e7b557ca19a975bba1a8efa9c04cc9669edb293543e63627c66ee021 WHIRLPOOL b4139c8ba9cdce57733a0942a60a6233710a7228476dc885bb26d70f8f39b3be1c813d411127446ce813bdca41621d4eaab071820d906425a7b3b383cd6bbd20
 MISC ChangeLog 3540 SHA256 d098c0bd2b0633ef0a88a1a1d82be9ee0b68b829e1a8fe317fbbff4ce79449f3 SHA512 ec47e4c0545258f15ba200f72539fc66abff53eb1a65e1f9630a166b2f9c15b065f1ceed072bb89764259eabdcff4fc14ad3101b4e8bffa749aac5951f5cc6c1 WHIRLPOOL 4a663d9484b6d41d28cf78a7db8a308eefe26f37090c509ec8b4839704269bbac196e3494b1d4bbd168b2352b3af9e62175fada6591a4be61b368ca6d3015507
 MISC ChangeLog-2015 2414 SHA256 e599ce9c9a9b0b6c3662b71f39d71e9c36b05866457f4f61c2618fa7ebaa3bd9 SHA512 35a074457636d834df80f6cd1d862ede2f4095b58cf15a5e2f6c253adbbe18b1a2a2bb45f56cc784f52d31627d7616812d59985c83452910bddc0c9909407fec WHIRLPOOL 14b02631f78b408071fd0f075ab4d15a686681a9704711ebc5de7e0a6def979f774f61254734b776e1e2a9ce9d5621633ce9c6ed0326d4c08e009e992889e929
 MISC metadata.xml 243 SHA256 161359b6e9eddec137a431eea66785e070bbc25fab3ae1b57f900e411fc37fe7 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06 WHIRLPOOL ebf59815181c251040396bb44206b875f6d996abcff030fdbf8355b47d6ea8c4f2669847ea1af194112de469258d7ca09ed77b682924ca495958a65f957dbf39
diff --git a/media-plugins/vdr-vcd/vdr-vcd-0.9-r3.ebuild b/media-plugins/vdr-vcd/vdr-vcd-0.9-r3.ebuild
index fc253d9b65f9..64dfed857f61 100644
--- a/media-plugins/vdr-vcd/vdr-vcd-0.9-r3.ebuild
+++ b/media-plugins/vdr-vcd/vdr-vcd-0.9-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI=" http://www.heiligenmann.de/vdr/download/${P}.tgz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND=">=media-video/vdr-1.5.9"
diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest
index 0df96616947c..b60cda2b1d36 100644
--- a/media-radio/fldigi/Manifest
+++ b/media-radio/fldigi/Manifest
@@ -14,7 +14,7 @@ EBUILD fldigi-4.0.4.ebuild 981 SHA256 16743bf6a93a87163c51a376534f0d56df069f16aa
 EBUILD fldigi-4.0.5.ebuild 986 SHA256 797b653a3a627cbb62628865ec8da496a6de8349fe28dd07f9cd6a38f81eb9aa SHA512 602b86836bf073a36274a2d61874d4dd1ed133e0fee65cdae02d31f6eaf3280dbaa4ec6cbd69c6caca906a15932c6bd8d351188e40f9993b6c196a64e80a0d53 WHIRLPOOL 74a6c6b1fbbd48d873c72465e7af61092686dcc3e9298e2c92a569a0c917517df375d6d2d51dab6d2bbb5ddb33f6ae78c45c58e555cba4aaa9aabf9530930b51
 EBUILD fldigi-4.0.6.ebuild 965 SHA256 60b8d4cd4400ef8dfa47dc5aaaf247d0789421c0e2444160ad26b14f9e712792 SHA512 58087bc28d121bc466dc89355de61ce0e1630aca431c5954099e6c5774ad7ef24e34d6ac686b306794464b6cf35696fd12a24aceaeaa53515f3adde7f0b517a0 WHIRLPOOL af869b61aa5e8f3665d3ea47f742761318fa41b7f3fec44a7b98c4c13219d7d989998f50f67e88d934e53f16967bad95366759b0bd523e1cfc8f5645af8d80b5
 EBUILD fldigi-4.0.7.ebuild 965 SHA256 60b8d4cd4400ef8dfa47dc5aaaf247d0789421c0e2444160ad26b14f9e712792 SHA512 58087bc28d121bc466dc89355de61ce0e1630aca431c5954099e6c5774ad7ef24e34d6ac686b306794464b6cf35696fd12a24aceaeaa53515f3adde7f0b517a0 WHIRLPOOL af869b61aa5e8f3665d3ea47f742761318fa41b7f3fec44a7b98c4c13219d7d989998f50f67e88d934e53f16967bad95366759b0bd523e1cfc8f5645af8d80b5
-EBUILD fldigi-4.0.8.ebuild 965 SHA256 60b8d4cd4400ef8dfa47dc5aaaf247d0789421c0e2444160ad26b14f9e712792 SHA512 58087bc28d121bc466dc89355de61ce0e1630aca431c5954099e6c5774ad7ef24e34d6ac686b306794464b6cf35696fd12a24aceaeaa53515f3adde7f0b517a0 WHIRLPOOL af869b61aa5e8f3665d3ea47f742761318fa41b7f3fec44a7b98c4c13219d7d989998f50f67e88d934e53f16967bad95366759b0bd523e1cfc8f5645af8d80b5
+EBUILD fldigi-4.0.8.ebuild 964 SHA256 bc53b80f83102d6bbd9921c35e4085888870f4a971046f7d280cd124e4b16cc5 SHA512 a33217892281522e69e0ae5d2583b46ed51ba6c36e811b51db85f8814a50b2eac98c51b45e209dc89618fa6ae70e1e1aead5c8fb454c1041d8b9e6c98fd1260d WHIRLPOOL ce5df9417f40a0f34cc468ec8daeaab1bdc8a6a4d732265e5363081a350520db7f40ca4639dfd0e9510626951460fc1958ea4d6ec401bf4cfe86ce6bf93cc7ce
 EBUILD fldigi-4.0.9.ebuild 965 SHA256 60b8d4cd4400ef8dfa47dc5aaaf247d0789421c0e2444160ad26b14f9e712792 SHA512 58087bc28d121bc466dc89355de61ce0e1630aca431c5954099e6c5774ad7ef24e34d6ac686b306794464b6cf35696fd12a24aceaeaa53515f3adde7f0b517a0 WHIRLPOOL af869b61aa5e8f3665d3ea47f742761318fa41b7f3fec44a7b98c4c13219d7d989998f50f67e88d934e53f16967bad95366759b0bd523e1cfc8f5645af8d80b5
 MISC ChangeLog 8022 SHA256 b79a1983e8c028cef0f62f566044ca8781f4cd9e1a5a7576ae23002822dc9ec5 SHA512 42f5fc7f70c62a6dd65f508e061ed436e68d9f08435cc802f9299977a3f17d852538325da8cb920d750b0ed2ae8eaf952a4e55a558bb5417bb4367d1bc0b165e WHIRLPOOL f94b7b6d3f48f8f4accf0541c402ad156f73d4f69067bc770610d32b19433b6d1bbaf14924794b77c308e37259975eff14e667648812c60775b9da248996691e
 MISC ChangeLog-2015 16176 SHA256 b4d070f6d128813b3b681ece4f9cc9ee0693d0cd37f00ba07faad4119fe8e516 SHA512 856e28ffc5e145b5836963dd649fbf44b0c9e1d02a4afd311477cd43ce48e1a2d3f023d081a04e75c3cee7bbd215cc5ffe8c48777e31a1a7f497dadb4fdd03db WHIRLPOOL d5e3910630b581cb46d8765413bb946158eb0c859ea523a7559eab1f7da88e92b883f3a45d9a606aab03613ca2d256271eafe55ccffb315563df19e4b0252919
diff --git a/media-radio/fldigi/fldigi-4.0.8.ebuild b/media-radio/fldigi/fldigi-4.0.8.ebuild
index b447e289f005..a33b5ec25710 100644
--- a/media-radio/fldigi/fldigi-4.0.8.ebuild
+++ b/media-radio/fldigi/fldigi-4.0.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="hamlib nls pulseaudio"
 
 RDEPEND="x11-libs/fltk:1[threads,xft]
diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index 8463c16810cc..4ecd7c267b5e 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -12,7 +12,7 @@ EBUILD flrig-1.3.28.ebuild 626 SHA256 ecf9a757e7c9f6bca428129ca8ea353f5dae78177d
 EBUILD flrig-1.3.30.ebuild 626 SHA256 ecf9a757e7c9f6bca428129ca8ea353f5dae78177dcafffc1aa06e320a49a34f SHA512 e6c243bd911e9f894524d9366c6dd344941524a1811614056d547a68d56bf58996b3c4ff02b5e80bf27ced913c602589d480188b425d38fe5deaff3efbca7c9d WHIRLPOOL b78a93576042a239406fdaed767616ab18a26f6c33f6bebe3472b141bc191b1635d2048b830cc323768901c2ed91f4ad48fa7f20fab91fd2cd16239a7b60d387
 EBUILD flrig-1.3.31.ebuild 626 SHA256 ecf9a757e7c9f6bca428129ca8ea353f5dae78177dcafffc1aa06e320a49a34f SHA512 e6c243bd911e9f894524d9366c6dd344941524a1811614056d547a68d56bf58996b3c4ff02b5e80bf27ced913c602589d480188b425d38fe5deaff3efbca7c9d WHIRLPOOL b78a93576042a239406fdaed767616ab18a26f6c33f6bebe3472b141bc191b1635d2048b830cc323768901c2ed91f4ad48fa7f20fab91fd2cd16239a7b60d387
 EBUILD flrig-1.3.32.ebuild 626 SHA256 ecf9a757e7c9f6bca428129ca8ea353f5dae78177dcafffc1aa06e320a49a34f SHA512 e6c243bd911e9f894524d9366c6dd344941524a1811614056d547a68d56bf58996b3c4ff02b5e80bf27ced913c602589d480188b425d38fe5deaff3efbca7c9d WHIRLPOOL b78a93576042a239406fdaed767616ab18a26f6c33f6bebe3472b141bc191b1635d2048b830cc323768901c2ed91f4ad48fa7f20fab91fd2cd16239a7b60d387
-EBUILD flrig-1.3.33.ebuild 626 SHA256 ecf9a757e7c9f6bca428129ca8ea353f5dae78177dcafffc1aa06e320a49a34f SHA512 e6c243bd911e9f894524d9366c6dd344941524a1811614056d547a68d56bf58996b3c4ff02b5e80bf27ced913c602589d480188b425d38fe5deaff3efbca7c9d WHIRLPOOL b78a93576042a239406fdaed767616ab18a26f6c33f6bebe3472b141bc191b1635d2048b830cc323768901c2ed91f4ad48fa7f20fab91fd2cd16239a7b60d387
+EBUILD flrig-1.3.33.ebuild 625 SHA256 daa8bb7799a88a359b11103925ed9374b702bd1251649809a87b1febc9f559b8 SHA512 59ef8acf3d6101b54a05d832463eb1b100d6486f3c2a5fa2392fafc96abc32f228c4cb6655914a2111cc5ca67e3bb9e76916fde0edb183fa635794a64a89bca9 WHIRLPOOL 325c8078c7f0c24df22e152f33c74419cfeb3663aada351b00d09574dd32e3b471ffd05d9397afcd0eb5c642dc6372a3ef324384e68aa234c66c9a0f33d35348
 EBUILD flrig-1.3.34.ebuild 626 SHA256 ecf9a757e7c9f6bca428129ca8ea353f5dae78177dcafffc1aa06e320a49a34f SHA512 e6c243bd911e9f894524d9366c6dd344941524a1811614056d547a68d56bf58996b3c4ff02b5e80bf27ced913c602589d480188b425d38fe5deaff3efbca7c9d WHIRLPOOL b78a93576042a239406fdaed767616ab18a26f6c33f6bebe3472b141bc191b1635d2048b830cc323768901c2ed91f4ad48fa7f20fab91fd2cd16239a7b60d387
 EBUILD flrig-1.3.35.ebuild 626 SHA256 ecf9a757e7c9f6bca428129ca8ea353f5dae78177dcafffc1aa06e320a49a34f SHA512 e6c243bd911e9f894524d9366c6dd344941524a1811614056d547a68d56bf58996b3c4ff02b5e80bf27ced913c602589d480188b425d38fe5deaff3efbca7c9d WHIRLPOOL b78a93576042a239406fdaed767616ab18a26f6c33f6bebe3472b141bc191b1635d2048b830cc323768901c2ed91f4ad48fa7f20fab91fd2cd16239a7b60d387
 MISC ChangeLog 4108 SHA256 bc3c290281e78ff70c406249a6ea577f3e7d90db1a5374984ac0736fe632b290 SHA512 3a5cdecd79909a729f2eb8995dac0beef719964cfd428b9f12af068e996bc5b738659431b9673ae5cf757db58b3ee72716e0544579fa2604775d66aadbc000f2 WHIRLPOOL 7e3a2e9da2d4401604f77c23995bedaa57e68a85b9ed5861f79e5a4566e815a337d58de68f3789fc13fad2e3af7807849668266af3100e04002806df590e8980
diff --git a/media-radio/flrig/flrig-1.3.33.ebuild b/media-radio/flrig/flrig-1.3.33.ebuild
index 55065b05abc0..f0f4e66200b9 100644
--- a/media-radio/flrig/flrig-1.3.33.ebuild
+++ b/media-radio/flrig/flrig-1.3.33.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="nls"
 
 RDEPEND="x11-libs/libX11
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index d9cf5ca282e7..8f48af515641 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,8 +1,10 @@
 AUX abcmidi-2016.05.05-docs.patch 614 SHA256 acd4b11d1023ce3cb9c2fa950c0b943bf9f1eb6fed5c5233c2de322917f03c43 SHA512 c06436cab7dbc4eb4bf8595e561402428bd1d45be653fa652841c3378e4b78f246ae5c862addf7bffbcb21d994f11151d464837f20915e91eef31d4f66618213 WHIRLPOOL a56e86fa197a6b9bbed3d674ad2da633fdc927ba7e63c22bb07d0addee008b3793ed856bc6bce135fd88335a193522b9e8d58580b4d801ff6d453359a789579d
 DIST abcMIDI-2017.10.11.zip 554492 SHA256 c421bfe41f9fcb8d19b101e6c0e2057505416c7c4f30689184a8ca3fea2e1234 SHA512 e0287426be71ec098fa9207f2b4be2ec47fc930fd853dc7f78683d5ff50842862678a42424d4f2cd850bb560170352231f3506ad75a43b89080c1c4a025bf1f7 WHIRLPOOL f1243c9460492c75b4b3da34ac3255b98d3f922dbc4f89d25562939bf31544586b09ea5c10c821684206e93cf27609a8b90ca79c922e646b90fd3f5e22a1e43c
 DIST abcMIDI-2017.10.18.zip 554639 SHA256 a3299db678dfb1699226950f9711d330fcfd83c9689e26a7337affe2120b6986 SHA512 b2d559c31761bb500b9b7f1578f147cf9255eb302bdd3cea8bd1e846b09f30c95eb86b20941b13f1e97ddebba40d048155913a34fddfff0126738c7b2becedd8 WHIRLPOOL 8b3a5ad6bfa3d495c795cdc329183acc3d084dc12c14a3b877f2a809dbb8942283c176b58d6734bd85bc7b2a25eaa71391e928db5ab8be240afbf2d71df193e3
+DIST abcMIDI-2017.10.23.zip 555824 SHA256 cf7d8ad12ce387be68200a002557dca6a19f662e7dc24e7d1c872f566e9b0c27 SHA512 d4377b833f9b62d430f98345ca6c0864406db89a0a5590f8756685d247a80c209b6311345d4409c3aee98c3a3f2c14154745c5a8afdb87f586c900efbea1a5eb WHIRLPOOL efe304fa1ed6c434b722c16ce8917ea651e191ecfe528b573799c8a59b2794114b34e358a094825c996a1deb50a80c4a4fe38d579ebf57f472b27f32e8571590
 EBUILD abcmidi-2017.10.11.ebuild 794 SHA256 b04f9fde0cea696204c97be5fc052fdffdc522c5f23de893add98675457d782c SHA512 74e4869499ab64922e7e5431dfbe640bc0af1d9502953aa7186128f0d3df6243d0944a74e4cdea76c9a1bb53b5d24fad130119f76f5af865d0b65b43cf2cf001 WHIRLPOOL 39a850861e57b7431152ad2a599b285b5f2c896d22eef298f03da60d8010ae426dd4401db7a067c15372d76de1c48d1f5d2a07268740096f755eeefc30279e48
 EBUILD abcmidi-2017.10.18.ebuild 794 SHA256 b04f9fde0cea696204c97be5fc052fdffdc522c5f23de893add98675457d782c SHA512 74e4869499ab64922e7e5431dfbe640bc0af1d9502953aa7186128f0d3df6243d0944a74e4cdea76c9a1bb53b5d24fad130119f76f5af865d0b65b43cf2cf001 WHIRLPOOL 39a850861e57b7431152ad2a599b285b5f2c896d22eef298f03da60d8010ae426dd4401db7a067c15372d76de1c48d1f5d2a07268740096f755eeefc30279e48
+EBUILD abcmidi-2017.10.23.ebuild 794 SHA256 b04f9fde0cea696204c97be5fc052fdffdc522c5f23de893add98675457d782c SHA512 74e4869499ab64922e7e5431dfbe640bc0af1d9502953aa7186128f0d3df6243d0944a74e4cdea76c9a1bb53b5d24fad130119f76f5af865d0b65b43cf2cf001 WHIRLPOOL 39a850861e57b7431152ad2a599b285b5f2c896d22eef298f03da60d8010ae426dd4401db7a067c15372d76de1c48d1f5d2a07268740096f755eeefc30279e48
 MISC ChangeLog 4168 SHA256 dfde158a68a63628e011667f3f0ee948824dcb379fcb1a2a238360730678c6d5 SHA512 9d623a04dcfa9fcbfbbcdacd44a675ea2faeaeed04cb42f27ea2f1f6f7643f62f57adac819fe9a14a01abaab8a285dba9290d636eb04e13b80e7737efc045845 WHIRLPOOL 1bd98e8e359eef989d5023a8ec8277864b5cdb99dd90e0c429b0f6e46c2ecfcb2c56be284013b7d5a34caf7a8a855244b4bb3fc5074366be7a18b6240a301f25
 MISC ChangeLog-2015 8942 SHA256 eaebb0e8329e2be37d2750a40b5c6a32911c969934ae77dfde9ccc9f4053e91c SHA512 b3cf908c40b8b93d64ef4f0c4d787a3261e90a744f3cb5a7dc237829cc141bb2e2727c6ecce1111a94ed0e323ec49895fa6f17ca621c548475488ad4fbb03d1b WHIRLPOOL 9819d47080919e62c107480691acad5124dda6c63177164899e5aa2cae853e8d84d03d7de0f9a2fcb4cf6e5d98e2235edee9f4e08679209625c07ce403db1c2a
 MISC metadata.xml 326 SHA256 a2ccc6f3b97c41d5636859e54cb6731fcc2717c551ecb22b440116b17f5b0ddd SHA512 aad9a108325a4a1a827ba64b96ef8410017ea1f3c8db6b51660f987df26b42ce4a6f034c6df3be5c58d44fc40e80b7f4dd3900fb4ba45c448764265273741a7a WHIRLPOOL 40eacbc7470fc238963f173dc58df5d55aaf97381bc9f8a6b3ba28adb173b2bd26324b5980ebd4e95191de81cd2deb8192052c467eccd218f289ccb39a9a8acb
diff --git a/media-sound/abcmidi/abcmidi-2017.10.23.ebuild b/media-sound/abcmidi/abcmidi-2017.10.23.ebuild
new file mode 100644
index 000000000000..adf33138050d
--- /dev/null
+++ b/media-sound/abcmidi/abcmidi-2017.10.23.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MY_P="abcMIDI-${PV}"
+DESCRIPTION="Programs for processing ABC music notation files"
+HOMEPAGE="http://ifdo.ca/~seymour/runabc/top.html"
+SRC_URI="http://ifdo.ca/~seymour/runabc/${MY_P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	local PATCHES=( "${FILESDIR}"/${PN}-2016.05.05-docs.patch )
+	default
+
+	rm configure makefile || die
+	sed -i "s:-O2::" configure.ac || die
+
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc doc/{AUTHORS,CHANGES,abcguide.txt,abcmatch.txt,history.txt,readme.txt,yapshelp.txt}
+
+	if use examples ; then
+		docinto examples
+		dodoc samples/*.abc
+	fi
+}
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 71b60a6c1ffc..84e5c92a8765 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -2,7 +2,7 @@ AUX cantata-2.1.0-headers.patch 1018 SHA256 6dcb056e22db3d2633235caa3dbb7b52b7bb
 AUX cantata-2.2.0-headers.patch 1345 SHA256 360b7600d99395684fb6d3cb57817c94646fb7d4290343e776eb4241b08bbeab SHA512 e9c1a3fc756bd3ed37bd8729433d48d4bb652d3fd7d95b3a6024b4b1d6cda72205d1326214b283377a1ee0b376fe1199c351006e8e640ed6ca9ed98f74c1b7df WHIRLPOOL 354e2d42f8164cb90d9ee3600945e0f9c00d9ce1061278640389fb6bfae39677ac0d21dd7bf98b730a73539001e6134061af4def3f6df3c7aa082fa024f8a247
 DIST cantata-2.1.0.tar.bz2 2207271 SHA256 9317afcae75c709ec733da069d4245b47e6e2c297a259eaf87a181fa9d1cd4c4 SHA512 bf03933785110d0d0c1dfbfc27f4974869ae7c79afe3cf1da1f3024c95d86733d8bea77f2a882887de79a7897ffcdac4262e58747dd4e979824943991675c5d2 WHIRLPOOL 5d58b84290c387d535e556553e64bba36520a099565c44bed1c4e9cf800c2a432ac09296b989a557e72d81a951c926b4bb638f2d2ab7976735059ebb74b8c8e2
 DIST cantata-2.2.0.tar.bz2 2251649 SHA256 c84691eb17711118d3c512d70cb422267f7a137290082cdd1ff0a871b4a8e5c0 SHA512 519a2e24c8b2a1c98a2006a1f590945e1bd5e98a2c3a1b5da23e40f2297f1477d48d69b48ec669219f5ab8fdc955486fe29db6914abeef1fba2a47377f694ecd WHIRLPOOL 50a44192368ee90708ecf906401c28d6a06878d61cfefae04bcab3463343c11bcfe3054880364886e57f797cc303fe14a4f2010e87ad873ba4de3738c05399e7
-EBUILD cantata-2.1.0.ebuild 2725 SHA256 54c6793a89ed016aff139fa039634af0f2aa885e7b8d196738489599dd224754 SHA512 d823027e8181e50e4eccbaf11aa45456d8f04b6f3a403ed4f23962830fa53bf822bea3ae4c6af564a10e3566b25ed4f5829ca5c6530917bf245b26991f2c43e5 WHIRLPOOL e8641a969bf3667674f4a5f12b0522f419c513598deb02b75814bb515e780bcb84a30438afe560873430c6d699b32cbe9740ae11aa979a893651d146bbd97a20
+EBUILD cantata-2.1.0.ebuild 2723 SHA256 7fdfe99cde06625022f88171ce34eac5e6f237364b7cc05406975f679d9ab95b SHA512 e7bbd6e7f55c59d987306e3745879468c61d701f8a2fe053227c366dffe2ebeb3cca3837172546b8c4235295d4200174a45a2c64801ff364129b32a00e981df7 WHIRLPOOL be66a7bb36bbd1f0fbc2b9f3cec9bcadbb3fd0876a192ac012fa3de71cb51f3735309adec021881e2b9969f82adeffa69a2f9cace466dff7f2756f0e74d130db
 EBUILD cantata-2.2.0.ebuild 2784 SHA256 337cb9cb32a2f13a856beb300bc6cb7b6374c1ada01b409942d2a7f6c932b7c7 SHA512 f50abe7ba97aae423d48d6fc29099633c9be1c6c500c8725a1bbbd6b743ee6b39bf0d133229959c3a8fa943355716be270fdacbf130ea9060d71c2034329338e WHIRLPOOL 36c65d11f4b7e70c6ce23da1433ac3983062d6f8225965d9179801c25e0d34fa90c48eb898d656ff98f8e99d28142b3535213ff887dc9f64c07554d014edc6b1
 MISC ChangeLog 4843 SHA256 c02d7b259f24e9f14dad63626564aa1145641a0d51de8917409827182e856af6 SHA512 c39f1feb920ce7e4dcdce22b93ff1c14876305aec11e29b0e52cf96f286cb267a6388ad5a665ccef9d625e04cd0b82be1dcdc7526f6a649cab3962533010b54e WHIRLPOOL 6c6b93df770ec945ac481d827880b4bf93836e95e6f8bfb599ab3b7f2d32d6d510359cfd181ce55e5b3be20251b3ff273cb57b0df39136522c87814ce3ec55cb
 MISC ChangeLog-2015 5497 SHA256 9ebde97b0b56ec60a5f1c83fbebd8e180d5421fd389249afafcec7ad4bf674ee SHA512 2bd57729bbc7f86b5149e9c61b7da340a9b4435b68b05e0e31f1ecd983738180ffc4c91027137f89c54018186ee4e1d33f77ea5a97405dae44bdc1a463157193 WHIRLPOOL 9b6be1f1d1e14ecb5bd1a5377d0145e3a42174ec06ea882f775d9fecbb1d4e622c70a732c65c12b88ae1da80d0a20434e5f7656056cce3f13f75f0fa5ce76ad6
diff --git a/media-sound/cantata/cantata-2.1.0.ebuild b/media-sound/cantata/cantata-2.1.0.ebuild
index e60ac6b3c74a..57c74fe9299c 100644
--- a/media-sound/cantata/cantata-2.1.0.ebuild
+++ b/media-sound/cantata/cantata-2.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain taglib udisks"
 REQUIRED_USE="
 	?? ( cdda cdio )
diff --git a/media-sound/gmorgan/Manifest b/media-sound/gmorgan/Manifest
index d28ee2cd15e1..c85d8c3e568c 100644
--- a/media-sound/gmorgan/Manifest
+++ b/media-sound/gmorgan/Manifest
@@ -7,7 +7,7 @@ AUX gmorgan-cflags.patch 597 SHA256 cb1e7b196bd252ab7dc8117b09603250ccbcaafaac80
 DIST gmorgan-0.79.tar.gz 8055701 SHA256 eccdff6d0de745f469e45220de2b41764c0e591eb894695c24ce07cc2a65b1cf SHA512 17fadbe2c8b2b4c7e18816a6f866e4406c005fda1ca3ded628c9497aa46abacd06417d68296c500a2d108e9364eae3702f990f5c1b1b1d83328ed553aa453be0 WHIRLPOOL 96a20bc79ee9a8b62ad1061995fda5542450b5e0faee9677f548d05884e13791af79617bf1ad0546028db2a1f38b7e3882b9dd4778e7a912b6ebcb02efefa7f1
 DIST gmorgan_0.39.tar.gz 1370780 SHA256 37f6c3d4b43c415e0edaf5d8acc80d7a60fb9318f684acde0eaa723f3ef58b56 SHA512 b66769382de4b2386779d55158d16167d4aba1a2e3425fc46561cfda621854004029b872810844313d64b8fea50d7cdcaa5247a02ef500f7d932deedc691bdf3 WHIRLPOOL 92453194f241cf75d19221dce97aec8a06e16dc19d7b46ab09ab51d8e4541de22b5f6ca46fc18d68e82a18dcdc5fd529f02fb044ea6e4a45f8586d8030148ea1
 EBUILD gmorgan-0.39.ebuild 951 SHA256 3290b7ebbfbe09c20dcd18b34f95dbd3424ef9fbc60ad7c9af78e26f19082ba7 SHA512 6247b536d0c90174b7b122398c803db6310344b812f254cd41d392a9a7639fb235be62e42f46ad6400c13c130e527315f1ba754a3f5b7ac76c474eb33f59b55b WHIRLPOOL 0bcad7de920ac20df832fd8f1aa0dd932d1b7ec7cd7542b8277fe91529b5d2046537e24ccc5697b4e5ca929a899c7e04b7f85557ce4b28e7094e1a685d78907e
-EBUILD gmorgan-0.79.ebuild 786 SHA256 019a5501fbc4e1a24372b7a3402b7b86a12d0479e7f1f77e6a234c4f7332220f SHA512 9be3ff5f4b71d35f1e9de4fc7551350844edcdcd5d9f728cf946b31d95007a802303a57681c8f70adfc2d923e66d8a491a82d4bdd0dcdf574b2c809ec0395f90 WHIRLPOOL ccca487cf5cbd2d8c509de4222ead277da92d56447be0ae591913e4cae25bab91ba6c15ec0d8cf6c285592efcb17855cb81c2fcbfc7ceaf39809f48555872a54
+EBUILD gmorgan-0.79.ebuild 785 SHA256 80924fad1a78750069350fdbeda3b108bd1dcdf04a4caa4df9592a53fb65d2db SHA512 b14863f4c2ce179528096cdd31a88ca82954c657783055508027e384acbf6f08c77e6586973df8367c968f7e006975adb3dddcff6e5adc5f425c2e8a16a96e1e WHIRLPOOL 34c69d71c0e19e3c32d0e31584b9aef4a4b1b7be5bbbe1af9dd6a81322a1ea39db5564b14058586d2d11ccc27ed9421ba4c8ced255ac1535685b699a58450a76
 MISC ChangeLog 2545 SHA256 c6d33ee545b9be9f95eeee6fc60d81b7020a89b41449229a909c8111f75f688c SHA512 5ea8880d1b6c9bb3a9d313b666a09610ad95261104aeb428922fa1273e04abf082cd791c235f5920f8f6b588bc972680302fc60db11c12564c66779a66524c0c WHIRLPOOL 9c6a61f106dfc8917bb132087bd1a1c260094e360b3f7c27a0a224c8f07ffe23bdfa77b6a0dc4cd9f60e6128f36f62f591cfc2ae15065912cc2d5a34d7f67f84
 MISC ChangeLog-2015 4540 SHA256 4b3a4451d0260c37a4a1791d1a9ab263aa6fbb7bf368183acf7d5b4fe351e25b SHA512 512b3c24d74de2e08e3a58cc19b12c449c2e2dd8a2be40103e542e7759632c52a954446a309b8226d94606a7053cf992fd2d830b5c4b4554794736a05d7c698d WHIRLPOOL 3cbcc74b2e918462c16240be452dc0459bb0ec7459fe813695a77e8d87a2eb83b94fd670eb104c3f28b01d4c8fc5fb1391ea887a48899de51a4d846ed1c630b4
 MISC metadata.xml 336 SHA256 90555defe0515f8ec9952c40165d83eb9f10254f9f2cf94e48096a03eb9c2bf7 SHA512 3d5245a06c576d8a4f5fdf07ddb0a6cbc9cf0f64799da9e7e58a67fdd23a5fe082d0bc557575914ec7fba42923d8503587b327ad31f270f46710084fb7cba5f8 WHIRLPOOL f54f1d82e3b322a66e4d9bb33c0b90458b00a0d92876899e29f3d7c4a5d8fd3001930f4c2fb66c8b122b24866619c64aafdbe5b1b3e3494808b2d2d72b5f6174
diff --git a/media-sound/gmorgan/gmorgan-0.79.ebuild b/media-sound/gmorgan/gmorgan-0.79.ebuild
index 77d5c1384977..a602c30e99ce 100644
--- a/media-sound/gmorgan/gmorgan-0.79.ebuild
+++ b/media-sound/gmorgan/gmorgan-0.79.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gmorgan/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="nls"
 
 RDEPEND="media-libs/alsa-lib
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index 5a7e73277003..9e1ed482a746 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -5,7 +5,7 @@ DIST grip-3.4.3.tar.gz 740870 SHA256 34b7dd9f8c904f8f1984f691b3bfc62a68979eef62a
 DIST grip-3.5.2.tar.gz 952153 SHA256 aa67931ef3a80ef57351d487be2210b2f7030a16b41ff2f38d22ccc76d7f89b7 SHA512 25fbc1aadfcbab57ae585afe0a6663d9640a3614c1b655abd238f272116eccf524e4de465784265cd1f12b48c4cdeb9fdd318f989052400a0bfc9855a5420421 WHIRLPOOL cc883036a3a4a2073eb9d14c53f53e26ae568be81e0f21e709031586b5b541c04d03cd251bd99eb66bfda86fdf1167a6b1838517c85b89b1fa6acb72cd94e588
 DIST grip-3.6.1.tar.gz 958967 SHA256 88a7a1193de74ce65968106a1b48b62a3171aaeabb1a5edae9d0308e901d5e28 SHA512 ebb0945833189b17d814fee9a68acf25786f83fa7d1e47523512b25c1ef9d146d5d218c8422c7b37fbb7cf63558cc093795ef4078639f8e35c9947d76d6d2fcf WHIRLPOOL a8b5cf838d205ce32ccf78df9df04f50c1095d87b0d61e44c9cfb7e661345c737173df968f5cafa2492e7a6a66b474ad00ce6a0922d41253d767cf880c61fa80
 EBUILD grip-3.3.1-r3.ebuild 1353 SHA256 86015e1490c5fd36a3de2a9171f2f0f0f894739a3b4c30164d79b0f416a5b109 SHA512 964b99dd264dda5e9309c47a998308ac4b6dc770847d14ae0d60e768ef5038ffd41ea3a0bd87cd5de1130f79d5ceaf5040588724db59516ab1a1e3acf92b9154 WHIRLPOOL 25916061d8e72838207ec09f46ce95ed543d4840746397f09670eff05e370a8f80dfb11cd897dffac88d3859466f5c2b083dbc7beb69b6e3a8279fd40bf5b4b9
-EBUILD grip-3.4.3.ebuild 1210 SHA256 b93e11cf440092b5299922288ed61f6d026ab7a48e7b4f790dfb0974524902b5 SHA512 8938f10865ee8917044e382be2165ea4922d810900d3337151c2ec7b6cb697df4e376fbc8e7aefc57713c6cb54ed5c5415e5b4427890cbe00d01f7eee60e4935 WHIRLPOOL 06fdfddd824cc98f2955d4626328e6019396a9e702df07cc6ab241ae7fb95332d7bd4cffafddae59d4fa47b8f11522d76af2def767b3b50dadeed5501e71a902
+EBUILD grip-3.4.3.ebuild 1209 SHA256 aabc5f311b44f609d4cc1b4bbdc04353d4ff95381aa86da917e468f56a52cd0a SHA512 12232d370cc9d4951ebada3270210512fdc2e5849e16b94aeb2330bfee8bd0cd87d550fbabefc346fb2430b80f4172fc8f16ecb6962665af3f95df854b1231aa WHIRLPOOL aecac5ef5d254eacf9ff9952306fa470c5f5df6e7249e21716f4e5f4b037e26e8b84b4dcb1f776a15b242926f573bb1b887e55a2d9d1c863a55969067363bc1b
 EBUILD grip-3.5.2.ebuild 1214 SHA256 7a1dcd44a2cbf2be7cd5bfb158f2836569b220af4389119fc5956138ed079591 SHA512 6da4ad712b0da1f19b2e851a4b6ea7122b97bfd77cc5e5a2393888cccf1a241b0cde2359bebd9486885df15cf890802993655370d404c4d8e31756f4e8191b92 WHIRLPOOL 15325254d92f5de6e80260e3a227b173de69288e35027518595a564bcf8f40817af4ec3f28d25837eb3ea10dd8c1e1a875fc8e5cd8aaa099c2d90394c0d1fae2
 EBUILD grip-3.6.1.ebuild 1214 SHA256 7a1dcd44a2cbf2be7cd5bfb158f2836569b220af4389119fc5956138ed079591 SHA512 6da4ad712b0da1f19b2e851a4b6ea7122b97bfd77cc5e5a2393888cccf1a241b0cde2359bebd9486885df15cf890802993655370d404c4d8e31756f4e8191b92 WHIRLPOOL 15325254d92f5de6e80260e3a227b173de69288e35027518595a564bcf8f40817af4ec3f28d25837eb3ea10dd8c1e1a875fc8e5cd8aaa099c2d90394c0d1fae2
 MISC ChangeLog 2633 SHA256 3a2d77609f0964d855012b01f14fe6272301e064249e4dc3906c7fe4a3a7fccf SHA512 623ac7e82e453abc3d895ae1f48ba1f6b8819315fb3c155ed38ebf071cecf3d785a0b0e8d11d6ed1b5dbf4a79f7c651e9aedf3cba422032c271db4f5e549f5a5 WHIRLPOOL d93f9369678af73af8264be95646903113ee47b207f588b19214c77d951fc293394d2923e4e87a49d50d37a2417f69468592b2b4ad2435e16d4bee5dcfd66905
diff --git a/media-sound/grip/grip-3.4.3.ebuild b/media-sound/grip/grip-3.4.3.ebuild
index c9abaf041752..3490727172cc 100644
--- a/media-sound/grip/grip-3.4.3.ebuild
+++ b/media-sound/grip/grip-3.4.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="vorbis"
 
 # lame and vorbis-tools are no real RDEPENDs. But without them
diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest
index 822cf4726b9f..ab91281c32d0 100644
--- a/media-sound/lame/Manifest
+++ b/media-sound/lame/Manifest
@@ -5,8 +5,8 @@ AUX lame-3.99.5-tinfo.patch 768 SHA256 75e5f5be5a18bf5f436ab9622113502a889b90b6b
 DIST lame-3.100.tar.gz 1524133 SHA256 ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e SHA512 0844b9eadb4aacf8000444621451277de365041cc1d97b7f7a589da0b7a23899310afd4e4d81114b9912aa97832621d20588034715573d417b2923948c08634b WHIRLPOOL 6e940e2995dec8d1f6b73b87fc5441f9d85bdccfb3faf670ca06f9001ce752e9efbad17dc8fb5641e0e14e4e27aa2ff33f4c2c9df2fafd5e522ca0894e4c8efb
 DIST lame-3.99.5-automake-2.12.patch.gz 536 SHA256 49833b952d846405fdcc8d87de55f60dda5fb2268e1b36861c53dfd39dbd275d SHA512 9d6211e257d573ced5c29c43ba5d5cc98a231b213d6e0cfc352b14776c06c9e656ed1873d5caae466afb27dfe753eeac0842c7221a8538ccecea8f4ba0f8bfe2 WHIRLPOOL 506e505cbf8659c3f67084565fc581e4dee3ba2016db3d835e3e63d9eca0d4383443e7596229f51b349c1f8c53ef42a581761d27778de4c1e5b698c85418b401
 DIST lame-3.99.5.tar.gz 1445348 SHA256 24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff SHA512 ce62d7eb9fc8c53c343374ded30f11153a296910f0be7e649197bca7412c6660aad1aa6143d56b750f866229eb492cf7bb4f682535c383fb4aa57d7077d8b4d8 WHIRLPOOL c238107bfb824c67c639875547e24b64ceeeb22125800af753ca42de129138f480574a6cfe132bc2c9cffeb39e54b6d57059be69cb41bdc164cdbf29bd95afe9
-EBUILD lame-3.100.ebuild 2233 SHA256 3280b37ad642b0a237449a5d652685d071d76e8ec9bf33d5e71dc050d67ce00e SHA512 268442710208f82fc8e600fd7b7fa8327dcae6d026eb26c72517ca223aa9f88c31303b775bf858dcfc84587f47bec2977c3193d3e7ada73e6654a8fd8af60201 WHIRLPOOL a408a75519a0037fb6c08a653f0b03924163b720862d682cdff0a009e5436d07a40d4948de9829e2a1ce76a5875b1d1e56c49b372a344046240cc3ac9a90784c
-EBUILD lame-3.99.5-r1.ebuild 2385 SHA256 f922424473a124a8da58c4b7f53b80c3481252fade01e94fa0a096977b5a7a9e SHA512 1556b27959f39d8a324922be3ce0a472803b8eab4bd47311f7e3ff7a567df3d65a654b51310597f3f7e27fec25a24715fe0fbac0a8f68c608acfeab8e29ae9bf WHIRLPOOL b0b6cd13ea1c0db9407ecb2245e6f143176dca6fab5a9fb4ad234b213624220ec27bbd13b1f3a794a46d998b10a20fa0463c37f53faa95e7c07a0b72594f22d3
+EBUILD lame-3.100.ebuild 2227 SHA256 16e951eb454f969affe1e2aebbfae22c1fa5c89d0989dbf855bac57b1cc49d02 SHA512 a2f1ad06602e918c3667f252f728f3e4c77dbc256544f4e7c4453210d2f58dce8862a80e9c46d85e39f1d3a7d94b92ec3a755b58fea683921b961b7be01e521f WHIRLPOOL 8640cff1488f735b7e85ce155c13ae086090caece5c4f6b836d60d5a82037cb491137cf44364aef11e4a6de2c59e26b50eb19a27df665157dfa05a339f4011da
+EBUILD lame-3.99.5-r1.ebuild 2389 SHA256 d374131c6b53fe22e2e3c47d1c5d2146f6e38bca0e1c3a4cc8f24cab7243f6f5 SHA512 4ec01c7f70acef14e3363f9c764d5b538d44662ae23dfc936850831874d9e97c3a3a16051aa99af0086576fa85d5f1d7dc94862c0a20aeae61d3e4358be89e4d WHIRLPOOL ed6d4b8885f5ab69a0f2cfb4108e9411ee0ccae8f4f54510dab82780e7a18805507bf1f0bfec773d40019d0414883e2de6924b3113f4d2fc9458cefb3aaf0edd
 MISC ChangeLog 3967 SHA256 cba2a8250a14dfce2a88981f3d162228874e5d8dc150396f8b87d4fca7faa99a SHA512 3075cc97e089a57fe4cb8149cfe11602cf2bddafc628f26702502b71104bdc8669ca43f637053bf51bdd2343b605bda8e6567e8504a1a63d063d6004f16d95ce WHIRLPOOL 9ba9c5dcadd19974fab507ed2c906b065e97a8dd0529b37cdeab839b5906edd85e33fad0394e272791c29a280902d74a6ef510dc5ae2dda7b47e3f5d251297a5
 MISC ChangeLog-2015 23341 SHA256 d275b2762420a52827eaafcd4fea3c4c3ec52f32d0c06ec62aba48d408cf6817 SHA512 084b9e0d4ffc5eedcffe35239d1632232755f2f6604d9e6b12763f380eb06aa8886a5787143d3570f5846845a2cd91654ae2e20dfbd24faa11ca8738aaf9d931 WHIRLPOOL 951a28e8a998711e9c340f129b32ad75122bca2090d25e894d7c92cab90cca2b610baabb5ce708a755c7e6e15782c9e68bdb83df8ddeba5820c6e8729e4b75f1
 MISC metadata.xml 542 SHA256 304318f80a4776058857774e3168a33aa3affad6a656f163ae8c086bdbd62f0c SHA512 8fc2e2658ae34d146894786f1c66800eecf818e2bd9bb807c6b32a8e132340c1568e9f47220be3daaabce2ab6e1e1d5aa817157f2c0131ed01944abbab6593fb WHIRLPOOL e36ad27b52067332cf80f8d4d71a2ab2a03c9cb2551a1386c444f78b9721c706fc4ca4d90a93809af84f97e04396416ae13efe70241780d14d9ddbce7a6242ff
diff --git a/media-sound/lame/lame-3.100.ebuild b/media-sound/lame/lame-3.100.ebuild
index 1c19043df7a3..5bfd8b0a825e 100644
--- a/media-sound/lame/lame-3.100.ebuild
+++ b/media-sound/lame/lame-3.100.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug cpu_flags_x86_mmx +frontend mp3rtp sndfile static-libs"
 
 # These deps are without MULTILIB_USEDEP and are correct since we only build
diff --git a/media-sound/lame/lame-3.99.5-r1.ebuild b/media-sound/lame/lame-3.99.5-r1.ebuild
index 52f620849bd6..416a94fb34f9 100644
--- a/media-sound/lame/lame-3.99.5-r1.ebuild
+++ b/media-sound/lame/lame-3.99.5-r1.ebuild
@@ -28,7 +28,7 @@ DEPEND="${RDEPEND}
 	cpu_flags_x86_mmx? ( dev-lang/nasm )"
 
 src_prepare() {
-	epatch \
+	epatch -p1 \
 		"${FILESDIR}"/${PN}-3.96-ccc.patch \
 		"${FILESDIR}"/${PN}-3.98-gtk-path.patch \
 		"${FILESDIR}"/${PN}-3.99.5-tinfo.patch \
diff --git a/media-sound/mac/Manifest b/media-sound/mac/Manifest
index e8e01fdb6fdb..dcb432e3baaa 100644
--- a/media-sound/mac/Manifest
+++ b/media-sound/mac/Manifest
@@ -3,7 +3,7 @@ AUX mac-4.11.4.5.7-output.patch 1498 SHA256 65ee185f66c821b69b3727070645a93dff2d
 DIST mac-3.99-u4-b5-s7.tar.gz 450981 SHA256 9a735af2c56f05ee06b6e2ff719e902271299adf9e25cd3c9e4b28e8df3e30c5 SHA512 fa7ca8cec0ba6c0fb78dda6e964b17e9331184fed656a2458d0e3ac12fc375a661adfd36c142ef63111f31c6b63e8c00fe40e7babe84f0cefe5433940be628e0 WHIRLPOOL f4df5bccad06b7313348e9be734e926c1d511a2e3ca40162bc2c6a8cffb38c1455543fd7dc0a2352efa91945ae5546364085bd05888e906eb9e1c49fde7f743d
 DIST monkeys-audio_4.11-u4-b5-s7.orig.tar.gz 511190 SHA256 73e28b7dbef5dfd07108b85783261a8a8bb1770917bf2877d4ab8f5c3833299a SHA512 7e73b35c86d6007ab2a94a2d8b7449bb4ac505bbba53e40373a279dc83a9cad5f62a51419a6375335576cf325c88ed7d317b0ef3039b8a497100cb74a63c25d0 WHIRLPOOL be9b56a45c8da00d1c6008d6955a7a9d4fd86e4a893a60b6b35ea426af38900493a213944f1a77451eb942a0d7d0c42e4af3d71c889bead2bc82e5d2732fa022
 EBUILD mac-3.99.4.5.7-r1.ebuild 1147 SHA256 a244bcccea6336ec22456743596fc13fdb3e35bdf38d9d05c260e0835257826f SHA512 b96196fc64816de218a834ebcb13a931440149602b1876349241afa454c01dd24458c865abfd8158ac6a978df6d3782aafe3c89a80c2cb8557a43b637291ed63 WHIRLPOOL fd85f1c05ef73d4c5f05fe61f8d1be70be146999c12a9400d4bafdc8523534333466d5a6877c318595f580983f6058cba7a1683f6b7c5772654c34fee49cdba1
-EBUILD mac-4.11.4.5.7.ebuild 1360 SHA256 5e61e467a3f67d96c7a692b3d7920c6fc75f00a3873ac56e21e6299bc6df188c SHA512 7d9012b16fdeabeca727e2de4b940b6c487251de9b664f9ebb38dee1a2f29af13a64256fb293219198526c01d8a7264e06c811f6b6b54431e534865b2fc42eaf WHIRLPOOL 2baaf86d7a78d09296580ed8821c01ea701a8e4c278b7d266336d73086da958a3593b686511620e87800094071a11790f79d0310c591a8b4b625669dad563483
+EBUILD mac-4.11.4.5.7.ebuild 1359 SHA256 2e15b8c7ee4e9115b08e81b4f584332ec53d64ded911401531e1bad3d97dd22d SHA512 a4eb177a493ca9a09272793df96a3a48337b1e2658845eab63c011789206b9be443e0bae341ea47b3cd354c7a067e9694fb7b7e2701152112518ce331aa95d23 WHIRLPOOL 670e9cf3b5dcac04d0bf2d2983378ff6c5deb11eebfed34e2827f7ed685e886a02b51a60aba4adf88b8341d4eed7ea52e00d2fc05237f81946f9d1ad6e83a592
 MISC ChangeLog 2607 SHA256 7e800b9f6da6258bba61cf98bae5ed9913483ae6f22b5297e6ca4074dbfe1770 SHA512 ea0b572d838252113db29de18e71dc4e8abe866915b28188f2fa2785b1955fc285bcab8969c7864d0ee17c266cddc229f70ad18bb7239015b8906353347ae3ad WHIRLPOOL e813586ff8dfe9c32c569ddba9bc3b48436ed11ce3944e64e5cdc8e6815582baa6a56f53b702d7ed92b4416fbbfee089dcbac0ea0b3d8af5b71b93e381c6308d
 MISC ChangeLog-2015 3772 SHA256 fd6090b0e38c8da52de9d4791dc06ecd2bba3ff59da1c951083e091cd78a2a75 SHA512 c149c600fc0c475049067d65c4cf943cd9de6b56e6111526c24553da09839bc11dc36ca26e32bae270ad8584cc0363daef3455217e84fa9f330f6bd8d589431d WHIRLPOOL 51860fdd909b424fbd2b4c9006966f90c5cef0f31a8fdfc1bfbcbc347e1504bd221d513210fe1bac90f20bf5c4011b4a4eec7dc3ed0a9374a9c0f0ca9dc6fa1e
 MISC metadata.xml 373 SHA256 58b217f5db7cc0446a966a93fbc1fa8c77965a8701dcbbdb240b99db04fcaaa6 SHA512 398ca3b9a13eede72e283f90a215d1e05a518f6b3eee9d8f6a74e3eba1e1f0f501443399906f09771ef1c7441667b5e991f98d9cabd9c6b8395af334312f02a9 WHIRLPOOL 6685ff2c0896504886f9f2f374ed4d0f4a1efba3efb549780a57465ac3ac1235426c3044572acd46a12dfa24073232afa83d46ee2783453a78484e6153723808
diff --git a/media-sound/mac/mac-4.11.4.5.7.ebuild b/media-sound/mac/mac-4.11.4.5.7.ebuild
index 4e495bf76d57..1f1674b693b3 100644
--- a/media-sound/mac/mac-4.11.4.5.7.ebuild
+++ b/media-sound/mac/mac-4.11.4.5.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.deb-multimedia.org/pool/main/m/monkeys-audio/${MY_P}.orig.ta
 
 LICENSE="mac"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 x86"
+KEYWORDS="alpha amd64 ppc ppc64 x86"
 IUSE="cpu_flags_x86_mmx static-libs"
 
 RDEPEND=""
diff --git a/media-sound/mp3blaster/Manifest b/media-sound/mp3blaster/Manifest
index bc893a0ac96e..2b7cbb4c369b 100644
--- a/media-sound/mp3blaster/Manifest
+++ b/media-sound/mp3blaster/Manifest
@@ -5,7 +5,7 @@ DIST mp3blaster-3.2.6.tar.gz 354019 SHA256 43d9f656367d16aaac163f93dc323e9843c3d
 DIST mp3blaster_3.2.5-3.debian.tar.gz 11000 SHA256 e4d424aeccde6ccd219270f4e4f0bf8f70b97e13075447b6d6d069110ed092c9 SHA512 1d899c85c2a2e1326fac0f87c61ead82273a08c672aeab0929479d9aa10c6ae703bb63c1a6aec14c8f5b6a139089fa5228cf09db72ea5b114efb60a196bd4788 WHIRLPOOL 9c1c99d5a4f4e5060a9eae4e681f0df841d6932f34a12102a82d2e1f795d4db41fd3f15d6aa6a34d04d42259d73ba67f775b24a51df30779d4f4466ded40f69f
 EBUILD mp3blaster-3.2.5-r1.ebuild 1637 SHA256 ef44b4b9dd428cc53e9f97456d3b30fe4048b300a07b3275b879bb72451c21ac SHA512 70a0f736b34b33819ae3a28b8e17dd7445c6b3a8ba0b05f35880d10d34d9649e4bfd664079022b0af0ee4eba3c1ca9a2ea1107931936506b3b16f68120a2113a WHIRLPOOL a7dc77f1f5ac46d12acebde2b62c857799c85f1aac98f49e49d984b09e17c0b0e4936a0025b14da7585597b0273292890cbb174aaee5437be8de056fec456bc8
 EBUILD mp3blaster-3.2.5-r2.ebuild 1643 SHA256 a62615c04e0ce4381be324e1bcf812c13d42dabb7f3fe85ae4ab8fce899f2745 SHA512 52587b78745e4253c6d43a42238dfcab79c0807dde7feab13ea3cb01900b07213dbd6eef020aa35de891db05381afd9c64abeba3954bdad0845496ea24628471 WHIRLPOOL 1e599d300365ee9011fd46bbf0fc3ac9df9449bae645bca0c6d924433d51657fc5c465a915552672ff32d4b84030efd1cf79f736f1fde229da0e65e4f580fc1f
-EBUILD mp3blaster-3.2.6.ebuild 1567 SHA256 2bda0a264f7dbee747ffe6c41a9d34b946026ccabf07aa3e7fda2bf73cdfe527 SHA512 e3490c6ab58cec7be0a56fe341eff648d8d87c5978c1124dd56bcee2d021819b301547cc5dc37f734b414d0b58ce0bd3c2730f9d96510b7ec9e30a7720ac5a69 WHIRLPOOL 14037440cacff42ec9ee587c837edea22177f1576ef6c8b5debeae13061425f746ffd6792ba6f6f87b27eddf4a9d91e98d92a0de5b36bed5957da3a701fa22d6
+EBUILD mp3blaster-3.2.6.ebuild 1565 SHA256 822dd0f8d2db1023e0b3c196f5f83dffa34a1276b0f7e5a092a0cb8c756f6ffe SHA512 b7c4653c118f7b1617a2a38011dde1ed39b09d6ae13e694cf855eb303c0b9f9dfcaea993c95e9e63eaffcf39d96ababe41307b5959de415b2671df93a452a5db WHIRLPOOL 0d3ee6bbe8bf991a6448d9713412fccc540025905bf8da073359455d2a1c42881b8a8563e6389f85d04e8d60e0f77222692d6e9e9d2dd8727a25ddf5d7a271ea
 MISC ChangeLog 2665 SHA256 74403c3822735e7a0a2ca825f1395423e3b2c886a7c0ad40a42ecaa90eda7975 SHA512 b48a91ee8781e052c9f406e3ddfab14a4a11cd80a1db99670ae2c03d394bccfd9c7b7204f382b8e52a7cb95dbd6578ee723bc668616be16ceac581b8b269f31d WHIRLPOOL 9db8f4d90e0254be27ee84dc372c250961f94d73ce605ce2fc8dfe80568e7f9efedfe604b7a6ff73eaa5591cc32ce4ff0e49b3856492143f04ec00f53bff5797
 MISC ChangeLog-2015 8308 SHA256 e3a3ad043d654e2c03a08cd5454c4fa6dc183a2aceaeb4e93de4b4c88e20b4dc SHA512 5623907d9824e694eeaaf2910c0f3c837745f53b2f751573978ae0d2aa33d32eb320a616c4f9166f35cb64ed44f8c231f74be51986d14d8effe2c98ccf3486cc WHIRLPOOL 0b5c91f15838d06a565e26d57a3923962c67fbfd2989814f6120ec98230f03c97b71ffe296df2cfe12b8fceb426687aca3707f922ab640c94b30d06d36097e79
 MISC metadata.xml 432 SHA256 694e6b73b6c12ad1b7c2a5069a43b7c0f393d3b099ca89fca181a3bd44850846 SHA512 e59462dc17d0e050f0876eb74334ddb5c980900a8b4268c281f92e30545a7cf7a3589dc1961640cba9a01d3ce01ec210904dd7033e42d9b3d237740f6820f375 WHIRLPOOL f968017b9a88a08d1dcce5e049814cfd6331d9f885f21f3d248f862592e9cce664b646871ae8ee161997880f0a09c1f6bf94a3dde747fdb0cf1b69cc25411784
diff --git a/media-sound/mp3blaster/mp3blaster-3.2.6.ebuild b/media-sound/mp3blaster/mp3blaster-3.2.6.ebuild
index ec45419deef4..565272b311e6 100644
--- a/media-sound/mp3blaster/mp3blaster-3.2.6.ebuild
+++ b/media-sound/mp3blaster/mp3blaster-3.2.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="lirc oss +sdl sid vorbis"
 
 RDEPEND="
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index a0615d24f269..6cb947e65e27 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -4,7 +4,7 @@ DIST mpg123-1.25.6.tar.bz2 919169 SHA256 0f0458c9b87799bc2c9bf9455279cc4d305e245
 DIST mpg123-1.25.7.tar.bz2 920705 SHA256 31b15ebcf26111b874732e07c8e60de5053ee555eea15fb70c657a4f9f0344f3 SHA512 4e0972149ce4f792cc361d96d638551eb5184942465e69713202d0830a0a54b33e3effe2e460683b996024772edba5e0be341048b9d0c73dace557c640d4414e WHIRLPOOL b5c95cf1da06e06c3059282e79a57cf9e07137862a01348b11a719f42dcd77533c45237a1ed641f6417b29ae2b852655d1d23f2373220b5ef99aed6fa57e2941
 EBUILD mpg123-1.24.0.ebuild 3022 SHA256 707f9c9143cf2d6a58ae71ebb65add748fb06d8be93be735f87d56c95b36beb0 SHA512 6354bcbb2befae65a3433cad75d7e1b0a12cc8ed6e93f8eef5ca6bb59074edbca483e34e077355be12f0d70efd6e73ab9521c0118c5ac0dc1a64e363c80bf7b4 WHIRLPOOL f1e9be81ba4d9cce3e5ca8c77f371eb00ac781e5848d18e0899690b1316c1923b74745c7415111ca6f9d395a4fc1c78913a6ec80d29bede7674846d6f26ba57a
 EBUILD mpg123-1.25.2.ebuild 3030 SHA256 56a3526d720725b1a44b0b0ab8b8f4b2976b06afbd5770eca22725c1a1047203 SHA512 ff19843589d37864e210114b1d69a5246bd62222e3572f07853bf356c6932898a6a9afea2ce88121261d4c2b641f67fe7225a6715d65733a07031e0915f7218c WHIRLPOOL 87713af2cd254f303f470f660a7d64bc1e7b85a7a194ec8b239c8b0df6a39c469b09334147a2781f244d1a24ccb975c5953303d0742a943f5f468234e8eb2c8a
-EBUILD mpg123-1.25.6.ebuild 3033 SHA256 90b4a3b6ad76eac28e0eed8f31520dceacfe661571ce0c9161d62853a39fa67f SHA512 ea5dcf82cba41a956a67b7c5c1eecdb5a5c5b2945a7fe0b2abc2b753736a33303c655edd58c3fffd5ff82dd519b0910c947a6e3460e0113e30191e07f26c91d4 WHIRLPOOL aa54d475d896c7c774649891cf74442145bfecb653506456ec003b2ccfe58ef7b86e4cb26ffd93312a7e814adfb9229bccd7f5d1cbd740e525bf0207558d3e4b
+EBUILD mpg123-1.25.6.ebuild 3030 SHA256 56a3526d720725b1a44b0b0ab8b8f4b2976b06afbd5770eca22725c1a1047203 SHA512 ff19843589d37864e210114b1d69a5246bd62222e3572f07853bf356c6932898a6a9afea2ce88121261d4c2b641f67fe7225a6715d65733a07031e0915f7218c WHIRLPOOL 87713af2cd254f303f470f660a7d64bc1e7b85a7a194ec8b239c8b0df6a39c469b09334147a2781f244d1a24ccb975c5953303d0742a943f5f468234e8eb2c8a
 EBUILD mpg123-1.25.7.ebuild 3038 SHA256 18119c639868adfbf66d68386b5fc5ab240d6dd3e1f84e34540800a8ba81635e SHA512 b3ad391ea62ffed0fe08538b9631d3a927d3c028dd4d9ce41e20c3ee1d09e9b204225fcb1dc1e66d8b4fadbac8b9f0433c8a17b5ebcf27285f271750b4496441 WHIRLPOOL be01bfdf7621edca8162b40f6fbfb1ae4739485e224c0cee85e4b7f716163c1680fff9e3082109f75a45ff742575655bb4bdc9da23caf33bb85e1f82bf4234d8
 MISC ChangeLog 7069 SHA256 78b99c669a6ab6805e51567b0152b8600d201c9ea43f0aa2d76639b6669887cd SHA512 607b16770e5a835725991cf1e9046b22c0ee83f40cbacfc0f62e203f7e1db043fddfc52eee9a4977c0876b1b5b5c52cdea4e3d2d4a9e1ee0032ee24dfcdfff6e WHIRLPOOL ec3be4f6dc13773dc03a8bfe6d0f9ee3c40f4dedc2d7644b14b1ebd0dcbcfd0039611b06d5ced389ab395b85464e3735cbd27410e0d4dbc92252617d416a9cd3
 MISC ChangeLog-2015 43285 SHA256 0b49de609f234bd5f9bc052cd06c3586fc103e1cd6629b6fc314b03f96a5174f SHA512 803af43862eaaf7cf696255bf78c568080c5506c3ff42d85606acddc3fc0d70f174bf3760bf40cd96e2a3c28d3126d99a9c1266ed510184ef30c2fc7d747af30 WHIRLPOOL c2ac239fe9540a463a6d6832613cf142376acf4d078f0609918397fe0a5545e7eec00176e9628db22e7aea4b459a41057da000643564c96cff7bad621c33065f
diff --git a/media-sound/mpg123/mpg123-1.25.6.ebuild b/media-sound/mpg123/mpg123-1.25.6.ebuild
index 252b405b01d0..30e10ca885c7 100644
--- a/media-sound/mpg123/mpg123-1.25.6.ebuild
+++ b/media-sound/mpg123/mpg123-1.25.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index d7032d0503e1..198429a279c1 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1,6 +1,8 @@
 DIST ncmpcpp-0.7.7.tar.bz2 443801 SHA256 b7bcbec83b1f88cc7b21f196b10be09a27b430566c59f402df170163464d01ef SHA512 a0bbe85f154c40513d41e85810de86ed21109b72fb0f2bdb0b78dcbddb3770aff5422b5bb7fbac2b76634c5b9aaf843bed5fc16fc672fcd71bbae911f65c0034 WHIRLPOOL 49a5e16cf583424618db5e2c38a946cc60d5ea2e17015c7e6232c91f84cf44c308389b81bb2f380045f3f9595d83a13c2a4f571930ea122e85437f4e6cccb4d1
+DIST ncmpcpp-0.8.1.tar.bz2 464123 SHA256 4df9570a1db4ba2dc9b759aab88b283c00806fb5d2bce5f5d27a2eb10e6888ff SHA512 2b1b615672910f6b55d4a3e1842f677b8c72659a86dca74d9c306612038d7b765f622e4b8948f14d8a3f4fa913d413d128ed8726f70d7a09cfe95d3c1fe87d15 WHIRLPOOL 988af2a3917a46102fc82396e320b0176eb9fe17defe9012d9eba08afaabcb8407902082dbc24b2d35637798a880ff730152e10e6ea8c8569abb59b6c9ae1e08
 DIST ncmpcpp-0.8.tar.bz2 464165 SHA256 2f0f2a1c0816119430880be6932e5eb356b7875dfa140e2453a5a802909f465a SHA512 b51217df85f95efa345f0484f16024bd74c1c0e22f2c2b25238335fc2f00caf81877088170f241c1d97fd328d104b19f022dc4de9895ff420f1fcbea341e7cdb WHIRLPOOL 765bd7889d16ea88a574ec9da3a3a50a68c133a51d976053cf1fe533b9a8d21da3e789e76d6c50b18190a36915e57daa7e4e1378154b79c1119068cc82be6085
 EBUILD ncmpcpp-0.7.7.ebuild 1501 SHA256 890749eece11fc7574eb05c9a3892a1b13d435679619ff179c7477bda5d26b7e SHA512 dc3691ec4e4d92f063fcccf219e3566ebc85d8b2b0bdf8134720701172108bce462ba9278b9405c556c8631df846747e5f5a2ccdfaab1b6efad58ec92e9474e1 WHIRLPOOL 560b09d84256bbae400866898cda50628fa1da089f8009674956d25e8758bb0b5ac25211ba6e243d825aaf843f404c70aa81007e87d77ec03f7e9b71d9284747
+EBUILD ncmpcpp-0.8.1.ebuild 1372 SHA256 3e6679a2c15606374fa55541bb1c7300c354f2f507bf1ac977d8b944a007aeb8 SHA512 221b4646fafb31d9faf4876fedd0c2e52418f8a8a6e448985076cf4f862a9d1e58aa3d749790488731a1c12443b2bbb1b6a0e7a1f02fab78c6cf3b5568bc3d31 WHIRLPOOL 6dae7e2127f535f219c31701e4656053d4ae40d72a78462ce91689a873613099bed1ada6072623446229b041e9c0f4156472b0cf2d2bbc10887041094e0c3f5b
 EBUILD ncmpcpp-0.8.ebuild 1372 SHA256 3e6679a2c15606374fa55541bb1c7300c354f2f507bf1ac977d8b944a007aeb8 SHA512 221b4646fafb31d9faf4876fedd0c2e52418f8a8a6e448985076cf4f862a9d1e58aa3d749790488731a1c12443b2bbb1b6a0e7a1f02fab78c6cf3b5568bc3d31 WHIRLPOOL 6dae7e2127f535f219c31701e4656053d4ae40d72a78462ce91689a873613099bed1ada6072623446229b041e9c0f4156472b0cf2d2bbc10887041094e0c3f5b
 EBUILD ncmpcpp-9999.ebuild 1361 SHA256 f069fcfbf0c24ca5943a781fbbffdd900c17803bfc56be51811d86a31c2fbfd7 SHA512 8c126b75c5ce753b537b43aae6f665258c80954900d9ae61e48e89e45860e247425fd01ef77c3707ed66db97863330a27d33d2191020684394cd60e20246b505 WHIRLPOOL b581348f38ba905f8c4a192ddc829868f45b846bdd0c430cb919bd46d494e2f716648dbce8fd803547d192e2521a1f768ced259010638017fa76e229e09a8c6e
 MISC ChangeLog 11907 SHA256 f0ff7ef7493e024bc5fe3aa210666889c49ec8fd7f1607d23234b1a319dbc198 SHA512 cfe59004afc004d5556968309c0267fbabe80fb73419df7c297a2dc8c4f4e3c3aefc036720328a9c3d05cef6cd26cec7d83ce96c74678c581e68a297471e5b35 WHIRLPOOL 138c2a9d65244dadfc4904f00ad4763d3626a9d36506eea53fff072522c28ad3f5ec37a06a091fada0a701963be926bb19d455a9df4a9633cd4526adc9d7f783
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.8.1.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.8.1.ebuild
new file mode 100644
index 000000000000..937bcfe975bf
--- /dev/null
+++ b/media-sound/ncmpcpp/ncmpcpp-0.8.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
+HOMEPAGE="https://rybczak.net/ncmpcpp/"
+SRC_URI="${HOMEPAGE}stable/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="clock outputs taglib visualizer"
+
+RDEPEND="
+	!dev-libs/boost:0/1.57.0
+	>=media-libs/libmpdclient-2.1
+	dev-libs/boost:=[nls,threads]
+	net-misc/curl
+	sys-libs/ncurses:=
+	sys-libs/readline:*
+	taglib? ( media-libs/taglib )
+	visualizer? ( sci-libs/fftw:3.0= )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
+	sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable clock) \
+		$(use_enable outputs) \
+		$(use_enable visualizer) \
+		$(use_with taglib) \
+		$(use_with visualizer fftw) \
+		--docdir=/usr/share/doc/${PF}
+}
+
+src_install() {
+	default
+
+	dodoc doc/{bindings,config}
+}
+
+pkg_postinst() {
+	echo
+	elog "Example configuration files have been installed at"
+	elog "${ROOT}usr/share/doc/${PF}"
+	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
+	elog "as user configuration files."
+	echo
+	if use visualizer; then
+	elog "If you want to use the visualizer, you need mpd with fifo enabled."
+	echo
+	fi
+}
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index e6923c6951fb..cdf4dfe62689 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -5,7 +5,7 @@ DIST picard-1.4.2.tar.gz 2116021 SHA256 f0adee3877bbd66c827a43b57dd2233037b99f6e
 EBUILD picard-1.3.1.ebuild 1305 SHA256 969d0538e9b6b7d7158317481280c51d17558dad59418df82afc6e87864de9fb SHA512 99ffcb297f20dc17f30f188c85c6955fecaf6188e0b9c25d9a5242d08db585ea6fe9b09c754540fd74c4e0724d2f39da88e483f6cfb9b5eabbc74f3dc2d20d5b WHIRLPOOL 912029138bb625e3ca9012d40e8b573550d74118cf971bdfb7d8274de5122d23cad1cc0fc41e794cf4620f864b70dffa452f35d7285cb9ed3e23233dc0e7d761
 EBUILD picard-1.3.2-r1.ebuild 1332 SHA256 d3521816a7cb5dafa4a9ac6447fc62367a0b2fc6cc79ef9738cb7e79ec0714ae SHA512 7b059c984c0ac001fa837197fbf7559a0933777f3667b429560b6d603716faea067cc15ad6005092e800a55b605d47a5e41f2cf420d6b7ffff7afca92c673981 WHIRLPOOL cda05129249c1e89bf17e9d082cb348159a08558d6f7b09e773c04077786ae3ac42f8c59b9ff67b3415e8c251e13e1959c97779c8d9b7fde54965e29f031e639
 EBUILD picard-1.4.1.ebuild 1582 SHA256 2d75f91d37d75856a3318ca14f232e82085db2eba1e8cb481f116784da0f446a SHA512 0a003ed174c9e8cb7159b11d1782d1205f471b3c1c08a3fe33f32e1261e4e4b33c7e71aae3d85b9bb39d3006d2200dc40be078019df472fb2b3ea501bdc537fa WHIRLPOOL 0a2396c9a7d8614ff98254cb5f197a0bfb7308e43222c14cd2e38562ddba6b3397f1c43d142aa6af8a9d767f8abc8255cb489b40d54ee271ad691fa1363df4d4
-EBUILD picard-1.4.2.ebuild 1582 SHA256 2d75f91d37d75856a3318ca14f232e82085db2eba1e8cb481f116784da0f446a SHA512 0a003ed174c9e8cb7159b11d1782d1205f471b3c1c08a3fe33f32e1261e4e4b33c7e71aae3d85b9bb39d3006d2200dc40be078019df472fb2b3ea501bdc537fa WHIRLPOOL 0a2396c9a7d8614ff98254cb5f197a0bfb7308e43222c14cd2e38562ddba6b3397f1c43d142aa6af8a9d767f8abc8255cb489b40d54ee271ad691fa1363df4d4
+EBUILD picard-1.4.2.ebuild 1581 SHA256 257e89e34202126cb98d24c4e0e61be6a53d76df343f1ff2b0b12f719b8411a4 SHA512 ac6f9ee124b70de9bdc2bae6446504397f1c7f6fbb8cc37777c4cc184a55ddb7f999d6e42d91673cb6119edb2171aaec130cc790c950c51eadd76f1087a6c84d WHIRLPOOL beee997cf08f7375fa33f209166ca82e8a442c76f7be836453ef198f89f66e926fb79bcb3e24e71e57ad2a95ee3dc9172f0ff13b772a66c8e33e3245ebe3a07a
 MISC ChangeLog 2876 SHA256 038428dffbaaa64a27fc3b5a5ce13fb01b272d338effc0d17fb65ef8e81f45bd SHA512 336a643800eba682ddb2cfcd9fa4c557eddee83bfad22ee654652555ab247a0de87d0f4da7362f7e8395b75b3dd198601a374db2882e8f96cdafdfb02f63c8b8 WHIRLPOOL 6d240f5e43223624dde9114d61af037c673e6b423829027bd4759eeec13a7becf2a2c759199b47a767f8f9e149d263fb521274c069efc41cc237d259a7b89be7
 MISC ChangeLog-2015 8587 SHA256 9ff902965e0ec129dace44423ed68df7bdcb1dddb02a9aa60800c519ff5b051b SHA512 840a07393644bf13f5ff52f8e461ebb7e68eba28c953b4c03ac9c2ce67d119f619b4b4b7eef0998aceca03cb38253515d1ace06bdfc1820d3ec0a75e2ee5c80d WHIRLPOOL 6dcd0c1369c1d4d4b730e0ad6820b5eea61a54405279bab89a17fca9fef330b3ad2530a920c20118507732f5f4b693be0591e49555dc17a4a95ce870bbdb3bf6
 MISC metadata.xml 664 SHA256 71d7265f73c9596796cb95e3a47f3fd9a39e62be96b034ce4c4b7fa6457a7d30 SHA512 f0671dca61d99480b92fc90cfdfa456d6a88c692a6e2b86ccc9d9ecf95bff6f634b885b14aa2e2b2e1c140090cd06043cc4f396dce0999c1febef61f831dcd09 WHIRLPOOL d92e2120512f58080b805f27609b1b8eb905e623a744b154cbed865a72d76e90ce35444da29ef99ce027851e6bab86a00e3327f2bc01d351c24d0fe6d287c9a0
diff --git a/media-sound/picard/picard-1.4.2.ebuild b/media-sound/picard/picard-1.4.2.ebuild
index 763fc7e9db21..c1ae248b2ba2 100644
--- a/media-sound/picard/picard-1.4.2.ebuild
+++ b/media-sound/picard/picard-1.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/picard/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="nls"
 
 DEPEND="
diff --git a/media-sound/playerctl/Manifest b/media-sound/playerctl/Manifest
index 39a533688377..d24736d1de3f 100644
--- a/media-sound/playerctl/Manifest
+++ b/media-sound/playerctl/Manifest
@@ -1,4 +1,4 @@
 DIST playerctl-0.5.0.tar.gz 17015 SHA256 e1ea761c05774471a0a1274ad93805178b32d55d358ece0424fd087c1def8017 SHA512 307cad5eeea7efa0c97c885660f49468f442fe907ef2495b56ac512e0551c7248750897b6d00934cbfcfcb35f486a101a238b276ef71d2ef866132ca3cc0932c WHIRLPOOL 11e374a1b38586a8ee362b821d503af8175c36f0b48f067c91176d32aeae034a4fbd6c1e2afc2c78987a7be574248f0c8f329efc2dcf4b07f8df52d8e7d35726
-EBUILD playerctl-0.5.0.ebuild 911 SHA256 55f668c757a5396f6efff67cdc9a11dd5033effb13185ae5d7f4fa1005f527c8 SHA512 0a8d421ab0874a479aca422f676c4b4ccc92cb1043ab82c799a332375439802da585d69afa3325a36f597e6ae6e25e8e8dab32631daf280ee8186ad5d116d8b1 WHIRLPOOL 25b27b61e311c4d87d3cb375336ae46f8a7668e540a991bb72bc233ec896f44dc47cfce838d36d4b6630c19b4bd02476bb6283a279fa54675a8e67751a6046cc
+EBUILD playerctl-0.5.0.ebuild 910 SHA256 02852e6bf0ac5849ee67f72ad12ab17fa4631ea31e3d745e237cae162a768ab1 SHA512 a0e488aa5f5ea9aaaa0a4cbd9575c6a4f59e4ee4730057332c5d865345a2c33a94e49b5478382ab792e1b679dc43a78dfff918142e0e8804785976a070e1d0b9 WHIRLPOOL 897365b6cadb0aeae088741544727dccfddf875c84a1840d53e5f47f195c7f001fc7d9d228bb014036a6faa1d5b10004a32ab1895c7344ca726baae3c078d824
 MISC ChangeLog 831 SHA256 07065e126ff85048ba2609db976c921316eabdd13ba2efb595f653532a55658c SHA512 e5d32eeda9bfac0fb0c4f5a5fd5dc283080bff5185c6db2bd42d273e6eb40908c6e47516e5f3d5885cb4b21b61b20b1b060549c2ad89bab4f0e63b615a0e78db WHIRLPOOL 658477543f9b6acbd0f9b3778c5c9ce69565e895b480f92dcb68d632880b351b103b2b5db3d556df37dcd0bae22baf68e069014c3ee74bcef60c89d17050b451
 MISC metadata.xml 487 SHA256 e21947c51cd8faf1265f27d0c86dbe4b654d90c55d92d4e97775c188cc6573f4 SHA512 f97cd3597a70b86c784f11ffcc5c7c8fb5c16a124cb871907f8e3f216b7ff26d7e2954a52f52a5640fc8a8f41300a4419c527c57f410350a322ed36b1fa2e77f WHIRLPOOL 22eae4306d9eeb4f9fb0cd736196e257a015031395aa1da96eac64fa6f722056cc58f52b600fcac9bf2a2bd46c3e5123bfe4be02a00f6c4ce0cd68bd8c50bb54
diff --git a/media-sound/playerctl/playerctl-0.5.0.ebuild b/media-sound/playerctl/playerctl-0.5.0.ebuild
index 67ba0cbdc5cf..d7fcc274c5a4 100644
--- a/media-sound/playerctl/playerctl-0.5.0.ebuild
+++ b/media-sound/playerctl/playerctl-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/acrisci/playerctl"
 SRC_URI="https://github.com/acrisci/playerctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 1eca759cb263..d27538ae2513 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,9 +1,9 @@
 DIST qmmp-1.1.10.tar.bz2 1142444 SHA256 1e5781bf65b3a27dd5e21349ac007464e67861dda99f8a0206984687881e0b9a SHA512 f9945ea428265c900751dd692e25eb0618e162e621bda7ab5f0f77d504aee66fa06390edca0155d18ca041706f461dcb9bb20678eaf32250b766e0f593915356 WHIRLPOOL 1beaa2339fa8b86c79876774a3da12a8a5a62bf729e4fd6bd6896aa225bc573dc2272cc7438b257fe6567c8c85f38a301f2740eef788322e1d872404e5db6c0c
+DIST qmmp-1.1.12.tar.bz2 1147871 SHA256 4601898490167560e189a736ae619f6161cefd12a46252a9f151ec1bf7aac6da SHA512 a45680dcee478a7f03a04dbc87525368ac227a9de7e803252470f517027639d3426bf27a3235996d94ad68212596c03e7a67b5ad00a642532f02a820bf4097ee WHIRLPOOL a4babf407ae612d6604985a75ce905ae1e3cdc84899256c1a37e4daab3d395b435a1c64fd0b90e56545a84ab09d70ec32b2e495271b537738399f219cbe5f216
 DIST qmmp-1.1.7.tar.bz2 1135005 SHA256 464f79d9a54e6456c5abcb570d7f062e48d3eaa3d60ad2b09c58bc62af5b87a7 SHA512 058187d34b848c0917077a167bcb52c63e39b5150409295ea658484d99fcd5582f7871979d3d3eea40aa97f0d9bf2a2d72ae721b827bcc0366b1bbc652aa3a72 WHIRLPOOL 1c1f22a22329619f63a1a24590b41b352d398bb4653117c81918b2e940e887c6aaa06f178674a97893de7418673022bdc800a09643d3fb38096f6dc78b7774c3
-DIST qmmp-1.1.9.tar.bz2 1136753 SHA256 e25bfc0fb4182793df81c6ec222d553183ccd3f61e5919d217c9c5d788f3df2e SHA512 54ff71626b2ef778efef84fa56a50b483d6e9d14f1f53be2f1b01223a0f23db04fcc734a371eb22985404d9e15839b76c28d0909bf110c286ebbdf4ae27d1cd9 WHIRLPOOL 5fed1f1d3971887e3922d581e9805966c6715d834120218e013b5bb8b3e166ef89e21af6676ac642713370cfc54f6b0d62a47e5fa91445361cc5a59c749d0d1a
 EBUILD qmmp-1.1.10.ebuild 3858 SHA256 b27e5dd787378b86732b902aa1e37fa0f2bda0ab39e3fee24c55af95230dd92d SHA512 4e207516f6ceab473fcac12699f8795916da85380ea933612cf16f632d2a815702ac598a260f31fe26a07c3aed96fabbb24a996b0501821e35c7866a8f6fcc1f WHIRLPOOL 0bab7edc488bf7695b2616f1830552959cbbc4ec0c59725f82d5430bd63fbdef6a63f9c2fd552b1230d6f932381fa0872e8e90e1b79eab09eb2d66ae6b531c55
+EBUILD qmmp-1.1.12.ebuild 3858 SHA256 b27e5dd787378b86732b902aa1e37fa0f2bda0ab39e3fee24c55af95230dd92d SHA512 4e207516f6ceab473fcac12699f8795916da85380ea933612cf16f632d2a815702ac598a260f31fe26a07c3aed96fabbb24a996b0501821e35c7866a8f6fcc1f WHIRLPOOL 0bab7edc488bf7695b2616f1830552959cbbc4ec0c59725f82d5430bd63fbdef6a63f9c2fd552b1230d6f932381fa0872e8e90e1b79eab09eb2d66ae6b531c55
 EBUILD qmmp-1.1.7-r1.ebuild 3856 SHA256 5dc5790f785a0c1444e58f5a57e785ad7f9a9a2faf64132a36bc63a16ce6ddaa SHA512 e0922330692482d5ae933f27cb8f12201412cd97f717601bf925eed638412ba70463eba3afecb17d011b5040f1d30f69eb07b8bef1d0599f2341574050434aba WHIRLPOOL 760702483d215e8ee9153096358600b309951d0a0f66c5b25b3ba1cbad6b1a470e1665f5f1e70c3c5fc2aaf96dde8087d6637540be5992fd5dcb117c9f6965bf
-EBUILD qmmp-1.1.9.ebuild 3858 SHA256 b27e5dd787378b86732b902aa1e37fa0f2bda0ab39e3fee24c55af95230dd92d SHA512 4e207516f6ceab473fcac12699f8795916da85380ea933612cf16f632d2a815702ac598a260f31fe26a07c3aed96fabbb24a996b0501821e35c7866a8f6fcc1f WHIRLPOOL 0bab7edc488bf7695b2616f1830552959cbbc4ec0c59725f82d5430bd63fbdef6a63f9c2fd552b1230d6f932381fa0872e8e90e1b79eab09eb2d66ae6b531c55
 EBUILD qmmp-9999.ebuild 3858 SHA256 b27e5dd787378b86732b902aa1e37fa0f2bda0ab39e3fee24c55af95230dd92d SHA512 4e207516f6ceab473fcac12699f8795916da85380ea933612cf16f632d2a815702ac598a260f31fe26a07c3aed96fabbb24a996b0501821e35c7866a8f6fcc1f WHIRLPOOL 0bab7edc488bf7695b2616f1830552959cbbc4ec0c59725f82d5430bd63fbdef6a63f9c2fd552b1230d6f932381fa0872e8e90e1b79eab09eb2d66ae6b531c55
 MISC ChangeLog 11794 SHA256 602bd5ff0c4fead6e2ef8ad3ae1bb93e63e3b9fc314ac99ac28e86e3c893d185 SHA512 52fa69e0eeab93580764aca9582d8fc70bb9bd9eaa7d82fbf4b4e0f68b9bb2d4c9cff29230bc34dbad9fa48b4f8c6bf4ad585d92470ebff2c7467232fce5ec8c WHIRLPOOL 9e76ba77ac78fd4820fb2f77b662f6a0d50ad894ebfbdb608821bc0b67b5d42e728df4135c3f876144553dd5359e22936b1b494326844489c1a83c4183375e2a
 MISC ChangeLog-2015 18869 SHA256 c6b9b2d4ab726c2c37d4f47a5de3564be303d73c9de6e0eedccf8536ad93b7be SHA512 6d39df9af1d2ce8427c0f0a1c506a070942cc25a5fbeb08431b41d0aaee8e0d5fb6c0a2aa2bc8b526909253079179b5b2600d6bd8deda38c921d174349525fb8 WHIRLPOOL 80b378e67e041dfc1333e5d57ccd45925b37e96582620753756f86164b8d1708b3db872c70a72722d4d3252c8f4d8dc7c4257d96ebf0587f7373981117c7687a
diff --git a/media-sound/qmmp/qmmp-1.1.9.ebuild b/media-sound/qmmp/qmmp-1.1.12.ebuild
index 846c740edb76..846c740edb76 100644
--- a/media-sound/qmmp/qmmp-1.1.9.ebuild
+++ b/media-sound/qmmp/qmmp-1.1.12.ebuild
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index 0845d068851d..4a038968d4e3 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -6,7 +6,7 @@ DIST qsynth-0.4.4.tar.gz 260482 SHA256 0ef914447b1f3a3ecd9c38101f06fc9c67e1d8367
 EBUILD qsynth-0.3.9.ebuild 1227 SHA256 744432c63db83946951b01bbc6773f376ea6766e832d7027fb5a4c6d96902c52 SHA512 b4f62f6dea2d1d990efe150a75a383a905eab1ef2aa10e2d7f9446e32dad454e4ce0e3cf5743f9a1529c335c823ec96a49f48c239e63f8136fb02cf713ac2e7c WHIRLPOOL 8e39dc6766c74796c2c3b20798f52a5998b81ea149b4cb09ed948173f23736594bc2343d8037a58581835e51481bd3085d54f02d4cd9ed9bc40063a187457543
 EBUILD qsynth-0.4.2-r1.ebuild 1274 SHA256 3016b25e68958ff0589fb41560eb89dc6767bab3da14d21a1ab30426f2918b64 SHA512 b714287716436e34fff9676ce471283ed7b123a88766cc0b2eca5fb9c85d2a7aa72ba923bd467b70ba44cd7b0a7ac8b3f5a09c608cf410071bf74cd82b2b3551 WHIRLPOOL 3ccbe659cbe771271d12becb0ce09949e2a5523db04751547532f99f944688b005c04b815efdb4735cc83e2b5c7831104b8d53e48f80124e6dce3aa112022a64
 EBUILD qsynth-0.4.3.ebuild 1274 SHA256 3016b25e68958ff0589fb41560eb89dc6767bab3da14d21a1ab30426f2918b64 SHA512 b714287716436e34fff9676ce471283ed7b123a88766cc0b2eca5fb9c85d2a7aa72ba923bd467b70ba44cd7b0a7ac8b3f5a09c608cf410071bf74cd82b2b3551 WHIRLPOOL 3ccbe659cbe771271d12becb0ce09949e2a5523db04751547532f99f944688b005c04b815efdb4735cc83e2b5c7831104b8d53e48f80124e6dce3aa112022a64
-EBUILD qsynth-0.4.4.ebuild 1273 SHA256 e1e3473a3ef9da71d3b21a98dc28ea1b4b47e90d2b3af23c5cd8901e521d3e1f SHA512 892e4f4b4af8dca09010f4e7af1aa7c79a35e10f0882300fb47d82bafdfef54dc02babf35183946b680a3d0ba8734b428b827ccfa7ec26ac633d94dc0c8c94de WHIRLPOOL 07d458fcff21e2cf77f01dd3badabbbf682a47c60dcd9c9410d1ecbe0707888b30873909d34015775d8aa022d37c32d722dd048120552d3995e6f80d3c35b74c
+EBUILD qsynth-0.4.4.ebuild 1272 SHA256 38e1a34ce4581b3885ecf8ae3a0bdb2b75d58ac631b2a0d152e52c42b7628f80 SHA512 31574b72392f5f5d84351b1164c225f0257008c8e54679661b96b685abd6b1894c7e65c4d2c033e97aac062116c02e8faa320c7bc0a57f852ac644eba8d658e7 WHIRLPOOL 29a627d31fc7abc52a3a720ba4f9b7afc75b5551da7bbe9a8d512503040296275d2e3a23251cc96b193f5c6e7591c3df7da5da1056cb5176ae00edf822186a21
 MISC ChangeLog 4759 SHA256 d5231fd7eabfbd72c202e1fccc06406e59b4f4ec756c1916e6124f07e8450ef4 SHA512 8739c18599645121c30c929f20a6c60da042c2317de75bce93c51aacc7345d8a1a57cbec05a6510623ed0a0b16c3f1afee2a697b60174c75e44375043d0b9daf WHIRLPOOL 2de8c1631604cfb875b4fc1cb1f7158fca2ec5f6ffe468eb04a6e8ec01d4bbd01b257d2684c0b095ecbad596669b14abf0f36445f66f798a9e41a1c9bf32b264
 MISC ChangeLog-2015 10926 SHA256 1706925fb5646bc835ea4c751e1917a14c799fa45a8d1b25481ede18e3d9c000 SHA512 33036742742911326e33054024235d108d3db11ddda9ea44ae3ab005ae0daeedb2f8dc7ce0cbbb7e32d3c8a1f7b22cadde871e7805eee6aca95357d2e4c9019a WHIRLPOOL 6cf9152968549abf3de778388c799d6f3185e2f50df6d47ce3b6497f2a73b42ba99fa3208b30cb9d88bcc12d6e277692794f5665018cb174bb210ba6b0d324ce
 MISC metadata.xml 755 SHA256 825dc970bb78e173d7851943a63577e3048f8f162f2fd009b71e5e29b1683198 SHA512 25f7c0ace8cd3b9ebe09ff93e9c39169f5345cb583646bcc146ff3b33c2cd4d689b665ae4e19f6ac588f47d5c691bfe3c16f0e67756847c7b45c090e586ab933 WHIRLPOOL afaa1961b7e76d401d26dde8011e83fd9c19efb8f386d5d3ef5152dd4442e2296750ad633a50c58f2aabbba5e4fcc14fa892080fd0c38658358dcd1ec0501c53
diff --git a/media-sound/qsynth/qsynth-0.4.4.ebuild b/media-sound/qsynth/qsynth-0.4.4.ebuild
index d88d540d7268..f5becf98e744 100644
--- a/media-sound/qsynth/qsynth-0.4.4.ebuild
+++ b/media-sound/qsynth/qsynth-0.4.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug jack alsa pulseaudio"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
 
 RDEPEND="
 	dev-qt/qtcore:5
diff --git a/media-sound/qtmpc/Manifest b/media-sound/qtmpc/Manifest
deleted file mode 100644
index 18183fd35a2e..000000000000
--- a/media-sound/qtmpc/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX qtmpc-0.6.1-underlinking.patch 1481 SHA256 8295218ebeeb14372c36c34510a9eed7210e82d8e474ef3caae1bd58327780d3 SHA512 dd7471ddf9e7cb6b389c8551580193b569b53c56f717528f2631885ad4f788723b0e11fff572b09205f5fb53f60681b26cd412bdf549d8d24028c6bd69ce5778 WHIRLPOOL d7c860863cbb8463894a66c4a860c49b645f8914d729fe285c480e650084ab38768913d02889e5be9c18f283b1138d4633ecd27203fef6e2704277c982498adf
-DIST QtMPC-0.6.1.tar.bz2 96341 SHA256 82287a26788b36d49db26518b66203f332cf686eefb81ee2d9be095e61123a62 SHA512 9b55a3d0190cc8f7aa96c379e9b8f428f6d306bd2d02e7b8b70032aaee6fd486b7bc0db2cdb1216623c866954a49f60b9563edf39c4e62df81333230b37fe304 WHIRLPOOL 25397f159ea38da400b518d4ef8ef5b82f353f42425dc281a8f32e049fb49a6833a0c2def9d4b0a4abda8efc11488731d7853bc47761ef14fdefe87a809cfe22
-EBUILD qtmpc-0.6.1.ebuild 490 SHA256 64419b659d21a1441e63070052681a49bba0497241f3bbc16fbd996ae3c4c9f9 SHA512 0c2e62c3b41e782c053b8bf8a0d4140a60da84a68a5804ea9b1ad75ac5823e1ff6f33b7596151f21fd56662fa26e65747188df073e72dc367803f455942e10f1 WHIRLPOOL b8a8f03b1f8ac499b78bad64468cf42965c1d88573242f805bf69f4e79e151b83d6c02241c26bfb722c975cfe1b89786e931e904f8f07141a59dbe684f00f335
-MISC ChangeLog 2856 SHA256 b5c235020bc40b9ef9741ec8e7ad6b68b4fc4a06034d3ce327676c1dd396bb8a SHA512 6b354225764bdc1ab97c9f68136fe9b54b93d589b28de70c79acbad20aa1b8ee177f681c812d1bf901cf758156e5d413b3512bed9a203d6d49012e92dd6bd995 WHIRLPOOL 48f9a882dd3337b5b35ceedc4c03f67eb8b2adc2be178b943aca3ef237ce7cef1b38d0836f878fd88a1da3e7ea3598e48594c6285955c2dc512fe6f1a1d349f4
-MISC ChangeLog-2015 763 SHA256 94ecb9926cbb66fd8406f63f11ad384128f98b440ac2f9774cb8ec2f01637619 SHA512 cba02c92ef8aee747b27830c6905619deb7094a59b050b83f51be5bd805c648fd8ed85355dfef530b7fbfbb9e5bbb82f56517d485daf59a9b5e724224ba8177b WHIRLPOOL 0e7c20a0905db4893e5879d77b5cef9fec1dadaeeb146a334b7fd8ab958ee58bec6407bf39afe24264c2423255237b14c3dfa1262ca1d53d4a2e4872c6dfad29
-MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/media-sound/qtmpc/files/qtmpc-0.6.1-underlinking.patch b/media-sound/qtmpc/files/qtmpc-0.6.1-underlinking.patch
deleted file mode 100644
index 881187d1f9ce..000000000000
--- a/media-sound/qtmpc/files/qtmpc-0.6.1-underlinking.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -ruN QtMPC-0-vanilla/CMakeLists.txt QtMPC/CMakeLists.txt
---- QtMPC-0-vanilla/CMakeLists.txt	2010-11-02 17:00:58.000000000 +0100
-+++ QtMPC/CMakeLists.txt	2011-11-20 23:27:18.000000000 +0100
-@@ -81,6 +81,11 @@
- 
- # this command finds Qt4 libraries and sets all required variables
- FIND_PACKAGE( Qt4 REQUIRED )
-+
-+# add some useful macros and variables
-+# (QT_USE_FILE is a variable defined by FIND_PACKAGE( Qt4 ) that contains a path to CMake script)
-+INCLUDE( ${QT_USE_FILE} )
-+
- FIND_PACKAGE( KDE4 )
- 
- IF( NOT DEFINED WANT_KDE_SUPPORT )
-@@ -134,12 +139,6 @@
- 	ADD_DEFINITIONS( -DQT_NO_STL -DQT_NO_CAST_TO_ASCII -Wall -Wextra )
- ENDIF( NOT ENABLE_KDE_SUPPORT )
- 
--# add some useful macros and variables
--# (QT_USE_FILE is a variable defined by FIND_PACKAGE( Qt4 ) that contains a path to CMake script)
--IF( NOT ENABLE_KDE_SUPPORT )
--	INCLUDE( ${QT_USE_FILE} )
--ENDIF( NOT ENABLE_KDE_SUPPORT )
--
- ADD_SUBDIRECTORY( external/libmaia )
- 
- # Compile the resource files
-@@ -169,9 +168,9 @@
- 
- # Last but not least, link everything. Based on whether we are using KDE or not.
- IF( ENABLE_KDE_SUPPORT )
--	TARGET_LINK_LIBRARIES( QtMPC ${QT_LIBRARIES} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} Maia )
-+	TARGET_LINK_LIBRARIES( QtMPC Maia ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_LIBRARIES} )
- ELSE( ENABLE_KDE_SUPPORT )
--	TARGET_LINK_LIBRARIES( QtMPC ${QT_LIBRARIES} Maia )
-+	TARGET_LINK_LIBRARIES( QtMPC Maia ${QT_LIBRARIES} )
- ENDIF( ENABLE_KDE_SUPPORT )
- 
- IF( ENABLE_KDE_SUPPORT )
diff --git a/media-sound/qtmpc/metadata.xml b/media-sound/qtmpc/metadata.xml
deleted file mode 100644
index 2fdbf33d963d..000000000000
--- a/media-sound/qtmpc/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/media-sound/qtmpc/qtmpc-0.6.1.ebuild b/media-sound/qtmpc/qtmpc-0.6.1.ebuild
deleted file mode 100644
index 30544bb03374..000000000000
--- a/media-sound/qtmpc/qtmpc-0.6.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="QtMPC-${PV}"
-inherit kde4-base
-
-DESCRIPTION="Qt MPD client with a tree view music library interface"
-HOMEPAGE="http://lowblog.nl/category/qtmpc/"
-SRC_URI="http://files.lowblog.nl/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/QtMPC"
-
-PATCHES=( "${FILESDIR}/${P}-underlinking.patch" )
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index d197342f841b..08a1cc793249 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,6 +1,9 @@
 DIST spotify-client_1.0.64.407.g9bd02c2d-26_amd64.deb 93425432 SHA256 8c97a95ade46ce9f8e2bbe565cd2e79396ed31fc4f0646a907a6f3e028db887d SHA512 78352ed0cd116b8ef8c2b9ffc3c186d2fecd3dd5f49f0f732ccf0a3a796b72faf60cd4997355bb4f34f450f8af0b7684e28e8e21a14b7902cba2ea49fe4a81eb WHIRLPOOL db9d74ce31d57704184e6a00b18b3cc417cdffeb6e582d0c41ddc0ba5c822fa4dfebad9d9cf151ebecc46d3b3892714e0fec91ced356d57f3c51dd94a8cce370
 DIST spotify-client_1.0.64.407.g9bd02c2d-26_i386.deb 97705428 SHA256 0e32bc8b21d591f8def932403b8ef3632e95eba4b5628506dfdf6d521dce7941 SHA512 43342faf26b7530dbb3fecafebcb7dac6ed6b7323c845f373bb63760ab309f4f01c6f4dd1cb4ab1bfd9a97b383fb863ba5f2aa7e73d32d1575bf8964dcdf30a5 WHIRLPOOL f3c42136e0682bddaec17829a05a9237d95b6d8f79b9ed27e2cdd77d011ea015fb4532d5f5878c03e15661207779a65e7e228a46821c13899b17513f12612863
+DIST spotify-client_1.0.66.478.g1296534d-39_amd64.deb 90932368 SHA256 a2e739c0ee009df1c899e42c095735bca231312b75b82e311147d41fb72404c1 SHA512 cd8b073f981b5bf793d87de22922054df141dbf58c5eac96eb55e44f1672b8057c79ee950a14a8a34aaa5d59e961b87df56198f382330d079553212189a1975c WHIRLPOOL 5c3cfe26e3c7eaee53e506eeb72e3ab4fa13601f4debb6f003804abb0953c6c8796ff49fa983aa734750b773889d9d23d4634655a4c8526918e3f45e4c269a37
+DIST spotify-client_1.0.66.478.g1296534d-39_i386.deb 95213590 SHA256 29795bd5c226e54d531621e645ffe7bd2cc6b4e5c69956c63bdcaade165cb8d9 SHA512 5c1b56787930a672da9a8ead8246cb779c6680dce6e5514c098e81712c9b131b77d45afa2ccedb95635b5387aab4db8c7e7f6dddb0cefb3cbdfb573d60920af7 WHIRLPOOL 5cfaa8fb5ede2bcec27c2bd557cc3c2dbda8e75cb140c48cecae21dfdfb18129996a1d6a7707b97ecfab1227c1a1f4b0420a44b16146233641141882ac5b19bf
 EBUILD spotify-1.0.64.ebuild 3268 SHA256 e24f02c548a42eb551900034ed1d8a80279e8a37722e8f0f417679f7eda1bf42 SHA512 ef1ee3f6edce9364be0a39e0a135a7c3b073fea88d7767e39401d72299f7f582b1bb45c7835e409b4a53c1693dcb2477d9c49e0a1fea197d26df2f827611a6b6 WHIRLPOOL a753ffde0ba9cc1277da6bc9ed86d0df3edba3fecbd711ae525659462ba4e7e995846fb0d54cc10f2e461e07f9865dd455e2f1ad04e98d862f390b0fd204d7df
+EBUILD spotify-1.0.66.ebuild 3270 SHA256 c1c4667c9b6e2a54afcf15364b5ff1b9405b94c26b5c34a77422d63c32a2f781 SHA512 b41ca3b5fbf499732ac2ca49d81fd2e31846cbe2f77ced870cc148cae29d8d160536b1d8285ec43631cbd95045aee9327bb1b8f5656e97d19f9249cf09f00137 WHIRLPOOL bfe72638118eee4dbbabbe35d1fb1cd7a75751cb5c189b16660e3d120c66e8c4f1b2cd77d4d71cafe14c0dc98ff67fb6caa099dac4e13ce2899869dfa9173213
 MISC ChangeLog 12081 SHA256 9e5c2f8b289533cca9ed5549d38602649a59d5c4a470b8dde4b75aedb5a26597 SHA512 b3af791f79c30a3010c6e8d767503b5d59ce858ecdda4e07bdb580a0c436b3b6b4bdf800805aca4d22aec09d89efb43a8ef1ca1c6c4907889d2e0f93ed96cf00 WHIRLPOOL 4341491bb2ec33effbf176fc4116d49751b353b4abb6499bcc69bc7085930b2fad446e82e7b716d9655e4268ea45f00e14e34e013b479af8a2529a76e65e858f
 MISC ChangeLog-2015 7294 SHA256 09f13a6ecc5fda5e12291f061eeb9ef9757017d91f9efbd8ccedf3d1262c5653 SHA512 030d4657a3c92c7311c96401e227f6b09a6c842a7935b1286c60e86cf85cfcf72acd8e80a7ebd15324ad7efe922c06cde6930757eeb70fb0682b6cf8219a8019 WHIRLPOOL 39e8775ef34231dfd628ff6d468d09bd114ac4da9c4365ad8a84b1391a757a064210e667464d102261e129163e36d53a48e35fe8001ee1d28ceedf0d4291018b
 MISC metadata.xml 349 SHA256 61c3a19b42a59b4881ec543958d205d86d441a0aefd68393de8c0d6de54812de SHA512 e39bca3abfb9169f633c009af54681a96b0d1f26d5edd9a0cb5c0a7b2aacfd70fdc4db317bde3273a1e37c04db520fcb0dcbb67167893a40a8fa6766a6637af1 WHIRLPOOL a68aa937b59e907ee396676089418d698948cd1780d15a56a1d0b1d805d530c44ec3ff308d859712fec2bd85cb9d0fefcc2cb70c39a76d184845a539575ac9da
diff --git a/media-sound/spotify/spotify-1.0.66.ebuild b/media-sound/spotify/spotify-1.0.66.ebuild
new file mode 100644
index 000000000000..edc01daefd5a
--- /dev/null
+++ b/media-sound/spotify/spotify-1.0.66.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils fdo-mime gnome2-utils pax-utils unpacker
+
+DESCRIPTION="Spotify is a social music platform"
+HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
+BUILD_ID="478.g1296534d"
+SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
+SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID}-39_amd64.deb )
+	x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID}-39_i386.deb )"
+LICENSE="Spotify"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome pax_kernel pulseaudio"
+RESTRICT="mirror strip"
+
+DEPEND=""
+# zenety needed for filepicker
+RDEPEND="
+	${DEPEND}
+	dev-libs/nss
+	gnome-base/gconf
+	gnome-extra/zenity
+	media-libs/alsa-lib
+	media-libs/harfbuzz
+	media-libs/fontconfig
+	media-libs/mesa
+	net-misc/curl[ssl,curl_ssl_openssl]
+	net-print/cups[ssl]
+	x11-libs/gtk+:2
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	dev-python/pygobject:3
+	dev-python/dbus-python
+	pulseaudio? ( media-sound/pulseaudio )
+	gnome? ( gnome-extra/gnome-integration-spotify )"
+	#sys-libs/glibc
+
+S=${WORKDIR}/
+
+QA_PREBUILT="opt/spotify/spotify-client/spotify"
+
+src_prepare() {
+	# Fix desktop entry to launch spotify-dbus.py for GNOME integration
+	if use gnome ; then
+		sed -i \
+			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
+			usr/share/spotify/spotify.desktop || die "sed failed"
+	fi
+	default
+}
+
+src_install() {
+	dodoc usr/share/doc/spotify-client/changelog.gz
+
+	SPOTIFY_PKG_HOME=usr/share/spotify
+	insinto /usr/share/pixmaps
+	doins ${SPOTIFY_PKG_HOME}/icons/*.png
+
+	# install in /opt/spotify
+	SPOTIFY_HOME=/opt/spotify/spotify-client
+	insinto ${SPOTIFY_HOME}
+	doins -r ${SPOTIFY_PKG_HOME}/*
+	fperms +x ${SPOTIFY_HOME}/spotify
+
+	dodir /usr/bin
+	cat <<-EOF >"${D}"/usr/bin/spotify || die
+		#! /bin/sh
+		exec ${SPOTIFY_HOME}/spotify "\$@"
+	EOF
+	fperms +x /usr/bin/spotify
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 512; do
+		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
+			"spotify-client.png"
+	done
+	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
+	if use pax_kernel; then
+		#create the headers, reset them to default, then paxmark -m them
+		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
+		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "${PN} under a PaX enabled kernel.  To do so, we must modify"
+		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
+		eqawarn "you suspect that ${PN} is being broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+
+	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
+	ewarn "To remove the cache:"
+	ewarn "rm -rf ~/.cache/spotify"
+	ewarn
+	ewarn "If you use KDE and are upgrading from 0.9 to 1.0, you might still see the old icon."
+	ewarn "Run"
+	ewarn "$ rm /var/tmp/kdecache-\$USER/icon-cache.kcache"
+	ewarn "Then log out and log in back to KDE."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 7991cfd33e03..92d20f39ae75 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,23 +1,21 @@
 AUX generate.sh 803 SHA256 8e32ccbd56e2d36d9d0504282881b3ee1d33ee7293827b75444b917093955d09 SHA512 064b11416be5583202d92ab0c87156b7098bf4a97c7875ad3a0b11e048ebcfd69aeb22653e8175e7ad0cd400ed2d9c27aa8d1d25be04d34438f4c4f86e329986 WHIRLPOOL 3565b3f6ef9650bfbb3b9e4b6ee5b71d1d245e62520f00f88f1c0b2ade6bf923200a1e94efdbbea8d5e53449f38ac78bc4714280e276e085c91ada404ebfeb89
 AUX kodi-17.3-ftpparse_string.patch 2076 SHA256 332c31ff05d41813021a14b337f903b0fa096196036bbf4fd7ebe4c78447da8d SHA512 d23865fe6624291d88c0a7674aa52b7e15889a96eb41590827248d8215643f773d0f02871efa858d2c533674627d4e6ebc69cba56be6ec9b58277bb2d6c204df WHIRLPOOL 7ddc32530f91840f5387c6767676cb17e5e243116821a7c1bef45750a17ee71895a74d9fb2e1260828537cacca89036a24fd2ce346a3eaf1ed5b0a91bca11335
 AUX kodi-17.3-unrar-vulnerability.patch 1883 SHA256 85e60dba6e78a7dd6c39667898cd1cbb2da176d5d9917006e09c015f4fa8028c SHA512 5c59a3c47ea9bcd21712da0ca0dc6bf0618f2f9cad6fd011ebcc94ae90868159e528237727e174a5b137b2e6ef2cb895c01c1b4be91cae0c402697a7d85791aa WHIRLPOOL 701a33d7c88105bcb108cb1eb006491f0a45baffaae9a4b66e3de2d7820dcb0888162b54321276c3cf5afb90a03f7eece1c2392f30d1fb5a535872502d49214b
-AUX kodi-17.4-mariadb.patch 999 SHA256 cf25973c666e7f61b8068f19b1bf55273e1b956c44855c4b0313121e20ebbd27 SHA512 4262dbcab7acaf495cb9fb4780cdc32c7f9f1933a0246b5cd8b4d2c94cb665b8cfba6900cd1677ce5a2703f3579c7d54a209876963146bc8ebedb11e7dbc11c1 WHIRLPOOL b59c1d8a19388c15158d73ea14d5e49bc5994ff721280298fc669a62bb298577856f6a5526c6da4506c886a81fa1fa2e8812a475fbb0c678b0a6eb737f5b9c60
+AUX kodi-17.5-network-test-fix.patch 1410 SHA256 f71518218f8916be5464f77b86f82d5002d17b911b3456f6a76a354d1258900b SHA512 60f6971cce1bfade8c9cf658a392aab7d9a009a61b198f55c71315ef58747c65ada947488ecd085cedad89d9e72cb893b1e0aee1fc7e570db5950f5efbc0e2aa WHIRLPOOL 99630e0e8588e71506d4b6aeb8f3ad15ce14ebb54590ab3a77b5aa2380acce78ca2f8143d009bfd7d6e2661c583e7a3e196a993c60c898e39af0c56bb8c95175
 AUX kodi-cmake-no-java.patch 2297 SHA256 571c477b39531c3d924a18f3f404485875fe4e7752d700984cc4140db804fce5 SHA512 9eb7d64694411ce7e47976291fabce96b055c8b4b60bdd7cd37f992d8a3c813de1ef828464e6996124303b015b5c64eccbade10290747180f4ac1fe6a1747d19 WHIRLPOOL 68cceb70ec22cd636586e7bdbe27f1dcd27d689647e7482d15497882a228f3aa73750436926ab3b16008119c9faca65511486fcaa235ce35e566d267f1b63c44
+DIST ffmpeg-kodi-3.1.11-Krypton-17.5.tar.gz 11188798 SHA256 7df8bce40765b39de5766ca9d08b5b9ac1f498c65c805c989461b907cee6b7c0 SHA512 b28bb6970c6767213f34e5f4f3e48ad5219a6c668a5264ff7de0a42712cb7393f389ddd88f56785a2dc8089f8231ae5fd05adfa10dbf15ea3e0ad7bc2ccd4d73 WHIRLPOOL 34055af438910a82ee7f2571c2bc5515d6988af51b4f5a2e0eb8f183f6a7e9ea3cdc4b16a6d8d166ad52f46d29a9625fbb72e8f47ed95c732482b33393445f7a
 DIST ffmpeg-kodi-3.1.6-Krypton.tar.gz 11170735 SHA256 01f914742f6af8afd1d2eb076425975e24c4eed75f5d57f1c816086dc4625192 SHA512 060d06946ee71106196587b36eccf7fb7d0710d6ee72dae2e08f23e5bf7e223a3bac77f1730121f494ecf5f860a40635978023317a06f27a3b28752fa537f1a1 WHIRLPOOL ae6f0b3b798e92cd72aed8eb3e6dc82708c86052590b30ae93e1b8275dca89c5a4470dbc8ff51bfefd72bd40036b7bd1b7695ee77e90bab35b5e80bcb8b79826
-DIST ffmpeg-kodi-3.1.9-Krypton-17.4.tar.gz 11186492 SHA256 ead247d5d804399951531ba904d1b59b60c9163e2d8fbab014cf495a40f91266 SHA512 4f399578f95d42357c73dc01fb5372042070ce11ff82e97695cc5a69574f35b9a860042ea0d43cfd562f03ac06fd888c074a838944c0c1aef7a692f89ea85dda WHIRLPOOL 24c3c926bb0f204a66d4e01c9d96e34ab22d20389f9274ead9ff01393c62a1502f8604f9096f36f1fafb5c0526d6ccb5062a8b90e34a9773f2cfa89f8f87d069
 DIST ffmpeg-kodi-3.4-Leia-Alpha-1.tar.gz 12147515 SHA256 0b5b7446dd5b9eeef427617e140058fbe7be94f5893055bc38cce3ca96375e03 SHA512 84fa07f88a3ee89b5dec8bf0f06a9d5f8b9e4a8f52656c6509aa081b87e59ae7ea643bc4bd668b555128b75e2a4d89fe82d7fc4586d37d9ea737eedb25508910 WHIRLPOOL e4a54744dcac947f0a9b1ca28eb1176bafc491f74e5f1142bb6b1a0b9aa57abc38c6c8af6fd41239da72b9cbdd595bfb815998f6f1a6d2baa568bf5ea08fe24d
 DIST kodi-17.3-generated-addons.tar.xz 57548 SHA256 6175ac64dbcbe2c747cd77f876b8e2bb3e516daa4707d7ccf768d76a89b27bd1 SHA512 56d1912f5e24d3fcda3010783a5b32728ece9c81c718ac6f8db2cbbd096059fe97b8d1971b34bbde1216558a8e5db874f7b2179e1f18942774ae5486167bca9a WHIRLPOOL 1023c69687ac9958e72ab70c15a280800ea4866f8e0dc2740d9bfd50f75bef71c28f23f01a841f254022610e1388d14217ea384213161264dae721515c9dabe3
 DIST kodi-17.3.tar.gz 58466114 SHA256 1de8653a3729cefd1baaf09ecde5ace01a1e3a58fbf29d48c1363f2503d331a1 SHA512 832071c3e9f332281a767f29168f6d6d003a86b42df849e81d907c2280f81f959ae42a850eddc889ae2280bba6106de3355e701ff2d71c88ee14cb20c84e7987 WHIRLPOOL 0ed5585f891459292a1cfd4451bee1f2b19af217e462b810468b00395ee024ba346300f84c67c6dc428d27abcaef4eec9dc7b844e66e2ab83543830a106a1634
-DIST kodi-17.4-generated-addons.tar.xz 57576 SHA256 dffa734a5fd40493b338ce76cdf49e42572b437fd449ceded3183ac09929e015 SHA512 80bb6b159c3556c75ad02110c5431fbc21339b74988421269f049cdf9b630a7e819aa5816f315aa7279247cab3d09680c5966449642d0c3e25ef1c789b285581 WHIRLPOOL 39715af523582b1eb982b6da7bb6f2a6557f99f9bb38cfd69899f0e92db977cf965648c1ff2ad6bf2e77d09b26ef655256b5c1025bc224984f0040a3713958ba
-DIST kodi-17.4.tar.gz 58475144 SHA256 b05e11b2d108222bfc3ff0c9a466d798c0feedf1228166239948e6ed37c3cb4f SHA512 fc4eff6606c84459ab24323888d39bf1f5d433aaf7136c17d85631f768761f61e498297c500befc986dd6de14de87a5a28f7a9c36c8d7c35d49ca15c99db37ef WHIRLPOOL 15f35516da71f9e64b4e7fdfa2a285236961db36ccc98fe2fa65809a0ef355c5e7b2a37cf3e36cd3bc9bc6717a3e26b7537e77d8828c09daaca7d79f9150c7d6
+DIST kodi-17.5-generated-addons.tar.xz 57556 SHA256 41a2a02ee3eaaab6de9da3e2e7eef4ab8ae94e8654487cc4f4f13d2ea749fbcc SHA512 c0458c9086ae3df7eb6a17ac9bfe33f1d2b4d9897bdb5831af8bbb01d927263e99ab1dd0f7eb7795dac04d757d04a8ad2346c8b29bfe1faf95b84218792bcb8e WHIRLPOOL cc4e68be47bc4318d995ecafe977af95d17443f7f81743bb2a321e72ee56e2de037402810f97a606aa6a55c9e4e18fa8a9733a44e5ac3c4ae59916097910562a
+DIST kodi-17.5.tar.gz 58292301 SHA256 84c64acc270b9e845a67fbbe481ae5ddeb9b4568d76e42f2d5f9160fe0ce2de2 SHA512 e47f8a53ccee675031dfb816ffbe338dd2e94c22c944b814f332c1abdab16182304474c6b0d5cd7ad7eb9bc0500de6f5fc97b965dc5828635b58a6c596f82736 WHIRLPOOL ca743b927a19d81c71072c8a7bc5f87eec73367275633de79f5bcc950eee9ed60380ee49a599f49023e48ff29495d361fa2a071617f7fa6bd18606015cd8d15d
 DIST libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz 95395 SHA256 b6eb2d929ff56cb051152c32010afc5e7cf5fe8c5ae32dca412a2b46b6b57e34 SHA512 12ba7aa653fcb26d5336bf2a8110c924d634cec79f684bbf19dc38ea33f69fb68c22c97f4c09e5ca7c35f95f6c324a6d70ccc2c501a99122a9321cafd33b2cd9 WHIRLPOOL 8570ad8d2b6e629cc1c7e544be2853cab3bb50fd73438cea47c7a0919b251cecf906f7446ef3714c54ee3e636278dc0dabab47f772440624ff49877068b7b50a
 DIST libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz 130603 SHA256 8e3f0563e16df898fe115e1723e3f78dbc953f6e9cf4f04568add215371d9ed2 SHA512 901c6f24afa1d78b6ed78d1ee30daf634ca0bbc0467ef9cc3416bcab4fbc4fda6869ffa051791d85c0b510de748805328627681ef044668a7857299f0035232e WHIRLPOOL 588d060f418f18ef193061ff88260ac7929647b2babde5b78ab73141ffc7f3782ce1254bfee1234ec0da8bb28bc16ede301b4ec1e2d3073b9c6d22cb526f06ca
 DIST libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz 124326 SHA256 e7179b2054163652596a56301c9f025515cb08c6d6310b42b897c3ad11c0199b SHA512 e59ae0bfdc62698e407e3d70503c6a7c5e308545c9dae7843e25db3b5b62d9b26256be77ef4e884263add6b4abec3438c324bfd5715f6ca2ce7fa5962d43a6c2 WHIRLPOOL b42130027d201e545fabc27677bd4238d04bcbc5a0e622ca6da396ac340ea94b5c60004557334464a31dac880603dab99e2f189e41d6cddbe9e32728c626085a
 EBUILD kodi-17.3-r1.ebuild 8577 SHA256 1c7a1ab5fdbd298255aedfe4c49c6368164fe5082451307877db106a02fff4a4 SHA512 be9bf1b24d6bcd3d797ee9f12a9495a7bd1245904b1a361a5bb67fff64eae69a9c5f8f3ae9b2a9c2aebe28b62c755135daeea7ae4f077e68ce5f0cad3169a78c WHIRLPOOL eaf13e817010edbd73f45710636e3d35f38184bd2cd3f79314c69c48698b27905f2b23f20f2e321bb7bb8ba554a93ec7d12f5dcc9c0d0a88b8df1c82d87a3488
-EBUILD kodi-17.3.ebuild 8451 SHA256 786a0a33fcbc3a003989d0e6b733a0e6fc0d1b31c7f284d07cf12220cae35dc6 SHA512 de1310214a2a5087793dd6040786c0c97ed7c3fbdbba933ace0dc3623b8c58ac91bad0591a37e9c021d5b548567f9d5cf76dbd87685a80f317fd50f8bc7c7e78 WHIRLPOOL b5ca0a7864d4ce135660c93625c1761641f31b79e74f2f49846a2bcad7a431d46ad26fd8852a155ebf0ca1c2aa3d77543116fe29e6360ab8831b38f11e791f03
-EBUILD kodi-17.4-r1.ebuild 8791 SHA256 3060e2630be81ec93d730d9273a5d5ebdb056f33e74b1c7cac846e7afa5106f4 SHA512 f691fbc68fbb5e2c4fd7406f370071735c4f30b487c957f43b6b424f7f0b6c99e184b7e0bd752a224638cb456d25a54e16e7dcf957cd1cdead777d7bf07e32f7 WHIRLPOOL 6aacfc2b20545e8701e3e9ba358aea73b5a0a89083bd086bbabc1b7549d58ce2016077d85320e65c65b8cf318465f1ccaa2a802ac66be1056b50397edfab8a12
-EBUILD kodi-17.4.ebuild 8681 SHA256 19035885bb21b3e78cec298e749f77949857d5a5647ebc8524263684e7d22d99 SHA512 b4c5456292e67fd3051114f5d6d7de9d6241af0ba55c7d850e2d38bf58c0d22134c05f8134312e45f947e5dc736935a925f6b6b24f31465c879b5122ea86a714 WHIRLPOOL 56980d9351a6a992618cdccec8a77da66170a7ad14a62a4f4883c5e016f2135384c461b1d742d8cbb784bd1c7e3a065720f1c4faedfce9a035399d33a3363798
-EBUILD kodi-9999.ebuild 9401 SHA256 7fa195c6d9cf8309a05239bb5a8cb389b87945ca8df130475da2883c7c5a603c SHA512 29d90b1d252fc93d81876a84bf471d7ad944d554cc5d56b040a5ef3440ec6ec9a4082eb439993b83d69ae889925298a67990d0c3886c957192fff150472c5df6 WHIRLPOOL c9296f191ec859216e7ef01925f5220208f89749e596ab7e484a29ae96a31fdd422466829a6833b0d3aec5e9b22172f6e617355bce61d17bc6c7a2f04749d643
+EBUILD kodi-17.5-r1.ebuild 8830 SHA256 578682556f08d5e5f3adbf05bfb2a3e0fea5e5a3f183dcba17de08492af1b2ea SHA512 68e7232a7a45afdfe8b042b4b999e2b7d803bf2812d021155636c40789ec713da025c7c8d01e094bc94121e7f8b22e6cccfc6871f99086646886059476da8df0 WHIRLPOOL 28319f45cbe806699238cd595e3fead2a0972c1555ba6f827863ca965f1278057a956b9a5eab9fa91752d9d98c3fd265983cc9836659949ca5dad6b75a873061
+EBUILD kodi-9999.ebuild 9401 SHA256 29e4e4d36e7044a01016715437c337265dcf44712f28bfc2fb0a275fc8865d85 SHA512 ad3b057a5992e558e13db8248e3368cd6724ec63b46fd4b05a5715ff3f329336db54aaf9c8221ee24dac51529916c0ceba61bab723a995ab980ced2f9effffd3 WHIRLPOOL d90537e4f42040f45af9e0df2535e70a25473d87f5c3c4edebb3e5877289645d33d74364ef45d5216f247a16ea4f92c9e487f30376e3979bcbaab2636b3c9301
 MISC ChangeLog 10199 SHA256 3f5e1658ba52c3c11da3a40af2339ab0cae0416e7d0d9b0b3433f1d02e6e3edc SHA512 b437c274abf9d6b4651468397b8be5df7cd4e5bf1fdea94120e0c642d368bb3af6bc90f9253c940c65ef5c2352d9e7063041bd73efbf0f9e1e43876f5298070c WHIRLPOOL f8945ddb9ee4c3ef8ddac0bfc216ea3a5307b04a6f8d9c94c6338a880efe484e6a4654dab0baf3bd721c810da5670d8ba390132b15fc24a5876b1ddeb472252d
 MISC ChangeLog-2015 3574 SHA256 5c2511969e6a8bb6539549dd321d0883acf23d2e2be8232a04f1ce8bed0a84b2 SHA512 49f435da4fee73c3406d7c26ba752c584a9d95469cd75cdc5c4154271093ed9d4d8d9c3cce789fcaea361c389b89643af593599733e97d34a9d8a771cc14936a WHIRLPOOL 5b82789cdbac9fc836b79a922d7604dc3c107f94024b4a6092155baf7e19aceb711be0ff6dc64ea2a4b6de3a2c54a1a457a9c1daee05ebec96c94c7e68fa21ae
 MISC metadata.xml 1716 SHA256 b3f5652694008ec0fba636013aefdeca3707abc43e0561041d31a5d4d5dedfcf SHA512 4ea0d31caa3a4c10ff5a421fa830c9db3eeb2628cecc19759ad218eb551d2c4382016ec5655a5c5be1e257eec29cad0717523a9fe3f251ff762cdf0ba60b4355 WHIRLPOOL 68819dd60cafb92496e2776fd94ebb0167477e45d5ab3063e351ecbe51ab714fb3fdeca9dec4654d0d185a1284c47265180e50973a0a919a91625b7a0a58182d
diff --git a/media-tv/kodi/files/kodi-17.4-mariadb.patch b/media-tv/kodi/files/kodi-17.4-mariadb.patch
deleted file mode 100644
index 6def8f8a3043..000000000000
--- a/media-tv/kodi/files/kodi-17.4-mariadb.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From ff848b104182467e5048351fdf27a07dd55a34a6 Mon Sep 17 00:00:00 2001
-From: Wolfgang Schupp <w.schupp@a1.net>
-Date: Tue, 29 Aug 2017 09:08:05 +0200
-Subject: [PATCH] Merge pull request #12727 from candrews/patch-6
-
-[cmake] FindMySqlClient: Compatibility with MariaDB
----
- project/cmake/modules/FindMySqlClient.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/project/cmake/modules/FindMySqlClient.cmake b/project/cmake/modules/FindMySqlClient.cmake
-index ceccea39b1e3..7b485778e4fc 100644
---- a/project/cmake/modules/FindMySqlClient.cmake
-+++ b/project/cmake/modules/FindMySqlClient.cmake
-@@ -21,7 +21,7 @@ else()
-   set(EXTRA_FIND_ARGS)
- endif()
- 
--find_path(MYSQLCLIENT_INCLUDE_DIR mysql/mysql_time.h)
-+find_path(MYSQLCLIENT_INCLUDE_DIR NAMES mysql/mysql.h mysql/server/mysql.h)
- find_library(MYSQLCLIENT_LIBRARY_RELEASE NAMES mysqlclient libmysql
-                                          PATH_SUFFIXES mysql
-                                          ${EXTRA_FIND_ARGS})
diff --git a/media-tv/kodi/files/kodi-17.5-network-test-fix.patch b/media-tv/kodi/files/kodi-17.5-network-test-fix.patch
new file mode 100644
index 000000000000..2f61cda953fe
--- /dev/null
+++ b/media-tv/kodi/files/kodi-17.5-network-test-fix.patch
@@ -0,0 +1,46 @@
+From f585edfffa79ebbbcb0557be2e889809b76b5def Mon Sep 17 00:00:00 2001
+From: Rechi <Rechi@users.noreply.github.com>
+Date: Wed, 21 Dec 2016 17:10:54 +0100
+Subject: [PATCH 1/2] [cmake] build TestWebServer only if HTTPRequestHandlers
+ are build
+
+---
+ xbmc/network/test/CMakeLists.txt | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/xbmc/network/test/CMakeLists.txt b/xbmc/network/test/CMakeLists.txt
+index 5d1dab328160..a323d1835b07 100644
+--- a/xbmc/network/test/CMakeLists.txt
++++ b/xbmc/network/test/CMakeLists.txt
+@@ -1,3 +1,5 @@
+-set(SOURCES TestWebServer.cpp)
++if(MICROHTTPD_FOUND)
++  set(SOURCES TestWebServer.cpp)
+ 
+-core_add_test_library(network_test)
++  core_add_test_library(network_test)
++endif()
+
+From f7a514064923d0d693c122cc8fbe3b72cc205820 Mon Sep 17 00:00:00 2001
+From: Rechi <Rechi@users.noreply.github.com>
+Date: Wed, 21 Dec 2016 17:10:57 +0100
+Subject: [PATCH 2/2] [win] remove HAS_WEB_SERVER & HAS_WEB_INTERFACE defines,
+ they are handled trough HAVE_LIBMICROHTTPD (cmake)
+
+---
+ xbmc/system.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/xbmc/system.h b/xbmc/system.h
+index 07dfe87e4a01..26757ca90642 100644
+--- a/xbmc/system.h
++++ b/xbmc/system.h
+@@ -97,8 +97,6 @@
+ #define HAS_WIN32_NETWORK
+ #define HAS_IRSERVERSUITE
+ #define HAS_AUDIO
+-#define HAS_WEB_SERVER
+-#define HAS_WEB_INTERFACE
+ #define HAS_FILESYSTEM_SMB
+ #define HAS_ZEROCONF
+ #define HAS_MDNS
diff --git a/media-tv/kodi/kodi-17.3.ebuild b/media-tv/kodi/kodi-17.3.ebuild
deleted file mode 100644
index 48000044633d..000000000000
--- a/media-tv/kodi/kodi-17.3.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Does not work with py3 here
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1
-
-LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
-LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
-LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
-FFMPEG_VERSION="3.1.6"
-CODENAME="Krypton"
-PATCHES=(
-	"${FILESDIR}/${P}-ftpparse_string.patch"
-)
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
-	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz )"
-
-DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
-
-LICENSE="GPL-2"
-SLOT="0"
-# use flag is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( gles opengl )
-	gles? ( X )
-	opengl? ( X )
-	udev? ( !libusb )
-	udisks? ( dbus )
-	upower? ( dbus )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	airplay? (
-		app-pda/libplist
-		net-libs/shairplay
-	)
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	bluray? ( >=media-libs/libbluray-0.7.0 )
-	caps? ( sys-libs/libcap )
-	dbus? ( sys-apps/dbus )
-	dev-db/sqlite
-	dev-libs/expat
-	dev-libs/fribidi
-	cec? ( >=dev-libs/libcec-4.0 )
-	dev-libs/libpcre[cxx]
-	dev-libs/libxml2
-	>=dev-libs/lzo-2.04
-	dev-libs/tinyxml[stl]
-	>=dev-libs/yajl-2
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-libs/libcdio
-	gles? ( media-libs/mesa[gles2] )
-	libusb? ( virtual/libusb:1 )
-	media-fonts/corefonts
-	>=media-fonts/noto-20160531
-	media-fonts/roboto
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/libass-0.13.4
-	media-libs/mesa[egl]
-	>=media-libs/taglib-1.11.1
-	system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc] )
-	mysql? ( virtual/mysql )
-	>=net-misc/curl-7.51.0
-	nfs? ( net-fs/libnfs:= )
-	opengl? ( media-libs/glu )
-	!libressl? ( >=dev-libs/openssl-1.0.2j:0= )
-	libressl? ( dev-libs/libressl:0= )
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
-	sftp? ( net-libs/libssh[sftp] )
-	sys-libs/zlib
-	udev? ( virtual/udev )
-	vaapi? ( x11-libs/libva[opengl] )
-	vdpau? (
-		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
-		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
-	)
-	webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
-	X? (
-		x11-libs/libdrm
-		x11-libs/libX11
-		x11-libs/libXrandr
-		x11-libs/libXrender
-	)
-	xslt? ( dev-libs/libxslt )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
-	lirc? (
-		|| ( app-misc/lirc app-misc/inputlircd )
-	)
-	!media-tv/xbmc
-	udisks? ( sys-fs/udisks:0 )
-	upower? (
-		systemd? ( sys-power/upower )
-		!systemd? (
-			|| ( sys-power/upower-pm-utils sys-power/upower )
-		)
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-arch/bzip2
-	app-arch/unzip
-	app-arch/xz-utils
-	app-arch/zip
-	dev-lang/swig
-	dev-libs/crossguid
-	dev-util/cmake
-	dev-util/gperf
-	media-libs/giflib
-	>=media-libs/libjpeg-turbo-1.5.1:=
-	>=media-libs/libpng-1.6.26:0=
-	test? ( dev-cpp/gtest )
-	virtual/pkgconfig
-	x86? ( dev-lang/nasm )
-"
-case ${PV} in
-9999)
-	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
-	inherit git-r3
-	# Force java for latest git version to avoid having to hand maintain the
-	# generated addons package.  #488118
-	DEPEND+="
-		virtual/jre
-		"
-	;;
-*)
-	MY_PV=${PV/_p/_r}
-	MY_PV=${MY_PV/_alpha/a}
-	MY_PV=${MY_PV/_beta/b}
-	MY_PV=${MY_PV/_rc/rc}
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz
-		 !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
-	KEYWORDS="amd64 x86"
-	IUSE+=" java"
-	DEPEND+="
-		java? ( virtual/jre )
-		"
-
-	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
-	;;
-esac
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-CMAKE_USE_DIR=${S}/project/cmake/
-
-pkg_setup() {
-	check_extra_config
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if in_iuse java && use !java; then
-		eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
-	fi
-	cmake-utils_src_prepare
-
-	# avoid long delays when powerkit isn't running #348580
-	sed -i \
-		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-		xbmc/linux/*.cpp || die
-
-	# Prepare tools and libs witch are configured with autotools during compile time
-	AUTOTOOLS_DIRS=(
-		"${S}"/lib/cpluff
-		"${S}"/tools/depends/native/TexturePacker/src
-		"${S}"/tools/depends/native/JsonSchemaBuilder/src
-	)
-
-	local d
-	for d in "${AUTOTOOLS_DIRS[@]}" ; do
-		pushd ${d} >/dev/null || die
-		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
-		popd >/dev/null || die
-	done
-	elibtoolize
-
-	# Prevent autoreconf rerun
-	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
-		"${S}"/project/cmake/modules/FindCpluff.cmake \
-		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
-		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
-		|| die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
-		-DENABLE_ALSA=$(usex alsa)
-		-DENABLE_AIRTUNES=$(usex airplay)
-		-DENABLE_AVAHI=$(usex zeroconf)
-		-DENABLE_BLUETOOTH=$(usex bluetooth)
-		-DENABLE_BLURAY=$(usex bluray)
-		-DENABLE_CCACHE=OFF
-		-DENABLE_CEC=$(usex cec)
-		-DENABLE_DBUS=$(usex dbus)
-		-DENABLE_DVDCSS=$(usex css)
-		-DENABLE_INTERNAL_CROSSGUID=OFF
-		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
-		-DENABLE_CAP=$(usex caps)
-		-DENABLE_LIRC=$(usex lirc)
-		-DENABLE_MICROHTTPD=$(usex webserver)
-		-DENABLE_MYSQLCLIENT=$(usex mysql)
-		-DENABLE_NFS=$(usex nfs)
-		-DENABLE_NONFREE=$(usex nonfree)
-		-DENABLE_OPENGLES=$(usex gles)
-		-DENABLE_OPENGL=$(usex opengl)
-		-DENABLE_OPENSSL=ON
-		-DENABLE_OPTICAL=$(usex dvd)
-		-DENABLE_PLIST=$(usex airplay)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_SMBCLIENT=$(usex samba)
-		-DENABLE_SSH=$(usex sftp)
-		-DENABLE_UDEV=$(usex udev)
-		-DENABLE_UPNP=$(usex upnp)
-		-DENABLE_VAAPI=$(usex vaapi)
-		-DENABLE_VDPAU=$(usex vdpau)
-		-DENABLE_X11=$(usex X)
-		-DENABLE_XSLT=$(usex xslt)
-		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
-		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
-		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
-	)
-
-	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
-
-	use !system-ffmpeg && mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz" )
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile all $(usev test)
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
-
-	rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
-
-	newicon media/icon48x48.png kodi.png
-
-	# Replace bundled fonts with system ones.
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
-	dosym ../../../../fonts/noto/NotoSans-Regular.ttf \
-		usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
-
-	local f
-	for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
-		rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
-		dosym ../../../../fonts/noto/"${f}" \
-			usr/share/kodi/addons/skin.estuary/fonts/"${f}"
-	done
-
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
-	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
-		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
-
-	python_domodule tools/EventClients/lib/python/xbmcclient.py
-	python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
-}
diff --git a/media-tv/kodi/kodi-17.4-r1.ebuild b/media-tv/kodi/kodi-17.4-r1.ebuild
deleted file mode 100644
index de54ded326de..000000000000
--- a/media-tv/kodi/kodi-17.4-r1.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Does not work with py3 here
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1 versionator
-
-LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
-LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
-LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
-FFMPEG_VERSION="3.1.9"
-FFMPEG_KODI_VERSION="$(get_version_component_range 1-2)"
-CODENAME="Krypton"
-PATCHES=(
-	"${FILESDIR}/${P}-mariadb.patch"
-)
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
-	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
-
-DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
-
-LICENSE="GPL-2"
-SLOT="0"
-# use flag is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles lcms libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( gles opengl )
-	gles? ( X )
-	opengl? ( X )
-	udev? ( !libusb )
-	udisks? ( dbus )
-	upower? ( dbus )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	airplay? (
-		app-pda/libplist
-		net-libs/shairplay
-	)
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	bluray? ( >=media-libs/libbluray-0.7.0 )
-	caps? ( sys-libs/libcap )
-	dbus? ( sys-apps/dbus )
-	dev-db/sqlite
-	dev-libs/expat
-	dev-libs/fribidi
-	cec? ( >=dev-libs/libcec-4.0 )
-	dev-libs/libpcre[cxx]
-	dev-libs/libxml2
-	>=dev-libs/lzo-2.04
-	dev-libs/tinyxml[stl]
-	>=dev-libs/yajl-2
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-libs/libcdio
-	gles? ( media-libs/mesa[gles2] )
-	lcms? ( media-libs/lcms:2 )
-	libusb? ( virtual/libusb:1 )
-	media-fonts/corefonts
-	>=media-fonts/noto-20160531
-	media-fonts/roboto
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/libass-0.13.4
-	media-libs/mesa[egl]
-	>=media-libs/taglib-1.11.1
-	system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc] )
-	mysql? ( virtual/mysql )
-	>=net-misc/curl-7.51.0
-	nfs? ( net-fs/libnfs:= )
-	opengl? ( media-libs/glu )
-	!libressl? ( >=dev-libs/openssl-1.0.2j:0= )
-	libressl? ( dev-libs/libressl:0= )
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
-	sftp? ( net-libs/libssh[sftp] )
-	sys-libs/zlib
-	udev? ( virtual/udev )
-	vaapi? ( x11-libs/libva[opengl] )
-	vdpau? (
-		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
-		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
-	)
-	webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
-	X? (
-		x11-libs/libdrm
-		x11-libs/libX11
-		x11-libs/libXrandr
-		x11-libs/libXrender
-	)
-	xslt? ( dev-libs/libxslt )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
-	lirc? (
-		|| ( app-misc/lirc app-misc/inputlircd )
-	)
-	!media-tv/xbmc
-	udisks? ( sys-fs/udisks:0 )
-	upower? (
-		systemd? ( sys-power/upower )
-		!systemd? (
-			|| ( sys-power/upower-pm-utils sys-power/upower )
-		)
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-arch/bzip2
-	app-arch/unzip
-	app-arch/xz-utils
-	app-arch/zip
-	dev-lang/swig
-	dev-libs/crossguid
-	dev-util/cmake
-	dev-util/gperf
-	media-libs/giflib
-	>=media-libs/libjpeg-turbo-1.5.1:=
-	>=media-libs/libpng-1.6.26:0=
-	test? ( dev-cpp/gtest )
-	virtual/pkgconfig
-	x86? ( dev-lang/nasm )
-"
-case ${PV} in
-9999)
-	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
-	inherit git-r3
-	# Force java for latest git version to avoid having to hand maintain the
-	# generated addons package.  #488118
-	DEPEND+="
-		virtual/jre
-		"
-	;;
-*)
-	MY_PV=${PV/_p/_r}
-	MY_PV=${MY_PV/_alpha/a}
-	MY_PV=${MY_PV/_beta/b}
-	MY_PV=${MY_PV/_rc/rc}
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz
-		 !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
-	KEYWORDS="~amd64 ~x86"
-	IUSE+=" java"
-	DEPEND+="
-		java? ( virtual/jre )
-		"
-
-	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
-	;;
-esac
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-CMAKE_USE_DIR=${S}/project/cmake/
-
-pkg_setup() {
-	check_extra_config
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if in_iuse java && use !java; then
-		eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
-	fi
-	cmake-utils_src_prepare
-
-	# avoid long delays when powerkit isn't running #348580
-	sed -i \
-		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-		xbmc/linux/*.cpp || die
-
-	# Prepare tools and libs witch are configured with autotools during compile time
-	AUTOTOOLS_DIRS=(
-		"${S}"/lib/cpluff
-		"${S}"/tools/depends/native/TexturePacker/src
-		"${S}"/tools/depends/native/JsonSchemaBuilder/src
-	)
-
-	local d
-	for d in "${AUTOTOOLS_DIRS[@]}" ; do
-		pushd ${d} >/dev/null || die
-		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
-		popd >/dev/null || die
-	done
-	elibtoolize
-
-	# Prevent autoreconf rerun
-	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
-		"${S}"/project/cmake/modules/FindCpluff.cmake \
-		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
-		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
-		|| die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
-		-DENABLE_ALSA=$(usex alsa)
-		-DENABLE_AIRTUNES=$(usex airplay)
-		-DENABLE_AVAHI=$(usex zeroconf)
-		-DENABLE_BLUETOOTH=$(usex bluetooth)
-		-DENABLE_BLURAY=$(usex bluray)
-		-DENABLE_CCACHE=OFF
-		-DENABLE_CEC=$(usex cec)
-		-DENABLE_DBUS=$(usex dbus)
-		-DENABLE_DVDCSS=$(usex css)
-		-DENABLE_INTERNAL_CROSSGUID=OFF
-		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
-		-DENABLE_CAP=$(usex caps)
-		-DENABLE_LCMS2=$(usex lcms)
-		-DENABLE_LIRC=$(usex lirc)
-		-DENABLE_MICROHTTPD=$(usex webserver)
-		-DENABLE_MYSQLCLIENT=$(usex mysql)
-		-DENABLE_NFS=$(usex nfs)
-		-DENABLE_NONFREE=$(usex nonfree)
-		-DENABLE_OPENGLES=$(usex gles)
-		-DENABLE_OPENGL=$(usex opengl)
-		-DENABLE_OPENSSL=ON
-		-DENABLE_OPTICAL=$(usex dvd)
-		-DENABLE_PLIST=$(usex airplay)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_SMBCLIENT=$(usex samba)
-		-DENABLE_SSH=$(usex sftp)
-		-DENABLE_UDEV=$(usex udev)
-		-DENABLE_UPNP=$(usex upnp)
-		-DENABLE_VAAPI=$(usex vaapi)
-		-DENABLE_VDPAU=$(usex vdpau)
-		-DENABLE_X11=$(usex X)
-		-DENABLE_XSLT=$(usex xslt)
-		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
-		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
-		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
-	)
-
-	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
-
-	if use system-ffmpeg; then
-		mycmakeargs+=( -DWITH_FFMPEG="yes" )
-	else
-		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile all
-	use test && emake -C "${BUILD_DIR}" kodi-test
-}
-
-src_test() {
-	emake -C "${BUILD_DIR}" test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
-
-	rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
-
-	newicon media/icon48x48.png kodi.png
-
-	# Replace bundled fonts with system ones.
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
-	dosym ../../../../fonts/noto/NotoSans-Regular.ttf \
-		usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
-
-	local f
-	for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
-		rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
-		dosym ../../../../fonts/noto/"${f}" \
-			usr/share/kodi/addons/skin.estuary/fonts/"${f}"
-	done
-
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
-	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
-		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
-
-	python_domodule tools/EventClients/lib/python/xbmcclient.py
-	python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
-}
diff --git a/media-tv/kodi/kodi-17.4.ebuild b/media-tv/kodi/kodi-17.4.ebuild
deleted file mode 100644
index 50e4a9c83256..000000000000
--- a/media-tv/kodi/kodi-17.4.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Does not work with py3 here
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1 versionator
-
-LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
-LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
-LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
-FFMPEG_VERSION="3.1.9"
-FFMPEG_KODI_VERSION="$(get_version_component_range 1-2)"
-CODENAME="Krypton"
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
-	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
-
-DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
-
-LICENSE="GPL-2"
-SLOT="0"
-# use flag is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( gles opengl )
-	gles? ( X )
-	opengl? ( X )
-	udev? ( !libusb )
-	udisks? ( dbus )
-	upower? ( dbus )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	airplay? (
-		app-pda/libplist
-		net-libs/shairplay
-	)
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	bluray? ( >=media-libs/libbluray-0.7.0 )
-	caps? ( sys-libs/libcap )
-	dbus? ( sys-apps/dbus )
-	dev-db/sqlite
-	dev-libs/expat
-	dev-libs/fribidi
-	cec? ( >=dev-libs/libcec-4.0 )
-	dev-libs/libpcre[cxx]
-	dev-libs/libxml2
-	>=dev-libs/lzo-2.04
-	dev-libs/tinyxml[stl]
-	>=dev-libs/yajl-2
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-libs/libcdio
-	gles? ( media-libs/mesa[gles2] )
-	libusb? ( virtual/libusb:1 )
-	media-fonts/corefonts
-	>=media-fonts/noto-20160531
-	media-fonts/roboto
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/libass-0.13.4
-	media-libs/mesa[egl]
-	>=media-libs/taglib-1.11.1
-	system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc] )
-	mysql? ( virtual/mysql )
-	>=net-misc/curl-7.51.0
-	nfs? ( net-fs/libnfs:= )
-	opengl? ( media-libs/glu )
-	!libressl? ( >=dev-libs/openssl-1.0.2j:0= )
-	libressl? ( dev-libs/libressl:0= )
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
-	sftp? ( net-libs/libssh[sftp] )
-	sys-libs/zlib
-	udev? ( virtual/udev )
-	vaapi? ( x11-libs/libva[opengl] )
-	vdpau? (
-		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
-		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
-	)
-	webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
-	X? (
-		x11-libs/libdrm
-		x11-libs/libX11
-		x11-libs/libXrandr
-		x11-libs/libXrender
-	)
-	xslt? ( dev-libs/libxslt )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
-	lirc? (
-		|| ( app-misc/lirc app-misc/inputlircd )
-	)
-	!media-tv/xbmc
-	udisks? ( sys-fs/udisks:0 )
-	upower? (
-		systemd? ( sys-power/upower )
-		!systemd? (
-			|| ( sys-power/upower-pm-utils sys-power/upower )
-		)
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-arch/bzip2
-	app-arch/unzip
-	app-arch/xz-utils
-	app-arch/zip
-	dev-lang/swig
-	dev-libs/crossguid
-	dev-util/cmake
-	dev-util/gperf
-	media-libs/giflib
-	>=media-libs/libjpeg-turbo-1.5.1:=
-	>=media-libs/libpng-1.6.26:0=
-	test? ( dev-cpp/gtest )
-	virtual/pkgconfig
-	x86? ( dev-lang/nasm )
-"
-case ${PV} in
-9999)
-	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
-	inherit git-r3
-	# Force java for latest git version to avoid having to hand maintain the
-	# generated addons package.  #488118
-	DEPEND+="
-		virtual/jre
-		"
-	;;
-*)
-	MY_PV=${PV/_p/_r}
-	MY_PV=${MY_PV/_alpha/a}
-	MY_PV=${MY_PV/_beta/b}
-	MY_PV=${MY_PV/_rc/rc}
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz
-		 !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
-	KEYWORDS="~amd64 ~x86"
-	IUSE+=" java"
-	DEPEND+="
-		java? ( virtual/jre )
-		"
-
-	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
-	;;
-esac
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-CMAKE_USE_DIR=${S}/project/cmake/
-
-pkg_setup() {
-	check_extra_config
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if in_iuse java && use !java; then
-		eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
-	fi
-	cmake-utils_src_prepare
-
-	# avoid long delays when powerkit isn't running #348580
-	sed -i \
-		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-		xbmc/linux/*.cpp || die
-
-	# Prepare tools and libs witch are configured with autotools during compile time
-	AUTOTOOLS_DIRS=(
-		"${S}"/lib/cpluff
-		"${S}"/tools/depends/native/TexturePacker/src
-		"${S}"/tools/depends/native/JsonSchemaBuilder/src
-	)
-
-	local d
-	for d in "${AUTOTOOLS_DIRS[@]}" ; do
-		pushd ${d} >/dev/null || die
-		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
-		popd >/dev/null || die
-	done
-	elibtoolize
-
-	# Prevent autoreconf rerun
-	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
-		"${S}"/project/cmake/modules/FindCpluff.cmake \
-		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
-		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
-		|| die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
-		-DENABLE_ALSA=$(usex alsa)
-		-DENABLE_AIRTUNES=$(usex airplay)
-		-DENABLE_AVAHI=$(usex zeroconf)
-		-DENABLE_BLUETOOTH=$(usex bluetooth)
-		-DENABLE_BLURAY=$(usex bluray)
-		-DENABLE_CCACHE=OFF
-		-DENABLE_CEC=$(usex cec)
-		-DENABLE_DBUS=$(usex dbus)
-		-DENABLE_DVDCSS=$(usex css)
-		-DENABLE_INTERNAL_CROSSGUID=OFF
-		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
-		-DENABLE_CAP=$(usex caps)
-		-DENABLE_LIRC=$(usex lirc)
-		-DENABLE_MICROHTTPD=$(usex webserver)
-		-DENABLE_MYSQLCLIENT=$(usex mysql)
-		-DENABLE_NFS=$(usex nfs)
-		-DENABLE_NONFREE=$(usex nonfree)
-		-DENABLE_OPENGLES=$(usex gles)
-		-DENABLE_OPENGL=$(usex opengl)
-		-DENABLE_OPENSSL=ON
-		-DENABLE_OPTICAL=$(usex dvd)
-		-DENABLE_PLIST=$(usex airplay)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_SMBCLIENT=$(usex samba)
-		-DENABLE_SSH=$(usex sftp)
-		-DENABLE_UDEV=$(usex udev)
-		-DENABLE_UPNP=$(usex upnp)
-		-DENABLE_VAAPI=$(usex vaapi)
-		-DENABLE_VDPAU=$(usex vdpau)
-		-DENABLE_X11=$(usex X)
-		-DENABLE_XSLT=$(usex xslt)
-		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
-		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
-		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
-	)
-
-	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
-
-	if use system-ffmpeg; then
-		mycmakeargs+=( -DWITH_FFMPEG="yes" )
-	else
-		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile all
-	use test && emake -C "${BUILD_DIR}" kodi-test
-}
-
-src_test() {
-	emake -C "${BUILD_DIR}" test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
-
-	rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
-
-	newicon media/icon48x48.png kodi.png
-
-	# Replace bundled fonts with system ones.
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
-	dosym ../../../../fonts/noto/NotoSans-Regular.ttf \
-		usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
-
-	local f
-	for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
-		rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
-		dosym ../../../../fonts/noto/"${f}" \
-			usr/share/kodi/addons/skin.estuary/fonts/"${f}"
-	done
-
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
-	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
-		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
-
-	python_domodule tools/EventClients/lib/python/xbmcclient.py
-	python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
-}
diff --git a/media-tv/kodi/kodi-17.5-r1.ebuild b/media-tv/kodi/kodi-17.5-r1.ebuild
new file mode 100644
index 000000000000..b92c08d6fe3a
--- /dev/null
+++ b/media-tv/kodi/kodi-17.5-r1.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Does not work with py3 here
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1 versionator
+
+LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
+LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
+LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
+FFMPEG_VERSION="3.1.11"
+FFMPEG_KODI_VERSION="$(get_version_component_range 1-2)"
+CODENAME="Krypton"
+PATCHES=(
+	"${FILESDIR}/${P}-network-test-fix.patch"
+)
+SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
+	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
+	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
+	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
+
+DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
+HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
+
+LICENSE="GPL-2"
+SLOT="0"
+# use flag is called libusb so that it doesn't fool people in thinking that
+# it is _required_ for USB support. Otherwise they'll disable udev and
+# that's going to be worse.
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles lcms libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( gles opengl )
+	gles? ( X )
+	opengl? ( X )
+	udev? ( !libusb )
+	udisks? ( dbus )
+	upower? ( dbus )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	airplay? (
+		app-pda/libplist
+		net-libs/shairplay
+	)
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	bluray? ( >=media-libs/libbluray-0.7.0 )
+	caps? ( sys-libs/libcap )
+	dbus? ( sys-apps/dbus )
+	dev-db/sqlite
+	dev-libs/expat
+	dev-libs/fribidi
+	cec? ( >=dev-libs/libcec-4.0 )
+	dev-libs/libpcre[cxx]
+	dev-libs/libxml2
+	>=dev-libs/lzo-2.04
+	dev-libs/tinyxml[stl]
+	>=dev-libs/yajl-2
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-libs/libcdio
+	gles? ( media-libs/mesa[gles2] )
+	lcms? ( media-libs/lcms:2 )
+	libusb? ( virtual/libusb:1 )
+	media-fonts/corefonts
+	>=media-fonts/noto-20160531
+	media-fonts/roboto
+	media-libs/fontconfig
+	media-libs/freetype
+	>=media-libs/libass-0.13.4
+	media-libs/mesa[egl]
+	>=media-libs/taglib-1.11.1
+	system-ffmpeg? (
+		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc]
+		<media-video/ffmpeg-3.4
+	)
+	mysql? ( virtual/mysql )
+	>=net-misc/curl-7.51.0
+	nfs? ( net-fs/libnfs:= )
+	opengl? ( media-libs/glu )
+	!libressl? ( >=dev-libs/openssl-1.0.2j:0= )
+	libressl? ( dev-libs/libressl:0= )
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
+	sftp? ( net-libs/libssh[sftp] )
+	sys-libs/zlib
+	udev? ( virtual/udev )
+	vaapi? ( x11-libs/libva[opengl] )
+	vdpau? (
+		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
+		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
+	)
+	webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
+	X? (
+		x11-libs/libdrm
+		x11-libs/libX11
+		x11-libs/libXrandr
+		x11-libs/libXrender
+	)
+	xslt? ( dev-libs/libxslt )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+RDEPEND="${COMMON_DEPEND}
+	lirc? (
+		|| ( app-misc/lirc app-misc/inputlircd )
+	)
+	!media-tv/xbmc
+	udisks? ( sys-fs/udisks:0 )
+	upower? (
+		systemd? ( sys-power/upower )
+		!systemd? (
+			|| ( sys-power/upower-pm-utils sys-power/upower )
+		)
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	app-arch/bzip2
+	app-arch/unzip
+	app-arch/xz-utils
+	app-arch/zip
+	dev-lang/swig
+	dev-libs/crossguid
+	dev-util/cmake
+	dev-util/gperf
+	media-libs/giflib
+	>=media-libs/libjpeg-turbo-1.5.1:=
+	>=media-libs/libpng-1.6.26:0=
+	test? ( dev-cpp/gtest )
+	virtual/pkgconfig
+	x86? ( dev-lang/nasm )
+"
+case ${PV} in
+9999)
+	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
+	inherit git-r3
+	# Force java for latest git version to avoid having to hand maintain the
+	# generated addons package.  #488118
+	DEPEND+="
+		virtual/jre
+		"
+	;;
+*)
+	MY_PV=${PV/_p/_r}
+	MY_PV=${MY_PV/_alpha/a}
+	MY_PV=${MY_PV/_beta/b}
+	MY_PV=${MY_PV/_rc/rc}
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz
+		 !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
+	KEYWORDS="~amd64 ~x86"
+	IUSE+=" java"
+	DEPEND+="
+		java? ( virtual/jre )
+		"
+
+	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
+	;;
+esac
+
+CONFIG_CHECK="~IP_MULTICAST"
+ERROR_IP_MULTICAST="
+In some cases Kodi needs to access multicast addresses.
+Please consider enabling IP_MULTICAST under Networking options.
+"
+
+CMAKE_USE_DIR=${S}/project/cmake/
+
+pkg_setup() {
+	check_extra_config
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if in_iuse java && use !java; then
+		eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
+	fi
+	cmake-utils_src_prepare
+
+	# avoid long delays when powerkit isn't running #348580
+	sed -i \
+		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+		xbmc/linux/*.cpp || die
+
+	# Prepare tools and libs witch are configured with autotools during compile time
+	AUTOTOOLS_DIRS=(
+		"${S}"/lib/cpluff
+		"${S}"/tools/depends/native/TexturePacker/src
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src
+	)
+
+	local d
+	for d in "${AUTOTOOLS_DIRS[@]}" ; do
+		pushd ${d} >/dev/null || die
+		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
+		popd >/dev/null || die
+	done
+	elibtoolize
+
+	# Prevent autoreconf rerun
+	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
+		"${S}"/project/cmake/modules/FindCpluff.cmake \
+		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
+		|| die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
+		-DENABLE_ALSA=$(usex alsa)
+		-DENABLE_AIRTUNES=$(usex airplay)
+		-DENABLE_AVAHI=$(usex zeroconf)
+		-DENABLE_BLUETOOTH=$(usex bluetooth)
+		-DENABLE_BLURAY=$(usex bluray)
+		-DENABLE_CCACHE=OFF
+		-DENABLE_CEC=$(usex cec)
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_DVDCSS=$(usex css)
+		-DENABLE_INTERNAL_CROSSGUID=OFF
+		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
+		-DENABLE_CAP=$(usex caps)
+		-DENABLE_LCMS2=$(usex lcms)
+		-DENABLE_LIRC=$(usex lirc)
+		-DENABLE_MICROHTTPD=$(usex webserver)
+		-DENABLE_MYSQLCLIENT=$(usex mysql)
+		-DENABLE_NFS=$(usex nfs)
+		-DENABLE_NONFREE=$(usex nonfree)
+		-DENABLE_OPENGLES=$(usex gles)
+		-DENABLE_OPENGL=$(usex opengl)
+		-DENABLE_OPENSSL=ON
+		-DENABLE_OPTICAL=$(usex dvd)
+		-DENABLE_PLIST=$(usex airplay)
+		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
+		-DENABLE_SMBCLIENT=$(usex samba)
+		-DENABLE_SSH=$(usex sftp)
+		-DENABLE_UDEV=$(usex udev)
+		-DENABLE_UPNP=$(usex upnp)
+		-DENABLE_VAAPI=$(usex vaapi)
+		-DENABLE_VDPAU=$(usex vdpau)
+		-DENABLE_X11=$(usex X)
+		-DENABLE_XSLT=$(usex xslt)
+		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
+		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
+		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
+	)
+
+	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
+
+	if use system-ffmpeg; then
+		mycmakeargs+=( -DWITH_FFMPEG="yes" )
+	else
+		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile all
+	use test && emake -C "${BUILD_DIR}" kodi-test
+}
+
+src_test() {
+	emake -C "${BUILD_DIR}" test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
+
+	rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
+
+	newicon media/icon48x48.png kodi.png
+
+	# Replace bundled fonts with system ones.
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
+	dosym ../../../../fonts/noto/NotoSans-Regular.ttf \
+		usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
+
+	local f
+	for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
+		rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
+		dosym ../../../../fonts/noto/"${f}" \
+			usr/share/kodi/addons/skin.estuary/fonts/"${f}"
+	done
+
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
+	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
+		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
+
+	python_domodule tools/EventClients/lib/python/xbmcclient.py
+	python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
+}
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 8af457688040..a6ff93976977 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -74,7 +74,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=media-libs/taglib-1.11.1
 	system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc] )
 	mysql? ( virtual/mysql )
-	>=net-misc/curl-7.51.0
+	>=net-misc/curl-7.56.1
 	nfs? ( net-fs/libnfs:= )
 	opengl? ( media-libs/glu )
 	!libressl? ( >=dev-libs/openssl-1.0.2l:0= )
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index bc21321d7a90..6cf0cd4bf55b 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,7 +1,5 @@
 DIST avidemux_2.6.20.tar.gz 20172362 SHA256 03c6cb7fc9eb74688b4fcd5eb654ed7b9c4ffc717a72cc09b08a2d10cdc7ef9f SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103 WHIRLPOOL 2e2dc21bed49eeb0cdfefe75fe51f6a84226e7e8e80b063bc0b3d8711a6b91db710611dc0ec06575be69ec8e24f2f9e5b5eb363b9c095267729e85e162a4ce38
-DIST avidemux_2.6.8.tar.gz 17380534 SHA256 02998c235a89894d184d745c94cac37b78bc20e9eb44b318ee2bb83f2507e682 SHA512 57a4042f1a9d46462850871d36950215c5ffb5b66ce2f2cde09d747e946c05adb7a550ac7763c96f4c1bcb2c39881407d9d88bc64c93053741091751495ba0b0 WHIRLPOOL 29f8a6039d82e686e8dfbfc7b23658921834238a4cc6c4de338afdfdc032a9a7cba1c8236789aa6dbcab318ec14c344c19563f153e6cbd63cd265c5fb15b44b6
 EBUILD avidemux-2.6.20.ebuild 4429 SHA256 1d3faeeb54d83aab20edd51e8baad2f9e2b564f0a272c7bb5292f223892f6106 SHA512 bfb165003b197c1bd6ce6579cc5ef2ef6e974087bb66589cf7f72d50f0f0fe0521bfa9f1cec00cc3abb9f2a03b87bc046c6c0fb94ab0f58176afc5581d92acee WHIRLPOOL 3bab699388501377585ec4277b0070ff666a235b2f9c2823fa8aca65b3a98bbc23c2acc1081132cff3bfe6034bcc2dfbbb2a6fe80f8e19d96dcc7942a358b8d9
-EBUILD avidemux-2.6.8.ebuild 3756 SHA256 172e966eb9bbd8c601fd9e9955bb1734661c50ce4b691983bf6650a0f8b75e9b SHA512 81fe43ed4d4e4263587310b5a14eaf355dddee13d145e6417b9cbd528e2bff230dc16e63b39004977be61ca8ee3507cfb4b438f88e9778f0087da08b74b0bf0a WHIRLPOOL 53e6427ad1939f300c90c1268e528ee6faa14208cb8e0250ccb929b40c398c2bd6da8588b793a5a3c9b92d69cb877847b9ef7e3d5e8d86da2403d22cf389bccc
 EBUILD avidemux-9999.ebuild 4429 SHA256 1d3faeeb54d83aab20edd51e8baad2f9e2b564f0a272c7bb5292f223892f6106 SHA512 bfb165003b197c1bd6ce6579cc5ef2ef6e974087bb66589cf7f72d50f0f0fe0521bfa9f1cec00cc3abb9f2a03b87bc046c6c0fb94ab0f58176afc5581d92acee WHIRLPOOL 3bab699388501377585ec4277b0070ff666a235b2f9c2823fa8aca65b3a98bbc23c2acc1081132cff3bfe6034bcc2dfbbb2a6fe80f8e19d96dcc7942a358b8d9
 MISC ChangeLog 3639 SHA256 3a79a443e426c7880449f1b2cb9a46029fad0e5f38d292e0eb95a9fba14cfbf7 SHA512 10d5194ff3371f4d98eaf444c00958f3b597732b8d8f7f08156ff4fd629a7223637e96feb76af5f5f447be6a354e056a25c91cae10c3d17efd23be7a7c948c6a WHIRLPOOL 97abe8eaf9b159d491e2a07a52f0b0024e064eddfadf25eaec3d19e1379f8c535a61479c06ef07feb8cceba884b92e3a9302c7efb67460255bb5398ff2d2d0b9
 MISC ChangeLog-2015 43501 SHA256 bf5c8b539d6e30ac299b9383b3c3dda2ce8a5bb087860335f6b970b174da3957 SHA512 e85c2de4babc72668e180da6e580876ae2c6cef1cc0826b96546e9838e071949c167507ab02ee943d97d7e4ab77b90116e615fdcecfc10dc1326d4f7ceed6652 WHIRLPOOL b070add4eed7e98da1dfea88a5f534b50944c7ebdef40bdc4e8e38eeb860509d57f95a04f58429a163375f0c3d9084e73b28e13cf5267b7d40159c5d5a0b9754
diff --git a/media-video/avidemux/avidemux-2.6.8.ebuild b/media-video/avidemux/avidemux-2.6.8.ebuild
deleted file mode 100644
index d31c66fd8977..000000000000
--- a/media-video/avidemux/avidemux-2.6.8.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr"
-
-inherit cmake-utils eutils flag-o-matic l10n
-
-SLOT="2.6"
-
-DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/${PN}"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-IUSE="debug opengl nls qt4 sdl vaapi vdpau video_cards_fglrx xv"
-KEYWORDS="~amd64 ~x86"
-
-if [[ ${PV} == *9999* ]] ; then
-	KEYWORDS=""
-	EGIT_REPO_URI="git://gitorious.org/${PN}2-6/${PN}2-6.git https://git.gitorious.org/${PN}2-6/${PN}2-6.git"
-
-	inherit git-2
-else
-	MY_P="${PN}_${PV}"
-	SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-DEPEND="
-	~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,video_cards_fglrx?,xv?]
-	opengl? ( virtual/opengl:0 )
-	qt4? ( >=dev-qt/qtgui-4.8.3:4 )
-	vaapi? ( x11-libs/libva:0 )
-	video_cards_fglrx? (
-		|| ( >=x11-drivers/ati-drivers-14.12-r3
-			x11-libs/xvba-video:0 )
-		)"
-RDEPEND="$DEPEND"
-PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?]"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Fix icon name -> avidemux-2.6.png
-	sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${PN}2.desktop || die "Icon name fix failed."
-
-	# The desktop file is broken. It uses avidemux2 instead of avidemux3
-	# so it will actually launch avidemux-2.5 if it is installed.
-	sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || die "Desktop file fix failed."
-	sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt4:' ${PN}2.desktop || die "Desktop file fix failed."
-
-	# Fix QA warnings that complain a trailing ; is missing and Application is deprecated.
-	sed -i -e 's/Application;AudioVideo/AudioVideo;/g' ${PN}2.desktop || die "Desktop file fix failed."
-
-	# Now rename the desktop file to not collide with 2.5.
-	mv ${PN}2.desktop ${PN}-2.6.desktop || die "Collision rename failed."
-
-	# Remove "Build Option" dialog because it doesn't reflect what the GUI can or has been built with. (Bug #463628)
-	sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || die "Couldn't remove \"Build Option\" dialog."
-}
-
-src_configure() {
-	local mycmakeargs="
-		-DAVIDEMUX_SOURCE_DIR='${S}'
-		$(cmake-utils_use nls GETTEXT)
-		$(cmake-utils_use sdl)
-		$(cmake-utils_use vaapi LIBVA)
-		$(cmake-utils_use vdpau)
-		$(cmake-utils_use video_cards_fglrx XVBA)
-		$(cmake-utils_use xv XVIDEO)
-	"
-
-	if use debug ; then
-		mycmakeargs+=" -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1"
-	fi
-
-	processes="buildCli:avidemux/cli"
-	use qt4 && processes+=" buildQt4:avidemux/qt4"
-
-	for process in ${processes} ; do
-		local build="${process%%:*}"
-
-		mkdir "${S}"/${build} || die "Can't create build folder."
-		cd "${S}"/${build} || die "Can't enter build folder."
-		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${S}"/${build} cmake-utils_src_configure
-	done
-
-	# Add lax vector typing for PowerPC.
-	if use ppc || use ppc64 ; then
-		append-cflags -flax-vector-conversions
-	fi
-
-	# See bug 432322.
-	use x86 && replace-flags -O0 -O1
-}
-
-src_compile() {
-	for process in ${processes} ; do
-		BUILD_DIR="${S}/${process%%:*}" cmake-utils_src_compile
-	done
-}
-
-DOCS=( AUTHORS README )
-
-src_install() {
-	for process in ${processes} ; do
-		BUILD_DIR="${S}/${process%%:*}" cmake-utils_src_install
-	done
-
-	if [[ -f "${ED}"/usr/bin/avidemux3_cli ]] ; then
-		fperms +x /usr/bin/avidemux3_cli
-	fi
-
-	if [[ -f "${ED}"/usr/bin/avidemux3_jobs ]] ; then
-		fperms +x /usr/bin/avidemux3_jobs
-	fi
-
-	cd "${S}" || die "Can't enter source folder."
-	newicon ${PN}_icon.png ${PN}-2.6.png
-
-	if use qt4 ; then
-		fperms +x /usr/bin/avidemux3_qt4
-		domenu ${PN}-2.6.desktop
-	fi
-}
diff --git a/media-video/dvgrab/Manifest b/media-video/dvgrab/Manifest
index 19365fdc6b06..ea488552af15 100644
--- a/media-video/dvgrab/Manifest
+++ b/media-video/dvgrab/Manifest
@@ -1,6 +1,6 @@
 AUX dvgrab-3.5-gcc6.patch 993 SHA256 148885d4de8ca880d93ed418913aafc08529dacda5cd0d1095682ad49451ff78 SHA512 db155702d050c58b7833c609e5e1a38f91256b5bf5b8c6c8619648e12851924fb0177ad7930f4dd77671bd6515abfd6059ed5ab5611aef9b6ba4e3c8260b88b0 WHIRLPOOL 1563c74a7fcb358d2d6c275e8d42fe60a900a8958252640fc8a10b08408a6564130d2d2e933c5aa726883be44187e390316802d361ed242911fec04b27e04c92
 DIST dvgrab-3.5.tar.gz 205268 SHA256 5910183429d300221783d6054ff5add15bb2ae49ae33272d723a314bc2ce0af9 SHA512 7d9cae1661d27dbef1d0dcdf18966a0ab386d936803ff7d071a18e0303fca45631c9b27187a413adfa4391c395e5909e3b8dc5c543d529e7805550f1a3ee6735 WHIRLPOOL 2e1227a1845c047e0b8161afa6b50cf1d271758fe4a47a77b7f47c46f1cc568e4fb72d8d795c5f1a0976fb12f0d6ff461c0326af002be5b3f1c6a5a3a4ebec90
-EBUILD dvgrab-3.5-r1.ebuild 706 SHA256 ea3a85ed800714c77b696bd68376667cdfd1b2f94a99ac8f44d1bbd078f80dd2 SHA512 f5d15abde322117c6818229b018ff0e696be7e81c29d3411f70c278595c3e69379454483c2d9a8ce3683b5e721c416f3a33c5eb143f800aff2832626df6db9fe WHIRLPOOL a74fc207d69f2fe3afdbc4fc1d0706417106574446646f6c447a021ea221cf7caf5a8816c3c383957974ae742bf2f55a618cfc46500ad99027964913a7b5215b
+EBUILD dvgrab-3.5-r1.ebuild 705 SHA256 95a346b52531c0334492837e978dc6abfa5bb8090cdc9b511541eff8817b6f86 SHA512 a699bb08474f3754b57da8068fa6221d8a8f8ec2326b77fbbf9e142dc859d3514f842469ae0e786d3989d4473ffc2605493406a505bade89cbdc0901d24dccc1 WHIRLPOOL 032bffa68a3efb35e520876130d7c47b9cd5abef15605c60331f5cb420cfd01c343ed2e5cf4133cf463789121e0524e16273c8ee180e2f1a405f9930e8006a16
 EBUILD dvgrab-3.5.ebuild 787 SHA256 7e9d068f8b384cb3a059111bde0715e9d209595d75430c3bdd23f2ecc41874c8 SHA512 6c9a164a8837d2279710ef04744313edc2d210574615903ae079219b69f8036394df9d11eac390b7c44be77f7c1e23678058fca61347fd2c58edb9084b045590 WHIRLPOOL 1162d359095aebdd0994f4e12ecf300a528c4532b49b25f5f87be02279390a32649832d77eb58d8f32297ee947bc2e477e10d1afbe6adb09dcb26eeb15fd5075
 MISC ChangeLog 2423 SHA256 949a1dca7c8f62690e96b7d147d655a81c8aa217416adc82d91c0acd868c47fe SHA512 f167a747b4a4a1219bbb258953fa7b214bbd0e3cd9d3d3555d0c1427597f6daf01417ed62012b7cd0c3c9d05465b06dde4d1545c88a8b69de7061ae0590e6bc0 WHIRLPOOL d10dc3b734fdbe8c7a642604a79cfe68184a387640f44b1ecc65d7f7f618d70b68fb759cb8551aed7bece912a7011e79ebddba89987d91cdfba17b6c03cf152e
 MISC ChangeLog-2015 5696 SHA256 64bc6461429e8463504a76dbb34828f176b11e0e8f450113092e0c2e9fb3c42d SHA512 9dadbc48f3900866e0f6bd8fa870a5c060aec213f2cf5e6340212b661b4d56ec3c084fb1908a128f96e2cff35429c22865d869b2dff53945bff3002d52af50f8 WHIRLPOOL c2b70f9814f24e3f02684fd81175fed1cdd59c1c2365d903c1f00cf34f85afa57a5d9fb811dbc2d4557034ae8350611ebe9572e59c36da85c40e0f979a2ed17d
diff --git a/media-video/dvgrab/dvgrab-3.5-r1.ebuild b/media-video/dvgrab/dvgrab-3.5-r1.ebuild
index 004dae6a1642..4c9372683ce7 100644
--- a/media-video/dvgrab/dvgrab-3.5-r1.ebuild
+++ b/media-video/dvgrab/dvgrab-3.5-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/kino/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86"
 IUSE="jpeg quicktime"
 
 RDEPEND=">=sys-libs/libraw1394-1.1
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index ef1a8521f5f7..a220a09c6ae6 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -10,7 +10,7 @@ DIST ffmpeg-3.4.tar.bz2 10171702 SHA256 5d8911fe6017d00c98a359d7c8e7818e48f2c0cc
 EBUILD ffmpeg-3.2.6.ebuild 15078 SHA256 8429b0673a250afb791e7ae3e48456d88bbe42017602947957ea24714743d3e0 SHA512 56e3a5e60aab2c15d22e9ce9630138ed95ff6e751a41b4211704b052f290d8748a0859766b39e0221d4cb1ad2b1163982a25179861eee7b85707053f99b5f869 WHIRLPOOL fb99c0c52c19fd45f997829715466b60e47d077889b30c4d64b8da98255e6006fcb62ea835c5ea68d35843bf385a15eca708d069e84737a97bff6ee1809bad9f
 EBUILD ffmpeg-3.2.7.ebuild 15083 SHA256 c5b9bcbaf74024fba519764852bcd2d800fcc740b13558c555f8ca8a1c8af49c SHA512 2645eada5e381a5df2b3972dee7435f51dea461f4535796ededcc4f705979b289c48c289f3384bb58bbe1b6f64dadfda10e2c9d1674bf00d566dfe107f52a42e WHIRLPOOL 40092ab775c49ea1b902017ec0bab05a9bc898c88f49a7dd2061b86af89404f4b0bbd1b0f96e8f6cb2f73ec682f83d55e52de3d712d5a22f0bebdad928c4496a
 EBUILD ffmpeg-3.3.3.ebuild 16075 SHA256 69536764659767c709f17df58d698eec5593a74b932c273f3ffd9ae2e15a9e87 SHA512 037ba3846ccdc462945800af3438b4d852f026f0261c0264409f0e5960168457fd37c20bd9f332d2149bcf11af075b130fc7f27adb09fc6887e693fc86090204 WHIRLPOOL 1e28f1b0e98797acd5fe7123b83eb50818c1fb4eacd6b3aa953f776735819bfdd2ab9887457ea8b617b99af467c915eafc1d8acc12aa0d84bfbfcb71fcec0cfa
-EBUILD ffmpeg-3.3.4.ebuild 16109 SHA256 8dfffba69b54efcc60ec3d671e04a587d8c73d5d00f8fe9147aa1909857b4ef3 SHA512 4c994e2f3d0a4a5d2ebbd3868eb8a60b2f1c459b06747902cfaf4647167abb05295e02d44526ced588ab139d0e58d84c2127915ad3fd1f82756113b27eabbb18 WHIRLPOOL 69061f150cdba1eb0884818531264a43312c3e6d8b32bfb1f8986e5133ece8b3f2e81145bc52fac4b3dff5ec2b92cdab757dab36d55c9ff5502ce3985ccd01e9
+EBUILD ffmpeg-3.3.4.ebuild 16107 SHA256 d7f48a8aa67297968bd97ff4e91095cd76db5559f46fbaa888fbb54f617b04a1 SHA512 ed129a8ee9f66bed5c2ab724114ed77ad345e7dec13f541ede5371ca442352b2e16666a715c30bac967210464d970bd4728c7753bd08dd542478d43da83b598b WHIRLPOOL 6509b5525e8832dbe8459db8fd48f8ab66fffc5cf9bf724c675b6bd045e9b42c10065a6d9be80b78b51671f3f04ac966b7ad0ec0b659bc39f060d42cc778179f
 EBUILD ffmpeg-3.4.ebuild 15664 SHA256 c3e195e6126953e12170e8846e6952bfd326561a5c6ec6bc212553effd838ae3 SHA512 2060c89e73a059b6626505c1632f727536f711fb7b723633ac8b8c2a057776a2c7e7b1f98561585addadd6317f4ef506057033097d1c15c5553969e31d07008e WHIRLPOOL a5c034b4264f6076fb7e3b43d73ac0d4f8f177dfef9f5f274b65ce3f8a120f86aa7e46b5692a3be04b4b92f0b71380afe9a634e2602e9cedb4cb657d9ce8d723
 EBUILD ffmpeg-9999.ebuild 15671 SHA256 483e9cb1d91cb9f665f5bc5a2b7ba5cb82fed6223cddb4ac6a4e2006f75a7755 SHA512 31a985156399ca0ae0948fafb49168b76d8bd74c064c600c3630acc3be3ca78413952726bc80af6e919357ebfc43c8fd1a74d30d3e59da5ae5343cac99871f16 WHIRLPOOL b8ec3270ba4301bd1bd93945e6c178e33494eeb6f7ea20ba7a0b8dc086f4a8a1da871aeb749f73648cd4d16af2f66462103b280bc050269fb220f41dfbdf244a
 MISC ChangeLog 23132 SHA256 09ec61b302618a36f1aaf270cc3d8a0adfecae89915cfa1db49eba415094887f SHA512 6ec8dcf80d54a23683e72425d5989d70ee5a2f0a9cbf93a6ff3583d7af1556e9897ae9d917e216d0d2a4469ea0ea05d75389bff11c07193f9c599d59848b0468 WHIRLPOOL 7bd7dd2164286941873d7640311f3b9e501a66c4fadce9f825dcf94ff054e79e1ab1ec4922a193d12631806ceb5fed3787cf4992332586a75e4d7993a74e7a86
diff --git a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
index d3e881309387..6c79a3343159 100644
--- a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
@@ -54,7 +54,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 1c662da1532b..4ac9ee46e42b 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -2,7 +2,7 @@ AUX makemkv-path.patch 2153 SHA256 daf69f09e936929e78c82ef8efdd6014a3b1bfdf77675
 AUX makemkv-wget.patch 1013 SHA256 8153281145a2299c190e5b3453fa3f76c9451e1eb16006fde459e6665a7bad80 SHA512 09ece751d6765a93ff18e0eb8edbb7c413e1074676bc5c6fbc57bb1b8c2314f66198737c5077ecef18d286d724088d2db6731977885713bc095531281f104e0f WHIRLPOOL 453a619c70b8ef28e0d8ccfb80141109fe129879f7a4e31355d52d059d95a2abfebe74b16b05d14b033b0c63fa28a0f1567d4382c370937c63990d66d22a1b67
 DIST makemkv-bin-1.10.7.tar.gz 8724225 SHA256 2b9a9e6fb779bc876371b2f88b23fddad3e92d6449fe5d1541dcd9ad04e01eac SHA512 7c3c1713df6b4009de2337a28f4c5b1f38d37be3a30f08ceafc6dc276c960960f6443fd5b29f5f96f10597093ff170fb5ab69d6244db5165da30abe1d3732aab WHIRLPOOL 7cdbd0aef4d1d5e9d7eb0b5ba1e7be5d478a84dfa4fe2c6528c91db29c2ebe86db4ee2cd5059b84b934bb720f293979e0afec9bcce2a3c8460825d9c5a6ce104
 DIST makemkv-oss-1.10.7.tar.gz 4570003 SHA256 be61fcee31dc52944ec7ef440ff8fffbc140d24877e6afb19149c541564eb654 SHA512 f329449ed1bb4240a8256c3171c3c6cc0843c8d07a79526608fa3ea83e012634e6c6d9dd17160853b973d012e3483bcdaa17d9d1e6f7beb90c048b6063c12aa8 WHIRLPOOL 2e74e6d025bf26c12b036c971648975a4e7d9b753a2015e9282f5a4ded0885e83df4f54ca30200c8f50ba5f748283c582fba3b65b4e26211a7d87e4d431ec137
-EBUILD makemkv-1.10.7.ebuild 3113 SHA256 bd8dfb616f0219994f7ea82ca2526ad1030ecb1d4ed765ad2968049fef631d88 SHA512 4733ad340dd9ab8fe247e6f37005620ea5ed5e364c21911d81bb54e7a31e02b5c652699422a14d0fdd3113c2870529e20dba8b3166b424ab3472971c7a960202 WHIRLPOOL 078a37c1892a4fa9700848db25b34f1c232f7428f328303822819d0e86afd35eee61e350f862c68b3af96f681b984f4c53b782e1ecb1fb60b9cbc34be516853e
+EBUILD makemkv-1.10.7-r1.ebuild 2910 SHA256 7a3bf0095f0b62f3e80f215c0720b7a40afd61b340427f4191b66cd8c0c3943d SHA512 9f72258fcce7878938b086613fd31d0197f4b1380d4a02ce5e3ef67356d0f2ade43e8e2066875bed76f8051539c646ccd401b9f292b73a70f7bb69cc0f437a46 WHIRLPOOL e093f3cee709d82f45e10938868552bc05aa51186f80e5ba43180496cd0e96d3ab82be65008753d129b532d92bfe32c0fc97d213dda246a9d317db091dde3316
 MISC ChangeLog 7615 SHA256 377311aefb24e51892ac094ee9733edecad630891cdea77e76c745b3059fc0b1 SHA512 99510e41787abe9edefd918edaff201c5a43f3c8e05c0bf49f9499a9b31e685c6dc8f1d5763f9feb251a352e76a9a9b7d5a13488c33ea8d18ddc32cb6370d1e5 WHIRLPOOL b30a6ec149a2c90ec532b38c4ed8c10b33a7285ee9174c792fdb44123e454704906ebebd92f497c0a5302392884559cabf35af71c7a1e0621f3a7f1534b43cc5
 MISC ChangeLog-2015 12085 SHA256 fbf29eb91bf5bf4b516857b2e3e778bc4ed54b6fe382d80f84ffd688dc0afb02 SHA512 63a0713ae6a6cee55f3077d850a86cc6079a574145683b61b643b8324dcf9ed55dc207e54e70709d1b818489a9fb016c12d553076b5f7aa9a298c599990a565f WHIRLPOOL 3a54bb835dea1cd815cfc2daab46338b46b65e785bc0684a7787ee74ff69b8fd19f8741d821fb5a4de968a3029742e8f7666589e03d64d34b518289a9294c2e6
-MISC metadata.xml 1221 SHA256 19e142b9a9c08384f526c0bf2175aa9443a31c8082f8fe6804dc5011421db4c8 SHA512 697327658b9d1dff99431417d48d9184377c56eacdaf61d98f22a1f7df1e596ee34971f6f75f13cd3842ccb49a21bd2f70592acee8269ae9c130261f72d6a92b WHIRLPOOL 9231c2da5d1d02def5eff7b9609f470720710ea9fb6d2c807226a7488b84f9baa000215761ae71acb88306d59c9429a5bd6ec761bfe1c0918baadd6dc5886083
+MISC metadata.xml 1281 SHA256 fbbb6558c79e5a4df39afcd552f583f662ac08bdd10ccacec693661c256cfb99 SHA512 5060b07ae001cff4403f34cb7a5d09aaa9338147b3a649ec1ab98a355029b770e8c127ba08f771b24c27182c24cb2c72287af77022482844b2188a4a2c6b22d1 WHIRLPOOL dab82e73c8bcbe382c3bd849f5915dca4fe2dd2c6cea65498224adb24eaa66ffefde76aba79b95747af469bfeb1518eb5beb2687123401f1274380e430b4a973
diff --git a/media-video/makemkv/makemkv-1.10.7-r1.ebuild b/media-video/makemkv/makemkv-1.10.7-r1.ebuild
new file mode 100644
index 000000000000..8ae13a9e98f9
--- /dev/null
+++ b/media-video/makemkv/makemkv-1.10.7-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils flag-o-matic
+
+MY_P=makemkv-oss-${PV}
+MY_PB=makemkv-bin-${PV}
+
+DESCRIPTION="Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs"
+HOMEPAGE="http://www.makemkv.com/"
+SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
+	http://www.makemkv.com/download/${MY_PB}.tar.gz"
+
+LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+gui libav multilib"
+
+QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
+
+DEPEND="
+	sys-libs/glibc[multilib?]
+	dev-libs/expat
+	dev-libs/openssl:0[-bindist(-)]
+	sys-libs/zlib
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	!libav? ( >=media-video/ffmpeg-1.0.0:0= )
+	libav? ( >=media-video/libav-0.8.9:0= )
+"
+RDEPEND="${DEPEND}
+	net-misc/wget"
+
+S="${WORKDIR}/makemkv-oss-${PV}"
+PATCHES=( "${FILESDIR}"/${PN}-{wget,path}.patch )
+
+src_configure() {
+	# See bug #439380.
+	replace-flags -O* -Os
+
+	econf \
+		--enable-debug \
+		--disable-noec \
+		--disable-qt4 \
+		$(use_enable gui) \
+		$(use_enable gui qt5)
+}
+
+src_install() {
+	default
+
+	# add missing symlinks for QA
+	dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV}
+	dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so
+	dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
+	dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so
+	dosym libmmbd.so.0    /usr/$(get_libdir)/libmmbd.so
+	dosym libmmbd.so.0    /usr/$(get_libdir)/libmmbd.so.0.${PV}
+
+	cd "${WORKDIR}"/${MY_PB} || die
+
+	# install prebuilt bins
+	if use x86; then
+		dobin bin/i386/{makemkvcon,mmdtsdec}
+	elif use amd64; then
+		dobin bin/amd64/makemkvcon
+		use multilib && dobin bin/i386/mmdtsdec
+	fi
+
+	# install profiles and locales
+	insinto /usr/share/MakeMKV
+	doins src/share/*.{mo.gz,xml}
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	elog "While MakeMKV is in beta mode, upstream has provided a license"
+	elog "to use if you do not want to purchase one."
+	elog ""
+	elog "See this forum thread for more information, including the key:"
+	elog "http://www.makemkv.com/forum2/viewtopic.php?f=5&t=1053"
+	elog ""
+	elog "Note that beta license may have an expiration date and you will"
+	elog "need to check for newer licenses/releases. "
+	elog ""
+	elog "We previously said to copy default.mmcp.xml to ~/.MakeMKV/. This"
+	elog "is no longer necessary and you should delete it from there to"
+	elog "avoid warning messages."
+	elog ""
+	elog "MakeMKV can also act as a drop-in replacement for libaacs and"
+	elog "libbdplus, allowing transparent decryption of a wider range of"
+	elog "titles under players like VLC and mplayer. To enable this, set"
+	elog "the following variables when launching the player:"
+	elog "LIBAACS_PATH=libmmbd LIBBDPLUS_PATH=libmmbd"
+}
+
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-video/makemkv/makemkv-1.10.7.ebuild b/media-video/makemkv/makemkv-1.10.7.ebuild
deleted file mode 100644
index f01bbdb662fc..000000000000
--- a/media-video/makemkv/makemkv-1.10.7.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils flag-o-matic
-
-MY_P=makemkv-oss-${PV}
-MY_PB=makemkv-bin-${PV}
-
-DESCRIPTION="Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs"
-HOMEPAGE="http://www.makemkv.com/"
-SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
-	http://www.makemkv.com/download/${MY_PB}.tar.gz"
-
-LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="libav multilib qt4 qt5"
-
-QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
-
-DEPEND="
-	sys-libs/glibc[multilib?]
-	dev-libs/expat
-	dev-libs/openssl:0[-bindist(-)]
-	sys-libs/zlib
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	!qt5? ( qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-	) )
-	!libav? ( >=media-video/ffmpeg-1.0.0:0= )
-	libav? ( >=media-video/libav-0.8.9:0= )
-"
-RDEPEND="${DEPEND}
-	net-misc/wget"
-
-S="${WORKDIR}/makemkv-oss-${PV}"
-PATCHES=( "${FILESDIR}"/${PN}-{wget,path}.patch )
-
-src_configure() {
-	# See bug #439380.
-	replace-flags -O* -Os
-
-	local econf_args=()
-
-	if use qt5 || use qt4; then
-		econf_args+=( --enable-gui )
-	else
-		econf_args+=( --disable-gui )
-	fi
-
-	econf \
-		--enable-debug \
-		--disable-noec \
-		$(use_enable qt5) \
-		$(use_enable qt4) \
-		"${econf_args[@]}"
-}
-
-src_install() {
-	default
-
-	# add missing symlinks for QA
-	dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV}
-	dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so
-	dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
-	dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so
-	dosym libmmbd.so.0    /usr/$(get_libdir)/libmmbd.so
-	dosym libmmbd.so.0    /usr/$(get_libdir)/libmmbd.so.0.${PV}
-
-	cd "${WORKDIR}"/${MY_PB} || die
-
-	# install prebuilt bins
-	if use x86; then
-		dobin bin/i386/{makemkvcon,mmdtsdec}
-	elif use amd64; then
-		dobin bin/amd64/makemkvcon
-		use multilib && dobin bin/i386/mmdtsdec
-	fi
-
-	# install profiles and locales
-	insinto /usr/share/MakeMKV
-	doins src/share/*.{mo.gz,xml}
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "While MakeMKV is in beta mode, upstream has provided a license"
-	elog "to use if you do not want to purchase one."
-	elog ""
-	elog "See this forum thread for more information, including the key:"
-	elog "http://www.makemkv.com/forum2/viewtopic.php?f=5&t=1053"
-	elog ""
-	elog "Note that beta license may have an expiration date and you will"
-	elog "need to check for newer licenses/releases. "
-	elog ""
-	elog "We previously said to copy default.mmcp.xml to ~/.MakeMKV/. This"
-	elog "is no longer necessary and you should delete it from there to"
-	elog "avoid warning messages."
-	elog ""
-	elog "MakeMKV can also act as a drop-in replacement for libaacs and"
-	elog "libbdplus, allowing transparent decryption of a wider range of"
-	elog "titles under players like VLC and mplayer. To enable this, set"
-	elog "the following variables when launching the player:"
-	elog "LIBAACS_PATH=libmmbd LIBBDPLUS_PATH=libmmbd"
-}
-
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-video/makemkv/metadata.xml b/media-video/makemkv/metadata.xml
index b650d107cd5b..9de3ac702c5f 100644
--- a/media-video/makemkv/metadata.xml
+++ b/media-video/makemkv/metadata.xml
@@ -21,5 +21,8 @@
       without intermediate conversion to wide range of players, so you
       may watch Blu-ray and DVD discs with your favorite player on
       your favorite OS or on your favorite device.
-</longdescription>
+	</longdescription>
+	<use>
+		<flag name="gui">Build the Qt5 GUI</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 9518d975a216..ebb7c12cafe8 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -3,6 +3,7 @@ AUX mplayer-1.2-get_buffer.patch 12054 SHA256 ffffa0672bead0e97d970e98dc9ed4d1b9
 AUX mplayer-1.2_pre20150730-chan.patch 966 SHA256 d92a18180b023833a748ec4186a5e2914781247f8840d57d41b564cbe06eed48 SHA512 9ea28c193d26feba870283d110a69d42e739696571ac13d40f983b4b6f0c83f01befd12fa7825b2dca10d5f3279d29d71dd07f2f53553f78e88b182fd8250df4 WHIRLPOOL 8368cf41f1c1ca82674fde7ca39c46a7ec95569fd56acde0caba55b848a1a2635ae0b4b8b5e39c9b6f5f79bb6ad6401c2d7920568aee9d0c24e2e2def8a1f5fb
 AUX mplayer-1.2_pre20150730-encode.patch 3022 SHA256 edf081f8704fdf3936be1971d2d1243b684f78772d4c2a9459ad56a2db9c87fa SHA512 c1da3944616205c92926910d93bf9ee39404f46cad07a68df28050aeab88a358480e9cfe09f41af8fa047b623d9400bcebc1a05c6982f704d5164a777e591792 WHIRLPOOL a928b0ff7bf40495a4a34a4f89f7c6cd17d76bf528ecc696828d9dd5b67a9121f455d22fd439d74dbe434b3e6c1c94e572023e694db8510fea3b6581bd95ab72
 AUX mplayer-1.3-CVE-2016-4352.patch 617 SHA256 3fac635945a9327b3e08d6707f7153966908df147b7bf3d06d0b72d2d3215ae5 SHA512 654bfa8368a02669ba249aa0c1a605f285d4d967b7038285df0ba7b83cd034ac3aff933a564fd6f33c7a153267be19d9eb517a52c8f4b53a6f81b6b2c5558512 WHIRLPOOL a7f36dbb623536ceeebdfc11f1389c97d51a7e5afba335345318b867bf2dbed9f8fdcfd695eb41de0b8fe648b3b40a04f61857c2845e43d46d8ad4ed0dfa08d5
+AUX mplayer-1.3-vdpau-x11.patch 543 SHA256 e941130dde42fe4e4221eca35c3b5fe477c136e5ca3735c22e902663b6feea8e SHA512 c0dfdca8075fd8bdad7cde99e163ba5d55e6268883f852917e287eeeace85b06e244b727bd87501c77ff72fce4b6ba317d45694f1086b5cd1a63fe3ca222f805 WHIRLPOOL 2d3eefde487ffe33e2bbe248708b07e61f8b27cfdd60bc1289398f83d55efcb9319b1dc2342d2a827f97066453a21256d5c85d318983a3692021e1998a854cdb
 AUX prepare_mplayer.sh 757 SHA256 ee4c0765b2cbab5bcc99408c4864669647fb0ad42517e0a51a6524c12b55804f SHA512 0add0707e15d58cee331fc82f884a44b29908c503f9ddcbb63dc01e237e2f457f599bae8644ce49f1af2cc7b3183529364ce30e6748889355c17cb96cecee71a WHIRLPOOL a4de2ff8e6ecfe66e41881664a84bc8ad91147e7b559e2ec334f9ad6671d9892de01bddfdba514b9c2b0589956b38d22fc8d2ce6ff00c267bded4bfb6c3ef6f0
 DIST MPlayer-1.2.1.tar.xz 13029936 SHA256 831baf097d899bdfcdad0cb80f33cc8dff77fa52cb306bee5dee6843b5c52b5f SHA512 e6dd6de73ede9743855fab7f7316de2e957ac5a5b8fc8324ef3d57ca9796b0cb03676dee46b3827d932050836d43a6ad08f925cad3d28493a26933dbafdbb506 WHIRLPOOL d8f056a8a1d6cf2a7c99687bec9e34d123f574391df02a29959355c6e44f35f1f9a56ea5f2d0f6d1037d94de0897689429e78aa7e15f29f3df3042bbfc579c72
 DIST MPlayer-1.3.0.tar.xz 13278984 SHA256 3ad0846c92d89ab2e4e6fb83bf991ea677e7aa2ea775845814cbceb608b09843 SHA512 10007e471a941f8a3dabf6149e6e44fc1a364a9ccb5cd08c670fc22560e5053a15f3249e9d3e18cdda06b6b7e77e537026b5d33dc356e928c63747d6ed73dbae WHIRLPOOL 4aaa9609b0c27c0363671e32fb6b7cac8d2c0944c3425c8e76de0250fb76865d5f47c341b11704a0ea980401288d1d28fcd172a5f8469c9713ec37f977bcb088
@@ -11,7 +12,7 @@ DIST font-arial-iso-8859-1.tar.bz2 234242 SHA256 9730f481764f367c9089d0166fb6ccf
 DIST font-arial-iso-8859-2.tar.bz2 222208 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d WHIRLPOOL 08178087b4ea1dfb2250f4673785e31dd876b06af51c51b2bddc172b23e6e33cbc1b2c6b710a317e42dc05486974b26ed0ad3ca50a185567aa77d49bd1e72aee
 EBUILD mplayer-1.2.1-r1.ebuild 17429 SHA256 96024a2fc6ec79a8c8fc32c9fb2173e4287d10807f6371961b3c95aaeaf81b75 SHA512 b36f8bfb7eb246787af2779b27d3cd17825a5f9e944a12c71a751615567b0f4a1015ca344b4e4a4bc64acdb52fb99dd1462a867505b24792472f5919fa6389c3 WHIRLPOOL 8f8e334b08ff302eeeb164f0aa48f052ce144a108e1f5de9ff2e37bcdb1e721d20c91cb823a4f7b11d0e6191c75d7c7c19b88ea36a822ef00e3b9b1eabfad97b
 EBUILD mplayer-1.3.0-r2.ebuild 17194 SHA256 1424b2b4087e9f83d60f37a8f1fccae9f9818ef6372b1713670b08dda6b28ef9 SHA512 ec49627e9094314b6595a501c6057e5f0643b3035e92edebc6a2d778260a78c2553962b0cd72f56b290ceb80dffee891362786db18c2e948d295452eb0a9009d WHIRLPOOL 53a194edac6cf2520f9c4180f4f0741ce938a9c23fde391eb5cbc8452fe8be5b739e51c08cfd4587b35085b37142d26386b1424c90d25e3a6247a0ae8a12c393
-EBUILD mplayer-1.3.0-r3.ebuild 17291 SHA256 7299fe0a625eddc967c549992a6f3e93e5f00ffe1121d60acae792e15f17cdb3 SHA512 c7090f69590d7fb36a702c9ee93e5d252ba5bf015d25408806e0fcc64bc87dd822052cd63e3ed3d2627b9ff9dbeb7e3424c80065a8aa22dbc44c2b7a33857814 WHIRLPOOL 6999865997bbda05c0bdf0de812991761436a44759dfc274f42bc08035d0e4dbfc6a8e69281717db159a7208ad3128e5c1f1687849cdb835321de89776fa1357
+EBUILD mplayer-1.3.0-r3.ebuild 17342 SHA256 9282558e9c29f23a2cd0fd22c7dd0473a0edd2462015653e794ab2fe17f04fdc SHA512 5bb5222df9ba043dd5ab7d251a5bb5f749274bd78d95b3fa535a104d5d196da134ac423fd8010d17df81d5b4a0707d37ce998033659bc48713b949a98e3f495d WHIRLPOOL eae711f3deefb5e6172ebc7de4e40a609f0461125b937a9d7494631faceeeb17f2402f55821a6c5b6dcfea04870bdf37132cb823962801d69514cf1d1349f1b3
 EBUILD mplayer-9999.ebuild 17206 SHA256 a8ce728287a09091c4d2917a3e91bc686e31eb7cb5bfbbbef6716d97ea64735e SHA512 b99dacae704b960366f0406bb5e99a9a34a3b454b29ce538ac8a46af48ecb86929ef0c59a80fd67b9187309fb7cca608a1385b6a229238fb114d0b2ebc9a723a WHIRLPOOL 1d23c6754b0c21f3eb3b515396a4a1dc4d2bcb3dee1b2472b38edf91fd987f31b7ee5fb7f229529f826a502d7ae4643b9d57df300cfcc21477a2c4aeb4591f47
 MISC ChangeLog 10735 SHA256 6c3dcfc43705566e97c1761d41f94e41aa26a6a1d7893c25b14e635979e2d267 SHA512 97d8be790bbc844cb59784d2b87dbf9ad0125e69949e502373a7e3cf230d6b5a964eea20b06648efc67634768af865ee5639aff155b61f4eecfa13e08ac93a73 WHIRLPOOL 28daecebbcea2937847c7c1122971327454dcc05ed41b01f1b4a79586c2d5d3db93226ed0ecf4870a2d43061d39192eb63b5fc05ef207ce9408c8b7873d5aa62
 MISC ChangeLog-2008 107064 SHA256 d9949e0e21fd6fd00f1417201455ee399240ef1010dcf56611ac0fc1f6f9505b SHA512 622543b379b4c44f5845566b4e697bd92dd3e864e2f01a1b0f303c8ae5c7fb5de24839f6503765d51b4a3bfa777d175a7e410383e62ef2bbacf3e87cdc28c705 WHIRLPOOL e731af47505ffa646c92386dfb14acaffc2bb14ab4da74520c0b4dbc15ca5c20aacadbb53c4b91ba8d126a75bf7d2fb61877eeda354064e20c48cf4137bf6a74
diff --git a/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch b/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch
new file mode 100644
index 000000000000..ae21941a8aa1
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch
@@ -0,0 +1,19 @@
+r37932 | al | 2017-04-20 01:06:04 +0200 (Thu, 20 Apr 2017) | 6 lines
+
+vo_vdpau: Explicitly include header vdpau_x11.h
+
+The include from inside libavcodec/vdpau.h was removed in FFmpeg
+commit d40e181bec22014a9ea312ab6837f7f0bc4f9e42 .
+
+Index: libvo/vo_vdpau.c
+===================================================================
+--- libvo/vo_vdpau.c	(revision 37931)
++++ libvo/vo_vdpau.c	(revision 37932)
+@@ -34,6 +34,7 @@
+ 
+ #include <stdio.h>
+ #include <strings.h>
++#include <vdpau/vdpau_x11.h>
+ 
+ #include "config.h"
+ #include "sub/ass_mp.h"
diff --git a/media-video/mplayer/mplayer-1.3.0-r3.ebuild b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
index ef36667a3189..9283124a63f6 100644
--- a/media-video/mplayer/mplayer-1.3.0-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
@@ -156,9 +156,9 @@ RDEPEND+="
 SLOT="0"
 LICENSE="GPL-2"
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 else
-	KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 x86"
+	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86"
 fi
 
 # faac codecs are nonfree
@@ -185,6 +185,8 @@ REQUIRED_USE="
 	xvmc? ( xv )"
 RESTRICT="faac? ( bindist )"
 
+PATCHES=( "${FILESDIR}/${PN}-1.3-vdpau-x11.patch" )
+
 pkg_setup() {
 	if [[ ${PV} == *9999* ]]; then
 		elog
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index e64322a873e3..e3010d1398ee 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,12 +1,12 @@
 AUX obs-studio-20.0.1-fix-curl-crash.patch 2240 SHA256 459532f3fee6e24274a93d4364dbc1be5b2cdfa3b592687ea6068927efb0a839 SHA512 dcb09aadf3dad1af5e0de2b83a9ce0b7c9d89911a1cdecd6d40cda6d46f5de2d90ff42d8572f45e9933938a37f5017a7e1160a6885a5247aad2c74c075960688 WHIRLPOOL 013f44817cd8f0b3586b02e4878dce39a1b78bbf2262bd41dddcd4ad0d6dab7242ab5d81c7c4d8e3195887da70c4f32ff00212e2951dc8dcc5c022113d535cd3
 AUX obs-studio-ImageMagick-header-path.patch 2466 SHA256 043654f06cedf7e5f2f66144ecfdc5405ab8977ab0a1177bc69bf255c29d9bfa SHA512 c352671edbfe8de6ca92c3155dddc5f4116e2f0c0e1197f73bc2b59749f0015458e93c892519bc4c1bbfbc89874411f3287092d67951d8ae365cb0411302a2a2 WHIRLPOOL 4fdf33a059efeb3f0d88949b0f39e5715ae4288413a5862ca3678bbdc3491ed24753623ea6a8c699679f3f4bbc2f752b1f6f3fef8c26dbf73c175aaa926d3ddf
-DIST obs-studio-18.0.2.tar.gz 6073678 SHA256 1cfbad3439b1d581b4f5b47792ccc4dae231acaf37178808811ff4e2b68feb0a SHA512 5d03791438e73e1b7689b319d4a7bb2235a178655061e816309a115026207db11053e3c27c08c5dde4f3638b3bb424ebb3bf3748bbbe828374a06abe75b2e39d WHIRLPOOL 66e3a425dd4029f3649e50fcc88d57f7e85133e16ae65e56b69d5e7ad584df37f6d51079419d47ec79397e321388c762715bab14f797f1fc40d1980cafa9c785
 DIST obs-studio-19.0.2.tar.gz 5509958 SHA256 c7846e09f13061587d844588c538276aec6d498c8f9a4518fc3d8bb206776f01 SHA512 8e2c720d713f6b3fdfb0ce64252cba3129644155be75e0942250bb616700ba62acdb04265a7a6d0ce9406282fbbf85d662d7bdc36736c36be89fd726c8bbf5a9 WHIRLPOOL 7200a787ef1afc848fabf52193210a3309456b799da8cbd083d5914723e2c721dc3f7269d5b23edee3fd61c61314c96f11c683b5585d13d8b19536e3480f1f5c
 DIST obs-studio-20.0.1.tar.gz 5610534 SHA256 3241667f180816b860622fd9ac572a86375a9a766ac45c69a886dcbdaf524643 SHA512 891be96bbe18a2de4af8efd2eaeb54c388332ac7d93a66efcc18208af9ef2dfe3981f81ba351bdb16a93b2d66bcfef4f5277d3d8746261f0beb1f324ed9a7534 WHIRLPOOL d43526496775a409c75212ab53c30ebe3d55250583761c58ab5bf9cbe958c5ac4174ea7a3692a133d0be58265862b9e4a62515afa85b429d4d601b0b102a1ec6
-EBUILD obs-studio-18.0.2.ebuild 2744 SHA256 1e6470059421743702d1438d78b92b9a18b3ca9d9ea7690ba061d444d2cfbb09 SHA512 56157c010fd5e108cd6ce8a6689595fe19b3dfd3357c47323ce495bafcff0fbd39546ba166aa04c622031ff74f7f1dabc78211863dce7bc86abfa633870c5c94 WHIRLPOOL a6a11eb73b0f7284e03173021f5751626efc033aaa6645c6212e9a8c2c050cf50d9eea798b3ab0d5ebc6432eaacdee985d6e5ed283e83ed1a224c846be3cc016
+DIST obs-studio-20.1.0.tar.gz 5637636 SHA256 3354e21f1909633dc98e7faafc4c6c57fe0edd049d2675a85c0a1a0e007eee83 SHA512 fd0c4b910b9a07644a9ddb72c2622d1fac67878a8bf445d7ab33385aafa23a5207f89971c428a3be01fa851141d9cbb55e86ca81201928783227fc730d12b962 WHIRLPOOL e0ce146c09ba85904191d339b9a14ff3f9420a7fe8f6a5e079e3f78a019e553a17ba8cdd1b38b0a6c5f66d3b3e517bb567bee5e4d1e9ba31b820f765012f9744
 EBUILD obs-studio-19.0.2.ebuild 2744 SHA256 1e6470059421743702d1438d78b92b9a18b3ca9d9ea7690ba061d444d2cfbb09 SHA512 56157c010fd5e108cd6ce8a6689595fe19b3dfd3357c47323ce495bafcff0fbd39546ba166aa04c622031ff74f7f1dabc78211863dce7bc86abfa633870c5c94 WHIRLPOOL a6a11eb73b0f7284e03173021f5751626efc033aaa6645c6212e9a8c2c050cf50d9eea798b3ab0d5ebc6432eaacdee985d6e5ed283e83ed1a224c846be3cc016
 EBUILD obs-studio-20.0.1-r1.ebuild 2798 SHA256 7c12481e3b3bd77473f4b1596d1aa5480f1f642e381494828673b938bf9830f3 SHA512 252a30b740c525bb975a20cd70a6a5987a3c13bf7b7235fb58a74b0f233b21fe5bdc9a4a32612d3de1184a3d31dfb0e8e32afb9e16dbccdf224f190d19dd22df WHIRLPOOL 4b14b33a6e182fd60b8ea28062040d68aff3b54c088199869a3ca2d366e93865628040b4187b97a1e2ffd383ea9e10a60e129ab12a66f195d325be6ec66503b1
 EBUILD obs-studio-20.0.1.ebuild 2744 SHA256 1e6470059421743702d1438d78b92b9a18b3ca9d9ea7690ba061d444d2cfbb09 SHA512 56157c010fd5e108cd6ce8a6689595fe19b3dfd3357c47323ce495bafcff0fbd39546ba166aa04c622031ff74f7f1dabc78211863dce7bc86abfa633870c5c94 WHIRLPOOL a6a11eb73b0f7284e03173021f5751626efc033aaa6645c6212e9a8c2c050cf50d9eea798b3ab0d5ebc6432eaacdee985d6e5ed283e83ed1a224c846be3cc016
+EBUILD obs-studio-20.1.0.ebuild 2686 SHA256 a93b1aaf0d2943279ca3a15de8bc7de518bda7d15c55179612bc39bbbfdd07bb SHA512 30a3d1bc2f224528d217ab1e855892a373fa434bdd62a13c0935da9cc49f04ffae9e1739a0b7bde6b0cdf77f0ff92ad53d669ca1777411a4b551610d0ed9690c WHIRLPOOL 21d210db03e4d9b5187f17449bc22b6cf1d7e391b596461cdcdf842530b117a7b46fee57581caec4af73c5cb0adf3ecce7e0118ecc4da55061ab71557592f340
 EBUILD obs-studio-9999.ebuild 2654 SHA256 e745f5db8303efb1794b971d6fa17056ed96a00760177a1814d55362b01d881c SHA512 e5a0695d6f87e4335fbf3a51898f05e7ec00c7c9fca12c6a8d71374e54e4fb3389cb711fdc4be4908cc8063297b04528ca9b302e54898871c537d0cd671b2cf8 WHIRLPOOL 86687b0e844c84d89bd64654e5bad06aedcd1168d35041361748c3aba739292d9d8e981eb945f4dbebacf6a83921581efe7669f60624ec0bd02c5a421da83794
 MISC ChangeLog 2578 SHA256 0b32345d309d129d538db25a3de7c29a842fa90e96dd7512d29ccfe72cea3dbd SHA512 e1beab278a575b4059dad958ca01c03bb09cd839cc53b6345ed048bed591ba4222612828f676528877cbf42a2bd7e0eb564891ed7ecd50508f6d367307239cee WHIRLPOOL 93cb13b159a9282db547bc7bbedf159e1e585bbdc4e6a50ef96e8d3d6120b40d2131788373bef15b1521f005c6826b7eda66ce5c79151a3bc59535e101aba74e
 MISC metadata.xml 786 SHA256 ad1780d1edc37a4e0947ed48aac398fbeb887e68bd1fe709aa278b8932251703 SHA512 94ee6c6239b9befb24c87cb647aaed5b87c374deab3791df5742714e7cfabd28cb07822d2cb9a17b310b82f11e2daa6216bb14b327752a7b2a8ddfc9e7062492 WHIRLPOOL 0890c883c7ef15588b132c2c5519096a58d4ee18675ad385b5fc357b761083ad659e797cd9acecfdb178f9fe57469b00c19c39cc4fbfc131654f5cf4bbdd1900
diff --git a/media-video/obs-studio/obs-studio-18.0.2.ebuild b/media-video/obs-studio/obs-studio-18.0.2.ebuild
deleted file mode 100644
index d742e19dd528..000000000000
--- a/media-video/obs-studio/obs-studio-18.0.2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jp9000/obs-studio.git"
-	EGIT_SUBMODULES=()
-else
-	SRC_URI="https://github.com/jp9000/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Software for Recording and Streaming Live Video Content"
-HOMEPAGE="https://obsproject.com"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+alsa fdk imagemagick jack pulseaudio truetype v4l"
-
-COMMON_DEPEND="
-	>=dev-libs/jansson-2.5
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtsql:5
-	dev-qt/qttest:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-video/ffmpeg:=[x264]
-	net-misc/curl
-	x11-libs/libXcomposite
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	alsa? ( media-libs/alsa-lib )
-	fdk? ( media-libs/fdk-aac:= )
-	imagemagick? ( media-gfx/imagemagick:= )
-	jack? ( virtual/jack )
-	pulseaudio? ( media-sound/pulseaudio )
-	truetype? (
-		media-libs/fontconfig
-		media-libs/freetype
-	)
-	v4l? ( media-libs/libv4l )
-"
-DEPEND="${COMMON_DEPEND}
-	imagemagick? (
-		|| (
-			<media-gfx/imagemagick-7
-			(
-				>=media-gfx/imagemagick-7
-				>=dev-util/cmake-3.9
-			)
-		)
-	)
-"
-RDEPEND="${COMMON_DEPEND}"
-
-PATCHES="${FILESDIR}/${PN}-ImageMagick-header-path.patch"
-
-CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DDISABLE_ALSA=$(usex !alsa)
-		-DDISABLE_FREETYPE=$(usex !truetype)
-		-DDISABLE_JACK=$(usex !jack)
-		-DDISABLE_LIBFDK=$(usex !fdk)
-		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
-		-DDISABLE_V4L2=$(usex !v4l)
-		-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
-		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
-		-DOBS_VERSION_OVERRIDE=${PV}
-		-DUNIX_STRUCTURE=1
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	if ! use alsa && ! use pulseaudio; then
-		elog
-		elog "For the audio capture features to be available,"
-		elog "either the 'alsa' or the 'pulseaudio' USE-flag needs to"
-		elog "be enabled."
-		elog
-	fi
-
-	if ! has_version "sys-apps/dbus"; then
-		elog
-		elog "The 'sys-apps/dbus' package is not installed, but"
-		elog "could be used for disabling hibernating, screensaving,"
-		elog "and sleeping.  Where it is not installed,"
-		elog "'xdg-screensaver reset' is used instead"
-		elog "(if 'x11-misc/xdg-utils' is installed)."
-		elog
-	fi
-
-	if ! has_version "media-libs/speex"; then
-		elog
-		elog "For the speexdsp-based noise suppression filter"
-		elog "to be available, the 'media-libs/speex' package needs"
-		elog "to be installed."
-		elog
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-video/obs-studio/obs-studio-20.1.0.ebuild b/media-video/obs-studio/obs-studio-20.1.0.ebuild
new file mode 100644
index 000000000000..55ccd0be37f4
--- /dev/null
+++ b/media-video/obs-studio/obs-studio-20.1.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jp9000/obs-studio.git"
+	EGIT_SUBMODULES=()
+else
+	SRC_URI="https://github.com/jp9000/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Software for Recording and Streaming Live Video Content"
+HOMEPAGE="https://obsproject.com"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+alsa fdk imagemagick jack pulseaudio truetype v4l"
+
+COMMON_DEPEND="
+	>=dev-libs/jansson-2.5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtsql:5
+	dev-qt/qttest:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-video/ffmpeg:=[x264]
+	net-misc/curl
+	x11-libs/libXcomposite
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	alsa? ( media-libs/alsa-lib )
+	fdk? ( media-libs/fdk-aac:= )
+	imagemagick? ( media-gfx/imagemagick:= )
+	jack? ( virtual/jack )
+	pulseaudio? ( media-sound/pulseaudio )
+	truetype? (
+		media-libs/fontconfig
+		media-libs/freetype
+	)
+	v4l? ( media-libs/libv4l )
+"
+DEPEND="${COMMON_DEPEND}
+	imagemagick? (
+		|| (
+			<media-gfx/imagemagick-7
+			(
+				>=media-gfx/imagemagick-7
+				>=dev-util/cmake-3.9
+			)
+		)
+	)
+"
+RDEPEND="${COMMON_DEPEND}"
+
+CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DDISABLE_ALSA=$(usex !alsa)
+		-DDISABLE_FREETYPE=$(usex !truetype)
+		-DDISABLE_JACK=$(usex !jack)
+		-DDISABLE_LIBFDK=$(usex !fdk)
+		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
+		-DDISABLE_V4L2=$(usex !v4l)
+		-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
+		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
+		-DOBS_VERSION_OVERRIDE=${PV}
+		-DUNIX_STRUCTURE=1
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	if ! use alsa && ! use pulseaudio; then
+		elog
+		elog "For the audio capture features to be available,"
+		elog "either the 'alsa' or the 'pulseaudio' USE-flag needs to"
+		elog "be enabled."
+		elog
+	fi
+
+	if ! has_version "sys-apps/dbus"; then
+		elog
+		elog "The 'sys-apps/dbus' package is not installed, but"
+		elog "could be used for disabling hibernating, screensaving,"
+		elog "and sleeping.  Where it is not installed,"
+		elog "'xdg-screensaver reset' is used instead"
+		elog "(if 'x11-misc/xdg-utils' is installed)."
+		elog
+	fi
+
+	if ! has_version "media-libs/speex"; then
+		elog
+		elog "For the speexdsp-based noise suppression filter"
+		elog "to be available, the 'media-libs/speex' package needs"
+		elog "to be installed."
+		elog
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-video/syncplay/Manifest b/media-video/syncplay/Manifest
index 812724a98062..948c62e9138f 100644
--- a/media-video/syncplay/Manifest
+++ b/media-video/syncplay/Manifest
@@ -1,5 +1,5 @@
 DIST syncplay-1.4.0.tar.gz 539743 SHA256 37fc2b3d1d6d49e2289dcdeffcf24ebdafbc24398411cff4666e09d49405759d SHA512 2266ffafe3b15730a43e3ddd8aa24e99c65ce5a4e95d05bcac745262d310cb846c84c6e5bb061ebb96e89faa0f10e22aacee286db6cbe53cd5f521cb2e5eee1a WHIRLPOOL 68ea8b437c379e2a049efbb9a4258c9d85bdb2d26841ed1100ee7a0083b4e66687bf21826daffd12102acb236b9bede9037f63ead0eba67dbbc5142db309d183
-EBUILD syncplay-1.4.0.ebuild 1358 SHA256 0e6a4996b29b4ab0136cfc169768d713cb2e0d236d46c2b0a6375228ae5d0c09 SHA512 143e8591a326e05a3f07fe70f1df67e54bebaa180e703d8102d5556299fe3e637f5b0ce086c0f16a4757cbbaa87a42502364b2187d923502c7fa0841b3c2fb1b WHIRLPOOL b542e1032d52bee34ab63634442a02bb4d02b94275f847944ea67b71e668e869e2f6d3b589124f2a60ab5274853cb3d72d1799dc612b5924cd744a436a6ecb4e
+EBUILD syncplay-1.4.0.ebuild 1357 SHA256 4a6e8fd0ebdff5bb33518c98f22599f12f90a31b870db2cdac70a3e998c6a488 SHA512 decf80d28781f046bb5a12493d7dce2c9dbc2a8822446810302b38f3793aeaefc11a029e5cc70c0d17337b6598ba586eb4db97b28acb653c1c8a9349f0371c38 WHIRLPOOL 6e64f1e7a42f5cfdfcad95d93cca7dfd9fbd61f8b4b1b7af32d80d7b45d8319c45487522e645d842a2048accc42d070543d4d6344224598148c1aef83992f16a
 EBUILD syncplay-9999.ebuild 1309 SHA256 6aadf78c712c7b90fd2e2eea9afdc800dcf9362bce5def64ced8898d79c5632e SHA512 20927635cf3f40ff0be4c4150c894e2e7b5093b2b0504a3ff0fe0abc6dbe9809a52e445593f06c8a97c3249b7c6fc53a215b7afe9bb1cb2df75a4fe10cdc8ddb WHIRLPOOL dda95c65cad3579c6a41ef2f987a09028472550102217c617babd21bcb0f07b1a2d365da034e7e55977e372e93fd1356492703355f0bb7c6044e93e20132bb1f
 MISC ChangeLog 660 SHA256 1ed9c00f7085a1c3258996731070237b931a0ea6a3657e6bfbd7a693bc9861f2 SHA512 b60cb14a3e25725d362f81bc1611fb03bc002059fb162d3982b268d531bfeea4013b0aa8d80ff0f7dede180690472f1f4da989bdea76951966e1e07f0b79d4fd WHIRLPOOL 49253f8235fe1fb98a0ea5a8981ed7bf16836c1fcf18a5391f4cea752a627a865f5d4feffef75d424db039765792bfe2b3ebe9cbf748498cec82d27396747823
 MISC metadata.xml 679 SHA256 dd3a1a62c1874d252c4260b55f30d85f3cc309d0de861995b99ace5eeef0ed16 SHA512 e997de8e604c16977c8a3dec989c50e9cbfba327e8447277bdaee835e442d77565c2b2092bede04e64babe34f62e1fcd640cc01d6ef56d4c7572bacb1718b714 WHIRLPOOL b7f02f423835c640c974c7554ad5df19a9d1428ac58284993c07a12c4f8767bbe35ce896674af3a1898a6fd48da32a17825f8dbfb0850ee2354137f133e659b7
diff --git a/media-video/syncplay/syncplay-1.4.0.ebuild b/media-video/syncplay/syncplay-1.4.0.ebuild
index a2c620036d4d..ae5ec4785364 100644
--- a/media-video/syncplay/syncplay-1.4.0.ebuild
+++ b/media-video/syncplay/syncplay-1.4.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Syncplay/syncplay/archive/v${MY_PV}.tar.gz -> ${P}.t
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="+client +server gui vlc"
 REQUIRED_USE="vlc? ( client )
 	gui? ( client )
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 4751ffbdb218..efc7a33c3304 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 21 Oct 2017 19:09:17 +0000
+Sun, 29 Oct 2017 10:39:29 +0000
diff --git a/metadata/glsa/glsa-201710-21.xml b/metadata/glsa/glsa-201710-21.xml
new file mode 100644
index 000000000000..adb110274d67
--- /dev/null
+++ b/metadata/glsa/glsa-201710-21.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201710-21">
+  <title>Kodi: Arbitrary code execution </title>
+  <synopsis>An integer overflow vulnerability in Kodi could result in remote
+    execution of arbitrary code.
+  </synopsis>
+  <product type="ebuild">kodi</product>
+  <announced>2017-10-22</announced>
+  <revised>2017-10-22: 1</revised>
+  <bug>622384</bug>
+  <access>remote</access>
+  <affected>
+    <package name="media-tv/kodi" auto="yes" arch="*">
+      <unaffected range="ge">17.3-r1</unaffected>
+      <vulnerable range="lt">17.3-r1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Kodi is a free and open source media-center and entertainment hub
+      previously known as XBMC.
+    </p>
+  </background>
+  <description>
+    <p>Kodi is vulnerable due to shipping with an embedded version of UnRAR.
+      Please review the referenced CVE identifier for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker, by enticing a user to process a specifically crafted
+      RAR file, could execute arbitrary code.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Kodi users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=media-tv/kodi-17.3-r1"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2012-6706">CVE-2012-6706</uri>
+  </references>
+  <metadata tag="requester" timestamp="2017-10-18T03:54:48Z">jmbailey</metadata>
+  <metadata tag="submitter" timestamp="2017-10-22T00:24:12Z">jmbailey</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201710-22.xml b/metadata/glsa/glsa-201710-22.xml
new file mode 100644
index 000000000000..c676b3f4addb
--- /dev/null
+++ b/metadata/glsa/glsa-201710-22.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201710-22">
+  <title>Adobe Flash Player: Remote execution of arbitrary code</title>
+  <synopsis>A vulnerability in Adobe Flash Player might allow remote attackers
+    to execute arbitrary code.
+  </synopsis>
+  <product type="ebuild">adobeflash</product>
+  <announced>2017-10-22</announced>
+  <revised>2017-10-22: 1</revised>
+  <bug>634456</bug>
+  <access>remote</access>
+  <affected>
+    <package name="www-plugins/adobe-flash" auto="yes" arch="*">
+      <unaffected range="ge">27.0.0.170</unaffected>
+      <vulnerable range="lt">27.0.0.170</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>The Adobe Flash Player is a renderer for the SWF file format, which is
+      commonly used to provide interactive websites.
+    </p>
+  </background>
+  <description>
+    <p>A  critical type confusion vulnerability was discovered in Adobe Flash
+      Player.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could execute arbitrary code.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Adobe Flash Player users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=www-plugins/adobe-flash-27.0.0.170"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-11292">
+      CVE-2017-11292
+    </uri>
+  </references>
+  <metadata tag="requester" timestamp="2017-10-16T21:42:03Z">whissi</metadata>
+  <metadata tag="submitter" timestamp="2017-10-22T00:27:40Z">b-man</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201710-23.xml b/metadata/glsa/glsa-201710-23.xml
new file mode 100644
index 000000000000..cc6aa8ba3a3b
--- /dev/null
+++ b/metadata/glsa/glsa-201710-23.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201710-23">
+  <title>Go: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Go, the worst of which
+    may result in the execution of arbitrary commands.
+  </synopsis>
+  <product type="ebuild">go</product>
+  <announced>2017-10-23</announced>
+  <revised>2017-10-23: 1</revised>
+  <bug>632408</bug>
+  <access>remote</access>
+  <affected>
+    <package name="dev-lang/go" auto="yes" arch="*">
+      <unaffected range="ge">1.9.1</unaffected>
+      <vulnerable range="lt">1.9.1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Go is an open source programming language that makes it easy to build
+      simple, reliable, and efficient software.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Go. Please review the
+      references below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>Remote attackers could execute arbitrary Go commands or conduct a man in
+      the middle attack.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Go users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-lang/go-1.9.1"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-15041">
+      CVE-2017-15041
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-15042">
+      CVE-2017-15042
+    </uri>
+  </references>
+  <metadata tag="requester" timestamp="2017-10-16T22:06:50Z">chrisadr</metadata>
+  <metadata tag="submitter" timestamp="2017-10-23T01:03:41Z">b-man</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201710-24.xml b/metadata/glsa/glsa-201710-24.xml
new file mode 100644
index 000000000000..4be2b2d87b5b
--- /dev/null
+++ b/metadata/glsa/glsa-201710-24.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201710-24">
+  <title>Chromium, Google Chrome: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Chromium and Google
+    Chrome, the worst of which could result in the execution of arbitrary code.
+  </synopsis>
+  <product type="ebuild">chromium,chrome</product>
+  <announced>2017-10-23</announced>
+  <revised>2017-10-23: 1</revised>
+  <bug>634664</bug>
+  <access>remote</access>
+  <affected>
+    <package name="www-client/chromium" auto="yes" arch="*">
+      <unaffected range="ge">62.0.3202.62</unaffected>
+      <vulnerable range="lt">62.0.3202.62</vulnerable>
+    </package>
+    <package name="www-client/google-chrome" auto="yes" arch="*">
+      <unaffected range="ge">62.0.3202.62</unaffected>
+      <vulnerable range="lt">62.0.3202.62</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Chromium is an open-source browser project that aims to build a safer,
+      faster, and more stable way for all users to experience the web.
+    </p>
+    
+    <p>Google Chrome is one fast, simple, and secure browser for all your
+      devices
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Chromium and Google
+      Chrome. Please review the referenced CVE identifiers and Google Chrome
+      Releases for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could possibly execute arbitrary code with the
+      privileges of the process, cause a Denial of Service condition, bypass
+      content security controls, or conduct URL spoofing.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Chromium users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=www-client/chromium-62.0.3202.62"
+    </code>
+    
+    <p>All Google Chrome users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=www-client/google-chrome-62.0.3202.62"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-15386">
+      CVE-2017-15386
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-15387">
+      CVE-2017-15387
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-15388">
+      CVE-2017-15388
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-15389">
+      CVE-2017-15389
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-15390">
+      CVE-2017-15390
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-15391">
+      CVE-2017-15391
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-15392">
+      CVE-2017-15392
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-15393">
+      CVE-2017-15393
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-15394">
+      CVE-2017-15394
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-15395">
+      CVE-2017-15395
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-5124">
+      CVE-2017-5124
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-5125">
+      CVE-2017-5125
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-5126">
+      CVE-2017-5126
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-5127">
+      CVE-2017-5127
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-5128">
+      CVE-2017-5128
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-5129">
+      CVE-2017-5129
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-5130">
+      CVE-2017-5130
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-5131">
+      CVE-2017-5131
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-5132">
+      CVE-2017-5132
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-5133">
+      CVE-2017-5133
+    </uri>
+    <uri link="https://chromereleases.googleblog.com/2017/10/stable-channel-update-for-desktop.html">
+      Google Chrome Releases
+    </uri>
+  </references>
+  <metadata tag="requester" timestamp="2017-10-20T19:48:32Z">b-man</metadata>
+  <metadata tag="submitter" timestamp="2017-10-23T01:10:56Z">chrisadr</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201710-25.xml b/metadata/glsa/glsa-201710-25.xml
new file mode 100644
index 000000000000..b21d81a00256
--- /dev/null
+++ b/metadata/glsa/glsa-201710-25.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201710-25">
+  <title>PCRE: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in the PCRE Library, the
+    worst of which may allow remote attackers to cause a Denial of Service
+    condition.
+  </synopsis>
+  <product type="ebuild">libpcre</product>
+  <announced>2017-10-23</announced>
+  <revised>2017-10-23: 1</revised>
+  <bug>614048</bug>
+  <bug>614052</bug>
+  <bug>614054</bug>
+  <access>remote</access>
+  <affected>
+    <package name="dev-libs/libpcre" auto="yes" arch="*">
+      <unaffected range="ge">8.41</unaffected>
+      <vulnerable range="lt">8.41</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>The PCRE Library provides functions for Perl-compatible regular
+      expressions.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in The PCRE Library.
+      Please review the references below for details.
+    </p>
+    
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could possibly cause a Denial of Service condition or
+      other unspecified impacts via a specially crafted file.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All PCRE users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-libs/libpcre-8.41"
+    </code>
+    
+    <p>Packages which depend on this library may need to be recompiled. Tools
+      such as revdep-rebuild may assist in identifying some of these packages.
+    </p>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7186">
+      CVE-2017-7186
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7244">
+      CVE-2017-7244
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7245">
+      CVE-2017-7245
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7246">
+      CVE-2017-7246
+    </uri>
+  </references>
+  <metadata tag="requester" timestamp="2017-10-18T23:44:30Z">b-man</metadata>
+  <metadata tag="submitter" timestamp="2017-10-23T01:19:24Z">chrisadr</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201710-26.xml b/metadata/glsa/glsa-201710-26.xml
new file mode 100644
index 000000000000..ecbdd99167f3
--- /dev/null
+++ b/metadata/glsa/glsa-201710-26.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201710-26">
+  <title>OpenJPEG: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in OpenJPEG, the worst of
+    which may allow remote attackers to execute arbitrary code.
+  </synopsis>
+  <product type="ebuild">openjpeg</product>
+  <announced>2017-10-23</announced>
+  <revised>2017-10-23: 1</revised>
+  <bug>602180</bug>
+  <bug>606618</bug>
+  <bug>628504</bug>
+  <bug>629372</bug>
+  <bug>629668</bug>
+  <bug>630120</bug>
+  <access>remote</access>
+  <affected>
+    <package name="media-libs/openjpeg" auto="yes" arch="*">
+      <unaffected range="ge" slot="2">2.3.0</unaffected>
+      <vulnerable range="lt" slot="2">2.3.0</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>OpenJPEG is an open-source JPEG 2000 library.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in OpenJPEG. Please review
+      the references below for details.
+    </p>
+    
+  </description>
+  <impact type="normal">
+    <p>A remote attacker, via a crafted BMP, PDF, or j2k document, could
+      execute arbitrary code, cause a Denial of Service condition, or have
+      other unspecified impacts.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All OpenJPEG users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=media-libs/openjpeg-2.3.0:2"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-10504">
+      CVE-2016-10504
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-10505">
+      CVE-2016-10505
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-10506">
+      CVE-2016-10506
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-10507">
+      CVE-2016-10507
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-1626">
+      CVE-2016-1626
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-1628">
+      CVE-2016-1628
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-9112">
+      CVE-2016-9112
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-9113">
+      CVE-2016-9113
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-9114">
+      CVE-2016-9114
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-9115">
+      CVE-2016-9115
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-9116">
+      CVE-2016-9116
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-9117">
+      CVE-2016-9117
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-9118">
+      CVE-2016-9118
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-9572">
+      CVE-2016-9572
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-9573">
+      CVE-2016-9573
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-9580">
+      CVE-2016-9580
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-9581">
+      CVE-2016-9581
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-12982">
+      CVE-2017-12982
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-14039">
+      CVE-2017-14039
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-14164">
+      CVE-2017-14164
+    </uri>
+  </references>
+  <metadata tag="requester" timestamp="2017-10-22T00:00:11Z">b-man</metadata>
+  <metadata tag="submitter" timestamp="2017-10-23T01:39:09Z">chrisadr</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201710-27.xml b/metadata/glsa/glsa-201710-27.xml
new file mode 100644
index 000000000000..489a0d9e00e0
--- /dev/null
+++ b/metadata/glsa/glsa-201710-27.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201710-27">
+  <title>Dnsmasq: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Dnsmasq, the worst of
+    which may allow remote attackers to execute arbitrary code.
+    
+  </synopsis>
+  <product type="ebuild">dnsmasq</product>
+  <announced>2017-10-23</announced>
+  <revised>2017-10-23: 1</revised>
+  <bug>632692</bug>
+  <access>remote</access>
+  <affected>
+    <package name="net-dns/dnsmasq" auto="yes" arch="*">
+      <unaffected range="ge">2.78</unaffected>
+      <vulnerable range="lt">2.78</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Dnsmasq is a lightweight and easily-configurable DNS forwarder and DHCP
+      server.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Dnsmasq. Please review
+      the references below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could execute arbitrary code or cause a Denial of
+      Service condition via crafted DNS, IPv6, or DHCPv6 packets.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Dnsmasq users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=net-dns/dnsmasq-2.78"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-14491">
+      CVE-2017-14491
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-14492">
+      CVE-2017-14492
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-14493">
+      CVE-2017-14493
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-14494">
+      CVE-2017-14494
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-14495">
+      CVE-2017-14495
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-14496">
+      CVE-2017-14496
+    </uri>
+  </references>
+  <metadata tag="requester" timestamp="2017-10-22T23:49:34Z">b-man</metadata>
+  <metadata tag="submitter" timestamp="2017-10-23T01:46:04Z">chrisadr</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 4751ffbdb218..efc7a33c3304 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 21 Oct 2017 19:09:17 +0000
+Sun, 29 Oct 2017 10:39:29 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index 5e2249358c83..350c70c794f0 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-8c9b32528b910251b1fe3992838c97ba223db5d7 1508289507 2017-10-18T01:18:27+00:00
+3c64211d24fa5a633310d841c0bd5cddc991cc02 1508723227 2017-10-23T01:47:07+00:00
diff --git a/metadata/md5-cache/app-accessibility/espeak-1.48.04-r1 b/metadata/md5-cache/app-accessibility/espeak-1.48.04-r1
index 747f2ad555b4..e2ed56d78e6a 100644
--- a/metadata/md5-cache/app-accessibility/espeak-1.48.04-r1
+++ b/metadata/md5-cache/app-accessibility/espeak-1.48.04-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Speech synthesizer for English and other languages
 EAPI=6
 HOMEPAGE=http://espeak.sourceforge.net/
 IUSE=portaudio pulseaudio
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio ) media-sound/sox
 SLOT=0
 SRC_URI=mirror://sourceforge/espeak/espeak-1.48.04-source.zip
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=85bc7cad723a8131ecdf17bbf2ee63c0
+_md5_=0fcfe65df578595a8d708fbf1c0f29ec
diff --git a/metadata/md5-cache/app-accessibility/simon-0.4.90 b/metadata/md5-cache/app-accessibility/simon-0.4.90
index a75cd7b2f602..233699070e99 100644
--- a/metadata/md5-cache/app-accessibility/simon-0.4.90
+++ b/metadata/md5-cache/app-accessibility/simon-0.4.90
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib x11-libs/libX11 x11-libs/libXtst x11-libs/qwt:6[qt4(+)] libsamplerate? ( media-libs/libsamplerate ) opencv? ( media-libs/opencv ) sphinx? ( >=app-accessibility/pocketsphinx-0.8 >=app-accessibility/sphinxbase-0.8 >=app-accessibility/SphinxTrain-1 ) !sphinx? ( app-accessibility/julius ) kde-frameworks/oxygen-icons l10n_ast? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ast(+)] ) l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[l10n_bs(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[l10n_en-GB(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[l10n_et(+)] ) l10n_fa? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fa(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_gl(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hu(+)] ) l10n_ia? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ia(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ja(+)] ) l10n_kk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_kk(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[l10n_lt(+)] ) l10n_mr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_mr(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt-BR(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sl(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_tr(+)] ) l10n_ug? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ug(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-TW(+)] ) >=dev-qt/qtsql-4.8.5:4 dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=0
 SRC_URI=mirror://kde/unstable/simon/0.4.90/simon-0.4.90.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fe17448253eff6af197e14e00e40e602
diff --git a/metadata/md5-cache/app-admin/ansible-2.4.1.0 b/metadata/md5-cache/app-admin/ansible-2.4.1.0
new file mode 100644
index 000000000000..9d622934ac8e
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-2.4.1.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] test? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] <dev-python/mock-1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/passlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-vcs/git ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=6
+HOMEPAGE=http://ansible.com/
+IUSE=test python_targets_python2_7 python_targets_python3_5
+KEYWORDS=~amd64 ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://releases.ansible.com/ansible/ansible-2.4.1.0.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3423580063aa17b9e6596344f911c31b
diff --git a/metadata/md5-cache/app-admin/apache-tools-2.2.31 b/metadata/md5-cache/app-admin/apache-tools-2.2.31
deleted file mode 100644
index d11833133863..000000000000
--- a/metadata/md5-cache/app-admin/apache-tools-2.2.31
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND==dev-libs/apr-1* =dev-libs/apr-util-1* dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl ) !<www-servers/apache-2.2.4 sys-devel/libtool
-DESCRIPTION=Useful Apache tools - htdigest, htpasswd, ab, htdbm
-EAPI=4
-HOMEPAGE=https://httpd.apache.org/
-IUSE=ssl
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=Apache-2.0
-RDEPEND==dev-libs/apr-1* =dev-libs/apr-util-1* dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl ) !<www-servers/apache-2.2.4
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://apache/httpd/httpd-2.2.31.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=801b01d6b76c897f8419106f96ec027b
diff --git a/metadata/md5-cache/app-admin/apache-tools-2.2.34 b/metadata/md5-cache/app-admin/apache-tools-2.2.34
index 3ecdf1568ed5..16f33e5daa01 100644
--- a/metadata/md5-cache/app-admin/apache-tools-2.2.34
+++ b/metadata/md5-cache/app-admin/apache-tools-2.2.34
@@ -4,11 +4,11 @@ DESCRIPTION=Useful Apache tools - htdigest, htpasswd, ab, htdbm
 EAPI=6
 HOMEPAGE=https://httpd.apache.org/
 IUSE=ssl
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=Apache-2.0
 RDEPEND==dev-libs/apr-1* =dev-libs/apr-util-1* dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl:0= ) !<www-servers/apache-2.2.4
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/httpd/httpd-2.2.34.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=2f44a495372d80f054cc131abba34686
+_md5_=7c08ca67f757c2f0a6e4f52d8bd36a03
diff --git a/metadata/md5-cache/app-admin/apache-tools-2.4.29 b/metadata/md5-cache/app-admin/apache-tools-2.4.29
new file mode 100644
index 000000000000..fdaf3368eec1
--- /dev/null
+++ b/metadata/md5-cache/app-admin/apache-tools-2.4.29
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=dev-libs/apr-1.5.0:1 dev-libs/apr-util:1 dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-devel/libtool
+DESCRIPTION=Useful Apache tools - htdigest, htpasswd, ab, htdbm
+EAPI=6
+HOMEPAGE=https://httpd.apache.org/
+IUSE=libressl ssl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=dev-libs/apr-1.5.0:1 dev-libs/apr-util:1 dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://apache/httpd/httpd-2.4.29.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=341e536b65221a9fba8860058cec5407
diff --git a/metadata/md5-cache/app-admin/calamares-3.1.5 b/metadata/md5-cache/app-admin/calamares-3.1.5
deleted file mode 100644
index 06d2bae7c566..000000000000
--- a/metadata/md5-cache/app-admin/calamares-3.1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 >=dev-cpp/yaml-cpp-0.5.1 >=dev-libs/boost-1.55:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-3.0.3:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.37.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Distribution-independent installer framework
-EAPI=6
-HOMEPAGE=https://calamares.io
-IUSE=+networkmanager pythonqt +upower debug python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 >=dev-cpp/yaml-cpp-0.5.1 >=dev-libs/boost-1.55:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-3.0.3:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) app-admin/sudo dev-libs/libatasmart net-misc/rsync >=sys-block/parted-3.0 || ( sys-boot/grub:2 sys-boot/systemd-boot ) sys-boot/os-prober sys-fs/squashfs-tools virtual/udev networkmanager? ( net-misc/networkmanager ) upower? ( sys-power/upower ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
-SLOT=5
-SRC_URI=https://github.com/calamares/calamares/releases/download/v3.1.5/calamares-3.1.5.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=09755be37c7d731dc077c18ea8c72928
diff --git a/metadata/md5-cache/app-admin/calamares-3.1.6 b/metadata/md5-cache/app-admin/calamares-3.1.6
index 3a551f81c539..7ad8e58c5659 100644
--- a/metadata/md5-cache/app-admin/calamares-3.1.6
+++ b/metadata/md5-cache/app-admin/calamares-3.1.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=5
 SRC_URI=https://github.com/calamares/calamares/releases/download/v3.1.6/calamares-3.1.6.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=09755be37c7d731dc077c18ea8c72928
diff --git a/metadata/md5-cache/app-admin/calamares-3.1.7 b/metadata/md5-cache/app-admin/calamares-3.1.7
new file mode 100644
index 000000000000..b99837662c13
--- /dev/null
+++ b/metadata/md5-cache/app-admin/calamares-3.1.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 >=dev-cpp/yaml-cpp-0.5.1 >=dev-libs/boost-1.55:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-3.0.3:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.37.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Distribution-independent installer framework
+EAPI=6
+HOMEPAGE=https://calamares.io
+IUSE=+networkmanager pythonqt +upower debug python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 >=dev-cpp/yaml-cpp-0.5.1 >=dev-libs/boost-1.55:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-3.0.3:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) app-admin/sudo dev-libs/libatasmart net-misc/rsync >=sys-block/parted-3.0 || ( sys-boot/grub:2 sys-boot/systemd-boot ) sys-boot/os-prober sys-fs/squashfs-tools virtual/udev networkmanager? ( net-misc/networkmanager ) upower? ( sys-power/upower ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
+SLOT=5
+SRC_URI=https://github.com/calamares/calamares/releases/download/v3.1.7/calamares-3.1.7.tar.gz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=09755be37c7d731dc077c18ea8c72928
diff --git a/metadata/md5-cache/app-admin/cgmanager-0.39 b/metadata/md5-cache/app-admin/cgmanager-0.39
deleted file mode 100644
index 66c4e4a4a5eb..000000000000
--- a/metadata/md5-cache/app-admin/cgmanager-0.39
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/libnih[dbus] sys-apps/dbus selinux? ( sec-policy/selinux-cgmanager ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Control Group manager daemon
-EAPI=5
-HOMEPAGE=https://linuxcontainers.org/cgmanager/introduction/
-IUSE=pam selinux
-KEYWORDS=alpha amd64 arm ~arm64 hppa ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=sys-libs/libnih[dbus] sys-apps/dbus selinux? ( sec-policy/selinux-cgmanager )
-SLOT=0
-SRC_URI=https://linuxcontainers.org/downloads/cgmanager/cgmanager-0.39.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=4019f4da5497d84497466fd98016cfd9
diff --git a/metadata/md5-cache/app-admin/cli53-0.8.12 b/metadata/md5-cache/app-admin/cli53-0.8.12
new file mode 100644
index 000000000000..7964f1170f68
--- /dev/null
+++ b/metadata/md5-cache/app-admin/cli53-0.8.12
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.8
+DESCRIPTION=Command line tool for Amazon Route 53
+EAPI=6
+HOMEPAGE=https://github.com/barnybug/cli53
+KEYWORDS=~amd64
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/barnybug/cli53/archive/0.8.12.tar.gz -> cli53-0.8.12.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=60df1e9a4fd49892b05c301aa5cb4f97
diff --git a/metadata/md5-cache/app-admin/consul-0.8.4-r1 b/metadata/md5-cache/app-admin/consul-0.8.4-r1
deleted file mode 100644
index 67058635dee2..000000000000
--- a/metadata/md5-cache/app-admin/consul-0.8.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup unpack
-DEPEND=dev-go/gox >=dev-lang/go-1.7.5:= >=dev-go/go-tools-0_pre20160121 >=dev-lang/go-1.8 virtual/pkgconfig
-DESCRIPTION=A tool for service discovery, monitoring and configuration
-EAPI=6
-HOMEPAGE=http://www.consul.io
-KEYWORDS=~amd64
-LICENSE=MPL-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/hashicorp/consul/archive/v0.8.4.tar.gz -> consul-0.8.4.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=b7e44b6f5910a119e6604b3afed9450f
diff --git a/metadata/md5-cache/app-admin/consul-0.9.3 b/metadata/md5-cache/app-admin/consul-0.9.3
index 7d5ac4fdb7e6..2ab73edd186d 100644
--- a/metadata/md5-cache/app-admin/consul-0.9.3
+++ b/metadata/md5-cache/app-admin/consul-0.9.3
@@ -9,4 +9,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/consul/archive/v0.9.3.tar.gz -> consul-0.9.3.tar.gz
 _eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=bfe24b128254319d370c2202757b849d
+_md5_=6a1fd004bc7e3c581811ebbbe380e471
diff --git a/metadata/md5-cache/app-admin/consul-1.0.0 b/metadata/md5-cache/app-admin/consul-1.0.0
index c3fcc3ee12cb..69426433ed4c 100644
--- a/metadata/md5-cache/app-admin/consul-1.0.0
+++ b/metadata/md5-cache/app-admin/consul-1.0.0
@@ -9,4 +9,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/consul/archive/v1.0.0.tar.gz -> consul-1.0.0.tar.gz
 _eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=bfe24b128254319d370c2202757b849d
+_md5_=6a1fd004bc7e3c581811ebbbe380e471
diff --git a/metadata/md5-cache/app-admin/dxf-6.2.0 b/metadata/md5-cache/app-admin/dxf-6.2.0
new file mode 100644
index 000000000000..f37b164a24c1
--- /dev/null
+++ b/metadata/md5-cache/app-admin/dxf-6.2.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Docker registry v2 client in Python
+EAPI=6
+HOMEPAGE=https://github.com/davedoesdev/dxf
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/jwcrypto-0.4.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tqdm-4.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/www-authenticate-0.9.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/davedoesdev/dxf/archive/v6.2.0.tar.gz -> dxf-6.2.0.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4251ba489a3b2dc17002705967e3e0ed
diff --git a/metadata/md5-cache/app-admin/keepassxc-2.2.2 b/metadata/md5-cache/app-admin/keepassxc-2.2.2
new file mode 100644
index 000000000000..54f680584b59
--- /dev/null
+++ b/metadata/md5-cache/app-admin/keepassxc-2.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) yubikey? ( sys-auth/ykpers ) dev-qt/linguist-tools:5 dev-qt/qtconcurrent:5 test? ( dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DESCRIPTION=KeePassXC - KeePass Cross-platform Community Edition
+EAPI=6
+HOMEPAGE=https://keepassxc.org
+IUSE=autotype debug http test yubikey
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1 GPL-2 GPL-3
+RDEPEND=dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) yubikey? ( sys-auth/ykpers )
+SLOT=0
+SRC_URI=https://github.com/keepassxreboot/keepassxc/archive/2.2.2.tar.gz -> keepassxc-2.2.2.tar.gz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2e662ff04ef183e8337109160465c0e9
diff --git a/metadata/md5-cache/app-admin/lastpass-cli-1.2.2 b/metadata/md5-cache/app-admin/lastpass-cli-1.2.2
new file mode 100644
index 000000000000..565cdf727edf
--- /dev/null
+++ b/metadata/md5-cache/app-admin/lastpass-cli-1.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=X? ( || ( x11-misc/xclip x11-misc/xsel ) ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-misc/curl dev-libs/libxml2 pinentry? ( app-crypt/pinentry ) app-text/asciidoc virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Interfaces with LastPass.com from the command line.
+EAPI=6
+HOMEPAGE=https://github.com/lastpass/lastpass-cli
+IUSE=libressl X +pinentry test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=X? ( || ( x11-misc/xclip x11-misc/xsel ) ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-misc/curl dev-libs/libxml2 pinentry? ( app-crypt/pinentry )
+SLOT=0
+SRC_URI=https://github.com/lastpass/lastpass-cli/archive/v1.2.2.tar.gz -> lastpass-cli-1.2.2.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=2aab55d4cfd979751921ce0d84c358c6
diff --git a/metadata/md5-cache/app-admin/logrotate-3.11.0 b/metadata/md5-cache/app-admin/logrotate-3.11.0
deleted file mode 100644
index 891d86e4e8a5..000000000000
--- a/metadata/md5-cache/app-admin/logrotate-3.11.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) >=sys-apps/sed-4 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Rotates, compresses, and mails system logs
-EAPI=6
-HOMEPAGE=https://github.com/logrotate/logrotate
-IUSE=acl +cron selinux
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) selinux? ( sec-policy/selinux-logrotate ) cron? ( virtual/cron )
-SLOT=0
-SRC_URI=https://github.com/logrotate/logrotate/releases/download/3.11.0/logrotate-3.11.0.tar.gz -> logrotate-3.11.0.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=4668b2e5f1570193788cc4b646eed5a1
diff --git a/metadata/md5-cache/app-admin/logrotate-3.12.2 b/metadata/md5-cache/app-admin/logrotate-3.12.2
deleted file mode 100644
index ecfbaf028d52..000000000000
--- a/metadata/md5-cache/app-admin/logrotate-3.12.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) >=sys-apps/sed-4 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Rotates, compresses, and mails system logs
-EAPI=6
-HOMEPAGE=https://github.com/logrotate/logrotate
-IUSE=acl +cron selinux
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) selinux? ( sec-policy/selinux-logrotate ) cron? ( virtual/cron )
-SLOT=0
-SRC_URI=https://github.com/logrotate/logrotate/releases/download/3.12.2/logrotate-3.12.2.tar.gz -> logrotate-3.12.2.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=050c754f62a12e36f9caeadf1ed78c11
diff --git a/metadata/md5-cache/app-admin/logrotate-3.12.3 b/metadata/md5-cache/app-admin/logrotate-3.12.3
deleted file mode 100644
index 568256ea0d3f..000000000000
--- a/metadata/md5-cache/app-admin/logrotate-3.12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) >=sys-apps/sed-4 virtual/pkgconfig
-DESCRIPTION=Rotates, compresses, and mails system logs
-EAPI=6
-HOMEPAGE=https://github.com/logrotate/logrotate
-IUSE=acl +cron selinux bzip2
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) selinux? ( sec-policy/selinux-logrotate ) cron? ( virtual/cron ) bzip2? ( app-arch/bzip2 )
-SLOT=0
-SRC_URI=https://github.com/logrotate/logrotate/releases/download/3.12.3/logrotate-3.12.3.tar.gz -> logrotate-3.12.3.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=cafd05888eb8e638f4a347939e08a39f
diff --git a/metadata/md5-cache/app-admin/logrotate-3.12.3-r1 b/metadata/md5-cache/app-admin/logrotate-3.12.3-r1
index 3e17072197f8..ab22cf338a69 100644
--- a/metadata/md5-cache/app-admin/logrotate-3.12.3-r1
+++ b/metadata/md5-cache/app-admin/logrotate-3.12.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Rotates, compresses, and mails system logs
 EAPI=6
 HOMEPAGE=https://github.com/logrotate/logrotate
 IUSE=acl +cron selinux
-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-2
 RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) selinux? ( sec-policy/selinux-logrotate ) cron? ( virtual/cron )
 SLOT=0
 SRC_URI=https://github.com/logrotate/logrotate/releases/download/3.12.3/logrotate-3.12.3.tar.gz -> logrotate-3.12.3.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=47997d810b24bb939a2b0bbdad35455c
+_md5_=6532383cbbfda17575d8b6c5526ac180
diff --git a/metadata/md5-cache/app-admin/mcelog-152 b/metadata/md5-cache/app-admin/mcelog-152
deleted file mode 100644
index 61f2649990c4..000000000000
--- a/metadata/md5-cache/app-admin/mcelog-152
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=A tool to log and decode Machine Check Exceptions
-EAPI=6
-HOMEPAGE=http://mcelog.org/
-IUSE=selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=selinux? ( sec-policy/selinux-mcelog )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/andikleen/mcelog/archive/v152.tar.gz -> mcelog-152.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=18534ccc3ee8e92913aaf9df955ba7d9
diff --git a/metadata/md5-cache/app-admin/mcelog-153 b/metadata/md5-cache/app-admin/mcelog-153
deleted file mode 100644
index d692e048f20e..000000000000
--- a/metadata/md5-cache/app-admin/mcelog-153
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prepare pretend setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=A tool to log and decode Machine Check Exceptions
-EAPI=6
-HOMEPAGE=http://mcelog.org/
-IUSE=selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=selinux? ( sec-policy/selinux-mcelog )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/andikleen/mcelog/archive/v153.tar.gz -> mcelog-153.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8c22cfeff61d6974b1c2bd2d9c34de76
diff --git a/metadata/md5-cache/app-admin/mcelog-154 b/metadata/md5-cache/app-admin/mcelog-154
new file mode 100644
index 000000000000..c0d949b55808
--- /dev/null
+++ b/metadata/md5-cache/app-admin/mcelog-154
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prepare pretend setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=A tool to log and decode Machine Check Exceptions
+EAPI=6
+HOMEPAGE=http://mcelog.org/
+IUSE=selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=selinux? ( sec-policy/selinux-mcelog )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/andikleen/mcelog/archive/v154.tar.gz -> mcelog-154.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8c22cfeff61d6974b1c2bd2d9c34de76
diff --git a/metadata/md5-cache/app-admin/mcollective-2.11.1 b/metadata/md5-cache/app-admin/mcollective-2.11.1
deleted file mode 100644
index 66ab4b2b334c..000000000000
--- a/metadata/md5-cache/app-admin/mcollective-2.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-DESCRIPTION=Framework to build server orchestration or parallel job execution systems
-EAPI=5
-HOMEPAGE=http://marionette-collective.org/
-IUSE=doc +client elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-ruby/stomp ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=https://github.com/puppetlabs/marionette-collective/archive/2.11.1.tar.gz -> mcollective-2.11.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ef00ed8e299064f8e1950e45306af890
diff --git a/metadata/md5-cache/app-admin/mcollective-2.11.3 b/metadata/md5-cache/app-admin/mcollective-2.11.3
index 6480028b210b..c3846ddf2daa 100644
--- a/metadata/md5-cache/app-admin/mcollective-2.11.3
+++ b/metadata/md5-cache/app-admin/mcollective-2.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Framework to build server orchestration or parallel job execution sy
 EAPI=6
 HOMEPAGE=https://docs.puppet.com/mcollective/
 IUSE=doc +client elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-ruby/stomp ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/marionette-collective/archive/2.11.3.tar.gz -> mcollective-2.11.3.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=a0db2bb3c24c978770c95aee54fd1751
+_md5_=b7db5fb9345721e56bcf25713a693560
diff --git a/metadata/md5-cache/app-admin/socklog-2.1.0 b/metadata/md5-cache/app-admin/socklog-2.1.0
index 85618252a1c9..4af7a48151a3 100644
--- a/metadata/md5-cache/app-admin/socklog-2.1.0
+++ b/metadata/md5-cache/app-admin/socklog-2.1.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install prepare
 DESCRIPTION=small secure replacement for syslogd with automatic log rotation
-EAPI=3
+EAPI=6
 HOMEPAGE=http://smarden.org/socklog/
 IUSE=static
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
@@ -9,4 +9,4 @@ RDEPEND=>=sys-process/runit-1.4.0
 SLOT=0
 SRC_URI=http://smarden.org/socklog/socklog-2.1.0.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=878a1956515a1d9c8f1c7eebc8ae02c6
+_md5_=e2f5d69a8f23ab15e51b4e3969b12b2e
diff --git a/metadata/md5-cache/app-admin/swatchdog-3.2.4 b/metadata/md5-cache/app-admin/swatchdog-3.2.4
deleted file mode 100644
index 7df5acef0ae0..000000000000
--- a/metadata/md5-cache/app-admin/swatchdog-3.2.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Simple log watcher
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/swatch/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-perl/Date-Manip dev-perl/Date-Calc dev-perl/File-Tail dev-perl/TimeDate >=virtual/perl-Time-HiRes-1.12 !app-admin/swatch dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://sourceforge/swatch/swatchdog-3.2.4.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-app	4b65c2afee485a204b0b22518141ae47	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=780b5bd6ba9a5b8b621beacd3cd740da
diff --git a/metadata/md5-cache/app-admin/swatchdog-3.2.4-r1 b/metadata/md5-cache/app-admin/swatchdog-3.2.4-r1
index 71610cf34365..6fbee5fe6c46 100644
--- a/metadata/md5-cache/app-admin/swatchdog-3.2.4-r1
+++ b/metadata/md5-cache/app-admin/swatchdog-3.2.4-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Simple log watcher
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/swatch/
-KEYWORDS=amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/Date-Manip dev-perl/Date-Calc dev-perl/File-Tail dev-perl/TimeDate >=virtual/perl-Time-HiRes-1.12 !app-admin/swatch dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/swatch/swatchdog-3.2.4.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-app	4b65c2afee485a204b0b22518141ae47	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=5049c003c1a995be6b638db550d6434c
+_md5_=5342b82b6fd108fc352d4bff44b2b3a4
diff --git a/metadata/md5-cache/app-admin/systemdgenie-0.99.0 b/metadata/md5-cache/app-admin/systemdgenie-0.99.0
index 8470dfac967f..646ccd934631 100644
--- a/metadata/md5-cache/app-admin/systemdgenie-0.99.0
+++ b/metadata/md5-cache/app-admin/systemdgenie-0.99.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-apps/systemd >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/unstable/systemdgenie/systemdgenie-0.99.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=97be443413edb83c2e757af010023e96
diff --git a/metadata/md5-cache/app-admin/tmpwatch-2.11 b/metadata/md5-cache/app-admin/tmpwatch-2.11
deleted file mode 100644
index 8e95e3c3d91c..000000000000
--- a/metadata/md5-cache/app-admin/tmpwatch-2.11
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Files which haven't been accessed are removed from specified directories
-EAPI=5
-HOMEPAGE=https://fedorahosted.org/tmpwatch/
-IUSE=selinux
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=selinux? ( sec-policy/selinux-tmpreaper )
-SLOT=0
-SRC_URI=https://fedorahosted.org/releases/t/m/tmpwatch/tmpwatch-2.11.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=7b7c480709b12396d142e19d9e1edf85
diff --git a/metadata/md5-cache/app-admin/tmpwatch-2.11-r2 b/metadata/md5-cache/app-admin/tmpwatch-2.11-r2
index 3849ba73d08c..921b9910dd47 100644
--- a/metadata/md5-cache/app-admin/tmpwatch-2.11-r2
+++ b/metadata/md5-cache/app-admin/tmpwatch-2.11-r2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install
 DESCRIPTION=Files which haven't been accessed are removed from specified directories
 EAPI=6
-HOMEPAGE=https://fedorahosted.org/tmpwatch/
+HOMEPAGE=https://pagure.io/tmpwatch
 IUSE=selinux
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-tmpreaper )
 SLOT=0
-SRC_URI=https://fedorahosted.org/releases/t/m/tmpwatch/tmpwatch-2.11.tar.bz2
+SRC_URI=https://releases.pagure.org/tmpwatch/tmpwatch-2.11.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a5a1ca2cbf6af3f5a49401b712117ec9
+_md5_=ec3ed27af4731724e63b412f5aa22ba4
diff --git a/metadata/md5-cache/app-arch/dpkg-1.18.23 b/metadata/md5-cache/app-arch/dpkg-1.18.23
deleted file mode 100644
index f95d5f863e4b..000000000000
--- a/metadata/md5-cache/app-arch/dpkg-1.18.23
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lang/perl-5.14.2:= bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 ) app-arch/xz-utils sys-devel/flex virtual/pkgconfig nls? ( app-text/po4a >=sys-devel/gettext-0.18.2 ) test? ( dev-perl/IO-String dev-perl/Test-Pod virtual/perl-Test-Harness ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Package maintenance system for Debian
-EAPI=6
-HOMEPAGE=https://packages.qa.debian.org/dpkg
-IUSE=+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=>=dev-lang/perl-5.14.2:= bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.18.23.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=79fa3820a4a80a2782994867d8d19398
diff --git a/metadata/md5-cache/app-arch/dpkg-1.19.0.4 b/metadata/md5-cache/app-arch/dpkg-1.19.0.4
new file mode 100644
index 000000000000..b7c89de22cbb
--- /dev/null
+++ b/metadata/md5-cache/app-arch/dpkg-1.19.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=dev-lang/perl-5.14.2:= bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 ) app-arch/xz-utils sys-devel/flex virtual/pkgconfig nls? ( app-text/po4a >=sys-devel/gettext-0.18.2 ) test? ( dev-perl/IO-String dev-perl/Test-Pod virtual/perl-Test-Harness ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Package maintenance system for Debian
+EAPI=6
+HOMEPAGE=https://packages.qa.debian.org/dpkg
+IUSE=+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=>=dev-lang/perl-5.14.2:= bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.19.0.4.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=79fa3820a4a80a2782994867d8d19398
diff --git a/metadata/md5-cache/app-arch/pxz-5.0_pre20110811 b/metadata/md5-cache/app-arch/pxz-5.0_pre20110811
index dda88ec5d0b3..cccbb2ca618e 100644
--- a/metadata/md5-cache/app-arch/pxz-5.0_pre20110811
+++ b/metadata/md5-cache/app-arch/pxz-5.0_pre20110811
@@ -3,10 +3,10 @@ DEPEND=app-arch/xz-utils sys-devel/gcc[openmp]
 DESCRIPTION=Parallel implementation of the XZ compression utility
 EAPI=3
 HOMEPAGE=https://jnovy.fedorapeople.org/pxz/
-KEYWORDS=amd64 x86 ~amd64-linux
+KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux
 LICENSE=GPL-2
 RDEPEND=app-arch/xz-utils
 SLOT=0
 SRC_URI=mirror://gentoo/pxz-5.0_pre20110811.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=69ded0643a6c0abb367db1945e670169
+_md5_=914c2b03082e0699b79356aeb748cb5b
diff --git a/metadata/md5-cache/app-arch/pxz-5.0_pre20151029 b/metadata/md5-cache/app-arch/pxz-5.0_pre20151029
new file mode 100644
index 000000000000..ee3bd8d318c8
--- /dev/null
+++ b/metadata/md5-cache/app-arch/pxz-5.0_pre20151029
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare unpack
+DEPEND=app-arch/xz-utils sys-devel/gcc:*[openmp]
+DESCRIPTION=Parallel implementation of the XZ compression utility
+EAPI=6
+HOMEPAGE=http://jnovy.fedorapeople.org/pxz/
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=app-arch/xz-utils sys-devel/gcc:*[openmp]
+SLOT=0
+SRC_URI=https://github.com/jnovy/pxz/archive/fcfea93957d96b7661d1439cf4b767ecfd341eed.tar.gz -> pxz-5.0_pre20151029.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e
+_md5_=77a51ec7cc41a601c0b6406f33762f0a
diff --git a/metadata/md5-cache/app-arch/pxz-9999 b/metadata/md5-cache/app-arch/pxz-9999
index f91521cca3b8..01c5cb0d61e0 100644
--- a/metadata/md5-cache/app-arch/pxz-9999
+++ b/metadata/md5-cache/app-arch/pxz-9999
@@ -1,10 +1,10 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=app-arch/xz-utils sys-devel/gcc[openmp] dev-vcs/git
+DEFINED_PHASES=prepare unpack
+DEPEND=app-arch/xz-utils sys-devel/gcc:*[openmp] >=dev-vcs/git-1.8.2.1
 DESCRIPTION=parallel LZMA compressor (no parallel decompression!)
-EAPI=3
+EAPI=6
 HOMEPAGE=https://jnovy.fedorapeople.org/pxz/
 LICENSE=GPL-2
-RDEPEND=app-arch/xz-utils sys-devel/gcc[openmp]
+RDEPEND=app-arch/xz-utils sys-devel/gcc:*[openmp]
 SLOT=0
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-2	195a672bfaf52d868442171c9469bbb6	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=737dcd9eb3f45402e279f3655a2f2315
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=131d7a43cd1ca8e28b6e9b5427a232c9
diff --git a/metadata/md5-cache/app-arch/snappy-1.1.7 b/metadata/md5-cache/app-arch/snappy-1.1.7
index ca234231c00b..fb8373150f0a 100644
--- a/metadata/md5-cache/app-arch/snappy-1.1.7
+++ b/metadata/md5-cache/app-arch/snappy-1.1.7
@@ -4,10 +4,10 @@ DESCRIPTION=A high-speed compression/decompression library by Google
 EAPI=6
 HOMEPAGE=https://github.com/google/snappy
 IUSE=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 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
 REQUIRED_USE=!static-libs
 SLOT=0/1
 SRC_URI=https://github.com/google/snappy/archive/1.1.7.tar.gz -> snappy-1.1.7.tar.gz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=87802eee75118ad3b797a319e49f00be
+_md5_=f71c4b9dfbe63abd7e8d9e80c514f0a4
diff --git a/metadata/md5-cache/app-arch/zstd-1.1.3 b/metadata/md5-cache/app-arch/zstd-1.1.3
index 80b7b5338cf8..706a11a2e3af 100644
--- a/metadata/md5-cache/app-arch/zstd-1.1.3
+++ b/metadata/md5-cache/app-arch/zstd-1.1.3
@@ -3,9 +3,9 @@ DESCRIPTION=zstd fast compression library
 EAPI=6
 HOMEPAGE=https://facebook.github.io/zstd/
 IUSE=static-libs
-KEYWORDS=amd64 arm ~mips ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm ~mips ppc ppc64 x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/facebook/zstd/archive/v1.1.3.tar.gz -> zstd-1.1.3.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=93b974d9dbc078efe10162c9bdd03f2e
+_md5_=beda661161bf54d32c8449fe8600c92a
diff --git a/metadata/md5-cache/app-arch/zstd-1.3.2 b/metadata/md5-cache/app-arch/zstd-1.3.2
index 92e5bd573cdd..56369cf7748b 100644
--- a/metadata/md5-cache/app-arch/zstd-1.3.2
+++ b/metadata/md5-cache/app-arch/zstd-1.3.2
@@ -4,10 +4,10 @@ DESCRIPTION=zstd fast compression library
 EAPI=6
 HOMEPAGE=https://facebook.github.io/zstd/
 IUSE=static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86
 LICENSE=|| ( BSD GPL-2 )
 RDEPEND=app-arch/xz-utils
 SLOT=0/1
 SRC_URI=https://github.com/facebook/zstd/archive/v1.3.2.tar.gz -> zstd-1.3.2.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=8e7fcc57c17743402779616a61c4cf62
+_md5_=2f103c2b90d532bd194352ae5c52d138
diff --git a/metadata/md5-cache/app-backup/backuppc-3.3.1-r4 b/metadata/md5-cache/app-backup/backuppc-3.3.1-r4
deleted file mode 100644
index c6f0135d5109..000000000000
--- a/metadata/md5-cache/app-backup/backuppc-3.3.1-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=dev-lang/perl app-admin/apache-tools app-admin/makepasswd =www-servers/apache-2.4* virtual/pkgconfig
-DESCRIPTION=High-performance backups to a server's disk
-EAPI=5
-HOMEPAGE=http://backuppc.sourceforge.net/
-IUSE=rss samba
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl app-admin/apache-tools app-admin/makepasswd virtual/perl-IO-Compress dev-perl/Archive-Zip dev-perl/CGI dev-perl/libwww-perl app-arch/tar app-arch/par2cmdline app-arch/gzip app-arch/bzip2 virtual/mta >=www-apache/mod_perl-2.0.9 www-apache/mpm_itk || ( >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_authn_core,apache2_modules_authz_core,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_cgi] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_authn_core,apache2_modules_authz_core,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_cgid] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_authn_core,apache2_modules_authz_core,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_fcgid] ) net-misc/rsync dev-perl/File-RsyncP rss? ( dev-perl/XML-RSS ) samba? ( net-fs/samba ) =www-servers/apache-2.4*
-SLOT=0
-SRC_URI=mirror://sourceforge/backuppc/BackupPC-3.3.1.tar.gz
-_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=1a6b7af30a0e0cc127f5ea09e7fffd9b
diff --git a/metadata/md5-cache/app-backup/backuppc-3.3.1-r5 b/metadata/md5-cache/app-backup/backuppc-3.3.1-r5
index 51fa7b2ed3fe..2d70fa73a1d0 100644
--- a/metadata/md5-cache/app-backup/backuppc-3.3.1-r5
+++ b/metadata/md5-cache/app-backup/backuppc-3.3.1-r5
@@ -4,10 +4,10 @@ DESCRIPTION=High-performance backups to a server's disk
 EAPI=5
 HOMEPAGE=http://backuppc.sourceforge.net/
 IUSE=rss samba
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl app-admin/apache-tools app-admin/makepasswd virtual/perl-IO-Compress dev-perl/Archive-Zip dev-perl/CGI dev-perl/libwww-perl app-arch/tar app-arch/par2cmdline app-arch/gzip app-arch/bzip2 virtual/mta >=www-apache/mod_perl-2.0.9 www-apache/mpm_itk || ( >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_authn_core,apache2_modules_authz_core,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_cgi] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_authn_core,apache2_modules_authz_core,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_cgid] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_authn_core,apache2_modules_authz_core,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_fcgid] ) net-misc/rsync dev-perl/File-RsyncP rss? ( dev-perl/XML-RSS ) samba? ( net-fs/samba ) =www-servers/apache-2.4*
 SLOT=0
 SRC_URI=mirror://sourceforge/backuppc/BackupPC-3.3.1.tar.gz
 _eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=12b8a77f07cd6ea62f749a0c0c7222dc
+_md5_=d8f94c6786f934899e2da3a3a53d97fa
diff --git a/metadata/md5-cache/app-backup/borgbackup-1.1.1 b/metadata/md5-cache/app-backup/borgbackup-1.1.1
new file mode 100644
index 000000000000..315e24adae7f
--- /dev/null
+++ b/metadata/md5-cache/app-backup/borgbackup-1.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools_scm[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !!app-office/borg app-arch/lz4 dev-python/llfuse[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/msgpack[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyzmq[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Deduplicating backup program with compression and authenticated encryption
+EAPI=6
+HOMEPAGE=https://borgbackup.readthedocs.io/
+IUSE=libressl python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=!!app-office/borg app-arch/lz4 dev-python/llfuse[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/msgpack[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyzmq[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/b/borgbackup/borgbackup-1.1.1.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=279c888c7ce027bc0ea162b0782ecd4e
diff --git a/metadata/md5-cache/app-backup/flexbackup-1.2.1-r13 b/metadata/md5-cache/app-backup/flexbackup-1.2.1-r13
index ea958abc73ec..fb421b7e6bb1 100644
--- a/metadata/md5-cache/app-backup/flexbackup-1.2.1-r13
+++ b/metadata/md5-cache/app-backup/flexbackup-1.2.1-r13
@@ -3,10 +3,10 @@ DEPEND=app-arch/mt-st
 DESCRIPTION=Flexible backup script using perl
 EAPI=6
 HOMEPAGE=http://flexbackup.sourceforge.net/
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
+KEYWORDS=amd64 ~hppa ppc x86
 LICENSE=GPL-2
 RDEPEND=app-arch/mt-st
 SLOT=0
 SRC_URI=mirror://sourceforge/flexbackup/flexbackup-1.2.1.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=5b2de9466b22f59d5ccff1331d95dc51
+_md5_=eb055859132e38700f411f4f39731e27
diff --git a/metadata/md5-cache/app-backup/kbackup-1.0 b/metadata/md5-cache/app-backup/kbackup-1.0
index 4c6b03dbf9b8..33bcafa58600 100644
--- a/metadata/md5-cache/app-backup/kbackup-1.0
+++ b/metadata/md5-cache/app-backup/kbackup-1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !app-backup/kbackup:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=http://members.aon.at/m.koller/kbackup-1.0.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=08dcc27bf0ee872a46ca8f87a5ab484f
diff --git a/metadata/md5-cache/app-backup/kfoldersync-3.4.1 b/metadata/md5-cache/app-backup/kfoldersync-3.4.1
index cfdd62d0d98d..770f707021ea 100644
--- a/metadata/md5-cache/app-backup/kfoldersync-3.4.1
+++ b/metadata/md5-cache/app-backup/kfoldersync-3.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://dl.opendesktop.org/api/files/download/id/1485353737/kfoldersync-3.4.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=385cf950f892f1ef07dbe0557526c425
diff --git a/metadata/md5-cache/app-backup/untangle-https-backup-0.0.6 b/metadata/md5-cache/app-backup/untangle-https-backup-0.0.6
deleted file mode 100644
index 3574447debc9..000000000000
--- a/metadata/md5-cache/app-backup/untangle-https-backup-0.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Back up Untangle configurations via the web admin UI
-EAPI=6
-HOMEPAGE=http://michael.orlitzky.com/code/untangle-https-backup.php
-IUSE=python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=http://michael.orlitzky.com/code/releases/untangle-https-backup-0.0.6.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eaaca182add3c0eec99d14e7aa5c8667
diff --git a/metadata/md5-cache/app-backup/untangle-https-backup-0.0.7 b/metadata/md5-cache/app-backup/untangle-https-backup-0.0.7
new file mode 100644
index 000000000000..b70b43979431
--- /dev/null
+++ b/metadata/md5-cache/app-backup/untangle-https-backup-0.0.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Back up Untangle configurations via the web admin UI
+EAPI=6
+HOMEPAGE=http://michael.orlitzky.com/code/untangle-https-backup.php
+IUSE=python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=http://michael.orlitzky.com/code/releases/untangle-https-backup-0.0.7.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=eaaca182add3c0eec99d14e7aa5c8667
diff --git a/metadata/md5-cache/app-benchmarks/bonnie++-1.97.3 b/metadata/md5-cache/app-benchmarks/bonnie++-1.97.3
index c46d3ebed822..d30bd0cd77f4 100644
--- a/metadata/md5-cache/app-benchmarks/bonnie++-1.97.3
+++ b/metadata/md5-cache/app-benchmarks/bonnie++-1.97.3
@@ -3,8 +3,8 @@ DESCRIPTION=Hard drive bottleneck testing benchmark suite
 EAPI=6
 HOMEPAGE=http://www.coker.com.au/bonnie++/
 IUSE=debug
-KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.coker.com.au/bonnie++/experimental/bonnie++-1.97.3.tgz
-_md5_=2d8293f5d6edb2072c87c85f255a1990
+_md5_=5c3499a13c195b4b7ac14d8802ba1db3
diff --git a/metadata/md5-cache/app-benchmarks/dbench-4.0 b/metadata/md5-cache/app-benchmarks/dbench-4.0
index 0f15e6930213..067a56115f6e 100644
--- a/metadata/md5-cache/app-benchmarks/dbench-4.0
+++ b/metadata/md5-cache/app-benchmarks/dbench-4.0
@@ -3,10 +3,10 @@ DEPEND=dev-libs/popt >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18
 DESCRIPTION=Popular filesystem benchmark
 EAPI=5
 HOMEPAGE=http://samba.org/ftp/tridge/dbench/
-KEYWORDS=amd64 ~arm64 hppa ppc ppc64 sparc x86
+KEYWORDS=amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/popt
 SLOT=0
 SRC_URI=ftp://ftp.samba.org/pub/tridge/dbench/dbench-4.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=4b345e9698093284b34a824d54064836
+_md5_=33963bd9c8fa90f7a43e73333786db8d
diff --git a/metadata/md5-cache/app-benchmarks/wrk-4.0.2 b/metadata/md5-cache/app-benchmarks/wrk-4.0.2
new file mode 100644
index 000000000000..7a176d851742
--- /dev/null
+++ b/metadata/md5-cache/app-benchmarks/wrk-4.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=>=dev-lang/luajit-2.0.2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+DESCRIPTION=A modern HTTP benchmarking tool
+EAPI=5
+HOMEPAGE=https://github.com/wg/wrk
+IUSE=libressl
+KEYWORDS=~x86 ~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-lang/luajit-2.0.2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+SLOT=0
+SRC_URI=https://github.com/wg/wrk/archive/4.0.2.tar.gz -> wrk-4.0.2.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=96ff9bee96e5e4a46b15a199b83d0f30
diff --git a/metadata/md5-cache/app-cdr/kcdemu-0.7.2 b/metadata/md5-cache/app-cdr/kcdemu-0.7.2
index e7b72badda4d..e0c53fbb2be6 100644
--- a/metadata/md5-cache/app-cdr/kcdemu-0.7.2
+++ b/metadata/md5-cache/app-cdr/kcdemu-0.7.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=app-cdr/cdemu-2.0.0[cdemu-daemon] !app-cdr/kcdemu:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://dl.opendesktop.org/api/files/download/id/1481242372/kde_cdemu-0.7.2.tar.bz2 -> kcdemu-0.7.2.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=dbdbdd49b9d5072e2d3840475d87d785
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-0.19.0 b/metadata/md5-cache/app-crypt/certbot-apache-0.19.0
index bf7598680c5c..c0889887c3be 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-0.19.0
+++ b/metadata/md5-cache/app-crypt/certbot-apache-0.19.0
@@ -4,11 +4,11 @@ DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
 EAPI=6
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=~app-crypt/certbot-0.19.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~app-crypt/acme-0.19.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v0.19.0.tar.gz -> certbot-0.19.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=150d5fac2a9713548c787f3cd125ab7f
+_md5_=eb30e8c952c825c2b0cc23c4d7f5f866
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-9999 b/metadata/md5-cache/app-crypt/certbot-apache-9999
index 7cd6a1fa062a..3c58dc331cf3 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-9999
+++ b/metadata/md5-cache/app-crypt/certbot-apache-9999
@@ -9,4 +9,4 @@ RDEPEND=~app-crypt/certbot-9999[python_targets_python2_7(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	git-r3	52a888802d25387c2c74cb845d1219bc	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=150d5fac2a9713548c787f3cd125ab7f
+_md5_=eb30e8c952c825c2b0cc23c4d7f5f866
diff --git a/metadata/md5-cache/app-crypt/gentoo-keys-201607021514-r2 b/metadata/md5-cache/app-crypt/gentoo-keys-201607021514-r2
new file mode 100644
index 000000000000..8638885d15b0
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/gentoo-keys-201607021514-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=A OpenPGP/GPG keyring of official Gentoo release media GPG keys
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Gentoo-keys
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~ppc ~sparc ~x86 ~arm64 ~x86-fbsd ~amd64-fbsd ~m68k ~mips ~s390 ~sh
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~dolsen/releases/keyrings/gentoo-keys-201607021514.tar.xz
+_md5_=70213fded3c6d3bcf7b9b72a1c528b13
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.2.0 b/metadata/md5-cache/app-crypt/gnupg-2.2.0
index 31b779c1382f..3ef83fe8e26a 100644
--- a/metadata/md5-cache/app-crypt/gnupg-2.2.0
+++ b/metadata/md5-cache/app-crypt/gnupg-2.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
 EAPI=6
 HOMEPAGE=http://www.gnupg.org/
 IUSE=bzip2 doc +gnutls ldap nls readline selinux +smartcard tofu tools usb wks-server
-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 ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/npth-1.2 >=dev-libs/libassuan-2.4.3 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.24 >=dev-libs/libksba-1.3.4 >=net-misc/curl-7.10 gnutls? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) tofu? ( >=dev-db/sqlite-3.7 ) app-crypt/pinentry !app-crypt/dirmngr selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.0.tar.bz2
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=2ad5259e2a3461e59795fc63f14d6cc3
+_md5_=1e4ac20e59fe711f76b50dc2a575f045
diff --git a/metadata/md5-cache/app-crypt/heimdal-7.1.0 b/metadata/md5-cache/app-crypt/heimdal-7.1.0
index 65f41f51d0b3..da4111ae1169 100644
--- a/metadata/md5-cache/app-crypt/heimdal-7.1.0
+++ b/metadata/md5-cache/app-crypt/heimdal-7.1.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=ssl? ( >=dev-libs/openssl-1.0.1h-r2[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(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) !berkdb? ( >=sys-libs/gdbm-1.10-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(-)?] ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.8.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(-)?] >=sys-libs/e2fsprogs-libs-1.42.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(-)?] sys-libs/ncurses:0= >=sys-libs/readline-6.2_p5-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(-)?] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl || ( dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) >=virtual/pkgconfig-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/autoconf-2.62 test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[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(-)?] ) libressl? ( dev-libs/libressl[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(-)?] ) ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) !berkdb? ( >=sys-libs/gdbm-1.10-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(-)?] ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.8.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(-)?] >=sys-libs/e2fsprogs-libs-1.42.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(-)?] sys-libs/ncurses:0= >=sys-libs/readline-6.2_p5-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(-)?] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl || ( dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) >=virtual/pkgconfig-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/autoconf-2.62 test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Kerberos 5 implementation from KTH
 EAPI=6
 HOMEPAGE=http://www.h5l.org/
-IUSE=afs +berkdb caps hdb-ldap ipv6 otp +pkinit selinux ssl static-libs test X 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
+IUSE=afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X 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
 LICENSE=BSD
-RDEPEND=ssl? ( >=dev-libs/openssl-1.0.1h-r2[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(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) !berkdb? ( >=sys-libs/gdbm-1.10-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(-)?] ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.8.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(-)?] >=sys-libs/e2fsprogs-libs-1.42.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(-)?] sys-libs/ncurses:0= >=sys-libs/readline-6.2_p5-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(-)?] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl selinux? ( sec-policy/selinux-kerberos )
+RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[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(-)?] ) libressl? ( dev-libs/libressl[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(-)?] ) ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) !berkdb? ( >=sys-libs/gdbm-1.10-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(-)?] ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.8.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(-)?] >=sys-libs/e2fsprogs-libs-1.42.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(-)?] sys-libs/ncurses:0= >=sys-libs/readline-6.2_p5-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(-)?] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl selinux? ( sec-policy/selinux-kerberos )
 SLOT=0
 SRC_URI=https://github.com/heimdal/heimdal/releases/download/heimdal-7.1.0/heimdal-7.1.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db-use	582140d1a711279e50ce284fc7b609f5	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
-_md5_=fce882ca6876ac6a0f69d0668ebfba62
+_md5_=81134795ed97473b86a61aae69b57b62
diff --git a/metadata/md5-cache/app-crypt/heimdal-7.3.0 b/metadata/md5-cache/app-crypt/heimdal-7.3.0
index fe70489eb413..467329157355 100644
--- a/metadata/md5-cache/app-crypt/heimdal-7.3.0
+++ b/metadata/md5-cache/app-crypt/heimdal-7.3.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=ssl? ( >=dev-libs/openssl-1.0.1h-r2[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(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) !berkdb? ( >=sys-libs/gdbm-1.10-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(-)?] ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.8.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(-)?] >=sys-libs/e2fsprogs-libs-1.42.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(-)?] sys-libs/ncurses:0= >=sys-libs/readline-6.2_p5-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(-)?] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl || ( dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) >=virtual/pkgconfig-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/autoconf-2.62 test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[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(-)?] ) libressl? ( dev-libs/libressl[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(-)?] ) ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) !berkdb? ( >=sys-libs/gdbm-1.10-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(-)?] ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.8.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(-)?] >=sys-libs/e2fsprogs-libs-1.42.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(-)?] sys-libs/ncurses:0= >=sys-libs/readline-6.2_p5-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(-)?] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl || ( dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) >=virtual/pkgconfig-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/autoconf-2.62 test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Kerberos 5 implementation from KTH
 EAPI=6
 HOMEPAGE=http://www.h5l.org/
-IUSE=afs +berkdb caps hdb-ldap ipv6 otp +pkinit selinux ssl static-libs test X 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
+IUSE=afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X 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
 LICENSE=BSD
-RDEPEND=ssl? ( >=dev-libs/openssl-1.0.1h-r2[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(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) !berkdb? ( >=sys-libs/gdbm-1.10-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(-)?] ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.8.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(-)?] >=sys-libs/e2fsprogs-libs-1.42.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(-)?] sys-libs/ncurses:0= >=sys-libs/readline-6.2_p5-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(-)?] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl selinux? ( sec-policy/selinux-kerberos )
+RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[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(-)?] ) libressl? ( dev-libs/libressl[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(-)?] ) ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) !berkdb? ( >=sys-libs/gdbm-1.10-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(-)?] ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.8.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(-)?] >=sys-libs/e2fsprogs-libs-1.42.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(-)?] sys-libs/ncurses:0= >=sys-libs/readline-6.2_p5-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(-)?] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl selinux? ( sec-policy/selinux-kerberos )
 SLOT=0
 SRC_URI=https://github.com/heimdal/heimdal/releases/download/heimdal-7.3.0/heimdal-7.3.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db-use	582140d1a711279e50ce284fc7b609f5	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
-_md5_=5a70b3638286f6e729cef4821b5beaad
+_md5_=81134795ed97473b86a61aae69b57b62
diff --git a/metadata/md5-cache/app-crypt/heimdal-7.4.0 b/metadata/md5-cache/app-crypt/heimdal-7.4.0
index 4dd961293df9..0d8050e86c33 100644
--- a/metadata/md5-cache/app-crypt/heimdal-7.4.0
+++ b/metadata/md5-cache/app-crypt/heimdal-7.4.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=ssl? ( >=dev-libs/openssl-1.0.1h-r2[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(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) !berkdb? ( >=sys-libs/gdbm-1.10-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(-)?] ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.8.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(-)?] >=sys-libs/e2fsprogs-libs-1.42.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(-)?] sys-libs/ncurses:0= >=sys-libs/readline-6.2_p5-r1: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(-)?] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl || ( dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) >=virtual/pkgconfig-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/autoconf-2.62 test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[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(-)?] ) libressl? ( dev-libs/libressl[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(-)?] ) ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) !berkdb? ( >=sys-libs/gdbm-1.10-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(-)?] ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.8.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(-)?] >=sys-libs/e2fsprogs-libs-1.42.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(-)?] sys-libs/ncurses:0= >=sys-libs/readline-6.2_p5-r1: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(-)?] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl || ( dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) >=virtual/pkgconfig-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/autoconf-2.62 test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Kerberos 5 implementation from KTH
 EAPI=6
 HOMEPAGE=http://www.h5l.org/
-IUSE=afs +berkdb caps hdb-ldap ipv6 otp +pkinit selinux ssl static-libs test X 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
+IUSE=afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X 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
 LICENSE=BSD
-RDEPEND=ssl? ( >=dev-libs/openssl-1.0.1h-r2[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(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) !berkdb? ( >=sys-libs/gdbm-1.10-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(-)?] ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.8.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(-)?] >=sys-libs/e2fsprogs-libs-1.42.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(-)?] sys-libs/ncurses:0= >=sys-libs/readline-6.2_p5-r1: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(-)?] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl selinux? ( sec-policy/selinux-kerberos )
+RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[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(-)?] ) libressl? ( dev-libs/libressl[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(-)?] ) ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) !berkdb? ( >=sys-libs/gdbm-1.10-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(-)?] ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.8.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(-)?] >=sys-libs/e2fsprogs-libs-1.42.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(-)?] sys-libs/ncurses:0= >=sys-libs/readline-6.2_p5-r1: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(-)?] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl selinux? ( sec-policy/selinux-kerberos )
 SLOT=0
 SRC_URI=https://github.com/heimdal/heimdal/releases/download/heimdal-7.4.0/heimdal-7.4.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db-use	582140d1a711279e50ce284fc7b609f5	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
-_md5_=8ed8f78433940c78d9672b5af6743787
+_md5_=27c50dd74405f21f2a9c5b6b24bc8fc3
diff --git a/metadata/md5-cache/app-crypt/kbfs-9999 b/metadata/md5-cache/app-crypt/kbfs-9999
index ef56b8b39a8c..12948720520e 100644
--- a/metadata/md5-cache/app-crypt/kbfs-9999
+++ b/metadata/md5-cache/app-crypt/kbfs-9999
@@ -3,8 +3,9 @@ DEPEND=>=dev-lang/go-1.6:0 >=app-crypt/keybase-1.0.17 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Keybase Filesystem (KBFS)
 EAPI=6
 HOMEPAGE=https://keybase.io/docs/kbfs
+IUSE=git
 LICENSE=BSD
 RDEPEND=app-crypt/gnupg sys-fs/fuse
 SLOT=0
 _eclasses_=git-r3	52a888802d25387c2c74cb845d1219bc
-_md5_=ccdaa5ab4ce7a729ba0460afaa42e51c
+_md5_=465509b95cf119787ad44f6b2385706a
diff --git a/metadata/md5-cache/app-crypt/kencfs-1.6.4 b/metadata/md5-cache/app-crypt/kencfs-1.6.4
deleted file mode 100644
index 39ed58b0dc99..000000000000
--- a/metadata/md5-cache/app-crypt/kencfs-1.6.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4
-DESCRIPTION=GUI frontend for encfs
-EAPI=6
-HOMEPAGE=https://www.linux-apps.com/content/show.php?content=134003
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 || ( kde-frameworks/kwallet:5 kde-apps/kwalletd:4 ) sys-fs/encfs
-SLOT=0
-SRC_URI=https://dl.opendesktop.org/api/files/download/id/1486311191/kencfs-1.6.4.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=82cf41b625ffc9328eeb9ae4c3fbe152
diff --git a/metadata/md5-cache/app-crypt/kencfs-plasma-1.6.4 b/metadata/md5-cache/app-crypt/kencfs-plasma-1.6.4
new file mode 100644
index 000000000000..3b9119e5baa9
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/kencfs-plasma-1.6.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4
+DESCRIPTION=GUI frontend for encfs
+EAPI=6
+HOMEPAGE=https://www.linux-apps.com/content/show.php?content=134003
+KEYWORDS=amd64 x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 kde-frameworks/kwallet:5 sys-fs/encfs
+SLOT=0
+SRC_URI=https://dl.opendesktop.org/api/files/download/id/1486311191/kencfs-1.6.4.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=1f79db7214928eec3b9d8e590f59c73d
diff --git a/metadata/md5-cache/app-crypt/kencfs-plasma-2.0.1_alpha b/metadata/md5-cache/app-crypt/kencfs-plasma-2.0.1_alpha
index e0f853e9a16e..f2348222a257 100644
--- a/metadata/md5-cache/app-crypt/kencfs-plasma-2.0.1_alpha
+++ b/metadata/md5-cache/app-crypt/kencfs-plasma-2.0.1_alpha
@@ -9,4 +9,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 kde
 SLOT=0
 SRC_URI=https://dl.opendesktop.org/api/files/download/id/1486310914/kencfs-plasma-2.0.1a.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=ca739df9d242cfead15d058c39c1fd5b
+_md5_=887287e91d9feb642057890ccdc64f11
diff --git a/metadata/md5-cache/app-crypt/libscrypt-1.21 b/metadata/md5-cache/app-crypt/libscrypt-1.21
index 509bb136b3b0..6131787f5207 100644
--- a/metadata/md5-cache/app-crypt/libscrypt-1.21
+++ b/metadata/md5-cache/app-crypt/libscrypt-1.21
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile setup
 DESCRIPTION=Shared library to impliment the scrypt algorithm
 EAPI=6
 HOMEPAGE=https://github.com/technion/libscrypt
-KEYWORDS=amd64 arm ~mips ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 arm ~mips ppc ppc64 ~sparc x86
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://github.com/technion/libscrypt/archive/v1.21.tar.gz -> libscrypt-1.21.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=adaf692dd61afbb762630b8d4eb3e7be
+_md5_=34c5ddd9d8c704268512118c217e4fa3
diff --git a/metadata/md5-cache/app-crypt/paperkey-1.5 b/metadata/md5-cache/app-crypt/paperkey-1.5
new file mode 100644
index 000000000000..d92e9d35d43a
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/paperkey-1.5
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=OpenPGP key archiver
+EAPI=6
+HOMEPAGE=http://www.jabberwocky.com/software/paperkey/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://www.jabberwocky.com/software/paperkey/paperkey-1.5.tar.gz
+_md5_=b7afdf51b9b1dad711f34d80c66c2954
diff --git a/metadata/md5-cache/app-crypt/pesign-0.108 b/metadata/md5-cache/app-crypt/pesign-0.108
index 00d78fc3d3cf..f0e85465f7a0 100644
--- a/metadata/md5-cache/app-crypt/pesign-0.108
+++ b/metadata/md5-cache/app-crypt/pesign-0.108
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/nspr !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux sys-apps/help2man sys-boot/gnu-efi virtual/pkgconfig
+DEPEND=dev-libs/nspr dev-libs/nss dev-libs/popt !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux sys-apps/help2man sys-boot/gnu-efi virtual/pkgconfig
 DESCRIPTION=Tools for manipulating signed PE-COFF binaries
 EAPI=5
 HOMEPAGE=https://github.com/vathpela/pesign
 IUSE=libressl
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/nspr !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux
+RDEPEND=dev-libs/nspr dev-libs/nss dev-libs/popt !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux
 SLOT=0
 SRC_URI=https://github.com/vathpela/pesign/archive/0.108.tar.gz -> pesign-0.108.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=1ddc179787748aea10acecc3dd1f3340
+_md5_=0bbf2ebef5a6ff27a19262febcb9eacb
diff --git a/metadata/md5-cache/app-crypt/pesign-0.112 b/metadata/md5-cache/app-crypt/pesign-0.112
index 66519a88a607..6af28a23c296 100644
--- a/metadata/md5-cache/app-crypt/pesign-0.112
+++ b/metadata/md5-cache/app-crypt/pesign-0.112
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=dev-libs/nspr !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux sys-apps/help2man sys-boot/gnu-efi sys-libs/efivar virtual/pkgconfig
+DEPEND=dev-libs/nspr dev-libs/nss dev-libs/popt !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux sys-apps/help2man sys-boot/gnu-efi sys-libs/efivar virtual/pkgconfig
 DESCRIPTION=Tools for manipulating signed PE-COFF binaries
 EAPI=6
 HOMEPAGE=https://github.com/vathpela/pesign
 IUSE=libressl
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/nspr !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux
+RDEPEND=dev-libs/nspr dev-libs/nss dev-libs/popt !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux
 SLOT=0
 SRC_URI=https://github.com/vathpela/pesign/archive/0.112.tar.gz -> pesign-0.112.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=1be8438db3a3c3d6c434359f0210452f
+_md5_=cbf675cbc3d957a84c5b9b6044c94bb4
diff --git a/metadata/md5-cache/app-crypt/rhash-1.3.5 b/metadata/md5-cache/app-crypt/rhash-1.3.5
index 3ab15b6b3387..69f82020da4a 100644
--- a/metadata/md5-cache/app-crypt/rhash-1.3.5
+++ b/metadata/md5-cache/app-crypt/rhash-1.3.5
@@ -4,10 +4,10 @@ DESCRIPTION=Console utility and library for computing and verifying file hash su
 EAPI=6
 HOMEPAGE=http://rhash.anz.ru/
 IUSE=debug nls openssl 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 sparc ~x86 ~amd64-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=openssl? ( dev-libs/openssl: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(-)?] )
 SLOT=0
 SRC_URI=mirror://sourceforge/rhash/rhash-1.3.5-src.tar.gz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a83bd133e64d5a8e0b42223bd41be0a3
+_md5_=7a34003172d86a26a2c3467a6a3d7963
diff --git a/metadata/md5-cache/app-crypt/tpm-emulator-0.7.4-r1 b/metadata/md5-cache/app-crypt/tpm-emulator-0.7.4-r1
index 8f1dda68de77..14438c098de1 100644
--- a/metadata/md5-cache/app-crypt/tpm-emulator-0.7.4-r1
+++ b/metadata/md5-cache/app-crypt/tpm-emulator-0.7.4-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) !ssl? ( dev-libs/gmp ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) sys-devel/make >=dev-util/cmake-3.7.2 virtual/pkgconfig
+DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) !ssl? ( dev-libs/gmp ) modules? ( kernel_linux? ( virtual/modutils ) ) modules? ( sys-apps/sed kernel_linux? ( virtual/linux-sources ) ) sys-devel/make >=dev-util/cmake-3.7.2 virtual/pkgconfig
 DESCRIPTION=Emulator driver for tpm
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/tpm-emulator.berlios/
-IUSE=libressl ssl modules kernel_linux
+IUSE=libressl ssl kernel_linux modules
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) kernel_linux? ( virtual/modutils )
+RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) modules? ( kernel_linux? ( virtual/modutils ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/tpm-emulator/tpm_emulator-0.7.4.tar.gz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	e77cdec133261f6bfa67560748277269	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=6b0b60f9152f2f439b5d2e7acbda4b31
+_md5_=88a4871dee20d0da5f561d9b817dc9c1
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-0.4.6 b/metadata/md5-cache/app-crypt/yubikey-manager-0.4.6
new file mode 100644
index 000000000000..23b3e466ff53
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-0.4.6
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Python library and command line tool for configuring a YubiKey
+EAPI=6
+HOMEPAGE=https://developers.yubico.com/yubikey-manager/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=app-crypt/libu2f-host dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyscard[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyusb[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/click[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-auth/ykpers python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey-manager-0.4.6.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d19ba0191ed14eae98b6b243b1735f64
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-qt-0.3.2 b/metadata/md5-cache/app-crypt/yubikey-manager-qt-0.3.2
new file mode 100644
index 000000000000..453410d33b79
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-qt-0.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare setup unpack
+DEPEND=>=app-crypt/yubikey-manager-0.4[python_targets_python3_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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyotherside[python_targets_python3_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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-qt/qtsingleapplication[qt5] dev-qt/qtdeclarative:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtwidgets:5
+DESCRIPTION=Cross-platform application for configuring any YubiKey over all USB transports
+EAPI=6
+HOMEPAGE=https://developers.yubico.com/yubikey-manager-qt https://github.com/Yubico/yubikey-manager-qt
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=>=app-crypt/yubikey-manager-0.4[python_targets_python3_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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyotherside[python_targets_python3_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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-qt/qtsingleapplication[qt5] dev-qt/qtdeclarative:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=https://github.com/Yubico/yubikey-manager-qt/archive/yubikey-manager-qt-0.3.2.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e
+_md5_=5b0dec9a7559a7c069897700693249be
diff --git a/metadata/md5-cache/app-dicts/dikt-2s_p1 b/metadata/md5-cache/app-dicts/dikt-2s_p1
index 6c8df36147c4..425343f6d896 100644
--- a/metadata/md5-cache/app-dicts/dikt-2s_p1
+++ b/metadata/md5-cache/app-dicts/dikt-2s_p1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !app-dicts/dikt:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://bitbucket.org/dikt/code/downloads/dikt-2s1.txz -> dikt-2s1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d4efbd95f33a9395d2ab4da70f8b13e7
diff --git a/metadata/md5-cache/app-dicts/opendict-0.6.7 b/metadata/md5-cache/app-dicts/opendict-0.6.7
index bc619a1e01f5..5c0ab1bca53f 100644
--- a/metadata/md5-cache/app-dicts/opendict-0.6.7
+++ b/metadata/md5-cache/app-dicts/opendict-0.6.7
@@ -4,11 +4,11 @@ DESCRIPTION=OpenDict is a free cross-platform dictionary program
 EAPI=6
 HOMEPAGE=http://opendict.sourceforge.net/
 IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ppc ~x86
+KEYWORDS=amd64 ppc 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sourceforge/opendict/files/opendict-0.6.7.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dda8fa0d8184f3fc375cb937744e3b08
+_md5_=d53b4b3e46f145382187b0159dfbbdbb
diff --git a/metadata/md5-cache/app-editors/editra-0.7.20-r2 b/metadata/md5-cache/app-editors/editra-0.7.20-r2
index e9d697543aff..510defa1515c 100644
--- a/metadata/md5-cache/app-editors/editra-0.7.20-r2
+++ b/metadata/md5-cache/app-editors/editra-0.7.20-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Multi-platform text editor supporting over 50 programming languages
 EAPI=6
 HOMEPAGE=http://editra.org https://pypi.python.org/pypi/Editra
 IUSE=spell python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=wxWinLL-3.1
 RDEPEND=dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-0.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] spell? ( dev-python/pyenchant[python_targets_python2_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_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://editra.org/uploads/src/Editra-0.7.20.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2b01b2dd9c459732a0097bdccb0cbe68
+_md5_=9c658626f3da40690605d8477010f01c
diff --git a/metadata/md5-cache/app-editors/emacs-vcs-26.0.90 b/metadata/md5-cache/app-editors/emacs-vcs-26.0.90
new file mode 100644
index 000000000000..00b87571cce7
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-vcs-26.0.90
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( x11-libs/gtk+:3 net-libs/webkit-gtk:4= ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) virtual/pkgconfig gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/attr ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/emacs/
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib mailutils motif pax_kernel png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( x11-libs/gtk+:3 net-libs/webkit-gtk:4= ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) )
+REQUIRED_USE=?? ( aqua X )
+SLOT=26
+SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emacs-26.0.90.tar.xz mirror://gnu-alpha/emacs/pretest/emacs-26.0.90.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=12bd4af6b8f579373a31bd18b80de701
diff --git a/metadata/md5-cache/app-editors/gvim-8.0.1188 b/metadata/md5-cache/app-editors/gvim-8.0.1188
index 7afe619d42e0..30107a214047 100644
--- a/metadata/md5-cache/app-editors/gvim-8.0.1188
+++ b/metadata/md5-cache/app-editors/gvim-8.0.1188
@@ -11,4 +11,4 @@ REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 pytho
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.0.1188.tar.gz -> vim-8.0.1188.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	7b6fb2fc216b101b5d97d171925a847c	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=01fbe56e516a612badd0d4ae91bac4c2
+_md5_=eeb951409969a69cfca1a67c8d004756
diff --git a/metadata/md5-cache/app-editors/gvim-9999 b/metadata/md5-cache/app-editors/gvim-9999
index 642f16a9e557..b291f5a82ec4 100644
--- a/metadata/md5-cache/app-editors/gvim-9999
+++ b/metadata/md5-cache/app-editors/gvim-9999
@@ -9,4 +9,4 @@ RDEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurs
 REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	7b6fb2fc216b101b5d97d171925a847c	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=01fbe56e516a612badd0d4ae91bac4c2
+_md5_=eeb951409969a69cfca1a67c8d004756
diff --git a/metadata/md5-cache/app-editors/kile-2.1.3-r3 b/metadata/md5-cache/app-editors/kile-2.1.3-r3
index 111c3d6b4f95..81b5d612cea3 100644
--- a/metadata/md5-cache/app-editors/kile-2.1.3-r3
+++ b/metadata/md5-cache/app-editors/kile-2.1.3-r3
@@ -9,5 +9,5 @@ LICENSE=FDL-1.2 GPL-2
 RDEPEND=x11-misc/shared-mime-info >=kde-apps/katepart-4.14.3:4 >=kde-apps/kdebase-data-4.4:4 >=kde-apps/konsolepart-4.4:4 || ( kde-apps/okular[pdf?,postscript] app-text/evince app-text/acroread ) virtual/imagemagick-tools[png?] virtual/latex-base virtual/tex-base pdf? ( || ( app-text/dvipdfmx >=app-text/texlive-core-2014 ) app-text/ghostscript-gpl ) png? ( app-text/dvipng ) kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4
 SRC_URI=mirror://sourceforge/kile/kile-2.1.3.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7343e5ee13ea365755a3529242e6e846
diff --git a/metadata/md5-cache/app-editors/kile-2.9.91 b/metadata/md5-cache/app-editors/kile-2.9.91
index d352faace27f..e8cfe4589b71 100644
--- a/metadata/md5-cache/app-editors/kile-2.9.91
+++ b/metadata/md5-cache/app-editors/kile-2.9.91
@@ -9,5 +9,5 @@ LICENSE=FDL-1.2 GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdoctools-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kinit-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/ktexteditor-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/okular-14.12.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qttest-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 pdf? ( app-text/poppler[qt5] ) !app-editors/kile:4 >=kde-apps/konsole-14.12.0:5 >=kde-apps/okular-14.12.0:5[pdf?] virtual/latex-base virtual/tex-base pdf? ( || ( app-text/dvipdfmx >=app-text/texlive-core-2014 ) app-text/ghostscript-gpl ) png? ( app-text/dvipng || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] ) ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://sourceforge/kile/kile-2.9.91.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=aee75182ebb5f0205b74d04306a99bc4
diff --git a/metadata/md5-cache/app-editors/mg-20170401 b/metadata/md5-cache/app-editors/mg-20170401
index 4e9b3cff66d7..dd59021d80f5 100644
--- a/metadata/md5-cache/app-editors/mg-20170401
+++ b/metadata/md5-cache/app-editors/mg-20170401
@@ -4,10 +4,10 @@ DESCRIPTION=MicroGnuEmacs, a port from the BSDs
 EAPI=6
 HOMEPAGE=http://homepage.boetes.org/software/mg/
 IUSE=livecd
-KEYWORDS=alpha ~amd64 arm hppa ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha ~amd64 arm hppa ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=public-domain
 RDEPEND=sys-libs/ncurses:0 !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )
 SLOT=0
 SRC_URI=http://homepage.boetes.org/software/mg/mg-20170401.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=2ed17aaa8ef30739186cbad5d1800fb2
+_md5_=c37b998e46efbf5cd74320247874d46f
diff --git a/metadata/md5-cache/app-editors/notepadqq-1.2.0 b/metadata/md5-cache/app-editors/notepadqq-1.2.0
new file mode 100644
index 000000000000..147573cf0970
--- /dev/null
+++ b/metadata/md5-cache/app-editors/notepadqq-1.2.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5
+DESCRIPTION=Notepad++-like editor for Linux
+EAPI=6
+HOMEPAGE=http://notepadqq.altervista.org
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=https://github.com/notepadqq/notepadqq/archive/v1.2.0.tar.gz -> notepadqq-1.2.0.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e5cb6a60bcb7b6c7d032162ed682bab1
diff --git a/metadata/md5-cache/app-editors/vim-8.0.1188 b/metadata/md5-cache/app-editors/vim-8.0.1188
index 8aceeda556d0..86bbc11e200a 100644
--- a/metadata/md5-cache/app-editors/vim-8.0.1188
+++ b/metadata/md5-cache/app-editors/vim-8.0.1188
@@ -11,4 +11,4 @@ REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 pytho
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.0.1188.tar.gz -> vim-8.0.1188.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
-_md5_=50da87e552649e7d58496a5ee0cbb722
+_md5_=20163048fc9ba4a4a01f686d7810fefa
diff --git a/metadata/md5-cache/app-editors/vim-9999 b/metadata/md5-cache/app-editors/vim-9999
index 1a6799ce0f38..2cbdb4440dad 100644
--- a/metadata/md5-cache/app-editors/vim-9999
+++ b/metadata/md5-cache/app-editors/vim-9999
@@ -9,4 +9,4 @@ RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual
 REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
-_md5_=50da87e552649e7d58496a5ee0cbb722
+_md5_=20163048fc9ba4a4a01f686d7810fefa
diff --git a/metadata/md5-cache/app-editors/vim-core-8.0.1188 b/metadata/md5-cache/app-editors/vim-core-8.0.1188
index 555544a88a00..94fbcbbc9c26 100644
--- a/metadata/md5-cache/app-editors/vim-core-8.0.1188
+++ b/metadata/md5-cache/app-editors/vim-core-8.0.1188
@@ -10,4 +10,4 @@ PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.0.1188.tar.gz -> vim-8.0.1188.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
-_md5_=78934684618efacce0df64b10ce6be9c
+_md5_=5e1e501f5020251ce1372135de1c4bb5
diff --git a/metadata/md5-cache/app-editors/vim-core-9999 b/metadata/md5-cache/app-editors/vim-core-9999
index 060fba529fcd..f164d1f00216 100644
--- a/metadata/md5-cache/app-editors/vim-core-9999
+++ b/metadata/md5-cache/app-editors/vim-core-9999
@@ -8,4 +8,4 @@ LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 SLOT=0
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb
-_md5_=78934684618efacce0df64b10ce6be9c
+_md5_=5e1e501f5020251ce1372135de1c4bb5
diff --git a/metadata/md5-cache/app-emacs/ebuild-mode-1.38 b/metadata/md5-cache/app-emacs/ebuild-mode-1.38
index 36def05da3b0..441c23c2e642 100644
--- a/metadata/md5-cache/app-emacs/ebuild-mode-1.38
+++ b/metadata/md5-cache/app-emacs/ebuild-mode-1.38
@@ -3,10 +3,10 @@ DEPEND=sys-apps/texinfo >=virtual/emacs-23
 DESCRIPTION=Emacs modes for editing ebuilds and other Gentoo specific files
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.38.tar.xz
 _eclasses_=elisp	571fd9c6c9d8b71c8461bb9f33e135ab	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
-_md5_=d64789c03e1d3154d8b4ba7b8496d105
+_md5_=b61311f0e8e1b68e4d9842f24d0da0a8
diff --git a/metadata/md5-cache/app-emacs/ebuild-mode-1.39 b/metadata/md5-cache/app-emacs/ebuild-mode-1.39
deleted file mode 100644
index 9c42ce31c6bf..000000000000
--- a/metadata/md5-cache/app-emacs/ebuild-mode-1.39
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=sys-apps/texinfo >=virtual/emacs-23
-DESCRIPTION=Emacs modes for editing ebuilds and other Gentoo specific files
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2+ GPL-3
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.39.tar.xz
-_eclasses_=elisp	571fd9c6c9d8b71c8461bb9f33e135ab	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
-_md5_=5ec6f1c2cb4f2c5442efe6465dc41fcd
diff --git a/metadata/md5-cache/app-emacs/ebuild-mode-1.40 b/metadata/md5-cache/app-emacs/ebuild-mode-1.40
new file mode 100644
index 000000000000..42cbcab66415
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/ebuild-mode-1.40
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=sys-apps/texinfo >=virtual/emacs-23
+DESCRIPTION=Emacs modes for editing ebuilds and other Gentoo specific files
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-2+
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.40.tar.xz
+_eclasses_=elisp	571fd9c6c9d8b71c8461bb9f33e135ab	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
+_md5_=c7fde3fff394b2c9da64a0efb80dfa12
diff --git a/metadata/md5-cache/app-emulation/cloud-init-17.1 b/metadata/md5-cache/app-emulation/cloud-init-17.1
new file mode 100644
index 000000000000..7779b1ac0a5f
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/cloud-init-17.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/oauthlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyserial[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configobj-5.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jsonpatch[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jsonschema[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/httpretty-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/contextlib2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/pkgconfig
+DESCRIPTION=cloud initialisation magic
+EAPI=6
+HOMEPAGE=https://launchpad.net/cloud-init
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/oauthlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyserial[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configobj-5.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jsonpatch[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jsonschema[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-analyzer/macchanger sys-apps/iproute2 sys-fs/growpart virtual/logger python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://launchpad.net/cloud-init/trunk/17.1/+download/cloud-init-17.1.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9255cc2474f12d557111e0909d2eef5e
diff --git a/metadata/md5-cache/app-emulation/docker-machine-0.10.0 b/metadata/md5-cache/app-emulation/docker-machine-0.10.0
deleted file mode 100644
index ee7ca7367bd5..000000000000
--- a/metadata/md5-cache/app-emulation/docker-machine-0.10.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.7:= >=dev-lang/go-1.8
-DESCRIPTION=Machine management for a container-centric world
-EAPI=6
-HOMEPAGE=https://docs.docker.com/machine/
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/docker/machine/archive/v0.10.0.tar.gz -> docker-machine-0.10.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=44b34497d3d86fca8651a906b6f799c3
diff --git a/metadata/md5-cache/app-emulation/docker-machine-0.12.0 b/metadata/md5-cache/app-emulation/docker-machine-0.12.0
deleted file mode 100644
index 7914e5655606..000000000000
--- a/metadata/md5-cache/app-emulation/docker-machine-0.12.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.7:= >=dev-lang/go-1.8
-DESCRIPTION=Machine management for a container-centric world
-EAPI=6
-HOMEPAGE=https://docs.docker.com/machine/
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/docker/machine/archive/v0.12.0.tar.gz -> docker-machine-0.12.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=44b34497d3d86fca8651a906b6f799c3
diff --git a/metadata/md5-cache/app-emulation/docker-machine-0.13.0 b/metadata/md5-cache/app-emulation/docker-machine-0.13.0
new file mode 100644
index 000000000000..b1dfdac2c3cb
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/docker-machine-0.13.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=>=dev-lang/go-1.8
+DESCRIPTION=Machine management for a container-centric world
+EAPI=6
+HOMEPAGE=https://docs.docker.com/machine/
+IUSE=hardened
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/docker/machine/archive/v0.13.0.tar.gz -> docker-machine-0.13.0.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=9155c192aeae1048c3d777989c607e89
diff --git a/metadata/md5-cache/app-emulation/docker-machine-0.9.0 b/metadata/md5-cache/app-emulation/docker-machine-0.9.0
deleted file mode 100644
index 883e5497b4a9..000000000000
--- a/metadata/md5-cache/app-emulation/docker-machine-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.7:= >=dev-lang/go-1.8
-DESCRIPTION=Machine management for a container-centric world
-EAPI=6
-HOMEPAGE=https://docs.docker.com/machine/
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/docker/machine/archive/v0.9.0.tar.gz -> docker-machine-0.9.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=3561bbc7495be21f1cd951992c2d0632
diff --git a/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r3 b/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r3
deleted file mode 100644
index 4d5a444e0a9e..000000000000
--- a/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=X? ( x11-libs/libX11 x11-libs/libXxf86vm x11-libs/libXau x11-libs/libXext x11-libs/libXdmcp x11-apps/xset x11-apps/xlsfonts x11-apps/bdftopcf x11-apps/mkfontdir ) svga? ( media-libs/svgalib ) gpm? ( sys-libs/gpm ) alsa? ( media-libs/alsa-lib ) sndfile? ( media-libs/libsndfile ) fluidsynth? ( media-sound/fluidsynth media-sound/fluid-soundfont ) media-libs/libsdl >=sys-libs/slang-1.4 X? ( x11-proto/xf86dgaproto ) >=sys-devel/autoconf-2.57 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=DOS Emulator
-EAPI=5
-HOMEPAGE=http://www.dosemu.org/
-IUSE=X svga gpm debug alsa sndfile fluidsynth
-KEYWORDS=-* amd64 x86
-LICENSE=GPL-2
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libXxf86vm x11-libs/libXau x11-libs/libXext x11-libs/libXdmcp x11-apps/xset x11-apps/xlsfonts x11-apps/bdftopcf x11-apps/mkfontdir ) svga? ( media-libs/svgalib ) gpm? ( sys-libs/gpm ) alsa? ( media-libs/alsa-lib ) sndfile? ( media-libs/libsndfile ) fluidsynth? ( media-sound/fluidsynth media-sound/fluid-soundfont ) media-libs/libsdl >=sys-libs/slang-1.4
-SLOT=0
-SRC_URI=mirror://sourceforge/dosemu/dosemu-freedos-1.0-bin.tgz https://sourceforge.net/code-snapshots/git/d/do/dosemu/code.git/dosemu-code-15cfb41ff20a052769d753c3262c57ecb050ad71.zip -> dosemu-1.4.1_pre20130107.zip
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=da47fea64265576883c209244f100a66
diff --git a/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r4 b/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r4
index 1ceef6ed04f1..9714b93a995f 100644
--- a/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r4
+++ b/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r4
@@ -4,10 +4,10 @@ DESCRIPTION=DOS Emulator
 EAPI=6
 HOMEPAGE=http://www.dosemu.org/
 IUSE=X svga gpm debug alsa sndfile fluidsynth
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=GPL-2
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libXxf86vm x11-libs/libXau x11-libs/libXext x11-libs/libXdmcp x11-apps/xset x11-apps/xlsfonts x11-apps/bdftopcf x11-apps/mkfontdir ) svga? ( media-libs/svgalib ) gpm? ( sys-libs/gpm ) alsa? ( media-libs/alsa-lib ) sndfile? ( media-libs/libsndfile ) fluidsynth? ( media-sound/fluidsynth media-sound/fluid-soundfont ) media-libs/libsdl >=sys-libs/slang-1.4
 SLOT=0
 SRC_URI=mirror://sourceforge/dosemu/dosemu-freedos-1.0-bin.tgz https://sourceforge.net/code-snapshots/git/d/do/dosemu/code.git/dosemu-code-15cfb41ff20a052769d753c3262c57ecb050ad71.zip -> dosemu-1.4.1_pre20130107.zip
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=1eef3d3bcb8611ab34b2936026d2c97f
+_md5_=9f8360e17242bae7f0505dddafe64d02
diff --git a/metadata/md5-cache/app-emulation/kompose-1.1.0 b/metadata/md5-cache/app-emulation/kompose-1.1.0
deleted file mode 100644
index a935dee81244..000000000000
--- a/metadata/md5-cache/app-emulation/kompose-1.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
-DESCRIPTION=Tool to move from docker-compose to Kubernetes
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kompose https://kompose.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kompose/archive/v1.1.0.tar.gz -> kompose-1.1.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=3f36449a2e94f104c68d3c13a00eb93e
diff --git a/metadata/md5-cache/app-emulation/kompose-1.2.0 b/metadata/md5-cache/app-emulation/kompose-1.2.0
deleted file mode 100644
index 891179cee1bc..000000000000
--- a/metadata/md5-cache/app-emulation/kompose-1.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
-DESCRIPTION=Tool to move from docker-compose to Kubernetes
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kompose https://kompose.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kompose/archive/v1.2.0.tar.gz -> kompose-1.2.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=a58a63169a1c05626f1165e8c862bcea
diff --git a/metadata/md5-cache/app-emulation/libvirt-3.7.0 b/metadata/md5-cache/app-emulation/libvirt-3.7.0
deleted file mode 100644
index 96e8224d5bea..000000000000
--- a/metadata/md5-cache/app-emulation/libvirt-3.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) elibc_glibc? ( sys-libs/glibc[rpc(+)] ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=C toolkit to manipulate virtual machines
-EAPI=6
-HOMEPAGE=http://www.libvirt.org/
-IUSE=apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network wireshark-plugins xen zeroconf zfs elibc_glibc
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) elibc_glibc? ( sys-libs/glibc[rpc(+)] ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs )
-REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
-SLOT=0/3.7.0
-SRC_URI=http://libvirt.org/sources/libvirt-3.7.0.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=5e9e0e7db19141e3ef00bf763d3c12f4
diff --git a/metadata/md5-cache/app-emulation/libvirt-3.8.0-r1 b/metadata/md5-cache/app-emulation/libvirt-3.8.0-r1
new file mode 100644
index 000000000000..82c88cbb91ec
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/libvirt-3.8.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst preinst prepare setup test
+DEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=C toolkit to manipulate virtual machines
+EAPI=6
+HOMEPAGE=http://www.libvirt.org/
+IUSE=apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network wireshark-plugins xen zeroconf zfs
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs )
+REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
+SLOT=0/3.8.0
+SRC_URI=http://libvirt.org/sources/libvirt-3.8.0.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0a7b46e25a98510cc41e20f1d1ff13fe
diff --git a/metadata/md5-cache/app-emulation/libvirt-9999 b/metadata/md5-cache/app-emulation/libvirt-9999
index f0b37fffd25f..fdd3fccaf958 100644
--- a/metadata/md5-cache/app-emulation/libvirt-9999
+++ b/metadata/md5-cache/app-emulation/libvirt-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup test unpack
-DEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) elibc_glibc? ( sys-libs/glibc[rpc(+)] ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig >=dev-vcs/git-1.8.2.1
+DEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig >=dev-vcs/git-1.8.2.1
 DESCRIPTION=C toolkit to manipulate virtual machines
 EAPI=6
 HOMEPAGE=http://www.libvirt.org/
-IUSE=apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network wireshark-plugins xen zeroconf zfs elibc_glibc
+IUSE=apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network wireshark-plugins xen zeroconf zfs
 LICENSE=LGPL-2.1
-RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) elibc_glibc? ( sys-libs/glibc[rpc(+)] ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs )
+RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs )
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	git-r3	52a888802d25387c2c74cb845d1219bc	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=79194699072121f52a5ee2746e5d5951
+_md5_=c5f829914eba9062cd4a1782f93af9fd
diff --git a/metadata/md5-cache/app-emulation/qemu-2.10.0-r1 b/metadata/md5-cache/app-emulation/qemu-2.10.0-r1
new file mode 100644
index 000000000000..53f0336031c3
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/qemu-2.10.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure info install postinst prepare pretend setup test
+DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.2 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) dev-lang/perl =dev-lang/python-2* sys-apps/texinfo virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) gtk? ( nls? ( sys-devel/gettext ) ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2[static-libs(+)] ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.4.2[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11[static-libs(+)] ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2[static-libs(+)] ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:=[static-libs(+)] ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
+DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
+EAPI=6
+HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
+IUSE=accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen xfs qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_armeb qemu_user_targets_hppa qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx python_targets_python2_7 +filecaps linguas_bg linguas_de_DE linguas_fr_FR linguas_hu linguas_it linguas_tr linguas_zh_CN
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-2 LGPL-2 BSD-2
+RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.2 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) selinux? ( sec-policy/selinux-qemu )
+REQUIRED_USE=|| ( python_targets_python2_7 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio ) virtfs? ( xattr ) vte? ( gtk )
+SLOT=0
+SRC_URI=http://wiki.qemu-project.org/download/qemu-2.10.0.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fcaps	e80204189039ecc03f24151c518375f0	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	l10n	2c2e15383ba891d642f51896a7f0ecfe	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=2f2f72922c62ab1fde8c12230da0dcc6
diff --git a/metadata/md5-cache/app-emulation/qemu-2.9.0-r57 b/metadata/md5-cache/app-emulation/qemu-2.9.0-r57
new file mode 100644
index 000000000000..1dd0e989520f
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/qemu-2.9.0-r57
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure info install postinst prepare pretend setup test
+DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.2 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) dev-lang/perl =dev-lang/python-2* sys-apps/texinfo virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) gtk? ( nls? ( sys-devel/gettext ) ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2[static-libs(+)] ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.4.2[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11[static-libs(+)] ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2[static-libs(+)] ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:=[static-libs(+)] ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
+DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
+EAPI=6
+HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
+IUSE=accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen xfs qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_armeb qemu_user_targets_hppa qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx python_targets_python2_7 +filecaps linguas_bg linguas_de_DE linguas_fr_FR linguas_hu linguas_it linguas_tr linguas_zh_CN
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-2 LGPL-2 BSD-2
+RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.2 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) selinux? ( sec-policy/selinux-qemu )
+REQUIRED_USE=|| ( python_targets_python2_7 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio ) virtfs? ( xattr ) vte? ( gtk )
+SLOT=0
+SRC_URI=http://wiki.qemu-project.org/download/qemu-2.9.0.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fcaps	e80204189039ecc03f24151c518375f0	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	l10n	2c2e15383ba891d642f51896a7f0ecfe	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=024873806acda0e600814e93f08974ec
diff --git a/metadata/md5-cache/app-emulation/virt-what-1.18 b/metadata/md5-cache/app-emulation/virt-what-1.18
index 5fbed68f3b0a..bfbc3c690ed1 100644
--- a/metadata/md5-cache/app-emulation/virt-what-1.18
+++ b/metadata/md5-cache/app-emulation/virt-what-1.18
@@ -4,9 +4,9 @@ DESCRIPTION=Detects if the current machine is running in a virtual machine
 EAPI=6
 HOMEPAGE=https://people.redhat.com/~rjones/virt-what/
 IUSE=dmi
-KEYWORDS=~amd64 arm ~hppa ppc ppc64 ~sparc ~x86
+KEYWORDS=~amd64 arm ~hppa ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=app-shells/bash dmi? ( sys-apps/dmidecode )
 SLOT=0
 SRC_URI=https://people.redhat.com/~rjones/virt-what/files/virt-what-1.18.tar.gz
-_md5_=25b88f741471ee3675acce6c2d211382
+_md5_=5651d1e2d8283dbc105ef2f67cd66eab
diff --git a/metadata/md5-cache/app-emulation/wine-staging-2.18 b/metadata/md5-cache/app-emulation/wine-staging-2.18
new file mode 100644
index 000000000000..67672c6c89db
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-staging-2.18
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
+DEPEND=X? ( x11-libs/libXcursor[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[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/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(-)?] x11-libs/libXi[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[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(-)?] ) alsa? ( media-libs/alsa-lib[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(-)?] ) capi? ( net-libs/libcapi[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(-)?] ) cups? ( net-print/cups:=[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(-)?] ) fontconfig? ( media-libs/fontconfig:=[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(-)?] ) gphoto2? ( media-libs/libgphoto2:=[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(-)?] ) gsm? ( media-sound/gsm:=[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(-)?] ) gstreamer? ( media-libs/gstreamer:1.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(-)?] media-plugins/gst-plugins-meta:1.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(-)?] ) jpeg? ( virtual/jpeg: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(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[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(-)?] ) mp3? ( >=media-sound/mpg123-1.5.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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2: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(-)?] ) netapi? ( net-fs/samba[netapi(+),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(-)?] ) nls? ( sys-devel/gettext[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(-)?] ) odbc? ( dev-db/unixODBC:=[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(-)?] ) openal? ( media-libs/openal:=[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? ( virtual/opencl[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(-)?] ) opengl? ( virtual/glu[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/opengl[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(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,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(-)?] ) pcap? ( net-libs/libpcap[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(-)?] ) png? ( media-libs/libpng: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(-)?] ) pulseaudio? ( media-sound/pulseaudio[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(-)?] ) scanner? ( media-gfx/sane-backends:=[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(-)?] ) ssl? ( net-libs/gnutls:=[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(-)?] ) staging? ( sys-apps/attr[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(-)?] ) themes? ( dev-libs/glib: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/cairo[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/gtk+: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(-)?] ) truetype? ( >=media-libs/freetype-2.0.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(-)?] ) udev? ( virtual/libudev:=[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(-)?] ) udisks? ( sys-apps/dbus[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(-)?] ) v4l? ( media-libs/libv4l[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[X,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(-)?] ) xcomposite? ( x11-libs/libXcomposite[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(-)?] ) xinerama? ( x11-libs/libXinerama[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(-)?] ) xml? ( dev-libs/libxml2[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/libxslt[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(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-baselibs-20140508-r14 !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-db-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-medialibs-20140508-r6 !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-opengl-20140508-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-sdl-20140508-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-soundlibs-20140508 !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-xlibs-20140508 ) dev-util/patchbin sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-proto/xineramaproto ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
+EAPI=6
+HOMEPAGE=https://www.winehq.org/
+IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi +X +xcomposite xinerama +xml linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW 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 test
+KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
+LICENSE=LGPL-2.1
+RDEPEND=X? ( x11-libs/libXcursor[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[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/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(-)?] x11-libs/libXi[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[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(-)?] ) alsa? ( media-libs/alsa-lib[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(-)?] ) capi? ( net-libs/libcapi[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(-)?] ) cups? ( net-print/cups:=[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(-)?] ) fontconfig? ( media-libs/fontconfig:=[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(-)?] ) gphoto2? ( media-libs/libgphoto2:=[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(-)?] ) gsm? ( media-sound/gsm:=[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(-)?] ) gstreamer? ( media-libs/gstreamer:1.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(-)?] media-plugins/gst-plugins-meta:1.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(-)?] ) jpeg? ( virtual/jpeg: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(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[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(-)?] ) mp3? ( >=media-sound/mpg123-1.5.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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2: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(-)?] ) netapi? ( net-fs/samba[netapi(+),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(-)?] ) nls? ( sys-devel/gettext[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(-)?] ) odbc? ( dev-db/unixODBC:=[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(-)?] ) openal? ( media-libs/openal:=[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? ( virtual/opencl[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(-)?] ) opengl? ( virtual/glu[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/opengl[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(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,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(-)?] ) pcap? ( net-libs/libpcap[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(-)?] ) png? ( media-libs/libpng: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(-)?] ) pulseaudio? ( media-sound/pulseaudio[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(-)?] ) scanner? ( media-gfx/sane-backends:=[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(-)?] ) ssl? ( net-libs/gnutls:=[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(-)?] ) staging? ( sys-apps/attr[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(-)?] ) themes? ( dev-libs/glib: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/cairo[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/gtk+: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(-)?] ) truetype? ( >=media-libs/freetype-2.0.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(-)?] ) udev? ( virtual/libudev:=[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(-)?] ) udisks? ( sys-apps/dbus[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(-)?] ) v4l? ( media-libs/libv4l[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[X,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(-)?] ) xcomposite? ( x11-libs/libXcomposite[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(-)?] ) xinerama? ( x11-libs/libXinerama[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(-)?] ) xml? ( dev-libs/libxml2[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/libxslt[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(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-baselibs-20140508-r14 !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-db-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-medialibs-20140508-r6 !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-opengl-20140508-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-sdl-20140508-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-soundlibs-20140508 !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] !<app-emulation/emul-linux-x86-xlibs-20140508 ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.7.1 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-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(-)?] ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) pipelight? ( staging ) s3tc? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging )
+RESTRICT=test
+SLOT=2.18
+SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.18.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20170830.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.18.tar.gz -> wine-staging-2.18.tar.gz )
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	2c2e15383ba891d642f51896a7f0ecfe	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=93165c1b0a3730bea587b296ce3c446c
diff --git a/metadata/md5-cache/app-eselect/eselect-postgresql-2.2 b/metadata/md5-cache/app-eselect/eselect-postgresql-2.2
index 6d0714709c03..8d798a51c07c 100644
--- a/metadata/md5-cache/app-eselect/eselect-postgresql-2.2
+++ b/metadata/md5-cache/app-eselect/eselect-postgresql-2.2
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Utility to select the default PostgreSQL slot
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=!<dev-db/postgresql-9.6.2-r1:9.6 !<dev-db/postgresql-9.5.6-r1:9.5 !<dev-db/postgresql-9.4.11-r1:9.4 !<dev-db/postgresql-9.3.16-r1:9.3 !<dev-db/postgresql-9.2.20-r1
 RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~titanofold/eselect-postgresql-2.2.tbz2
-_md5_=1ec3c0f65eea70f9021a9c45eb22c759
+_md5_=2078cebd16817ab92fbd54598a37f4b0
diff --git a/metadata/md5-cache/app-eselect/eselect-ruby-20131227 b/metadata/md5-cache/app-eselect/eselect-ruby-20131227
deleted file mode 100644
index 801a075d0dc8..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-ruby-20131227
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Manages multiple Ruby versions
-EAPI=0
-HOMEPAGE=https://www.gentoo.org
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-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-2
-RDEPEND=>=app-admin/eselect-1.0.2
-SLOT=0
-SRC_URI=http://dev.a3li.li/gentoo/distfiles/ruby.eselect-20131227.bz2
-_md5_=e218cca5498b287355b06c4f10efae3f
diff --git a/metadata/md5-cache/app-i18n/fcitx-anthy-0.2.3 b/metadata/md5-cache/app-i18n/fcitx-anthy-0.2.3
new file mode 100644
index 000000000000..4375fb7f04fb
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/fcitx-anthy-0.2.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-i18n/fcitx-4.2.9:4[X,xml] app-i18n/anthy:= virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DESCRIPTION=Japanese Anthy input methods for Fcitx
+EAPI=6
+HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-anthy
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-i18n/fcitx-4.2.9:4[X,xml] app-i18n/anthy:= virtual/libintl
+SLOT=4
+SRC_URI=https://download.fcitx-im.org/fcitx-anthy/fcitx-anthy-0.2.3.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d09fa058d7d894c3f55d226e220608e0
diff --git a/metadata/md5-cache/app-i18n/fcitx-anthy-4.9999 b/metadata/md5-cache/app-i18n/fcitx-anthy-4.9999
new file mode 100644
index 000000000000..3fd812504fa5
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/fcitx-anthy-4.9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=app-i18n/fcitx-4.2.9:4[X,xml] app-i18n/anthy:= virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Japanese Anthy input methods for Fcitx
+EAPI=6
+HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-anthy
+LICENSE=GPL-2+
+RDEPEND=>=app-i18n/fcitx-4.2.9:4[X,xml] app-i18n/anthy:= virtual/libintl
+SLOT=4
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3518b24115f56018b2448ae469a0831e
diff --git a/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-0.3.5 b/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-0.3.5
new file mode 100644
index 000000000000..0c14ffde0f19
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-0.3.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-i18n/fcitx-4.2.9:4 net-misc/curl:= virtual/libiconv virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Internet look-up support for Chinese Pinyin input methods for Fcitx
+EAPI=6
+HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-cloudpinyin
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-i18n/fcitx-4.2.9:4 net-misc/curl:= virtual/libiconv virtual/libintl
+SLOT=4
+SRC_URI=https://download.fcitx-im.org/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.5.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9c21e06560d6b25e648ce1e696c2e6a2
diff --git a/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-4.9999 b/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-4.9999
new file mode 100644
index 000000000000..f30a2fee7f74
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-4.9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=app-i18n/fcitx-4.2.9:4 net-misc/curl:= virtual/libiconv virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Internet look-up support for Chinese Pinyin input methods for Fcitx
+EAPI=6
+HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-cloudpinyin
+LICENSE=GPL-2+
+RDEPEND=>=app-i18n/fcitx-4.2.9:4 net-misc/curl:= virtual/libiconv virtual/libintl
+SLOT=4
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3ed33899210f20963b924096045a67d7
diff --git a/metadata/md5-cache/app-i18n/fcitx-configtool-0.4.10 b/metadata/md5-cache/app-i18n/fcitx-configtool-0.4.10
index eca9b7903b08..99a2197d3cfe 100644
--- a/metadata/md5-cache/app-i18n/fcitx-configtool-0.4.10
+++ b/metadata/md5-cache/app-i18n/fcitx-configtool-0.4.10
@@ -4,9 +4,9 @@ DESCRIPTION=GTK+ GUI configuration tool for Fcitx
 EAPI=6
 HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-configtool
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2+
+LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk+:3
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/fcitx-configtool/fcitx-configtool-0.4.10.tar.xz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=68aaca793611a4ec46f2948c08664ad8
+_md5_=3479e4d1bab2c9380e19895321df2775
diff --git a/metadata/md5-cache/app-i18n/fcitx-configtool-4.9999 b/metadata/md5-cache/app-i18n/fcitx-configtool-4.9999
index 522d9ebb61d3..b41dd8f9e61e 100644
--- a/metadata/md5-cache/app-i18n/fcitx-configtool-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-configtool-4.9999
@@ -3,8 +3,8 @@ DEPEND=>=app-i18n/fcitx-4.2.9:4 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk+
 DESCRIPTION=GTK+ GUI configuration tool for Fcitx
 EAPI=6
 HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-configtool
-LICENSE=GPL-2+
+LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk+:3
 SLOT=4
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9ebd16307dad62f1251593e80db84a44
+_md5_=2021ccdc069433509f3c194b1767d2bc
diff --git a/metadata/md5-cache/app-i18n/fcitx-hangul-0.3.1 b/metadata/md5-cache/app-i18n/fcitx-hangul-0.3.1
new file mode 100644
index 000000000000..7a5bf28a94cf
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/fcitx-hangul-0.3.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-i18n/fcitx-4.2.9:4 app-i18n/libhangul:= virtual/libiconv virtual/libintl sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DESCRIPTION=Korean Hangul input method for Fcitx
+EAPI=6
+HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-hangul
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-i18n/fcitx-4.2.9:4 app-i18n/libhangul:= virtual/libiconv virtual/libintl
+SLOT=4
+SRC_URI=https://download.fcitx-im.org/fcitx-hangul/fcitx-hangul-0.3.1.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=aacc91d67fdf60f3b0a263ffafab8138
diff --git a/metadata/md5-cache/app-i18n/fcitx-hangul-4.9999 b/metadata/md5-cache/app-i18n/fcitx-hangul-4.9999
new file mode 100644
index 000000000000..a51b58c9857c
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/fcitx-hangul-4.9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=app-i18n/fcitx-4.2.9:4 app-i18n/libhangul:= virtual/libiconv virtual/libintl sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Korean Hangul input method for Fcitx
+EAPI=6
+HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-hangul
+LICENSE=GPL-2+
+RDEPEND=>=app-i18n/fcitx-4.2.9:4 app-i18n/libhangul:= virtual/libiconv virtual/libintl
+SLOT=4
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bbd624e5e7a4b977bdec57f329833b50
diff --git a/metadata/md5-cache/app-i18n/fcitx-qt5-1.1.1 b/metadata/md5-cache/app-i18n/fcitx-qt5-1.1.1
index 59a389c78909..a7de53b30de5 100644
--- a/metadata/md5-cache/app-i18n/fcitx-qt5-1.1.1
+++ b/metadata/md5-cache/app-i18n/fcitx-qt5-1.1.1
@@ -4,9 +4,9 @@ DESCRIPTION=Fcitx input method module for Qt 5
 EAPI=6
 HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5
 KEYWORDS=~amd64 ~hppa ~ppc64 ~x86
-LICENSE=GPL-2+
+LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 virtual/libintl x11-libs/libxkbcommon
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/fcitx-qt5/fcitx-qt5-1.1.1.tar.xz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8366739660ca4dc99080aefa907d7723
+_md5_=f40c5d39c9048425459f8e3408c99ec0
diff --git a/metadata/md5-cache/app-i18n/fcitx-qt5-4.9999 b/metadata/md5-cache/app-i18n/fcitx-qt5-4.9999
index 3b1c16ddb2ae..7ccb731a2ed5 100644
--- a/metadata/md5-cache/app-i18n/fcitx-qt5-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-qt5-4.9999
@@ -3,8 +3,8 @@ DEPEND=>=app-i18n/fcitx-4.2.9:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5=
 DESCRIPTION=Fcitx input method module for Qt 5
 EAPI=6
 HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5
-LICENSE=GPL-2+
+LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 virtual/libintl x11-libs/libxkbcommon
 SLOT=4
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=38cd64d3ed2236ba29932e260794f900
+_md5_=6abd8c0050bfda2bc4abc645da0b0b09
diff --git a/metadata/md5-cache/app-i18n/fcitx-rime-0.3.2 b/metadata/md5-cache/app-i18n/fcitx-rime-0.3.2
new file mode 100644
index 000000000000..0d2c68bc8f42
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/fcitx-rime-0.3.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/librime-1.0.0:= app-i18n/rime-data virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DESCRIPTION=Chinese RIME input method for Fcitx
+EAPI=6
+HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-rime
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/librime-1.0.0:= app-i18n/rime-data virtual/libintl
+SLOT=4
+SRC_URI=https://download.fcitx-im.org/fcitx-rime/fcitx-rime-0.3.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a1810f37309fc44bd1721a7efeeb5b4f
diff --git a/metadata/md5-cache/app-i18n/fcitx-rime-4.9999 b/metadata/md5-cache/app-i18n/fcitx-rime-4.9999
new file mode 100644
index 000000000000..0c53585827a0
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/fcitx-rime-4.9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/librime-1.0.0:= app-i18n/rime-data virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Chinese RIME input method for Fcitx
+EAPI=6
+HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-rime
+LICENSE=GPL-2
+RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/librime-1.0.0:= app-i18n/rime-data virtual/libintl
+SLOT=4
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f9e6cbae59b5c267c9f876339b640358
diff --git a/metadata/md5-cache/app-i18n/fcitx-sunpinyin-0.4.2 b/metadata/md5-cache/app-i18n/fcitx-sunpinyin-0.4.2
new file mode 100644
index 000000000000..c95f3b249ada
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/fcitx-sunpinyin-0.4.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/sunpinyin-2.0.4_alpha:= virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DESCRIPTION=Chinese SunPinyin input method for Fcitx
+EAPI=6
+HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-sunpinyin
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/sunpinyin-2.0.4_alpha:= virtual/libintl
+SLOT=4
+SRC_URI=https://download.fcitx-im.org/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ef5bbcda0922ea34074236e7b168fd6a
diff --git a/metadata/md5-cache/app-i18n/fcitx-sunpinyin-4.9999 b/metadata/md5-cache/app-i18n/fcitx-sunpinyin-4.9999
new file mode 100644
index 000000000000..3bf97d0bd854
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/fcitx-sunpinyin-4.9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/sunpinyin-2.0.4_alpha:= virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Chinese SunPinyin input method for Fcitx
+EAPI=6
+HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-sunpinyin
+LICENSE=GPL-2+
+RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/sunpinyin-2.0.4_alpha:= virtual/libintl
+SLOT=4
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3404fd61c327daa8215e3680bc460c19
diff --git a/metadata/md5-cache/app-i18n/fcitx-table-extra-0.3.8 b/metadata/md5-cache/app-i18n/fcitx-table-extra-0.3.8
new file mode 100644
index 000000000000..fbcb76f59318
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/fcitx-table-extra-0.3.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-i18n/fcitx-4.2.9:4[table] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DESCRIPTION=Extra Chinese table input methods for Fcitx
+EAPI=6
+HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-table-extra
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-i18n/fcitx-4.2.9:4[table]
+SLOT=4
+SRC_URI=https://download.fcitx-im.org/fcitx-table-extra/fcitx-table-extra-0.3.8.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=daeddf26e09b2d63b3525a28af29ea07
diff --git a/metadata/md5-cache/app-i18n/fcitx-table-extra-4.9999 b/metadata/md5-cache/app-i18n/fcitx-table-extra-4.9999
new file mode 100644
index 000000000000..256d3e5ca60b
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/fcitx-table-extra-4.9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=app-i18n/fcitx-4.2.9:4[table] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Extra Chinese table input methods for Fcitx
+EAPI=6
+HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-table-extra
+LICENSE=GPL-2+
+RDEPEND=>=app-i18n/fcitx-4.2.9:4[table]
+SLOT=4
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=67ad54c3efcb134f2f7faa24f19ecd52
diff --git a/metadata/md5-cache/app-i18n/fcitx-unikey-0.2.6 b/metadata/md5-cache/app-i18n/fcitx-unikey-0.2.6
index f32701bcbb54..47c3556f7210 100644
--- a/metadata/md5-cache/app-i18n/fcitx-unikey-0.2.6
+++ b/metadata/md5-cache/app-i18n/fcitx-unikey-0.2.6
@@ -5,9 +5,9 @@ EAPI=6
 HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-unikey
 IUSE=+macro-editor
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2+ GPL-3+
+LICENSE=GPL-2+ GPL-3+ LGPL-2+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 virtual/libintl macro-editor? ( >=app-i18n/fcitx-4.2.9:4[qt4] dev-qt/qtcore:4 dev-qt/qtgui:4 )
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/fcitx-unikey/fcitx-unikey-0.2.6.tar.xz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f633acfa589434bd881a7fb5d09dc685
+_md5_=b7e48bc703f4fbe67f857f86cef6a4c8
diff --git a/metadata/md5-cache/app-i18n/fcitx-unikey-4.9999 b/metadata/md5-cache/app-i18n/fcitx-unikey-4.9999
index db5adff7031f..f691e31d97bf 100644
--- a/metadata/md5-cache/app-i18n/fcitx-unikey-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-unikey-4.9999
@@ -4,8 +4,8 @@ DESCRIPTION=Vietnamese Unikey input methods for Fcitx
 EAPI=6
 HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-unikey
 IUSE=+macro-editor
-LICENSE=GPL-2+ GPL-3+
+LICENSE=GPL-2+ GPL-3+ LGPL-2+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 virtual/libintl macro-editor? ( >=app-i18n/fcitx-qt5-1.1:4 >=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtwidgets-5.7:5 )
 SLOT=4
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2423faad4a9fea3fa5ec510c5ed1d42c
+_md5_=7f54888591e88f1a88090b45aa06b8b8
diff --git a/metadata/md5-cache/app-i18n/libhangul-0.1.0 b/metadata/md5-cache/app-i18n/libhangul-0.1.0
index 4de9a4cf61b8..6fede1b46497 100644
--- a/metadata/md5-cache/app-i18n/libhangul-0.1.0
+++ b/metadata/md5-cache/app-i18n/libhangul-0.1.0
@@ -1,12 +1,12 @@
-DEFINED_PHASES=configure install
-DEPEND=nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check )
-DESCRIPTION=libhangul is a generalized and portable library for processing hangul
-EAPI=4
-HOMEPAGE=https://code.google.com/p/libhangul/
+DEFINED_PHASES=configure install test
+DEPEND=virtual/libiconv nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check )
+DESCRIPTION=Library for hangul input method logic, hanja dictionary
+EAPI=6
+HOMEPAGE=https://github.com/choehwanjin/libhangul
 IUSE=nls static-libs test
 KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=nls? ( virtual/libintl )
-SLOT=0
+LICENSE=LGPL-2.1+
+RDEPEND=virtual/libiconv nls? ( virtual/libintl )
+SLOT=0/1
 SRC_URI=https://libhangul.googlecode.com/files/libhangul-0.1.0.tar.gz
-_md5_=c760f8e27f942ed2e945b9b0f72df8a1
+_md5_=6e46444416fafce43166ce0e73d43376
diff --git a/metadata/md5-cache/app-i18n/librime-1.2 b/metadata/md5-cache/app-i18n/librime-1.2
index 5d5bc2d667d0..836a8a4327f8 100644
--- a/metadata/md5-cache/app-i18n/librime-1.2
+++ b/metadata/md5-cache/app-i18n/librime-1.2
@@ -7,7 +7,7 @@ IUSE=static-libs test
 KEYWORDS=amd64 ~ppc ppc64 ~x86
 LICENSE=GPL-3
 RDEPEND=app-i18n/opencc:= dev-cpp/glog >=dev-cpp/yaml-cpp-0.5.0 dev-db/kyotocabinet dev-libs/marisa >=dev-libs/boost-1.46.0[threads(+)] sys-libs/zlib x11-proto/xproto
-SLOT=0
+SLOT=0/1
 SRC_URI=http://dl.bintray.com/lotem/rime/librime-1.2.tar.gz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=4406fccab65d3a5a26acffbb4f66abb0
+_md5_=b58b83c9eb777fffe78197f51ccafac6
diff --git a/metadata/md5-cache/app-i18n/librime-1.2.9 b/metadata/md5-cache/app-i18n/librime-1.2.9
index 23dab9ad1e74..7a4b54a904cd 100644
--- a/metadata/md5-cache/app-i18n/librime-1.2.9
+++ b/metadata/md5-cache/app-i18n/librime-1.2.9
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>app-i18n/opencc-1.0.2:= dev-cpp/glog >=dev-cpp/yaml-cpp-0.5.0 dev-db/kyotocabinet dev-libs/leveldb dev-libs/marisa >=dev-libs/boost-1.46.0[threads(+)] sys-libs/zlib x11-proto/xproto test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=app-i18n/opencc:= dev-cpp/glog:= >=dev-cpp/yaml-cpp-0.5.0:= >=dev-libs/boost-1.46.0:=[threads] dev-libs/leveldb:= dev-libs/marisa:= x11-proto/xproto test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=Rime Input Method Engine library
-EAPI=5
-HOMEPAGE=http://rime.im/
+EAPI=6
+HOMEPAGE=http://rime.im/ https://github.com/rime/librime
 IUSE=static-libs test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-3
-RDEPEND=>app-i18n/opencc-1.0.2:= dev-cpp/glog >=dev-cpp/yaml-cpp-0.5.0 dev-db/kyotocabinet dev-libs/leveldb dev-libs/marisa >=dev-libs/boost-1.46.0[threads(+)] sys-libs/zlib
-SLOT=0
+RDEPEND=app-i18n/opencc:= dev-cpp/glog:= >=dev-cpp/yaml-cpp-0.5.0:= >=dev-libs/boost-1.46.0:=[threads] dev-libs/leveldb:= dev-libs/marisa:=
+SLOT=0/1
 SRC_URI=https://github.com/rime/librime/archive/rime-1.2.9.tar.gz -> librime-1.2.9.tar.gz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=3eb34654b356fa77065951e176937c1d
+_md5_=58634a7dc524740357e539c533fc97a4
diff --git a/metadata/md5-cache/app-i18n/mozc-2.20.2673.102 b/metadata/md5-cache/app-i18n/mozc-2.20.2673.102
index dbe37d2c71f7..90bcb8ef5c27 100644
--- a/metadata/md5-cache/app-i18n/mozc-2.20.2673.102
+++ b/metadata/md5-cache/app-i18n/mozc-2.20.2673.102
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting
 SLOT=0
 SRC_URI=https://github.com/google/mozc/archive/280e38fe3d9db4df52f0713acf2ca65898cd697a.tar.gz -> mozc-2.20.2673.102.tar.gz https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/e5b3425575734c323e1d947009dd74709437b684.tar.gz -> japanese-usage-dictionary-20120416091336.tar.gz fcitx4? ( https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-2.18.2612.102.1.patch )
 _eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=f719db4c4c809d7ff780bdc3784669fa
+_md5_=edc02d877dab8789744d5288275f5d74
diff --git a/metadata/md5-cache/app-i18n/mozc-9999 b/metadata/md5-cache/app-i18n/mozc-9999
index f6f0592e8156..44c220b8e77c 100644
--- a/metadata/md5-cache/app-i18n/mozc-9999
+++ b/metadata/md5-cache/app-i18n/mozc-9999
@@ -10,4 +10,4 @@ REQUIRED_USE=|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting
 SLOT=0
 SRC_URI=fcitx4? ( https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-2.18.2612.102.1.patch )
 _eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	git-r3	52a888802d25387c2c74cb845d1219bc	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=5dbbc4cdc3271bfdb9f9fb823b30da01
+_md5_=bed0337489416596919692137cfe6165
diff --git a/metadata/md5-cache/app-i18n/rime-data-0.35 b/metadata/md5-cache/app-i18n/rime-data-0.35
index df8b7b91408e..1870f9a884b8 100644
--- a/metadata/md5-cache/app-i18n/rime-data-0.35
+++ b/metadata/md5-cache/app-i18n/rime-data-0.35
@@ -1,12 +1,11 @@
-DEFINED_PHASES=unpack
+DEFINED_PHASES=-
 DEPEND=app-i18n/librime
 DESCRIPTION=Data resources for Rime Input Method Engine
-EAPI=5
-HOMEPAGE=http://rime.im/
+EAPI=6
+HOMEPAGE=http://rime.im/ https://github.com/rime/brise
 KEYWORDS=amd64 ~ppc ppc64 x86
 LICENSE=GPL-3
 RDEPEND=app-i18n/librime
 SLOT=0
-SRC_URI=http://dl.bintray.com/lotem/rime/brise-0.35.tar.gz
-_eclasses_=vcs-snapshot	03289f51c769cf409d200d2d628cdd6e
-_md5_=ff37c332802c9d046286cc9994ac35af
+SRC_URI=https://dl.bintray.com/lotem/rime/brise-0.35.tar.gz
+_md5_=dfbca7c8153ba305ac7bc7784f7b5c3f
diff --git a/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20130108 b/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20130108
deleted file mode 100644
index d4c001666e17..000000000000
--- a/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20130108
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-db/sqlite:3 || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig dev-util/scons
-DESCRIPTION=A Statistical Language Model based Chinese input method library
-EAPI=5
-HOMEPAGE=https://github.com/sunpinyin/sunpinyin
-KEYWORDS=amd64 ~ppc ppc64 ~x86
-LICENSE=LGPL-2.1 CDDL
-PDEPEND=app-i18n/sunpinyin-data
-RDEPEND=dev-db/sqlite:3
-SLOT=0/1
-SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/sunpinyin-2.0.4_pre20130108.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	scons-utils	fcace052aef60e6b0eb3023c26aa585a	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=6071b7eaaf2ba71aecde02979a9827b5
diff --git a/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20130108-r1 b/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20130108-r1
index 268d08a27c65..9bfacd35c06b 100644
--- a/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20130108-r1
+++ b/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20130108-r1
@@ -7,7 +7,7 @@ KEYWORDS=amd64 ~ppc ppc64 ~x86
 LICENSE=LGPL-2.1 CDDL
 PDEPEND=app-i18n/sunpinyin-data
 RDEPEND=dev-db/sqlite:3
-SLOT=0/1
+SLOT=0/3
 SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/sunpinyin-2.0.4_pre20130108.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	scons-utils	fcace052aef60e6b0eb3023c26aa585a	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=87cbfe3ca58e00a8f6a683ba36c4b3f1
+_md5_=e8a4d2809af5c137dc0453bf2d39daae
diff --git a/metadata/md5-cache/app-misc/freemind-1.0.1-r2 b/metadata/md5-cache/app-misc/freemind-1.0.1-r2
deleted file mode 100644
index b0aeaf742835..000000000000
--- a/metadata/md5-cache/app-misc/freemind-1.0.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/javahelp:0 dev-java/jgoodies-forms:0 dev-java/jibx:0 dev-java/jortho:0 >=dev-java/simplyhtml-0.13.1:0 groovy? ( dev-java/groovy ) latex? ( dev-java/hoteqn:0 ) pdf? ( dev-java/batik:1.8 dev-java/fop:0 ) svg? ( dev-java/batik:1.8 dev-java/fop:0 ) >=virtual/jdk-1.6 pdf? ( dev-java/avalon-framework:4.2 ) svg? ( dev-java/avalon-framework:4.2 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Mind-mapping software written in Java
-EAPI=5
-HOMEPAGE=http://freemind.sourceforge.net
-IUSE=groovy latex pdf svg elibc_FreeBSD doc elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-java/javahelp:0 dev-java/jgoodies-forms:0 dev-java/jibx:0 dev-java/jortho:0 >=dev-java/simplyhtml-0.13.1:0 groovy? ( dev-java/groovy ) latex? ( dev-java/hoteqn:0 ) pdf? ( dev-java/batik:1.8 dev-java/fop:0 ) svg? ( dev-java/batik:1.8 dev-java/fop:0 ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://sourceforge/freemind/freemind-src-1.0.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c71814550c0962d2d4cdcf471d1b013b
diff --git a/metadata/md5-cache/app-misc/freemind-1.0.1-r3 b/metadata/md5-cache/app-misc/freemind-1.0.1-r3
new file mode 100644
index 000000000000..736a78fe62b4
--- /dev/null
+++ b/metadata/md5-cache/app-misc/freemind-1.0.1-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=dev-java/javahelp:0 dev-java/jgoodies-forms:0 dev-java/jibx:0 dev-java/jortho:0 >=dev-java/simplyhtml-0.13.1:0 groovy? ( dev-java/groovy ) latex? ( dev-java/hoteqn:0 ) pdf? ( dev-java/batik:1.9 dev-java/fop:0 ) svg? ( dev-java/batik:1.9 dev-java/fop:0 ) >=virtual/jdk-1.6 pdf? ( dev-java/avalon-framework:4.2 ) svg? ( dev-java/avalon-framework:4.2 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Mind-mapping software written in Java
+EAPI=5
+HOMEPAGE=http://freemind.sourceforge.net
+IUSE=groovy latex pdf svg elibc_FreeBSD doc elibc_FreeBSD
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=dev-java/javahelp:0 dev-java/jgoodies-forms:0 dev-java/jibx:0 dev-java/jortho:0 >=dev-java/simplyhtml-0.13.1:0 groovy? ( dev-java/groovy ) latex? ( dev-java/hoteqn:0 ) pdf? ( dev-java/batik:1.9 dev-java/fop:0 ) svg? ( dev-java/batik:1.9 dev-java/fop:0 ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
+SLOT=0
+SRC_URI=mirror://sourceforge/freemind/freemind-src-1.0.1.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0df7525279b5f762f28253cb56571fe8
diff --git a/metadata/md5-cache/app-misc/gourmet-0.17.4-r2 b/metadata/md5-cache/app-misc/gourmet-0.17.4-r2
index df787a3d22d6..f2c800235086 100644
--- a/metadata/md5-cache/app-misc/gourmet-0.17.4-r2
+++ b/metadata/md5-cache/app-misc/gourmet-0.17.4-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Recipe Organizer and Shopping List Generator for Gnome
 EAPI=5
 HOMEPAGE=https://thinkle.github.com/gourmet/
 IUSE=-i18n -ipython pdf print spell sound web python_targets_python2_7
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-python/pygtk-2.22.0:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-0.7.9-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] i18n? ( dev-python/elib-intl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ipython? ( >=dev-python/ipython-0.13.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) pdf? ( >=dev-python/reportlab-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-poppler-0.12.1-r4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) print? ( >=dev-python/reportlab-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-poppler-0.12.1-r4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) spell? ( >=dev-python/gtkspell-python-2.25.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sound? ( dev-python/pyglet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) web? ( >=dev-python/beautifulsoup-3.2.1-r1:python-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/thinkle/gourmet/archive/0.17.4.tar.gz -> gourmet-0.17.4.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=179125103c78cf4bb5bf19bdd8cb85e0
+_md5_=32b3c320f718b00018a6a883ef169707
diff --git a/metadata/md5-cache/app-misc/icdiff-1.9.1 b/metadata/md5-cache/app-misc/icdiff-1.9.1
new file mode 100644
index 000000000000..48f0c13e06c0
--- /dev/null
+++ b/metadata/md5-cache/app-misc/icdiff-1.9.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Colourized diff that supports side-by-side diffing
+EAPI=6
+HOMEPAGE=http://www.jefftk.com/icdiff
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64
+LICENSE=PSF-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://github.com/jeffkaufman/icdiff/archive/release-1.9.1.tar.gz -> icdiff-1.9.1.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=474abe553c5be66db1f8b828b35b5a59
diff --git a/metadata/md5-cache/app-misc/mvcase-0.1-r2 b/metadata/md5-cache/app-misc/mvcase-0.1-r2
new file mode 100644
index 000000000000..21b6e723af7d
--- /dev/null
+++ b/metadata/md5-cache/app-misc/mvcase-0.1-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-libs/shhopt
+DESCRIPTION=A modified version of mv, used to convert filenames to lower/upper case
+EAPI=6
+HOMEPAGE=http://www.ibiblio.org/pub/Linux/utils/file
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/shhopt
+SLOT=0
+SRC_URI=http://www.ibiblio.org/pub/Linux/utils/file/mvcase-0.1.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=ce436d39627a3deba8b73fe9e31c0619
diff --git a/metadata/md5-cache/app-misc/screen-4.6.2 b/metadata/md5-cache/app-misc/screen-4.6.2
new file mode 100644
index 000000000000..fa9acd08173f
--- /dev/null
+++ b/metadata/md5-cache/app-misc/screen-4.6.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=sys-libs/ncurses-5.2:0= pam? ( virtual/pam ) sys-apps/texinfo >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=screen manager with VT100/ANSI terminal emulation
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/screen/
+IUSE=debug nethack pam selinux multiuser
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/ncurses-5.2:0= pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen )
+SLOT=0
+SRC_URI=mirror://gnu/screen/screen-4.6.2.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
+_md5_=7a0df15587a002538e47086eb0fd2a7f
diff --git a/metadata/md5-cache/app-misc/spacenavd-0.6 b/metadata/md5-cache/app-misc/spacenavd-0.6
index f5c47abc4d99..82ba44ba11ff 100644
--- a/metadata/md5-cache/app-misc/spacenavd-0.6
+++ b/metadata/md5-cache/app-misc/spacenavd-0.6
@@ -4,10 +4,10 @@ DESCRIPTION=The spacenavd daemon provides free alternative to the 3dxserv daemon
 EAPI=5
 HOMEPAGE=http://spacenav.sourceforge.net/
 IUSE=X
-KEYWORDS=~amd64 ppc64 ~x86
+KEYWORDS=~amd64 ppc64 x86
 LICENSE=GPL-3
 RDEPEND=X? ( x11-apps/xdpyinfo )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/spacenav/spacenav%20daemon/spacenavd%200.6/spacenavd-0.6.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=faecb503bee15e65e069193041464ec7
+_md5_=8f2371972191484e8a29043e3ab6e350
diff --git a/metadata/md5-cache/app-misc/sphinx-0.9.9 b/metadata/md5-cache/app-misc/sphinx-0.9.9
deleted file mode 100644
index 28cb0b889669..000000000000
--- a/metadata/md5-cache/app-misc/sphinx-0.9.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) test? ( dev-lang/php ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Full-text search engine with support for MySQL and PostgreSQL
-EAPI=2
-HOMEPAGE=http://www.sphinxsearch.com/
-IUSE=debug id64 mysql postgres stemmer test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://sphinxsearch.com/downloads/sphinx-0.9.9.tar.gz stemmer? ( mirror://gentoo/libstemmer_c-20091122.tgz )
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=c1de9a79334fe53b50f05d9b090714f9
diff --git a/metadata/md5-cache/app-misc/ttyrec-1.0.8-r2 b/metadata/md5-cache/app-misc/ttyrec-1.0.8-r2
index ad5cf20d31d8..c57d412633ed 100644
--- a/metadata/md5-cache/app-misc/ttyrec-1.0.8-r2
+++ b/metadata/md5-cache/app-misc/ttyrec-1.0.8-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=ttyrec provides tools to record and replay a terminal session
 EAPI=6
 HOMEPAGE=http://0xcc.net/ttyrec/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://0xcc.net/ttyrec/ttyrec-1.0.8.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=67399aa4c58299483c0499baab71aec8
+_md5_=082458e8957eb8ec0f2a4add0879c4c9
diff --git a/metadata/md5-cache/app-office/calligra-3.0.1 b/metadata/md5-cache/app-office/calligra-3.0.1
index c0465968a383..c61b0d8e3470 100644
--- a/metadata/md5-cache/app-office/calligra-3.0.1
+++ b/metadata/md5-cache/app-office/calligra-3.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcmutils-5.37.0:5 >=
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/calligra/3.0.1/calligra-3.0.1.tar.xz
-_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=45c732c36b0d8571a00b8370f8f0b5a7
diff --git a/metadata/md5-cache/app-office/kexi-3.0.2 b/metadata/md5-cache/app-office/kexi-3.0.2
index 2fc86d9c3057..d60c44e69357 100644
--- a/metadata/md5-cache/app-office/kexi-3.0.2
+++ b/metadata/md5-cache/app-office/kexi-3.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/ktexteditor-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/designer-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-db/kdb-3.0.2[mysql?,postgres?,sqlite?] dev-libs/kproperty dev-libs/kreport marble? ( >=kde-apps/marble-14.12.0:5 ) mdb? ( dev-libs/glib:2 virtual/libiconv ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:* dev-libs/libpqxx ) webkit? ( >=dev-qt/qtwebkit-5.7.1:5 ) >=kde-frameworks/breeze-icons-rcc-5.37.0:5 !app-office/calligra:4[calligra_features_kexi] !app-office/calligra-l10n:4[calligra_features_kexi(+)] >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kexi/src/kexi-3.0.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=98421e59861e535bf7f403e246d76a4e
diff --git a/metadata/md5-cache/app-office/kmymoney-4.8.0-r2 b/metadata/md5-cache/app-office/kmymoney-4.8.0-r2
index 4f1e356214c2..31f4050b1dcb 100644
--- a/metadata/md5-cache/app-office/kmymoney-4.8.0-r2
+++ b/metadata/md5-cache/app-office/kmymoney-4.8.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-crypt/gpgme-1.7.0[cxx] <app-office/libalkimia-6.0.0 dev-libs/gmp:0= dev-libs/libgpg-error x11-misc/shared-mime-info calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.5.1 >=sys-libs/gwenhywfar-4.15.3[qt4] ) ofx? ( >=dev-libs/libofx-0.9.4 ) weboob? ( www-client/weboob ) quotes? ( dev-perl/Finance-Quote ) kde-frameworks/oxygen-icons l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[l10n_bs(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[l10n_en-GB(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[l10n_et(+)] ) l10n_eu? ( >=kde-apps/kde4-l10n-4.4:4[l10n_eu(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fr(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_gl(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hu(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[l10n_it(+)] ) l10n_kk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_kk(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sk(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-TW(+)] ) handbook? ( kde-frameworks/kdelibs:4[handbook] ) >=dev-qt/qtsql-4.8.5:4 dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4
 SRC_URI=mirror://kde/stable/kmymoney/4.8.0/src/kmymoney-4.8.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=692b662346dafcf6275bb0f603325338
diff --git a/metadata/md5-cache/app-office/kraft-0.59 b/metadata/md5-cache/app-office/kraft-0.59
index e927e4885d6e..fe108c721f46 100644
--- a/metadata/md5-cache/app-office/kraft-0.59
+++ b/metadata/md5-cache/app-office/kraft-0.59
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/ctemplate dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsql:4[mysql,sqlite] >=kde-apps/kdepimlibs-4.4:4 kde-frameworks/oxygen-icons l10n_ast? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ast(+)] ) l10n_bg? ( >=kde-apps/kde4-l10n-4.4:4[l10n_bg(+)] ) l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[l10n_bs(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[l10n_de(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[l10n_en-GB(+)] ) l10n_eo? ( >=kde-apps/kde4-l10n-4.4:4[l10n_eo(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[l10n_et(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_gl(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hu(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ja(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[l10n_lt(+)] ) l10n_mai? ( >=kde-apps/kde4-l10n-4.4:4[l10n_mai(+)] ) l10n_mr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_mr(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt-BR(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sk(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_tr(+)] ) l10n_ug? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ug(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-CN(+)] ) >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtsql-4.8.5:4[qt3support] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
 SLOT=4
 SRC_URI=mirror://sourceforge/kraft/kraft-0.59.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=468899e65e1a29f1ae18a11f3d45e368
diff --git a/metadata/md5-cache/app-office/ledger-3.1.1 b/metadata/md5-cache/app-office/ledger-3.1.1
index 166b1f8f39c9..c9143278a1b0 100644
--- a/metadata/md5-cache/app-office/ledger-3.1.1
+++ b/metadata/md5-cache/app-office/ledger-3.1.1
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ledger/ledger/archive/v3.1.1.tar.gz -> ledger-3.1.1.tar.gz
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=7a81c1dce1b9913ff7d1edadabd69a41
+_md5_=a6599270abf6d0d5dc719ceacdece40a
diff --git a/metadata/md5-cache/app-office/libreoffice-5.2.7.2 b/metadata/md5-cache/app-office/libreoffice-5.2.7.2
index 5c73503357b5..f0bb79ebf444 100644
--- a/metadata/md5-cache/app-office/libreoffice-5.2.7.2
+++ b/metadata/md5-cache/app-office/libreoffice-5.2.7.2
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) bluetooth? ( dbus ) collada? ( gltf ) eds? ( gnome ) gnome? ( gtk ) telepathy? ( gtk ) 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-5.2.7.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-5.2.7.2.tar.xz https://download.documentfoundation.org/libreoffice/src/5.2.7//libreoffice-5.2.7.2.tar.xz https://download.documentfoundation.org/libreoffice/src/5.2.7//libreoffice-help-5.2.7.2.tar.xz https://download.documentfoundation.org/libreoffice/old/5.2.7.2//libreoffice-5.2.7.2.tar.xz https://download.documentfoundation.org/libreoffice/old/5.2.7.2//libreoffice-help-5.2.7.2.tar.xz https://dev-www.libreoffice.org/src//ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz collada? ( https://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) 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	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	check-reqs	bd050ce908e4637604ee604ed4b78e8f	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	check-reqs	bd050ce908e4637604ee604ed4b78e8f	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8f88a1061c6d45e4db802881adb55edc
diff --git a/metadata/md5-cache/app-office/libreoffice-5.4.2.2 b/metadata/md5-cache/app-office/libreoffice-5.4.2.2
index 6bed6a45e025..82c7ee636c32 100644
--- a/metadata/md5-cache/app-office/libreoffice-5.4.2.2
+++ b/metadata/md5-cache/app-office/libreoffice-5.4.2.2
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) bluetooth? ( dbus ) collada? ( gltf ) eds? ( gnome ) gnome? ( gtk ) 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-5.4.2.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-5.4.2.2.tar.xz https://download.documentfoundation.org/libreoffice/src/5.4.2//libreoffice-5.4.2.2.tar.xz https://download.documentfoundation.org/libreoffice/src/5.4.2//libreoffice-help-5.4.2.2.tar.xz https://download.documentfoundation.org/libreoffice/old/5.4.2.2//libreoffice-5.4.2.2.tar.xz https://download.documentfoundation.org/libreoffice/old/5.4.2.2//libreoffice-help-5.4.2.2.tar.xz collada? ( https://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) 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	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	check-reqs	bd050ce908e4637604ee604ed4b78e8f	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	check-reqs	bd050ce908e4637604ee604ed4b78e8f	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0ef779a1f54afc4475906d5747cc6a0a
diff --git a/metadata/md5-cache/app-office/libreoffice-5.4.9999 b/metadata/md5-cache/app-office/libreoffice-5.4.9999
index 2f3a2bfb9093..b7d0d430cf06 100644
--- a/metadata/md5-cache/app-office/libreoffice-5.4.9999
+++ b/metadata/md5-cache/app-office/libreoffice-5.4.9999
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) bluetooth? ( dbus ) collada? ( gltf ) eds? ( gnome ) gnome? ( gtk ) 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 ) collada? ( https://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) 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	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	check-reqs	bd050ce908e4637604ee604ed4b78e8f	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	check-reqs	bd050ce908e4637604ee604ed4b78e8f	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3aa1c412f8c47b356492da05040099f3
diff --git a/metadata/md5-cache/app-office/libreoffice-9999 b/metadata/md5-cache/app-office/libreoffice-9999
index 4d608c25aec9..610aa9e80941 100644
--- a/metadata/md5-cache/app-office/libreoffice-9999
+++ b/metadata/md5-cache/app-office/libreoffice-9999
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[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] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] 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/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 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:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.12* dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] 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 >=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 net-nds/openldap sci-mathematics/lpsolve x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/jpeg:0 virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( media-libs/opencollada ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 ) gltf? ( >=media-libs/libgltf-0.1.0 ) gnome? ( gnome-base/dconf ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !<sys-devel/make-3.82 >=dev-libs/libatomic_ops-7.2d >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.2.2:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp sys-libs/zlib virtual/pkgconfig x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( dev-util/cppunit media-fonts/dejavu ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1 kde? ( dev-util/automoc virtual/pkgconfig >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) kde? ( dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4 )
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[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] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] 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/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:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.12* dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] 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 >=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 net-nds/openldap sci-mathematics/lpsolve x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/jpeg:0 virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( media-libs/opencollada ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 ) gltf? ( >=media-libs/libgltf-0.1.0 ) gnome? ( gnome-base/dconf ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !<sys-devel/make-3.82 >=dev-libs/libatomic_ops-7.2d >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.2.2:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp sys-libs/zlib virtual/pkgconfig x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( dev-util/cppunit media-fonts/dejavu ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1 kde? ( dev-util/automoc virtual/pkgconfig >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) kde? ( dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4 )
 DESCRIPTION=A full office productivity suite
 EAPI=6
 HOMEPAGE=https://www.libreoffice.org
 IUSE=bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java kde python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 PDEPEND=!app-office/libreoffice-l10n
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[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] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] 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/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 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:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.12* dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] 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 >=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 net-nds/openldap sci-mathematics/lpsolve x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/jpeg:0 virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( media-libs/opencollada ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 ) gltf? ( >=media-libs/libgltf-0.1.0 ) gnome? ( gnome-base/dconf ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( 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/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 ) kde? ( kde-frameworks/oxygen-icons ) kde? ( dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[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] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] 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/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:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.12* dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] 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 >=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 net-nds/openldap sci-mathematics/lpsolve x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/jpeg:0 virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( media-libs/opencollada ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 ) gltf? ( >=media-libs/libgltf-0.1.0 ) gnome? ( gnome-base/dconf ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( 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/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 ) kde? ( kde-frameworks/oxygen-icons ) kde? ( dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4 )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) bluetooth? ( dbus ) collada? ( gltf ) eds? ( gnome ) gnome? ( gtk ) 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-www.libreoffice.org/src//libepubgen-0.0.1.tar.bz2 collada? ( https://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) 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	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	check-reqs	bd050ce908e4637604ee604ed4b78e8f	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dc67347c44d5621489c6fd14a10ce4e7
+SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) collada? ( https://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) 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	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	check-reqs	bd050ce908e4637604ee604ed4b78e8f	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ab26a7e05112f6a94db51eeb8d189b48
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-5.2.7.2 b/metadata/md5-cache/app-office/libreoffice-bin-5.2.7.2
index 30cad0fd60b7..b3bb1923607d 100644
--- a/metadata/md5-cache/app-office/libreoffice-bin-5.2.7.2
+++ b/metadata/md5-cache/app-office/libreoffice-bin-5.2.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=kde? ( !gnome ) gnome? ( !kde ) ^^ ( python_single_target_python2_7
 RESTRICT=test strip
 SLOT=0
 SRC_URI=amd64? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-5.2.7.2.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-5.2.7.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-java-5.2.7.2.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-5.2.7.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-java-5.2.7.2.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-java-5.2.7.2.xd3 ) ) ) ) x86? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-5.2.7.2.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-5.2.7.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-java-5.2.7.2.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-5.2.7.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-java-5.2.7.2.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-java-5.2.7.2.xd3 ) ) ) )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3aa6fc1e6c566e288e9f12ad727f11a5
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-5.2.7.2-r1 b/metadata/md5-cache/app-office/libreoffice-bin-5.2.7.2-r1
index 2b0d509a9850..69a2a32e0f45 100644
--- a/metadata/md5-cache/app-office/libreoffice-bin-5.2.7.2-r1
+++ b/metadata/md5-cache/app-office/libreoffice-bin-5.2.7.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=kde? ( !gnome ) gnome? ( !kde ) ^^ ( python_single_target_python2_7
 RESTRICT=test strip
 SLOT=0
 SRC_URI=amd64? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-5.2.7.2-r1.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-5.2.7.2-r1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-java-5.2.7.2-r1.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-5.2.7.2-r1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-java-5.2.7.2-r1.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-java-5.2.7.2-r1.xd3 ) ) ) ) x86? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-5.2.7.2-r1.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-5.2.7.2-r1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-java-5.2.7.2-r1.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-5.2.7.2-r1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-java-5.2.7.2-r1.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-java-5.2.7.2-r1.xd3 ) ) ) )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fe8d3ad77a352a94e558a351a46d4556
diff --git a/metadata/md5-cache/app-office/lyx-2.2.3-r1 b/metadata/md5-cache/app-office/lyx-2.2.3-r1
index ae1c9990cdcc..0dcf9436bfbd 100644
--- a/metadata/md5-cache/app-office/lyx-2.2.3-r1
+++ b/metadata/md5-cache/app-office/lyx-2.2.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=WYSIWYM frontend for LaTeX, DocBook, etc.
 EAPI=6
 HOMEPAGE=https://www.lyx.org/
 IUSE=aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls +qt5 rcs rtf subversion svg linguas_ar linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_es linguas_eu linguas_fi linguas_fr linguas_gl linguas_he linguas_hu linguas_ia linguas_id linguas_it linguas_ja linguas_nb linguas_nn linguas_pl linguas_pt_BR linguas_pt_PT linguas_ro linguas_ru linguas_sk linguas_sr linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW X python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~hppa ia64 ppc ppc64 ~sparc ~x86 ~x64-macos ~x86-macos
+KEYWORDS=alpha ~amd64 ~hppa ia64 ppc ppc64 ~sparc ~x86 ~x64-macos ~x86-macos
 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/boost:= dev-texlive/texlive-fontsextra sys-apps/file sys-libs/zlib virtual/imagemagick-tools[png,svg?] aspell? ( app-text/aspell ) cups? ( net-print/cups ) dia? ( app-office/dia ) docbook? ( app-text/sgmltools-lite ) dot? ( media-gfx/graphviz ) enchant? ( app-text/enchant ) gnumeric? ( app-office/gnumeric ) html? ( dev-tex/html2latex ) hunspell? ( app-text/hunspell ) latex? ( app-text/dvipng app-text/ghostscript-gpl app-text/noweb app-text/ps2eps app-text/texlive dev-tex/chktex dev-tex/dvipost dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-pictures || ( dev-texlive/texlive-mathscience dev-texlive/texlive-science ) || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericextra ) || ( dev-tex/hevea dev-tex/latex2html dev-tex/tex4ht[java] dev-tex/tth ) ) linguas_he? ( dev-tex/culmus-latex ) !qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) rcs? ( dev-vcs/rcs ) rtf? ( app-text/unrtf dev-tex/html2latex dev-tex/latex2rtf ) subversion? ( dev-vcs/subversion ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/lyx-2.2.3.tar.xz ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.2/lyx-2.2.3/lyx-2.2.3.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	font	82836641e7d4639329d8c195234ad0e3	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2068715f48b932e18a734e4b519ad5a1
+_md5_=3e592c69aa87ff7538401f491f95a608
diff --git a/metadata/md5-cache/app-office/openerp-7.0.20140125 b/metadata/md5-cache/app-office/openerp-7.0.20140125
index 1d997fe9cc47..50668036d8c5 100644
--- a/metadata/md5-cache/app-office/openerp-7.0.20140125
+++ b/metadata/md5-cache/app-office/openerp-7.0.20140125
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile config configure install postinst preinst prepare setup test
-DEPEND=!app-office/openerp-web postgres? ( dev-db/postgresql[server] ) dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pychart[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/reportlab[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pydot[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/vobject[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/mako[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/Babel[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/gdata[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-python/python-openid[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/werkzeug[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/xlwt[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/feedparser[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pywebdav[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ssl? ( dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-python/vatnumber[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/zsi[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/unittest2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pillow[jpeg,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
+DEPEND=!app-office/openerp-web postgres? ( dev-db/postgresql[server] ) dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pychart[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/reportlab[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pydot[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/vobject[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/mako[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/Babel[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/gdata[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-python/python-openid[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/werkzeug[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/xlwt[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/feedparser[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pywebdav[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ssl? ( dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-python/vatnumber[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/zsi[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/unittest2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pillow[jpeg(+),python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
 DESCRIPTION=Open Source ERP & CRM
 EAPI=5
 HOMEPAGE=http://www.openerp.com/
 IUSE=+postgres ldap ssl python_targets_python2_7
 KEYWORDS=~x86 ~amd64
 LICENSE=GPL-2
-RDEPEND=!app-office/openerp-web postgres? ( dev-db/postgresql[server] ) dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pychart[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/reportlab[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pydot[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/vobject[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/mako[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/Babel[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/gdata[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-python/python-openid[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/werkzeug[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/xlwt[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/feedparser[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pywebdav[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ssl? ( dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-python/vatnumber[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/zsi[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/unittest2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pillow[jpeg,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
+RDEPEND=!app-office/openerp-web postgres? ( dev-db/postgresql[server] ) dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pychart[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/reportlab[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pydot[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/vobject[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/mako[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/Babel[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/gdata[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-python/python-openid[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/werkzeug[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/xlwt[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/feedparser[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pywebdav[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ssl? ( dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-python/vatnumber[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/zsi[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/unittest2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pillow[jpeg(+),python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://nightly.openerp.com/7.0/nightly/src/openerp-7.0-20140125-002455.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=da76d6346da543d0899bebb6fa2b8d24
+_md5_=27e33e28a6f9cf6bce0ab7e188693487
diff --git a/metadata/md5-cache/app-office/openerp-8.0.20140125 b/metadata/md5-cache/app-office/openerp-8.0.20140125
index 22bfd17c277c..db36887c138f 100644
--- a/metadata/md5-cache/app-office/openerp-8.0.20140125
+++ b/metadata/md5-cache/app-office/openerp-8.0.20140125
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile config configure install postinst preinst prepare setup test
-DEPEND=!app-office/openerp-web postgres? ( dev-db/postgresql[server] ) dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pychart[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/reportlab[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pydot[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/vobject[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/mako[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/Babel[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/gdata[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-python/python-openid[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/werkzeug[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/xlwt[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/feedparser[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pywebdav[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ssl? ( dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-python/vatnumber[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/zsi[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/unittest2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pillow[jpeg,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
+DEPEND=!app-office/openerp-web postgres? ( dev-db/postgresql[server] ) dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pychart[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/reportlab[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pydot[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/vobject[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/mako[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/Babel[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/gdata[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-python/python-openid[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/werkzeug[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/xlwt[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/feedparser[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pywebdav[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ssl? ( dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-python/vatnumber[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/zsi[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/unittest2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pillow[jpeg(+),python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
 DESCRIPTION=Open Source ERP & CRM
 EAPI=5
 HOMEPAGE=http://www.openerp.com/
 IUSE=+postgres ldap ssl python_targets_python2_7
 LICENSE=GPL-2
-RDEPEND=!app-office/openerp-web postgres? ( dev-db/postgresql[server] ) dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pychart[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/reportlab[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pydot[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/vobject[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/mako[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/Babel[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/gdata[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-python/python-openid[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/werkzeug[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/xlwt[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/feedparser[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pywebdav[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ssl? ( dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-python/vatnumber[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/zsi[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/unittest2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pillow[jpeg,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
+RDEPEND=!app-office/openerp-web postgres? ( dev-db/postgresql[server] ) dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pychart[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/reportlab[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pydot[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/vobject[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/mako[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/Babel[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/gdata[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-python/python-openid[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/werkzeug[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/xlwt[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/feedparser[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pywebdav[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ssl? ( dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-python/vatnumber[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/zsi[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/unittest2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pillow[jpeg(+),python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://nightly.openerp.com/trunk/nightly/src/openerp-8.0dev-20140125-000101.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a73a1583d1ab400e5517c238429bf4f9
+_md5_=bd5e6d65f4ac0d7918d64040fc9f2454
diff --git a/metadata/md5-cache/app-office/scribus-1.5.0-r1 b/metadata/md5-cache/app-office/scribus-1.5.0-r1
deleted file mode 100644
index 27fd1db2b449..000000000000
--- a/metadata/md5-cache/app-office/scribus-1.5.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/libmspub >=app-text/poppler-0.19.0:= dev-libs/boost dev-libs/hyphen dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libcdr media-libs/libpagemaker media-libs/libpng:0 media-libs/libvisio media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( dev-libs/boost ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) tk? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Desktop publishing (DTP) and layout program
-EAPI=5
-HOMEPAGE=http://www.scribus.net/
-IUSE=+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk linguas_af linguas_ar linguas_bg linguas_br linguas_ca linguas_ca_ES linguas_cs linguas_cs_CZ linguas_cy linguas_cy_GB linguas_da linguas_da_DK linguas_de linguas_de@1901 linguas_de_CH linguas_de_DE linguas_el linguas_en_AU linguas_en_GB linguas_en_US linguas_eo linguas_es linguas_es_ES linguas_et linguas_eu linguas_fi linguas_fi_FI linguas_fr linguas_gl linguas_he linguas_hr linguas_hu linguas_hu_HU linguas_ia linguas_id linguas_id_ID linguas_is linguas_is_IS linguas_it linguas_ja linguas_ko linguas_ku linguas_la linguas_lt linguas_lt_LT linguas_nb_NO linguas_nl linguas_nn_NO linguas_pl linguas_pl_PL linguas_pt linguas_pt_BR linguas_pt_PT linguas_ro linguas_ro_RO linguas_ru linguas_ru_RU linguas_sa linguas_sk linguas_sk_SK linguas_sl linguas_sl_SI linguas_sq linguas_sr linguas_sv linguas_sv_SE linguas_th_TH linguas_tr linguas_uk linguas_uk_UA linguas_zh_CN linguas_zh_TW python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/libmspub >=app-text/poppler-0.19.0:= dev-libs/boost dev-libs/hyphen dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libcdr media-libs/libpagemaker media-libs/libpng:0 media-libs/libvisio media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( dev-libs/boost ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) tk? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) app-text/ghostscript-gpl
-REQUIRED_USE=python_targets_python2_7 tk? ( scripts )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/scribus/scribus-devel/1.5.0/scribus-1.5.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=a1c3f3f7e5d8a44284633713f7ed0d77
diff --git a/metadata/md5-cache/app-office/scribus-1.5.2-r2 b/metadata/md5-cache/app-office/scribus-1.5.2-r2
deleted file mode 100644
index 1b8e1afffade..000000000000
--- a/metadata/md5-cache/app-office/scribus-1.5.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/libmspub app-text/poppler:= dev-libs/hyphen dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libcdr media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.62:= ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) tk? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.7.2
-DESCRIPTION=Desktop publishing (DTP) and layout program
-EAPI=6
-HOMEPAGE=http://www.scribus.net/
-IUSE=+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk linguas_af linguas_ar linguas_bg linguas_br linguas_ca linguas_ca_ES linguas_cs linguas_cs_CZ linguas_cy linguas_cy_GB linguas_da linguas_da_DK linguas_de linguas_de@1901 linguas_de_CH linguas_de_DE linguas_el linguas_en_AU linguas_en_GB linguas_en_US linguas_eo linguas_es linguas_es_ES linguas_et linguas_eu linguas_fi linguas_fi_FI linguas_fr linguas_gl linguas_he linguas_hr linguas_hu linguas_hu_HU linguas_ia linguas_id linguas_id_ID linguas_is linguas_is_IS linguas_it linguas_ja linguas_ko linguas_ku linguas_la linguas_lt linguas_lt_LT linguas_nb_NO linguas_nl linguas_nn_NO linguas_pl linguas_pl_PL linguas_pt linguas_pt_BR linguas_pt_PT linguas_ro linguas_ro_RO linguas_ru linguas_ru_RU linguas_sa linguas_sk linguas_sk_SK linguas_sl linguas_sl_SI linguas_sq linguas_sr linguas_sv linguas_sv_SE linguas_th_TH linguas_tr linguas_uk linguas_uk_UA linguas_zh_CN linguas_zh_TW python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/libmspub app-text/poppler:= dev-libs/hyphen dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libcdr media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.62:= ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) tk? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) app-text/ghostscript-gpl
-REQUIRED_USE=python_targets_python2_7 tk? ( scripts )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/scribus/scribus-devel/1.5.2/scribus-1.5.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=643ed888d3baf6d22498d7e8147622cc
diff --git a/metadata/md5-cache/app-office/scribus-1.5.2-r3 b/metadata/md5-cache/app-office/scribus-1.5.2-r3
deleted file mode 100644
index 13e8600a4954..000000000000
--- a/metadata/md5-cache/app-office/scribus-1.5.2-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/libmspub app-text/poppler:= dev-libs/hyphen dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libcdr media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.62:= ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) tk? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.7.2 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Desktop publishing (DTP) and layout program
-EAPI=6
-HOMEPAGE=http://www.scribus.net/
-IUSE=+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk linguas_af linguas_ar linguas_bg linguas_br linguas_ca linguas_ca_ES linguas_cs linguas_cs_CZ linguas_cy linguas_cy_GB linguas_da linguas_da_DK linguas_de linguas_de@1901 linguas_de_CH linguas_de_DE linguas_el linguas_en_AU linguas_en_GB linguas_en_US linguas_eo linguas_es linguas_es_ES linguas_et linguas_eu linguas_fi linguas_fi_FI linguas_fr linguas_gl linguas_he linguas_hr linguas_hu linguas_hu_HU linguas_ia linguas_id linguas_id_ID linguas_is linguas_is_IS linguas_it linguas_ja linguas_ko linguas_ku linguas_la linguas_lt linguas_lt_LT linguas_nb_NO linguas_nl linguas_nn_NO linguas_pl linguas_pl_PL linguas_pt linguas_pt_BR linguas_pt_PT linguas_ro linguas_ro_RO linguas_ru linguas_ru_RU linguas_sa linguas_sk linguas_sk_SK linguas_sl linguas_sl_SI linguas_sq linguas_sr linguas_sv linguas_sv_SE linguas_th_TH linguas_tr linguas_uk linguas_uk_UA linguas_zh_CN linguas_zh_TW python_targets_python2_7
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/libmspub app-text/poppler:= dev-libs/hyphen dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libcdr media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.62:= ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) tk? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) app-text/ghostscript-gpl
-REQUIRED_USE=python_targets_python2_7 tk? ( scripts )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/scribus/scribus-devel/1.5.2/scribus-1.5.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=db6e0d77f47b3346301966e53fc0f8f0
diff --git a/metadata/md5-cache/app-office/scribus-1.5.3 b/metadata/md5-cache/app-office/scribus-1.5.3
index 1de6de37a057..5d28e5e1bad8 100644
--- a/metadata/md5-cache/app-office/scribus-1.5.3
+++ b/metadata/md5-cache/app-office/scribus-1.5.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/libmspub app-text/poppler:= dev-libs/hyphen dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libcdr media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.62:= ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) tk? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.2.0 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/libmspub app-text/poppler:= dev-libs/hyphen >=dev-libs/icu-58.2:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.62:= ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) tk? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.2.0 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Desktop publishing (DTP) and layout program
 EAPI=6
 HOMEPAGE=http://www.scribus.net/
 IUSE=+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk linguas_af linguas_ar linguas_bg linguas_br linguas_ca linguas_ca_ES linguas_cs linguas_cs_CZ linguas_cy linguas_cy_GB linguas_da linguas_da_DK linguas_de linguas_de@1901 linguas_de_CH linguas_de_DE linguas_el linguas_en_AU linguas_en_GB linguas_en_US linguas_eo linguas_es linguas_es_ES linguas_et linguas_eu linguas_fa_IR linguas_fi linguas_fi_FI linguas_fr linguas_gl linguas_he linguas_he_IL linguas_hr linguas_hu linguas_hu_HU linguas_ia linguas_id linguas_id_ID linguas_is linguas_is_IS linguas_it linguas_ja linguas_kab linguas_kn_IN linguas_ko linguas_ku linguas_la linguas_lt linguas_lt_LT linguas_nb_NO linguas_nl linguas_nn_NO linguas_pl linguas_pl_PL linguas_pt linguas_pt_BR linguas_pt_PT linguas_ro linguas_ro_RO linguas_ru linguas_ru_RU linguas_sa linguas_sk linguas_sk_SK linguas_sl linguas_sl_SI linguas_so linguas_sq linguas_sr linguas_sv linguas_sv_SE linguas_te linguas_th_TH linguas_tr linguas_uk linguas_uk_UA linguas_zh_CN linguas_zh_TW python_targets_python2_7
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/libmspub app-text/poppler:= dev-libs/hyphen dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libcdr media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.62:= ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) tk? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) app-text/ghostscript-gpl
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/libmspub app-text/poppler:= dev-libs/hyphen >=dev-libs/icu-58.2:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.62:= ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) tk? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) app-text/ghostscript-gpl
 REQUIRED_USE=python_targets_python2_7 tk? ( scripts )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/scribus/scribus-devel/1.5.3/scribus-1.5.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6483dbcd1fd9159701e94cb206c2e9d7
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1afe9c4cda8ae009feb98f904581ca39
diff --git a/metadata/md5-cache/app-office/scribus-9999 b/metadata/md5-cache/app-office/scribus-9999
index 4a619c0bf316..6b184f2c8690 100644
--- a/metadata/md5-cache/app-office/scribus-9999
+++ b/metadata/md5-cache/app-office/scribus-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/libmspub app-text/poppler:= dev-libs/hyphen dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libcdr media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.62:= ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) tk? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.2.0 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/libmspub app-text/poppler:= dev-libs/hyphen >=dev-libs/icu-58.2:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.62:= ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) tk? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.2.0 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
 DESCRIPTION=Desktop publishing (DTP) and layout program
 EAPI=6
 HOMEPAGE=http://www.scribus.net/
 IUSE=+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk linguas_af linguas_ar linguas_bg linguas_br linguas_ca linguas_ca_ES linguas_cs linguas_cs_CZ linguas_cy linguas_cy_GB linguas_da linguas_da_DK linguas_de linguas_de@1901 linguas_de_CH linguas_de_DE linguas_el linguas_en_AU linguas_en_GB linguas_en_US linguas_eo linguas_es linguas_es_ES linguas_et linguas_eu linguas_fa_IR linguas_fi linguas_fi_FI linguas_fr linguas_gl linguas_he linguas_he_IL linguas_hr linguas_hu linguas_hu_HU linguas_ia linguas_id linguas_id_ID linguas_is linguas_is_IS linguas_it linguas_ja linguas_kab linguas_kn_IN linguas_ko linguas_ku linguas_la linguas_lt linguas_lt_LT linguas_nb_NO linguas_nl linguas_nn_NO linguas_pl linguas_pl_PL linguas_pt linguas_pt_BR linguas_pt_PT linguas_ro linguas_ro_RO linguas_ru linguas_ru_RU linguas_sa linguas_sk linguas_sk_SK linguas_sl linguas_sl_SI linguas_so linguas_sq linguas_sr linguas_sv linguas_sv_SE linguas_te linguas_th_TH linguas_tr linguas_uk linguas_uk_UA linguas_zh_CN linguas_zh_TW python_targets_python2_7
 LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/libmspub app-text/poppler:= dev-libs/hyphen dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libcdr media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.62:= ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) tk? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) app-text/ghostscript-gpl
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/libmspub app-text/poppler:= dev-libs/hyphen >=dev-libs/icu-58.2:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.62:= ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) tk? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) app-text/ghostscript-gpl
 REQUIRED_USE=python_targets_python2_7 tk? ( scripts )
 SLOT=0
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	subversion	a5d5826a85609611f098c0553eb24cc1	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=87952793cda70a1f0798e4193b843f1c
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	subversion	a5d5826a85609611f098c0553eb24cc1	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=06aa6cef1dab52c93daf9a8e790fd049
diff --git a/metadata/md5-cache/app-office/skrooge-2.8.1 b/metadata/md5-cache/app-office/skrooge-2.8.1
index d702554ab4c6..eead8aadcfc3 100644
--- a/metadata/md5-cache/app-office/skrooge-2.8.1
+++ b/metadata/md5-cache/app-office/skrooge-2.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( designer )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/skrooge/skrooge-2.8.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d43c2ebb722e1a2dac2b8efcfcac9066
diff --git a/metadata/md5-cache/app-office/skrooge-2.9.0 b/metadata/md5-cache/app-office/skrooge-2.9.0
index 32b8ef683fca..ad44fd907a32 100644
--- a/metadata/md5-cache/app-office/skrooge-2.9.0
+++ b/metadata/md5-cache/app-office/skrooge-2.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( designer )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/skrooge/skrooge-2.9.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4eb57c146ad6c9fe07cf8f59c26465a5
diff --git a/metadata/md5-cache/app-portage/eix-0.32.9 b/metadata/md5-cache/app-portage/eix-0.32.9
index a6286834d77c..1346b6552a08 100644
--- a/metadata/md5-cache/app-portage/eix-0.32.9
+++ b/metadata/md5-cache/app-portage/eix-0.32.9
@@ -4,10 +4,10 @@ DESCRIPTION=Search and query ebuilds
 EAPI=6
 HOMEPAGE=https://github.com/vaeth/eix/
 IUSE=debug doc nls sqlite linguas_de linguas_ru
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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 ~sparc-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
 SLOT=0
 SRC_URI=https://github.com/vaeth/eix/releases/download/v0.32.9/eix-0.32.9.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	l10n	2c2e15383ba891d642f51896a7f0ecfe	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=de887e7aa65be922f36bf0e2f9610cab
+_md5_=fd1e16ca72e0afa20a9217e851844a26
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.4.0 b/metadata/md5-cache/app-portage/gentoolkit-0.4.0
index bead680e1ea0..8f02c095477c 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.4.0
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=Collection of administration scripts for Gentoo
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage-Tools
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_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 ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !app-portage/gentoolkit-dev sys-apps/gawk sys-apps/gentoo-functions python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dolsen/releases/gentoolkit/gentoolkit-0.4.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fb6dc5e3d10da303b297ff381104ef78
+_md5_=6bf680cc2612ff51ef66bd8b92edf9a5
diff --git a/metadata/md5-cache/app-portage/kuroo4-0.90.5 b/metadata/md5-cache/app-portage/kuroo4-0.90.5
index 68f8b4fe6687..60d2986df708 100644
--- a/metadata/md5-cache/app-portage/kuroo4-0.90.5
+++ b/metadata/md5-cache/app-portage/kuroo4-0.90.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-db/sqlite:3 app-portage/gentoolkit kde-apps/kompare:* kde-plasma/kde-cli-tools[kdesu] kde-frameworks/oxygen-icons >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
 SLOT=4
 SRC_URI=mirror://sourceforge/kuroo/kuroo4-0.90.5.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=dea21f55a6d2d5b640fd98ed060243bb
diff --git a/metadata/md5-cache/app-portage/mirrorselect-9999 b/metadata/md5-cache/app-portage/mirrorselect-9999
index 23e8dd8330e8..4bc71c5fc82f 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-9999
+++ b/metadata/md5-cache/app-portage/mirrorselect-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-vcs/git-1.8.2.1
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Tool to help select distfiles mirrors for Gentoo
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Mirrorselect
-IUSE=python_targets_python2_7 python_targets_python3_4
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 LICENSE=GPL-2
-RDEPEND=dev-util/dialog net-analyzer/netselect =dev-python/ssl-fetch-9999[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
+RDEPEND=dev-util/dialog net-analyzer/netselect =dev-python/ssl-fetch-9999[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	git-r3	52a888802d25387c2c74cb845d1219bc	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	prefix	7b6fb2fc216b101b5d97d171925a847c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=820e726b4ebf9742b8b8d8a30d2e2e8b
+_md5_=4c79bb8271ae1091f212501c1ddabce4
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.64 b/metadata/md5-cache/app-portage/portage-utils-0.64
index e23d9bff3b34..8c08def5f122 100644
--- a/metadata/md5-cache/app-portage/portage-utils-0.64
+++ b/metadata/md5-cache/app-portage/portage-utils-0.64
@@ -4,10 +4,10 @@ DESCRIPTION=small and fast portage helper tools written in C
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils
 IUSE=nls static
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/iniparser:0
 SLOT=0
 SRC_URI=mirror://gentoo/portage-utils-0.64.tar.xz https://dev.gentoo.org/~vapier/dist/portage-utils-0.64.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=0ae0080a5e90652e47dd60deb56489a5
+_md5_=53b3e9e194fe19177372b65feb79374f
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.0-r2 b/metadata/md5-cache/app-portage/repoman-2.3.0-r2
deleted file mode 100644
index 72505f2d161d..000000000000
--- a/metadata/md5-cache/app-portage/repoman-2.3.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=!<sys-apps/portage-2.3.0_rc >=dev-python/lxml-3.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Repoman is a Quality Assurance tool for Gentoo ebuilds
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=!<sys-apps/portage-2.3.0_rc >=dev-python/lxml-3.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~dolsen/releases/repoman/repoman-2.3.0.tar.bz2
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6e4e9757eaa94527dbc6a60214ecf69b
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.0_rc1-r1 b/metadata/md5-cache/app-portage/repoman-2.3.0_rc1-r1
deleted file mode 100644
index 26544c2be03c..000000000000
--- a/metadata/md5-cache/app-portage/repoman-2.3.0_rc1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-lang/python-exec:2 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Repoman is a Quality Assurance tool for Gentoo ebuilds
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=dev-lang/python-exec:2 !<sys-apps/portage-2.3.0_rc >=dev-python/lxml-3.6.0 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://gentoo/repoman-2.3.0_rc1.tar.bz2 https://dev.gentoo.org/~dolsen/releases/repoman/repoman-2.3.0_rc1.tar.bz2
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e46c173e5c09ec66c11e0e32cb83d9d6
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.1 b/metadata/md5-cache/app-portage/repoman-2.3.1
deleted file mode 100644
index 346c5ab94e2b..000000000000
--- a/metadata/md5-cache/app-portage/repoman-2.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-apps/portage-2.3.0_rc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Repoman is a Quality Assurance tool for Gentoo ebuilds
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-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-2
-RDEPEND=>=sys-apps/portage-2.3.0_rc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~dolsen/releases/repoman/repoman-2.3.1.tar.bz2
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f63e4cb963712018ad741193696432d4
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.2 b/metadata/md5-cache/app-portage/repoman-2.3.2
deleted file mode 100644
index 80a66ae78793..000000000000
--- a/metadata/md5-cache/app-portage/repoman-2.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-apps/portage-2.3.0_rc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Repoman is a Quality Assurance tool for Gentoo ebuilds
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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-2
-RDEPEND=>=sys-apps/portage-2.3.0_rc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~dolsen/releases/repoman/repoman-2.3.2.tar.bz2
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f32e9472591c22f8abfa5e42b93e127e
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.3 b/metadata/md5-cache/app-portage/repoman-2.3.3
index dd35b1dea232..3bd2d3a4718c 100644
--- a/metadata/md5-cache/app-portage/repoman-2.3.3
+++ b/metadata/md5-cache/app-portage/repoman-2.3.3
@@ -4,11 +4,11 @@ DESCRIPTION=Repoman is a Quality Assurance tool for Gentoo ebuilds
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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 ~sparc-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-2
 RDEPEND=>=sys-apps/portage-2.3.0_rc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dolsen/releases/repoman/repoman-2.3.3.tar.bz2
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=31267fd9babee8da494f76708d37eb13
+_md5_=5ec8e555a2231097e426131bc3c3bf2d
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.4 b/metadata/md5-cache/app-portage/repoman-2.3.4
new file mode 100644
index 000000000000..4eb2ead46cd2
--- /dev/null
+++ b/metadata/md5-cache/app-portage/repoman-2.3.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=sys-apps/portage-2.3.0_rc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Repoman is a Quality Assurance tool for Gentoo ebuilds
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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-2
+RDEPEND=>=sys-apps/portage-2.3.0_rc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~dolsen/releases/repoman/repoman-2.3.4.tar.bz2
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9f386a96604df921e02559d5b79865f5
diff --git a/metadata/md5-cache/app-shells/bash-completion-2.7-r1 b/metadata/md5-cache/app-shells/bash-completion-2.7-r1
new file mode 100644
index 000000000000..7abe4c91a16f
--- /dev/null
+++ b/metadata/md5-cache/app-shells/bash-completion-2.7-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst prepare test
+DEPEND=app-arch/xz-utils test? ( >=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp app-misc/dtach dev-util/dejagnu dev-tcltk/tcllib )
+DESCRIPTION=Programmable Completion for bash
+EAPI=6
+HOMEPAGE=https://github.com/scop/bash-completion
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
+LICENSE=GPL-2
+PDEPEND=>=app-shells/gentoo-bashcomp-20140911
+RDEPEND=>=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/scop/bash-completion/releases/download/2.7/bash-completion-2.7.tar.xz https://bitbucket.org/mgorny/bashcomp2/downloads/bashcomp-2.0.2.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=43eb2786802590ed2bcfeb78c91182f2
diff --git a/metadata/md5-cache/app-shells/bash-completion-9999 b/metadata/md5-cache/app-shells/bash-completion-9999
index a4b376f9f174..63345a03c182 100644
--- a/metadata/md5-cache/app-shells/bash-completion-9999
+++ b/metadata/md5-cache/app-shells/bash-completion-9999
@@ -10,4 +10,4 @@ RDEPEND=>=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bas
 SLOT=0
 SRC_URI=https://bitbucket.org/mgorny/bashcomp2/downloads/bashcomp-2.0.2.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	git-r3	52a888802d25387c2c74cb845d1219bc	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1138480f63085172431746ae6865b994
+_md5_=16384206fc6c70ca6884c76b02ddd194
diff --git a/metadata/md5-cache/app-shells/dash-0.5.9.1-r3 b/metadata/md5-cache/app-shells/dash-0.5.9.1-r3
index 139e30012216..2d81ea4f2a80 100644
--- a/metadata/md5-cache/app-shells/dash-0.5.9.1-r3
+++ b/metadata/md5-cache/app-shells/dash-0.5.9.1-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Debian Almquist Shell
 EAPI=6
 HOMEPAGE=http://gondor.apana.org.au/~herbert/dash/
 IUSE=libedit static vanilla
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=!static? ( libedit? ( dev-libs/libedit ) )
 SLOT=0
 SRC_URI=http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.9.1.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0683791b5434919cb02caa536e4d658b
+_md5_=556464ea4d4a209d37ced7339e243d62
diff --git a/metadata/md5-cache/app-shells/fish-2.6.0 b/metadata/md5-cache/app-shells/fish-2.6.0
index 3f03552a4037..f0064960c070 100644
--- a/metadata/md5-cache/app-shells/fish-2.6.0
+++ b/metadata/md5-cache/app-shells/fish-2.6.0
@@ -4,9 +4,9 @@ DESCRIPTION=fish is the Friendly Interactive SHell
 EAPI=6
 HOMEPAGE=http://fishshell.com/
 IUSE=nls
-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=GPL-2
 RDEPEND=>=dev-libs/libpcre2-10.21[pcre32] sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=https://github.com/fish-shell/fish-shell/releases/download/2.6.0/fish-2.6.0.tar.gz
-_md5_=8d3a4f2e979f2c5791f5686cdf8c963b
+_md5_=ce5ba64ee54895500b717c5e76a1023d
diff --git a/metadata/md5-cache/app-shells/push-2.0-r1 b/metadata/md5-cache/app-shells/push-2.0-r1
index 2203f758f80a..dbe27f78d9c0 100644
--- a/metadata/md5-cache/app-shells/push-2.0-r1
+++ b/metadata/md5-cache/app-shells/push-2.0-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=A POSIX shell function to treat a variable like an array, quoting args
 EAPI=6
 HOMEPAGE=https://github.com/vaeth/push/
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/vaeth/push/archive/v2.0.tar.gz -> push-2.0.tar.gz
 _eclasses_=vcs-snapshot	03289f51c769cf409d200d2d628cdd6e
-_md5_=e7b0244b06708bb0d9df937499d21e4c
+_md5_=edc251f186ff0df324464a6caf0e10b6
diff --git a/metadata/md5-cache/app-shells/quoter-3.0_p2-r1 b/metadata/md5-cache/app-shells/quoter-3.0_p2-r1
index f316c24cbfc3..503e489c7b4f 100644
--- a/metadata/md5-cache/app-shells/quoter-3.0_p2-r1
+++ b/metadata/md5-cache/app-shells/quoter-3.0_p2-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Quote arguments or standard input for usage in POSIX shell by eval
 EAPI=6
 HOMEPAGE=https://github.com/vaeth/quoter/
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/vaeth/quoter/archive/v3.0_p2.tar.gz -> quoter-3.0_p2.tar.gz
 _eclasses_=vcs-snapshot	03289f51c769cf409d200d2d628cdd6e
-_md5_=de7cdcae52f49d8d3474cc38f3e01609
+_md5_=e4aa6fef32025169aaf1a6bc413983c5
diff --git a/metadata/md5-cache/app-shells/zsh-5.3.1 b/metadata/md5-cache/app-shells/zsh-5.3.1
index 8c848591fa4d..bbda1e680ec7 100644
--- a/metadata/md5-cache/app-shells/zsh-5.3.1
+++ b/metadata/md5-cache/app-shells/zsh-5.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=UNIX Shell similar to the Korn shell
 EAPI=6
 HOMEPAGE=http://www.zsh.org/
 IUSE=caps debug doc examples gdbm maildir pcre static unicode
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ZSH gdbm? ( GPL-2 )
 PDEPEND=examples? ( app-doc/zsh-lovers )
 RDEPEND=>=sys-libs/ncurses-5.1:0= static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm )
 SLOT=0
 SRC_URI=http://www.zsh.org/pub/zsh-5.3.1.tar.xz doc? ( http://www.zsh.org/pub/zsh-5.3.1-doc.tar.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=c60562401c4462fce144974bbad8da0c
+_md5_=296e946b08520242477ae8432b37ffd1
diff --git a/metadata/md5-cache/app-text/atril-1.12.2-r3 b/metadata/md5-cache/app-text/atril-1.12.2-r3
deleted file mode 100644
index 95e90685b0a6..000000000000
--- a/metadata/md5-cache/app-text/atril-1.12.2-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/poppler-0.16:0=[cairo] app-text/rarian:0 dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:2 ) ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.0:0 ) !!app-text/mate-document-viewer app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools:0 >=app-text/scrollkeeper-dtd-1:1.0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* virtual/pkgconfig:* sys-devel/gettext:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.12
-DESCRIPTION=Atril document viewer for MATE
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscript t1lib tiff xps
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/poppler-0.16:0=[cairo] app-text/rarian:0 dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:2 ) ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.0:0 ) !!app-text/mate-document-viewer
-REQUIRED_USE=t1lib? ( dvi )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/atril-1.12.2.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5a710fe4ea3f97636c40dcabf57e2217
diff --git a/metadata/md5-cache/app-text/atril-1.12.2-r4 b/metadata/md5-cache/app-text/atril-1.12.2-r4
index 5dd92d5c3088..fed9f43b9917 100644
--- a/metadata/md5-cache/app-text/atril-1.12.2-r4
+++ b/metadata/md5-cache/app-text/atril-1.12.2-r4
@@ -4,7 +4,7 @@ DESCRIPTION=Atril document viewer for MATE
 EAPI=6
 HOMEPAGE=https://mate-desktop.org
 IUSE=caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscript t1lib tiff xps
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/poppler-0.16:0=[cairo] app-text/rarian:0 dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.0:0 ) !!app-text/mate-document-viewer
 REQUIRED_USE=t1lib? ( dvi ) !gtk3? ( !epub )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.12/atril-1.12.2.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=82d8c7b6d1fbde2c075b88332b7fcf34
+_md5_=42d793bc2d912f27a54b127962a8f0a7
diff --git a/metadata/md5-cache/app-text/atril-1.14.2 b/metadata/md5-cache/app-text/atril-1.14.2
deleted file mode 100644
index 19b164f03cb6..000000000000
--- a/metadata/md5-cache/app-text/atril-1.14.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/poppler-0.16:0=[cairo] dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:2 ) ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.0:0 ) !!app-text/mate-document-viewer app-text/docbook-xml-dtd:4.1.2 app-text/rarian:0 app-text/yelp-tools:0 >=app-text/scrollkeeper-dtd-1:1.0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* virtual/pkgconfig:* sys-devel/gettext:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.14
-DESCRIPTION=Atril document viewer for MATE
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscript t1lib tiff xps
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/poppler-0.16:0=[cairo] dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:2 ) ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.0:0 ) !!app-text/mate-document-viewer
-REQUIRED_USE=t1lib? ( dvi )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/atril-1.14.2.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b79eacea6f2b8f82ad5667e69eb53cc3
diff --git a/metadata/md5-cache/app-text/atril-1.16.1 b/metadata/md5-cache/app-text/atril-1.16.1
deleted file mode 100644
index fda8751575ca..000000000000
--- a/metadata/md5-cache/app-text/atril-1.16.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/poppler-0.22:0=[cairo] dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:2 ) ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.1:0 ) !!app-text/mate-document-viewer app-text/docbook-xml-dtd:4.1.2 app-text/rarian:0 app-text/yelp-tools:0 >=app-text/scrollkeeper-dtd-1:1.0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* virtual/pkgconfig:* sys-devel/gettext:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
-DESCRIPTION=Atril document viewer for MATE
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscript t1lib tiff xps
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/poppler-0.22:0=[cairo] dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:2 ) ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.1:0 ) !!app-text/mate-document-viewer
-REQUIRED_USE=t1lib? ( dvi )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/atril-1.16.1.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=126ad41fca1e16d103253b02730c9264
diff --git a/metadata/md5-cache/app-text/bibus-1.5.2-r3 b/metadata/md5-cache/app-text/bibus-1.5.2-r3
index 59c7230c65c0..0e4763f084d7 100644
--- a/metadata/md5-cache/app-text/bibus-1.5.2-r3
+++ b/metadata/md5-cache/app-text/bibus-1.5.2-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Bibliographic and reference management software, integrates with LO
 EAPI=6
 HOMEPAGE=http://bibus-biblio.sourceforge.net/
 IUSE=mysql python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-office/libreoffice dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-db/sqliteodbc dev-db/unixODBC mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-db/myodbc )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/bibus-biblio/bibus_1.5.2.orig.tar.gz https://dev.gentoo.org/~jlec/distfiles/bibus-1.5.2-lo-4.patch.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=671880cda6c505438603d7ac2a770b4b
+_md5_=90163a6fc6c54566bd0d0852e378e68d
diff --git a/metadata/md5-cache/app-text/discount-2.2.2 b/metadata/md5-cache/app-text/discount-2.2.2
index d86e6fbce0a9..267b25b334e6 100644
--- a/metadata/md5-cache/app-text/discount-2.2.2
+++ b/metadata/md5-cache/app-text/discount-2.2.2
@@ -7,4 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.pell.portland.or.us/~orc/Code/discount/discount-2.2.2.tar.bz2
-_md5_=b701176d39de9e41035f0f083cb2f204
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=3499ee42a3e9750ca64cc5f8acdbee63
diff --git a/metadata/md5-cache/app-text/djvu-3.5.27 b/metadata/md5-cache/app-text/djvu-3.5.27
index 62970257b913..fbe563a185be 100644
--- a/metadata/md5-cache/app-text/djvu-3.5.27
+++ b/metadata/md5-cache/app-text/djvu-3.5.27
@@ -4,10 +4,10 @@ DESCRIPTION=DjVu viewers, encoders and utilities
 EAPI=5
 HOMEPAGE=http://djvu.sourceforge.net/
 IUSE=debug doc jpeg tiff xml
-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-solaris
+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-solaris
 LICENSE=GPL-2
 RDEPEND=jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0= )
 SLOT=0
 SRC_URI=mirror://sourceforge/djvu/djvulibre-3.5.27.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=d7a79ab0a90b96c1d0039fa512fcbb01
+_md5_=1a7becb0f0397f4b32fc0e607532776c
diff --git a/metadata/md5-cache/app-text/dos2unix-7.3.5 b/metadata/md5-cache/app-text/dos2unix-7.3.5
index 86fb56d458ab..27b7a086f202 100644
--- a/metadata/md5-cache/app-text/dos2unix-7.3.5
+++ b/metadata/md5-cache/app-text/dos2unix-7.3.5
@@ -4,10 +4,10 @@ DESCRIPTION=Convert DOS or MAC text files to UNIX format or vice versa
 EAPI=6
 HOMEPAGE=http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/
 IUSE=debug nls test linguas_da linguas_de linguas_eo linguas_es linguas_fr linguas_hu linguas_ja linguas_nb linguas_nl linguas_pl linguas_pt_BR linguas_ru linguas_sr linguas_sv linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
 LICENSE=BSD-2
 RDEPEND=!app-text/hd2u virtual/libintl
 SLOT=0
 SRC_URI=http://www.xs4all.nl/~waterlan/dos2unix/dos2unix-7.3.5.tar.gz mirror://sourceforge/dos2unix/dos2unix-7.3.5.tar.gz
 _eclasses_=l10n	2c2e15383ba891d642f51896a7f0ecfe	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=73ceebf271e28fbaf299ac18e6440368
+_md5_=8c3f45bbaf18dd71dd19af6560280b25
diff --git a/metadata/md5-cache/app-text/evince-3.24.1 b/metadata/md5-cache/app-text/evince-3.24.1
deleted file mode 100644
index 1ab593dfd367..000000000000
--- a/metadata/md5-cache/app-text/evince-3.24.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk >=dev-libs/glib-2.36:2[dbus] >=dev-libs/libxml2-2.5:2 sys-libs/zlib:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.16.0:3[introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10:= >=app-text/poppler-0.33[cairo] djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( virtual/tex-base dev-libs/kpathsea:= t1lib? ( >=media-libs/t1lib-5:= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] ) postscript? ( >=app-text/libspectre-0.2:= ) tiff? ( >=media-libs/tiff-3.6:0= ) xps? ( >=app-text/libgxps-0.2.1:= ) app-text/docbook-xml-dtd:4.3 app-text/yelp-tools dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.35 dev-util/itstool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
-DESCRIPTION=Simple document viewer for GNOME
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Evince
-IUSE=djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin +postscript t1lib tiff xps
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=GPL-2+ CC-BY-SA-3.0
-RDEPEND=dev-libs/atk >=dev-libs/glib-2.36:2[dbus] >=dev-libs/libxml2-2.5:2 sys-libs/zlib:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.16.0:3[introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10:= >=app-text/poppler-0.33[cairo] djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( virtual/tex-base dev-libs/kpathsea:= t1lib? ( >=media-libs/t1lib-5:= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] ) postscript? ( >=app-text/libspectre-0.2:= ) tiff? ( >=media-libs/tiff-3.6:0= ) xps? ( >=app-text/libgxps-0.2.1:= ) gnome-base/gvfs gnome-base/librsvg || ( >=x11-themes/adwaita-icon-theme-2.17.1 >=x11-themes/hicolor-icon-theme-0.10 )
-SLOT=0/evd3.4-evv3.3
-SRC_URI=mirror://gnome/sources/evince/3.24/evince-3.24.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=692ee5a8ac9d2e940444011192647a40
diff --git a/metadata/md5-cache/app-text/evince-3.24.2 b/metadata/md5-cache/app-text/evince-3.24.2
new file mode 100644
index 000000000000..1006108409d1
--- /dev/null
+++ b/metadata/md5-cache/app-text/evince-3.24.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-libs/atk >=dev-libs/glib-2.36:2[dbus] >=dev-libs/libxml2-2.5:2 sys-libs/zlib:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.16.0:3[introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10:= >=app-text/poppler-0.33[cairo] djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( virtual/tex-base dev-libs/kpathsea:= t1lib? ( >=media-libs/t1lib-5:= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] ) postscript? ( >=app-text/libspectre-0.2:= ) tiff? ( >=media-libs/tiff-3.6:0= ) xps? ( >=app-text/libgxps-0.2.1:= ) app-text/docbook-xml-dtd:4.3 app-text/yelp-tools dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.35 dev-util/itstool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
+DESCRIPTION=Simple document viewer for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Evince
+IUSE=djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin +postscript t1lib tiff xps
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
+LICENSE=GPL-2+ CC-BY-SA-3.0
+RDEPEND=dev-libs/atk >=dev-libs/glib-2.36:2[dbus] >=dev-libs/libxml2-2.5:2 sys-libs/zlib:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.16.0:3[introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10:= >=app-text/poppler-0.33[cairo] djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( virtual/tex-base dev-libs/kpathsea:= t1lib? ( >=media-libs/t1lib-5:= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] ) postscript? ( >=app-text/libspectre-0.2:= ) tiff? ( >=media-libs/tiff-3.6:0= ) xps? ( >=app-text/libgxps-0.2.1:= ) gnome-base/gvfs gnome-base/librsvg || ( >=x11-themes/adwaita-icon-theme-2.17.1 >=x11-themes/hicolor-icon-theme-0.10 )
+SLOT=0/evd3.4-evv3.3
+SRC_URI=mirror://gnome/sources/evince/3.24/evince-3.24.2.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=692ee5a8ac9d2e940444011192647a40
diff --git a/metadata/md5-cache/app-text/html-xml-utils-7.1 b/metadata/md5-cache/app-text/html-xml-utils-7.1
index b21223c30517..8ced6be0c0d6 100644
--- a/metadata/md5-cache/app-text/html-xml-utils-7.1
+++ b/metadata/md5-cache/app-text/html-xml-utils-7.1
@@ -4,11 +4,11 @@ DESCRIPTION=A number of simple utilities for manipulating HTML and XML files
 EAPI=6
 HOMEPAGE=http://www.w3.org/Tools/HTML-XML-utils/
 IUSE=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=~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~amd64 ppc ppc64 x86 ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=W3C
 RDEPEND=net-misc/curl
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.w3.org/Tools/HTML-XML-utils/html-xml-utils-7.1.tar.gz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=37709920a13508af319168901899930e
+_md5_=a3c6b4829aea6f866694b0b11703d41b
diff --git a/metadata/md5-cache/app-text/kbibtex-0.6.2 b/metadata/md5-cache/app-text/kbibtex-0.6.2
index 4deff27cfd8f..ddae72836d87 100644
--- a/metadata/md5-cache/app-text/kbibtex-0.6.2
+++ b/metadata/md5-cache/app-text/kbibtex-0.6.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/poppler[qt4] dev-libs/libxml2 dev-libs/libxslt dev-libs/qoauth:0 virtual/tex-base x11-libs/libqxt dev-tex/bibtex2html kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4
 SRC_URI=mirror://kde/stable/KBibTeX/kbibtex-0.6.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8cd63b944ffa56fe8100e0fcf0290c40
diff --git a/metadata/md5-cache/app-text/lesspipe-1.83 b/metadata/md5-cache/app-text/lesspipe-1.83
index aae6af93d9d2..3d38162e5063 100644
--- a/metadata/md5-cache/app-text/lesspipe-1.83
+++ b/metadata/md5-cache/app-text/lesspipe-1.83
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl
 DESCRIPTION=a preprocessor for less
 EAPI=5
 HOMEPAGE=https://github.com/wofr06/lesspipe
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl !<sys-apps/less-483-r1
 SLOT=0
 SRC_URI=https://www-zeuthen.desy.de/~friebel/unix/less/lesspipe-1.83.tar.gz
-_md5_=028d6a6eefc195692f64b8b67aab161b
+_md5_=14d76ddda9b98b031c5613302ca2ab89
diff --git a/metadata/md5-cache/app-text/libepubgen-0.0.1 b/metadata/md5-cache/app-text/libepubgen-0.0.1
new file mode 100644
index 000000000000..585c74f9da8e
--- /dev/null
+++ b/metadata/md5-cache/app-text/libepubgen-0.0.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/librevenge dev-libs/boost virtual/pkgconfig doc? ( app-doc/doxygen )
+DESCRIPTION=EPUB generator for librevenge
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/libepubgen/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=dev-libs/librevenge
+SLOT=0
+SRC_URI=mirror://sourceforge/libepubgen/libepubgen-0.0.1.tar.xz
+_md5_=09361664febe254a0b1b9714bdeaabcb
diff --git a/metadata/md5-cache/app-text/libgepub-0.5.2 b/metadata/md5-cache/app-text/libgepub-0.5.2
index 5c787b4f7aff..ef4f28f94573 100644
--- a/metadata/md5-cache/app-text/libgepub-0.5.2
+++ b/metadata/md5-cache/app-text/libgepub-0.5.2
@@ -9,5 +9,5 @@ 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.5/libgepub-0.5.2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	958769e8b8b5a79afc3f22f3915cebbc	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	38757afcd8d9f0d1d44ba4cefc33b99d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8a946f07e3e3273d190d06c65c1d8768
diff --git a/metadata/md5-cache/app-text/libgxps-0.3.0 b/metadata/md5-cache/app-text/libgxps-0.3.0
index 2e1878fd1b97..b10f8c67b28e 100644
--- a/metadata/md5-cache/app-text/libgxps-0.3.0
+++ b/metadata/md5-cache/app-text/libgxps-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=app-arch/libarchive-2.8 >=dev-libs/glib-2.36:2 media-libs/freetype:2 m
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgxps/0.3/libgxps-0.3.0.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	958769e8b8b5a79afc3f22f3915cebbc	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	38757afcd8d9f0d1d44ba4cefc33b99d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=799d7cd7c8a86aff35b883085be3b06d
diff --git a/metadata/md5-cache/app-text/libqxp-0.0.0 b/metadata/md5-cache/app-text/libqxp-0.0.0
new file mode 100644
index 000000000000..443eebbf1086
--- /dev/null
+++ b/metadata/md5-cache/app-text/libqxp-0.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/librevenge dev-libs/icu:= dev-libs/boost virtual/pkgconfig doc? ( app-doc/doxygen )
+DESCRIPTION=Library parsing QuarkXpress documents
+EAPI=6
+HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libqxp
+IUSE=debug doc test tools
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=dev-libs/librevenge dev-libs/icu:=
+SLOT=0
+SRC_URI=https://dev-www.libreoffice.org/src/libqxp/libqxp-0.0.0.tar.xz
+_md5_=901bb01f449d5d8cf04d4b76d7e0a46d
diff --git a/metadata/md5-cache/app-text/master-pdf-editor-4.3.61 b/metadata/md5-cache/app-text/master-pdf-editor-4.3.61
new file mode 100644
index 000000000000..001a9974deed
--- /dev/null
+++ b/metadata/md5-cache/app-text/master-pdf-editor-4.3.61
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DESCRIPTION=Master PDF Editor is a complete solution for viewing and editing PDF files
+EAPI=6
+HOMEPAGE=https://code-industry.net/free-pdf-editor/
+KEYWORDS=~amd64
+LICENSE=master-pdf-editor
+RDEPEND=app-arch/bzip2 dev-libs/double-conversion dev-libs/glib dev-libs/icu dev-libs/openssl media-gfx/graphite2 media-gfx/sane-backends media-libs/freetype media-libs/harfbuzz media-libs/libjpeg-turbo media-libs/libpng media-libs/tiff x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXdmcp x11-libs/libXext >=dev-qt/qtsvg-5.4:5 >=dev-qt/qtnetwork-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtprintsupport-5.4:5
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://get.code-industry.net/public/master-pdf-editor-4.3.61_qt5.amd64.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bfc83461c95605b36797433ff812f8c4
diff --git a/metadata/md5-cache/app-text/opensp-1.5.2-r4 b/metadata/md5-cache/app-text/opensp-1.5.2-r4
deleted file mode 100644
index 7870add60aa5..000000000000
--- a/metadata/md5-cache/app-text/opensp-1.5.2-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( net-libs/libnsl <sys-libs/glibc-2.26 ) nls? ( sys-devel/gettext ) doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 ) test? ( app-text/docbook-xml-dtd:4.5 app-text/openjade app-text/sgml-common ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A free, object-oriented toolkit for SGML parsing and entity management
-EAPI=5
-HOMEPAGE=http://openjade.sourceforge.net/
-IUSE=doc nls static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=|| ( net-libs/libnsl <sys-libs/glibc-2.26 )
-SLOT=0
-SRC_URI=mirror://sourceforge/openjade/OpenSP-1.5.2.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=15d6f036ae414d2c94e4a035b11240cd
diff --git a/metadata/md5-cache/app-text/opensp-1.5.2-r6 b/metadata/md5-cache/app-text/opensp-1.5.2-r6
new file mode 100644
index 000000000000..cc0f3555053d
--- /dev/null
+++ b/metadata/md5-cache/app-text/opensp-1.5.2-r6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-libs/libnsl:0= nls? ( sys-devel/gettext ) doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 ) test? ( app-text/docbook-xml-dtd:4.5 app-text/openjade app-text/sgml-common ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A free, object-oriented toolkit for SGML parsing and entity management
+EAPI=5
+HOMEPAGE=http://openjade.sourceforge.net/
+IUSE=doc nls static-libs test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=net-libs/libnsl:0=
+SLOT=0
+SRC_URI=mirror://sourceforge/openjade/OpenSP-1.5.2.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=24835ddcb3cf95dc490d4b42a76603b2
diff --git a/metadata/md5-cache/app-text/xmlto-0.0.26-r1 b/metadata/md5-cache/app-text/xmlto-0.0.26-r1
index 5bd545cbc596..f67a7e834782 100644
--- a/metadata/md5-cache/app-text/xmlto-0.0.26-r1
+++ b/metadata/md5-cache/app-text/xmlto-0.0.26-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure prepare
 DEPEND=>=app-text/docbook-xsl-stylesheets-1.62.0-r1 app-text/docbook-xml-dtd:4.2 app-shells/bash:0 dev-libs/libxslt sys-apps/sed || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin ) || ( sys-apps/util-linux app-misc/getopt ) || ( sys-apps/which sys-freebsd/freebsd-ubin ) text? ( || ( virtual/w3m www-client/lynx www-client/links ) ) latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )
 DESCRIPTION=script for converting XML and DocBook documents to a variety of output formats
 EAPI=5
-HOMEPAGE=https://fedorahosted.org/xmlto/
+HOMEPAGE=https://pagure.io/xmlto
 IUSE=latex text
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-text/docbook-xsl-stylesheets-1.62.0-r1 app-text/docbook-xml-dtd:4.2 app-shells/bash:0 dev-libs/libxslt sys-apps/sed || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin ) || ( sys-apps/util-linux app-misc/getopt ) || ( sys-apps/which sys-freebsd/freebsd-ubin ) text? ( || ( virtual/w3m www-client/lynx www-client/links ) ) latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )
 SLOT=0
-SRC_URI=https://fedorahosted.org/releases/x/m/xmlto/xmlto-0.0.26.tar.bz2
+SRC_URI=https://releases.pagure.org/xmlto/xmlto-0.0.26.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=5ee673fc4dba3db5b7ec48928e5b6712
+_md5_=856d4aadc7371bf720d9889a8b4e19d6
diff --git a/metadata/md5-cache/app-text/xmlto-0.0.28-r1 b/metadata/md5-cache/app-text/xmlto-0.0.28-r1
index de27889abfc6..f8c229202da6 100644
--- a/metadata/md5-cache/app-text/xmlto-0.0.28-r1
+++ b/metadata/md5-cache/app-text/xmlto-0.0.28-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure prepare
 DEPEND=>=app-text/docbook-xsl-stylesheets-1.62.0-r1 app-text/docbook-xml-dtd:4.2 app-shells/bash:0 dev-libs/libxslt sys-apps/sed || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin ) || ( sys-apps/util-linux app-misc/getopt ) || ( sys-apps/which sys-freebsd/freebsd-ubin ) text? ( || ( virtual/w3m www-client/lynx www-client/elinks ) ) latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )
 DESCRIPTION=script for converting XML and DocBook documents to a variety of output formats
 EAPI=5
-HOMEPAGE=https://fedorahosted.org/xmlto/
+HOMEPAGE=https://pagure.io/xmlto
 IUSE=latex text
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-text/docbook-xsl-stylesheets-1.62.0-r1 app-text/docbook-xml-dtd:4.2 app-shells/bash:0 dev-libs/libxslt sys-apps/sed || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin ) || ( sys-apps/util-linux app-misc/getopt ) || ( sys-apps/which sys-freebsd/freebsd-ubin ) text? ( || ( virtual/w3m www-client/lynx www-client/elinks ) ) latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )
 SLOT=0
-SRC_URI=https://fedorahosted.org/releases/x/m/xmlto/xmlto-0.0.28.tar.bz2
+SRC_URI=https://releases.pagure.org/xmlto/xmlto-0.0.28.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=80ded595076c4c61fb410a78c905e796
+_md5_=993e9462f8f94569b9c64a52e461ef60
diff --git a/metadata/md5-cache/app-vim/ackvim-1.0.9 b/metadata/md5-cache/app-vim/ackvim-1.0.9
deleted file mode 100644
index cf8b0561e6cf..000000000000
--- a/metadata/md5-cache/app-vim/ackvim-1.0.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: run ack from within vim
-EAPI=6
-HOMEPAGE=https://github.com/mileszs/ack.vim
-KEYWORDS=amd64 x86
-LICENSE=vim
-RDEPEND=sys-apps/ack || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/mileszs/ack.vim/archive/1.0.9.zip -> ack.vim-1.0.9.zip
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
-_md5_=f9c57a415ed203b6992c366b01996d55
diff --git a/metadata/md5-cache/app-vim/ackvim-1.0.9-r1 b/metadata/md5-cache/app-vim/ackvim-1.0.9-r1
index 32fc45743c60..1b12630ed2f7 100644
--- a/metadata/md5-cache/app-vim/ackvim-1.0.9-r1
+++ b/metadata/md5-cache/app-vim/ackvim-1.0.9-r1
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: run ack from vim
 EAPI=6
 HOMEPAGE=https://github.com/mileszs/ack.vim
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=vim
 RDEPEND=sys-apps/ack || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/mileszs/ack.vim/archive/1.0.9.tar.gz -> ack.vim-1.0.9.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
-_md5_=23f7f4e1e25212f6261e1c2d4bb6b978
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
+_md5_=2eee2a0b4c475257c75ff912bb592719
diff --git a/metadata/md5-cache/app-vim/airline-0.8 b/metadata/md5-cache/app-vim/airline-0.8
index f3f9c91ef7cf..96b8315c563c 100644
--- a/metadata/md5-cache/app-vim/airline-0.8
+++ b/metadata/md5-cache/app-vim/airline-0.8
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-airline/vim-airline/archive/v0.8.tar.gz -> airline-0.8.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=8ea226543df2d21b0e9aeb7c867bf9d0
diff --git a/metadata/md5-cache/app-vim/airline-9999 b/metadata/md5-cache/app-vim/airline-9999
index 5768241df164..88c0d7ad97f6 100644
--- a/metadata/md5-cache/app-vim/airline-9999
+++ b/metadata/md5-cache/app-vim/airline-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/vim-airline/vim-airline/ http://www.vim.org/scripts/
 LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	52a888802d25387c2c74cb845d1219bc	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	52a888802d25387c2c74cb845d1219bc	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=5aff10bd4fc143567b9060c752790f9f
diff --git a/metadata/md5-cache/app-vim/airline-themes-9999 b/metadata/md5-cache/app-vim/airline-themes-9999
index ee116bdb17a4..e11f13d0c898 100644
--- a/metadata/md5-cache/app-vim/airline-themes-9999
+++ b/metadata/md5-cache/app-vim/airline-themes-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/vim-airline/vim-airline-themes
 LICENSE=MIT
 RDEPEND=app-vim/airline || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	52a888802d25387c2c74cb845d1219bc	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	52a888802d25387c2c74cb845d1219bc	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=7c611ae385f5ea9198aa07ba5e035fdf
diff --git a/metadata/md5-cache/app-vim/align-43 b/metadata/md5-cache/app-vim/align-43
index 830e985267b5..6b9407262ce2 100644
--- a/metadata/md5-cache/app-vim/align-43
+++ b/metadata/md5-cache/app-vim/align-43
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=app-vim/cecutil || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/align-43.tar.bz2 https://dev.gentoo.org/~radhermit/vim/align-43.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=aec4948cfb2cb02f2932f964ca723f8c
diff --git a/metadata/md5-cache/app-vim/alternate-2.18-r1 b/metadata/md5-cache/app-vim/alternate-2.18-r1
index 989c65cfd5d9..48bbb18b0f35 100644
--- a/metadata/md5-cache/app-vim/alternate-2.18-r1
+++ b/metadata/md5-cache/app-vim/alternate-2.18-r1
@@ -8,5 +8,5 @@ LICENSE=alternate
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/alternate-2.18.tar.bz2 https://dev.gentoo.org/~radhermit/vim/alternate-2.18.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=6dc5691581df1e2037bf0249181a9960
diff --git a/metadata/md5-cache/app-vim/alternate-2.18-r2 b/metadata/md5-cache/app-vim/alternate-2.18-r2
index 499171fd28d8..b9d8a60e8919 100644
--- a/metadata/md5-cache/app-vim/alternate-2.18-r2
+++ b/metadata/md5-cache/app-vim/alternate-2.18-r2
@@ -8,5 +8,5 @@ LICENSE=alternate
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-scripts/a.vim/archive/2.18.tar.bz2 -> alternate-2.18.tar.bz2 http://www.vim.org/scripts/download_script.php?src_id=6347 -> alternate.txt
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=b6b1c4f65f6b06f8727187b56a262378
diff --git a/metadata/md5-cache/app-vim/ansiesc-12 b/metadata/md5-cache/app-vim/ansiesc-12
index 667b0fcfee12..a1b715c01eaa 100644
--- a/metadata/md5-cache/app-vim/ansiesc-12
+++ b/metadata/md5-cache/app-vim/ansiesc-12
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=app-vim/cecutil || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/ansiesc-12.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ansiesc-12.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=4707888684a86dd5ec934e7dd6512124
diff --git a/metadata/md5-cache/app-vim/ant_menu-0.5.7.1-r1 b/metadata/md5-cache/app-vim/ant_menu-0.5.7.1-r1
index 53718cb86ae7..b116d419d0df 100644
--- a/metadata/md5-cache/app-vim/ant_menu-0.5.7.1-r1
+++ b/metadata/md5-cache/app-vim/ant_menu-0.5.7.1-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-java/ant || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/ant_menu-0.5.7.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ant_menu-0.5.7.1.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=f9fa661c2a55bd71d071b9f26e828a79
diff --git a/metadata/md5-cache/app-vim/autoalign-14 b/metadata/md5-cache/app-vim/autoalign-14
index 9904c90fdfe3..4f31c6fb8996 100644
--- a/metadata/md5-cache/app-vim/autoalign-14
+++ b/metadata/md5-cache/app-vim/autoalign-14
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=>=app-vim/align-30 >=app-vim/cecutil-4 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/autoalign-14.tar.xz https://dev.gentoo.org/~chutzpah/vim/autoalign-14.tar.xz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=61b4bc65b8713ed68c9a7493703a29c9
diff --git a/metadata/md5-cache/app-vim/automatictexplugin-12.5-r1 b/metadata/md5-cache/app-vim/automatictexplugin-12.5-r1
index d681b02ee538..b812cd95e8be 100644
--- a/metadata/md5-cache/app-vim/automatictexplugin-12.5-r1
+++ b/metadata/md5-cache/app-vim/automatictexplugin-12.5-r1
@@ -10,5 +10,5 @@ RDEPEND=|| ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sourceforge/atp-vim/releases/AutomaticTexPlugin_12.5.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=c2590af0b7cb34b49ddf72fa41be9209
diff --git a/metadata/md5-cache/app-vim/bash-support-4.2.1 b/metadata/md5-cache/app-vim/bash-support-4.2.1
index b9b69eeab5ae..4b31139e4340 100644
--- a/metadata/md5-cache/app-vim/bash-support-4.2.1
+++ b/metadata/md5-cache/app-vim/bash-support-4.2.1
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/bash-support-4.2.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/bash-support-4.2.1.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=7c961905acd7c69a1a5eb7214a00aec7
diff --git a/metadata/md5-cache/app-vim/bnf-syntax-1.2-r2 b/metadata/md5-cache/app-vim/bnf-syntax-1.2-r2
index e939fd669304..af2f6efd7169 100644
--- a/metadata/md5-cache/app-vim/bnf-syntax-1.2-r2
+++ b/metadata/md5-cache/app-vim/bnf-syntax-1.2-r2
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/bnf-syntax-1.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/bnf-syntax-1.2.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=354c4fa101c4fb844fa05b8571862cd8
diff --git a/metadata/md5-cache/app-vim/brainfuck-syntax-1.0.2 b/metadata/md5-cache/app-vim/brainfuck-syntax-1.0.2
index fd1cb832e6ba..1b24bc35f960 100644
--- a/metadata/md5-cache/app-vim/brainfuck-syntax-1.0.2
+++ b/metadata/md5-cache/app-vim/brainfuck-syntax-1.0.2
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/brainfuck-syntax-1.0.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/brainfuck-syntax-1.0.2.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=09fbe6db58830ed5936a9ddc954ce42e
diff --git a/metadata/md5-cache/app-vim/brainfuck-syntax-1.0.3 b/metadata/md5-cache/app-vim/brainfuck-syntax-1.0.3
index bb860e5f6933..397fb722adf7 100644
--- a/metadata/md5-cache/app-vim/brainfuck-syntax-1.0.3
+++ b/metadata/md5-cache/app-vim/brainfuck-syntax-1.0.3
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/brainfuck-syntax-1.0.3.tar.bz2 https://dev.gentoo.org/~radhermit/vim/brainfuck-syntax-1.0.3.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=4f6f3a2a3c96e02fe1c044003401157f
diff --git a/metadata/md5-cache/app-vim/breakpts-4.0-r1 b/metadata/md5-cache/app-vim/breakpts-4.0-r1
index 5d1ef60aae4f..0e3837fd51dd 100644
--- a/metadata/md5-cache/app-vim/breakpts-4.0-r1
+++ b/metadata/md5-cache/app-vim/breakpts-4.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 ) >=app-vim/multvals-3.6.1 >=app-vim/genutils-1.13 >=app-vim/foldutil-1.6 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/breakpts-4.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/breakpts-4.0.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=47f162774cebfe79ad1d2578c58db554
diff --git a/metadata/md5-cache/app-vim/bufexplorer-7.4.18 b/metadata/md5-cache/app-vim/bufexplorer-7.4.18
index 0b9734edeab5..c01d3a1061e9 100644
--- a/metadata/md5-cache/app-vim/bufexplorer-7.4.18
+++ b/metadata/md5-cache/app-vim/bufexplorer-7.4.18
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/jlanzarotta/bufexplorer/archive/v7.4.18.tar.gz -> bufexplorer-7.4.18.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=554c71067f8955f84c6d49046a3b9c63
diff --git a/metadata/md5-cache/app-vim/bufexplorer-7.4.19 b/metadata/md5-cache/app-vim/bufexplorer-7.4.19
index 231be457e276..6e49b77442b5 100644
--- a/metadata/md5-cache/app-vim/bufexplorer-7.4.19
+++ b/metadata/md5-cache/app-vim/bufexplorer-7.4.19
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/jlanzarotta/bufexplorer/archive/v7.4.19.tar.gz -> bufexplorer-7.4.19.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=b88bb18c05c87fccdc03ef7c7e2c16f7
diff --git a/metadata/md5-cache/app-vim/bufexplorer-9999 b/metadata/md5-cache/app-vim/bufexplorer-9999
index 9f0d4951e122..6e49a2ff8cfa 100644
--- a/metadata/md5-cache/app-vim/bufexplorer-9999
+++ b/metadata/md5-cache/app-vim/bufexplorer-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=42 https://github.com/j
 LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	52a888802d25387c2c74cb845d1219bc	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	52a888802d25387c2c74cb845d1219bc	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=54099f31c9991450a9aa870c2708d420
diff --git a/metadata/md5-cache/app-vim/c-support-6.0 b/metadata/md5-cache/app-vim/c-support-6.0
index 700fa4ec387e..80de25971d00 100644
--- a/metadata/md5-cache/app-vim/c-support-6.0
+++ b/metadata/md5-cache/app-vim/c-support-6.0
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/c-support-6.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/c-support-6.0.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=1189a2415b0b01a7fc25705ae2578668
diff --git a/metadata/md5-cache/app-vim/c-support-6.1 b/metadata/md5-cache/app-vim/c-support-6.1
index 65c6cef62ae5..07b21ee86f1f 100644
--- a/metadata/md5-cache/app-vim/c-support-6.1
+++ b/metadata/md5-cache/app-vim/c-support-6.1
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/c-support-6.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/c-support-6.1.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=2a797d47670dd1b714fa4a7b0562fac5
diff --git a/metadata/md5-cache/app-vim/c-support-6.1.1 b/metadata/md5-cache/app-vim/c-support-6.1.1
index a6d5c714599b..fca2314709d1 100644
--- a/metadata/md5-cache/app-vim/c-support-6.1.1
+++ b/metadata/md5-cache/app-vim/c-support-6.1.1
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/c-support-6.1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/c-support-6.1.1.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=b5e5607a34d0c49c7dcc486785da316c
diff --git a/metadata/md5-cache/app-vim/calendar-2.9 b/metadata/md5-cache/app-vim/calendar-2.9
index bc972ffe4349..8d1f5a1a5838 100644
--- a/metadata/md5-cache/app-vim/calendar-2.9
+++ b/metadata/md5-cache/app-vim/calendar-2.9
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/calendar-2.9.tar.bz2 https://dev.gentoo.org/~radhermit/vim/calendar-2.9.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=8ccc3a98a566606483893fd65840d791
diff --git a/metadata/md5-cache/app-vim/cctree-1.61-r1 b/metadata/md5-cache/app-vim/cctree-1.61-r1
index 1cfbdd33b151..1eed33db34bf 100644
--- a/metadata/md5-cache/app-vim/cctree-1.61-r1
+++ b/metadata/md5-cache/app-vim/cctree-1.61-r1
@@ -8,5 +8,5 @@ LICENSE=bufexplorer.vim
 RDEPEND=dev-util/cscope || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/cctree-1.61.tar.bz2 https://dev.gentoo.org/~radhermit/vim/cctree-1.61.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=608d78a654f35de7b8b36ad920ae90d1
diff --git a/metadata/md5-cache/app-vim/cecutil-17 b/metadata/md5-cache/app-vim/cecutil-17
index 956d8fd61be8..285281034bc1 100644
--- a/metadata/md5-cache/app-vim/cecutil-17
+++ b/metadata/md5-cache/app-vim/cecutil-17
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/cecutil-17.tar.bz2 https://dev.gentoo.org/~radhermit/vim/cecutil-17.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=6dba5f30a19ce12c8ea1fec7432ac6f1
diff --git a/metadata/md5-cache/app-vim/cfengine-syntax-20141019 b/metadata/md5-cache/app-vim/cfengine-syntax-20141019
index 2699ab0b9c59..140b9a4f29e0 100644
--- a/metadata/md5-cache/app-vim/cfengine-syntax-20141019
+++ b/metadata/md5-cache/app-vim/cfengine-syntax-20141019
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/cfengine-syntax-20141019.tar.bz2 https://dev.gentoo.org/~radhermit/vim/cfengine-syntax-20141019.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=995a160c54d6b4bf1641c391d93a2fb8
diff --git a/metadata/md5-cache/app-vim/checkattach-0.17 b/metadata/md5-cache/app-vim/checkattach-0.17
index 9c1c066db54f..cb259f09a8c9 100644
--- a/metadata/md5-cache/app-vim/checkattach-0.17
+++ b/metadata/md5-cache/app-vim/checkattach-0.17
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/checkattach-0.17.tar.bz2 https://dev.gentoo.org/~radhermit/vim/checkattach-0.17.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=001b60c8da575b0cafd174508d7cbfce
diff --git a/metadata/md5-cache/app-vim/closetag-0.9.1-r1 b/metadata/md5-cache/app-vim/closetag-0.9.1-r1
index 47055c613db8..59bc9a988759 100644
--- a/metadata/md5-cache/app-vim/closetag-0.9.1-r1
+++ b/metadata/md5-cache/app-vim/closetag-0.9.1-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/closetag-0.9.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/closetag-0.9.1.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=89e414614eb7fa44b9eea88a291a11dd
diff --git a/metadata/md5-cache/app-vim/cmdalias-3.0-r1 b/metadata/md5-cache/app-vim/cmdalias-3.0-r1
index 82f22b1bc80e..188509c53884 100644
--- a/metadata/md5-cache/app-vim/cmdalias-3.0-r1
+++ b/metadata/md5-cache/app-vim/cmdalias-3.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/cmdalias-3.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/cmdalias-3.0.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=5f70cc1a30b2374fc9b5c9eec32306f9
diff --git a/metadata/md5-cache/app-vim/colorschemes-20140623-r1 b/metadata/md5-cache/app-vim/colorschemes-20140623-r1
index f78cb2993a6c..fa66d85007e8 100644
--- a/metadata/md5-cache/app-vim/colorschemes-20140623-r1
+++ b/metadata/md5-cache/app-vim/colorschemes-20140623-r1
@@ -8,5 +8,5 @@ LICENSE=vim GPL-2 GPL-2+ GPL-3 GPL-3+ MIT BSD WTFPL-2 public-domain vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/colorschemes-20140623.tar.bz2 https://dev.gentoo.org/~radhermit/vim/colorschemes-20140623.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=68539a674e38e6c33ce256504add198d
diff --git a/metadata/md5-cache/app-vim/colorsel-20100406 b/metadata/md5-cache/app-vim/colorsel-20100406
index 8c7e5dc9ef74..c3e80a03fecf 100644
--- a/metadata/md5-cache/app-vim/colorsel-20100406
+++ b/metadata/md5-cache/app-vim/colorsel-20100406
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=>=app-editors/gvim-7.0 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=http://www.vim.org/scripts/download_script.php?src_id=12789 -> colorsel-20100406.zip
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=642e680fa336b99eb4d9e49de01409c2
diff --git a/metadata/md5-cache/app-vim/colorv-3.0.2-r1 b/metadata/md5-cache/app-vim/colorv-3.0.2-r1
index 3f74df589997..b679dfd745af 100644
--- a/metadata/md5-cache/app-vim/colorv-3.0.2-r1
+++ b/metadata/md5-cache/app-vim/colorv-3.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://gentoo/colorv-3.0.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/colorv-3.0.2.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=143edb834a7b1ce4e9081578b61a0ae2
diff --git a/metadata/md5-cache/app-vim/command-t-5.0.1 b/metadata/md5-cache/app-vim/command-t-5.0.1
index f995e9b751d4..ca1e3e3f0bb3 100644
--- a/metadata/md5-cache/app-vim/command-t-5.0.1
+++ b/metadata/md5-cache/app-vim/command-t-5.0.1
@@ -10,5 +10,5 @@ RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/v
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/wincent/command-t/archive/5.0.1.tar.gz -> command-t-5.0.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=e3b372c819d282369c741983331c8ad5
diff --git a/metadata/md5-cache/app-vim/command-t-5.0.2 b/metadata/md5-cache/app-vim/command-t-5.0.2
index 06aa5e3e1a9f..f4f6267ab535 100644
--- a/metadata/md5-cache/app-vim/command-t-5.0.2
+++ b/metadata/md5-cache/app-vim/command-t-5.0.2
@@ -10,5 +10,5 @@ RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/v
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/wincent/command-t/archive/5.0.2.tar.gz -> command-t-5.0.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=e92884084ab3adccea4067954ef96a63
diff --git a/metadata/md5-cache/app-vim/conque-2.3 b/metadata/md5-cache/app-vim/conque-2.3
index a385f8473564..0d2779468dc3 100644
--- a/metadata/md5-cache/app-vim/conque-2.3
+++ b/metadata/md5-cache/app-vim/conque-2.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=|| ( app-editors/vim[python] app-editors/gvim[python] ) >=dev-lang/python-2.3 || ( >=app-editors/vim-7.1 >=app-editors/gvim-7.1 )
 SLOT=0
 SRC_URI=https://conque.googlecode.com/files/conque_2.3.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=cffaa7a931dc28a96f5d93667506e257
diff --git a/metadata/md5-cache/app-vim/conque-2.3-r1 b/metadata/md5-cache/app-vim/conque-2.3-r1
index 3ded6052e491..c0e4aa139ae0 100644
--- a/metadata/md5-cache/app-vim/conque-2.3-r1
+++ b/metadata/md5-cache/app-vim/conque-2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=|| ( app-editors/vim[python,python_targets_python2_7(-)?,python_targets_
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://conque.googlecode.com/files/conque_2.3.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=117dffe784cfe67b732b8e61b4ca9ad1
diff --git a/metadata/md5-cache/app-vim/cream-0.43 b/metadata/md5-cache/app-vim/cream-0.43
index 993b34c54701..eb339d82869f 100644
--- a/metadata/md5-cache/app-vim/cream-0.43
+++ b/metadata/md5-cache/app-vim/cream-0.43
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-editors/gvim-7.0 dev-util/ctags || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/cream/cream-0.43.tar.gz l10n_de? ( http://cream.sourceforge.net/cream-spell-dict-ger_2.0.1.zip ) l10n_en? ( http://cream.sourceforge.net/cream-spell-dict-eng_2.0.2.zip ) l10n_es? ( http://cream.sourceforge.net/cream-spell-dict-spa_3.0.zip ) l10n_fr? ( http://cream.sourceforge.net/cream-spell-dict-fre_2.1.zip )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=2cc7b7569d676cf5cc239b732ad52117
diff --git a/metadata/md5-cache/app-vim/csound-syntax-20160804 b/metadata/md5-cache/app-vim/csound-syntax-20160804
index 74a233e33042..c489dfe37712 100644
--- a/metadata/md5-cache/app-vim/csound-syntax-20160804
+++ b/metadata/md5-cache/app-vim/csound-syntax-20160804
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/csound-syntax-20160804.tar.bz2 https://dev.gentoo.org/~radhermit/vim/csound-syntax-20160804.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=d7a8f14159e306c57d33456843c0ee3e
diff --git a/metadata/md5-cache/app-vim/csscomplete-1.0 b/metadata/md5-cache/app-vim/csscomplete-1.0
index b679da8e3a35..cfc565c0e222 100644
--- a/metadata/md5-cache/app-vim/csscomplete-1.0
+++ b/metadata/md5-cache/app-vim/csscomplete-1.0
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/othree/csscomplete.vim/archive/1.0.zip -> csscomplete-1.0.zip
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=754f50aecd97a0209959aae3ace84c65
diff --git a/metadata/md5-cache/app-vim/csv-0.31-r1 b/metadata/md5-cache/app-vim/csv-0.31-r1
index 758040270429..120f5ab7d341 100644
--- a/metadata/md5-cache/app-vim/csv-0.31-r1
+++ b/metadata/md5-cache/app-vim/csv-0.31-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/csv-0.31.tar.bz2 https://dev.gentoo.org/~radhermit/vim/csv-0.31.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=1d0cd727fdd6dc0f20c9c6765b7c4f0d
diff --git a/metadata/md5-cache/app-vim/ctrlp-1.80 b/metadata/md5-cache/app-vim/ctrlp-1.80
index 6aefb4afbb91..5e1f4b6f9ee9 100644
--- a/metadata/md5-cache/app-vim/ctrlp-1.80
+++ b/metadata/md5-cache/app-vim/ctrlp-1.80
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/ctrlpvim/ctrlp.vim/archive/1.80.tar.gz -> ctrlp-1.80.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=e70f43201887478d3c72e78c0f9df95a
diff --git a/metadata/md5-cache/app-vim/ctx-1.17-r1 b/metadata/md5-cache/app-vim/ctx-1.17-r1
index d0da5b3a44d0..7cd871ef2c09 100644
--- a/metadata/md5-cache/app-vim/ctx-1.17-r1
+++ b/metadata/md5-cache/app-vim/ctx-1.17-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!app-vim/enhancedcommentify || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/ctx-1.17.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ctx-1.17.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=d666ce197e73006a08c6e899e1155ae9
diff --git a/metadata/md5-cache/app-vim/curcmdmode-1.0-r1 b/metadata/md5-cache/app-vim/curcmdmode-1.0-r1
index eb262d1e3aa9..f87dffdc084f 100644
--- a/metadata/md5-cache/app-vim/curcmdmode-1.0-r1
+++ b/metadata/md5-cache/app-vim/curcmdmode-1.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-vim/genutils || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/curcmdmode-1.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/curcmdmode-1.0.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=ed3e3cb2577010e024ca06f206c18289
diff --git a/metadata/md5-cache/app-vim/cvsmenu-1.147-r1 b/metadata/md5-cache/app-vim/cvsmenu-1.147-r1
index 1afb4d1edb31..7f5d8ac65aa8 100644
--- a/metadata/md5-cache/app-vim/cvsmenu-1.147-r1
+++ b/metadata/md5-cache/app-vim/cvsmenu-1.147-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-vcs/cvs || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/cvsmenu-1.147.tar.bz2 https://dev.gentoo.org/~radhermit/vim/cvsmenu-1.147.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=1e31d0eec86215db872d849488dd9b21
diff --git a/metadata/md5-cache/app-vim/dbext-25.0 b/metadata/md5-cache/app-vim/dbext-25.0
index a3bc2a0ca172..d9de844d5b64 100644
--- a/metadata/md5-cache/app-vim/dbext-25.0
+++ b/metadata/md5-cache/app-vim/dbext-25.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/dbext-25.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/dbext-25.0.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=827fbbeb406a1f84f7277daeeedcc733
diff --git a/metadata/md5-cache/app-vim/detectindent-1.0_p20150908 b/metadata/md5-cache/app-vim/detectindent-1.0_p20150908
index 883bcc3f03c6..4bca14e05aca 100644
--- a/metadata/md5-cache/app-vim/detectindent-1.0_p20150908
+++ b/metadata/md5-cache/app-vim/detectindent-1.0_p20150908
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/detectindent-1.0_p20150908.tar.xz https://dev.gentoo.org/~chutzpah/vim/detectindent-1.0_p20150908.tar.xz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=d9ddbb6bc352ad9634db9267bf9a7ba8
diff --git a/metadata/md5-cache/app-vim/dhcpd-syntax-20030825 b/metadata/md5-cache/app-vim/dhcpd-syntax-20030825
index dd9faa732091..866e95e4253c 100644
--- a/metadata/md5-cache/app-vim/dhcpd-syntax-20030825
+++ b/metadata/md5-cache/app-vim/dhcpd-syntax-20030825
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/dhcpd-syntax-20030825.tar.bz2 https://dev.gentoo.org/~radhermit/vim/dhcpd-syntax-20030825.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=a63e8b5031c0536994b97a67b116b663
diff --git a/metadata/md5-cache/app-vim/dhcpd-syntax-20030825-r1 b/metadata/md5-cache/app-vim/dhcpd-syntax-20030825-r1
index 8c6443bf4653..36b24c390148 100644
--- a/metadata/md5-cache/app-vim/dhcpd-syntax-20030825-r1
+++ b/metadata/md5-cache/app-vim/dhcpd-syntax-20030825-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/dhcpd-syntax-20030825.tar.bz2 https://dev.gentoo.org/~radhermit/vim/dhcpd-syntax-20030825.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=b06931796eab687a5b22a122d47de6ae
diff --git a/metadata/md5-cache/app-vim/diffchar-6.9 b/metadata/md5-cache/app-vim/diffchar-6.9
index 8bd02ce0d785..6aad18d48581 100644
--- a/metadata/md5-cache/app-vim/diffchar-6.9
+++ b/metadata/md5-cache/app-vim/diffchar-6.9
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/diffchar-6.9.tar.bz2 https://dev.gentoo.org/~radhermit/vim/diffchar-6.9.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=8d6e700a1e38b2dca14681303304598c
diff --git a/metadata/md5-cache/app-vim/diffchar-7.01 b/metadata/md5-cache/app-vim/diffchar-7.01
index 2eacaebbf2f9..a61c40e948f6 100644
--- a/metadata/md5-cache/app-vim/diffchar-7.01
+++ b/metadata/md5-cache/app-vim/diffchar-7.01
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/diffchar-7.01.tar.bz2 https://dev.gentoo.org/~radhermit/vim/diffchar-7.01.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=5562a1f190fb147a1bc690f0a0721303
diff --git a/metadata/md5-cache/app-vim/dirdiff-1.1.5 b/metadata/md5-cache/app-vim/dirdiff-1.1.5
index 1d7ab2493b5e..2838417ae4d0 100644
--- a/metadata/md5-cache/app-vim/dirdiff-1.1.5
+++ b/metadata/md5-cache/app-vim/dirdiff-1.1.5
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=sys-apps/diffutils || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/dirdiff-1.1.5.tar.bz2 https://dev.gentoo.org/~radhermit/vim/dirdiff-1.1.5.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=85f5ae713343bbe933d04c3a29373363
diff --git a/metadata/md5-cache/app-vim/easy-align-2.10.0 b/metadata/md5-cache/app-vim/easy-align-2.10.0
index 9f472fef85e7..9f44a8900d85 100644
--- a/metadata/md5-cache/app-vim/easy-align-2.10.0
+++ b/metadata/md5-cache/app-vim/easy-align-2.10.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/junegunn/vim-easy-align/archive/2.10.0.tar.gz -> easy-align-2.10.0.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=de3f4993fa73cccb5f752d26c2564847
diff --git a/metadata/md5-cache/app-vim/easytags-3.11 b/metadata/md5-cache/app-vim/easytags-3.11
index c34020670f93..b8ca8e9b1836 100644
--- a/metadata/md5-cache/app-vim/easytags-3.11
+++ b/metadata/md5-cache/app-vim/easytags-3.11
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/xolox/vim-easytags/archive/3.11.tar.gz -> easytags-3.11.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=f970d3cedc4cde66cb9a9ce885be4d80
diff --git a/metadata/md5-cache/app-vim/ebnf-syntax-1.1-r1 b/metadata/md5-cache/app-vim/ebnf-syntax-1.1-r1
index 138ebff679bb..dc0ad6f7ddef 100644
--- a/metadata/md5-cache/app-vim/ebnf-syntax-1.1-r1
+++ b/metadata/md5-cache/app-vim/ebnf-syntax-1.1-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/ebnf-syntax-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ebnf-syntax-1.1.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=35db7d59cf1465edb47c12d007410bff
diff --git a/metadata/md5-cache/app-vim/ebnf-syntax-1.1-r2 b/metadata/md5-cache/app-vim/ebnf-syntax-1.1-r2
index 9a87271f37ca..977fb75d5c82 100644
--- a/metadata/md5-cache/app-vim/ebnf-syntax-1.1-r2
+++ b/metadata/md5-cache/app-vim/ebnf-syntax-1.1-r2
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/ebnf-syntax-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ebnf-syntax-1.1.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=587c0e2fd7d70df4ffdae9cad18b4b36
diff --git a/metadata/md5-cache/app-vim/editorconfig-vim-0.3.3-r2 b/metadata/md5-cache/app-vim/editorconfig-vim-0.3.3-r2
index af335e5e9362..5f73b3bec18e 100644
--- a/metadata/md5-cache/app-vim/editorconfig-vim-0.3.3-r2
+++ b/metadata/md5-cache/app-vim/editorconfig-vim-0.3.3-r2
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) 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/editorconfig/editorconfig-vim/archive/v0.3.3.tar.gz -> editorconfig-vim-0.3.3.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=abe9d507d9b6be9e27a4cb40ee88f619
diff --git a/metadata/md5-cache/app-vim/emmet-0.85 b/metadata/md5-cache/app-vim/emmet-0.85
index 311f24e86e09..bfdbbdf1e87d 100644
--- a/metadata/md5-cache/app-vim/emmet-0.85
+++ b/metadata/md5-cache/app-vim/emmet-0.85
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/emmet-0.85.tar.bz2 https://dev.gentoo.org/~radhermit/vim/emmet-0.85.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=b4239d18bba169dedd7a8a9b762a6b99
diff --git a/metadata/md5-cache/app-vim/enhancedcommentify-2.3-r1 b/metadata/md5-cache/app-vim/enhancedcommentify-2.3-r1
index f9150572c47b..c58840056413 100644
--- a/metadata/md5-cache/app-vim/enhancedcommentify-2.3-r1
+++ b/metadata/md5-cache/app-vim/enhancedcommentify-2.3-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=sys-apps/sed !app-vim/ctx || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/enhancedcommentify-2.3.tar.bz2 https://dev.gentoo.org/~radhermit/vim/enhancedcommentify-2.3.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=a20d26bd62301d7553c300c22cb80c22
diff --git a/metadata/md5-cache/app-vim/errsign-0.1-r1 b/metadata/md5-cache/app-vim/errsign-0.1-r1
index 2bd493ee8329..3f13a381b02d 100644
--- a/metadata/md5-cache/app-vim/errsign-0.1-r1
+++ b/metadata/md5-cache/app-vim/errsign-0.1-r1
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/errsign-0.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/errsign-0.1.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=54b1815e39124dd5cf284e480b7f4394
diff --git a/metadata/md5-cache/app-vim/eruby-syntax-2.0-r1 b/metadata/md5-cache/app-vim/eruby-syntax-2.0-r1
index 905d675d278e..bc39e27c1394 100644
--- a/metadata/md5-cache/app-vim/eruby-syntax-2.0-r1
+++ b/metadata/md5-cache/app-vim/eruby-syntax-2.0-r1
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/eruby-syntax-2.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/eruby-syntax-2.0.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=c6d9ffa0cf485217c023a738bb80660b
diff --git a/metadata/md5-cache/app-vim/eruby-syntax-2.0-r2 b/metadata/md5-cache/app-vim/eruby-syntax-2.0-r2
index 800d1c2481f7..7d5ecfce2f82 100644
--- a/metadata/md5-cache/app-vim/eruby-syntax-2.0-r2
+++ b/metadata/md5-cache/app-vim/eruby-syntax-2.0-r2
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/eruby-syntax-2.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/eruby-syntax-2.0.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=840439af6b6725f676a682faeac1749d
diff --git a/metadata/md5-cache/app-vim/eselect-syntax-20070506 b/metadata/md5-cache/app-vim/eselect-syntax-20070506
index e463fc882958..f39fb54e11be 100644
--- a/metadata/md5-cache/app-vim/eselect-syntax-20070506
+++ b/metadata/md5-cache/app-vim/eselect-syntax-20070506
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=!<app-vim/gentoo-syntax-20070506 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/eselect-syntax-20070506.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=d1e51400f3b0603292c3fd408a589ae5
diff --git a/metadata/md5-cache/app-vim/exheres-syntax-20090310 b/metadata/md5-cache/app-vim/exheres-syntax-20090310
index 1d1330d0a88a..17fac3d173a0 100644
--- a/metadata/md5-cache/app-vim/exheres-syntax-20090310
+++ b/metadata/md5-cache/app-vim/exheres-syntax-20090310
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=http://dev.exherbo.org/~ahf/pub/software/releases/exheres-syntax/exheres-syntax-20090310.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=775c1ec97226885be55365f62b17fda2
diff --git a/metadata/md5-cache/app-vim/exheres-syntax-99999999 b/metadata/md5-cache/app-vim/exheres-syntax-99999999
index 8ab9670da467..1754012e1162 100644
--- a/metadata/md5-cache/app-vim/exheres-syntax-99999999
+++ b/metadata/md5-cache/app-vim/exheres-syntax-99999999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.exherbo.org/
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-2	195a672bfaf52d868442171c9469bbb6	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-2	195a672bfaf52d868442171c9469bbb6	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=803faea135747074be759366f6900683
diff --git a/metadata/md5-cache/app-vim/extra-syntax-4-r1 b/metadata/md5-cache/app-vim/extra-syntax-4-r1
index 9ba602e1b02d..bc77e9c94132 100644
--- a/metadata/md5-cache/app-vim/extra-syntax-4-r1
+++ b/metadata/md5-cache/app-vim/extra-syntax-4-r1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~mips ~ppc ppc64 x86
 LICENSE=metapackage
 RDEPEND=app-vim/bnf-syntax app-vim/brainfuck-syntax app-vim/cfengine-syntax app-vim/dhcpd-syntax app-vim/ebnf-syntax app-vim/eruby-syntax app-vim/fluxbox-syntax app-vim/gentoo-syntax app-vim/gtk-syntax app-vim/help-extra-syntax app-vim/nagios-syntax app-vim/ntp-syntax app-vim/pam-syntax app-vim/pgn-syntax app-vim/selinux-syntax app-vim/wikipedia-syntax app-vim/xquery-syntax app-vim/xsl-syntax || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=249c72ff0a1c24a7b96597171fce98ce
diff --git a/metadata/md5-cache/app-vim/ferret-1.4 b/metadata/md5-cache/app-vim/ferret-1.4
index f96c836e70d2..110f38db4675 100644
--- a/metadata/md5-cache/app-vim/ferret-1.4
+++ b/metadata/md5-cache/app-vim/ferret-1.4
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/wincent/ferret/archive/1.4.zip -> ferret-1.4.zip
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=483a397066170d04ea72e7fbc4a9a0a6
diff --git a/metadata/md5-cache/app-vim/ferret-1.4-r1 b/metadata/md5-cache/app-vim/ferret-1.4-r1
index 409711552796..a1d922e166c6 100644
--- a/metadata/md5-cache/app-vim/ferret-1.4-r1
+++ b/metadata/md5-cache/app-vim/ferret-1.4-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/wincent/ferret/archive/1.4.zip -> ferret-1.4.zip
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=95b4b72f0178bb8797c6f17bf6a854dd
diff --git a/metadata/md5-cache/app-vim/ferret-1.5 b/metadata/md5-cache/app-vim/ferret-1.5
index ffa6d5a70550..a3a39ed8e662 100644
--- a/metadata/md5-cache/app-vim/ferret-1.5
+++ b/metadata/md5-cache/app-vim/ferret-1.5
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/wincent/ferret/archive/1.5.zip -> ferret-1.5.zip
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=95b4b72f0178bb8797c6f17bf6a854dd
diff --git a/metadata/md5-cache/app-vim/ferret-2.0 b/metadata/md5-cache/app-vim/ferret-2.0
index 8979c6b70ea6..93d90a53749c 100644
--- a/metadata/md5-cache/app-vim/ferret-2.0
+++ b/metadata/md5-cache/app-vim/ferret-2.0
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/wincent/ferret/archive/2.0.tar.gz -> ferret-2.0.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=8a569e4651e9c7a3ec05d65f8d0b4567
diff --git a/metadata/md5-cache/app-vim/ferret-3.0 b/metadata/md5-cache/app-vim/ferret-3.0
index e97c4897d141..6e3ed0dd5991 100644
--- a/metadata/md5-cache/app-vim/ferret-3.0
+++ b/metadata/md5-cache/app-vim/ferret-3.0
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/wincent/ferret/archive/3.0.tar.gz -> ferret-3.0.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=8a569e4651e9c7a3ec05d65f8d0b4567
diff --git a/metadata/md5-cache/app-vim/fluxbox-syntax-1.5 b/metadata/md5-cache/app-vim/fluxbox-syntax-1.5
index 87b659246c47..af09ce80daca 100644
--- a/metadata/md5-cache/app-vim/fluxbox-syntax-1.5
+++ b/metadata/md5-cache/app-vim/fluxbox-syntax-1.5
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=>=app-vim/genindent-1.0 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/fluxbox-syntax-1.5.tar.bz2 https://dev.gentoo.org/~radhermit/vim/fluxbox-syntax-1.5.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=50220f29e04a36fa6fcf68c0536c20f4
diff --git a/metadata/md5-cache/app-vim/foldutil-3.0-r1 b/metadata/md5-cache/app-vim/foldutil-3.0-r1
index 4ba8e5df8553..6378b148e9e6 100644
--- a/metadata/md5-cache/app-vim/foldutil-3.0-r1
+++ b/metadata/md5-cache/app-vim/foldutil-3.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-vim/genutils-2.0 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/foldutil-3.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/foldutil-3.0.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=9650ad47ab9b61bdd044179c43d8b0b8
diff --git a/metadata/md5-cache/app-vim/fugitive-2.2 b/metadata/md5-cache/app-vim/fugitive-2.2
index 8f9c89878811..2ec0a7d06062 100644
--- a/metadata/md5-cache/app-vim/fugitive-2.2
+++ b/metadata/md5-cache/app-vim/fugitive-2.2
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tpope/vim-fugitive/archive/v2.2.tar.gz -> fugitive-2.2.tar.gz
-_eclasses_=vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=a9724070c35f81c324dae8b4f7d3298e
diff --git a/metadata/md5-cache/app-vim/fugitive-9999 b/metadata/md5-cache/app-vim/fugitive-9999
index a7afaedd4337..0b105c4f7153 100644
--- a/metadata/md5-cache/app-vim/fugitive-9999
+++ b/metadata/md5-cache/app-vim/fugitive-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=2975 https://github.com
 LICENSE=vim
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	52a888802d25387c2c74cb845d1219bc	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	52a888802d25387c2c74cb845d1219bc	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=a9724070c35f81c324dae8b4f7d3298e
diff --git a/metadata/md5-cache/app-vim/fuzzyfinder-4.2.2 b/metadata/md5-cache/app-vim/fuzzyfinder-4.2.2
index 7ef428b3498e..701c49441482 100644
--- a/metadata/md5-cache/app-vim/fuzzyfinder-4.2.2
+++ b/metadata/md5-cache/app-vim/fuzzyfinder-4.2.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=app-vim/l9 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=http://www.vim.org/scripts/download_script.php?src_id=13961 -> fuzzyfinder-4.2.2.zip
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=3dad74a33557400cc4b24f56a38c2fd1
diff --git a/metadata/md5-cache/app-vim/genindent-1.1-r1 b/metadata/md5-cache/app-vim/genindent-1.1-r1
index 70eacda16d11..01085e00d786 100644
--- a/metadata/md5-cache/app-vim/genindent-1.1-r1
+++ b/metadata/md5-cache/app-vim/genindent-1.1-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/genindent-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/genindent-1.1.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=6b0d9272cf737c7a2beab139197387a1
diff --git a/metadata/md5-cache/app-vim/gentoo-syntax-20160530 b/metadata/md5-cache/app-vim/gentoo-syntax-20160530
index e2a4084d5eea..a9b4876611c3 100644
--- a/metadata/md5-cache/app-vim/gentoo-syntax-20160530
+++ b/metadata/md5-cache/app-vim/gentoo-syntax-20160530
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/gentoo/gentoo-syntax/archive/20160530.tar.gz -> gentoo-syntax-20160530.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=7ed0364d4b7e4358a3491b375b6afbe5
diff --git a/metadata/md5-cache/app-vim/gentoo-syntax-20170225 b/metadata/md5-cache/app-vim/gentoo-syntax-20170225
index 4deb2fe058ed..81f46f42bdc1 100644
--- a/metadata/md5-cache/app-vim/gentoo-syntax-20170225
+++ b/metadata/md5-cache/app-vim/gentoo-syntax-20170225
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/gentoo/gentoo-syntax/archive/20170225.tar.gz -> gentoo-syntax-20170225.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=b0a426f5c217ff18aa02dd080b755562
diff --git a/metadata/md5-cache/app-vim/gentoo-syntax-99999999 b/metadata/md5-cache/app-vim/gentoo-syntax-99999999
index d57aa2659d0d..03b299266f46 100644
--- a/metadata/md5-cache/app-vim/gentoo-syntax-99999999
+++ b/metadata/md5-cache/app-vim/gentoo-syntax-99999999
@@ -7,5 +7,5 @@ IUSE=ignore-glep31
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	52a888802d25387c2c74cb845d1219bc	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	52a888802d25387c2c74cb845d1219bc	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=c55c0d49dddc5e19abdb8bf8a1f8767b
diff --git a/metadata/md5-cache/app-vim/genutils-2.5 b/metadata/md5-cache/app-vim/genutils-2.5
index f367339f4b0d..3a9558fc29b9 100644
--- a/metadata/md5-cache/app-vim/genutils-2.5
+++ b/metadata/md5-cache/app-vim/genutils-2.5
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=http://www.vim.org/scripts/download_script.php?src_id=11399 -> genutils-2.5.zip
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=2aec90cbb5c3b5498604bceff13242bd
diff --git a/metadata/md5-cache/app-vim/gist-7.3 b/metadata/md5-cache/app-vim/gist-7.3
index e0c3ecefe252..9a578dacbe9b 100644
--- a/metadata/md5-cache/app-vim/gist-7.3
+++ b/metadata/md5-cache/app-vim/gist-7.3
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=app-vim/webapi net-misc/curl dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/mattn/gist-vim/archive/7.3.tar.gz -> gist-7.3.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=6a3769ba9ee4d81cae1a99a08c4497c0
diff --git a/metadata/md5-cache/app-vim/git-patch-tags-0.2 b/metadata/md5-cache/app-vim/git-patch-tags-0.2
index 98fc33ca24ba..25d22ca42472 100644
--- a/metadata/md5-cache/app-vim/git-patch-tags-0.2
+++ b/metadata/md5-cache/app-vim/git-patch-tags-0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/git-patch-tags-0.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/git-patch-tags-0.2.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=42c016a6f68fa635817792c7e5c5ed89
diff --git a/metadata/md5-cache/app-vim/gitgutter-20170222 b/metadata/md5-cache/app-vim/gitgutter-20170222
index 9c618c9313b5..2c15af747949 100644
--- a/metadata/md5-cache/app-vim/gitgutter-20170222
+++ b/metadata/md5-cache/app-vim/gitgutter-20170222
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/gitgutter-20170222.tar.bz2 https://dev.gentoo.org/~radhermit/vim/gitgutter-20170222.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=3d5d5f3014a2e215ca635b6f291a354e
diff --git a/metadata/md5-cache/app-vim/gitgutter-99999999 b/metadata/md5-cache/app-vim/gitgutter-99999999
index 930f2a6e58d5..ee00e9937e27 100644
--- a/metadata/md5-cache/app-vim/gitgutter-99999999
+++ b/metadata/md5-cache/app-vim/gitgutter-99999999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/airblade/vim-gitgutter/
 LICENSE=MIT
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	52a888802d25387c2c74cb845d1219bc	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	52a888802d25387c2c74cb845d1219bc	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=39cf91656b38baf35134aba8cc5b8853
diff --git a/metadata/md5-cache/app-vim/gitlog-5.1.0 b/metadata/md5-cache/app-vim/gitlog-5.1.0
index ee548636553b..9b44613b9f1e 100644
--- a/metadata/md5-cache/app-vim/gitlog-5.1.0
+++ b/metadata/md5-cache/app-vim/gitlog-5.1.0
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/PAntoine/vimgitlog/archive/version_5.1.0.tar.gz -> gitlog-5.1.0.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=f4b9206dbb7e01b0b38251977b81ce72
diff --git a/metadata/md5-cache/app-vim/gitlog-6.0.0 b/metadata/md5-cache/app-vim/gitlog-6.0.0
index 60d391166ce2..ba7c7b853550 100644
--- a/metadata/md5-cache/app-vim/gitlog-6.0.0
+++ b/metadata/md5-cache/app-vim/gitlog-6.0.0
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/PAntoine/vimgitlog/archive/version_6.0.0.tar.gz -> gitlog-6.0.0.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=8aa1923dd1587d9b81714170d9e2f154
diff --git a/metadata/md5-cache/app-vim/gitlog-9999 b/metadata/md5-cache/app-vim/gitlog-9999
index db63eb00b168..9fe743dacb97 100644
--- a/metadata/md5-cache/app-vim/gitlog-9999
+++ b/metadata/md5-cache/app-vim/gitlog-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=4294 https://github.com
 LICENSE=Artistic
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	52a888802d25387c2c74cb845d1219bc	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	52a888802d25387c2c74cb845d1219bc	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=8aa1923dd1587d9b81714170d9e2f154
diff --git a/metadata/md5-cache/app-vim/gitolite-syntax-20111225 b/metadata/md5-cache/app-vim/gitolite-syntax-20111225
index c54b6c6253c0..149cb3b0900f 100644
--- a/metadata/md5-cache/app-vim/gitolite-syntax-20111225
+++ b/metadata/md5-cache/app-vim/gitolite-syntax-20111225
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-syntax-20111225.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=6e7338cbf017d3460aca362de61df8f1
diff --git a/metadata/md5-cache/app-vim/gitolite-syntax-20130306 b/metadata/md5-cache/app-vim/gitolite-syntax-20130306
index b82799843453..b9257fdce0b3 100644
--- a/metadata/md5-cache/app-vim/gitolite-syntax-20130306
+++ b/metadata/md5-cache/app-vim/gitolite-syntax-20130306
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tmatilai/gitolite.vim/archive/990634e95f209ffca96970da1c117c0f67697d89.tar.gz -> gitolite-syntax-20130306.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=8e58b9c910bb9c5a0ba75ebbe71c471e
diff --git a/metadata/md5-cache/app-vim/gitv-1.3 b/metadata/md5-cache/app-vim/gitv-1.3
index 821f17ef9050..871e644fc5c6 100644
--- a/metadata/md5-cache/app-vim/gitv-1.3
+++ b/metadata/md5-cache/app-vim/gitv-1.3
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=dev-vcs/git app-vim/fugitive || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/gregsexton/gitv/archive/v1.3.tar.gz -> gitv-1.3.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=584fe153ae340dd869dd3a2a2e0ea83a
diff --git a/metadata/md5-cache/app-vim/gitv-1.3.1 b/metadata/md5-cache/app-vim/gitv-1.3.1
index 6209cadd4122..adaff69d1546 100644
--- a/metadata/md5-cache/app-vim/gitv-1.3.1
+++ b/metadata/md5-cache/app-vim/gitv-1.3.1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=dev-vcs/git app-vim/fugitive || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/gregsexton/gitv/archive/v1.3.1.tar.gz -> gitv-1.3.1.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=885e22482dc90cf5d21a7692d5d720fd
diff --git a/metadata/md5-cache/app-vim/gitv-9999 b/metadata/md5-cache/app-vim/gitv-9999
index 2ed3b8658a81..3379603bd591 100644
--- a/metadata/md5-cache/app-vim/gitv-9999
+++ b/metadata/md5-cache/app-vim/gitv-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=3574 https://github.com
 LICENSE=vim
 RDEPEND=dev-vcs/git app-vim/fugitive || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	52a888802d25387c2c74cb845d1219bc	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	52a888802d25387c2c74cb845d1219bc	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=885e22482dc90cf5d21a7692d5d720fd
diff --git a/metadata/md5-cache/app-vim/gnupg-2.6 b/metadata/md5-cache/app-vim/gnupg-2.6
index b1d5fa26d714..ed0fa10aafc2 100644
--- a/metadata/md5-cache/app-vim/gnupg-2.6
+++ b/metadata/md5-cache/app-vim/gnupg-2.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/gnupg || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/gnupg-2.6.tar.bz2 https://dev.gentoo.org/~radhermit/vim/gnupg-2.6.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=831e559d66a4875c41e01e5fd7888743
diff --git a/metadata/md5-cache/app-vim/greputils-2.8-r1 b/metadata/md5-cache/app-vim/greputils-2.8-r1
index c21140d98cc3..428965b22d8c 100644
--- a/metadata/md5-cache/app-vim/greputils-2.8-r1
+++ b/metadata/md5-cache/app-vim/greputils-2.8-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-vim/genutils-1.18 >=app-vim/multvals-3.6.1 >=app-vim/cmdalias-1.0 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/greputils-2.8.tar.bz2 https://dev.gentoo.org/~radhermit/vim/greputils-2.8.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=b1105f57d6e00962b417c17e7cbbf9e5
diff --git a/metadata/md5-cache/app-vim/gtk-syntax-20130716 b/metadata/md5-cache/app-vim/gtk-syntax-20130716
index 458b902a0c2c..af7847e16cb7 100644
--- a/metadata/md5-cache/app-vim/gtk-syntax-20130716
+++ b/metadata/md5-cache/app-vim/gtk-syntax-20130716
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/gtk-syntax-20130716.tar.bz2 https://dev.gentoo.org/~radhermit/vim/gtk-syntax-20130716.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=6a33c73bba2a47005588d2ffa2f0afce
diff --git a/metadata/md5-cache/app-vim/gundo-2.6.1 b/metadata/md5-cache/app-vim/gundo-2.6.1
index 704855d8f9c9..224842647b7e 100644
--- a/metadata/md5-cache/app-vim/gundo-2.6.1
+++ b/metadata/md5-cache/app-vim/gundo-2.6.1
@@ -10,5 +10,5 @@ RDEPEND=|| ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/sjl/gundo.vim/archive/v2.6.1.tar.gz -> gundo-2.6.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=c1b276b90a3dda1cb0d709cc2de195d4
diff --git a/metadata/md5-cache/app-vim/gundo-2.6.2 b/metadata/md5-cache/app-vim/gundo-2.6.2
index e4f56e1601be..a673e9178b0b 100644
--- a/metadata/md5-cache/app-vim/gundo-2.6.2
+++ b/metadata/md5-cache/app-vim/gundo-2.6.2
@@ -10,5 +10,5 @@ RDEPEND=|| ( app-editors/vim[python,python_targets_python2_7(-)?,python_targets_
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://bitbucket.org/sjl/gundo.vim/get/v2.6.2.tar.bz2 -> gundo-2.6.2.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=68b5eb07a5041ace6160f369aed73a05
diff --git a/metadata/md5-cache/app-vim/help-extra-syntax-20050106-r1 b/metadata/md5-cache/app-vim/help-extra-syntax-20050106-r1
index 8047ab4a4466..d91e35ec7052 100644
--- a/metadata/md5-cache/app-vim/help-extra-syntax-20050106-r1
+++ b/metadata/md5-cache/app-vim/help-extra-syntax-20050106-r1
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/help-extra-syntax-20050106.tar.bz2 https://dev.gentoo.org/~radhermit/vim/help-extra-syntax-20050106.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=9119a2d428411d17af18c4f6d21dfd59
diff --git a/metadata/md5-cache/app-vim/html5-0.27 b/metadata/md5-cache/app-vim/html5-0.27
index 5ba33d705218..7f4bb97886ec 100644
--- a/metadata/md5-cache/app-vim/html5-0.27
+++ b/metadata/md5-cache/app-vim/html5-0.27
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/othree/html5.vim/archive/0.27.zip -> html5-0.27.zip
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=257c225e9126debe0440151baef4e509
diff --git a/metadata/md5-cache/app-vim/increment-1.1-r1 b/metadata/md5-cache/app-vim/increment-1.1-r1
index f83fcc1064a6..735bdfaace65 100644
--- a/metadata/md5-cache/app-vim/increment-1.1-r1
+++ b/metadata/md5-cache/app-vim/increment-1.1-r1
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/increment-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/increment-1.1.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=329d93da32698f9ba23623690e7f5fd8
diff --git a/metadata/md5-cache/app-vim/indentpython-0.3 b/metadata/md5-cache/app-vim/indentpython-0.3
index f569962445b1..5852dde564ab 100644
--- a/metadata/md5-cache/app-vim/indentpython-0.3
+++ b/metadata/md5-cache/app-vim/indentpython-0.3
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-scripts/indentpython.vim/archive/0.3.zip -> indentpython-0.3.zip
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=2cc9c36f824c2633f949befc76cd449a
diff --git a/metadata/md5-cache/app-vim/info-1.7-r2 b/metadata/md5-cache/app-vim/info-1.7-r2
index 9270dd5cba9d..a8c951c45bf0 100644
--- a/metadata/md5-cache/app-vim/info-1.7-r2
+++ b/metadata/md5-cache/app-vim/info-1.7-r2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/info-1.7.tar.bz2 https://dev.gentoo.org/~radhermit/vim/info-1.7.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=c135378c2c556754dd58305b36be2b84
diff --git a/metadata/md5-cache/app-vim/json-20150511 b/metadata/md5-cache/app-vim/json-20150511
index 5bf477e5bc10..ea9ee24dcadf 100644
--- a/metadata/md5-cache/app-vim/json-20150511
+++ b/metadata/md5-cache/app-vim/json-20150511
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/json-20150511.tar.bz2 https://dev.gentoo.org/~radhermit/vim/json-20150511.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=1aa3088a61e12a3ae238bb4121acccf4
diff --git a/metadata/md5-cache/app-vim/l9-1.1 b/metadata/md5-cache/app-vim/l9-1.1
index 0686ff787857..a72d0f1d1b24 100644
--- a/metadata/md5-cache/app-vim/l9-1.1
+++ b/metadata/md5-cache/app-vim/l9-1.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=http://www.vim.org/scripts/download_script.php?src_id=13948 -> l9-1.1.zip
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=a0b1e32a138a2cbdb5fa8967818401fb
diff --git a/metadata/md5-cache/app-vim/languagetool-1.29 b/metadata/md5-cache/app-vim/languagetool-1.29
index 670c7b7b03ae..b8fef92adf63 100644
--- a/metadata/md5-cache/app-vim/languagetool-1.29
+++ b/metadata/md5-cache/app-vim/languagetool-1.29
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=app-text/languagetool || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/languagetool-1.29.tar.bz2 https://dev.gentoo.org/~radhermit/vim/languagetool-1.29.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=5f52abf9afed00d6ea82c6f97fae9c59
diff --git a/metadata/md5-cache/app-vim/languagetool-1.30 b/metadata/md5-cache/app-vim/languagetool-1.30
index 297b241f423a..be0499a1f168 100644
--- a/metadata/md5-cache/app-vim/languagetool-1.30
+++ b/metadata/md5-cache/app-vim/languagetool-1.30
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=app-text/languagetool || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/languagetool-1.30.tar.bz2 https://dev.gentoo.org/~radhermit/vim/languagetool-1.30.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=fd3c30b3297afd3ea1c7c4cca66d470e
diff --git a/metadata/md5-cache/app-vim/lightline-9999 b/metadata/md5-cache/app-vim/lightline-9999
index 4eed0e3f55d9..20793fe2494d 100644
--- a/metadata/md5-cache/app-vim/lightline-9999
+++ b/metadata/md5-cache/app-vim/lightline-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/itchyny/lightline.vim/
 LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	52a888802d25387c2c74cb845d1219bc	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	52a888802d25387c2c74cb845d1219bc	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=9b105aed1cc18efb7bcc145fb5942bc8
diff --git a/metadata/md5-cache/app-vim/locateopen-1.3-r1 b/metadata/md5-cache/app-vim/locateopen-1.3-r1
index 1c6a0113a0b4..36149c8a60bd 100644
--- a/metadata/md5-cache/app-vim/locateopen-1.3-r1
+++ b/metadata/md5-cache/app-vim/locateopen-1.3-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=sys-apps/mlocate || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/locateopen-1.3.tar.bz2 https://dev.gentoo.org/~radhermit/vim/locateopen-1.3.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=5366884d209da6476990e5c750192223
diff --git a/metadata/md5-cache/app-vim/lustyexplorer-4.1 b/metadata/md5-cache/app-vim/lustyexplorer-4.1
index e58b8ae11c8e..dd32670532af 100644
--- a/metadata/md5-cache/app-vim/lustyexplorer-4.1
+++ b/metadata/md5-cache/app-vim/lustyexplorer-4.1
@@ -8,5 +8,5 @@ LICENSE=bufexplorer.vim
 RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/lustyexplorer-4.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/lustyexplorer-4.1.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=e948937dd1e98ab3536a63d68f0281fc
diff --git a/metadata/md5-cache/app-vim/lustyexplorer-4.3 b/metadata/md5-cache/app-vim/lustyexplorer-4.3
index 0f08d3703e49..0a05d758b054 100644
--- a/metadata/md5-cache/app-vim/lustyexplorer-4.3
+++ b/metadata/md5-cache/app-vim/lustyexplorer-4.3
@@ -8,5 +8,5 @@ LICENSE=bufexplorer.vim
 RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/lustyexplorer-4.3.tar.bz2 https://dev.gentoo.org/~radhermit/vim/lustyexplorer-4.3.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=e948937dd1e98ab3536a63d68f0281fc
diff --git a/metadata/md5-cache/app-vim/matrix-1.10-r1 b/metadata/md5-cache/app-vim/matrix-1.10-r1
index 279b942e829d..ea9b91833fab 100644
--- a/metadata/md5-cache/app-vim/matrix-1.10-r1
+++ b/metadata/md5-cache/app-vim/matrix-1.10-r1
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/matrix-1.10.tar.bz2 https://dev.gentoo.org/~radhermit/vim/matrix-1.10.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=84bf9d6704965870132cda70cb6a764f
diff --git a/metadata/md5-cache/app-vim/merginal-2.0.2 b/metadata/md5-cache/app-vim/merginal-2.0.2
index b6dc3169ec73..55c78fb43923 100644
--- a/metadata/md5-cache/app-vim/merginal-2.0.2
+++ b/metadata/md5-cache/app-vim/merginal-2.0.2
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=app-vim/fugitive || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/idanarye/vim-merginal/archive/2.0.2.tar.gz -> merginal-2.0.2.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=f3317e88e4493e157fd212bbee16e1bc
diff --git a/metadata/md5-cache/app-vim/merginal-9999 b/metadata/md5-cache/app-vim/merginal-9999
index 5e3a04ca8644..3723818c4092 100644
--- a/metadata/md5-cache/app-vim/merginal-9999
+++ b/metadata/md5-cache/app-vim/merginal-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=4955 https://github.com
 LICENSE=vim
 RDEPEND=app-vim/fugitive || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	52a888802d25387c2c74cb845d1219bc	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	52a888802d25387c2c74cb845d1219bc	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=2fbbc28119f85672bde4f51619daae0f
diff --git a/metadata/md5-cache/app-vim/minibufexpl-6.5.2 b/metadata/md5-cache/app-vim/minibufexpl-6.5.2
index 63b8cebd752c..59c87523386a 100644
--- a/metadata/md5-cache/app-vim/minibufexpl-6.5.2
+++ b/metadata/md5-cache/app-vim/minibufexpl-6.5.2
@@ -8,5 +8,5 @@ LICENSE=bufexplorer.vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/fholgado/minibufexpl.vim/archive/v6.5.2.tar.gz -> minibufexpl-6.5.2.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=876f5ce1814b6c0be3e352350f823690
diff --git a/metadata/md5-cache/app-vim/multiplesearch-1.3 b/metadata/md5-cache/app-vim/multiplesearch-1.3
index 61c93f4de83f..92dbc75fba85 100644
--- a/metadata/md5-cache/app-vim/multiplesearch-1.3
+++ b/metadata/md5-cache/app-vim/multiplesearch-1.3
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=http://www.vim.org/scripts/download_script.php?src_id=9276 -> multiplesearch-1.3.zip
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=838908fe99d47816005d798eb15c9def
diff --git a/metadata/md5-cache/app-vim/multvals-3.10-r1 b/metadata/md5-cache/app-vim/multvals-3.10-r1
index d93b4299eaaf..342d8199b14c 100644
--- a/metadata/md5-cache/app-vim/multvals-3.10-r1
+++ b/metadata/md5-cache/app-vim/multvals-3.10-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/multvals-3.10.tar.bz2 https://dev.gentoo.org/~radhermit/vim/multvals-3.10.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=a6b9d7596a84086eb132cfdcccb8de47
diff --git a/metadata/md5-cache/app-vim/nagios-syntax-1.8 b/metadata/md5-cache/app-vim/nagios-syntax-1.8
index 6b352dea5f62..cc4b8fd7ca53 100644
--- a/metadata/md5-cache/app-vim/nagios-syntax-1.8
+++ b/metadata/md5-cache/app-vim/nagios-syntax-1.8
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/nagios-syntax-1.8.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=c8baecec92f9ec7e34a685a4b40b3e9a
diff --git a/metadata/md5-cache/app-vim/nagios-syntax-20050105 b/metadata/md5-cache/app-vim/nagios-syntax-20050105
index 3a7be778871c..9540f91d87d3 100644
--- a/metadata/md5-cache/app-vim/nagios-syntax-20050105
+++ b/metadata/md5-cache/app-vim/nagios-syntax-20050105
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/nagios-syntax-20050105.tar.bz2 https://dev.gentoo.org/~radhermit/vim/nagios-syntax-20050105.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=c535080c70bf05eebc8866d98904ebec
diff --git a/metadata/md5-cache/app-vim/neocomplcache-7.1 b/metadata/md5-cache/app-vim/neocomplcache-7.1
index 93217b57adc3..2eb3855e169b 100644
--- a/metadata/md5-cache/app-vim/neocomplcache-7.1
+++ b/metadata/md5-cache/app-vim/neocomplcache-7.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/neocomplcache-7.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/neocomplcache-7.1.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=4f30ac6a3e0e6a7c2edcbf9f8309ba2b
diff --git a/metadata/md5-cache/app-vim/neocomplcache-7.1-r1 b/metadata/md5-cache/app-vim/neocomplcache-7.1-r1
index 905f220efc9c..71a50599c6dc 100644
--- a/metadata/md5-cache/app-vim/neocomplcache-7.1-r1
+++ b/metadata/md5-cache/app-vim/neocomplcache-7.1-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/neocomplcache-7.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/neocomplcache-7.1.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=28c91c449d48253070df1740527ac488
diff --git a/metadata/md5-cache/app-vim/nerdcommenter-2.5.0 b/metadata/md5-cache/app-vim/nerdcommenter-2.5.0
index 62b78cecd531..3d56309654f1 100644
--- a/metadata/md5-cache/app-vim/nerdcommenter-2.5.0
+++ b/metadata/md5-cache/app-vim/nerdcommenter-2.5.0
@@ -8,5 +8,5 @@ LICENSE=WTFPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/scrooloose/nerdcommenter/archive/2.5.0.tar.gz -> nerdcommenter-2.5.0.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=ce7778c58447ead9958c0e2f414af323
diff --git a/metadata/md5-cache/app-vim/nerdcommenter-9999 b/metadata/md5-cache/app-vim/nerdcommenter-9999
index 959eb12edc4e..dada723807a3 100644
--- a/metadata/md5-cache/app-vim/nerdcommenter-9999
+++ b/metadata/md5-cache/app-vim/nerdcommenter-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/scrooloose/nerdcommenter http://www.vim.org/scripts/
 LICENSE=WTFPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	52a888802d25387c2c74cb845d1219bc	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	52a888802d25387c2c74cb845d1219bc	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=fc135b560a33758565f60f5364437353
diff --git a/metadata/md5-cache/app-vim/nerdtree-5.0.0 b/metadata/md5-cache/app-vim/nerdtree-5.0.0
index 1de674e6a44a..fee01b90bdeb 100644
--- a/metadata/md5-cache/app-vim/nerdtree-5.0.0
+++ b/metadata/md5-cache/app-vim/nerdtree-5.0.0
@@ -8,5 +8,5 @@ LICENSE=WTFPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/scrooloose/nerdtree/archive/5.0.0.tar.gz -> nerdtree-5.0.0.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=ad39bcb3d1aed535059c50d1d6767e4d
diff --git a/metadata/md5-cache/app-vim/nerdtree-9999 b/metadata/md5-cache/app-vim/nerdtree-9999
index f59b0cdd7cd8..9b64890cb846 100644
--- a/metadata/md5-cache/app-vim/nerdtree-9999
+++ b/metadata/md5-cache/app-vim/nerdtree-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=1658 https://github.com
 LICENSE=WTFPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	52a888802d25387c2c74cb845d1219bc	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	52a888802d25387c2c74cb845d1219bc	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=5db5ce447bc5866a070facfb93f959e5
diff --git a/metadata/md5-cache/app-vim/nerdtree-tabs-1.4.7 b/metadata/md5-cache/app-vim/nerdtree-tabs-1.4.7
index bd843d992473..da31fb4a0933 100644
--- a/metadata/md5-cache/app-vim/nerdtree-tabs-1.4.7
+++ b/metadata/md5-cache/app-vim/nerdtree-tabs-1.4.7
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-vim/nerdtree || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/jistr/vim-nerdtree-tabs/archive/v1.4.7.tar.gz -> nerdtree-tabs-1.4.7.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=562dbab2a9dda102b4d82dfee3ed66a0
diff --git a/metadata/md5-cache/app-vim/nginx-syntax-0.3.3 b/metadata/md5-cache/app-vim/nginx-syntax-0.3.3
index 87dbd54902d5..4bd1d7eb72b3 100644
--- a/metadata/md5-cache/app-vim/nginx-syntax-0.3.3
+++ b/metadata/md5-cache/app-vim/nginx-syntax-0.3.3
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/nginx-syntax-0.3.3.tar.bz2 https://dev.gentoo.org/~radhermit/vim/nginx-syntax-0.3.3.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=4a4fed6104b76f5b470f5a736b1c24d6
diff --git a/metadata/md5-cache/app-vim/notes-0.33.4 b/metadata/md5-cache/app-vim/notes-0.33.4
index b2006114eaaf..c7225667a9d7 100644
--- a/metadata/md5-cache/app-vim/notes-0.33.4
+++ b/metadata/md5-cache/app-vim/notes-0.33.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=d
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/xolox/vim-notes/archive/0.33.4.tar.gz -> notes-0.33.4.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=8029c0059bda23ccf3f7d1d39d13b5ab
diff --git a/metadata/md5-cache/app-vim/ntp-syntax-20031001-r1 b/metadata/md5-cache/app-vim/ntp-syntax-20031001-r1
index 104aa3cd1450..c1d328b14747 100644
--- a/metadata/md5-cache/app-vim/ntp-syntax-20031001-r1
+++ b/metadata/md5-cache/app-vim/ntp-syntax-20031001-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/ntp-syntax-20031001.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ntp-syntax-20031001.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=38a8aa668c668fe4cff029e5cdbd7b66
diff --git a/metadata/md5-cache/app-vim/omnicppcomplete-0.41 b/metadata/md5-cache/app-vim/omnicppcomplete-0.41
index e4fd5789a347..9e278e10e3bd 100644
--- a/metadata/md5-cache/app-vim/omnicppcomplete-0.41
+++ b/metadata/md5-cache/app-vim/omnicppcomplete-0.41
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=>=dev-util/ctags-5.7 || ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
 SLOT=0
 SRC_URI=http://www.vim.org/scripts/download_script.php?src_id=7722 -> omnicppcomplete-0.41.zip
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=2342bd6470e91ec37096497fb3c1f8f7
diff --git a/metadata/md5-cache/app-vim/pam-syntax-20060424 b/metadata/md5-cache/app-vim/pam-syntax-20060424
index 136679aa626b..c12d66a8bb5a 100644
--- a/metadata/md5-cache/app-vim/pam-syntax-20060424
+++ b/metadata/md5-cache/app-vim/pam-syntax-20060424
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/pam-syntax-20060424.tar.bz2 https://dev.gentoo.org/~radhermit/vim/pam-syntax-20060424.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=e3f5cd546d0a03fc8b2ac3cefb497218
diff --git a/metadata/md5-cache/app-vim/pathogen-2.4 b/metadata/md5-cache/app-vim/pathogen-2.4
index f58221bb001a..7e6bf2dcea30 100644
--- a/metadata/md5-cache/app-vim/pathogen-2.4
+++ b/metadata/md5-cache/app-vim/pathogen-2.4
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tpope/vim-pathogen/archive/v2.4.tar.gz -> pathogen-2.4.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=b6ead0bd9052b4a50cb4aa6ec1b774dd
diff --git a/metadata/md5-cache/app-vim/pdv-1.0.1-r1 b/metadata/md5-cache/app-vim/pdv-1.0.1-r1
index 22ffc8eb0e4c..6e45b0c28443 100644
--- a/metadata/md5-cache/app-vim/pdv-1.0.1-r1
+++ b/metadata/md5-cache/app-vim/pdv-1.0.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/pdv-1.0.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/pdv-1.0.1.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=80930a26f760c85af98faef3b532cbb6
diff --git a/metadata/md5-cache/app-vim/perl-support-5.3.2 b/metadata/md5-cache/app-vim/perl-support-5.3.2
index a2836f1efe97..7cd5d0390e0c 100644
--- a/metadata/md5-cache/app-vim/perl-support-5.3.2
+++ b/metadata/md5-cache/app-vim/perl-support-5.3.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2 GPL-2+
 RDEPEND=dev-perl/Perl-Tags dev-perl/Perl-Critic || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/perl-support-5.3.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/perl-support-5.3.2.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=97cffc760cbddf46c91de94a9d44db40
diff --git a/metadata/md5-cache/app-vim/perlomni-2.5 b/metadata/md5-cache/app-vim/perlomni-2.5
index 953b99c9f927..e36518b2db38 100644
--- a/metadata/md5-cache/app-vim/perlomni-2.5
+++ b/metadata/md5-cache/app-vim/perlomni-2.5
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=app-arch/unzip dev-lang/perl || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/c9s/perlomni.vim/archive/v2.5.zip -> perlomni-2.5.zip
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=4753a6cc44a7dd9de7f2713e25e495f4
diff --git a/metadata/md5-cache/app-vim/pgn-syntax-1.0 b/metadata/md5-cache/app-vim/pgn-syntax-1.0
index 8f80268d51ac..c1d22bd705b0 100644
--- a/metadata/md5-cache/app-vim/pgn-syntax-1.0
+++ b/metadata/md5-cache/app-vim/pgn-syntax-1.0
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/pgn-syntax-1.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/pgn-syntax-1.0.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=50c252e5e0d2dc29553d6da41a7bb931
diff --git a/metadata/md5-cache/app-vim/phpdocs-0.26-r1 b/metadata/md5-cache/app-vim/phpdocs-0.26-r1
index 62273e941d7b..b49ed8959abf 100644
--- a/metadata/md5-cache/app-vim/phpdocs-0.26-r1
+++ b/metadata/md5-cache/app-vim/phpdocs-0.26-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/phpdocs-0.26.tar.bz2 https://dev.gentoo.org/~radhermit/vim/phpdocs-0.26.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=543d7c1d2a1a7afe02e2cd67df9da278
diff --git a/metadata/md5-cache/app-vim/project-1.4.1 b/metadata/md5-cache/app-vim/project-1.4.1
index 496a6db52d58..3a6985ac69ee 100644
--- a/metadata/md5-cache/app-vim/project-1.4.1
+++ b/metadata/md5-cache/app-vim/project-1.4.1
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=http://www.vim.org/scripts/download_script.php?src_id=6273 -> project-1.4.1.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=899946e7af9c66e2c03fe10f4d532fde
diff --git a/metadata/md5-cache/app-vim/puppet-syntax-3.0.1 b/metadata/md5-cache/app-vim/puppet-syntax-3.0.1
index 5be3e8828786..41b256a92b06 100644
--- a/metadata/md5-cache/app-vim/puppet-syntax-3.0.1
+++ b/metadata/md5-cache/app-vim/puppet-syntax-3.0.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 GPL-2
 RDEPEND=!<app-admin/puppet-3.0.1 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tampakrap/tarballs/puppet-syntax-3.0.1.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=505238d48936b0f61aa2df388cb529d4
diff --git a/metadata/md5-cache/app-vim/pushpop-4.0-r1 b/metadata/md5-cache/app-vim/pushpop-4.0-r1
index a9228d6ed67e..18e2c9d38a93 100644
--- a/metadata/md5-cache/app-vim/pushpop-4.0-r1
+++ b/metadata/md5-cache/app-vim/pushpop-4.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-vim/genutils-1.1 >=app-vim/cmdalias-1.0 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/pushpop-4.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/pushpop-4.0.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=b5c31e4491a504347e5d21d124540357
diff --git a/metadata/md5-cache/app-vim/pyclewn-2.0.1 b/metadata/md5-cache/app-vim/pyclewn-2.0.1
index 709e0998fa84..b9c00720d114 100644
--- a/metadata/md5-cache/app-vim/pyclewn-2.0.1
+++ b/metadata/md5-cache/app-vim/pyclewn-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=|| ( >=app-editors/vim-7.3[python_targets_python2_7(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyclewn/pyclewn-2.0.1.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f5cbd76333df0181d8408e23dbb3cc4b
diff --git a/metadata/md5-cache/app-vim/pyclewn-2.1-r1 b/metadata/md5-cache/app-vim/pyclewn-2.1-r1
index 7858856492ed..5d9650341afe 100644
--- a/metadata/md5-cache/app-vim/pyclewn-2.1-r1
+++ b/metadata/md5-cache/app-vim/pyclewn-2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3[netbeans] ) app-arch/v
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyclewn/pyclewn-2.1.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7f26a57391140157f282928b15d64d9b
diff --git a/metadata/md5-cache/app-vim/pydiction-1.2.3 b/metadata/md5-cache/app-vim/pydiction-1.2.3
index 571f7f19b608..984ec72794cc 100644
--- a/metadata/md5-cache/app-vim/pydiction-1.2.3
+++ b/metadata/md5-cache/app-vim/pydiction-1.2.3
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=dev-lang/python:* || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/pydiction-1.2.3.zip
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=7f51bfb0df96cc750bcee482d6af490b
diff --git a/metadata/md5-cache/app-vim/pydiction-1.2.3-r1 b/metadata/md5-cache/app-vim/pydiction-1.2.3-r1
index 5d80e6591fa4..fcf7dc9e6f84 100644
--- a/metadata/md5-cache/app-vim/pydiction-1.2.3-r1
+++ b/metadata/md5-cache/app-vim/pydiction-1.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targ
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/pydiction-1.2.3.zip
-_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=5d8f563ed642592cc2de0c2843383fc4
diff --git a/metadata/md5-cache/app-vim/pydiction-1.2.3-r2 b/metadata/md5-cache/app-vim/pydiction-1.2.3-r2
index 6761046c93df..d89fd3c8218d 100644
--- a/metadata/md5-cache/app-vim/pydiction-1.2.3-r2
+++ b/metadata/md5-cache/app-vim/pydiction-1.2.3-r2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targ
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/pydiction-1.2.3.zip
-_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=2bf6c8166c0e9a22d29e1d1ca06be78f
diff --git a/metadata/md5-cache/app-vim/pydoc-2.0 b/metadata/md5-cache/app-vim/pydoc-2.0
index 5828cbd0a4e5..760e3dbfc45a 100644
--- a/metadata/md5-cache/app-vim/pydoc-2.0
+++ b/metadata/md5-cache/app-vim/pydoc-2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/python:* || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/fs111/pydoc.vim/tarball/2.0 -> pydoc-2.0.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=8617500fff5fecf86eb1e6cb960ed833
diff --git a/metadata/md5-cache/app-vim/pydoc-2.0-r1 b/metadata/md5-cache/app-vim/pydoc-2.0-r1
index 3133c0b489a8..cc8bbde8bc03 100644
--- a/metadata/md5-cache/app-vim/pydoc-2.0-r1
+++ b/metadata/md5-cache/app-vim/pydoc-2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) 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/fs111/pydoc.vim/tarball/2.0 -> pydoc-2.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=e08cfecec0572c4cf30cae14cdb09654
diff --git a/metadata/md5-cache/app-vim/pytest-1.1.4 b/metadata/md5-cache/app-vim/pytest-1.1.4
index 49d2eaa3d979..6ac852dca22c 100644
--- a/metadata/md5-cache/app-vim/pytest-1.1.4
+++ b/metadata/md5-cache/app-vim/pytest-1.1.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-python/pytest || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=http://www.vim.org/scripts/download_script.php?src_id=18178 -> pytest-1.1.4.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=cff9a5f19b48c0bf4bd878e2ff8cd794
diff --git a/metadata/md5-cache/app-vim/python-mode-0.6.18-r3 b/metadata/md5-cache/app-vim/python-mode-0.6.18-r3
index e4e5d8e3abb2..29ff4e7440f6 100644
--- a/metadata/md5-cache/app-vim/python-mode-0.6.18-r3
+++ b/metadata/md5-cache/app-vim/python-mode-0.6.18-r3
@@ -8,5 +8,5 @@ LICENSE=LGPL-3
 RDEPEND=dev-python/astng dev-python/autopep8 dev-python/pyflakes dev-python/pylint dev-python/rope dev-python/ropemode || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/klen/python-mode/archive/0.6.18.tar.gz -> python-mode-0.6.18.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=5e6b6227145ba65e91fcc6ce420d1a24
diff --git a/metadata/md5-cache/app-vim/python-mode-0.6.18-r4 b/metadata/md5-cache/app-vim/python-mode-0.6.18-r4
index feb07d45cb70..6b36f82d9fca 100644
--- a/metadata/md5-cache/app-vim/python-mode-0.6.18-r4
+++ b/metadata/md5-cache/app-vim/python-mode-0.6.18-r4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/klen/python-mode/archive/0.6.18.tar.gz -> python-mode-0.6.18.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=ea4213b458378a0fa7b51b3293131c00
diff --git a/metadata/md5-cache/app-vim/python-mode-0.9.0 b/metadata/md5-cache/app-vim/python-mode-0.9.0
index 3ae68ea479d6..1ae983eba09b 100644
--- a/metadata/md5-cache/app-vim/python-mode-0.9.0
+++ b/metadata/md5-cache/app-vim/python-mode-0.9.0
@@ -9,5 +9,5 @@ RDEPEND=dev-python/rope dev-python/astng dev-python/pylint dev-python/pyflakes d
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/klen/python-mode/archive/0.9.0.tar.gz -> python-mode-0.9.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=1d2404bf2d7f2c38a9fe885ebc1bdb55
diff --git a/metadata/md5-cache/app-vim/python-mode-0.9.0-r1 b/metadata/md5-cache/app-vim/python-mode-0.9.0-r1
index 135578ddac6a..f3f5122af22f 100644
--- a/metadata/md5-cache/app-vim/python-mode-0.9.0-r1
+++ b/metadata/md5-cache/app-vim/python-mode-0.9.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/klen/python-mode/archive/0.9.0.tar.gz -> python-mode-0.9.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=3eebfcd4e331bd1a7ad85e22a4031e6a
diff --git a/metadata/md5-cache/app-vim/rails-5.1 b/metadata/md5-cache/app-vim/rails-5.1
index 21453a1451ce..f3bf60f721ec 100644
--- a/metadata/md5-cache/app-vim/rails-5.1
+++ b/metadata/md5-cache/app-vim/rails-5.1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tpope/vim-rails/archive/v5.1.tar.gz -> rails-5.1.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=ebe817ed51a6e540c156164db9135400
diff --git a/metadata/md5-cache/app-vim/rails-5.2 b/metadata/md5-cache/app-vim/rails-5.2
index 610e6f705b92..d2a07f0d37bf 100644
--- a/metadata/md5-cache/app-vim/rails-5.2
+++ b/metadata/md5-cache/app-vim/rails-5.2
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tpope/vim-rails/archive/v5.2.tar.gz -> rails-5.2.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=ebe817ed51a6e540c156164db9135400
diff --git a/metadata/md5-cache/app-vim/rainbow_parentheses-1.0 b/metadata/md5-cache/app-vim/rainbow_parentheses-1.0
index 781cbbc20e5b..bee50b597831 100644
--- a/metadata/md5-cache/app-vim/rainbow_parentheses-1.0
+++ b/metadata/md5-cache/app-vim/rainbow_parentheses-1.0
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/rainbow_parentheses-1.0.zip
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=de1f6eed4cf7d37fcd53266628307097
diff --git a/metadata/md5-cache/app-vim/recover-0.18 b/metadata/md5-cache/app-vim/recover-0.18
index 0fcb10d8c338..7dd76127f140 100644
--- a/metadata/md5-cache/app-vim/recover-0.18
+++ b/metadata/md5-cache/app-vim/recover-0.18
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/recover-0.18.tar.bz2 https://dev.gentoo.org/~radhermit/vim/recover-0.18.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=5a4b25f3cfff747a836659e9cd36803d
diff --git a/metadata/md5-cache/app-vim/reload-0.6.17 b/metadata/md5-cache/app-vim/reload-0.6.17
index 8baba68f135f..fb298a24b50c 100644
--- a/metadata/md5-cache/app-vim/reload-0.6.17
+++ b/metadata/md5-cache/app-vim/reload-0.6.17
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=app-vim/vim-misc-1.8.5 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/xolox/vim-reload/archive/0.6.17.tar.gz -> reload-0.6.17.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=0bb163e78140db9105f01189f6ab6e68
diff --git a/metadata/md5-cache/app-vim/repeat-1.1 b/metadata/md5-cache/app-vim/repeat-1.1
index fbf345582ea6..08a71f707d23 100644
--- a/metadata/md5-cache/app-vim/repeat-1.1
+++ b/metadata/md5-cache/app-vim/repeat-1.1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tpope/vim-repeat/archive/v1.1.tar.gz -> repeat-1.1.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=76105b67dd72d58b9d8ed7b9530dd849
diff --git a/metadata/md5-cache/app-vim/ri-browser-1.2 b/metadata/md5-cache/app-vim/ri-browser-1.2
index f37f72f90efc..42049adacdba 100644
--- a/metadata/md5-cache/app-vim/ri-browser-1.2
+++ b/metadata/md5-cache/app-vim/ri-browser-1.2
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=dev-lang/ruby || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/ri-browser-1.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ri-browser-1.2.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=c85732719ff6b7261e8e29ed84b3ab4b
diff --git a/metadata/md5-cache/app-vim/rust-vim-1_pre20160829 b/metadata/md5-cache/app-vim/rust-vim-1_pre20160829
index e21e295b0fdc..af53b56a51cd 100644
--- a/metadata/md5-cache/app-vim/rust-vim-1_pre20160829
+++ b/metadata/md5-cache/app-vim/rust-vim-1_pre20160829
@@ -8,5 +8,5 @@ LICENSE=|| ( MIT Apache-2.0 )
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/rust-lang/rust.vim/tarball/fc11d02fee330df7b30c83a80f09dd0c60ab43ce -> rust-vim-1_pre20160829.tar.gz
-_eclasses_=vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=b78e321336d8e513facb0e21465dd7e3
diff --git a/metadata/md5-cache/app-vim/rust-vim-1_pre20161204 b/metadata/md5-cache/app-vim/rust-vim-1_pre20161204
index 87b429d3f50a..43bb4af56e2f 100644
--- a/metadata/md5-cache/app-vim/rust-vim-1_pre20161204
+++ b/metadata/md5-cache/app-vim/rust-vim-1_pre20161204
@@ -8,5 +8,5 @@ LICENSE=|| ( MIT Apache-2.0 )
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/rust-lang/rust.vim/tarball/eed97e75117faaf210cb6103cf39a797fe21bfbe -> rust-vim-1_pre20161204.tar.gz
-_eclasses_=vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=15794d380080cccc0456adc5d48f6aee
diff --git a/metadata/md5-cache/app-vim/salt-vim-20151119 b/metadata/md5-cache/app-vim/salt-vim-20151119
index 18040951cadd..648548d46feb 100644
--- a/metadata/md5-cache/app-vim/salt-vim-20151119
+++ b/metadata/md5-cache/app-vim/salt-vim-20151119
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=!<=app-admin/salt-2015.5.6 !~app-admin/salt-2015.8.0 !~app-admin/salt-2015.8.1 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/saltstack/salt-vim/archive/5b15d379fbcbb84f82c6a345abc08cea9d374be9.tar.gz -> salt-vim-20151119.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=fc2c710e031622cca007f562339f0d3b
diff --git a/metadata/md5-cache/app-vim/scala-syntax-1.0 b/metadata/md5-cache/app-vim/scala-syntax-1.0
index 59438869a71a..e29d70a16d8d 100644
--- a/metadata/md5-cache/app-vim/scala-syntax-1.0
+++ b/metadata/md5-cache/app-vim/scala-syntax-1.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/scala-syntax-1.0.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=579520ea02abea1ee875cf9da84c6cb6
diff --git a/metadata/md5-cache/app-vim/screen-1.5 b/metadata/md5-cache/app-vim/screen-1.5
index f124e9b4bcab..1f82d20fce37 100644
--- a/metadata/md5-cache/app-vim/screen-1.5
+++ b/metadata/md5-cache/app-vim/screen-1.5
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=|| ( app-misc/screen app-misc/tmux ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-scripts/Screen-vim---gnu-screentmux/tarball/1.5 -> screen-1.5.tar.gz
-_eclasses_=vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=45b00527ff5d2655563be1a96f55bfb5
diff --git a/metadata/md5-cache/app-vim/searchcomplete-1.1-r1 b/metadata/md5-cache/app-vim/searchcomplete-1.1-r1
index 323252eb5760..bf7d8a643937 100644
--- a/metadata/md5-cache/app-vim/searchcomplete-1.1-r1
+++ b/metadata/md5-cache/app-vim/searchcomplete-1.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/searchcomplete-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/searchcomplete-1.1.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=97ce15f58d8813c8e7597ee831432219
diff --git a/metadata/md5-cache/app-vim/securemodelines-20140926 b/metadata/md5-cache/app-vim/securemodelines-20140926
index fc5c74e3ab5d..b4420ab20947 100644
--- a/metadata/md5-cache/app-vim/securemodelines-20140926
+++ b/metadata/md5-cache/app-vim/securemodelines-20140926
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/securemodelines-20140926.tar.bz2 https://dev.gentoo.org/~radhermit/vim/securemodelines-20140926.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=d4a4b1520afe4a8a817341fde0783c4c
diff --git a/metadata/md5-cache/app-vim/selinux-syntax-20041225 b/metadata/md5-cache/app-vim/selinux-syntax-20041225
index 9be12065a763..3643ca7480fb 100644
--- a/metadata/md5-cache/app-vim/selinux-syntax-20041225
+++ b/metadata/md5-cache/app-vim/selinux-syntax-20041225
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/selinux-syntax-20041225.tar.bz2 https://dev.gentoo.org/~radhermit/vim/selinux-syntax-20041225.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=0007fa189f94761252ea9f66cd30691f
diff --git a/metadata/md5-cache/app-vim/session-2.13.1 b/metadata/md5-cache/app-vim/session-2.13.1
index 567650b7cea8..3d653539df06 100644
--- a/metadata/md5-cache/app-vim/session-2.13.1
+++ b/metadata/md5-cache/app-vim/session-2.13.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=app-vim/vim-misc-1.17.6 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/xolox/vim-session/archive/2.13.1.tar.gz -> session-2.13.1.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=554bc3340efcd93b2560d41749feecb6
diff --git a/metadata/md5-cache/app-vim/showmarks-2.2-r1 b/metadata/md5-cache/app-vim/showmarks-2.2-r1
index 70a3b8162cd0..9af789c68c7f 100644
--- a/metadata/md5-cache/app-vim/showmarks-2.2-r1
+++ b/metadata/md5-cache/app-vim/showmarks-2.2-r1
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/showmarks-2.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/showmarks-2.2.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=7fd785e5ce36a162671dcf5a906818b4
diff --git a/metadata/md5-cache/app-vim/sleuth-1.0 b/metadata/md5-cache/app-vim/sleuth-1.0
index a4007428281a..61398ad2335f 100644
--- a/metadata/md5-cache/app-vim/sleuth-1.0
+++ b/metadata/md5-cache/app-vim/sleuth-1.0
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/sleuth-1.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/sleuth-1.0.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=73fc3702c636f4fe92e413cfc98ba952
diff --git a/metadata/md5-cache/app-vim/sleuth-1.1 b/metadata/md5-cache/app-vim/sleuth-1.1
index eae7915d5d30..3cb8b4198b00 100644
--- a/metadata/md5-cache/app-vim/sleuth-1.1
+++ b/metadata/md5-cache/app-vim/sleuth-1.1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/sleuth-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/sleuth-1.1.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=8806751ffbddaf0426fb1227dca4cb4d
diff --git a/metadata/md5-cache/app-vim/slimv-0.9.12-r1 b/metadata/md5-cache/app-vim/slimv-0.9.12-r1
index 84f7fafcd158..19eb4a49043c 100644
--- a/metadata/md5-cache/app-vim/slimv-0.9.12-r1
+++ b/metadata/md5-cache/app-vim/slimv-0.9.12-r1
@@ -10,5 +10,5 @@ RDEPEND=|| ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://bitbucket.org/kovisoft/slimv/get/0.9.12.tar.bz2 -> slimv-0.9.12.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=578f96994458ee28bff3985af8955cc8
diff --git a/metadata/md5-cache/app-vim/snipmate-0.87-r1 b/metadata/md5-cache/app-vim/snipmate-0.87-r1
index 28c260fa9af9..39ef12234727 100644
--- a/metadata/md5-cache/app-vim/snipmate-0.87-r1
+++ b/metadata/md5-cache/app-vim/snipmate-0.87-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=app-vim/vim-addon-mw-utils app-vim/tlib || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/garbas/vim-snipmate/archive/v0.87.tar.gz -> snipmate-0.87.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=c8fe19120e33c25fd291972601406903
diff --git a/metadata/md5-cache/app-vim/splice-1.0.1 b/metadata/md5-cache/app-vim/splice-1.0.1
index 4da581aa0b22..e7745bbd27d0 100644
--- a/metadata/md5-cache/app-vim/splice-1.0.1
+++ b/metadata/md5-cache/app-vim/splice-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://gentoo/splice-1.0.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/splice-1.0.1.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=59179f4a343549865bde83d412336b0e
diff --git a/metadata/md5-cache/app-vim/splice-1.1.0 b/metadata/md5-cache/app-vim/splice-1.1.0
index 263a0d7f1113..721aeda201b6 100644
--- a/metadata/md5-cache/app-vim/splice-1.1.0
+++ b/metadata/md5-cache/app-vim/splice-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://bitbucket.org/sjl/splice.vim/get/v1.1.0.tar.gz -> splice-1.1.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=896e74d2c7eed37d4ac512402844f8eb
diff --git a/metadata/md5-cache/app-vim/sudoedit-0.21 b/metadata/md5-cache/app-vim/sudoedit-0.21
index 2e79e2e9386a..5e87d42b00c1 100644
--- a/metadata/md5-cache/app-vim/sudoedit-0.21
+++ b/metadata/md5-cache/app-vim/sudoedit-0.21
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( app-admin/sudo sys-apps/shadow ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/sudoedit-0.21.tar.bz2 https://dev.gentoo.org/~radhermit/vim/sudoedit-0.21.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=d8f20bb79b623d00d341f9098f750213
diff --git a/metadata/md5-cache/app-vim/supertab-2.1 b/metadata/md5-cache/app-vim/supertab-2.1
index d88ac6be9c59..69eaf8649864 100644
--- a/metadata/md5-cache/app-vim/supertab-2.1
+++ b/metadata/md5-cache/app-vim/supertab-2.1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/ervandew/supertab/archive/2.1.tar.gz -> supertab-2.1.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=e0caae18616cd1b8531069188bfad26e
diff --git a/metadata/md5-cache/app-vim/surround-2.1-r1 b/metadata/md5-cache/app-vim/surround-2.1-r1
index a95d3f965ad3..3f5fb51d100d 100644
--- a/metadata/md5-cache/app-vim/surround-2.1-r1
+++ b/metadata/md5-cache/app-vim/surround-2.1-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/surround-2.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/surround-2.1.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=a053acf16db74dca9faa2b60d15cf584
diff --git a/metadata/md5-cache/app-vim/syntastic-3.8.0 b/metadata/md5-cache/app-vim/syntastic-3.8.0
index 51f5326be922..17d8c6e8e172 100644
--- a/metadata/md5-cache/app-vim/syntastic-3.8.0
+++ b/metadata/md5-cache/app-vim/syntastic-3.8.0
@@ -8,5 +8,5 @@ LICENSE=WTFPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/scrooloose/syntastic/archive/3.8.0.tar.gz -> syntastic-3.8.0.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=756d79dcaebe4d5a04bff9988079d1f8
diff --git a/metadata/md5-cache/app-vim/syntastic-9999 b/metadata/md5-cache/app-vim/syntastic-9999
index da64740c24f2..c374a2b46f56 100644
--- a/metadata/md5-cache/app-vim/syntastic-9999
+++ b/metadata/md5-cache/app-vim/syntastic-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=2736 https://github.com
 LICENSE=WTFPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	52a888802d25387c2c74cb845d1219bc	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	52a888802d25387c2c74cb845d1219bc	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=248c71185317f7bf8bb580d2478a3ef1
diff --git a/metadata/md5-cache/app-vim/tagbar-2.6.1 b/metadata/md5-cache/app-vim/tagbar-2.6.1
index b42889f8a183..e43cc552806e 100644
--- a/metadata/md5-cache/app-vim/tagbar-2.6.1
+++ b/metadata/md5-cache/app-vim/tagbar-2.6.1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=>=dev-util/ctags-5.5 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/majutsushi/tagbar/archive/v2.6.1.tar.gz -> tagbar-2.6.1.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=23d4e6047641ed47b10406a267bc155b
diff --git a/metadata/md5-cache/app-vim/tagbar-2.7 b/metadata/md5-cache/app-vim/tagbar-2.7
index a7941d99d12e..7f832543f0c7 100644
--- a/metadata/md5-cache/app-vim/tagbar-2.7
+++ b/metadata/md5-cache/app-vim/tagbar-2.7
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=>=dev-util/ctags-5.5 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/majutsushi/tagbar/archive/v2.7.tar.gz -> tagbar-2.7.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=85b5cc312cd4c70f8de9081b8982806b
diff --git a/metadata/md5-cache/app-vim/taglist-4.6 b/metadata/md5-cache/app-vim/taglist-4.6
index 1f17d93017f1..27303e6dd8a2 100644
--- a/metadata/md5-cache/app-vim/taglist-4.6
+++ b/metadata/md5-cache/app-vim/taglist-4.6
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=dev-util/ctags || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/taglist-4.6.tar.bz2 https://dev.gentoo.org/~radhermit/vim/taglist-4.6.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=0915761b2830fc4f2a31f228c53ee44c
diff --git a/metadata/md5-cache/app-vim/tasklist-1.0.1 b/metadata/md5-cache/app-vim/tasklist-1.0.1
index 47d00d62a778..1bbdb9f513f5 100644
--- a/metadata/md5-cache/app-vim/tasklist-1.0.1
+++ b/metadata/md5-cache/app-vim/tasklist-1.0.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-scripts/tasklist.vim/tarball/1.0.1 -> tasklist-1.0.1.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=d701e4bf10822be1de08fdb142448018
diff --git a/metadata/md5-cache/app-vim/tcomment-3.08.1 b/metadata/md5-cache/app-vim/tcomment-3.08.1
index bd74b9eb0b8d..51a1d7220e2f 100644
--- a/metadata/md5-cache/app-vim/tcomment-3.08.1
+++ b/metadata/md5-cache/app-vim/tcomment-3.08.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tomtom/tcomment_vim/archive/3.08.1.tar.gz -> tcomment-3.08.1.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=a10b1e6c293b5c7dd61a119be0f4e5c8
diff --git a/metadata/md5-cache/app-vim/tcomment-9999 b/metadata/md5-cache/app-vim/tcomment-9999
index 0ed175797f49..9a39e04671bb 100644
--- a/metadata/md5-cache/app-vim/tcomment-9999
+++ b/metadata/md5-cache/app-vim/tcomment-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=1173 https://github.com
 LICENSE=GPL-3
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	52a888802d25387c2c74cb845d1219bc	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	52a888802d25387c2c74cb845d1219bc	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=f237959dbcae227bff5c5f58ffa2ea5d
diff --git a/metadata/md5-cache/app-vim/thlnk-1.2.1-r1 b/metadata/md5-cache/app-vim/thlnk-1.2.1-r1
index 6791a4f3f7ec..ec590c9e8392 100644
--- a/metadata/md5-cache/app-vim/thlnk-1.2.1-r1
+++ b/metadata/md5-cache/app-vim/thlnk-1.2.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/thlnk-1.2.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/thlnk-1.2.1.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=bf2604ff626e86ec951fef83aa8b3e8f
diff --git a/metadata/md5-cache/app-vim/tlib-1.20 b/metadata/md5-cache/app-vim/tlib-1.20
index 5f93d8605d0f..b0ac2f762886 100644
--- a/metadata/md5-cache/app-vim/tlib-1.20
+++ b/metadata/md5-cache/app-vim/tlib-1.20
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tomtom/tlib_vim/archive/1.20.tar.gz -> tlib-1.20.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=e194458e17ec19fa3798d03d7c8e0242
diff --git a/metadata/md5-cache/app-vim/tmpl-0.1-r1 b/metadata/md5-cache/app-vim/tmpl-0.1-r1
index b8c2f2d80db5..5d5cf3482e97 100644
--- a/metadata/md5-cache/app-vim/tmpl-0.1-r1
+++ b/metadata/md5-cache/app-vim/tmpl-0.1-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/tmpl-0.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/tmpl-0.1.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=91026b79f67e74751e51675c1b3c62e5
diff --git a/metadata/md5-cache/app-vim/toggle-0.5-r1 b/metadata/md5-cache/app-vim/toggle-0.5-r1
index e4350265a6a7..94a32a125fd6 100644
--- a/metadata/md5-cache/app-vim/toggle-0.5-r1
+++ b/metadata/md5-cache/app-vim/toggle-0.5-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/toggle-0.5.tar.bz2 https://dev.gentoo.org/~radhermit/vim/toggle-0.5.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=dd7d2fd532fbc7fbc3aa2ad502ab6c99
diff --git a/metadata/md5-cache/app-vim/tt2-syntax-1.13 b/metadata/md5-cache/app-vim/tt2-syntax-1.13
index 68aba09ad0ab..deddc29e8ba7 100644
--- a/metadata/md5-cache/app-vim/tt2-syntax-1.13
+++ b/metadata/md5-cache/app-vim/tt2-syntax-1.13
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/tt2-syntax-1.13.tar.bz2 https://dev.gentoo.org/~radhermit/vim/tt2-syntax-1.13.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=42dabc6948b70d15989a805dac560642
diff --git a/metadata/md5-cache/app-vim/tt2-syntax-1.13-r1 b/metadata/md5-cache/app-vim/tt2-syntax-1.13-r1
index a490b6413a34..dd5acac1b797 100644
--- a/metadata/md5-cache/app-vim/tt2-syntax-1.13-r1
+++ b/metadata/md5-cache/app-vim/tt2-syntax-1.13-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/tt2-syntax-1.13.tar.bz2 https://dev.gentoo.org/~radhermit/vim/tt2-syntax-1.13.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=94dd4025063c9a975cde55ed62c05661
diff --git a/metadata/md5-cache/app-vim/txtfmt-2.4-r1 b/metadata/md5-cache/app-vim/txtfmt-2.4-r1
index 77f541de4412..038dc35684da 100644
--- a/metadata/md5-cache/app-vim/txtfmt-2.4-r1
+++ b/metadata/md5-cache/app-vim/txtfmt-2.4-r1
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=http://www.vim.org/scripts/download_script.php?src_id=13856 -> txtfmt-2.4.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=4a93285fac084cf071e34d6134a23161
diff --git a/metadata/md5-cache/app-vim/txtfmt-3.1 b/metadata/md5-cache/app-vim/txtfmt-3.1
index 35587b40cdf3..88107c7f2d65 100644
--- a/metadata/md5-cache/app-vim/txtfmt-3.1
+++ b/metadata/md5-cache/app-vim/txtfmt-3.1
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=http://www.vim.org/scripts/download_script.php?src_id=24489 -> txtfmt-3.1.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=e4e2b1094eb847aa043a2521330b8e53
diff --git a/metadata/md5-cache/app-vim/udev-syntax-20051016-r1 b/metadata/md5-cache/app-vim/udev-syntax-20051016-r1
index 6f32c8f3c9b7..bda205398fc3 100644
--- a/metadata/md5-cache/app-vim/udev-syntax-20051016-r1
+++ b/metadata/md5-cache/app-vim/udev-syntax-20051016-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/udev-syntax-20051016.tar.bz2 https://dev.gentoo.org/~radhermit/vim/udev-syntax-20051016.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=b69ddc3a3f60afea213d297840548ec8
diff --git a/metadata/md5-cache/app-vim/udev-syntax-20051016-r2 b/metadata/md5-cache/app-vim/udev-syntax-20051016-r2
index 444cb7f8b903..71d61264ffb7 100644
--- a/metadata/md5-cache/app-vim/udev-syntax-20051016-r2
+++ b/metadata/md5-cache/app-vim/udev-syntax-20051016-r2
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/udev-syntax-20051016.tar.bz2 https://dev.gentoo.org/~radhermit/vim/udev-syntax-20051016.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=e11cf01217853031524c1e61b50dbc79
diff --git a/metadata/md5-cache/app-vim/undotree-5.0 b/metadata/md5-cache/app-vim/undotree-5.0
index ebb409dfc395..d092d141dad0 100644
--- a/metadata/md5-cache/app-vim/undotree-5.0
+++ b/metadata/md5-cache/app-vim/undotree-5.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/mbbill/undotree/archive/rel_5.0.tar.gz -> undotree-5.0.tar.gz
-_eclasses_=vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=4b2f96c0221612e3bc73212b2ffada2c
diff --git a/metadata/md5-cache/app-vim/undotree-9999 b/metadata/md5-cache/app-vim/undotree-9999
index c1061a92040d..01a33f87f615 100644
--- a/metadata/md5-cache/app-vim/undotree-9999
+++ b/metadata/md5-cache/app-vim/undotree-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=4177 https://github.com
 LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	52a888802d25387c2c74cb845d1219bc	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	52a888802d25387c2c74cb845d1219bc	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=0a7f80dd1c529859345dd8fe3cd174cd
diff --git a/metadata/md5-cache/app-vim/unite-4.0-r1 b/metadata/md5-cache/app-vim/unite-4.0-r1
index 8c00092a2f2e..4dfee89f0674 100644
--- a/metadata/md5-cache/app-vim/unite-4.0-r1
+++ b/metadata/md5-cache/app-vim/unite-4.0-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=!app-vim/neocomplcache || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/unite-4.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/unite-4.0.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=6e648dc4bd2d5c990f0264fb9717aa09
diff --git a/metadata/md5-cache/app-vim/uptime-1.3-r1 b/metadata/md5-cache/app-vim/uptime-1.3-r1
index 0d50b4ffb132..543f45f7bcfe 100644
--- a/metadata/md5-cache/app-vim/uptime-1.3-r1
+++ b/metadata/md5-cache/app-vim/uptime-1.3-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/uptime-1.3.tar.bz2 https://dev.gentoo.org/~radhermit/vim/uptime-1.3.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=315c9db53c6a4ab4559a90a7d35f7a8d
diff --git a/metadata/md5-cache/app-vim/vcscommand-1.99.47 b/metadata/md5-cache/app-vim/vcscommand-1.99.47
index 0ce187ff4f2d..064c2d5ad30b 100644
--- a/metadata/md5-cache/app-vim/vcscommand-1.99.47
+++ b/metadata/md5-cache/app-vim/vcscommand-1.99.47
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=!app-vim/cvscommand || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/vcscommand-1.99.47.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vcscommand-1.99.47.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=0d371d103e79df94d4f035b459667011
diff --git a/metadata/md5-cache/app-vim/vim-addon-mw-utils-20121105 b/metadata/md5-cache/app-vim/vim-addon-mw-utils-20121105
index ed18bf9e1d8f..6a2123eee57b 100644
--- a/metadata/md5-cache/app-vim/vim-addon-mw-utils-20121105
+++ b/metadata/md5-cache/app-vim/vim-addon-mw-utils-20121105
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/vim-addon-mw-utils-20121105.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vim-addon-mw-utils-20121105.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=22e504005bb4930ab5f4e013d95cd6f4
diff --git a/metadata/md5-cache/app-vim/vim-autoclose-2.0 b/metadata/md5-cache/app-vim/vim-autoclose-2.0
index 288dbcdce2b8..a4e447feff2f 100644
--- a/metadata/md5-cache/app-vim/vim-autoclose-2.0
+++ b/metadata/md5-cache/app-vim/vim-autoclose-2.0
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/vim-autoclose-2.0.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=35a0d0487429c1c0ae670cab8175ebf5
diff --git a/metadata/md5-cache/app-vim/vim-flake8-1.6 b/metadata/md5-cache/app-vim/vim-flake8-1.6
index 4a94f438fe4a..8a3c7b833a48 100644
--- a/metadata/md5-cache/app-vim/vim-flake8-1.6
+++ b/metadata/md5-cache/app-vim/vim-flake8-1.6
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/flake8 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/nvie/vim-flake8/archive/1.6.zip -> vim-flake8-1.6.zip
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=b339f6a1c6889b2a15593ef503534acf
diff --git a/metadata/md5-cache/app-vim/vim-go-1.13 b/metadata/md5-cache/app-vim/vim-go-1.13
new file mode 100644
index 000000000000..e1798e846683
--- /dev/null
+++ b/metadata/md5-cache/app-vim/vim-go-1.13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: Go development plugin for Vim
+EAPI=6
+HOMEPAGE=https://github.com/fatih/vim-go
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/fatih/vim-go/archive/v1.13.zip -> vim-go-1.13.zip
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
+_md5_=e09b6f539cf4eefeb174037344c58ebc
diff --git a/metadata/md5-cache/app-vim/vim-hoogle-1.3 b/metadata/md5-cache/app-vim/vim-hoogle-1.3
index a9ead6d64012..d72dfefcde32 100644
--- a/metadata/md5-cache/app-vim/vim-hoogle-1.3
+++ b/metadata/md5-cache/app-vim/vim-hoogle-1.3
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/Twinside/vim-hoogle/archive/31823f830843385f53a3da7a5bfaf678494383c4.tar.gz -> vim-hoogle-1.3.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=fc27d8bf42c1250e323cdb11fae79600
diff --git a/metadata/md5-cache/app-vim/vim-latex-1.8.23.20141116 b/metadata/md5-cache/app-vim/vim-latex-1.8.23.20141116
index 8c3d5ba57ec9..da3e81edf8a3 100644
--- a/metadata/md5-cache/app-vim/vim-latex-1.8.23.20141116
+++ b/metadata/md5-cache/app-vim/vim-latex-1.8.23.20141116
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sourceforge/vim-latex/vim-latex-1.8.23-20141116.812-gitd0f31c9.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=8ed98cbf925aac6ed5bf2907c75e2cde
diff --git a/metadata/md5-cache/app-vim/vim-latex-1.9.0 b/metadata/md5-cache/app-vim/vim-latex-1.9.0
index 295728c32db7..f0b6d4e70c0b 100644
--- a/metadata/md5-cache/app-vim/vim-latex-1.9.0
+++ b/metadata/md5-cache/app-vim/vim-latex-1.9.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sourceforge/vim-latex/vim-latex-1.9.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=59c7d4ba876128bc7761f9836650b301
diff --git a/metadata/md5-cache/app-vim/vim-misc-1.17.6 b/metadata/md5-cache/app-vim/vim-misc-1.17.6
index 04f8cb4cb0bf..0fe86f58c171 100644
--- a/metadata/md5-cache/app-vim/vim-misc-1.17.6
+++ b/metadata/md5-cache/app-vim/vim-misc-1.17.6
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/xolox/vim-misc/archive/1.17.6.tar.gz -> vim-misc-1.17.6.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=46ec834add770feb8d0715812473a3e4
diff --git a/metadata/md5-cache/app-vim/vim-multiple-cursors-2.2-r1 b/metadata/md5-cache/app-vim/vim-multiple-cursors-2.2-r1
index 070fdc7b9fd5..5685c1673161 100644
--- a/metadata/md5-cache/app-vim/vim-multiple-cursors-2.2-r1
+++ b/metadata/md5-cache/app-vim/vim-multiple-cursors-2.2-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/terryma/vim-multiple-cursors/archive/v2.2.tar.gz -> vim-multiple-cursors-2.2.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=079ccb4e353be6bd1350f7bb01e14662
diff --git a/metadata/md5-cache/app-vim/vim-r-1.0 b/metadata/md5-cache/app-vim/vim-r-1.0
index 3889a397ac64..04181e100b4f 100644
--- a/metadata/md5-cache/app-vim/vim-r-1.0
+++ b/metadata/md5-cache/app-vim/vim-r-1.0
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=dev-lang/R || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/vim-r-1.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vim-r-1.0.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=cafad4568baab0bb49961c8047819ac7
diff --git a/metadata/md5-cache/app-vim/vim-r-1.2.6 b/metadata/md5-cache/app-vim/vim-r-1.2.6
index eac95e99a230..fc2c1b084fc3 100644
--- a/metadata/md5-cache/app-vim/vim-r-1.2.6
+++ b/metadata/md5-cache/app-vim/vim-r-1.2.6
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=dev-lang/R || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/vim-r-1.2.6.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vim-r-1.2.6.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=cafad4568baab0bb49961c8047819ac7
diff --git a/metadata/md5-cache/app-vim/vim-rest-console-2.3.0 b/metadata/md5-cache/app-vim/vim-rest-console-2.3.0
index 6abe5c689acc..de84a6b871a2 100644
--- a/metadata/md5-cache/app-vim/vim-rest-console-2.3.0
+++ b/metadata/md5-cache/app-vim/vim-rest-console-2.3.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=net-misc/curl || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/diepm/vim-rest-console/archive/v2.3.0.tar.gz -> vim-rest-console-2.3.0.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=7b1287b8afbdb58aa965fe49d309cda5
diff --git a/metadata/md5-cache/app-vim/vim-rest-console-2.4.0 b/metadata/md5-cache/app-vim/vim-rest-console-2.4.0
index bee82d0267fc..0c1a677645dd 100644
--- a/metadata/md5-cache/app-vim/vim-rest-console-2.4.0
+++ b/metadata/md5-cache/app-vim/vim-rest-console-2.4.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=net-misc/curl || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/diepm/vim-rest-console/archive/v2.4.0.tar.gz -> vim-rest-console-2.4.0.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=cdb2f8a5dc484e5bc3e8431fb4c8632e
diff --git a/metadata/md5-cache/app-vim/vim-rest-console-2.5.0 b/metadata/md5-cache/app-vim/vim-rest-console-2.5.0
index 2e742d8a304a..fc516d3678f3 100644
--- a/metadata/md5-cache/app-vim/vim-rest-console-2.5.0
+++ b/metadata/md5-cache/app-vim/vim-rest-console-2.5.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=net-misc/curl || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/diepm/vim-rest-console/archive/v2.5.0.tar.gz -> vim-rest-console-2.5.0.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=cdb2f8a5dc484e5bc3e8431fb4c8632e
diff --git a/metadata/md5-cache/app-vim/vim-rest-console-2.6.0 b/metadata/md5-cache/app-vim/vim-rest-console-2.6.0
index 5c0ef2f08ece..636486d269ed 100644
--- a/metadata/md5-cache/app-vim/vim-rest-console-2.6.0
+++ b/metadata/md5-cache/app-vim/vim-rest-console-2.6.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=net-misc/curl || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/diepm/vim-rest-console/archive/v2.6.0.tar.gz -> vim-rest-console-2.6.0.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=951efadb615a06f56d864989a893e82c
diff --git a/metadata/md5-cache/app-vim/vim-tmux-3.0.0 b/metadata/md5-cache/app-vim/vim-tmux-3.0.0
index 9f42d3dac7ad..b80308022f66 100644
--- a/metadata/md5-cache/app-vim/vim-tmux-3.0.0
+++ b/metadata/md5-cache/app-vim/vim-tmux-3.0.0
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=!<app-misc/tmux-2.5-r2 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tmux-plugins/vim-tmux/archive/v3.0.0.zip -> vim-tmux-3.0.0.zip
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=bcb637d470510d1c0fa7a2770f1fc632
diff --git a/metadata/md5-cache/app-vim/vimagit-1.7.1 b/metadata/md5-cache/app-vim/vimagit-1.7.1
index bc543837b1a9..de43c514beb3 100644
--- a/metadata/md5-cache/app-vim/vimagit-1.7.1
+++ b/metadata/md5-cache/app-vim/vimagit-1.7.1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/jreybert/vimagit/archive/1.7.1.tar.gz -> vimagit-1.7.1.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=a99c6c3c300fc94a64bfac2bc65d69cf
diff --git a/metadata/md5-cache/app-vim/vimagit-1.7.2 b/metadata/md5-cache/app-vim/vimagit-1.7.2
index c0cf16b751ec..062ff87a279b 100644
--- a/metadata/md5-cache/app-vim/vimagit-1.7.2
+++ b/metadata/md5-cache/app-vim/vimagit-1.7.2
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/jreybert/vimagit/archive/1.7.2.tar.gz -> vimagit-1.7.2.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=99f74496ab576a65b6a85d3f152c35a3
diff --git a/metadata/md5-cache/app-vim/vimagit-9999 b/metadata/md5-cache/app-vim/vimagit-9999
index 17ae2721cc07..b8466f412bac 100644
--- a/metadata/md5-cache/app-vim/vimagit-9999
+++ b/metadata/md5-cache/app-vim/vimagit-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/jreybert/vimagit
 LICENSE=vim
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	52a888802d25387c2c74cb845d1219bc	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	52a888802d25387c2c74cb845d1219bc	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=99f74496ab576a65b6a85d3f152c35a3
diff --git a/metadata/md5-cache/app-vim/vimbuddy-0.9.2-r1 b/metadata/md5-cache/app-vim/vimbuddy-0.9.2-r1
index 981ae71aa888..095c747ceeec 100644
--- a/metadata/md5-cache/app-vim/vimbuddy-0.9.2-r1
+++ b/metadata/md5-cache/app-vim/vimbuddy-0.9.2-r1
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-scripts/vimbuddy.vim/archive/0.9.2.zip -> vimbuddy-0.9.2.zip
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=f0ba4828d99e4f8b59a7bdb96c2b6d41
diff --git a/metadata/md5-cache/app-vim/vimcalc-1.3-r2 b/metadata/md5-cache/app-vim/vimcalc-1.3-r2
index a1c650a3be70..5064084915f6 100644
--- a/metadata/md5-cache/app-vim/vimcalc-1.3-r2
+++ b/metadata/md5-cache/app-vim/vimcalc-1.3-r2
@@ -10,5 +10,5 @@ RDEPEND=|| ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://www.vim.org/scripts/download_script.php?src_id=15317 -> vimcalc-1.3.zip
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=520155451622c956ea78739e6197964f
diff --git a/metadata/md5-cache/app-vim/vimcdoc-1.9.0 b/metadata/md5-cache/app-vim/vimcdoc-1.9.0
index 4d5d6bbeabd9..8bd9e23c9797 100644
--- a/metadata/md5-cache/app-vim/vimcdoc-1.9.0
+++ b/metadata/md5-cache/app-vim/vimcdoc-1.9.0
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/vimcdoc/vimcdoc-1.9.0.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=2c4f8fd03256c848d8997dc38b795345
diff --git a/metadata/md5-cache/app-vim/vimclojure-2.3.6-r2 b/metadata/md5-cache/app-vim/vimclojure-2.3.6-r2
index 4be67daa48a3..2f6f0356666c 100644
--- a/metadata/md5-cache/app-vim/vimclojure-2.3.6-r2
+++ b/metadata/md5-cache/app-vim/vimclojure-2.3.6-r2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/clojure || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-scripts/VimClojure/archive/2.3.6.zip -> vimclojure-2.3.6.zip
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=c40c010dedb399610f96231e4cc9cbfd
diff --git a/metadata/md5-cache/app-vim/vimclojure-2.3.6-r3 b/metadata/md5-cache/app-vim/vimclojure-2.3.6-r3
index a92f11e3244c..32e91a4a8a40 100644
--- a/metadata/md5-cache/app-vim/vimclojure-2.3.6-r3
+++ b/metadata/md5-cache/app-vim/vimclojure-2.3.6-r3
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/clojure || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-scripts/VimClojure/archive/2.3.6.zip -> vimclojure-2.3.6.zip
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=f596f01c2e5bb9eb841f1a799a9c5d15
diff --git a/metadata/md5-cache/app-vim/vimcommander-0.81 b/metadata/md5-cache/app-vim/vimcommander-0.81
index 7864c536ace7..df060286d298 100644
--- a/metadata/md5-cache/app-vim/vimcommander-0.81
+++ b/metadata/md5-cache/app-vim/vimcommander-0.81
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/vimcommander-0.81.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vimcommander-0.81.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=35b6b27f1f3fd5bb403d7b6c56c5914a
diff --git a/metadata/md5-cache/app-vim/vimoutliner-0.3.6 b/metadata/md5-cache/app-vim/vimoutliner-0.3.6
index 70b0cce2d5db..0953af3298e5 100644
--- a/metadata/md5-cache/app-vim/vimoutliner-0.3.6
+++ b/metadata/md5-cache/app-vim/vimoutliner-0.3.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vimoutliner/vimoutliner/archive/v0.3.6.zip -> vimoutliner-0.3.6.zip
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=0751bc668f9f8163d4ad82a85a1498cf
diff --git a/metadata/md5-cache/app-vim/vimoutliner-0.3.6-r1 b/metadata/md5-cache/app-vim/vimoutliner-0.3.6-r1
index c4556d9957d0..f97c9d789b06 100644
--- a/metadata/md5-cache/app-vim/vimoutliner-0.3.6-r1
+++ b/metadata/md5-cache/app-vim/vimoutliner-0.3.6-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/autopep8 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) 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/vimoutliner/vimoutliner/archive/v0.3.6.zip -> vimoutliner-0.3.6.zip
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=9da6cd188c6e0e2711265c94b017a4f3
diff --git a/metadata/md5-cache/app-vim/vimpress-2.1.5 b/metadata/md5-cache/app-vim/vimpress-2.1.5
index 7dfdad83dd12..14006f93b45a 100644
--- a/metadata/md5-cache/app-vim/vimpress-2.1.5
+++ b/metadata/md5-cache/app-vim/vimpress-2.1.5
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( app-editors/vim[python] app-editors/gvim[python] ) || ( dev-lang/python:2.7 dev-lang/python:2.6 ) dev-python/markdown || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-scripts/VimRepress/tarball/2.1.5 -> vimpress-2.1.5.tar.gz
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=577a5a9219c90ebb224972ad63e3e253
diff --git a/metadata/md5-cache/app-vim/vimpress-3.2.0 b/metadata/md5-cache/app-vim/vimpress-3.2.0
index d30f874fa1af..399c05b15e6c 100644
--- a/metadata/md5-cache/app-vim/vimpress-3.2.0
+++ b/metadata/md5-cache/app-vim/vimpress-3.2.0
@@ -10,5 +10,5 @@ RDEPEND=|| ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://gentoo/vimpress-3.2.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vimpress-3.2.0.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=99ef02dfb1d9fa6e9a1e60f2bba258e8
diff --git a/metadata/md5-cache/app-vim/vimpython-1.13-r1 b/metadata/md5-cache/app-vim/vimpython-1.13-r1
index c81a2f331164..02365fdf6874 100644
--- a/metadata/md5-cache/app-vim/vimpython-1.13-r1
+++ b/metadata/md5-cache/app-vim/vimpython-1.13-r1
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=dev-lang/python:* || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/vimpython-1.13.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vimpython-1.13.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=7f2ebb28a26012dd97fca06068573f3a
diff --git a/metadata/md5-cache/app-vim/vimpython-1.13-r2 b/metadata/md5-cache/app-vim/vimpython-1.13-r2
index 9bc4e832c051..d403898651e4 100644
--- a/metadata/md5-cache/app-vim/vimpython-1.13-r2
+++ b/metadata/md5-cache/app-vim/vimpython-1.13-r2
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gentoo/vimpython-1.13.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vimpython-1.13.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=9b882152807eea6d06535cfadeaeea2d
diff --git a/metadata/md5-cache/app-vim/vimtex-20160324 b/metadata/md5-cache/app-vim/vimtex-20160324
index 349e599152c4..eb6d31cff685 100644
--- a/metadata/md5-cache/app-vim/vimtex-20160324
+++ b/metadata/md5-cache/app-vim/vimtex-20160324
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=!app-vim/vim-latex virtual/latex-base dev-tex/latexmk || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/vimtex-20160324.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vimtex-20160324.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=99cb912dba22ace9b7333bc1521ef1c9
diff --git a/metadata/md5-cache/app-vim/voom-5.1 b/metadata/md5-cache/app-vim/voom-5.1
index f726fa41ebae..554dc5116f13 100644
--- a/metadata/md5-cache/app-vim/voom-5.1
+++ b/metadata/md5-cache/app-vim/voom-5.1
@@ -8,5 +8,5 @@ LICENSE=CC0-1.0
 RDEPEND=|| ( app-editors/vim[python] app-editors/gvim[python] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/voom-5.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/voom-5.1.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=86a25cd190f8d5c713b01aa5114bb005
diff --git a/metadata/md5-cache/app-vim/voom-5.1-r1 b/metadata/md5-cache/app-vim/voom-5.1-r1
index 1701b1594a5e..5b5c1eb997db 100644
--- a/metadata/md5-cache/app-vim/voom-5.1-r1
+++ b/metadata/md5-cache/app-vim/voom-5.1-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://gentoo/voom-5.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/voom-5.1.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=10baeb1cb170201a9e15f8f6bc636998
diff --git a/metadata/md5-cache/app-vim/webapi-0.2 b/metadata/md5-cache/app-vim/webapi-0.2
index 4466e0b619dc..d7055e6765be 100644
--- a/metadata/md5-cache/app-vim/webapi-0.2
+++ b/metadata/md5-cache/app-vim/webapi-0.2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=net-misc/curl || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/webapi-0.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/webapi-0.2.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=50f7c21a2d50cb1b8e873d31897fe5f3
diff --git a/metadata/md5-cache/app-vim/wikipedia-syntax-20101113-r1 b/metadata/md5-cache/app-vim/wikipedia-syntax-20101113-r1
index 41f3f99eb453..ae2a33921d1b 100644
--- a/metadata/md5-cache/app-vim/wikipedia-syntax-20101113-r1
+++ b/metadata/md5-cache/app-vim/wikipedia-syntax-20101113-r1
@@ -8,5 +8,5 @@ LICENSE=CC-BY-SA-3.0
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/wikipedia-syntax-20101113.tar.bz2 https://dev.gentoo.org/~radhermit/vim/wikipedia-syntax-20101113.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=cc384482735aaf499c09c1373bbfd8c6
diff --git a/metadata/md5-cache/app-vim/xquery-syntax-0.1-r2 b/metadata/md5-cache/app-vim/xquery-syntax-0.1-r2
index 94a4f822a0d8..e30735bfbf2c 100644
--- a/metadata/md5-cache/app-vim/xquery-syntax-0.1-r2
+++ b/metadata/md5-cache/app-vim/xquery-syntax-0.1-r2
@@ -8,5 +8,5 @@ LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/xquery-syntax-0.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/xquery-syntax-0.1.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=560a8753019f0c4e84f24a230d1ff264
diff --git a/metadata/md5-cache/app-vim/xsl-syntax-0.3.11-r2 b/metadata/md5-cache/app-vim/xsl-syntax-0.3.11-r2
index 68543bdbf6cd..11853aeef3a9 100644
--- a/metadata/md5-cache/app-vim/xsl-syntax-0.3.11-r2
+++ b/metadata/md5-cache/app-vim/xsl-syntax-0.3.11-r2
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/xsl-syntax-0.3.11.tar.bz2 https://dev.gentoo.org/~radhermit/vim/xsl-syntax-0.3.11.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=4816c665665afba4c3b8655455f47911
diff --git a/metadata/md5-cache/app-vim/yankring-19.0 b/metadata/md5-cache/app-vim/yankring-19.0
index 034a152b134d..8ff93a8eb5f1 100644
--- a/metadata/md5-cache/app-vim/yankring-19.0
+++ b/metadata/md5-cache/app-vim/yankring-19.0
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/yankring-19.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/yankring-19.0.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=d01028d18149b88fb1d16e59b02b084c
diff --git a/metadata/md5-cache/app-vim/youcompleteme-20130910 b/metadata/md5-cache/app-vim/youcompleteme-20130910
index a3910a8500cb..eb039f86ee4f 100644
--- a/metadata/md5-cache/app-vim/youcompleteme-20130910
+++ b/metadata/md5-cache/app-vim/youcompleteme-20130910
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~radhermit/vim/youcompleteme-20130910.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=319cf829916bbc708b6b9ec10705b0d6
diff --git a/metadata/md5-cache/app-vim/youcompleteme-99999999 b/metadata/md5-cache/app-vim/youcompleteme-99999999
index 155037c27c5c..fc4cb63354e9 100644
--- a/metadata/md5-cache/app-vim/youcompleteme-99999999
+++ b/metadata/md5-cache/app-vim/youcompleteme-99999999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] clang? ( >=sys-devel/clang-3.3 ) dev-libs/boost[python,threads,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] || ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-python/bottle[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] virtual/python-futures[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/jedi[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/sh[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/waitress[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=4cf2f129bc4b52fa584a445b19c44bc4
diff --git a/metadata/md5-cache/app-vim/zenburn-2.25 b/metadata/md5-cache/app-vim/zenburn-2.25
index e1f8bb0b2699..779d8b02a4ce 100644
--- a/metadata/md5-cache/app-vim/zenburn-2.25
+++ b/metadata/md5-cache/app-vim/zenburn-2.25
@@ -8,5 +8,5 @@ LICENSE=GPL-1
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/jnurmine/Zenburn/archive/v2.25.zip -> zenburn-2.25.zip
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=a17776a3858eea144a9ef68823b5c1ee
diff --git a/metadata/md5-cache/app-vim/zoomwin-24 b/metadata/md5-cache/app-vim/zoomwin-24
index 3e531158a7d0..93b5079b965f 100644
--- a/metadata/md5-cache/app-vim/zoomwin-24
+++ b/metadata/md5-cache/app-vim/zoomwin-24
@@ -8,5 +8,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/zoomwin-24.tar.bz2 https://dev.gentoo.org/~radhermit/vim/zoomwin-24.tar.bz2
-_eclasses_=vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=9c9090942b551d1f915a942c7ec77460
diff --git a/metadata/md5-cache/dev-cpp/eigen-3.3.3 b/metadata/md5-cache/dev-cpp/eigen-3.3.3
index 2db8027e6450..8dd252c8b4fb 100644
--- a/metadata/md5-cache/dev-cpp/eigen-3.3.3
+++ b/metadata/md5-cache/dev-cpp/eigen-3.3.3
@@ -3,11 +3,11 @@ DEPEND=doc? ( app-doc/doxygen[dot,latex] ) test? ( dev-libs/gmp:0 dev-libs/mpfr:
 DESCRIPTION=C++ template library for linear algebra
 EAPI=6
 HOMEPAGE=http://eigen.tuxfamily.org/
-IUSE=altivec c++11 cuda debug doc neon openmp test cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_fma3 cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3
+IUSE=altivec c++11 cuda debug doc neon openmp test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MPL-2.0
 RDEPEND=!dev-cpp/eigen:0
 SLOT=3
 SRC_URI=https://bitbucket.org/eigen/eigen/get/3.3.3.tar.bz2 -> eigen-3.3.3.tar.bz2
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	cuda	626969678b9c5735753d8a380c6f295b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=7465d5cbf8170b0152a4be817f8278b7
+_md5_=22def90ad97b0a9491c9ff444828ac9d
diff --git a/metadata/md5-cache/dev-db/kdb-3.0.2 b/metadata/md5-cache/dev-db/kdb-3.0.2
index 7c11a2496c43..1a4c5a6f3185 100644
--- a/metadata/md5-cache/dev-db/kdb-3.0.2
+++ b/metadata/md5-cache/dev-db/kdb-3.0.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/icu:= mysql? ( virtual/mysql ) postgres? ( >=dev-qt/qtnetwork-5.7.1:5 dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kdb/src/kdb-3.0.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0303c802320b47a3489f767ea1e8333d
diff --git a/metadata/md5-cache/dev-db/kyotocabinet-1.2.76-r1 b/metadata/md5-cache/dev-db/kyotocabinet-1.2.76-r1
index 2812a8f42455..559d86928e0e 100644
--- a/metadata/md5-cache/dev-db/kyotocabinet-1.2.76-r1
+++ b/metadata/md5-cache/dev-db/kyotocabinet-1.2.76-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A straightforward implementation of DBM
 EAPI=6
 HOMEPAGE=http://fallabs.com/kyotocabinet/
 IUSE=debug doc examples static-libs
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=GPL-3
 RDEPEND=sys-libs/zlib[static-libs?] app-arch/xz-utils[static-libs?]
 SLOT=0
 SRC_URI=http://fallabs.com/kyotocabinet/pkg/kyotocabinet-1.2.76.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=49d57c536e5ad48a4efc9f2f2ecd354c
+_md5_=dcafc7e5806de148004696c34c0c9b55
diff --git a/metadata/md5-cache/dev-db/mariadb-10.0.30 b/metadata/md5-cache/dev-db/mariadb-10.0.30
deleted file mode 100644
index 68eef4af89d1..000000000000
--- a/metadata/md5-cache/dev-db/mariadb-10.0.30
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
-DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) !bindist? ( >=sys-libs/readline-4.1:0= ) server? ( extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35: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(-)?] jdbc? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= virtual/yacc static? ( sys-libs/ncurses[static-libs] )
-DESCRIPTION=An enhanced, drop-in replacement for MySQL
-EAPI=6
-HOMEPAGE=http://mariadb.org/
-IUSE=bindist jdbc odbc oqgraph pam sphinx tokudb xml elibc_FreeBSD jdbc 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 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[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(-)?,static-libs=]
-RDEPEND=!bindist? ( >=sys-libs/readline-4.1:0= ) server? ( extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35: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(-)?] perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
-REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam ) ^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
-RESTRICT=!bindist? ( bindist )
-SLOT=0/18
-SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.0.30/source/mariadb-10.0.30.tar.gz mirror://gentoo/mysql-extras-20170310-1426Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170310-1426Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170310-1426Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170310-1426Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170310-1426Z.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	mysql-multilib-r1	c7b4143ab65ce356a4faba035e38b39f	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b0cead00eac7b0d27000b2a71183518b
diff --git a/metadata/md5-cache/dev-db/mariadb-10.0.30-r1 b/metadata/md5-cache/dev-db/mariadb-10.0.30-r1
new file mode 100644
index 000000000000..4f2c8b10f7ee
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mariadb-10.0.30-r1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
+DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) !bindist? ( >=sys-libs/readline-4.1:0= ) server? ( extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35: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(-)?] jdbc? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= virtual/yacc static? ( sys-libs/ncurses[static-libs] )
+DESCRIPTION=An enhanced, drop-in replacement for MySQL
+EAPI=6
+HOMEPAGE=http://mariadb.org/
+IUSE=bindist jdbc odbc oqgraph pam sphinx tokudb xml elibc_FreeBSD jdbc 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 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[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(-)?,static-libs=]
+RDEPEND=!bindist? ( >=sys-libs/readline-4.1:0= ) server? ( extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35: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(-)?] perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
+REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam ) ^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
+RESTRICT=!bindist? ( bindist )
+SLOT=0/18
+SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.0.30/source/mariadb-10.0.30.tar.gz mirror://gentoo/mysql-extras-20170310-1426Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170310-1426Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170310-1426Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170310-1426Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170310-1426Z.tar.bz2
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	mysql-multilib-r1	2c06af347ab7308dd741813b1a3da8e3	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b0cead00eac7b0d27000b2a71183518b
diff --git a/metadata/md5-cache/dev-db/mariadb-10.0.32 b/metadata/md5-cache/dev-db/mariadb-10.0.32
deleted file mode 100644
index cfda6de56f3b..000000000000
--- a/metadata/md5-cache/dev-db/mariadb-10.0.32
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
-DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) !bindist? ( >=sys-libs/readline-4.1:0= ) server? ( extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35: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(-)?] jdbc? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= virtual/yacc static? ( sys-libs/ncurses[static-libs] )
-DESCRIPTION=An enhanced, drop-in replacement for MySQL
-EAPI=6
-HOMEPAGE=http://mariadb.org/
-IUSE=bindist jdbc odbc oqgraph pam sphinx tokudb xml elibc_FreeBSD jdbc 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 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[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(-)?,static-libs=]
-RDEPEND=!bindist? ( >=sys-libs/readline-4.1:0= ) server? ( extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35: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(-)?] perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
-REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam ) ^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
-RESTRICT=!bindist? ( bindist )
-SLOT=0/18
-SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.0.32/source/mariadb-10.0.32.tar.gz mirror://gentoo/mysql-extras-20170310-1426Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170310-1426Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170310-1426Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170310-1426Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170310-1426Z.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	mysql-multilib-r1	c7b4143ab65ce356a4faba035e38b39f	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1af997d1fae5bc16059de5d5770f708f
diff --git a/metadata/md5-cache/dev-db/mariadb-10.0.32-r1 b/metadata/md5-cache/dev-db/mariadb-10.0.32-r1
new file mode 100644
index 000000000000..568fe02be668
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mariadb-10.0.32-r1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
+DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) !bindist? ( >=sys-libs/readline-4.1:0= ) server? ( extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35: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(-)?] jdbc? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= virtual/yacc static? ( sys-libs/ncurses[static-libs] )
+DESCRIPTION=An enhanced, drop-in replacement for MySQL
+EAPI=6
+HOMEPAGE=http://mariadb.org/
+IUSE=bindist jdbc odbc oqgraph pam sphinx tokudb xml elibc_FreeBSD jdbc 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 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[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(-)?,static-libs=]
+RDEPEND=!bindist? ( >=sys-libs/readline-4.1:0= ) server? ( extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35: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(-)?] perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
+REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam ) ^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
+RESTRICT=!bindist? ( bindist )
+SLOT=0/18
+SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.0.32/source/mariadb-10.0.32.tar.gz mirror://gentoo/mysql-extras-20170310-1426Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170310-1426Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170310-1426Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170310-1426Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170310-1426Z.tar.bz2
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	mysql-multilib-r1	2c06af347ab7308dd741813b1a3da8e3	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=1af997d1fae5bc16059de5d5770f708f
diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.24 b/metadata/md5-cache/dev-db/mariadb-10.1.24
deleted file mode 100644
index 732f815aa260..000000000000
--- a/metadata/md5-cache/dev-db/mariadb-10.1.24
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
-DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[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(-)?] ) systemd? ( sys-apps/systemd:= ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35:3= jdbc? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= virtual/yacc static? ( sys-libs/ncurses[static-libs] )
-DESCRIPTION=An enhanced, drop-in replacement for MySQL
-EAPI=6
-HOMEPAGE=http://mariadb.org/
-IUSE=+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml elibc_FreeBSD jdbc 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 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-PDEPEND=galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[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(-)?,static-libs=]
-RDEPEND=mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[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(-)?] ) systemd? ( sys-apps/systemd:= ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35:3= galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
-REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam ) ^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
-RESTRICT=!bindist? ( bindist )
-SLOT=0/18
-SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.24/source/mariadb-10.1.24.tar.gz mirror://gentoo/mysql-extras-20170316-1355Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170316-1355Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170316-1355Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170316-1355Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170316-1355Z.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	mysql-multilib-r1	c7b4143ab65ce356a4faba035e38b39f	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=a3b3fe0a461af8472314247270f9bd68
diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.24-r1 b/metadata/md5-cache/dev-db/mariadb-10.1.24-r1
new file mode 100644
index 000000000000..6ebc002c2693
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mariadb-10.1.24-r1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
+DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[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(-)?] ) systemd? ( sys-apps/systemd:= ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35:3= jdbc? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= virtual/yacc static? ( sys-libs/ncurses[static-libs] )
+DESCRIPTION=An enhanced, drop-in replacement for MySQL
+EAPI=6
+HOMEPAGE=http://mariadb.org/
+IUSE=+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml elibc_FreeBSD jdbc 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 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+PDEPEND=galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[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(-)?,static-libs=]
+RDEPEND=mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[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(-)?] ) systemd? ( sys-apps/systemd:= ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35:3= galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
+REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam ) ^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
+RESTRICT=!bindist? ( bindist )
+SLOT=0/18
+SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.24/source/mariadb-10.1.24.tar.gz mirror://gentoo/mysql-extras-20170316-1355Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170316-1355Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170316-1355Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170316-1355Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170316-1355Z.tar.bz2
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	mysql-multilib-r1	2c06af347ab7308dd741813b1a3da8e3	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a3b3fe0a461af8472314247270f9bd68
diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.26 b/metadata/md5-cache/dev-db/mariadb-10.1.26
deleted file mode 100644
index 317641136012..000000000000
--- a/metadata/md5-cache/dev-db/mariadb-10.1.26
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
-DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[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(-)?] ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35:3= jdbc? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= virtual/yacc static? ( sys-libs/ncurses[static-libs] )
-DESCRIPTION=An enhanced, drop-in replacement for MySQL
-EAPI=6
-HOMEPAGE=http://mariadb.org/
-IUSE=+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml elibc_FreeBSD jdbc 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 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-PDEPEND=galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[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(-)?,static-libs=]
-RDEPEND=mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[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(-)?] ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35:3= galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
-REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam ) ^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
-RESTRICT=!bindist? ( bindist )
-SLOT=0/18
-SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.26/source/mariadb-10.1.26.tar.gz mirror://gentoo/mysql-extras-20170830-1210Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170830-1210Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170830-1210Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170830-1210Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170830-1210Z.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	mysql-multilib-r1	c7b4143ab65ce356a4faba035e38b39f	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f1ef9b21e9390e28d47a0d180bb538ef
diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.26-r1 b/metadata/md5-cache/dev-db/mariadb-10.1.26-r1
new file mode 100644
index 000000000000..278089fe8c31
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mariadb-10.1.26-r1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
+DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[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(-)?] ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35:3= jdbc? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= virtual/yacc static? ( sys-libs/ncurses[static-libs] )
+DESCRIPTION=An enhanced, drop-in replacement for MySQL
+EAPI=6
+HOMEPAGE=http://mariadb.org/
+IUSE=+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml elibc_FreeBSD jdbc 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 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+PDEPEND=galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[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(-)?,static-libs=]
+RDEPEND=mroonga? ( app-text/groonga-normalizer-mysql ) kerberos? ( virtual/krb5[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(-)?] ) !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) sys-libs/zlib[minizip] ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35:3= galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
+REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam ) ^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
+RESTRICT=!bindist? ( bindist )
+SLOT=0/18
+SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.26/source/mariadb-10.1.26.tar.gz mirror://gentoo/mysql-extras-20170830-1210Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170830-1210Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170830-1210Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170830-1210Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170830-1210Z.tar.bz2
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	mysql-multilib-r1	2c06af347ab7308dd741813b1a3da8e3	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f1ef9b21e9390e28d47a0d180bb538ef
diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.28 b/metadata/md5-cache/dev-db/mariadb-10.1.28
index 5ce9cfd2299d..058f434ff512 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.1.28
+++ b/metadata/md5-cache/dev-db/mariadb-10.1.28
@@ -12,5 +12,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !
 RESTRICT=!bindist? ( bindist )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.28/source/mariadb-10.1.28.tar.gz mirror://gentoo/mysql-extras-20170926-1321Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170926-1321Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170926-1321Z.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	mysql-multilib-r1	c7b4143ab65ce356a4faba035e38b39f	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	mysql-multilib-r1	2c06af347ab7308dd741813b1a3da8e3	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=36059331f577302ace2189bee3cffbee
diff --git a/metadata/md5-cache/dev-db/mariadb-5.5.58 b/metadata/md5-cache/dev-db/mariadb-5.5.58
index e058cc1fe190..67ae1a8086d3 100644
--- a/metadata/md5-cache/dev-db/mariadb-5.5.58
+++ b/metadata/md5-cache/dev-db/mariadb-5.5.58
@@ -12,5 +12,5 @@ REQUIRED_USE=minimal? ( !oqgraph ) minimal? ( !sphinx ) tokudb? ( jemalloc !tcma
 RESTRICT=!bindist? ( bindist )
 SLOT=0/18
 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.5.58/kvm-tarbake-jaunty-x86/mariadb-5.5.58.tar.gz http://ftp.osuosl.org/pub/mariadb/mariadb-5.5.58/source/mariadb-5.5.58.tar.gz http://mirror.jmu.edu/pub/mariadb/mariadb-5.5.58/kvm-tarbake-jaunty-x86/mariadb-5.5.58.tar.gz http://mirrors.coreix.net/mariadb/mariadb-5.5.58/kvm-tarbake-jaunty-x86/mariadb-5.5.58.tar.gz http://mirrors.syringanetworks.net/mariadb/mariadb-5.5.58/kvm-tarbake-jaunty-x86/mariadb-5.5.58.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.5.58/kvm-tarbake-jaunty-x86/mariadb-5.5.58.tar.gz http://mirror2.hs-esslingen.de/mariadb/mariadb-5.5.58/kvm-tarbake-jaunty-x86/mariadb-5.5.58.tar.gz mirror://gentoo/mysql-extras-20160721-1526Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20160721-1526Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20160721-1526Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20160721-1526Z.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	mysql-cmake	84b8e014a55adc91fb42dabaa0d7159e	mysql-v2	52e3d60d8babfc8f05ce19add46476f0	mysql_fx	8b1a162f910cbde93413070f1a239fef	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	mysql-cmake	84b8e014a55adc91fb42dabaa0d7159e	mysql-v2	b4917fa72c71a08039b3f1685f975509	mysql_fx	8b1a162f910cbde93413070f1a239fef	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8aad9a4a2850cd6a321b0997dce0dbfe
diff --git a/metadata/md5-cache/dev-db/mariadb-galera-10.0.32 b/metadata/md5-cache/dev-db/mariadb-galera-10.0.32
index 63841bf7aa56..30a36aa998f9 100644
--- a/metadata/md5-cache/dev-db/mariadb-galera-10.0.32
+++ b/metadata/md5-cache/dev-db/mariadb-galera-10.0.32
@@ -12,5 +12,5 @@ REQUIRED_USE=server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam ) ^^ ( ya
 RESTRICT=!bindist? ( bindist )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-galera-10.0.32/source/mariadb-galera-10.0.32.tar.gz mirror://gentoo/mysql-extras-20160629-1442Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20160629-1442Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20160629-1442Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20160629-1442Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20160629-1442Z.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	mysql-multilib-r1	c7b4143ab65ce356a4faba035e38b39f	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	mysql-multilib-r1	2c06af347ab7308dd741813b1a3da8e3	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0b891fb9d3f953a2a450d7b73c21aa3f
diff --git a/metadata/md5-cache/dev-db/mydumper-0.9.3 b/metadata/md5-cache/dev-db/mydumper-0.9.3
deleted file mode 100644
index cfb60e502a04..000000000000
--- a/metadata/md5-cache/dev-db/mydumper-0.9.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:= dev-libs/libpcre:= dev-libs/openssl:= sys-libs/zlib:= virtual/mysql virtual/pkgconfig doc? ( dev-python/sphinx ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=A high-performance multi-threaded backup (and restore) toolset for MySQL
-EAPI=6
-HOMEPAGE=https://github.com/maxbube/mydumper
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/glib:= dev-libs/libpcre:= dev-libs/openssl:= sys-libs/zlib:= virtual/mysql
-SLOT=0
-SRC_URI=https://github.com/maxbube/mydumper/archive/v0.9.3.tar.gz -> mydumper-0.9.3.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b40e83206daa774559535f9783b42e4f
diff --git a/metadata/md5-cache/dev-db/mydumper-0.9.3-r1 b/metadata/md5-cache/dev-db/mydumper-0.9.3-r1
new file mode 100644
index 000000000000..7f6f6a2c7ab4
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mydumper-0.9.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/glib:= dev-libs/libpcre:= dev-libs/openssl:= sys-libs/zlib:= virtual/mysql virtual/pkgconfig doc? ( dev-python/sphinx ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=A high-performance multi-threaded backup (and restore) toolset for MySQL
+EAPI=6
+HOMEPAGE=https://github.com/maxbube/mydumper
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/glib:= dev-libs/libpcre:= dev-libs/openssl:= sys-libs/zlib:= virtual/mysql
+SLOT=0
+SRC_URI=https://github.com/maxbube/mydumper/archive/v0.9.3.tar.gz -> mydumper-0.9.3.tar.gz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5459ed584a8aed4e67c3da0adbfe0fa9
diff --git a/metadata/md5-cache/dev-db/mysql++-2.3.2 b/metadata/md5-cache/dev-db/mysql++-2.3.2
index 291ce6a0a11f..317a87ae400d 100644
--- a/metadata/md5-cache/dev-db/mysql++-2.3.2
+++ b/metadata/md5-cache/dev-db/mysql++-2.3.2
@@ -7,6 +7,6 @@ KEYWORDS=alpha amd64 hppa ~mips ppc sparc x86
 LICENSE=LGPL-2
 RDEPEND=>=virtual/mysql-4.0
 SLOT=0
-SRC_URI=http://www.tangentsoft.net/mysql++/releases/mysql++-2.3.2.tar.gz
+SRC_URI=http://www.tangentsoft.net/mysqlpp/releases/mysql++-2.3.2.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=298588eb9a7a54614170ca3c19555706
+_md5_=749d6d858b3b9b1e4084012f41c4ff06
diff --git a/metadata/md5-cache/dev-db/mysql++-3.1.0 b/metadata/md5-cache/dev-db/mysql++-3.1.0
index 03dd98cb4bca..5eb43f741457 100644
--- a/metadata/md5-cache/dev-db/mysql++-3.1.0
+++ b/metadata/md5-cache/dev-db/mysql++-3.1.0
@@ -7,6 +7,6 @@ KEYWORDS=alpha amd64 hppa ~mips ppc sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=LGPL-2
 RDEPEND=>=virtual/mysql-4.0
 SLOT=0/3
-SRC_URI=http://www.tangentsoft.net/mysql++/releases/mysql++-3.1.0.tar.gz
+SRC_URI=http://www.tangentsoft.net/mysqlpp/releases/mysql++-3.1.0.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=aa394ef40f250516c324145e27eea34c
+_md5_=ff0bd128288afbd62bfa5e4e9a475b8a
diff --git a/metadata/md5-cache/dev-db/mysql++-3.2.1 b/metadata/md5-cache/dev-db/mysql++-3.2.1
index 35b99c0bd8bd..5217fbaa3eea 100644
--- a/metadata/md5-cache/dev-db/mysql++-3.2.1
+++ b/metadata/md5-cache/dev-db/mysql++-3.2.1
@@ -7,6 +7,6 @@ KEYWORDS=alpha amd64 hppa ~mips ppc sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=LGPL-2
 RDEPEND=>=virtual/mysql-4.0
 SLOT=0/3
-SRC_URI=http://www.tangentsoft.net/mysql++/releases/mysql++-3.2.1.tar.gz
+SRC_URI=http://www.tangentsoft.net/mysqlpp/releases/mysql++-3.2.1.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=b9cf53bc41be13446923425924e7108c
+_md5_=2299d1a76ead152a79250691144bf036
diff --git a/metadata/md5-cache/dev-db/mysql++-3.2.2 b/metadata/md5-cache/dev-db/mysql++-3.2.2
index fdde2f0605d2..352d62d96b4d 100644
--- a/metadata/md5-cache/dev-db/mysql++-3.2.2
+++ b/metadata/md5-cache/dev-db/mysql++-3.2.2
@@ -7,6 +7,6 @@ KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64
 LICENSE=LGPL-2
 RDEPEND=virtual/libmysqlclient:=
 SLOT=0/3
-SRC_URI=http://www.tangentsoft.net/mysql++/releases/mysql++-3.2.2.tar.gz
+SRC_URI=http://www.tangentsoft.net/mysqlpp/releases/mysql++-3.2.2.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=69f1b611dd7b0983da16ce1da8eaaa6d
+_md5_=ddfc5378f3288aa17512293dc1a8a994
diff --git a/metadata/md5-cache/dev-db/mysql++-3.2.3 b/metadata/md5-cache/dev-db/mysql++-3.2.3
index 448cbc72c90f..db76cb104469 100644
--- a/metadata/md5-cache/dev-db/mysql++-3.2.3
+++ b/metadata/md5-cache/dev-db/mysql++-3.2.3
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64
 LICENSE=LGPL-2
 RDEPEND=virtual/libmysqlclient:=
 SLOT=0/3
-SRC_URI=http://www.tangentsoft.net/mysql++/releases/mysql++-3.2.3.tar.gz
+SRC_URI=http://www.tangentsoft.net/mysqlpp/releases/mysql++-3.2.3.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=834432ee9c80c15f00ae273d088eb44d
+_md5_=839877cc4a10a64414e4725dc9ba018c
diff --git a/metadata/md5-cache/dev-db/mysql-5.5.58 b/metadata/md5-cache/dev-db/mysql-5.5.58
index f3ea9dd1cdf2..5fc0f09ea864 100644
--- a/metadata/md5-cache/dev-db/mysql-5.5.58
+++ b/metadata/md5-cache/dev-db/mysql-5.5.58
@@ -12,5 +12,5 @@ REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster
 RESTRICT=!bindist? ( bindist )
 SLOT=0/18
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.5/mysql-5.5.58.tar.gz https://downloads.skysql.com/files/mysql-5.5/mysql-5.5.58.tar.gz mirror://mysql/Downloads/MySQL-5.5/mysql-5.5.58.tar.gz mirror://gentoo/mysql-extras-20171018-1948Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20171018-1948Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20171018-1948Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20171018-1948Z.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	mysql-cmake	84b8e014a55adc91fb42dabaa0d7159e	mysql-v2	52e3d60d8babfc8f05ce19add46476f0	mysql_fx	8b1a162f910cbde93413070f1a239fef	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	mysql-cmake	84b8e014a55adc91fb42dabaa0d7159e	mysql-v2	b4917fa72c71a08039b3f1685f975509	mysql_fx	8b1a162f910cbde93413070f1a239fef	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=331f1ac02afb273a051077905f8c569f
diff --git a/metadata/md5-cache/dev-db/mysql-5.6.36 b/metadata/md5-cache/dev-db/mysql-5.6.36
deleted file mode 100644
index 98346959c380..000000000000
--- a/metadata/md5-cache/dev-db/mysql-5.6.36
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
-DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= virtual/yacc static? ( sys-libs/ncurses[static-libs] )
-DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
-EAPI=6
-HOMEPAGE=http://www.mysql.com/
-IUSE=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 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[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(-)?,static-libs=]
-RDEPEND=kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
-REQUIRED_USE=^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
-RESTRICT=libressl? ( test )
-SLOT=0/18
-SRC_URI=http://cdn.mysql.com/Downloads/MySQL-5.6/mysql-5.6.36.tar.gz http://downloads.mysql.com/archives/MySQL-5.6/mysql-5.6.36.tar.gz mirror://gentoo/mysql-extras-20170302-1359Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170302-1359Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170302-1359Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170302-1359Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170302-1359Z.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	mysql-multilib-r1	c7b4143ab65ce356a4faba035e38b39f	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=52d337b9fcb6679f85e6bafeeb7c5b79
diff --git a/metadata/md5-cache/dev-db/mysql-5.6.36-r1 b/metadata/md5-cache/dev-db/mysql-5.6.36-r1
new file mode 100644
index 000000000000..e9e305e64315
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-5.6.36-r1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
+DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= virtual/yacc static? ( sys-libs/ncurses[static-libs] )
+DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
+EAPI=6
+HOMEPAGE=http://www.mysql.com/
+IUSE=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 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[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(-)?,static-libs=]
+RDEPEND=kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
+REQUIRED_USE=^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
+RESTRICT=libressl? ( test )
+SLOT=0/18
+SRC_URI=http://cdn.mysql.com/Downloads/MySQL-5.6/mysql-5.6.36.tar.gz http://downloads.mysql.com/archives/MySQL-5.6/mysql-5.6.36.tar.gz mirror://gentoo/mysql-extras-20170302-1359Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170302-1359Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170302-1359Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170302-1359Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170302-1359Z.tar.bz2
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	mysql-multilib-r1	2c06af347ab7308dd741813b1a3da8e3	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=52d337b9fcb6679f85e6bafeeb7c5b79
diff --git a/metadata/md5-cache/dev-db/mysql-5.6.37 b/metadata/md5-cache/dev-db/mysql-5.6.37
deleted file mode 100644
index 4768a75880ac..000000000000
--- a/metadata/md5-cache/dev-db/mysql-5.6.37
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
-DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= virtual/yacc static? ( sys-libs/ncurses[static-libs] )
-DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
-EAPI=6
-HOMEPAGE=http://www.mysql.com/
-IUSE=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 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
-KEYWORDS=~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[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(-)?,static-libs=]
-RDEPEND=kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
-REQUIRED_USE=^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
-RESTRICT=libressl? ( test )
-SLOT=0/18
-SRC_URI=http://cdn.mysql.com/Downloads/MySQL-5.6/mysql-5.6.37.tar.gz http://downloads.mysql.com/archives/MySQL-5.6/mysql-5.6.37.tar.gz mirror://gentoo/mysql-extras-20170719-1335Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170719-1335Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170719-1335Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170719-1335Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170719-1335Z.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	mysql-multilib-r1	c7b4143ab65ce356a4faba035e38b39f	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=cd09ac7c847a18d657c4fc6cd43b6900
diff --git a/metadata/md5-cache/dev-db/mysql-5.6.37-r1 b/metadata/md5-cache/dev-db/mysql-5.6.37-r1
new file mode 100644
index 000000000000..b9e1b7a899e2
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-5.6.37-r1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
+DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= virtual/yacc static? ( sys-libs/ncurses[static-libs] )
+DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
+EAPI=6
+HOMEPAGE=http://www.mysql.com/
+IUSE=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 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
+KEYWORDS=~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[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(-)?,static-libs=]
+RDEPEND=kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
+REQUIRED_USE=^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
+RESTRICT=libressl? ( test )
+SLOT=0/18
+SRC_URI=http://cdn.mysql.com/Downloads/MySQL-5.6/mysql-5.6.37.tar.gz http://downloads.mysql.com/archives/MySQL-5.6/mysql-5.6.37.tar.gz mirror://gentoo/mysql-extras-20170719-1335Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170719-1335Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170719-1335Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170719-1335Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170719-1335Z.tar.bz2
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	mysql-multilib-r1	2c06af347ab7308dd741813b1a3da8e3	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=cd09ac7c847a18d657c4fc6cd43b6900
diff --git a/metadata/md5-cache/dev-db/mysql-5.6.38 b/metadata/md5-cache/dev-db/mysql-5.6.38
index b8800c93110a..ca61a5fbae76 100644
--- a/metadata/md5-cache/dev-db/mysql-5.6.38
+++ b/metadata/md5-cache/dev-db/mysql-5.6.38
@@ -4,7 +4,7 @@ DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
 EAPI=6
 HOMEPAGE=http://www.mysql.com/
 IUSE=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 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[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(-)?,static-libs=]
 RDEPEND=kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?
 RESTRICT=libressl? ( test )
 SLOT=0/18
 SRC_URI=http://cdn.mysql.com/Downloads/MySQL-5.6/mysql-5.6.38.tar.gz http://downloads.mysql.com/archives/MySQL-5.6/mysql-5.6.38.tar.gz mirror://gentoo/mysql-extras-20171018-1948Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20171018-1948Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20171018-1948Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20171018-1948Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20171018-1948Z.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	mysql-multilib-r1	c7b4143ab65ce356a4faba035e38b39f	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d62760797981d1a1a4bd7c015e147f8d
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	mysql-multilib-r1	2c06af347ab7308dd741813b1a3da8e3	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=868ad7e342ca1a353b698f29d7562298
diff --git a/metadata/md5-cache/dev-db/mysql-cluster-7.2.22 b/metadata/md5-cache/dev-db/mysql-cluster-7.2.22
deleted file mode 100644
index 69bb205806c2..000000000000
--- a/metadata/md5-cache/dev-db/mysql-cluster-7.2.22
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack
-DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) java? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.7.2 ssl? ( >=dev-libs/openssl-0.9.6d:0 ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.3 !bindist? ( >=sys-libs/readline-4.1:0 ) !dev-db/mysql !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server jemalloc? ( dev-libs/jemalloc[static-libs?] ) tcmalloc? ( dev-util/google-perftools ) >=sys-libs/zlib-1.2.3[static-libs?] ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) dev-libs/libevent java? ( >=virtual/jdk-1.6 ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 >=dev-util/cmake-2.6.3
-DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
-EAPI=5
-HOMEPAGE=http://www.mysql.com/
-IUSE=elibc_FreeBSD java bindist debug embedded minimal +perl selinux ssl static static-libs test latin1 extraengine cluster max-idx-128 +community profiling jemalloc tcmalloc systemtap
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) ~virtual/mysql-5.5
-RDEPEND=!media-sound/amarok[embedded] java? ( >=dev-java/java-config-2.2.0-r3 ) ssl? ( >=dev-libs/openssl-0.9.6d:0 ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.3 !bindist? ( >=sys-libs/readline-4.1:0 ) !dev-db/mysql !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server jemalloc? ( dev-libs/jemalloc[static-libs?] ) tcmalloc? ( dev-util/google-perftools ) >=sys-libs/zlib-1.2.3[static-libs?] ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) dev-libs/libevent !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) java? ( >=virtual/jre-1.6 )
-REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=http://downloads.mysql.com/archives/mysql-cluster-gpl-7.2/mysql-cluster-gpl-7.2.22.tar.gz https://downloads.skysql.com/files/mysql-cluster-gpl-7.2/mysql-cluster-gpl-7.2.22.tar.gz mirror://mysql/Downloads/MySQL-Cluster-7.2/mysql-cluster-gpl-7.2.22.tar.gz mirror://gentoo/mysql-extras-20151117-2040Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20151117-2040Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20151117-2040Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20151117-2040Z.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	mysql-cmake	84b8e014a55adc91fb42dabaa0d7159e	mysql-v2	52e3d60d8babfc8f05ce19add46476f0	mysql_fx	8b1a162f910cbde93413070f1a239fef	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=53e632ea2217c7df4faf15b9b368f0b7
diff --git a/metadata/md5-cache/dev-db/mysql-cluster-7.2.22-r1 b/metadata/md5-cache/dev-db/mysql-cluster-7.2.22-r1
new file mode 100644
index 000000000000..fdb7cc2d089a
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-cluster-7.2.22-r1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack
+DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) java? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.7.2 ssl? ( >=dev-libs/openssl-0.9.6d:0 ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.3 !bindist? ( >=sys-libs/readline-4.1:0 ) !dev-db/mysql !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server jemalloc? ( dev-libs/jemalloc[static-libs?] ) tcmalloc? ( dev-util/google-perftools ) >=sys-libs/zlib-1.2.3[static-libs?] ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) dev-libs/libevent java? ( >=virtual/jdk-1.6 ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 >=dev-util/cmake-2.6.3
+DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
+EAPI=5
+HOMEPAGE=http://www.mysql.com/
+IUSE=elibc_FreeBSD java bindist debug embedded minimal +perl selinux ssl static static-libs test latin1 extraengine cluster max-idx-128 +community profiling jemalloc tcmalloc systemtap
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) ~virtual/mysql-5.5
+RDEPEND=!media-sound/amarok[embedded] java? ( >=dev-java/java-config-2.2.0-r3 ) ssl? ( >=dev-libs/openssl-0.9.6d:0 ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.3 !bindist? ( >=sys-libs/readline-4.1:0 ) !dev-db/mysql !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server jemalloc? ( dev-libs/jemalloc[static-libs?] ) tcmalloc? ( dev-util/google-perftools ) >=sys-libs/zlib-1.2.3[static-libs?] ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) dev-libs/libevent !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) java? ( >=virtual/jre-1.6 )
+REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )
+RESTRICT=!bindist? ( bindist )
+SLOT=0
+SRC_URI=http://downloads.mysql.com/archives/mysql-cluster-gpl-7.2/mysql-cluster-gpl-7.2.22.tar.gz https://downloads.skysql.com/files/mysql-cluster-gpl-7.2/mysql-cluster-gpl-7.2.22.tar.gz mirror://mysql/Downloads/MySQL-Cluster-7.2/mysql-cluster-gpl-7.2.22.tar.gz mirror://gentoo/mysql-extras-20151117-2040Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20151117-2040Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20151117-2040Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20151117-2040Z.tar.bz2
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	mysql-cmake	84b8e014a55adc91fb42dabaa0d7159e	mysql-v2	b4917fa72c71a08039b3f1685f975509	mysql_fx	8b1a162f910cbde93413070f1a239fef	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=878fcf024d66e4d1e5ba64d744320e6d
diff --git a/metadata/md5-cache/dev-db/mysql-cluster-7.3.11 b/metadata/md5-cache/dev-db/mysql-cluster-7.3.11
deleted file mode 100644
index c376560edbbd..000000000000
--- a/metadata/md5-cache/dev-db/mysql-cluster-7.3.11
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
-DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses: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-db/mysql !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server dev-libs/libevent:0= java? ( >=virtual/jdk-1.6 ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.8.9 sys-libs/ncurses[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(-)?]
-DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
-EAPI=5
-HOMEPAGE=http://www.mysql.com/
-IUSE=elibc_FreeBSD java 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 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux systemtap static static-libs tcmalloc test yassl minimal
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) ~virtual/mysql-5.6
-RDEPEND=!media-sound/amarok[embedded] java? ( >=dev-java/java-config-2.2.0-r3 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses: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-db/mysql !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server dev-libs/libevent:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) java? ( >=virtual/jre-1.6 )
-REQUIRED_USE=^^ ( yassl openssl libressl ) minimal? ( !extraengine !embedded ) tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) static? ( yassl !openssl !libressl )
-RESTRICT=libressl? ( test )
-SLOT=0/18
-SRC_URI=http://downloads.mysql.com/archives/mysql-cluster-gpl-7.3/mysql-cluster-gpl-7.3.11.tar.gz mirror://mysql/Downloads/MySQL-Cluster-7.3/mysql-cluster-gpl-7.3.11.tar.gz mirror://gentoo/mysql-extras-20151117-2040Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20151117-2040Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20151117-2040Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20151117-2040Z.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	mysql-cmake	84b8e014a55adc91fb42dabaa0d7159e	mysql-multilib	5d3d6f77848c501986da84a815885467	mysql_fx	8b1a162f910cbde93413070f1a239fef	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=fa1c4f61c74172a90ab237cad50047f4
diff --git a/metadata/md5-cache/dev-db/mysql-cluster-7.3.11-r1 b/metadata/md5-cache/dev-db/mysql-cluster-7.3.11-r1
new file mode 100644
index 000000000000..21f9011aee61
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-cluster-7.3.11-r1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
+DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses: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-db/mysql !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server dev-libs/libevent:0= java? ( >=virtual/jdk-1.6 ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.8.9 sys-libs/ncurses[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(-)?]
+DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
+EAPI=5
+HOMEPAGE=http://www.mysql.com/
+IUSE=elibc_FreeBSD java 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 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux systemtap static static-libs tcmalloc test yassl minimal
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) ~virtual/mysql-5.6
+RDEPEND=!media-sound/amarok[embedded] java? ( >=dev-java/java-config-2.2.0-r3 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses: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-db/mysql !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server dev-libs/libevent:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) java? ( >=virtual/jre-1.6 )
+REQUIRED_USE=^^ ( yassl openssl libressl ) minimal? ( !extraengine !embedded ) tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) static? ( yassl !openssl !libressl )
+RESTRICT=libressl? ( test )
+SLOT=0/18
+SRC_URI=http://downloads.mysql.com/archives/mysql-cluster-gpl-7.3/mysql-cluster-gpl-7.3.11.tar.gz mirror://mysql/Downloads/MySQL-Cluster-7.3/mysql-cluster-gpl-7.3.11.tar.gz mirror://gentoo/mysql-extras-20151117-2040Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20151117-2040Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20151117-2040Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20151117-2040Z.tar.bz2
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	mysql-cmake	84b8e014a55adc91fb42dabaa0d7159e	mysql-multilib	25997cc96823709d602ffa3a569dce59	mysql_fx	8b1a162f910cbde93413070f1a239fef	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=76756261cda86333e84858ce449ca857
diff --git a/metadata/md5-cache/dev-db/mysql-init-scripts-2.2-r1 b/metadata/md5-cache/dev-db/mysql-init-scripts-2.2-r1
index a12952acccf2..e490dbecf3fa 100644
--- a/metadata/md5-cache/dev-db/mysql-init-scripts-2.2-r1
+++ b/metadata/md5-cache/dev-db/mysql-init-scripts-2.2-r1
@@ -3,9 +3,9 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=Gentoo MySQL init scripts.
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=!<dev-db/mysql-5.1 !<sys-apps/openrc-0.16.2
 SLOT=0
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	s6	9fd5ce6a54658cb380091f4c3acc544e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=00e546cc4e9e82e163bba59cc5263ced
+_md5_=616605f4fa83bf389fade3b517062cd7
diff --git a/metadata/md5-cache/dev-db/percona-server-5.6.37.82.2 b/metadata/md5-cache/dev-db/percona-server-5.6.37.82.2
deleted file mode 100644
index 2e1c88f272f3..000000000000
--- a/metadata/md5-cache/dev-db/percona-server-5.6.37.82.2
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
-DEPEND=numa? ( sys-process/numactl:= ) server? ( pam? ( virtual/pam:0= ) ) tokudb? ( app-arch/snappy ) tokudb-backup-plugin? ( dev-util/valgrind ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/mysql-python[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= virtual/yacc static? ( sys-libs/ncurses[static-libs] )
-DESCRIPTION=An enhanced, drop-in replacement for MySQL from the Percona team
-EAPI=6
-HOMEPAGE=http://www.percona.com/software/percona-server
-IUSE=numa pam tokudb tokudb-backup-plugin 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 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux
-LICENSE=GPL-2
-PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[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(-)?,static-libs=]
-RDEPEND=numa? ( sys-process/numactl:= ) server? ( pam? ( virtual/pam:0= ) ) tokudb? ( app-arch/snappy ) tokudb-backup-plugin? ( dev-util/valgrind ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
-REQUIRED_USE=tokudb-backup-plugin? ( tokudb ) tokudb? ( jemalloc !tcmalloc ) ^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
-RESTRICT=libressl? ( test )
-SLOT=0/18
-SRC_URI=http://www.percona.com/redir/downloads/Percona-Server-5.6/Percona-Server-5.6.37-82.2/source/tarball/percona-server-5.6.37-82.2.tar.gz mirror://gentoo/mysql-extras-20170820-2245Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170820-2245Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170820-2245Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170820-2245Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170820-2245Z.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	mysql-multilib-r1	c7b4143ab65ce356a4faba035e38b39f	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	7b6fb2fc216b101b5d97d171925a847c	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=005588e741e9d1844f3da627a61f8eb0
diff --git a/metadata/md5-cache/dev-db/percona-server-5.6.37.82.2-r1 b/metadata/md5-cache/dev-db/percona-server-5.6.37.82.2-r1
new file mode 100644
index 000000000000..9b9746343bc2
--- /dev/null
+++ b/metadata/md5-cache/dev-db/percona-server-5.6.37.82.2-r1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
+DEPEND=numa? ( sys-process/numactl:= ) server? ( pam? ( virtual/pam:0= ) ) tokudb? ( app-arch/snappy ) tokudb-backup-plugin? ( dev-util/valgrind ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/mysql-python[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= virtual/yacc static? ( sys-libs/ncurses[static-libs] )
+DESCRIPTION=An enhanced, drop-in replacement for MySQL from the Percona team
+EAPI=6
+HOMEPAGE=http://www.percona.com/software/percona-server
+IUSE=numa pam tokudb tokudb-backup-plugin 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 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux
+LICENSE=GPL-2
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[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(-)?,static-libs=]
+RDEPEND=numa? ( sys-process/numactl:= ) server? ( pam? ( virtual/pam:0= ) ) tokudb? ( app-arch/snappy ) tokudb-backup-plugin? ( dev-util/valgrind ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
+REQUIRED_USE=tokudb-backup-plugin? ( tokudb ) tokudb? ( jemalloc !tcmalloc ) ^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
+RESTRICT=libressl? ( test )
+SLOT=0/18
+SRC_URI=http://www.percona.com/redir/downloads/Percona-Server-5.6/Percona-Server-5.6.37-82.2/source/tarball/percona-server-5.6.37-82.2.tar.gz mirror://gentoo/mysql-extras-20170820-2245Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20170820-2245Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20170820-2245Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20170820-2245Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20170820-2245Z.tar.bz2
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	mysql-multilib-r1	2c06af347ab7308dd741813b1a3da8e3	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	7b6fb2fc216b101b5d97d171925a847c	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=005588e741e9d1844f3da627a61f8eb0
diff --git a/metadata/md5-cache/dev-db/redis-3.2.8-r5 b/metadata/md5-cache/dev-db/redis-3.2.8-r5
index 13bb69df59f1..0709bf444ad2 100644
--- a/metadata/md5-cache/dev-db/redis-3.2.8-r5
+++ b/metadata/md5-cache/dev-db/redis-3.2.8-r5
@@ -4,11 +4,11 @@ DESCRIPTION=A persistent caching system, key-value and data structures database
 EAPI=6
 HOMEPAGE=http://redis.io/
 IUSE=+jemalloc tcmalloc luajit test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-3.2 )
 REQUIRED_USE=?? ( tcmalloc jemalloc )
 SLOT=0
 SRC_URI=http://download.redis.io/releases/redis-3.2.8.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=e7f7054932416dbe4ed0b4cb862a950f
+_md5_=ef3a3cfe52c65eaf25c403d8d5852ee0
diff --git a/metadata/md5-cache/dev-db/redis-4.0.2-r1 b/metadata/md5-cache/dev-db/redis-4.0.2-r1
index ea3bdf030199..f756811e983b 100644
--- a/metadata/md5-cache/dev-db/redis-4.0.2-r1
+++ b/metadata/md5-cache/dev-db/redis-4.0.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A persistent caching system, key-value and data structures database
 EAPI=6
 HOMEPAGE=http://redis.io/
 IUSE=+jemalloc tcmalloc luajit test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-3.2 )
 REQUIRED_USE=?? ( tcmalloc jemalloc )
 SLOT=0
 SRC_URI=http://download.redis.io/releases/redis-4.0.2.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=911b3379f084e7b3eb94cfd2d5b00319
+_md5_=d1bcfcb0ff1c5382908ccb263f5b447a
diff --git a/metadata/md5-cache/dev-db/sqliteman-1.2.2-r4 b/metadata/md5-cache/dev-db/sqliteman-1.2.2-r4
new file mode 100644
index 000000000000..9d95efbfdc2f
--- /dev/null
+++ b/metadata/md5-cache/dev-db/sqliteman-1.2.2-r4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 >=x11-libs/qscintilla-2.9.4:=[qt5(+)] sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Powerful GUI manager for the Sqlite3 database
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/sqliteman/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 >=x11-libs/qscintilla-2.9.4:=[qt5(+)]
+SLOT=0
+SRC_URI=mirror://sourceforge/sqliteman/sqliteman-1.2.2.tar.gz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=756b796b613e36ab5d1be7f88deeb670
diff --git a/metadata/md5-cache/dev-db/sqlitestudio-3.0.7 b/metadata/md5-cache/dev-db/sqlitestudio-3.0.7
index 2da9452e5664..990e503b4584 100644
--- a/metadata/md5-cache/dev-db/sqlitestudio-3.0.7
+++ b/metadata/md5-cache/dev-db/sqlitestudio-3.0.7
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:3 >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-qt/designer-5.7.1:5 cups? ( >=dev-qt/qtprintsupport-5.7.1:5 ) cli? ( sys-libs/readline:= ) tcl? ( dev-lang/tcl:= )
 SLOT=0
 SRC_URI=http://sqlitestudio.pl/files/sqlitestudio3/complete/tar/sqlitestudio-3.0.7.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fc2f77dbbe74577381921ae89a30e315
diff --git a/metadata/md5-cache/dev-embedded/gputils-1.5.0 b/metadata/md5-cache/dev-embedded/gputils-1.5.0
index 8b235d8b5380..c0fb081f0b47 100644
--- a/metadata/md5-cache/dev-embedded/gputils-1.5.0
+++ b/metadata/md5-cache/dev-embedded/gputils-1.5.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Tools including assembler, linker and librarian for PIC microcontrollers
 EAPI=6
 HOMEPAGE=https://gputils.sourceforge.io
-KEYWORDS=~amd64 ppc ppc64 ~x86
+KEYWORDS=~amd64 ppc ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/gputils/gputils-1.5.0.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=32b380e4e1901ae563daaf18e92323aa
+_md5_=2047643efb24f36b2923a9e632ea31df
diff --git a/metadata/md5-cache/dev-erlang/cache_tab-1.0.7 b/metadata/md5-cache/dev-erlang/cache_tab-1.0.7
index b517ef4c6a36..7d647c06c05e 100644
--- a/metadata/md5-cache/dev-erlang/cache_tab-1.0.7
+++ b/metadata/md5-cache/dev-erlang/cache_tab-1.0.7
@@ -3,10 +3,10 @@ DEPEND=>=dev-erlang/p1_utils-1.0.7 >=dev-lang/erlang-17.1 dev-lang/erlang dev-ut
 DESCRIPTION=In-memory cache Erlang and Elixir library
 EAPI=6
 HOMEPAGE=https://github.com/processone/cache_tab
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-erlang/p1_utils-1.0.7 >=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/cache_tab/archive/1.0.7.tar.gz -> cache_tab-1.0.7.tar.gz
 _eclasses_=rebar	f135c419c43bc8841cd57d1d53ed1da8
-_md5_=5dcfc3c4b765e64ca7040a5fec302ea9
+_md5_=d465a56919eaad4c714394155848adcc
diff --git a/metadata/md5-cache/dev-erlang/esip-1.0.11 b/metadata/md5-cache/dev-erlang/esip-1.0.11
index 24960ef7c698..50c9a3b75743 100644
--- a/metadata/md5-cache/dev-erlang/esip-1.0.11
+++ b/metadata/md5-cache/dev-erlang/esip-1.0.11
@@ -3,10 +3,10 @@ DEPEND=>=dev-erlang/fast_tls-1.0.11 >=dev-erlang/stun-1.0.10 >=dev-erlang/p1_uti
 DESCRIPTION=ProcessOne SIP server component
 EAPI=6
 HOMEPAGE=https://github.com/processone/esip
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-erlang/fast_tls-1.0.11 >=dev-erlang/stun-1.0.10 >=dev-erlang/p1_utils-1.0.7 >=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/esip/archive/1.0.11.tar.gz -> esip-1.0.11.tar.gz
 _eclasses_=rebar	f135c419c43bc8841cd57d1d53ed1da8
-_md5_=d018e7aa59c9b92f2decc759f87fb3f8
+_md5_=6a699f62ee60b9178946d7caa7fc3835
diff --git a/metadata/md5-cache/dev-erlang/ezlib-1.0.2 b/metadata/md5-cache/dev-erlang/ezlib-1.0.2
index 92d989578483..c1886eef2628 100644
--- a/metadata/md5-cache/dev-erlang/ezlib-1.0.2
+++ b/metadata/md5-cache/dev-erlang/ezlib-1.0.2
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/erlang-17.1 sys-libs/zlib dev-lang/erlang dev-util/rebar >=sys
 DESCRIPTION=Native zlib driver for Erlang and Elixir
 EAPI=6
 HOMEPAGE=https://github.com/processone/ezlib
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/erlang-17.1 sys-libs/zlib dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/ezlib/archive/1.0.2.tar.gz -> ezlib-1.0.2.tar.gz
 _eclasses_=rebar	f135c419c43bc8841cd57d1d53ed1da8
-_md5_=c424123d1fc7b27bc1d3a0eb973fefeb
+_md5_=559827cbb5b7e9661ecf7412d4c99268
diff --git a/metadata/md5-cache/dev-erlang/fast_tls-1.0.11 b/metadata/md5-cache/dev-erlang/fast_tls-1.0.11
index ac938421c190..294b0ca2e0ee 100644
--- a/metadata/md5-cache/dev-erlang/fast_tls-1.0.11
+++ b/metadata/md5-cache/dev-erlang/fast_tls-1.0.11
@@ -4,10 +4,10 @@ DESCRIPTION=TLS/SSL native driver for Erlang and Elixir
 EAPI=6
 HOMEPAGE=https://github.com/processone/fast_tls
 IUSE=libressl
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-erlang/p1_utils-1.0.7 >=dev-lang/erlang-17.1 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/fast_tls/archive/1.0.11.tar.gz -> fast_tls-1.0.11.tar.gz
 _eclasses_=rebar	f135c419c43bc8841cd57d1d53ed1da8
-_md5_=6ca0dacac6233e1236a81cfca6dfd917
+_md5_=84b9926b3e83a41bb55d72a74193d29a
diff --git a/metadata/md5-cache/dev-erlang/fast_xml-1.1.22 b/metadata/md5-cache/dev-erlang/fast_xml-1.1.22
index b241620e0998..a25e7be5e987 100644
--- a/metadata/md5-cache/dev-erlang/fast_xml-1.1.22
+++ b/metadata/md5-cache/dev-erlang/fast_xml-1.1.22
@@ -4,10 +4,10 @@ DESCRIPTION=Fast Expat based Erlang XML parsing library
 EAPI=6
 HOMEPAGE=https://github.com/processone/fast_xml
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-erlang/p1_utils-1.0.7 >=dev-lang/erlang-17.1 dev-libs/expat dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/fast_xml/archive/1.1.22.tar.gz -> fast_xml-1.1.22.tar.gz
 _eclasses_=rebar	f135c419c43bc8841cd57d1d53ed1da8
-_md5_=d4fa83496133c640eb142e8ffe166377
+_md5_=f74bf9b9881f8804e26d0f9fa0156e7a
diff --git a/metadata/md5-cache/dev-erlang/fast_yaml-1.0.9 b/metadata/md5-cache/dev-erlang/fast_yaml-1.0.9
index 00622e1628a0..93dd19f00062 100644
--- a/metadata/md5-cache/dev-erlang/fast_yaml-1.0.9
+++ b/metadata/md5-cache/dev-erlang/fast_yaml-1.0.9
@@ -3,10 +3,10 @@ DEPEND=>=dev-erlang/p1_utils-1.0.7 >=dev-lang/erlang-17.1 dev-libs/libyaml dev-l
 DESCRIPTION=Fast Yaml native library for Erlang and Elixir
 EAPI=6
 HOMEPAGE=https://github.com/processone/fast_yaml
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-erlang/p1_utils-1.0.7 >=dev-lang/erlang-17.1 dev-libs/libyaml dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/fast_yaml/archive/1.0.9.tar.gz -> fast_yaml-1.0.9.tar.gz
 _eclasses_=rebar	f135c419c43bc8841cd57d1d53ed1da8
-_md5_=7eb19bd93a7b2de7746bec9c16a03f87
+_md5_=ad7217f090f0e7577a98453f5ca300c6
diff --git a/metadata/md5-cache/dev-erlang/goldrush-0.1.9 b/metadata/md5-cache/dev-erlang/goldrush-0.1.9
index 4d05c162e717..f8c4980c7fb9 100644
--- a/metadata/md5-cache/dev-erlang/goldrush-0.1.9
+++ b/metadata/md5-cache/dev-erlang/goldrush-0.1.9
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
 DESCRIPTION=Small Erlang app that provides fast event stream processing
 EAPI=6
 HOMEPAGE=https://github.com/DeadZen/goldrush
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/DeadZen/goldrush/archive/0.1.9.tar.gz -> goldrush-0.1.9.tar.gz
 _eclasses_=rebar	f135c419c43bc8841cd57d1d53ed1da8
-_md5_=0bedad27c8327f18f9d504a37d8f113a
+_md5_=c9b67e3a9b2da92bd231ba004fc066e7
diff --git a/metadata/md5-cache/dev-erlang/iconv-1.0.4 b/metadata/md5-cache/dev-erlang/iconv-1.0.4
index 15267ad63e64..5915b99c1643 100644
--- a/metadata/md5-cache/dev-erlang/iconv-1.0.4
+++ b/metadata/md5-cache/dev-erlang/iconv-1.0.4
@@ -3,10 +3,10 @@ DEPEND=>=dev-erlang/p1_utils-1.0.7 >=dev-lang/erlang-17.1 virtual/libiconv dev-l
 DESCRIPTION=Fast encoding conversion library for Erlang and Elixir
 EAPI=6
 HOMEPAGE=https://github.com/processone/iconv
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-erlang/p1_utils-1.0.7 >=dev-lang/erlang-17.1 virtual/libiconv dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/iconv/archive/1.0.4.tar.gz -> iconv-1.0.4.tar.gz
 _eclasses_=rebar	f135c419c43bc8841cd57d1d53ed1da8
-_md5_=d440b3ebc8437260b5bc8bf15ab6cd81
+_md5_=38a23c59e32059329b6dece235fac3f7
diff --git a/metadata/md5-cache/dev-erlang/jiffy-0.14.9 b/metadata/md5-cache/dev-erlang/jiffy-0.14.9
index 50bfc7e264d8..1be2e159be90 100644
--- a/metadata/md5-cache/dev-erlang/jiffy-0.14.9
+++ b/metadata/md5-cache/dev-erlang/jiffy-0.14.9
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
 DESCRIPTION=JSON NIFs for Erlang
 EAPI=6
 HOMEPAGE=https://github.com/davisp/jiffy
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=MIT BSD
 RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/davisp/jiffy/archive/0.14.9.tar.gz -> jiffy-0.14.9.tar.gz
 _eclasses_=rebar	f135c419c43bc8841cd57d1d53ed1da8
-_md5_=586010ad9b0a0dfca6a7c710a46e248f
+_md5_=b203b246067beda3dd2ba2bb2e3a2976
diff --git a/metadata/md5-cache/dev-erlang/lager-3.2.4 b/metadata/md5-cache/dev-erlang/lager-3.2.4
index 4bae0aa4a73d..a102460b2418 100644
--- a/metadata/md5-cache/dev-erlang/lager-3.2.4
+++ b/metadata/md5-cache/dev-erlang/lager-3.2.4
@@ -3,10 +3,10 @@ DEPEND=>=dev-erlang/goldrush-0.1.9 >=dev-lang/erlang-17.1 dev-lang/erlang dev-ut
 DESCRIPTION=Logging framework for Erlang/OTP
 EAPI=6
 HOMEPAGE=https://github.com/basho/lager
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-erlang/goldrush-0.1.9 >=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/basho/lager/archive/3.2.4.tar.gz -> lager-3.2.4.tar.gz
 _eclasses_=rebar	f135c419c43bc8841cd57d1d53ed1da8
-_md5_=48cb23d1567f17379097c75c0ec97c79
+_md5_=652feef9392cec8ee9787ee0227d6934
diff --git a/metadata/md5-cache/dev-erlang/p1_mysql-1.0.2 b/metadata/md5-cache/dev-erlang/p1_mysql-1.0.2
index b384f743fe82..79e367e05b39 100644
--- a/metadata/md5-cache/dev-erlang/p1_mysql-1.0.2
+++ b/metadata/md5-cache/dev-erlang/p1_mysql-1.0.2
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
 DESCRIPTION=Pure Erlang MySQL driver
 EAPI=6
 HOMEPAGE=https://github.com/processone/p1_mysql
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/p1_mysql/archive/1.0.2.tar.gz -> p1_mysql-1.0.2.tar.gz
 _eclasses_=rebar	f135c419c43bc8841cd57d1d53ed1da8
-_md5_=19ea8788288fddbe8f1f4a6666555eae
+_md5_=cfc874eea426b788d271e39b23c57e4c
diff --git a/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.2 b/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.2
index 191b3d2e5ccc..06dcb2aa30b7 100644
--- a/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.2
+++ b/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.2
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
 DESCRIPTION=Pure Erlang PostgreSQL driver
 EAPI=6
 HOMEPAGE=https://github.com/processone/p1_pgsql
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=ErlPL-1.1
 RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/p1_pgsql/archive/1.1.2.tar.gz -> p1_pgsql-1.1.2.tar.gz
 _eclasses_=rebar	f135c419c43bc8841cd57d1d53ed1da8
-_md5_=ac87f6f6fb030cb8f2330e8c678ffc22
+_md5_=0aca54566d3cc09ffee4af08c928d153
diff --git a/metadata/md5-cache/dev-erlang/p1_utils-1.0.7 b/metadata/md5-cache/dev-erlang/p1_utils-1.0.7
index a1d406e77c73..07f05aa16741 100644
--- a/metadata/md5-cache/dev-erlang/p1_utils-1.0.7
+++ b/metadata/md5-cache/dev-erlang/p1_utils-1.0.7
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
 DESCRIPTION=Erlang utility modules from ProcessOne
 EAPI=6
 HOMEPAGE=https://github.com/processone/p1_utils
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/p1_utils/archive/1.0.7.tar.gz -> p1_utils-1.0.7.tar.gz
 _eclasses_=rebar	f135c419c43bc8841cd57d1d53ed1da8
-_md5_=8e90d0d1cff197239b38bdc8bd5bb915
+_md5_=59ec9a2a8cfa38da421ff166d6a006f1
diff --git a/metadata/md5-cache/dev-erlang/riak_pb-2.2.0.2 b/metadata/md5-cache/dev-erlang/riak_pb-2.2.0.2
index af2c9ef883cd..a9340620d8a5 100644
--- a/metadata/md5-cache/dev-erlang/riak_pb-2.2.0.2
+++ b/metadata/md5-cache/dev-erlang/riak_pb-2.2.0.2
@@ -3,10 +3,10 @@ DEPEND=>=dev-erlang/protobuffs-0.9.0 >=dev-erlang/hamcrest-0.1.0_p20160709 >=dev
 DESCRIPTION=Riak Protocol Buffers messages
 EAPI=6
 HOMEPAGE=https://github.com/basho/riak_pb
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-erlang/protobuffs-0.9.0 >=dev-erlang/hamcrest-0.1.0_p20160709 >=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/basho/riak_pb/archive/2.2.0.2.tar.gz -> riak_pb-2.2.0.2.tar.gz
 _eclasses_=rebar	f135c419c43bc8841cd57d1d53ed1da8
-_md5_=4c90bdd425633eff33d6977065729e32
+_md5_=38195424742adf138aa1496fa7292ce0
diff --git a/metadata/md5-cache/dev-erlang/stringprep-1.0.8 b/metadata/md5-cache/dev-erlang/stringprep-1.0.8
index 9d43eb84f22f..30e9f8dc2154 100644
--- a/metadata/md5-cache/dev-erlang/stringprep-1.0.8
+++ b/metadata/md5-cache/dev-erlang/stringprep-1.0.8
@@ -3,10 +3,10 @@ DEPEND=>=dev-erlang/p1_utils-1.0.7 >=dev-lang/erlang-17.1 dev-lang/erlang dev-ut
 DESCRIPTION=Fast Stringprep implementation for Erlang and Elixir
 EAPI=6
 HOMEPAGE=https://github.com/processone/stringprep
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=Apache-2.0 tcltk
 RDEPEND=>=dev-erlang/p1_utils-1.0.7 >=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/stringprep/archive/1.0.8.tar.gz -> stringprep-1.0.8.tar.gz
 _eclasses_=rebar	f135c419c43bc8841cd57d1d53ed1da8
-_md5_=cc8a55032d428cf8d6717e01da5e4f58
+_md5_=b7c7a926b92e70ceb40928e242118954
diff --git a/metadata/md5-cache/dev-erlang/stun-1.0.10 b/metadata/md5-cache/dev-erlang/stun-1.0.10
index 82d7f4b3ed80..c97ccae5cadc 100644
--- a/metadata/md5-cache/dev-erlang/stun-1.0.10
+++ b/metadata/md5-cache/dev-erlang/stun-1.0.10
@@ -3,10 +3,10 @@ DEPEND=>=dev-erlang/fast_tls-1.0.11 >=dev-erlang/p1_utils-1.0.7 >=dev-lang/erlan
 DESCRIPTION=STUN and TURN library for Erlang and Elixir
 EAPI=6
 HOMEPAGE=https://github.com/processone/stun
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-erlang/fast_tls-1.0.11 >=dev-erlang/p1_utils-1.0.7 >=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/stun/archive/1.0.10.tar.gz -> stun-1.0.10.tar.gz
 _eclasses_=rebar	f135c419c43bc8841cd57d1d53ed1da8
-_md5_=97b77e36fab78c3d8b604103c24a5cec
+_md5_=f2a0253d2cbae3b63a69eb39a5ed51eb
diff --git a/metadata/md5-cache/dev-erlang/xmpp-1.1.9 b/metadata/md5-cache/dev-erlang/xmpp-1.1.9
index 75e4b19a60d9..e917912198ed 100644
--- a/metadata/md5-cache/dev-erlang/xmpp-1.1.9
+++ b/metadata/md5-cache/dev-erlang/xmpp-1.1.9
@@ -4,10 +4,10 @@ DESCRIPTION=XMPP parsing and serialization library on top of Fast XML
 EAPI=6
 HOMEPAGE=https://github.com/processone/xmpp
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-erlang/fast_xml-1.1.22 >=dev-erlang/stringprep-1.0.8 >=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/xmpp/archive/1.1.9.tar.gz -> xmpp-1.1.9.tar.gz
 _eclasses_=rebar	f135c419c43bc8841cd57d1d53ed1da8
-_md5_=8c824c1338842e861e8fdca891537136
+_md5_=155ffce9b67e897ae4f166ffd079e60c
diff --git a/metadata/md5-cache/dev-java/batik-1.8-r3 b/metadata/md5-cache/dev-java/batik-1.8-r3
deleted file mode 100644
index f2d1ee3ade4d..000000000000
--- a/metadata/md5-cache/dev-java/batik-1.8-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/xalan:0 dev-java/rhino:1.6 dev-java/xml-commons-external:1.3 dev-java/xmlgraphics-commons:2 python? ( dev-java/jython:2.7 ) tcl? ( dev-java/jacl:0 ) dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java based SVG toolkit
-EAPI=5
-HOMEPAGE=https://xmlgraphics.apache.org/batik/
-IUSE=doc python tcl elibc_FreeBSD doc elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/xalan:0 dev-java/rhino:1.6 dev-java/xml-commons-external:1.3 dev-java/xmlgraphics-commons:2 python? ( dev-java/jython:2.7 ) tcl? ( dev-java/jacl:0 ) dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3
-SLOT=1.8
-SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/batik/source/batik-src-1.8.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1f5ce4c48d793d396071ed36bd07cf49
diff --git a/metadata/md5-cache/dev-java/batik-1.9 b/metadata/md5-cache/dev-java/batik-1.9
index 98a4ca2eed02..3bd5cac21e95 100644
--- a/metadata/md5-cache/dev-java/batik-1.9
+++ b/metadata/md5-cache/dev-java/batik-1.9
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 tcl? ( dev-java/jacl:0 ) python? ( dev-java/jython:2.7 ) dev-java/xalan:0 dev-java/rhino:1.6 dev-java/ant-core:0 dev-java/xmlgraphics-commons:2 dev-java/xml-commons-external:1.3 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=tcl? ( dev-java/jacl:0 ) python? ( dev-java/jython:2.7 ) dev-java/xalan:0 dev-java/rhino:1.6 dev-java/ant-core:0 dev-java/xmlgraphics-commons:2 dev-java/xml-commons-external:1.3 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
 DESCRIPTION=Java based SVG toolkit
 EAPI=5
 HOMEPAGE=https://xmlgraphics.apache.org/batik/
 IUSE=doc python tcl elibc_FreeBSD doc elibc_FreeBSD
-KEYWORDS=~amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 tcl? ( dev-java/jacl:0 ) python? ( dev-java/jython:2.7 ) dev-java/xalan:0 dev-java/rhino:1.6 dev-java/ant-core:0 dev-java/xmlgraphics-commons:2 dev-java/xml-commons-external:1.3 >=dev-java/java-config-2.2.0-r3
+RDEPEND=tcl? ( dev-java/jacl:0 ) python? ( dev-java/jython:2.7 ) dev-java/xalan:0 dev-java/rhino:1.6 dev-java/ant-core:0 dev-java/xmlgraphics-commons:2 dev-java/xml-commons-external:1.3 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=1.9
 SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/batik/source/batik-src-1.9.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=40dd634f80a5e187ee3345570fa562a0
+_md5_=cceae751da77eeab869f4e182d420f5b
diff --git a/metadata/md5-cache/dev-java/fop-2.0-r2 b/metadata/md5-cache/dev-java/fop-2.0-r2
deleted file mode 100644
index 8e71157c4887..000000000000
--- a/metadata/md5-cache/dev-java/fop-2.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip dev-java/batik:1.8 dev-java/ant-core:0 dev-java/fontbox:1.7 dev-java/commons-io:1 dev-java/commons-logging:0 java-virtuals/servlet-api:3.0 dev-java/avalon-framework:4.2 dev-java/xmlgraphics-commons:2 dev-java/xml-commons-external:1.3 dev-java/qdox:1.12 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Formatting Objects Processor is a print formatter driven by XSL
-EAPI=5
-HOMEPAGE=http://xmlgraphics.apache.org/fop/
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/batik:1.8 dev-java/ant-core:0 dev-java/fontbox:1.7 dev-java/commons-io:1 dev-java/commons-logging:0 java-virtuals/servlet-api:3.0 dev-java/avalon-framework:4.2 dev-java/xmlgraphics-commons:2 dev-java/xml-commons-external:1.3 dev-java/qdox:1.12 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://apache/xmlgraphics/fop/source/fop-2.0-src.zip
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=28c6eef0841c0552cc81e49c8d60ea7d
diff --git a/metadata/md5-cache/dev-java/fop-2.0-r3 b/metadata/md5-cache/dev-java/fop-2.0-r3
new file mode 100644
index 000000000000..030cd4503e6a
--- /dev/null
+++ b/metadata/md5-cache/dev-java/fop-2.0-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 app-arch/unzip dev-java/batik:1.9 dev-java/ant-core:0 dev-java/fontbox:1.7 dev-java/commons-io:1 dev-java/commons-logging:0 java-virtuals/servlet-api:3.0 dev-java/avalon-framework:4.2 dev-java/xmlgraphics-commons:2 dev-java/xml-commons-external:1.3 dev-java/qdox:1.12 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Formatting Objects Processor is a print formatter driven by XSL
+EAPI=5
+HOMEPAGE=https://xmlgraphics.apache.org/fop/
+IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
+KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.6 dev-java/batik:1.9 dev-java/ant-core:0 dev-java/fontbox:1.7 dev-java/commons-io:1 dev-java/commons-logging:0 java-virtuals/servlet-api:3.0 dev-java/avalon-framework:4.2 dev-java/xmlgraphics-commons:2 dev-java/xml-commons-external:1.3 dev-java/qdox:1.12 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://apache/xmlgraphics/fop/source/fop-2.0-src.zip
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=2d8c5d4af67dab37645f415b73285bfe
diff --git a/metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.144 b/metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.144
deleted file mode 100644
index 6ed06f04ed1f..000000000000
--- a/metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.144
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch
-DEPEND=app-arch/unzip
-DESCRIPTION=Oracle's documentation bundle (including API) for Java SE
-EAPI=6
-HOMEPAGE=http://download.oracle.com/javase/8/docs/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=oracle-java-documentation-8
-RESTRICT=fetch
-SLOT=1.8
-SRC_URI=jdk-8u144-docs-all.zip
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=3b2283fc4a3c20e9ebac1bce45d6edc4
diff --git a/metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.152 b/metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.152
new file mode 100644
index 000000000000..5ecb2a70604f
--- /dev/null
+++ b/metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.152
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch
+DEPEND=app-arch/unzip
+DESCRIPTION=Oracle's documentation bundle (including API) for Java SE
+EAPI=6
+HOMEPAGE=http://download.oracle.com/javase/8/docs/
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
+LICENSE=oracle-java-documentation-8
+RESTRICT=fetch
+SLOT=1.8
+SRC_URI=jdk-8u152-docs-all.zip
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3b2283fc4a3c20e9ebac1bce45d6edc4
diff --git a/metadata/md5-cache/dev-java/jython-2.7.0 b/metadata/md5-cache/dev-java/jython-2.7.0
deleted file mode 100644
index 49d6e4adc151..000000000000
--- a/metadata/md5-cache/dev-java/jython-2.7.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-java/ant-core:0 dev-java/antlr:3 dev-java/netty-transport:0 =dev-java/asm-5.0.3:4 dev-java/commons-compress:0 dev-java/guava:13 >=dev-java/java-config-2.1.11-r3 dev-java/jffi:1.2 dev-java/jline:2 dev-java/icu4j:52 dev-java/jnr-constants:0 dev-java/jnr-posix:3.0 dev-java/jnr-netdb:1.0 dev-java/stringtemplate:0 dev-java/xerces:2 java-virtuals/script-api:0 java-virtuals/servlet-api:3.0 readline? ( >=dev-java/libreadline-java-0.8.0:0 ) >=virtual/jdk-1.7 app-arch/unzip test? ( dev-java/junit:4 dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=An implementation of Python written in Java
-EAPI=5
-HOMEPAGE=http://www.jython.org
-IUSE=+readline test elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=PSF-2
-RDEPEND=dev-java/ant-core:0 dev-java/antlr:3 dev-java/netty-transport:0 =dev-java/asm-5.0.3:4 dev-java/commons-compress:0 dev-java/guava:13 >=dev-java/java-config-2.1.11-r3 dev-java/jffi:1.2 dev-java/jline:2 dev-java/icu4j:52 dev-java/jnr-constants:0 dev-java/jnr-posix:3.0 dev-java/jnr-netdb:1.0 dev-java/stringtemplate:0 dev-java/xerces:2 java-virtuals/script-api:0 java-virtuals/servlet-api:3.0 readline? ( >=dev-java/libreadline-java-0.8.0:0 ) >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-REQUIRED_USE=test? ( readline )
-RESTRICT=test
-SLOT=2.7
-SRC_URI=http://search.maven.org/remotecontent?filepath=org/python/jython/2.7.0/jython-2.7.0-sources.jar
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=627ccdd238320371b93815bba75128f1
diff --git a/metadata/md5-cache/dev-java/jython-2.7.0-r2 b/metadata/md5-cache/dev-java/jython-2.7.0-r2
index 5ee26cad8f47..b19425ed6e47 100644
--- a/metadata/md5-cache/dev-java/jython-2.7.0-r2
+++ b/metadata/md5-cache/dev-java/jython-2.7.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=An implementation of Python written in Java
 EAPI=6
 HOMEPAGE=http://www.jython.org
 IUSE=examples test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=PSF-2
 RDEPEND=dev-java/antlr:3 dev-java/netty-transport:0 >=dev-java/asm-5:4 dev-java/commons-compress:0 dev-java/guava:20 dev-java/jffi:1.2 dev-java/jline:2 dev-java/icu4j:52 dev-java/jnr-constants:0 dev-java/jnr-posix:3.0 dev-java/jnr-netdb:1.0 dev-java/stringtemplate:0 dev-java/xerces:2 java-virtuals/script-api:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=2.7
 SRC_URI=http://search.maven.org/remotecontent?filepath=org/python/jython/2.7.0/jython-2.7.0-sources.jar
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9c91003a0369a0c4f3b3cb25889adcea
+_md5_=1a4cb72bf1af61c6e0d5bbb5b792314e
diff --git a/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.144 b/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.144
deleted file mode 100644
index 9802653d14e4..000000000000
--- a/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.144
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm prepare prerm setup unpack
-DEPEND=app-arch/zip jce? ( app-arch/unzip ) examples? ( x64-macos? ( app-arch/unzip ) ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.2.0
-DESCRIPTION=Oracle's Java SE Development Kit
-EAPI=6
-HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
-IUSE=alsa commercial cups derby doc examples +fontconfig headless-awt javafx jce nsplugin selinux source visualvm
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris
-LICENSE=Oracle-BCLA-JavaSE examples? ( BSD )
-RDEPEND=!x64-macos? ( !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) javafx? ( dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/freetype:2 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXtst x11-libs/libXxf86vm x11-libs/pango virtual/opengl ) ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) doc? ( dev-java/java-sdk-docs:1.8 ) fontconfig? ( media-libs/fontconfig:1.0 ) !prefix? ( sys-libs/glibc:* ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.2.0
-REQUIRED_USE=javafx? ( alsa fontconfig )
-RESTRICT=fetch preserve-libs strip
-SLOT=1.8
-SRC_URI=amd64? ( jdk-8u144-linux-x64.tar.gz examples? ( jdk-8u144-linux-x64-demos.tar.gz ) ) arm? ( jdk-8u144-linux-arm32-vfp-hflt.tar.gz examples? ( jdk-8u144-linux-arm32-vfp-hflt-demos.tar.gz ) ) arm64? ( jdk-8u144-linux-arm64-vfp-hflt.tar.gz examples? ( jdk-8u144-linux-arm64-vfp-hflt-demos.tar.gz ) ) x86? ( jdk-8u144-linux-i586.tar.gz examples? ( jdk-8u144-linux-i586-demos.tar.gz ) ) x64-solaris? ( jdk-8u144-solaris-x64.tar.gz examples? ( jdk-8u144-solaris-amd64-demos.tar.gz ) ) sparc64-solaris? ( jdk-8u144-solaris-sparcv9.tar.gz examples? ( jdk-8u144-solaris-sparcv9-demos.tar.gz ) ) x64-macos? ( jdk-8u144-macosx-x64.dmg examples? ( jdk-8u144-macosx-x86_64-demos.zip ) ) jce? ( jce_policy-8.zip )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	java-vm-2	477ca23a49dfcd57017ee7f3bed47564	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ea06a2c1ff840e03764135304808822e
diff --git a/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.152-r1 b/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.152-r1
new file mode 100644
index 000000000000..c3269467ce12
--- /dev/null
+++ b/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.152-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install nofetch postinst postrm prepare prerm setup unpack
+DEPEND=app-arch/zip examples? ( x64-macos? ( app-arch/unzip ) ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.2.0
+DESCRIPTION=Oracle's Java SE Development Kit
+EAPI=6
+HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
+IUSE=alsa commercial cups derby doc examples +fontconfig headless-awt javafx jce nsplugin selinux source visualvm
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris
+LICENSE=Oracle-BCLA-JavaSE examples? ( BSD )
+RDEPEND=!x64-macos? ( !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) javafx? ( dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/freetype:2 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXtst x11-libs/libXxf86vm x11-libs/pango virtual/opengl ) ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) doc? ( dev-java/java-sdk-docs:1.8 ) fontconfig? ( media-libs/fontconfig:1.0 ) !prefix? ( sys-libs/glibc:* ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.2.0
+REQUIRED_USE=javafx? ( alsa fontconfig )
+RESTRICT=fetch preserve-libs strip
+SLOT=1.8
+SRC_URI=amd64? ( jdk-8u152-linux-x64.tar.gz examples? ( jdk-8u152-linux-x64-demos.tar.gz ) ) arm? ( jdk-8u152-linux-arm32-vfp-hflt.tar.gz examples? ( jdk-8u152-linux-arm32-vfp-hflt-demos.tar.gz ) ) arm64? ( jdk-8u152-linux-arm64-vfp-hflt.tar.gz examples? ( jdk-8u152-linux-arm64-vfp-hflt-demos.tar.gz ) ) x86? ( jdk-8u152-linux-i586.tar.gz examples? ( jdk-8u152-linux-i586-demos.tar.gz ) ) x64-solaris? ( jdk-8u152-solaris-x64.tar.gz examples? ( jdk-8u152-solaris-x64-demos.tar.gz ) ) sparc64-solaris? ( jdk-8u152-solaris-sparcv9.tar.gz examples? ( jdk-8u152-solaris-sparcv9-demos.tar.gz ) ) x64-macos? ( jdk-8u152-macosx-x64.dmg examples? ( jdk-8u152-macosx-x86_64-demos.zip ) )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	java-vm-2	477ca23a49dfcd57017ee7f3bed47564	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=bfeb2e5d01c1c31e24d249e9abeb21be
diff --git a/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.144 b/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.144
deleted file mode 100644
index 68ba82ea7b14..000000000000
--- a/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.144
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm prepare prerm setup unpack
-DEPEND=app-arch/zip jce? ( app-arch/unzip ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.2.0
-DESCRIPTION=Oracle's Java SE Runtime Environment
-EAPI=6
-HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
-IUSE=alsa commercial cups +fontconfig headless-awt javafx jce nsplugin selinux
-KEYWORDS=amd64 x86
-LICENSE=Oracle-BCLA-JavaSE
-RDEPEND=!x64-macos? ( !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) javafx? ( dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/freetype:2 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXtst x11-libs/libXxf86vm x11-libs/pango virtual/opengl ) ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) fontconfig? ( media-libs/fontconfig:1.0 ) !prefix? ( sys-libs/glibc:* ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.2.0
-RESTRICT=fetch preserve-libs strip
-SLOT=1.8
-SRC_URI=amd64? ( jre-8u144-linux-x64.tar.gz ) x86? ( jre-8u144-linux-i586.tar.gz ) jce? ( jce_policy-8.zip )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	java-vm-2	477ca23a49dfcd57017ee7f3bed47564	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=026269d9667a5abe9c5e6c0822800afc
diff --git a/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.152-r1 b/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.152-r1
new file mode 100644
index 000000000000..6f99be512716
--- /dev/null
+++ b/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.152-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm prepare prerm setup unpack
+DEPEND=app-arch/zip >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.2.0
+DESCRIPTION=Oracle's Java SE Runtime Environment
+EAPI=6
+HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
+IUSE=alsa commercial cups +fontconfig headless-awt javafx jce nsplugin selinux
+KEYWORDS=amd64 x86
+LICENSE=Oracle-BCLA-JavaSE
+RDEPEND=!x64-macos? ( !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) javafx? ( dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/freetype:2 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXtst x11-libs/libXxf86vm x11-libs/pango virtual/opengl ) ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) fontconfig? ( media-libs/fontconfig:1.0 ) !prefix? ( sys-libs/glibc:* ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.2.0
+RESTRICT=fetch preserve-libs strip
+SLOT=1.8
+SRC_URI=amd64? ( jre-8u152-linux-x64.tar.gz ) x86? ( jre-8u152-linux-i586.tar.gz )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	java-vm-2	477ca23a49dfcd57017ee7f3bed47564	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a55c92a8cd24a07b25e84a8d23035c08
diff --git a/metadata/md5-cache/dev-java/xp-0.5-r4 b/metadata/md5-cache/dev-java/xp-0.5-r4
new file mode 100644
index 000000000000..f38f13f8cb49
--- /dev/null
+++ b/metadata/md5-cache/dev-java/xp-0.5-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=XP is an XML 1.0 parser written in Java
+EAPI=6
+HOMEPAGE=http://www.jclark.com/xml/xp
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=ftp://ftp.jclark.com/pub/xml/xp.zip -> xp-0.5.zip
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5a643c765dbe9f2dc2dd4a724ba776c7
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2016 b/metadata/md5-cache/dev-lang/gnat-gpl-2016
index d28f29470d02..ed3b26910742 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2016
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2016
@@ -10,6 +10,6 @@ PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=!sys-devel/gcc:4.9.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 )
 RESTRICT=strip
 SLOT=4.9.4
-SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://mirrors.cdn.adacore.com/art/57399304c7a447658e0aff7f -> gnat-gpl-2016-src.tar.gz http://mirrors.cdn.adacore.com/art/573992d4c7a447658d00e1db -> gcc-4.9-gpl-2016-src.tar.gz http://mirrors.cdn.adacore.com/art/57399232c7a447658e0aff7d -> gcc-interface-4.9-gpl-2016-src.tar.gz bootstrap? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://mirrors.cdn.adacore.com/art/57399304c7a447658e0aff7f -> gnat-gpl-2016-src.tar.gz http://mirrors.cdn.adacore.com/art/573992d4c7a447658d00e1db -> gcc-4.9-gpl-2016-src.tar.gz http://mirrors.cdn.adacore.com/art/57399232c7a447658e0aff7d -> gcc-interface-4.9-gpl-2016-src.tar.gz bootstrap? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=49b24fe6e7cdafe65a2519eca1b38df6
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2017 b/metadata/md5-cache/dev-lang/gnat-gpl-2017
index e72104d51e8d..d41a2d5af30a 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2017
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2017
@@ -10,6 +10,6 @@ PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
 RDEPEND=!sys-devel/gcc:6.3.0 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0 graphite? ( >=dev-libs/isl-0.14 )
 RESTRICT=strip
 SLOT=6.3.0
-SRC_URI=mirror://gnu/gcc/gcc-6.3.0/gcc-6.3.0.tar.bz2 mirror://gentoo/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://mirrors.cdn.adacore.com/art/591adbb4c7a4473fcc4532a3 -> gnat-gpl-2017-src.tar.gz http://mirrors.cdn.adacore.com/art/591adb65c7a4473fcbb153ac -> gcc-6-gpl-2017-src.tar.gz http://mirrors.cdn.adacore.com/art/591adbc5c7a4473fcbb153ae -> gcc-interface-6-gpl-2017-src.tar.gz bootstrap? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-6.3.0/gcc-6.3.0.tar.bz2 mirror://gentoo/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://mirrors.cdn.adacore.com/art/591adbb4c7a4473fcc4532a3 -> gnat-gpl-2017-src.tar.gz http://mirrors.cdn.adacore.com/art/591adb65c7a4473fcbb153ac -> gcc-6-gpl-2017-src.tar.gz http://mirrors.cdn.adacore.com/art/591adbc5c7a4473fcbb153ae -> gcc-interface-6-gpl-2017-src.tar.gz bootstrap? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6cc8fc1195acd2a1071b776e9845e41d
diff --git a/metadata/md5-cache/dev-lang/go-1.8.3 b/metadata/md5-cache/dev-lang/go-1.8.3
deleted file mode 100644
index e00d2ac38859..000000000000
--- a/metadata/md5-cache/dev-lang/go-1.8.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install pretend test unpack
-DEPEND=gccgo? ( >=sys-devel/gcc-5[go] )
-DESCRIPTION=A concurrent garbage collected and typesafe programming language
-EAPI=6
-HOMEPAGE=https://golang.org
-IUSE=gccgo
-KEYWORDS=-* amd64 arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=!<dev-go/go-tools-0_pre20150902
-RESTRICT=test strip
-SLOT=0/1.8.3
-SRC_URI=https://storage.googleapis.com/golang/go1.8.3.src.tar.gz !gccgo? ( amd64? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz ) arm? ( https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz ) arm64? ( https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz ) ppc64? ( 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 ) s390? ( https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz ) x86? ( https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz ) amd64-fbsd? ( https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz ) x86-fbsd? ( https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz ) x64-macos? ( https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz ) x64-solaris? ( https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=e789b9a321d6ceb69b76ef96289a127f
diff --git a/metadata/md5-cache/dev-lang/go-1.9 b/metadata/md5-cache/dev-lang/go-1.9
deleted file mode 100644
index 444a6499ceff..000000000000
--- a/metadata/md5-cache/dev-lang/go-1.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install pretend test unpack
-DEPEND=gccgo? ( >=sys-devel/gcc-5[go] )
-DESCRIPTION=A concurrent garbage collected and typesafe programming language
-EAPI=6
-HOMEPAGE=https://golang.org
-IUSE=gccgo
-KEYWORDS=-* amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=!<dev-go/go-tools-0_pre20150902
-RESTRICT=test strip
-SLOT=0/1.9
-SRC_URI=https://storage.googleapis.com/golang/go1.9.src.tar.gz !gccgo? ( amd64? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz ) arm? ( https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz ) arm64? ( https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz ) ppc64? ( 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 ) s390? ( https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz ) x86? ( https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz ) amd64-fbsd? ( https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz ) x86-fbsd? ( https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz ) x64-macos? ( https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz ) x64-solaris? ( https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=5a7521f0101d4f44659e68be0d9f80ab
diff --git a/metadata/md5-cache/dev-lang/perl-5.24.3 b/metadata/md5-cache/dev-lang/perl-5.24.3
index 60d557f690cb..06cc92f64b92 100644
--- a/metadata/md5-cache/dev-lang/perl-5.24.3
+++ b/metadata/md5-cache/dev-lang/perl-5.24.3
@@ -4,11 +4,11 @@ DESCRIPTION=Larry Wall's Practical Extraction and Report Language
 EAPI=6
 HOMEPAGE=http://www.perl.org/
 IUSE=berkdb debug doc gdbm ithreads
-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+ )
 PDEPEND=>=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Path-2.130.0 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) app-arch/bzip2 sys-libs/zlib
 SLOT=0/5.24
 SRC_URI=mirror://cpan/src/5.0/perl-5.24.3.tar.xz mirror://cpan/authors/id/S/SH/SHAY/perl-5.24.3.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.24.3-patches-1/perl-5.24.3-patches-1.tar.xz mirror://gentoo/perl-5.24.3-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.24.3-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.1.7/perl-cross-1.1.7.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=7ee2ad99cf15dd76953fc9491e9d3bcd
+_md5_=c9fdd6ed08f2e0753ce07617ce05c75c
diff --git a/metadata/md5-cache/dev-lang/php-5.6.31 b/metadata/md5-cache/dev-lang/php-5.6.31
index 2041fa2229f0..4dcdd609efc3 100644
--- a/metadata/md5-cache/dev-lang/php-5.6.31
+++ b/metadata/md5-cache/dev-lang/php-5.6.31
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/libmysqlclient:= ) mysqli? ( virtual/libmysqlclient:= ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma:= ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) app-arch/xz-utils >=sys-devel/bison-3.0.1 sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=The PHP language runtime engine
 EAPI=6
-HOMEPAGE=http://php.net/
+HOMEPAGE=https://secure.php.net/
 IUSE=embed +cli cgi fpm apache2 threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
 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
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/libmysqlclient:= ) mysqli? ( virtual/libmysqlclient:= ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma:= ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) vpx? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) recode? ( !imap !mysql !mysqli !libmysqlclient ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) sharedmem? ( !threads )
 SLOT=5.6
-SRC_URI=http://php.net/distributions/php-5.6.31.tar.xz
+SRC_URI=https://secure.php.net/distributions/php-5.6.31.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=701a12b96cca71156ae9448d7b2a0daa
+_md5_=8d9e5203f08bb7835862b0f8cd725812
diff --git a/metadata/md5-cache/dev-lang/php-5.6.32 b/metadata/md5-cache/dev-lang/php-5.6.32
new file mode 100644
index 000000000000..f1fa9f2dbd93
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-5.6.32
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/libmysqlclient:= ) mysqli? ( virtual/libmysqlclient:= ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma:= ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) app-arch/xz-utils >=sys-devel/bison-3.0.1 sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=The PHP language runtime engine
+EAPI=6
+HOMEPAGE=https://secure.php.net/
+IUSE=embed +cli cgi fpm apache2 threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
+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
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/libmysqlclient:= ) mysqli? ( virtual/libmysqlclient:= ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma:= ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) vpx? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) recode? ( !imap !mysql !mysqli !libmysqlclient ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) sharedmem? ( !threads )
+SLOT=5.6
+SRC_URI=https://php.net/distributions/php-5.6.32.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9ee0aab4a4938071b3726f8850441833
diff --git a/metadata/md5-cache/dev-lang/php-7.0.23 b/metadata/md5-cache/dev-lang/php-7.0.23
index 6a0a56a65655..27a678f87405 100644
--- a/metadata/md5-cache/dev-lang/php-7.0.23
+++ b/metadata/md5-cache/dev-lang/php-7.0.23
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) app-arch/xz-utils >=sys-devel/bison-3.0.1 sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 virtual/pkgconfig
 DESCRIPTION=The PHP language runtime engine
 EAPI=6
-HOMEPAGE=http://php.net/
+HOMEPAGE=https://secure.php.net/
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sysvipc systemd tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
 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
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) sharedmem? ( !threads ) mysql? ( || ( mysqli pdo ) )
 SLOT=7.0
-SRC_URI=http://php.net/distributions/php-7.0.23.tar.xz
+SRC_URI=https://secure.php.net/distributions/php-7.0.23.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f7f13cab6a8dff276c6535b861e9ad8c
+_md5_=fa80ac126ae6d4d1c3b7e7ac90ab86ba
diff --git a/metadata/md5-cache/dev-lang/php-7.0.24 b/metadata/md5-cache/dev-lang/php-7.0.24
deleted file mode 100644
index 04b7ddb68d27..000000000000
--- a/metadata/md5-cache/dev-lang/php-7.0.24
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) app-arch/xz-utils >=sys-devel/bison-3.0.1 sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 virtual/pkgconfig
-DESCRIPTION=The PHP language runtime engine
-EAPI=6
-HOMEPAGE=http://php.net/
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sysvipc systemd tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-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
-LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) sharedmem? ( !threads ) mysql? ( || ( mysqli pdo ) )
-SLOT=7.0
-SRC_URI=http://php.net/distributions/php-7.0.24.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=657cc69b2e0dcc0f3c433e6a3a5bcacb
diff --git a/metadata/md5-cache/dev-lang/php-7.0.25 b/metadata/md5-cache/dev-lang/php-7.0.25
new file mode 100644
index 000000000000..f1242c987593
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-7.0.25
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) app-arch/xz-utils >=sys-devel/bison-3.0.1 sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 virtual/pkgconfig
+DESCRIPTION=The PHP language runtime engine
+EAPI=6
+HOMEPAGE=https://secure.php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sysvipc systemd tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
+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
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) sharedmem? ( !threads ) mysql? ( || ( mysqli pdo ) )
+SLOT=7.0
+SRC_URI=https://secure.php.net/distributions/php-7.0.25.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=18145ff25258cb0fd346c7ef9e4832e5
diff --git a/metadata/md5-cache/dev-lang/php-7.1.10 b/metadata/md5-cache/dev-lang/php-7.1.10
deleted file mode 100644
index 279492b4db6c..000000000000
--- a/metadata/md5-cache/dev-lang/php-7.1.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) app-arch/xz-utils >=sys-devel/bison-3.0.1 virtual/pkgconfig
-DESCRIPTION=The PHP language runtime engine
-EAPI=6
-HOMEPAGE=http://php.net/
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sysvipc systemd test tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-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
-LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) sharedmem? ( !threads ) mysql? ( || ( mysqli pdo ) )
-SLOT=7.1
-SRC_URI=http://php.net/distributions/php-7.1.10.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=5cf4623f91b1f37af52e5d06006f538c
diff --git a/metadata/md5-cache/dev-lang/php-7.1.11 b/metadata/md5-cache/dev-lang/php-7.1.11
new file mode 100644
index 000000000000..749c92944169
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-7.1.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) app-arch/xz-utils >=sys-devel/bison-3.0.1 virtual/pkgconfig
+DESCRIPTION=The PHP language runtime engine
+EAPI=6
+HOMEPAGE=https://secure.php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sysvipc systemd test tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
+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
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) sharedmem? ( !threads ) mysql? ( || ( mysqli pdo ) )
+SLOT=7.1
+SRC_URI=https://secure.php.net/distributions/php-7.1.11.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d6c6024c6be987d1daf013fca318a717
diff --git a/metadata/md5-cache/dev-lang/php-7.1.9 b/metadata/md5-cache/dev-lang/php-7.1.9
deleted file mode 100644
index 152474e3da6f..000000000000
--- a/metadata/md5-cache/dev-lang/php-7.1.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) app-arch/xz-utils >=sys-devel/bison-3.0.1 virtual/pkgconfig
-DESCRIPTION=The PHP language runtime engine
-EAPI=6
-HOMEPAGE=http://php.net/
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sysvipc systemd test tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-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
-LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) sharedmem? ( !threads ) mysql? ( || ( mysqli pdo ) )
-SLOT=7.1
-SRC_URI=http://php.net/distributions/php-7.1.9.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=5cf4623f91b1f37af52e5d06006f538c
diff --git a/metadata/md5-cache/dev-lang/php-7.2.0_rc2 b/metadata/md5-cache/dev-lang/php-7.2.0_rc2
deleted file mode 100644
index a7f87749819c..000000000000
--- a/metadata/md5-cache/dev-lang/php-7.2.0_rc2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2 ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib ) app-arch/xz-utils >=sys-devel/bison-3.0.1 virtual/pkgconfig
-DESCRIPTION=The PHP language runtime engine
-EAPI=6
-HOMEPAGE=http://php.net/
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib
-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
-LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2 ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) sharedmem? ( !threads ) mysql? ( || ( mysqli pdo ) ) zip-encryption? ( zip )
-SLOT=7.2
-SRC_URI=https://downloads.php.net/~pollita/php-7.2.0RC2.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9313a87017265a00b7dc2034aea35341
diff --git a/metadata/md5-cache/dev-lang/php-7.2.0_rc3 b/metadata/md5-cache/dev-lang/php-7.2.0_rc3
deleted file mode 100644
index 1fec383d30e3..000000000000
--- a/metadata/md5-cache/dev-lang/php-7.2.0_rc3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2 ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib ) app-arch/xz-utils >=sys-devel/bison-3.0.1 virtual/pkgconfig
-DESCRIPTION=The PHP language runtime engine
-EAPI=6
-HOMEPAGE=http://php.net/
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib
-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
-LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2 ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) sharedmem? ( !threads ) mysql? ( || ( mysqli pdo ) ) zip-encryption? ( zip )
-SLOT=7.2
-SRC_URI=https://downloads.php.net/~remi/php-7.2.0RC3.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=09577ae95b26cfc0e433a4ba63b89ac7
diff --git a/metadata/md5-cache/dev-lang/php-7.2.0_rc5 b/metadata/md5-cache/dev-lang/php-7.2.0_rc5
new file mode 100644
index 000000000000..31ec75943c27
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-7.2.0_rc5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2 ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib ) app-arch/xz-utils >=sys-devel/bison-3.0.1 virtual/pkgconfig
+DESCRIPTION=The PHP language runtime engine
+EAPI=6
+HOMEPAGE=https://secure.php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib
+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
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2 ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) sharedmem? ( !threads ) mysql? ( || ( mysqli pdo ) ) zip-encryption? ( zip )
+SLOT=7.2
+SRC_URI=https://downloads.php.net/~pollita/php-7.2.0RC5.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c443bc4d87fdcebe33a43cc78167d837
diff --git a/metadata/md5-cache/dev-lang/python-3.5.4 b/metadata/md5-cache/dev-lang/python-3.5.4
index 83356fade39b..3d505cf10ea9 100644
--- a/metadata/md5-cache/dev-lang/python-3.5.4
+++ b/metadata/md5-cache/dev-lang/python-3.5.4
@@ -4,11 +4,11 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=5
 HOMEPAGE=https://www.python.org/
 IUSE=build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=PSF-2
 PDEPEND=>=app-eselect/eselect-python-20140125-r1
 RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
 SLOT=3.5/3.5m
 SRC_URI=https://www.python.org/ftp/python/3.5.4/Python-3.5.4.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.5.4-0.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=6b4986833a5fd6b9db79ab00e693eccd
+_md5_=bea6aee1f1eff597b09823963c6476b8
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r5 b/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r5
index 624f649c42fa..741b30b64120 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r5
+++ b/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r5
@@ -4,7 +4,7 @@ DESCRIPTION=Stand-alone JavaScript C library
 EAPI=6
 HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
 IUSE=debug jit minimal static-libs test
-KEYWORDS=~alpha ~amd64 ~arm -hppa ia64 -mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha ~amd64 ~arm -hppa ia64 -mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=NPL-1.1
 RDEPEND=>=dev-libs/nspr-4.9.4 virtual/libffi sys-libs/readline:0= >=sys-libs/zlib-1.1.4
 REQUIRED_USE=debug? ( jit )
@@ -12,4 +12,4 @@ RESTRICT=ia64? ( test )
 SLOT=17
 SRC_URI=http://archive.mozilla.org/pub/js/mozjs17.0.0.tar.gz https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot17-patches-01.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=85eed95de2bc79ea1fb500547256acdb
+_md5_=bf2af2df67e37701a2bc6624c244ccc7
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-24.2.0-r4 b/metadata/md5-cache/dev-lang/spidermonkey-24.2.0-r4
index 87b34f1e3ab3..6b73ed0ffd70 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-24.2.0-r4
+++ b/metadata/md5-cache/dev-lang/spidermonkey-24.2.0-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Stand-alone JavaScript C library
 EAPI=6
 HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
 IUSE=debug icu jit minimal static-libs +system-icu test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha ~amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=NPL-1.1
 RDEPEND=>=dev-libs/nspr-4.9.4 virtual/libffi sys-libs/readline:0= >=sys-libs/zlib-1.1.4 system-icu? ( >=dev-libs/icu-1.51:= )
 RESTRICT=ia64? ( test )
 SLOT=24
 SRC_URI=https://archive.mozilla.org/pub/js/mozjs-24.2.0.tar.bz2 https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot24-patches-01.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2771ecb1ecbe2752f2d5e6c094c86bfa
+_md5_=b3f1745bcffdc55f9a6fb0f66e346a79
diff --git a/metadata/md5-cache/dev-libs/appstream-0.11.5 b/metadata/md5-cache/dev-libs/appstream-0.11.5
index 756a73eb26ac..5282ca50ddf4 100644
--- a/metadata/md5-cache/dev-libs/appstream-0.11.5
+++ b/metadata/md5-cache/dev-libs/appstream-0.11.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/libxml2:2 dev-libs/libyaml dev-libs/snowball-stemmer qt5? ( dev-qt/qtcore:5 )
 SLOT=0/4
 SRC_URI=https://github.com/ximion/appstream/archive/APPSTREAM_0_11_5.tar.gz -> appstream-0.11.5.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	958769e8b8b5a79afc3f22f3915cebbc	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	38757afcd8d9f0d1d44ba4cefc33b99d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f3dc3489b5964792161124aebea447c4
diff --git a/metadata/md5-cache/dev-libs/appstream-glib-0.6.13 b/metadata/md5-cache/dev-libs/appstream-glib-0.6.13
index 8f63fbb34f9d..e606db8af31c 100644
--- a/metadata/md5-cache/dev-libs/appstream-glib-0.6.13
+++ b/metadata/md5-cache/dev-libs/appstream-glib-0.6.13
@@ -4,10 +4,10 @@ DESCRIPTION=Provides GObjects and helper methods to read and write AppStream met
 EAPI=6
 HOMEPAGE=https://people.freedesktop.org/~hughsient/appstream-glib/
 IUSE=+introspection nls stemmer
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=app-arch/gcab app-arch/libarchive dev-db/sqlite:3 >=dev-libs/glib-2.45.8:2 >=dev-libs/json-glib-1.1.1 dev-libs/libyaml >=media-libs/fontconfig-2.11:1.0 >=media-libs/freetype-2.4:2 >=net-libs/libsoup-2.51.92:2.4 sys-apps/util-linux >=x11-libs/gdk-pixbuf-2.31.5:2[introspection?] x11-libs/gtk+:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.9.8:= ) stemmer? ( dev-libs/snowball-stemmer ) !<dev-util/appdata-tools-0.1.8-r1
 SLOT=0/8
 SRC_URI=https://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-0.6.13.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=99ab63f15cc477ce54eea2f0893d1273
+_md5_=29acb7241d89cb385334e672431d21d4
diff --git a/metadata/md5-cache/dev-libs/apr-1.6.3 b/metadata/md5-cache/dev-libs/apr-1.6.3
new file mode 100644
index 000000000000..ec444cc4c80d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/apr-1.6.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) >=sys-devel/libtool-2.4.2 doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Apache Portable Runtime Library
+EAPI=6
+HOMEPAGE=https://apr.apache.org/
+IUSE=doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) selinux? ( sec-policy/selinux-apache )
+SLOT=1
+SRC_URI=mirror://apache/apr/apr-1.6.3.tar.bz2
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=9c149007d25918575f3dad41b5bd6eef
diff --git a/metadata/md5-cache/dev-libs/apr-util-1.5.4-r1 b/metadata/md5-cache/dev-libs/apr-util-1.5.4-r1
deleted file mode 100644
index 3aa839cfa9a5..000000000000
--- a/metadata/md5-cache/dev-libs/apr-util-1.5.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/expat >=dev-libs/apr-1.4.6:1 berkdb? ( >=sys-libs/db-4 ) freetds? ( dev-db/freetds ) gdbm? ( sys-libs/gdbm ) ldap? ( =net-nds/openldap-2* ) mysql? ( =virtual/mysql-5* ) nss? ( dev-libs/nss ) odbc? ( dev-db/unixODBC ) openssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) postgres? ( dev-db/postgresql ) sqlite? ( dev-db/sqlite:3 ) >=sys-devel/libtool-2.4.2 doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Apache Portable Runtime Utility Library
-EAPI=4
-HOMEPAGE=http://apr.apache.org/
-IUSE=berkdb doc freetds gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/expat >=dev-libs/apr-1.4.6:1 berkdb? ( >=sys-libs/db-4 ) freetds? ( dev-db/freetds ) gdbm? ( sys-libs/gdbm ) ldap? ( =net-nds/openldap-2* ) mysql? ( =virtual/mysql-5* ) nss? ( dev-libs/nss ) odbc? ( dev-db/unixODBC ) openssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) postgres? ( dev-db/postgresql ) sqlite? ( dev-db/sqlite:3 )
-SLOT=1
-SRC_URI=mirror://apache/apr/apr-util-1.5.4.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db-use	582140d1a711279e50ce284fc7b609f5	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=3948ecdc971923990ffec729b258474e
diff --git a/metadata/md5-cache/dev-libs/apr-util-1.6.1 b/metadata/md5-cache/dev-libs/apr-util-1.6.1
new file mode 100644
index 000000000000..b63f013c2528
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/apr-util-1.6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-libs/expat >=dev-libs/apr-1.6.2:1 berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) ldap? ( =net-nds/openldap-2* ) mysql? ( =virtual/mysql-5* ) nss? ( dev-libs/nss ) odbc? ( dev-db/unixODBC ) openssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 ) >=sys-devel/libtool-2.4.2 doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Apache Portable Runtime Utility Library
+EAPI=6
+HOMEPAGE=http://apr.apache.org/
+IUSE=berkdb doc gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/expat >=dev-libs/apr-1.6.2:1 berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) ldap? ( =net-nds/openldap-2* ) mysql? ( =virtual/mysql-5* ) nss? ( dev-libs/nss ) odbc? ( dev-db/unixODBC ) openssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
+SLOT=1
+SRC_URI=mirror://apache/apr/apr-util-1.6.1.tar.bz2
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db-use	582140d1a711279e50ce284fc7b609f5	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a4488fae0eb71c440cbd4779f9076515
diff --git a/metadata/md5-cache/dev-libs/cgicc-3.2.16 b/metadata/md5-cache/dev-libs/cgicc-3.2.16
index 31011ef9bf8f..9b4850e51335 100644
--- a/metadata/md5-cache/dev-libs/cgicc-3.2.16
+++ b/metadata/md5-cache/dev-libs/cgicc-3.2.16
@@ -4,9 +4,9 @@ DESCRIPTION=A C++ class library for writing CGI applications
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/cgicc/
 IUSE=doc examples static-libs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=LGPL-3 doc? ( FDL-1.2 )
 SLOT=0
 SRC_URI=mirror://gnu/cgicc/cgicc-3.2.16.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=9ae49eccaaf5e4f9d24b819bc7903eb4
+_md5_=33d7ab4ab4d7b4491600ac90c28c96f8
diff --git a/metadata/md5-cache/dev-libs/check-0.12.0 b/metadata/md5-cache/dev-libs/check-0.12.0
new file mode 100644
index 000000000000..2a5fffa02541
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/check-0.12.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=subunit? ( >=dev-python/subunit-0.0.10-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-apps/texinfo virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A unit test framework for C
+EAPI=6
+HOMEPAGE=https://libcheck.github.io/check/
+IUSE=static-libs subunit 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 ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=subunit? ( >=dev-python/subunit-0.0.10-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
+SRC_URI=https://github.com/libcheck/check/archive/0.12.0.tar.gz -> check-0.12.0-github.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=5372261cb19c4af1cbfcbe1028da276d
diff --git a/metadata/md5-cache/dev-libs/ffcall-2.0 b/metadata/md5-cache/dev-libs/ffcall-2.0
index 1c259f6bbe57..8313bc6f7668 100644
--- a/metadata/md5-cache/dev-libs/ffcall-2.0
+++ b/metadata/md5-cache/dev-libs/ffcall-2.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=foreign function call libraries
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libffcall/
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ia64 ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha ~amd64 ~arm64 ~hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://gnu/libffcall/libffcall-2.0.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=aa776e37ea8d5e0371e5543b3db60cc5
+_md5_=376ec37f1c2f46acbdf44ea96c7ab393
diff --git a/metadata/md5-cache/dev-libs/jansson-2.10 b/metadata/md5-cache/dev-libs/jansson-2.10
index 7c4effdccb84..4e20ab1201a2 100644
--- a/metadata/md5-cache/dev-libs/jansson-2.10
+++ b/metadata/md5-cache/dev-libs/jansson-2.10
@@ -4,9 +4,9 @@ DESCRIPTION=C library for encoding, decoding and manipulating JSON data
 EAPI=6
 HOMEPAGE=http://www.digip.org/jansson/
 IUSE=doc 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
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://www.digip.org/jansson/releases/jansson-2.10.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=c0b918c6d5b42357493da3e85af9646a
+_md5_=512235bcf4a2eec1cd7ec4bf86d3dcc7
diff --git a/metadata/md5-cache/dev-libs/kasync-0.2.0 b/metadata/md5-cache/dev-libs/kasync-0.2.0
index 915f5c67d528..9e759088a57a 100644
--- a/metadata/md5-cache/dev-libs/kasync-0.2.0
+++ b/metadata/md5-cache/dev-libs/kasync-0.2.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/unstable/kasync/0.2.0/src/kasync-0.2.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=82624b9e928c29220ad8738c147c1973
diff --git a/metadata/md5-cache/dev-libs/kdiagram-2.6.0 b/metadata/md5-cache/dev-libs/kdiagram-2.6.0
index c6bd16df6e3a..e4c8986f3cc1 100644
--- a/metadata/md5-cache/dev-libs/kdiagram-2.6.0
+++ b/metadata/md5-cache/dev-libs/kdiagram-2.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kdiagram/2.6.0/src/kdiagram-2.6.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5327e214b53fe72ec43694924f475e55
diff --git a/metadata/md5-cache/dev-libs/kproperty-3.0.2 b/metadata/md5-cache/dev-libs/kproperty-3.0.2
index d7a7b6eb172a..7045efcbb3db 100644
--- a/metadata/md5-cache/dev-libs/kproperty-3.0.2
+++ b/metadata/md5-cache/dev-libs/kproperty-3.0.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kproperty/src/kproperty-3.0.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9c2a037697dd9e17dcb6d84c762905ee
diff --git a/metadata/md5-cache/dev-libs/kreport-3.0.2 b/metadata/md5-cache/dev-libs/kreport-3.0.2
index 892885ff3917..717f324ff856 100644
--- a/metadata/md5-cache/dev-libs/kreport-3.0.2
+++ b/metadata/md5-cache/dev-libs/kreport-3.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kreport/src/kreport-3.0.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8d5682c4a2fff9377bf240fe7f30be1e
diff --git a/metadata/md5-cache/dev-libs/libatasmart-0.19-r2 b/metadata/md5-cache/dev-libs/libatasmart-0.19-r2
index fb54e94b0918..f54bc4ce25a9 100644
--- a/metadata/md5-cache/dev-libs/libatasmart-0.19-r2
+++ b/metadata/md5-cache/dev-libs/libatasmart-0.19-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A small and lightweight parser library for ATA S.M.A.R.T. hard disks
 EAPI=6
 HOMEPAGE=http://0pointer.de/blog/projects/being-smart.html
 IUSE=static-libs
-KEYWORDS=alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc ~x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=virtual/libudev:=
 SLOT=0/4
 SRC_URI=http://0pointer.de/public/libatasmart-0.19.tar.xz mirror://debian/pool/main/liba/libatasmart/libatasmart_0.19-2.debian.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=7945d98c1195b4f2c9bafbb2382d7737
+_md5_=0b4546228af5ea45932aa5c0f007caa1
diff --git a/metadata/md5-cache/dev-libs/libburn-1.4.8 b/metadata/md5-cache/dev-libs/libburn-1.4.8
deleted file mode 100644
index 98e6157ce05e..000000000000
--- a/metadata/md5-cache/dev-libs/libburn-1.4.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=cdio? ( >=dev-libs/libcdio-0.83 ) virtual/pkgconfig
-DESCRIPTION=Open-source library for reading, mastering and writing optical discs
-EAPI=6
-HOMEPAGE=https://dev.lovelyhq.com/libburnia/web/wikis/home
-IUSE=cdio debug static-libs track-src-odirect
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=cdio? ( >=dev-libs/libcdio-0.83 )
-SLOT=0
-SRC_URI=http://files.libburnia-project.org/releases/libburn-1.4.8.tar.gz
-_md5_=4d6ee8ec11f4530f2569f144692cbd91
diff --git a/metadata/md5-cache/dev-libs/libburn-1.4.8-r1 b/metadata/md5-cache/dev-libs/libburn-1.4.8-r1
new file mode 100644
index 000000000000..f273771c07ee
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libburn-1.4.8-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Open-source library for reading, mastering and writing optical discs
+EAPI=6
+HOMEPAGE=https://dev.lovelyhq.com/libburnia/web/wikis/home
+IUSE=debug static-libs track-src-odirect
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://files.libburnia-project.org/releases/libburn-1.4.8.tar.gz
+_md5_=95e531d59c325970e5ec35c774becec0
diff --git a/metadata/md5-cache/dev-libs/libgudev-231 b/metadata/md5-cache/dev-libs/libgudev-231
index 8a41efcc1264..84b9182cdadd 100644
--- a/metadata/md5-cache/dev-libs/libgudev-231
+++ b/metadata/md5-cache/dev-libs/libgudev-231
@@ -4,11 +4,11 @@ DESCRIPTION=GObject bindings for libudev
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/libgudev
 IUSE=introspection static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.30.0: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(-)?,static-libs?] >=virtual/libudev-199:=[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(-)?,static-libs?] introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) !sys-fs/eudev[gudev(-)] !sys-fs/udev[gudev(-)] !sys-apps/systemd[gudev(-)]
 RESTRICT=test
 SLOT=0/0
 SRC_URI=mirror://gnome/sources/libgudev/231/libgudev-231.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5cbe19574e93d96bf2d9aacfead828d7
+_md5_=2f88995eaa8f4f70c2da98e21f8eb95e
diff --git a/metadata/md5-cache/dev-libs/libinput-1.7.3 b/metadata/md5-cache/dev-libs/libinput-1.7.3
index 0d42d204d82e..5f40d3becd6c 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.7.3
+++ b/metadata/md5-cache/dev-libs/libinput-1.7.3
@@ -4,11 +4,11 @@ DESCRIPTION=Library to handle input devices in Wayland
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/
 IUSE=input_devices_wacom test
-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=MIT
 RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-0.4 >=sys-libs/mtdev-1.1 virtual/libudev
 RESTRICT=test
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.7.3.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=5ac26f55fe497603398eb4c9aa5fb791
+_md5_=43921b390964be46da6f371915e44918
diff --git a/metadata/md5-cache/dev-libs/libinput-1.9.0 b/metadata/md5-cache/dev-libs/libinput-1.9.0
new file mode 100644
index 000000000000..d369be205b7a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libinput-1.9.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev virtual/pkgconfig doc? ( >=app-doc/doxygen-1.8.3 >=media-gfx/graphviz-2.38.0 ) >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2 virtual/pkgconfig
+DESCRIPTION=Library to handle input devices in Wayland
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/
+IUSE=doc input_devices_wacom test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=MIT
+RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev
+RESTRICT=test
+SLOT=0/10
+SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.9.0.tar.xz
+_eclasses_=meson	38757afcd8d9f0d1d44ba4cefc33b99d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182
+_md5_=4b877ddf6042dd634f26b54a37292920
diff --git a/metadata/md5-cache/dev-libs/libisoburn-1.4.8 b/metadata/md5-cache/dev-libs/libisoburn-1.4.8
deleted file mode 100644
index 544dad0bc13d..000000000000
--- a/metadata/md5-cache/dev-libs/libisoburn-1.4.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/libburn-1.4.8 >=dev-libs/libisofs-1.4.8 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) acl? ( virtual/acl ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) cdio? ( >=dev-libs/libcdio-0.83 ) launch-frontend? ( dev-lang/tcl:0 dev-lang/tk:0 ) launch-frontend-setuid? ( dev-lang/tcl:0 dev-lang/tk:0 ) frontend-optional? ( dev-tcltk/bwidget ) virtual/pkgconfig
-DESCRIPTION=Creation/expansion of ISO-9660 filesystems on CD/DVD media supported by libburn
-EAPI=6
-HOMEPAGE=https://dev.lovelyhq.com/libburnia/web/wikis/home
-IUSE=acl cdio debug external-filters external-filters-setuid frontend-optional launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 GPL-3
-RDEPEND=>=dev-libs/libburn-1.4.8 >=dev-libs/libisofs-1.4.8 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) acl? ( virtual/acl ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) cdio? ( >=dev-libs/libcdio-0.83 ) launch-frontend? ( dev-lang/tcl:0 dev-lang/tk:0 ) launch-frontend-setuid? ( dev-lang/tcl:0 dev-lang/tk:0 ) frontend-optional? ( dev-tcltk/bwidget )
-REQUIRED_USE=frontend-optional? ( || ( launch-frontend launch-frontend-setuid ) )
-SLOT=0
-SRC_URI=http://files.libburnia-project.org/releases/libisoburn-1.4.8.tar.gz
-_md5_=fc718764c2ea778b98b80720df1501c9
diff --git a/metadata/md5-cache/dev-libs/libisoburn-1.4.8-r1 b/metadata/md5-cache/dev-libs/libisoburn-1.4.8-r1
new file mode 100644
index 000000000000..64d72de7d40c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libisoburn-1.4.8-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=>=dev-libs/libburn-1.4.8 >=dev-libs/libisofs-1.4.8 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) acl? ( virtual/acl ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) launch-frontend? ( dev-lang/tcl:0 dev-lang/tk:0 ) launch-frontend-setuid? ( dev-lang/tcl:0 dev-lang/tk:0 ) frontend-optional? ( dev-tcltk/bwidget ) virtual/pkgconfig
+DESCRIPTION=Creation/expansion of ISO-9660 filesystems on CD/DVD media supported by libburn
+EAPI=6
+HOMEPAGE=https://dev.lovelyhq.com/libburnia/web/wikis/home
+IUSE=acl debug external-filters external-filters-setuid frontend-optional launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 GPL-3
+RDEPEND=>=dev-libs/libburn-1.4.8 >=dev-libs/libisofs-1.4.8 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) acl? ( virtual/acl ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) launch-frontend? ( dev-lang/tcl:0 dev-lang/tk:0 ) launch-frontend-setuid? ( dev-lang/tcl:0 dev-lang/tk:0 ) frontend-optional? ( dev-tcltk/bwidget )
+REQUIRED_USE=frontend-optional? ( || ( launch-frontend launch-frontend-setuid ) )
+SLOT=0
+SRC_URI=http://files.libburnia-project.org/releases/libisoburn-1.4.8.tar.gz
+_md5_=451c75fa814e0754760c4bf819b1c243
diff --git a/metadata/md5-cache/dev-libs/libpcre-8.41 b/metadata/md5-cache/dev-libs/libpcre-8.41
index fd538555b112..dba3c213d96a 100644
--- a/metadata/md5-cache/dev-libs/libpcre-8.41
+++ b/metadata/md5-cache/dev-libs/libpcre-8.41
@@ -4,11 +4,11 @@ DESCRIPTION=Perl-compatible regular expression library
 EAPI=5
 HOMEPAGE=http://www.pcre.org/
 IUSE=bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode 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
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline )
 SLOT=3
 SRC_URI=mirror://sourceforge/pcre/pcre-8.41.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.41.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=bde35f1dcc4a5e53f04a823647821fad
+_md5_=8837f1a33f192ea943a5b00ec666a8e9
diff --git a/metadata/md5-cache/dev-libs/libratbag-0.9 b/metadata/md5-cache/dev-libs/libratbag-0.9
index aa6f366a28e3..862ef16e0e7b 100644
--- a/metadata/md5-cache/dev-libs/libratbag-0.9
+++ b/metadata/md5-cache/dev-libs/libratbag-0.9
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libevdev virtual/libudev
 SLOT=0
 SRC_URI=https://github.com/libratbag/libratbag/archive/v0.9.tar.gz -> libratbag-0.9.tar.gz
-_eclasses_=meson	958769e8b8b5a79afc3f22f3915cebbc	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182
+_eclasses_=meson	38757afcd8d9f0d1d44ba4cefc33b99d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182
 _md5_=ffafd0d20db3a46cc3cb573de30d5c7b
diff --git a/metadata/md5-cache/dev-libs/libwacom-0.25 b/metadata/md5-cache/dev-libs/libwacom-0.25
index 03ab48006013..2e3c4df237c4 100644
--- a/metadata/md5-cache/dev-libs/libwacom-0.25
+++ b/metadata/md5-cache/dev-libs/libwacom-0.25
@@ -4,10 +4,10 @@ DESCRIPTION=Library for identifying Wacom tablets and their model-specific featu
 EAPI=6
 HOMEPAGE=http://linuxwacom.sourceforge.net/
 IUSE=doc static-libs
-KEYWORDS=alpha amd64 arm ~ia64 ~ppc ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 arm ~ia64 ppc ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/glib:2 virtual/libgudev:=
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxwacom/libwacom/libwacom-0.25.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=176b224d5ca9abd8bd501077a586946b
+_md5_=20cac65d9423db28dd43791f4e1b4f13
diff --git a/metadata/md5-cache/dev-libs/libxslt-1.1.30-r2 b/metadata/md5-cache/dev-libs/libxslt-1.1.30-r2
new file mode 100644
index 000000000000..25a0853f3c1f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libxslt-1.1.30-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libxml2-2.9.1-r5: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(-)?] crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/libxml2:2[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=XSLT libraries and tools
+EAPI=6
+HOMEPAGE=http://www.xmlsoft.org/
+IUSE=crypt debug examples python static-libs python_targets_python2_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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=dev-libs/libxml2-2.9.1-r5: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(-)?] crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/libxml2:2[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
+SLOT=0
+SRC_URI=ftp://xmlsoft.org/libxslt/libxslt-1.1.30.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=1a9ed93f83c330af8e73048bdbf0ce41
diff --git a/metadata/md5-cache/dev-libs/libzip-1.2.0 b/metadata/md5-cache/dev-libs/libzip-1.2.0
deleted file mode 100644
index cbb2f2ca78e1..000000000000
--- a/metadata/md5-cache/dev-libs/libzip-1.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/zlib elibc_musl? ( sys-libs/fts-standalone ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Library for manipulating zip archives
-EAPI=6
-HOMEPAGE=http://www.nih.at/libzip/
-IUSE=static-libs
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=BSD
-RDEPEND=sys-libs/zlib elibc_musl? ( sys-libs/fts-standalone )
-SLOT=0/5
-SRC_URI=http://www.nih.at/libzip/libzip-1.2.0.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a4963efdf36c27a6b25a2fc49b0dde80
diff --git a/metadata/md5-cache/dev-libs/libzip-1.2.0-r1 b/metadata/md5-cache/dev-libs/libzip-1.2.0-r1
deleted file mode 100644
index 2e65edb43170..000000000000
--- a/metadata/md5-cache/dev-libs/libzip-1.2.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/zlib elibc_musl? ( sys-libs/fts-standalone ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Library for manipulating zip archives
-EAPI=6
-HOMEPAGE=http://www.nih.at/libzip/
-IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=BSD
-RDEPEND=sys-libs/zlib elibc_musl? ( sys-libs/fts-standalone )
-SLOT=0/5
-SRC_URI=http://www.nih.at/libzip/libzip-1.2.0.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=bcefdd8827421991c58c83d6c7fae884
diff --git a/metadata/md5-cache/dev-libs/libzip-1.2.0-r2 b/metadata/md5-cache/dev-libs/libzip-1.2.0-r2
deleted file mode 100644
index 3bbe55ffbdad..000000000000
--- a/metadata/md5-cache/dev-libs/libzip-1.2.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/zlib elibc_musl? ( sys-libs/fts-standalone ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Library for manipulating zip archives
-EAPI=6
-HOMEPAGE=https://nih.at/libzip/
-IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=BSD
-RDEPEND=sys-libs/zlib elibc_musl? ( sys-libs/fts-standalone )
-SLOT=0/5
-SRC_URI=https://www.nih.at/libzip/libzip-1.2.0.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=9227fcc2af019cab6a14b6825a896e30
diff --git a/metadata/md5-cache/dev-libs/libzip-1.3.0 b/metadata/md5-cache/dev-libs/libzip-1.3.0
index 0b70dd2c78e2..b5d681e63180 100644
--- a/metadata/md5-cache/dev-libs/libzip-1.3.0
+++ b/metadata/md5-cache/dev-libs/libzip-1.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=Library for manipulating zip archives
 EAPI=6
 HOMEPAGE=https://nih.at/libzip/
 IUSE=bzip2 static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=BSD
 RDEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) elibc_musl? ( sys-libs/fts-standalone )
 SLOT=0/5
 SRC_URI=https://www.nih.at/libzip/libzip-1.3.0.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=84a933b9cc07f01ed06c71e6bff4f9ce
+_md5_=a5843ce502254a99911a02eb23f17938
diff --git a/metadata/md5-cache/dev-libs/marisa-0.2.4 b/metadata/md5-cache/dev-libs/marisa-0.2.4
index 6b8c1ea8dc53..8ea59d2605d7 100644
--- a/metadata/md5-cache/dev-libs/marisa-0.2.4
+++ b/metadata/md5-cache/dev-libs/marisa-0.2.4
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare
 DEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python? ( dev-lang/swig )
 DESCRIPTION=Matching Algorithm with Recursively Implemented StorAge
 EAPI=5
-HOMEPAGE=https://code.google.com/p/marisa-trie/
+HOMEPAGE=https://github.com/s-yata/marisa-trie https://code.google.com/archive/p/marisa-trie/
 IUSE=python doc static-libs cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_sse4a cpu_flags_x86_popcnt python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=amd64 ~arm64 ~ppc ppc64 ~x86
 LICENSE=BSD
@@ -11,4 +11,4 @@ REQUIRED_USE=cpu_flags_x86_popcnt? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse4a? (
 SLOT=0
 SRC_URI=https://marisa-trie.googlecode.com/files/marisa-0.2.4.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d6c983456958fce348a7ab4048ddfc41
+_md5_=c87cd0baaadfc0faabfd368321a65e8a
diff --git a/metadata/md5-cache/dev-libs/nanomsg-1.1.0 b/metadata/md5-cache/dev-libs/nanomsg-1.1.0
new file mode 100644
index 000000000000..5b9ed07c1246
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/nanomsg-1.1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( dev-ruby/asciidoctor ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=High-performance messaging interface for distributed applications
+EAPI=5
+HOMEPAGE=http://nanomsg.org/
+IUSE=doc 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=~amd64 ~arm ~arm64
+LICENSE=MIT
+SLOT=0/5.0.0
+SRC_URI=https://github.com/nanomsg/nanomsg/archive/1.1.0.tar.gz -> nanomsg-1.1.0.tar.gz
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=67c0bb8577d2c90e8f33320e3f36a648
diff --git a/metadata/md5-cache/dev-libs/onigmo-6.1.3 b/metadata/md5-cache/dev-libs/onigmo-6.1.3
new file mode 100644
index 000000000000..d8806a92a80a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/onigmo-6.1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Onigmo is a regular expressions library forked from Oniguruma
+EAPI=6
+HOMEPAGE=https://github.com/k-takata/onigmo
+IUSE=combination-explosion-check crnl-as-line-terminator static-libs
+KEYWORDS=~amd64
+LICENSE=BSD-2
+SLOT=0/6
+SRC_URI=https://github.com/k-takata/onigmo/archive/Onigmo-6.1.3.tar.gz -> onigmo-6.1.3.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=095faa0b62da59f8034481a5bddc0bef
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2l-r1 b/metadata/md5-cache/dev-libs/openssl-1.0.2l-r1
new file mode 100644
index 000000000000..2288682cee8f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.2l-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.4[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/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
+DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
+EAPI=5
+HOMEPAGE=http://www.openssl.org/
+IUSE=+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+LICENSE=openssl
+PDEPEND=app-misc/ca-certificates
+RDEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.4[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(-)?] )
+RESTRICT=!bindist? ( bindist )
+SLOT=0
+SRC_URI=mirror://openssl/source/openssl-1.0.2l.tar.gz bindist? ( https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//hobble-openssl?h=f25 -> openssl-1.0.2l_hobble-openssl https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ec_curve.c?h=f25 -> openssl-1.0.2l_ec_curve.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ectest.c?h=f25 -> openssl-1.0.2l_ectest.c )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=1f9b4041c6433b4053c17b29e96433aa
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.0f-r1 b/metadata/md5-cache/dev-libs/openssl-1.1.0f-r1
new file mode 100644
index 000000000000..fddee7a49ca3
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-1.1.0f-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
+DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
+EAPI=5
+HOMEPAGE=http://www.openssl.org/
+IUSE=+asm bindist rfc3779 sctp cpu_flags_x86_sse2 static-libs test tls-heartbeat vanilla 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+LICENSE=openssl
+PDEPEND=app-misc/ca-certificates
+RDEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!bindist? ( bindist )
+SLOT=0/1.1
+SRC_URI=mirror://openssl/source/openssl-1.1.0f.tar.gz bindist? ( https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//hobble-openssl?h=f27 -> openssl-1.1.0f_hobble-openssl https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ec_curve.c?h=f27 -> openssl-1.1.0f_ec_curve.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ectest.c?h=f27 -> openssl-1.1.0f_ectest.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//openssl-1.1.0-build.patch?h=f27 -> openssl-1.1.0-build.patch https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//openssl-1.1.0-ec-curves.patch?h=f27 -> openssl-1.1.0-ec-curves.patch )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=92083356d6d13534fb7f42eb5c7bf105
diff --git a/metadata/md5-cache/dev-libs/ppl-1.2 b/metadata/md5-cache/dev-libs/ppl-1.2
index 182eee11651e..92baf9fcdc05 100644
--- a/metadata/md5-cache/dev-libs/ppl-1.2
+++ b/metadata/md5-cache/dev-libs/ppl-1.2
@@ -4,9 +4,9 @@ DESCRIPTION=The Parma Polyhedra Library for numerical analysis of complex system
 EAPI=5
 HOMEPAGE=http://bugseng.com/products/ppl
 IUSE=+cxx doc lpsol pch static-libs test
-KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/gmp-6[cxx] lpsol? ( sci-mathematics/glpk ) !dev-libs/cloog-ppl
 SLOT=0/4.14
 SRC_URI=http://bugseng.com/products/ppl/download/ftp/releases/1.2/ppl-1.2.tar.xz
-_md5_=a0289fec10375de6ac816b3392657c29
+_md5_=85022013d0a451bfb35de167d408aacf
diff --git a/metadata/md5-cache/dev-libs/protobuf-c-1.3.0-r1 b/metadata/md5-cache/dev-libs/protobuf-c-1.3.0-r1
index a63b697d7c73..8d25c05e9b85 100644
--- a/metadata/md5-cache/dev-libs/protobuf-c-1.3.0-r1
+++ b/metadata/md5-cache/dev-libs/protobuf-c-1.3.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Protocol Buffers implementation in C
 EAPI=6
 HOMEPAGE=https://github.com/protobuf-c/protobuf-c/
 IUSE=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 sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=BSD-2
 RDEPEND=>=dev-libs/protobuf-2.6.0: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(-)?]
 SLOT=0/1.0.0
 SRC_URI=https://github.com/protobuf-c/protobuf-c/releases/download/v1.3.0/protobuf-c-1.3.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=61ffb3a8302f85e52073f4dfa4b57b47
+_md5_=5ca4122b0d456610d7fafbc9d297ef08
diff --git a/metadata/md5-cache/dev-libs/purpose-1.1-r1 b/metadata/md5-cache/dev-libs/purpose-1.1-r1
index ed658603fc0a..88ae03fe5df3 100644
--- a/metadata/md5-cache/dev-libs/purpose-1.1-r1
+++ b/metadata/md5-cache/dev-libs/purpose-1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/purpose/purpose-1.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=53d994320bcbb18d7e1e5526bb5ae563
diff --git a/metadata/md5-cache/dev-libs/purpose-1.2.1 b/metadata/md5-cache/dev-libs/purpose-1.2.1
new file mode 100644
index 000000000000..cb2d5b8306fe
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/purpose-1.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 kaccounts? ( >=kde-apps/kaccounts-integration-14.12.0:5 net-libs/accounts-qt ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.37.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for providing abstractions to get the developer's purposes fulfilled
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+kaccounts debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 kaccounts? ( >=kde-apps/kaccounts-integration-14.12.0:5 net-libs/accounts-qt ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/purpose/purpose-1.2.1.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e1371b9abafbf25b6953b0c3cb126038
diff --git a/metadata/md5-cache/dev-libs/sink-0.3.0-r1 b/metadata/md5-cache/dev-libs/sink-0.3.0-r1
index a159caa7723b..47f3f8cd7d59 100644
--- a/metadata/md5-cache/dev-libs/sink-0.3.0-r1
+++ b/metadata/md5-cache/dev-libs/sink-0.3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-apps/kcontacts-14.12.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/unstable/sink/0.3.0/src/sink-0.3.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8ad3364b6a498cd7163e6a3005897c6a
diff --git a/metadata/md5-cache/dev-libs/sway-9999 b/metadata/md5-cache/dev-libs/sway-9999
index 25e7dbb2f467..eaa739701d6c 100644
--- a/metadata/md5-cache/dev-libs/sway-9999
+++ b/metadata/md5-cache/dev-libs/sway-9999
@@ -9,4 +9,4 @@ RDEPEND==dev-libs/wlc-9999[systemd=] dev-libs/json-c dev-libs/libpcre dev-libs/l
 REQUIRED_USE=tray? ( swaybar )
 SLOT=0
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8d7d24294be174abbbba03efd7ba8571
+_md5_=1b5e4a4293c902e84c96b2844a16abde
diff --git a/metadata/md5-cache/dev-lisp/asdf-3.3.0 b/metadata/md5-cache/dev-lisp/asdf-3.3.0
index 205a28d93384..d8e4f88d8da4 100644
--- a/metadata/md5-cache/dev-lisp/asdf-3.3.0
+++ b/metadata/md5-cache/dev-lisp/asdf-3.3.0
@@ -7,7 +7,8 @@ IUSE=doc
 KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=MIT
 PDEPEND=~dev-lisp/uiop-3.3.0 virtual/commonlisp
+RDEPEND=virtual/commonlisp
 SLOT=0/3.3.0
 SRC_URI=http://common-lisp.net/project/asdf/archives/asdf-3.3.0.tar.gz
 _eclasses_=common-lisp-3	8c4aaa6d66cd2daed8572bb60bf6fe07	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a6b4dcc80b4018ad8fda918a6c676e4e
+_md5_=3326227c9b96a0c00207fae12ccfd7c7
diff --git a/metadata/md5-cache/dev-lisp/clisp-2.49-r101 b/metadata/md5-cache/dev-lisp/clisp-2.49-r101
new file mode 100644
index 000000000000..e2787d6f1913
--- /dev/null
+++ b/metadata/md5-cache/dev-lisp/clisp-2.49-r101
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=dev-lisp/asdf-2.33-r3 virtual/libiconv >=dev-libs/libsigsegv-2.4 >=dev-libs/ffcall-1.10 dbus? ( sys-apps/dbus ) fastcgi? ( dev-libs/fcgi ) gdbm? ( sys-libs/gdbm ) gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6 ) pari? ( <sci-mathematics/pari-2.5.0 ) postgres? ( >=dev-db/postgresql-8.0:* ) readline? ( >=sys-libs/readline-7.0:0= ) pcre? ( dev-libs/libpcre:3 ) svm? ( sci-libs/libsvm ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXpm ) hyperspec? ( dev-lisp/hyperspec ) berkdb? ( sys-libs/db:4.8 ) X? ( x11-misc/imake x11-proto/xextproto )
+DESCRIPTION=A portable, bytecode-compiled implementation of Common Lisp
+EAPI=5
+HOMEPAGE=http://clisp.sourceforge.net/
+IUSE=hyperspec X berkdb dbus fastcgi gdbm gtk pari +pcre postgres +readline svm -threads +unicode +zlib
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lisp/asdf-2.33-r3 virtual/libiconv >=dev-libs/libsigsegv-2.4 >=dev-libs/ffcall-1.10 dbus? ( sys-apps/dbus ) fastcgi? ( dev-libs/fcgi ) gdbm? ( sys-libs/gdbm ) gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6 ) pari? ( <sci-mathematics/pari-2.5.0 ) postgres? ( >=dev-db/postgresql-8.0:* ) readline? ( >=sys-libs/readline-7.0:0= ) pcre? ( dev-libs/libpcre:3 ) svm? ( sci-libs/libsvm ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXpm ) hyperspec? ( dev-lisp/hyperspec ) berkdb? ( sys-libs/db:4.8 )
+SLOT=2/7
+SRC_URI=mirror://sourceforge/clisp/clisp-2.49.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=8c9495a67ef0c54773246bcad1fecd3e
diff --git a/metadata/md5-cache/dev-lisp/clisp-2.49-r9 b/metadata/md5-cache/dev-lisp/clisp-2.49-r9
new file mode 100644
index 000000000000..ce7be988673e
--- /dev/null
+++ b/metadata/md5-cache/dev-lisp/clisp-2.49-r9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=dev-lisp/asdf-2.33-r3 virtual/libiconv >=dev-libs/libsigsegv-2.4 >=dev-libs/ffcall-1.10 dbus? ( sys-apps/dbus ) fastcgi? ( dev-libs/fcgi ) gdbm? ( sys-libs/gdbm ) gtk? ( >=x11-libs/gtk+-2.10 >=gnome-base/libglade-2.6 ) pari? ( <sci-mathematics/pari-2.5.0 ) postgres? ( >=dev-db/postgresql-8.0 ) readline? ( >=sys-libs/readline-5.0 <sys-libs/readline-7.0 ) pcre? ( dev-libs/libpcre ) svm? ( sci-libs/libsvm ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXpm ) hyperspec? ( dev-lisp/hyperspec ) berkdb? ( sys-libs/db:4.8 ) X? ( x11-misc/imake x11-proto/xextproto )
+DESCRIPTION=A portable, bytecode-compiled implementation of Common Lisp
+EAPI=5
+HOMEPAGE=http://clisp.sourceforge.net/
+IUSE=hyperspec X berkdb dbus fastcgi gdbm gtk pari +pcre postgres +readline svm -threads +unicode +zlib
+KEYWORDS=amd64 ~ppc ~sparc x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lisp/asdf-2.33-r3 virtual/libiconv >=dev-libs/libsigsegv-2.4 >=dev-libs/ffcall-1.10 dbus? ( sys-apps/dbus ) fastcgi? ( dev-libs/fcgi ) gdbm? ( sys-libs/gdbm ) gtk? ( >=x11-libs/gtk+-2.10 >=gnome-base/libglade-2.6 ) pari? ( <sci-mathematics/pari-2.5.0 ) postgres? ( >=dev-db/postgresql-8.0 ) readline? ( >=sys-libs/readline-5.0 <sys-libs/readline-7.0 ) pcre? ( dev-libs/libpcre ) svm? ( sci-libs/libsvm ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXpm ) hyperspec? ( dev-lisp/hyperspec ) berkdb? ( sys-libs/db:4.8 )
+SLOT=2/2.49
+SRC_URI=mirror://sourceforge/clisp/clisp-2.49.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=a52dfb3803d9ce3f938eabfa877df682
diff --git a/metadata/md5-cache/dev-ml/merlin-2.5.3 b/metadata/md5-cache/dev-ml/merlin-2.5.3
index a52ec7954619..291e4746a553 100644
--- a/metadata/md5-cache/dev-ml/merlin-2.5.3
+++ b/metadata/md5-cache/dev-ml/merlin-2.5.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/ocaml:= dev-ml/yojson:= || ( app-editors/vim[python] app-editors/gvim[python] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0/2.5.3
 SRC_URI=https://github.com/ocaml/merlin/archive/v2.5.3.tar.gz -> merlin-2.5.3.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	findlib	45d6030075064a68da8d7143726a1150	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=8f11d3c8ca5ff7c5ca6556735193bc36
diff --git a/metadata/md5-cache/dev-ml/merlin-2.5.4 b/metadata/md5-cache/dev-ml/merlin-2.5.4
index 70e0baf15447..f0a878791fa8 100644
--- a/metadata/md5-cache/dev-ml/merlin-2.5.4
+++ b/metadata/md5-cache/dev-ml/merlin-2.5.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/ocaml:= dev-ml/yojson:= || ( app-editors/vim[python] app-editors/gvim[python] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0/2.5.4
 SRC_URI=https://github.com/ocaml/merlin/archive/v2.5.4.tar.gz -> merlin-2.5.4.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	findlib	45d6030075064a68da8d7143726a1150	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=8f11d3c8ca5ff7c5ca6556735193bc36
diff --git a/metadata/md5-cache/dev-ml/merlin-2.5.5 b/metadata/md5-cache/dev-ml/merlin-2.5.5
index 035ef6970b49..144b7826d14d 100644
--- a/metadata/md5-cache/dev-ml/merlin-2.5.5
+++ b/metadata/md5-cache/dev-ml/merlin-2.5.5
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/ocaml:= dev-ml/yojson:= || ( app-editors/vim[python] app-editors/gvim[python] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0/2.5.5
 SRC_URI=https://github.com/ocaml/merlin/archive/v2.5.5.tar.gz -> merlin-2.5.5.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	findlib	45d6030075064a68da8d7143726a1150	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=8f11d3c8ca5ff7c5ca6556735193bc36
diff --git a/metadata/md5-cache/dev-ml/merlin-3.0.0 b/metadata/md5-cache/dev-ml/merlin-3.0.0
index 969c502fb6d9..6d9232005dd9 100644
--- a/metadata/md5-cache/dev-ml/merlin-3.0.0
+++ b/metadata/md5-cache/dev-ml/merlin-3.0.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/ocaml:= dev-ml/yojson:= || ( app-editors/vim[python] app-editors/gvim[python] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0/3.0.0
 SRC_URI=https://github.com/ocaml/merlin/archive/v3.0.0.tar.gz -> merlin-3.0.0.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	findlib	45d6030075064a68da8d7143726a1150	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=8f11d3c8ca5ff7c5ca6556735193bc36
diff --git a/metadata/md5-cache/dev-ml/merlin-3.0.1 b/metadata/md5-cache/dev-ml/merlin-3.0.1
index 8e24f7912293..7424d8238cee 100644
--- a/metadata/md5-cache/dev-ml/merlin-3.0.1
+++ b/metadata/md5-cache/dev-ml/merlin-3.0.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/ocaml:= dev-ml/yojson:= || ( app-editors/vim[python] app-editors/gvim[python] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0/3.0.1
 SRC_URI=https://github.com/ocaml/merlin/archive/v3.0.1.tar.gz -> merlin-3.0.1.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	findlib	45d6030075064a68da8d7143726a1150	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=8f11d3c8ca5ff7c5ca6556735193bc36
diff --git a/metadata/md5-cache/dev-ml/merlin-3.0.2 b/metadata/md5-cache/dev-ml/merlin-3.0.2
index eb9b70e9635b..5e1ad61a6031 100644
--- a/metadata/md5-cache/dev-ml/merlin-3.0.2
+++ b/metadata/md5-cache/dev-ml/merlin-3.0.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/ocaml:= dev-ml/yojson:= || ( app-editors/vim[python] app-editors/gvim[python] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0/3.0.2
 SRC_URI=https://github.com/ocaml/merlin/archive/v3.0.2.tar.gz -> merlin-3.0.2.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	findlib	45d6030075064a68da8d7143726a1150	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=8f11d3c8ca5ff7c5ca6556735193bc36
diff --git a/metadata/md5-cache/dev-ml/merlin-3.0.3 b/metadata/md5-cache/dev-ml/merlin-3.0.3
index 763c292949c6..bf9f5f424199 100644
--- a/metadata/md5-cache/dev-ml/merlin-3.0.3
+++ b/metadata/md5-cache/dev-ml/merlin-3.0.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/ocaml:= dev-ml/yojson:= || ( app-editors/vim[python] app-editors/gvim[python] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0/3.0.3
 SRC_URI=https://github.com/ocaml/merlin/archive/v3.0.3.tar.gz -> merlin-3.0.3.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	6f0171b0a2f2fce005c13b4c0685a0d8
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	findlib	45d6030075064a68da8d7143726a1150	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	b5b3de0c186fed2d7255bd4ac8b5ac80
 _md5_=8f11d3c8ca5ff7c5ca6556735193bc36
diff --git a/metadata/md5-cache/dev-perl/Data-Float-0.13.0 b/metadata/md5-cache/dev-perl/Data-Float-0.13.0
index cfec4790794d..58e2314e25d1 100644
--- a/metadata/md5-cache/dev-perl/Data-Float-0.13.0
+++ b/metadata/md5-cache/dev-perl/Data-Float-0.13.0
@@ -4,10 +4,10 @@ DESCRIPTION=details of the floating point data type
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Data-Float/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-parent dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Data-Float-0.013.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=578165429b4e765aa40ae7bda376b66b
+_md5_=39a61f9b693c41b2f9533567562bc9bb
diff --git a/metadata/md5-cache/dev-perl/Encode-Locale-1.50.0 b/metadata/md5-cache/dev-perl/Encode-Locale-1.50.0
index c1b0e84cd38e..d444be5d5956 100644
--- a/metadata/md5-cache/dev-perl/Encode-Locale-1.50.0
+++ b/metadata/md5-cache/dev-perl/Encode-Locale-1.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Determine the locale encoding
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Encode-Locale/
 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 ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Encode-2.0.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Encode-Locale-1.05.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=a53d67a3d5d50493f33c5e7d13b6278a
+_md5_=7cc2131c8aa7598017c0fa80a6f49e62
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-CppGuess-0.110.0 b/metadata/md5-cache/dev-perl/ExtUtils-CppGuess-0.110.0
index eccc2e166244..87227b7b5ed8 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-CppGuess-0.110.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-CppGuess-0.110.0
@@ -4,10 +4,10 @@ DESCRIPTION=Guess C++ compiler and flags
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/ExtUtils-CppGuess/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Capture-Tiny dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAVIDO/ExtUtils-CppGuess-0.11.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=8a600f35e42a66a3e3db47a8f1f0ff57
+_md5_=bf62462dd23a24a69c6c38590b6d423f
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-Typemaps-Default-1.50.0 b/metadata/md5-cache/dev-perl/ExtUtils-Typemaps-Default-1.50.0
index ad744465a6d8..e8dcac51e0cc 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-Typemaps-Default-1.50.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-Typemaps-Default-1.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=A set of useful typemaps
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/ExtUtils-Typemaps-Default/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-ExtUtils-ParseXS-3.180.300 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-Typemaps-Default-1.05.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=6ce90be3c18b57169a070e4510efdd7c
+_md5_=6097a35852815035d626979efc1c695a
diff --git a/metadata/md5-cache/dev-perl/GD-Graph3d-0.630.0-r2 b/metadata/md5-cache/dev-perl/GD-Graph3d-0.630.0-r2
new file mode 100644
index 000000000000..7a444b9a6581
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/GD-Graph3d-0.630.0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/GD-1.18 >=dev-perl/GDGraph-1.30 dev-perl/GDTextUtil dev-lang/perl:=
+DESCRIPTION=Create 3D Graphs with GD and GD::Graph
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/GD-Graph3d/
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/GD-1.18 >=dev-perl/GDGraph-1.30 dev-perl/GDTextUtil dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/W/WA/WADG/GD-Graph3d-0.63.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=5654d4f3fd2209ddf851e8b95debf097
diff --git a/metadata/md5-cache/dev-perl/GDTextUtil-0.860.0-r2 b/metadata/md5-cache/dev-perl/GDTextUtil-0.860.0-r2
new file mode 100644
index 000000000000..293df46fdcab
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/GDTextUtil-0.860.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/GD dev-lang/perl:=
+DESCRIPTION=Text utilities for use with GD
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/GDTextUtil/
+IUSE=examples
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/GD dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MV/MVERB/GDTextUtil-0.86.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=45099eaec420fbb1853bb88d58d1a2a3
diff --git a/metadata/md5-cache/dev-perl/Gearman-2.4.9 b/metadata/md5-cache/dev-perl/Gearman-2.4.9
new file mode 100644
index 000000000000..c4706d57c21c
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Gearman-2.4.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp virtual/perl-IO virtual/perl-IO-Socket-IP dev-perl/IO-Socket-SSL dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils virtual/perl-Socket virtual/perl-Storable dev-perl/String-CRC32 virtual/perl-Time-HiRes >=virtual/perl-version-0.770.0 virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/File-Which virtual/perl-Perl-OSType >=dev-perl/Proc-Guard-0.70.0 dev-perl/Test-Exception virtual/perl-Test-Simple >=dev-perl/Test-TCP-2.170.0 dev-perl/Test-Timer ) dev-lang/perl:=
+DESCRIPTION=Gearman distributed job system, client and worker libraries
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Gearman/
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-IO virtual/perl-IO-Socket-IP dev-perl/IO-Socket-SSL dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils virtual/perl-Socket virtual/perl-Storable dev-perl/String-CRC32 virtual/perl-Time-HiRes >=virtual/perl-version-0.770.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/P/PA/PALIK/Gearman-2.004.009.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=525f4105d25a3ac88a8492d9f7385684
diff --git a/metadata/md5-cache/dev-perl/Gearman-Client-Async-0.940.0-r2 b/metadata/md5-cache/dev-perl/Gearman-Client-Async-0.940.0-r2
new file mode 100644
index 000000000000..998a3658aa7c
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Gearman-Client-Async-0.940.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/Gearman-1.07 >=dev-perl/Danga-Socket-1.57 test? ( dev-perl/Gearman-Server ) dev-lang/perl:=
+DESCRIPTION=Asynchronous client module for Gearman for Danga::Socket applications
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Gearman-Client-Async/
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Gearman-1.07 >=dev-perl/Danga-Socket-1.57 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BR/BRADFITZ/Gearman-Client-Async-0.94.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=0d7d6d0d51bb67bd610d46498efd0d0e
diff --git a/metadata/md5-cache/dev-perl/Gearman-Server-1.120.0 b/metadata/md5-cache/dev-perl/Gearman-Server-1.120.0
deleted file mode 100644
index 377fe0395b92..000000000000
--- a/metadata/md5-cache/dev-perl/Gearman-Server-1.120.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/Danga-Socket-1.520.0 >=dev-perl/Gearman-1.07 virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=[-build(-)]
-DESCRIPTION=Gearman distributed job system - worker/client connector
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Gearman-Server/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Danga-Socket-1.520.0 >=dev-perl/Gearman-1.07 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DO/DORMANDO/Gearman-Server-1.12.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=36972ae48d3854761566da6ad02f5180
diff --git a/metadata/md5-cache/dev-perl/Gearman-Server-1.120.0-r1 b/metadata/md5-cache/dev-perl/Gearman-Server-1.120.0-r1
new file mode 100644
index 000000000000..a193029f9856
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Gearman-Server-1.120.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-perl/Danga-Socket-1.520.0 >=dev-perl/Gearman-1.07 !!sys-cluster/gearmand virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=[-build(-)]
+DESCRIPTION=Gearman distributed job system - worker/client connector
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/Gearman-Server/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Danga-Socket-1.520.0 >=dev-perl/Gearman-1.07 !!sys-cluster/gearmand dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DO/DORMANDO/Gearman-Server-1.12.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
+_md5_=0b8a9b237f421037cfd1616007222b45
diff --git a/metadata/md5-cache/dev-perl/Gearman-Server-1.130.1-r1 b/metadata/md5-cache/dev-perl/Gearman-Server-1.130.1-r1
new file mode 100644
index 000000000000..8d3bcaaf073a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Gearman-Server-1.130.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/Danga-Socket-1.520.0 >=dev-perl/Gearman-1.07 !!sys-cluster/gearmand virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Test-Script ) dev-lang/perl:=
+DESCRIPTION=Gearman distributed job system - worker/client connector
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Gearman-Server/
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Danga-Socket-1.520.0 >=dev-perl/Gearman-1.07 !!sys-cluster/gearmand dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/P/PA/PALIK/Gearman-Server-v1.130.1.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=16a9186c9baf2910770f62124218c1a4
diff --git a/metadata/md5-cache/dev-perl/Getopt-GUI-Long-0.930.0-r1 b/metadata/md5-cache/dev-perl/Getopt-GUI-Long-0.930.0-r1
index 4ae92143a968..1b9eb892c0c2 100644
--- a/metadata/md5-cache/dev-perl/Getopt-GUI-Long-0.930.0-r1
+++ b/metadata/md5-cache/dev-perl/Getopt-GUI-Long-0.930.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Auto-GUI extending Getopt::Long
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Getopt-GUI-Long/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Temp virtual/perl-Getopt-Long dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HARDAKER/Getopt-GUI-Long-0.93.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=f9f21e2ed4441a5ba5377677a960e7b2
+_md5_=7b426ea751c0b6192cadf1419aa30ade
diff --git a/metadata/md5-cache/dev-perl/Getopt-GUI-Long-0.930.0-r2 b/metadata/md5-cache/dev-perl/Getopt-GUI-Long-0.930.0-r2
new file mode 100644
index 000000000000..ab0e31f8dd89
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Getopt-GUI-Long-0.930.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl:=
+DESCRIPTION=Auto-GUI extending Getopt::Long
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Getopt-GUI-Long/
+IUSE=examples
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-File-Temp virtual/perl-Getopt-Long dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/H/HA/HARDAKER/Getopt-GUI-Long-0.93.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=3cb9d3c44d3a4996240abb380942972d
diff --git a/metadata/md5-cache/dev-perl/Getopt-Long-Descriptive-0.100.0 b/metadata/md5-cache/dev-perl/Getopt-Long-Descriptive-0.100.0
new file mode 100644
index 000000000000..fa460d85d35f
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Getopt-Long-Descriptive-0.100.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!<dev-perl/MooseX-Getopt-0.660.0 virtual/perl-Carp >=virtual/perl-Getopt-Long-2.330.0 >=dev-perl/Params-Validate-0.970.0 virtual/perl-Scalar-List-Utils >=dev-perl/Sub-Exporter-0.972.0 virtual/perl-ExtUtils-MakeMaker test? ( !minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 ) >=dev-perl/CPAN-Meta-Check-0.11.0 virtual/perl-File-Spec dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.960.0 >=dev-perl/Test-Warnings-0.5.0 ) dev-lang/perl:=
+DESCRIPTION=Getopt::Long with usage text
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Getopt-Long-Descriptive/
+IUSE=test minimal
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~ppc-aix ~ppc-macos ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=!<dev-perl/MooseX-Getopt-0.660.0 virtual/perl-Carp >=virtual/perl-Getopt-Long-2.330.0 >=dev-perl/Params-Validate-0.970.0 virtual/perl-Scalar-List-Utils >=dev-perl/Sub-Exporter-0.972.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Getopt-Long-Descriptive-0.100.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=0098ebb2a1a513debeed3b64ca69ab2e
diff --git a/metadata/md5-cache/dev-perl/Getopt-Tabular-0.300.0-r1 b/metadata/md5-cache/dev-perl/Getopt-Tabular-0.300.0-r1
new file mode 100644
index 000000000000..b3a9088aa6f2
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Getopt-Tabular-0.300.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl:=
+DESCRIPTION=Table-driven argument parsing with help text
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Getopt-Tabular/
+IUSE=examples
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/G/GW/GWARD/Getopt-Tabular-0.3.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=a198f4730e6d5bd12877b714cd9e4765
diff --git a/metadata/md5-cache/dev-perl/GnuPG-Interface-0.520.0-r3 b/metadata/md5-cache/dev-perl/GnuPG-Interface-0.520.0-r3
new file mode 100644
index 000000000000..4a7e14d1d033
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/GnuPG-Interface-0.520.0-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-crypt/gnupg-1.2.1-r1 virtual/perl-autodie >=virtual/perl-Math-BigInt-1.780.0 >=dev-perl/Moo-0.91.11 >=dev-perl/MooX-HandlesVia-0.1.4 >=dev-perl/MooX-late-0.14.0 >=virtual/perl-ExtUtils-MakeMaker-6.360.0 dev-lang/perl:=
+DESCRIPTION=Perl module interface to interacting with GnuPG
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/GnuPG-Interface/
+IUSE=test
+KEYWORDS=~amd64 ~hppa ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=app-crypt/gnupg-1.2.1-r1 virtual/perl-autodie >=virtual/perl-Math-BigInt-1.780.0 >=dev-perl/Moo-0.91.11 >=dev-perl/MooX-HandlesVia-0.1.4 >=dev-perl/MooX-late-0.14.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/GnuPG-Interface-0.52.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=911736cd69b54f89ddcfe481c77dada0
diff --git a/metadata/md5-cache/dev-perl/Goo-Canvas-0.60.0-r2 b/metadata/md5-cache/dev-perl/Goo-Canvas-0.60.0-r2
new file mode 100644
index 000000000000..2b10bf7d43b8
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Goo-Canvas-0.60.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=x11-libs/goocanvas:0 dev-perl/Gtk2 dev-perl/glib-perl dev-perl/Cairo dev-perl/ExtUtils-Depends dev-perl/ExtUtils-PkgConfig dev-lang/perl:=
+DESCRIPTION=Perl interface to the GooCanvas
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Goo-Canvas/
+IUSE=examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=x11-libs/goocanvas:0 dev-perl/Gtk2 dev-perl/glib-perl dev-perl/Cairo dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/Y/YE/YEWENBIN/Goo-Canvas-0.06.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=c26b71bcf3281f4d6cb44693fb8f0619
diff --git a/metadata/md5-cache/dev-perl/Google-Ads-AdWords-Client-4.18.0 b/metadata/md5-cache/dev-perl/Google-Ads-AdWords-Client-4.18.0
new file mode 100644
index 000000000000..50db92f6dca9
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Google-Ads-AdWords-Client-4.18.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/Class-Load >=dev-perl/Class-Std-Fast-0.0.5 dev-perl/Crypt-OpenSSL-RSA dev-perl/File-HomeDir virtual/perl-File-Spec dev-perl/IO-Socket-SSL dev-perl/JSON-Parse dev-perl/LWP-Protocol-https dev-perl/libwww-perl dev-perl/Log-Log4perl >=dev-perl/SOAP-WSDL-2.00.10 virtual/perl-Scalar-List-Utils dev-perl/Template-Toolkit dev-perl/URI dev-perl/XML-Simple dev-perl/XML-XPath examples? ( virtual/perl-Digest-SHA virtual/perl-File-Temp dev-perl/HTTP-Server-Simple ) >=dev-perl/Module-Build-0.400.0 test? ( dev-perl/Config-Properties dev-perl/Data-Uniqid virtual/perl-File-Temp dev-perl/Test-Deep dev-perl/Test-Exception dev-perl/Test-MockObject virtual/perl-Test-Simple ) dev-lang/perl:=
+DESCRIPTION=Google AdWords API Perl Client Library
+EAPI=6
+HOMEPAGE=https://github.com/googleads/googleads-perl-lib
+IUSE=test examples
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-perl/Class-Load >=dev-perl/Class-Std-Fast-0.0.5 dev-perl/Crypt-OpenSSL-RSA dev-perl/File-HomeDir virtual/perl-File-Spec dev-perl/IO-Socket-SSL dev-perl/JSON-Parse dev-perl/LWP-Protocol-https dev-perl/libwww-perl dev-perl/Log-Log4perl >=dev-perl/SOAP-WSDL-2.00.10 virtual/perl-Scalar-List-Utils dev-perl/Template-Toolkit dev-perl/URI dev-perl/XML-Simple dev-perl/XML-XPath examples? ( virtual/perl-Digest-SHA virtual/perl-File-Temp dev-perl/HTTP-Server-Simple ) dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SU/SUNDQUIST/Google-Ads-AdWords-Client-4.18.0.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=3d5f057fc64e2c5835cde5e750fd4b64
diff --git a/metadata/md5-cache/dev-perl/GraphViz-2.240.0 b/metadata/md5-cache/dev-perl/GraphViz-2.240.0
index 61d25448a27f..1396f8f97e2f 100644
--- a/metadata/md5-cache/dev-perl/GraphViz-2.240.0
+++ b/metadata/md5-cache/dev-perl/GraphViz-2.240.0
@@ -4,10 +4,10 @@ DESCRIPTION=Interface to AT&T's GraphViz
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/GraphViz/
 IUSE=test examples
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=media-gfx/graphviz >=virtual/perl-Carp-1.10.0 >=virtual/perl-Getopt-Long-2.340.0 virtual/perl-IO >=dev-perl/IPC-Run-0.600.0 >=dev-perl/libwww-perl-6 >=dev-perl/Parse-RecDescent-1.965.1 >=virtual/perl-Time-HiRes-1.510.0 >=dev-perl/XML-Twig-3.520.0 >=dev-perl/XML-XPath-1.130.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RS/RSAVAGE/GraphViz-2.24.tgz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=2ce5a4df26526fe4e986241caa7fb2df
+_md5_=26df5eb7d5902820eeba6f5d89a7b293
diff --git a/metadata/md5-cache/dev-perl/Growl-GNTP-0.210.0-r1 b/metadata/md5-cache/dev-perl/Growl-GNTP-0.210.0-r1
index 9068c3fa26f4..7f9e9b138be9 100644
--- a/metadata/md5-cache/dev-perl/Growl-GNTP-0.210.0-r1
+++ b/metadata/md5-cache/dev-perl/Growl-GNTP-0.210.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Perl implementation of GNTP Protocol (Client Part)
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Growl-GNTP/
 IUSE=examples examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=examples? ( virtual/perl-Encode ) >=dev-perl/Crypt-CBC-2.290.0 >=dev-perl/Data-UUID-0.149.0 >=virtual/perl-Digest-MD5-2.360.0 >=virtual/perl-Digest-SHA-5.450.0 virtual/perl-IO dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MATTN/Growl-GNTP-0.21.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=06ed5760998c8551c17dc6cef45144dc
+_md5_=51ad59bf6f0e8ecd14cbb4547c5f5735
diff --git a/metadata/md5-cache/dev-perl/Gtk2-AppIndicator-0.150.0-r1 b/metadata/md5-cache/dev-perl/Gtk2-AppIndicator-0.150.0-r1
new file mode 100644
index 000000000000..9ef22d785233
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Gtk2-AppIndicator-0.150.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/Gtk2-1.200.0 dev-libs/libappindicator:2 virtual/perl-ExtUtils-MakeMaker test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl:=
+DESCRIPTION=Perl binding for the GTK2 AppIndicator
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Gtk2-AppIndicator/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Gtk2-1.200.0 dev-libs/libappindicator:2 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/O/OE/OESTERHOL/Gtk2-AppIndicator-0.15.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	virtualx	171580f737f5aaf18fcb456548588066
+_md5_=d108f26c7afded841e9917a8e5d1a375
diff --git a/metadata/md5-cache/dev-perl/Gtk2-Ex-PodViewer-0.180.0-r2 b/metadata/md5-cache/dev-perl/Gtk2-Ex-PodViewer-0.180.0-r2
new file mode 100644
index 000000000000..4370c51f6ffa
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Gtk2-Ex-PodViewer-0.180.0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=x11-libs/gtk+:2 dev-perl/Gtk2 dev-perl/IO-stringy virtual/perl-Pod-Parser virtual/perl-Pod-Simple dev-perl/Gtk2-Ex-Simple-List dev-perl/Locale-gettext dev-lang/perl:=
+DESCRIPTION=a Gtk2 widget for displaying Plain old Documentation (POD)
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Gtk2-Ex-PodViewer/
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=x11-libs/gtk+:2 dev-perl/Gtk2 dev-perl/IO-stringy virtual/perl-Pod-Parser virtual/perl-Pod-Simple dev-perl/Gtk2-Ex-Simple-List dev-perl/Locale-gettext dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/G/GB/GBROWN/Gtk2-Ex-PodViewer-0.18.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=c2bec4dabb9c0594d7de6e89c79d8206
diff --git a/metadata/md5-cache/dev-perl/Gtk2-Ex-PrintDialog-0.30.0-r2 b/metadata/md5-cache/dev-perl/Gtk2-Ex-PrintDialog-0.30.0-r2
new file mode 100644
index 000000000000..671fdc4c6412
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Gtk2-Ex-PrintDialog-0.30.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=cups? ( dev-perl/Net-CUPS ) dev-perl/Gtk2 >=dev-perl/Locale-gettext-1.04 dev-lang/perl:=
+DESCRIPTION=a simple, pure Perl dialog for printing PostScript data in GTK+ applications
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Gtk2-Ex-PrintDialog/
+IUSE=cups
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=cups? ( dev-perl/Net-CUPS ) dev-perl/Gtk2 >=dev-perl/Locale-gettext-1.04 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/G/GB/GBROWN/Gtk2-Ex-PrintDialog-0.03.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=7ad2e13dc86a34bd2a7fa7d6c639aa55
diff --git a/metadata/md5-cache/dev-perl/Gtk2-Ex-Simple-List-0.500.0-r2 b/metadata/md5-cache/dev-perl/Gtk2-Ex-Simple-List-0.500.0-r2
new file mode 100644
index 000000000000..42679bc1937e
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Gtk2-Ex-Simple-List-0.500.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/Gtk2-1.60.0 >=dev-perl/glib-perl-1.62.0 dev-lang/perl:= test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A simple interface to Gtk2's complex MVC list widget
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Gtk2-Ex-Simple-List/
+IUSE=examples test
+KEYWORDS=~amd64 ~ia64 ~sparc ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=dev-perl/Gtk2-1.60.0 >=dev-perl/glib-perl-1.62.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RM/RMCFARLA/Gtk2-Perl-Ex/Gtk2-Ex-Simple-List-0.50.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	virtualx	171580f737f5aaf18fcb456548588066
+_md5_=d5335fd9578491ea55fd3b0ccb03a83b
diff --git a/metadata/md5-cache/dev-perl/Gtk2-ImageView-0.50.0-r2 b/metadata/md5-cache/dev-perl/Gtk2-ImageView-0.50.0-r2
new file mode 100644
index 000000000000..63e001ad2d13
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Gtk2-ImageView-0.50.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/Gtk2 >=media-gfx/gtkimageview-1.6.3 dev-perl/glib-perl >=dev-perl/ExtUtils-Depends-0.300 >=dev-perl/ExtUtils-PkgConfig-1.030 dev-lang/perl:= test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Perl binding for the GtkImageView image viewer widget
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Gtk2-ImageView/
+IUSE=examples test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=dev-perl/Gtk2 >=media-gfx/gtkimageview-1.6.3 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RA/RATCLIFFE/Gtk2-ImageView-0.05.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	virtualx	171580f737f5aaf18fcb456548588066
+_md5_=c6d6e4137f052ee79a69ef2f4aaae38e
diff --git a/metadata/md5-cache/dev-perl/Gtk2-SourceView2-0.100.0-r1 b/metadata/md5-cache/dev-perl/Gtk2-SourceView2-0.100.0-r1
new file mode 100644
index 000000000000..6ce52b7dad2a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Gtk2-SourceView2-0.100.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/Gtk2 >=dev-perl/glib-perl-1.160.0 dev-perl/ExtUtils-Depends dev-perl/ExtUtils-PkgConfig virtual/perl-ExtUtils-MakeMaker x11-libs/gtksourceview:2.0 dev-lang/perl:= test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Perl binding for the C library gtksourceview
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Gtk2-SourceView2/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2+ Artistic-2 )
+RDEPEND=dev-perl/Gtk2 >=dev-perl/glib-perl-1.160.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/P/PO/POTYL/Gtk2-SourceView2-0.10.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	virtualx	171580f737f5aaf18fcb456548588066
+_md5_=73912c2055d4b3b5f43eef86d2af6abf
diff --git a/metadata/md5-cache/dev-perl/Gtk2-Unique-0.50.0-r2 b/metadata/md5-cache/dev-perl/Gtk2-Unique-0.50.0-r2
new file mode 100644
index 000000000000..394637dfbcd3
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Gtk2-Unique-0.50.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libunique:1 dev-perl/Gtk2 dev-perl/glib-perl dev-perl/ExtUtils-Depends dev-perl/ExtUtils-PkgConfig dev-lang/perl:= test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Perl binding for C libunique library
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Gtk2-Unique/
+IUSE=examples test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-libs/libunique:1 dev-perl/Gtk2 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/P/PO/POTYL/Gtk2-Unique-0.05.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	virtualx	171580f737f5aaf18fcb456548588066
+_md5_=ec76357bcfde8533f057eb62f36f143b
diff --git a/metadata/md5-cache/dev-perl/HTML-Clean-0.800.0-r2 b/metadata/md5-cache/dev-perl/HTML-Clean-0.800.0-r2
new file mode 100644
index 000000000000..d53bcacee8b1
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTML-Clean-0.800.0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!<app-text/html-xml-utils-5.3 dev-lang/perl:=
+DESCRIPTION=Cleans up HTML code for web browsers, not humans
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/HTML-Clean/
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=!<app-text/html-xml-utils-5.3 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/L/LI/LINDNER/HTML-Clean-0.8.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=fbf1d1aa784f52b4fe9b445650258df8
diff --git a/metadata/md5-cache/dev-perl/HTML-Form-6.30.0-r2 b/metadata/md5-cache/dev-perl/HTML-Form-6.30.0-r2
new file mode 100644
index 000000000000..4e9300d3ec6a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTML-Form-6.30.0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!<dev-perl/libwww-perl-6 >=dev-perl/HTTP-Message-6.30.0 >=dev-perl/URI-1.10 dev-perl/HTML-Parser >=virtual/perl-Encode-2 dev-lang/perl:=
+DESCRIPTION=Class that represents an HTML form element
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/HTML-Form/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=!<dev-perl/libwww-perl-6 >=dev-perl/HTTP-Message-6.30.0 >=dev-perl/URI-1.10 dev-perl/HTML-Parser >=virtual/perl-Encode-2 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/HTML-Form-6.03.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=737d4b52fd4638ce50fd262c88271cac
diff --git a/metadata/md5-cache/dev-perl/HTML-Format-2.140.0 b/metadata/md5-cache/dev-perl/HTML-Format-2.140.0
deleted file mode 100644
index 67823a1e0953..000000000000
--- a/metadata/md5-cache/dev-perl/HTML-Format-2.140.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Encode dev-perl/Font-AFM dev-perl/HTML-Tree virtual/perl-IO virtual/perl-parent >=dev-perl/Module-Build-0.280.0 test? ( dev-perl/File-Slurper virtual/perl-File-Spec virtual/perl-Scalar-List-Utils >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl:=
-DESCRIPTION=HTML Formatter
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/HTML-Formatter/
-IUSE=test
-KEYWORDS=amd64 ppc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Encode dev-perl/Font-AFM dev-perl/HTML-Tree virtual/perl-IO virtual/perl-parent dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/N/NI/NIGELM/HTML-Formatter-2.14.tar.gz
-_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=6300258615720909850524fcd026478c
diff --git a/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.150.0 b/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.150.0
deleted file mode 100644
index c73976f204e4..000000000000
--- a/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.150.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/HTML-Format-2 dev-perl/HTML-Tree dev-perl/URI >=dev-perl/Module-Build-0.380.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=HTML to text conversion with links as footnotes
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/HTML-FormatText-WithLinks/
-IUSE=test
-KEYWORDS=amd64
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/HTML-Format-2 dev-perl/HTML-Tree dev-perl/URI dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/ST/STRUAN/HTML-FormatText-WithLinks-0.15.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=c1b5bd3ab1bb19f2c535bbbd5915529d
diff --git a/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.150.0-r1 b/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.150.0-r1
new file mode 100644
index 000000000000..3479f4725380
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.150.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-perl/HTML-Formatter-2 dev-perl/HTML-Tree dev-perl/URI >=dev-perl/Module-Build-0.380.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
+DESCRIPTION=HTML to text conversion with links as footnotes
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/HTML-FormatText-WithLinks/
+IUSE=test
+KEYWORDS=amd64
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/HTML-Formatter-2 dev-perl/HTML-Tree dev-perl/URI dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/ST/STRUAN/HTML-FormatText-WithLinks-0.15.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
+_md5_=8bdc4187bc8f075e16a65de8080f9916
diff --git a/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-AndTables-0.60.0 b/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-AndTables-0.60.0
deleted file mode 100644
index 2032ab13fb9d..000000000000
--- a/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-AndTables-0.60.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/HTML-Format dev-perl/HTML-FormatText-WithLinks dev-perl/HTML-Tree virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Converts HTML to text with tables intact
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/HTML-FormatText-WithLinks-AndTables/
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/HTML-Format dev-perl/HTML-FormatText-WithLinks dev-perl/HTML-Tree dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DA/DALEEVANS/HTML-FormatText-WithLinks-AndTables-0.06.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=cb0b6bf944fadcc7e4aa72f5f3568aef
diff --git a/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-AndTables-0.60.0-r1 b/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-AndTables-0.60.0-r1
new file mode 100644
index 000000000000..2972dae377b0
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-AndTables-0.60.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-perl/HTML-Formatter dev-perl/HTML-FormatText-WithLinks dev-perl/HTML-Tree virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
+DESCRIPTION=Converts HTML to text with tables intact
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/HTML-FormatText-WithLinks-AndTables/
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/HTML-Formatter dev-perl/HTML-FormatText-WithLinks dev-perl/HTML-Tree dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DA/DALEEVANS/HTML-FormatText-WithLinks-AndTables-0.06.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
+_md5_=6475ffd12a665c1e807502de4a2f3959
diff --git a/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-AndTables-0.70.0 b/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-AndTables-0.70.0
deleted file mode 100644
index 180edfb61a69..000000000000
--- a/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-AndTables-0.70.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/HTML-Format dev-perl/HTML-FormatText-WithLinks dev-perl/HTML-Tree virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl:=
-DESCRIPTION=Converts HTML to text with tables intact
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/HTML-FormatText-WithLinks-AndTables/
-IUSE=test
-KEYWORDS=amd64
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/HTML-Format dev-perl/HTML-FormatText-WithLinks dev-perl/HTML-Tree dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DA/DALEEVANS/HTML-FormatText-WithLinks-AndTables-0.07.tar.gz
-_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=977ed2dc6aa03763b85c3c5abf283a76
diff --git a/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-AndTables-0.70.0-r1 b/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-AndTables-0.70.0-r1
new file mode 100644
index 000000000000..ae498393738c
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-AndTables-0.70.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/HTML-Formatter dev-perl/HTML-FormatText-WithLinks dev-perl/HTML-Tree virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl:=
+DESCRIPTION=Converts HTML to text with tables intact
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/HTML-FormatText-WithLinks-AndTables/
+IUSE=test
+KEYWORDS=amd64
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/HTML-Formatter dev-perl/HTML-FormatText-WithLinks dev-perl/HTML-Tree dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DA/DALEEVANS/HTML-FormatText-WithLinks-AndTables-0.07.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=150cd9e738acc6b6be210983884f4320
diff --git a/metadata/md5-cache/dev-perl/HTML-Formatter-2.140.0 b/metadata/md5-cache/dev-perl/HTML-Formatter-2.140.0
new file mode 100644
index 000000000000..ebf5c34cf6ed
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTML-Formatter-2.140.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Encode dev-perl/Font-AFM dev-perl/HTML-Tree virtual/perl-IO virtual/perl-parent >=dev-perl/Module-Build-0.280.0 test? ( dev-perl/File-Slurper virtual/perl-File-Spec virtual/perl-Scalar-List-Utils >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl:=
+DESCRIPTION=HTML Formatter
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/HTML-Formatter/
+IUSE=test
+KEYWORDS=amd64 ppc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Encode dev-perl/Font-AFM dev-perl/HTML-Tree virtual/perl-IO virtual/perl-parent dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/N/NI/NIGELM/HTML-Formatter-2.14.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=b002be648b1437071fc7b17ebb6ee6ab
diff --git a/metadata/md5-cache/dev-perl/HTML-Formatter-2.160.0 b/metadata/md5-cache/dev-perl/HTML-Formatter-2.160.0
new file mode 100644
index 000000000000..f0869c1f056e
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTML-Formatter-2.160.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Encode dev-perl/Font-AFM dev-perl/HTML-Tree virtual/perl-IO virtual/perl-parent virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/File-Slurper virtual/perl-File-Spec >=virtual/perl-Test-Simple-0.960.0 dev-perl/Test-Warnings ) dev-lang/perl:=
+DESCRIPTION=Base class for HTML Formatters
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/HTML-Formatter/
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Encode dev-perl/Font-AFM dev-perl/HTML-Tree virtual/perl-IO virtual/perl-parent dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/N/NI/NIGELM/HTML-Formatter-2.16.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=427f765eeaf2feae6c61ea749b7b4b29
diff --git a/metadata/md5-cache/dev-perl/HTML-LinkExtractor-0.130.0-r2 b/metadata/md5-cache/dev-perl/HTML-LinkExtractor-0.130.0-r2
new file mode 100644
index 000000000000..ed5b08964838
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTML-LinkExtractor-0.130.0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/HTML-Parser dev-lang/perl:=
+DESCRIPTION=A bare-bone HTML parser, similar to HTML::Parser
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/HTML-LinkExtractor/
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/HTML-Parser dev-perl/URI dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/P/PO/PODMASTER/HTML-LinkExtractor-0.13.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=7f708e769018f68db7972ab8ae13e254
diff --git a/metadata/md5-cache/dev-perl/HTML-Mason-1.560.0 b/metadata/md5-cache/dev-perl/HTML-Mason-1.560.0
index 61d673996cfa..e9c9de97868e 100644
--- a/metadata/md5-cache/dev-perl/HTML-Mason-1.560.0
+++ b/metadata/md5-cache/dev-perl/HTML-Mason-1.560.0
@@ -10,4 +10,4 @@ RDEPEND=!modperl? ( >=dev-perl/CGI-2.460.0 ) modperl? ( www-apache/libapreq2 >=w
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.56.tar.gz
 _eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=52b11db1ce758df463488e1885fcbbb9
+_md5_=b4606f6895ef84c6de452b603dc91633
diff --git a/metadata/md5-cache/dev-perl/HTML-Packer-2.60.0 b/metadata/md5-cache/dev-perl/HTML-Packer-2.60.0
new file mode 100644
index 000000000000..9533c9f1c664
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTML-Packer-2.60.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/CSS-Packer-2.10.0 >=dev-perl/JavaScript-Packer-2.10.0 >=dev-perl/Regexp-RegGrp-1.1.1_rc virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl:=
+DESCRIPTION=Another HTML code cleaner
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/HTML-Packer/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/CSS-Packer-2.10.0 >=dev-perl/JavaScript-Packer-2.10.0 >=dev-perl/Regexp-RegGrp-1.1.1_rc dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/HTML-Packer-2.06.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=c5a2505e6c84a13da0b79ee74a71e967
diff --git a/metadata/md5-cache/dev-perl/HTML-Scrubber-0.170.0 b/metadata/md5-cache/dev-perl/HTML-Scrubber-0.170.0
new file mode 100644
index 000000000000..9116c73ee887
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTML-Scrubber-0.170.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Test-Differences dev-perl/Test-Memory-Cycle ) dev-lang/perl:=
+DESCRIPTION=Perl extension for scrubbing/sanitizing html
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/HTML-Scrubber/
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/HTML-Parser dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/N/NI/NIGELM/HTML-Scrubber-0.17.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=724ef8b1ef3a633e1bf39d62ad6e563a
diff --git a/metadata/md5-cache/dev-perl/HTML-SimpleParse-0.120.0-r2 b/metadata/md5-cache/dev-perl/HTML-SimpleParse-0.120.0-r2
new file mode 100644
index 000000000000..f3dbaaf51193
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTML-SimpleParse-0.120.0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/Module-Build-0.28 dev-lang/perl:=
+DESCRIPTION=A bare-bones HTML parser, similar to HTML::Parser
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/HTML-SimpleParse/
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/K/KW/KWILLIAMS/HTML-SimpleParse-0.12.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=bd7a89fb85f0ff4d5924170030bb9d54
diff --git a/metadata/md5-cache/dev-perl/HTML-Strip-2.100.0 b/metadata/md5-cache/dev-perl/HTML-Strip-2.100.0
new file mode 100644
index 000000000000..8f57432c3135
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTML-Strip-2.100.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Test-Exception virtual/perl-Test-Simple ) dev-lang/perl:=
+DESCRIPTION=Extension for stripping HTML markup from text
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/HTML-Strip/
+IUSE=test
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/K/KI/KILINRAX/HTML-Strip-2.10.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=0bdb9bbb17a18e4016dbf7961101ef2e
diff --git a/metadata/md5-cache/dev-perl/HTML-TableExtract-2.150.0 b/metadata/md5-cache/dev-perl/HTML-TableExtract-2.150.0
new file mode 100644
index 000000000000..b409cd91a755
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTML-TableExtract-2.150.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/HTML-Element-Extended-1.160.0 dev-perl/HTML-Parser virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+DESCRIPTION=The Perl Table-Extract Module
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/HTML-TableExtract/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~x86 ~x86-linux
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/HTML-Element-Extended-1.160.0 dev-perl/HTML-Parser dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MS/MSISK/HTML-TableExtract-2.15.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=6ef6acc85769d75e367a8b63ff7f55ec
diff --git a/metadata/md5-cache/dev-perl/HTML-TagFilter-1.30.0 b/metadata/md5-cache/dev-perl/HTML-TagFilter-1.30.0
index 4c4182171b28..4d23c4ab98b1 100644
--- a/metadata/md5-cache/dev-perl/HTML-TagFilter-1.30.0
+++ b/metadata/md5-cache/dev-perl/HTML-TagFilter-1.30.0
@@ -9,4 +9,4 @@ RDEPEND=dev-perl/HTML-Parser dev-perl/URI dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/W/WR/WROSS/HTML-TagFilter-1.03.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=abae790ca91777c8e07b13f5f5f164b6
+_md5_=d85b76274de24909423648400fef868d
diff --git a/metadata/md5-cache/dev-perl/HTML-Template-JIT-0.50.0-r3 b/metadata/md5-cache/dev-perl/HTML-Template-JIT-0.50.0-r3
new file mode 100644
index 000000000000..e07735a0a1ad
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTML-Template-JIT-0.50.0-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/HTML-Template-2.8 dev-perl/Inline dev-perl/Inline-C dev-lang/perl:=
+DESCRIPTION=a just-in-time compiler for HTML::Template
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/HTML-Template-JIT/
+IUSE=examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/HTML-Template-2.8 dev-perl/Inline dev-perl/Inline-C dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SA/SAMTREGAR/HTML-Template-JIT-0.05.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=9adecb658a4b431f201a04f6d07f0059
diff --git a/metadata/md5-cache/dev-perl/HTML-Tree-5.70.0 b/metadata/md5-cache/dev-perl/HTML-Tree-5.70.0
new file mode 100644
index 000000000000..bb195f864495
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTML-Tree-5.70.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp virtual/perl-Exporter >=dev-perl/HTML-Tagset-3.20.0 >=dev-perl/HTML-Parser-3.460.0 virtual/perl-Scalar-List-Utils >=dev-perl/Module-Build-0.280.800 test? ( virtual/perl-Encode dev-perl/Test-Fatal dev-perl/Test-LeakTrace virtual/perl-Test-Simple dev-perl/URI ) dev-lang/perl:=
+DESCRIPTION=A library to manage HTML-Tree in PERL
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/HTML-Tree/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-Exporter >=dev-perl/HTML-Tagset-3.20.0 >=dev-perl/HTML-Parser-3.460.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/K/KE/KENTNL/HTML-Tree-5.07.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=104c8e3d3d2657d45204b79bff8adddc
diff --git a/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-3.140.0 b/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-3.140.0
new file mode 100644
index 000000000000..cc64f69645ee
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-3.140.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/Module-Build-0.280.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-JSON-PP dev-perl/Path-Tiny dev-perl/Test-FailWarnings virtual/perl-Test-Simple dev-perl/Test-Most dev-perl/Test-NoWarnings ) dev-lang/perl:=
+DESCRIPTION=Determine Web browser, version, and platform from an HTTP user agent string
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/HTTP-BrowserDetect/
+IUSE=test
+KEYWORDS=~amd64 ~hppa ~mips ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/HTTP-BrowserDetect-3.14.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=2bdc2d4dc43f9d939bc2310a6cb62473
diff --git a/metadata/md5-cache/dev-perl/HTTP-Cookies-6.40.0 b/metadata/md5-cache/dev-perl/HTTP-Cookies-6.40.0
new file mode 100644
index 000000000000..b6a86f1fb63a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTTP-Cookies-6.40.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!<dev-perl/libwww-perl-6 virtual/perl-Carp >=dev-perl/HTTP-Date-6.0.0 virtual/perl-Time-Local >=dev-perl/HTTP-Message-6.0.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test virtual/perl-Test-Simple dev-perl/URI ) dev-lang/perl:=
+DESCRIPTION=Storage of cookies
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/HTTP-Cookies/
+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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=!<dev-perl/libwww-perl-6 virtual/perl-Carp >=dev-perl/HTTP-Date-6.0.0 virtual/perl-Time-Local >=dev-perl/HTTP-Message-6.0.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Cookies-6.04.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=b3a638f1ab1201250076600530f6955f
diff --git a/metadata/md5-cache/dev-perl/HTTP-Daemon-6.10.0-r2 b/metadata/md5-cache/dev-perl/HTTP-Daemon-6.10.0-r2
new file mode 100644
index 000000000000..83c6eb9a3a01
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTTP-Daemon-6.10.0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!<dev-perl/libwww-perl-6 >=dev-perl/HTTP-Date-6.0.0 virtual/perl-IO >=dev-perl/HTTP-Message-6.0.0 >=dev-perl/LWP-MediaTypes-6.0.0 dev-lang/perl:=
+DESCRIPTION=Base class for simple HTTP servers
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/HTTP-Daemon/
+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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=!<dev-perl/libwww-perl-6 >=dev-perl/HTTP-Date-6.0.0 virtual/perl-IO >=dev-perl/HTTP-Message-6.0.0 >=dev-perl/LWP-MediaTypes-6.0.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/HTTP-Daemon-6.01.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=3d8974935923c84e6f75f24c0b33b38f
diff --git a/metadata/md5-cache/dev-perl/HTTP-Entity-Parser-0.200.0 b/metadata/md5-cache/dev-perl/HTTP-Entity-Parser-0.200.0
new file mode 100644
index 000000000000..5e1bcdd38119
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTTP-Entity-Parser-0.200.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Encode virtual/perl-File-Temp dev-perl/HTTP-MultiPartParser dev-perl/Hash-MultiValue >=dev-perl/JSON-MaybeXS-1.3.7 virtual/perl-Module-Load dev-perl/Stream-Buffered >=dev-perl/WWW-Form-UrlEncoded-0.230.0 xs? ( >=dev-perl/WWW-Form-UrlEncoded-XS-0.230.0 ) >=dev-perl/Module-Build-Tiny-0.35.0 test? ( virtual/perl-File-Spec >=dev-perl/HTTP-Message-6 >=virtual/perl-Test-Simple-0.980.0 ) dev-lang/perl:=
+DESCRIPTION=PSGI compliant HTTP Entity Parser
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/HTTP-Entity-Parser/
+IUSE=test +xs examples
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Encode virtual/perl-File-Temp dev-perl/HTTP-MultiPartParser dev-perl/Hash-MultiValue >=dev-perl/JSON-MaybeXS-1.3.7 virtual/perl-Module-Load dev-perl/Stream-Buffered >=dev-perl/WWW-Form-UrlEncoded-0.230.0 xs? ( >=dev-perl/WWW-Form-UrlEncoded-XS-0.230.0 ) dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/K/KA/KAZEBURO/HTTP-Entity-Parser-0.20.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=9e9216f967ff884fd3ed71174534f899
diff --git a/metadata/md5-cache/dev-perl/HTTP-Message-6.130.0 b/metadata/md5-cache/dev-perl/HTTP-Message-6.130.0
new file mode 100644
index 000000000000..69f73745d012
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTTP-Message-6.130.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!<dev-perl/libwww-perl-6 virtual/perl-Compress-Raw-Zlib >=dev-perl/URI-1.100.0 >=virtual/perl-Encode-2.210.0 >=dev-perl/HTTP-Date-6.0.0 dev-perl/IO-HTML >=dev-perl/Encode-Locale-1.0.0 >=dev-perl/LWP-MediaTypes-6.0.0 >=virtual/perl-IO-Compress-2.021 >=virtual/perl-MIME-Base64-2.100.0 >=virtual/perl-Exporter-5.570.0 virtual/perl-Storable virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec >=virtual/perl-Test-Simple-0.880.0 virtual/perl-Time-Local dev-perl/Try-Tiny ) dev-lang/perl:=
+DESCRIPTION=Base class for Request/Response
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/HTTP-Message/
+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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=!<dev-perl/libwww-perl-6 virtual/perl-Compress-Raw-Zlib >=dev-perl/URI-1.100.0 >=virtual/perl-Encode-2.210.0 >=dev-perl/HTTP-Date-6.0.0 dev-perl/IO-HTML >=dev-perl/Encode-Locale-1.0.0 >=dev-perl/LWP-MediaTypes-6.0.0 >=virtual/perl-IO-Compress-2.021 >=virtual/perl-MIME-Base64-2.100.0 >=virtual/perl-Exporter-5.570.0 virtual/perl-Storable dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Message-6.13.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=c8d949db9f172abf00b7069987a47f4d
diff --git a/metadata/md5-cache/dev-perl/HTTP-Negotiate-6.10.0-r1 b/metadata/md5-cache/dev-perl/HTTP-Negotiate-6.10.0-r1
new file mode 100644
index 000000000000..e0968715bba5
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTTP-Negotiate-6.10.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!<dev-perl/libwww-perl-6 >=dev-perl/HTTP-Message-6.0.0 dev-lang/perl:=
+DESCRIPTION=HTTP content negotiation
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/HTTP-Negotiate/
+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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=!<dev-perl/libwww-perl-6 >=dev-perl/HTTP-Message-6.0.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/HTTP-Negotiate-6.01.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=76679e560c8565a5a4a46a29b7c063d8
diff --git a/metadata/md5-cache/dev-perl/HTTP-Server-Simple-Mason-0.140.0-r1 b/metadata/md5-cache/dev-perl/HTTP-Server-Simple-Mason-0.140.0-r1
index 9deb90c163ab..e420d0aca2bb 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Server-Simple-Mason-0.140.0-r1
+++ b/metadata/md5-cache/dev-perl/HTTP-Server-Simple-Mason-0.140.0-r1
@@ -9,4 +9,4 @@ RDEPEND=dev-perl/Hook-LexWrap dev-perl/URI dev-perl/libwww-perl >=dev-perl/HTML-
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JE/JESSE/HTTP-Server-Simple-Mason-0.14.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=58d6c5cd63317607053dbfa68d81efbb
+_md5_=d0b6c8eb23618e5a653f76bee0f961cc
diff --git a/metadata/md5-cache/dev-perl/Hash-NoRef-0.30.0-r2 b/metadata/md5-cache/dev-perl/Hash-NoRef-0.30.0-r2
new file mode 100644
index 000000000000..fee56c28eacb
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Hash-NoRef-0.30.0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl:=
+DESCRIPTION=Hash to store values without increasing reference count (weak references)
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Hash-NoRef/
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/G/GM/GMPASSOS/Hash-NoRef-0.03.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=fff4fab32ec29824dc5e9996ff34bc96
diff --git a/metadata/md5-cache/dev-perl/Heap-0.800.0-r2 b/metadata/md5-cache/dev-perl/Heap-0.800.0-r2
new file mode 100644
index 000000000000..3a251c8a5993
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Heap-0.800.0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl:=
+DESCRIPTION=Perl extensions for keeping data partially sorted
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Heap/
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/J/JM/JMM/Heap-0.80.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=d5c464a3252cd3f6ad91372a15fa96cd
diff --git a/metadata/md5-cache/dev-perl/Hook-LexWrap-0.260.0 b/metadata/md5-cache/dev-perl/Hook-LexWrap-0.260.0
new file mode 100644
index 000000000000..562cfb1539ec
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Hook-LexWrap-0.260.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec virtual/perl-Test-Simple ) dev-lang/perl:=
+DESCRIPTION=Lexically scoped subroutine wrappers
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Hook-LexWrap/
+IUSE=test examples
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Hook-LexWrap-0.26.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=acfd4d0493fcf021fc5f0a7bf8f2b4af
diff --git a/metadata/md5-cache/dev-perl/IMAP-Admin-1.6.8 b/metadata/md5-cache/dev-perl/IMAP-Admin-1.6.8
new file mode 100644
index 000000000000..303666d6cf35
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/IMAP-Admin-1.6.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl:=
+DESCRIPTION=Perl module for basic IMAP server administration
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/IMAP-Admin/
+IUSE=examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/EE/EESTABROO/IMAP-Admin-1.6.8.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=60d899f164c9e8685661326707a3c855
diff --git a/metadata/md5-cache/dev-perl/IO-AIO-4.340.0 b/metadata/md5-cache/dev-perl/IO-AIO-4.340.0
new file mode 100644
index 000000000000..a167afc186a4
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/IO-AIO-4.340.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/common-sense >=dev-perl/Canary-Stability-2001 >=virtual/perl-ExtUtils-MakeMaker-6.520.0 dev-lang/perl:=
+DESCRIPTION=Asynchronous Input/Output
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/IO-AIO/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/common-sense dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/IO-AIO-4.34.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=d5fefed1be35c92d0aacc80bcd822c47
diff --git a/metadata/md5-cache/dev-perl/IO-All-0.870.0 b/metadata/md5-cache/dev-perl/IO-All-0.870.0
new file mode 100644
index 000000000000..48b56d8f1a74
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/IO-All-0.870.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=
+DESCRIPTION=unified IO operations
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/IO-All/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Scalar-List-Utils virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/F/FR/FREW/IO-All-0.87.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=df2704aab660608cc862dc3a6a9beaff
diff --git a/metadata/md5-cache/dev-perl/IO-BufferedSelect-1.0.0-r2 b/metadata/md5-cache/dev-perl/IO-BufferedSelect-1.0.0-r2
new file mode 100644
index 000000000000..365f99cb9ef8
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/IO-BufferedSelect-1.0.0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl:=
+DESCRIPTION=Perl module that implements a line-buffered select interface
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/IO-BufferedSelect/
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AF/AFN/IO-BufferedSelect-1.0.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=96a7db7e590f6525a795b08f2c33ca0a
diff --git a/metadata/md5-cache/dev-perl/IO-Capture-0.50.0-r2 b/metadata/md5-cache/dev-perl/IO-Capture-0.50.0-r2
new file mode 100644
index 000000000000..07a82dc05c6f
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/IO-Capture-0.50.0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl:=
+DESCRIPTION=Abstract Base Class to build modules to capture output
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/IO-Capture/
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RE/REYNOLDS/IO-Capture-0.05.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=ddf8b049d8d9865a57c1aa9ab6f1cfd9
diff --git a/metadata/md5-cache/dev-perl/IO-CaptureOutput-1.110.400-r1 b/metadata/md5-cache/dev-perl/IO-CaptureOutput-1.110.400-r1
new file mode 100644
index 000000000000..849fa98a714e
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/IO-CaptureOutput-1.110.400-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp virtual/perl-Exporter >=virtual/perl-File-Temp-0.160.0 >=virtual/perl-ExtUtils-MakeMaker-6.170.0 test? ( >=virtual/perl-File-Spec-3.270.0 virtual/perl-IO >=virtual/perl-Test-Simple-0.620.0 ) dev-lang/perl:=
+DESCRIPTION=Capture STDOUT and STDERR from Perl code, subprocesses or XS
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/IO-CaptureOutput/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-linux
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-Exporter >=virtual/perl-File-Temp-0.160.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/IO-CaptureOutput-1.1104.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=6295b9142fee4b4ff78c6b5444089fdb
diff --git a/metadata/md5-cache/dev-perl/IO-Digest-0.110.0-r2 b/metadata/md5-cache/dev-perl/IO-Digest-0.110.0-r2
index c3bfba485670..dd6ad207eac8 100644
--- a/metadata/md5-cache/dev-perl/IO-Digest-0.110.0-r2
+++ b/metadata/md5-cache/dev-perl/IO-Digest-0.110.0-r2
@@ -9,4 +9,4 @@ RDEPEND=>=dev-perl/PerlIO-via-dynamic-0.10 virtual/perl-Digest dev-lang/perl:=[-
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CL/CLKAO/IO-Digest-0.11.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=d2ba28676dea87287cb5d1564fb6c9c1
+_md5_=bd7c4dcce3eee44b60b37337f85b1724
diff --git a/metadata/md5-cache/dev-perl/IO-Event-0.813.0-r1 b/metadata/md5-cache/dev-perl/IO-Event-0.813.0-r1
new file mode 100644
index 000000000000..36a9bb19fee8
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/IO-Event-0.813.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/AnyEvent dev-perl/Event dev-perl/List-MoreUtils virtual/perl-Time-HiRes dev-lang/perl:=
+DESCRIPTION=Tied Filehandles for Nonblocking IO with Object Callbacks
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/IO-Event/
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/AnyEvent dev-perl/Event dev-perl/List-MoreUtils virtual/perl-Time-HiRes dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MU/MUIR/modules/IO-Event-0.813.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=723975c8a7f5cb197f2127f7b0a80dae
diff --git a/metadata/md5-cache/dev-perl/IO-Interactive-1.22.0 b/metadata/md5-cache/dev-perl/IO-Interactive-1.22.0
new file mode 100644
index 000000000000..8092813aac7b
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/IO-Interactive-1.22.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=virtual/perl-version-0.780.0 >=virtual/perl-ExtUtils-MakeMaker-6.640.0 virtual/perl-File-Spec test? ( >=virtual/perl-Test-Simple-0.940.0 ) dev-lang/perl:=
+DESCRIPTION=Utilities for interactive I/O
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/IO-Interactive/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-version-0.780.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/IO-Interactive-1.022.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=1d0ca301ee3e15201f67c8226f8098f5
diff --git a/metadata/md5-cache/dev-perl/IO-Pager-0.390.0 b/metadata/md5-cache/dev-perl/IO-Pager-0.390.0
new file mode 100644
index 000000000000..eac8071a8504
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/IO-Pager-0.390.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-File-Spec dev-perl/File-Which virtual/perl-IO virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Exporter virtual/perl-Test-Simple virtual/perl-File-Temp ) dev-lang/perl:=
+DESCRIPTION=Select a pager, optionally pipe it output if destination is a TTY
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/IO-Pager/
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-File-Spec dev-perl/File-Which virtual/perl-IO dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-0.39.tgz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=211d1d5b722f6874b233a6ac409ccce8
diff --git a/metadata/md5-cache/dev-perl/IO-Pipely-0.5.0-r1 b/metadata/md5-cache/dev-perl/IO-Pipely-0.5.0-r1
new file mode 100644
index 000000000000..2736eabe14fe
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/IO-Pipely-0.5.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl:=
+DESCRIPTION=Portably create pipe() or pipe-like handles, one way or another
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/IO-Pipely/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RC/RCAPUTO/IO-Pipely-0.005.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=2f84b3501faadbcc5593f96c757bd8e8
diff --git a/metadata/md5-cache/dev-perl/IO-SessionData-1.30.0-r1 b/metadata/md5-cache/dev-perl/IO-SessionData-1.30.0-r1
new file mode 100644
index 000000000000..13264044d116
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/IO-SessionData-1.30.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+DESCRIPTION=Session data support module for SOAP::Lite
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/IO-SessionData/
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/IO-SessionData-1.03.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=23945a2d43070cd24061a6b5528124c8
diff --git a/metadata/md5-cache/dev-perl/IO-Socket-INET6-2.720.0-r1 b/metadata/md5-cache/dev-perl/IO-Socket-INET6-2.720.0-r1
new file mode 100644
index 000000000000..5a339ed660d9
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/IO-Socket-INET6-2.720.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/Socket6 dev-perl/Module-Build dev-lang/perl:=
+DESCRIPTION=Work with IO sockets in ipv6
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/IO-Socket-INET6/
+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 ~x86-macos ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Socket6 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/IO-Socket-INET6-2.72.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=bd9d5f1d59c80638e1fc76ee5fc3c116
diff --git a/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.48.0 b/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.48.0
index 2fecf3958c05..32b188a3a766 100644
--- a/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.48.0
+++ b/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.48.0
@@ -4,10 +4,10 @@ DESCRIPTION=Nearly transparent SSL encapsulation for IO::Socket::INET
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/IO-Socket-SSL/
 IUSE=idn examples
-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 ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Net-SSLeay-1.460.0 virtual/perl-Scalar-List-Utils idn? ( || ( >=dev-perl/URI-1.50 dev-perl/Net-LibIDN dev-perl/Net-IDN-Encode ) ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.048.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=406bc531d44909204b76769a91767331
+_md5_=4e24e1ea7ae49f2c04319f2420101d8e
diff --git a/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.52.0 b/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.52.0
new file mode 100644
index 000000000000..7d4be75815c1
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.52.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/Net-SSLeay-1.460.0 virtual/perl-Scalar-List-Utils idn? ( || ( >=dev-perl/URI-1.50 dev-perl/Net-LibIDN dev-perl/Net-IDN-Encode ) ) virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+DESCRIPTION=Nearly transparent SSL encapsulation for IO::Socket::INET
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/IO-Socket-SSL/
+IUSE=idn examples
+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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Net-SSLeay-1.460.0 virtual/perl-Scalar-List-Utils idn? ( || ( >=dev-perl/URI-1.50 dev-perl/Net-LibIDN dev-perl/Net-IDN-Encode ) ) dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.052.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=cc5dcd42e85446680a5676866311502f
diff --git a/metadata/md5-cache/dev-perl/IO-Tee-0.650.0 b/metadata/md5-cache/dev-perl/IO-Tee-0.650.0
new file mode 100644
index 000000000000..52128f8440ae
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/IO-Tee-0.650.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+DESCRIPTION=Multiplex output to multiple output handles
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/IO-Tee/
+KEYWORDS=~amd64 ~ia64 ~ppc ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-IO virtual/perl-parent dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/IO-Tee-0.65.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=d3bc9ada6b5830cad7fbf6b931ea8273
diff --git a/metadata/md5-cache/dev-perl/IO-Util-1.500.0-r2 b/metadata/md5-cache/dev-perl/IO-Util-1.500.0-r2
new file mode 100644
index 000000000000..e1ad13054b06
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/IO-Util-1.500.0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl:=
+DESCRIPTION=A selection of general-utility IO function
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/IO-Util/
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DO/DOMIZIO/IO-Util-1.5.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=630a7f0f1665f9c777228914e4ae2322
diff --git a/metadata/md5-cache/dev-perl/IPC-Run-0.940.0 b/metadata/md5-cache/dev-perl/IPC-Run-0.940.0
index f69620fe99fb..986c5470349c 100644
--- a/metadata/md5-cache/dev-perl/IPC-Run-0.940.0
+++ b/metadata/md5-cache/dev-perl/IPC-Run-0.940.0
@@ -4,10 +4,10 @@ DESCRIPTION=system() and background procs w/ piping, redirs, ptys
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/IPC-Run/
 IUSE=test
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-linux
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/IO-Tty-1.80.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-0.94.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=9b34370244173bb45c3586caab18dad6
+_md5_=f5a1fbe1b1b5a2de6986a8f5467c1ea0
diff --git a/metadata/md5-cache/dev-perl/IPC-Run-0.960.0 b/metadata/md5-cache/dev-perl/IPC-Run-0.960.0
index 63cc13de05bd..54e6c142bfb3 100644
--- a/metadata/md5-cache/dev-perl/IPC-Run-0.960.0
+++ b/metadata/md5-cache/dev-perl/IPC-Run-0.960.0
@@ -4,10 +4,10 @@ DESCRIPTION=system() and background procs w/ piping, redirs, ptys
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/IPC-Run/
 IUSE=test
-KEYWORDS=alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/IO-Tty-1.80.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-0.96.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=20e2bd95ee6e6103c2c29baef19c34dc
+_md5_=1c318e22afdb47df5bd6535d45ff9be8
diff --git a/metadata/md5-cache/dev-perl/IPC-Signal-1.0.0-r2 b/metadata/md5-cache/dev-perl/IPC-Signal-1.0.0-r2
new file mode 100644
index 000000000000..c82164d9ccb4
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/IPC-Signal-1.0.0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl:=
+DESCRIPTION=Translate signal names to/from numbers
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/IPC-Signal/
+KEYWORDS=~amd64 ~ia64 ~ppc ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RO/ROSCH/IPC-Signal-1.00.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=94d6d3c4fe773222589316edfa198d52
diff --git a/metadata/md5-cache/dev-perl/Image-Info-1.410.0 b/metadata/md5-cache/dev-perl/Image-Info-1.410.0
new file mode 100644
index 000000000000..35b31f5709f6
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Image-Info-1.410.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/IO-stringy-1.01 dev-perl/XML-LibXML dev-perl/XML-Simple dev-lang/perl:=
+DESCRIPTION=The Perl Image-Info Module
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Image-Info/
+IUSE=examples
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/IO-stringy-1.01 dev-perl/XML-LibXML dev-perl/XML-Simple dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SR/SREZIC/Image-Info-1.41.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=c462e6f8b4721b3692bc6771d2705b36
diff --git a/metadata/md5-cache/dev-perl/Image-Sane-0.120.0 b/metadata/md5-cache/dev-perl/Image-Sane-0.120.0
index 582931bbe741..837bca89749a 100644
--- a/metadata/md5-cache/dev-perl/Image-Sane-0.120.0
+++ b/metadata/md5-cache/dev-perl/Image-Sane-0.120.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Exception-Class dev-perl/Readonly >=media-gfx/sane-backends-1.0.19 dev-perl/ExtUtils-Depends dev-perl/ExtUtils-PkgConfig test? ( dev-perl/Test-Requires ) dev-lang/perl:=
+DEPEND=dev-perl/Exception-Class dev-perl/Readonly >=media-gfx/sane-backends-1.0.19 dev-perl/ExtUtils-Depends dev-perl/ExtUtils-PkgConfig test? ( dev-perl/Test-Requires dev-perl/Try-Tiny ) dev-lang/perl:=
 DESCRIPTION=Access SANE-compatible scanners from Perl
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Image-Sane/
 IUSE=test examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Exception-Class dev-perl/Readonly >=media-gfx/sane-backends-1.0.19 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RA/RATCLIFFE/Image-Sane-0.12.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=9595a185915fb9b68d6ffa6c2a2c94d0
+_md5_=e13cadf9b919812cdc579e0085eb77dc
diff --git a/metadata/md5-cache/dev-perl/Image-Sane-0.140.0 b/metadata/md5-cache/dev-perl/Image-Sane-0.140.0
new file mode 100644
index 000000000000..876b15a9332e
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Image-Sane-0.140.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/Exception-Class dev-perl/Readonly >=media-gfx/sane-backends-1.0.19 dev-perl/ExtUtils-Depends dev-perl/ExtUtils-PkgConfig test? ( dev-perl/Test-Requires dev-perl/Try-Tiny ) dev-lang/perl:=
+DESCRIPTION=Access SANE-compatible scanners from Perl
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Image-Sane/
+IUSE=test examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Exception-Class dev-perl/Readonly >=media-gfx/sane-backends-1.0.19 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RA/RATCLIFFE/Image-Sane-0.14.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=438cd57f0791b36bb4298a5f77966d17
diff --git a/metadata/md5-cache/dev-perl/Image-Scale-0.130.0 b/metadata/md5-cache/dev-perl/Image-Scale-0.130.0
new file mode 100644
index 000000000000..66377cb85c4a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Image-Scale-0.130.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg:0 ) gif? ( media-libs/giflib ) test? ( dev-perl/Test-NoWarnings ) virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+DESCRIPTION=Fast, high-quality fixed-point image resizing
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Image-Scale/
+IUSE=+gif jpeg +png test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 )
+RDEPEND=png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg:0 ) gif? ( media-libs/giflib ) dev-lang/perl:=
+REQUIRED_USE=|| ( jpeg png )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AG/AGRUNDMA/Image-Scale-0.13.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=3cac360103938b333f067fa073e31b33
diff --git a/metadata/md5-cache/dev-perl/Inline-Python-0.560.0 b/metadata/md5-cache/dev-perl/Inline-Python-0.560.0
new file mode 100644
index 000000000000..e186590a222c
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Inline-Python-0.560.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=virtual/perl-Data-Dumper >=virtual/perl-Digest-MD5-2.500.0 >=dev-perl/Inline-0.460.0 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] virtual/perl-ExtUtils-MakeMaker test? ( >=dev-perl/Proc-ProcessTable-0.530.0 virtual/perl-Test-Simple dev-perl/Test-Deep dev-perl/Test-Number-Delta virtual/perl-Test ) dev-lang/perl:=
+DESCRIPTION=Easy implementation of Python extensions
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Inline-Python/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
+KEYWORDS=~amd64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Data-Dumper >=virtual/perl-Digest-MD5-2.500.0 >=dev-perl/Inline-0.460.0 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-lang/perl:=
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/N/NI/NINE/Inline-Python-0.56.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=75141b8d362b549de7f396f3c8a91b33
diff --git a/metadata/md5-cache/dev-perl/JSON-Parse-0.550.0 b/metadata/md5-cache/dev-perl/JSON-Parse-0.550.0
new file mode 100644
index 000000000000..f3f9902873d2
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/JSON-Parse-0.550.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Getopt-Long virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple virtual/perl-Encode ) dev-lang/perl:=
+DESCRIPTION=Read JSON into a Perl Variable
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/JSON-Parse/
+IUSE=test examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Getopt-Long dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BK/BKB/JSON-Parse-0.55.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=a5ec6015a0897f4cc8f5ecb322e027fd
diff --git a/metadata/md5-cache/dev-perl/JSON-XS-3.40.0 b/metadata/md5-cache/dev-perl/JSON-XS-3.40.0
new file mode 100644
index 000000000000..fdf391c3f05c
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/JSON-XS-3.40.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/Types-Serialiser dev-perl/common-sense !<dev-perl/JSON-2.900.0 !<dev-perl/JSON-Any-1.310.0 dev-perl/Canary-Stability >=virtual/perl-ExtUtils-MakeMaker-6.520.0 test? ( virtual/perl-Test-Harness ) dev-lang/perl:=
+DESCRIPTION=JSON::XS - JSON serialising/deserialising, done correctly and fast
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/JSON-XS/
+IUSE=test examples
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Types-Serialiser dev-perl/common-sense !<dev-perl/JSON-2.900.0 !<dev-perl/JSON-Any-1.310.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-3.04.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=2f67c00f2d09e81139758111215c595e
diff --git a/metadata/md5-cache/dev-perl/JavaScript-SpiderMonkey-0.210.0-r1 b/metadata/md5-cache/dev-perl/JavaScript-SpiderMonkey-0.210.0-r1
index 5d6729e9b4e5..198568ca7fd1 100644
--- a/metadata/md5-cache/dev-perl/JavaScript-SpiderMonkey-0.210.0-r1
+++ b/metadata/md5-cache/dev-perl/JavaScript-SpiderMonkey-0.210.0-r1
@@ -9,4 +9,4 @@ RDEPEND=dev-perl/Log-Log4perl >=dev-lang/spidermonkey-1.5:0 dev-lang/perl:=[-bui
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TB/TBUSCH/JavaScript-SpiderMonkey-0.21.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=300444c0ca15adb5cc90e2141d16f242
+_md5_=7c10deea82576d53ea2c7e09b90fd8a8
diff --git a/metadata/md5-cache/dev-perl/LWPx-ParanoidAgent-1.120.0 b/metadata/md5-cache/dev-perl/LWPx-ParanoidAgent-1.120.0
new file mode 100644
index 000000000000..ae0771b17609
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/LWPx-ParanoidAgent-1.120.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/libwww-perl dev-perl/Net-DNS virtual/perl-Time-HiRes dev-lang/perl:=
+DESCRIPTION=Subclass of LWP::UserAgent that protects you from harm
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/LWPx-ParanoidAgent/
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/libwww-perl dev-perl/Net-DNS virtual/perl-Time-HiRes virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SA/SAXJAZMAN/lwp/LWPx-ParanoidAgent-1.12.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=4fe90533902ed4db676724c353766004
diff --git a/metadata/md5-cache/dev-perl/LaTeX-Driver-0.200.4 b/metadata/md5-cache/dev-perl/LaTeX-Driver-0.200.4
index 215a9d2589c5..a4ad328d4666 100644
--- a/metadata/md5-cache/dev-perl/LaTeX-Driver-0.200.4
+++ b/metadata/md5-cache/dev-perl/LaTeX-Driver-0.200.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Class-Accessor dev-perl/Exception-Class dev-perl/File-Slurp virtual/perl-File-Spec dev-perl/File-pushd virtual/perl-Getopt-Long dev-perl/Readonly virtual/perl-parent virtual/latex-base virtual/perl-ExtUtils-MakeMaker test? ( app-text/texlive dev-texlive/texlive-latexextra ) dev-lang/perl:=
+DEPEND=dev-perl/Class-Accessor dev-perl/Exception-Class dev-perl/File-Slurp virtual/perl-File-Spec dev-perl/File-pushd virtual/perl-Getopt-Long dev-perl/Readonly virtual/perl-parent virtual/latex-base virtual/perl-ExtUtils-MakeMaker test? ( app-text/texlive-core dev-texlive/texlive-latexextra ) dev-lang/perl:=
 DESCRIPTION=Perl encapsulation of invoking the Latex programs
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/LaTeX-Driver/
@@ -10,4 +10,4 @@ RDEPEND=dev-perl/Class-Accessor dev-perl/Exception-Class dev-perl/File-Slurp vir
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EI/EINHVERFR/LaTeX-Driver-0.200.4.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=6d67315726bde0537e0cc8e4dfc93551
+_md5_=f1cae65ad352492e1ea834d45f5e3cf1
diff --git a/metadata/md5-cache/dev-perl/LaTeX-Driver-0.300.2 b/metadata/md5-cache/dev-perl/LaTeX-Driver-0.300.2
new file mode 100644
index 000000000000..d60dbf2746dd
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/LaTeX-Driver-0.300.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/Capture-Tiny dev-perl/Class-Accessor dev-perl/Exception-Class dev-perl/File-Slurp virtual/perl-File-Spec dev-perl/File-pushd virtual/perl-Getopt-Long dev-perl/Readonly virtual/perl-parent virtual/latex-base >=virtual/perl-ExtUtils-MakeMaker-6.590.0 test? ( >=virtual/perl-Test-Simple-0.880.0 dev-perl/Test-Exception app-text/texlive-core dev-texlive/texlive-latexextra ) dev-lang/perl:=
+DESCRIPTION=Perl encapsulation of invoking the Latex programs
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/LaTeX-Driver/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Capture-Tiny dev-perl/Class-Accessor dev-perl/Exception-Class dev-perl/File-Slurp virtual/perl-File-Spec dev-perl/File-pushd virtual/perl-Getopt-Long dev-perl/Readonly virtual/perl-parent virtual/latex-base dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/EI/EINHVERFR/LaTeX-Driver-0.300.2.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=4c099dce3b30c913af397eac186b9e87
diff --git a/metadata/md5-cache/dev-perl/Lab-Zhinst-1.20.0 b/metadata/md5-cache/dev-perl/Lab-Zhinst-1.20.0
new file mode 100644
index 000000000000..63d838eb00c0
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Lab-Zhinst-1.20.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sci-electronics/labone virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+DESCRIPTION=Perl bindings to the LabOne API of Zurich Instruments
+EAPI=6
+HOMEPAGE=http://search.cpan.org/~amba/Lab-Zhinst/
+KEYWORDS=~amd64
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=sci-electronics/labone dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AM/AMBA/Lab-Zhinst-1.02.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=fb1326ff9c83c011a368a962c0cbfa42
diff --git a/metadata/md5-cache/dev-perl/Lexical-SealRequireHints-0.11.0 b/metadata/md5-cache/dev-perl/Lexical-SealRequireHints-0.11.0
new file mode 100644
index 000000000000..90c7b9c9fc93
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Lexical-SealRequireHints-0.11.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!<dev-perl/B-Hooks-OP-Check-0.190.0 dev-perl/Module-Build test? ( >=virtual/perl-Test-Simple-0.410.0 ) dev-lang/perl:=
+DESCRIPTION=Prevent leakage of lexical hints
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Lexical-SealRequireHints/
+IUSE=test
+KEYWORDS=~amd64 ~hppa ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=!<dev-perl/B-Hooks-OP-Check-0.190.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Lexical-SealRequireHints-0.011.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=ddf2878f2079340aeda8385fd8acd81c
diff --git a/metadata/md5-cache/dev-perl/Lingua-EN-NameParse-1.360.0 b/metadata/md5-cache/dev-perl/Lingua-EN-NameParse-1.360.0
new file mode 100644
index 000000000000..93faf6251b40
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Lingua-EN-NameParse-1.360.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/Parse-RecDescent-1 >=dev-perl/Module-Build-0.380.0 test? ( >=virtual/perl-Test-Simple-0.940.0 ) dev-lang/perl:=
+DESCRIPTION=routines for manipulating a person's name
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Lingua-EN-NameParse/
+IUSE=test examples
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Parse-RecDescent-1 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/K/KI/KIMRYAN/Lingua-EN-NameParse-1.36.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=73671d9b39ceee88d1b64d7a683bd5c9
diff --git a/metadata/md5-cache/dev-perl/Lingua-Translit-0.280.0 b/metadata/md5-cache/dev-perl/Lingua-Translit-0.280.0
new file mode 100644
index 000000000000..7fd6c4c61ec3
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Lingua-Translit-0.280.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+DESCRIPTION=Transliterates text between writing systems
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Lingua-Translit/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AL/ALINKE/Lingua-Translit-0.28.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=465c24e8bac175ea3d8d1bffcee94a43
diff --git a/metadata/md5-cache/dev-perl/Linux-DesktopFiles-0.250.0 b/metadata/md5-cache/dev-perl/Linux-DesktopFiles-0.250.0
new file mode 100644
index 000000000000..b6f8a4ce0f50
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Linux-DesktopFiles-0.250.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/Module-Build dev-lang/perl:=
+DESCRIPTION=Perl module to get and parse the Linux .desktop files
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Linux-DesktopFiles/
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic-2
+RDEPEND=>=dev-lang/perl-5.14.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TR/TRIZEN/Linux-DesktopFiles-0.25.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=09ba262458057cf2bbcba9a84ab3e4af
diff --git a/metadata/md5-cache/dev-perl/List-MoreUtils-0.426.0 b/metadata/md5-cache/dev-perl/List-MoreUtils-0.426.0
new file mode 100644
index 000000000000..d7129db912eb
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/List-MoreUtils-0.426.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/Exporter-Tiny-0.38.0 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl:=
+DESCRIPTION=Provide the missing functionality from List::Util
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/List-MoreUtils/
+IUSE=test +xs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=Apache-2.0 || ( Artistic GPL-1+ )
+PDEPEND=xs? ( >=dev-perl/List-MoreUtils-XS-0.426.0 )
+RDEPEND=>=dev-perl/Exporter-Tiny-0.38.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-0.426.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=698b505fbe143ff5a25cfb6150e2503d
diff --git a/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.426.0 b/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.426.0
new file mode 100644
index 000000000000..e88a24dbe074
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.426.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!<dev-perl/List-MoreUtils-0.417.1 >=virtual/perl-XSLoader-0.220.0 virtual/perl-Carp virtual/perl-ExtUtils-MakeMaker virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-IPC-Cmd test? ( >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl:=
+DESCRIPTION=Compiled List::MoreUtils functions
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/List-MoreUtils-XS/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=Apache-2.0 || ( Artistic GPL-1+ )
+RDEPEND=!<dev-perl/List-MoreUtils-0.417.1 >=virtual/perl-XSLoader-0.220.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-XS-0.426.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=8c7a5843e0bfed976ef308067c14b565
diff --git a/metadata/md5-cache/dev-perl/List-SomeUtils-0.560.0 b/metadata/md5-cache/dev-perl/List-SomeUtils-0.560.0
new file mode 100644
index 000000000000..e990e2d482ca
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/List-SomeUtils-0.560.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp virtual/perl-Exporter dev-perl/Module-Implementation >=dev-perl/List-SomeUtils-XS-0.550.0 virtual/perl-ExtUtils-MakeMaker virtual/perl-Text-ParseWords test? ( virtual/perl-File-Spec dev-perl/Test-LeakTrace >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl:=
+DESCRIPTION=A colletion of List utilities missing from List::Util
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/List-SomeUtils/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-perl/Module-Implementation >=dev-perl/List-SomeUtils-XS-0.550.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/List-SomeUtils-0.56.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=6268e32f19906bca0307dcdee7fdbccf
diff --git a/metadata/md5-cache/dev-perl/List-SomeUtils-XS-0.550.0 b/metadata/md5-cache/dev-perl/List-SomeUtils-XS-0.550.0
new file mode 100644
index 000000000000..04759adc5df9
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/List-SomeUtils-XS-0.550.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-XSLoader virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-Scalar-List-Utils virtual/perl-Storable dev-perl/Test-LeakTrace >=virtual/perl-Test-Simple-0.960.0 >=dev-perl/Test-Warnings-0.6.0 ) dev-lang/perl:=
+DESCRIPTION=XS implementation for List::SomeUtils
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/List-SomeUtils-XS/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Artistic-2
+RDEPEND=virtual/perl-XSLoader dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/List-SomeUtils-XS-0.55.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=e894ec7a57fd92f4157588c7b00a5cbc
diff --git a/metadata/md5-cache/dev-perl/List-UtilsBy-0.100.0 b/metadata/md5-cache/dev-perl/List-UtilsBy-0.100.0
index d72abc3662ee..4420236d2ffb 100644
--- a/metadata/md5-cache/dev-perl/List-UtilsBy-0.100.0
+++ b/metadata/md5-cache/dev-perl/List-UtilsBy-0.100.0
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PEVANS/List-UtilsBy-0.10.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=d02d5561f48255656711cd1884511be6
+_md5_=d613f4bb48641c466a44e6b4f3e0410d
diff --git a/metadata/md5-cache/dev-perl/Locale-gettext-1.70.0 b/metadata/md5-cache/dev-perl/Locale-gettext-1.70.0
index 17f1ceda4ce3..5caa2498035b 100644
--- a/metadata/md5-cache/dev-perl/Locale-gettext-1.70.0
+++ b/metadata/md5-cache/dev-perl/Locale-gettext-1.70.0
@@ -9,4 +9,4 @@ RDEPEND=sys-devel/gettext dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.07.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=e1554766b6359bd33ebd821610a099fc
+_md5_=f9d9820ec3768259160aee37a172b61f
diff --git a/metadata/md5-cache/dev-perl/Log-Agent-1.1.0 b/metadata/md5-cache/dev-perl/Log-Agent-1.1.0
index 8763be62bee4..84c4ba3a5179 100644
--- a/metadata/md5-cache/dev-perl/Log-Agent-1.1.0
+++ b/metadata/md5-cache/dev-perl/Log-Agent-1.1.0
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MR/MROGASKI/Log-Agent-1.001.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=a92d52310017592b171ec83311a64022
+_md5_=5d6afd2d2a59bcc71003a15c38603548
diff --git a/metadata/md5-cache/dev-perl/Log-Any-1.701.0 b/metadata/md5-cache/dev-perl/Log-Any-1.701.0
new file mode 100644
index 000000000000..e78ac7ea42f5
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Log-Any-1.701.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Exporter virtual/perl-IO virtual/perl-Storable virtual/perl-Sys-Syslog virtual/perl-Test-Simple virtual/perl-ExtUtils-MakeMaker test? ( !minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 ) virtual/perl-File-Spec ) dev-lang/perl:=
+DESCRIPTION=Bringing loggers and listeners together
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Log-Any/
+IUSE=test minimal
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Exporter virtual/perl-IO virtual/perl-Storable virtual/perl-Sys-Syslog virtual/perl-Test-Simple dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/P/PR/PREACTION/Log-Any-1.701.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=098734e6459e256eb0d42c1915ad590d
diff --git a/metadata/md5-cache/dev-perl/Log-Dispatch-2.670.0 b/metadata/md5-cache/dev-perl/Log-Dispatch-2.670.0
new file mode 100644
index 000000000000..83fac2028177
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Log-Dispatch-2.670.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp dev-perl/Devel-GlobalDestruction >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-Encode virtual/perl-Exporter virtual/perl-IO dev-perl/Module-Runtime dev-perl/Params-ValidationCompiler virtual/perl-Scalar-List-Utils >=dev-perl/Specio-0.320.0 >=virtual/perl-Sys-Syslog-0.280.0 dev-perl/Try-Tiny dev-perl/namespace-autoclean virtual/perl-parent virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Data-Dumper virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Getopt-Long dev-perl/IPC-Run3 dev-perl/Test-Fatal dev-perl/Test-Needs >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl:=
+DESCRIPTION=Dispatches messages to one or more outputs
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Log-Dispatch/
+IUSE=test
+KEYWORDS=~amd64 ~x86 ~ppc-aix
+LICENSE=Artistic-2
+RDEPEND=virtual/perl-Carp dev-perl/Devel-GlobalDestruction >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-Encode virtual/perl-Exporter virtual/perl-IO dev-perl/Module-Runtime dev-perl/Params-ValidationCompiler virtual/perl-Scalar-List-Utils >=dev-perl/Specio-0.320.0 >=virtual/perl-Sys-Syslog-0.280.0 dev-perl/Try-Tiny dev-perl/namespace-autoclean virtual/perl-parent dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.67.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=2b280397284fc503171cbcebfe34d73b
diff --git a/metadata/md5-cache/dev-perl/Log-Report-1.220.0 b/metadata/md5-cache/dev-perl/Log-Report-1.220.0
new file mode 100644
index 000000000000..2f4b28f98096
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Log-Report-1.220.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/Devel-GlobalDestruction-0.90.0 >=virtual/perl-Encode-2.0.0 >=dev-perl/Log-Report-Optional-1.30.0 virtual/perl-Scalar-List-Utils >=dev-perl/String-Print-0.910.0 >=virtual/perl-Sys-Syslog-0.270.0 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.860.0 ) dev-lang/perl:=
+DESCRIPTION=A pluggable, multilingual handler driven problem reporting system
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Log-Report/
+IUSE=test examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Devel-GlobalDestruction-0.90.0 >=virtual/perl-Encode-2.0.0 >=dev-perl/Log-Report-Optional-1.30.0 virtual/perl-Scalar-List-Utils >=dev-perl/String-Print-0.910.0 >=virtual/perl-Sys-Syslog-0.270.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Log-Report-1.22.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=503c2255be1fa847fee42d3a54a80e0f
diff --git a/metadata/md5-cache/dev-perl/Log-Report-Optional-1.30.0 b/metadata/md5-cache/dev-perl/Log-Report-Optional-1.30.0
new file mode 100644
index 000000000000..7e5909ad4723
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Log-Report-Optional-1.30.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/String-Print-0.910.0 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.860.0 ) dev-lang/perl:=
+DESCRIPTION=Lightweight implementation logger for Log::Report
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Log-Report-Optional/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/String-Print-0.910.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Log-Report-Optional-1.03.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=d674140a6db518c12b084fc0ce32dacf
diff --git a/metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0-r1 b/metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0-r1
index b528c6d1d4aa..6a5d7d249232 100644
--- a/metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0-r1
+++ b/metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0-r1
@@ -9,4 +9,4 @@ RDEPEND=>=dev-perl/HTML-FromText-1.004 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ED/EDAVIS/Log-TraceMessages-1.4.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=98bb2c60ae4d089574aab55531b86557
+_md5_=557776c007d352fb9a7221fb7916f35b
diff --git a/metadata/md5-cache/dev-perl/Math-BigInt-Lite-0.140.0 b/metadata/md5-cache/dev-perl/Math-BigInt-Lite-0.140.0
index 7ad0157284f6..5015871ed4db 100644
--- a/metadata/md5-cache/dev-perl/Math-BigInt-Lite-0.140.0
+++ b/metadata/md5-cache/dev-perl/Math-BigInt-Lite-0.140.0
@@ -4,10 +4,10 @@ DESCRIPTION=What BigInts are before they become big
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Math-BigInt-Lite/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Math-BigInt-1.940.0 >=virtual/perl-Math-BigRat-0.190.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FL/FLORA/Math-BigInt-Lite-0.14.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=26302007343a8af97b43125523ba58ea
+_md5_=64d91e9a648b493635d31293c268b25c
diff --git a/metadata/md5-cache/dev-perl/Math-Factor-XS-0.400.0 b/metadata/md5-cache/dev-perl/Math-Factor-XS-0.400.0
index e00861ec1f73..ddd8706fc75b 100644
--- a/metadata/md5-cache/dev-perl/Math-Factor-XS-0.400.0
+++ b/metadata/md5-cache/dev-perl/Math-Factor-XS-0.400.0
@@ -4,10 +4,10 @@ DESCRIPTION=Factorize numbers and calculate matching multiplications
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Math-Factor-XS/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/boolean dev-perl/List-MoreUtils dev-perl/Params-Validate virtual/perl-Carp virtual/perl-Exporter virtual/perl-Scalar-List-Utils virtual/perl-XSLoader dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KR/KRYDE/Math-Factor-XS-0.40.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=e8360549bbb03a356a112efb06e9bc35
+_md5_=943c1b0ac2401c1c1043ab0ade721b47
diff --git a/metadata/md5-cache/dev-perl/Math-Libm-1.0.0 b/metadata/md5-cache/dev-perl/Math-Libm-1.0.0
index 0e6550d38a50..bcee892b3d8e 100644
--- a/metadata/md5-cache/dev-perl/Math-Libm-1.0.0
+++ b/metadata/md5-cache/dev-perl/Math-Libm-1.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=wrapper to libm functions
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Math-Libm/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-AutoLoader virtual/perl-Carp dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DS/DSLEWART/Math-Libm-1.00.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=341a02a048e9210209794fad7ac7de61
+_md5_=cf4be8a8726cc085586d3aec3c0c1f3c
diff --git a/metadata/md5-cache/dev-perl/Math-NumSeq-71.0.0 b/metadata/md5-cache/dev-perl/Math-NumSeq-71.0.0
index b8fc7911f257..f709dd865ca2 100644
--- a/metadata/md5-cache/dev-perl/Math-NumSeq-71.0.0
+++ b/metadata/md5-cache/dev-perl/Math-NumSeq-71.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=number sequences (for example from OEIS)
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Math-NumSeq/
 IUSE=test examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/File-HomeDir virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Scalar-List-Utils >=dev-perl/Math-Factor-XS-0.400.0 dev-perl/Math-Libm >=dev-perl/Math-Prime-XS-0.260.0 virtual/perl-Module-Load >=dev-perl/Module-Pluggable-4.700.0 dev-perl/Module-Util >=dev-perl/constant-defer-1.0.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KR/KRYDE/Math-NumSeq-71.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=a982656ea968c68eeeef2b5a9e729442
+_md5_=e19db44196c86fb730cd31d88ffe9a1d
diff --git a/metadata/md5-cache/dev-perl/Math-PlanePath-124.0.0 b/metadata/md5-cache/dev-perl/Math-PlanePath-124.0.0
index c49f7df81d80..098d07d459a7 100644
--- a/metadata/md5-cache/dev-perl/Math-PlanePath-124.0.0
+++ b/metadata/md5-cache/dev-perl/Math-PlanePath-124.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Mathematical paths through the 2-D plane
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Math-PlanePath/
 IUSE=gmp test examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-3+
 RDEPEND=gmp? ( dev-perl/Math-BigInt-GMP ) dev-perl/Math-Libm dev-perl/Math-NumSeq >=dev-perl/constant-defer-5.0.0 virtual/perl-Scalar-List-Utils virtual/perl-Math-BigInt dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KR/KRYDE/Math-PlanePath-124.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=0a8f2be7a055d092b4e12d4bb2a58739
+_md5_=5fc07cb2e31312907f48c4c105d443d2
diff --git a/metadata/md5-cache/dev-perl/Math-Prime-XS-0.260.0 b/metadata/md5-cache/dev-perl/Math-Prime-XS-0.260.0
index ba9eb0498eec..47fd17139451 100644
--- a/metadata/md5-cache/dev-perl/Math-Prime-XS-0.260.0
+++ b/metadata/md5-cache/dev-perl/Math-Prime-XS-0.260.0
@@ -4,10 +4,10 @@ DESCRIPTION=Detect and calculate prime numbers with deterministic tests
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Math-Prime-XS/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/boolean dev-perl/Params-Validate virtual/perl-Carp virtual/perl-Exporter virtual/perl-Scalar-List-Utils virtual/perl-XSLoader dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KR/KRYDE/Math-Prime-XS-0.26.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=0db07cebdc40e97f000d16dba01f84c4
+_md5_=10af4afc0366d871a00bd56699d85d2e
diff --git a/metadata/md5-cache/dev-perl/Module-Build-WithXSpp-0.140.0 b/metadata/md5-cache/dev-perl/Module-Build-WithXSpp-0.140.0
index 2a258fe87f8a..844be757a7f5 100644
--- a/metadata/md5-cache/dev-perl/Module-Build-WithXSpp-0.140.0
+++ b/metadata/md5-cache/dev-perl/Module-Build-WithXSpp-0.140.0
@@ -4,10 +4,10 @@ DESCRIPTION=XS++ enhanced flavour of Module::Build
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Module-Build-WithXSpp/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/ExtUtils-CppGuess-0.40.0 >=dev-perl/ExtUtils-XSpp-0.110.0 virtual/perl-Digest-MD5 virtual/perl-ExtUtils-CBuilder >=virtual/perl-ExtUtils-ParseXS-2.220.500 >=dev-perl/Module-Build-0.260.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/Module-Build-WithXSpp-0.14.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=d98fb582fbfc9f468710b3d0efa35fc6
+_md5_=a871b8a9f7d31f5955788bdd4f97344d
diff --git a/metadata/md5-cache/dev-perl/Module-Util-1.90.0 b/metadata/md5-cache/dev-perl/Module-Util-1.90.0
index 0305f5107080..a9daa1756421 100644
--- a/metadata/md5-cache/dev-perl/Module-Util-1.90.0
+++ b/metadata/md5-cache/dev-perl/Module-Util-1.90.0
@@ -4,10 +4,10 @@ DESCRIPTION=Module name tools and transformations
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Module-Util/
 IUSE=test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MATTLAW/Module-Util-1.09.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=f04d6579f03cbf1b0ffb8b0c498997f9
+_md5_=95f4341eabe82e156cb13bf8f72a5180
diff --git a/metadata/md5-cache/dev-perl/Net-Bonjour-0.960.0 b/metadata/md5-cache/dev-perl/Net-Bonjour-0.960.0
index eaa0e299e60b..39c575822ff7 100644
--- a/metadata/md5-cache/dev-perl/Net-Bonjour-0.960.0
+++ b/metadata/md5-cache/dev-perl/Net-Bonjour-0.960.0
@@ -4,10 +4,10 @@ DESCRIPTION=Module for DNS service discovery (Apple's Bonjour)
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Net-Bonjour/
 IUSE=test examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Net-DNS-0.500.0 >=virtual/perl-Socket-1.750.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHLIGE/Net-Bonjour-0.96.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=cd9040c593b790e8f08de139b86dc132
+_md5_=b687b996d2da76424446d1fbda712ada
diff --git a/metadata/md5-cache/dev-perl/Number-Fraction-2.0.0 b/metadata/md5-cache/dev-perl/Number-Fraction-2.0.0
index 7d507f6baf1c..39f9aae64388 100644
--- a/metadata/md5-cache/dev-perl/Number-Fraction-2.0.0
+++ b/metadata/md5-cache/dev-perl/Number-Fraction-2.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl extension to model fractions
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Number-Fraction/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Moose virtual/perl-Carp dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAVECROSS/Number-Fraction-2.00.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=ef3a3fd5fb431bc2c23c0fd5a2793ee6
+_md5_=765825415b2a6877ae611f0a6ca87a45
diff --git a/metadata/md5-cache/dev-perl/PPI-1.224.0 b/metadata/md5-cache/dev-perl/PPI-1.224.0
index 38c2cbee2ae6..5c07f6c96052 100644
--- a/metadata/md5-cache/dev-perl/PPI-1.224.0
+++ b/metadata/md5-cache/dev-perl/PPI-1.224.0
@@ -4,10 +4,10 @@ DESCRIPTION=Parse, Analyze and Manipulate Perl (without perl)
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/PPI/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=alpha ~amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Clone-0.300.0 >=virtual/perl-Digest-MD5-2.350.0 >=virtual/perl-File-Spec-3.270.100 >=dev-perl/IO-String-1.70.0 >=dev-perl/List-MoreUtils-0.160.0 >=virtual/perl-Scalar-List-Utils-1.330.0 >=dev-perl/Params-Util-1.000.0 >=virtual/perl-Storable-2.170.0 dev-perl/Task-Weaken dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MITHALDU/PPI-1.224.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=cd5bd776d501e5bd2fe29d66a9ce3ddf
+_md5_=f99d3fcf6f45e5de47c32ffe261b5ab1
diff --git a/metadata/md5-cache/dev-perl/PerlIO-via-symlink-0.50.0-r1 b/metadata/md5-cache/dev-perl/PerlIO-via-symlink-0.50.0-r1
deleted file mode 100644
index 222da3855d61..000000000000
--- a/metadata/md5-cache/dev-perl/PerlIO-via-symlink-0.50.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Module-Install dev-perl/ExtUtils-AutoInstall dev-lang/perl:=[-build(-)]
-DESCRIPTION=PerlIO::via::symlink - PerlIO layer for symlinks
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/PerlIO-via-symlink/
-KEYWORDS=amd64 ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CL/CLKAO/PerlIO-via-symlink-0.05.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=9b9d32aa284d90569edac28a101ec7f9
diff --git a/metadata/md5-cache/dev-perl/String-Print-0.920.0 b/metadata/md5-cache/dev-perl/String-Print-0.920.0
new file mode 100644
index 000000000000..121673e4f9d5
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/String-Print-0.920.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/TimeDate-2.300.0 virtual/perl-Encode dev-perl/HTML-Parser dev-perl/Unicode-LineBreak test? ( >=virtual/perl-Test-Simple-0.860.0 ) dev-lang/perl:=
+DESCRIPTION=Extensions to printf
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/String-Print/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/TimeDate-2.300.0 virtual/perl-Encode dev-perl/HTML-Parser dev-perl/Unicode-LineBreak dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/String-Print-0.92.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=6f43b0ae6e47c3f0f039f69e84f78944
diff --git a/metadata/md5-cache/dev-perl/Sys-CpuLoad-0.30.0 b/metadata/md5-cache/dev-perl/Sys-CpuLoad-0.30.0
new file mode 100644
index 000000000000..15d01a71e21a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Sys-CpuLoad-0.30.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Exporter virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+DESCRIPTION=A module to retrieve system load averages
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Sys-CpuLoad/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Exporter dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CL/CLINTDW/Sys-CpuLoad-0.03.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=221b88b000466a9139761ba67eb1b517
diff --git a/metadata/md5-cache/dev-perl/Task-Weaken-1.40.0-r1 b/metadata/md5-cache/dev-perl/Task-Weaken-1.40.0-r1
index b0fb52fd92e8..cec15620bef5 100644
--- a/metadata/md5-cache/dev-perl/Task-Weaken-1.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Task-Weaken-1.40.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Ensure that a platform has weaken support
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Task-Weaken/
-KEYWORDS=~alpha amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=alpha amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Task-Weaken-1.04.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=692b7657f01128172ff6a79e80cdd995
+_md5_=49423a60f73e666d7c16bd42238f0256
diff --git a/metadata/md5-cache/dev-perl/Wx-GLCanvas-0.90.0 b/metadata/md5-cache/dev-perl/Wx-GLCanvas-0.90.0
index 343f34d3adf4..6df9a19db850 100644
--- a/metadata/md5-cache/dev-perl/Wx-GLCanvas-0.90.0
+++ b/metadata/md5-cache/dev-perl/Wx-GLCanvas-0.90.0
@@ -4,10 +4,10 @@ DESCRIPTION=interface to wxWidgets' OpenGL canvas
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Wx-GLCanvas/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/OpenGL dev-perl/Alien-wxWidgets[opengl] >=dev-perl/Wx-0.570.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MB/MBARBON/Wx-GLCanvas-0.09.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	virtualx	171580f737f5aaf18fcb456548588066
-_md5_=9d0f55616a801370c7d841ad7408c2f3
+_md5_=7d8d879a8bf44ac5a4cf960bb2ef106e
diff --git a/metadata/md5-cache/dev-perl/XML-SAX-ExpatXS-1.330.0 b/metadata/md5-cache/dev-perl/XML-SAX-ExpatXS-1.330.0
index cef21ca829a0..3fc50efcbe18 100644
--- a/metadata/md5-cache/dev-perl/XML-SAX-ExpatXS-1.330.0
+++ b/metadata/md5-cache/dev-perl/XML-SAX-ExpatXS-1.330.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl SAX 2 XS extension to Expat parser
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/XML-SAX-ExpatXS/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-libs/expat >=dev-perl/XML-SAX-0.960.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PC/PCIMPRICH/XML-SAX-ExpatXS-1.33.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=4c0cbfa5cd353adc7722c99f87ca8e15
+_md5_=086324c351b59f76ebd4f27434fbc7c2
diff --git a/metadata/md5-cache/dev-perl/constant-defer-6.0.0 b/metadata/md5-cache/dev-perl/constant-defer-6.0.0
index 3e10c1251d24..adbad967efcb 100644
--- a/metadata/md5-cache/dev-perl/constant-defer-6.0.0
+++ b/metadata/md5-cache/dev-perl/constant-defer-6.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=constant subs with deferred value calculation
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/constant-defer/
 IUSE=test examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-3
 RDEPEND=virtual/perl-Carp dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KR/KRYDE/constant-defer-6.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=3ecaef39641e28fc12a6e86de3671460
+_md5_=1a0bc199479cb944d9ac092560803d02
diff --git a/metadata/md5-cache/dev-perl/forks-0.360.0-r1 b/metadata/md5-cache/dev-perl/forks-0.360.0-r1
new file mode 100644
index 000000000000..c62cc428d53e
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/forks-0.360.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/Acme-Damn virtual/perl-Attribute-Handlers dev-perl/Devel-Symdump virtual/perl-File-Spec >=dev-perl/List-MoreUtils-0.150.0 >=virtual/perl-Scalar-List-Utils-1.110.0 virtual/perl-Storable >=dev-perl/Sys-SigAction-0.110.0 virtual/perl-Time-HiRes virtual/perl-if virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl:=
+DESCRIPTION=Emulate threads with fork
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/forks/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Acme-Damn virtual/perl-Attribute-Handlers dev-perl/Devel-Symdump virtual/perl-File-Spec >=dev-perl/List-MoreUtils-0.150.0 >=virtual/perl-Scalar-List-Utils-1.110.0 virtual/perl-Storable >=dev-perl/Sys-SigAction-0.110.0 virtual/perl-Time-HiRes virtual/perl-if dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RY/RYBSKEJ/forks-0.36.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=91a1cff6845f2bde244ed9fca59ba4c2
diff --git a/metadata/md5-cache/dev-perl/frontier-rpc-0.07_beta4-r2 b/metadata/md5-cache/dev-perl/frontier-rpc-0.07_beta4-r2
new file mode 100644
index 000000000000..2f60a1373413
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/frontier-rpc-0.07_beta4-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/XML-Parser dev-perl/libwww-perl dev-lang/perl:=
+DESCRIPTION=Perform remote procedure calls using extensible markup language
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Frontier-RPC/ http://perl-xml.sourceforge.net/xml-rpc/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/XML-Parser dev-perl/libwww-perl dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/K/KM/KMACLEOD/Frontier-RPC-0.07b4.tar.gz http://perl-xml.sourceforge.net/xml-rpc/Frontier-RPC-0.07b4.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=915281d3c2deb7e9702d86b22630a695
diff --git a/metadata/md5-cache/dev-perl/glib-perl-1.326.0 b/metadata/md5-cache/dev-perl/glib-perl-1.326.0
new file mode 100644
index 000000000000..f725b14d17df
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/glib-perl-1.326.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/glib-2 virtual/perl-ExtUtils-MakeMaker >=dev-perl/ExtUtils-Depends-0.300.0 >=dev-perl/ExtUtils-PkgConfig-1.0.0 virtual/pkgconfig dev-perl/Log-Agent dev-lang/perl:=
+DESCRIPTION=Glib - Perl wrappers for the GLib utility and Object libraries
+EAPI=6
+HOMEPAGE=http://gtk2-perl.sf.net/ http://search.cpan.org/dist/Glib/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/glib-2 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Glib-1.326.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=9e0b9a1dc63fd6c376bee8e274c24a0d
diff --git a/metadata/md5-cache/dev-perl/gnome2-canvas-1.2.0-r2 b/metadata/md5-cache/dev-perl/gnome2-canvas-1.2.0-r2
new file mode 100644
index 000000000000..8455cc88d806
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/gnome2-canvas-1.2.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=x11-libs/gtk+:2 >=gnome-base/libgnomecanvas-2 >=dev-perl/glib-perl-1.040 >=dev-perl/Gtk2-1.040 >=dev-perl/ExtUtils-PkgConfig-1.03 >=dev-perl/ExtUtils-Depends-0.202 virtual/pkgconfig dev-lang/perl:= test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Perl interface to the Gnome Canvas
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Gnome2-Canvas/
+IUSE=examples test
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
+LICENSE=LGPL-2
+RDEPEND=x11-libs/gtk+:2 >=gnome-base/libgnomecanvas-2 >=dev-perl/glib-perl-1.040 >=dev-perl/Gtk2-1.040 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TS/TSCH/Gnome2-Canvas-1.002.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	virtualx	171580f737f5aaf18fcb456548588066
+_md5_=bf8bd8ee384ee9d9f23d692985aa3a92
diff --git a/metadata/md5-cache/dev-perl/gnome2-perl-1.46.0 b/metadata/md5-cache/dev-perl/gnome2-perl-1.46.0
new file mode 100644
index 000000000000..e3c52abfc3a4
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/gnome2-perl-1.46.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=x11-libs/gtk+:2 dev-perl/Gtk2 gnome-base/libgnomeui gnome-base/libbonoboui dev-perl/gnome2-canvas >=dev-perl/glib-perl-1.40.0 dev-perl/gnome2-vfs-perl dev-perl/ExtUtils-Depends dev-perl/ExtUtils-PkgConfig dev-lang/perl:=
+DESCRIPTION=Perl interface to the 2.x series of the Gnome libraries
+EAPI=6
+HOMEPAGE=http://gtk2-perl.sourceforge.net/ http://search.cpan.org/dist/Gnome2/
+KEYWORDS=~alpha ~amd64 ~ppc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=x11-libs/gtk+:2 dev-perl/Gtk2 gnome-base/libgnomeui gnome-base/libbonoboui dev-perl/gnome2-canvas >=dev-perl/glib-perl-1.40.0 dev-perl/gnome2-vfs-perl dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Gnome2-1.046.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=184b9006ee6853cbb1d40e8966901027
diff --git a/metadata/md5-cache/dev-perl/gnome2-wnck-0.160.0-r2 b/metadata/md5-cache/dev-perl/gnome2-wnck-0.160.0-r2
new file mode 100644
index 000000000000..073291992e92
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/gnome2-wnck-0.160.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/glib-perl-1.180.0 >=dev-perl/Gtk2-1.42.0 >=x11-libs/libwnck-2.20:1 >=dev-perl/ExtUtils-PkgConfig-1.03 >=dev-perl/ExtUtils-Depends-0.2 dev-lang/perl:= test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Perl interface to the Window Navigator Construction Kit
+EAPI=6
+HOMEPAGE=http://gtk2-perl.sourceforge.net/ http://search.cpan.org/dist/Gnome2-Wnck/
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-perl/glib-perl-1.180.0 >=dev-perl/Gtk2-1.42.0 >=x11-libs/libwnck-2.20:1 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TS/TSCH/Gnome2-Wnck-0.16.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	virtualx	171580f737f5aaf18fcb456548588066
+_md5_=207652f45a3d00015a6b56a0fbf2ee39
diff --git a/metadata/md5-cache/dev-perl/gtk2-gladexml-1.7.0-r2 b/metadata/md5-cache/dev-perl/gtk2-gladexml-1.7.0-r2
new file mode 100644
index 000000000000..f9c67f796a0f
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/gtk2-gladexml-1.7.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=x11-libs/gtk+:2 gnome-base/libglade:2.0 >=dev-perl/glib-perl-1.020 >=dev-perl/Gtk2-1.012 >=dev-perl/ExtUtils-Depends-0.300 dev-perl/ExtUtils-PkgConfig dev-lang/perl:= test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Create user interfaces directly from Glade XML files
+EAPI=6
+HOMEPAGE=http://gtk2-perl.sf.net/ http://search.cpan.org/dist/Gtk2-GladeXML/
+IUSE=examples test
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND=x11-libs/gtk+:2 gnome-base/libglade:2.0 >=dev-perl/glib-perl-1.020 >=dev-perl/Gtk2-1.012 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TS/TSCH/Gtk2-GladeXML-1.007.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	virtualx	171580f737f5aaf18fcb456548588066
+_md5_=e45488d5a77e6957becf9533e269e87f
diff --git a/metadata/md5-cache/dev-perl/gtk2-spell-1.40.0-r2 b/metadata/md5-cache/dev-perl/gtk2-spell-1.40.0-r2
new file mode 100644
index 000000000000..f506eff3afbe
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/gtk2-spell-1.40.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=x11-libs/gtk+:2 >=app-text/gtkspell-2:2 >=dev-perl/glib-perl-1.240.0 >=dev-perl/Gtk2-1.012 dev-perl/ExtUtils-Depends dev-perl/ExtUtils-PkgConfig virtual/pkgconfig dev-lang/perl:= test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Bindings for GtkSpell with Gtk2.x
+EAPI=6
+HOMEPAGE=http://gtk2-perl.sf.net/ http://search.cpan.org/dist/Gtk2-Spell/
+IUSE=test
+KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=x11-libs/gtk+:2 >=app-text/gtkspell-2:2 >=dev-perl/glib-perl-1.240.0 >=dev-perl/Gtk2-1.012 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TS/TSCH/Gtk2-Spell-1.04.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	virtualx	171580f737f5aaf18fcb456548588066
+_md5_=ddf8bd42fff1326facb83b896581054d
diff --git a/metadata/md5-cache/dev-perl/gtk2-trayicon-0.60.0-r2 b/metadata/md5-cache/dev-perl/gtk2-trayicon-0.60.0-r2
new file mode 100644
index 000000000000..1174e0b6e974
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/gtk2-trayicon-0.60.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/glib-perl-1.012 >=dev-perl/Gtk2-1.012 gnome-base/libglade:2.0 x11-libs/gtk+:2 dev-perl/ExtUtils-Depends dev-perl/ExtUtils-PkgConfig virtual/pkgconfig dev-lang/perl:= test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Perl wrappers for the egg cup Gtk2::TrayIcon utilities
+EAPI=6
+HOMEPAGE=http://gtk2-perl.sf.net/ http://search.cpan.org/dist/Gtk2-TrayIcon/
+IUSE=examples test
+KEYWORDS=~amd64 ~ia64 ~ppc ~sparc ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-perl/glib-perl-1.012 >=dev-perl/Gtk2-1.012 gnome-base/libglade:2.0 x11-libs/gtk+:2 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BO/BORUP/Gtk2-TrayIcon-0.06.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	virtualx	171580f737f5aaf18fcb456548588066
+_md5_=37eee3b20ef2dfdf91da09c61000164e
diff --git a/metadata/md5-cache/dev-perl/gtk2-traymanager-0.50.0-r2 b/metadata/md5-cache/dev-perl/gtk2-traymanager-0.50.0-r2
new file mode 100644
index 000000000000..815e39840b27
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/gtk2-traymanager-0.50.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=x11-libs/gtk+:2 >=dev-perl/glib-perl-1.012 >=dev-perl/Gtk2-1.012 dev-perl/ExtUtils-Depends dev-perl/ExtUtils-PkgConfig virtual/pkgconfig dev-lang/perl:= test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Perl bindings for EggTrayManager
+EAPI=6
+HOMEPAGE=http://gtk2-perl.sf.net/ http://search.cpan.org/dist/Gtk2-TrayManager/
+IUSE=examples test
+KEYWORDS=~amd64 ~ia64 ~ppc ~x86
+LICENSE=LGPL-2
+RDEPEND=x11-libs/gtk+:2 >=dev-perl/glib-perl-1.012 >=dev-perl/Gtk2-1.012 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BO/BORUP/Gtk2-TrayManager-0.05.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	virtualx	171580f737f5aaf18fcb456548588066
+_md5_=173645e7917103d752c566cb4f36f0ec
diff --git a/metadata/md5-cache/dev-perl/indirect-0.370.0 b/metadata/md5-cache/dev-perl/indirect-0.370.0
new file mode 100644
index 000000000000..dfa27ca67930
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/indirect-0.370.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp virtual/perl-XSLoader virtual/perl-ExtUtils-MakeMaker virtual/perl-Socket test? ( virtual/perl-Test-Simple ) dev-lang/perl:=
+DESCRIPTION=Lexically warn about using the indirect method call syntax
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/indirect/
+IUSE=test
+KEYWORDS=~amd64 ~hppa ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-XSLoader dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/V/VP/VPIT/indirect-0.37.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=9eb4529ade9e48aac6d03a100da25c31
diff --git a/metadata/md5-cache/dev-perl/rpm-build-perl-0.820.0 b/metadata/md5-cache/dev-perl/rpm-build-perl-0.820.0
deleted file mode 100644
index 2bfd5e9597f4..000000000000
--- a/metadata/md5-cache/dev-perl/rpm-build-perl-0.820.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-Encode virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Automatically extract Perl dependencies
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/rpm-build-perl/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Encode dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AT/ATOURBIN/rpm-build-perl-0.82.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=cbfcaa7a7ecbf0f54c0777a228b1c132
diff --git a/metadata/md5-cache/dev-perl/rpm-build-perl-0.820.0-r1 b/metadata/md5-cache/dev-perl/rpm-build-perl-0.820.0-r1
deleted file mode 100644
index 26b96bc2fec4..000000000000
--- a/metadata/md5-cache/dev-perl/rpm-build-perl-0.820.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Encode virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl:=
-DESCRIPTION=Automatically extract Perl dependencies
-EAPI=6
-HOMEPAGE=http://search.cpan.org/dist/rpm-build-perl/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Encode dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AT/ATOURBIN/rpm-build-perl-0.82.tar.gz https://dev.gentoo.org/~dilfridge/distfiles/rpm-build-perl-0.820.0-perl526.patch.gz
-_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=3449164eb55d119e57462cc8e9fef795
diff --git a/metadata/md5-cache/dev-php/pecl-cassandra-1.2.2 b/metadata/md5-cache/dev-php/pecl-cassandra-1.2.2
deleted file mode 100644
index b93702940348..000000000000
--- a/metadata/md5-cache/dev-php/pecl-cassandra-1.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-db/cpp-driver-2.4.3 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=DataStax PHP Driver for Apache Cassandra
-EAPI=6
-HOMEPAGE=https://github.com/datastax/php-driver
-IUSE=php_targets_php7-0 php_targets_php5-6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-db/cpp-driver-2.4.3 php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php5-6 )
-SLOT=0
-SRC_URI=http://pecl.php.net/get/cassandra-1.2.2.tgz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r3	f0b4914f85a3c676561454b15a910dc6	php-ext-source-r3	02131d21ec5edc689a1ef97096214131	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=b13840199584789f5a2bbb90aee5a5ca
diff --git a/metadata/md5-cache/dev-php/pecl-cassandra-1.3.2 b/metadata/md5-cache/dev-php/pecl-cassandra-1.3.2
new file mode 100644
index 000000000000..975d4859d45a
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-cassandra-1.3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-db/cpp-driver-2.7.0 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
+DESCRIPTION=DataStax PHP Driver for Apache Cassandra
+EAPI=6
+HOMEPAGE=https://github.com/datastax/php-driver
+IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-db/cpp-driver-2.7.0 php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
+REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
+SLOT=0
+SRC_URI=http://pecl.php.net/get/cassandra-1.3.2.tgz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r3	f0b4914f85a3c676561454b15a910dc6	php-ext-source-r3	02131d21ec5edc689a1ef97096214131	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=53439d9abc8a8a6022915d282fb396e8
diff --git a/metadata/md5-cache/dev-python/astropy-1.3.3 b/metadata/md5-cache/dev-python/astropy-1.3.3
index 469381daf160..8a043e8dae01 100644
--- a/metadata/md5-cache/dev-python/astropy-1.3.3
+++ b/metadata/md5-cache/dev-python/astropy-1.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/expat:0= dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-astronomy/erfa-1.3:0= >=sci-astronomy/wcslib-5:0= >=sci-libs/cfitsio-3.410:0= sys-libs/zlib:0= dev-python/astropy-helpers[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/pkgconfig doc? ( media-gfx/graphviz dev-libs/libxml2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/h5py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jplephem[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),jpeg] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx-gallery[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-libs/libxml2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),jpeg] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-mpl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/h5py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-libs/expat:0= dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-astronomy/erfa-1.3:0= >=sci-astronomy/wcslib-5:0= >=sci-libs/cfitsio-3.410:0= sys-libs/zlib:0= dev-python/astropy-helpers[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/pkgconfig doc? ( media-gfx/graphviz dev-libs/libxml2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/h5py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jplephem[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),jpeg(+)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx-gallery[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-libs/libxml2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),jpeg] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-mpl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/h5py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Core functionality for performing astrophysics with Python
 EAPI=6
 HOMEPAGE=http://astropy.org/
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/a/astropy/astropy-1.3.3.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f3b615c639f1e01dc286ca9cc606e6d7
+_md5_=d965e2b29834c467935771f31dd1f7f8
diff --git a/metadata/md5-cache/dev-python/astropy-2.0.1 b/metadata/md5-cache/dev-python/astropy-2.0.1
index feecddb77d56..8f75efe069a5 100644
--- a/metadata/md5-cache/dev-python/astropy-2.0.1
+++ b/metadata/md5-cache/dev-python/astropy-2.0.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/astropy-helpers-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cython-0.21[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/pkgconfig doc? ( dev-libs/expat:0= dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/h5py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jplephem[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libxml2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mpmath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/objgraph[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pandas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),jpeg] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-astronomy/erfa-1.3:0= >=sci-astronomy/wcslib-5:0= >=sci-libs/cfitsio-3.410:0= sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scikits_image[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/zlib:0= media-gfx/graphviz dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-gallery-0.1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-libs/expat:0= dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/h5py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jplephem[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libxml2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mpmath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/objgraph[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pandas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),jpeg] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-astronomy/erfa-1.3:0= >=sci-astronomy/wcslib-5:0= >=sci-libs/cfitsio-3.410:0= sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scikits_image[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/zlib:0= dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-mpl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/astropy-helpers-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cython-0.21[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/pkgconfig doc? ( dev-libs/expat:0= dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/h5py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jplephem[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libxml2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mpmath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/objgraph[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pandas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),jpeg(+)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-astronomy/erfa-1.3:0= >=sci-astronomy/wcslib-5:0= >=sci-libs/cfitsio-3.410:0= sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scikits_image[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/zlib:0= media-gfx/graphviz dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-gallery-0.1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-libs/expat:0= dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/h5py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jplephem[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libxml2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mpmath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/objgraph[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pandas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),jpeg(+)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-astronomy/erfa-1.3:0= >=sci-astronomy/wcslib-5:0= >=sci-libs/cfitsio-3.410:0= sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scikits_image[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/zlib:0= dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-mpl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Core functionality for performing astrophysics with Python
 EAPI=6
 HOMEPAGE=http://astropy.org/
 IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=dev-libs/expat:0= dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/h5py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jplephem[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libxml2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mpmath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/objgraph[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pandas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),jpeg] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-astronomy/erfa-1.3:0= >=sci-astronomy/wcslib-5:0= >=sci-libs/cfitsio-3.410:0= sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scikits_image[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/zlib:0= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=dev-libs/expat:0= dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/h5py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jplephem[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libxml2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mpmath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/objgraph[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pandas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),jpeg(+)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-astronomy/erfa-1.3:0= >=sci-astronomy/wcslib-5:0= >=sci-libs/cfitsio-3.410:0= sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scikits_image[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/zlib:0= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/astropy/astropy-2.0.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9f3bc234afc5d59edf048de30b09da0d
+_md5_=8c6bc34b7bd3d735496be7586e5e1241
diff --git a/metadata/md5-cache/dev-python/brython-3.3.3 b/metadata/md5-cache/dev-python/brython-3.3.3
index 97015d864c96..21a1dd76504a 100644
--- a/metadata/md5-cache/dev-python/brython-3.3.3
+++ b/metadata/md5-cache/dev-python/brython-3.3.3
@@ -4,11 +4,11 @@ DESCRIPTION=A Python 3 implementation for client-side web programming
 EAPI=6
 HOMEPAGE=http://www.brython.info
 IUSE=vhosts python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 x86
 LICENSE=BSD
 RDEPEND=>=app-admin/webapp-config-1.50.15
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=3.3.3
 SRC_URI=https://github.com/brython-dev/brython/archive/3.3.3.zip -> brython-3.3.3.zip
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=ce8c5ac88e24aed4da7eb0d58898090c
+_md5_=26c2c37658659a88803d3d769b5e4ca5
diff --git a/metadata/md5-cache/dev-python/constantly-15.1.0 b/metadata/md5-cache/dev-python/constantly-15.1.0
index 08bc708aab6a..26a4156015e4 100644
--- a/metadata/md5-cache/dev-python/constantly-15.1.0
+++ b/metadata/md5-cache/dev-python/constantly-15.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Symbolic constants in Python
 EAPI=6
 HOMEPAGE=https://github.com/twisted/constantly https://pypi.python.org/pypi/constantly
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/constantly/constantly-15.1.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=adc31def88a8cabdbf6989c9710372b1
+_md5_=5bdc2878dbfe3893dbae1bc0950116c4
diff --git a/metadata/md5-cache/dev-python/cryptography-2.1.1 b/metadata/md5-cache/dev-python/cryptography-2.1.1
new file mode 100644
index 000000000000..0a994b4a4430
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cryptography-2.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] ) libressl? ( dev-libs/libressl ) python_targets_python2_7? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),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_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/idna-2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/asn1crypto-0.21.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( ~dev-python/cryptography-vectors-2.1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/hypothesis[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/iso8601[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pretend[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyasn1-modules[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.9.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Library providing cryptographic recipes and primitives
+EAPI=6
+HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/
+IUSE=libressl test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x64-solaris
+LICENSE=|| ( Apache-2.0 BSD )
+RDEPEND=!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] ) libressl? ( dev-libs/libressl ) python_targets_python2_7? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),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_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/idna-2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/asn1crypto-0.21.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/c/cryptography/cryptography-2.1.1.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1d9bc0d70cd25df0ef3e90f2791ae15c
diff --git a/metadata/md5-cache/dev-python/cryptography-2.1.2 b/metadata/md5-cache/dev-python/cryptography-2.1.2
new file mode 100644
index 000000000000..176e60312993
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cryptography-2.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] ) libressl? ( dev-libs/libressl ) python_targets_python2_7? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),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_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/idna-2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/asn1crypto-0.21.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( ~dev-python/cryptography-vectors-2.1.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/hypothesis[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/iso8601[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pretend[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyasn1-modules[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.9.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Library providing cryptographic recipes and primitives
+EAPI=6
+HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/
+IUSE=libressl test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x64-solaris
+LICENSE=|| ( Apache-2.0 BSD )
+RDEPEND=!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] ) libressl? ( dev-libs/libressl ) python_targets_python2_7? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),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_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/idna-2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/asn1crypto-0.21.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/c/cryptography/cryptography-2.1.2.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1d9bc0d70cd25df0ef3e90f2791ae15c
diff --git a/metadata/md5-cache/dev-python/cryptography-vectors-2.1.1 b/metadata/md5-cache/dev-python/cryptography-vectors-2.1.1
new file mode 100644
index 000000000000..03eff5f48ac3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cryptography-vectors-2.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Test vectors for the cryptography package
+EAPI=6
+HOMEPAGE=https://pypi.python.org/pypi/cryptography-vectors/
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=|| ( Apache-2.0 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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/c/cryptography-vectors/cryptography_vectors-2.1.1.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=62e5d8e8536cbec9fe926ca60ad64c51
diff --git a/metadata/md5-cache/dev-python/cryptography-vectors-2.1.2 b/metadata/md5-cache/dev-python/cryptography-vectors-2.1.2
new file mode 100644
index 000000000000..ec8c523824ff
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cryptography-vectors-2.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Test vectors for the cryptography package
+EAPI=6
+HOMEPAGE=https://pypi.python.org/pypi/cryptography-vectors/
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=|| ( Apache-2.0 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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/c/cryptography-vectors/cryptography_vectors-2.1.2.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=62e5d8e8536cbec9fe926ca60ad64c51
diff --git a/metadata/md5-cache/dev-python/denonavr-0.5.4 b/metadata/md5-cache/dev-python/denonavr-0.5.4
new file mode 100644
index 000000000000..ee99eebe71c2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/denonavr-0.5.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests-mock[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/testtools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Automation Library for Denon AVR receivers
+EAPI=6
+HOMEPAGE=https://github.com/scarface-4711/denonavr
+IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/d/denonavr/denonavr-0.5.4.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6f968079c7fbc3c1df901aa7721bc0d8
diff --git a/metadata/md5-cache/dev-python/execnet-1.5.0 b/metadata/md5-cache/dev-python/execnet-1.5.0
new file mode 100644
index 000000000000..f8d4b3531b39
--- /dev/null
+++ b/metadata/md5-cache/dev-python/execnet-1.5.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/apipkg-1.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools_scm[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Rapid multi-Python deployment
+EAPI=6
+HOMEPAGE=http://codespeak.net/execnet/ https://pypi.python.org/pypi/execnet/
+IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/apipkg-1.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/e/execnet/execnet-1.5.0.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=61a54110c71713ac774a58e697026f8c
diff --git a/metadata/md5-cache/dev-python/flask-admin-1.4.2-r1 b/metadata/md5-cache/dev-python/flask-admin-1.4.2-r1
index 30b1ecfbf4ed..62527172151d 100644
--- a/metadata/md5-cache/dev-python/flask-admin-1.4.2-r1
+++ b/metadata/md5-cache/dev-python/flask-admin-1.4.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/flask-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/wtforms[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask-wtf[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/peewee[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/wtf-peewee[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask-pymongo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask-mongoengine[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask-sqlalchemy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask-babelex[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sci-libs/Shapely[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/geoalchemy2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pillow-2.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),jpeg] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=>=dev-python/flask-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/wtforms[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask-wtf[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/peewee[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/wtf-peewee[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask-pymongo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask-mongoengine[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask-sqlalchemy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask-babelex[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sci-libs/Shapely[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/geoalchemy2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pillow-2.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),jpeg(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Simple and extensible admin interface framework for Flask
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/Flask-Admin
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Admin/Flask-Admin-1.4.2.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=769dd65f3931306f6015fb9e2cd60a6a
+_md5_=d824ba63ff7923a5bfff9f4994b28dee
diff --git a/metadata/md5-cache/dev-python/flask-admin-1.5.0 b/metadata/md5-cache/dev-python/flask-admin-1.5.0
index 362137f48856..560779481fc1 100644
--- a/metadata/md5-cache/dev-python/flask-admin-1.5.0
+++ b/metadata/md5-cache/dev-python/flask-admin-1.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/flask-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/wtforms[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask-wtf[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/peewee[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/wtf-peewee[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask-pymongo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask-mongoengine[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask-sqlalchemy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask-babelex[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sci-libs/Shapely[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/geoalchemy2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pillow-2.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),jpeg] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=>=dev-python/flask-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/wtforms[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask-wtf[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/peewee[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/wtf-peewee[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask-pymongo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask-mongoengine[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask-sqlalchemy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask-babelex[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sci-libs/Shapely[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/geoalchemy2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pillow-2.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),jpeg(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Simple and extensible admin interface framework for Flask
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/Flask-Admin
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Admin/Flask-Admin-1.5.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4df56cff6b6cb44e7685c4c0146966e3
+_md5_=d824ba63ff7923a5bfff9f4994b28dee
diff --git a/metadata/md5-cache/dev-python/future-0.15.2 b/metadata/md5-cache/dev-python/future-0.15.2
index 57681d103e45..781e72f8e2b4 100644
--- a/metadata/md5-cache/dev-python/future-0.15.2
+++ b/metadata/md5-cache/dev-python/future-0.15.2
@@ -4,11 +4,11 @@ DESCRIPTION=Easy, clean, reliable Python 2/3 compatibility
 EAPI=6
 HOMEPAGE=http://python-future.org/
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha amd64 x86
+KEYWORDS=~alpha amd64 ~hppa x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/f/future/future-0.15.2.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2e66561ec27bc5860a14346fe3f220f1
+_md5_=e9f44413ade2c386c9b52672d15818c9
diff --git a/metadata/md5-cache/dev-python/future-0.16.0 b/metadata/md5-cache/dev-python/future-0.16.0
index 11751f5e5fd4..128986ea5220 100644
--- a/metadata/md5-cache/dev-python/future-0.16.0
+++ b/metadata/md5-cache/dev-python/future-0.16.0
@@ -4,11 +4,11 @@ DESCRIPTION=Easy, clean, reliable Python 2/3 compatibility
 EAPI=6
 HOMEPAGE=http://python-future.org/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/f/future/future-0.16.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7f2b07c5cc008201bf3078e685940fbd
+_md5_=ebb500590f545ddb14c60d4b342f8743
diff --git a/metadata/md5-cache/dev-python/futures-3.1.1 b/metadata/md5-cache/dev-python/futures-3.1.1
index 6261f2c81fea..47f80ee4c443 100644
--- a/metadata/md5-cache/dev-python/futures-3.1.1
+++ b/metadata/md5-cache/dev-python/futures-3.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Backport of the concurrent.futures package from Python 3.2
 EAPI=6
 HOMEPAGE=https://code.google.com/p/pythonfutures https://pypi.python.org/pypi/futures
 IUSE=doc python_targets_pypy python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=PSF-2
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/f/futures/futures-3.1.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=23a69afb643e5e9c583e1d0f1e33cd05
+_md5_=47ce93fc4a62f111b442c2ede27d5d80
diff --git a/metadata/md5-cache/dev-python/gst-python-1.10.5 b/metadata/md5-cache/dev-python/gst-python-1.10.5
index 051f5df148b9..8c053ca344a0 100644
--- a/metadata/md5-cache/dev-python/gst-python-1.10.5
+++ b/metadata/md5-cache/dev-python/gst-python-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=A Python Interface to GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygobject-3:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-libs/gstreamer-1.10.5:1.0[introspection] >=media-libs/gst-plugins-base-1.10.5:1.0[introspection]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=bdef01aa438c986976b1363b80c8a24a
+_md5_=71f865f5bd9f8abe513548659fd8c1c8
diff --git a/metadata/md5-cache/dev-python/hpack-2.3.0-r1 b/metadata/md5-cache/dev-python/hpack-2.3.0-r1
index 1e3738c3e317..e62ca641ef7d 100644
--- a/metadata/md5-cache/dev-python/hpack-2.3.0-r1
+++ b/metadata/md5-cache/dev-python/hpack-2.3.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Pure-Python HPACK header compression
 EAPI=6
 HOMEPAGE=https://python-hyper.org/hpack/en/latest/ https://pypi.python.org/pypi/hpack
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hpack/hpack-2.3.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=59b54e6d2f06548f1b70d8a91f1285eb
+_md5_=215bb33a285ad7f1c2bdb9f5358442c9
diff --git a/metadata/md5-cache/dev-python/hyper-h2-2.5.1 b/metadata/md5-cache/dev-python/hyper-h2-2.5.1
index c51ef6b1aeea..21a51f588054 100644
--- a/metadata/md5-cache/dev-python/hyper-h2-2.5.1
+++ b/metadata/md5-cache/dev-python/hyper-h2-2.5.1
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP/2 State-Machine based protocol implementation
 EAPI=6
 HOMEPAGE=http://python-hyper.org/h2 https://pypi.python.org/pypi/h2
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/hyperframe-4.0.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/hyperframe-5.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/hpack-2.2.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/hpack-3.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/h2/h2-2.5.1.tar.gz -> hyper-h2-2.5.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a8fa2192dfd78cf7b1c6eeaf5b539f7f
+_md5_=ceda90a397094209617aefa92ca284d3
diff --git a/metadata/md5-cache/dev-python/hyperframe-4.0.1 b/metadata/md5-cache/dev-python/hyperframe-4.0.1
index 06c4b00191d6..2b4f66a0d0e6 100644
--- a/metadata/md5-cache/dev-python/hyperframe-4.0.1
+++ b/metadata/md5-cache/dev-python/hyperframe-4.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP/2 framing layer for Python
 EAPI=6
 HOMEPAGE=https://python-hyper.org/en/latest/ https://pypi.python.org/pypi/hyperframe
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hyperframe/hyperframe-4.0.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3a90e75b13166f7842c371a9d2e6653d
+_md5_=e36d5f308a4af061e47cba75525717dc
diff --git a/metadata/md5-cache/dev-python/hypothesis-3.33.0 b/metadata/md5-cache/dev-python/hypothesis-3.33.0
new file mode 100644
index 000000000000..ae79f89b61a8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-3.33.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/attrs[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_4? ( dev-lang/python:3.4[threads(+),sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=A library for property based testing
+EAPI=6
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis-python https://pypi.python.org/pypi/hypothesis
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=MPL-2.0
+RDEPEND=dev-python/attrs[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_4? ( dev-lang/python:3.4[threads(+),sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis-python/archive/3.33.0.tar.gz -> hypothesis-3.33.0.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=de17beaaa21cab0d0689c5e4e216361d
diff --git a/metadata/md5-cache/dev-python/ijson-2.3 b/metadata/md5-cache/dev-python/ijson-2.3
index 89b1adab1e73..133cdb042613 100644
--- a/metadata/md5-cache/dev-python/ijson-2.3
+++ b/metadata/md5-cache/dev-python/ijson-2.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/yajl dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=dev-libs/yajl dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Iterative JSON parser with a Pythonic interface
-EAPI=5
+EAPI=6
 HOMEPAGE=https://github.com/isagalaev/ijson https://pypi.python.org/pypi/ijson/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=dev-libs/yajl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+RDEPEND=dev-libs/yajl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/isagalaev/ijson/archive/2.3.tar.gz -> ijson-2.3.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2b7a66b960017b0e2699f96921db6d3a
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=75b582f5a5fe9002b2a016c5392d0041
diff --git a/metadata/md5-cache/dev-python/incremental-16.10.1 b/metadata/md5-cache/dev-python/incremental-16.10.1
index e426c7c9349e..d3b096fb8b2f 100644
--- a/metadata/md5-cache/dev-python/incremental-16.10.1
+++ b/metadata/md5-cache/dev-python/incremental-16.10.1
@@ -4,11 +4,11 @@ DESCRIPTION=Incremental is a small library that versions your Python projects
 EAPI=6
 HOMEPAGE=https://github.com/hawkowl/incremental https://pypi.python.org/pypi/incremental
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/incremental/incremental-16.10.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=af73d8a24d37b02ce9695bad661d64e2
+_md5_=91aeca60888cd966d02b7ed2e51f4246
diff --git a/metadata/md5-cache/dev-python/json-tools-0.3.3 b/metadata/md5-cache/dev-python/json-tools-0.3.3
deleted file mode 100644
index 680d764855d4..000000000000
--- a/metadata/md5-cache/dev-python/json-tools-0.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/colorama[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_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_python2_7(-)]
-DESCRIPTION=A set of tools to manipulate JSON: diff, patch, and pretty-printing
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/json_tools https://bitbucket.org/vadim_semenov/json_tools
-IUSE=test python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-python/colorama[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/j/json_tools/json_tools-0.3.3.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=581ce73c898111cf2a320c35d248e73f
diff --git a/metadata/md5-cache/dev-python/json-tools-0.4.0 b/metadata/md5-cache/dev-python/json-tools-0.4.0
index 2a69d02d5891..b70d652dc4b0 100644
--- a/metadata/md5-cache/dev-python/json-tools-0.4.0
+++ b/metadata/md5-cache/dev-python/json-tools-0.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=A set of tools to manipulate JSON: diff, patch, and pretty-printing
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/json_tools https://bitbucket.org/vadim_semenov/json_tools
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/colorama[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/json_tools/json_tools-0.4.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=06b1a32d2b44ae168b35cc715d2d9734
+_md5_=68cb90d64c7da5237fb1e755a6c8704a
diff --git a/metadata/md5-cache/dev-python/json-tools-0.4.1 b/metadata/md5-cache/dev-python/json-tools-0.4.1
new file mode 100644
index 000000000000..cf8264f9f5d5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/json-tools-0.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/colorama[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=A set of tools to manipulate JSON: diff, patch, and pretty-printing
+EAPI=6
+HOMEPAGE=https://pypi.python.org/pypi/json_tools https://bitbucket.org/vadim_semenov/json_tools
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/colorama[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/j/json_tools/json_tools-0.4.1.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c86355a05ba17a6a3aafa41cbf84d530
diff --git a/metadata/md5-cache/dev-python/libvirt-python-3.7.0 b/metadata/md5-cache/dev-python/libvirt-python-3.7.0
deleted file mode 100644
index dce920e7ccb3..000000000000
--- a/metadata/md5-cache/dev-python/libvirt-python-3.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-emulation/libvirt:0/3.7.0 virtual/pkgconfig test? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=libvirt Python bindings
-EAPI=6
-HOMEPAGE=https://www.libvirt.org
-IUSE=examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2
-RDEPEND=app-emulation/libvirt:0/3.7.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=http://libvirt.org/sources/python/libvirt-python-3.7.0.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1600c568824cad8a6aa8972817e20907
diff --git a/metadata/md5-cache/dev-python/libvirt-python-3.8.0 b/metadata/md5-cache/dev-python/libvirt-python-3.8.0
new file mode 100644
index 000000000000..ce8ed1396134
--- /dev/null
+++ b/metadata/md5-cache/dev-python/libvirt-python-3.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-emulation/libvirt:0/3.8.0 virtual/pkgconfig test? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=libvirt Python bindings
+EAPI=6
+HOMEPAGE=https://www.libvirt.org
+IUSE=examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2
+RDEPEND=app-emulation/libvirt:0/3.8.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=http://libvirt.org/sources/python/libvirt-python-3.8.0.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1600c568824cad8a6aa8972817e20907
diff --git a/metadata/md5-cache/dev-python/oslo-serialization-2.16.0 b/metadata/md5-cache/dev-python/oslo-serialization-2.16.0
deleted file mode 100644
index 0760713bbed6..000000000000
--- a/metadata/md5-cache/dev-python/oslo-serialization-2.16.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( virtual/python-ipaddress[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( >=dev-python/oslo-sphinx-4.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/sphinx-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/reno-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Oslo Serialization library
-EAPI=6
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.serialization/oslo.serialization-2.16.0.tar.gz -> oslo-serialization-2.16.0.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b684ecf791af0709a3c0c59f0b01a57a
diff --git a/metadata/md5-cache/dev-python/oslo-serialization-2.16.1 b/metadata/md5-cache/dev-python/oslo-serialization-2.16.1
index 093531d8fb24..05edfc696c1c 100644
--- a/metadata/md5-cache/dev-python/oslo-serialization-2.16.1
+++ b/metadata/md5-cache/dev-python/oslo-serialization-2.16.1
@@ -4,7 +4,7 @@ DESCRIPTION=Oslo Serialization library
 EAPI=6
 HOMEPAGE=https://launchpad.net/oslo
 IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.serialization/oslo.serialization-2.16.1.tar.gz -> oslo-serialization-2.16.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ffeaee1cfa2fcc765f14cb3f3f42fc4d
+_md5_=b684ecf791af0709a3c0c59f0b01a57a
diff --git a/metadata/md5-cache/dev-python/pillow-4.2.1 b/metadata/md5-cache/dev-python/pillow-4.2.1
deleted file mode 100644
index 6e0435b71a7b..000000000000
--- a/metadata/md5-cache/dev-python/pillow-4.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) ole? ( dev-python/olefile[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) tiff? ( media-libs/tiff:0=[jpeg?] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) zlib? ( sys-libs/zlib:0= ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx_rtd_theme[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Python Imaging Library (fork)
-EAPI=6
-HOMEPAGE=https://python-pillow.org/
-IUSE=doc examples imagequant jpeg jpeg2k ole lcms test tiff tk truetype webp zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=HPND
-RDEPEND=imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) ole? ( dev-python/olefile[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) tiff? ( media-libs/tiff:0=[jpeg?] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) zlib? ( sys-libs/zlib:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=test? ( jpeg tiff ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/P/Pillow/Pillow-4.2.1.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=429f4e42c0a7b71ec3c575ecdf705e14
diff --git a/metadata/md5-cache/dev-python/pillow-4.2.1-r1 b/metadata/md5-cache/dev-python/pillow-4.2.1-r1
deleted file mode 100644
index d88856657d99..000000000000
--- a/metadata/md5-cache/dev-python/pillow-4.2.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/olefile[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg?] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) zlib? ( sys-libs/zlib:0= ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx_rtd_theme[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Python Imaging Library (fork)
-EAPI=6
-HOMEPAGE=https://python-pillow.org/
-IUSE=doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=HPND
-RDEPEND=dev-python/olefile[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg?] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) zlib? ( sys-libs/zlib:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=test? ( jpeg tiff ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/P/Pillow/Pillow-4.2.1.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3da06848aff1977e25592773dbce8b36
diff --git a/metadata/md5-cache/dev-python/pillow-4.2.1-r2 b/metadata/md5-cache/dev-python/pillow-4.2.1-r2
new file mode 100644
index 000000000000..0fc53f4980d7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pillow-4.2.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/olefile[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] imagequant? ( media-gfx/libimagequant:0 ) virtual/jpeg:0 jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) zlib? ( sys-libs/zlib:0= ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx_rtd_theme[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Python Imaging Library (fork)
+EAPI=6
+HOMEPAGE=https://python-pillow.org/
+IUSE=doc examples imagequant jpeg2k lcms test tiff tk truetype webp zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=HPND
+RDEPEND=dev-python/olefile[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] imagequant? ( media-gfx/libimagequant:0 ) virtual/jpeg:0 jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) zlib? ( sys-libs/zlib:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=test? ( tiff ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/P/Pillow/Pillow-4.2.1.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cf40715701d0ee855528c4a40324eabd
diff --git a/metadata/md5-cache/dev-python/pillow-4.3.0 b/metadata/md5-cache/dev-python/pillow-4.3.0
new file mode 100644
index 000000000000..0c2c31fabe66
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pillow-4.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/olefile[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] imagequant? ( media-gfx/libimagequant:0 ) virtual/jpeg:0 jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) zlib? ( sys-libs/zlib:0= ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx_rtd_theme[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Python Imaging Library (fork)
+EAPI=6
+HOMEPAGE=https://python-pillow.org/
+IUSE=doc examples imagequant jpeg2k lcms test tiff tk truetype webp zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=HPND
+RDEPEND=dev-python/olefile[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] imagequant? ( media-gfx/libimagequant:0 ) virtual/jpeg:0 jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) zlib? ( sys-libs/zlib:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=test? ( tiff ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/P/Pillow/Pillow-4.3.0.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cf40715701d0ee855528c4a40324eabd
diff --git a/metadata/md5-cache/dev-python/priority-1.3.0 b/metadata/md5-cache/dev-python/priority-1.3.0
index 88b7c2103a3c..32a148621ec4 100644
--- a/metadata/md5-cache/dev-python/priority-1.3.0
+++ b/metadata/md5-cache/dev-python/priority-1.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=A pure-Python implementation of the HTTP/2 priority tree
 EAPI=6
 HOMEPAGE=http://python-hyper.org/priority https://github.com/python-hyper/priority https://pypi.python.org/pypi/priority
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/priority/priority-1.3.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9b74389fb97cd32244fdfd8bae26b6e0
+_md5_=3e6c8924691f5b728ce9f7f7afa1a1c2
diff --git a/metadata/md5-cache/dev-python/prometheus_client-0.0.21 b/metadata/md5-cache/dev-python/prometheus_client-0.0.21
index 2d081959c13f..44f8a41c250d 100644
--- a/metadata/md5-cache/dev-python/prometheus_client-0.0.21
+++ b/metadata/md5-cache/dev-python/prometheus_client-0.0.21
@@ -4,11 +4,11 @@ DESCRIPTION=Python client for the Prometheus monitoring system
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/prometheus_client
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=|| ( dev-python/twisted[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/twisted-web[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/prometheus/client_python/archive/v0.0.21.tar.gz -> prometheus_client-0.0.21.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9b743bb7d502ae5054f3bf4a31fced80
+_md5_=a4ae3a1ef284c746c27d360a684e0069
diff --git a/metadata/md5-cache/dev-python/ptyprocess-0.5.1 b/metadata/md5-cache/dev-python/ptyprocess-0.5.1
index b1d82d0c7370..e7e62ca00e03 100644
--- a/metadata/md5-cache/dev-python/ptyprocess-0.5.1
+++ b/metadata/md5-cache/dev-python/ptyprocess-0.5.1
@@ -4,11 +4,11 @@ DESCRIPTION=Run a subprocess in a pseudo terminal
 EAPI=5
 HOMEPAGE=https://github.com/pexpect/ptyprocess
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-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=ISC
 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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/ptyprocess/ptyprocess-0.5.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=84f4ce651d1e95b4732ac7aa257ff1e4
+_md5_=14f6800f5f67183af4a99fdf8b5d876a
diff --git a/metadata/md5-cache/dev-python/pyasn1-modules-0.1.5 b/metadata/md5-cache/dev-python/pyasn1-modules-0.1.5
new file mode 100644
index 000000000000..c3b22ab57d33
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyasn1-modules-0.1.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/pyasn1-0.3.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=pyasn1 modules
+EAPI=6
+HOMEPAGE=http://pyasn1.sourceforge.net/ https://pypi.python.org/pypi/pyasn1-modules
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=BSD
+RDEPEND=>=dev-python/pyasn1-0.3.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,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_4(-),-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_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pyasn1-modules/pyasn1-modules-0.1.5.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0548a7509a676c04224ccc99300e038b
diff --git a/metadata/md5-cache/dev-python/pyblake2-0.9.3 b/metadata/md5-cache/dev-python/pyblake2-0.9.3
index b559dea5f683..4a5af29c5604 100644
--- a/metadata/md5-cache/dev-python/pyblake2-0.9.3
+++ b/metadata/md5-cache/dev-python/pyblake2-0.9.3
@@ -3,12 +3,12 @@ DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? (
 DESCRIPTION=BLAKE2 hash function extension module
 EAPI=6
 HOMEPAGE=https://github.com/dchest/pyblake2 https://pypi.python.org/pypi/pyblake2
-IUSE=cpu_flags_x86_ssse3 cpu_flags_x86_avx cpu_flags_x86_xop python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=CC0-1.0
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyblake2/pyblake2-0.9.3.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=74370eef44a156621ad3a0fc2d4fdd3b
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=325f3d585bfc7996006a4a8ac8976e4f
diff --git a/metadata/md5-cache/dev-python/pycairo-1.15.3 b/metadata/md5-cache/dev-python/pycairo-1.15.3
index 22d206f14e23..d728a3a0db05 100644
--- a/metadata/md5-cache/dev-python/pycairo-1.15.3
+++ b/metadata/md5-cache/dev-python/pycairo-1.15.3
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for the cairo library
 EAPI=6
 HOMEPAGE=https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo
 IUSE=doc examples test xcb python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-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
+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
 LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=>=x11-libs/cairo-1.13.1[svg,xcb?] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/pygobject/pycairo/releases/download/v1.15.3/pycairo-1.15.3.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=708ccc94e670136edcdbcacd58aa093e
+_md5_=107837895ab72e4691b8055ed5bfaaaa
diff --git a/metadata/md5-cache/dev-python/python-gnupg-0.4.0 b/metadata/md5-cache/dev-python/python-gnupg-0.4.0
new file mode 100644
index 000000000000..635e4757d7d9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-gnupg-0.4.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-crypt/gnupg python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Python wrapper for GNU Privacy Guard
+EAPI=6
+HOMEPAGE=http://pythonhosted.org/python-gnupg/ https://github.com/vsajip/python-gnupg/
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=app-crypt/gnupg python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/p/python-gnupg/python-gnupg-0.4.0.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0c02c935950c3d82e4cb9e76ac849186
diff --git a/metadata/md5-cache/dev-python/python-heatclient-1.11.1 b/metadata/md5-cache/dev-python/python-heatclient-1.11.1
new file mode 100644
index 000000000000..964c6ba1b761
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-heatclient-1.11.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( >=dev-python/coverage-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/coverage-4.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-mock-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/mox3-0.19.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-openstackclient-3.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) doc? ( >=dev-python/openstackdocstheme-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=OpenStack Orchestration API Client Library
+EAPI=6
+HOMEPAGE=http://www.openstack.org/
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+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_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cliff-2.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/osc-lib-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-heatclient/python-heatclient-1.11.1.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c69c49489aed8301b64887540fb04f73
diff --git a/metadata/md5-cache/dev-python/python-heatclient-1.8.2 b/metadata/md5-cache/dev-python/python-heatclient-1.8.2
new file mode 100644
index 000000000000..487f6b8c41b1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-heatclient-1.8.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-mock-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/mox3-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/mox3-0.19.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >dev-python/oslotest-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-openstackclient-3.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) doc? ( >=dev-python/oslo-sphinx-4.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sphinx-1.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sphinx-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=OpenStack Orchestration API Client Library
+EAPI=6
+HOMEPAGE=http://www.openstack.org/
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cliff-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/osc-lib-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-2.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/requests-2.12.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-heatclient/python-heatclient-1.8.2.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f676452b3f594311afa438ae24d98be0
diff --git a/metadata/md5-cache/dev-python/pyusb-1.0.2 b/metadata/md5-cache/dev-python/pyusb-1.0.2
new file mode 100644
index 000000000000..55b0b641f73b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyusb-1.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/libusb:= dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=USB support for Python
+EAPI=6
+HOMEPAGE=https://walac.github.io/pyusb/ https://pypi.python.org/pypi/pyusb
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=BSD
+RDEPEND=virtual/libusb:= dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/walac/pyusb/archive/v1.0.2.tar.gz -> pyusb-1.0.2.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f423441df5c9777fe7b293b21b726742
diff --git a/metadata/md5-cache/dev-python/pyx-0.14.1 b/metadata/md5-cache/dev-python/pyx-0.14.1
index 9f0d3b7630d1..a4f4cfa4c6cb 100644
--- a/metadata/md5-cache/dev-python/pyx-0.14.1
+++ b/metadata/md5-cache/dev-python/pyx-0.14.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/tex-base dev-texlive/texlive-basic doc? ( virtual/latex-base dev-python/sphinx[latex,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=virtual/tex-base dev-texlive/texlive-basic doc? ( virtual/latex-base dev-python/sphinx[latex,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Python package for the generation of encapsulated PostScript figures
 EAPI=5
 HOMEPAGE=http://pyx.sourceforge.net/ http://pypi.python.org/pypi/PyX/
-IUSE=doc python_targets_python3_4 python_targets_python3_5
+IUSE=doc python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=virtual/tex-base dev-texlive/texlive-basic python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
+RDEPEND=virtual/tex-base dev-texlive/texlive-basic python_targets_python3_4? ( dev-lang/python:3.4 ) 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyX/PyX-0.14.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dc594bf6c5a94a80d2897774b955f81c
+_md5_=547d40559700b099f213253a8813cfb6
diff --git a/metadata/md5-cache/dev-python/reportlab-3.3.0-r1 b/metadata/md5-cache/dev-python/reportlab-3.3.0-r1
index bcc73b5d1e4a..982dd31ecf4c 100644
--- a/metadata/md5-cache/dev-python/reportlab-3.3.0-r1
+++ b/metadata/md5-cache/dev-python/reportlab-3.3.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-python/pillow-2.4.0[tiff,truetype,jpeg,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-libs/libart_lgpl sys-libs/zlib >=dev-python/setuptools-2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/pillow-2.4.0[tiff,truetype,jpeg(+),python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-libs/libart_lgpl sys-libs/zlib >=dev-python/setuptools-2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Tools for generating printable PDF documents from any data source
 EAPI=5
 HOMEPAGE=http://www.reportlab.com/
 IUSE=doc examples python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=>=dev-python/pillow-2.4.0[tiff,truetype,jpeg,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-libs/libart_lgpl sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=>=dev-python/pillow-2.4.0[tiff,truetype,jpeg(+),python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-libs/libart_lgpl sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/reportlab/reportlab-3.3.0.tar.gz http://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	prefix	7b6fb2fc216b101b5d97d171925a847c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3a80860826f5329e647138273c3701ac
+_md5_=bf8fdb993927d51a4deb8a70663fed8d
diff --git a/metadata/md5-cache/dev-python/reportlab-3.4.0 b/metadata/md5-cache/dev-python/reportlab-3.4.0
index 3db0b82e14c1..f47b0f46e2b9 100644
--- a/metadata/md5-cache/dev-python/reportlab-3.4.0
+++ b/metadata/md5-cache/dev-python/reportlab-3.4.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-python/pillow-2.4.0[tiff,truetype,jpeg,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-libs/libart_lgpl sys-libs/zlib >=dev-python/setuptools-2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/pillow-2.4.0[tiff,truetype,jpeg(+),python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-libs/libart_lgpl sys-libs/zlib >=dev-python/setuptools-2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Tools for generating printable PDF documents from any data source
 EAPI=6
 HOMEPAGE=http://www.reportlab.com/
 IUSE=doc examples python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=>=dev-python/pillow-2.4.0[tiff,truetype,jpeg,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-libs/libart_lgpl sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=>=dev-python/pillow-2.4.0[tiff,truetype,jpeg(+),python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-libs/libart_lgpl sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/reportlab/reportlab-3.4.0.tar.gz http://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	prefix	7b6fb2fc216b101b5d97d171925a847c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d52869ba5fec7d7c5e0ee249e693ca16
+_md5_=f0eb69a774db45d1c36242f62caa6d33
diff --git a/metadata/md5-cache/dev-python/scrapy-1.4.0 b/metadata/md5-cache/dev-python/scrapy-1.4.0
new file mode 100644
index 000000000000..0f4d265fea48
--- /dev/null
+++ b/metadata/md5-cache/dev-python/scrapy-1.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( >=dev-python/six-1.5.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libxml2[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/parsel-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ibl? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ssl? ( >=dev-python/pyopenssl-0.14[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) boto? ( dev-python/boto3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/twisted-14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/w3lib-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/queuelib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cssselect-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =net-proxy/mitmproxy-0.10.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/netlib-0.10.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jmespath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/testfixtures[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-ftp/vsftpd ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=A high-level Python Screen Scraping framework
+EAPI=6
+HOMEPAGE=https://github.com/scrapy/scrapy/ https://pypi.python.org/pypi/Scrapy/
+IUSE=boto doc ibl test ssl python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-python/six-1.5.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libxml2[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/parsel-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ibl? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ssl? ( >=dev-python/pyopenssl-0.14[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) boto? ( dev-python/boto3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/twisted-14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/w3lib-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/queuelib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cssselect-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=test? ( ssl boto ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/scrapy/scrapy/archive/1.4.0.tar.gz -> scrapy-1.4.0.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=612a1001aca168d2bed5e0ddf47d9a71
diff --git a/metadata/md5-cache/dev-python/twisted-16.6.0-r3 b/metadata/md5-cache/dev-python/twisted-16.6.0-r3
index 00320c3005fe..576eba1c074f 100644
--- a/metadata/md5-cache/dev-python/twisted-16.6.0-r3
+++ b/metadata/md5-cache/dev-python/twisted-16.6.0-r3
@@ -4,11 +4,11 @@ DESCRIPTION=An asynchronous networking framework written in Python
 EAPI=5
 HOMEPAGE=http://www.twistedmatrix.com/
 IUSE=conch crypt http2 serial +soap test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/incremental-16.10.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/zope-interface-4.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] conch? ( dev-python/pyasn1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-0.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/appdirs-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/idna-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) serial? ( dev-python/pyserial[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) soap? ( python_targets_python2_7? ( dev-python/soappy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) http2? ( >=dev-python/hyper-h2-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/hyper-h2-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/priority-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/priority-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/constantly-15.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !dev-python/twisted-core !dev-python/twisted-conch !dev-python/twisted-lore !dev-python/twisted-mail !dev-python/twisted-names !dev-python/twisted-news !dev-python/twisted-pair !dev-python/twisted-runner !dev-python/twisted-words !dev-python/twisted-web python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://twistedmatrix.com/Releases/Twisted/16.6/Twisted-16.6.0.tar.bz2 https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=da90027c22063ebabcef8857864ba905
+_md5_=1150138fbc4433475be371c8a78c8e3f
diff --git a/metadata/md5-cache/dev-python/twisted-17.9.0 b/metadata/md5-cache/dev-python/twisted-17.9.0
new file mode 100644
index 000000000000..8b67af20c3c0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/twisted-17.9.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=dev-python/incremental-16.10.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/gmpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyasn1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-0.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/appdirs-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/idna[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyserial[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/constantly-15.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <net-misc/openssh-7.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=An asynchronous networking framework written in Python
+EAPI=5
+HOMEPAGE=http://www.twistedmatrix.com/
+IUSE=conch crypt http2 serial +soap test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/incremental-16.10.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/zope-interface-4.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] conch? ( dev-python/pyasn1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/appdirs-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/idna-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) serial? ( >=dev-python/pyserial-3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) soap? ( python_targets_python2_7? ( dev-python/soappy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) http2? ( >=dev-python/hyper-h2-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/hyper-h2-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/priority-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/priority-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/constantly-15.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/automat-0.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/hyperlink-17.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !dev-python/twisted-core !dev-python/twisted-conch !dev-python/twisted-lore !dev-python/twisted-mail !dev-python/twisted-names !dev-python/twisted-news !dev-python/twisted-pair !dev-python/twisted-runner !dev-python/twisted-words !dev-python/twisted-web python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=http://twistedmatrix.com/Releases/Twisted/17.9/Twisted-17.9.0.tar.bz2 https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a35af08618fa56cd3068a98c27cc03a4
diff --git a/metadata/md5-cache/dev-python/twisted-conch-15.2.1 b/metadata/md5-cache/dev-python/twisted-conch-15.2.1
index 8130e96ebdc0..9b906b1e50ad 100644
--- a/metadata/md5-cache/dev-python/twisted-conch-15.2.1
+++ b/metadata/md5-cache/dev-python/twisted-conch-15.2.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-python/twisted-core-15.2*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_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_python2_7(-)]
+DEPEND==dev-python/twisted-core-15.2*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycryptodome[python_targets_python2_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_python2_7(-)]
 DESCRIPTION=Twisted SSHv2 implementation
 EAPI=5
 HOMEPAGE=http://www.twistedmatrix.com/
 IUSE=python_targets_python2_7
 KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86
 LICENSE=MIT
-RDEPEND==dev-python/twisted-core-15.2*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !dev-python/twisted 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(-)]
+RDEPEND==dev-python/twisted-core-15.2*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycryptodome[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !dev-python/twisted python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://twistedmatrix.com/Releases/Conch/15.2/TwistedConch-15.2.1.tar.bz2
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	twisted-r1	929311d6c0e0b4fc11d9fb83b5df9d35	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=952db15944a3c331072c20d31357bf57
+_md5_=2a133368dfa90630a7a30ca5a4109e61
diff --git a/metadata/md5-cache/dev-python/w3lib-1.18.0 b/metadata/md5-cache/dev-python/w3lib-1.18.0
new file mode 100644
index 000000000000..59e02efcf6c8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/w3lib-1.18.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Python library of web-related functions
+EAPI=6
+HOMEPAGE=https://github.com/scrapy/w3lib
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/w/w3lib/w3lib-1.18.0.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=01b04cd5d8815e5d0e7b0e53fbf07b80
diff --git a/metadata/md5-cache/dev-qt/qtcore-4.8.7-r3 b/metadata/md5-cache/dev-qt/qtcore-4.8.7-r3
new file mode 100644
index 000000000000..2be3639c9f29
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtcore-4.8.7-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=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(-)?] glib? ( dev-libs/glib: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(-)?] ) iconv? ( >=virtual/libiconv-0-r2[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(-)?] ) icu? ( dev-libs/icu:=[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(-)?] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-lang/perl virtual/pkgconfig[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(-)?]
+DESCRIPTION=Cross-platform application development framework
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=+glib iconv icu libressl qt3support ssl 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 aqua debug pch +exceptions
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
+PDEPEND=~dev-qt/qttranslations-4.8.7 qt3support? ( ~dev-qt/qtgui-4.8.7[aqua=,debug=,glib=,qt3support,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(-)?] )
+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(-)?] glib? ( dev-libs/glib: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(-)?] ) iconv? ( >=virtual/libiconv-0-r2[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(-)?] ) icu? ( dev-libs/icu:=[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(-)?] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
+SLOT=4
+SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	qt4-build-multilib	277a1997239523435425a3e17d116e23	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=31b83a60c71ad5480eb0be39f90549aa
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.1.3 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.1.3
deleted file mode 100644
index 74c09f9caa64..000000000000
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rails[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] dev-ruby/rspec-rails[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rails[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/rspec-rails[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Add vendor prefixes to CSS rules using values from the Can I Use website
-EAPI=6
-HOMEPAGE=https://github.com/ai/autoprefixer-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=7
-SRC_URI=mirror://rubygems/autoprefixer-rails-7.1.1.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1aa43bb38a5ef821f0baf7e835195376
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.2.4 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.2.4
deleted file mode 100644
index 277f4debc6d3..000000000000
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rails[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] dev-ruby/rspec-rails[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rails[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/rspec-rails[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Add vendor prefixes to CSS rules using values from the Can I Use website
-EAPI=6
-HOMEPAGE=https://github.com/ai/autoprefixer-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=7
-SRC_URI=mirror://rubygems/autoprefixer-rails-7.1.2.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1aa43bb38a5ef821f0baf7e835195376
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.6 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.6
new file mode 100644
index 000000000000..d5e9878dec0c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rails[ruby_targets_ruby22] dev-ruby/rake[ruby_targets_ruby22] dev-ruby/rspec-rails[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rails[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/rspec-rails[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=Add vendor prefixes to CSS rules using values from the Can I Use website
+EAPI=6
+HOMEPAGE=https://github.com/ai/autoprefixer-rails
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/execjs:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=7
+SRC_URI=mirror://rubygems/autoprefixer-rails-7.1.6.gem
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=02232d42e9278c6974d9f31523000ab0
diff --git a/metadata/md5-cache/dev-ruby/backports-3.8.0 b/metadata/md5-cache/dev-ruby/backports-3.8.0
index 1053ee6d5256..2eb31ba71fb1 100644
--- a/metadata/md5-cache/dev-ruby/backports-3.8.0
+++ b/metadata/md5-cache/dev-ruby/backports-3.8.0
@@ -4,11 +4,11 @@ DESCRIPTION=Backports of Ruby features for older Ruby
 EAPI=6
 HOMEPAGE=https://github.com/marcandre/backports
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~ia64 ~ppc
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/backports-3.8.0.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c32b358ab2413f91623f7205956f58ca
+_md5_=70a10dac7632e3283389b2ba389c159a
diff --git a/metadata/md5-cache/dev-ruby/binding_of_caller-0.7.3 b/metadata/md5-cache/dev-ruby/binding_of_caller-0.7.3
new file mode 100644
index 000000000000..c503f5dc11af
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/binding_of_caller-0.7.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bacon[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Retrieve the binding of a method's caller
+EAPI=6
+HOMEPAGE=https://github.com/banister/binding_of_caller
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=mirror://rubygems/binding_of_caller-0.7.3.gem
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=1cd4beeb3652dcc2e15e9f58bf99632d
diff --git a/metadata/md5-cache/dev-ruby/capybara-1.1.4 b/metadata/md5-cache/dev-ruby/capybara-1.1.4
deleted file mode 100644
index 28707d05e859..000000000000
--- a/metadata/md5-cache/dev-ruby/capybara-1.1.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby22] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby22] >=dev-ruby/xpath-0.1.4:0[ruby_targets_ruby22] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Capybara aims to simplify the process of integration testing Rack applications
-EAPI=4
-HOMEPAGE=https://github.com/jnicklas/capybara
-IUSE=test test elibc_FreeBSD ruby_targets_ruby22 test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby22] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby22] >=dev-ruby/xpath-0.1.4:0[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://rubygems/capybara-1.1.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
-_md5_=66008fbb64a2a0edad9fb89aa144cc71
diff --git a/metadata/md5-cache/dev-ruby/coderay-1.1.2 b/metadata/md5-cache/dev-ruby/coderay-1.1.2
index aa8a77b0bce8..d23fe3b6d3f4 100644
--- a/metadata/md5-cache/dev-ruby/coderay-1.1.2
+++ b/metadata/md5-cache/dev-ruby/coderay-1.1.2
@@ -4,11 +4,11 @@ DESCRIPTION=A Ruby library for syntax highlighting
 EAPI=6
 HOMEPAGE=http://coderay.rubychan.de/
 IUSE=elibc_FreeBSD ruby_targets_ruby22 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
+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=MIT
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/rubychan/coderay/archive/v1.1.2.tar.gz -> coderay-1.1.2.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9a908f66c6c622f94ffd6999190631e8
+_md5_=d1deef55e32220a0c3caba283cd80c0d
diff --git a/metadata/md5-cache/dev-ruby/cri-2.10.0 b/metadata/md5-cache/dev-ruby/cri-2.10.0
new file mode 100644
index 000000000000..b04d215b985d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/cri-2.10.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/colored-1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/colored-1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/colored-1.2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/yard[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/yard[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/yard[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Cri is a library for building easy-to-use commandline tools
+EAPI=6
+HOMEPAGE=https://rubygems.org/gems/cri
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/colored-1.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/colored-1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/colored-1.2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=mirror://rubygems/cri-2.10.0.gem
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ea1a7f488f0dc69571a16a08fed4fe64
diff --git a/metadata/md5-cache/dev-ruby/daemons-1.2.5 b/metadata/md5-cache/dev-ruby/daemons-1.2.5
new file mode 100644
index 000000000000..ae54f2db2de7
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/daemons-1.2.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Wrap existing ruby scripts to be run as a daemon
+EAPI=6
+HOMEPAGE=https://github.com/thuehlinger/daemons
+IUSE=examples elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=https://github.com/thuehlinger/daemons/archive/v1.2.5.tar.gz -> daemons-1.2.5.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4d6e665697ca7b2e26310325b46a07e5
diff --git a/metadata/md5-cache/dev-ruby/dbf-3.1.0 b/metadata/md5-cache/dev-ruby/dbf-3.1.0
index 92c5691b1310..9d82460fd9ad 100644
--- a/metadata/md5-cache/dev-ruby/dbf-3.1.0
+++ b/metadata/md5-cache/dev-ruby/dbf-3.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=a small fast library for reading dBase, xBase, Clipper and FoxPro da
 EAPI=5
 HOMEPAGE=https://github.com/infused/dbf
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/dbf-3.1.0.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=09fa79f0ca3c3bff190df23dc634f7b8
+_md5_=262dce15616aa2a54cb30727a3aca632
diff --git a/metadata/md5-cache/dev-ruby/dbf-3.1.1 b/metadata/md5-cache/dev-ruby/dbf-3.1.1
new file mode 100644
index 000000000000..ca6c5bc7299e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/dbf-3.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+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_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=mirror://rubygems/dbf-3.1.1.gem
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=79f474f58e02364c8b64ecee35c54714
diff --git a/metadata/md5-cache/dev-ruby/ethon-0.11.0 b/metadata/md5-cache/dev-ruby/ethon-0.11.0
new file mode 100644
index 000000000000..97b57d97512f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ethon-0.11.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/sinatra[ruby_targets_ruby22] dev-ruby/mime-types[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sinatra[ruby_targets_ruby23] dev-ruby/mime-types[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/sinatra[ruby_targets_ruby24] dev-ruby/mime-types[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Very lightweight libcurl wrapper
+EAPI=6
+HOMEPAGE=https://github.com/typhoeus/ethon
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=net-misc/curl ruby_targets_ruby22? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=mirror://rubygems/ethon-0.11.0.gem
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a9361aa3fcf23e5e94798a796fbde7db
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.9.18 b/metadata/md5-cache/dev-ruby/ffi-1.9.18
index b4a0e20ee02e..2ecf74dfe343 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.9.18
+++ b/metadata/md5-cache/dev-ruby/ffi-1.9.18
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby extension for programmatically loading dynamic libraries
 EAPI=5
 HOMEPAGE=https://wiki.github.com/ffi/ffi
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=virtual/libffi ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/ffi/ffi/archive/1.9.18.tar.gz -> ffi-git-1.9.18.tgz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=db943b727efe640856462cf3da686686
+_md5_=0427d550f220f187161821cea259538f
diff --git a/metadata/md5-cache/dev-ruby/globalid-0.4.1 b/metadata/md5-cache/dev-ruby/globalid-0.4.1
new file mode 100644
index 000000000000..f881cc8d6334
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/globalid-0.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/activemodel-4.2.0[ruby_targets_ruby22] >=dev-ruby/railties-4.2.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/activemodel-4.2.0[ruby_targets_ruby23] >=dev-ruby/railties-4.2.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/activemodel-4.2.0[ruby_targets_ruby24] >=dev-ruby/railties-4.2.0[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Reference models by URI
+EAPI=6
+HOMEPAGE=https://github.com/rails/globalid
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=https://github.com/rails/globalid/archive/v0.4.1.tar.gz -> globalid-0.4.1.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7181572db74170f8090b1aeecbaf3515
diff --git a/metadata/md5-cache/dev-ruby/highline-1.7.8 b/metadata/md5-cache/dev-ruby/highline-1.7.8
index fcee22dc918f..9387311986da 100644
--- a/metadata/md5-cache/dev-ruby/highline-1.7.8
+++ b/metadata/md5-cache/dev-ruby/highline-1.7.8
@@ -4,11 +4,11 @@ DESCRIPTION=Highline is a high-level command-line IO library for ruby
 EAPI=5
 HOMEPAGE=https://github.com/JEG2/highline
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~alpha ~amd64 ~hppa ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-2 Ruby )
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/highline-1.7.8.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b74486cce8e98dd5fda253ef97a2f694
+_md5_=f58513677fb46db79e3e291605356b30
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.16.0 b/metadata/md5-cache/dev-ruby/hoe-3.16.0
index 7781d3d6f3d3..9706624b0e29 100644
--- a/metadata/md5-cache/dev-ruby/hoe-3.16.0
+++ b/metadata/md5-cache/dev-ruby/hoe-3.16.0
@@ -4,11 +4,11 @@ DESCRIPTION=Hoe extends rake to provide full project automation
 EAPI=5
 HOMEPAGE=https://www.zenspider.com/projects/hoe.html
 IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-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
+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=MIT
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby22] <dev-ruby/rake-13.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] <dev-ruby/rake-13.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] <dev-ruby/rake-13.0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/hoe-3.16.0.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=aba7869eae60d25a57d2e943d7d0c206
+_md5_=504c3152944f53fadcb72689cc6766e6
diff --git a/metadata/md5-cache/dev-ruby/json-1.8.6-r1 b/metadata/md5-cache/dev-ruby/json-1.8.6-r1
index a658016fcb48..e65c94d96984 100644
--- a/metadata/md5-cache/dev-ruby/json-1.8.6-r1
+++ b/metadata/md5-cache/dev-ruby/json-1.8.6-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A JSON implementation as a Ruby extension
 EAPI=6
 HOMEPAGE=https://github.com/flori/json
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-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
+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=|| ( Ruby GPL-2 )
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/json-1.8.6.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=a86c0147c3488c91887ec741b6e88879
+_md5_=ebf138b5f8ac2b9815bbe52cdacafec1
diff --git a/metadata/md5-cache/dev-ruby/libxml-2.9.0 b/metadata/md5-cache/dev-ruby/libxml-2.9.0
index a81649a6a893..f60dbb5f36d5 100644
--- a/metadata/md5-cache/dev-ruby/libxml-2.9.0
+++ b/metadata/md5-cache/dev-ruby/libxml-2.9.0
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby libxml with a user friendly API, akin to REXML
 EAPI=5
 HOMEPAGE=https://github.com/xml4r/libxml-ruby
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-libs/libxml2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/libxml-ruby-2.9.0.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d42faf835bd8dcc0fd73415ea038543d
+_md5_=67376c592e380a6c5c502b12c08f7dae
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.9.1 b/metadata/md5-cache/dev-ruby/minitest-5.9.1
index 4deeb5466078..68267c823a7e 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.9.1
+++ b/metadata/md5-cache/dev-ruby/minitest-5.9.1
@@ -4,11 +4,11 @@ DESCRIPTION=minitest/unit is a small and fast replacement for ruby's huge and sl
 EAPI=5
 HOMEPAGE=https://github.com/seattlerb/minitest
 IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-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
+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=MIT
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5
 SRC_URI=mirror://rubygems/minitest-5.9.1.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=7f920e8847689b7016251c1d78a077b3
+_md5_=edf7cfa349a2e0174f126a09d2755f4e
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.1.0-r1 b/metadata/md5-cache/dev-ruby/msgpack-1.1.0-r1
new file mode 100644
index 000000000000..050b3941f7fe
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/msgpack-1.1.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Binary-based efficient data interchange format for ruby binding
+EAPI=5
+HOMEPAGE=https://msgpack.org/
+IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=mirror://rubygems/msgpack-1.1.0.gem
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=36c79f3f8c674c65413b67ce3023d0c4
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.12.1 b/metadata/md5-cache/dev-ruby/multi_json-1.12.1
index 7afa1c733625..e84362a888b4 100644
--- a/metadata/md5-cache/dev-ruby/multi_json-1.12.1
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.12.1
@@ -4,11 +4,11 @@ DESCRIPTION=A gem to provide swappable JSON backends
 EAPI=5
 HOMEPAGE=https://github.com/intridea/multi_json
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~x86 ~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 ppc ppc64 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_ruby22? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby22] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby22] ) ) 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_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/intridea/multi_json/archive/v1.12.1.tar.gz -> multi_json-1.12.1.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ac248063f360bcdc41332f4cd3ae79fb
+_md5_=62057b3cdbe790bce8c7075f0eed23fd
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
new file mode 100644
index 000000000000..cfc66fc26f8a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.5.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby22] ) 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_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) 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_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/msgpack-1.0.0[ruby_targets_ruby22] ) 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_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=mirror://rubygems/neovim-0.5.1.gem
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e43dd76030e8020d2614d1dbd03a5ad5
diff --git a/metadata/md5-cache/dev-ruby/open4-1.3.4 b/metadata/md5-cache/dev-ruby/open4-1.3.4
index b2dddd6b78fb..7384e38a4627 100644
--- a/metadata/md5-cache/dev-ruby/open4-1.3.4
+++ b/metadata/md5-cache/dev-ruby/open4-1.3.4
@@ -4,11 +4,11 @@ DESCRIPTION=Open3::popen3 with exit status
 EAPI=5
 HOMEPAGE=https://github.com/ahoward/open4
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/open4-1.3.4.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=08fef8915b8066939718e9bf99457778
+_md5_=20d70e5f1a5a7415539b5686f29b222d
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.2.8 b/metadata/md5-cache/dev-ruby/pkg-config-1.2.8
new file mode 100644
index 000000000000..e1805493487d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.2.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) test? ( x11-libs/cairo ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=A pkg-config implementation by Ruby
+EAPI=6
+HOMEPAGE=https://github.com/rcairo/pkg-config
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( LGPL-2 LGPL-2.1 LGPL-3 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=mirror://rubygems/pkg-config-1.2.8.gem
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=03ddbd5a954e7d99958dcf5ca75595b9
diff --git a/metadata/md5-cache/dev-ruby/power_assert-1.1.1 b/metadata/md5-cache/dev-ruby/power_assert-1.1.1
new file mode 100644
index 000000000000..829ade0a9e7b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/power_assert-1.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/test-unit[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Shows each value of variables and method calls in the expression
+EAPI=6
+HOMEPAGE=https://github.com/k-tsj/power_assert
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 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 BSD-2 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=https://github.com/k-tsj/power_assert/archive/v1.1.1.tar.gz -> power_assert-1.1.1.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=de004b243821b8278ed1ae1f884e5dd7
diff --git a/metadata/md5-cache/dev-ruby/pry-0.11.2 b/metadata/md5-cache/dev-ruby/pry-0.11.2
index 788012f719a5..7cf063b7d9c2 100644
--- a/metadata/md5-cache/dev-ruby/pry-0.11.2
+++ b/metadata/md5-cache/dev-ruby/pry-0.11.2
@@ -4,11 +4,11 @@ DESCRIPTION=Pry is a powerful alternative to the standard IRB shell for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/pry/pry/wiki
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] =dev-ruby/coderay-1.1*[ruby_targets_ruby22] >=dev-ruby/method_source-0.9.0[ruby_targets_ruby22] =dev-ruby/method_source-0.9*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] =dev-ruby/coderay-1.1*[ruby_targets_ruby23] >=dev-ruby/method_source-0.9.0[ruby_targets_ruby23] =dev-ruby/method_source-0.9*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/coderay-1.1.0[ruby_targets_ruby24] =dev-ruby/coderay-1.1*[ruby_targets_ruby24] >=dev-ruby/method_source-0.9.0[ruby_targets_ruby24] =dev-ruby/method_source-0.9*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=ruby19
 SRC_URI=https://github.com/pry/pry/archive/v0.11.2.tar.gz -> pry-0.11.2.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ac2b24570bc90feb07ff5aee90173c9e
+_md5_=bae77c6042d57eb56d1c0884c103b148
diff --git a/metadata/md5-cache/dev-ruby/rack-1.6.7 b/metadata/md5-cache/dev-ruby/rack-1.6.7
index 26d358a7420e..eb5cb41152c4 100644
--- a/metadata/md5-cache/dev-ruby/rack-1.6.7
+++ b/metadata/md5-cache/dev-ruby/rack-1.6.7
@@ -4,11 +4,11 @@ DESCRIPTION=A modular Ruby webserver interface
 EAPI=6
 HOMEPAGE=https://rack.github.com/
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test 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
+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_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) !<dev-ruby/rack-1.4.5-r1:1.4 !<dev-ruby/rack-1.5.2-r4:1.5 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1.6
 SRC_URI=mirror://rubygems/rack-1.6.7.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f032217875c4d158f13863bd514eb93c
+_md5_=0e78a779edc415e983235f1c53f4e1ac
diff --git a/metadata/md5-cache/dev-ruby/rainbow-2.2.2 b/metadata/md5-cache/dev-ruby/rainbow-2.2.2
index 57058c2c485e..25fdd06756b5 100644
--- a/metadata/md5-cache/dev-ruby/rainbow-2.2.2
+++ b/metadata/md5-cache/dev-ruby/rainbow-2.2.2
@@ -4,11 +4,11 @@ DESCRIPTION=Colorize printed text on ANSI terminals
 EAPI=6
 HOMEPAGE=https://github.com/sickill/rainbow
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~hppa ~ppc ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=https://github.com/sickill/rainbow/archive/v2.2.2.tar.gz -> rainbow-git-2.2.2.tgz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f0ab7701f221d7147cceb381dfeaebdb
+_md5_=e87f79cad7875642f210097ee8440ff6
diff --git a/metadata/md5-cache/dev-ruby/rake-12.2.1 b/metadata/md5-cache/dev-ruby/rake-12.2.1
new file mode 100644
index 000000000000..e5ef73745997
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rake-12.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=app-arch/gzip ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Make-like scripting in Ruby
+EAPI=6
+HOMEPAGE=https://github.com/ruby/rake
+IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+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=MIT
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=https://github.com/ruby/rake/archive/v12.2.1.tar.gz -> rake-12.2.1.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9f304666805b1c9d0c77b8ba5898f53e
diff --git a/metadata/md5-cache/dev-ruby/rr-1.2.0 b/metadata/md5-cache/dev-ruby/rr-1.2.0
deleted file mode 100644
index a06f5e4b5b1c..000000000000
--- a/metadata/md5-cache/dev-ruby/rr-1.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/session[ruby_targets_ruby22] dev-ruby/diff-lcs[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/session[ruby_targets_ruby23] dev-ruby/diff-lcs[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] dev-ruby/session[ruby_targets_ruby24] dev-ruby/diff-lcs[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A double framework featuring a selection of double techniques and a terse syntax
-EAPI=5
-HOMEPAGE=http://pivotallabs.com/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 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=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=https://github.com/rr/rr/archive/v1.2.0.tar.gz -> rr-1.2.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ec0b666a6e55ad7ca133164475623442
diff --git a/metadata/md5-cache/dev-ruby/rr-1.2.1 b/metadata/md5-cache/dev-ruby/rr-1.2.1
index 42c446883ba4..bf6f1646dee3 100644
--- a/metadata/md5-cache/dev-ruby/rr-1.2.1
+++ b/metadata/md5-cache/dev-ruby/rr-1.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=A double framework featuring a selection of double techniques and a
 EAPI=6
 HOMEPAGE=https://rr.github.io/rr
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 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
+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=MIT
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/rr/rr/archive/v1.2.1.tar.gz -> rr-1.2.1.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=678c3f6bc18229e99d5599c794a82f11
+_md5_=0d4971d620cb9588cee0885596556e3d
diff --git a/metadata/md5-cache/dev-ruby/rspec-2.99.0 b/metadata/md5-cache/dev-ruby/rspec-2.99.0
index 00b594aa8361..63103feb1988 100644
--- a/metadata/md5-cache/dev-ruby/rspec-2.99.0
+++ b/metadata/md5-cache/dev-ruby/rspec-2.99.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 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
+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_ruby22? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby22] =dev-ruby/rspec-expectations-2.99*[ruby_targets_ruby22] =dev-ruby/rspec-mocks-2.99*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby23] =dev-ruby/rspec-expectations-2.99*[ruby_targets_ruby23] =dev-ruby/rspec-mocks-2.99*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby24] =dev-ruby/rspec-expectations-2.99*[ruby_targets_ruby24] =dev-ruby/rspec-mocks-2.99*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/rspec-2.99.0.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=769a2b5311ff176f9a058aea4197128f
+_md5_=498cabc904eb1e23e5ce4452112aadc4
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2 b/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
index f4cfb7a76dba..5676296f2401 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
+++ b/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-core
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test 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
+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_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-core/archive/v2.99.2.tar.gz -> rspec-core-2.99.2-git.tgz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=986ba6c2d0730fa92d83a73579793609
+_md5_=4e4b9365ad72d461831c9f75ce315a28
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2 b/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
index b6742d7d6f46..a949951f3d74 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test 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
+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_ruby22? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v2.99.2.tar.gz -> rspec-expectations-2.99.2-git.tgz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2e3642bc34f5ec606523addb84708b11
+_md5_=5bcce47373198ef071132efc218d495d
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2 b/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
index 2d87b951228b..52b6e7bcc619 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test 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
+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_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v2.99.2.tar.gz -> rspec-mocks-2.99.2-git.tgz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=20ca4a82638d3558321a3778a10cdf60
+_md5_=36cc621d6fba404979d57193224c6aa5
diff --git a/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.1 b/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.1
deleted file mode 100644
index 3e9c7d24a9fd..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby22] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby22] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby22] ) 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_ruby22? ( doc? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/hoe-seattlerb[ruby_targets_ruby22] ) test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/hoe-seattlerb[ruby_targets_ruby23] ) test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Generates readable ruby from ParseTree
-EAPI=5
-HOMEPAGE=https://github.com/seattlerb/ruby2ruby
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 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_ruby22? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby22] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby22] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby22] ) 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_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=2
-SRC_URI=mirror://rubygems/ruby2ruby-2.3.1.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d565883c52d73e1868e14eb026c0f1b9
diff --git a/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.2 b/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.2
index caa6742866de..21ce9cc4feb6 100644
--- a/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.2
+++ b/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=Generates readable ruby from ParseTree
 EAPI=5
 HOMEPAGE=https://github.com/seattlerb/ruby2ruby
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 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
+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_ruby22? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby22] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby22] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby22] ) 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_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/ruby2ruby-2.3.2.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=cef20226b6f2fe2be4a9beebdb7211ad
+_md5_=86ff1993e8ca390dca32801ee68ecdd4
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.10.0 b/metadata/md5-cache/dev-ruby/ruby_parser-3.10.0
deleted file mode 100644
index 1478c978f89a..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby22] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby22] ) 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_ruby22? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby22] ) ) 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_ruby22? ( test? ( dev-ruby/racc[ruby_targets_ruby22] >=dev-ruby/minitest-4.3[ruby_targets_ruby22] ) ) 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_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) 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_ruby22 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_ruby22? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby22] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby22] ) 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_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=3
-SRC_URI=mirror://rubygems/ruby_parser-3.10.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c3f39841d222d808d5c0b1f7611b506f
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.8.3 b/metadata/md5-cache/dev-ruby/ruby_parser-3.8.3
deleted file mode 100644
index a55a8cab4cc4..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.8.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby22] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/racc[ruby_targets_ruby22] >=dev-ruby/minitest-4.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/racc[ruby_targets_ruby23] >=dev-ruby/minitest-4.3[ruby_targets_ruby23] ) ) test? ( dev-util/unifdef ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=A ruby parser written in pure ruby
-EAPI=5
-HOMEPAGE=https://github.com/seattlerb/ruby_parser
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 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_ruby22? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby22] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=3
-SRC_URI=mirror://rubygems/ruby_parser-3.8.3.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=801cdb68ce50b5d2b9965767d63c2a3a
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.8.4 b/metadata/md5-cache/dev-ruby/ruby_parser-3.8.4
deleted file mode 100644
index 1bc0d284a09a..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.8.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby22] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby24] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/hoe-2.9.1[ruby_targets_ruby22] ) ) 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_ruby22? ( test? ( dev-ruby/racc[ruby_targets_ruby22] >=dev-ruby/minitest-4.3[ruby_targets_ruby22] ) ) 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_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) 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=5
-HOMEPAGE=https://github.com/seattlerb/ruby_parser
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 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_ruby22? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby22] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.7.0:4[ruby_targets_ruby24] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=3
-SRC_URI=mirror://rubygems/ruby_parser-3.8.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9bbf8d1f4d7fdcbd2cb1a48004737357
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.9.0 b/metadata/md5-cache/dev-ruby/ruby_parser-3.9.0
index 8bea21660582..51e7fe085207 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.9.0
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.9.0
@@ -4,11 +4,11 @@ DESCRIPTION=A ruby parser written in pure ruby
 EAPI=5
 HOMEPAGE=https://github.com/seattlerb/ruby_parser
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 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
+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_ruby22? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby22] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby22] ) 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_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=mirror://rubygems/ruby_parser-3.9.0.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=64b436251e995429926a9dd15b694912
+_md5_=ed3cc006aeb32b99598fb0220d57b480
diff --git a/metadata/md5-cache/dev-ruby/rubygems-2.6.13 b/metadata/md5-cache/dev-ruby/rubygems-2.6.13
deleted file mode 100644
index 7fd848b5dfdf..000000000000
--- a/metadata/md5-cache/dev-ruby/rubygems-2.6.13
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby24] dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-DESCRIPTION=Centralized Ruby extension management system
-EAPI=6
-HOMEPAGE=https://rubygems.org/
-IUSE=server test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
-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=|| ( Ruby MIT )
-PDEPEND=server? ( >=dev-ruby/builder-2.1 )
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=https://rubygems.org/rubygems/rubygems-2.6.13.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	7b6fb2fc216b101b5d97d171925a847c	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1b127f2a32aad115b63aeee4ef076be4
diff --git a/metadata/md5-cache/dev-ruby/rubygems-2.6.14 b/metadata/md5-cache/dev-ruby/rubygems-2.6.14
index 8a9e98376df1..acaa2fed4299 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-2.6.14
+++ b/metadata/md5-cache/dev-ruby/rubygems-2.6.14
@@ -4,7 +4,7 @@ DESCRIPTION=Centralized Ruby extension management system
 EAPI=6
 HOMEPAGE=https://rubygems.org/
 IUSE=server test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
-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
+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=|| ( Ruby MIT )
 PDEPEND=server? ( >=dev-ruby/builder-2.1 )
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-2.6.14.tgz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	7b6fb2fc216b101b5d97d171925a847c	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=7065535cec7e47de3a040baa9be913e5
+_md5_=1b127f2a32aad115b63aeee4ef076be4
diff --git a/metadata/md5-cache/dev-ruby/session-3.2.0 b/metadata/md5-cache/dev-ruby/session-3.2.0
index 74d857d41aa5..2da24ca1dc8e 100644
--- a/metadata/md5-cache/dev-ruby/session-3.2.0
+++ b/metadata/md5-cache/dev-ruby/session-3.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=A set of classes to drive external programs via pipe
 EAPI=5
 HOMEPAGE=http://codeforpeople.com/lib/ruby/session/
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=alpha ~amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/session-3.2.0.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=7d99a5f5d5c694f3556c6e4ad44077fe
+_md5_=5a1fe7a96701d5330ccdad48f3a183c3
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.8.0 b/metadata/md5-cache/dev-ruby/sexp_processor-4.8.0
deleted file mode 100644
index 3ada638cedf3..000000000000
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby22] dev-ruby/hoe-seattlerb[ruby_targets_ruby22] >=dev-ruby/minitest-5.5[ruby_targets_ruby22] ) ) 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_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Processor for s-expressions created as part of the ParseTree project
-EAPI=5
-HOMEPAGE=http://www.zenspider.com/ZSS/Products/ParseTree/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 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=GPL-2
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=4
-SRC_URI=mirror://rubygems/sexp_processor-4.8.0.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=95efa1b7eef0034a088b6626dcfe0a09
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.9.0 b/metadata/md5-cache/dev-ruby/sexp_processor-4.9.0
index b639320fde94..19ce510212a2 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.9.0
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.9.0
@@ -4,11 +4,11 @@ DESCRIPTION=Processor for s-expressions created as part of the ParseTree project
 EAPI=5
 HOMEPAGE=https://www.zenspider.com/projects/sexp_processor.html
 IUSE=elibc_FreeBSD ruby_targets_ruby22 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
+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_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4
 SRC_URI=mirror://rubygems/sexp_processor-4.9.0.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=5fe5c6213777876bd629c00bf2ece5d5
+_md5_=e17c396790c8806b8297b0eaab96096f
diff --git a/metadata/md5-cache/dev-ruby/term-ansicolor-1.6.0 b/metadata/md5-cache/dev-ruby/term-ansicolor-1.6.0
index f80576539218..efcbb4a92a2e 100644
--- a/metadata/md5-cache/dev-ruby/term-ansicolor-1.6.0
+++ b/metadata/md5-cache/dev-ruby/term-ansicolor-1.6.0
@@ -4,11 +4,11 @@ DESCRIPTION=Small Ruby library that colors strings using ANSI escape sequences
 EAPI=5
 HOMEPAGE=https://flori.github.io/term-ansicolor/
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc 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
+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_ruby22? ( >=dev-ruby/tins-1.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/tins-1.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/tins-1.0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/term-ansicolor-1.6.0.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=33ff51c748bfd043dd1831193eda422e
+_md5_=c5f32dedb523f43b7d15c89f7c9825d7
diff --git a/metadata/md5-cache/dev-ruby/tins-1.14.0 b/metadata/md5-cache/dev-ruby/tins-1.14.0
index dbb9d979b17f..f151f5877d26 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.14.0
+++ b/metadata/md5-cache/dev-ruby/tins-1.14.0
@@ -4,11 +4,11 @@ DESCRIPTION=All the stuff that isn't good enough for a real library
 EAPI=6
 HOMEPAGE=https://github.com/flori/tins
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=alpha ~amd64 arm ~hppa ia64 ppc ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/tins-1.14.0.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d0552c66eb5c6b6c671199aeb7b74d50
+_md5_=9074549576d25e1b9f353056863cd115
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-1.2.2 b/metadata/md5-cache/dev-ruby/tzinfo-1.2.2
deleted file mode 100644
index 0d82ed251d2f..000000000000
--- a/metadata/md5-cache/dev-ruby/tzinfo-1.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-libs/timezone-data ) test? ( ruby_targets_ruby22? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Daylight-savings aware timezone library
-EAPI=5
-HOMEPAGE=http://tzinfo.github.io/
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=sys-libs/timezone-data ruby_targets_ruby22? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=1
-SRC_URI=mirror://rubygems/tzinfo-1.2.2.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c5fea2d7b1551255c36b81d2be8f215e
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-1.2.4 b/metadata/md5-cache/dev-ruby/tzinfo-1.2.4
new file mode 100644
index 000000000000..a8face3d9022
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/tzinfo-1.2.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( sys-libs/timezone-data ) test? ( ruby_targets_ruby22? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Daylight-savings aware timezone library
+EAPI=6
+HOMEPAGE=https://tzinfo.github.io/
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=sys-libs/timezone-data ruby_targets_ruby22? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=1
+SRC_URI=mirror://rubygems/tzinfo-1.2.4.gem
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5c5dd837f6ec9d5c2f838d9f78221aa9
diff --git a/metadata/md5-cache/dev-ruby/xpath-0.1.4-r1 b/metadata/md5-cache/dev-ruby/xpath-0.1.4-r1
deleted file mode 100644
index f35ba1379abf..000000000000
--- a/metadata/md5-cache/dev-ruby/xpath-0.1.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=XPath is a Ruby DSL around a subset of XPath 1.0
-EAPI=5
-HOMEPAGE=https://github.com/jnicklas/xpath
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/xpath-0.1.4.gem
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=02358bb1777256e28ecab80064338fc9
diff --git a/metadata/md5-cache/dev-ruby/yajl-ruby-1.3.0 b/metadata/md5-cache/dev-ruby/yajl-ruby-1.3.0
index c9b59c2cca1c..7a52838ed74f 100644
--- a/metadata/md5-cache/dev-ruby/yajl-ruby-1.3.0
+++ b/metadata/md5-cache/dev-ruby/yajl-ruby-1.3.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/yajl ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) 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_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=dev-libs/yajl ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Ruby C bindings to the Yajl JSON stream-based parser library
 EAPI=5
 HOMEPAGE=https://github.com/brianmario/yajl-ruby
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test 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
+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=dev-libs/yajl ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/yajl-ruby-1.3.0.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c8f148328adf81b2b7134f4f515ead9e
+_md5_=cd67e03c1aa934bd19117364b806fdaa
diff --git a/metadata/md5-cache/dev-tex/ppower4-0.9.6 b/metadata/md5-cache/dev-tex/ppower4-0.9.6
index 566c04fb0dc8..03500b02352e 100644
--- a/metadata/md5-cache/dev-tex/ppower4-0.9.6
+++ b/metadata/md5-cache/dev-tex/ppower4-0.9.6
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install postinst postrm unpack
 DEPEND=app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DESCRIPTION=Post-process presentations in PDF format which were prepared using (La)TeX to add dynamic effects
+DESCRIPTION=The Java tool PPower4 adds effects to slides using LaTeX
 EAPI=0
-HOMEPAGE=http://www.tex.ac.uk/tex-archive/support/ppower4/index.html
+HOMEPAGE=http://tug.ctan.org/support/ppower4/index.html
 KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-arch/unzip virtual/jre virtual/latex-base
 SLOT=0
 SRC_URI=mirror://gentoo/ppower4-0.9.6.tar.gz
 _eclasses_=base	df2aa567b3f0595aae0d0923889f7631	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	latex-package	79acad19b9efeec616d0ad70cd117b03	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=3d6d727aedf8b062e7f451d8d94c7e29
+_md5_=c0dac9e3dd968177d9d6b103f0fea50a
diff --git a/metadata/md5-cache/dev-util/android-tools-6.0.1_p79 b/metadata/md5-cache/dev-util/android-tools-6.0.1_p79
index 947a29cbb130..b57b38b8f95f 100644
--- a/metadata/md5-cache/dev-util/android-tools-6.0.1_p79
+++ b/metadata/md5-cache/dev-util/android-tools-6.0.1_p79
@@ -4,10 +4,10 @@ DESCRIPTION=Android platform tools (adb, fastboot, and mkbootimg)
 EAPI=6
 HOMEPAGE=https://android.googlesource.com/platform/system/core.git/
 IUSE=libressl
-KEYWORDS=~amd64 ~x86 ~arm-linux ~x86-linux
+KEYWORDS=~amd64 x86 ~arm-linux ~x86-linux
 LICENSE=Apache-2.0 BSD-2
 RDEPEND=sys-libs/zlib:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-libs/libpcre
 SLOT=0
 SRC_URI=https://git.archlinux.org/svntogit/community.git/snapshot/community-6a03c4736c9734f5ac3d6b5b912605690a6eaa5f.tar.gz -> android-tools-6.0.1_r79-arch.tar.gz https://github.com/android/platform_system_core/archive/android-6.0.1_r79.tar.gz -> android-tools-6.0.1_r79-core.tar.gz mirror://gentoo/android-tools-6.0.1_r79-extras.tar.gz mirror://gentoo/android-tools-6.0.1_r79-libselinux.tar.gz mirror://gentoo/android-tools-6.0.1_r79-f2fs-tools.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=950e883bcb2b45c5824c783dae30302f
+_md5_=88ea6d86f6776b4ca5ebb0d62764b928
diff --git a/metadata/md5-cache/dev-util/bazel-0.5.4 b/metadata/md5-cache/dev-util/bazel-0.5.4
new file mode 100644
index 000000000000..0db2fa73d7af
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bazel-0.5.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=virtual/jdk:1.8 app-arch/unzip app-arch/zip >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Fast and correct automated build system
+EAPI=6
+HOMEPAGE=http://bazel.io/
+IUSE=examples tools zsh-completion elibc_FreeBSD
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/bazelbuild/bazel/releases/download/0.5.4/bazel-0.5.4-dist.zip
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=625f6654d1347b7cee3485f8885a8f7f
diff --git a/metadata/md5-cache/dev-util/bazel-0.7.0 b/metadata/md5-cache/dev-util/bazel-0.7.0
new file mode 100644
index 000000000000..e34af75b9e64
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bazel-0.7.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=virtual/jdk:1.8 app-arch/unzip app-arch/zip >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Fast and correct automated build system
+EAPI=6
+HOMEPAGE=http://bazel.io/
+IUSE=examples tools zsh-completion elibc_FreeBSD
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/bazelbuild/bazel/releases/download/0.7.0/bazel-0.7.0-dist.zip
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=625f6654d1347b7cee3485f8885a8f7f
diff --git a/metadata/md5-cache/dev-util/bcc-0.2.0-r1 b/metadata/md5-cache/dev-util/bcc-0.2.0-r1
deleted file mode 100644
index 447c711c4689..000000000000
--- a/metadata/md5-cache/dev-util/bcc-0.2.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Tools for BPF-based Linux IO analysis, networking, monitoring, and more
-EAPI=6
-HOMEPAGE=https://iovisor.github.io/bcc/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/iovisor/bcc/archive/v0.2.0.tar.gz -> bcc-0.2.0.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f35000887068f58b5047e09038705a1c
diff --git a/metadata/md5-cache/dev-util/bcc-0.3.0 b/metadata/md5-cache/dev-util/bcc-0.3.0
deleted file mode 100644
index 25e56441e7fb..000000000000
--- a/metadata/md5-cache/dev-util/bcc-0.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) 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_python2_7(-)?,python_targets_python3_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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Tools for BPF-based Linux IO analysis, networking, monitoring, and more
-EAPI=6
-HOMEPAGE=https://iovisor.github.io/bcc/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) 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_python2_7(-)?,python_targets_python3_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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) 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/iovisor/bcc/archive/v0.3.0.tar.gz -> bcc-0.3.0.tar.gz https://github.com/iovisor/bcc/commit/76887992d786064213af87694d2a21745e579338.patch -> bcc-0.3.0-llvm5-76887992d786064213af87694d2a21745e579338.patch
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=82b5bf65e7622c75f68f7487a14fe365
diff --git a/metadata/md5-cache/dev-util/bcc-0.4.0 b/metadata/md5-cache/dev-util/bcc-0.4.0
new file mode 100644
index 000000000000..317460371eb4
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bcc-0.4.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=>=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) 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_python2_7(-)?,python_targets_python3_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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Tools for BPF-based Linux IO analysis, networking, monitoring, and more
+EAPI=6
+HOMEPAGE=https://iovisor.github.io/bcc/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) 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_python2_7(-)?,python_targets_python3_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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) 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/iovisor/bcc/archive/v0.4.0.tar.gz -> bcc-0.4.0.tar.gz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b10e269cf72de9e8abe1987f1527f649
diff --git a/metadata/md5-cache/dev-util/buildbot-0.9.10 b/metadata/md5-cache/dev-util/buildbot-0.9.10
index 925bf9d54904..a96a8ec800a2 100644
--- a/metadata/md5-cache/dev-util/buildbot-0.9.10
+++ b/metadata/md5-cache/dev-util/buildbot-0.9.10
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-0.9.10.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d485dc870840fadcf283ceedbb6d8223
+_md5_=e727899d5ce97106ca42f6386a7e9440
diff --git a/metadata/md5-cache/dev-util/buildbot-0.9.11 b/metadata/md5-cache/dev-util/buildbot-0.9.11
index dd4b18a8aea4..93ae394b04ed 100644
--- a/metadata/md5-cache/dev-util/buildbot-0.9.11
+++ b/metadata/md5-cache/dev-util/buildbot-0.9.11
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-0.9.11.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9af887712301ee6e57cae71b0c9b3b02
+_md5_=3fc9eea6ad41064cdca52c223da96213
diff --git a/metadata/md5-cache/dev-util/buildbot-0.9.12 b/metadata/md5-cache/dev-util/buildbot-0.9.12
new file mode 100644
index 000000000000..51d90c0b926c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-0.9.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test
+DEPEND=>=dev-python/jinja-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/twisted-17.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/autobahn-0.16.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-migrate-0.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/python-dateutil-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/txaio-2.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyjwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/zope-interface-4.1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-worker-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] crypt? ( >=dev-python/twisted-17.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),crypt] >=dev-python/pyopenssl-16.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/idna[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) irc? ( dev-python/txrequests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) >=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] doc? ( >=dev-python/sphinx-1.4.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/sphinxcontrib-spelling[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyenchant[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/docutils-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] <dev-python/docutils-0.13.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/sphinx-jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/ramlfications[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) test? ( >=dev-python/python-dateutil-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/moto[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/boto3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/ramlfications[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyjade[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/txgithub[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/txrequests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/lz4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/treq[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/setuptools_trial[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-worker-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
+DESCRIPTION=BuildBot build automation system
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot
+IUSE=crypt doc examples irc test python_targets_python2_7 python_targets_python3_5
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=dev-python/jinja-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/twisted-17.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/autobahn-0.16.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-migrate-0.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/python-dateutil-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/txaio-2.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyjwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/zope-interface-4.1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-worker-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] crypt? ( >=dev-python/twisted-17.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),crypt] >=dev-python/pyopenssl-16.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/idna[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) irc? ( dev-python/txrequests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot/buildbot-0.9.12.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a3552038c0934819a9e43b838d6918a6
diff --git a/metadata/md5-cache/dev-util/buildbot-0.9.4 b/metadata/md5-cache/dev-util/buildbot-0.9.4
deleted file mode 100644
index ef001dce4a64..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-0.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=>=dev-python/jinja-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-web-14.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/autobahn-0.16.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-migrate-0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] crypt? ( >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/idna[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/service_identity[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) irc? ( dev-python/txrequests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-words-14.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) mail? ( || ( >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-mail-14.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) manhole? ( || ( >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-conch-14.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) dev-python/future[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-dateutil-1.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/txaio-2.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyjwt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( >=dev-python/sphinx-1.4.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/sphinxcontrib-spelling[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyenchant[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/docutils-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/sphinx-jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ramlfications[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( >=dev-python/python-dateutil-1.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ( >=dev-python/twisted-mail-14.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-web-14.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-words-14.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) dev-python/moto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/boto3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ramlfications[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyjade[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/txgithub[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/txrequests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=BuildBot build automation system
-EAPI=5
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot
-IUSE=crypt doc examples irc mail manhole test python_targets_python2_7
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=dev-python/jinja-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-web-14.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/autobahn-0.16.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-migrate-0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] crypt? ( >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/idna[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/service_identity[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) irc? ( dev-python/txrequests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-words-14.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) mail? ( || ( >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-mail-14.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) manhole? ( || ( >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-conch-14.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) dev-python/future[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-dateutil-1.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/txaio-2.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyjwt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot/buildbot-0.9.4.tar.gz https://dev.gentoo.org/~dolsen/distfiles/buildbot-0.9.4.docs.tar.xz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=23257dd9fc6a8b602b4c67c2f0a91d86
diff --git a/metadata/md5-cache/dev-util/buildbot-0.9.7 b/metadata/md5-cache/dev-util/buildbot-0.9.7
deleted file mode 100644
index 49eaf008a947..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-0.9.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test
-DEPEND=>=dev-python/jinja-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/twisted-17.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/autobahn-0.16.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-migrate-0.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] crypt? ( >=dev-python/twisted-17.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),crypt] >=dev-python/pyopenssl-16.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/idna[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) irc? ( dev-python/txrequests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/python-dateutil-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/txaio-2.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyjwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/distro[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/zope-interface-4.1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-worker-0.9.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] doc? ( >=dev-python/sphinx-1.4.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/sphinxcontrib-spelling[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyenchant[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/docutils-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] <dev-python/docutils-0.13.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/sphinx-jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/ramlfications[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) test? ( >=dev-python/python-dateutil-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/moto[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/boto3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/ramlfications[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyjade[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/txgithub[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/txrequests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/lz4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/treq[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-worker-0.9.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-DESCRIPTION=BuildBot build automation system
-EAPI=5
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot
-IUSE=crypt doc examples irc test python_targets_python2_7 python_targets_python3_5
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=dev-python/jinja-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/twisted-17.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/autobahn-0.16.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-migrate-0.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] crypt? ( >=dev-python/twisted-17.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),crypt] >=dev-python/pyopenssl-16.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/idna[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) irc? ( dev-python/txrequests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/python-dateutil-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/txaio-2.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyjwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/distro[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/zope-interface-4.1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-worker-0.9.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot/buildbot-0.9.7.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fcf887b498d9ae0c30137b63b7a3bbf9
diff --git a/metadata/md5-cache/dev-util/buildbot-0.9.8 b/metadata/md5-cache/dev-util/buildbot-0.9.8
deleted file mode 100644
index f79b8c6d53c9..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-0.9.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test
-DEPEND=>=dev-python/jinja-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/twisted-17.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/autobahn-0.16.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-migrate-0.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] crypt? ( >=dev-python/twisted-17.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),crypt] >=dev-python/pyopenssl-16.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/idna[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) irc? ( dev-python/txrequests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/python-dateutil-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/txaio-2.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyjwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/distro[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/zope-interface-4.1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-worker-0.9.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] doc? ( >=dev-python/sphinx-1.4.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/sphinxcontrib-spelling[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyenchant[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/docutils-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] <dev-python/docutils-0.13.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/sphinx-jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/ramlfications[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) test? ( >=dev-python/python-dateutil-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/moto[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/boto3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/ramlfications[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyjade[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/txgithub[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/txrequests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/lz4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/treq[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/setuptools_trial[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-worker-0.9.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-DESCRIPTION=BuildBot build automation system
-EAPI=5
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot
-IUSE=crypt doc examples irc test python_targets_python2_7 python_targets_python3_5
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=dev-python/jinja-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/twisted-17.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/autobahn-0.16.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-migrate-0.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] crypt? ( >=dev-python/twisted-17.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),crypt] >=dev-python/pyopenssl-16.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/idna[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) irc? ( dev-python/txrequests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/python-dateutil-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/txaio-2.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyjwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/distro[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/zope-interface-4.1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-worker-0.9.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot/buildbot-0.9.8.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=663a9ec8a96154a45f04c807d72a1990
diff --git a/metadata/md5-cache/dev-util/buildbot-9999 b/metadata/md5-cache/dev-util/buildbot-9999
index ae59ca3779cf..c3f561cdd3ea 100644
--- a/metadata/md5-cache/dev-util/buildbot-9999
+++ b/metadata/md5-cache/dev-util/buildbot-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=>=dev-python/jinja-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/twisted-17.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/autobahn-0.16.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-migrate-0.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/python-dateutil-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/txaio-2.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyjwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/zope-interface-4.1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-worker-9999[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] crypt? ( >=dev-python/twisted-17.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),crypt] >=dev-python/pyopenssl-16.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/idna[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) irc? ( dev-python/txrequests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) >=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] doc? ( >=dev-python/sphinx-1.4.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/sphinxcontrib-spelling[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyenchant[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/docutils-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] <dev-python/docutils-0.13.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/sphinx-jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/ramlfications[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) test? ( >=dev-python/python-dateutil-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/moto[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/boto3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/ramlfications[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyjade[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/txgithub[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/txrequests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/lz4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/treq[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/setuptools_trial[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-worker-9999[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) >=dev-vcs/git-1.8.2.1 virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
+DEPEND=>=dev-python/jinja-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/twisted-17.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/autobahn-0.16.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-migrate-0.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/python-dateutil-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/txaio-2.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyjwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/zope-interface-4.1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-worker-9999[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] crypt? ( >=dev-python/twisted-17.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),crypt] >=dev-python/pyopenssl-16.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/idna[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) irc? ( dev-python/txrequests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) >=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] doc? ( >=dev-python/sphinx-1.4.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/sphinxcontrib-spelling[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyenchant[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/docutils-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] <dev-python/docutils-0.13.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/sphinx-jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/ramlfications[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) test? ( >=dev-python/python-dateutil-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/moto[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/boto3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/ramlfications[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyjade[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/txgithub[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/txrequests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/lz4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/treq[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/setuptools_trial[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-worker-9999[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) >=dev-vcs/git-1.8.2.1 virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 DESCRIPTION=BuildBot build automation system
-EAPI=5
+EAPI=6
 HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot
 IUSE=crypt doc examples irc test python_targets_python2_7 python_targets_python3_5
 LICENSE=GPL-2
-RDEPEND=>=dev-python/jinja-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/twisted-17.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/autobahn-0.16.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-migrate-0.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/python-dateutil-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/txaio-2.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyjwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/zope-interface-4.1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-worker-9999[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] crypt? ( >=dev-python/twisted-17.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),crypt] >=dev-python/pyopenssl-16.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/idna[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) irc? ( dev-python/txrequests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
+RDEPEND=>=dev-python/jinja-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/twisted-17.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/autobahn-0.16.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-migrate-0.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/python-dateutil-1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/txaio-2.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyjwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/zope-interface-4.1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-worker-9999[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] crypt? ( >=dev-python/twisted-17.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),crypt] >=dev-python/pyopenssl-16.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/idna[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) irc? ( dev-python/txrequests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
 SLOT=0
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	git-r3	52a888802d25387c2c74cb845d1219bc	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9af887712301ee6e57cae71b0c9b3b02
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	git-r3	52a888802d25387c2c74cb845d1219bc	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bd839c798465301aefde714906ae74ce
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-0.9.12 b/metadata/md5-cache/dev-util/buildbot-console-view-0.9.12
new file mode 100644
index 000000000000..e63472ce65e6
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-console-view-0.9.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~dev-util/buildbot-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-www-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Buildbot console-view plugin
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-console-view
+IUSE=test python_targets_python2_7 python_targets_python3_5
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=~dev-util/buildbot-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-www-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot-console-view/buildbot-console-view-0.9.12.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=855837bedeb80da81c292bf890dd7f20
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-0.9.4 b/metadata/md5-cache/dev-util/buildbot-console-view-0.9.4
deleted file mode 100644
index 21e1fe9bef3f..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-console-view-0.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-util/buildbot-0.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-util/buildbot-www-0.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Buildbot console-view plugin
-EAPI=5
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-console-view
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-0.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-util/buildbot-www-0.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-console-view/buildbot-console-view-0.9.4.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a51d63f37289112c9b066df62846563c
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-0.9.7 b/metadata/md5-cache/dev-util/buildbot-console-view-0.9.7
deleted file mode 100644
index e1c0c9b8c147..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-console-view-0.9.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-util/buildbot-0.9.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-www-0.9.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Buildbot console-view plugin
-EAPI=5
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-console-view
-IUSE=test python_targets_python2_7 python_targets_python3_5
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-0.9.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-www-0.9.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-console-view/buildbot-console-view-0.9.7.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d1dfb2b89ddb5962074417a27b888032
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-0.9.8 b/metadata/md5-cache/dev-util/buildbot-console-view-0.9.8
deleted file mode 100644
index 081427a237c3..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-console-view-0.9.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-util/buildbot-0.9.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-www-0.9.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Buildbot console-view plugin
-EAPI=5
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-console-view
-IUSE=test python_targets_python2_7 python_targets_python3_5
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-0.9.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-www-0.9.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-console-view/buildbot-console-view-0.9.8.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d1dfb2b89ddb5962074417a27b888032
diff --git a/metadata/md5-cache/dev-util/buildbot-grid-view-0.9.12_p1 b/metadata/md5-cache/dev-util/buildbot-grid-view-0.9.12_p1
new file mode 100644
index 000000000000..684f47962e71
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-grid-view-0.9.12_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] =dev-util/buildbot-0.9.12*[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] =dev-util/buildbot-www-0.9.12*[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
+DESCRIPTION=BuildBot grid view web interface
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-grid-view
+IUSE=test python_targets_python2_7 python_targets_python3_5
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-0.9.12.post1.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8174be9c0e0fb9e2e7c266a6edd8b7a8
diff --git a/metadata/md5-cache/dev-util/buildbot-pkg-0.9.12 b/metadata/md5-cache/dev-util/buildbot-pkg-0.9.12
new file mode 100644
index 000000000000..95f3a2448686
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-pkg-0.9.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~dev-util/buildbot-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
+DESCRIPTION=BuildBot common www build tools for packaging releases
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-pkg
+IUSE=python_targets_python2_7 python_targets_python3_5
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=~dev-util/buildbot-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot-pkg/buildbot-pkg-0.9.12.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=735867b997439acbf32953486d3c797a
diff --git a/metadata/md5-cache/dev-util/buildbot-pkg-0.9.4 b/metadata/md5-cache/dev-util/buildbot-pkg-0.9.4
deleted file mode 100644
index cb10dc565f76..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-pkg-0.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-util/buildbot-0.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=BuildBot common www build tools for packaging releases
-EAPI=5
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-pkg
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-0.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-pkg/buildbot-pkg-0.9.4.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8c2bce1ca60e527ccaa76dedc9a960b4
diff --git a/metadata/md5-cache/dev-util/buildbot-pkg-0.9.7 b/metadata/md5-cache/dev-util/buildbot-pkg-0.9.7
deleted file mode 100644
index d70e16b04040..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-pkg-0.9.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-util/buildbot-0.9.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-DESCRIPTION=BuildBot common www build tools for packaging releases
-EAPI=5
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-pkg
-IUSE=python_targets_python2_7 python_targets_python3_5
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-0.9.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-pkg/buildbot-pkg-0.9.7.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a01d1d221ff3cc100f9237fe6644afe9
diff --git a/metadata/md5-cache/dev-util/buildbot-pkg-0.9.8 b/metadata/md5-cache/dev-util/buildbot-pkg-0.9.8
deleted file mode 100644
index 8a59ac8e3297..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-pkg-0.9.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-util/buildbot-0.9.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-DESCRIPTION=BuildBot common www build tools for packaging releases
-EAPI=5
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-pkg
-IUSE=python_targets_python2_7 python_targets_python3_5
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-0.9.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-pkg/buildbot-pkg-0.9.8.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a01d1d221ff3cc100f9237fe6644afe9
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-0.9.12 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-0.9.12
new file mode 100644
index 000000000000..8ca4332b9ca1
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-waterfall-view-0.9.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~dev-util/buildbot-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-www-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Buildbot waterfall-view plugin
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-waterfall-view
+IUSE=test python_targets_python2_7 python_targets_python3_5
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=~dev-util/buildbot-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-www-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=415fc9f5a4c52cadddd9db45ef39b521
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-0.9.4 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-0.9.4
deleted file mode 100644
index 77dc6a5b294d..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-waterfall-view-0.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-util/buildbot-0.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-util/buildbot-www-0.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Buildbot waterfall-view plugin
-EAPI=5
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-waterfall-view
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-0.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-util/buildbot-www-0.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-0.9.4.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e374613c5cf3a97befaff824ca4d04e0
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-0.9.7 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-0.9.7
deleted file mode 100644
index fec9ca171416..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-waterfall-view-0.9.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-util/buildbot-0.9.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-www-0.9.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Buildbot waterfall-view plugin
-EAPI=5
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-waterfall-view
-IUSE=test python_targets_python2_7 python_targets_python3_5
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-0.9.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-www-0.9.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-0.9.7.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=799c6edc626e0df907863ad6b4cec734
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-0.9.8 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-0.9.8
deleted file mode 100644
index 6b3a9af082d3..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-waterfall-view-0.9.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-util/buildbot-0.9.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-www-0.9.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Buildbot waterfall-view plugin
-EAPI=5
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-waterfall-view
-IUSE=test python_targets_python2_7 python_targets_python3_5
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=~dev-util/buildbot-0.9.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-www-0.9.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-0.9.8.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=799c6edc626e0df907863ad6b4cec734
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-0.9.12 b/metadata/md5-cache/dev-util/buildbot-worker-0.9.12
new file mode 100644
index 000000000000..ad8f1b9ab379
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-worker-0.9.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test
+DEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/twisted-17.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !<dev-util/buildbot-0.9.7 test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/setuptools_trial[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
+DESCRIPTION=BuildBot Worker (slave) Daemon
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-worker
+IUSE=test python_targets_python2_7 python_targets_python3_5
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/twisted-17.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !<dev-util/buildbot-0.9.7 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-0.9.12.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ac44253975c34314b8b4668b735d6835
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-0.9.4 b/metadata/md5-cache/dev-util/buildbot-worker-0.9.4
deleted file mode 100644
index 0863e6ea2c70..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-worker-0.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-core-8.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/future[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !<dev-util/buildbot-0.9.0_rc1 test? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools_trial[python_targets_python2_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_python2_7(-)]
-DESCRIPTION=BuildBot Slave Daemon
-EAPI=5
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-worker
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-core-8.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/future[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !<dev-util/buildbot-0.9.0_rc1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-0.9.4.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=821501b669fa384a00a7bc66ff79f781
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-0.9.7 b/metadata/md5-cache/dev-util/buildbot-worker-0.9.7
deleted file mode 100644
index c07e6aee2a37..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-worker-0.9.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/twisted-17.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/setuptools_trial[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-DESCRIPTION=BuildBot Slave Daemon
-EAPI=5
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-worker
-IUSE=test python_targets_python2_7 python_targets_python3_5
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/twisted-17.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-0.9.7.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=68ab141558c6f193cf20dff6ccbad61b
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-0.9.8 b/metadata/md5-cache/dev-util/buildbot-worker-0.9.8
deleted file mode 100644
index 6f5d5f2155b4..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-worker-0.9.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/twisted-17.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !<dev-util/buildbot-0.9.7 test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/setuptools_trial[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-DESCRIPTION=BuildBot Slave Daemon
-EAPI=5
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-worker
-IUSE=test python_targets_python2_7 python_targets_python3_5
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/twisted-17.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !<dev-util/buildbot-0.9.7 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-0.9.8.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e93f86766a70965cc04c3050de5a4689
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-9999 b/metadata/md5-cache/dev-util/buildbot-worker-9999
index b7b8d6c6057c..c35eea235cd7 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-9999
+++ b/metadata/md5-cache/dev-util/buildbot-worker-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/twisted-17.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !<dev-util/buildbot-0.9.7 test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/setuptools_trial[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) >=dev-vcs/git-1.8.2.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
+DEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/twisted-17.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !<dev-util/buildbot-0.9.7 test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/setuptools_trial[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) >=dev-vcs/git-1.8.2.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 DESCRIPTION=BuildBot Worker (slave) Daemon
-EAPI=5
+EAPI=6
 HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-worker
 IUSE=test python_targets_python2_7 python_targets_python3_5
 LICENSE=GPL-2
-RDEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/twisted-17.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !<dev-util/buildbot-0.9.7 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
+RDEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/twisted-17.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] !<dev-util/buildbot-0.9.7 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
 SLOT=0
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	git-r3	52a888802d25387c2c74cb845d1219bc	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4336b34814d0b31eb84212cf4e04d16e
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	git-r3	52a888802d25387c2c74cb845d1219bc	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ac44253975c34314b8b4668b735d6835
diff --git a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-0.9.12 b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-0.9.12
new file mode 100644
index 000000000000..476f33ed7e4a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-0.9.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-www-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Buildbot plugin to integrate flask or bottle dashboards to buildbot UI
+EAPI=5
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-wsgi-dashboards
+IUSE=test python_targets_python2_7 python_targets_python3_5
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e43f7d0313296f65c2c455d31b01760f
diff --git a/metadata/md5-cache/dev-util/buildbot-www-0.9.12 b/metadata/md5-cache/dev-util/buildbot-www-0.9.12
new file mode 100644
index 000000000000..b0f38717fb42
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-www-0.9.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-pkg-0.9.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
+DESCRIPTION=BuildBot base web interface, use with buildbot-{console-view,waterfall-view}...
+EAPI=6
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-www
+IUSE=test python_targets_python2_7 python_targets_python3_5
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-0.9.12.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e7f9b96328c64a8c0bb5aca80c03ac97
diff --git a/metadata/md5-cache/dev-util/buildbot-www-0.9.4 b/metadata/md5-cache/dev-util/buildbot-www-0.9.4
deleted file mode 100644
index e63a35c65d6b..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-www-0.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-util/buildbot-0.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-util/buildbot-pkg-0.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=BuildBot base web interface, use with buildbot-{console-view,waterfall-view}...
-EAPI=5
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-www
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-0.9.4.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a4969ebc8fca8ff47a0c0ff985bdb762
diff --git a/metadata/md5-cache/dev-util/buildbot-www-0.9.7 b/metadata/md5-cache/dev-util/buildbot-www-0.9.7
deleted file mode 100644
index efdbcb11a4b4..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-www-0.9.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-0.9.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-pkg-0.9.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-DESCRIPTION=BuildBot base web interface, use with buildbot-{console-view,waterfall-view}...
-EAPI=5
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-www
-IUSE=test python_targets_python2_7 python_targets_python3_5
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-0.9.7.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a0cad8df6c588b52f83e864ea1fdfd8e
diff --git a/metadata/md5-cache/dev-util/buildbot-www-0.9.8 b/metadata/md5-cache/dev-util/buildbot-www-0.9.8
deleted file mode 100644
index 6cdcb6482fea..000000000000
--- a/metadata/md5-cache/dev-util/buildbot-www-0.9.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/setuptools-21.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-0.9.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ~dev-util/buildbot-pkg-0.9.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-DESCRIPTION=BuildBot base web interface, use with buildbot-{console-view,waterfall-view}...
-EAPI=5
-HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-www
-IUSE=test python_targets_python2_7 python_targets_python3_5
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-0.9.8.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a0cad8df6c588b52f83e864ea1fdfd8e
diff --git a/metadata/md5-cache/dev-util/clinfo-2.2.17.10.25 b/metadata/md5-cache/dev-util/clinfo-2.2.17.10.25
new file mode 100644
index 000000000000..40df694a440c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/clinfo-2.2.17.10.25
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=virtual/opencl
+DESCRIPTION=A tool to display info about the system's OpenCL capabilities
+EAPI=6
+HOMEPAGE=https://github.com/Oblomov/clinfo
+KEYWORDS=~amd64
+LICENSE=CC0-1.0
+RDEPEND=virtual/opencl
+SLOT=0
+SRC_URI=https://github.com/Oblomov/clinfo/archive/2.2.17.10.25.tar.gz -> clinfo-2.2.17.10.25.tar.gz
+_md5_=4e23161e660c08cc5a83bdf1a81c77ee
diff --git a/metadata/md5-cache/dev-util/clinfo-9999 b/metadata/md5-cache/dev-util/clinfo-9999
new file mode 100644
index 000000000000..641fcd6fac66
--- /dev/null
+++ b/metadata/md5-cache/dev-util/clinfo-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install unpack
+DEPEND=virtual/opencl >=dev-vcs/git-1.8.2.1
+DESCRIPTION=A tool to display info about the system's OpenCL capabilities
+EAPI=6
+HOMEPAGE=https://github.com/Oblomov/clinfo
+LICENSE=CC0-1.0
+RDEPEND=virtual/opencl
+SLOT=0
+_eclasses_=git-r3	52a888802d25387c2c74cb845d1219bc
+_md5_=4e23161e660c08cc5a83bdf1a81c77ee
diff --git a/metadata/md5-cache/dev-util/cmake-3.8.2 b/metadata/md5-cache/dev-util/cmake-3.8.2
index 53411223b9eb..906235e14bcf 100644
--- a/metadata/md5-cache/dev-util/cmake-3.8.2
+++ b/metadata/md5-cache/dev-util/cmake-3.8.2
@@ -4,10 +4,10 @@ DESCRIPTION=Cross platform Make
 EAPI=6
 HOMEPAGE=https://cmake.org/
 IUSE=doc emacs server system-jsoncpp ncurses qt5 test
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=CMake
 RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) server? ( >=dev-libs/libuv-1.0.0:= ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.8/cmake-3.8.2.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
-_md5_=57df2f07a28838903ca0b06d0674eb3e
+_md5_=c1b3c1905d2a1b47a34c92ce15e8419a
diff --git a/metadata/md5-cache/dev-util/cucumber-3.0.1 b/metadata/md5-cache/dev-util/cucumber-3.0.1
index f4ed686e348e..7a6bfeb64dae 100644
--- a/metadata/md5-cache/dev-util/cucumber-3.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-3.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=Executable feature scenarios
 EAPI=6
 HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
 IUSE=examples test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~ia64 ~ppc
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby22] dev-util/cucumber-core:3.0[ruby_targets_ruby22] dev-util/cucumber-expressions:4.0[ruby_targets_ruby22] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby22] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby22] dev-ruby/gherkin:4[ruby_targets_ruby22] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby22] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby22] ) 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.1.3[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.1.3[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_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-3.0.1.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f7374b22b94955d88f51e9c9e281af1d
+_md5_=8f41f0cbeb1a675cfcb0fa53fe4afdf5
diff --git a/metadata/md5-cache/dev-util/cucumber-core-3.0.0 b/metadata/md5-cache/dev-util/cucumber-core-3.0.0
index ab172a1cb890..270d0858ef49 100644
--- a/metadata/md5-cache/dev-util/cucumber-core-3.0.0
+++ b/metadata/md5-cache/dev-util/cucumber-core-3.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=Executable feature scenarios
 EAPI=6
 HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~ia64 ~ppc
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/backports-3.8.0[ruby_targets_ruby22] >=dev-util/cucumber-tag_expressions-1.0.1[ruby_targets_ruby22] >=dev-ruby/gherkin-4.1.3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/backports-3.8.0[ruby_targets_ruby23] >=dev-util/cucumber-tag_expressions-1.0.1[ruby_targets_ruby23] >=dev-ruby/gherkin-4.1.3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/backports-3.8.0[ruby_targets_ruby24] >=dev-util/cucumber-tag_expressions-1.0.1[ruby_targets_ruby24] >=dev-ruby/gherkin-4.1.3[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3.0
 SRC_URI=mirror://rubygems/cucumber-core-3.0.0.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1561de58d0ec6079246761b13b159c26
+_md5_=b13df3eb01eadeda769cc04023bdf10e
diff --git a/metadata/md5-cache/dev-util/cucumber-expressions-4.0.4 b/metadata/md5-cache/dev-util/cucumber-expressions-4.0.4
index 7f7f7e2e14c1..6fde8f111922 100644
--- a/metadata/md5-cache/dev-util/cucumber-expressions-4.0.4
+++ b/metadata/md5-cache/dev-util/cucumber-expressions-4.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=a simpler alternative to Regular Expressions
 EAPI=6
 HOMEPAGE=https://github.com/cucumber/cucumber-expressions-ruby#readme
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~ia64 ~ppc
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=4.0
 SRC_URI=mirror://rubygems/cucumber-expressions-4.0.4.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=612c17fd4bfc3980a81a9ee4fd857aa7
+_md5_=aff5e8cc02899b1efb4d2f7abec7b8c3
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
index e68a7c73dbab..172ac3fc9c82 100644
--- a/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=Cucumber tag expressions for ruby
 EAPI=6
 HOMEPAGE=https://docs.cucumber.io/tag-expressions/
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~ia64 ~ppc
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/cucumber-tag_expressions-1.0.1.gem
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f190043466f25e281d8c34196c2445a3
+_md5_=e0dd5f39a3a5a732da18a0cd1479eaa9
diff --git a/metadata/md5-cache/dev-util/debhelper-10.10.3 b/metadata/md5-cache/dev-util/debhelper-10.10.3
new file mode 100644
index 000000000000..be9a0be56cc2
--- /dev/null
+++ b/metadata/md5-cache/dev-util/debhelper-10.10.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long linguas_de? ( >=app-text/po4a-0.24 ) linguas_es? ( >=app-text/po4a-0.24 ) linguas_fr? ( >=app-text/po4a-0.24 ) test? ( dev-perl/Test-Pod sys-apps/fakeroot )
+DESCRIPTION=Collection of programs that can be used to automate common tasks in debian/rules
+EAPI=6
+HOMEPAGE=https://packages.qa.debian.org/d/debhelper.html
+IUSE=test linguas_de linguas_es linguas_fr
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_10.10.3.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=292e7c0dc7ca3e29dc0c34c7da0b7090
diff --git a/metadata/md5-cache/dev-util/debhelper-10.9 b/metadata/md5-cache/dev-util/debhelper-10.9
deleted file mode 100644
index 772a81da06ce..000000000000
--- a/metadata/md5-cache/dev-util/debhelper-10.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long linguas_de? ( >=app-text/po4a-0.24 ) linguas_es? ( >=app-text/po4a-0.24 ) linguas_fr? ( >=app-text/po4a-0.24 ) test? ( dev-perl/Test-Pod sys-apps/fakeroot )
-DESCRIPTION=Collection of programs that can be used to automate common tasks in debian/rules
-EAPI=6
-HOMEPAGE=https://packages.qa.debian.org/d/debhelper.html
-IUSE=test linguas_de linguas_es linguas_fr
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_10.9.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=292e7c0dc7ca3e29dc0c34c7da0b7090
diff --git a/metadata/md5-cache/dev-util/debhelper-10.9.1 b/metadata/md5-cache/dev-util/debhelper-10.9.1
deleted file mode 100644
index 2c11f72580f6..000000000000
--- a/metadata/md5-cache/dev-util/debhelper-10.9.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long linguas_de? ( >=app-text/po4a-0.24 ) linguas_es? ( >=app-text/po4a-0.24 ) linguas_fr? ( >=app-text/po4a-0.24 ) test? ( dev-perl/Test-Pod sys-apps/fakeroot )
-DESCRIPTION=Collection of programs that can be used to automate common tasks in debian/rules
-EAPI=6
-HOMEPAGE=https://packages.qa.debian.org/d/debhelper.html
-IUSE=test linguas_de linguas_es linguas_fr
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_10.9.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=292e7c0dc7ca3e29dc0c34c7da0b7090
diff --git a/metadata/md5-cache/dev-util/diffoscope-87 b/metadata/md5-cache/dev-util/diffoscope-87
new file mode 100644
index 000000000000..37ac9bc55c8a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/diffoscope-87
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Will try to get to the bottom of what makes files or directories different
+EAPI=5
+HOMEPAGE=https://diffoscope.org/ https://pypi.python.org/pypi/diffoscope/
+IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg gzip haskell hex imagemagick iso java llvm mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar tcpdump xz zip python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-python/python-magic[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/libarchive-c[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/distro[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) gzip? ( app-arch/gzip ) haskell? ( dev-lang/ghc ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( virtual/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) xz? ( app-arch/xz-utils ) zip? ( app-arch/unzip ) 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_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/d/diffoscope/diffoscope-87.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=04aa406f381c9452498b69cd971dd45e
diff --git a/metadata/md5-cache/dev-util/duma-2.5.15-r2 b/metadata/md5-cache/dev-util/duma-2.5.15-r2
index dcff357fbcc4..f827b1b8ed75 100644
--- a/metadata/md5-cache/dev-util/duma-2.5.15-r2
+++ b/metadata/md5-cache/dev-util/duma-2.5.15-r2
@@ -3,9 +3,9 @@ DESCRIPTION=DUMA (Detect Unintended Memory Access) is a memory debugging library
 EAPI=6
 HOMEPAGE=http://duma.sourceforge.net
 IUSE=examples
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/duma/duma_2_5_15.tar.gz mirror://gentoo/duma-2.5.15-GNUmakefile.patch.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=640cf77931d111913d3a9867f1482ef8
+_md5_=6534ccc00b846f96600be69fc0b7d463
diff --git a/metadata/md5-cache/dev-util/electron-1.6.11-r1 b/metadata/md5-cache/dev-util/electron-1.6.11-r1
index 130b33f4cc6a..ac22f9c3f2af 100644
--- a/metadata/md5-cache/dev-util/electron-1.6.11-r1
+++ b/metadata/md5-cache/dev-util/electron-1.6.11-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=app-arch/bzip2:= >=app-eselect/eselect-electron-2.0 cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:2 dev-libs/icu:= >=dev-libs/jsoncpp-0.5.0-r1:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= media-libs/libexif:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libvpx:=[svc] media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= media-libs/flac:= >=media-libs/harfbuzz-1.3.1:=[icu(+)] >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl dev-perl/JSON >=dev-util/gperf-3.0.3 dev-util/ninja sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git x11-libs/gtk+:2 x11-libs/gtk+:3 || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=app-arch/bzip2:= >=app-eselect/eselect-electron-2.0 cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:2 dev-libs/icu:= >=dev-libs/jsoncpp-0.5.0-r1:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= media-libs/libexif:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libvpx:=[svc] media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libdrm x11-libs/libnotify:= x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= media-libs/flac:= >=media-libs/harfbuzz-1.3.1:=[icu(+)] >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl dev-perl/JSON >=dev-util/gperf-3.0.3 dev-util/ninja net-libs/nodejs sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git x11-libs/gtk+:2 x11-libs/gtk+:3 || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Cross platform application development framework based on web technologies
 EAPI=6
 HOMEPAGE=http://electron.atom.io/
 IUSE=cups custom-cflags gnome gnome-keyring kerberos lto neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=app-arch/bzip2:= >=app-eselect/eselect-electron-2.0 cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:2 dev-libs/icu:= >=dev-libs/jsoncpp-0.5.0-r1:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= media-libs/libexif:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libvpx:=[svc] media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= media-libs/flac:= >=media-libs/harfbuzz-1.3.1:=[icu(+)] >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !<dev-util/electron-0.36.12-r4 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts x11-libs/gtk+:2 selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+RDEPEND=app-arch/bzip2:= >=app-eselect/eselect-electron-2.0 cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:2 dev-libs/icu:= >=dev-libs/jsoncpp-0.5.0-r1:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= media-libs/libexif:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libvpx:=[svc] media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libdrm x11-libs/libnotify:= x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= media-libs/flac:= >=media-libs/harfbuzz-1.3.1:=[icu(+)] >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !<dev-util/electron-0.36.12-r4 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts x11-libs/gtk+:2 selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=1.6
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-56.0.2924.87.tar.xz https://github.com/electron/electron/archive/v1.6.11.tar.gz -> electron-1.6.11.tar.gz https://github.com/electron/chromium-breakpad/archive/c566c50d81f7b1edeaee9f11f5d07bda858d6b64.tar.gz -> electron-chromium-breakpad-c566c50d81f7b1edeaee9f11f5d07bda858d6b64.tar.gz https://github.com/google/breakpad/archive/e35167de7516448fcc2bf687ad580b9d8b6aedc2.tar.gz -> electron-breakpad-e35167de7516448fcc2bf687ad580b9d8b6aedc2.tar.gz https://github.com/electron/brightray/archive/909c49265493bd095c27cefd999567be2107899a.tar.gz -> electron-brightray-909c49265493bd095c27cefd999567be2107899a.tar.gz https://github.com/electron/node/archive/9b1683e7000481ec6214eafa3eef7ac4594eb410.tar.gz -> electron-node-9b1683e7000481ec6214eafa3eef7ac4594eb410.tar.gz https://github.com/zcbenz/native-mate/archive/fd0e7dc4ab778f0d1ccda6c9640464ea06ee771e.tar.gz -> electron-native-mate-fd0e7dc4ab778f0d1ccda6c9640464ea06ee771e.tar.gz https://github.com/electron/pdf-viewer/archive/a050a339cfeabcfb5f07c313161d2ee27b6c3a39.tar.gz -> electron-pdf-viewer-a050a339cfeabcfb5f07c313161d2ee27b6c3a39.tar.gz https://github.com/elprans/grit/archive/9536fb6429147d27ef1563088341825db0a893cd.tar.gz -> electron-grit-9536fb6429147d27ef1563088341825db0a893cd.tar.gz https://github.com/electron/libchromiumcontent/archive/e2ec6935fbf034207d5ad00fa905a4b2cdd60bb7.tar.gz -> electron-libchromiumcontent-e2ec6935fbf034207d5ad00fa905a4b2cdd60bb7.tar.gz https://github.com/elprans/asar/releases/download/v0.12.1-gentoo/asar-build.tar.gz -> asar-0.12.1.tar.gz https://github.com/elprans/node-browserify/releases/download/14.0.0-gentoo/browserify-build.tar.gz -> browserify-14.0.0.tar.gz
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	pax-utils	4f95120230a315c8caaabeb2307b7eee	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b6ba2c6b210d7c250ce81b610129ffe1
+_md5_=d2173238b5f3681fabc5ea232aae6958
diff --git a/metadata/md5-cache/dev-util/heaptrack-9999 b/metadata/md5-cache/dev-util/heaptrack-9999
index fe929b184f2b..57d729d02ec1 100644
--- a/metadata/md5-cache/dev-util/heaptrack-9999
+++ b/metadata/md5-cache/dev-util/heaptrack-9999
@@ -7,5 +7,5 @@ IUSE=+qt5 debug test
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/boost:= sys-libs/libunwind sys-libs/zlib qt5? ( >=kde-frameworks/kconfig-5.37.0 >=kde-frameworks/kconfigwidgets-5.37.0 >=kde-frameworks/kcoreaddons-5.37.0 >=kde-frameworks/ki18n-5.37.0 >=kde-frameworks/kio-5.37.0 >=kde-frameworks/kitemmodels-5.37.0 >=kde-frameworks/kwidgetsaddons-5.37.0 >=kde-frameworks/threadweaver-5.37.0 >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/kdiagram:5 ) qt5? ( >=kde-frameworks/kf-env-4 )
 SLOT=0
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=996bee619798b39bb19d46470652a19c
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.86 b/metadata/md5-cache/dev-util/jenkins-bin-2.86
new file mode 100644
index 000000000000..193465832e66
--- /dev/null
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.86
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Extensible continuous integration server
+EAPI=6
+HOMEPAGE=http://jenkins-ci.org/
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:lts >=virtual/jre-1.8.0
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://mirrors.jenkins-ci.org/war/2.86/jenkins.war -> jenkins-bin-2.86.war
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
+_md5_=62e8d5a174d9794790c833c251dc4e85
diff --git a/metadata/md5-cache/dev-util/kdbg-2.9.1 b/metadata/md5-cache/dev-util/kdbg-2.9.1
index 2f669d9cf2c4..cedbeac14efb 100644
--- a/metadata/md5-cache/dev-util/kdbg-2.9.1
+++ b/metadata/md5-cache/dev-util/kdbg-2.9.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-devel/gdb kde-frameworks/oxygen-icons l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[l10n_de(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[l10n_es(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fr(+)] ) l10n_hr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hu(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ja(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nb(+)] ) l10n_nn? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nn(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sk(+)] ) l10n_sr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sr(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_tr(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-CN(+)] ) handbook? ( kde-frameworks/kdelibs:4[handbook] ) >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
 SLOT=4
 SRC_URI=mirror://sourceforge/kdbg/kdbg-2.9.1.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=800634e74a8450aba7d5df39450340c2
diff --git a/metadata/md5-cache/dev-util/kdevelop-5.1.1 b/metadata/md5-cache/dev-util/kdevelop-5.1.1
index 76fa27b6b9dc..f8d94715dda6 100644
--- a/metadata/md5-cache/dev-util/kdevelop-5.1.1
+++ b/metadata/md5-cache/dev-util/kdevelop-5.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.1.1/src/kdevelop-5.1.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=50f21ef3ad69fdcff04e5cbe8bd15ae2
diff --git a/metadata/md5-cache/dev-util/kdevelop-5.1.2 b/metadata/md5-cache/dev-util/kdevelop-5.1.2
index e1db8fcb84bd..6f4ed8ca0527 100644
--- a/metadata/md5-cache/dev-util/kdevelop-5.1.2
+++ b/metadata/md5-cache/dev-util/kdevelop-5.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.1.2/src/kdevelop-5.1.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c86db79c4ca0849aa5333b039eeada41
diff --git a/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.0.0-r1 b/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.0.0-r1
index 64578dcc1f71..8c6af95a3fdb 100644
--- a/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.0.0-r1
+++ b/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=!dev-util/kdevelop-pg-qt:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop-pg-qt/2.0.0/src/kdevelop-pg-qt-2.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9a2f4ba90507a51fc2da8e27c1b1c644
diff --git a/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.1.0 b/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.1.0
index fd73836ad494..6de2bcd59e45 100644
--- a/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.1.0
+++ b/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.1.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=!dev-util/kdevelop-pg-qt:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop-pg-qt/2.1.0/src/kdevelop-pg-qt-2.1.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c919ca588ecc8225e7230c6ba80b8662
diff --git a/metadata/md5-cache/dev-util/kdevelop-php-5.1.1 b/metadata/md5-cache/dev-util/kdevelop-php-5.1.1
index dc848e832634..4a0cf557dbfb 100644
--- a/metadata/md5-cache/dev-util/kdevelop-php-5.1.1
+++ b/metadata/md5-cache/dev-util/kdevelop-php-5.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/ktexteditor-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/threadweaver-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-util/kdevelop-pg-qt:5 >=dev-util/kdevplatform-5.1.1:5 !dev-util/kdevelop-php-docs dev-util/kdevelop:5 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.1.1/src/kdev-php-5.1.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=db9245e754422c5e05ad3f1c00859bb7
diff --git a/metadata/md5-cache/dev-util/kdevelop-php-5.1.2 b/metadata/md5-cache/dev-util/kdevelop-php-5.1.2
index cb13eec8e7c2..d54920dbb927 100644
--- a/metadata/md5-cache/dev-util/kdevelop-php-5.1.2
+++ b/metadata/md5-cache/dev-util/kdevelop-php-5.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/ktexteditor-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/threadweaver-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-util/kdevelop-pg-qt:5 >=dev-util/kdevplatform-5.1.2:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.37.0:5 handbook? ( >=kde-frameworks/kdoctools-5.37.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/ktexteditor-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/threadweaver-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-util/kdevelop-pg-qt:5 >=dev-util/kdevplatform-5.1.2:5 test? ( >=dev-util/kdevplatform-5.1.2:5[test] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.37.0:5 handbook? ( >=kde-frameworks/kdoctools-5.37.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=PHP plugin for KDevelop
 EAPI=6
 HOMEPAGE=https://www.kdevelop.org/
@@ -7,7 +7,8 @@ IUSE=test debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/ktexteditor-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/threadweaver-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-util/kdevelop-pg-qt:5 >=dev-util/kdevplatform-5.1.2:5 !dev-util/kdevelop-php-docs dev-util/kdevelop:5 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.1.2/src/kdev-php-5.1.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2738a5f8bfd649c1455fcfb9866b89ee
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1d8a961f2ce60da1a5af382fe67c0886
diff --git a/metadata/md5-cache/dev-util/kdevelop-python-5.1.1 b/metadata/md5-cache/dev-util/kdevelop-python-5.1.1
index 057539fe7b34..20b251f3de6e 100644
--- a/metadata/md5-cache/dev-util/kdevelop-python-5.1.1
+++ b/metadata/md5-cache/dev-util/kdevelop-python-5.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.1.1/src/kdev-python-5.1.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5076ecc991ab2151e2d7da2f9712aa3f
diff --git a/metadata/md5-cache/dev-util/kdevelop-python-5.1.2 b/metadata/md5-cache/dev-util/kdevelop-python-5.1.2
index f24f792ecd03..0b6dc409675b 100644
--- a/metadata/md5-cache/dev-util/kdevelop-python-5.1.2
+++ b/metadata/md5-cache/dev-util/kdevelop-python-5.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.1.2/src/kdev-python-5.1.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a1f453130e9b076523ec6f0d1b79a6f7
diff --git a/metadata/md5-cache/dev-util/kdevplatform-5.1.1 b/metadata/md5-cache/dev-util/kdevplatform-5.1.1
index a3463030b430..44dfcd2ac0e7 100644
--- a/metadata/md5-cache/dev-util/kdevplatform-5.1.1
+++ b/metadata/md5-cache/dev-util/kdevplatform-5.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( welcomepage )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.1.1/src/kdevplatform-5.1.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c584b97619e969babf9bfb76166599c0
diff --git a/metadata/md5-cache/dev-util/kdevplatform-5.1.2 b/metadata/md5-cache/dev-util/kdevplatform-5.1.2
index 304d33165946..ef4c352bb40b 100644
--- a/metadata/md5-cache/dev-util/kdevplatform-5.1.2
+++ b/metadata/md5-cache/dev-util/kdevplatform-5.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( welcomepage )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.1.2/src/kdevplatform-5.1.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=16b707777d54ea3774632b387fd81d9f
diff --git a/metadata/md5-cache/dev-util/massif-visualizer-0.7.0 b/metadata/md5-cache/dev-util/massif-visualizer-0.7.0
index 7d569bcb48e9..b74ae511b026 100644
--- a/metadata/md5-cache/dev-util/massif-visualizer-0.7.0
+++ b/metadata/md5-cache/dev-util/massif-visualizer-0.7.0
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/kdiagram:5 callgraph? ( media-gfx/kgraphviewer:5 ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/massif-visualizer/0.7.0/src/massif-visualizer-0.7.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ab153fd91110f43cc0d34f46fa749cfb
diff --git a/metadata/md5-cache/dev-util/ninja-1.8.2 b/metadata/md5-cache/dev-util/ninja-1.8.2
index 73077d7a8367..62b2630b7073 100644
--- a/metadata/md5-cache/dev-util/ninja-1.8.2
+++ b/metadata/md5-cache/dev-util/ninja-1.8.2
@@ -4,10 +4,10 @@ DESCRIPTION=A small build system similar to make
 EAPI=6
 HOMEPAGE=https://ninja-build.org/
 IUSE=doc emacs test vim-syntax zsh-completion
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) zsh-completion? ( app-shells/zsh ) !<net-irc/ninja-1.5.9_pre14-r1
 SLOT=0
 SRC_URI=https://github.com/ninja-build/ninja/archive/v1.8.2.tar.gz -> ninja-1.8.2.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=6ebfcb748001efe2d0bbdd5ff8fb48b5
+_md5_=28258d16ef0fe2d11605e1a9d6b63384
diff --git a/metadata/md5-cache/dev-util/pkgconfig-0.29.2 b/metadata/md5-cache/dev-util/pkgconfig-0.29.2
index f15efa3c1e2f..b189c5b06da5 100644
--- a/metadata/md5-cache/dev-util/pkgconfig-0.29.2
+++ b/metadata/md5-cache/dev-util/pkgconfig-0.29.2
@@ -4,10 +4,10 @@ DESCRIPTION=Package config system that manages compile/link flags
 EAPI=6
 HOMEPAGE=https://pkgconfig.freedesktop.org/wiki/
 IUSE=elibc_FreeBSD elibc_glibc hardened internal-glib 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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!internal-glib? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] virtual/libintl
 SLOT=0
 SRC_URI=https://pkgconfig.freedesktop.org/releases/pkg-config-0.29.2.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=ef2a767a910f3a98df038c5ece763c89
+_md5_=6ce8403232012b4551bc71bb79d63f64
diff --git a/metadata/md5-cache/dev-util/radare2-2.0.1 b/metadata/md5-cache/dev-util/radare2-2.0.1
deleted file mode 100644
index 19a013550759..000000000000
--- a/metadata/md5-cache/dev-util/radare2-2.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=ssl? ( dev-libs/openssl:0= ) system-capstone? ( dev-libs/capstone:0= ) virtual/pkgconfig
-DESCRIPTION=unix-like reverse engineering framework and commandline tools
-EAPI=6
-HOMEPAGE=http://www.radare.org
-IUSE=ssl +system-capstone zsh-completion
-KEYWORDS=~amd64 ~x86 ~arm ~arm64
-LICENSE=GPL-2
-RDEPEND=ssl? ( dev-libs/openssl:0= ) system-capstone? ( dev-libs/capstone:0= )
-SLOT=0
-SRC_URI=https://github.com/radare/radare2/archive/2.0.1.tar.gz -> radare2-2.0.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=7f0bd4c0ba99f87db2d72c2a168780f7
diff --git a/metadata/md5-cache/dev-util/radare2-2.0.1-r1 b/metadata/md5-cache/dev-util/radare2-2.0.1-r1
new file mode 100644
index 000000000000..50870587ccad
--- /dev/null
+++ b/metadata/md5-cache/dev-util/radare2-2.0.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=ssl? ( dev-libs/openssl:0= ) system-capstone? ( dev-libs/capstone:0= ) virtual/pkgconfig
+DESCRIPTION=unix-like reverse engineering framework and commandline tools
+EAPI=6
+HOMEPAGE=http://www.radare.org
+IUSE=ssl +system-capstone zsh-completion
+KEYWORDS=~amd64 ~x86 ~arm ~arm64
+LICENSE=GPL-2
+RDEPEND=ssl? ( dev-libs/openssl:0= ) system-capstone? ( dev-libs/capstone:0= )
+SLOT=0
+SRC_URI=https://github.com/radare/radare2/archive/2.0.1.tar.gz -> radare2-2.0.1.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=ff1ddc3cbd8577e02816edfedb660118
diff --git a/metadata/md5-cache/dev-util/ragel-6.10 b/metadata/md5-cache/dev-util/ragel-6.10
index c8847094daef..c3bfbd9e4860 100644
--- a/metadata/md5-cache/dev-util/ragel-6.10
+++ b/metadata/md5-cache/dev-util/ragel-6.10
@@ -4,10 +4,10 @@ DESCRIPTION=Compiles finite state machines from regular languages into executabl
 EAPI=5
 HOMEPAGE=http://www.colm.net/open-source/ragel/
 IUSE=vim-syntax
-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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.colm.net/files/ragel/ragel-6.10.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=5e812301f9bc85ffddfd576bde872af5
+_md5_=b1c993be51da363c6fd9eb589693942a
diff --git a/metadata/md5-cache/dev-util/re2c-1.0.2 b/metadata/md5-cache/dev-util/re2c-1.0.2
index 1bd67f81f2bc..0373afdc222c 100644
--- a/metadata/md5-cache/dev-util/re2c-1.0.2
+++ b/metadata/md5-cache/dev-util/re2c-1.0.2
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=tool for generating C-based recognizers from regular expressions
 EAPI=6
 HOMEPAGE=http://re2c.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://github.com/skvadrik/re2c/releases/download/1.0.2/re2c-1.0.2.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=c8743be468a199f148d7c0fdab9e955c
+_md5_=13883fa74d5820bd595a1414abed5cf7
diff --git a/metadata/md5-cache/dev-util/rr-5.0.0 b/metadata/md5-cache/dev-util/rr-5.0.0
new file mode 100644
index 000000000000..4cf4d063aa40
--- /dev/null
+++ b/metadata/md5-cache/dev-util/rr-5.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-libs/zlib dev-libs/capnproto 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] test? ( dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] sys-devel/gdb[xml] ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Record and Replay Framework
+EAPI=6
+HOMEPAGE=http://rr-project.org/
+IUSE=test python_targets_python2_7
+KEYWORDS=~amd64
+LICENSE=MIT BSD-2
+RDEPEND=sys-libs/zlib dev-libs/capnproto 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] sys-devel/gdb[xml]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://github.com/mozilla/rr/archive/5.0.0.tar.gz -> mozilla-rr-5.0.0.tar.gz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=34660776be7abf289db28bf33ede3953
diff --git a/metadata/md5-cache/dev-util/source-highlight-3.1.8 b/metadata/md5-cache/dev-util/source-highlight-3.1.8
index 0eac317da2b2..8ca0e105926f 100644
--- a/metadata/md5-cache/dev-util/source-highlight-3.1.8
+++ b/metadata/md5-cache/dev-util/source-highlight-3.1.8
@@ -4,10 +4,10 @@ DESCRIPTION=Generate highlighted source code as an (x)html document
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/src-highlite/source-highlight.html
 IUSE=doc static-libs
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/boost-1.62.0:=[threads] dev-util/ctags
 SLOT=0
 SRC_URI=mirror://gnu/src-highlite/source-highlight-3.1.8.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=833b5108665ec37eb8d71fe55bdde4ce
+_md5_=a15ab80326d0f75926ce2c67b18a0649
diff --git a/metadata/md5-cache/dev-util/valgrind-3.13.0 b/metadata/md5-cache/dev-util/valgrind-3.13.0
index a94736710ffd..6abeeffb8a31 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.13.0
+++ b/metadata/md5-cache/dev-util/valgrind-3.13.0
@@ -4,10 +4,10 @@ DESCRIPTION=An open-source memory debugger for GNU/Linux
 EAPI=6
 HOMEPAGE=http://www.valgrind.org
 IUSE=mpi
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=-* ~amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/valgrind/valgrind-3.13.0.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=ce39f56696abea763d360c63e2499646
+_md5_=d0b06d413acc707ec3ec589c29a63833
diff --git a/metadata/md5-cache/dev-vcs/git-2.13.6 b/metadata/md5-cache/dev-vcs/git-2.13.6
index 7cb04d627732..f4de059c412c 100644
--- a/metadata/md5-cache/dev-vcs/git-2.13.6
+++ b/metadata/md5-cache/dev-vcs/git-2.13.6
@@ -4,11 +4,11 @@ DESCRIPTION=stupid content tracker: distributed VCS designed for speed and effic
 EAPI=6
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test linguas_bg linguas_ca linguas_de linguas_fr linguas_is linguas_it linguas_ko linguas_pt_PT linguas_ru linguas_sv linguas_vi linguas_zh_CN python_targets_python2_7
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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? ( 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 ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL 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 ) 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-2.13.6.tar.xz mirror://kernel/software/scm/git/git-manpages-2.13.6.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.13.6.tar.xz )
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	l10n	2c2e15383ba891d642f51896a7f0ecfe	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=753bfd5f36f2956386091b457cc75fbd
+_md5_=8c40db9786893d6e9473343737bd6ecb
diff --git a/metadata/md5-cache/dev-vcs/git-2.14.3 b/metadata/md5-cache/dev-vcs/git-2.14.3
new file mode 100644
index 000000000000..5d1e088f0c96
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-2.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=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 ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
+EAPI=6
+HOMEPAGE=http://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 linguas_bg linguas_ca linguas_de linguas_fr linguas_is linguas_it linguas_ko linguas_pt_PT linguas_ru linguas_sv linguas_vi linguas_zh_CN python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL 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 ) 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),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.14.3.tar.xz mirror://kernel/software/scm/git/git-manpages-2.14.3.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.14.3.tar.xz )
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	l10n	2c2e15383ba891d642f51896a7f0ecfe	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=20a7644f6b3f786c6e37824e4ef6a3ed
diff --git a/metadata/md5-cache/dev-vcs/hgview-1.9.0 b/metadata/md5-cache/dev-vcs/hgview-1.9.0
deleted file mode 100644
index 698b7148b23e..000000000000
--- a/metadata/md5-cache/dev-vcs/hgview-1.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-vcs/mercurial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ncurses? ( >=dev-python/urwid-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) qt4? ( dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[X,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/qscintilla-python[qt4(+),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) doc? ( app-text/asciidoc app-text/xmlto ) 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(-)]
-DESCRIPTION=A Mercurial interactive history viewer
-EAPI=5
-HOMEPAGE=https://www.logilab.org/project/hgview/ https://pypi.python.org/pypi/hgview/
-IUSE=doc ncurses +qt4 python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-vcs/mercurial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ncurses? ( >=dev-python/urwid-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) qt4? ( dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[X,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/qscintilla-python[qt4(+),python_targets_python2_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_python2_7(-)]
-REQUIRED_USE=|| ( ncurses qt4 ) || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/h/hgview/hgview-1.9.0.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f7d28b2c919285d3431c124366cdac66
diff --git a/metadata/md5-cache/dev-vcs/hgview-1.9.0-r1 b/metadata/md5-cache/dev-vcs/hgview-1.9.0-r1
new file mode 100644
index 000000000000..0f86cce5e38f
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/hgview-1.9.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/urwid-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/mercurial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( app-text/asciidoc app-text/xmlto ) 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(-)]
+DESCRIPTION=A Mercurial interactive history viewer
+EAPI=6
+HOMEPAGE=https://www.logilab.org/project/hgview/ https://pypi.python.org/pypi/hgview/
+IUSE=doc python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/urwid-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/mercurial[python_targets_python2_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_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/h/hgview/hgview-1.9.0.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6b5acd6d7fa1271fefd0249e0c10d463
diff --git a/metadata/md5-cache/dev-vcs/kdesvn-2.0.0 b/metadata/md5-cache/dev-vcs/kdesvn-2.0.0
index 9aa85eb239d4..7d058db20662 100644
--- a/metadata/md5-cache/dev-vcs/kdesvn-2.0.0
+++ b/metadata/md5-cache/dev-vcs/kdesvn-2.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion !dev-vcs/kdesvn:4 !kde-apps/kdesdk-kioslaves:4[subversion(-)] >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kdesvn/2.0.0/kdesvn-2.0.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=71372ba01a13475bfeca4fb1d08ca4f1
diff --git a/metadata/md5-cache/dev-vcs/tig-2.3.0 b/metadata/md5-cache/dev-vcs/tig-2.3.0
new file mode 100644
index 000000000000..87cedf106289
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/tig-2.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/ncurses:0=[unicode?] sys-libs/readline:0=
+DESCRIPTION=A text mode interface for git
+EAPI=6
+HOMEPAGE=https://jonas.github.io/tig/
+IUSE=unicode
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0=[unicode?] sys-libs/readline:0= dev-vcs/git
+SLOT=0
+SRC_URI=https://github.com/jonas/tig/releases/download/tig-2.3.0/tig-2.3.0.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=bd52e7a9aadb9dbe68b6b85707052982
diff --git a/metadata/md5-cache/games-board/knights-2.5.0-r1 b/metadata/md5-cache/games-board/knights-2.5.0-r1
index 53c71e6cab6b..01c8165e4e24 100644
--- a/metadata/md5-cache/games-board/knights-2.5.0-r1
+++ b/metadata/md5-cache/games-board/knights-2.5.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=kde-frameworks/kdelibs:4[plasma(+)] >=kde-apps/libkdegames-4.9:4 kde-frameworks/oxygen-icons l10n_bs? ( >=kde-apps/kde4-l10n-4.9:4[l10n_bs(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.9:4[l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.9:4[l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.9:4[l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.9:4[l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.9:4[l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.9:4[l10n_el(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.9:4[l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.9:4[l10n_et(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.9:4[l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.9:4[l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.9:4[l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.9:4[l10n_gl(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.9:4[l10n_it(+)] ) l10n_km? ( >=kde-apps/kde4-l10n-4.9:4[l10n_km(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.9:4[l10n_lt(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.9:4[l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.9:4[l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.9:4[l10n_nl(+)] ) l10n_nn? ( >=kde-apps/kde4-l10n-4.9:4[l10n_nn(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.9:4[l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.9:4[l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.9:4[l10n_pt-BR(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.9:4[l10n_ru(+)] ) l10n_sr? ( >=kde-apps/kde4-l10n-4.9:4[l10n_sr(+)] ) l10n_sr-ijekavsk? ( >=kde-apps/kde4-l10n-4.9:4[l10n_sr-ijekavsk(+)] ) l10n_sr-Latn-ijekavsk? ( >=kde-apps/kde4-l10n-4.9:4[l10n_sr-Latn-ijekavsk(+)] ) l10n_sr-Latn? ( >=kde-apps/kde4-l10n-4.9:4[l10n_sr-Latn(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.9:4[l10n_sv(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.9:4[l10n_uk(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.9:4[l10n_zh-TW(+)] ) handbook? ( kde-frameworks/kdelibs:4[handbook] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4
 SRC_URI=http://dl.dropbox.com/u/2888238/Knights/knights-2.5.0.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a2e67192a33203c1f4dd64ae42e533a4
diff --git a/metadata/md5-cache/games-board/peg-e-1.1.2 b/metadata/md5-cache/games-board/peg-e-1.1.2
index 20a67cd7ddde..9592b1d6c011 100644
--- a/metadata/md5-cache/games-board/peg-e-1.1.2
+++ b/metadata/md5-cache/games-board/peg-e-1.1.2
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup u
 DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 >=sys-apps/sed-4
 DESCRIPTION=A peg solitaire game
 EAPI=5
-HOMEPAGE=http://gottcode.org/peg-e/
+HOMEPAGE=https://gottcode.org/peg-e/
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 games-misc/games-envd
 SLOT=0
-SRC_URI=http://gottcode.org/peg-e/peg-e-1.1.2-src.tar.bz2
+SRC_URI=https://gottcode.org/peg-e/peg-e-1.1.2-src.tar.bz2
 _eclasses_=base	df2aa567b3f0595aae0d0923889f7631	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=58a1b807bbf7c8a7d80fb65b074b76ac
+_md5_=dc97491ac4bd5574744aac512e94820f
diff --git a/metadata/md5-cache/games-board/peg-e-1.1.2-r1 b/metadata/md5-cache/games-board/peg-e-1.1.2-r1
index 92fd8d862338..8719cb0428de 100644
--- a/metadata/md5-cache/games-board/peg-e-1.1.2-r1
+++ b/metadata/md5-cache/games-board/peg-e-1.1.2-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=configure install postinst postrm preinst
 DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 >=sys-apps/sed-4
 DESCRIPTION=A peg solitaire game
 EAPI=6
-HOMEPAGE=http://gottcode.org/peg-e/
+HOMEPAGE=https://gottcode.org/peg-e/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4
 SLOT=0
-SRC_URI=http://gottcode.org/peg-e/peg-e-1.1.2-src.tar.bz2
+SRC_URI=https://gottcode.org/peg-e/peg-e-1.1.2-src.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9dbb2be871a78f74c08f4a80a2115dc7
+_md5_=f45d893a1c69b2d34eaf9a02c0679ed8
diff --git a/metadata/md5-cache/games-board/simsu-1.2.3 b/metadata/md5-cache/games-board/simsu-1.2.3
index b969bd559ed3..5cf60469b2b1 100644
--- a/metadata/md5-cache/games-board/simsu-1.2.3
+++ b/metadata/md5-cache/games-board/simsu-1.2.3
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup u
 DEPEND=dev-qt/qtgui:4 >=sys-apps/sed-4
 DESCRIPTION=A basic sudoku game
 EAPI=5
-HOMEPAGE=http://gottcode.org/simsu/
+HOMEPAGE=https://gottcode.org/simsu/
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtgui:4 games-misc/games-envd
 SLOT=0
-SRC_URI=http://gottcode.org/simsu/simsu-1.2.3-src.tar.bz2
+SRC_URI=https://gottcode.org/simsu/simsu-1.2.3-src.tar.bz2
 _eclasses_=base	df2aa567b3f0595aae0d0923889f7631	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c2982095d0a368ffabf48f6fd2fc4af0
+_md5_=58169353d3a0baccee2f90f5de7f046c
diff --git a/metadata/md5-cache/games-board/simsu-1.2.3-r1 b/metadata/md5-cache/games-board/simsu-1.2.3-r1
index a46da7afe7ab..362cd39abefd 100644
--- a/metadata/md5-cache/games-board/simsu-1.2.3-r1
+++ b/metadata/md5-cache/games-board/simsu-1.2.3-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=configure install postinst postrm preinst
 DEPEND=dev-qt/qtgui:4 >=sys-apps/sed-4
 DESCRIPTION=A basic sudoku game
 EAPI=6
-HOMEPAGE=http://gottcode.org/simsu/
+HOMEPAGE=https://gottcode.org/simsu/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtgui:4
 SLOT=0
-SRC_URI=http://gottcode.org/simsu/simsu-1.2.3-src.tar.bz2
+SRC_URI=https://gottcode.org/simsu/simsu-1.2.3-src.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b9fcd8daebcc7e89119975f09c0e6ac3
+_md5_=f510dffc12489617df4a3329a1f2abc4
diff --git a/metadata/md5-cache/games-board/tetzle-2.0.3 b/metadata/md5-cache/games-board/tetzle-2.0.3
index a15a8f72c31d..65f9cefc0c8c 100644
--- a/metadata/md5-cache/games-board/tetzle-2.0.3
+++ b/metadata/md5-cache/games-board/tetzle-2.0.3
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup u
 DEPEND=>=dev-qt/qtgui-4.7:4 >=dev-qt/qtopengl-4.7:4 >=sys-apps/sed-4
 DESCRIPTION=A jigsaw puzzle game that uses tetrominoes for the pieces
 EAPI=5
-HOMEPAGE=http://gottcode.org/tetzle/
+HOMEPAGE=https://gottcode.org/tetzle/
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=dev-qt/qtgui-4.7:4 >=dev-qt/qtopengl-4.7:4 games-misc/games-envd
 SLOT=0
-SRC_URI=http://gottcode.org/tetzle/tetzle-2.0.3-src.tar.bz2
+SRC_URI=https://gottcode.org/tetzle/tetzle-2.0.3-src.tar.bz2
 _eclasses_=base	df2aa567b3f0595aae0d0923889f7631	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bc4f4e7441e9ce58c8fe8617de25d5e4
+_md5_=f7243e2909fb3b060d4671cc1006faaa
diff --git a/metadata/md5-cache/games-emulation/desmume-0.9.11-r1 b/metadata/md5-cache/games-emulation/desmume-0.9.11-r1
index e1da8d454b59..03006fde0308 100644
--- a/metadata/md5-cache/games-emulation/desmume-0.9.11-r1
+++ b/metadata/md5-cache/games-emulation/desmume-0.9.11-r1
@@ -3,9 +3,9 @@ DEPEND=>=x11-libs/gtk+-2.8.0:2 gnome-base/libglade x11-libs/gtkglext virtual/ope
 DESCRIPTION=Nintendo DS emulator
 EAPI=6
 HOMEPAGE=http://desmume.org/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.8.0:2 gnome-base/libglade x11-libs/gtkglext virtual/opengl sys-libs/zlib dev-libs/zziplib media-libs/libsdl[joystick,opengl,video] x11-libs/agg
 SLOT=0
 SRC_URI=mirror://sourceforge/desmume/desmume-0.9.11.tar.gz
-_md5_=2c19d0e26156a8650c9cac8b68f3ea8c
+_md5_=d309b58766ce8ee620554a21911d6a4f
diff --git a/metadata/md5-cache/games-fps/urbanterror-4.3.2_p20171016 b/metadata/md5-cache/games-fps/urbanterror-4.3.2_p20171016
new file mode 100644
index 000000000000..55000590daf7
--- /dev/null
+++ b/metadata/md5-cache/games-fps/urbanterror-4.3.2_p20171016
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst pretend
+DEPEND=client? ( media-libs/libsdl2[X,sound,joystick,opengl,video] mumble? ( media-sound/mumble ) openal? ( media-libs/openal ) opus? ( media-libs/opusfile ) vorbis? ( media-libs/libogg media-libs/libvorbis ) ) curl? ( net-misc/curl ) ~games-fps/urbanterror-data-4.3.2 sys-libs/zlib[minizip] virtual/jpeg:0 >=sys-apps/sed-4
+DESCRIPTION=Hollywood tactical shooter based on the ioquake3 engine
+EAPI=6
+HOMEPAGE=http://urbanterror.info https://github.com/mickael9/ioq3
+IUSE=+altgamma +client +curl debug mumble openal +opus server voip vorbis
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=client? ( media-libs/libsdl2[X,sound,joystick,opengl,video] mumble? ( media-sound/mumble ) openal? ( media-libs/openal ) opus? ( media-libs/opusfile ) vorbis? ( media-libs/libogg media-libs/libvorbis ) ) curl? ( net-misc/curl ) ~games-fps/urbanterror-data-4.3.2 sys-libs/zlib[minizip] virtual/jpeg:0
+REQUIRED_USE=|| ( client server )
+SLOT=0
+SRC_URI=https://github.com/mickael9/ioq3/archive/3e555ab1405c38556cbfcdd42eac23a4af49e633.tar.gz -> urbanterror-4.3.2_p20171016.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=804396ec7e858d289e0bd5fafcb6235d
diff --git a/metadata/md5-cache/games-mud/kmuddy-1.0.1-r3 b/metadata/md5-cache/games-mud/kmuddy-1.0.1-r3
index 18c44f745de9..86808a5d99d4 100644
--- a/metadata/md5-cache/games-mud/kmuddy-1.0.1-r3
+++ b/metadata/md5-cache/games-mud/kmuddy-1.0.1-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[l10n_es(+)] ) handbook? ( kde-frameworks/kdelibs:4[handbook] ) >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
 SLOT=4
 SRC_URI=http://www.kmuddy.com/releases/stable/kmuddy-1.0.1.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=51cbc8f5508f6e9f6a0f8ba229a6af58
diff --git a/metadata/md5-cache/games-puzzle/connectagram-1.2.1 b/metadata/md5-cache/games-puzzle/connectagram-1.2.1
index ab215a525e28..d0b67c330b58 100644
--- a/metadata/md5-cache/games-puzzle/connectagram-1.2.1
+++ b/metadata/md5-cache/games-puzzle/connectagram-1.2.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup u
 DEPEND=>=dev-qt/qtcore-5.2:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=dev-qt/qtgui-5.2:5 >=sys-apps/sed-4
 DESCRIPTION=A word unscrambling game
 EAPI=5
-HOMEPAGE=http://gottcode.org/connectagram/
+HOMEPAGE=https://gottcode.org/connectagram/
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-qt/qtcore-5.2:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=dev-qt/qtgui-5.2:5 games-misc/games-envd
 SLOT=0
-SRC_URI=http://gottcode.org/connectagram/connectagram-1.2.1-src.tar.bz2
+SRC_URI=https://gottcode.org/connectagram/connectagram-1.2.1-src.tar.bz2
 _eclasses_=base	df2aa567b3f0595aae0d0923889f7631	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=50bdffb92475ae6e4626a160e181bc28
+_md5_=4d1c93ca87f946fa0289eda570731ae8
diff --git a/metadata/md5-cache/games-puzzle/hitori-3.22.4 b/metadata/md5-cache/games-puzzle/hitori-3.22.4
new file mode 100644
index 000000000000..aa72e0e7080b
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/hitori-3.22.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/cairo-1.4 app-text/yelp-tools dev-libs/appstream-glib >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Logic puzzle game for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Hitori
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3+ CC-BY-SA-3.0
+RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/cairo-1.4
+SLOT=0
+SRC_URI=mirror://gnome/sources/hitori/3.22/hitori-3.22.4.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=dd5e1b40d1d80e9143822ae591d73dac
diff --git a/metadata/md5-cache/games-puzzle/tanglet-1.3.1 b/metadata/md5-cache/games-puzzle/tanglet-1.3.1
index e459ac5b67b9..82b3fb8a74f0 100644
--- a/metadata/md5-cache/games-puzzle/tanglet-1.3.1
+++ b/metadata/md5-cache/games-puzzle/tanglet-1.3.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup u
 DEPEND=sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 >=sys-apps/sed-4
 DESCRIPTION=A single player word finding game based on Boggle
 EAPI=5
-HOMEPAGE=http://gottcode.org/tanglet/
+HOMEPAGE=https://gottcode.org/tanglet/
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 games-misc/games-envd
 SLOT=0
-SRC_URI=http://gottcode.org/tanglet/tanglet-1.3.1-src.tar.bz2
+SRC_URI=https://gottcode.org/tanglet/tanglet-1.3.1-src.tar.bz2
 _eclasses_=base	df2aa567b3f0595aae0d0923889f7631	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d5197c6a0983d3120c9e0b023fcce33b
+_md5_=bfdd758c0e69f03e2474fdc8f97ea638
diff --git a/metadata/md5-cache/games-roguelike/powder-117-r1 b/metadata/md5-cache/games-roguelike/powder-117-r1
index 695ce0c95121..1e6ebbdf47c2 100644
--- a/metadata/md5-cache/games-roguelike/powder-117-r1
+++ b/metadata/md5-cache/games-roguelike/powder-117-r1
@@ -9,4 +9,4 @@ RDEPEND=media-libs/libsdl[video]
 SLOT=0
 SRC_URI=http://www.zincland.com/powder/release/powder117_src.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=eb6757b304199e841ab202ba8f31b8aa
+_md5_=b5f1981cca7b0ea15f14ec12f09f65e6
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.16.2-r1 b/metadata/md5-cache/games-roguelike/stone-soup-0.16.2-r1
index 2c41fd6ecea5..378cc80083dc 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.16.2-r1
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.16.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-db/sqlite:3 luajit? ( >=dev-lang/luajit-2.0.0 ) sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl2[opengl,video] media-libs/sdl2-image[png] virtual/glu virtual/opengl ) dev-lang/perl sys-devel/flex virtual/pkgconfig virtual/yacc tiles? ( sys-libs/ncurses:0 ) >=sys-apps/sed-4
+DEPEND=dev-db/sqlite:3 luajit? ( >=dev-lang/luajit-2.0.0 ) sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image[png] virtual/glu virtual/opengl ) dev-lang/perl sys-devel/flex virtual/pkgconfig virtual/yacc tiles? ( sys-libs/ncurses:0 ) >=sys-apps/sed-4
 DESCRIPTION=Role-playing roguelike game of exploration and treasure-hunting in dungeons
 EAPI=6
 HOMEPAGE=http://crawl.develz.org/wordpress/
 IUSE=debug luajit ncurses test +tiles
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT
-RDEPEND=dev-db/sqlite:3 luajit? ( >=dev-lang/luajit-2.0.0 ) sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl2[opengl,video] media-libs/sdl2-image[png] virtual/glu virtual/opengl )
+RDEPEND=dev-db/sqlite:3 luajit? ( >=dev-lang/luajit-2.0.0 ) sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image[png] virtual/glu virtual/opengl )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://crawl.develz.org/release/stone_soup-0.16.2.tar.xz https://dev.gentoo.org/~hasufell/distfiles/stone-soup.png https://dev.gentoo.org/~hasufell/distfiles/stone-soup.svg
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=afb7ae455b2770fa5614c01970748feb
+_md5_=6b33e6dc2f9e30be0b86bb7fb5eefff7
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.20.1 b/metadata/md5-cache/games-roguelike/stone-soup-0.20.1
new file mode 100644
index 000000000000..42723cd00e15
--- /dev/null
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.20.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=dev-db/sqlite:3 luajit? ( >=dev-lang/luajit-2.0.0 ) sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image[png] virtual/glu virtual/opengl ) dev-lang/perl sys-devel/flex virtual/pkgconfig virtual/yacc tiles? ( sys-libs/ncurses:0 ) >=sys-apps/sed-4
+DESCRIPTION=Role-playing roguelike game of exploration and treasure-hunting in dungeons
+EAPI=6
+HOMEPAGE=http://crawl.develz.org/wordpress/
+IUSE=debug luajit ncurses test +tiles
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT
+RDEPEND=dev-db/sqlite:3 luajit? ( >=dev-lang/luajit-2.0.0 ) sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image[png] virtual/glu virtual/opengl )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://crawl.develz.org/release/0.20/stone_soup-0.20.1.tar.xz https://dev.gentoo.org/~hasufell/distfiles/stone-soup.png https://dev.gentoo.org/~hasufell/distfiles/stone-soup.svg
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fea45cc7fc1ff707f4363e7c84242bed
diff --git a/metadata/md5-cache/games-strategy/scorched3d-44-r2 b/metadata/md5-cache/games-strategy/scorched3d-44-r2
index ebfc10b0b108..129eb51a649e 100644
--- a/metadata/md5-cache/games-strategy/scorched3d-44-r2
+++ b/metadata/md5-cache/games-strategy/scorched3d-44-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Multi-player tank battle in 3D (OpenGL)
 EAPI=6
 HOMEPAGE=http://www.scorched3d.co.uk/
 IUSE=dedicated mysql
-KEYWORDS=~amd64 ppc64 ~x86
+KEYWORDS=~amd64 ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/expat media-fonts/dejavu media-libs/libpng:0= media-libs/libsdl[video] media-libs/sdl-net sys-libs/zlib virtual/jpeg:0 !dedicated? ( virtual/opengl virtual/glu media-libs/glew:0= media-libs/libogg media-libs/libvorbis media-libs/openal media-libs/freealut x11-libs/wxGTK:3.0[X] media-libs/freetype:2 sci-libs/fftw:3.0= ) mysql? ( virtual/mysql )
 SLOT=0
 SRC_URI=mirror://sourceforge/scorched3d/Scorched3D-44-src.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=69049560495642eef7501b427cd969ec
+_md5_=37e439f5aa2c3936c5f0d0631bfd6c52
diff --git a/metadata/md5-cache/gnome-base/dconf-0.26.1 b/metadata/md5-cache/gnome-base/dconf-0.26.1
new file mode 100644
index 000000000000..5332190ba7ea
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/dconf-0.26.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.44.0:2 sys-apps/dbus app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.15 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Simple low-level configuration system
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/action/show/Projects/dconf
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.44.0:2 sys-apps/dbus
+SLOT=0
+SRC_URI=mirror://gnome/sources/dconf/0.26/dconf-0.26.1.tar.xz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ba956ce6cbee99f97489475995134a03
diff --git a/metadata/md5-cache/gnome-base/libgnome-keyring-3.12.0-r1 b/metadata/md5-cache/gnome-base/libgnome-keyring-3.12.0-r1
index a5ab5a2c24ee..f173cdeaccb1 100644
--- a/metadata/md5-cache/gnome-base/libgnome-keyring-3.12.0-r1
+++ b/metadata/md5-cache/gnome-base/libgnome-keyring-3.12.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Compatibility library for accessing secrets
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeKeyring
 IUSE=debug +introspection test vala debug 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 ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris
 LICENSE=LGPL-2+ GPL-2+
 RDEPEND=>=dev-libs/glib-2.16.0: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(-)?] >=dev-libs/libgcrypt-1.2.2: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(-)?] >=sys-apps/dbus-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(-)?] >=gnome-base/gnome-keyring-3.1.92 introspection? ( >=dev-libs/gobject-introspection-1.30.0 )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgnome-keyring/3.12/libgnome-keyring-3.12.0.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vala	103e6885c83965507391cdc5b6fa0e67	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=05fb191b8b077def6a78111e7aff8cfc
+_md5_=e947e25d3674deb58f0853e527faa70d
diff --git a/metadata/md5-cache/gnome-extra/gnome-commander-1.4.8 b/metadata/md5-cache/gnome-extra/gnome-commander-1.4.8
deleted file mode 100644
index f242d18c77d2..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-commander-1.4.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=app-text/gnome-doc-utils >=dev-libs/glib-2.6.0:2 >=dev-libs/libunique-0.9.3:1 gnome-base/gnome-keyring >=gnome-base/gnome-vfs-2.0.0 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.4.0 >=x11-libs/gtk+-2.8.0:2 chm? ( dev-libs/chmlib ) doc? ( app-text/scrollkeeper ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12.0 ) pdf? ( >=app-text/poppler-0.18 ) 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/gnome-vfs-python-2.0.0 ) taglib? ( >=media-libs/taglib-1.4 ) >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A graphical, full featured, twin-panel file manager
-EAPI=5
-HOMEPAGE=http://gcmd.github.io/
-IUSE=chm doc exif gsf pdf python taglib debug python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-text/gnome-doc-utils >=dev-libs/glib-2.6.0:2 >=dev-libs/libunique-0.9.3:1 gnome-base/gnome-keyring >=gnome-base/gnome-vfs-2.0.0 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.4.0 >=x11-libs/gtk+-2.8.0:2 chm? ( dev-libs/chmlib ) doc? ( app-text/scrollkeeper ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12.0 ) pdf? ( >=app-text/poppler-0.18 ) 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/gnome-vfs-python-2.0.0 ) taglib? ( >=media-libs/taglib-1.4 )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-commander/1.4/gnome-commander-1.4.8.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=22876d192b75c780fa4ece85a4430105
diff --git a/metadata/md5-cache/gnome-extra/gnome-commander-1.6.4 b/metadata/md5-cache/gnome-extra/gnome-commander-1.6.4
new file mode 100644
index 000000000000..201004c67c14
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-commander-1.6.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=app-text/gnome-doc-utils >=dev-libs/glib-2.44.0:2 unique? ( >=dev-libs/libunique-0.9.3:1 ) gnome-base/gnome-keyring >=gnome-base/gnome-vfs-2.0.0 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.4.0 >=x11-libs/gtk+-2.8.0:2 chm? ( dev-libs/chmlib ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12.0 ) samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] ) pdf? ( >=app-text/poppler-0.18 ) 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/gnome-vfs-python-2.0.0 ) taglib? ( >=media-libs/taglib-1.4 ) dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig test? ( >=dev-cpp/gtest-1.7.0 ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A graphical, full featured, twin-panel file manager
+EAPI=6
+HOMEPAGE=http://gcmd.github.io/
+IUSE=chm exif gsf pdf python taglib samba test +unique python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/gnome-doc-utils >=dev-libs/glib-2.44.0:2 unique? ( >=dev-libs/libunique-0.9.3:1 ) gnome-base/gnome-keyring >=gnome-base/gnome-vfs-2.0.0 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.4.0 >=x11-libs/gtk+-2.8.0:2 chm? ( dev-libs/chmlib ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12.0 ) samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] ) pdf? ( >=app-text/poppler-0.18 ) 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/gnome-vfs-python-2.0.0 ) taglib? ( >=media-libs/taglib-1.4 )
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-commander/1.6/gnome-commander-1.6.4.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1ae683b692915629fe0992e3febb0b77
diff --git a/metadata/md5-cache/gnome-extra/gnome-commander-1.8.0 b/metadata/md5-cache/gnome-extra/gnome-commander-1.8.0
new file mode 100644
index 000000000000..f14950c1311c
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-commander-1.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=app-text/yelp-tools >=dev-libs/glib-2.44.0:2 unique? ( >=dev-libs/libunique-0.9.3:1 ) gnome-base/gnome-keyring >=gnome-base/gnome-vfs-2.0.0 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.4.0 >=x11-libs/gtk+-2.18.0:2 chm? ( dev-libs/chmlib ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12.0 ) samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] ) pdf? ( >=app-text/poppler-0.18 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-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_python2_7(+)?,python_single_target_python3_4(+)?] >=dev-python/gnome-vfs-python-2.0.0 ) taglib? ( >=media-libs/taglib-1.4 ) dev-util/gtk-doc-am sys-devel/gettext virtual/pkgconfig test? ( >=dev-cpp/gtest-1.7.0 ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A graphical, full featured, twin-panel file manager
+EAPI=6
+HOMEPAGE=http://gcmd.github.io/
+IUSE=chm exif gsf pdf python taglib samba test +unique python_targets_python2_7 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/yelp-tools >=dev-libs/glib-2.44.0:2 unique? ( >=dev-libs/libunique-0.9.3:1 ) gnome-base/gnome-keyring >=gnome-base/gnome-vfs-2.0.0 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.4.0 >=x11-libs/gtk+-2.18.0:2 chm? ( dev-libs/chmlib ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12.0 ) samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] ) pdf? ( >=app-text/poppler-0.18 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-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_python2_7(+)?,python_single_target_python3_4(+)?] >=dev-python/gnome-vfs-python-2.0.0 ) taglib? ( >=media-libs/taglib-1.4 )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-commander/1.8/gnome-commander-1.8.0.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=213e6b511076dbfab2c53101a8cb61a5
diff --git a/metadata/md5-cache/gnome-extra/gtkhtml-4.8.5 b/metadata/md5-cache/gnome-extra/gtkhtml-4.8.5
deleted file mode 100644
index 04682df7f83a..000000000000
--- a/metadata/md5-cache/gnome-extra/gtkhtml-4.8.5
+++ /dev/null
@@ -1,12 +0,0 @@
-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-proto/xproto sys-devel/gettext >=dev-util/intltool-0.40.0 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 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
-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.8/gtkhtml-4.8.5.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3831d162994a0c74b60c8a9771a65fe2
diff --git a/metadata/md5-cache/kde-apps/akonadi-17.04.3-r1 b/metadata/md5-cache/kde-apps/akonadi-17.04.3-r1
index 1d127ee78199..995a7be898eb 100644
--- a/metadata/md5-cache/kde-apps/akonadi-17.04.3-r1
+++ b/metadata/md5-cache/kde-apps/akonadi-17.04.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( tools )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/akonadi-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=65b717bd04e9f316963b0023d9aba9e7
diff --git a/metadata/md5-cache/kde-apps/akonadi-17.08.2 b/metadata/md5-cache/kde-apps/akonadi-17.08.2
index b60c05bfad3c..4694a0f38bb8 100644
--- a/metadata/md5-cache/kde-apps/akonadi-17.08.2
+++ b/metadata/md5-cache/kde-apps/akonadi-17.08.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5= >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsql-5.7.1:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 x11-misc/shared-mime-info sqlite? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) dev-libs/boost dev-libs/libxslt test? ( sys-apps/dbus ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.37.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.37.0:5 >=dev-qt/designer-5.7.1:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5= >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsql-5.7.1-r1:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 x11-misc/shared-mime-info sqlite? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) dev-libs/boost dev-libs/libxslt test? ( sys-apps/dbus ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.37.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.37.0:5 >=dev-qt/designer-5.7.1:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Storage service for PIM data and libraries for PIM apps
 EAPI=6
 HOMEPAGE=https://community.kde.org/KDE_PIM/akonadi
 IUSE=+mysql postgres sqlite tools xml test debug designer test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5= >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsql-5.7.1:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 x11-misc/shared-mime-info sqlite? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) !kde-apps/kdepim-l10n !kde-apps/kdepimlibs mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) >=kde-frameworks/kf-env-4 !kde-apps/akonadi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5= >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsql-5.7.1-r1:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 x11-misc/shared-mime-info sqlite? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) !kde-apps/kdepim-l10n !kde-apps/kdepimlibs mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) >=kde-frameworks/kf-env-4 !kde-apps/akonadi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( tools )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/akonadi-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4a148a35ce9b00ee2a0f64cabf781263
diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-17.04.3 b/metadata/md5-cache/kde-apps/akonadi-calendar-17.04.3
index ca3479cc85eb..8f43dcb0a87d 100644
--- a/metadata/md5-cache/kde-apps/akonadi-calendar-17.04.3
+++ b/metadata/md5-cache/kde-apps/akonadi-calendar-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kd
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/akonadi-calendar-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e6344c57e4df992e4c291d307b4d7990
diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-17.08.2 b/metadata/md5-cache/kde-apps/akonadi-calendar-17.08.2
index 2afc00edee5f..bd005d2d7348 100644
--- a/metadata/md5-cache/kde-apps/akonadi-calendar-17.08.2
+++ b/metadata/md5-cache/kde-apps/akonadi-calendar-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kd
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/akonadi-calendar-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=456a8767f183eed2a9880290ad262a27
diff --git a/metadata/md5-cache/kde-apps/akonadi-contacts-17.04.3 b/metadata/md5-cache/kde-apps/akonadi-contacts-17.04.3
index 01df78ed9380..15c6712f1b5e 100644
--- a/metadata/md5-cache/kde-apps/akonadi-contacts-17.04.3
+++ b/metadata/md5-cache/kde-apps/akonadi-contacts-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/akonadi-contacts-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4e49d24f32be7499c1e670f3a8eb5a3b
diff --git a/metadata/md5-cache/kde-apps/akonadi-contacts-17.08.2 b/metadata/md5-cache/kde-apps/akonadi-contacts-17.08.2
index 37c5f1b901d1..accba43eb66d 100644
--- a/metadata/md5-cache/kde-apps/akonadi-contacts-17.08.2
+++ b/metadata/md5-cache/kde-apps/akonadi-contacts-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/akonadi-contacts-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5eb30637c95be784fe9a3b438f7b5625
diff --git a/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.04.3 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.04.3
index 1b94087a7311..7571f7984eb4 100644
--- a/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.04.3
+++ b/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-17.04.3:5 >=kde-apps/kcontacts-17.04.3:5 >=kde-apps/kidentitymanagement-17.04.3:5 >=kde-apps/kmailtransport-17.04.3:5 >=kde-apps/libkdepim-17.04.3:5 >=kde-apps/mailcommon-17.04.3:5 >=kde-apps/mailimporter-17.04.3:5 >=kde-apps/messagelib-17.04.3:5 >=kde-apps/pimcommon-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 !kde-apps/akonadi-import-wizard:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/akonadi-import-wizard-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d80733a8eccb7e998c41d54fd297ee50
diff --git a/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.08.2 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.08.2
index abb8148036d5..848a1f447ce9 100644
--- a/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.08.2
+++ b/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-17.08.2:5 >=kde-apps/kcontacts-17.08.2:5 >=kde-apps/kidentitymanagement-17.08.2:5 >=kde-apps/kmailtransport-17.08.2:5 >=kde-apps/libkdepim-17.08.2:5 >=kde-apps/mailcommon-17.08.2:5 >=kde-apps/mailimporter-17.08.2:5 >=kde-apps/messagelib-17.08.2:5 >=kde-apps/pimcommon-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 !kde-apps/akonadi-import-wizard:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/akonadi-import-wizard-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a60317535390c06e7f0a4ddc54b15878
diff --git a/metadata/md5-cache/kde-apps/akonadi-mime-17.04.3 b/metadata/md5-cache/kde-apps/akonadi-mime-17.04.3
index bcd7db2fdb79..ab96c00212b7 100644
--- a/metadata/md5-cache/kde-apps/akonadi-mime-17.04.3
+++ b/metadata/md5-cache/kde-apps/akonadi-mime-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/akonadi-mime-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ccc0b761a4d83b7bfe993ccd4ae2bbbf
diff --git a/metadata/md5-cache/kde-apps/akonadi-mime-17.08.2 b/metadata/md5-cache/kde-apps/akonadi-mime-17.08.2
index 97eb44634615..6bfce6dc6e76 100644
--- a/metadata/md5-cache/kde-apps/akonadi-mime-17.08.2
+++ b/metadata/md5-cache/kde-apps/akonadi-mime-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/akonadi-mime-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6c7f50cdec14d9f3c44d88aa36bf0257
diff --git a/metadata/md5-cache/kde-apps/akonadi-notes-17.04.3 b/metadata/md5-cache/kde-apps/akonadi-notes-17.04.3
index cfb179154d37..a8ab839474fc 100644
--- a/metadata/md5-cache/kde-apps/akonadi-notes-17.04.3
+++ b/metadata/md5-cache/kde-apps/akonadi-notes-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/ki18n-5.37.0:5 >=kde-apps/kmime-17.04.3:5 >=dev-qt/qtgu
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/akonadi-notes-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4c6477c74eedcd231fc0c352fc8cd4b2
diff --git a/metadata/md5-cache/kde-apps/akonadi-notes-17.08.2 b/metadata/md5-cache/kde-apps/akonadi-notes-17.08.2
index a0ee339009f8..ef9486703f1c 100644
--- a/metadata/md5-cache/kde-apps/akonadi-notes-17.08.2
+++ b/metadata/md5-cache/kde-apps/akonadi-notes-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/ki18n-5.37.0:5 >=kde-apps/kmime-17.08.2:5 >=dev-qt/qtgu
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/akonadi-notes-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b22ea9689e925a459ddfb91afaae3068
diff --git a/metadata/md5-cache/kde-apps/akonadi-search-17.04.3 b/metadata/md5-cache/kde-apps/akonadi-search-17.04.3
index f331b20302ad..e4f63fdca034 100644
--- a/metadata/md5-cache/kde-apps/akonadi-search-17.04.3
+++ b/metadata/md5-cache/kde-apps/akonadi-search-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/krunner-5.37.0:5 >=kde-apps/akonadi-17.04.3:5 >=kde-apps/akonadi-mime-17.04.3:5 >=kde-apps/kcalcore-17.04.3:5 >=kde-apps/kcontacts-17.04.3:5 >=kde-apps/kmime-17.04.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-libs/xapian-1.3:=[chert] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/akonadi-search:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/akonadi-search-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=13f2bfdd3aba18af2a71300cbd8b76ff
diff --git a/metadata/md5-cache/kde-apps/akonadi-search-17.08.2 b/metadata/md5-cache/kde-apps/akonadi-search-17.08.2
index 08552c1ed872..065328fb79e5 100644
--- a/metadata/md5-cache/kde-apps/akonadi-search-17.08.2
+++ b/metadata/md5-cache/kde-apps/akonadi-search-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/krunner-5.37.0:5 >=kde-apps/akonadi-17.08.2:5 >=kde-apps/akonadi-mime-17.08.2:5 >=kde-apps/kcalcore-17.08.2:5 >=kde-apps/kcontacts-17.08.2:5 >=kde-apps/kmime-17.08.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-libs/xapian-1.3:=[chert] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/akonadi-search:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/akonadi-search-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=cb9725a17f94a11e093f040a90bfc4a1
diff --git a/metadata/md5-cache/kde-apps/akonadiconsole-17.04.3 b/metadata/md5-cache/kde-apps/akonadiconsole-17.04.3
index b0bd87745f3c..02b409552a5a 100644
--- a/metadata/md5-cache/kde-apps/akonadiconsole-17.04.3
+++ b/metadata/md5-cache/kde-apps/akonadiconsole-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-17.04.3:5 >=kde-apps/akonadi-contacts-17.04.3:5 >=kde-apps/calendarsupport-17.04.3:5 >=kde-apps/kcalcore-17.04.3:5 >=kde-apps/kcontacts-17.04.3:5 >=kde-apps/kmime-17.04.3:5 >=kde-apps/kpimtextedit-17.04.3:5 >=kde-apps/libkdepim-17.04.3:5 >=kde-apps/messagelib-17.04.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/akonadiconsole:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/akonadiconsole-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8bd7bf1e73617271f0952249f5203b94
diff --git a/metadata/md5-cache/kde-apps/akonadiconsole-17.08.2 b/metadata/md5-cache/kde-apps/akonadiconsole-17.08.2
index 413513100159..eca5e5f92583 100644
--- a/metadata/md5-cache/kde-apps/akonadiconsole-17.08.2
+++ b/metadata/md5-cache/kde-apps/akonadiconsole-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-17.08.2:5 >=kde-apps/akonadi-contacts-17.08.2:5 >=kde-apps/calendarsupport-17.08.2:5 >=kde-apps/kcalcore-17.08.2:5 >=kde-apps/kcontacts-17.08.2:5 >=kde-apps/kmime-17.08.2:5 >=kde-apps/kpimtextedit-17.08.2:5 >=kde-apps/libkdepim-17.08.2:5 >=kde-apps/messagelib-17.08.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/akonadiconsole:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/akonadiconsole-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a96ebf6a4ba5a49d428e00a6a979fb20
diff --git a/metadata/md5-cache/kde-apps/akregator-17.04.3 b/metadata/md5-cache/kde-apps/akregator-17.04.3
index 56986d6538a4..1b82f81d2977 100644
--- a/metadata/md5-cache/kde-apps/akregator-17.04.3
+++ b/metadata/md5-cache/kde-apps/akregator-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/grantleetheme-17.04.3:5 >=kde-apps/kontactinterface-17.04.3:5 >=kde-apps/kpimtextedit-17.04.3:5 >=kde-apps/libkdepim-17.04.3:5 >=kde-apps/messagelib-17.04.3:5 >=kde-apps/pimcommon-17.04.3:5 >=kde-apps/syndication-17.04.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5= >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/akregator:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/akregator-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0d911702f46d59c550aebe8939b5a86a
diff --git a/metadata/md5-cache/kde-apps/akregator-17.08.2 b/metadata/md5-cache/kde-apps/akregator-17.08.2
index 8d60cbf1160f..26eb72edba4b 100644
--- a/metadata/md5-cache/kde-apps/akregator-17.08.2
+++ b/metadata/md5-cache/kde-apps/akregator-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/grantleetheme-17.08.2:5 >=kde-apps/kontactinterface-17.08.2:5 >=kde-apps/kpimtextedit-17.08.2:5 >=kde-apps/libkdepim-17.08.2:5 >=kde-apps/messagelib-17.08.2:5 >=kde-apps/pimcommon-17.08.2:5 >=kde-apps/syndication-17.08.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5= >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/akregator:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/akregator-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=473fa6e36d6cd00824089803540393d1
diff --git a/metadata/md5-cache/kde-apps/akregator-4.4.2017.04 b/metadata/md5-cache/kde-apps/akregator-4.4.2017.04
index c320a1ef27d3..429c218cb685 100644
--- a/metadata/md5-cache/kde-apps/akregator-4.4.2017.04
+++ b/metadata/md5-cache/kde-apps/akregator-4.4.2017.04
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.4.2017.04:4 >=kde-apps/libkdepim-4.4.2017.04:4 kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)] kontact? ( >=kde-apps/kontact-4.4.2017.04:4 )
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2017.04.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=66662b29ec611b065d77d8c799738e11
diff --git a/metadata/md5-cache/kde-apps/analitza-17.04.3 b/metadata/md5-cache/kde-apps/analitza-17.04.3
index 72213d4b669d..3e7fa4d59a4e 100644
--- a/metadata/md5-cache/kde-apps/analitza-17.04.3
+++ b/metadata/md5-cache/kde-apps/analitza-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[-gles2] >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 eigen? ( dev-cpp/eigen:3 ) >=kde-frameworks/kf-env-4 !kde-apps/analitza:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/analitza-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=437f36b5e5aa8e35c0ff4da36c0c6338
diff --git a/metadata/md5-cache/kde-apps/analitza-17.08.2 b/metadata/md5-cache/kde-apps/analitza-17.08.2
index 5d5dcb3a46bc..718c865ee89a 100644
--- a/metadata/md5-cache/kde-apps/analitza-17.08.2
+++ b/metadata/md5-cache/kde-apps/analitza-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[-gles2] >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 eigen? ( dev-cpp/eigen:3 ) >=kde-frameworks/kf-env-4 !kde-apps/analitza:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/analitza-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ad7f9776702b5ff683fddc700f31a5b2
diff --git a/metadata/md5-cache/kde-apps/ark-17.04.3 b/metadata/md5-cache/kde-apps/ark-17.04.3
index fab7248abf63..9a98eda6f7d6 100644
--- a/metadata/md5-cache/kde-apps/ark-17.04.3
+++ b/metadata/md5-cache/kde-apps/ark-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/ark-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f944d0d9ff600712b4fcc5089c87eab0
diff --git a/metadata/md5-cache/kde-apps/ark-17.08.2 b/metadata/md5-cache/kde-apps/ark-17.08.2
index 7a06192017b1..eb98e92e9dc8 100644
--- a/metadata/md5-cache/kde-apps/ark-17.08.2
+++ b/metadata/md5-cache/kde-apps/ark-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/ark-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ba8ea2dc4a60fe1df48b819b6ba2ee1a
diff --git a/metadata/md5-cache/kde-apps/artikulate-17.04.3 b/metadata/md5-cache/kde-apps/artikulate-17.04.3
index c2234c7f9ca5..dd5b12f464fc 100644
--- a/metadata/md5-cache/kde-apps/artikulate-17.04.3
+++ b/metadata/md5-cache/kde-apps/artikulate-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=k
 REQUIRED_USE=|| ( gstreamer qtmedia )
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/artikulate-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e546fd04a2802e1b11bba8bb72f31ffb
diff --git a/metadata/md5-cache/kde-apps/artikulate-17.08.2 b/metadata/md5-cache/kde-apps/artikulate-17.08.2
index 7814c48c3e8b..ba84b3d53761 100644
--- a/metadata/md5-cache/kde-apps/artikulate-17.08.2
+++ b/metadata/md5-cache/kde-apps/artikulate-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=k
 REQUIRED_USE=|| ( gstreamer qtmedia )
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/artikulate-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bc418571a20f96fbca9c40b25a8f5c09
diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-17.04.3 b/metadata/md5-cache/kde-apps/audiocd-kio-17.04.3
index 26a305c566c2..7363dab374f4 100644
--- a/metadata/md5-cache/kde-apps/audiocd-kio-17.04.3
+++ b/metadata/md5-cache/kde-apps/audiocd-kio-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-apps/libkcddb-17.04.3:5 >=kde-apps/libkcompactdisc-17.04.3:5 >=dev-qt/qtwidgets-5.7.1:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 !kde-apps/audiocd-kio:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/audiocd-kio-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=575ad23686143f3245da4a6415e20463
diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-17.08.2 b/metadata/md5-cache/kde-apps/audiocd-kio-17.08.2
index 88865eae7af0..10795865be82 100644
--- a/metadata/md5-cache/kde-apps/audiocd-kio-17.08.2
+++ b/metadata/md5-cache/kde-apps/audiocd-kio-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-apps/libkcddb-17.08.2:5 >=kde-apps/libkcompactdisc-17.08.2:5 >=dev-qt/qtwidgets-5.7.1:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 !kde-apps/audiocd-kio:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/audiocd-kio-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=43b7755fb16687d9a42ee9f2d438ed73
diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-17.04.3 b/metadata/md5-cache/kde-apps/baloo-widgets-17.04.3
index b24c13cb8eb4..f9a644a641cd 100644
--- a/metadata/md5-cache/kde-apps/baloo-widgets-17.04.3
+++ b/metadata/md5-cache/kde-apps/baloo-widgets-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/baloo-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/baloo-widgets-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=dea209a7f5e0887fff9afdb5c3400b87
diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-17.08.2 b/metadata/md5-cache/kde-apps/baloo-widgets-17.08.2
index 3d2cd557a828..e0ba808b21f3 100644
--- a/metadata/md5-cache/kde-apps/baloo-widgets-17.08.2
+++ b/metadata/md5-cache/kde-apps/baloo-widgets-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/baloo-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/baloo-widgets-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=dc736f8cf0c286208c145a1414677fed
diff --git a/metadata/md5-cache/kde-apps/blinken-17.04.3 b/metadata/md5-cache/kde-apps/blinken-17.04.3
index 297709d5082f..da5fe0004cbd 100644
--- a/metadata/md5-cache/kde-apps/blinken-17.04.3
+++ b/metadata/md5-cache/kde-apps/blinken-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 !kde-apps/blinken:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/blinken-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9fc9e414765935f6b32ec6e55ee1eb68
diff --git a/metadata/md5-cache/kde-apps/blinken-17.08.2 b/metadata/md5-cache/kde-apps/blinken-17.08.2
index e4c2cb618b20..e853fefc0b68 100644
--- a/metadata/md5-cache/kde-apps/blinken-17.08.2
+++ b/metadata/md5-cache/kde-apps/blinken-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 !kde-apps/blinken:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/blinken-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=31184b1a3688c179af846b477470573f
diff --git a/metadata/md5-cache/kde-apps/blogilo-17.04.3 b/metadata/md5-cache/kde-apps/blogilo-17.04.3
index ce447fec1d1a..718ab0ed5299 100644
--- a/metadata/md5-cache/kde-apps/blogilo-17.04.3
+++ b/metadata/md5-cache/kde-apps/blogilo-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/ktexteditor-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/kblog-17.04.3:5 >=kde-apps/kdepim-apps-libs-17.04.3:5 >=kde-apps/libkdepim-17.04.3:5 >=kde-apps/messagelib-17.04.3:5 >=kde-apps/pimcommon-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 google? ( >=kde-apps/libkgapi-17.04.3:5 ) !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/blogilo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/blogilo-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a9747efc2036afc4212c3286ad87c7df
diff --git a/metadata/md5-cache/kde-apps/blogilo-17.08.2 b/metadata/md5-cache/kde-apps/blogilo-17.08.2
index 5a1b69d44de4..72ec15c759e6 100644
--- a/metadata/md5-cache/kde-apps/blogilo-17.08.2
+++ b/metadata/md5-cache/kde-apps/blogilo-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/ktexteditor-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/kblog-17.08.2:5 >=kde-apps/kdepim-apps-libs-17.08.2:5 >=kde-apps/libkdepim-17.08.2:5 >=kde-apps/messagelib-17.08.2:5 >=kde-apps/pimcommon-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 google? ( >=kde-apps/libkgapi-17.08.2:5 ) !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/blogilo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/blogilo-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ec15f0775cc017ba660ec647a01664ac
diff --git a/metadata/md5-cache/kde-apps/blogilo-4.4.2017.04 b/metadata/md5-cache/kde-apps/blogilo-4.4.2017.04
index 2b31df2a30c2..bcb4d5cfde37 100644
--- a/metadata/md5-cache/kde-apps/blogilo-4.4.2017.04
+++ b/metadata/md5-cache/kde-apps/blogilo-4.4.2017.04
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.4.2017.04:4 kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtsql-4.8.5:4[qt3support] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2017.04.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7b232655949d9076e32c16e818623d58
diff --git a/metadata/md5-cache/kde-apps/bomber-17.04.3 b/metadata/md5-cache/kde-apps/bomber-17.04.3
index c692eec41340..d47835864fa7 100644
--- a/metadata/md5-cache/kde-apps/bomber-17.04.3
+++ b/metadata/md5-cache/kde-apps/bomber-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !games-action/xbomber >=kde-frameworks/kf-env-4 !kde-apps/bomber:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/bomber-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4d027261b359e0cc6e8dae98d814a0e4
diff --git a/metadata/md5-cache/kde-apps/bomber-17.08.2 b/metadata/md5-cache/kde-apps/bomber-17.08.2
index efbe17e2ddd1..2d303b31b4b9 100644
--- a/metadata/md5-cache/kde-apps/bomber-17.08.2
+++ b/metadata/md5-cache/kde-apps/bomber-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !games-action/xbomber >=kde-frameworks/kf-env-4 !kde-apps/bomber:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/bomber-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=afac903baf353556841f0d53aa32a883
diff --git a/metadata/md5-cache/kde-apps/bovo-17.04.3 b/metadata/md5-cache/kde-apps/bovo-17.04.3
index d0def03d5527..9b74e7fab148 100644
--- a/metadata/md5-cache/kde-apps/bovo-17.04.3
+++ b/metadata/md5-cache/kde-apps/bovo-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.04.3:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/bovo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/bovo-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=45eec26588970a0332a5120a4c54b028
diff --git a/metadata/md5-cache/kde-apps/bovo-17.08.2 b/metadata/md5-cache/kde-apps/bovo-17.08.2
index 5837c43354ef..ee3cf4a16c69 100644
--- a/metadata/md5-cache/kde-apps/bovo-17.08.2
+++ b/metadata/md5-cache/kde-apps/bovo-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/bovo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/bovo-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=df02d34ae13de52187d5ab8b28ddeeaf
diff --git a/metadata/md5-cache/kde-apps/calendarjanitor-17.04.3 b/metadata/md5-cache/kde-apps/calendarjanitor-17.04.3
index 2b303dfcdbc6..e320413dadbf 100644
--- a/metadata/md5-cache/kde-apps/calendarjanitor-17.04.3
+++ b/metadata/md5-cache/kde-apps/calendarjanitor-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-apps/akonadi-17.04.3:5 >=kde-apps/akonadi-calendar-17.04.3:5 >=kde-apps/calendarsupport-17.04.3:5 >=kde-apps/kcalcore-17.04.3:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/calendarjanitor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/akonadi-calendar-tools-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=529396bff21115f911f0e68132874c42
diff --git a/metadata/md5-cache/kde-apps/calendarjanitor-17.08.2 b/metadata/md5-cache/kde-apps/calendarjanitor-17.08.2
index 418c2fad2a43..3faac287e312 100644
--- a/metadata/md5-cache/kde-apps/calendarjanitor-17.08.2
+++ b/metadata/md5-cache/kde-apps/calendarjanitor-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-apps/akonadi-17.08.2:5 >=kde-apps/akonadi-calendar-17.08.2:5 >=kde-apps/calendarsupport-17.08.2:5 >=kde-apps/kcalcore-17.08.2:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/calendarjanitor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/akonadi-calendar-tools-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c613940e6fae33207cb852b75ea41bf7
diff --git a/metadata/md5-cache/kde-apps/calendarsupport-17.04.3 b/metadata/md5-cache/kde-apps/calendarsupport-17.04.3
index c54f38070a2f..80cc2d54812f 100644
--- a/metadata/md5-cache/kde-apps/calendarsupport-17.04.3
+++ b/metadata/md5-cache/kde-apps/calendarsupport-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-apps/akonadi-17.04.3:5 >=kde-apps/akonadi-calendar-17.04.3:5 >=kde-apps/akonadi-mime-17.04.3:5 >=kde-apps/kcalcore-17.04.3:5 >=kde-apps/kcalutils-17.04.3:5 >=kde-apps/kdepim-apps-libs-17.04.3:5 >=kde-apps/kholidays-17.04.3:5 >=kde-apps/kidentitymanagement-17.04.3:5 >=kde-apps/kmime-17.04.3:5 >=kde-apps/libkdepim-17.04.3:5 >=kde-apps/pimcommon-17.04.3:5 >=dev-qt/designer-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/calendarsupport:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/calendarsupport-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d66f9d001fe587a25a1f002d1d9fc187
diff --git a/metadata/md5-cache/kde-apps/calendarsupport-17.08.2 b/metadata/md5-cache/kde-apps/calendarsupport-17.08.2
index 30e2233f91db..87c22549a031 100644
--- a/metadata/md5-cache/kde-apps/calendarsupport-17.08.2
+++ b/metadata/md5-cache/kde-apps/calendarsupport-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-apps/akonadi-17.08.2:5 >=kde-apps/akonadi-calendar-17.08.2:5 >=kde-apps/akonadi-mime-17.08.2:5 >=kde-apps/kcalcore-17.08.2:5 >=kde-apps/kcalutils-17.08.2:5 >=kde-apps/kdepim-apps-libs-17.08.2:5 >=kde-apps/kholidays-17.08.2:5 >=kde-apps/kidentitymanagement-17.08.2:5 >=kde-apps/kmime-17.08.2:5 >=kde-apps/libkdepim-17.08.2:5 >=kde-apps/pimcommon-17.08.2:5 >=dev-qt/designer-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/calendarsupport:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/calendarsupport-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=24343a98d7134d0394ab1a82c974b33c
diff --git a/metadata/md5-cache/kde-apps/cantor-16.12.3 b/metadata/md5-cache/kde-apps/cantor-16.12.3
index 7b38e98b5588..64a2dd4a299c 100644
--- a/metadata/md5-cache/kde-apps/cantor-16.12.3
+++ b/metadata/md5-cache/kde-apps/cantor-16.12.3
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/cantor-16.12.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=262a289a7f0a679580632ccd4436b0d3
diff --git a/metadata/md5-cache/kde-apps/cantor-17.04.3 b/metadata/md5-cache/kde-apps/cantor-17.04.3
index 614baf3a562b..97196f9f65c9 100644
--- a/metadata/md5-cache/kde-apps/cantor-17.04.3
+++ b/metadata/md5-cache/kde-apps/cantor-17.04.3
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/cantor-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e45794ccad7fd14aaca332020e3fe62c
diff --git a/metadata/md5-cache/kde-apps/cantor-17.08.2 b/metadata/md5-cache/kde-apps/cantor-17.08.2
index 43a8fb26b206..c6b8c1bb27fc 100644
--- a/metadata/md5-cache/kde-apps/cantor-17.08.2
+++ b/metadata/md5-cache/kde-apps/cantor-17.08.2
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/cantor-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=439b9ee9b2b08ae52ac4ec00811f49de
diff --git a/metadata/md5-cache/kde-apps/cervisia-17.04.3 b/metadata/md5-cache/kde-apps/cervisia-17.04.3
index 9a00a8c5f2f1..5b8af51eea81 100644
--- a/metadata/md5-cache/kde-apps/cervisia-17.04.3
+++ b/metadata/md5-cache/kde-apps/cervisia-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdesu-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kinit-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-vcs/cvs >=kde-frameworks/kf-env-4 !kde-apps/cervisia:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/cervisia-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c6c07196760d44bcd3f0a770de963019
diff --git a/metadata/md5-cache/kde-apps/cervisia-17.08.2 b/metadata/md5-cache/kde-apps/cervisia-17.08.2
index 3c3c38dbddbd..a5d0513baa85 100644
--- a/metadata/md5-cache/kde-apps/cervisia-17.08.2
+++ b/metadata/md5-cache/kde-apps/cervisia-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdesu-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kinit-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-vcs/cvs >=kde-frameworks/kf-env-4 !kde-apps/cervisia:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/cervisia-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=cd919ffccd336d35b577fc3017f76d6d
diff --git a/metadata/md5-cache/kde-apps/dolphin-17.04.3 b/metadata/md5-cache/kde-apps/dolphin-17.04.3
index ed0087aeee8c..7d430ffa002b 100644
--- a/metadata/md5-cache/kde-apps/dolphin-17.04.3
+++ b/metadata/md5-cache/kde-apps/dolphin-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kbookmarks-5.37.0:5 >=kde-frameworks/kcmutils-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/dolphin-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a126db68e078c92b7f3d64c10c53b13e
diff --git a/metadata/md5-cache/kde-apps/dolphin-17.08.2 b/metadata/md5-cache/kde-apps/dolphin-17.08.2
index 3576f953ca63..2cad7a742311 100644
--- a/metadata/md5-cache/kde-apps/dolphin-17.08.2
+++ b/metadata/md5-cache/kde-apps/dolphin-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kbookmarks-5.37.0:5 >=kde-frameworks/kcmutils-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/dolphin-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ef1ca6e58057398c8dd55455f8e82679
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-17.04.3 b/metadata/md5-cache/kde-apps/dolphin-plugins-17.04.3
index 0c373f1df95a..a2b2f3f3971e 100644
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-17.04.3
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/dolphin-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 git? ( >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktexteditor-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 ) >=kde-apps/kompare-17.04.3:5 bazaar? ( dev-vcs/bzr ) dropbox? ( net-misc/dropbox-cli ) git? ( dev-vcs/git ) subversion? ( dev-vcs/subversion ) >=kde-frameworks/kf-env-4 !kde-apps/dolphin-plugins:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/dolphin-plugins-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=94445e4665f0df22d271c02f69afe6e5
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-17.08.2 b/metadata/md5-cache/kde-apps/dolphin-plugins-17.08.2
index 9b2c405c2717..76d0b1d8a80c 100644
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-17.08.2
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/dolphin-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 git? ( >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktexteditor-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 ) >=kde-apps/kompare-17.08.2:5 bazaar? ( dev-vcs/bzr ) dropbox? ( net-misc/dropbox-cli ) git? ( dev-vcs/git ) subversion? ( dev-vcs/subversion ) >=kde-frameworks/kf-env-4 !kde-apps/dolphin-plugins:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/dolphin-plugins-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ff4e800540ac3fb25b9a904a025442e7
diff --git a/metadata/md5-cache/kde-apps/dragon-17.04.3 b/metadata/md5-cache/kde-apps/dragon-17.04.3
index 5956f4941215..3cc5a888d52e 100644
--- a/metadata/md5-cache/kde-apps/dragon-17.04.3
+++ b/metadata/md5-cache/kde-apps/dragon-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/solid-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 !kde-apps/dragon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/dragon-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c7a36e37c6d234eed3c2b2dca1c7f0c5
diff --git a/metadata/md5-cache/kde-apps/dragon-17.08.2 b/metadata/md5-cache/kde-apps/dragon-17.08.2
index 49c95ded3291..6e86951ea51a 100644
--- a/metadata/md5-cache/kde-apps/dragon-17.08.2
+++ b/metadata/md5-cache/kde-apps/dragon-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/solid-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 !kde-apps/dragon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/dragon-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7c9a0df7f6583f7bfe694913b8ececfb
diff --git a/metadata/md5-cache/kde-apps/eventviews-17.04.3 b/metadata/md5-cache/kde-apps/eventviews-17.04.3
index a257089ff2ef..71ad5195bede 100644
--- a/metadata/md5-cache/kde-apps/eventviews-17.04.3
+++ b/metadata/md5-cache/kde-apps/eventviews-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-apps/akonadi-17.04.3:5 >=kde-apps/akonadi-calendar-17.04.3:5 >=kde-apps/calendarsupport-17.04.3:5 >=kde-apps/kcalcore-17.04.3:5 >=kde-apps/kcalutils-17.04.3:5 >=kde-apps/kcontacts-17.04.3:5 >=kde-apps/kmime-17.04.3:5 >=kde-apps/libkdepim-17.04.3:5 >=dev-qt/designer-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/kdiagram:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/eventviews:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/eventviews-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=422108ac0e0ee8aa0c8c8a5481264122
diff --git a/metadata/md5-cache/kde-apps/eventviews-17.08.2 b/metadata/md5-cache/kde-apps/eventviews-17.08.2
index 3a1cce00a39d..f94d06e9d1c9 100644
--- a/metadata/md5-cache/kde-apps/eventviews-17.08.2
+++ b/metadata/md5-cache/kde-apps/eventviews-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-apps/akonadi-17.08.2:5 >=kde-apps/akonadi-calendar-17.08.2:5 >=kde-apps/calendarsupport-17.08.2:5 >=kde-apps/kcalcore-17.08.2:5 >=kde-apps/kcalutils-17.08.2:5 >=kde-apps/kcontacts-17.08.2:5 >=kde-apps/kmime-17.08.2:5 >=kde-apps/libkdepim-17.08.2:5 >=dev-qt/designer-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/kdiagram:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/eventviews:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/eventviews-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a3dacee82377964b1612a2206c7bfef3
diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-17.04.3 b/metadata/md5-cache/kde-apps/ffmpegthumbs-17.04.3
index 973a9800eb25..cc5e4bf26971 100644
--- a/metadata/md5-cache/kde-apps/ffmpegthumbs-17.04.3
+++ b/metadata/md5-cache/kde-apps/ffmpegthumbs-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kio-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/ffmpegthumbs-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1c2943d5b9c84e3acce732dd18a638a8
diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-17.08.2 b/metadata/md5-cache/kde-apps/ffmpegthumbs-17.08.2
index fc8d65757454..4e0101f623f1 100644
--- a/metadata/md5-cache/kde-apps/ffmpegthumbs-17.08.2
+++ b/metadata/md5-cache/kde-apps/ffmpegthumbs-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kio-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/ffmpegthumbs-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3175d8010d01dd641df6183b354bc27e
diff --git a/metadata/md5-cache/kde-apps/filelight-17.04.3 b/metadata/md5-cache/kde-apps/filelight-17.04.3
index 9c34ddad3e7a..e35483145e02 100644
--- a/metadata/md5-cache/kde-apps/filelight-17.04.3
+++ b/metadata/md5-cache/kde-apps/filelight-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/filelight:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/filelight-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=08adbba2d8c5cf6fff1e0bd96217b057
diff --git a/metadata/md5-cache/kde-apps/filelight-17.08.2 b/metadata/md5-cache/kde-apps/filelight-17.08.2
index d6b611cc2e44..bce7d2c6f6d7 100644
--- a/metadata/md5-cache/kde-apps/filelight-17.08.2
+++ b/metadata/md5-cache/kde-apps/filelight-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/filelight:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/filelight-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b417d18b1125a0dd79c8d25771b1bfb1
diff --git a/metadata/md5-cache/kde-apps/granatier-17.04.3 b/metadata/md5-cache/kde-apps/granatier-17.04.3
index 210bc5369a1b..cbb05fa3f6e8 100644
--- a/metadata/md5-cache/kde-apps/granatier-17.04.3
+++ b/metadata/md5-cache/kde-apps/granatier-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/granatier:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/granatier-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=896d22fefd0bc8454e05f2dbab270112
diff --git a/metadata/md5-cache/kde-apps/granatier-17.08.2 b/metadata/md5-cache/kde-apps/granatier-17.08.2
index a00345f7235d..d987d5e8e503 100644
--- a/metadata/md5-cache/kde-apps/granatier-17.08.2
+++ b/metadata/md5-cache/kde-apps/granatier-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/granatier:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/granatier-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=51567d434d6fad5b41cf74d1242c701f
diff --git a/metadata/md5-cache/kde-apps/grantlee-editor-17.04.3 b/metadata/md5-cache/kde-apps/grantlee-editor-17.04.3
index 884709c52240..7a3679e4fbd8 100644
--- a/metadata/md5-cache/kde-apps/grantlee-editor-17.04.3
+++ b/metadata/md5-cache/kde-apps/grantlee-editor-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/ktexteditor-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-contacts-17.04.3:5 >=kde-apps/kblog-17.04.3:5 >=kde-apps/kcontacts-17.04.3:5 >=kde-apps/kmime-17.04.3:5 >=kde-apps/kpimtextedit-17.04.3:5 >=kde-apps/messagelib-17.04.3:5 >=kde-apps/pimcommon-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kaddressbook:4 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 !kde-apps/grantlee-editor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/grantlee-editor-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3205934855f5d65d053cbe48001dfdf3
diff --git a/metadata/md5-cache/kde-apps/grantlee-editor-17.08.2 b/metadata/md5-cache/kde-apps/grantlee-editor-17.08.2
index 0b1ec76da918..e91316526a80 100644
--- a/metadata/md5-cache/kde-apps/grantlee-editor-17.08.2
+++ b/metadata/md5-cache/kde-apps/grantlee-editor-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/ktexteditor-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-contacts-17.08.2:5 >=kde-apps/kblog-17.08.2:5 >=kde-apps/kcontacts-17.08.2:5 >=kde-apps/kmime-17.08.2:5 >=kde-apps/kpimtextedit-17.08.2:5 >=kde-apps/messagelib-17.08.2:5 >=kde-apps/pimcommon-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kaddressbook:4 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 !kde-apps/grantlee-editor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/grantlee-editor-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f3db0dc576b475068e648ef0ae9a3cc5
diff --git a/metadata/md5-cache/kde-apps/grantleetheme-17.04.3 b/metadata/md5-cache/kde-apps/grantleetheme-17.04.3
index 4631994ce0ea..9b401487fd8d 100644
--- a/metadata/md5-cache/kde-apps/grantleetheme-17.04.3
+++ b/metadata/md5-cache/kde-apps/grantleetheme-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/grantleetheme-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4d0c18678f6456dbbe74c1aab0ce21de
diff --git a/metadata/md5-cache/kde-apps/grantleetheme-17.08.2 b/metadata/md5-cache/kde-apps/grantleetheme-17.08.2
index 703fbf348b4d..659d9f6fb8f3 100644
--- a/metadata/md5-cache/kde-apps/grantleetheme-17.08.2
+++ b/metadata/md5-cache/kde-apps/grantleetheme-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/grantleetheme-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=303b3c51981be94e40bb5dd882d6c864
diff --git a/metadata/md5-cache/kde-apps/gwenview-17.04.3 b/metadata/md5-cache/kde-apps/gwenview-17.04.3
index 599bfddf953b..f96932181df8 100644
--- a/metadata/md5-cache/kde-apps/gwenview-17.04.3
+++ b/metadata/md5-cache/kde-apps/gwenview-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.37.0:5 >=kde-frameworks/kcompletion-5.37.
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/gwenview-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0e7fe8933a0a66bd17e8b9b090accefd
diff --git a/metadata/md5-cache/kde-apps/gwenview-17.08.2 b/metadata/md5-cache/kde-apps/gwenview-17.08.2
index c51dac00a88d..8823bcc18a1a 100644
--- a/metadata/md5-cache/kde-apps/gwenview-17.08.2
+++ b/metadata/md5-cache/kde-apps/gwenview-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.37.0:5 >=kde-frameworks/kcompletion-5.37.
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/gwenview-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8f1f3dfeef72c507439aa9eeeb98d6d5
diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-17.04.3 b/metadata/md5-cache/kde-apps/incidenceeditor-17.04.3
index 6e359712dae4..4c0b268c445a 100644
--- a/metadata/md5-cache/kde-apps/incidenceeditor-17.04.3
+++ b/metadata/md5-cache/kde-apps/incidenceeditor-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-17.04.3:5 >=kde-apps/akonadi-calendar-17.04.3:5 >=kde-apps/akonadi-contacts-17.04.3:5 >=kde-apps/akonadi-mime-17.04.3:5 >=kde-apps/calendarsupport-17.04.3:5 >=kde-apps/eventviews-17.04.3:5 >=kde-apps/kcalcore-17.04.3:5 >=kde-apps/kcalutils-17.04.3:5 >=kde-apps/kcontacts-17.04.3:5 >=kde-apps/kdepim-apps-libs-17.04.3:5 >=kde-apps/kidentitymanagement-17.04.3:5 >=kde-apps/kldap-17.04.3:5 >=kde-apps/kmailtransport-17.04.3:5 >=kde-apps/kmime-17.04.3:5 >=kde-apps/libkdepim-17.04.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/kdiagram:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/incidenceeditor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/incidenceeditor-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2860907995f4f3ec3b9cc0c14364e82a
diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-17.08.2 b/metadata/md5-cache/kde-apps/incidenceeditor-17.08.2
index 3e4d9f0d83d5..6718300da08a 100644
--- a/metadata/md5-cache/kde-apps/incidenceeditor-17.08.2
+++ b/metadata/md5-cache/kde-apps/incidenceeditor-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-17.08.2:5 >=kde-apps/akonadi-calendar-17.08.2:5 >=kde-apps/akonadi-contacts-17.08.2:5 >=kde-apps/akonadi-mime-17.08.2:5 >=kde-apps/calendarsupport-17.08.2:5 >=kde-apps/eventviews-17.08.2:5 >=kde-apps/kcalcore-17.08.2:5 >=kde-apps/kcalutils-17.08.2:5 >=kde-apps/kcontacts-17.08.2:5 >=kde-apps/kdepim-apps-libs-17.08.2:5 >=kde-apps/kidentitymanagement-17.08.2:5 >=kde-apps/kldap-17.08.2:5 >=kde-apps/kmailtransport-17.08.2:5 >=kde-apps/kmime-17.08.2:5 >=kde-apps/libkdepim-17.08.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/kdiagram:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/incidenceeditor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/incidenceeditor-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d073386cad57c39fec74093a7d7c308f
diff --git a/metadata/md5-cache/kde-apps/jovie-17.04.3 b/metadata/md5-cache/kde-apps/jovie-17.04.3
index 822f7d384708..2fbfa8833e53 100644
--- a/metadata/md5-cache/kde-apps/jovie-17.04.3
+++ b/metadata/md5-cache/kde-apps/jovie-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-accessibility/speech-dispatcher kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.04
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/jovie-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=70c0a4f551c85133789da4a1bedcb6d4
diff --git a/metadata/md5-cache/kde-apps/jovie-17.08.2 b/metadata/md5-cache/kde-apps/jovie-17.08.2
index 5e2207612b32..5c4d978b3325 100644
--- a/metadata/md5-cache/kde-apps/jovie-17.08.2
+++ b/metadata/md5-cache/kde-apps/jovie-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-accessibility/speech-dispatcher kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.08
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/jovie-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=01ea47164c1d7612f036533208703663
diff --git a/metadata/md5-cache/kde-apps/juk-17.04.3 b/metadata/md5-cache/kde-apps/juk-17.04.3
index b79b23f1037b..b7ce4b5f536f 100644
--- a/metadata/md5-cache/kde-apps/juk-17.04.3
+++ b/metadata/md5-cache/kde-apps/juk-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/phonon[qt4] >=media-libs/taglib-1.6 kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
 SLOT=4/17.04
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/juk-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3ab17c9a880c86e5d6ec8e2a41128b82
diff --git a/metadata/md5-cache/kde-apps/juk-17.08.2 b/metadata/md5-cache/kde-apps/juk-17.08.2
index c5200d02daad..a9fbe36bafb4 100644
--- a/metadata/md5-cache/kde-apps/juk-17.08.2
+++ b/metadata/md5-cache/kde-apps/juk-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/phonon[qt4] >=media-libs/taglib-1.6 kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
 SLOT=4/17.08
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/juk-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0c60b5d6969f8b28c43014da2bb51a43
diff --git a/metadata/md5-cache/kde-apps/k3b-17.04.3-r1 b/metadata/md5-cache/kde-apps/k3b-17.04.3-r1
index f68b6f28982b..6ab851cbec29 100644
--- a/metadata/md5-cache/kde-apps/k3b-17.04.3-r1
+++ b/metadata/md5-cache/kde-apps/k3b-17.04.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=flac? ( taglib ) mp3? ( encode taglib ) sox? ( encode taglib )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/k3b-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ea37e5a0972a785453ba595139eeb025
diff --git a/metadata/md5-cache/kde-apps/k3b-17.08.2 b/metadata/md5-cache/kde-apps/k3b-17.08.2
index 437fea42f206..a4144fcd9c1b 100644
--- a/metadata/md5-cache/kde-apps/k3b-17.08.2
+++ b/metadata/md5-cache/kde-apps/k3b-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kbookmarks-5.37.0:5
 REQUIRED_USE=flac? ( taglib ) mp3? ( encode taglib ) sox? ( encode taglib )
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/k3b-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=418743efb8e7008d11b005a808599329
diff --git a/metadata/md5-cache/kde-apps/kabcclient-4.4.2017.04 b/metadata/md5-cache/kde-apps/kabcclient-4.4.2017.04
index b8ce68f01bdf..948ce81981bd 100644
--- a/metadata/md5-cache/kde-apps/kabcclient-4.4.2017.04
+++ b/metadata/md5-cache/kde-apps/kabcclient-4.4.2017.04
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.4.2017.04:4 kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2017.04.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=38a8dc48ab0195548f84b9b698266da3
diff --git a/metadata/md5-cache/kde-apps/kaccessible-17.04.3 b/metadata/md5-cache/kde-apps/kaccessible-17.04.3
index 5ef8819f1c63..2152fa519128 100644
--- a/metadata/md5-cache/kde-apps/kaccessible-17.04.3
+++ b/metadata/md5-cache/kde-apps/kaccessible-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=speechd? ( app-accessibility/speech-dispatcher ) kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.04
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kaccessible-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=88efcd5aec8f20539b4bb03be170e1d4
diff --git a/metadata/md5-cache/kde-apps/kaccessible-17.08.2 b/metadata/md5-cache/kde-apps/kaccessible-17.08.2
index 102e7a5893dd..348cfa15dec8 100644
--- a/metadata/md5-cache/kde-apps/kaccessible-17.08.2
+++ b/metadata/md5-cache/kde-apps/kaccessible-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=speechd? ( app-accessibility/speech-dispatcher ) kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.08
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kaccessible-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5c4e70918500c3150d8d3154c09a6928
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-17.04.3 b/metadata/md5-cache/kde-apps/kaccounts-integration-17.04.3
index e7786e6ff13e..63b30f38952f 100644
--- a/metadata/md5-cache/kde-apps/kaccounts-integration-17.04.3
+++ b/metadata/md5-cache/kde-apps/kaccounts-integration-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kaccounts-integration-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6c66ca8e2671ba7f42cd47d3b08e2fcf
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-17.08.2 b/metadata/md5-cache/kde-apps/kaccounts-integration-17.08.2
index af77e310991d..925c02e121d1 100644
--- a/metadata/md5-cache/kde-apps/kaccounts-integration-17.08.2
+++ b/metadata/md5-cache/kde-apps/kaccounts-integration-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kaccounts-integration-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6f7a32fb67105217e546530226b47de2
diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-17.04.3 b/metadata/md5-cache/kde-apps/kaccounts-providers-17.04.3
index a37bffa049e9..14054fb8c55d 100644
--- a/metadata/md5-cache/kde-apps/kaccounts-providers-17.04.3
+++ b/metadata/md5-cache/kde-apps/kaccounts-providers-17.04.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kpackage-5.37.0:5 >=kde-apps/kaccounts-integration-17.04.3:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 net-im/telepathy-connection-managers[xmpp] net-libs/signon-ui net-libs/signon-oauth2 >=kde-frameworks/kf-env-4 !kde-apps/kaccounts-providers:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kaccounts-providers-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8b584750e0ac281721bcde122104e2e8
diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-17.08.2-r1 b/metadata/md5-cache/kde-apps/kaccounts-providers-17.08.2-r1
index 544350d05e98..d32fe8ee22e7 100644
--- a/metadata/md5-cache/kde-apps/kaccounts-providers-17.08.2-r1
+++ b/metadata/md5-cache/kde-apps/kaccounts-providers-17.08.2-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kpackage-5.37.0:5 >=kde-apps/kaccounts-integration-17.08.2:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 net-libs/signon-ui net-libs/signon-oauth2 >=kde-frameworks/kf-env-4 !kde-apps/kaccounts-providers:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kaccounts-providers-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=43f55919daf6816a96551286df961ac6
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-17.04.3 b/metadata/md5-cache/kde-apps/kaddressbook-17.04.3
index e4f815fba140..a8563dde786f 100644
--- a/metadata/md5-cache/kde-apps/kaddressbook-17.04.3
+++ b/metadata/md5-cache/kde-apps/kaddressbook-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-17.04.3:5 >=kde-apps/akonadi-contacts-17.04.3:5 >=kde-apps/akonadi-search-17.04.3:5 >=kde-apps/grantleetheme-17.04.3:5 >=kde-apps/kcontacts-17.04.3:5 >=kde-apps/kdepim-apps-libs-17.04.3:5 >=kde-apps/kontactinterface-17.04.3:5 >=kde-apps/libgravatar-17.04.3:5 >=kde-apps/libkdepim-17.04.3:5 >=kde-apps/pimcommon-17.04.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 prison? ( >=kde-frameworks/prison-5.37.0:5 ) !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.04.3:5 >=kde-frameworks/kf-env-4 !kde-apps/kaddressbook:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kaddressbook-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3449fa52b0bf4c7b94ebcfce1c2d54d1
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-17.08.2 b/metadata/md5-cache/kde-apps/kaddressbook-17.08.2
index 1ace6ede1402..fb2bba10ff33 100644
--- a/metadata/md5-cache/kde-apps/kaddressbook-17.08.2
+++ b/metadata/md5-cache/kde-apps/kaddressbook-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/prison-5.37.0:5 >=kde-apps/akonadi-17.08.2:5 >=kde-apps/akonadi-contacts-17.08.2:5 >=kde-apps/akonadi-search-17.08.2:5 >=kde-apps/grantleetheme-17.08.2:5 >=kde-apps/kcontacts-17.08.2:5 >=kde-apps/kdepim-apps-libs-17.08.2:5 >=kde-apps/kontactinterface-17.08.2:5 >=kde-apps/libgravatar-17.08.2:5 >=kde-apps/libkdepim-17.08.2:5 >=kde-apps/pimcommon-17.08.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.08.2:5 >=kde-frameworks/kf-env-4 !kde-apps/kaddressbook:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kaddressbook-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=540057da3e8202d8e7f763d5854bf5d3
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-4.4.2017.04 b/metadata/md5-cache/kde-apps/kaddressbook-4.4.2017.04
index a0f91b97b1cf..fd136d0e01c2 100644
--- a/metadata/md5-cache/kde-apps/kaddressbook-4.4.2017.04
+++ b/metadata/md5-cache/kde-apps/kaddressbook-4.4.2017.04
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.14.10_p20160611:4 >=kde-apps/libkdepim-4.4.2017.04:4 >=kde-apps/libkleo-4.4.2017.04:4 !>kde-apps/kdepimlibs-4.14.11_pre20160211 kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)] kontact? ( >=kde-apps/kontact-4.4.2017.04:4 )
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2017.04.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=65364ab40e322b28aab86873a7f6c712
diff --git a/metadata/md5-cache/kde-apps/kajongg-17.04.3 b/metadata/md5-cache/kde-apps/kajongg-17.04.3
index 567d5044e6bf..3b2bb197cd7a 100644
--- a/metadata/md5-cache/kde-apps/kajongg-17.04.3
+++ b/metadata/md5-cache/kde-apps/kajongg-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta
 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=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kajongg-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=14a8f63c45bae3f636904b9052801084
diff --git a/metadata/md5-cache/kde-apps/kajongg-17.08.2 b/metadata/md5-cache/kde-apps/kajongg-17.08.2
index 30486bfc2160..a802e51e8c19 100644
--- a/metadata/md5-cache/kde-apps/kajongg-17.08.2
+++ b/metadata/md5-cache/kde-apps/kajongg-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta
 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=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kajongg-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=14a8f63c45bae3f636904b9052801084
diff --git a/metadata/md5-cache/kde-apps/kalarm-17.04.3 b/metadata/md5-cache/kde-apps/kalarm-17.04.3
index 4d3ca737ea61..47d3ee1935de 100644
--- a/metadata/md5-cache/kde-apps/kalarm-17.04.3
+++ b/metadata/md5-cache/kde-apps/kalarm-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kauth-5.37.0:5 >=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-17.04.3:5 >=kde-apps/akonadi-contacts-17.04.3:5 >=kde-apps/akonadi-mime-17.04.3:5 >=kde-apps/kalarmcal-17.04.3:5 >=kde-apps/kcalcore-17.04.3:5 >=kde-apps/kcalutils-17.04.3:5 >=kde-apps/kcontacts-17.04.3:5 >=kde-apps/kdepim-apps-libs-17.04.3:5 >=kde-apps/kholidays-17.04.3:5 >=kde-apps/kidentitymanagement-17.04.3:5 >=kde-apps/kmailtransport-17.04.3:5 >=kde-apps/kmime-17.04.3:5 >=kde-apps/kontactinterface-17.04.3:5 >=kde-apps/kpimtextedit-17.04.3:5 >=kde-apps/libkdepim-17.04.3:5 >=kde-apps/mailcommon-17.04.3:5 >=kde-apps/pimcommon-17.04.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/libxslt media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.04.3:5 >=kde-frameworks/kf-env-4 !kde-apps/kalarm:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kalarm-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=cf84b431933b0e8206c30530e464c129
diff --git a/metadata/md5-cache/kde-apps/kalarm-17.08.2 b/metadata/md5-cache/kde-apps/kalarm-17.08.2
index 09a6d41fa03d..9f5007fbebb9 100644
--- a/metadata/md5-cache/kde-apps/kalarm-17.08.2
+++ b/metadata/md5-cache/kde-apps/kalarm-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kauth-5.37.0:5 >=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-17.08.2:5 >=kde-apps/akonadi-contacts-17.08.2:5 >=kde-apps/akonadi-mime-17.08.2:5 >=kde-apps/kalarmcal-17.08.2:5 >=kde-apps/kcalcore-17.08.2:5 >=kde-apps/kcalutils-17.08.2:5 >=kde-apps/kcontacts-17.08.2:5 >=kde-apps/kdepim-apps-libs-17.08.2:5 >=kde-apps/kholidays-17.08.2:5 >=kde-apps/kidentitymanagement-17.08.2:5 >=kde-apps/kmailtransport-17.08.2:5 >=kde-apps/kmime-17.08.2:5 >=kde-apps/kontactinterface-17.08.2:5 >=kde-apps/kpimtextedit-17.08.2:5 >=kde-apps/libkdepim-17.08.2:5 >=kde-apps/mailcommon-17.08.2:5 >=kde-apps/pimcommon-17.08.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/libxslt media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.08.2:5 >=kde-frameworks/kf-env-4 !kde-apps/kalarm:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kalarm-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=16c276dc2a5d4bd2c79a0b84baa9acce
diff --git a/metadata/md5-cache/kde-apps/kalarm-4.4.2017.04 b/metadata/md5-cache/kde-apps/kalarm-4.4.2017.04
index 5fa15c04716d..a0b3a3510fb5 100644
--- a/metadata/md5-cache/kde-apps/kalarm-4.4.2017.04
+++ b/metadata/md5-cache/kde-apps/kalarm-4.4.2017.04
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.4.2017.04:4 >=kde-apps/libkdepim-4.4.2017.04:4 media-libs/phonon[qt4] kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2017.04.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e5cc73df20f1d0593a67e650ed158995
diff --git a/metadata/md5-cache/kde-apps/kalarmcal-17.04.3 b/metadata/md5-cache/kde-apps/kalarmcal-17.04.3
index 81f7ca77d123..5f08e041d227 100644
--- a/metadata/md5-cache/kde-apps/kalarmcal-17.04.3
+++ b/metadata/md5-cache/kde-apps/kalarmcal-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-apps/akonadi-17.04.3:5 >=kde-apps/kcalcore-17.04.3:5 >=kde-apps/kholidays-17.04.3:5 >=kde-apps/kidentitymanagement-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kalarmcal:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kalarmcal-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ae129af148b9ef7e699d68472ba94172
diff --git a/metadata/md5-cache/kde-apps/kalarmcal-17.08.2 b/metadata/md5-cache/kde-apps/kalarmcal-17.08.2
index a1965ac0ed96..2d800fe55937 100644
--- a/metadata/md5-cache/kde-apps/kalarmcal-17.08.2
+++ b/metadata/md5-cache/kde-apps/kalarmcal-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-apps/akonadi-17.08.2:5 >=kde-apps/kcalcore-17.08.2:5 >=kde-apps/kholidays-17.08.2:5 >=kde-apps/kidentitymanagement-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kalarmcal:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kalarmcal-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=09dfff195a5386bf81e2df6837004aa9
diff --git a/metadata/md5-cache/kde-apps/kalgebra-17.04.3 b/metadata/md5-cache/kde-apps/kalgebra-17.04.3
index 6c43bc110942..8cad805a512e 100644
--- a/metadata/md5-cache/kde-apps/kalgebra-17.04.3
+++ b/metadata/md5-cache/kde-apps/kalgebra-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/analitza-17.04.3:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 readline? ( sys-libs/readline:0= ) >=dev-qt/qtquickcontrols-5.7.1:5 >=kde-frameworks/kirigami-2.2.0:5 !kde-apps/analitza:4 >=kde-frameworks/kf-env-4 !kde-apps/kalgebra:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kalgebra-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a284a1cec3ac8224913fe0fcf501c145
diff --git a/metadata/md5-cache/kde-apps/kalgebra-17.08.2 b/metadata/md5-cache/kde-apps/kalgebra-17.08.2
index e706486b0721..07da16b12a3d 100644
--- a/metadata/md5-cache/kde-apps/kalgebra-17.08.2
+++ b/metadata/md5-cache/kde-apps/kalgebra-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/analitza-17.08.2:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 readline? ( sys-libs/readline:0= ) >=kde-frameworks/kirigami-5.37.0:5 >=dev-qt/qtquickcontrols-5.7.1:5 !kde-apps/analitza:4 >=kde-frameworks/kf-env-4 !kde-apps/kalgebra:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kalgebra-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=77ecf669ef52a9275777eba16fbb1cf6
diff --git a/metadata/md5-cache/kde-apps/kalzium-17.04.3 b/metadata/md5-cache/kde-apps/kalzium-17.04.3
index e2c580875a57..1276fb6fe8cc 100644
--- a/metadata/md5-cache/kde-apps/kalzium-17.04.3
+++ b/metadata/md5-cache/kde-apps/kalzium-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/khtml-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kplotting-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kunitconversion-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 editor? ( dev-cpp/eigen:3 || ( sci-libs/avogadrolibs sci-chemistry/avogadro ) sci-chemistry/openbabel ) solver? ( dev-ml/facile[ocamlopt] ) sci-chemistry/chemical-mime-data >=kde-frameworks/kf-env-4 !kde-apps/kalzium:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kalzium-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8d4ebcea9093864006bb4d7994c22815
diff --git a/metadata/md5-cache/kde-apps/kalzium-17.08.2 b/metadata/md5-cache/kde-apps/kalzium-17.08.2
index f12ed53457bd..975470e5c26e 100644
--- a/metadata/md5-cache/kde-apps/kalzium-17.08.2
+++ b/metadata/md5-cache/kde-apps/kalzium-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/khtml-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kplotting-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kunitconversion-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 editor? ( dev-cpp/eigen:3 || ( sci-libs/avogadrolibs sci-chemistry/avogadro ) sci-chemistry/openbabel ) solver? ( dev-ml/facile[ocamlopt] ) sci-chemistry/chemical-mime-data >=kde-frameworks/kf-env-4 !kde-apps/kalzium:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kalzium-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a767d2181080eef3664ba3063539aa9d
diff --git a/metadata/md5-cache/kde-apps/kamera-17.04.3 b/metadata/md5-cache/kde-apps/kamera-17.04.3
index 9e74c8489c0f..25e264920561 100644
--- a/metadata/md5-cache/kde-apps/kamera-17.04.3
+++ b/metadata/md5-cache/kde-apps/kamera-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/libgphoto2:= >=kde-frameworks/kf-env-4 !kde-apps/kamera:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kamera-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e429e8862b9391b41b9499f98b92d9a8
diff --git a/metadata/md5-cache/kde-apps/kamera-17.08.2 b/metadata/md5-cache/kde-apps/kamera-17.08.2
index d61905da7bcf..142031592f84 100644
--- a/metadata/md5-cache/kde-apps/kamera-17.08.2
+++ b/metadata/md5-cache/kde-apps/kamera-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/libgphoto2:= >=kde-frameworks/kf-env-4 !kde-apps/kamera:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kamera-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=09d5890772fb4fc7ea581d06314ef0a8
diff --git a/metadata/md5-cache/kde-apps/kanagram-17.04.3 b/metadata/md5-cache/kde-apps/kanagram-17.04.3
index 6bab9d344ea5..dcf9533e86a3 100644
--- a/metadata/md5-cache/kde-apps/kanagram-17.04.3
+++ b/metadata/md5-cache/kde-apps/kanagram-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/sonnet-5.37.0:5 >=kde-apps/libkeduvocdocument-17.04.3:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] >=kde-apps/kdeedu-data-17.04.3:5 >=dev-qt/qtmultimedia-5.7.1:5[qml] >=dev-qt/qtquickcontrols-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kanagram:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kanagram-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0e03fa697c60522142a2032ea4d2a48f
diff --git a/metadata/md5-cache/kde-apps/kanagram-17.08.2-r1 b/metadata/md5-cache/kde-apps/kanagram-17.08.2-r1
index 1bc8c64f9578..07ffba8bc921 100644
--- a/metadata/md5-cache/kde-apps/kanagram-17.08.2-r1
+++ b/metadata/md5-cache/kde-apps/kanagram-17.08.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/sonnet-5.37.0:5 >=kde-apps/libkeduvocdocument-17.08.2:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.7.1:5 ) >=kde-apps/kdeedu-data-17.08.2:5 >=dev-qt/qtmultimedia-5.7.1:5[qml] >=dev-qt/qtquickcontrols-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kanagram:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kanagram-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=87ef376754addfdbc09a90cb435c1462
diff --git a/metadata/md5-cache/kde-apps/kapman-17.04.3 b/metadata/md5-cache/kde-apps/kapman-17.04.3
index bb76e429adb1..c222709cd997 100644
--- a/metadata/md5-cache/kde-apps/kapman-17.04.3
+++ b/metadata/md5-cache/kde-apps/kapman-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kapman:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kapman-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4343e6f24928653d96e2be0a89457675
diff --git a/metadata/md5-cache/kde-apps/kapman-17.08.2 b/metadata/md5-cache/kde-apps/kapman-17.08.2
index bd70ef66efaa..db009c55a78f 100644
--- a/metadata/md5-cache/kde-apps/kapman-17.08.2
+++ b/metadata/md5-cache/kde-apps/kapman-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kapman:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kapman-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=511d2fa32307900eceac13fb5ccfe045
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-17.04.3 b/metadata/md5-cache/kde-apps/kapptemplate-17.04.3
index d7a082c1a851..77cd215ecfdf 100644
--- a/metadata/md5-cache/kde-apps/kapptemplate-17.04.3
+++ b/metadata/md5-cache/kde-apps/kapptemplate-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kapptemplate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kapptemplate-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1a2c475cd8f72cd2e0ec81c14e93cd38
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-17.08.2 b/metadata/md5-cache/kde-apps/kapptemplate-17.08.2
index 4eaa3ae11544..f2ae6710d00c 100644
--- a/metadata/md5-cache/kde-apps/kapptemplate-17.08.2
+++ b/metadata/md5-cache/kde-apps/kapptemplate-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kapptemplate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kapptemplate-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a2a32430429514d7c12be1892c6cdafa
diff --git a/metadata/md5-cache/kde-apps/kate-17.04.3 b/metadata/md5-cache/kde-apps/kate-17.04.3
index 05e512f440b5..af689da3cb10 100644
--- a/metadata/md5-cache/kde-apps/kate-17.04.3
+++ b/metadata/md5-cache/kde-apps/kate-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktexteditor-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 addons? ( >=kde-frameworks/kbookmarks-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/plasma-5.37.0:5 >=kde-frameworks/threadweaver-5.37.0:5 >=dev-qt/qtsql-5.7.1:5 >=dev-libs/libgit2-0.22.0:=[threads] ) >=kde-frameworks/kf-env-4 !kde-apps/kate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kate-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0826cd3332e174e03927b963f9a14f75
diff --git a/metadata/md5-cache/kde-apps/kate-17.08.2 b/metadata/md5-cache/kde-apps/kate-17.08.2
index 735cc563ac7d..bb2f2a48bb8f 100644
--- a/metadata/md5-cache/kde-apps/kate-17.08.2
+++ b/metadata/md5-cache/kde-apps/kate-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktexteditor-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 addons? ( >=kde-frameworks/kbookmarks-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/plasma-5.37.0:5 >=kde-frameworks/threadweaver-5.37.0:5 >=dev-qt/qtsql-5.7.1:5 ) >=kde-frameworks/kf-env-4 !kde-apps/kate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kate-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4ab0b9449dfa9a74dcfa15d57d764fef
diff --git a/metadata/md5-cache/kde-apps/katepart-4.14.3 b/metadata/md5-cache/kde-apps/katepart-4.14.3
index 23e82ad6744b..7ac9090c645f 100644
--- a/metadata/md5-cache/kde-apps/katepart-4.14.3
+++ b/metadata/md5-cache/kde-apps/katepart-4.14.3
@@ -10,5 +10,5 @@ RDEPEND=kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handboo
 RESTRICT=test
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/4.14.3/src/kate-4.14.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e191949905121dbff9f7640357ef7dee
diff --git a/metadata/md5-cache/kde-apps/katomic-17.04.3 b/metadata/md5-cache/kde-apps/katomic-17.04.3
index 19eaa2b1610b..468d5b157fbe 100644
--- a/metadata/md5-cache/kde-apps/katomic-17.04.3
+++ b/metadata/md5-cache/kde-apps/katomic-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/katomic:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/katomic-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=81f0a7a743b837bfe85e97f069cda7b9
diff --git a/metadata/md5-cache/kde-apps/katomic-17.08.2 b/metadata/md5-cache/kde-apps/katomic-17.08.2
index 67c9009e64eb..7f4102079658 100644
--- a/metadata/md5-cache/kde-apps/katomic-17.08.2
+++ b/metadata/md5-cache/kde-apps/katomic-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/katomic:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/katomic-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bd9394b7e4365dfc7b3f50cd9b353ebd
diff --git a/metadata/md5-cache/kde-apps/kblackbox-17.04.3 b/metadata/md5-cache/kde-apps/kblackbox-17.04.3
index 8aafdd7f4d59..7bf1924a2ca8 100644
--- a/metadata/md5-cache/kde-apps/kblackbox-17.04.3
+++ b/metadata/md5-cache/kde-apps/kblackbox-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kblackbox:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kblackbox-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bc615d9daaad69e2d4f855149a78e74e
diff --git a/metadata/md5-cache/kde-apps/kblackbox-17.08.2 b/metadata/md5-cache/kde-apps/kblackbox-17.08.2
index bfd108a18d79..136195993c6c 100644
--- a/metadata/md5-cache/kde-apps/kblackbox-17.08.2
+++ b/metadata/md5-cache/kde-apps/kblackbox-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kblackbox:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kblackbox-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bc8679a89009133d354a5e172cb09f72
diff --git a/metadata/md5-cache/kde-apps/kblocks-17.04.3 b/metadata/md5-cache/kde-apps/kblocks-17.04.3
index 2c28a684b589..93fe6b410ed5 100644
--- a/metadata/md5-cache/kde-apps/kblocks-17.04.3
+++ b/metadata/md5-cache/kde-apps/kblocks-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kblocks:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kblocks-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3023c64a01f20a0c57f69b68c6299b08
diff --git a/metadata/md5-cache/kde-apps/kblocks-17.08.2 b/metadata/md5-cache/kde-apps/kblocks-17.08.2
index fb955655f259..e4fac75ab6bb 100644
--- a/metadata/md5-cache/kde-apps/kblocks-17.08.2
+++ b/metadata/md5-cache/kde-apps/kblocks-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kblocks:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kblocks-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=96f4647d6e2e3ca37660fb414a0ca1ed
diff --git a/metadata/md5-cache/kde-apps/kblog-17.04.3 b/metadata/md5-cache/kde-apps/kblog-17.04.3
index f23f037bb796..3e5a43522c62 100644
--- a/metadata/md5-cache/kde-apps/kblog-17.04.3
+++ b/metadata/md5-cache/kde-apps/kblog-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kxmlrpcclient-5.37.0:5 >=kde-apps/kcalcore-17.04.3:5 >=kde-apps/syndication-17.04.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kblog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kblog-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b59df2d0daecc27d3745857027c97996
diff --git a/metadata/md5-cache/kde-apps/kblog-17.08.2 b/metadata/md5-cache/kde-apps/kblog-17.08.2
index cf7303e4b75b..d72687dca8a0 100644
--- a/metadata/md5-cache/kde-apps/kblog-17.08.2
+++ b/metadata/md5-cache/kde-apps/kblog-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kxmlrpcclient-5.37.0:5 >=kde-apps/kcalcore-17.08.2:5 >=kde-apps/syndication-17.08.2:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kblog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kblog-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=69afb689d7d8696a15785e18b0800e92
diff --git a/metadata/md5-cache/kde-apps/kbounce-17.04.3 b/metadata/md5-cache/kde-apps/kbounce-17.04.3
index f2d6b8e6ecc3..3937ec9f3d17 100644
--- a/metadata/md5-cache/kde-apps/kbounce-17.04.3
+++ b/metadata/md5-cache/kde-apps/kbounce-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kbounce:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kbounce-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0c156f4592c6e5c622c87bf3d0c92ff0
diff --git a/metadata/md5-cache/kde-apps/kbounce-17.08.2 b/metadata/md5-cache/kde-apps/kbounce-17.08.2
index e17c6dc43f81..899d8061efd9 100644
--- a/metadata/md5-cache/kde-apps/kbounce-17.08.2
+++ b/metadata/md5-cache/kde-apps/kbounce-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kbounce:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kbounce-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1b7c2b257d09d4f5e573ce4accb93dc2
diff --git a/metadata/md5-cache/kde-apps/kbreakout-17.04.3 b/metadata/md5-cache/kde-apps/kbreakout-17.04.3
index 3334159c5520..ad5a4927f877 100644
--- a/metadata/md5-cache/kde-apps/kbreakout-17.04.3
+++ b/metadata/md5-cache/kde-apps/kbreakout-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.04.3:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kbreakout:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kbreakout-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fc73339357235cf8629ab2859463098b
diff --git a/metadata/md5-cache/kde-apps/kbreakout-17.08.2 b/metadata/md5-cache/kde-apps/kbreakout-17.08.2
index 31cb66680473..ad4b43b5f734 100644
--- a/metadata/md5-cache/kde-apps/kbreakout-17.08.2
+++ b/metadata/md5-cache/kde-apps/kbreakout-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kbreakout:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kbreakout-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bce51ff72f645818703b2d3de80b18b7
diff --git a/metadata/md5-cache/kde-apps/kbruch-17.04.3 b/metadata/md5-cache/kde-apps/kbruch-17.04.3
index 68b39b1efc73..363fed2b715f 100644
--- a/metadata/md5-cache/kde-apps/kbruch-17.04.3
+++ b/metadata/md5-cache/kde-apps/kbruch-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kbruch:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kbruch-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d2987bb83cccc940f58193fe801236ff
diff --git a/metadata/md5-cache/kde-apps/kbruch-17.08.2 b/metadata/md5-cache/kde-apps/kbruch-17.08.2
index ee5a8ef1f739..a356322d1382 100644
--- a/metadata/md5-cache/kde-apps/kbruch-17.08.2
+++ b/metadata/md5-cache/kde-apps/kbruch-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kbruch:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kbruch-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8aea660b0eac1a181f7b234d7f05a70e
diff --git a/metadata/md5-cache/kde-apps/kcachegrind-17.04.3 b/metadata/md5-cache/kde-apps/kcachegrind-17.04.3
index 6b4f174a8ef8..8d929508ce8a 100644
--- a/metadata/md5-cache/kde-apps/kcachegrind-17.04.3
+++ b/metadata/md5-cache/kde-apps/kcachegrind-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-gfx/graphviz !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 !kde-apps/kcachegrind:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kcachegrind-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=857e94bf329ed1127d626bfcac4c68c9
diff --git a/metadata/md5-cache/kde-apps/kcachegrind-17.08.2 b/metadata/md5-cache/kde-apps/kcachegrind-17.08.2
index 480add41a30d..fb2550466196 100644
--- a/metadata/md5-cache/kde-apps/kcachegrind-17.08.2
+++ b/metadata/md5-cache/kde-apps/kcachegrind-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-gfx/graphviz !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 !kde-apps/kcachegrind:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kcachegrind-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0df1cb93e6f6d2b27a1dbec7becfb5e1
diff --git a/metadata/md5-cache/kde-apps/kcalc-17.04.3 b/metadata/md5-cache/kde-apps/kcalc-17.04.3
index 6e275e0cf256..7a511b814913 100644
--- a/metadata/md5-cache/kde-apps/kcalc-17.04.3
+++ b/metadata/md5-cache/kde-apps/kcalc-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kinit-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/gmp:0= >=kde-frameworks/kf-env-4 !kde-apps/kcalc:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kcalc-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7e56d69fbe8cb9ee20e2d9b8e2c06611
diff --git a/metadata/md5-cache/kde-apps/kcalc-17.08.2 b/metadata/md5-cache/kde-apps/kcalc-17.08.2
index e5f59a5c3337..7d073139c550 100644
--- a/metadata/md5-cache/kde-apps/kcalc-17.08.2
+++ b/metadata/md5-cache/kde-apps/kcalc-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kinit-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/gmp:0= >=kde-frameworks/kf-env-4 !kde-apps/kcalc:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kcalc-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6c3605f0ebcb68e9a9581bf3edd97e79
diff --git a/metadata/md5-cache/kde-apps/kcalcore-17.04.3 b/metadata/md5-cache/kde-apps/kcalcore-17.04.3
index 1a4b6e557f6f..ca49ce5859cd 100644
--- a/metadata/md5-cache/kde-apps/kcalcore-17.04.3
+++ b/metadata/md5-cache/kde-apps/kcalcore-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kcalcore-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ab8e2e4715f74078570713965286ef20
diff --git a/metadata/md5-cache/kde-apps/kcalcore-17.08.2 b/metadata/md5-cache/kde-apps/kcalcore-17.08.2
index 822e9f464378..d19c69fb3558 100644
--- a/metadata/md5-cache/kde-apps/kcalcore-17.08.2
+++ b/metadata/md5-cache/kde-apps/kcalcore-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kcalcore-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e5efec8ff671f6d7e68079bbb1802492
diff --git a/metadata/md5-cache/kde-apps/kcalutils-17.04.3 b/metadata/md5-cache/kde-apps/kcalutils-17.04.3
index 8714e582c8aa..5920cfd9ff85 100644
--- a/metadata/md5-cache/kde-apps/kcalutils-17.04.3
+++ b/metadata/md5-cache/kde-apps/kcalutils-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kd
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kcalutils-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ff72db0fe533a186a2bd8b438e05b6a6
diff --git a/metadata/md5-cache/kde-apps/kcalutils-17.08.2 b/metadata/md5-cache/kde-apps/kcalutils-17.08.2
index 1b0d0ac2bb0f..adef270eb6a8 100644
--- a/metadata/md5-cache/kde-apps/kcalutils-17.08.2
+++ b/metadata/md5-cache/kde-apps/kcalutils-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kd
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kcalutils-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=aabcb5b45370fcd14d7213ea2423950c
diff --git a/metadata/md5-cache/kde-apps/kcharselect-17.04.3 b/metadata/md5-cache/kde-apps/kcharselect-17.04.3
index 01c6a9ce3e18..ac542107ca94 100644
--- a/metadata/md5-cache/kde-apps/kcharselect-17.04.3
+++ b/metadata/md5-cache/kde-apps/kcharselect-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kcharselect:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kcharselect-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7946be3cfb0b8a064f1016768bb45d14
diff --git a/metadata/md5-cache/kde-apps/kcharselect-17.08.2 b/metadata/md5-cache/kde-apps/kcharselect-17.08.2
index 042109f98fe3..a58edfd98574 100644
--- a/metadata/md5-cache/kde-apps/kcharselect-17.08.2
+++ b/metadata/md5-cache/kde-apps/kcharselect-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kcharselect:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kcharselect-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=af17a179f871a802a41fc912a67b86b0
diff --git a/metadata/md5-cache/kde-apps/kcolorchooser-17.04.3 b/metadata/md5-cache/kde-apps/kcolorchooser-17.04.3
index 26b861b21263..1b3f0dd2be84 100644
--- a/metadata/md5-cache/kde-apps/kcolorchooser-17.04.3
+++ b/metadata/md5-cache/kde-apps/kcolorchooser-17.04.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kcolorchooser:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kcolorchooser-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c380cbbd11a3c7500a38a4bbedfc10da
diff --git a/metadata/md5-cache/kde-apps/kcolorchooser-17.08.2 b/metadata/md5-cache/kde-apps/kcolorchooser-17.08.2
index 2cfadcf57850..ed4f139300fb 100644
--- a/metadata/md5-cache/kde-apps/kcolorchooser-17.08.2
+++ b/metadata/md5-cache/kde-apps/kcolorchooser-17.08.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kcolorchooser:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kcolorchooser-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e4c1358970d0e04611e0ef83becc2f63
diff --git a/metadata/md5-cache/kde-apps/kcontacts-17.04.3 b/metadata/md5-cache/kde-apps/kcontacts-17.04.3
index 0f7524b0c729..871e43764f26 100644
--- a/metadata/md5-cache/kde-apps/kcontacts-17.04.3
+++ b/metadata/md5-cache/kde-apps/kcontacts-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kcontacts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kcontacts-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=af70a94169f12fa55f6d703b839552a7
diff --git a/metadata/md5-cache/kde-apps/kcontacts-17.08.2 b/metadata/md5-cache/kde-apps/kcontacts-17.08.2
index dd6c3a5b759e..c0cd83236432 100644
--- a/metadata/md5-cache/kde-apps/kcontacts-17.08.2
+++ b/metadata/md5-cache/kde-apps/kcontacts-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kcontacts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kcontacts-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a6eba6c39634819f9cbfb676e6f3d714
diff --git a/metadata/md5-cache/kde-apps/kcron-17.04.3 b/metadata/md5-cache/kde-apps/kcron-17.04.3
index 59624257c299..11b1db12dbad 100644
--- a/metadata/md5-cache/kde-apps/kcron-17.04.3
+++ b/metadata/md5-cache/kde-apps/kcron-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !prefix? ( virtual/cron ) >=kde-frameworks/kf-env-4 !kde-apps/kcron:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kcron-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=adfff0ed561cc05fa8d134120e419fd8
diff --git a/metadata/md5-cache/kde-apps/kcron-17.08.2 b/metadata/md5-cache/kde-apps/kcron-17.08.2
index 8947b93f3336..58335ac9e4ec 100644
--- a/metadata/md5-cache/kde-apps/kcron-17.08.2
+++ b/metadata/md5-cache/kde-apps/kcron-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !prefix? ( virtual/cron ) >=kde-frameworks/kf-env-4 !kde-apps/kcron:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kcron-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8b90d1926d3b289ce550d733b62425da
diff --git a/metadata/md5-cache/kde-apps/kdav-17.04.3 b/metadata/md5-cache/kde-apps/kdav-17.04.3
index d8789985e2a5..cd4555b07fbc 100644
--- a/metadata/md5-cache/kde-apps/kdav-17.04.3
+++ b/metadata/md5-cache/kde-apps/kdav-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kdav:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kdav-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0b6030dd049646816947c0a88516311c
diff --git a/metadata/md5-cache/kde-apps/kdav-17.08.2 b/metadata/md5-cache/kde-apps/kdav-17.08.2
index 9d0a47a39d71..e9d1d58c134c 100644
--- a/metadata/md5-cache/kde-apps/kdav-17.08.2
+++ b/metadata/md5-cache/kde-apps/kdav-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kdav:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kdav-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bc7ce894bd9c40ada66865bb59f6b526
diff --git a/metadata/md5-cache/kde-apps/kde-apps-meta-17.04.3 b/metadata/md5-cache/kde-apps/kde-apps-meta-17.04.3
index cd1ce0effeb5..0a7c18a57b98 100644
--- a/metadata/md5-cache/kde-apps/kde-apps-meta-17.04.3
+++ b/metadata/md5-cache/kde-apps/kde-apps-meta-17.04.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kate-17.04.3 >=kde-apps/kdeadmin-meta-17.04.3 >=kde-apps/kdecore-meta-17.04.3 >=kde-apps/kdeedu-meta-17.04.3 >=kde-apps/kdegames-meta-17.04.3 >=kde-apps/kdegraphics-meta-17.04.3 >=kde-apps/kdemultimedia-meta-17.04.3 >=kde-apps/kdenetwork-meta-17.04.3 >=kde-apps/kdeutils-meta-17.04.3 accessibility? ( >=kde-apps/kdeaccessibility-meta-17.04.3 ) pim? ( >=kde-apps/kdepim-meta-17.04.3 ) sdk? ( >=kde-apps/kdesdk-meta-17.04.3 >=kde-apps/kdewebdev-meta-17.04.3 ) !kde-apps/kde-apps-meta:4
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	kde5-meta-pkg	fc5b88f735e794095606833579179a56	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=01adfb7d070fbd5ece865e545832ee00
diff --git a/metadata/md5-cache/kde-apps/kde-apps-meta-17.08.2 b/metadata/md5-cache/kde-apps/kde-apps-meta-17.08.2
index 741e84466a4a..a08b80129a6f 100644
--- a/metadata/md5-cache/kde-apps/kde-apps-meta-17.08.2
+++ b/metadata/md5-cache/kde-apps/kde-apps-meta-17.08.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kate-17.08.2 >=kde-apps/kdeadmin-meta-17.08.2 >=kde-apps/kdecore-meta-17.08.2 >=kde-apps/kdeedu-meta-17.08.2 >=kde-apps/kdegames-meta-17.08.2 >=kde-apps/kdegraphics-meta-17.08.2 >=kde-apps/kdemultimedia-meta-17.08.2 >=kde-apps/kdenetwork-meta-17.08.2 >=kde-apps/kdeutils-meta-17.08.2 accessibility? ( >=kde-apps/kdeaccessibility-meta-17.08.2 ) pim? ( >=kde-apps/kdepim-meta-17.08.2 ) sdk? ( >=kde-apps/kdesdk-meta-17.08.2 qt4? ( >=kde-apps/kdewebdev-meta-17.08.2 ) ) !kde-apps/kde-apps-meta:4
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	kde5-meta-pkg	fc5b88f735e794095606833579179a56	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=550c2adc4a5b62168f5819bcf0b05372
diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-17.04.3 b/metadata/md5-cache/kde-apps/kde-dev-scripts-17.04.3
index 4bd3c5c3c2fb..728df595c269 100644
--- a/metadata/md5-cache/kde-apps/kde-dev-scripts-17.04.3
+++ b/metadata/md5-cache/kde-apps/kde-dev-scripts-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/advancecomp media-gfx/optipng dev-perl/XML-DOM >=kde-frameworks/kf-env-4 !kde-apps/kde-dev-scripts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kde-dev-scripts-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4d3c5a24b0769ccf9f57a03a751253c0
diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-17.08.2 b/metadata/md5-cache/kde-apps/kde-dev-scripts-17.08.2
index 8ba7ad3a546d..8e7a9b626c16 100644
--- a/metadata/md5-cache/kde-apps/kde-dev-scripts-17.08.2
+++ b/metadata/md5-cache/kde-apps/kde-dev-scripts-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/advancecomp media-gfx/optipng dev-perl/XML-DOM >=kde-frameworks/kf-env-4 !kde-apps/kde-dev-scripts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kde-dev-scripts-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=29d2d57c01899ebcd8ba1a2f270915a0
diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-17.04.3 b/metadata/md5-cache/kde-apps/kde-dev-utils-17.04.3
index e118ab92221d..4046cf4ff15f 100644
--- a/metadata/md5-cache/kde-apps/kde-dev-utils-17.04.3
+++ b/metadata/md5-cache/kde-apps/kde-dev-utils-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/designer-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 !kde-apps/kde-dev-utils:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kde-dev-utils-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a8ffed95de935ae5f505d6932db98cbb
diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-17.08.2 b/metadata/md5-cache/kde-apps/kde-dev-utils-17.08.2
index c9b03622fc41..8ed8228d949e 100644
--- a/metadata/md5-cache/kde-apps/kde-dev-utils-17.08.2
+++ b/metadata/md5-cache/kde-apps/kde-dev-utils-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/designer-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 !kde-apps/kde-dev-utils:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kde-dev-utils-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c76350aa0783e2e8ee31a9916eae6ee2
diff --git a/metadata/md5-cache/kde-apps/kde-meta-17.04.3 b/metadata/md5-cache/kde-apps/kde-meta-17.04.3
index df3d492d6a82..76b6987ec1ef 100644
--- a/metadata/md5-cache/kde-apps/kde-meta-17.04.3
+++ b/metadata/md5-cache/kde-apps/kde-meta-17.04.3
@@ -6,5 +6,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kde-apps-meta-17.04.3 >=kde-plasma/plasma-meta-5.10.5 !kde-apps/kde-meta:4
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	kde5-meta-pkg	fc5b88f735e794095606833579179a56	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2f7f6dbde5a42635408c1f67e310c38e
diff --git a/metadata/md5-cache/kde-apps/kde-meta-17.08.2 b/metadata/md5-cache/kde-apps/kde-meta-17.08.2
index eb41bdcb69f5..102045b70217 100644
--- a/metadata/md5-cache/kde-apps/kde-meta-17.08.2
+++ b/metadata/md5-cache/kde-apps/kde-meta-17.08.2
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kde-apps-meta-17.08.2 >=kde-plasma/plasma-meta-5.10.5 !kde-apps/kde-meta:4
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	kde5-meta-pkg	fc5b88f735e794095606833579179a56	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6df415eaf1c1240a04118e31bf40ca0e
diff --git a/metadata/md5-cache/kde-apps/kde4-l10n-17.04.3 b/metadata/md5-cache/kde-apps/kde4-l10n-17.04.3
index a862b3665a0e..ad9c95904498 100644
--- a/metadata/md5-cache/kde-apps/kde4-l10n-17.04.3
+++ b/metadata/md5-cache/kde-apps/kde4-l10n-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<kde-apps/akonadi-search-17.04.1:5 !kde-apps/kde-l10n:5 !<kde-apps/khelpcenter-17.04.1:5 !<kde-apps/kio-extras-17.04.1:5 !<kde-frameworks/baloo-5.34.0:5 !<kde-frameworks/baloo-widgets-5.34.0:5 !<kde-frameworks/kfilemetadata-5.34.0:5 !<kde-plasma/plasma-workspace-5.9.5.1-r1:5 kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.04
 SRC_URI=l10n_ar? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ar-17.04.3.tar.xz ) l10n_ast? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ast-17.04.3.tar.xz ) l10n_bg? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-bg-17.04.3.tar.xz ) l10n_bs? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-bs-17.04.3.tar.xz ) l10n_ca? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ca-17.04.3.tar.xz ) l10n_ca-valencia? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ca@valencia-17.04.3.tar.xz ) l10n_cs? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-cs-17.04.3.tar.xz ) l10n_da? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-da-17.04.3.tar.xz ) l10n_de? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-de-17.04.3.tar.xz ) l10n_el? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-el-17.04.3.tar.xz ) l10n_en-GB? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-en_GB-17.04.3.tar.xz ) l10n_eo? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-eo-17.04.3.tar.xz ) l10n_es? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-es-17.04.3.tar.xz ) l10n_et? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-et-17.04.3.tar.xz ) l10n_eu? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-eu-17.04.3.tar.xz ) l10n_fa? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-fa-17.04.3.tar.xz ) l10n_fi? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-fi-17.04.3.tar.xz ) l10n_fr? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-fr-17.04.3.tar.xz ) l10n_ga? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ga-17.04.3.tar.xz ) l10n_gl? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-gl-17.04.3.tar.xz ) l10n_he? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-he-17.04.3.tar.xz ) l10n_hi? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-hi-17.04.3.tar.xz ) l10n_hr? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-hr-17.04.3.tar.xz ) l10n_hu? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-hu-17.04.3.tar.xz ) l10n_ia? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ia-17.04.3.tar.xz ) l10n_id? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-id-17.04.3.tar.xz ) l10n_is? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-is-17.04.3.tar.xz ) l10n_it? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-it-17.04.3.tar.xz ) l10n_ja? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ja-17.04.3.tar.xz ) l10n_kk? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-kk-17.04.3.tar.xz ) l10n_km? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-km-17.04.3.tar.xz ) l10n_ko? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ko-17.04.3.tar.xz ) l10n_lt? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-lt-17.04.3.tar.xz ) l10n_lv? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-lv-17.04.3.tar.xz ) l10n_mr? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-mr-17.04.3.tar.xz ) l10n_nb? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-nb-17.04.3.tar.xz ) l10n_nds? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-nds-17.04.3.tar.xz ) l10n_nl? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-nl-17.04.3.tar.xz ) l10n_nn? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-nn-17.04.3.tar.xz ) l10n_pa? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-pa-17.04.3.tar.xz ) l10n_pl? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-pl-17.04.3.tar.xz ) l10n_pt? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-pt-17.04.3.tar.xz ) l10n_pt-BR? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-pt_BR-17.04.3.tar.xz ) l10n_ro? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ro-17.04.3.tar.xz ) l10n_ru? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ru-17.04.3.tar.xz ) l10n_sk? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-sk-17.04.3.tar.xz ) l10n_sl? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-sl-17.04.3.tar.xz ) l10n_sr? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-sr-17.04.3.tar.xz ) l10n_sr-ijekavsk? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-sr-17.04.3.tar.xz ) l10n_sr-Latn? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-sr-17.04.3.tar.xz ) l10n_sr-Latn-ijekavsk? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-sr-17.04.3.tar.xz ) l10n_sv? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-sv-17.04.3.tar.xz ) l10n_tr? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-tr-17.04.3.tar.xz ) l10n_ug? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ug-17.04.3.tar.xz ) l10n_uk? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-uk-17.04.3.tar.xz ) l10n_wa? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-wa-17.04.3.tar.xz ) l10n_zh-CN? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-zh_CN-17.04.3.tar.xz ) l10n_zh-TW? ( mirror://kde/stable/applications/17.04.3/src/kde-l10n/kde-l10n-zh_TW-17.04.3.tar.xz )
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e1ae4b0a37e4d515b993dbf7f0dcda53
diff --git a/metadata/md5-cache/kde-apps/kde4-l10n-17.08.2 b/metadata/md5-cache/kde-apps/kde4-l10n-17.08.2
index f80d81da4ad9..3fcdd358d624 100644
--- a/metadata/md5-cache/kde-apps/kde4-l10n-17.08.2
+++ b/metadata/md5-cache/kde-apps/kde4-l10n-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<kde-apps/akonadi-search-17.04.1:5 !kde-apps/kde-l10n:5 !<kde-apps/khelpcenter-17.04.1:5 !<kde-apps/kio-extras-17.04.1:5 !<kde-apps/umbrello-17.08.0:5 !<kde-frameworks/baloo-5.34.0:5 !<kde-frameworks/baloo-widgets-5.34.0:5 !<kde-frameworks/kfilemetadata-5.34.0:5 !<kde-plasma/kde-cli-tools-5.10.0:5 !<kde-plasma/plasma-desktop-5.10.0:5 !<kde-plasma/plasma-workspace-5.10.0:5 kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.08
 SRC_URI=l10n_ar? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ar-17.08.2.tar.xz ) l10n_ast? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ast-17.08.2.tar.xz ) l10n_bg? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-bg-17.08.2.tar.xz ) l10n_bs? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-bs-17.08.2.tar.xz ) l10n_ca? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ca-17.08.2.tar.xz ) l10n_ca-valencia? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ca@valencia-17.08.2.tar.xz ) l10n_cs? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-cs-17.08.2.tar.xz ) l10n_da? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-da-17.08.2.tar.xz ) l10n_de? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-de-17.08.2.tar.xz ) l10n_el? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-el-17.08.2.tar.xz ) l10n_en-GB? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-en_GB-17.08.2.tar.xz ) l10n_eo? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-eo-17.08.2.tar.xz ) l10n_es? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-es-17.08.2.tar.xz ) l10n_et? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-et-17.08.2.tar.xz ) l10n_eu? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-eu-17.08.2.tar.xz ) l10n_fa? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-fa-17.08.2.tar.xz ) l10n_fi? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-fi-17.08.2.tar.xz ) l10n_fr? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-fr-17.08.2.tar.xz ) l10n_ga? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ga-17.08.2.tar.xz ) l10n_gl? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-gl-17.08.2.tar.xz ) l10n_he? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-he-17.08.2.tar.xz ) l10n_hi? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-hi-17.08.2.tar.xz ) l10n_hr? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-hr-17.08.2.tar.xz ) l10n_hu? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-hu-17.08.2.tar.xz ) l10n_ia? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ia-17.08.2.tar.xz ) l10n_id? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-id-17.08.2.tar.xz ) l10n_is? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-is-17.08.2.tar.xz ) l10n_it? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-it-17.08.2.tar.xz ) l10n_ja? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ja-17.08.2.tar.xz ) l10n_kk? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-kk-17.08.2.tar.xz ) l10n_km? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-km-17.08.2.tar.xz ) l10n_ko? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ko-17.08.2.tar.xz ) l10n_lt? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-lt-17.08.2.tar.xz ) l10n_lv? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-lv-17.08.2.tar.xz ) l10n_mr? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-mr-17.08.2.tar.xz ) l10n_nb? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-nb-17.08.2.tar.xz ) l10n_nds? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-nds-17.08.2.tar.xz ) l10n_nl? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-nl-17.08.2.tar.xz ) l10n_nn? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-nn-17.08.2.tar.xz ) l10n_pa? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-pa-17.08.2.tar.xz ) l10n_pl? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-pl-17.08.2.tar.xz ) l10n_pt? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-pt-17.08.2.tar.xz ) l10n_pt-BR? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-pt_BR-17.08.2.tar.xz ) l10n_ro? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ro-17.08.2.tar.xz ) l10n_ru? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ru-17.08.2.tar.xz ) l10n_sk? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-sk-17.08.2.tar.xz ) l10n_sl? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-sl-17.08.2.tar.xz ) l10n_sr? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-sr-17.08.2.tar.xz ) l10n_sr-ijekavsk? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-sr-17.08.2.tar.xz ) l10n_sr-Latn? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-sr-17.08.2.tar.xz ) l10n_sr-Latn-ijekavsk? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-sr-17.08.2.tar.xz ) l10n_sv? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-sv-17.08.2.tar.xz ) l10n_tr? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-tr-17.08.2.tar.xz ) l10n_ug? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-ug-17.08.2.tar.xz ) l10n_uk? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-uk-17.08.2.tar.xz ) l10n_wa? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-wa-17.08.2.tar.xz ) l10n_zh-CN? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-zh_CN-17.08.2.tar.xz ) l10n_zh-TW? ( mirror://kde/stable/applications/17.08.2/src/kde-l10n/kde-l10n-zh_TW-17.08.2.tar.xz )
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b0f6c7597c436da4b1f97422490f968f
diff --git a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-17.04.3 b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-17.04.3
index fb929c827fdc..dd7072abb721 100644
--- a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-17.04.3
+++ b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-17.04.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/jovie-17.04.3 >=kde-apps/kaccessible-17.04.3 >=kde-apps/kmag-17.04.3 >=kde-apps/kmousetool-17.04.3 >=kde-apps/kmouth-17.04.3 nls? ( >=kde-apps/kde4-l10n-17.04.3 ) !kde-apps/kdeaccessibility-meta:4
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	kde5-meta-pkg	fc5b88f735e794095606833579179a56	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=553842b59d4289d79c89429076bd36c1
diff --git a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-17.08.2 b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-17.08.2
index 43835db50728..7c5c42185b8c 100644
--- a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-17.08.2
+++ b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-17.08.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kmag-17.08.2 >=kde-apps/kmousetool-17.08.2 qt4? ( >=kde-apps/jovie-17.08.2 >=kde-apps/kaccessible-17.08.2 >=kde-apps/kmouth-17.08.2 nls? ( >=kde-apps/kde4-l10n-17.08.2 ) ) !kde-apps/kdeaccessibility-meta:4
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	kde5-meta-pkg	fc5b88f735e794095606833579179a56	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=79d01398da73e5d39296eff5012a179d
diff --git a/metadata/md5-cache/kde-apps/kdeadmin-meta-17.04.3 b/metadata/md5-cache/kde-apps/kdeadmin-meta-17.04.3
index f5534fd975f0..7f1936bf8465 100644
--- a/metadata/md5-cache/kde-apps/kdeadmin-meta-17.04.3
+++ b/metadata/md5-cache/kde-apps/kdeadmin-meta-17.04.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/ksystemlog-17.04.3 cron? ( >=kde-apps/kcron-17.04.3 ) !kde-apps/kdeadmin-meta:4
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	kde5-meta-pkg	fc5b88f735e794095606833579179a56	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8b27bf1f5ddab165f0702dee7c281654
diff --git a/metadata/md5-cache/kde-apps/kdeadmin-meta-17.08.2 b/metadata/md5-cache/kde-apps/kdeadmin-meta-17.08.2
index dfb595528a89..ef1030648e97 100644
--- a/metadata/md5-cache/kde-apps/kdeadmin-meta-17.08.2
+++ b/metadata/md5-cache/kde-apps/kdeadmin-meta-17.08.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/ksystemlog-17.08.2 cron? ( >=kde-apps/kcron-17.08.2 ) !kde-apps/kdeadmin-meta:4
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	kde5-meta-pkg	fc5b88f735e794095606833579179a56	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c719c0e2ead66f187eb200ef12813d4a
diff --git a/metadata/md5-cache/kde-apps/kdebase-data-16.04.3 b/metadata/md5-cache/kde-apps/kdebase-data-16.04.3
index b06b06866b8b..5c652ff0a8d2 100644
--- a/metadata/md5-cache/kde-apps/kdebase-data-16.04.3
+++ b/metadata/md5-cache/kde-apps/kdebase-data-16.04.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-themes/hicolor-icon-theme kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b035dd2e9ca298283620d249fffd9845
diff --git a/metadata/md5-cache/kde-apps/kdebase-kioslaves-16.04.3-r2 b/metadata/md5-cache/kde-apps/kdebase-kioslaves-16.04.3-r2
index c98a3a3c0836..15cf0729568c 100644
--- a/metadata/md5-cache/kde-apps/kdebase-kioslaves-16.04.3-r2
+++ b/metadata/md5-cache/kde-apps/kdebase-kioslaves-16.04.3-r2
@@ -10,5 +10,5 @@ RDEPEND=virtual/jpeg:0 x11-libs/libXcursor bzip2? ( app-arch/bzip2 ) exif? ( med
 RESTRICT=test
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d0d565078985cade1037b34eb337a92f
diff --git a/metadata/md5-cache/kde-apps/kdebase-meta-17.04.3 b/metadata/md5-cache/kde-apps/kdebase-meta-17.04.3
index 5fc57e498d64..c1b6488bdfa5 100644
--- a/metadata/md5-cache/kde-apps/kdebase-meta-17.04.3
+++ b/metadata/md5-cache/kde-apps/kdebase-meta-17.04.3
@@ -6,5 +6,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kdecore-meta-17.04.3 >=kde-plasma/plasma-meta-5.10.5 !kde-apps/kdebase-meta:4
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	kde5-meta-pkg	fc5b88f735e794095606833579179a56	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=84e79443aaba2a8b8f5ecc2cdde5dcff
diff --git a/metadata/md5-cache/kde-apps/kdebase-meta-17.08.2 b/metadata/md5-cache/kde-apps/kdebase-meta-17.08.2
index cab6e5cf5d5b..ff2d283999eb 100644
--- a/metadata/md5-cache/kde-apps/kdebase-meta-17.08.2
+++ b/metadata/md5-cache/kde-apps/kdebase-meta-17.08.2
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kdecore-meta-17.08.2 >=kde-plasma/plasma-meta-5.10.5 !kde-apps/kdebase-meta:4
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	kde5-meta-pkg	fc5b88f735e794095606833579179a56	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=459ca2c24abac3ae618cc76a775ba688
diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-17.04.3 b/metadata/md5-cache/kde-apps/kdebugsettings-17.04.3
index 43e3827ce224..c2d35d28ab11 100644
--- a/metadata/md5-cache/kde-apps/kdebugsettings-17.04.3
+++ b/metadata/md5-cache/kde-apps/kdebugsettings-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kdebugsettings-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1f9fa35cee1cab61b11b372f7fbf38f9
diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-17.08.2 b/metadata/md5-cache/kde-apps/kdebugsettings-17.08.2
index 17482ab586c0..efe117ac1e4d 100644
--- a/metadata/md5-cache/kde-apps/kdebugsettings-17.08.2
+++ b/metadata/md5-cache/kde-apps/kdebugsettings-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kdebugsettings-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ee273a1ab793d58db1b0a0aa616ad8b2
diff --git a/metadata/md5-cache/kde-apps/kdecore-meta-17.04.3 b/metadata/md5-cache/kde-apps/kdecore-meta-17.04.3
index 53fe3c144b8c..6364f3bf650f 100644
--- a/metadata/md5-cache/kde-apps/kdecore-meta-17.04.3
+++ b/metadata/md5-cache/kde-apps/kdecore-meta-17.04.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/dolphin-17.04.3 >=kde-apps/kdialog-17.04.3 >=kde-apps/keditbookmarks-17.04.3 >=kde-apps/kfind-17.04.3 >=kde-apps/konqueror-17.04.3 >=kde-apps/konsole-17.04.3 >=kde-apps/kwrite-17.04.3 handbook? ( >=kde-apps/khelpcenter-17.04.3 ) !kde-apps/kdecore-meta:4
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	kde5-meta-pkg	fc5b88f735e794095606833579179a56	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6be51752e9a4ebbe19ad02741e337dcc
diff --git a/metadata/md5-cache/kde-apps/kdecore-meta-17.08.2 b/metadata/md5-cache/kde-apps/kdecore-meta-17.08.2
index a0500839e8b3..874dcce6a0d2 100644
--- a/metadata/md5-cache/kde-apps/kdecore-meta-17.08.2
+++ b/metadata/md5-cache/kde-apps/kdecore-meta-17.08.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/dolphin-17.08.2 >=kde-apps/kdialog-17.08.2 >=kde-apps/keditbookmarks-17.08.2 >=kde-apps/kfind-17.08.2 || ( www-client/qupzilla >=kde-apps/konqueror-17.08.2 ) >=kde-apps/konsole-17.08.2 >=kde-apps/kwrite-17.08.2 handbook? ( >=kde-apps/khelpcenter-17.08.2 ) !kde-apps/kdecore-meta:4
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	kde5-meta-pkg	fc5b88f735e794095606833579179a56	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3d35511d8c23eebc094e4b1b63295c6c
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-17.04.3 b/metadata/md5-cache/kde-apps/kdeedu-data-17.04.3
index a823dc715fd9..1d983c929221 100644
--- a/metadata/md5-cache/kde-apps/kdeedu-data-17.04.3
+++ b/metadata/md5-cache/kde-apps/kdeedu-data-17.04.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-apps/libkdeedu:4 !kde-apps/kde-l10n
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kdeedu-data-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b006b298396dfd948239ecd3d5a43ff5
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-17.08.2 b/metadata/md5-cache/kde-apps/kdeedu-data-17.08.2
index 10238a8b0d5a..eae7bebcaa4e 100644
--- a/metadata/md5-cache/kde-apps/kdeedu-data-17.08.2
+++ b/metadata/md5-cache/kde-apps/kdeedu-data-17.08.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-apps/libkdeedu:4 !kde-apps/kde-l10n
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kdeedu-data-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d8df1f18a4595f02c672186b0f285404
diff --git a/metadata/md5-cache/kde-apps/kdeedu-meta-17.04.3 b/metadata/md5-cache/kde-apps/kdeedu-meta-17.04.3
index 533b9e33307f..aaedd20c21f1 100644
--- a/metadata/md5-cache/kde-apps/kdeedu-meta-17.04.3
+++ b/metadata/md5-cache/kde-apps/kdeedu-meta-17.04.3
@@ -6,5 +6,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/analitza-17.04.3 >=kde-apps/artikulate-17.04.3 >=kde-apps/blinken-17.04.3 >=kde-apps/cantor-17.04.3 >=kde-apps/kalgebra-17.04.3 >=kde-apps/kalzium-17.04.3 >=kde-apps/kanagram-17.04.3 >=kde-apps/kbruch-17.04.3 >=kde-apps/kdeedu-data-17.04.3 >=kde-apps/kgeography-17.04.3 >=kde-apps/khangman-17.04.3 >=kde-apps/kig-17.04.3 >=kde-apps/kiten-17.04.3 >=kde-apps/klettres-17.04.3 >=kde-apps/kmplot-17.04.3 >=kde-apps/kqtquickcharts-17.04.3 >=kde-apps/kstars-17.04.3 >=kde-apps/ktouch-17.04.3 >=kde-apps/kturtle-17.04.3 >=kde-apps/kwordquiz-17.04.3 >=kde-apps/libkeduvocdocument-17.04.3 >=kde-apps/marble-17.04.3 >=kde-apps/minuet-17.04.3 >=kde-apps/parley-17.04.3 >=kde-apps/rocs-17.04.3 >=kde-apps/step-17.04.3 !kde-apps/kdeedu-meta:4
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	kde5-meta-pkg	fc5b88f735e794095606833579179a56	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=60d76cdfe0849fa84bb962f35bc8c091
diff --git a/metadata/md5-cache/kde-apps/kdeedu-meta-17.08.2 b/metadata/md5-cache/kde-apps/kdeedu-meta-17.08.2
index 1ed21b3e6cb6..f4695006ff31 100644
--- a/metadata/md5-cache/kde-apps/kdeedu-meta-17.08.2
+++ b/metadata/md5-cache/kde-apps/kdeedu-meta-17.08.2
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/analitza-17.08.2 >=kde-apps/artikulate-17.08.2 >=kde-apps/blinken-17.08.2 >=kde-apps/cantor-17.08.2 >=kde-apps/kalgebra-17.08.2 >=kde-apps/kalzium-17.08.2 >=kde-apps/kanagram-17.08.2 >=kde-apps/kbruch-17.08.2 >=kde-apps/kdeedu-data-17.08.2 >=kde-apps/kgeography-17.08.2 >=kde-apps/khangman-17.08.2 >=kde-apps/kig-17.08.2 >=kde-apps/kiten-17.08.2 >=kde-apps/klettres-17.08.2 >=kde-apps/kmplot-17.08.2 >=kde-apps/kqtquickcharts-17.08.2 >=kde-apps/kstars-17.08.2 >=kde-apps/ktouch-17.08.2 >=kde-apps/kturtle-17.08.2 >=kde-apps/kwordquiz-17.08.2 >=kde-apps/libkeduvocdocument-17.08.2 >=kde-apps/marble-17.08.2 >=kde-apps/minuet-17.08.2 >=kde-apps/parley-17.08.2 >=kde-apps/rocs-17.08.2 >=kde-apps/step-17.08.2 !kde-apps/kdeedu-meta:4
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	kde5-meta-pkg	fc5b88f735e794095606833579179a56	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=c832ad89db7e170762c3d6d062863eda
diff --git a/metadata/md5-cache/kde-apps/kdegames-meta-17.04.3 b/metadata/md5-cache/kde-apps/kdegames-meta-17.04.3
index 613282217a44..7730cf0b9aad 100644
--- a/metadata/md5-cache/kde-apps/kdegames-meta-17.04.3
+++ b/metadata/md5-cache/kde-apps/kdegames-meta-17.04.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/bomber-17.04.3 >=kde-apps/bovo-17.04.3 >=kde-apps/granatier-17.04.3 >=kde-apps/kapman-17.04.3 >=kde-apps/katomic-17.04.3 >=kde-apps/kblackbox-17.04.3 >=kde-apps/kblocks-17.04.3 >=kde-apps/kbounce-17.04.3 >=kde-apps/kbreakout-17.04.3 >=kde-apps/kdiamond-17.04.3 >=kde-apps/kfourinline-17.04.3 >=kde-apps/kgoldrunner-17.04.3 >=kde-apps/kigo-17.04.3 >=kde-apps/killbots-17.04.3 >=kde-apps/kiriki-17.04.3 >=kde-apps/kjumpingcube-17.04.3 >=kde-apps/klickety-17.04.3 >=kde-apps/klines-17.04.3 >=kde-apps/kmahjongg-17.04.3 >=kde-apps/kmines-17.04.3 >=kde-apps/knavalbattle-17.04.3 >=kde-apps/knetwalk-17.04.3 >=kde-apps/kolf-17.04.3 >=kde-apps/kollision-17.04.3 >=kde-apps/konquest-17.04.3 >=kde-apps/kpat-17.04.3 >=kde-apps/kreversi-17.04.3 >=kde-apps/kshisen-17.04.3 >=kde-apps/ksirk-17.04.3 >=kde-apps/ksnakeduel-17.04.3 >=kde-apps/kspaceduel-17.04.3 >=kde-apps/ksquares-17.04.3 >=kde-apps/ktuberling-17.04.3 >=kde-apps/libkdegames-17.04.3 >=kde-apps/libkmahjongg-17.04.3 >=kde-apps/lskat-17.04.3 >=kde-apps/palapeli-17.04.3 >=kde-apps/picmi-17.04.3 nls? ( >=kde-apps/kde4-l10n-17.04.3 ) opengl? ( >=kde-apps/ksudoku-17.04.3 >=kde-apps/kubrick-17.04.3 ) python? ( >=kde-apps/kajongg-17.04.3 ) !kde-apps/kdegames-meta:4
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	kde5-meta-pkg	fc5b88f735e794095606833579179a56	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=daf6d220ca5ac704bac356e43aa91e7a
diff --git a/metadata/md5-cache/kde-apps/kdegames-meta-17.08.2 b/metadata/md5-cache/kde-apps/kdegames-meta-17.08.2
index 1bf10b57a499..4d5ad42273a3 100644
--- a/metadata/md5-cache/kde-apps/kdegames-meta-17.08.2
+++ b/metadata/md5-cache/kde-apps/kdegames-meta-17.08.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/bomber-17.08.2 >=kde-apps/bovo-17.08.2 >=kde-apps/granatier-17.08.2 >=kde-apps/kapman-17.08.2 >=kde-apps/katomic-17.08.2 >=kde-apps/kblackbox-17.08.2 >=kde-apps/kblocks-17.08.2 >=kde-apps/kbounce-17.08.2 >=kde-apps/kbreakout-17.08.2 >=kde-apps/kdiamond-17.08.2 >=kde-apps/kfourinline-17.08.2 >=kde-apps/kgoldrunner-17.08.2 >=kde-apps/kigo-17.08.2 >=kde-apps/killbots-17.08.2 >=kde-apps/kiriki-17.08.2 >=kde-apps/kjumpingcube-17.08.2 >=kde-apps/klickety-17.08.2 >=kde-apps/klines-17.08.2 >=kde-apps/kmahjongg-17.08.2 >=kde-apps/kmines-17.08.2 >=kde-apps/knavalbattle-17.08.2 >=kde-apps/knetwalk-17.08.2 >=kde-apps/kollision-17.08.2 >=kde-apps/konquest-17.08.2 >=kde-apps/kpat-17.08.2 >=kde-apps/kreversi-17.08.2 >=kde-apps/kshisen-17.08.2 >=kde-apps/ksnakeduel-17.08.2 >=kde-apps/kspaceduel-17.08.2 >=kde-apps/ksquares-17.08.2 >=kde-apps/ktuberling-17.08.2 >=kde-apps/libkdegames-17.08.2 >=kde-apps/libkmahjongg-17.08.2 >=kde-apps/lskat-17.08.2 >=kde-apps/picmi-17.08.2 opengl? ( >=kde-apps/ksudoku-17.08.2 >=kde-apps/kubrick-17.08.2 ) python? ( >=kde-apps/kajongg-17.08.2 ) qt4? ( >=kde-apps/kolf-17.08.2 >=kde-apps/ksirk-17.08.2 >=kde-apps/palapeli-17.08.2 nls? ( >=kde-apps/kde4-l10n-17.08.2 ) ) !kde-apps/kdegames-meta:4
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	kde5-meta-pkg	fc5b88f735e794095606833579179a56	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=cec96fd4f521c79f53804586ced57cd1
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-meta-17.04.3-r1 b/metadata/md5-cache/kde-apps/kdegraphics-meta-17.04.3-r1
index f9e75e3149a7..153d14e68cb9 100644
--- a/metadata/md5-cache/kde-apps/kdegraphics-meta-17.04.3-r1
+++ b/metadata/md5-cache/kde-apps/kdegraphics-meta-17.04.3-r1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/gwenview-17.04.3 >=kde-apps/kamera-17.04.3 >=kde-apps/kcolorchooser-17.04.3 >=kde-apps/kdegraphics-mobipocket-17.04.3 >=kde-apps/kolourpaint-17.04.3 >=kde-apps/kruler-17.04.3 >=kde-apps/libkdcraw-17.04.3 >=kde-apps/libkexiv2-17.04.3 >=kde-apps/libkipi-17.04.3 >=kde-apps/okular-17.04.3 >=kde-apps/spectacle-17.04.3 >=kde-apps/svgpart-17.04.3 >=kde-apps/thumbnailers-17.04.3 scanner? ( >=kde-apps/libksane-17.04.3 ) !kde-apps/kdegraphics-meta:4
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	kde5-meta-pkg	fc5b88f735e794095606833579179a56	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f95ad6a28c29ded1c81c5f1acfeb18e2
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-meta-17.08.2 b/metadata/md5-cache/kde-apps/kdegraphics-meta-17.08.2
index 7931de9a915f..38bae34d8304 100644
--- a/metadata/md5-cache/kde-apps/kdegraphics-meta-17.08.2
+++ b/metadata/md5-cache/kde-apps/kdegraphics-meta-17.08.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/gwenview-17.08.2 >=kde-apps/kamera-17.08.2 >=kde-apps/kcolorchooser-17.08.2 >=kde-apps/kdegraphics-mobipocket-17.08.2 >=kde-apps/kolourpaint-17.08.2 >=kde-apps/kruler-17.08.2 >=kde-apps/libkdcraw-17.08.2 >=kde-apps/libkexiv2-17.08.2 >=kde-apps/libkipi-17.08.2 >=kde-apps/okular-17.08.2 >=kde-apps/spectacle-17.08.2 >=kde-apps/svgpart-17.08.2 >=kde-apps/thumbnailers-17.08.2 scanner? ( >=kde-apps/libksane-17.08.2 ) !kde-apps/kdegraphics-meta:4
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	kde5-meta-pkg	fc5b88f735e794095606833579179a56	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=55dc1ef4433a6a94ad93fd8fcb79489f
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.04.3 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.04.3
index 58c5d23c188c..42f76b137acf 100644
--- a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.04.3
+++ b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 thumbnail? ( >=kde-frameworks/kio-5.37.0:5 ) >=kde-frameworks/kf-env-4 !kde-apps/kdegraphics-mobipocket:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kdegraphics-mobipocket-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0f4d686c9b63365668847d4702bf5d5a
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.08.2 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.08.2
index a40959d045f5..13ba7fb27254 100644
--- a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.08.2
+++ b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 thumbnail? ( >=kde-frameworks/kio-5.37.0:5 ) >=kde-frameworks/kf-env-4 !kde-apps/kdegraphics-mobipocket:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kdegraphics-mobipocket-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=150cb8e8e6beaccba814a86068584d6f
diff --git a/metadata/md5-cache/kde-apps/kdemultimedia-meta-17.04.3 b/metadata/md5-cache/kde-apps/kdemultimedia-meta-17.04.3
index 97f6a51e0e11..be8032ec152d 100644
--- a/metadata/md5-cache/kde-apps/kdemultimedia-meta-17.04.3
+++ b/metadata/md5-cache/kde-apps/kdemultimedia-meta-17.04.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/dragon-17.04.3 >=kde-apps/juk-17.04.3 >=kde-apps/kdenlive-17.04.3 >=kde-apps/kmix-17.04.3 >=kde-apps/kwave-17.04.3 >=kde-apps/libkcddb-17.04.3 cdrom? ( >=kde-apps/audiocd-kio-17.04.3 >=kde-apps/k3b-17.04.3 >=kde-apps/kscd-17.04.3 >=kde-apps/libkcompactdisc-17.04.3 ) ffmpeg? ( >=kde-apps/ffmpegthumbs-17.04.3 ) nls? ( >=kde-apps/kde4-l10n-17.04.3 ) !kde-apps/kdemultimedia-meta:4
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	kde5-meta-pkg	fc5b88f735e794095606833579179a56	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1eb7cc6135afb0a24857d82eb51cdce1
diff --git a/metadata/md5-cache/kde-apps/kdemultimedia-meta-17.08.2 b/metadata/md5-cache/kde-apps/kdemultimedia-meta-17.08.2
index 53ac506c746d..6751e400b6f5 100644
--- a/metadata/md5-cache/kde-apps/kdemultimedia-meta-17.08.2
+++ b/metadata/md5-cache/kde-apps/kdemultimedia-meta-17.08.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/dragon-17.08.2 >=kde-apps/kdenlive-17.08.2 >=kde-apps/kmix-17.08.2 >=kde-apps/kwave-17.08.2 >=kde-apps/libkcddb-17.08.2 cdrom? ( >=kde-apps/audiocd-kio-17.08.2 >=kde-apps/k3b-17.08.2 >=kde-apps/libkcompactdisc-17.08.2 ) ffmpeg? ( >=kde-apps/ffmpegthumbs-17.08.2 ) qt4? ( >=kde-apps/juk-17.08.2 cdrom? ( >=kde-apps/kscd-17.08.2 ) nls? ( >=kde-apps/kde4-l10n-17.08.2 ) ) !kde-apps/kdemultimedia-meta:4
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	kde5-meta-pkg	fc5b88f735e794095606833579179a56	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=eebb2cfa8b1944c0fd4ea9d4d3dab9ea
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.04.3 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.04.3
index 6749b7d9a1a8..2ca37f9170f2 100644
--- a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.04.3
+++ b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kdenetwork-filesharing:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kdenetwork-filesharing-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=650a7b3f923b480db49761634887dfd3
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.08.2 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.08.2
index db4f67adb8fe..a92a1e68125e 100644
--- a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.08.2
+++ b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kdenetwork-filesharing:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kdenetwork-filesharing-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=36e996fe8d326947bbc73e3d1dddb64e
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-meta-17.04.3 b/metadata/md5-cache/kde-apps/kdenetwork-meta-17.04.3
index 8e136b8eb102..a290ab6ecbf3 100644
--- a/metadata/md5-cache/kde-apps/kdenetwork-meta-17.04.3
+++ b/metadata/md5-cache/kde-apps/kdenetwork-meta-17.04.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kdenetwork-filesharing-17.04.3 >=kde-apps/kget-17.04.3 >=kde-apps/krdc-17.04.3 >=kde-apps/krfb-17.04.3 >=kde-apps/plasma-telepathy-meta-17.04.3 >=kde-apps/zeroconf-ioslave-17.04.3 nls? ( >=kde-apps/kde4-l10n-17.04.3 ) ppp? ( >=kde-apps/kppp-17.04.3 ) !kde-apps/kdenetwork-meta:4
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	kde5-meta-pkg	fc5b88f735e794095606833579179a56	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2710d97e5babf0fae3ee420f974cab50
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-meta-17.08.2 b/metadata/md5-cache/kde-apps/kdenetwork-meta-17.08.2
index bff8633d1ec0..1139caf0f33a 100644
--- a/metadata/md5-cache/kde-apps/kdenetwork-meta-17.08.2
+++ b/metadata/md5-cache/kde-apps/kdenetwork-meta-17.08.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kdenetwork-filesharing-17.08.2 >=kde-apps/krdc-17.08.2 >=kde-apps/krfb-17.08.2 >=kde-apps/plasma-telepathy-meta-17.08.2 qt4? ( >=kde-apps/kget-17.08.2 >=kde-apps/zeroconf-ioslave-17.08.2 nls? ( >=kde-apps/kde4-l10n-17.08.2 ) ppp? ( >=kde-apps/kppp-17.08.2 ) ) !kde-apps/kdenetwork-meta:4
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	kde5-meta-pkg	fc5b88f735e794095606833579179a56	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4385787211426ae099be66cc5ce1ee5c
diff --git a/metadata/md5-cache/kde-apps/kdenlive-17.04.3 b/metadata/md5-cache/kde-apps/kdenlive-17.04.3
index 8b5198f9c6e7..7b855c89b35a 100644
--- a/metadata/md5-cache/kde-apps/kdenlive-17.04.3
+++ b/metadata/md5-cache/kde-apps/kdenlive-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kbookmarks-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/solid-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[gles2=] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=media-libs/mlt-6.4.0[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl freesound? ( >=dev-qt/qtwebkit-5.7.1:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.37.0:5 ) v4l? ( media-libs/libv4l ) >=kde-frameworks/kf-env-4 !kde-apps/kdenlive:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kdenlive-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5973df8547d796b71b3c3d1b005175e9
diff --git a/metadata/md5-cache/kde-apps/kdenlive-17.08.2 b/metadata/md5-cache/kde-apps/kdenlive-17.08.2
index eaee9858d070..ddcb184b36f7 100644
--- a/metadata/md5-cache/kde-apps/kdenlive-17.08.2
+++ b/metadata/md5-cache/kde-apps/kdenlive-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kbookmarks-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/solid-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[gles2=] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=media-libs/mlt-6.4.0[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl freesound? ( >=dev-qt/qtwebkit-5.7.1:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.37.0:5 ) v4l? ( media-libs/libv4l ) >=kde-frameworks/kf-env-4 !kde-apps/kdenlive:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kdenlive-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=260e956f638e78516f22ad1088b357e7
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-17.04.3 b/metadata/md5-cache/kde-apps/kdepim-addons-17.04.3
index 24581a8dbf14..a6e0269e81a6 100644
--- a/metadata/md5-cache/kde-apps/kdepim-addons-17.04.3
+++ b/metadata/md5-cache/kde-apps/kdepim-addons-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kdepim-addons-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=92470af3b583fa8181bec3dc9b7204b5
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-17.08.2 b/metadata/md5-cache/kde-apps/kdepim-addons-17.08.2
index 68ff9075cea5..370c87f54d02 100644
--- a/metadata/md5-cache/kde-apps/kdepim-addons-17.08.2
+++ b/metadata/md5-cache/kde-apps/kdepim-addons-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kdepim-addons-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=86dc63f55a5b8c4786553ac64394827d
diff --git a/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.04.3 b/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.04.3
index 43c685a727ed..47680efecfa6 100644
--- a/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.04.3
+++ b/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-apps/akonadi-17.04.3:5 >=kde-apps/akonadi-contacts-17.04.3:5 >=kde-apps/grantleetheme-17.04.3:5 >=kde-apps/kcontacts-17.04.3:5 >=kde-apps/libkleo-17.04.3:5 >=kde-apps/pimcommon-17.04.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-libs/grantlee-5.1.0:5 prison? ( >=kde-frameworks/prison-5.37.0:5 ) !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kdepim-apps-libs:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kdepim-apps-libs-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=90b0a039d1e0f410cd99b261584b6623
diff --git a/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.08.2 b/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.08.2
index c10e55c64714..95868212e836 100644
--- a/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.08.2
+++ b/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/prison-5.37.0:5 >=kde-apps/akonadi-17.08.2:5 >=kde-apps/akonadi-contacts-17.08.2:5 >=kde-apps/grantleetheme-17.08.2:5 >=kde-apps/kcontacts-17.08.2:5 >=kde-apps/libkleo-17.08.2:5 >=kde-apps/pimcommon-17.08.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-libs/grantlee-5.1.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kdepim-apps-libs:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kdepim-apps-libs-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=003367934cb8bca31d367691838f499c
diff --git a/metadata/md5-cache/kde-apps/kdepim-kresources-4.4.2017.04 b/metadata/md5-cache/kde-apps/kdepim-kresources-4.4.2017.04
index 9854b90d77ec..469f456d35f2 100644
--- a/metadata/md5-cache/kde-apps/kdepim-kresources-4.4.2017.04
+++ b/metadata/md5-cache/kde-apps/kdepim-kresources-4.4.2017.04
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kaddressbook-4.4.2017.04:4 >=kde-apps/kdepimlibs-4.4.2017.04:4 >=kde-apps/libkdepim-4.4.2017.04:4 kde-frameworks/oxygen-icons >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2017.04.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3bcbb38697ae8a7dd556a0f332a28de6
diff --git a/metadata/md5-cache/kde-apps/kdepim-l10n-4.4.11.1-r2 b/metadata/md5-cache/kde-apps/kdepim-l10n-4.4.11.1-r2
index 2f7e2bd44768..4a07b460a5e6 100644
--- a/metadata/md5-cache/kde-apps/kdepim-l10n-4.4.11.1-r2
+++ b/metadata/md5-cache/kde-apps/kdepim-l10n-4.4.11.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<kde-apps/kde-l10n-15.08.0-r1 !<kde-apps/kde4-l10n-4.14.3-r1 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/4.4
 SRC_URI=l10n_ar? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-ar-4.4.5.tar.bz2 ) l10n_bg? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-bg-4.4.5.tar.bz2 ) l10n_ca? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-ca-4.4.5.tar.bz2 ) l10n_ca-valencia? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-ca@valencia-4.4.5.tar.bz2 ) l10n_cs? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-cs-4.4.5.tar.bz2 ) l10n_csb? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-csb-4.4.5.tar.bz2 ) l10n_da? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-da-4.4.5.tar.bz2 ) l10n_de? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-de-4.4.5.tar.bz2 ) l10n_el? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-el-4.4.5.tar.bz2 ) l10n_en-GB? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-en_GB-4.4.5.tar.bz2 ) l10n_eo? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-eo-4.4.5.tar.bz2 ) l10n_es? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-es-4.4.5.tar.bz2 ) l10n_et? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-et-4.4.5.tar.bz2 ) l10n_eu? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-eu-4.4.5.tar.bz2 ) l10n_fi? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-fi-4.4.5.tar.bz2 ) l10n_fr? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-fr-4.4.5.tar.bz2 ) l10n_fy? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-fy-4.4.5.tar.bz2 ) l10n_ga? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-ga-4.4.5.tar.bz2 ) l10n_gl? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-gl-4.4.5.tar.bz2 ) l10n_gu? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-gu-4.4.5.tar.bz2 ) l10n_he? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-he-4.4.5.tar.bz2 ) l10n_hi? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-hi-4.4.5.tar.bz2 ) l10n_hr? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-hr-4.4.5.tar.bz2 ) l10n_hu? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-hu-4.4.5.tar.bz2 ) l10n_id? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-id-4.4.5.tar.bz2 ) l10n_is? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-is-4.4.5.tar.bz2 ) l10n_it? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-it-4.4.5.tar.bz2 ) l10n_ja? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-ja-4.4.5.tar.bz2 ) l10n_kk? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-kk-4.4.5.tar.bz2 ) l10n_km? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-km-4.4.5.tar.bz2 ) l10n_kn? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-kn-4.4.5.tar.bz2 ) l10n_ko? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-ko-4.4.5.tar.bz2 ) l10n_lt? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-lt-4.4.5.tar.bz2 ) l10n_lv? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-lv-4.4.5.tar.bz2 ) l10n_mai? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-mai-4.4.5.tar.bz2 ) l10n_mk? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-mk-4.4.5.tar.bz2 ) l10n_ml? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-ml-4.4.5.tar.bz2 ) l10n_nb? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-nb-4.4.5.tar.bz2 ) l10n_nds? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-nds-4.4.5.tar.bz2 ) l10n_nl? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-nl-4.4.5.tar.bz2 ) l10n_nn? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-nn-4.4.5.tar.bz2 ) l10n_pa? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-pa-4.4.5.tar.bz2 ) l10n_pl? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-pl-4.4.5.tar.bz2 ) l10n_pt? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-pt-4.4.5.tar.bz2 ) l10n_pt-BR? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-pt_BR-4.4.5.tar.bz2 ) l10n_ro? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-ro-4.4.5.tar.bz2 ) l10n_ru? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-ru-4.4.5.tar.bz2 ) l10n_si? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-si-4.4.5.tar.bz2 ) l10n_sk? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-sk-4.4.5.tar.bz2 ) l10n_sl? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-sl-4.4.5.tar.bz2 ) l10n_sr? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-sr-4.4.5.tar.bz2 ) l10n_sv? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-sv-4.4.5.tar.bz2 ) l10n_tg? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-tg-4.4.5.tar.bz2 ) l10n_tr? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-tr-4.4.5.tar.bz2 ) l10n_uk? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-uk-4.4.5.tar.bz2 ) l10n_wa? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-wa-4.4.5.tar.bz2 ) l10n_zh-CN? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-zh_CN-4.4.5.tar.bz2 ) l10n_zh-TW? ( mirror://kde/Attic/4.4.5/src/kde-l10n/kde-l10n-zh_TW-4.4.5.tar.bz2 )
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2b0ee28c78db6f319b7b2713070c4d20
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-17.04.3 b/metadata/md5-cache/kde-apps/kdepim-meta-17.04.3
index 6c8fcfb25ef7..52d28c7dbfe0 100644
--- a/metadata/md5-cache/kde-apps/kdepim-meta-17.04.3
+++ b/metadata/md5-cache/kde-apps/kdepim-meta-17.04.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/akonadi-17.04.3 >=kde-apps/akonadiconsole-17.04.3 >=kde-apps/akonadi-calendar-17.04.3 >=kde-apps/akonadi-contacts-17.04.3 >=kde-apps/akonadi-import-wizard-17.04.3 >=kde-apps/akonadi-mime-17.04.3 >=kde-apps/akonadi-notes-17.04.3 >=kde-apps/akonadi-search-17.04.3 >=kde-apps/akregator-17.04.3 >=kde-apps/blogilo-17.04.3 >=kde-apps/calendarjanitor-17.04.3 >=kde-apps/calendarsupport-17.04.3 >=kde-apps/eventviews-17.04.3 >=kde-apps/grantlee-editor-17.04.3 >=kde-apps/grantleetheme-17.04.3 >=kde-apps/incidenceeditor-17.04.3 >=kde-apps/kaddressbook-17.04.3 >=kde-apps/kalarm-17.04.3 >=kde-apps/kalarmcal-17.04.3 >=kde-apps/kblog-17.04.3 >=kde-apps/kcalcore-17.04.3 >=kde-apps/kcalutils-17.04.3 >=kde-apps/kcontacts-17.04.3 >=kde-apps/kdepim-addons-17.04.3 >=kde-apps/kdepim-apps-libs-17.04.3 >=kde-apps/kdepim-runtime-17.04.3 >=kde-apps/kholidays-17.04.3 >=kde-apps/kidentitymanagement-17.04.3 >=kde-apps/kimap-17.04.3 >=kde-apps/kldap-17.04.3 >=kde-apps/kleopatra-17.04.3 >=kde-apps/kmail-17.04.3 >=kde-apps/kmail-account-wizard-17.04.3 >=kde-apps/kmailtransport-17.04.3 >=kde-apps/kmbox-17.04.3 >=kde-apps/kmime-17.04.3 >=kde-apps/knotes-17.04.3 >=kde-apps/konsolekalendar-17.04.3 >=kde-apps/kontact-17.04.3 >=kde-apps/kontactinterface-17.04.3 >=kde-apps/korganizer-17.04.3 >=kde-apps/kpimtextedit-17.04.3 >=kde-apps/libgravatar-17.04.3 >=kde-apps/libkdepim-17.04.3 >=kde-apps/libkleo-17.04.3 >=kde-apps/libksieve-17.04.3 >=kde-apps/libktnef-17.04.3 >=kde-apps/mailcommon-17.04.3 >=kde-apps/mailimporter-17.04.3 >=kde-apps/mbox-importer-17.04.3 >=kde-apps/messagelib-17.04.3 >=kde-apps/pim-data-exporter-17.04.3 >=kde-apps/pim-sieve-editor-17.04.3 >=kde-apps/pimcommon-17.04.3 >=kde-apps/syndication-17.04.3 google? ( >=kde-apps/libkgapi-17.04.3 ) !kde-apps/kdepim-meta:4
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	kde5-meta-pkg	fc5b88f735e794095606833579179a56	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f942f387181474f14567733d1b0d11d3
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-17.08.2 b/metadata/md5-cache/kde-apps/kdepim-meta-17.08.2
index 35184553b395..9bea404f7478 100644
--- a/metadata/md5-cache/kde-apps/kdepim-meta-17.08.2
+++ b/metadata/md5-cache/kde-apps/kdepim-meta-17.08.2
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/akonadi-17.08.2 >=kde-apps/akonadiconsole-17.08.2 >=kde-apps/akonadi-calendar-17.08.2 >=kde-apps/akonadi-contacts-17.08.2 >=kde-apps/akonadi-import-wizard-17.08.2 >=kde-apps/akonadi-mime-17.08.2 >=kde-apps/akonadi-notes-17.08.2 >=kde-apps/akonadi-search-17.08.2 >=kde-apps/akregator-17.08.2 >=kde-apps/blogilo-17.08.2 >=kde-apps/calendarjanitor-17.08.2 >=kde-apps/calendarsupport-17.08.2 >=kde-apps/eventviews-17.08.2 >=kde-apps/grantlee-editor-17.08.2 >=kde-apps/grantleetheme-17.08.2 >=kde-apps/incidenceeditor-17.08.2 >=kde-apps/kaddressbook-17.08.2 >=kde-apps/kalarm-17.08.2 >=kde-apps/kalarmcal-17.08.2 >=kde-apps/kblog-17.08.2 >=kde-apps/kcalcore-17.08.2 >=kde-apps/kcalutils-17.08.2 >=kde-apps/kcontacts-17.08.2 >=kde-apps/kdepim-addons-17.08.2 >=kde-apps/kdepim-apps-libs-17.08.2 >=kde-apps/kdepim-runtime-17.08.2 >=kde-apps/kholidays-17.08.2 >=kde-apps/kidentitymanagement-17.08.2 >=kde-apps/kimap-17.08.2 >=kde-apps/kldap-17.08.2 >=kde-apps/kleopatra-17.08.2 >=kde-apps/kmail-17.08.2 >=kde-apps/kmail-account-wizard-17.08.2 >=kde-apps/kmailtransport-17.08.2 >=kde-apps/kmbox-17.08.2 >=kde-apps/kmime-17.08.2 >=kde-apps/knotes-17.08.2 >=kde-apps/konsolekalendar-17.08.2 >=kde-apps/kontact-17.08.2 >=kde-apps/kontactinterface-17.08.2 >=kde-apps/korganizer-17.08.2 >=kde-apps/kpimtextedit-17.08.2 >=kde-apps/libgravatar-17.08.2 >=kde-apps/libkdepim-17.08.2 >=kde-apps/libkgapi-17.08.2 >=kde-apps/libkleo-17.08.2 >=kde-apps/libksieve-17.08.2 >=kde-apps/libktnef-17.08.2 >=kde-apps/mailcommon-17.08.2 >=kde-apps/mailimporter-17.08.2 >=kde-apps/mbox-importer-17.08.2 >=kde-apps/messagelib-17.08.2 >=kde-apps/pim-data-exporter-17.08.2 >=kde-apps/pim-sieve-editor-17.08.2 >=kde-apps/pimcommon-17.08.2 >=kde-apps/syndication-17.08.2 !kde-apps/kdepim-meta:4
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	kde5-meta-pkg	fc5b88f735e794095606833579179a56	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b99a8acc813fd76f9a438fcbb90bb99d
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-17.04.3 b/metadata/md5-cache/kde-apps/kdepim-runtime-17.04.3
index ed54d5b015ee..f6e3f3ca95ea 100644
--- a/metadata/md5-cache/kde-apps/kdepim-runtime-17.04.3
+++ b/metadata/md5-cache/kde-apps/kdepim-runtime-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kdepim-runtime-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=60a9e7579a0edca0abef04ab2a403e46
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-17.08.2-r1 b/metadata/md5-cache/kde-apps/kdepim-runtime-17.08.2-r1
index 430407820431..a42b49d0deb5 100644
--- a/metadata/md5-cache/kde-apps/kdepim-runtime-17.08.2-r1
+++ b/metadata/md5-cache/kde-apps/kdepim-runtime-17.08.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kdepim-runtime-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5fdfe88863a0f9303bd4f9da31a7b173
diff --git a/metadata/md5-cache/kde-apps/kdepim-wizards-4.4.2017.04 b/metadata/md5-cache/kde-apps/kdepim-wizards-4.4.2017.04
index add07e5bef6b..d7a86fae37b6 100644
--- a/metadata/md5-cache/kde-apps/kdepim-wizards-4.4.2017.04
+++ b/metadata/md5-cache/kde-apps/kdepim-wizards-4.4.2017.04
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepim-kresources-4.4.2017.04:4 >=kde-apps/kdepimlibs-4.14.10_p20160611:4 >=kde-apps/libkdepim-4.4.2017.04:4 !>kde-apps/kdepimlibs-4.14.11_pre20160211 kde-frameworks/oxygen-icons >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2017.04.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9ca82cc19c66be004731b62d9a614006
diff --git a/metadata/md5-cache/kde-apps/kdepimlibs-4.14.10_p20160611 b/metadata/md5-cache/kde-apps/kdepimlibs-4.14.10_p20160611
index b50f6896c720..a88aee64c012 100644
--- a/metadata/md5-cache/kde-apps/kdepimlibs-4.14.10_p20160611
+++ b/metadata/md5-cache/kde-apps/kdepimlibs-4.14.10_p20160611
@@ -10,5 +10,5 @@ RDEPEND=>=app-crypt/gpgme-1.8.0 dev-libs/boost:= dev-libs/cyrus-sasl dev-libs/li
 RESTRICT=test
 SLOT=4/4.14
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/kdepimlibs-4.14.11_pre20160611.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=30c15df2a87401f6f9e9c16e47e2680f
diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.04.3 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.04.3
index fa5fc8a65232..96e7a0c17ec1 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.04.3
+++ b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 dev-lang/perl !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 !kde-apps/kdesdk-kioslaves:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kdesdk-kioslaves-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b92ab396ba1b0083fc066d165a5670b4
diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.08.2 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.08.2
index c283c0161767..92ca521fd732 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.08.2
+++ b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 dev-lang/perl !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 !kde-apps/kdesdk-kioslaves:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kdesdk-kioslaves-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6e01e030d33d63b51b9a7bd733692e35
diff --git a/metadata/md5-cache/kde-apps/kdesdk-meta-17.04.3 b/metadata/md5-cache/kde-apps/kdesdk-meta-17.04.3
index 948e146cc394..80ccb151b241 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-meta-17.04.3
+++ b/metadata/md5-cache/kde-apps/kdesdk-meta-17.04.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/dolphin-plugins-17.04.3 >=kde-apps/kapptemplate-17.04.3 >=kde-apps/kcachegrind-17.04.3 >=kde-apps/kde-dev-scripts-17.04.3 >=kde-apps/kde-dev-utils-17.04.3 >=kde-apps/kdesdk-kioslaves-17.04.3 >=kde-apps/kdesdk-thumbnailers-17.04.3 >=kde-apps/kompare-17.04.3 >=kde-apps/kross-interpreters-17.04.3 >=kde-apps/libkomparediff2-17.04.3 >=kde-apps/lokalize-17.04.3 >=kde-apps/okteta-17.04.3 >=kde-apps/poxml-17.04.3 >=kde-apps/umbrello-17.04.3 cvs? ( >=kde-apps/cervisia-17.04.3 ) !kde-apps/kdesdk-meta:4
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	kde5-meta-pkg	fc5b88f735e794095606833579179a56	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9b8578a475dea9b8e114058862e678cb
diff --git a/metadata/md5-cache/kde-apps/kdesdk-meta-17.08.2 b/metadata/md5-cache/kde-apps/kdesdk-meta-17.08.2
index 6995086b8ac5..bef816dc1115 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-meta-17.08.2
+++ b/metadata/md5-cache/kde-apps/kdesdk-meta-17.08.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/dolphin-plugins-17.08.2 >=kde-apps/kapptemplate-17.08.2 >=kde-apps/kcachegrind-17.08.2 >=kde-apps/kde-dev-scripts-17.08.2 >=kde-apps/kde-dev-utils-17.08.2 >=kde-apps/kdesdk-kioslaves-17.08.2 >=kde-apps/kdesdk-thumbnailers-17.08.2 >=kde-apps/kompare-17.08.2 >=kde-apps/kross-interpreters-17.08.2 >=kde-apps/libkomparediff2-17.08.2 >=kde-apps/lokalize-17.08.2 >=kde-apps/okteta-17.08.2 >=kde-apps/poxml-17.08.2 >=kde-apps/umbrello-17.08.2 cvs? ( >=kde-apps/cervisia-17.08.2 ) !kde-apps/kdesdk-meta:4
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	kde5-meta-pkg	fc5b88f735e794095606833579179a56	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=114605720174a6fa936e89c618473325
diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.04.3 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.04.3
index 80107017372a..75dfda2b0eb6 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.04.3
+++ b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/gettext >=kde-frameworks/kf-env-4 !kde-apps/kdesdk-thumbnailers:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kdesdk-thumbnailers-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=68f668f50f9f212566a7fb736bb32944
diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.08.2 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.08.2
index ab28998d2490..2fe146c80f22 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.08.2
+++ b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/gettext >=kde-frameworks/kf-env-4 !kde-apps/kdesdk-thumbnailers:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kdesdk-thumbnailers-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=37e7992cc1faa181cedb1ceb1c36cee9
diff --git a/metadata/md5-cache/kde-apps/kdeutils-meta-17.04.3 b/metadata/md5-cache/kde-apps/kdeutils-meta-17.04.3
index e97a581f2cdf..e9bfd6bee009 100644
--- a/metadata/md5-cache/kde-apps/kdeutils-meta-17.04.3
+++ b/metadata/md5-cache/kde-apps/kdeutils-meta-17.04.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/ark-17.04.3 >=kde-apps/filelight-17.04.3 >=kde-apps/kcalc-17.04.3 >=kde-apps/kcharselect-17.04.3 >=kde-apps/kdebugsettings-17.04.3 >=kde-apps/kdf-17.04.3 >=kde-apps/kgpg-17.04.3 >=kde-apps/kteatime-17.04.3 >=kde-apps/ktimer-17.04.3 >=kde-apps/kwalletmanager-17.04.3 >=kde-apps/sweeper-17.04.3 cups? ( >=kde-apps/print-manager-17.04.3 ) floppy? ( >=kde-apps/kfloppy-17.04.3 ) lirc? ( >=kde-apps/kremotecontrol-17.04.3 ) nls? ( >=kde-apps/kde4-l10n-17.04.3 ) !kde-apps/kdeutils-meta:4
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	kde5-meta-pkg	fc5b88f735e794095606833579179a56	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1d93e55b1b56e87be939e57d5757d12b
diff --git a/metadata/md5-cache/kde-apps/kdeutils-meta-17.08.2 b/metadata/md5-cache/kde-apps/kdeutils-meta-17.08.2
index fce87ca1a067..2c48c9a56045 100644
--- a/metadata/md5-cache/kde-apps/kdeutils-meta-17.08.2
+++ b/metadata/md5-cache/kde-apps/kdeutils-meta-17.08.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/ark-17.08.2 >=kde-apps/filelight-17.08.2 >=kde-apps/kcalc-17.08.2 >=kde-apps/kcharselect-17.08.2 >=kde-apps/kdebugsettings-17.08.2 >=kde-apps/kdf-17.08.2 >=kde-apps/kgpg-17.08.2 >=kde-apps/kteatime-17.08.2 >=kde-apps/ktimer-17.08.2 >=kde-apps/kwalletmanager-17.08.2 cups? ( >=kde-apps/print-manager-17.08.2 ) floppy? ( >=kde-apps/kfloppy-17.08.2 ) qt4? ( >=kde-apps/sweeper-17.08.2 lirc? ( >=kde-apps/kremotecontrol-17.08.2 ) nls? ( >=kde-apps/kde4-l10n-17.08.2 ) ) !kde-apps/kdeutils-meta:4
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	kde5-meta-pkg	fc5b88f735e794095606833579179a56	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7778fd33d062b87bc34043d72e7eb5a8
diff --git a/metadata/md5-cache/kde-apps/kdewebdev-meta-17.04.3 b/metadata/md5-cache/kde-apps/kdewebdev-meta-17.04.3
index 718985e5b8ba..eae4b1e92b35 100644
--- a/metadata/md5-cache/kde-apps/kdewebdev-meta-17.04.3
+++ b/metadata/md5-cache/kde-apps/kdewebdev-meta-17.04.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kfilereplace-17.04.3 >=kde-apps/kimagemapeditor-17.04.3 nls? ( >=kde-apps/kde4-l10n-17.04.3 ) !kde-apps/kdewebdev-meta:4
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	kde5-meta-pkg	fc5b88f735e794095606833579179a56	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=fce32e298e832f65a25c3b9ea29b027b
diff --git a/metadata/md5-cache/kde-apps/kdewebdev-meta-17.08.2 b/metadata/md5-cache/kde-apps/kdewebdev-meta-17.08.2
index 43f7e027b3ce..d306a7cfc754 100644
--- a/metadata/md5-cache/kde-apps/kdewebdev-meta-17.08.2
+++ b/metadata/md5-cache/kde-apps/kdewebdev-meta-17.08.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kfilereplace-17.08.2 >=kde-apps/kimagemapeditor-17.08.2 nls? ( >=kde-apps/kde4-l10n-17.08.2 ) !kde-apps/kdewebdev-meta:4
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	kde5-meta-pkg	fc5b88f735e794095606833579179a56	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8da2c5b5992264163fa072e9a02f7901
diff --git a/metadata/md5-cache/kde-apps/kdf-17.04.3 b/metadata/md5-cache/kde-apps/kdf-17.04.3
index a371625761f4..c77aebc6d609 100644
--- a/metadata/md5-cache/kde-apps/kdf-17.04.3
+++ b/metadata/md5-cache/kde-apps/kdf-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kdf:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kdf-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=193a8e4729984f4462fdc005cfb35649
diff --git a/metadata/md5-cache/kde-apps/kdf-17.08.2 b/metadata/md5-cache/kde-apps/kdf-17.08.2
index 1236948cbd29..05c983ec2316 100644
--- a/metadata/md5-cache/kde-apps/kdf-17.08.2
+++ b/metadata/md5-cache/kde-apps/kdf-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kdf:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kdf-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=46385897e6f84477df1a2f9f908f87b8
diff --git a/metadata/md5-cache/kde-apps/kdialog-17.04.3 b/metadata/md5-cache/kde-apps/kdialog-17.04.3
index 412cbecab433..5356d335d874 100644
--- a/metadata/md5-cache/kde-apps/kdialog-17.04.3
+++ b/metadata/md5-cache/kde-apps/kdialog-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 !kde-apps/kdialog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kdialog-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=212bada3c8169e6208edac7f909759db
diff --git a/metadata/md5-cache/kde-apps/kdialog-17.08.2 b/metadata/md5-cache/kde-apps/kdialog-17.08.2
index 4697b662d439..ce52cb1c41a1 100644
--- a/metadata/md5-cache/kde-apps/kdialog-17.08.2
+++ b/metadata/md5-cache/kde-apps/kdialog-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 !kde-apps/kdialog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kdialog-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0224afa13f5df1c3f337782dea0f45fc
diff --git a/metadata/md5-cache/kde-apps/kdiamond-17.04.3 b/metadata/md5-cache/kde-apps/kdiamond-17.04.3
index 65f39253a53d..179b6922353f 100644
--- a/metadata/md5-cache/kde-apps/kdiamond-17.04.3
+++ b/metadata/md5-cache/kde-apps/kdiamond-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kdiamond:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kdiamond-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7ebf7214e00b9089029ff0c91787bde7
diff --git a/metadata/md5-cache/kde-apps/kdiamond-17.08.2 b/metadata/md5-cache/kde-apps/kdiamond-17.08.2
index b2aa3def40d3..b859035fd920 100644
--- a/metadata/md5-cache/kde-apps/kdiamond-17.08.2
+++ b/metadata/md5-cache/kde-apps/kdiamond-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kdiamond:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kdiamond-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e5d1fd8f0cd7e9b12634be727f603355
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-17.04.3 b/metadata/md5-cache/kde-apps/keditbookmarks-17.04.3
index 99d79d1dfe7a..50ea5d8e5449 100644
--- a/metadata/md5-cache/kde-apps/keditbookmarks-17.04.3
+++ b/metadata/md5-cache/kde-apps/keditbookmarks-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !<=kde-apps/konqueror-16.08.3:4 >=kde-frameworks/kf-env-4 !kde-apps/keditbookmarks:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/keditbookmarks-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b1166fd780677eb27d7e9f512706f617
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-17.08.2 b/metadata/md5-cache/kde-apps/keditbookmarks-17.08.2
index da0f77731061..1846ed7172a7 100644
--- a/metadata/md5-cache/kde-apps/keditbookmarks-17.08.2
+++ b/metadata/md5-cache/kde-apps/keditbookmarks-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !<=kde-apps/konqueror-16.08.3:4 >=kde-frameworks/kf-env-4 !kde-apps/keditbookmarks:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/keditbookmarks-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9e27d75f10ec45d14d9ebb28c08e68a7
diff --git a/metadata/md5-cache/kde-apps/kfilereplace-17.04.3 b/metadata/md5-cache/kde-apps/kfilereplace-17.04.3
index ba8a4e668ae4..5142205f8d61 100644
--- a/metadata/md5-cache/kde-apps/kfilereplace-17.04.3
+++ b/metadata/md5-cache/kde-apps/kfilereplace-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
 SLOT=4/17.04
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kfilereplace-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=dfe59fa7ea469f5ec2a8204972c8fcf4
diff --git a/metadata/md5-cache/kde-apps/kfilereplace-17.08.2 b/metadata/md5-cache/kde-apps/kfilereplace-17.08.2
index 3a735e40e872..c5384e8c893d 100644
--- a/metadata/md5-cache/kde-apps/kfilereplace-17.08.2
+++ b/metadata/md5-cache/kde-apps/kfilereplace-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
 SLOT=4/17.08
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kfilereplace-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c12027b43d516681db9d577a9abd8763
diff --git a/metadata/md5-cache/kde-apps/kfind-17.04.3 b/metadata/md5-cache/kde-apps/kfind-17.04.3
index d3281c0f53b0..d03ec5e11dc3 100644
--- a/metadata/md5-cache/kde-apps/kfind-17.04.3
+++ b/metadata/md5-cache/kde-apps/kfind-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kfind:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kfind-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=dcfd61e3918acb31d87e5413c6d9ee48
diff --git a/metadata/md5-cache/kde-apps/kfind-17.08.2 b/metadata/md5-cache/kde-apps/kfind-17.08.2
index e9533751d1fd..99b54ebed2ad 100644
--- a/metadata/md5-cache/kde-apps/kfind-17.08.2
+++ b/metadata/md5-cache/kde-apps/kfind-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kfind:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kfind-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d56bffbc361579838e7abc10a3a7b2dc
diff --git a/metadata/md5-cache/kde-apps/kfloppy-17.04.3 b/metadata/md5-cache/kde-apps/kfloppy-17.04.3
index e7d38316832a..748436b583c8 100644
--- a/metadata/md5-cache/kde-apps/kfloppy-17.04.3
+++ b/metadata/md5-cache/kde-apps/kfloppy-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kfloppy:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kfloppy-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d235b065913ced8a56c4e23dbf999c8b
diff --git a/metadata/md5-cache/kde-apps/kfloppy-17.08.2 b/metadata/md5-cache/kde-apps/kfloppy-17.08.2
index 7d60a1f6d26d..9350e0d571bd 100644
--- a/metadata/md5-cache/kde-apps/kfloppy-17.08.2
+++ b/metadata/md5-cache/kde-apps/kfloppy-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kfloppy:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kfloppy-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6bd5424d699a023094178058e55ab6a2
diff --git a/metadata/md5-cache/kde-apps/kfourinline-17.04.3 b/metadata/md5-cache/kde-apps/kfourinline-17.04.3
index 1db0950f8b81..05690d5dc9ec 100644
--- a/metadata/md5-cache/kde-apps/kfourinline-17.04.3
+++ b/metadata/md5-cache/kde-apps/kfourinline-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/kdnssd-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kfourinline:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kfourinline-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=29f0bb47e258afc3fc3c8922a2a22861
diff --git a/metadata/md5-cache/kde-apps/kfourinline-17.08.2 b/metadata/md5-cache/kde-apps/kfourinline-17.08.2
index 1a6beb814652..a6080b4c716d 100644
--- a/metadata/md5-cache/kde-apps/kfourinline-17.08.2
+++ b/metadata/md5-cache/kde-apps/kfourinline-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdnssd-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kfourinline:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kfourinline-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fa2e5e7abaf6427c3a719f745b1066e8
diff --git a/metadata/md5-cache/kde-apps/kgeography-17.04.3 b/metadata/md5-cache/kde-apps/kgeography-17.04.3
index 5f0f216380c7..f05e1ca28356 100644
--- a/metadata/md5-cache/kde-apps/kgeography-17.04.3
+++ b/metadata/md5-cache/kde-apps/kgeography-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kgeography:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kgeography-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7942f129ed89d2f6915311c51cc370da
diff --git a/metadata/md5-cache/kde-apps/kgeography-17.08.2 b/metadata/md5-cache/kde-apps/kgeography-17.08.2
index 0a8b5f58a5b1..ec4d6e9980b3 100644
--- a/metadata/md5-cache/kde-apps/kgeography-17.08.2
+++ b/metadata/md5-cache/kde-apps/kgeography-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kgeography:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kgeography-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=71b1df7e58789d824cbe47b4ce6ba931
diff --git a/metadata/md5-cache/kde-apps/kget-17.04.3-r1 b/metadata/md5-cache/kde-apps/kget-17.04.3-r1
index e7825afacdc3..a96b89085fed 100644
--- a/metadata/md5-cache/kde-apps/kget-17.04.3-r1
+++ b/metadata/md5-cache/kde-apps/kget-17.04.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/qca:2[qt4] kde-frameworks/kdelibs:4[plasma(+)] mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.04
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kget-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7dfc43d4477537fb67bfb5d27ce17a13
diff --git a/metadata/md5-cache/kde-apps/kget-17.08.2 b/metadata/md5-cache/kde-apps/kget-17.08.2
index aa7239ea55c8..911077256037 100644
--- a/metadata/md5-cache/kde-apps/kget-17.08.2
+++ b/metadata/md5-cache/kde-apps/kget-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/qca:2[qt4] kde-frameworks/kdelibs:4[plasma(+)] mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.08
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kget-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5e0804882417ce1f2442d499f2232814
diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-17.04.3 b/metadata/md5-cache/kde-apps/kgoldrunner-17.04.3
index 1dc456e9632d..aa50af34ab3b 100644
--- a/metadata/md5-cache/kde-apps/kgoldrunner-17.04.3
+++ b/metadata/md5-cache/kde-apps/kgoldrunner-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4 media-libs/libsndfile media-libs/openal kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) selinux? ( sec-policy/selinux-games ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.04
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kgoldrunner-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=62227d02e9a17ef79269ec0e22aa01f3
diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-17.08.2 b/metadata/md5-cache/kde-apps/kgoldrunner-17.08.2
index 6872818315c8..e808baf9dd9f 100644
--- a/metadata/md5-cache/kde-apps/kgoldrunner-17.08.2
+++ b/metadata/md5-cache/kde-apps/kgoldrunner-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/libsndfile media-libs/openal !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 !kde-apps/kgoldrunner:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kgoldrunner-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8389f7db96f24679ce45787c7c3cf8e6
diff --git a/metadata/md5-cache/kde-apps/kgpg-17.04.3 b/metadata/md5-cache/kde-apps/kgpg-17.04.3
index 41813830970f..19de1eace861 100644
--- a/metadata/md5-cache/kde-apps/kgpg-17.04.3
+++ b/metadata/md5-cache/kde-apps/kgpg-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-17.04.3:5 >=kde-apps/akonadi-contacts-17.04.3:5 >=kde-apps/kcontacts-17.04.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 app-crypt/gnupg >=kde-frameworks/kf-env-4 !kde-apps/kgpg:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-gpg ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kgpg-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bea67fc847f2d1b7c2bdcf40566d76c0
diff --git a/metadata/md5-cache/kde-apps/kgpg-17.08.2 b/metadata/md5-cache/kde-apps/kgpg-17.08.2
index 27a3cec427e1..4c81e5ad35f0 100644
--- a/metadata/md5-cache/kde-apps/kgpg-17.08.2
+++ b/metadata/md5-cache/kde-apps/kgpg-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-17.08.2:5 >=kde-apps/akonadi-contacts-17.08.2:5 >=kde-apps/kcontacts-17.08.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 app-crypt/gnupg >=kde-frameworks/kf-env-4 !kde-apps/kgpg:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-gpg ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kgpg-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ed220bc2853668b18576bdb4a0acd0ec
diff --git a/metadata/md5-cache/kde-apps/khangman-17.04.3 b/metadata/md5-cache/kde-apps/khangman-17.04.3
index 755f2ee7278d..80b84285a41c 100644
--- a/metadata/md5-cache/kde-apps/khangman-17.04.3
+++ b/metadata/md5-cache/kde-apps/khangman-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkeduvocdocument-17.04.3:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] >=kde-apps/kdeedu-data-17.04.3:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtmultimedia-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/khangman:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/khangman-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b347dd28986938a4e584960f49966b8f
diff --git a/metadata/md5-cache/kde-apps/khangman-17.08.2 b/metadata/md5-cache/kde-apps/khangman-17.08.2
index 50b137e9d9bb..98cafff9a7d3 100644
--- a/metadata/md5-cache/kde-apps/khangman-17.08.2
+++ b/metadata/md5-cache/kde-apps/khangman-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkeduvocdocument-17.08.2:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] >=kde-apps/kdeedu-data-17.08.2:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtmultimedia-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/khangman:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/khangman-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9d2fa14487c61ad5e21f38eb1b578d00
diff --git a/metadata/md5-cache/kde-apps/khelpcenter-17.04.3 b/metadata/md5-cache/kde-apps/khelpcenter-17.04.3
index 3e127814009d..91041b92aa3e 100644
--- a/metadata/md5-cache/kde-apps/khelpcenter-17.04.3
+++ b/metadata/md5-cache/kde-apps/khelpcenter-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kbookmarks-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/khtml-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kinit-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= >=kde-plasma/kde-cli-tools-5.10.5:5 >=kde-frameworks/kf-env-4 !kde-apps/khelpcenter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/khelpcenter-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=42dc734708c01eebcdcae3ed440b3b36
diff --git a/metadata/md5-cache/kde-apps/khelpcenter-17.08.2 b/metadata/md5-cache/kde-apps/khelpcenter-17.08.2
index 76b8b48150bd..05e77dfbc93b 100644
--- a/metadata/md5-cache/kde-apps/khelpcenter-17.08.2
+++ b/metadata/md5-cache/kde-apps/khelpcenter-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kbookmarks-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdoctools-5.37.0:5 >=kde-frameworks/khtml-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kinit-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= >=kde-plasma/kde-cli-tools-5.10.5:5 >=kde-frameworks/kf-env-4 !kde-apps/khelpcenter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/khelpcenter-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0da08dcdabb7a0fabf7a079d2c44d66c
diff --git a/metadata/md5-cache/kde-apps/kholidays-17.04.3 b/metadata/md5-cache/kde-apps/kholidays-17.04.3
index eeabf7a779b8..102e64eac8ab 100644
--- a/metadata/md5-cache/kde-apps/kholidays-17.04.3
+++ b/metadata/md5-cache/kde-apps/kholidays-17.04.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kholidays:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kholidays-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b5432866b7d47df488d3c6ac56b9855a
diff --git a/metadata/md5-cache/kde-apps/kholidays-17.08.2 b/metadata/md5-cache/kde-apps/kholidays-17.08.2
index 01324aa5d5c2..2819f82ad9a2 100644
--- a/metadata/md5-cache/kde-apps/kholidays-17.08.2
+++ b/metadata/md5-cache/kde-apps/kholidays-17.08.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kholidays:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kholidays-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7c2f17cf472b512411da7b097f4e2f2e
diff --git a/metadata/md5-cache/kde-apps/kidentitymanagement-17.04.3 b/metadata/md5-cache/kde-apps/kidentitymanagement-17.04.3
index 1cc0452fdab9..22c57fbd5d27 100644
--- a/metadata/md5-cache/kde-apps/kidentitymanagement-17.04.3
+++ b/metadata/md5-cache/kde-apps/kidentitymanagement-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kidentitymanagement-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=df58c47872737e527756adc9be2e3e3e
diff --git a/metadata/md5-cache/kde-apps/kidentitymanagement-17.08.2 b/metadata/md5-cache/kde-apps/kidentitymanagement-17.08.2
index 4fe8ef517b0c..44e9f7ce24cc 100644
--- a/metadata/md5-cache/kde-apps/kidentitymanagement-17.08.2
+++ b/metadata/md5-cache/kde-apps/kidentitymanagement-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kidentitymanagement-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=38f99875d3da7d5b399db124f1b0a3a9
diff --git a/metadata/md5-cache/kde-apps/kig-17.04.3 b/metadata/md5-cache/kde-apps/kig-17.04.3
index 506f248f46fc..f1a8c730a6eb 100644
--- a/metadata/md5-cache/kde-apps/kig-17.04.3
+++ b/metadata/md5-cache/kde-apps/kig-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=python_targets_python2_7
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kig-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c92c774d626b553bd05aeff08911d166
diff --git a/metadata/md5-cache/kde-apps/kig-17.08.2 b/metadata/md5-cache/kde-apps/kig-17.08.2
index ef7baa22d5a5..59c42e529d4a 100644
--- a/metadata/md5-cache/kde-apps/kig-17.08.2
+++ b/metadata/md5-cache/kde-apps/kig-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=python_targets_python2_7
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kig-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9d285661d3ae05d76fdf250b4948033d
diff --git a/metadata/md5-cache/kde-apps/kigo-17.04.3 b/metadata/md5-cache/kde-apps/kigo-17.04.3
index b919167632f1..13ff5c981cb5 100644
--- a/metadata/md5-cache/kde-apps/kigo-17.04.3
+++ b/metadata/md5-cache/kde-apps/kigo-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4 games-board/gnugo kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.04
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kigo-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=424b803b4a9378adfc450bb7f27c0be6
diff --git a/metadata/md5-cache/kde-apps/kigo-17.08.2 b/metadata/md5-cache/kde-apps/kigo-17.08.2
index 64c78545d0b8..a1d61fe92953 100644
--- a/metadata/md5-cache/kde-apps/kigo-17.08.2
+++ b/metadata/md5-cache/kde-apps/kigo-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !<kde-apps/kde4-l10n-17.07.80 games-board/gnugo >=kde-frameworks/kf-env-4 !kde-apps/kigo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kigo-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e186742a5c529bc1ecba514553e3911a
diff --git a/metadata/md5-cache/kde-apps/killbots-17.04.3 b/metadata/md5-cache/kde-apps/killbots-17.04.3
index ac4e8bb18e4f..b6030f9e3b23 100644
--- a/metadata/md5-cache/kde-apps/killbots-17.04.3
+++ b/metadata/md5-cache/kde-apps/killbots-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/killbots:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/killbots-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=42fe1927fa7a6c1dddf6d768dd60c262
diff --git a/metadata/md5-cache/kde-apps/killbots-17.08.2 b/metadata/md5-cache/kde-apps/killbots-17.08.2
index d28d04c2ffcf..e88926ab7248 100644
--- a/metadata/md5-cache/kde-apps/killbots-17.08.2
+++ b/metadata/md5-cache/kde-apps/killbots-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/killbots:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/killbots-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=94032392d3e59ef8c7838215f64e57f7
diff --git a/metadata/md5-cache/kde-apps/kimagemapeditor-17.04.3 b/metadata/md5-cache/kde-apps/kimagemapeditor-17.04.3
index a3008d20057b..73974a9208da 100644
--- a/metadata/md5-cache/kde-apps/kimagemapeditor-17.04.3
+++ b/metadata/md5-cache/kde-apps/kimagemapeditor-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.04
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kimagemapeditor-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b162b3763836d29e86db7eee5039e42f
diff --git a/metadata/md5-cache/kde-apps/kimagemapeditor-17.08.2 b/metadata/md5-cache/kde-apps/kimagemapeditor-17.08.2
index 9f6d1dec52a4..86f77cb0ff63 100644
--- a/metadata/md5-cache/kde-apps/kimagemapeditor-17.08.2
+++ b/metadata/md5-cache/kde-apps/kimagemapeditor-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.08
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kimagemapeditor-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b971035fa49dd9b9833dc3e38c7809b7
diff --git a/metadata/md5-cache/kde-apps/kimap-17.04.3 b/metadata/md5-cache/kde-apps/kimap-17.04.3
index dc44d1d9cb35..867db2c37209 100644
--- a/metadata/md5-cache/kde-apps/kimap-17.04.3
+++ b/metadata/md5-cache/kde-apps/kimap-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-apps/kmime-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kimap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kimap-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=20a0affbb634630b2d40c035d510d080
diff --git a/metadata/md5-cache/kde-apps/kimap-17.08.2 b/metadata/md5-cache/kde-apps/kimap-17.08.2
index 5d4cd60f6744..71b2ef6dd853 100644
--- a/metadata/md5-cache/kde-apps/kimap-17.08.2
+++ b/metadata/md5-cache/kde-apps/kimap-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-apps/kmime-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kimap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kimap-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9f9f02d6fa0215531ddb1b0da3a806e1
diff --git a/metadata/md5-cache/kde-apps/kio-extras-17.04.3 b/metadata/md5-cache/kde-apps/kio-extras-17.04.3
index 81d6853dbb66..f00b0ad3296a 100644
--- a/metadata/md5-cache/kde-apps/kio-extras-17.04.3
+++ b/metadata/md5-cache/kde-apps/kio-extras-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.37.0:5[bzip2,lzma] >=kde-frameworks/kbookmar
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kio-extras-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b003816a0268a6fbaa34e9f4e88317fa
diff --git a/metadata/md5-cache/kde-apps/kio-extras-17.08.2 b/metadata/md5-cache/kde-apps/kio-extras-17.08.2
index 68c485c3cb63..3a8c2649a61f 100644
--- a/metadata/md5-cache/kde-apps/kio-extras-17.08.2
+++ b/metadata/md5-cache/kde-apps/kio-extras-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.37.0:5[bzip2,lzma] >=kde-frameworks/kbookmar
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kio-extras-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=40331fea89ea5962601fde92a9fcc9e1
diff --git a/metadata/md5-cache/kde-apps/kioclient-16.04.3 b/metadata/md5-cache/kde-apps/kioclient-16.04.3
index 1f8b2dfd825c..808608f7a43f 100644
--- a/metadata/md5-cache/kde-apps/kioclient-16.04.3
+++ b/metadata/md5-cache/kde-apps/kioclient-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5f3ac48b0d1713b7c91e4bb89b67f68b
diff --git a/metadata/md5-cache/kde-apps/kiriki-17.04.3 b/metadata/md5-cache/kde-apps/kiriki-17.04.3
index 0a830a3c79a8..d5f3396d6729 100644
--- a/metadata/md5-cache/kde-apps/kiriki-17.04.3
+++ b/metadata/md5-cache/kde-apps/kiriki-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kiriki:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kiriki-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a86b3fc9d4fc857e86f716b51257c758
diff --git a/metadata/md5-cache/kde-apps/kiriki-17.08.2 b/metadata/md5-cache/kde-apps/kiriki-17.08.2
index a4e5386f6ecf..78b36f262aa0 100644
--- a/metadata/md5-cache/kde-apps/kiriki-17.08.2
+++ b/metadata/md5-cache/kde-apps/kiriki-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kiriki:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kiriki-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2a04f31a6b96f960471bfbcdc8e56f82
diff --git a/metadata/md5-cache/kde-apps/kiten-17.04.3 b/metadata/md5-cache/kde-apps/kiten-17.04.3
index 30026a39c118..ba0b01a2e982 100644
--- a/metadata/md5-cache/kde-apps/kiten-17.04.3
+++ b/metadata/md5-cache/kde-apps/kiten-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/khtml-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kiten:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kiten-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a5c478fdcf86f6a58a1e252d75e9dbb9
diff --git a/metadata/md5-cache/kde-apps/kiten-17.08.2 b/metadata/md5-cache/kde-apps/kiten-17.08.2
index be97804e00b9..ca1be96a43d4 100644
--- a/metadata/md5-cache/kde-apps/kiten-17.08.2
+++ b/metadata/md5-cache/kde-apps/kiten-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/khtml-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kiten:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kiten-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0d86d7c84d253a42e48dffc89de97727
diff --git a/metadata/md5-cache/kde-apps/kjots-4.4.2017.04 b/metadata/md5-cache/kde-apps/kjots-4.4.2017.04
index 889e0e447acb..2d57bbeb3ec9 100644
--- a/metadata/md5-cache/kde-apps/kjots-4.4.2017.04
+++ b/metadata/md5-cache/kde-apps/kjots-4.4.2017.04
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.4.2017.04:4 >=kde-apps/libkdepim-4.4.2017.04:4 kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)] kontact? ( >=kde-apps/kontact-4.4.2017.04:4 )
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2017.04.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d735144439276acf302fa46a6252c7c7
diff --git a/metadata/md5-cache/kde-apps/kjots-5.0.2 b/metadata/md5-cache/kde-apps/kjots-5.0.2
index 64240370690c..255ce015da22 100644
--- a/metadata/md5-cache/kde-apps/kjots-5.0.2
+++ b/metadata/md5-cache/kde-apps/kjots-5.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.37.0:5 >=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-5.0.2:5 >=kde-apps/akonadi-notes-5.0.2:5 >=kde-apps/kmime-5.0.2:5 >=kde-apps/kontactinterface-5.0.2:5 >=kde-apps/kpimtextedit-5.0.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/grantlee:5 dev-libs/libxslt >=kde-frameworks/kf-env-4 !kde-apps/kjots:4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kjots/5.0.2/kjots-5.0.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ab2c8ee88eb9582f64cf5919f5779e9e
diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-17.04.3 b/metadata/md5-cache/kde-apps/kjumpingcube-17.04.3
index d89266491435..375f76cb348d 100644
--- a/metadata/md5-cache/kde-apps/kjumpingcube-17.04.3
+++ b/metadata/md5-cache/kde-apps/kjumpingcube-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kjumpingcube:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kjumpingcube-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=460befae53d141a1b1588f731f293cb2
diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-17.08.2 b/metadata/md5-cache/kde-apps/kjumpingcube-17.08.2
index 1931ee1f5598..570e2bd2b2ff 100644
--- a/metadata/md5-cache/kde-apps/kjumpingcube-17.08.2
+++ b/metadata/md5-cache/kde-apps/kjumpingcube-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kjumpingcube:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kjumpingcube-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8de775a32c75d5517e5ceaa0f15951e6
diff --git a/metadata/md5-cache/kde-apps/kldap-17.04.3 b/metadata/md5-cache/kde-apps/kldap-17.04.3
index af61dab87ca8..64bccb69a96e 100644
--- a/metadata/md5-cache/kde-apps/kldap-17.04.3
+++ b/metadata/md5-cache/kde-apps/kldap-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/cyrus-sasl net-nds/openldap !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kldap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kldap-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=86fef2c49208f53d9e6e53c359d25259
diff --git a/metadata/md5-cache/kde-apps/kldap-17.08.2 b/metadata/md5-cache/kde-apps/kldap-17.08.2
index ceb905f26623..866ab3c7ebfa 100644
--- a/metadata/md5-cache/kde-apps/kldap-17.08.2
+++ b/metadata/md5-cache/kde-apps/kldap-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/cyrus-sasl net-nds/openldap !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kldap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kldap-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6cf9bec4c6d54d66af8ab0cfa3e40e93
diff --git a/metadata/md5-cache/kde-apps/kleopatra-17.04.3 b/metadata/md5-cache/kde-apps/kleopatra-17.04.3
index 6398f18cec94..1756b1f20b8c 100644
--- a/metadata/md5-cache/kde-apps/kleopatra-17.04.3
+++ b/metadata/md5-cache/kde-apps/kleopatra-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/kmime-17.04.3:5 >=kde-apps/libkleo-17.04.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5= >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error !kde-apps/kdepim-l10n >=app-crypt/gnupg-2.1 app-crypt/paperkey >=kde-frameworks/kf-env-4 !kde-apps/kleopatra:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kleopatra-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4d94e4995a3d21e0fc8bb8d0ec388fd9
diff --git a/metadata/md5-cache/kde-apps/kleopatra-17.08.2 b/metadata/md5-cache/kde-apps/kleopatra-17.08.2
index 92ed4a18c6dd..e7c4221167b0 100644
--- a/metadata/md5-cache/kde-apps/kleopatra-17.08.2
+++ b/metadata/md5-cache/kde-apps/kleopatra-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/kmime-17.08.2:5 >=kde-apps/libkleo-17.08.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error !kde-apps/kdepim-l10n >=app-crypt/gnupg-2.1 app-crypt/paperkey >=kde-frameworks/kf-env-4 !kde-apps/kleopatra:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kleopatra-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a429e81a628b2ba94d75cb0285512eca
diff --git a/metadata/md5-cache/kde-apps/kleopatra-4.4.2017.04 b/metadata/md5-cache/kde-apps/kleopatra-4.4.2017.04
index c2743dd86b30..7a005f6662c1 100644
--- a/metadata/md5-cache/kde-apps/kleopatra-4.4.2017.04
+++ b/metadata/md5-cache/kde-apps/kleopatra-4.4.2017.04
@@ -10,5 +10,5 @@ RDEPEND=>=kde-apps/kdepimlibs-4.14.10_p20160611:4 >=kde-apps/libkdepim-4.4.2017.
 RESTRICT=test
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2017.04.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bd8e9027b84177f93c88b33b14e39fe3
diff --git a/metadata/md5-cache/kde-apps/klettres-17.04.3 b/metadata/md5-cache/kde-apps/klettres-17.04.3
index f4a7aea023ff..47ca1de0fed9 100644
--- a/metadata/md5-cache/kde-apps/klettres-17.04.3
+++ b/metadata/md5-cache/kde-apps/klettres-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 !kde-apps/klettres:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/klettres-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=33863b726679d79fc642adce6655bdcc
diff --git a/metadata/md5-cache/kde-apps/klettres-17.08.2 b/metadata/md5-cache/kde-apps/klettres-17.08.2
index fe0e6c6c67c4..d57db00ab8cf 100644
--- a/metadata/md5-cache/kde-apps/klettres-17.08.2
+++ b/metadata/md5-cache/kde-apps/klettres-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 !kde-apps/klettres:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/klettres-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b45558f48275a3ff46a50641b7a06160
diff --git a/metadata/md5-cache/kde-apps/klickety-17.04.3 b/metadata/md5-cache/kde-apps/klickety-17.04.3
index 3d8e9ac959cc..1e5414c648d1 100644
--- a/metadata/md5-cache/kde-apps/klickety-17.04.3
+++ b/metadata/md5-cache/kde-apps/klickety-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/klickety:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/klickety-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2fc3e65b00d952151a4072e0e6b59b63
diff --git a/metadata/md5-cache/kde-apps/klickety-17.08.2 b/metadata/md5-cache/kde-apps/klickety-17.08.2
index ec0d76b934cf..9c06d297f902 100644
--- a/metadata/md5-cache/kde-apps/klickety-17.08.2
+++ b/metadata/md5-cache/kde-apps/klickety-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/klickety:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/klickety-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bd525e45a0d3387df30f4e9e04fcf734
diff --git a/metadata/md5-cache/kde-apps/klines-17.04.3 b/metadata/md5-cache/kde-apps/klines-17.04.3
index 7332a0d2adb2..f4c82f667d1d 100644
--- a/metadata/md5-cache/kde-apps/klines-17.04.3
+++ b/metadata/md5-cache/kde-apps/klines-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/klines:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/klines-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e3605e2a1a99a1c2cdfa4b29442eee89
diff --git a/metadata/md5-cache/kde-apps/klines-17.08.2 b/metadata/md5-cache/kde-apps/klines-17.08.2
index 0aed018401f5..b3b0ed62ec31 100644
--- a/metadata/md5-cache/kde-apps/klines-17.08.2
+++ b/metadata/md5-cache/kde-apps/klines-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/klines:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/klines-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bcc5d0becc96342c5bf8ae9038089713
diff --git a/metadata/md5-cache/kde-apps/klinkstatus-17.04.3 b/metadata/md5-cache/kde-apps/klinkstatus-17.04.3
index 9eed130aced2..3d4edbd9fa0d 100644
--- a/metadata/md5-cache/kde-apps/klinkstatus-17.04.3
+++ b/metadata/md5-cache/kde-apps/klinkstatus-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.14.3:4 tidy? ( app-text/htmltidy ) kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.04
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/klinkstatus-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d9150ee24052897b0e506c99559ebe01
diff --git a/metadata/md5-cache/kde-apps/klinkstatus-17.08.2 b/metadata/md5-cache/kde-apps/klinkstatus-17.08.2
index 2a574fbacaba..f26c6d701038 100644
--- a/metadata/md5-cache/kde-apps/klinkstatus-17.08.2
+++ b/metadata/md5-cache/kde-apps/klinkstatus-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.14.3:4 tidy? ( app-text/htmltidy ) kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.08
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/klinkstatus-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f0d25c2ab07c2ccc8d4f18c7593069dc
diff --git a/metadata/md5-cache/kde-apps/kmag-17.04.3 b/metadata/md5-cache/kde-apps/kmag-17.04.3
index 8af40225649d..ef890850cb85 100644
--- a/metadata/md5-cache/kde-apps/kmag-17.04.3
+++ b/metadata/md5-cache/kde-apps/kmag-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kaccessible-4.14.3:4 kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.04
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kmag-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=748fdd44804083d40be2d753ca0b9e51
diff --git a/metadata/md5-cache/kde-apps/kmag-17.08.2 b/metadata/md5-cache/kde-apps/kmag-17.08.2
index fe80644e888b..b8b9319b643d 100644
--- a/metadata/md5-cache/kde-apps/kmag-17.08.2
+++ b/metadata/md5-cache/kde-apps/kmag-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 keyboardfocus? ( media-libs/libqaccessibilityclient:5 ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 !kde-apps/kmag:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kmag-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=dad7688e051281b2f934dcfa3fe19c7d
diff --git a/metadata/md5-cache/kde-apps/kmahjongg-17.04.3 b/metadata/md5-cache/kde-apps/kmahjongg-17.04.3
index f1e6c3c0c4f2..be9b55dafdcf 100644
--- a/metadata/md5-cache/kde-apps/kmahjongg-17.04.3
+++ b/metadata/md5-cache/kde-apps/kmahjongg-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.04.3:5 >=kde-apps/libkmahjongg-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kmahjongg:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kmahjongg-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=546f3a6f82f50b398576f4a127e62bfc
diff --git a/metadata/md5-cache/kde-apps/kmahjongg-17.08.2 b/metadata/md5-cache/kde-apps/kmahjongg-17.08.2
index f959c415cbab..ade5705c15ff 100644
--- a/metadata/md5-cache/kde-apps/kmahjongg-17.08.2
+++ b/metadata/md5-cache/kde-apps/kmahjongg-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=kde-apps/libkmahjongg-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kmahjongg:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kmahjongg-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b41c37913ac829ca7fb4a7c5b1be2503
diff --git a/metadata/md5-cache/kde-apps/kmail-17.04.3 b/metadata/md5-cache/kde-apps/kmail-17.04.3
index 74e555882afe..5237cad30612 100644
--- a/metadata/md5-cache/kde-apps/kmail-17.04.3
+++ b/metadata/md5-cache/kde-apps/kmail-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kbookmarks-5.37.0:5 >=kde-frameworks/kcmutils-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kmail-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=83e7a4643564a630b02691c9c31ed483
diff --git a/metadata/md5-cache/kde-apps/kmail-17.08.2 b/metadata/md5-cache/kde-apps/kmail-17.08.2
index 54e296807c76..87868a873f43 100644
--- a/metadata/md5-cache/kde-apps/kmail-17.08.2
+++ b/metadata/md5-cache/kde-apps/kmail-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kbookmarks-5.37.0:5 >=kde-frameworks/kcmutils-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kmail-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=23800567c884b38e8676ae3ee935c65d
diff --git a/metadata/md5-cache/kde-apps/kmail-4.4.2017.04 b/metadata/md5-cache/kde-apps/kmail-4.4.2017.04
index 03d0abd29eba..8c72236ad997 100644
--- a/metadata/md5-cache/kde-apps/kmail-4.4.2017.04
+++ b/metadata/md5-cache/kde-apps/kmail-4.4.2017.04
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.14.10_p20160611:4 >=kde-apps/libkdepim-4.4.2017.04:4 >=kde-apps/libkleo-4.4.2017.04:4 >=kde-apps/libkpgp-4.4.2017.04:4 !>kde-apps/kdepimlibs-4.14.11_pre20160211 kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)] kontact? ( >=kde-apps/kontact-4.4.2017.04:4 )
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2017.04.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8bf9a74dfe668479a2ba8d568bca7d39
diff --git a/metadata/md5-cache/kde-apps/kmail-account-wizard-17.04.3 b/metadata/md5-cache/kde-apps/kmail-account-wizard-17.04.3
index 1ffd51d27e4c..60566fada1b2 100644
--- a/metadata/md5-cache/kde-apps/kmail-account-wizard-17.04.3
+++ b/metadata/md5-cache/kde-apps/kmail-account-wizard-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kross-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktexteditor-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-17.04.3:5 >=kde-apps/kidentitymanagement-17.04.3:5 >=kde-apps/kldap-17.04.3:5 >=kde-apps/kmailtransport-17.04.3:5 >=kde-apps/libkdepim-17.04.3:5 >=kde-apps/libkleo-17.04.3:5 >=kde-apps/pimcommon-17.04.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kdepim-runtime:4 >=kde-frameworks/kf-env-4 !kde-apps/kmail-account-wizard:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kmail-account-wizard-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=60431c22ec8a72c2b70e6c834cd12274
diff --git a/metadata/md5-cache/kde-apps/kmail-account-wizard-17.08.2 b/metadata/md5-cache/kde-apps/kmail-account-wizard-17.08.2
index 0fb5f0aca88b..ede072b99488 100644
--- a/metadata/md5-cache/kde-apps/kmail-account-wizard-17.08.2
+++ b/metadata/md5-cache/kde-apps/kmail-account-wizard-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kross-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktexteditor-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-17.08.2:5 >=kde-apps/kidentitymanagement-17.08.2:5 >=kde-apps/kldap-17.08.2:5 >=kde-apps/kmailtransport-17.08.2:5 >=kde-apps/libkdepim-17.08.2:5 >=kde-apps/libkleo-17.08.2:5 >=kde-apps/pimcommon-17.08.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kdepim-runtime:4 >=kde-frameworks/kf-env-4 !kde-apps/kmail-account-wizard:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kmail-account-wizard-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=61dda8cd5c6f05f3edc34cbd07830443
diff --git a/metadata/md5-cache/kde-apps/kmailtransport-17.04.3 b/metadata/md5-cache/kde-apps/kmailtransport-17.04.3
index ebee20a9abc1..80ca5ba733f6 100644
--- a/metadata/md5-cache/kde-apps/kmailtransport-17.04.3
+++ b/metadata/md5-cache/kde-apps/kmailtransport-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kmailtransport-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c717ce29073e8f8e24e9e7e8e0b1c5c5
diff --git a/metadata/md5-cache/kde-apps/kmailtransport-17.08.2 b/metadata/md5-cache/kde-apps/kmailtransport-17.08.2
index 58b41bbf824a..3a40a15ee483 100644
--- a/metadata/md5-cache/kde-apps/kmailtransport-17.08.2
+++ b/metadata/md5-cache/kde-apps/kmailtransport-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kmailtransport-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=84b7c1010008ba67094571c7b935bec6
diff --git a/metadata/md5-cache/kde-apps/kmbox-17.04.3 b/metadata/md5-cache/kde-apps/kmbox-17.04.3
index 76e893eaee28..104fd86361cb 100644
--- a/metadata/md5-cache/kde-apps/kmbox-17.04.3
+++ b/metadata/md5-cache/kde-apps/kmbox-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-apps/kmime-17.04.3:5 >=kde-frameworks/kf-env-4 !kde-apps/kmbox:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kmbox-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=259bde8d82b581a9069d018b75b278b5
diff --git a/metadata/md5-cache/kde-apps/kmbox-17.08.2 b/metadata/md5-cache/kde-apps/kmbox-17.08.2
index 00cc770b363e..f4568557b6b7 100644
--- a/metadata/md5-cache/kde-apps/kmbox-17.08.2
+++ b/metadata/md5-cache/kde-apps/kmbox-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-apps/kmime-17.08.2:5 >=kde-frameworks/kf-env-4 !kde-apps/kmbox:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kmbox-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a8d55cacd3f34febe85bbcf97a0caad0
diff --git a/metadata/md5-cache/kde-apps/kmime-17.04.3 b/metadata/md5-cache/kde-apps/kmime-17.04.3
index 36ba1e141002..d7161d795ba2 100644
--- a/metadata/md5-cache/kde-apps/kmime-17.04.3
+++ b/metadata/md5-cache/kde-apps/kmime-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kmime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kmime-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0087bba43038d5ef4614ca18223889f0
diff --git a/metadata/md5-cache/kde-apps/kmime-17.08.2 b/metadata/md5-cache/kde-apps/kmime-17.08.2
index d6b8c3493151..396af3d18bea 100644
--- a/metadata/md5-cache/kde-apps/kmime-17.08.2
+++ b/metadata/md5-cache/kde-apps/kmime-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kmime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kmime-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=37933c5b528552dfac1f2f3bc1a87b0d
diff --git a/metadata/md5-cache/kde-apps/kmines-17.04.3 b/metadata/md5-cache/kde-apps/kmines-17.04.3
index 98b3ef10f88f..f2299c87dc81 100644
--- a/metadata/md5-cache/kde-apps/kmines-17.04.3
+++ b/metadata/md5-cache/kde-apps/kmines-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kmines:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kmines-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b804e4f4801895aa2b0d8d083b6dc598
diff --git a/metadata/md5-cache/kde-apps/kmines-17.08.2 b/metadata/md5-cache/kde-apps/kmines-17.08.2
index 49f0c1b9efdd..16f2b5555501 100644
--- a/metadata/md5-cache/kde-apps/kmines-17.08.2
+++ b/metadata/md5-cache/kde-apps/kmines-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kmines:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kmines-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a9310845fe81c836fed7018f155d9f73
diff --git a/metadata/md5-cache/kde-apps/kmix-17.04.3 b/metadata/md5-cache/kde-apps/kmix-17.04.3
index 9891300a7c4d..1fcbbc7af1db 100644
--- a/metadata/md5-cache/kde-apps/kmix-17.04.3
+++ b/metadata/md5-cache/kde-apps/kmix-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/kglobalaccel-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/plasma-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) >=kde-plasma/kde-cli-tools-5.10.5:5 >=kde-frameworks/kf-env-4 !kde-apps/kmix:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kmix-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=11328794f939d025786e739998c6c3dd
diff --git a/metadata/md5-cache/kde-apps/kmix-17.08.2 b/metadata/md5-cache/kde-apps/kmix-17.08.2
index 27a646c504b0..95f7da9d0c0c 100644
--- a/metadata/md5-cache/kde-apps/kmix-17.08.2
+++ b/metadata/md5-cache/kde-apps/kmix-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/kglobalaccel-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/plasma-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) >=kde-plasma/kde-cli-tools-5.10.5:5 >=kde-frameworks/kf-env-4 !kde-apps/kmix:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kmix-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b1f5c01b44e553e35f96e49ce0eb2b44
diff --git a/metadata/md5-cache/kde-apps/kmousetool-17.04.3 b/metadata/md5-cache/kde-apps/kmousetool-17.04.3
index a9f8fbfc9021..a731fe850e1d 100644
--- a/metadata/md5-cache/kde-apps/kmousetool-17.04.3
+++ b/metadata/md5-cache/kde-apps/kmousetool-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/phonon[qt4] >=kde-apps/knotify-4.14.3:4 kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.04
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kmousetool-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7c7d38f1496170ed4642154efcba0bfd
diff --git a/metadata/md5-cache/kde-apps/kmousetool-17.08.2 b/metadata/md5-cache/kde-apps/kmousetool-17.08.2
index 90faf1b6aeb2..858df03644f6 100644
--- a/metadata/md5-cache/kde-apps/kmousetool-17.08.2
+++ b/metadata/md5-cache/kde-apps/kmousetool-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXtst !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 !kde-apps/kmousetool:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kmousetool-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ac9ae4b7ff55ad3ec3194b6edbcc0e8d
diff --git a/metadata/md5-cache/kde-apps/kmouth-17.04.3 b/metadata/md5-cache/kde-apps/kmouth-17.04.3
index 676b1117f4bc..1e381cba11ef 100644
--- a/metadata/md5-cache/kde-apps/kmouth-17.04.3
+++ b/metadata/md5-cache/kde-apps/kmouth-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
 SLOT=4/17.04
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kmouth-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f6150e666bfb4bc83f97bed2066b3494
diff --git a/metadata/md5-cache/kde-apps/kmouth-17.08.2 b/metadata/md5-cache/kde-apps/kmouth-17.08.2
index c302202699e5..770e659f1da7 100644
--- a/metadata/md5-cache/kde-apps/kmouth-17.08.2
+++ b/metadata/md5-cache/kde-apps/kmouth-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
 SLOT=4/17.08
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kmouth-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=49096b3a83d02cd29ca8b794c0f06234
diff --git a/metadata/md5-cache/kde-apps/kmplot-17.04.3 b/metadata/md5-cache/kde-apps/kmplot-17.04.3
index 24e225b8fd60..ec514cd153e8 100644
--- a/metadata/md5-cache/kde-apps/kmplot-17.04.3
+++ b/metadata/md5-cache/kde-apps/kmplot-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kmplot:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kmplot-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=acb1824720805e31ce23b02bcb7070b7
diff --git a/metadata/md5-cache/kde-apps/kmplot-17.08.2 b/metadata/md5-cache/kde-apps/kmplot-17.08.2
index 691975e83335..37472480e39a 100644
--- a/metadata/md5-cache/kde-apps/kmplot-17.08.2
+++ b/metadata/md5-cache/kde-apps/kmplot-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kmplot:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kmplot-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d7b6ee991a41136d1d558be7b1f90527
diff --git a/metadata/md5-cache/kde-apps/knavalbattle-17.04.3 b/metadata/md5-cache/kde-apps/knavalbattle-17.04.3
index bb712da07a6c..71bd2c738330 100644
--- a/metadata/md5-cache/kde-apps/knavalbattle-17.04.3
+++ b/metadata/md5-cache/kde-apps/knavalbattle-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdnssd-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/knavalbattle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/knavalbattle-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c3b46d6206bb5f4296b579a78d452b02
diff --git a/metadata/md5-cache/kde-apps/knavalbattle-17.08.2 b/metadata/md5-cache/kde-apps/knavalbattle-17.08.2
index fb98c0fc0f73..bb47cac0961a 100644
--- a/metadata/md5-cache/kde-apps/knavalbattle-17.08.2
+++ b/metadata/md5-cache/kde-apps/knavalbattle-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdnssd-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/knavalbattle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/knavalbattle-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=516fcca2fcefea74615ff6079b29c9f7
diff --git a/metadata/md5-cache/kde-apps/knetwalk-17.04.3 b/metadata/md5-cache/kde-apps/knetwalk-17.04.3
index 8d046a2a0aed..17eef43e18c2 100644
--- a/metadata/md5-cache/kde-apps/knetwalk-17.04.3
+++ b/metadata/md5-cache/kde-apps/knetwalk-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.04.3:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/knetwalk:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/knetwalk-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f89b47fc9e93ebfa46cd410742cee2ac
diff --git a/metadata/md5-cache/kde-apps/knetwalk-17.08.2 b/metadata/md5-cache/kde-apps/knetwalk-17.08.2
index c9fa3287e4a0..de076470b066 100644
--- a/metadata/md5-cache/kde-apps/knetwalk-17.08.2
+++ b/metadata/md5-cache/kde-apps/knetwalk-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/knetwalk:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/knetwalk-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6ea771caf6ca3567ffa10cd5042ad585
diff --git a/metadata/md5-cache/kde-apps/knode-4.4.2017.04 b/metadata/md5-cache/kde-apps/knode-4.4.2017.04
index 7d359d619c06..68e69ec0344f 100644
--- a/metadata/md5-cache/kde-apps/knode-4.4.2017.04
+++ b/metadata/md5-cache/kde-apps/knode-4.4.2017.04
@@ -10,5 +10,5 @@ RDEPEND=>=kde-apps/kdepimlibs-4.4.2017.04:4 >=kde-apps/libkdepim-4.4.2017.04:4 >
 RESTRICT=test
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2017.04.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=647f354b7f5b33bc046ef65a5532c360
diff --git a/metadata/md5-cache/kde-apps/knotes-17.04.3 b/metadata/md5-cache/kde-apps/knotes-17.04.3
index 983ca90882ed..7fcb09796a26 100644
--- a/metadata/md5-cache/kde-apps/knotes-17.04.3
+++ b/metadata/md5-cache/kde-apps/knotes-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/kdnssd-5.37.0:5 >=kde-frameworks/kglobalaccel-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-17.04.3:5 >=kde-apps/akonadi-notes-17.04.3:5 >=kde-apps/akonadi-search-17.04.3:5 >=kde-apps/kcalcore-17.04.3:5 >=kde-apps/kcalutils-17.04.3:5 >=kde-apps/kcontacts-17.04.3:5 >=kde-apps/kmime-17.04.3:5 >=kde-apps/kontactinterface-17.04.3:5 >=kde-apps/libkdepim-17.04.3:5 >=kde-apps/pimcommon-17.04.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.04.3:5 >=kde-frameworks/kf-env-4 !kde-apps/knotes:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/knotes-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=da15c3eaba6fb6de143e5a6ac1bdc1e4
diff --git a/metadata/md5-cache/kde-apps/knotes-17.08.2 b/metadata/md5-cache/kde-apps/knotes-17.08.2
index 94264ef8dd9f..5e5a640e9d04 100644
--- a/metadata/md5-cache/kde-apps/knotes-17.08.2
+++ b/metadata/md5-cache/kde-apps/knotes-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/kdnssd-5.37.0:5 >=kde-frameworks/kglobalaccel-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-17.08.2:5 >=kde-apps/akonadi-notes-17.08.2:5 >=kde-apps/akonadi-search-17.08.2:5 >=kde-apps/kcalcore-17.08.2:5 >=kde-apps/kcalutils-17.08.2:5 >=kde-apps/kcontacts-17.08.2:5 >=kde-apps/kmime-17.08.2:5 >=kde-apps/kontactinterface-17.08.2:5 >=kde-apps/libkdepim-17.08.2:5 >=kde-apps/pimcommon-17.08.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.08.2:5 >=kde-frameworks/kf-env-4 !kde-apps/knotes:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/knotes-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=dc797dc78090841df72f676040a04a89
diff --git a/metadata/md5-cache/kde-apps/knotes-4.4.2017.04 b/metadata/md5-cache/kde-apps/knotes-4.4.2017.04
index 22dbb62640aa..0b26599e4f85 100644
--- a/metadata/md5-cache/kde-apps/knotes-4.4.2017.04
+++ b/metadata/md5-cache/kde-apps/knotes-4.4.2017.04
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.4.2017.04:4 >=kde-apps/libkdepim-4.4.2017.04:4 kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)] kontact? ( >=kde-apps/kontact-4.4.2017.04:4 )
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2017.04.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=22e53c40133c10303a0e8de72158523f
diff --git a/metadata/md5-cache/kde-apps/knotify-16.04.3 b/metadata/md5-cache/kde-apps/knotify-16.04.3
index 6a92a273cf2c..f02684a0dab0 100644
--- a/metadata/md5-cache/kde-apps/knotify-16.04.3
+++ b/metadata/md5-cache/kde-apps/knotify-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1dc8ca38f09efc96dba70758b94b7397
diff --git a/metadata/md5-cache/kde-apps/kolf-17.04.3 b/metadata/md5-cache/kde-apps/kolf-17.04.3
index f9f43b3b8b38..963702ac1d93 100644
--- a/metadata/md5-cache/kde-apps/kolf-17.04.3
+++ b/metadata/md5-cache/kde-apps/kolf-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4 kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) selinux? ( sec-policy/selinux-games ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.04
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kolf-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=123471cb6eaceae035d02f46376bba38
diff --git a/metadata/md5-cache/kde-apps/kolf-17.08.2 b/metadata/md5-cache/kde-apps/kolf-17.08.2
index 1c84cc679c5d..b608c8ca0f16 100644
--- a/metadata/md5-cache/kde-apps/kolf-17.08.2
+++ b/metadata/md5-cache/kde-apps/kolf-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4 kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) selinux? ( sec-policy/selinux-games ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.08
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kolf-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8b9ba7410a71a14813efcb53dc2dc41b
diff --git a/metadata/md5-cache/kde-apps/kollision-17.04.3 b/metadata/md5-cache/kde-apps/kollision-17.04.3
index 0e1f0d745255..3cbb042ee8ad 100644
--- a/metadata/md5-cache/kde-apps/kollision-17.04.3
+++ b/metadata/md5-cache/kde-apps/kollision-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kollision:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kollision-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3f70db307a07c7f21e514e811eb68ca5
diff --git a/metadata/md5-cache/kde-apps/kollision-17.08.2 b/metadata/md5-cache/kde-apps/kollision-17.08.2
index d5a13fd71395..eef977979f24 100644
--- a/metadata/md5-cache/kde-apps/kollision-17.08.2
+++ b/metadata/md5-cache/kde-apps/kollision-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kollision:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kollision-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7815be8bf8ef6e4bc680111399601297
diff --git a/metadata/md5-cache/kde-apps/kolourpaint-17.04.3 b/metadata/md5-cache/kde-apps/kolourpaint-17.04.3
index b7776d9f3efd..9609ed29a1ef 100644
--- a/metadata/md5-cache/kde-apps/kolourpaint-17.04.3
+++ b/metadata/md5-cache/kde-apps/kolourpaint-17.04.3
@@ -9,5 +9,5 @@ LICENSE=BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 scanner? ( >=kde-apps/libksane-17.04.3:5 ) >=kde-frameworks/kf-env-4 !kde-apps/kolourpaint:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kolourpaint-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=812a82188dc5bc8af585178ff8f22be0
diff --git a/metadata/md5-cache/kde-apps/kolourpaint-17.08.2 b/metadata/md5-cache/kde-apps/kolourpaint-17.08.2
index 84f79dc1477f..f9767f39c56c 100644
--- a/metadata/md5-cache/kde-apps/kolourpaint-17.08.2
+++ b/metadata/md5-cache/kde-apps/kolourpaint-17.08.2
@@ -9,5 +9,5 @@ LICENSE=BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 scanner? ( >=kde-apps/libksane-17.08.2:5 ) >=kde-frameworks/kf-env-4 !kde-apps/kolourpaint:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kolourpaint-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=805940581f0b96ecfe8b7077f8dde4e8
diff --git a/metadata/md5-cache/kde-apps/kompare-17.04.3 b/metadata/md5-cache/kde-apps/kompare-17.04.3
index 67d923cbbbd8..dc37778e8da1 100644
--- a/metadata/md5-cache/kde-apps/kompare-17.04.3
+++ b/metadata/md5-cache/kde-apps/kompare-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktexteditor-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkomparediff2-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kompare:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kompare-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9f364a4c4689e125342b25ef2e55d49a
diff --git a/metadata/md5-cache/kde-apps/kompare-17.08.2 b/metadata/md5-cache/kde-apps/kompare-17.08.2
index 70f059084571..d5790004df9f 100644
--- a/metadata/md5-cache/kde-apps/kompare-17.08.2
+++ b/metadata/md5-cache/kde-apps/kompare-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktexteditor-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkomparediff2-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kompare:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kompare-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6221468178b9448b800134f8365f79f3
diff --git a/metadata/md5-cache/kde-apps/konqueror-17.04.3 b/metadata/md5-cache/kde-apps/konqueror-17.04.3
index 85cd8a1e3301..4f7f60a536b7 100644
--- a/metadata/md5-cache/kde-apps/konqueror-17.04.3
+++ b/metadata/md5-cache/kde-apps/konqueror-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kbookmarks-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/konqueror-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=eee7e660736e8846ecee1ec0902707e6
diff --git a/metadata/md5-cache/kde-apps/konqueror-17.08.2 b/metadata/md5-cache/kde-apps/konqueror-17.08.2
index 83233d9c233a..8fc59ac5caa7 100644
--- a/metadata/md5-cache/kde-apps/konqueror-17.08.2
+++ b/metadata/md5-cache/kde-apps/konqueror-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kbookmarks-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/konqueror-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4f75fac66607be80755e514c24c06b41
diff --git a/metadata/md5-cache/kde-apps/konquest-17.04.3 b/metadata/md5-cache/kde-apps/konquest-17.04.3
index a8d1115550c6..d5e8d2dcace0 100644
--- a/metadata/md5-cache/kde-apps/konquest-17.04.3
+++ b/metadata/md5-cache/kde-apps/konquest-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4 kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) selinux? ( sec-policy/selinux-games ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.04
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/konquest-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9294d58c3140da60c7803dae2ca96972
diff --git a/metadata/md5-cache/kde-apps/konquest-17.08.2 b/metadata/md5-cache/kde-apps/konquest-17.08.2
index c46aea75af66..b5e357d2cd40 100644
--- a/metadata/md5-cache/kde-apps/konquest-17.08.2
+++ b/metadata/md5-cache/kde-apps/konquest-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 !kde-apps/konquest:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/konquest-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=851f3ea048788ab76e56c63f79537701
diff --git a/metadata/md5-cache/kde-apps/konsole-17.04.3 b/metadata/md5-cache/kde-apps/konsole-17.04.3
index 374d2ce408a5..2bfc78589d31 100644
--- a/metadata/md5-cache/kde-apps/konsole-17.04.3
+++ b/metadata/md5-cache/kde-apps/konsole-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kinit-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kpty-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 !kde-apps/konsole:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/konsole-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bcd55204d133442d5e43ce2decb7fc70
diff --git a/metadata/md5-cache/kde-apps/konsole-17.08.2 b/metadata/md5-cache/kde-apps/konsole-17.08.2
index 606ae602aad0..3dd3a99ac468 100644
--- a/metadata/md5-cache/kde-apps/konsole-17.08.2
+++ b/metadata/md5-cache/kde-apps/konsole-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kinit-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kpty-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 !kde-apps/konsole:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/konsole-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=52175fe37f9ca44b9b803e79705ecaa2
diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-17.04.3 b/metadata/md5-cache/kde-apps/konsolekalendar-17.04.3
index e93af8a3ac87..f500fa57ad13 100644
--- a/metadata/md5-cache/kde-apps/konsolekalendar-17.04.3
+++ b/metadata/md5-cache/kde-apps/konsolekalendar-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-apps/akonadi-17.04.3:5 >=kde-apps/akonadi-calendar-17.04.3:5 >=kde-apps/calendarsupport-17.04.3:5 >=kde-apps/kcalcore-17.04.3:5 >=kde-apps/kcalutils-17.04.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/konsolekalendar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/akonadi-calendar-tools-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5875c459c29525e0507d33f3c09fd53a
diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-17.08.2 b/metadata/md5-cache/kde-apps/konsolekalendar-17.08.2
index dd5b00e3ef52..b02cd2f22c73 100644
--- a/metadata/md5-cache/kde-apps/konsolekalendar-17.08.2
+++ b/metadata/md5-cache/kde-apps/konsolekalendar-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-apps/akonadi-17.08.2:5 >=kde-apps/akonadi-calendar-17.08.2:5 >=kde-apps/calendarsupport-17.08.2:5 >=kde-apps/kcalcore-17.08.2:5 >=kde-apps/kcalutils-17.08.2:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/konsolekalendar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/akonadi-calendar-tools-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9ff4e821b77c927da72329b3ffcac332
diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-4.4.2017.04 b/metadata/md5-cache/kde-apps/konsolekalendar-4.4.2017.04
index e28e2831d48a..0d501f62388b 100644
--- a/metadata/md5-cache/kde-apps/konsolekalendar-4.4.2017.04
+++ b/metadata/md5-cache/kde-apps/konsolekalendar-4.4.2017.04
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.14.10_p20160611:4 !>kde-apps/kdepimlibs-4.14.11_pre20160211 kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2017.04.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=55c6da189bddaddaac13b3adbb4d4c89
diff --git a/metadata/md5-cache/kde-apps/konsolepart-4.14.3 b/metadata/md5-cache/kde-apps/konsolepart-4.14.3
index 9c6d163ffafe..249164377f13 100644
--- a/metadata/md5-cache/kde-apps/konsolepart-4.14.3
+++ b/metadata/md5-cache/kde-apps/konsolepart-4.14.3
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext >=x11-libs/libxklavier-3.2 x11-libs/lib
 RESTRICT=test
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/4.14.3/src/konsole-4.14.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d6068fe6f11da8e7da1e5a45d6a2b54e
diff --git a/metadata/md5-cache/kde-apps/kontact-17.04.3 b/metadata/md5-cache/kde-apps/kontact-17.04.3
index ef82fb95adaa..f16d9439be42 100644
--- a/metadata/md5-cache/kde-apps/kontact-17.04.3
+++ b/metadata/md5-cache/kde-apps/kontact-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-17.04.3:5 >=kde-apps/grantleetheme-17.04.3:5 >=kde-apps/kdepim-apps-libs-17.04.3:5 >=kde-apps/kontactinterface-17.04.3:5 >=kde-apps/kpimtextedit-17.04.3:5 >=kde-apps/libkdepim-17.04.3:5 >=kde-apps/mailcommon-17.04.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kontact:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kontact-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0cebc004a3db35d77ed2a231ea9d204f
diff --git a/metadata/md5-cache/kde-apps/kontact-17.08.2 b/metadata/md5-cache/kde-apps/kontact-17.08.2
index 6c3396a43485..43e24b0f94d0 100644
--- a/metadata/md5-cache/kde-apps/kontact-17.08.2
+++ b/metadata/md5-cache/kde-apps/kontact-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-17.08.2:5 >=kde-apps/grantleetheme-17.08.2:5 >=kde-apps/kdepim-apps-libs-17.08.2:5 >=kde-apps/kontactinterface-17.08.2:5 >=kde-apps/kpimtextedit-17.08.2:5 >=kde-apps/libkdepim-17.08.2:5 >=kde-apps/mailcommon-17.08.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kontact:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kontact-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6c4f051537f515774455f619448a41fa
diff --git a/metadata/md5-cache/kde-apps/kontact-4.4.2017.04 b/metadata/md5-cache/kde-apps/kontact-4.4.2017.04
index 8c517d4d587a..a4097732607e 100644
--- a/metadata/md5-cache/kde-apps/kontact-4.4.2017.04
+++ b/metadata/md5-cache/kde-apps/kontact-4.4.2017.04
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.14.10_p20160611:4 >=kde-apps/libkdepim-4.4.2017.04:4 !>kde-apps/kdepimlibs-4.14.11_pre20160211 kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2017.04.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b0b2e3bf262dd94bae52416988f03795
diff --git a/metadata/md5-cache/kde-apps/kontactinterface-17.04.3 b/metadata/md5-cache/kde-apps/kontactinterface-17.04.3
index c89fc81c8e0f..709bd157755b 100644
--- a/metadata/md5-cache/kde-apps/kontactinterface-17.04.3
+++ b/metadata/md5-cache/kde-apps/kontactinterface-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kontactinterface:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kontactinterface-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0a583d4f009354aa62755a34575c6110
diff --git a/metadata/md5-cache/kde-apps/kontactinterface-17.08.2 b/metadata/md5-cache/kde-apps/kontactinterface-17.08.2
index 253c7ab7016d..f87ac2049176 100644
--- a/metadata/md5-cache/kde-apps/kontactinterface-17.08.2
+++ b/metadata/md5-cache/kde-apps/kontactinterface-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kontactinterface:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kontactinterface-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ce4494c3691ba3c6d546e7a0295ec941
diff --git a/metadata/md5-cache/kde-apps/kopete-17.04.3 b/metadata/md5-cache/kde-apps/kopete-17.04.3
index 3f224cac836f..dd960fa35ff0 100644
--- a/metadata/md5-cache/kde-apps/kopete-17.04.3
+++ b/metadata/md5-cache/kde-apps/kopete-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-apps/kdepimlibs-4.14.10_p20160611:4 dev-libs/libpcre >=dev-qt/qtgu
 RESTRICT=test
 SLOT=4/17.04
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kopete-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a7d711fb269771e238a78318fefd420d
diff --git a/metadata/md5-cache/kde-apps/kopete-17.08.2 b/metadata/md5-cache/kde-apps/kopete-17.08.2
index 9215c122edd2..a012c4a1a106 100644
--- a/metadata/md5-cache/kde-apps/kopete-17.08.2
+++ b/metadata/md5-cache/kde-apps/kopete-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-apps/kdepimlibs-4.14.10_p20160611:4 dev-libs/libpcre >=dev-qt/qtgu
 RESTRICT=test
 SLOT=4/17.08
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kopete-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4492241b2ddbdf6093d5588ddb2813d1
diff --git a/metadata/md5-cache/kde-apps/korganizer-17.04.3 b/metadata/md5-cache/kde-apps/korganizer-17.04.3
index 75b159cbbef3..dc40fecfc690 100644
--- a/metadata/md5-cache/kde-apps/korganizer-17.04.3
+++ b/metadata/md5-cache/kde-apps/korganizer-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-17.04.3:5 >=kde-apps/akonadi-calendar-17.04.3:5 >=kde-apps/akonadi-contacts-17.04.3:5 >=kde-apps/akonadi-mime-17.04.3:5 >=kde-apps/akonadi-notes-17.04.3:5 >=kde-apps/akonadi-search-17.04.3:5 >=kde-apps/calendarsupport-17.04.3:5 >=kde-apps/eventviews-17.04.3:5 >=kde-apps/incidenceeditor-17.04.3:5 >=kde-apps/kcalcore-17.04.3:5 >=kde-apps/kcalutils-17.04.3:5 >=kde-apps/kcontacts-17.04.3:5 >=kde-apps/kdepim-apps-libs-17.04.3:5 >=kde-apps/kholidays-17.04.3:5 >=kde-apps/kidentitymanagement-17.04.3:5 >=kde-apps/kmailtransport-17.04.3:5 >=kde-apps/kmime-17.04.3:5 >=kde-apps/kontactinterface-17.04.3:5 >=kde-apps/kpimtextedit-17.04.3:5 >=kde-apps/libkdepim-17.04.3:5 >=kde-apps/pimcommon-17.04.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.04.3:5 >=kde-frameworks/kf-env-4 !kde-apps/korganizer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/korganizer-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=862a15eb38408fbb0c41cdb2eeacd502
diff --git a/metadata/md5-cache/kde-apps/korganizer-17.08.2 b/metadata/md5-cache/kde-apps/korganizer-17.08.2
index 3f7ea5cf0033..33a2285e2692 100644
--- a/metadata/md5-cache/kde-apps/korganizer-17.08.2
+++ b/metadata/md5-cache/kde-apps/korganizer-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-17.08.2:5 >=kde-apps/akonadi-calendar-17.08.2:5 >=kde-apps/akonadi-contacts-17.08.2:5 >=kde-apps/akonadi-mime-17.08.2:5 >=kde-apps/akonadi-notes-17.08.2:5 >=kde-apps/akonadi-search-17.08.2:5 >=kde-apps/calendarsupport-17.08.2:5 >=kde-apps/eventviews-17.08.2:5 >=kde-apps/incidenceeditor-17.08.2:5 >=kde-apps/kcalcore-17.08.2:5 >=kde-apps/kcalutils-17.08.2:5 >=kde-apps/kcontacts-17.08.2:5 >=kde-apps/kdepim-apps-libs-17.08.2:5 >=kde-apps/kholidays-17.08.2:5 >=kde-apps/kidentitymanagement-17.08.2:5 >=kde-apps/kmailtransport-17.08.2:5 >=kde-apps/kmime-17.08.2:5 >=kde-apps/kontactinterface-17.08.2:5 >=kde-apps/kpimtextedit-17.08.2:5 >=kde-apps/libkdepim-17.08.2:5 >=kde-apps/pimcommon-17.08.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.08.2:5 >=kde-frameworks/kf-env-4 !kde-apps/korganizer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/korganizer-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b1463e4d730861e68ed2a764cd0f725f
diff --git a/metadata/md5-cache/kde-apps/korganizer-4.4.2017.04 b/metadata/md5-cache/kde-apps/korganizer-4.4.2017.04
index d35e4f22e469..7f5c845b5279 100644
--- a/metadata/md5-cache/kde-apps/korganizer-4.4.2017.04
+++ b/metadata/md5-cache/kde-apps/korganizer-4.4.2017.04
@@ -10,5 +10,5 @@ RDEPEND=>=kde-apps/kdepimlibs-4.14.10_p20160611:4 >=kde-apps/libkdepim-4.4.2017.
 RESTRICT=test
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2017.04.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=950c9eccd495d84afdc14e827e795bd2
diff --git a/metadata/md5-cache/kde-apps/kpat-17.04.3 b/metadata/md5-cache/kde-apps/kpat-17.04.3
index 4093be0dc049..88e365a46b65 100644
--- a/metadata/md5-cache/kde-apps/kpat-17.04.3
+++ b/metadata/md5-cache/kde-apps/kpat-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 x11-misc/shared-mime-info >=kde-frameworks/kf-env-4 !kde-apps/kpat:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kpat-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0c5ab38ec16984f2aac927750f452442
diff --git a/metadata/md5-cache/kde-apps/kpat-17.08.2 b/metadata/md5-cache/kde-apps/kpat-17.08.2
index ee1f05c6bfd7..b3d0ef6a7991 100644
--- a/metadata/md5-cache/kde-apps/kpat-17.08.2
+++ b/metadata/md5-cache/kde-apps/kpat-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 x11-misc/shared-mime-info >=kde-frameworks/kf-env-4 !kde-apps/kpat:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kpat-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=dea33a739ea024a079bea20f86422fea
diff --git a/metadata/md5-cache/kde-apps/kpimtextedit-17.04.3 b/metadata/md5-cache/kde-apps/kpimtextedit-17.04.3
index e22ffec6a66f..198ac1060452 100644
--- a/metadata/md5-cache/kde-apps/kpimtextedit-17.04.3
+++ b/metadata/md5-cache/kde-apps/kpimtextedit-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kpimtextedit-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b78a4e4847f9c9d2d4a5d2281efbb71c
diff --git a/metadata/md5-cache/kde-apps/kpimtextedit-17.08.2 b/metadata/md5-cache/kde-apps/kpimtextedit-17.08.2
index 194066bed5c4..38a7f60bfbed 100644
--- a/metadata/md5-cache/kde-apps/kpimtextedit-17.08.2
+++ b/metadata/md5-cache/kde-apps/kpimtextedit-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kpimtextedit-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=88f5d2f5546f4740bce8c5735a0ff8e4
diff --git a/metadata/md5-cache/kde-apps/kppp-17.04.3 b/metadata/md5-cache/kde-apps/kppp-17.04.3
index e3421d81c21b..e8ee2b4fb358 100644
--- a/metadata/md5-cache/kde-apps/kppp-17.04.3
+++ b/metadata/md5-cache/kde-apps/kppp-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-dialup/ppp kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
 SLOT=4/17.04
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kppp-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1e70c6d7a8750523aa88c5df1ade4ab7
diff --git a/metadata/md5-cache/kde-apps/kppp-17.08.2 b/metadata/md5-cache/kde-apps/kppp-17.08.2
index cf944049c7f7..0331ed1a606c 100644
--- a/metadata/md5-cache/kde-apps/kppp-17.08.2
+++ b/metadata/md5-cache/kde-apps/kppp-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-dialup/ppp kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
 SLOT=4/17.08
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kppp-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=59af0a9252e3e80dcbfb68ea096a55c8
diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-17.04.3 b/metadata/md5-cache/kde-apps/kqtquickcharts-17.04.3
index 5f1c20b5fbdf..1cce2d176834 100644
--- a/metadata/md5-cache/kde-apps/kqtquickcharts-17.04.3
+++ b/metadata/md5-cache/kde-apps/kqtquickcharts-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kqtquickcharts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kqtquickcharts-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=88ed61295348e06b10bacc57668af56d
diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-17.08.2 b/metadata/md5-cache/kde-apps/kqtquickcharts-17.08.2
index 4bc68acb0a79..90b01e1d614a 100644
--- a/metadata/md5-cache/kde-apps/kqtquickcharts-17.08.2
+++ b/metadata/md5-cache/kde-apps/kqtquickcharts-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kqtquickcharts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kqtquickcharts-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7828c72d7ce2935aa4bf543a1953df48
diff --git a/metadata/md5-cache/kde-apps/krdc-17.04.3 b/metadata/md5-cache/kde-apps/krdc-17.04.3
index dee7896bac98..fd664cd9afc1 100644
--- a/metadata/md5-cache/kde-apps/krdc-17.04.3
+++ b/metadata/md5-cache/kde-apps/krdc-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.37.0:5 >=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdnssd-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 vnc? ( >=net-libs/libvncserver-0.9 ) rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] ) >=kde-frameworks/kf-env-4 !kde-apps/krdc:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/krdc-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bf743b208d95e61a1eb7fbbab818c2f3
diff --git a/metadata/md5-cache/kde-apps/krdc-17.08.2 b/metadata/md5-cache/kde-apps/krdc-17.08.2
index 4261b18c1bdf..f2c10f670bfe 100644
--- a/metadata/md5-cache/kde-apps/krdc-17.08.2
+++ b/metadata/md5-cache/kde-apps/krdc-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.37.0:5 >=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdnssd-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 vnc? ( >=net-libs/libvncserver-0.9 ) rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] ) >=kde-frameworks/kf-env-4 !kde-apps/krdc:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/krdc-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fe1daff997d6251469ebdf7222c9a153
diff --git a/metadata/md5-cache/kde-apps/kremotecontrol-17.04.3 b/metadata/md5-cache/kde-apps/kremotecontrol-17.04.3
index dd0286ffac09..c19ea08e9720 100644
--- a/metadata/md5-cache/kde-apps/kremotecontrol-17.04.3
+++ b/metadata/md5-cache/kde-apps/kremotecontrol-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-misc/lirc kde-frameworks/kdelibs:4[plasma(+)] kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.04
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kremotecontrol-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=dbafbf141a5ec4b65cd1cc5156bbc631
diff --git a/metadata/md5-cache/kde-apps/kremotecontrol-17.08.2-r1 b/metadata/md5-cache/kde-apps/kremotecontrol-17.08.2-r1
index b5e38babaeef..81abbdb7dbf3 100644
--- a/metadata/md5-cache/kde-apps/kremotecontrol-17.08.2-r1
+++ b/metadata/md5-cache/kde-apps/kremotecontrol-17.08.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/kdelibs:4[plasma(+)] app-misc/lirc kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.08
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kremotecontrol-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=efa52115363c1c5ca223c1b19e603321
diff --git a/metadata/md5-cache/kde-apps/kreversi-17.04.3 b/metadata/md5-cache/kde-apps/kreversi-17.04.3
index 845ef8eadb98..9c9cbba72959 100644
--- a/metadata/md5-cache/kde-apps/kreversi-17.04.3
+++ b/metadata/md5-cache/kde-apps/kreversi-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4 kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) selinux? ( sec-policy/selinux-games ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.04
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kreversi-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=63713d5013f06a2d6f3abfdfe20d8f22
diff --git a/metadata/md5-cache/kde-apps/kreversi-17.08.2 b/metadata/md5-cache/kde-apps/kreversi-17.08.2
index 8663214cecf1..0040a073b754 100644
--- a/metadata/md5-cache/kde-apps/kreversi-17.08.2
+++ b/metadata/md5-cache/kde-apps/kreversi-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 !kde-apps/kreversi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kreversi-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=48023618750ddab7179e8561de14cf84
diff --git a/metadata/md5-cache/kde-apps/krfb-17.04.3 b/metadata/md5-cache/kde-apps/krfb-17.04.3
index a19c8e42ede1..3592bf587439 100644
--- a/metadata/md5-cache/kde-apps/krfb-17.04.3
+++ b/metadata/md5-cache/kde-apps/krfb-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdnssd-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXtst >=kde-frameworks/kf-env-4 !kde-apps/krfb:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/krfb-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=da4f9c41ed48417451b984874ca8ec50
diff --git a/metadata/md5-cache/kde-apps/krfb-17.08.2 b/metadata/md5-cache/kde-apps/krfb-17.08.2
index 72950f06f3ca..822fc2fd0543 100644
--- a/metadata/md5-cache/kde-apps/krfb-17.08.2
+++ b/metadata/md5-cache/kde-apps/krfb-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdnssd-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image >=kde-frameworks/kf-env-4 !kde-apps/krfb:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/krfb-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=06475e7515f1364cc550305426f9a4ad
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-17.04.3 b/metadata/md5-cache/kde-apps/kross-interpreters-17.04.3
index 8185a91b8f7f..85fb2a733310 100644
--- a/metadata/md5-cache/kde-apps/kross-interpreters-17.04.3
+++ b/metadata/md5-cache/kde-apps/kross-interpreters-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=python_targets_python2_7
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kross-interpreters-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=774dad5e362bfe0876b564c3b0f70ae3
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-17.08.2 b/metadata/md5-cache/kde-apps/kross-interpreters-17.08.2
index e2460c3b0b77..152c61c58f99 100644
--- a/metadata/md5-cache/kde-apps/kross-interpreters-17.08.2
+++ b/metadata/md5-cache/kde-apps/kross-interpreters-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=python_targets_python2_7
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kross-interpreters-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=201840e857fd64493827d02913b23319
diff --git a/metadata/md5-cache/kde-apps/kruler-17.04.3 b/metadata/md5-cache/kde-apps/kruler-17.04.3
index 9fbcb28a83d9..68fdf30fe5be 100644
--- a/metadata/md5-cache/kde-apps/kruler-17.04.3
+++ b/metadata/md5-cache/kde-apps/kruler-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 !kde-apps/kruler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kruler-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c352ae0f26a1cb6fc19eccd3fec66055
diff --git a/metadata/md5-cache/kde-apps/kruler-17.08.2 b/metadata/md5-cache/kde-apps/kruler-17.08.2
index 90e3c8055284..f3a1657a2d5e 100644
--- a/metadata/md5-cache/kde-apps/kruler-17.08.2
+++ b/metadata/md5-cache/kde-apps/kruler-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 !kde-apps/kruler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kruler-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=474fe2d549ad3a2ce7da14e224797528
diff --git a/metadata/md5-cache/kde-apps/kscd-17.04.3 b/metadata/md5-cache/kde-apps/kscd-17.04.3
index 508c512dcbbc..99eb9ee616bf 100644
--- a/metadata/md5-cache/kde-apps/kscd-17.04.3
+++ b/metadata/md5-cache/kde-apps/kscd-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/musicbrainz:3 media-libs/phonon[qt4] kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.04
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kscd-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ac67ff029ff7710d27849617c489bc8f
diff --git a/metadata/md5-cache/kde-apps/kscd-17.08.2 b/metadata/md5-cache/kde-apps/kscd-17.08.2
index 20c4c897afc7..b839cec20f98 100644
--- a/metadata/md5-cache/kde-apps/kscd-17.08.2
+++ b/metadata/md5-cache/kde-apps/kscd-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/musicbrainz:3 media-libs/phonon[qt4] kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.08
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kscd-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=200df928c9b4a0e0457e4fa6d0c4ceea
diff --git a/metadata/md5-cache/kde-apps/kshisen-17.04.3 b/metadata/md5-cache/kde-apps/kshisen-17.04.3
index 6c4d08cecca1..b3c9589772ec 100644
--- a/metadata/md5-cache/kde-apps/kshisen-17.04.3
+++ b/metadata/md5-cache/kde-apps/kshisen-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.04.3:5 >=kde-apps/libkmahjongg-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kshisen:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kshisen-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d85089c9fcf1c89ef1cb023526b44265
diff --git a/metadata/md5-cache/kde-apps/kshisen-17.08.2 b/metadata/md5-cache/kde-apps/kshisen-17.08.2
index 01d9851edf82..da801027ce9a 100644
--- a/metadata/md5-cache/kde-apps/kshisen-17.08.2
+++ b/metadata/md5-cache/kde-apps/kshisen-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=kde-apps/libkmahjongg-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kshisen:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kshisen-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=58790ee4d2ad07b60680384f7205413a
diff --git a/metadata/md5-cache/kde-apps/ksirk-17.04.3 b/metadata/md5-cache/kde-apps/ksirk-17.04.3
index 59ccfce5fdaa..7c037a0cb150 100644
--- a/metadata/md5-cache/kde-apps/ksirk-17.04.3
+++ b/metadata/md5-cache/kde-apps/ksirk-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4 app-crypt/qca:2[qt4] media-libs/phonon[qt4] sys-libs/zlib kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.04
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/ksirk-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9517f4ccb6fa38315da3289476fc8038
diff --git a/metadata/md5-cache/kde-apps/ksirk-17.08.2 b/metadata/md5-cache/kde-apps/ksirk-17.08.2
index fb74e5e48ed3..ac9072efd9ba 100644
--- a/metadata/md5-cache/kde-apps/ksirk-17.08.2
+++ b/metadata/md5-cache/kde-apps/ksirk-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4 app-crypt/qca:2[qt4] media-libs/phonon[qt4] sys-libs/zlib kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.08
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/ksirk-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8be7e3715df158868b1eb0944765d4d0
diff --git a/metadata/md5-cache/kde-apps/ksnakeduel-17.04.3 b/metadata/md5-cache/kde-apps/ksnakeduel-17.04.3
index c48c5d7374a2..288c600b6380 100644
--- a/metadata/md5-cache/kde-apps/ksnakeduel-17.04.3
+++ b/metadata/md5-cache/kde-apps/ksnakeduel-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4 kde-frameworks/oxygen-icons selinux? ( sec-policy/selinux-games ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.04
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/ksnakeduel-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7f3d6d1347b57f40d334d53a06c3c75c
diff --git a/metadata/md5-cache/kde-apps/ksnakeduel-17.08.2 b/metadata/md5-cache/kde-apps/ksnakeduel-17.08.2
index 21c9b78a6e6e..fd530437bfd6 100644
--- a/metadata/md5-cache/kde-apps/ksnakeduel-17.08.2
+++ b/metadata/md5-cache/kde-apps/ksnakeduel-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 !kde-apps/ksnakeduel:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/ksnakeduel-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=27224072086862320e3fcf82891879a6
diff --git a/metadata/md5-cache/kde-apps/kspaceduel-17.04.3 b/metadata/md5-cache/kde-apps/kspaceduel-17.04.3
index 86e837667d2f..12ae20363dc8 100644
--- a/metadata/md5-cache/kde-apps/kspaceduel-17.04.3
+++ b/metadata/md5-cache/kde-apps/kspaceduel-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4 kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) selinux? ( sec-policy/selinux-games ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.04
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kspaceduel-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0460e3299ace9d6f9803420cd0b6ea7c
diff --git a/metadata/md5-cache/kde-apps/kspaceduel-17.08.2 b/metadata/md5-cache/kde-apps/kspaceduel-17.08.2
index ff0f11bcd779..d76084c241d0 100644
--- a/metadata/md5-cache/kde-apps/kspaceduel-17.08.2
+++ b/metadata/md5-cache/kde-apps/kspaceduel-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 !kde-apps/kspaceduel:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kspaceduel-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c21a99a5940fd481e5315d319d0666f4
diff --git a/metadata/md5-cache/kde-apps/ksquares-17.04.3 b/metadata/md5-cache/kde-apps/ksquares-17.04.3
index b5445b28d8c3..0aac0c61ecb4 100644
--- a/metadata/md5-cache/kde-apps/ksquares-17.04.3
+++ b/metadata/md5-cache/kde-apps/ksquares-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/ksquares:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/ksquares-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=96e31bcce5901d3c93fa49a160a3adcb
diff --git a/metadata/md5-cache/kde-apps/ksquares-17.08.2 b/metadata/md5-cache/kde-apps/ksquares-17.08.2
index 67490562e338..49d582de69e3 100644
--- a/metadata/md5-cache/kde-apps/ksquares-17.08.2
+++ b/metadata/md5-cache/kde-apps/ksquares-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/ksquares:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/ksquares-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=af72aac5d44e4622c23bbc4c222de5d5
diff --git a/metadata/md5-cache/kde-apps/kstars-17.04.3 b/metadata/md5-cache/kde-apps/kstars-17.04.3
index f6af69ab9228..d92d74c06c7e 100644
--- a/metadata/md5-cache/kde-apps/kstars-17.04.3
+++ b/metadata/md5-cache/kde-apps/kstars-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0
 REQUIRED_USE=indi? ( fits ) python_targets_python2_7
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kstars-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=410c565682734b4e356f39fb93878ee3
diff --git a/metadata/md5-cache/kde-apps/kstars-17.08.2 b/metadata/md5-cache/kde-apps/kstars-17.08.2
index d1896f3d9774..4fa4eae212a3 100644
--- a/metadata/md5-cache/kde-apps/kstars-17.08.2
+++ b/metadata/md5-cache/kde-apps/kstars-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0
 REQUIRED_USE=indi? ( fits ) python_targets_python2_7
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kstars-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f05c00be0403f380ce10171592ec573b
diff --git a/metadata/md5-cache/kde-apps/ksudoku-17.04.3-r1 b/metadata/md5-cache/kde-apps/ksudoku-17.04.3-r1
index 9dd858d1e1a6..48bacbf52623 100644
--- a/metadata/md5-cache/kde-apps/ksudoku-17.04.3-r1
+++ b/metadata/md5-cache/kde-apps/ksudoku-17.04.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4 opengl? ( virtual/glu ) kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.04
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/ksudoku-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=723c2b14bddf137aab6f6e0a1c887fc7
diff --git a/metadata/md5-cache/kde-apps/ksudoku-17.08.2 b/metadata/md5-cache/kde-apps/ksudoku-17.08.2
index 701227424a28..a4dcb8bb01cc 100644
--- a/metadata/md5-cache/kde-apps/ksudoku-17.08.2
+++ b/metadata/md5-cache/kde-apps/ksudoku-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 opengl? ( >=dev-qt/qtopengl-5.7.1:5 virtual/glu ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 !kde-apps/ksudoku:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/ksudoku-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=aba62f5f271b6382ae092d9416575d6a
diff --git a/metadata/md5-cache/kde-apps/ksystemlog-17.04.3 b/metadata/md5-cache/kde-apps/ksystemlog-17.04.3
index 453215f84708..609efbb1cd0f 100644
--- a/metadata/md5-cache/kde-apps/ksystemlog-17.04.3
+++ b/metadata/md5-cache/kde-apps/ksystemlog-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/ksystemlog-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2fc1539dfed367ad55f75cfda4ea11c3
diff --git a/metadata/md5-cache/kde-apps/ksystemlog-17.08.2 b/metadata/md5-cache/kde-apps/ksystemlog-17.08.2
index cf8a1aefdd60..22eeab1c5aef 100644
--- a/metadata/md5-cache/kde-apps/ksystemlog-17.08.2
+++ b/metadata/md5-cache/kde-apps/ksystemlog-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/ksystemlog-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fdb3ba77573f4599cc8bb7c950b431d7
diff --git a/metadata/md5-cache/kde-apps/kteatime-17.04.3 b/metadata/md5-cache/kde-apps/kteatime-17.04.3
index 3164f7228def..7502c50cc45d 100644
--- a/metadata/md5-cache/kde-apps/kteatime-17.04.3
+++ b/metadata/md5-cache/kde-apps/kteatime-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kteatime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kteatime-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d09bfbbeeb88835095d9f80c40a648ae
diff --git a/metadata/md5-cache/kde-apps/kteatime-17.08.2 b/metadata/md5-cache/kde-apps/kteatime-17.08.2
index 275df4e3d888..43e3158777cd 100644
--- a/metadata/md5-cache/kde-apps/kteatime-17.08.2
+++ b/metadata/md5-cache/kde-apps/kteatime-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kteatime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kteatime-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bfbcdc8f6b817ef290ce9e757569fda5
diff --git a/metadata/md5-cache/kde-apps/ktimer-17.04.3 b/metadata/md5-cache/kde-apps/ktimer-17.04.3
index 19511744dafc..ce64e15d56a2 100644
--- a/metadata/md5-cache/kde-apps/ktimer-17.04.3
+++ b/metadata/md5-cache/kde-apps/ktimer-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/ktimer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/ktimer-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=632238d80c1f8d6761e7d0789c258aed
diff --git a/metadata/md5-cache/kde-apps/ktimer-17.08.2 b/metadata/md5-cache/kde-apps/ktimer-17.08.2
index 780054e9eda9..e575cb9d912b 100644
--- a/metadata/md5-cache/kde-apps/ktimer-17.08.2
+++ b/metadata/md5-cache/kde-apps/ktimer-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/ktimer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/ktimer-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=68bb95b5eb3bcfb03817e882679c0713
diff --git a/metadata/md5-cache/kde-apps/ktimetracker-4.4.2017.04 b/metadata/md5-cache/kde-apps/ktimetracker-4.4.2017.04
index 084a849254a0..3a43aafce32d 100644
--- a/metadata/md5-cache/kde-apps/ktimetracker-4.4.2017.04
+++ b/metadata/md5-cache/kde-apps/ktimetracker-4.4.2017.04
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepim-kresources-4.4.2017.04:4 >=kde-apps/kdepimlibs-4.4.2017.04:4 >=kde-apps/libkdepim-4.4.2017.04:4 x11-libs/libXScrnSaver kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)] kontact? ( >=kde-apps/kontact-4.4.2017.04:4 )
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2017.04.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fab0bf3c0a4b3ec41cae5577f0b4cb9e
diff --git a/metadata/md5-cache/kde-apps/ktimezoned-16.04.3 b/metadata/md5-cache/kde-apps/ktimezoned-16.04.3
index 793c95cd46a5..0e492010a3c7 100644
--- a/metadata/md5-cache/kde-apps/ktimezoned-16.04.3
+++ b/metadata/md5-cache/kde-apps/ktimezoned-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bda6eff9569a7fc5964b5461fd346c6b
diff --git a/metadata/md5-cache/kde-apps/ktouch-17.04.3 b/metadata/md5-cache/kde-apps/ktouch-17.04.3
index b1001d35a062..1ac674d6af68 100644
--- a/metadata/md5-cache/kde-apps/ktouch-17.04.3
+++ b/metadata/md5-cache/kde-apps/ktouch-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-apps/kqtquickcharts-17.04.3:5 >=kde-frameworks/kf-env-4 !kde-apps/ktouch:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/ktouch-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7f3f7f5196e989d6f861d7dcb7ac8dce
diff --git a/metadata/md5-cache/kde-apps/ktouch-17.08.2 b/metadata/md5-cache/kde-apps/ktouch-17.08.2
index eb1e466fd228..214f94b58787 100644
--- a/metadata/md5-cache/kde-apps/ktouch-17.08.2
+++ b/metadata/md5-cache/kde-apps/ktouch-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-apps/kqtquickcharts-17.08.2:5 >=kde-frameworks/kf-env-4 !kde-apps/ktouch:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/ktouch-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1f1f0663af218bb3fd9bd7aa1b7e1894
diff --git a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.04.3 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.04.3
index b0ebadaf5355..de6039902921 100644
--- a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.04.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-apps/kaccounts-integration-17.04.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-apps/kaccounts-providers-17.04.3:5 net-im/telepathy-connection-managers >=kde-frameworks/kf-env-4 !kde-apps/ktp-accounts-kcm:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/ktp-accounts-kcm-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2b44f134ad1f081b4ce85188d9437276
diff --git a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.08.2 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.08.2
index df950166c72c..d0ddcc787c41 100644
--- a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.08.2
+++ b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.08.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-apps/kaccounts-integration-17.08.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-apps/kaccounts-providers-17.08.2:5 net-im/telepathy-connection-managers >=kde-frameworks/kf-env-4 !kde-apps/ktp-accounts-kcm:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/ktp-accounts-kcm-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=274339f910329b0b01a6b8a6c90b5600
diff --git a/metadata/md5-cache/kde-apps/ktp-approver-17.04.3 b/metadata/md5-cache/kde-apps/ktp-approver-17.04.3
index 2267da0677e6..d97325d4984f 100644
--- a/metadata/md5-cache/kde-apps/ktp-approver-17.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-approver-17.04.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-17.04.3:5 >=kde-frameworks/kf-env-4 !kde-apps/ktp-approver:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/ktp-approver-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c5017543ed90d8e78204392400932809
diff --git a/metadata/md5-cache/kde-apps/ktp-approver-17.08.2 b/metadata/md5-cache/kde-apps/ktp-approver-17.08.2
index 3167ae26a4c9..93836c2f2bf2 100644
--- a/metadata/md5-cache/kde-apps/ktp-approver-17.08.2
+++ b/metadata/md5-cache/kde-apps/ktp-approver-17.08.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-17.08.2:5 >=kde-frameworks/kf-env-4 !kde-apps/ktp-approver:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/ktp-approver-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1a1055d230e198fc14130ba745f5c7ec
diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-17.04.3 b/metadata/md5-cache/kde-apps/ktp-auth-handler-17.04.3
index fd12a8fc5f4f..cce717200114 100644
--- a/metadata/md5-cache/kde-apps/ktp-auth-handler-17.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-auth-handler-17.04.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-apps/kaccounts-integration-17.04.3:5 >=kde-apps/ktp-common-internals-17.04.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 app-crypt/qca:2[qt5] net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] app-crypt/qca:2[ssl] >=kde-frameworks/kf-env-4 !kde-apps/ktp-auth-handler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/ktp-auth-handler-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a539d858bda5dcbfb600bdd969eece99
diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-17.08.2 b/metadata/md5-cache/kde-apps/ktp-auth-handler-17.08.2
index c43ef679bca4..f14eae400b06 100644
--- a/metadata/md5-cache/kde-apps/ktp-auth-handler-17.08.2
+++ b/metadata/md5-cache/kde-apps/ktp-auth-handler-17.08.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-apps/kaccounts-integration-17.08.2:5 >=kde-apps/ktp-common-internals-17.08.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 app-crypt/qca:2[qt5] net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] app-crypt/qca:2[ssl] >=kde-frameworks/kf-env-4 !kde-apps/ktp-auth-handler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/ktp-auth-handler-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9d211865d742ee6c15aa6ba7e860f978
diff --git a/metadata/md5-cache/kde-apps/ktp-call-ui-17.04.3 b/metadata/md5-cache/kde-apps/ktp-call-ui-17.04.3
index dc675b639b20..27a0bb57c1a3 100644
--- a/metadata/md5-cache/kde-apps/ktp-call-ui-17.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-call-ui-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/ktp-common-internals-17.04.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/boost dev-libs/glib:2 media-libs/phonon[qt5(+)] media-libs/qt-gstreamer[qt5(+)] net-libs/farstream:0.2 net-libs/telepathy-farstream net-libs/telepathy-qt[farstream,qt5(+)] >=kde-frameworks/kf-env-4 !kde-apps/ktp-call-ui:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/ktp-call-ui-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=626dc583b4023f68f6c931fefe554d00
diff --git a/metadata/md5-cache/kde-apps/ktp-call-ui-17.08.2 b/metadata/md5-cache/kde-apps/ktp-call-ui-17.08.2
index f1c7cee599b2..01fd7d7b527a 100644
--- a/metadata/md5-cache/kde-apps/ktp-call-ui-17.08.2
+++ b/metadata/md5-cache/kde-apps/ktp-call-ui-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/ktp-common-internals-17.08.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/boost dev-libs/glib:2 media-libs/phonon[qt5(+)] media-libs/qt-gstreamer[qt5(+)] net-libs/farstream:0.2 net-libs/telepathy-farstream net-libs/telepathy-qt[farstream,qt5(+)] >=kde-frameworks/kf-env-4 !kde-apps/ktp-call-ui:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/ktp-call-ui-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=eb73b4d93e9b6ccf3336d5b5f10f7e54
diff --git a/metadata/md5-cache/kde-apps/ktp-common-internals-17.04.3 b/metadata/md5-cache/kde-apps/ktp-common-internals-17.04.3
index 145658065e0d..87c76bd90ed8 100644
--- a/metadata/md5-cache/kde-apps/ktp-common-internals-17.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-common-internals-17.04.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kpeople-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktexteditor-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 net-libs/telepathy-logger-qt:5 >=net-libs/telepathy-qt-0.9.5[qt5(+)] otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-17.04.3:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kf-env-4 !kde-apps/ktp-common-internals:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/ktp-common-internals-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e314a894aaccc19936809d44b83be381
diff --git a/metadata/md5-cache/kde-apps/ktp-common-internals-17.08.2 b/metadata/md5-cache/kde-apps/ktp-common-internals-17.08.2
index 2da23e5a58a9..29ff6bb00a3f 100644
--- a/metadata/md5-cache/kde-apps/ktp-common-internals-17.08.2
+++ b/metadata/md5-cache/kde-apps/ktp-common-internals-17.08.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kpeople-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktexteditor-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=net-libs/telepathy-logger-qt-17.08.0:5 >=net-libs/telepathy-qt-0.9.5[qt5(+)] otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-17.08.2:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kf-env-4 !kde-apps/ktp-common-internals:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/ktp-common-internals-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=539ff12967cf2d7bbce0de8b42910ef4
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-list-17.04.3 b/metadata/md5-cache/kde-apps/ktp-contact-list-17.04.3
index 2145bdf51dc7..8fd84ae4f4ae 100644
--- a/metadata/md5-cache/kde-apps/ktp-contact-list-17.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-contact-list-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kpeople-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/ktp-common-internals-17.04.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 !kde-apps/ktp-contact-list:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/ktp-contact-list-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=495a8503ea6a6416557c5a40913a334a
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-list-17.08.2 b/metadata/md5-cache/kde-apps/ktp-contact-list-17.08.2
index 2d5f2e26c430..47706433cde6 100644
--- a/metadata/md5-cache/kde-apps/ktp-contact-list-17.08.2
+++ b/metadata/md5-cache/kde-apps/ktp-contact-list-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kpeople-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/ktp-common-internals-17.08.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 !kde-apps/ktp-contact-list:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/ktp-contact-list-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=65f546bbd75445997bc0484cccfc2705
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-17.04.3 b/metadata/md5-cache/kde-apps/ktp-contact-runner-17.04.3
index a73b4e04274d..e6d8541eb173 100644
--- a/metadata/md5-cache/kde-apps/ktp-contact-runner-17.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-contact-runner-17.04.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/krunner-5.37.0:5 >=kde-apps/ktp-common-internals-17.04.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 !kde-apps/ktp-contact-runner:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/ktp-contact-runner-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fd9024fa23a32867fd3ee7814acb9146
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-17.08.2 b/metadata/md5-cache/kde-apps/ktp-contact-runner-17.08.2
index d105665ba4b6..410a2dadb6d1 100644
--- a/metadata/md5-cache/kde-apps/ktp-contact-runner-17.08.2
+++ b/metadata/md5-cache/kde-apps/ktp-contact-runner-17.08.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/krunner-5.37.0:5 >=kde-apps/ktp-common-internals-17.08.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 !kde-apps/ktp-contact-runner:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/ktp-contact-runner-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a612eb4ad1e321b24e2554904f4da52f
diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.04.3 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.04.3
index 73b222af97e8..f1163183a075 100644
--- a/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.04.3
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/plasma-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/ktp-desktop-applets:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/ktp-desktop-applets-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bbfc3240001057611def7ad55ee43d4f
diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.08.2 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.08.2
index 99109d2b9b4b..72fb66a28122 100644
--- a/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.08.2
+++ b/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.08.2
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/plasma-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/ktp-desktop-applets:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/ktp-desktop-applets-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b9545ca6fc9dd049f9cab616876c5dbc
diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.04.3 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.04.3
index 8e47738a8382..3b6caa095c3e 100644
--- a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-apps/ktp-common-internals-17.04.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 !kde-apps/ktp-filetransfer-handler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/ktp-filetransfer-handler-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bae0987866d08a5c3f5294df36c0d1d8
diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.08.2 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.08.2
index fb287d650056..3b1fdabfa1d3 100644
--- a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.08.2
+++ b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-apps/ktp-common-internals-17.08.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 !kde-apps/ktp-filetransfer-handler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/ktp-filetransfer-handler-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7b08991d956943363b276a37e0380756
diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-17.04.3 b/metadata/md5-cache/kde-apps/ktp-kded-module-17.04.3
index e8e00daa8b35..2bcbf35a7659 100644
--- a/metadata/md5-cache/kde-apps/ktp-kded-module-17.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-kded-module-17.04.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kidletime-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-apps/ktp-common-internals-17.04.3:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/signon-kwallet-extension-17.04.3:5 >=kde-frameworks/kf-env-4 !kde-apps/ktp-kded-module:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/ktp-kded-module-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e76c1f90211cffd62087868d01000198
diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-17.08.2 b/metadata/md5-cache/kde-apps/ktp-kded-module-17.08.2
index c7e1eb2cb420..7e6be9bfa0ee 100644
--- a/metadata/md5-cache/kde-apps/ktp-kded-module-17.08.2
+++ b/metadata/md5-cache/kde-apps/ktp-kded-module-17.08.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kidletime-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-apps/ktp-common-internals-17.08.2:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/signon-kwallet-extension-17.08.2:5 >=kde-frameworks/kf-env-4 !kde-apps/ktp-kded-module:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/ktp-kded-module-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=61f5d00109926fd578b9935e2de4674a
diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-17.04.3 b/metadata/md5-cache/kde-apps/ktp-send-file-17.04.3
index 6aa61f268063..8e50a017cadf 100644
--- a/metadata/md5-cache/kde-apps/ktp-send-file-17.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-send-file-17.04.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-apps/ktp-common-internals-17.04.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-17.04.3:5 >=kde-apps/ktp-filetransfer-handler-17.04.3:5 >=kde-frameworks/kf-env-4 !kde-apps/ktp-send-file:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/ktp-send-file-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=78c356cb7d0a8ce9414da32db37f97c8
diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-17.08.2 b/metadata/md5-cache/kde-apps/ktp-send-file-17.08.2
index 519058b0e075..a1b4431b3bd6 100644
--- a/metadata/md5-cache/kde-apps/ktp-send-file-17.08.2
+++ b/metadata/md5-cache/kde-apps/ktp-send-file-17.08.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-apps/ktp-common-internals-17.08.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-17.08.2:5 >=kde-apps/ktp-filetransfer-handler-17.08.2:5 >=kde-frameworks/kf-env-4 !kde-apps/ktp-send-file:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/ktp-send-file-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=655040e58b3c635da976a10af0e2e73e
diff --git a/metadata/md5-cache/kde-apps/ktp-text-ui-17.04.3 b/metadata/md5-cache/kde-apps/ktp-text-ui-17.04.3
index ee3385fe020d..4dffaf8d8650 100644
--- a/metadata/md5-cache/kde-apps/ktp-text-ui-17.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-text-ui-17.04.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdewebkit-5.37.0:5 >=kde-frameworks/kemoticons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kpeople-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/sonnet-5.37.0:5 >=kde-apps/ktp-common-internals-17.04.3:5[otr] >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.7.1:5 ) >=kde-apps/ktp-contact-list-17.04.3:5 >=kde-frameworks/kf-env-4 !kde-apps/ktp-text-ui:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/ktp-text-ui-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8cca4dd5652e5f13aceb9765e3b33f09
diff --git a/metadata/md5-cache/kde-apps/ktp-text-ui-17.08.2 b/metadata/md5-cache/kde-apps/ktp-text-ui-17.08.2
index b6eaf6fe246d..276772dcb4a4 100644
--- a/metadata/md5-cache/kde-apps/ktp-text-ui-17.08.2
+++ b/metadata/md5-cache/kde-apps/ktp-text-ui-17.08.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdewebkit-5.37.0:5 >=kde-frameworks/kemoticons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kpeople-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/sonnet-5.37.0:5 >=kde-apps/ktp-common-internals-17.08.2:5[otr] >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.7.1:5 ) >=kde-apps/ktp-contact-list-17.08.2:5 >=kde-frameworks/kf-env-4 !kde-apps/ktp-text-ui:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/ktp-text-ui-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2f8e51316fe7ebd58498ec95058f842e
diff --git a/metadata/md5-cache/kde-apps/ktuberling-17.04.3 b/metadata/md5-cache/kde-apps/ktuberling-17.04.3
index 2c5616bd8bc1..f4651b39e18e 100644
--- a/metadata/md5-cache/kde-apps/ktuberling-17.04.3
+++ b/metadata/md5-cache/kde-apps/ktuberling-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 !kde-apps/ktuberling:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/ktuberling-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=746ac6a368c6fb67f2f08a85a49327cf
diff --git a/metadata/md5-cache/kde-apps/ktuberling-17.08.2 b/metadata/md5-cache/kde-apps/ktuberling-17.08.2
index f638c3a80ff6..be1b0d863de3 100644
--- a/metadata/md5-cache/kde-apps/ktuberling-17.08.2
+++ b/metadata/md5-cache/kde-apps/ktuberling-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 !kde-apps/ktuberling:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/ktuberling-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=255cba50e4799017528e23deb9ff1553
diff --git a/metadata/md5-cache/kde-apps/kturtle-17.04.3 b/metadata/md5-cache/kde-apps/kturtle-17.04.3
index 383cc59fd88a..2c089a48099f 100644
--- a/metadata/md5-cache/kde-apps/kturtle-17.04.3
+++ b/metadata/md5-cache/kde-apps/kturtle-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kturtle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kturtle-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=55c274c26ad985b46edfbe3e8c77ffc2
diff --git a/metadata/md5-cache/kde-apps/kturtle-17.08.2 b/metadata/md5-cache/kde-apps/kturtle-17.08.2
index e607a4280b89..2f7095e4f7de 100644
--- a/metadata/md5-cache/kde-apps/kturtle-17.08.2
+++ b/metadata/md5-cache/kde-apps/kturtle-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kturtle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kturtle-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2a88be7f625daa3169d5191e1a5cd1be
diff --git a/metadata/md5-cache/kde-apps/kubrick-17.04.3 b/metadata/md5-cache/kde-apps/kubrick-17.04.3
index f210b210f964..7d09e56c3ea2 100644
--- a/metadata/md5-cache/kde-apps/kubrick-17.04.3
+++ b/metadata/md5-cache/kde-apps/kubrick-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4 virtual/glu kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) >=dev-qt/qtopengl-4.8.5:4 dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.04
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kubrick-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0e8e3f2056bc74b4aec0b78caccef210
diff --git a/metadata/md5-cache/kde-apps/kubrick-17.08.2 b/metadata/md5-cache/kde-apps/kubrick-17.08.2
index b068652330ff..59eecb420df2 100644
--- a/metadata/md5-cache/kde-apps/kubrick-17.08.2
+++ b/metadata/md5-cache/kde-apps/kubrick-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtopengl-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 virtual/glu virtual/opengl !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 !kde-apps/kubrick:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kubrick-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=71381d8d7f071505c80d4b075c1773d9
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-17.04.3 b/metadata/md5-cache/kde-apps/kwalletmanager-17.04.3
index 66b2a9f107b4..4af41af45fa7 100644
--- a/metadata/md5-cache/kde-apps/kwalletmanager-17.04.3
+++ b/metadata/md5-cache/kde-apps/kwalletmanager-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kauth-5.37.0:5 >=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !<kde-apps/kwalletmanager-15.04.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kwalletmanager-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ad056c16b8f7ad91995d045c849eb91d
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-17.08.2 b/metadata/md5-cache/kde-apps/kwalletmanager-17.08.2
index 5bf7cd20157c..8ac32bf01a7c 100644
--- a/metadata/md5-cache/kde-apps/kwalletmanager-17.08.2
+++ b/metadata/md5-cache/kde-apps/kwalletmanager-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kauth-5.37.0:5 >=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !<kde-apps/kwalletmanager-15.04.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kwalletmanager-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ffad2d8cdf209f1894e73492bc95627e
diff --git a/metadata/md5-cache/kde-apps/kwave-17.04.3 b/metadata/md5-cache/kde-apps/kwave-17.04.3
index b58b6bb69884..3b12e6b9bdda 100644
--- a/metadata/md5-cache/kde-apps/kwave-17.04.3
+++ b/metadata/md5-cache/kde-apps/kwave-17.04.3
@@ -9,5 +9,5 @@ LICENSE=CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/audiofile:= >=sci-libs/fftw-3 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) mp3? ( media-libs/id3lib media-libs/libmad || ( media-sound/lame media-sound/toolame media-sound/twolame ) ) qtmedia? ( >=dev-qt/qtmultimedia-5.7.1:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 !kde-apps/kwave:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kwave-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=88d4b105739ba81dd63aa8d9926b68b8
diff --git a/metadata/md5-cache/kde-apps/kwave-17.08.2 b/metadata/md5-cache/kde-apps/kwave-17.08.2
index 4dd105224eba..2c6e07d9e1de 100644
--- a/metadata/md5-cache/kde-apps/kwave-17.08.2
+++ b/metadata/md5-cache/kde-apps/kwave-17.08.2
@@ -9,5 +9,5 @@ LICENSE=CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/audiofile:= >=sci-libs/fftw-3 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) mp3? ( media-libs/id3lib media-libs/libmad || ( media-sound/lame media-sound/toolame media-sound/twolame ) ) qtmedia? ( >=dev-qt/qtmultimedia-5.7.1:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 !kde-apps/kwave:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kwave-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1e4a0304b9334b633765ff24178b53a1
diff --git a/metadata/md5-cache/kde-apps/kwordquiz-17.04.3 b/metadata/md5-cache/kde-apps/kwordquiz-17.04.3
index 78f5e4c30d81..dc26cce57ca8 100644
--- a/metadata/md5-cache/kde-apps/kwordquiz-17.04.3
+++ b/metadata/md5-cache/kde-apps/kwordquiz-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkeduvocdocument-17.04.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 !kde-apps/kwordquiz:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kwordquiz-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d8cd79a7fb4fd74abb28c9abd0bc22ea
diff --git a/metadata/md5-cache/kde-apps/kwordquiz-17.08.2 b/metadata/md5-cache/kde-apps/kwordquiz-17.08.2
index dfcc3cbc47ca..6aee05075b71 100644
--- a/metadata/md5-cache/kde-apps/kwordquiz-17.08.2
+++ b/metadata/md5-cache/kde-apps/kwordquiz-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkeduvocdocument-17.08.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 !kde-apps/kwordquiz:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kwordquiz-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0b6191b0dd52b6450f6a88dc2e380e3d
diff --git a/metadata/md5-cache/kde-apps/kwrite-17.04.3 b/metadata/md5-cache/kde-apps/kwrite-17.04.3
index 816ca6eabd4f..90c6fab26170 100644
--- a/metadata/md5-cache/kde-apps/kwrite-17.04.3
+++ b/metadata/md5-cache/kde-apps/kwrite-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/ktexteditor-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kwrite:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kate-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d3fd21316e0b5306f7dab3968e7cc02e
diff --git a/metadata/md5-cache/kde-apps/kwrite-17.08.2 b/metadata/md5-cache/kde-apps/kwrite-17.08.2
index 571ad27519ea..17e28e864725 100644
--- a/metadata/md5-cache/kde-apps/kwrite-17.08.2
+++ b/metadata/md5-cache/kde-apps/kwrite-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/ktexteditor-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kwrite:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kate-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=834f3332aaa9d5039c5e904090a30c1b
diff --git a/metadata/md5-cache/kde-apps/libgravatar-17.04.3 b/metadata/md5-cache/kde-apps/libgravatar-17.04.3
index 138fa11b8a60..7e8fbcec8104 100644
--- a/metadata/md5-cache/kde-apps/libgravatar-17.04.3
+++ b/metadata/md5-cache/kde-apps/libgravatar-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-apps/pimcommon-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/libgravatar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/libgravatar-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3b65ce3aed571afdb86ba53228363824
diff --git a/metadata/md5-cache/kde-apps/libgravatar-17.08.2 b/metadata/md5-cache/kde-apps/libgravatar-17.08.2
index 87de2a5a64bd..cba56da54af3 100644
--- a/metadata/md5-cache/kde-apps/libgravatar-17.08.2
+++ b/metadata/md5-cache/kde-apps/libgravatar-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-apps/pimcommon-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/libgravatar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/libgravatar-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d6d8a39e6ab21e441faaa1a333697ce3
diff --git a/metadata/md5-cache/kde-apps/libkcddb-17.04.3 b/metadata/md5-cache/kde-apps/libkcddb-17.04.3
index bd8ff30a5a54..1f1047177bdd 100644
--- a/metadata/md5-cache/kde-apps/libkcddb-17.04.3
+++ b/metadata/md5-cache/kde-apps/libkcddb-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kd
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/libkcddb-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=cae1559c73606b7aada7952cfa673fd4
diff --git a/metadata/md5-cache/kde-apps/libkcddb-17.08.2 b/metadata/md5-cache/kde-apps/libkcddb-17.08.2
index ff68579c5066..e97833eb8d88 100644
--- a/metadata/md5-cache/kde-apps/libkcddb-17.08.2
+++ b/metadata/md5-cache/kde-apps/libkcddb-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kd
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/libkcddb-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e596fbb08a6cc0bc1a7b357111298fb7
diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-17.04.3 b/metadata/md5-cache/kde-apps/libkcompactdisc-17.04.3
index b85ccd3642b1..9fc0366377e5 100644
--- a/metadata/md5-cache/kde-apps/libkcompactdisc-17.04.3
+++ b/metadata/md5-cache/kde-apps/libkcompactdisc-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/solid-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/libkcompactdisc-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=aa73f159dea9b7b1153ebfc76bce6b83
diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-17.08.2 b/metadata/md5-cache/kde-apps/libkcompactdisc-17.08.2
index 73c9102d5893..260919d14d49 100644
--- a/metadata/md5-cache/kde-apps/libkcompactdisc-17.08.2
+++ b/metadata/md5-cache/kde-apps/libkcompactdisc-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/solid-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/libkcompactdisc-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=36ce868fb4be6c50f7014bbcd1e9af34
diff --git a/metadata/md5-cache/kde-apps/libkdcraw-17.04.3 b/metadata/md5-cache/kde-apps/libkdcraw-17.04.3
index 435fca9246aa..a011eb703142 100644
--- a/metadata/md5-cache/kde-apps/libkdcraw-17.04.3
+++ b/metadata/md5-cache/kde-apps/libkdcraw-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=media-libs/libraw-0.16:= >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/libkdcraw-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a3a00cf2b3436baef71672f62be99a06
diff --git a/metadata/md5-cache/kde-apps/libkdcraw-17.08.2 b/metadata/md5-cache/kde-apps/libkdcraw-17.08.2
index b0d3ba2edb13..a60fabbfb5b3 100644
--- a/metadata/md5-cache/kde-apps/libkdcraw-17.08.2
+++ b/metadata/md5-cache/kde-apps/libkdcraw-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=media-libs/libraw-0.16:= >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/libkdcraw-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2825ecf22e5e502429717dccd216e4fb
diff --git a/metadata/md5-cache/kde-apps/libkdegames-17.04.3 b/metadata/md5-cache/kde-apps/libkdegames-17.04.3
index 3d5c19f19120..bf008fa149dd 100644
--- a/metadata/md5-cache/kde-apps/libkdegames-17.04.3
+++ b/metadata/md5-cache/kde-apps/libkdegames-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kbookmarks-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/kdnssd-5.37.0:5 >=kde-frameworks/kglobalaccel-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/libsndfile media-libs/openal >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/libkdegames-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8f5852731cd2205320d05cfd19734f11
diff --git a/metadata/md5-cache/kde-apps/libkdegames-17.08.2 b/metadata/md5-cache/kde-apps/libkdegames-17.08.2
index ab2eb448a11e..a03fa8daa5af 100644
--- a/metadata/md5-cache/kde-apps/libkdegames-17.08.2
+++ b/metadata/md5-cache/kde-apps/libkdegames-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kbookmarks-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/kdnssd-5.37.0:5 >=kde-frameworks/kglobalaccel-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/libsndfile media-libs/openal >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/libkdegames-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=65d67ee5b736815b3decafef925dfd33
diff --git a/metadata/md5-cache/kde-apps/libkdegames-4.14.3-r1 b/metadata/md5-cache/kde-apps/libkdegames-4.14.3-r1
index bd30f3fe2909..e57ac11a8604 100644
--- a/metadata/md5-cache/kde-apps/libkdegames-4.14.3-r1
+++ b/metadata/md5-cache/kde-apps/libkdegames-4.14.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsndfile media-libs/openal kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/4.14.3/src/libkdegames-4.14.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f3d4e0b9099b42a3546e7f23fa1c55c0
diff --git a/metadata/md5-cache/kde-apps/libkdepim-17.04.3 b/metadata/md5-cache/kde-apps/libkdepim-17.04.3
index 468a76faf3c6..6535c71e129e 100644
--- a/metadata/md5-cache/kde-apps/libkdepim-17.04.3
+++ b/metadata/md5-cache/kde-apps/libkdepim-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-apps/akonadi-17.04.3:5 >=kde-apps/akonadi-contacts-17.04.3:5 >=kde-apps/akonadi-search-17.04.3:5 >=kde-apps/kcontacts-17.04.3:5 >=kde-apps/kldap-17.04.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/libkdepim:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/libkdepim-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=11099483a566173a87c4b06c82eb0b26
diff --git a/metadata/md5-cache/kde-apps/libkdepim-17.08.2 b/metadata/md5-cache/kde-apps/libkdepim-17.08.2
index 4d4a6e8e679d..d256fb386975 100644
--- a/metadata/md5-cache/kde-apps/libkdepim-17.08.2
+++ b/metadata/md5-cache/kde-apps/libkdepim-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-apps/akonadi-17.08.2:5 >=kde-apps/akonadi-contacts-17.08.2:5 >=kde-apps/akonadi-search-17.08.2:5 >=kde-apps/kcontacts-17.08.2:5 >=kde-apps/kldap-17.08.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/libkdepim:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/libkdepim-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=54e8a1ebd61071fbceee73367437f286
diff --git a/metadata/md5-cache/kde-apps/libkdepim-4.4.2017.04 b/metadata/md5-cache/kde-apps/libkdepim-4.4.2017.04
index e4ef186fbd72..dfd6e20380b6 100644
--- a/metadata/md5-cache/kde-apps/libkdepim-4.4.2017.04
+++ b/metadata/md5-cache/kde-apps/libkdepim-4.4.2017.04
@@ -10,5 +10,5 @@ RDEPEND=>=kde-apps/kdepimlibs-4.4.2017.04:4 kde-frameworks/oxygen-icons >=dev-qt
 RESTRICT=test
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2017.04.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d84eb4b3aafde02e6bfae0f8a723b5ba
diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-17.04.3 b/metadata/md5-cache/kde-apps/libkeduvocdocument-17.04.3
index 442e5cde37df..dc891051f863 100644
--- a/metadata/md5-cache/kde-apps/libkeduvocdocument-17.04.3
+++ b/metadata/md5-cache/kde-apps/libkeduvocdocument-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/libkeduvocdocument:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/libkeduvocdocument-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8919469c9479c0dc37bb4c9285756498
diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-17.08.2 b/metadata/md5-cache/kde-apps/libkeduvocdocument-17.08.2
index b72231c62f83..1d8569de26b0 100644
--- a/metadata/md5-cache/kde-apps/libkeduvocdocument-17.08.2
+++ b/metadata/md5-cache/kde-apps/libkeduvocdocument-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/libkeduvocdocument:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/libkeduvocdocument-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4805d93bfe3ff9debab4061d3ae7e363
diff --git a/metadata/md5-cache/kde-apps/libkexiv2-17.04.3 b/metadata/md5-cache/kde-apps/libkexiv2-17.04.3
index 956c2516ce9c..efeae230c8e1 100644
--- a/metadata/md5-cache/kde-apps/libkexiv2-17.04.3
+++ b/metadata/md5-cache/kde-apps/libkexiv2-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=media-gfx/exiv2-0.25:=[xmp=] >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/libkexiv2-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=618f7c9492c770dce7e7962ebeee5d4f
diff --git a/metadata/md5-cache/kde-apps/libkexiv2-17.08.2 b/metadata/md5-cache/kde-apps/libkexiv2-17.08.2
index 1a58a37fe385..df2ff07c60ff 100644
--- a/metadata/md5-cache/kde-apps/libkexiv2-17.08.2
+++ b/metadata/md5-cache/kde-apps/libkexiv2-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=media-gfx/exiv2-0.25:=[xmp=] >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/libkexiv2-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=16c1a752d246b2d16860a533f193c06a
diff --git a/metadata/md5-cache/kde-apps/libkface-17.04.3 b/metadata/md5-cache/kde-apps/libkface-17.04.3
index c883bd04d59b..232ed5a542c2 100644
--- a/metadata/md5-cache/kde-apps/libkface-17.04.3
+++ b/metadata/md5-cache/kde-apps/libkface-17.04.3
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/opencv:= || ( <media-libs/opencv-3.0.0 ( >=media-libs/opencv-3.1.0-r6[contrib] <media-libs/opencv-3.3 ) ) >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/libkface-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1b4531e02e3a9f734c2a4b4243e67968
diff --git a/metadata/md5-cache/kde-apps/libkface-17.08.2 b/metadata/md5-cache/kde-apps/libkface-17.08.2
index 5d12f5c1927e..6c9487f88a70 100644
--- a/metadata/md5-cache/kde-apps/libkface-17.08.2
+++ b/metadata/md5-cache/kde-apps/libkface-17.08.2
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/opencv:= || ( <media-libs/opencv-3.0.0 ( >=media-libs/opencv-3.1.0-r6[contrib] <media-libs/opencv-3.3 ) ) >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/libkface-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7f36d85dc9de94bf69597a0fa74cd73a
diff --git a/metadata/md5-cache/kde-apps/libkgapi-17.04.3 b/metadata/md5-cache/kde-apps/libkgapi-17.04.3
index 91b8eebf3841..bf47f72d94b4 100644
--- a/metadata/md5-cache/kde-apps/libkgapi-17.04.3
+++ b/metadata/md5-cache/kde-apps/libkgapi-17.04.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-apps/kcalcore-17.04.3:5 >=kde-apps/kcontacts-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/libkgapi-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0f4f055463d70adcc04f1221d36a2c1f
diff --git a/metadata/md5-cache/kde-apps/libkgapi-17.08.2 b/metadata/md5-cache/kde-apps/libkgapi-17.08.2
index d9cb047eaddb..e8ad1f04eb7d 100644
--- a/metadata/md5-cache/kde-apps/libkgapi-17.08.2
+++ b/metadata/md5-cache/kde-apps/libkgapi-17.08.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-apps/kcalcore-17.08.2:5 >=kde-apps/kcontacts-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/libkgapi-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=24dfdff37197c865db42090cea704a1f
diff --git a/metadata/md5-cache/kde-apps/libkgeomap-17.04.3 b/metadata/md5-cache/kde-apps/libkgeomap-17.04.3
index 753bef021f7c..b505519df8d5 100644
--- a/metadata/md5-cache/kde-apps/libkgeomap-17.04.3
+++ b/metadata/md5-cache/kde-apps/libkgeomap-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-apps/marble-17.04.3:5=[kde] >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/libkgeomap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/libkgeomap-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=cfb19a31d29abc717d51b59068da6975
diff --git a/metadata/md5-cache/kde-apps/libkgeomap-17.08.2 b/metadata/md5-cache/kde-apps/libkgeomap-17.08.2
index a8e186502e09..952392a75859 100644
--- a/metadata/md5-cache/kde-apps/libkgeomap-17.08.2
+++ b/metadata/md5-cache/kde-apps/libkgeomap-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-apps/marble-17.08.2:5=[kde] >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/libkgeomap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/libkgeomap-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f0d45505ea6346df1cc872a24915520c
diff --git a/metadata/md5-cache/kde-apps/libkipi-17.04.3 b/metadata/md5-cache/kde-apps/libkipi-17.04.3
index d143c7ca93b6..e59e58d1681f 100644
--- a/metadata/md5-cache/kde-apps/libkipi-17.04.3
+++ b/metadata/md5-cache/kde-apps/libkipi-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !<kde-apps/libkipi-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5/32
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/libkipi-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2897bd18f089533eacda7f4030f17351
diff --git a/metadata/md5-cache/kde-apps/libkipi-17.08.2 b/metadata/md5-cache/kde-apps/libkipi-17.08.2
index cbef4242e979..823cdd57b9a6 100644
--- a/metadata/md5-cache/kde-apps/libkipi-17.08.2
+++ b/metadata/md5-cache/kde-apps/libkipi-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !<kde-apps/libkipi-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5/32
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/libkipi-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=dcb171a2447ffca8a06f9b62f9b522f1
diff --git a/metadata/md5-cache/kde-apps/libkleo-17.04.3 b/metadata/md5-cache/kde-apps/libkleo-17.04.3
index 36af473cb543..bea051af10e6 100644
--- a/metadata/md5-cache/kde-apps/libkleo-17.04.3
+++ b/metadata/md5-cache/kde-apps/libkleo-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-apps/kpimtextedit-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/libkleo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/libkleo-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8d217de1d6339c23a168e52eb1f65e0e
diff --git a/metadata/md5-cache/kde-apps/libkleo-17.08.2 b/metadata/md5-cache/kde-apps/libkleo-17.08.2
index 33b97961074d..070e50e95d4c 100644
--- a/metadata/md5-cache/kde-apps/libkleo-17.08.2
+++ b/metadata/md5-cache/kde-apps/libkleo-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-apps/kpimtextedit-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/libkleo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/libkleo-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=58513d6ce947dfdb11a79afa0d984a12
diff --git a/metadata/md5-cache/kde-apps/libkleo-4.4.2017.04 b/metadata/md5-cache/kde-apps/libkleo-4.4.2017.04
index f22378f67054..ff7b14e67d61 100644
--- a/metadata/md5-cache/kde-apps/libkleo-4.4.2017.04
+++ b/metadata/md5-cache/kde-apps/libkleo-4.4.2017.04
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kdepimlibs-4.14.10_p20160611:4 app-crypt/gpgme !>kde-apps/kdepimlibs-4.14.11_pre20160211 app-crypt/gnupg kde-frameworks/oxygen-icons >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2017.04.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1d5d373eb61a0de4a8e70b73c27d452e
diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-17.04.3 b/metadata/md5-cache/kde-apps/libkmahjongg-17.04.3
index aad1639d76ff..07009e4998ed 100644
--- a/metadata/md5-cache/kde-apps/libkmahjongg-17.04.3
+++ b/metadata/md5-cache/kde-apps/libkmahjongg-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/libkmahjongg-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c78fbf3fcc78620466680bf527bcde57
diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-17.08.2 b/metadata/md5-cache/kde-apps/libkmahjongg-17.08.2
index c6aa07e62932..71231f1b9527 100644
--- a/metadata/md5-cache/kde-apps/libkmahjongg-17.08.2
+++ b/metadata/md5-cache/kde-apps/libkmahjongg-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/libkmahjongg-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ae0159c985c9ea72b115b8e9158c5d44
diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-17.04.3 b/metadata/md5-cache/kde-apps/libkomparediff2-17.04.3
index 8cf966675b53..fa15184f9f1a 100644
--- a/metadata/md5-cache/kde-apps/libkomparediff2-17.04.3
+++ b/metadata/md5-cache/kde-apps/libkomparediff2-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/libkomparediff2:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/libkomparediff2-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=80bc70fb0e0d54f8afe61f8b28676ffe
diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-17.08.2 b/metadata/md5-cache/kde-apps/libkomparediff2-17.08.2
index 63e9c8380a57..ce2f12337659 100644
--- a/metadata/md5-cache/kde-apps/libkomparediff2-17.08.2
+++ b/metadata/md5-cache/kde-apps/libkomparediff2-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/libkomparediff2:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/libkomparediff2-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6d43df2985a81ae8cb8b159e61e0b91f
diff --git a/metadata/md5-cache/kde-apps/libkpgp-4.4.2017.04 b/metadata/md5-cache/kde-apps/libkpgp-4.4.2017.04
index 82e65df949c7..34e6a0bc6468 100644
--- a/metadata/md5-cache/kde-apps/libkpgp-4.4.2017.04
+++ b/metadata/md5-cache/kde-apps/libkpgp-4.4.2017.04
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
 SLOT=4/4.4
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/kdepim-4.4.2017.04.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=56aaeb7147facf791cbb5e5a20303e11
diff --git a/metadata/md5-cache/kde-apps/libksane-17.04.3 b/metadata/md5-cache/kde-apps/libksane-17.04.3
index d2148053506a..bd37439a4a9f 100644
--- a/metadata/md5-cache/kde-apps/libksane-17.04.3
+++ b/metadata/md5-cache/kde-apps/libksane-17.04.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-gfx/sane-backends !<kde-apps/libksane-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/libksane-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5492bcaf9f2e18f976d60bf8377fa827
diff --git a/metadata/md5-cache/kde-apps/libksane-17.08.2 b/metadata/md5-cache/kde-apps/libksane-17.08.2
index 7a485f876f32..bfcc17cf1646 100644
--- a/metadata/md5-cache/kde-apps/libksane-17.08.2
+++ b/metadata/md5-cache/kde-apps/libksane-17.08.2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-gfx/sane-backends !<kde-apps/libksane-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/libksane-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3afc048f212ddb8582ddc852f3ef8aa4
diff --git a/metadata/md5-cache/kde-apps/libksieve-17.04.3 b/metadata/md5-cache/kde-apps/libksieve-17.04.3
index 0ab257eaf154..11e3e0a81254 100644
--- a/metadata/md5-cache/kde-apps/libksieve-17.04.3
+++ b/metadata/md5-cache/kde-apps/libksieve-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/libksieve-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=45094a30cba9fafc012c4910ab9629ad
diff --git a/metadata/md5-cache/kde-apps/libksieve-17.08.2 b/metadata/md5-cache/kde-apps/libksieve-17.08.2
index 11e25f674d66..01e711ff2b36 100644
--- a/metadata/md5-cache/kde-apps/libksieve-17.08.2
+++ b/metadata/md5-cache/kde-apps/libksieve-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/libksieve-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=718e1d546ceea39c92cd89f6764ff9fc
diff --git a/metadata/md5-cache/kde-apps/libktnef-17.04.3 b/metadata/md5-cache/kde-apps/libktnef-17.04.3
index 11285673ef9e..6a8f4b604f6d 100644
--- a/metadata/md5-cache/kde-apps/libktnef-17.04.3
+++ b/metadata/md5-cache/kde-apps/libktnef-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-apps/kcalcore-17.04.3:5 >=kde-apps/kcalutils-17.04.3:5 >=kde-apps/kcontacts-17.04.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/libktnef:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/ktnef-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=52518cde20f4947e84c1a41f299d5ab2
diff --git a/metadata/md5-cache/kde-apps/libktnef-17.08.2 b/metadata/md5-cache/kde-apps/libktnef-17.08.2
index 9651e6f8d29a..0d22a8bb8b9d 100644
--- a/metadata/md5-cache/kde-apps/libktnef-17.08.2
+++ b/metadata/md5-cache/kde-apps/libktnef-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-apps/kcalcore-17.08.2:5 >=kde-apps/kcalutils-17.08.2:5 >=kde-apps/kcontacts-17.08.2:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/libktnef:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/ktnef-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=757da307823486b6782b412eaee1ff08
diff --git a/metadata/md5-cache/kde-apps/lokalize-17.04.3 b/metadata/md5-cache/kde-apps/lokalize-17.04.3
index d9b365a4a9fd..bc5a9d38e35e 100644
--- a/metadata/md5-cache/kde-apps/lokalize-17.04.3
+++ b/metadata/md5-cache/kde-apps/lokalize-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/lokalize-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=90903b0cc9a6f9e395abf953ae3990b0
diff --git a/metadata/md5-cache/kde-apps/lokalize-17.08.2 b/metadata/md5-cache/kde-apps/lokalize-17.08.2
index 70efda8e87a7..4056f4b1ba92 100644
--- a/metadata/md5-cache/kde-apps/lokalize-17.08.2
+++ b/metadata/md5-cache/kde-apps/lokalize-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/lokalize-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4819e7907ca5be8c1e4f6dfc723cfd76
diff --git a/metadata/md5-cache/kde-apps/lskat-17.04.3 b/metadata/md5-cache/kde-apps/lskat-17.04.3
index 2048b5e2dfbe..688eebe4b781 100644
--- a/metadata/md5-cache/kde-apps/lskat-17.04.3
+++ b/metadata/md5-cache/kde-apps/lskat-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4 kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) selinux? ( sec-policy/selinux-games ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.04
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/lskat-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=601f9440f99de78bb170147440806057
diff --git a/metadata/md5-cache/kde-apps/lskat-17.08.2 b/metadata/md5-cache/kde-apps/lskat-17.08.2
index 48b6352a5188..e4cec4455945 100644
--- a/metadata/md5-cache/kde-apps/lskat-17.08.2
+++ b/metadata/md5-cache/kde-apps/lskat-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 !kde-apps/lskat:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/lskat-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0e840025da932be0ae1c7434f74bf349
diff --git a/metadata/md5-cache/kde-apps/mailcommon-17.04.3 b/metadata/md5-cache/kde-apps/mailcommon-17.04.3
index 102e9ffebabb..8e6baaa6de8e 100644
--- a/metadata/md5-cache/kde-apps/mailcommon-17.04.3
+++ b/metadata/md5-cache/kde-apps/mailcommon-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/mailcommon-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=06390cfb0276e09db9eed7afc8a9c267
diff --git a/metadata/md5-cache/kde-apps/mailcommon-17.08.2 b/metadata/md5-cache/kde-apps/mailcommon-17.08.2
index 55b153d2e1c3..1e97743d9be4 100644
--- a/metadata/md5-cache/kde-apps/mailcommon-17.08.2
+++ b/metadata/md5-cache/kde-apps/mailcommon-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/mailcommon-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e01f2b88b90f0b6214d26b6e34b467eb
diff --git a/metadata/md5-cache/kde-apps/mailimporter-17.04.3 b/metadata/md5-cache/kde-apps/mailimporter-17.04.3
index 86259c548a45..cdf31f248e31 100644
--- a/metadata/md5-cache/kde-apps/mailimporter-17.04.3
+++ b/metadata/md5-cache/kde-apps/mailimporter-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-apps/akonadi-17.04.3:5 >=kde-apps/akonadi-mime-17.04.3:5 >=kde-apps/kmime-17.04.3:5 >=kde-apps/libkdepim-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/mailimporter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/mailimporter-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=00a25851d3b9d7f9c205554ba55eb7e5
diff --git a/metadata/md5-cache/kde-apps/mailimporter-17.08.2 b/metadata/md5-cache/kde-apps/mailimporter-17.08.2
index d4213396446d..d9e9d88856e4 100644
--- a/metadata/md5-cache/kde-apps/mailimporter-17.08.2
+++ b/metadata/md5-cache/kde-apps/mailimporter-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-apps/akonadi-17.08.2:5 >=kde-apps/akonadi-mime-17.08.2:5 >=kde-apps/kmime-17.08.2:5 >=kde-apps/libkdepim-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/mailimporter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/mailimporter-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0fd5e0538adba1dc85f0ca314e528d8f
diff --git a/metadata/md5-cache/kde-apps/marble-17.04.3 b/metadata/md5-cache/kde-apps/marble-17.04.3
index 110a67a666a2..2beca70d612d 100644
--- a/metadata/md5-cache/kde-apps/marble-17.04.3
+++ b/metadata/md5-cache/kde-apps/marble-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qt
 RESTRICT=test
 SLOT=5/17.04
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/marble-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a7bdc1dc0747cc19bdf3c098121e9403
diff --git a/metadata/md5-cache/kde-apps/marble-17.08.2 b/metadata/md5-cache/kde-apps/marble-17.08.2
index 337fdb25a943..4b7d165bc9c2 100644
--- a/metadata/md5-cache/kde-apps/marble-17.08.2
+++ b/metadata/md5-cache/kde-apps/marble-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qt
 RESTRICT=test
 SLOT=5/17.08
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/marble-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=55fcb6830c471c91ec82fb310bf87a07
diff --git a/metadata/md5-cache/kde-apps/mbox-importer-17.04.3 b/metadata/md5-cache/kde-apps/mbox-importer-17.04.3
index b7225c6cd62c..ed21268faabb 100644
--- a/metadata/md5-cache/kde-apps/mbox-importer-17.04.3
+++ b/metadata/md5-cache/kde-apps/mbox-importer-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-apps/akonadi-17.04.3:5 >=kde-apps/kidentitymanagement-17.04.3:5 >=kde-apps/mailcommon-17.04.3:5 >=kde-apps/mailimporter-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 !kde-apps/mbox-importer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/mbox-importer-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=19559f2141f1cc1e970369136489ec6b
diff --git a/metadata/md5-cache/kde-apps/mbox-importer-17.08.2 b/metadata/md5-cache/kde-apps/mbox-importer-17.08.2
index 1042218e2f00..769876770fdb 100644
--- a/metadata/md5-cache/kde-apps/mbox-importer-17.08.2
+++ b/metadata/md5-cache/kde-apps/mbox-importer-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-apps/akonadi-17.08.2:5 >=kde-apps/kidentitymanagement-17.08.2:5 >=kde-apps/mailcommon-17.08.2:5 >=kde-apps/mailimporter-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 !kde-apps/mbox-importer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/mbox-importer-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=54ff6df6a1f35d241108aba19ce6f998
diff --git a/metadata/md5-cache/kde-apps/messagelib-17.04.3 b/metadata/md5-cache/kde-apps/messagelib-17.04.3
index 831bd115dd00..d69f8656227b 100644
--- a/metadata/md5-cache/kde-apps/messagelib-17.04.3
+++ b/metadata/md5-cache/kde-apps/messagelib-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/messagelib-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f69f70d7f623530e270ffd7387ec8956
diff --git a/metadata/md5-cache/kde-apps/messagelib-17.08.2 b/metadata/md5-cache/kde-apps/messagelib-17.08.2
index 863b0e0a2d11..4ceac853d556 100644
--- a/metadata/md5-cache/kde-apps/messagelib-17.08.2
+++ b/metadata/md5-cache/kde-apps/messagelib-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/messagelib-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=13498747f2e95dcc0e9542752f68fb66
diff --git a/metadata/md5-cache/kde-apps/minuet-17.04.3 b/metadata/md5-cache/kde-apps/minuet-17.04.3
index 21b7c1f01cb3..43a8a046b247 100644
--- a/metadata/md5-cache/kde-apps/minuet-17.04.3
+++ b/metadata/md5-cache/kde-apps/minuet-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=dev-qt/qtdeclarative-5.7.0:5 >=dev-qt/qtgui-5.7.0:5 >=dev-qt/qtsvg-5.7.0:5 >=dev-qt/qtquickcontrols2-5.7.0:5 media-sound/fluidsynth >=kde-frameworks/kf-env-4 !kde-apps/minuet:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.0:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/minuet-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1818e7504ced7d5456902b849d76dd5c
diff --git a/metadata/md5-cache/kde-apps/minuet-17.08.2 b/metadata/md5-cache/kde-apps/minuet-17.08.2
index 1c8dbb748f19..f1b67be0f925 100644
--- a/metadata/md5-cache/kde-apps/minuet-17.08.2
+++ b/metadata/md5-cache/kde-apps/minuet-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtquickcontrols2-5.7.1:5 media-sound/fluidsynth >=kde-frameworks/kf-env-4 !kde-apps/minuet:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/minuet-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f9d531c954732a7f496b47179c3da7a0
diff --git a/metadata/md5-cache/kde-apps/okteta-17.04.3 b/metadata/md5-cache/kde-apps/okteta-17.04.3
index 5808cc6b188d..697f4a7ea8d6 100644
--- a/metadata/md5-cache/kde-apps/okteta-17.04.3
+++ b/metadata/md5-cache/kde-apps/okteta-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.37.0:5 >=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtscript-5.7.1:5[scripttools] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 crypt? ( app-crypt/qca:2[qt5] ) >=kde-frameworks/kf-env-4 !kde-apps/okteta:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/okteta-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9970290740e7c9a15de1c55d6f2b8b9c
diff --git a/metadata/md5-cache/kde-apps/okteta-17.08.2 b/metadata/md5-cache/kde-apps/okteta-17.08.2
index 6206ed92e158..9435a09862b1 100644
--- a/metadata/md5-cache/kde-apps/okteta-17.08.2
+++ b/metadata/md5-cache/kde-apps/okteta-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.37.0:5 >=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtscript-5.7.1:5[scripttools] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 crypt? ( app-crypt/qca:2[qt5] ) >=kde-frameworks/kf-env-4 !kde-apps/okteta:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/okteta-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d566e35fa71d8eca0cfc0f9aaf89d9e7
diff --git a/metadata/md5-cache/kde-apps/okular-17.04.3 b/metadata/md5-cache/kde-apps/okular-17.04.3
index 7b3c845fdb60..58e0e93af8e2 100644
--- a/metadata/md5-cache/kde-apps/okular-17.04.3
+++ b/metadata/md5-cache/kde-apps/okular-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.37.0:5 >=kde-frameworks/karchive-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/okular-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=34e54da5a374562f9c23fe251d12518e
diff --git a/metadata/md5-cache/kde-apps/okular-17.08.2 b/metadata/md5-cache/kde-apps/okular-17.08.2
index c999704a9923..77a32dc5f12b 100644
--- a/metadata/md5-cache/kde-apps/okular-17.08.2
+++ b/metadata/md5-cache/kde-apps/okular-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.37.0:5 >=kde-frameworks/karchive-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/okular-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=305902409412f688e5daa92968b24443
diff --git a/metadata/md5-cache/kde-apps/palapeli-17.04.3 b/metadata/md5-cache/kde-apps/palapeli-17.04.3
index 04e5d9b26b49..5d94686a95a4 100644
--- a/metadata/md5-cache/kde-apps/palapeli-17.04.3
+++ b/metadata/md5-cache/kde-apps/palapeli-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4 kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.04
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/palapeli-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e4ed49b19f14a1ca66f5abf68b1e0a7d
diff --git a/metadata/md5-cache/kde-apps/palapeli-17.08.2 b/metadata/md5-cache/kde-apps/palapeli-17.08.2
index 340859242310..9e83b43b879d 100644
--- a/metadata/md5-cache/kde-apps/palapeli-17.08.2
+++ b/metadata/md5-cache/kde-apps/palapeli-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkdegames-4.14.3:4 kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.08
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/palapeli-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=233f0eace1f82276ecb2be8d2cfbf455
diff --git a/metadata/md5-cache/kde-apps/parley-17.04.3 b/metadata/md5-cache/kde-apps/parley-17.04.3
index 6d782333fa25..231056b1f0d4 100644
--- a/metadata/md5-cache/kde-apps/parley-17.04.3
+++ b/metadata/md5-cache/kde-apps/parley-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkeduvocdocument-17.04.3:5 >=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/khtml-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kross-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/sonnet-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtmultimedia-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/libxml2:2 dev-libs/libxslt >=kde-apps/kdeedu-data-17.04.3:5 >=kde-frameworks/kf-env-4 !kde-apps/parley:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/parley-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9742dcc125a1fb993e82927ba7b49058
diff --git a/metadata/md5-cache/kde-apps/parley-17.08.2 b/metadata/md5-cache/kde-apps/parley-17.08.2
index 4d894144432e..faf202807f63 100644
--- a/metadata/md5-cache/kde-apps/parley-17.08.2
+++ b/metadata/md5-cache/kde-apps/parley-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkeduvocdocument-17.08.2:5 >=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/khtml-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kross-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/sonnet-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtmultimedia-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/libxml2:2 dev-libs/libxslt >=kde-apps/kdeedu-data-17.08.2:5 >=kde-frameworks/kf-env-4 !kde-apps/parley:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/parley-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4a0ce323298a0f12ad02c3deb4d228a5
diff --git a/metadata/md5-cache/kde-apps/phonon-kde-16.04.3 b/metadata/md5-cache/kde-apps/phonon-kde-16.04.3
index 69868066af03..cbeec454736c 100644
--- a/metadata/md5-cache/kde-apps/phonon-kde-16.04.3
+++ b/metadata/md5-cache/kde-apps/phonon-kde-16.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/phonon[qt4] alsa? ( media-libs/alsa-lib ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.21[glib] ) kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/16.04
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/kde-runtime-16.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=14435615c72f70b27e5f59ee2a9ab2e5
diff --git a/metadata/md5-cache/kde-apps/picmi-17.04.3 b/metadata/md5-cache/kde-apps/picmi-17.04.3
index f1c8272459a8..0131b6d26baa 100644
--- a/metadata/md5-cache/kde-apps/picmi-17.04.3
+++ b/metadata/md5-cache/kde-apps/picmi-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.04.3:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/picmi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/picmi-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=db14bd4a689bc4aa0a460674ba8467e6
diff --git a/metadata/md5-cache/kde-apps/picmi-17.08.2 b/metadata/md5-cache/kde-apps/picmi-17.08.2
index 4cc3a792f74c..5ab2533af9f0 100644
--- a/metadata/md5-cache/kde-apps/picmi-17.08.2
+++ b/metadata/md5-cache/kde-apps/picmi-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkdegames-17.08.2:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/picmi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/picmi-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bdbc2ceada94f206dd21b467194c63ac
diff --git a/metadata/md5-cache/kde-apps/pim-data-exporter-17.04.3 b/metadata/md5-cache/kde-apps/pim-data-exporter-17.04.3
index 4d093ade9f8e..ee4b2d2a4f88 100644
--- a/metadata/md5-cache/kde-apps/pim-data-exporter-17.04.3
+++ b/metadata/md5-cache/kde-apps/pim-data-exporter-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-17.04.3:5 >=kde-apps/kcontacts-17.04.3:5 >=kde-apps/kidentitymanagement-17.04.3:5 >=kde-apps/kmailtransport-17.04.3:5 >=kde-apps/kmime-17.04.3:5 >=kde-apps/kpimtextedit-17.04.3:5 >=kde-apps/libkdepim-17.04.3:5 >=kde-apps/mailcommon-17.04.3:5 >=kde-apps/pimcommon-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 !kde-apps/pim-data-exporter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/pim-data-exporter-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1efc1e2c4585334dd66a3ab3f7b363a8
diff --git a/metadata/md5-cache/kde-apps/pim-data-exporter-17.08.2 b/metadata/md5-cache/kde-apps/pim-data-exporter-17.08.2
index ca672d759ef9..869174ce4aed 100644
--- a/metadata/md5-cache/kde-apps/pim-data-exporter-17.08.2
+++ b/metadata/md5-cache/kde-apps/pim-data-exporter-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-17.08.2:5 >=kde-apps/kcontacts-17.08.2:5 >=kde-apps/kidentitymanagement-17.08.2:5 >=kde-apps/kmailtransport-17.08.2:5 >=kde-apps/kmime-17.08.2:5 >=kde-apps/kpimtextedit-17.08.2:5 >=kde-apps/libkdepim-17.08.2:5 >=kde-apps/mailcommon-17.08.2:5 >=kde-apps/pimcommon-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 !kde-apps/pim-data-exporter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/pim-data-exporter-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9ec560e9bd982d4da8361d05c6f5cb92
diff --git a/metadata/md5-cache/kde-apps/pim-sieve-editor-17.04.3 b/metadata/md5-cache/kde-apps/pim-sieve-editor-17.04.3
index 0edad36b0560..0a2aaf53c0c7 100644
--- a/metadata/md5-cache/kde-apps/pim-sieve-editor-17.04.3
+++ b/metadata/md5-cache/kde-apps/pim-sieve-editor-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kbookmarks-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-17.04.3:5 >=kde-apps/akonadi-contacts-17.04.3:5 >=kde-apps/akonadi-mime-17.04.3:5 >=kde-apps/calendarsupport-17.04.3:5 >=kde-apps/kcalcore-17.04.3:5 >=kde-apps/kcontacts-17.04.3:5 >=kde-apps/kmailtransport-17.04.3:5 >=kde-apps/libksieve-17.04.3:5 >=kde-apps/pimcommon-17.04.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/pim-sieve-editor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/pim-sieve-editor-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=369a26941ecff91af7fe061edac4905b
diff --git a/metadata/md5-cache/kde-apps/pim-sieve-editor-17.08.2 b/metadata/md5-cache/kde-apps/pim-sieve-editor-17.08.2
index 979b02571929..0bcc8a969aa1 100644
--- a/metadata/md5-cache/kde-apps/pim-sieve-editor-17.08.2
+++ b/metadata/md5-cache/kde-apps/pim-sieve-editor-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kbookmarks-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-17.08.2:5 >=kde-apps/akonadi-contacts-17.08.2:5 >=kde-apps/akonadi-mime-17.08.2:5 >=kde-apps/calendarsupport-17.08.2:5 >=kde-apps/kcalcore-17.08.2:5 >=kde-apps/kcontacts-17.08.2:5 >=kde-apps/kmailtransport-17.08.2:5 >=kde-apps/libksieve-17.08.2:5 >=kde-apps/pimcommon-17.08.2:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/pim-sieve-editor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/pim-sieve-editor-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c62ace281fc947bbece0d3c4ff0a100a
diff --git a/metadata/md5-cache/kde-apps/pimcommon-17.04.3-r1 b/metadata/md5-cache/kde-apps/pimcommon-17.04.3-r1
index 251ef8807a9c..c98f16d29c8b 100644
--- a/metadata/md5-cache/kde-apps/pimcommon-17.04.3-r1
+++ b/metadata/md5-cache/kde-apps/pimcommon-17.04.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-17.04.3:5 >=kde-apps/akonadi-contacts-17.04.3:5 >=kde-apps/kcontacts-17.04.3:5 >=kde-apps/kimap-17.04.3:5 >=kde-apps/kpimtextedit-17.04.3:5 >=kde-apps/libkdepim-17.04.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/grantlee:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/pimcommon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/pimcommon-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8ede0502a833e15494a74f827133d1cc
diff --git a/metadata/md5-cache/kde-apps/pimcommon-17.08.2 b/metadata/md5-cache/kde-apps/pimcommon-17.08.2
index ef84e95fc80a..192ca4128ebc 100644
--- a/metadata/md5-cache/kde-apps/pimcommon-17.08.2
+++ b/metadata/md5-cache/kde-apps/pimcommon-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-17.08.2:5 >=kde-apps/akonadi-contacts-17.08.2:5 >=kde-apps/kcontacts-17.08.2:5 >=kde-apps/kimap-17.08.2:5 >=kde-apps/kpimtextedit-17.08.2:5 >=kde-apps/libkdepim-17.08.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/grantlee:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 !kde-apps/pimcommon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/pimcommon-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e865a59e55adf08c61b3a7bc934da903
diff --git a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-17.04.3 b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-17.04.3
index b28715cad25d..5f784b9cee10 100644
--- a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-17.04.3
+++ b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-17.04.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-2.1 )
 RDEPEND=>=kde-apps/ktp-accounts-kcm-17.04.3 >=kde-apps/ktp-approver-17.04.3 >=kde-apps/ktp-auth-handler-17.04.3 >=kde-apps/ktp-common-internals-17.04.3 >=kde-apps/ktp-contact-list-17.04.3 >=kde-apps/ktp-contact-runner-17.04.3 >=kde-apps/ktp-desktop-applets-17.04.3 >=kde-apps/ktp-filetransfer-handler-17.04.3 >=kde-apps/ktp-kded-module-17.04.3 >=kde-apps/ktp-send-file-17.04.3 >=kde-apps/ktp-text-ui-17.04.3 !kde-apps/plasma-telepathy-meta:4 gstreamer? ( >=kde-apps/ktp-call-ui-17.04.3 ) !kde-apps/plasma-telepathy-meta:4
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	kde5-meta-pkg	fc5b88f735e794095606833579179a56	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4a6161f9748c2b89828a07c39eba485a
diff --git a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-17.08.2 b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-17.08.2
index b53066536f52..297d6988531d 100644
--- a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-17.08.2
+++ b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-17.08.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-2.1 )
 RDEPEND=>=kde-apps/ktp-accounts-kcm-17.08.2 >=kde-apps/ktp-approver-17.08.2 >=kde-apps/ktp-auth-handler-17.08.2 >=kde-apps/ktp-common-internals-17.08.2 >=kde-apps/ktp-contact-list-17.08.2 >=kde-apps/ktp-contact-runner-17.08.2 >=kde-apps/ktp-desktop-applets-17.08.2 >=kde-apps/ktp-filetransfer-handler-17.08.2 >=kde-apps/ktp-kded-module-17.08.2 >=kde-apps/ktp-send-file-17.08.2 >=kde-apps/ktp-text-ui-17.08.2 gstreamer? ( >=kde-apps/ktp-call-ui-17.08.2 ) !kde-apps/plasma-telepathy-meta:4
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	kde5-meta-pkg	fc5b88f735e794095606833579179a56	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1615b0b2d699b0becaff58ddf6b0e4e8
diff --git a/metadata/md5-cache/kde-apps/poxml-17.04.3 b/metadata/md5-cache/kde-apps/poxml-17.04.3
index cf454e820291..1948e370a61f 100644
--- a/metadata/md5-cache/kde-apps/poxml-17.04.3
+++ b/metadata/md5-cache/kde-apps/poxml-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtxml-5.7.1:5 sys-devel/gettext >=kde-frameworks/kf-env-4 !kde-apps/poxml:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/poxml-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2e74b164ec2bc28a937cbbbda7512b56
diff --git a/metadata/md5-cache/kde-apps/poxml-17.08.2 b/metadata/md5-cache/kde-apps/poxml-17.08.2
index 8ce6285b837f..295b13e7491a 100644
--- a/metadata/md5-cache/kde-apps/poxml-17.08.2
+++ b/metadata/md5-cache/kde-apps/poxml-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtxml-5.7.1:5 sys-devel/gettext >=kde-frameworks/kf-env-4 !kde-apps/poxml:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/poxml-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6e2ae667b3e7964ba2e2a5d688aba0da
diff --git a/metadata/md5-cache/kde-apps/print-manager-17.04.3 b/metadata/md5-cache/kde-apps/print-manager-17.04.3
index fb0924b21bf4..4fbf06592528 100644
--- a/metadata/md5-cache/kde-apps/print-manager-17.04.3
+++ b/metadata/md5-cache/kde-apps/print-manager-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/plasma-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 net-print/cups >=kde-plasma/kde-cli-tools-5.10.5:5 gtk? ( app-admin/system-config-printer ) >=kde-frameworks/kf-env-4 !kde-apps/print-manager:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/print-manager-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a01a19d08aa3a28a7ae1146e85045fcd
diff --git a/metadata/md5-cache/kde-apps/print-manager-17.08.2 b/metadata/md5-cache/kde-apps/print-manager-17.08.2
index 321bb8aed98f..6dcc7a988d41 100644
--- a/metadata/md5-cache/kde-apps/print-manager-17.08.2
+++ b/metadata/md5-cache/kde-apps/print-manager-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/plasma-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 net-print/cups >=kde-plasma/kde-cli-tools-5.10.5:5 gtk? ( app-admin/system-config-printer ) >=kde-frameworks/kf-env-4 !kde-apps/print-manager:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/print-manager-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2c266c1b21150a263cb9313e2dd6df96
diff --git a/metadata/md5-cache/kde-apps/rocs-17.04.3 b/metadata/md5-cache/kde-apps/rocs-17.04.3
index 3d96bba90947..56c38e8ced30 100644
--- a/metadata/md5-cache/kde-apps/rocs-17.04.3
+++ b/metadata/md5-cache/kde-apps/rocs-17.04.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/rocs-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=cd8d829e5fce2e5af39e8844102ceff0
diff --git a/metadata/md5-cache/kde-apps/rocs-17.08.2 b/metadata/md5-cache/kde-apps/rocs-17.08.2
index dba9f26a9bf7..19064383ae31 100644
--- a/metadata/md5-cache/kde-apps/rocs-17.08.2
+++ b/metadata/md5-cache/kde-apps/rocs-17.08.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/rocs-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=be5313b5817f506772c39b438cc325e9
diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.04.3 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.04.3
index c658f7d2ee50..bf108fd9f519 100644
--- a/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.04.3
+++ b/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kwallet-5.37.0:5 net-libs/signond >=kde-frameworks/kf-env-4 !kde-apps/signon-kwallet-extension:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/signon-kwallet-extension-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b57e48edd98b470a742aa2973f075183
diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.08.2 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.08.2
index dcc446857c6f..dd5efe13d7b7 100644
--- a/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.08.2
+++ b/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kwallet-5.37.0:5 net-libs/signond >=kde-frameworks/kf-env-4 !kde-apps/signon-kwallet-extension:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/signon-kwallet-extension-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=61b8bd8a81b373357256132c5757f264
diff --git a/metadata/md5-cache/kde-apps/spectacle-17.04.3 b/metadata/md5-cache/kde-apps/spectacle-17.04.3
index 2038dcec1bdc..ca23ba3d8401 100644
--- a/metadata/md5-cache/kde-apps/spectacle-17.04.3
+++ b/metadata/md5-cache/kde-apps/spectacle-17.04.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-17.04.3:5= ) share? ( dev-libs/purpose:5 ) kipi? ( media-plugins/kipi-plugins:5 ) !kde-apps/ksnapshot >=kde-frameworks/kf-env-4 !kde-apps/spectacle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/spectacle-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=04edfb02b060947df0414b93428e6fcc
diff --git a/metadata/md5-cache/kde-apps/spectacle-17.08.2 b/metadata/md5-cache/kde-apps/spectacle-17.08.2
index 0bd6c22763ea..77f34984a3d8 100644
--- a/metadata/md5-cache/kde-apps/spectacle-17.08.2
+++ b/metadata/md5-cache/kde-apps/spectacle-17.08.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-17.08.2:5= ) share? ( dev-libs/purpose:5 ) kipi? ( media-plugins/kipi-plugins:5 ) !kde-apps/ksnapshot >=kde-frameworks/kf-env-4 !kde-apps/spectacle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/spectacle-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=191475f5863d70d17d355f94753fd44c
diff --git a/metadata/md5-cache/kde-apps/step-17.04.3 b/metadata/md5-cache/kde-apps/step-17.04.3
index 07cfe46563ac..0f3a27bacc9a 100644
--- a/metadata/md5-cache/kde-apps/step-17.04.3
+++ b/metadata/md5-cache/kde-apps/step-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/khtml-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kplotting-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtopengl-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-cpp/eigen-3.2:3 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) >=kde-frameworks/kf-env-4 !kde-apps/step:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/step-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=062400f1c210b109d670f89b0f42dbec
diff --git a/metadata/md5-cache/kde-apps/step-17.08.2 b/metadata/md5-cache/kde-apps/step-17.08.2
index 3bd976ac03a9..08f7c2353fbc 100644
--- a/metadata/md5-cache/kde-apps/step-17.08.2
+++ b/metadata/md5-cache/kde-apps/step-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/khtml-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kplotting-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtopengl-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-cpp/eigen-3.2:3 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) >=kde-frameworks/kf-env-4 !kde-apps/step:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/step-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fd5b17f0e7c524d886a1ff6a70ab373c
diff --git a/metadata/md5-cache/kde-apps/svgpart-17.04.3 b/metadata/md5-cache/kde-apps/svgpart-17.04.3
index b6ed2561fd77..c28d4a143b56 100644
--- a/metadata/md5-cache/kde-apps/svgpart-17.04.3
+++ b/metadata/md5-cache/kde-apps/svgpart-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/svgpart-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c6264b84af400315a1241b05c148b2bc
diff --git a/metadata/md5-cache/kde-apps/svgpart-17.08.2 b/metadata/md5-cache/kde-apps/svgpart-17.08.2
index 473e71b19b31..c4171a4df7fe 100644
--- a/metadata/md5-cache/kde-apps/svgpart-17.08.2
+++ b/metadata/md5-cache/kde-apps/svgpart-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/svgpart-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=504b2180d97c980ad75766d98ada92df
diff --git a/metadata/md5-cache/kde-apps/sweeper-17.04.3 b/metadata/md5-cache/kde-apps/sweeper-17.04.3
index aa3e9bc5c266..e37e7c7a282b 100644
--- a/metadata/md5-cache/kde-apps/sweeper-17.04.3
+++ b/metadata/md5-cache/kde-apps/sweeper-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.04
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/sweeper-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5376decdc8be41d0259eac07e9b7bb7b
diff --git a/metadata/md5-cache/kde-apps/sweeper-17.08.2 b/metadata/md5-cache/kde-apps/sweeper-17.08.2
index b66a6cb330b3..fa17e9ad390d 100644
--- a/metadata/md5-cache/kde-apps/sweeper-17.08.2
+++ b/metadata/md5-cache/kde-apps/sweeper-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.08
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/sweeper-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=de5a0c627a43deb0a10558f2489fc833
diff --git a/metadata/md5-cache/kde-apps/syndication-17.04.3 b/metadata/md5-cache/kde-apps/syndication-17.04.3
index 36db3f1961e3..1d81caf5dfb2 100644
--- a/metadata/md5-cache/kde-apps/syndication-17.04.3
+++ b/metadata/md5-cache/kde-apps/syndication-17.04.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/syndication:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/syndication-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3d6306dc516a6ac49583c141292e6f43
diff --git a/metadata/md5-cache/kde-apps/syndication-17.08.2 b/metadata/md5-cache/kde-apps/syndication-17.08.2
index dee6f3246c46..961d96dcabd0 100644
--- a/metadata/md5-cache/kde-apps/syndication-17.08.2
+++ b/metadata/md5-cache/kde-apps/syndication-17.08.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !kde-apps/syndication:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/syndication-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0621e72963fe30b1d95fd2679db34766
diff --git a/metadata/md5-cache/kde-apps/thumbnailers-17.04.3 b/metadata/md5-cache/kde-apps/thumbnailers-17.04.3
index 655e839781d1..5a4e0994a434 100644
--- a/metadata/md5-cache/kde-apps/thumbnailers-17.04.3
+++ b/metadata/md5-cache/kde-apps/thumbnailers-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kio-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 raw? ( >=kde-apps/libkdcraw-17.04.3:5 >=kde-apps/libkexiv2-17.04.3:5 ) >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kdegraphics-thumbnailers-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ff0667224ca07d7cbee6e9fd3f35e145
diff --git a/metadata/md5-cache/kde-apps/thumbnailers-17.08.2 b/metadata/md5-cache/kde-apps/thumbnailers-17.08.2
index 68be2b34dd38..64e324d2eb49 100644
--- a/metadata/md5-cache/kde-apps/thumbnailers-17.08.2
+++ b/metadata/md5-cache/kde-apps/thumbnailers-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kio-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 raw? ( >=kde-apps/libkdcraw-17.08.2:5 >=kde-apps/libkexiv2-17.08.2:5 ) >=kde-frameworks/kf-env-4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kdegraphics-thumbnailers-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ca26da3e3b5a36255e072a2385928c1c
diff --git a/metadata/md5-cache/kde-apps/umbrello-17.04.3 b/metadata/md5-cache/kde-apps/umbrello-17.04.3
index 625161ad2aad..7a7db4369a06 100644
--- a/metadata/md5-cache/kde-apps/umbrello-17.04.3
+++ b/metadata/md5-cache/kde-apps/umbrello-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/ktexteditor-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/libxml2 dev-libs/libxslt >=kde-frameworks/kf-env-4 !kde-apps/umbrello:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/umbrello-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a2c874df9f225146b1cfd67e58c0858a
diff --git a/metadata/md5-cache/kde-apps/umbrello-17.08.2 b/metadata/md5-cache/kde-apps/umbrello-17.08.2
index 3cd98c1f8c8d..29163a807c23 100644
--- a/metadata/md5-cache/kde-apps/umbrello-17.08.2
+++ b/metadata/md5-cache/kde-apps/umbrello-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/ktexteditor-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/libxml2 dev-libs/libxslt !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 !kde-apps/umbrello:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/umbrello-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fd08b51d474f9def93f5bc7961ce86f1
diff --git a/metadata/md5-cache/kde-apps/zeroconf-ioslave-17.04.3 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-17.04.3
index 3e75ceb437a9..85a670739ef6 100644
--- a/metadata/md5-cache/kde-apps/zeroconf-ioslave-17.04.3
+++ b/metadata/md5-cache/kde-apps/zeroconf-ioslave-17.04.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.04
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/zeroconf-ioslave-17.04.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3a5ad8eb09489694f6491cae16d594c8
diff --git a/metadata/md5-cache/kde-apps/zeroconf-ioslave-17.08.2 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-17.08.2
index 7ea1421ab634..480966c8d230 100644
--- a/metadata/md5-cache/kde-apps/zeroconf-ioslave-17.08.2
+++ b/metadata/md5-cache/kde-apps/zeroconf-ioslave-17.08.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/17.08
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/zeroconf-ioslave-17.08.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=51d8c4e4caaac492bd8bb4d29239db01
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.37.0 b/metadata/md5-cache/kde-frameworks/attica-5.37.0
index 48803046039b..1e2d3aaed825 100644
--- a/metadata/md5-cache/kde-frameworks/attica-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/attica-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtnetwork-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/attica-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7fa6614f4c3543cf1a2423e3b527f703
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.39.0 b/metadata/md5-cache/kde-frameworks/attica-5.39.0
index 16f04bc8faff..7dab7a984458 100644
--- a/metadata/md5-cache/kde-frameworks/attica-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/attica-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtnetwork-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/attica-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0e589edfc01bb8c6ca3e766c89740779
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.37.0 b/metadata/md5-cache/kde-frameworks/baloo-5.37.0
index 08a4ba2cdc36..80f75ed51d36 100644
--- a/metadata/md5-cache/kde-frameworks/baloo-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.37.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.37:5 >=kde-frameworks/kcoreaddons-5.37:5 >=kd
 RESTRICT=test
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/baloo-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=501bd597076ace69d05cfbebddcf6dbb
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.39.0 b/metadata/md5-cache/kde-frameworks/baloo-5.39.0
index 18e3c340600a..754f817b7529 100644
--- a/metadata/md5-cache/kde-frameworks/baloo-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.39.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kd
 RESTRICT=test
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/baloo-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4c58e92d10c2e885336be071560438bd
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.37.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.37.0
index 1cf88f945cea..39050e79faba 100644
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/bluez-qt-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ceab0be6f8a57f4b605b28d0e6c81b23
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.39.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.39.0
index f27142b6f0c4..84f0c30fd35f 100644
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/bluez-qt-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f2a516f7331d83e72c3c4f9d884943e2
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.37.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.37.0
index a993310ba8b4..49d1ee9d84de 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/breeze-icons-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5a74da1afacab273f680806927e7f077
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.39.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.39.0
index 6247b46b8731..0a1df12f1c0c 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.39.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-3
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/breeze-icons-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=69caf38e215dfa5a53beb377c255f1fe
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.37.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.37.0
index d6dd82f4d6bb..2702692dd106 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/breeze-icons-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6b5cd97d612b5ea6de9aad5884ed7ef7
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.39.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.39.0
index 102a9b544ed9..51abf194c958 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.39.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/breeze-icons-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=df0cf4e64053bb52eaa8e3b7e097e312
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.37.0-r1 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.37.0-r1
index 960004f0eb20..5c6ce015748f 100644
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.37.0-r1
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.37.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-arch/libarchive[bzip2]
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/extra-cmake-modules-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9084cf598eb58a89bcff31ba503e1330
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.39.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.39.0
index c416bd7c4b3d..998aa2fc4146 100644
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.39.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-arch/libarchive[bzip2]
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/extra-cmake-modules-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e2d5b6d298e4411caad4ea0b42bbb512
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.37.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.37.0
index fa5f366098ac..94b84c5fe860 100644
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.37.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.37:5 >=kde-frameworks/kconfigwidgets-5.37:5 >
 RESTRICT=test
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/frameworkintegration-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3b8f905b971c794761a8a0b1c15fd9ff
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.39.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.39.0
index 0913a755a0c7..9ebab65b0621 100644
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.39.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >
 RESTRICT=test
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/frameworkintegration-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=737070f89064e1299e23782b229eead2
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.37.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.37.0
index 33839af79db8..44f045983d4b 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.37.0
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=kde-frameworks/kconfig-5.37:5 >=kde-frameworks/kcoreaddons-5.37:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=kde-plasma/kactivitymanagerd-5.10.5:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kactivities-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=238998429b6cfe775363d6379ace32f2
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.39.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.39.0
index 17e01179b99d..bc91b6f63aa5 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.39.0
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=kde-plasma/kactivitymanagerd-5.10.5:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kactivities-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a26aa2b13f20d1e834fa0bb02d63d6d4
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.37.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.37.0
index 5785ad8cd529..33fbcec7a71b 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=kde-frameworks/kactivities-5.37:5 >=kde-frameworks/kconfig-5.37:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kactivities-stats-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=087279d7302741529f5c190c70ef29cf
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.39.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.39.0
index 3173d508b883..5467d66274af 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=kde-frameworks/kactivities-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kactivities-stats-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=45be8bff12c0bd8574bd4faa06f06956
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.37.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.37.0
index 3bb284a3a35b..37e2b8eba822 100644
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.37.0
@@ -10,5 +10,5 @@ RDEPEND=app-doc/doxygen dev-python/jinja[python_targets_python2_7(-)?,-python_si
 REQUIRED_USE=python_targets_python2_7
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kapidox-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3082b324629c59333c029b3a84c997a6
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.39.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.39.0
index c1bc74d5c636..9b9562cf67b2 100644
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.39.0
@@ -10,5 +10,5 @@ RDEPEND=app-doc/doxygen dev-python/jinja[python_targets_python2_7(-)?,-python_si
 REQUIRED_USE=python_targets_python2_7
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kapidox-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=19b65b2e813fba8fcd778eca732f11a7
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.37.0 b/metadata/md5-cache/kde-frameworks/karchive-5.37.0
index 0bfba8f7ee76..5fad7201d24f 100644
--- a/metadata/md5-cache/kde-frameworks/karchive-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.37.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) sys-libs/zlib >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/karchive-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=27cb43db29f708ff70f58546dd532976
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.39.0 b/metadata/md5-cache/kde-frameworks/karchive-5.39.0
index 94481733d55e..7f1ee6c6d90e 100644
--- a/metadata/md5-cache/kde-frameworks/karchive-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.39.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) sys-libs/zlib >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/karchive-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5731a79e5882f6073d5602e2096f6be8
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.37.0 b/metadata/md5-cache/kde-frameworks/kauth-5.37.0
index 269fa1ace1c5..a7706c8dd004 100644
--- a/metadata/md5-cache/kde-frameworks/kauth-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.37.0
@@ -10,5 +10,5 @@ PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kauth-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=08f9172b70c66382f098e9e56520010c
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.39.0 b/metadata/md5-cache/kde-frameworks/kauth-5.39.0
index 40bc86879e9b..2fc31b33f133 100644
--- a/metadata/md5-cache/kde-frameworks/kauth-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.39.0
@@ -10,5 +10,5 @@ PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
 RDEPEND=>=kde-frameworks/kcoreaddons-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kauth-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1a11bc0d73f6813c8e775d305e0b40c1
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.37.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.37.0
index f502890a56d6..c69f5fa0a108 100644
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.37:5 >=kde-frameworks/kconfig-5.37:5 >=kde-frameworks/kcoreaddons-5.37:5 >=kde-frameworks/kiconthemes-5.37:5 >=kde-frameworks/kwidgetsaddons-5.37:5 >=kde-frameworks/kxmlgui-5.37:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kbookmarks-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2bdd13d90b30034abd1a42866ef1d8ef
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.39.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.39.0
index 0b07fa6ce440..951d9bc49711 100644
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kbookmarks-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=54ba66ceb1e47fbf91959251877a3d22
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.37.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.37.0
index 27596476f269..d99e9b394275 100644
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kauth-5.37:5 >=kde-frameworks/kconfig-5.37:5 >=kde-frameworks/kconfigwidgets-5.37:5 >=kde-frameworks/kcoreaddons-5.37:5 >=kde-frameworks/kdeclarative-5.37:5 >=kde-frameworks/ki18n-5.37:5 >=kde-frameworks/kiconthemes-5.37:5 >=kde-frameworks/kitemviews-5.37:5 >=kde-frameworks/kservice-5.37:5 >=kde-frameworks/kwidgetsaddons-5.37:5 >=kde-frameworks/kxmlgui-5.37:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kcmutils-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fdbe12941d64da15665840ca0111619c
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.39.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.39.0
index 7b8bb2abdc1c..0937ab5d9f93 100644
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kauth-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kdeclarative-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kitemviews-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kcmutils-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8e11a30311f63aeebf5f6fa81cef7646
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.37.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.37.0
index 71f9beedf3ff..bd8c84e31559 100644
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.37.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kcodecs-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1881a8dfd2ba56eb0bd117f214c41597
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.39.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.39.0
index 244d954c64b1..e6e52f8222b3 100644
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.39.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kcodecs-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5b817a23a4095c7c7a0eda2e2d427582
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.37.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.37.0
index b9be1dc2a6b6..6ff03dfbbd8a 100644
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.37.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37:5 >=kde-frameworks/kwidgetsaddons-5.37:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kcompletion-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1c54a4ed6725a7fdec26510c20a222a7
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.39.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.39.0
index 9e11bfefd0b9..cbea3c66645e 100644
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.39.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kcompletion-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0087f13a5cd407ecbe601d1fb30d767b
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.37.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.37.0
index f20ccc3f50b0..ca34826b9bcc 100644
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.37.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4
 RESTRICT=test
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kconfig-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ca8a31b59b57350fe0f01e52800658fe
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.39.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.39.0
index 1b4b867e62ec..6529601c1a2a 100644
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.39.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4
 RESTRICT=test
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kconfig-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=965ee525c2a25beca5478a0a2ee766e0
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.37.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.37.0
index 22909f43b409..b442e5707eb2 100644
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.37:5 >=kde-frameworks/kcodecs-5.37:5 >=kde-frameworks/kconfig-5.37:5 >=kde-frameworks/kcoreaddons-5.37:5 >=kde-frameworks/kguiaddons-5.37:5 >=kde-frameworks/ki18n-5.37:5 >=kde-frameworks/kwidgetsaddons-5.37:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kconfigwidgets-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7f8a06a2547f374edfcbfa06e3af9906
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.39.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.39.0
index 583abd4e85a0..4c7f35959319 100644
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.39:5 >=kde-frameworks/kcodecs-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kguiaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kconfigwidgets-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fed3023b601b138283eb0f7a0f5b117c
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.37.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.37.0
index 2dccf50bc635..a838fd683431 100644
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtcore-5.7.1:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kcoreaddons-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bdac0bab9cada1645284f2fd9dd908c7
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.39.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.39.0
index a22e30af0f80..ff8a3097f96a 100644
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtcore-5.7.1:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kcoreaddons-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=539658846866ae52850fcc8e7de3eb42
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.37.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.37.0
index 9a65daff3c96..fe68ab31cc17 100644
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.37.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.37:5 >=kde-frameworks/kwindowsystem-5.37:
 RESTRICT=test
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kcrash-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=27b8d078635b9b48f8677fe7cbcac0e9
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.39.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.39.0
index c9b7ab7c8741..2de567bdd27b 100644
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.39.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kwindowsystem-5.39:
 RESTRICT=test
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kcrash-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a2afdd1794180698d60365c768a43313
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.37.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.37.0
index 4faf4fdbd19a..cbbe0089c9dd 100644
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kdbusaddons-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fc0dc2aafbfdf6e796f450cc5746db65
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.39.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.39.0
index 0f171d11587f..cad5a1fd3ae3 100644
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kdbusaddons-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=81cda1765ba13ae70b94b2c88904df35
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.37.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.37.0
index 6c93634daa31..dfec2ef6d74b 100644
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.37:5 >=kde-frameworks/kcoreaddons-5.37:5 >=kde-frameworks/kglobalaccel-5.37:5 >=kde-frameworks/ki18n-5.37:5 >=kde-frameworks/kiconthemes-5.37:5 >=kde-frameworks/kio-5.37:5 >=kde-frameworks/kpackage-5.37:5 >=kde-frameworks/kservice-5.37:5 >=kde-frameworks/kwidgetsaddons-5.37:5 >=kde-frameworks/kwindowsystem-5.37:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kdeclarative-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=788246ff5295c82893f3acc04a1eaaad
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.39.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.39.0
index c9c3810652fb..181ff0f6185e 100644
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kglobalaccel-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kpackage-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kwindowsystem-5.39:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kdeclarative-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9d1735136bc2a914c81da2b04718e5c2
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.37.0 b/metadata/md5-cache/kde-frameworks/kded-5.37.0
index 2a18d614fbf2..eb8bbcc1e7c8 100644
--- a/metadata/md5-cache/kde-frameworks/kded-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kded-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.37:5 >=kde-frameworks/kcoreaddons-5.37:5 >=kde-frameworks/kcrash-5.37:5 >=kde-frameworks/kdbusaddons-5.37:5 >=kde-frameworks/kinit-5.37:5 >=kde-frameworks/kservice-5.37:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kded-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f3f15fc546a919e398103d6e0553f0f6
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.39.0 b/metadata/md5-cache/kde-frameworks/kded-5.39.0
index d9bb593341c0..2724227bf70f 100644
--- a/metadata/md5-cache/kde-frameworks/kded-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kded-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kcrash-5.39:5 >=kde-frameworks/kdbusaddons-5.39:5 >=kde-frameworks/kinit-5.39:5 >=kde-frameworks/kservice-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kded-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=21e411b31abda5da52ecdce36cfaad78
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs-4.14.34 b/metadata/md5-cache/kde-frameworks/kdelibs-4.14.34
index 8b53a330b6c7..9810e8520a86 100644
--- a/metadata/md5-cache/kde-frameworks/kdelibs-4.14.34
+++ b/metadata/md5-cache/kde-frameworks/kdelibs-4.14.34
@@ -12,5 +12,5 @@ REQUIRED_USE=udisks? ( udev ) upower? ( udev )
 RESTRICT=test
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/applications/17.04.3/src/kdelibs-4.14.34.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=852e7b7b039962f9d16e378d22640783
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs-4.14.37 b/metadata/md5-cache/kde-frameworks/kdelibs-4.14.37
index 2a6f6cce870e..abc968e5c9a2 100644
--- a/metadata/md5-cache/kde-frameworks/kdelibs-4.14.37
+++ b/metadata/md5-cache/kde-frameworks/kdelibs-4.14.37
@@ -12,5 +12,5 @@ REQUIRED_USE=opengl? ( plasma ) udisks? ( udev ) upower? ( udev )
 RESTRICT=test
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/applications/17.08.2/src/kdelibs-4.14.37.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5e2492c65be04aa8542aa161d12762e6
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs-env-4.14.3 b/metadata/md5-cache/kde-frameworks/kdelibs-env-4.14.3
index d86e267bf9af..28fb41d00946 100644
--- a/metadata/md5-cache/kde-frameworks/kdelibs-env-4.14.3
+++ b/metadata/md5-cache/kde-frameworks/kdelibs-env-4.14.3
@@ -6,5 +6,5 @@ HOMEPAGE=https://www.kde.org/
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=4/4.14
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=997a28c6e90ccdb34fe424f52495bdcc
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.37.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.37.0
index e3637ed88297..b95f00f0d695 100644
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.37.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kauth-5.37:5 >=kde-frameworks/kcodecs-5.37:5 >=kde-fram
 RESTRICT=test
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/portingAids/kdelibs4support-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6cd392eba2392381c4bee7c0fdb7469c
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.39.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.39.0
index 96bb4895bfc0..d5bdadf7ea8a 100644
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.39.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kauth-5.39:5 >=kde-frameworks/kcodecs-5.39:5 >=kde-fram
 RESTRICT=test
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/portingAids/kdelibs4support-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b618c9857bd8b1565ad8dfc0c4f56d19
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.37.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.37.0
index 861d13e6aa8a..0f1a20c70386 100644
--- a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.37:5 >=kde-frameworks/kcoreaddons-5.37:5 designer? ( >=dev-qt/designer-5.7.1:5 >=kde-frameworks/kcompletion-5.37:5 >=kde-frameworks/kconfigwidgets-5.37:5 >=kde-frameworks/kiconthemes-5.37:5 >=kde-frameworks/kio-5.37:5 >=kde-frameworks/kitemviews-5.37:5 >=kde-frameworks/kplotting-5.37:5 >=kde-frameworks/ktextwidgets-5.37:5 >=kde-frameworks/kwidgetsaddons-5.37:5 >=kde-frameworks/kxmlgui-5.37:5 >=kde-frameworks/sonnet-5.37:5 ) webkit? ( >=dev-qt/designer-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kdewebkit-5.37:5 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kdesignerplugin-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b0536e929021b6fe4d76d362b648d950
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.39.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.39.0
index 49a919092e8e..03f35e303331 100644
--- a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 designer? ( >=dev-qt/designer-5.7.1:5 >=kde-frameworks/kcompletion-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kitemviews-5.39:5 >=kde-frameworks/kplotting-5.39:5 >=kde-frameworks/ktextwidgets-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=kde-frameworks/sonnet-5.39:5 ) webkit? ( >=dev-qt/designer-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kdewebkit-5.39:5 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kdesignerplugin-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3fdb98622ff91d9a46ab834eabb5169c
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.37.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.37.0
index d66b1e41ee13..9cb8e970cb81 100644
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37:5 >=kde-frameworks/kcoreaddons-5.37:5 >=kde-frameworks/ki18n-5.37:5 >=kde-frameworks/kpty-5.37:5 >=kde-frameworks/kservice-5.37:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kdesu-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=06e5484db9793488b148f7736a7d09ba
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.39.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.39.0
index 2dc4403a54cb..0974c7223a38 100644
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kpty-5.39:5 >=kde-frameworks/kservice-5.39:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kdesu-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a0cc3e9ecad38935109e78b23de6e37f
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.37.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.37.0
index 8a7ae4641ea9..d8dba8823e01 100644
--- a/metadata/md5-cache/kde-frameworks/kdewebkit-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.37:5 >=kde-frameworks/kcoreaddons-5.37:5 >=kde-frameworks/kio-5.37:5 >=kde-frameworks/kjobwidgets-5.37:5 >=kde-frameworks/kparts-5.37:5 >=kde-frameworks/kservice-5.37:5 >=kde-frameworks/kwallet-5.37:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kdewebkit-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=565547bc4564df9ef9737fa154bc11e1
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.39.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.39.0
index a4fecea6e3d5..e2e5996c0d1d 100644
--- a/metadata/md5-cache/kde-frameworks/kdewebkit-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kjobwidgets-5.39:5 >=kde-frameworks/kparts-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/kwallet-5.39:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kdewebkit-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e0747a68e32cba5c1e986bea31b526c8
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.37.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.37.0
index eaf998dc6a3e..13798f86c61d 100644
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtnetwork-5.7.1:5 zeroconf? ( >=dev-qt/qtdbus-5.7.1:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kdnssd-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c1af5e2444e60c2723f75b991417cc73
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.39.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.39.0
index 2a4689175564..b650601efea1 100644
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtnetwork-5.7.1:5 zeroconf? ( >=dev-qt/qtdbus-5.7.1:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kdnssd-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7ba1becabea5a694677ad7f54ec47fd7
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.37.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.37.0
index 19a637614236..05ee22ab9152 100644
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.37.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/karchive-5.37:5 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kdoctools-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c5cd8fa256b3930865d3a085034b7fdc
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.39.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.39.0
index de8a23382a30..7c6da2cdc9ef 100644
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.39.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/karchive-5.39:5 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kdoctools-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=40771509c2bb8ce31ac1b662ecf43df1
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.37.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.37.0
index ff54254e8160..d445f5719ce1 100644
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.37.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.37:5 >=kde-frameworks/kconfig-5.37:5 >=kde-f
 RESTRICT=test
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kemoticons-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=89c258dcbae138ab61178cfa6378525c
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.39.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.39.0
index c71efce243fa..4e20434b57da 100644
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.39.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-f
 RESTRICT=test
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kemoticons-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6259a1fef4ad1b0e2a594c125a5f0bae
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.37.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.37.0
index 1b1416f3f7b5..11ba763044fc 100644
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.37.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/ki18n-5.37:5 >=dev-qt/qtxml-5.7.1:5 epub? ( app-text/eb
 REQUIRED_USE=test? ( taglib )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kfilemetadata-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=37a997b319a440c652eb862cea40ae50
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.39.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.39.0
index f4df899c3583..f3cc46b17f91 100644
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.39.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/ki18n-5.39:5 >=dev-qt/qtxml-5.7.1:5 epub? ( app-text/eb
 REQUIRED_USE=test? ( taglib )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kfilemetadata-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d91ba48efc351f0dee16bc38c9eb0cfb
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.37.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.37.0
index f302c3e992ae..ba4f5ce3ff8d 100644
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.37:5 >=kde-frameworks/kcoreaddons-5.37:5 >=kde-frameworks/kcrash-5.37:5 >=kde-frameworks/kdbusaddons-5.37:5 >=kde-frameworks/kwindowsystem-5.37:5[X] >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kglobalaccel-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d756bf4771aef2bf144290c93d20c907
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.39.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.39.0
index 7101f9d44516..8dea9db0010d 100644
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kcrash-5.39:5 >=kde-frameworks/kdbusaddons-5.39:5 >=kde-frameworks/kwindowsystem-5.39:5[X] >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kglobalaccel-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=28acc087dcbbf38f949de22d1c8e7074
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.37.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.37.0
index a473851afc57..aa3bedd3d7d2 100644
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kguiaddons-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=213236a92070a0e990ffbd22390336ae
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.39.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.39.0
index 2f6c6f0c8a9b..73a20754efa5 100644
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kguiaddons-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=099ac82ffb493e7ad49234b1374ce211
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.37.0 b/metadata/md5-cache/kde-frameworks/khtml-5.37.0
index 3cb4728ac09d..06d5b2ba4d60 100644
--- a/metadata/md5-cache/kde-frameworks/khtml-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37:5 >=kde-frameworks/kcodecs-5.37:5 >=kde-frameworks/kcompletion-5.37:5 >=kde-frameworks/kconfig-5.37:5 >=kde-frameworks/kconfigwidgets-5.37:5 >=kde-frameworks/kcoreaddons-5.37:5 >=kde-frameworks/kglobalaccel-5.37:5 >=kde-frameworks/ki18n-5.37:5 >=kde-frameworks/kiconthemes-5.37:5 >=kde-frameworks/kio-5.37:5 >=kde-frameworks/kjobwidgets-5.37:5 >=kde-frameworks/kjs-5.37:5 >=kde-frameworks/knotifications-5.37:5 >=kde-frameworks/kparts-5.37:5 >=kde-frameworks/kservice-5.37:5 >=kde-frameworks/ktextwidgets-5.37:5 >=kde-frameworks/kwallet-5.37:5 >=kde-frameworks/kwidgetsaddons-5.37:5 >=kde-frameworks/kwindowsystem-5.37:5 >=kde-frameworks/kxmlgui-5.37:5 >=kde-frameworks/sonnet-5.37:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5(+)] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/portingAids/khtml-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=553edbca3e49a5580075cd0bff77d310
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.39.0 b/metadata/md5-cache/kde-frameworks/khtml-5.39.0
index 44c669c0ca4f..6f20f5be0a0d 100644
--- a/metadata/md5-cache/kde-frameworks/khtml-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.39:5 >=kde-frameworks/kcodecs-5.39:5 >=kde-frameworks/kcompletion-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kglobalaccel-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kjobwidgets-5.39:5 >=kde-frameworks/kjs-5.39:5 >=kde-frameworks/knotifications-5.39:5 >=kde-frameworks/kparts-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/ktextwidgets-5.39:5 >=kde-frameworks/kwallet-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kwindowsystem-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=kde-frameworks/sonnet-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5(+)] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/portingAids/khtml-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=69e76baa63ce10e0d6fbb984b495e0d8
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.37.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.37.0
index a9aa66227a96..ff1712fdb53c 100644
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.37.0
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/ki18n-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b316c2c33c6370973e8dd697cbabd780
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.39.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.39.0
index 5bd9337162f5..173b786714ff 100644
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.39.0
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/ki18n-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1926b1d3ee99190787b084494249607f
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.37.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.37.0
index d3707a1ef69e..612f0a15b0dc 100644
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.37.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.37:5 >=kde-frameworks/kconfig-5.37:5 >=kde-f
 RESTRICT=test
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kiconthemes-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1a6685e886bd360a80670ff5a28dea7f
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.39.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.39.0
index 0c1a7254e6fb..5625fada4656 100644
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.39.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-f
 RESTRICT=test
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kiconthemes-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5d76a73d55de375c29422e195f36b13c
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.37.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.37.0
index df86495b6e40..8101534c2065 100644
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.37.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11ext
 REQUIRED_USE=xscreensaver? ( X )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kidletime-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=08fda6c4ae974a77e990e6bc93d87423
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.39.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.39.0
index 41939b13d51c..c07096cc43bf 100644
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.39.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11ext
 REQUIRED_USE=xscreensaver? ( X )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kidletime-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=51f93c389b29bb1ef1a0e7c0cace8f6c
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.37.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.37.0
index ea03cfc3f62f..892d3b48bb0a 100644
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.37:5 >=dev-qt/qtgui-5.7.1:5 eps? ( >=dev-qt/qtprintsupport-5.7.1:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kimageformats-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=de119d4b822afcbb588625c550ec19c8
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.39.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.39.0
index 5e07d967797a..522d27598bac 100644
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.39:5 >=dev-qt/qtgui-5.7.1:5 eps? ( >=dev-qt/qtprintsupport-5.7.1:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kimageformats-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=906e95c41685f0ac1503d271ae718989
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.37.0 b/metadata/md5-cache/kde-frameworks/kinit-5.37.0
index 40175c4f7187..0f4b88b8468f 100644
--- a/metadata/md5-cache/kde-frameworks/kinit-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.37:5 >=kde-frameworks/kcoreaddons-5.37:5 >=kde-frameworks/kcrash-5.37:5 >=kde-frameworks/ki18n-5.37:5 >=kde-frameworks/kio-5.37:5 >=kde-frameworks/kservice-5.37:5 >=kde-frameworks/kwindowsystem-5.37:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 x11-libs/libX11 x11-libs/libxcb caps? ( sys-libs/libcap ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kinit-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=38b3acae9093859baaf591d0da71cafd
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.39.0 b/metadata/md5-cache/kde-frameworks/kinit-5.39.0
index 09ce5944d1d1..3393c42d244f 100644
--- a/metadata/md5-cache/kde-frameworks/kinit-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kcrash-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/kwindowsystem-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 x11-libs/libX11 x11-libs/libxcb caps? ( sys-libs/libcap ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kinit-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=67e36506777015eebf79e132a1fcd2be
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.37.0 b/metadata/md5-cache/kde-frameworks/kio-5.37.0
index e5e0cf87cb3f..9719ed127651 100644
--- a/metadata/md5-cache/kde-frameworks/kio-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kio-5.37.0
@@ -11,5 +11,5 @@ RDEPEND=>=kde-frameworks/karchive-5.37:5 >=kde-frameworks/kbookmarks-5.37:5 >=kd
 RESTRICT=test
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kio-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3e8650923fcebbff45f7e9d3e91566c1
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.39.0 b/metadata/md5-cache/kde-frameworks/kio-5.39.0
index da84fbde4a53..1fd8194bf0b4 100644
--- a/metadata/md5-cache/kde-frameworks/kio-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kio-5.39.0
@@ -11,5 +11,5 @@ RDEPEND=>=kde-frameworks/karchive-5.39:5 >=kde-frameworks/kbookmarks-5.39:5 >=kd
 RESTRICT=test
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kio-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=af2e590a59c50a13e2d2c3ab320f9b1c
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-1.1.0 b/metadata/md5-cache/kde-frameworks/kirigami-1.1.0
index 83c9e8079293..0a310193482f 100644
--- a/metadata/md5-cache/kde-frameworks/kirigami-1.1.0
+++ b/metadata/md5-cache/kde-frameworks/kirigami-1.1.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 plasma? ( >=kde-frameworks/plasma-1.1 ) >=dev-qt/linguist-tools-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-1.1:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 plasma? ( >=kde-frameworks/plasma-1.1 ) >=dev-qt/linguist-tools-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-1.1:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Lightweight user interface framework for mobile and convergent applications
 EAPI=6
 HOMEPAGE=https://techbase.kde.org/Kirigami
-IUSE=examples plasma debug test
+IUSE=examples plasma debug doc test
 KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 plasma? ( >=kde-frameworks/plasma-1.1 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 plasma? ( >=kde-frameworks/plasma-1.1 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=1
 SRC_URI=mirror://kde/stable/kirigami/kirigami-1.1.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f5f203b2c9b733d46d063d9a8d12ea54
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.37.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.37.0
index 5519f7d953a9..a3506bbe6fe1 100644
--- a/metadata/md5-cache/kde-frameworks/kirigami-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kirigami-5.37.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev
 RESTRICT=test
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kirigami2-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=dea551d2f9a535875ba2d28016cd68c3
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.39.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.39.0
index 6b827cb27099..4ceafbfb55f8 100644
--- a/metadata/md5-cache/kde-frameworks/kirigami-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kirigami-5.39.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev
 RESTRICT=test
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kirigami2-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a79f27361fa013f4cc4993aba6669dc9
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.37.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.37.0
index 003982eecb27..8429429d1ab8 100644
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kitemmodels-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=819210a72b7ce78fcc24816246e1eca4
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.39.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.39.0
index b41a1fedda38..b54d36714cd0 100644
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kitemmodels-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5317a881e2f5c6742841f1b6919671c8
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.37.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.37.0
index 4d94b894185d..0ef669f848aa 100644
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kitemviews-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=05801dcb37f397f2b5dbb19971bc55c2
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.39.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.39.0
index 8cc784940499..da86c86c6d6d 100644
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kitemviews-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c3d1b854770f4c2df50552363510eaf6
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.37.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.37.0
index 5603d20a8b95..f7c32a116dc9 100644
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37:5 >=kde-frameworks/kwidgetsaddons-5.37:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kjobwidgets-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=981441fb8da29eff0320a5df516d6884
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.39.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.39.0
index a9d86e11516f..7a69cfc1f954 100644
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kjobwidgets-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=57b24fa5787eeaea2f77f66d8c1f94d7
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.37.0 b/metadata/md5-cache/kde-frameworks/kjs-5.37.0
index 91a9e9feed1f..f3deb3d8a91c 100644
--- a/metadata/md5-cache/kde-frameworks/kjs-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.37.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2 LGPL-2+
 RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/portingAids/kjs-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b9277a5a6c0ec724705cfbcbe0e7f7f8
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.39.0 b/metadata/md5-cache/kde-frameworks/kjs-5.39.0
index 8da78aff50f9..00c6bf4addf5 100644
--- a/metadata/md5-cache/kde-frameworks/kjs-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.39.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2 LGPL-2+
 RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/portingAids/kjs-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a346c67befa9f93d4dc14abdff04dabf
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.37.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.37.0
index 22927fab6863..46e27aa92ee7 100644
--- a/metadata/md5-cache/kde-frameworks/kjsembed-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.37:5 >=kde-frameworks/kjs-5.37:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/portingAids/kjsembed-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1cf63cbc85a922af0f12946b4d006e4b
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.39.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.39.0
index 7ee1aa0d2012..fa7d1e6c32ba 100644
--- a/metadata/md5-cache/kde-frameworks/kjsembed-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kjs-5.39:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/portingAids/kjsembed-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=dadbee7d969ecec42702be488f8f17ce
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.37.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.37.0
index 82f350a44c12..7aa7f6a30f84 100644
--- a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.37.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/kparts-5.37:5 >=kde-frameworks/kxmlgui-5.37:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/portingAids/kmediaplayer-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=82b66f7a856440a1e620387a532056b8
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.39.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.39.0
index 6bb91d1b14ae..eeb99ea3fc1a 100644
--- a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.39.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/kparts-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/portingAids/kmediaplayer-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f9ce52e47965f74f9e024f9498173497
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.37.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.37.0
index c7407053bf42..c8af05087c3f 100644
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/attica-5.37:5 >=kde-frameworks/karchive-5.37:5 >=kde-frameworks/kcompletion-5.37:5 >=kde-frameworks/kconfig-5.37:5 >=kde-frameworks/kcoreaddons-5.37:5 >=kde-frameworks/ki18n-5.37:5 >=kde-frameworks/kiconthemes-5.37:5 >=kde-frameworks/kio-5.37:5 >=kde-frameworks/kitemviews-5.37:5 >=kde-frameworks/kservice-5.37:5 >=kde-frameworks/ktextwidgets-5.37:5 >=kde-frameworks/kwidgetsaddons-5.37:5 >=kde-frameworks/kxmlgui-5.37:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/knewstuff-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=427c1d9e18c1cbedb57ae0d8e7da5a92
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.39.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.39.0
index 9058f817c64e..832ab87097f6 100644
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/attica-5.39:5 >=kde-frameworks/karchive-5.39:5 >=kde-frameworks/kcompletion-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kitemviews-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/ktextwidgets-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kirigami-5.39:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/knewstuff-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=20fe499ab204f3e4816cf7214991c8b7
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.37.0-r1 b/metadata/md5-cache/kde-frameworks/knotifications-5.37.0-r1
index f3e370e99b1f..78f36a88e568 100644
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.37.0-r1
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.37.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcodecs-5.37:5 >=kde-frameworks/kconfig-5.37:5 >=kde-frameworks/kcoreaddons-5.37:5 >=kde-frameworks/kwindowsystem-5.37:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.7.1:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/knotifications-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4a2ac81c1385a1245d20b4c05468899f
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.39.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.39.0
index e0de291a95b9..af3f9991c16b 100644
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcodecs-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kwindowsystem-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.7.1:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/knotifications-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ef6aeab2d1defd125f1dbd7ed8032010
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.37.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.37.0
index 827c99bf1314..936a6da30c14 100644
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.37:5 >=kde-frameworks/kconfig-5.37:5 >=kde-frameworks/ki18n-5.37:5 >=kde-frameworks/kio-5.37:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 phonon? ( media-libs/phonon[qt5(+)] ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/knotifyconfig-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0b6f0fe8d7d3fc0800700228acde5cb6
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.39.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.39.0
index ad41c120fcfe..9cd3fa12f57a 100644
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kio-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 phonon? ( media-libs/phonon[qt5(+)] ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/knotifyconfig-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1c6b7a53599366b57f7c273d7aad0bc3
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.37.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.37.0
index 19a093f0cc54..99c81ac34098 100644
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.37:5 >=kde-frameworks/kcoreaddons-5.37:5 >=kde-frameworks/ki18n-5.37:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kpackage-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=891e14c120eb9ac2d8bd8ca22b3a7266
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.39.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.39.0
index f3418915869e..f2c78d869ca4 100644
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kpackage-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9dc83860295a350c0029154f753829e2
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.37.0 b/metadata/md5-cache/kde-frameworks/kparts-5.37.0
index 7dfea110f19d..7157346d3384 100644
--- a/metadata/md5-cache/kde-frameworks/kparts-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.37:5 >=kde-frameworks/kcoreaddons-5.37:5 >=kde-frameworks/ki18n-5.37:5 >=kde-frameworks/kiconthemes-5.37:5 >=kde-frameworks/kio-5.37:5 >=kde-frameworks/kjobwidgets-5.37:5 >=kde-frameworks/kservice-5.37:5 >=kde-frameworks/kwidgetsaddons-5.37:5 >=kde-frameworks/kxmlgui-5.37:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kparts-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=25abf8cc483cf2987ff1176c5c7ae916
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.39.0 b/metadata/md5-cache/kde-frameworks/kparts-5.39.0
index f71ce0fb57fc..8378e66cc751 100644
--- a/metadata/md5-cache/kde-frameworks/kparts-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kjobwidgets-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kparts-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=610c40cbb6798cbd294bf74f6c1ae3c4
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.37.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.37.0
index 962ce280b7e0..2af320804900 100644
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.37:5 >=kde-frameworks/kcoreaddons-5.37:5 >=kde-frameworks/ki18n-5.37:5 >=kde-frameworks/kitemviews-5.37:5 >=kde-frameworks/kservice-5.37:5 >=kde-frameworks/kwidgetsaddons-5.37:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !net-libs/kpeople:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kpeople-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d8f740a9259d86315b4f7cb16a47361e
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.39.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.39.0
index fb74a1932f78..e1d0eb5c09a3 100644
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kitemviews-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !net-libs/kpeople:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kpeople-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b919812d043c671dc14a4384eae6df04
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.37.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.37.0
index a6ce0c2d1174..767ed28ef7b4 100644
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kplotting-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=efcc6bc489e0e9b6bc9b2d0010f550df
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.39.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.39.0
index b7951d73f61d..d12e15633ddd 100644
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kplotting-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=941277bc1b802a123d5e919913ac7020
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.37.0 b/metadata/md5-cache/kde-frameworks/kpty-5.37.0
index 03a9cef1d3c0..b94e12e5aa94 100644
--- a/metadata/md5-cache/kde-frameworks/kpty-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37:5 >=kde-frameworks/ki18n-5.37:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kpty-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=428d346bcc1aadbfef57019ad904b7b7
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.39.0 b/metadata/md5-cache/kde-frameworks/kpty-5.39.0
index 595ef470f2ca..9f67fef73969 100644
--- a/metadata/md5-cache/kde-frameworks/kpty-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kpty-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=10c8e0069f21dccb19400ec6a1b1c4c8
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.37.0 b/metadata/md5-cache/kde-frameworks/kross-5.37.0
index c8f34961566b..fc80b9e47b22 100644
--- a/metadata/md5-cache/kde-frameworks/kross-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kross-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.37:5 >=kde-frameworks/kcoreaddons-5.37:5 >=kde-frameworks/ki18n-5.37:5 >=kde-frameworks/kiconthemes-5.37:5 >=kde-frameworks/kio-5.37:5 >=kde-frameworks/kparts-5.37:5 >=kde-frameworks/kwidgetsaddons-5.37:5 >=kde-frameworks/kxmlgui-5.37:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/portingAids/kross-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=630093845b227c158d633e3a670a1155
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.39.0 b/metadata/md5-cache/kde-frameworks/kross-5.39.0
index 59e24f5c1f7f..34119d003ed3 100644
--- a/metadata/md5-cache/kde-frameworks/kross-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kross-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kparts-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kxmlgui-5.39:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/portingAids/kross-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7db1389b0f2e96b1f4322e63e07e8a1f
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.37.0 b/metadata/md5-cache/kde-frameworks/krunner-5.37.0
index b7b6ab40e0c2..88df7d3c5bd0 100644
--- a/metadata/md5-cache/kde-frameworks/krunner-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.37:5 >=kde-frameworks/kcoreaddons-5.37:5 >=kde-frameworks/ki18n-5.37:5 >=kde-frameworks/kio-5.37:5 >=kde-frameworks/kservice-5.37:5 >=kde-frameworks/plasma-5.37:5 >=kde-frameworks/solid-5.37:5 >=kde-frameworks/threadweaver-5.37:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !<kde-apps/kapptemplate-15.12.3-r1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/krunner-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=15196907f7b36cc90588a28f18641b8b
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.39.0 b/metadata/md5-cache/kde-frameworks/krunner-5.39.0
index e7449e9237cd..0d5b3c12a8a6 100644
--- a/metadata/md5-cache/kde-frameworks/krunner-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kio-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/plasma-5.39:5 >=kde-frameworks/solid-5.39:5 >=kde-frameworks/threadweaver-5.39:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !<kde-apps/kapptemplate-15.12.3-r1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/krunner-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b6133644b4dc64c54406e014b7c2d326
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ba0938f7893f58a7ef68fa8cbad96ab4
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.37.0 b/metadata/md5-cache/kde-frameworks/kservice-5.37.0
index ceb6bd5dc4f3..4ff220956e36 100644
--- a/metadata/md5-cache/kde-frameworks/kservice-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.37.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.37:5 >=kde-frameworks/kcoreaddons-5.37:5 >=kd
 RESTRICT=test
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kservice-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b85257623593909d047011752b2660d8
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.39.0 b/metadata/md5-cache/kde-frameworks/kservice-5.39.0
index 9ce64ff7845b..155046159f4a 100644
--- a/metadata/md5-cache/kde-frameworks/kservice-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.39.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kd
 RESTRICT=test
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kservice-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=53c34a18d18f1400cc70003dfac8e01c
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.37.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.37.0
index 4612ec0831ea..81d03c2d2191 100644
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.37.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.37:5 >=kde-frameworks/kauth-5.37:5 >=kde-fra
 RESTRICT=test
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/ktexteditor-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e32e5dd9a0ce1a4c611b0119d6c009f1
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.39.0-r1 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.39.0-r1
index c1d353a18493..d7c451fe4c9f 100644
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.39.0-r1
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.39.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.39:5 >=kde-frameworks/kauth-5.39:5 >=kde-fra
 RESTRICT=test
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/ktexteditor-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=89f769b72f5b8859ac98cf337e8ee4a5
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.37.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.37.0
index 6d422d14ce06..b2ade65c14ea 100644
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcompletion-5.37:5 >=kde-frameworks/kconfig-5.37:5 >=kde-frameworks/kconfigwidgets-5.37:5 >=kde-frameworks/kcoreaddons-5.37:5 >=kde-frameworks/ki18n-5.37:5 >=kde-frameworks/kiconthemes-5.37:5 >=kde-frameworks/kservice-5.37:5 >=kde-frameworks/kwidgetsaddons-5.37:5 >=kde-frameworks/kwindowsystem-5.37:5 >=kde-frameworks/sonnet-5.37:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 speech? ( >=dev-qt/qtspeech-5.7.1:5 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/ktextwidgets-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=83cb5b8a615ae8cc6b8171bcb220fae4
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.39.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.39.0
index c28f8d2922c2..c4660e38faae 100644
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcompletion-5.39:5 >=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kwindowsystem-5.39:5 >=kde-frameworks/sonnet-5.39:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 speech? ( >=dev-qt/qtspeech-5.7.1:5 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/ktextwidgets-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a2cf8be8e2f0beb55b658f92697927f8
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.37.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.37.0
index 31b88eb1e03d..407842a92f75 100644
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.37:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kunitconversion-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=aacccc7f9a62fccb72a707330423f44e
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.39.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.39.0
index d6f2969f8cfc..fd85c34de6e7 100644
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.39:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kunitconversion-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=00846fd7e78876dd76c1ca4abdaf49a4
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.37.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.37.0
index 4a0abbf1222d..f026e7862c3b 100644
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.37:5 >=kde-frameworks/kconfigwidgets-5.37:5 >=kde-frameworks/kcoreaddons-5.37:5 >=kde-frameworks/kdbusaddons-5.37:5 >=kde-frameworks/ki18n-5.37:5 >=kde-frameworks/kiconthemes-5.37:5 >=kde-frameworks/knotifications-5.37:5 >=kde-frameworks/kservice-5.37:5 >=kde-frameworks/kwidgetsaddons-5.37:5 >=kde-frameworks/kwindowsystem-5.37:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kwallet-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8bc88acf1c9c3dbcbf19206028acc453
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.39.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.39.0
index b290cd4223d9..367792c7d431 100644
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kdbusaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/knotifications-5.39:5 >=kde-frameworks/kservice-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kwindowsystem-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kwallet-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c1011496155cdc97331719976bd4e438
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.37.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.37.0
index 8e7c2f294a2e..9b1be40604f9 100644
--- a/metadata/md5-cache/kde-frameworks/kwayland-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kwayland-5.37.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[egl] >=dev-libs/way
 RESTRICT=test
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kwayland-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=edaa2e4d9c840890309b4934844d85e2
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.39.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.39.0
index 3ffb42ee1a4a..6f8c385ad3e5 100644
--- a/metadata/md5-cache/kde-frameworks/kwayland-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kwayland-5.39.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[egl] >=dev-libs/way
 RESTRICT=test
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kwayland-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=29dcfb9e4576b1239b06b8100c3ef34e
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.37.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.37.0
index 239fbf6d70ec..fd9581863c11 100644
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kwidgetsaddons-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f94747fcb6b5dcecf74301eeafbb86bd
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.39.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.39.0
index f83e2c0088ed..acd22ae53379 100644
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kwidgetsaddons-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1c92f5c1c70e65a0496d6611b4d65d2c
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.37.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.37.0
index f62d639a8755..9dc73a5c3b94 100644
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.37.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11ext
 RESTRICT=test
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kwindowsystem-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=61188aad60dd227190e75dd2bdf49877
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.39.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.39.0
index 4242b35f18f8..8d87479815ce 100644
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.39.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11ext
 RESTRICT=test
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kwindowsystem-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5de6c0b7532878b45ba13b67e700ae97
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.37.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.37.0
index 7e37e9a1f0c4..23dccce8d930 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.37:5 >=kde-frameworks/kconfigwidgets-5.37:5 >=kde-frameworks/kcoreaddons-5.37:5 >=kde-frameworks/kglobalaccel-5.37:5 >=kde-frameworks/ki18n-5.37:5 >=kde-frameworks/kiconthemes-5.37:5 >=kde-frameworks/kitemviews-5.37:5 >=kde-frameworks/ktextwidgets-5.37:5 >=kde-frameworks/kwidgetsaddons-5.37:5 >=kde-frameworks/kwindowsystem-5.37:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 attica? ( >=kde-frameworks/attica-5.37:5 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kxmlgui-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=95edcd9e10b22d8575ef4170c65dbc3d
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.39.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.39.0
index 6e9594d1d4f0..a83ba106680c 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.39:5 >=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/kglobalaccel-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kitemviews-5.39:5 >=kde-frameworks/ktextwidgets-5.39:5 >=kde-frameworks/kwidgetsaddons-5.39:5 >=kde-frameworks/kwindowsystem-5.39:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 attica? ( >=kde-frameworks/attica-5.39:5 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kxmlgui-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=cab148274fcbfb783c20885526782f8d
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.37.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.37.0
index d331c8a97e61..8ec450dfb692 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.37.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37:5 >=kde-frameworks/ki18n-5.37:5 >=kde-frameworks/kio-5.37:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/kxmlrpcclient-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=582fa1c9d3a2a871f6e9e8b973929fed
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.39.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.39.0
index 1de4d3dd81b6..5138f8dca9cb 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.39.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.39:5 >=kde-frameworks/ki18n-5.39:5 >=kde-frameworks/kio-5.39:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/kxmlrpcclient-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7908b19a688391dff99b759d148e018b
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.37.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.37.0
index 9494d664183b..185559ad5d18 100644
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.37.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 net-misc/modemmanager >=k
 RESTRICT=test
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/modemmanager-qt-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8662bf0ba6d2608970cf87fd96c28415
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.39.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.39.0
index 8ec4fcc2f463..b30575cc91e8 100644
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.39.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 net-misc/modemmanager >=k
 RESTRICT=test
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/modemmanager-qt-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3460b1f9893b88a6b5c487fcdaac9017
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.37.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.37.0
index 5d59c58a788d..0f1ea5d0489d 100644
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit,teamd=] >=net-misc/networkmanager-1.4.0-r1[elogind,teamd=] >=net-misc/networkmanager-1.4.0-r1[systemd,teamd=] ) !net-libs/libnm-qt:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/networkmanager-qt-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c847ac20f934a6f25d49144cb8f275a6
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.39.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.39.0
index 9e8e88bf06df..63ed03bf37c7 100644
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit,teamd=] >=net-misc/networkmanager-1.4.0-r1[elogind,teamd=] >=net-misc/networkmanager-1.4.0-r1[systemd,teamd=] ) !net-libs/libnm-qt:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/networkmanager-qt-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=41142769b5f674b7ebcfa1db0e1e4508
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-4.14.3 b/metadata/md5-cache/kde-frameworks/oxygen-icons-4.14.3
index 6f29f9c50cc6..680345b294ed 100644
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-4.14.3
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-4.14.3
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86
 LICENSE=LGPL-3
 SLOT=4/4.14
 SRC_URI=!sources? ( https://dev.gentoo.org/~kensington/distfiles/oxygen-icons-4.14.3.repacked.tar.xz ) sources? ( mirror://kde/stable/4.14.3/src/oxygen-icons-4.14.3.tar.xz )
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=feee6b48b1c340771ce7b3a4f1b9b965
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.37.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.37.0
index 6d76941866c2..b79eb8e59918 100644
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=!kde-apps/kdepim-icons:4 !kde-frameworks/oxygen-icons:4 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/oxygen-icons5-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c80fa7b486d8e12248e79efc7e44045a
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.39.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.39.0
index dcdf47c3cca7..8dd8916082bc 100644
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=!kde-apps/kdepim-icons:4 !kde-frameworks/oxygen-icons:4
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/oxygen-icons5-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7f7e68a381027d0c30b2f16d16b291af
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.37.0 b/metadata/md5-cache/kde-frameworks/plasma-5.37.0
index 214e33d23d9b..a2f03bbd8c14 100644
--- a/metadata/md5-cache/kde-frameworks/plasma-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.37.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.37:5 >=kde-frameworks/karchive-5.37:5 >=k
 RESTRICT=test
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/plasma-framework-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4c0d0d92f9925fa4b06ae3189b8dec61
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.39.0 b/metadata/md5-cache/kde-frameworks/plasma-5.39.0
index 0ca5e9e28dc8..886dedfc67e8 100644
--- a/metadata/md5-cache/kde-frameworks/plasma-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.39.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.39:5 >=kde-frameworks/karchive-5.39:5 >=k
 RESTRICT=test
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/plasma-framework-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=dfe852add4359e44f7142e1690cc603b
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.37.0 b/metadata/md5-cache/kde-frameworks/prison-5.37.0
index 963157c67eea..f12d8ea40bb0 100644
--- a/metadata/md5-cache/kde-frameworks/prison-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/prison-5.37.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 media-gfx/qrencode media-libs/libdmtx >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/prison-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e5500831e046d7bfb4341f5916633e73
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.39.0 b/metadata/md5-cache/kde-frameworks/prison-5.39.0
index 5175aa79d88b..d6e755c15cf3 100644
--- a/metadata/md5-cache/kde-frameworks/prison-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/prison-5.39.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 media-gfx/qrencode:= media-libs/libdmtx >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/prison-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0a8055a57e3e72fefa520211aceb29ac
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.39.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.39.0
index a82538cb109d..93c8d2713458 100644
--- a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.39.0
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2+ LGPL-3+ )
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.39:5 >=kde-frameworks/kiconthemes-5.39:5 >=kde-frameworks/kirigami-5.39:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtquickcontrols2-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/qqc2-desktop-style-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=960321e84677b3ff914a4687eaf2f843
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.37.0 b/metadata/md5-cache/kde-frameworks/solid-5.37.0
index b89657c63b6c..7e00903f1cba 100644
--- a/metadata/md5-cache/kde-frameworks/solid-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/solid-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-fs/udisks:2 virtual/udev >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/solid-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d771cdab1e2ecdb42536071243cce372
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.39.0 b/metadata/md5-cache/kde-frameworks/solid-5.39.0
index 15bfd9770513..af5cbef64437 100644
--- a/metadata/md5-cache/kde-frameworks/solid-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/solid-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-fs/udisks:2 virtual/udev >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/solid-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1cf83fb76d474646e2c81a6aa8a9dd48
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.37.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.37.0
index 62d3a48d07e6..7f51c0bcde1f 100644
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/sonnet-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b945d81ae74eeff247698663762a1e43
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.39.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.39.0
index c57488bcd243..81b94c3bc816 100644
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/sonnet-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e18d9b50fe49c7485c7a54e7513dda90
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.37.0-r1 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.37.0-r1
index 185f8c8aa5c4..f71988028f43 100644
--- a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.37.0-r1
+++ b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.37.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/syntax-highlighting-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2446de7b57f3e0559934dd009a2b01d9
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.39.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.39.0
index e6b96911deba..842c33bafd21 100644
--- a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/syntax-highlighting-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=88fe7622e922b6449a355b7584879651
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.37.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.37.0
index 8ca22608f660..13f04da57218 100644
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.37.0
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.37.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.37
 SRC_URI=mirror://kde/stable/frameworks/5.37/threadweaver-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7e70da02a77f4550f64a77901a6deded
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.39.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.39.0
index bf51c75fc149..1b4da2c85506 100644
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.39.0
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.39.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.39
 SRC_URI=mirror://kde/stable/frameworks/5.39/threadweaver-5.39.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6af520d4d2345ebc79d62f785e593af4
diff --git a/metadata/md5-cache/kde-misc/akonadi-ews-0.8.1 b/metadata/md5-cache/kde-misc/akonadi-ews-0.8.1
index d5aebdf85c25..134a06fce759 100644
--- a/metadata/md5-cache/kde-misc/akonadi-ews-0.8.1
+++ b/metadata/md5-cache/kde-misc/akonadi-ews-0.8.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-apps/akonadi-14.12.0:5 >=kde-apps/akonadi-mime-14.12.0:5 >=kde-apps/kcalcore-14.12.0:5 >=kde-apps/kcontacts-14.12.0:5 >=kde-apps/kmime-14.12.0:5 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://github.com/KrissN/akonadi-ews/archive/v0.8.1.tar.gz -> akonadi-ews-0.8.1.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a3e68e592147433e9d33a28b5dce251f
diff --git a/metadata/md5-cache/kde-misc/basket-2.49a_p20170225 b/metadata/md5-cache/kde-misc/basket-2.49a_p20170225
index a595de226106..182829c2b3a1 100644
--- a/metadata/md5-cache/kde-misc/basket-2.49a_p20170225
+++ b/metadata/md5-cache/kde-misc/basket-2.49a_p20170225
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kfilemetadata-5.37.0:5 >=kde-frameworks/kglobalaccel-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 crypt? ( app-crypt/gpgme ) git? ( dev-libs/libgit2 ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://github.com/basket-notepads/basket/archive/8de0345d99f3eb08d9406bd07e88b31afe46f315.tar.gz -> basket-2.49a_p20170225.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8e7ed563c3b045ec8a2c85539e23569a
diff --git a/metadata/md5-cache/kde-misc/colord-kde-0.5.0 b/metadata/md5-cache/kde-misc/colord-kde-0.5.0
index 089ad6ba481d..932c14f25167 100644
--- a/metadata/md5-cache/kde-misc/colord-kde-0.5.0
+++ b/metadata/md5-cache/kde-misc/colord-kde-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 media-libs/lcms:2 x11-libs/libxcb x11-libs/libX11 x11-libs/libXrandr >=kde-plasma/kde-cli-tools-5.10.5:5 x11-misc/colord >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/colord-kde/0.5.0/src/colord-kde-0.5.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2fd46f95b05b884bfae4ec67f75a982a
diff --git a/metadata/md5-cache/kde-misc/gmailfeed-1.1 b/metadata/md5-cache/kde-misc/gmailfeed-1.1
index c1535253ccb4..21be5456233c 100644
--- a/metadata/md5-cache/kde-misc/gmailfeed-1.1
+++ b/metadata/md5-cache/kde-misc/gmailfeed-1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/plasma-5.37.0:5 >=dev-qt/qtdeclarative-5.7.1:5[xml] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://github.com/anthon38/gmailfeed/archive/v1.1.tar.gz -> gmailfeed-1.1.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d77da5f98b14f5fc04066adf9edb000d
diff --git a/metadata/md5-cache/kde-misc/kbiff-4.0 b/metadata/md5-cache/kde-misc/kbiff-4.0
index 677e7a565e53..d31b84556e70 100644
--- a/metadata/md5-cache/kde-misc/kbiff-4.0
+++ b/metadata/md5-cache/kde-misc/kbiff-4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons l10n_br? ( >=kde-apps/kde4-l10n-4.4:4[l10n_br(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[l10n_el(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[l10n_et(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fr(+)] ) l10n_he? ( >=kde-apps/kde4-l10n-4.4:4[l10n_he(+)] ) l10n_hr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hu(+)] ) l10n_is? ( >=kde-apps/kde4-l10n-4.4:4[l10n_is(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ja(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nb(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nl(+)] ) l10n_nn? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nn(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sl(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_uk(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-TW(+)] ) >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
 SLOT=4
 SRC_URI=mirror://sourceforge/kbiff/kbiff/kbiff-4.0.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7fe6f8f51020233b1a52c4940c3cc4b6
diff --git a/metadata/md5-cache/kde-misc/kcollectd-0.9-r1 b/metadata/md5-cache/kde-misc/kcollectd-0.9-r1
index 6e366c7f76d3..6026746ec1ca 100644
--- a/metadata/md5-cache/kde-misc/kcollectd-0.9-r1
+++ b/metadata/md5-cache/kde-misc/kcollectd-0.9-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/boost:= net-analyzer/rrdtool || ( app-admin/collectd[collectd_plugins_rrdtool] app-admin/collectd[collectd_plugins_rrdcached] ) kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4
 SRC_URI=https://www.forwiss.uni-passau.de/~berberic/Linux/kcollectd/kcollectd-0.9.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3ce64960a80017ebe2ecd7a2b756daa1
diff --git a/metadata/md5-cache/kde-misc/kdeconnect-1.0.3 b/metadata/md5-cache/kde-misc/kdeconnect-1.0.3
index 36745bf15857..d0319dcc50ba 100644
--- a/metadata/md5-cache/kde-misc/kdeconnect-1.0.3
+++ b/metadata/md5-cache/kde-misc/kdeconnect-1.0.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdeconnect/1.0.3/src/kdeconnect-kde-1.0.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d79943f33db448149f9b6a386b637b49
diff --git a/metadata/md5-cache/kde-misc/kdeconnect-1.2 b/metadata/md5-cache/kde-misc/kdeconnect-1.2
index 208606a64322..1c67074a51e9 100644
--- a/metadata/md5-cache/kde-misc/kdeconnect-1.2
+++ b/metadata/md5-cache/kde-misc/kdeconnect-1.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdeconnect/1.2/src/kdeconnect-kde-1.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0a934f5b1e229bc01b157837b5bd5aeb
diff --git a/metadata/md5-cache/kde-misc/kdesudo-3.4.2.4-r1 b/metadata/md5-cache/kde-misc/kdesudo-3.4.2.4-r1
index 1af9a5721802..c8e6b3edc1b2 100644
--- a/metadata/md5-cache/kde-misc/kdesudo-3.4.2.4-r1
+++ b/metadata/md5-cache/kde-misc/kdesudo-3.4.2.4-r1
@@ -9,5 +9,5 @@ LICENSE=FDL-1.2 GPL-2 LGPL-2
 RDEPEND=app-admin/sudo kde-frameworks/oxygen-icons l10n_ar? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ar(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[l10n_en-GB(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[l10n_et(+)] ) l10n_fa? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fa(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fr(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_gl(+)] ) l10n_he? ( >=kde-apps/kde4-l10n-4.4:4[l10n_he(+)] ) l10n_hr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hu(+)] ) l10n_id? ( >=kde-apps/kde4-l10n-4.4:4[l10n_id(+)] ) l10n_is? ( >=kde-apps/kde4-l10n-4.4:4[l10n_is(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ja(+)] ) l10n_kk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_kk(+)] ) l10n_ko? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ko(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[l10n_lt(+)] ) l10n_lv? ( >=kde-apps/kde4-l10n-4.4:4[l10n_lv(+)] ) l10n_ms? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ms(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nb(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nl(+)] ) l10n_oc? ( >=kde-apps/kde4-l10n-4.4:4[l10n_oc(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sk(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sv(+)] ) l10n_tl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_tl(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-TW(+)] ) handbook? ( kde-frameworks/kdelibs:4[handbook] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4
 SRC_URI=https://launchpad.net/kdesudo/3.x/3.4.2.4/+download/kdesudo-3.4.2.4.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=085339df8f03ddbbf773f97c0b2aca01
diff --git a/metadata/md5-cache/kde-misc/kdiff3-0.9.98_p20170219-r1 b/metadata/md5-cache/kde-misc/kdiff3-0.9.98_p20170219-r1
index 6a2a5dbe21bc..4fdfb4f4c81d 100644
--- a/metadata/md5-cache/kde-misc/kdiff3-0.9.98_p20170219-r1
+++ b/metadata/md5-cache/kde-misc/kdiff3-0.9.98_p20170219-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-misc/kdiff3:4 sys-apps/diffutils >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/kdiff3-0.9.98_p20170219.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9d1f7176d2822696bc90adda083530ae
diff --git a/metadata/md5-cache/kde-misc/kdirstat-3.1.2 b/metadata/md5-cache/kde-misc/kdirstat-3.1.2
index 72889e2ada99..87892fda2eec 100644
--- a/metadata/md5-cache/kde-misc/kdirstat-3.1.2
+++ b/metadata/md5-cache/kde-misc/kdirstat-3.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-libs/zlib !kde-misc/kdirstat:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://bitbucket.org/jeromerobert/k4dirstat/get/k4dirstat-3.1.2.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=302bc7103360e7d387d38ad6fcf8e43b
diff --git a/metadata/md5-cache/kde-misc/kimtoy-1.91 b/metadata/md5-cache/kde-misc/kimtoy-1.91
index 025de5f69b3b..105ebb0c5488 100644
--- a/metadata/md5-cache/kde-misc/kimtoy-1.91
+++ b/metadata/md5-cache/kde-misc/kimtoy-1.91
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/plasma-5.37.0:5 app-i18n/ibus dev-libs/glib:2 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/libpng:0=[apng] x11-libs/libX11 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) scim? ( >=app-i18n/scim-1.4.9 dev-libs/dbus-c++ ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.37.0:5 ) !kde-misc/kimtoy:4 >=app-i18n/fcitx-4.0 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://dl.opendesktop.org/api/files/download/id/1466629206/140967-kimtoy-1.91.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=377c8497e26837ca5966326ca75c39a9
diff --git a/metadata/md5-cache/kde-misc/kio-gdrive-1.2.0.1 b/metadata/md5-cache/kde-misc/kio-gdrive-1.2.0.1
index 99617418e438..315e121ae513 100644
--- a/metadata/md5-cache/kde-misc/kio-gdrive-1.2.0.1
+++ b/metadata/md5-cache/kde-misc/kio-gdrive-1.2.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-apps/libkgapi-17.04.0:5 >=dev-qt/qtwidgets-5.7.1:5 kaccounts? ( >=kde-apps/kaccounts-integration-17.04.0:5 ) !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kio-gdrive/1.2.0.1/src/kio-gdrive-1.2.0.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9c196df2ac1758a118a5d0fd44047b38
diff --git a/metadata/md5-cache/kde-misc/kio-gdrive-1.2.1-r1 b/metadata/md5-cache/kde-misc/kio-gdrive-1.2.1-r1
index fdf6b7f0f5c7..918a2880a31c 100644
--- a/metadata/md5-cache/kde-misc/kio-gdrive-1.2.1-r1
+++ b/metadata/md5-cache/kde-misc/kio-gdrive-1.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-apps/libkgapi-14.12.0:5 >=dev-qt/qtwidgets-5.7.1:5 kaccounts? ( >=kde-apps/kaccounts-integration-14.12.0:5 ) !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] ) kaccounts? ( >=kde-apps/kaccounts-providers-14.12.0:5 ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kio-gdrive/1.2.1/src/kio-gdrive-1.2.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=64428bb80dd57cd35a653c5328f618b3
diff --git a/metadata/md5-cache/kde-misc/kio-gopher-0.1.99 b/metadata/md5-cache/kde-misc/kio-gopher-0.1.99
index f2bac3d5f7d6..1d3355908671 100644
--- a/metadata/md5-cache/kde-misc/kio-gopher-0.1.99
+++ b/metadata/md5-cache/kde-misc/kio-gopher-0.1.99
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 !kde-misc/kio-gopher:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/unstable/kio-gopher/kio-gopher-0.1.99.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1f3b37bbdc9039ad1700326e33dd763a
diff --git a/metadata/md5-cache/kde-misc/kio-locate-0.5.3-r1 b/metadata/md5-cache/kde-misc/kio-locate-0.5.3-r1
index 9b4f08922610..3376b6919a93 100644
--- a/metadata/md5-cache/kde-misc/kio-locate-0.5.3-r1
+++ b/metadata/md5-cache/kde-misc/kio-locate-0.5.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/solid-5.37.0:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-misc/kio-locate:4 sys-apps/mlocate >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://dl.opendesktop.org/api/files/download/id/1460972255/120965-kio-locate-0.5.3.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4d37fb33026958d67b43584597c64b1c
diff --git a/metadata/md5-cache/kde-misc/kio-stash-1.0 b/metadata/md5-cache/kde-misc/kio-stash-1.0
index 9708561e9bfc..b90e570464d2 100644
--- a/metadata/md5-cache/kde-misc/kio-stash-1.0
+++ b/metadata/md5-cache/kde-misc/kio-stash-1.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0 >=kde-frameworks/kdbusaddons-5.37.0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kde/stable/kio-stash/kio-stash-1.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c6779dca47c1baf66665a8bc86b4aaf1
diff --git a/metadata/md5-cache/kde-misc/kmarkdownwebview-0.2.0 b/metadata/md5-cache/kde-misc/kmarkdownwebview-0.2.0
index 3398cb9c39b0..c6ed9a51eaf6 100644
--- a/metadata/md5-cache/kde-misc/kmarkdownwebview-0.2.0
+++ b/metadata/md5-cache/kde-misc/kmarkdownwebview-0.2.0
@@ -9,5 +9,5 @@ LICENSE=!webkit? ( BSD ) LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 webkit? ( >=dev-qt/qtwebkit-5.7.1:5 ) !webkit? ( >=dev-qt/qtwebchannel-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kmarkdownwebview/0.2.0/src/kmarkdownwebview-0.2.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5b890f020db609fd9abb878d6cb2aa71
diff --git a/metadata/md5-cache/kde-misc/kolor-manager-1.1.0 b/metadata/md5-cache/kde-misc/kolor-manager-1.1.0
index 00652cf0c52d..3a84ef91c5a6 100644
--- a/metadata/md5-cache/kde-misc/kolor-manager-1.1.0
+++ b/metadata/md5-cache/kde-misc/kolor-manager-1.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=dev-qt/qtwidgets-5.7.1:5 media-gfx/synnefo media-libs/libXcm >=media-libs/oyranos-0.9.6 x11-libs/libXrandr >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://github.com/KDE/kolor-manager/archive/1.1.0.tar.gz -> kolor-manager-1.1.0.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b7b719c4eec81f3b6638bddbe90337b1
diff --git a/metadata/md5-cache/kde-misc/konstruktor-0.9_beta1 b/metadata/md5-cache/kde-misc/konstruktor-0.9_beta1
deleted file mode 100644
index e58623faf8d8..000000000000
--- a/metadata/md5-cache/kde-misc/konstruktor-0.9_beta1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-db/sqlite:3 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.7.2 dev-util/automoc virtual/pkgconfig >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto >=dev-qt/qtopengl-4.8.5:4 dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
-DESCRIPTION=LEGO CAD
-EAPI=5
-HOMEPAGE=http://konstruktor.influx.kr/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-db/sqlite:3 kde-frameworks/oxygen-icons >=dev-qt/qtopengl-4.8.5:4 dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
-SLOT=4
-SRC_URI=http://konstruktor.influx.kr/konstruktor-0.9-beta1.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ae46cc8b2d4425318a821e739455e710
diff --git a/metadata/md5-cache/kde-misc/kookie-0.1.1 b/metadata/md5-cache/kde-misc/kookie-0.1.1
deleted file mode 100644
index e252b35186ce..000000000000
--- a/metadata/md5-cache/kde-misc/kookie-0.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.7.2 dev-util/automoc virtual/pkgconfig >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
-DESCRIPTION=Manage recipes and shopping lists
-EAPI=5
-HOMEPAGE=http://www.kde-apps.org/content/show.php/Kookie?content=117806
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=kde-frameworks/oxygen-icons >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
-SLOT=4
-SRC_URI=mirror://sourceforge/kookie/kookie-0.1.1.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bb68f36b85102ee1e43d18034728b53b
diff --git a/metadata/md5-cache/kde-misc/kopete-antispam-0.5 b/metadata/md5-cache/kde-misc/kopete-antispam-0.5
index b511775717f7..cfadae47703a 100644
--- a/metadata/md5-cache/kde-misc/kopete-antispam-0.5
+++ b/metadata/md5-cache/kde-misc/kopete-antispam-0.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kopete-4.4:4 kde-frameworks/oxygen-icons >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
 SLOT=4
 SRC_URI=mirror://sourceforge/kopeteantispam/kopete-antispam-kde4-0.5.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b1c5734bfb7d7f26affb5ef6ac223675
diff --git a/metadata/md5-cache/kde-misc/kopete-thinklight-0.50 b/metadata/md5-cache/kde-misc/kopete-thinklight-0.50
index 7211b196bb99..f40d23d4dfa4 100644
--- a/metadata/md5-cache/kde-misc/kopete-thinklight-0.50
+++ b/metadata/md5-cache/kde-misc/kopete-thinklight-0.50
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/kopete-4.4:4 kde-frameworks/oxygen-icons >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/100537-kopete-thinklight-0.50.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=48edbfb25fb25c66fd7b0d080599bf58
diff --git a/metadata/md5-cache/kde-misc/kover-6 b/metadata/md5-cache/kde-misc/kover-6
index 0b841b6c55f6..f7237f443171 100644
--- a/metadata/md5-cache/kde-misc/kover-6
+++ b/metadata/md5-cache/kde-misc/kover-6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libcdio-paranoia media-libs/libcddb kde-frameworks/oxygen-icons l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[l10n_de(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[l10n_es(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fr(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[l10n_it(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nb(+)] ) l10n_no? ( >=kde-apps/kde4-l10n-4.4:4[l10n_no(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pl(+)] ) >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
 SLOT=4
 SRC_URI=http://lisas.de/kover/kover-6.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=50872532f2e42f48ab2b1d6ec6188034
diff --git a/metadata/md5-cache/kde-misc/krcstat-0.7.6-r1 b/metadata/md5-cache/kde-misc/krcstat-0.7.6-r1
index 11d56e0a7ed7..071e539d61f1 100644
--- a/metadata/md5-cache/kde-misc/krcstat-0.7.6-r1
+++ b/metadata/md5-cache/kde-misc/krcstat-0.7.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=kde-apps/konsolepart-4.4:4 >=kde-apps/konsole-4.4:4 ) kde-frameworks/oxygen-icons >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
 SLOT=4
 SRC_URI=http://binro.org/krcstat-0.7.6.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ab294fc39557dfa9435a49b659db3065
diff --git a/metadata/md5-cache/kde-misc/krename-4.0.9_p20170610 b/metadata/md5-cache/kde-misc/krename-4.0.9_p20170610
index 459491bf1b8b..f9083b5318fb 100644
--- a/metadata/md5-cache/kde-misc/krename-4.0.9_p20170610
+++ b/metadata/md5-cache/kde-misc/krename-4.0.9_p20170610
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kjs-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 exif? ( media-gfx/exiv2:= ) pdf? ( app-text/podofo ) taglib? ( media-libs/taglib ) truetype? ( media-libs/freetype:2 ) !kde-misc/krename:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/krename-4.0.9_p20170610.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bf0ff2245c1883efb97c6a66c1edac7a
diff --git a/metadata/md5-cache/kde-misc/krusader-2.6.0 b/metadata/md5-cache/kde-misc/krusader-2.6.0
index fab9152adb86..0201c4edc0bc 100644
--- a/metadata/md5-cache/kde-misc/krusader-2.6.0
+++ b/metadata/md5-cache/kde-misc/krusader-2.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kbookmarks-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/solid-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-apps/acl sys-libs/zlib >=kde-apps/kio-extras-14.12.0:5 !kde-misc/krusader:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/krusader/2.6.0/krusader-2.6.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2bb992c64356949aa3ab6f8054a82d9a
diff --git a/metadata/md5-cache/kde-misc/kshutdown-4.0 b/metadata/md5-cache/kde-misc/kshutdown-4.0
index 9fff79ced74e..e32f35f341d1 100644
--- a/metadata/md5-cache/kde-misc/kshutdown-4.0
+++ b/metadata/md5-cache/kde-misc/kshutdown-4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde? ( kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kdbusaddons:5 kde-frameworks/kglobalaccel:5 kde-frameworks/ki18n:5 kde-frameworks/kidletime:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) !kde-misc/kshutdown:4
 SLOT=5
 SRC_URI=mirror://sourceforge/kshutdown/kshutdown-source-4.0.zip
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5e4cc84fbdd18fb6ecefcba327195358
diff --git a/metadata/md5-cache/kde-misc/kshutdown-4.1.1_beta b/metadata/md5-cache/kde-misc/kshutdown-4.1.1_beta
index 7a753be0ff23..5ff809b4c70c 100644
--- a/metadata/md5-cache/kde-misc/kshutdown-4.1.1_beta
+++ b/metadata/md5-cache/kde-misc/kshutdown-4.1.1_beta
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde? ( kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kdbusaddons:5 kde-frameworks/kglobalaccel:5 kde-frameworks/ki18n:5 kde-frameworks/kidletime:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) !kde-misc/kshutdown:4
 SLOT=5
 SRC_URI=mirror://sourceforge/kshutdown/kshutdown-source-4.1.1beta.zip
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=903f761e704b2c9727dc992170e39c41
diff --git a/metadata/md5-cache/kde-misc/ktexteditorpreviewplugin-0.1.0 b/metadata/md5-cache/kde-misc/ktexteditorpreviewplugin-0.1.0
index 481cbdc8ea54..0c64a3641b7e 100644
--- a/metadata/md5-cache/kde-misc/ktexteditorpreviewplugin-0.1.0
+++ b/metadata/md5-cache/kde-misc/ktexteditorpreviewplugin-0.1.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktexteditor-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/ktexteditorpreviewplugin/0.1.0/src/ktexteditorpreviewplugin-0.1.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=85a3167a76f87e06dce3973bdd17a928
diff --git a/metadata/md5-cache/kde-misc/ktexteditorpreviewplugin-0.2.0 b/metadata/md5-cache/kde-misc/ktexteditorpreviewplugin-0.2.0
index 7c23d112dff3..8b936d04b5ce 100644
--- a/metadata/md5-cache/kde-misc/ktexteditorpreviewplugin-0.2.0
+++ b/metadata/md5-cache/kde-misc/ktexteditorpreviewplugin-0.2.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktexteditor-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/ktexteditorpreviewplugin/0.2.0/src/ktexteditorpreviewplugin-0.2.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=61607ca759eccd83c51075e309d97eb3
diff --git a/metadata/md5-cache/kde-misc/ktoshiba-5.3.1 b/metadata/md5-cache/kde-misc/ktoshiba-5.3.1
index 0a3debe93c56..860e6ff14cb5 100644
--- a/metadata/md5-cache/kde-misc/ktoshiba-5.3.1
+++ b/metadata/md5-cache/kde-misc/ktoshiba-5.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kauth-5.37.0:5 >=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 net-libs/libmnl >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=http://prdownloads.sourceforge.net/ktoshiba/ktoshiba-5.3.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6a9db043b0c2a5f7e2000f0cf98025f8
diff --git a/metadata/md5-cache/kde-misc/kwebkitpart-1.4.0_pre20170128 b/metadata/md5-cache/kde-misc/kwebkitpart-1.4.0_pre20170128
index 5163c0544908..9df18ca6b805 100644
--- a/metadata/md5-cache/kde-misc/kwebkitpart-1.4.0_pre20170128
+++ b/metadata/md5-cache/kde-misc/kwebkitpart-1.4.0_pre20170128
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/kdewebkit-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/sonnet-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-misc/kwebkitpart:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~asturm/kwebkitpart-1.4.0_pre20170128.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9953275d7e43689e8ef50aa42232c021
diff --git a/metadata/md5-cache/kde-misc/latte-dock-0.7.1 b/metadata/md5-cache/kde-misc/latte-dock-0.7.1
index ba16a7817800..7e730be53bd6 100644
--- a/metadata/md5-cache/kde-misc/latte-dock-0.7.1
+++ b/metadata/md5-cache/kde-misc/latte-dock-0.7.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kactivities-5.37.0 >=kde-frameworks/karchive-5.37.0 >=kde-frameworks/kconfig-5.37.0 >=kde-frameworks/kcoreaddons-5.37.0 >=kde-frameworks/kcrash-5.37.0 >=kde-frameworks/kdbusaddons-5.37.0 >=kde-frameworks/kdeclarative-5.37.0 >=kde-frameworks/kglobalaccel-5.37.0 >=kde-frameworks/ki18n-5.37.0 >=kde-frameworks/kiconthemes-5.37.0 >=kde-frameworks/knotifications-5.37.0 >=kde-frameworks/kpackage-5.37.0 >=kde-frameworks/kwayland-5.37.0 >=kde-frameworks/kwindowsystem-5.37.0 >=kde-frameworks/kxmlgui-5.37.0 >=kde-frameworks/plasma-5.37.0[X] >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[xcb] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libSM x11-libs/libX11 x11-libs/libxcb
 SLOT=0
 SRC_URI=https://github.com/psifidotos/Latte-Dock/archive/v0.7.1.tar.gz -> latte-dock-0.7.1.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3dce10a87f92369bb2356828b38c059b
diff --git a/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r500 b/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r500
index 38735425a89d..76e65e65b083 100644
--- a/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r500
+++ b/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r500
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=http://arielch.fedorapeople.org/devel/src/OpenOfficeorgThumbnail-1.0.0.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=cde6974bd969a945b29c8288af18592e
diff --git a/metadata/md5-cache/kde-misc/plasma-applet-network-monitor-1.7.3 b/metadata/md5-cache/kde-misc/plasma-applet-network-monitor-1.7.3
index 6b48ab1317b9..0a1816c283e5 100644
--- a/metadata/md5-cache/kde-misc/plasma-applet-network-monitor-1.7.3
+++ b/metadata/md5-cache/kde-misc/plasma-applet-network-monitor-1.7.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/plasma-5.37.0:5 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://github.com/kotelnik/plasma-applet-network-monitor/archive/v1.7.3.tar.gz -> plasma-applet-network-monitor-1.7.3.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1183015ed71e22d85fb997c184a09562
diff --git a/metadata/md5-cache/kde-misc/plasma-applet-redshift-control-1.0.18 b/metadata/md5-cache/kde-misc/plasma-applet-redshift-control-1.0.18
index 711cbb95f11d..d45a47556783 100644
--- a/metadata/md5-cache/kde-misc/plasma-applet-redshift-control-1.0.18
+++ b/metadata/md5-cache/kde-misc/plasma-applet-redshift-control-1.0.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/plasma-5.37.0:5 x11-misc/redshift >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://github.com/kotelnik/plasma-applet-redshift-control/archive/v1.0.18.tar.gz -> plasma-applet-redshift-control-1.0.18.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=434f8b1e4e1a1cc4f09fd241e29798e4
diff --git a/metadata/md5-cache/kde-misc/plasma-applet-weather-widget-1.6.10 b/metadata/md5-cache/kde-misc/plasma-applet-weather-widget-1.6.10
index c93f3c24f8ea..7f1ad1894b10 100644
--- a/metadata/md5-cache/kde-misc/plasma-applet-weather-widget-1.6.10
+++ b/metadata/md5-cache/kde-misc/plasma-applet-weather-widget-1.6.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/plasma-5.37.0:5 >=dev-qt/qtdeclarative-5.7.1:5[xml] >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://github.com/kotelnik/plasma-applet-weather-widget/archive/v1.6.10.tar.gz -> plasma-applet-weather-widget-1.6.10.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b1329fd6b2c797c242c1ae8f62a2ae77
diff --git a/metadata/md5-cache/kde-misc/rsibreak-0.12.7 b/metadata/md5-cache/kde-misc/rsibreak-0.12.7
index c6f9ae05ad8f..6565fb8d4678 100644
--- a/metadata/md5-cache/kde-misc/rsibreak-0.12.7
+++ b/metadata/md5-cache/kde-misc/rsibreak-0.12.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kidletime-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/frameworkintegration-5.37.0:5 !kde-misc/rsibreak:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/rsibreak/0.12/rsibreak-0.12.7.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=aeea0e4c395caada164f15a8d0dc6d6e
diff --git a/metadata/md5-cache/kde-misc/skanlite-2.0.1 b/metadata/md5-cache/kde-misc/skanlite-2.0.1
index 34e5df1405e3..eb4824151a50 100644
--- a/metadata/md5-cache/kde-misc/skanlite-2.0.1
+++ b/metadata/md5-cache/kde-misc/skanlite-2.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libksane-14.12.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/libpng:0= !kde-misc/skanlite:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/skanlite/2.0/skanlite-2.0.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b05897343ce28a222251698a0d0d16d9
diff --git a/metadata/md5-cache/kde-misc/systemd-kcm-1.2.1 b/metadata/md5-cache/kde-misc/systemd-kcm-1.2.1
index 93ff4b396697..d42d0ff5e1c2 100644
--- a/metadata/md5-cache/kde-misc/systemd-kcm-1.2.1
+++ b/metadata/md5-cache/kde-misc/systemd-kcm-1.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-apps/systemd !kde-misc/kcmsystemd:4 !kde-misc/systemd-kcm:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/systemd-kcm/systemd-kcm-1.2.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5df1b9990ae7051885fc63a3ec700064
diff --git a/metadata/md5-cache/kde-misc/tellico-3.0.2 b/metadata/md5-cache/kde-misc/tellico-3.0.2
index c96527d0cb12..f7e10a533f26 100644
--- a/metadata/md5-cache/kde-misc/tellico-3.0.2
+++ b/metadata/md5-cache/kde-misc/tellico-3.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=http://tellico-project.org/files/tellico-3.0.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8e65958c84aa22d97558c311f169b04b
diff --git a/metadata/md5-cache/kde-misc/tellico-3.0.2-r1 b/metadata/md5-cache/kde-misc/tellico-3.0.2-r1
index 617c7452bc1c..b665c31c9c03 100644
--- a/metadata/md5-cache/kde-misc/tellico-3.0.2-r1
+++ b/metadata/md5-cache/kde-misc/tellico-3.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=http://tellico-project.org/files/tellico-3.0.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1d372140c6ef8596b43521239f56563d
diff --git a/metadata/md5-cache/kde-misc/tellico-3.1 b/metadata/md5-cache/kde-misc/tellico-3.1
index 2902a4aeabae..d91d0e7a8e69 100644
--- a/metadata/md5-cache/kde-misc/tellico-3.1
+++ b/metadata/md5-cache/kde-misc/tellico-3.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=http://tellico-project.org/files/tellico-3.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=968fabe4e1f6717b426e4c97f647caf9
diff --git a/metadata/md5-cache/kde-misc/wacomtablet-3.0.0_beta1 b/metadata/md5-cache/kde-misc/wacomtablet-3.0.0_beta1
index c28c03e662e9..c9f575b0e55c 100644
--- a/metadata/md5-cache/kde-misc/wacomtablet-3.0.0_beta1
+++ b/metadata/md5-cache/kde-misc/wacomtablet-3.0.0_beta1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/extra-cmake-modules-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kglobalaccel-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/plasma-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=x11-drivers/xf86-input-wacom-0.20.0 x11-libs/libX11 x11-libs/libXi x11-libs/libXrandr x11-libs/libxcb !kde-misc/wacomtablet:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-3.0.0~beta1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=21820abe71ff8db1dfbde11ac033ed78
diff --git a/metadata/md5-cache/kde-misc/yakuake-3.0.4 b/metadata/md5-cache/kde-misc/yakuake-3.0.4
index 82ba05be3841..7e22acf719cc 100644
--- a/metadata/md5-cache/kde-misc/yakuake-3.0.4
+++ b/metadata/md5-cache/kde-misc/yakuake-3.0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kglobalaccel-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwayland-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/konsole-14.12.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 !kde-misc/yakuake:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/yakuake/3.0.4/src/yakuake-3.0.4.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7fe393ad0796f91c608773abf02f52c8
diff --git a/metadata/md5-cache/kde-misc/yakuake-3.0.4-r2 b/metadata/md5-cache/kde-misc/yakuake-3.0.4-r2
index a0fb60bfbfab..5cb5be32fb99 100644
--- a/metadata/md5-cache/kde-misc/yakuake-3.0.4-r2
+++ b/metadata/md5-cache/kde-misc/yakuake-3.0.4-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kglobalaccel-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwayland-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/konsole-14.12.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 !kde-misc/yakuake:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/yakuake/3.0.4/src/yakuake-3.0.4.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7d60ec3d4352566d22d6c33b209b54de
diff --git a/metadata/md5-cache/kde-misc/zanshin-0.4.1_p20170701 b/metadata/md5-cache/kde-misc/zanshin-0.4.1_p20170701
index 288ad7c767d3..f7f15a6a1944 100644
--- a/metadata/md5-cache/kde-misc/zanshin-0.4.1_p20170701
+++ b/metadata/md5-cache/kde-misc/zanshin-0.4.1_p20170701
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/krunner-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/akonadi-14.12.0:5 >=kde-apps/akonadi-calendar-14.12.0:5 >=kde-apps/akonadi-contacts-14.12.0:5 >=kde-apps/akonadi-notes-14.12.0:5 >=kde-apps/akonadi-search-14.12.0:5 >=kde-apps/kcalcore-14.12.0:5 >=kde-apps/kcontacts-14.12.0:5 >=kde-apps/kidentitymanagement-14.12.0:5 >=kde-apps/kldap-14.12.0:5 >=kde-apps/kmime-14.12.0:5 >=kde-apps/kontactinterface-14.12.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-misc/zanshin:4 >=kde-apps/kdepim-runtime-14.12.0:5 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/zanshin-0.4.1_p20170701.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=33cbc428c8de0d683b239e8e0533f56f
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.10.5 b/metadata/md5-cache/kde-plasma/bluedevil-5.10.5
index 4da6e79650bf..73cf1d92fae3 100644
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.10.5
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.10.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/bluez-qt-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kded-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/plasma-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-plasma/kde-cli-tools-5.10.5:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !kde-plasma/bluedevil:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/bluedevil-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1f39dcd1e431b2223a9fdb4b77b274f1
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.11.1 b/metadata/md5-cache/kde-plasma/bluedevil-5.11.1
deleted file mode 100644
index 60847a87cb90..000000000000
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/bluez-qt-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kded-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Bluetooth stack for KDE Plasma
-EAPI=6
-HOMEPAGE=https://projects.kde.org/projects/extragear/base/bluedevil
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/bluez-qt-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kded-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-plasma/kde-cli-tools-5.11.1:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !kde-plasma/bluedevil:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/bluedevil-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e11b4147ff8871ca5c87cc62004c2224
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.11.2 b/metadata/md5-cache/kde-plasma/bluedevil-5.11.2
new file mode 100644
index 000000000000..bfa7e7365151
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.11.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/bluez-qt-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kded-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Bluetooth stack for KDE Plasma
+EAPI=6
+HOMEPAGE=https://projects.kde.org/projects/extragear/base/bluedevil
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/bluez-qt-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kded-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-plasma/kde-cli-tools-5.11.2:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !kde-plasma/bluedevil:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/bluedevil-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e11b4147ff8871ca5c87cc62004c2224
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.10.5 b/metadata/md5-cache/kde-plasma/breeze-5.10.5
index 9d9d3f7ad9a5..75d0b11beff4 100644
--- a/metadata/md5-cache/kde-plasma/breeze-5.10.5
+++ b/metadata/md5-cache/kde-plasma/breeze-5.10.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/frameworkintegration-5.37.0:5 >=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-plasma/kdecoration-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb qt4? ( kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.37.0:5 ) >=kde-frameworks/breeze-icons-5.37.0:5 >=kde-plasma/kde-cli-tools-5.10.5:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/breeze-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=195b950c57c6b3474c1c6ef9133254f9
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.11.1 b/metadata/md5-cache/kde-plasma/breeze-5.11.1
deleted file mode 100644
index 25939edb54cf..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-5.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/frameworkintegration-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kguiaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-plasma/kdecoration-5.11.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb qt4? ( kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.38.0:5 ) >=kde-frameworks/kpackage-5.38.0:5 qt4? ( dev-util/automoc:0 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Breeze visual style for the Plasma desktop
-EAPI=6
-HOMEPAGE=https://projects.kde.org/projects/kde/workspace/breeze
-IUSE=qt4 wayland debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/frameworkintegration-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kguiaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-plasma/kdecoration-5.11.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb qt4? ( kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.38.0:5 ) >=kde-frameworks/breeze-icons-5.38.0:5 >=kde-plasma/kde-cli-tools-5.11.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/breeze-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=95e0a6597e4f145b6227c051503c8789
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.11.2 b/metadata/md5-cache/kde-plasma/breeze-5.11.2
new file mode 100644
index 000000000000..bf236f0e307c
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/frameworkintegration-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kguiaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-plasma/kdecoration-5.11.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 qt4? ( kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.38.0:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb ) >=kde-frameworks/kpackage-5.38.0:5 qt4? ( dev-util/automoc:0 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Breeze visual style for the Plasma desktop
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/breeze.git
+IUSE=qt4 wayland X debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/frameworkintegration-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kguiaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-plasma/kdecoration-5.11.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 qt4? ( kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.38.0:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb ) >=kde-frameworks/breeze-icons-5.38.0:5 >=kde-plasma/kde-cli-tools-5.11.2:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+REQUIRED_USE=qt4? ( X )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/breeze-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8e9847b6e937a4e7da89cafc84c62c03
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.10.5 b/metadata/md5-cache/kde-plasma/breeze-grub-5.10.5
index f992eba7bdc6..db68f1fb484f 100644
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.10.5
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.10.5
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-3+
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/breeze-grub-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1e5bc01c0d865dc73b7f25d4ebefc68f
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.11.1 b/metadata/md5-cache/kde-plasma/breeze-grub-5.11.1
deleted file mode 100644
index 5b75c22d0775..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.11.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Breeze theme for GRUB
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3+
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/breeze-grub-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=353f46f5fa694c6f57fe50eb700b2b17
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.11.2 b/metadata/md5-cache/kde-plasma/breeze-grub-5.11.2
new file mode 100644
index 000000000000..4311720fd8a1
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.11.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Breeze theme for GRUB
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3+
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/breeze-grub-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=353f46f5fa694c6f57fe50eb700b2b17
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.10.5 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.10.5
index 034b2caade16..46d3c5fbaaba 100644
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.10.5
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.10.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/breeze-gtk-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=692e21f36ad4da1f6c36efea17dba4ab
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.11.1 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.11.1
deleted file mode 100644
index 14c828c7ba7e..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Official GTK+ port of Plasma's Breeze widget style
-EAPI=6
-HOMEPAGE=https://projects.kde.org/projects/kde/workspace/breeze-gtk
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/breeze-gtk-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9fd4ff9221bd5aeb7d3fd06381f9e2f3
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.11.2 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.11.2
new file mode 100644
index 000000000000..e36187304278
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.11.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Official GTK+ port of Plasma's Breeze widget style
+EAPI=6
+HOMEPAGE=https://projects.kde.org/projects/kde/workspace/breeze-gtk
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/breeze-gtk-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9fd4ff9221bd5aeb7d3fd06381f9e2f3
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.10.5 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.10.5
index 0817eb171ee6..d4c6440a0069 100644
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.10.5
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.10.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ GPL-3+
 RDEPEND=sys-boot/plymouth
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/breeze-plymouth-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=aed58461608da12764666eb7d1c7f4e5
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.11.1 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.11.1
deleted file mode 100644
index 620e05eb008d..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=sys-boot/plymouth >=kde-frameworks/extra-cmake-modules-5.38.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Breeze theme for Plymouth
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2+ GPL-3+
-RDEPEND=sys-boot/plymouth
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/breeze-plymouth-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d513c9db39b24f777b0ea34d442dcd1b
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.11.2 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.11.2
new file mode 100644
index 000000000000..19591883d7d9
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.11.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=sys-boot/plymouth >=kde-frameworks/extra-cmake-modules-5.38.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Breeze theme for Plymouth
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2+ GPL-3+
+RDEPEND=sys-boot/plymouth
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/breeze-plymouth-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d513c9db39b24f777b0ea34d442dcd1b
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.11.1 b/metadata/md5-cache/kde-plasma/drkonqi-5.11.1
deleted file mode 100644
index 1ea0fdda0c3a..000000000000
--- a/metadata/md5-cache/kde-plasma/drkonqi-5.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kcrash-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kidletime-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kjobwidgets-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwayland-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kxmlrpcclient-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=dev-qt/qtconcurrent-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma crash handler, gives the user feedback if a program crashed
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=X debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kcrash-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kidletime-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kjobwidgets-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwayland-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kxmlrpcclient-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) !kde-apps/drkonqi:4 !<kde-plasma/plasma-workspace-5.10.95:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/drkonqi-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3ad92711523c154715c5cff9224f5335
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.11.2 b/metadata/md5-cache/kde-plasma/drkonqi-5.11.2
new file mode 100644
index 000000000000..c22cf785f1fa
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/drkonqi-5.11.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kcrash-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kidletime-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kjobwidgets-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwayland-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kxmlrpcclient-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=dev-qt/qtconcurrent-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plasma crash handler, gives the user feedback if a program crashed
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=X debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kcrash-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kidletime-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kjobwidgets-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwayland-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kxmlrpcclient-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) !kde-apps/drkonqi:4 !<kde-plasma/plasma-workspace-5.10.95:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/drkonqi-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b79975182e1eba048dc72bb71c08710d
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.10.5 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.10.5
index b285126ae720..0f6b909b926d 100644
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.10.5
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.10.5
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kglobalaccel-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 !<kde-frameworks/kactivities-4.13.3-r2:4 !kde-plasma/kactivitymanagerd:4 !<kde-plasma/plasma-desktop-5.6.1 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/kactivitymanagerd-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3a287a931e758fcd3c19c190b1e9d32e
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.11.1 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.11.1
deleted file mode 100644
index d82b38769856..000000000000
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 >=dev-libs/boost-1.54 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=System service to manage user's activities, track the usage patterns etc.
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=>=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 !<kde-frameworks/kactivities-4.13.3-r2:4 !kde-plasma/kactivitymanagerd:4 !<kde-plasma/plasma-desktop-5.6.1 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/kactivitymanagerd-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2a6d5bdcaa7ca6c77388e857d27c13f3
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.11.2 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.11.2
new file mode 100644
index 000000000000..67fc35c696fa
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.11.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 >=dev-libs/boost-1.54 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=System service to manage user's activities, track the usage patterns etc.
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 )
+RDEPEND=>=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 !<kde-frameworks/kactivities-4.13.3-r2:4 !kde-plasma/kactivitymanagerd:4 !<kde-plasma/plasma-desktop-5.6.1 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/kactivitymanagerd-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2a6d5bdcaa7ca6c77388e857d27c13f3
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.10.5 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.10.5
index 54480b0f7840..d6572ed0c067 100644
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.10.5
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.10.5
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/kde-cli-tools-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=67b630310b3a69568062a4cb48bbb966
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.11.1 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.11.1
deleted file mode 100644
index 1f734a77f0ad..000000000000
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 kdesu? ( >=kde-frameworks/kdesu-5.38.0:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 handbook? ( >=kde-frameworks/kdoctools-5.38.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
-EAPI=6
-HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kde-cli-tools
-IUSE=+kdesu X test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 kdesu? ( >=kde-frameworks/kdesu-5.38.0:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) !kde-apps/kdesu >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/kde-cli-tools-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d56eaf9e1b08bf87639a4754879cf08b
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.11.2 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.11.2
new file mode 100644
index 000000000000..b900a4be1759
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 kdesu? ( >=kde-frameworks/kdesu-5.38.0:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 handbook? ( >=kde-frameworks/kdoctools-5.38.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
+EAPI=6
+HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kde-cli-tools
+IUSE=+kdesu X test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 kdesu? ( >=kde-frameworks/kdesu-5.38.0:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) !kde-apps/kdesu >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/kde-cli-tools-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d56eaf9e1b08bf87639a4754879cf08b
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.10.5 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.10.5
index 60c096c41810..84d40313b275 100644
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.10.5
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.10.5
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcmutils-5.37.0:5 >=
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/kde-gtk-config-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2650c6d654ab8c32cebc4387b9ce9d5f
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.11.1 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.11.1
deleted file mode 100644
index 414b8f61d523..000000000000
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/knewstuff-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXcursor gtk3? ( x11-libs/gtk+:3 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma systemsettings kcm to set GTK application look&feel
-EAPI=6
-HOMEPAGE=https://projects.kde.org/kde-gtk-config
-IUSE=+gtk3 test debug test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=>=kde-frameworks/karchive-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/knewstuff-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXcursor gtk3? ( x11-libs/gtk+:3 ) >=kde-plasma/kde-cli-tools-5.11.1:5 !kde-plasma/kde-gtk-config:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/kde-gtk-config-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=90107281ccd5166054cc6426b87c8b87
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.11.2 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.11.2
new file mode 100644
index 000000000000..6cbd2637e665
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/knewstuff-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXcursor gtk3? ( x11-libs/gtk+:3 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma systemsettings kcm to set GTK application look&feel
+EAPI=6
+HOMEPAGE=https://projects.kde.org/kde-gtk-config
+IUSE=+gtk3 test debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND=>=kde-frameworks/karchive-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/knewstuff-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXcursor gtk3? ( x11-libs/gtk+:3 ) >=kde-plasma/kde-cli-tools-5.11.2:5 !kde-plasma/kde-gtk-config:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/kde-gtk-config-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=90107281ccd5166054cc6426b87c8b87
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.10.5 b/metadata/md5-cache/kde-plasma/kdecoration-5.10.5
index 6438c11ab195..38c73e83bb8e 100644
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.10.5
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.10.5
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/kdecoration-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5b65e8b1e8a2c5673a2dd8bceb149127
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.11.1 b/metadata/md5-cache/kde-plasma/kdecoration-5.11.1
deleted file mode 100644
index 6528946981e9..000000000000
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plugin based library to create window decorations
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/kdecoration-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7c95d7044ce0f7bd5623865883fbd415
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.11.2 b/metadata/md5-cache/kde-plasma/kdecoration-5.11.2
new file mode 100644
index 000000000000..7f42e4b0136c
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.11.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plugin based library to create window decorations
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/kdecoration-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7c95d7044ce0f7bd5623865883fbd415
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.10.5 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.10.5
index 53f18f23149f..ede8cd4f0885 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.10.5
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.10.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.37.0:5 >=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kpackage-5.37.0:5 >=kde-frameworks/kross-5.37.0:5 >=kde-frameworks/krunner-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kunitconversion-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/plasma-5.37.0:5 >=kde-frameworks/sonnet-5.37.0:5 >=kde-plasma/plasma-workspace-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 share? ( dev-libs/purpose:5 ) >=kde-plasma/plasma-workspace-5.10.5:5 !kde-plasma/kdeplasma-addons:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/kdeplasma-addons-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=221a2a660b353f0a80a6eb5b44f62956
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.11.1 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.11.1
deleted file mode 100644
index 0488a283fb37..000000000000
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.38.0:5 >=kde-frameworks/karchive-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdelibs4support-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/knewstuff-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kpackage-5.38.0:5 >=kde-frameworks/kross-5.38.0:5 >=kde-frameworks/krunner-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kunitconversion-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=kde-frameworks/sonnet-5.38.0:5 >=kde-plasma/plasma-workspace-5.11.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 share? ( dev-libs/purpose:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Extra Plasma applets and engines
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=share debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.38.0:5 >=kde-frameworks/karchive-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdelibs4support-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/knewstuff-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kpackage-5.38.0:5 >=kde-frameworks/kross-5.38.0:5 >=kde-frameworks/krunner-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kunitconversion-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=kde-frameworks/sonnet-5.38.0:5 >=kde-plasma/plasma-workspace-5.11.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 share? ( dev-libs/purpose:5 ) >=kde-plasma/plasma-workspace-5.11.1:5 !kde-plasma/kdeplasma-addons:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/kdeplasma-addons-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=993c806cd2efcf7c9b09dab3bef0c94a
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.11.2 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.11.2
new file mode 100644
index 000000000000..4a53fe518223
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.11.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.38.0:5 >=kde-frameworks/karchive-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdelibs4support-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/knewstuff-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kpackage-5.38.0:5 >=kde-frameworks/kross-5.38.0:5 >=kde-frameworks/krunner-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kunitconversion-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=kde-frameworks/sonnet-5.38.0:5 >=kde-plasma/plasma-workspace-5.11.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 share? ( dev-libs/purpose:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Extra Plasma applets and engines
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=share debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.38.0:5 >=kde-frameworks/karchive-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdelibs4support-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/knewstuff-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kpackage-5.38.0:5 >=kde-frameworks/kross-5.38.0:5 >=kde-frameworks/krunner-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kunitconversion-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=kde-frameworks/sonnet-5.38.0:5 >=kde-plasma/plasma-workspace-5.11.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 share? ( dev-libs/purpose:5 ) >=kde-plasma/plasma-workspace-5.11.2:5 !kde-plasma/kdeplasma-addons:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/kdeplasma-addons-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5c830d46a7a615e9320c3eebc6d4703d
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.10.5 b/metadata/md5-cache/kde-plasma/kgamma-5.10.5
index 89b84e347243..0798b714e099 100644
--- a/metadata/md5-cache/kde-plasma/kgamma-5.10.5
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.10.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/kgamma5-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d880a779541666add886c5d72d14aa9f
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.11.1 b/metadata/md5-cache/kde-plasma/kgamma-5.11.1
deleted file mode 100644
index 5348a067ea8c..000000000000
--- a/metadata/md5-cache/kde-plasma/kgamma-5.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 x11-libs/libX11 x11-libs/libXxf86vm x11-proto/xf86vidmodeproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 handbook? ( >=kde-frameworks/kdoctools-5.38.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Screen gamma values kcontrol module
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/kgamma5-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=67911e80e242c9f277f1390d07cdd7bc
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.11.2 b/metadata/md5-cache/kde-plasma/kgamma-5.11.2
new file mode 100644
index 000000000000..7754a59129c3
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.11.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 x11-libs/libX11 x11-libs/libXxf86vm x11-proto/xf86vidmodeproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 handbook? ( >=kde-frameworks/kdoctools-5.38.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Screen gamma values kcontrol module
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/kgamma5-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=67911e80e242c9f277f1390d07cdd7bc
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.10.5 b/metadata/md5-cache/kde-plasma/khotkeys-5.10.5
index 418b008df604..5e831de3bd8a 100644
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.10.5
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.10.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5[X] >=kde-frameworks/kglobalaccel-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-plasma/plasma-workspace-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.37.0:5 >=kde-plasma/kde-cli-tools-5.10.5:5 !kde-plasma/khotkeys:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/khotkeys-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=265236eaa880c42added78d352782767
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.11.1 b/metadata/md5-cache/kde-plasma/khotkeys-5.11.1
deleted file mode 100644
index e002f1474efc..000000000000
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdelibs4support-5.38.0:5[X] >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/ktextwidgets-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-plasma/plasma-workspace-5.11.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXtst x11-libs/libxcb x11-libs/libXtst x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 handbook? ( >=kde-frameworks/kdoctools-5.38.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma workspace hotkey module
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdelibs4support-5.38.0:5[X] >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/ktextwidgets-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-plasma/plasma-workspace-5.11.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.38.0:5 >=kde-plasma/kde-cli-tools-5.11.1:5 !kde-plasma/khotkeys:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/khotkeys-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=396ced7318c0bb0187cee9bbc19bdbbf
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.11.2 b/metadata/md5-cache/kde-plasma/khotkeys-5.11.2
new file mode 100644
index 000000000000..3ce09238cfe9
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.11.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdelibs4support-5.38.0:5[X] >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/ktextwidgets-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-plasma/plasma-workspace-5.11.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXtst x11-libs/libxcb x11-libs/libXtst x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 handbook? ( >=kde-frameworks/kdoctools-5.38.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma workspace hotkey module
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdelibs4support-5.38.0:5[X] >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/ktextwidgets-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-plasma/plasma-workspace-5.11.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.38.0:5 >=kde-plasma/kde-cli-tools-5.11.2:5 !kde-plasma/khotkeys:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/khotkeys-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=396ced7318c0bb0187cee9bbc19bdbbf
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.10.5 b/metadata/md5-cache/kde-plasma/kinfocenter-5.10.5
index e58e0830503a..fad45b9e6073 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.10.5
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.10.5
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5
 REQUIRED_USE=wayland? ( || ( gles2 opengl ) )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/kinfocenter-5.10.5.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d8c0baccc01a9728aed81dd4a61288c1
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.11.1 b/metadata/md5-cache/kde-plasma/kinfocenter-5.11.1
deleted file mode 100644
index 443213544085..000000000000
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kcrash-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kpackage-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/solid-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.7.1:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.38.0:5 media-libs/mesa[egl] ) >=kde-frameworks/plasma-5.38.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 handbook? ( >=kde-frameworks/kdoctools-5.38.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A utility that provides information about a computer system
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/system/kinfocenter/
-IUSE=gles2 ieee1394 +opengl +pci wayland debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kcrash-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kpackage-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/solid-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.7.1:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.38.0:5 media-libs/mesa[egl] ) >=kde-plasma/kde-cli-tools-5.11.1:5 !kde-apps/kcontrol:4 !kde-misc/about-distro !kde-plasma/kinfocenter:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-REQUIRED_USE=wayland? ( || ( gles2 opengl ) )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/kinfocenter-5.11.1.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cacbbd33df43d6834c2b967836f4d2e6
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.11.2 b/metadata/md5-cache/kde-plasma/kinfocenter-5.11.2
new file mode 100644
index 000000000000..4c286ce441ba
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kcrash-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kpackage-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/solid-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.7.1:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.38.0:5 media-libs/mesa[egl] ) >=kde-frameworks/plasma-5.38.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 handbook? ( >=kde-frameworks/kdoctools-5.38.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A utility that provides information about a computer system
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/system/kinfocenter/
+IUSE=gles2 ieee1394 +opengl +pci wayland debug +handbook
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kcrash-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kpackage-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/solid-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.7.1:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.38.0:5 media-libs/mesa[egl] ) >=kde-plasma/kde-cli-tools-5.11.2:5 !kde-apps/kcontrol:4 !kde-misc/about-distro !kde-plasma/kinfocenter:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+REQUIRED_USE=wayland? ( || ( gles2 opengl ) )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/kinfocenter-5.11.2.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cacbbd33df43d6834c2b967836f4d2e6
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.10.5 b/metadata/md5-cache/kde-plasma/kmenuedit-5.10.5
index 67963eeae467..892a11fa48f9 100644
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.10.5
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.10.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/sonnet-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.10.5:5 ) !kde-plasma/kmenuedit:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/kmenuedit-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=beb873fa98b129d97f47df0ebfb42906
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.11.1 b/metadata/md5-cache/kde-plasma/kmenuedit-5.11.1
deleted file mode 100644
index e96c05f08caf..000000000000
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdelibs4support-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/sonnet-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 handbook? ( >=kde-frameworks/kdoctools-5.38.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma menu editor
-EAPI=6
-HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kmenuedit
-IUSE=+hotkeys debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdelibs4support-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/sonnet-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.11.1:5 ) !kde-plasma/kmenuedit:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/kmenuedit-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=290066f8da5d085c24a51d1466a22382
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.11.2 b/metadata/md5-cache/kde-plasma/kmenuedit-5.11.2
new file mode 100644
index 000000000000..427611201a79
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.11.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdelibs4support-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/sonnet-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.11.2:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 handbook? ( >=kde-frameworks/kdoctools-5.38.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma menu editor
+EAPI=6
+HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kmenuedit
+IUSE=+hotkeys debug +handbook
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdelibs4support-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/sonnet-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.11.2:5 ) !kde-plasma/kmenuedit:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/kmenuedit-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=290066f8da5d085c24a51d1466a22382
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.10.5 b/metadata/md5-cache/kde-plasma/kscreen-5.10.5
index a54d6c87c564..e81affb5a5b0 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-5.10.5
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.10.5
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/kscreen-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=40ded9b4815cd3106b4335f969e48c03
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.11.1 b/metadata/md5-cache/kde-plasma/kscreen-5.11.1
deleted file mode 100644
index e14d626eab83..000000000000
--- a/metadata/md5-cache/kde-plasma/kscreen-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-plasma/libkscreen-5.11.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma screen management
-EAPI=6
-HOMEPAGE=https://projects.kde.org/projects/extragear/base/kscreen
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-plasma/libkscreen-5.11.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/plasma-5.38.0:5 >=kde-plasma/kde-cli-tools-5.11.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 !kde-plasma/kscreen:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/kscreen-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bc20d42ea774754856b03e57aface64e
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.11.2 b/metadata/md5-cache/kde-plasma/kscreen-5.11.2
new file mode 100644
index 000000000000..02f89081b768
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-plasma/libkscreen-5.11.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma screen management
+EAPI=6
+HOMEPAGE=https://projects.kde.org/projects/extragear/base/kscreen
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-plasma/libkscreen-5.11.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/plasma-5.38.0:5 >=kde-plasma/kde-cli-tools-5.11.2:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 !kde-plasma/kscreen:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/kscreen-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bc20d42ea774754856b03e57aface64e
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.10.5.1 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.10.5.1
index f9a927deeeec..c691b3eeb1dc 100644
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.10.5.1
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.10.5.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/kscreenlocker-5.10.5.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7bb1b1f113660f3c2cc38cb95f489ffb
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.11.1 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.11.1
deleted file mode 100644
index aa8d4a78ced0..000000000000
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.11.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kcrash-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kidletime-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kpackage-5.38.0:5 >=kde-frameworks/ktextwidgets-5.38.0:5 >=kde-frameworks/kwayland-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/solid-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library and components for secure lock screen architecture
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+pam seccomp test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kcrash-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kidletime-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kpackage-5.38.0:5 >=kde-frameworks/ktextwidgets-5.38.0:5 >=kde-frameworks/kwayland-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/solid-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) >=kde-plasma/kde-cli-tools-5.11.1:5 !<kde-plasma/kcheckpass-4.11.22-r1:4 !kde-plasma/kdebase-pam:0 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-REQUIRED_USE=seccomp? ( pam )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/kscreenlocker-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5b50d5893fdafa3c47da27d6c39aa198
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.11.2 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.11.2
new file mode 100644
index 000000000000..3166c7768a4f
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.11.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kcrash-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kidletime-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kpackage-5.38.0:5 >=kde-frameworks/ktextwidgets-5.38.0:5 >=kde-frameworks/kwayland-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/solid-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library and components for secure lock screen architecture
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+pam seccomp test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kcrash-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kidletime-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kpackage-5.38.0:5 >=kde-frameworks/ktextwidgets-5.38.0:5 >=kde-frameworks/kwayland-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/solid-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) >=kde-plasma/kde-cli-tools-5.11.2:5 !<kde-plasma/kcheckpass-4.11.22-r1:4 !kde-plasma/kdebase-pam:0 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+REQUIRED_USE=seccomp? ( pam )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/kscreenlocker-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5b50d5893fdafa3c47da27d6c39aa198
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.10.5 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.10.5
index 2306309ed920..d11f5eb1a02e 100644
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.10.5
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.10.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-plasma/ksshaskpass:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/ksshaskpass-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b1bcd759e0f8b231653597c58900bdd7
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.11.1 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.11.1
deleted file mode 100644
index 0ab14f319b80..000000000000
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kwallet-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE implementation of ssh-askpass with Kwallet integration
-EAPI=6
-HOMEPAGE=https://projects.kde.org/projects/kde/workspace/ksshaskpass
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kwallet-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-plasma/ksshaskpass:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/ksshaskpass-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cbb8d0875cfe1b55a09c184f5cb9ccaa
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.11.2 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.11.2
new file mode 100644
index 000000000000..35bd8e475910
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.11.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kwallet-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE implementation of ssh-askpass with Kwallet integration
+EAPI=6
+HOMEPAGE=https://projects.kde.org/projects/kde/workspace/ksshaskpass
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kwallet-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-plasma/ksshaskpass:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/ksshaskpass-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cbb8d0875cfe1b55a09c184f5cb9ccaa
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.10.5 b/metadata/md5-cache/kde-plasma/ksysguard-5.10.5
index 64ebb96ea691..9c31a52fffc0 100644
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.10.5
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.10.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-plasma/libksysguard-5.10.5:5[-minimal(-)] >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kinit-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 lm_sensors? ( sys-apps/lm_sensors ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/ksysguard-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6b989bc5383deef9ae1375ebb6ae7578
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.11.1 b/metadata/md5-cache/kde-plasma/ksysguard-5.11.1
deleted file mode 100644
index 8d9857de7602..000000000000
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-plasma/libksysguard-5.11.1:5[-minimal(-)] >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kinit-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kitemviews-5.38.0:5 >=kde-frameworks/knewstuff-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 lm_sensors? ( sys-apps/lm_sensors ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 handbook? ( >=kde-frameworks/kdoctools-5.38.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Network-enabled task manager and system monitor
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=lm_sensors debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-plasma/libksysguard-5.11.1:5[-minimal(-)] >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kinit-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kitemviews-5.38.0:5 >=kde-frameworks/knewstuff-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 lm_sensors? ( sys-apps/lm_sensors ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/ksysguard-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=59cd7f834df6b28cc860385cef140cd4
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.11.2 b/metadata/md5-cache/kde-plasma/ksysguard-5.11.2
new file mode 100644
index 000000000000..a12245f6af2a
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.11.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-plasma/libksysguard-5.11.2:5[-minimal(-)] >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kinit-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kitemviews-5.38.0:5 >=kde-frameworks/knewstuff-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 lm_sensors? ( sys-apps/lm_sensors ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 handbook? ( >=kde-frameworks/kdoctools-5.38.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Network-enabled task manager and system monitor
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=lm_sensors debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-plasma/libksysguard-5.11.2:5[-minimal(-)] >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kinit-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kitemviews-5.38.0:5 >=kde-frameworks/knewstuff-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 lm_sensors? ( sys-apps/lm_sensors ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/ksysguard-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=59cd7f834df6b28cc860385cef140cd4
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.10.5-r1 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.10.5-r1
index 8a7b4b8b5267..c73355a27ddb 100644
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.10.5-r1
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.10.5-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libgcrypt:0= virtual/pam net-misc/socat >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/kwallet-pam-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ecd473f4112ef349aa27c5181a1b3238
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.11.1 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.11.1
deleted file mode 100644
index 40f3bae47289..000000000000
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libgcrypt:0= virtual/pam sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KWallet PAM module to not enter password again
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libgcrypt:0= virtual/pam net-misc/socat >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/kwallet-pam-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=09b2339f5ab4fdc4a61ef0cc2c4f7409
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.11.2 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.11.2
new file mode 100644
index 000000000000..d6ec8737ec64
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.11.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libgcrypt:0= virtual/pam sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KWallet PAM module to not enter password again
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/libgcrypt:0= virtual/pam net-misc/socat >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/kwallet-pam-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=56523921560ffdd320aa9d88ab86ead3
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.10.5 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.10.5
index 67015672d99c..d645ca4e50e8 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.10.5
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.10.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kidletime-5.37.0:5 >=kde-frameworks/kwayland-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/kwayland-integration-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=74c80d00e005ddebbb9a13c553e84b75
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.11.1 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.11.1
deleted file mode 100644
index a14b8f1c2f19..000000000000
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kidletime-5.38.0:5 >=kde-frameworks/kwayland-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Provides integration plugins for various KDE frameworks for Wayland
-EAPI=6
-HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kwayland-integration
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kidletime-5.38.0:5 >=kde-frameworks/kwayland-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/kwayland-integration-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=824460f829f521bdd8cef20fd1006ec8
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.11.2 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.11.2
new file mode 100644
index 000000000000..b1d00166b3f5
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.11.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kidletime-5.38.0:5 >=kde-frameworks/kwayland-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Provides integration plugins for various KDE frameworks for Wayland
+EAPI=6
+HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kwayland-integration
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kidletime-5.38.0:5 >=kde-frameworks/kwayland-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/kwayland-integration-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=824460f829f521bdd8cef20fd1006ec8
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.10.5 b/metadata/md5-cache/kde-plasma/kwin-5.10.5
index 27ac7741bdc1..60ce85b3fe34 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.10.5
+++ b/metadata/md5-cache/kde-plasma/kwin-5.10.5
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.37.0:5 >=kde-frameworks/kauth-5.37.0:5 >=
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/kwin-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3272cdb9fc5608f633e0f537d60965af
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.11.1 b/metadata/md5-cache/kde-plasma/kwin-5.11.1
deleted file mode 100644
index 7e72a19412ef..000000000000
--- a/metadata/md5-cache/kde-plasma/kwin-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.38.0:5 >=kde-frameworks/kauth-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kcrash-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kidletime-5.38.0:5 >=kde-frameworks/kinit-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/knewstuff-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kpackage-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/ktextwidgets-5.38.0:5 >=kde-frameworks/kwayland-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5[X] >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=kde-plasma/breeze-5.11.1:5 >=kde-plasma/kdecoration-5.11.1:5 >=kde-plasma/kscreenlocker-5.11.1:5 >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[gles2=] >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-libs/libinput-1.5 >=dev-libs/wayland-1.2 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms >=dev-qt/designer-5.7.1:5 >=dev-qt/qtconcurrent-5.7.1:5 x11-proto/xproto test? ( x11-libs/xcb-util-wm ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 handbook? ( >=kde-frameworks/kdoctools-5.38.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE window manager
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=gles2 multimedia test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kactivities-5.38.0:5 >=kde-frameworks/kauth-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kcrash-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kidletime-5.38.0:5 >=kde-frameworks/kinit-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/knewstuff-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kpackage-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/ktextwidgets-5.38.0:5 >=kde-frameworks/kwayland-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5[X] >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=kde-plasma/breeze-5.11.1:5 >=kde-plasma/kdecoration-5.11.1:5 >=kde-plasma/kscreenlocker-5.11.1:5 >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[gles2=] >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-libs/libinput-1.5 >=dev-libs/wayland-1.2 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms >=kde-plasma/kde-cli-tools-5.11.1:5 >=dev-qt/qtvirtualkeyboard-5.7.1:5 multimedia? ( >=dev-qt/qtmultimedia-5.7.1:5[gstreamer,qml] ) !<kde-apps/kdeartwork-meta-15.08.3-r1:4 !kde-plasma/kwin:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/kwin-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=66b4fbe4480ede312e38a9414ec08e47
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.11.2 b/metadata/md5-cache/kde-plasma/kwin-5.11.2
new file mode 100644
index 000000000000..5e2e2a6ba094
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwin-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.38.0:5 >=kde-frameworks/kauth-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kcrash-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kidletime-5.38.0:5 >=kde-frameworks/kinit-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/knewstuff-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kpackage-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/ktextwidgets-5.38.0:5 >=kde-frameworks/kwayland-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5[X] >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=kde-plasma/breeze-5.11.2:5 >=kde-plasma/kdecoration-5.11.2:5 >=kde-plasma/kscreenlocker-5.11.2:5 >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[gles2=] >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-libs/libinput-1.5 >=dev-libs/wayland-1.2 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms >=dev-qt/designer-5.7.1:5 >=dev-qt/qtconcurrent-5.7.1:5 x11-proto/xproto test? ( x11-libs/xcb-util-wm ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 handbook? ( >=kde-frameworks/kdoctools-5.38.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE window manager
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=gles2 multimedia test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kactivities-5.38.0:5 >=kde-frameworks/kauth-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kcrash-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kidletime-5.38.0:5 >=kde-frameworks/kinit-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/knewstuff-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kpackage-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/ktextwidgets-5.38.0:5 >=kde-frameworks/kwayland-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5[X] >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=kde-plasma/breeze-5.11.2:5 >=kde-plasma/kdecoration-5.11.2:5 >=kde-plasma/kscreenlocker-5.11.2:5 >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[gles2=] >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-libs/libinput-1.5 >=dev-libs/wayland-1.2 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms >=kde-plasma/kde-cli-tools-5.11.2:5 >=dev-qt/qtvirtualkeyboard-5.7.1:5 multimedia? ( >=dev-qt/qtmultimedia-5.7.1:5[gstreamer,qml] ) !<kde-apps/kdeartwork-meta-15.08.3-r1:4 !kde-plasma/kwin:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/kwin-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=66b4fbe4480ede312e38a9414ec08e47
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.10.5 b/metadata/md5-cache/kde-plasma/kwrited-5.10.5
index 192dfd907f86..5518587e3c8a 100644
--- a/metadata/md5-cache/kde-plasma/kwrited-5.10.5
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.10.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kpty-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-plasma/kwrited:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/kwrited-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9cd3b2c07f7e11bdaeb45958dfc4269c
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.11.1 b/metadata/md5-cache/kde-plasma/kwrited-5.11.1
deleted file mode 100644
index e6ad4288671f..000000000000
--- a/metadata/md5-cache/kde-plasma/kwrited-5.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kpty-5.38.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma daemon listening for wall and write messages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kpty-5.38.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-plasma/kwrited:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/kwrited-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=27373743d2481bc3ea460dc7bd693aac
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.11.2 b/metadata/md5-cache/kde-plasma/kwrited-5.11.2
new file mode 100644
index 000000000000..d248266d4626
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.11.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kpty-5.38.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma daemon listening for wall and write messages
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kpty-5.38.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-plasma/kwrited:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/kwrited-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=27373743d2481bc3ea460dc7bd693aac
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.10.5 b/metadata/md5-cache/kde-plasma/libkscreen-5.10.5
index 4d35045ee444..a05d9348350c 100644
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.10.5
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.10.5
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kwayland-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgu
 RESTRICT=test
 SLOT=5/7
 SRC_URI=mirror://kde/stable/plasma/5.10.5/libkscreen-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8c4b1aa508d3c0b31d2179dd2bd760f8
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.11.1 b/metadata/md5-cache/kde-plasma/libkscreen-5.11.1
deleted file mode 100644
index ab309b624e4d..000000000000
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kwayland-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma screen management library
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kwayland-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb !x11-libs/libkscreen:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5/7
-SRC_URI=mirror://kde/stable/plasma/5.11.1/libkscreen-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b963902c4126db03eedfcfee0fd280ba
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.11.2 b/metadata/md5-cache/kde-plasma/libkscreen-5.11.2
new file mode 100644
index 000000000000..16d69a8f59d6
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kwayland-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plasma screen management library
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kwayland-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb !x11-libs/libkscreen:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5/7
+SRC_URI=mirror://kde/stable/plasma/5.11.2/libkscreen-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b963902c4126db03eedfcfee0fd280ba
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.10.5 b/metadata/md5-cache/kde-plasma/libksysguard-5.10.5
index eab0fd3b438b..3757f35007ba 100644
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.10.5
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.10.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-libs/zlib detailedmemory? ( >=dev-qt/qtwebkit-5.7.1:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXres ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/libksysguard-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9fa945764d0807fbbd033fda6f0a0902
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.11.1 b/metadata/md5-cache/kde-plasma/libksysguard-5.11.1
deleted file mode 100644
index 43d5b9bc3fd0..000000000000
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-libs/zlib detailedmemory? ( >=dev-qt/qtwebkit-5.7.1:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.38.0:5 !minimal? ( >=kde-frameworks/plasma-5.38.0:5 ) X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Task management and system monitoring library
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+detailedmemory minimal X test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-libs/zlib detailedmemory? ( >=dev-qt/qtwebkit-5.7.1:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXres ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/libksysguard-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1b606634b95060f58f2ee1c16d46dac7
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.11.2 b/metadata/md5-cache/kde-plasma/libksysguard-5.11.2
new file mode 100644
index 000000000000..a99cd0d0ab4b
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.11.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-libs/zlib detailedmemory? ( >=dev-qt/qtwebkit-5.7.1:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.38.0:5 !minimal? ( >=kde-frameworks/plasma-5.38.0:5 ) X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Task management and system monitoring library
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+detailedmemory minimal X test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kauth-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-libs/zlib detailedmemory? ( >=dev-qt/qtwebkit-5.7.1:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXres ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/libksysguard-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1b606634b95060f58f2ee1c16d46dac7
diff --git a/metadata/md5-cache/kde-plasma/milou-5.10.5 b/metadata/md5-cache/kde-plasma/milou-5.10.5
index b414ba5b897e..b6bb2d7ac900 100644
--- a/metadata/md5-cache/kde-plasma/milou-5.10.5
+++ b/metadata/md5-cache/kde-plasma/milou-5.10.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/krunner-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/plasma-5.37.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-plasma/milou:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/milou-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=56a2ac1f36df09a6503b6f8395f57118
diff --git a/metadata/md5-cache/kde-plasma/milou-5.11.1 b/metadata/md5-cache/kde-plasma/milou-5.11.1
deleted file mode 100644
index 0055bf3a9110..000000000000
--- a/metadata/md5-cache/kde-plasma/milou-5.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/krunner-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Dedicated search application built on top of Baloo
-EAPI=6
-HOMEPAGE=https://projects.kde.org/projects/kde/workspace/milou
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/krunner-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-plasma/milou:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/milou-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=86501c27ef1d6afadd6b7a1d4a999126
diff --git a/metadata/md5-cache/kde-plasma/milou-5.11.2 b/metadata/md5-cache/kde-plasma/milou-5.11.2
new file mode 100644
index 000000000000..f252787000dc
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/milou-5.11.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/krunner-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Dedicated search application built on top of Baloo
+EAPI=6
+HOMEPAGE=https://projects.kde.org/projects/kde/workspace/milou
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/krunner-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-plasma/milou:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/milou-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=86501c27ef1d6afadd6b7a1d4a999126
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.10.5 b/metadata/md5-cache/kde-plasma/oxygen-5.10.5
index 7b4a1dba2cc9..5afde233a7c4 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-5.10.5
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.10.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/frameworkintegration-5.37.0:5 >=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-plasma/kdecoration-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb qt4? ( >=dev-qt/qtcore-4.8.7-r2:4 >=dev-qt/qtdbus-4.8.7:4 >=dev-qt/qtgui-4.8.7:4 kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.37.0:5 ) >=kde-plasma/kde-cli-tools-5.10.5:5 qt4? ( !kde-plasma/kstyles:4 !kde-plasma/liboxygenstyle:4 ) !kde-plasma/kdebase-cursors:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/oxygen-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d3999f9a55d99da949c6a44c97e3e3e5
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.11.1 b/metadata/md5-cache/kde-plasma/oxygen-5.11.1
deleted file mode 100644
index 6328ba14ed06..000000000000
--- a/metadata/md5-cache/kde-plasma/oxygen-5.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/frameworkintegration-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kguiaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-plasma/kdecoration-5.11.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb qt4? ( >=dev-qt/qtcore-4.8.7-r2:4 >=dev-qt/qtdbus-4.8.7:4 >=dev-qt/qtgui-4.8.7:4 kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.38.0:5 ) >=kde-frameworks/kservice-5.38.0:5 qt4? ( dev-util/automoc:0 virtual/pkgconfig ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Oxygen visual style for the Plasma desktop
-EAPI=6
-HOMEPAGE=https://projects.kde.org/projects/kde/workspace/oxygen
-IUSE=qt4 wayland debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/frameworkintegration-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kguiaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-plasma/kdecoration-5.11.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb qt4? ( >=dev-qt/qtcore-4.8.7-r2:4 >=dev-qt/qtdbus-4.8.7:4 >=dev-qt/qtgui-4.8.7:4 kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.38.0:5 ) >=kde-plasma/kde-cli-tools-5.11.1:5 qt4? ( !kde-plasma/kstyles:4 !kde-plasma/liboxygenstyle:4 ) !kde-plasma/kdebase-cursors:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/oxygen-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=295a4a4188bdc560711a0fea9075f628
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.11.2 b/metadata/md5-cache/kde-plasma/oxygen-5.11.2
new file mode 100644
index 000000000000..e5170452bbac
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.11.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/frameworkintegration-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kguiaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-plasma/kdecoration-5.11.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb qt4? ( >=dev-qt/qtcore-4.8.7-r2:4 >=dev-qt/qtdbus-4.8.7:4 >=dev-qt/qtgui-4.8.7:4 kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.38.0:5 ) >=kde-frameworks/kservice-5.38.0:5 qt4? ( dev-util/automoc:0 virtual/pkgconfig ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Oxygen visual style for the Plasma desktop
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/oxygen.git
+IUSE=qt4 wayland debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/frameworkintegration-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kguiaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-plasma/kdecoration-5.11.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb qt4? ( >=dev-qt/qtcore-4.8.7-r2:4 >=dev-qt/qtdbus-4.8.7:4 >=dev-qt/qtgui-4.8.7:4 kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.38.0:5 ) >=kde-plasma/kde-cli-tools-5.11.2:5 qt4? ( !kde-plasma/kstyles:4 !kde-plasma/liboxygenstyle:4 ) !kde-plasma/kdebase-cursors:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/oxygen-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=df8c7a10197c0816c3652fcd3ff3ebab
diff --git a/metadata/md5-cache/kde-plasma/oxygen-fonts-5.4.3 b/metadata/md5-cache/kde-plasma/oxygen-fonts-5.4.3
index 032d4b222f60..06a42381d179 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-fonts-5.4.3
+++ b/metadata/md5-cache/kde-plasma/oxygen-fonts-5.4.3
@@ -9,5 +9,5 @@ LICENSE=OFL-1.1
 RDEPEND=!media-fonts/oxygen-fonts
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/oxygen-fonts-5.4.3.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	font	82836641e7d4639329d8c195234ad0e3	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	font	82836641e7d4639329d8c195234ad0e3	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=575ba8e2b44079fa5876585bc4a040e2
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.10.5 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.10.5
index 7290e05eb979..0f05b0db63c0 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.10.5
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.10.5
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/attica-5.37.0:5 >=kde-frameworks/kactivities-5.37.0:5 >
 REQUIRED_USE=legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/plasma-desktop-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=796f21f0bc59e73073cfaf15984446fe
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.11.1 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.11.1
deleted file mode 100644
index eb65b77859a5..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/attica-5.38.0:5 >=kde-frameworks/kactivities-5.38.0:5 >=kde-frameworks/kactivities-stats-5.38.0:5 >=kde-frameworks/karchive-5.38.0:5 >=kde-frameworks/kauth-5.38.0:5 >=kde-frameworks/kbookmarks-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kcodecs-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/kded-5.38.0:5 >=kde-frameworks/kdelibs4support-5.38.0:5 >=kde-frameworks/kemoticons-5.38.0:5 >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/kguiaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kitemmodels-5.38.0:5 >=kde-frameworks/kitemviews-5.38.0:5 >=kde-frameworks/kjobwidgets-5.38.0:5 >=kde-frameworks/knewstuff-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/knotifyconfig-5.38.0:5 >=kde-frameworks/kparts-5.38.0:5 >=kde-frameworks/kpeople-5.38.0:5 >=kde-frameworks/krunner-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwallet-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=kde-frameworks/solid-5.38.0:5 >=kde-frameworks/sonnet-5.38.0:5 >=kde-plasma/kwin-5.11.1:5 >=kde-plasma/plasma-workspace-5.11.1:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile appstream? ( dev-libs/appstream[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.7.1:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.38.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) dev-libs/boost x11-proto/xproto fontconfig? ( x11-libs/libXrender ) mouse? ( x11-drivers/xf86-input-evdev ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 handbook? ( >=kde-frameworks/kdoctools-5.38.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma desktop
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=appstream +fontconfig gtk2 gtk3 ibus legacy-systray +mouse pulseaudio +qt4 scim +semantic-desktop touchpad test debug +handbook test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/attica-5.38.0:5 >=kde-frameworks/kactivities-5.38.0:5 >=kde-frameworks/kactivities-stats-5.38.0:5 >=kde-frameworks/karchive-5.38.0:5 >=kde-frameworks/kauth-5.38.0:5 >=kde-frameworks/kbookmarks-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kcodecs-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/kded-5.38.0:5 >=kde-frameworks/kdelibs4support-5.38.0:5 >=kde-frameworks/kemoticons-5.38.0:5 >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/kguiaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kitemmodels-5.38.0:5 >=kde-frameworks/kitemviews-5.38.0:5 >=kde-frameworks/kjobwidgets-5.38.0:5 >=kde-frameworks/knewstuff-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/knotifyconfig-5.38.0:5 >=kde-frameworks/kparts-5.38.0:5 >=kde-frameworks/kpeople-5.38.0:5 >=kde-frameworks/krunner-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwallet-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=kde-frameworks/solid-5.38.0:5 >=kde-frameworks/sonnet-5.38.0:5 >=kde-plasma/kwin-5.11.1:5 >=kde-plasma/plasma-workspace-5.11.1:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile appstream? ( dev-libs/appstream[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.7.1:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.38.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) >=kde-frameworks/qqc2-desktop-style-5.38.0:5 >=kde-plasma/breeze-5.11.1:5 >=kde-plasma/kde-cli-tools-5.11.1:5 >=kde-plasma/oxygen-5.11.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 sys-apps/accountsservice sys-apps/util-linux x11-apps/setxkbmap legacy-systray? ( gtk2? ( dev-libs/libappindicator:2 ) gtk3? ( dev-libs/libappindicator:3 ) qt4? ( dev-libs/sni-qt ) ) pulseaudio? ( >=kde-plasma/plasma-pa-5.11.1:5 ) qt4? ( kde-plasma/qguiplatformplugin_kde:4 ) !kde-apps/kcontrol !<kde-apps/kde4-l10n-17.08.1-r1 !kde-apps/knetattach[handbook] !kde-base/plasma-desktop:4 !kde-misc/kcm-touchpad !kde-plasma/plasma-workspace:4 !kde-plasma/solid-actions-kcm:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-REQUIRED_USE=legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/plasma-desktop-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d802db5d28620b082936bac859dc40b5
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.11.2 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.11.2
new file mode 100644
index 000000000000..71ff5681c33d
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/attica-5.38.0:5 >=kde-frameworks/kactivities-5.38.0:5 >=kde-frameworks/kactivities-stats-5.38.0:5 >=kde-frameworks/karchive-5.38.0:5 >=kde-frameworks/kauth-5.38.0:5 >=kde-frameworks/kbookmarks-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kcodecs-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/kded-5.38.0:5 >=kde-frameworks/kdelibs4support-5.38.0:5 >=kde-frameworks/kemoticons-5.38.0:5 >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/kguiaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kitemmodels-5.38.0:5 >=kde-frameworks/kitemviews-5.38.0:5 >=kde-frameworks/kjobwidgets-5.38.0:5 >=kde-frameworks/knewstuff-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/knotifyconfig-5.38.0:5 >=kde-frameworks/kparts-5.38.0:5 >=kde-frameworks/kpeople-5.38.0:5 >=kde-frameworks/krunner-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwallet-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=kde-frameworks/solid-5.38.0:5 >=kde-frameworks/sonnet-5.38.0:5 >=kde-plasma/kwin-5.11.2:5 >=kde-plasma/plasma-workspace-5.11.2:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile appstream? ( dev-libs/appstream[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.7.1:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.38.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) dev-libs/boost x11-proto/xproto fontconfig? ( x11-libs/libXrender ) mouse? ( x11-drivers/xf86-input-evdev ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 handbook? ( >=kde-frameworks/kdoctools-5.38.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma desktop
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=appstream +fontconfig gtk2 gtk3 ibus legacy-systray +mouse pulseaudio +qt4 scim +semantic-desktop touchpad test debug +handbook test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/attica-5.38.0:5 >=kde-frameworks/kactivities-5.38.0:5 >=kde-frameworks/kactivities-stats-5.38.0:5 >=kde-frameworks/karchive-5.38.0:5 >=kde-frameworks/kauth-5.38.0:5 >=kde-frameworks/kbookmarks-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kcodecs-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/kded-5.38.0:5 >=kde-frameworks/kdelibs4support-5.38.0:5 >=kde-frameworks/kemoticons-5.38.0:5 >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/kguiaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kitemmodels-5.38.0:5 >=kde-frameworks/kitemviews-5.38.0:5 >=kde-frameworks/kjobwidgets-5.38.0:5 >=kde-frameworks/knewstuff-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/knotifyconfig-5.38.0:5 >=kde-frameworks/kparts-5.38.0:5 >=kde-frameworks/kpeople-5.38.0:5 >=kde-frameworks/krunner-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwallet-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=kde-frameworks/solid-5.38.0:5 >=kde-frameworks/sonnet-5.38.0:5 >=kde-plasma/kwin-5.11.2:5 >=kde-plasma/plasma-workspace-5.11.2:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile appstream? ( dev-libs/appstream[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.7.1:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.38.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) >=kde-frameworks/qqc2-desktop-style-5.38.0:5 >=kde-plasma/breeze-5.11.2:5 >=kde-plasma/kde-cli-tools-5.11.2:5 >=kde-plasma/oxygen-5.11.2:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 sys-apps/accountsservice sys-apps/util-linux x11-apps/setxkbmap legacy-systray? ( gtk2? ( dev-libs/libappindicator:2 ) gtk3? ( dev-libs/libappindicator:3 ) qt4? ( dev-libs/sni-qt ) ) pulseaudio? ( >=kde-plasma/plasma-pa-5.11.2:5 ) qt4? ( kde-plasma/qguiplatformplugin_kde:4 ) !kde-apps/kcontrol !<kde-apps/kde4-l10n-17.08.1-r1 !kde-apps/knetattach[handbook] !kde-base/plasma-desktop:4 !kde-misc/kcm-touchpad !kde-plasma/plasma-workspace:4 !kde-plasma/solid-actions-kcm:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+REQUIRED_USE=legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/plasma-desktop-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=658eaf7bbce729bc8cd54d43b38027c1
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.10.5 b/metadata/md5-cache/kde-plasma/plasma-integration-5.10.5
index 60ed5b05a173..7e185ed3e657 100644
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.10.5
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.10.5
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/plasma-integration-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9966c095cb64f9e659b3df701d391c49
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.11.1 b/metadata/md5-cache/kde-plasma/plasma-integration-5.11.1
deleted file mode 100644
index b37d1b64c362..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kjobwidgets-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kwayland-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-plasma/breeze-5.11.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5=[dbus] >=dev-qt/qtquickcontrols2-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libXcursor x11-libs/libxcb sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kjobwidgets-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kwayland-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-plasma/breeze-5.11.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5=[dbus] >=dev-qt/qtquickcontrols2-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/plasma-integration-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ec647da093b14838fef0f0764d7c81ba
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.11.2 b/metadata/md5-cache/kde-plasma/plasma-integration-5.11.2
new file mode 100644
index 000000000000..8d2c432b3211
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kjobwidgets-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kwayland-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-plasma/breeze-5.11.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5=[dbus] >=dev-qt/qtquickcontrols2-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libXcursor x11-libs/libxcb sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kjobwidgets-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kwayland-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-plasma/breeze-5.11.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5=[dbus] >=dev-qt/qtquickcontrols2-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/plasma-integration-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ec647da093b14838fef0f0764d7c81ba
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.10.5 b/metadata/md5-cache/kde-plasma/plasma-meta-5.10.5
index b489480759f0..0d8c10bf82d4 100644
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.10.5
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.10.5
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm x86
 LICENSE=metapackage
 RDEPEND=>=kde-plasma/breeze-5.10.5:5 >=kde-plasma/kactivitymanagerd-5.10.5:5 >=kde-plasma/kde-cli-tools-5.10.5:5 >=kde-plasma/kdecoration-5.10.5:5 >=kde-plasma/kdeplasma-addons-5.10.5:5 >=kde-plasma/kgamma-5.10.5:5 >=kde-plasma/khotkeys-5.10.5:5 >=kde-plasma/kinfocenter-5.10.5:5 >=kde-plasma/kmenuedit-5.10.5:5 >=kde-plasma/kscreen-5.10.5:5 >=kde-plasma/kscreenlocker-5.10.5:5 >=kde-plasma/ksshaskpass-5.10.5:5 >=kde-plasma/ksysguard-5.10.5:5 >=kde-plasma/kwayland-integration-5.10.5:5 >=kde-plasma/kwin-5.10.5:5 >=kde-plasma/kwrited-5.10.5:5 >=kde-plasma/libkscreen-5.10.5:5 >=kde-plasma/libksysguard-5.10.5:5 >=kde-plasma/milou-5.10.5:5 >=kde-plasma/oxygen-5.10.5:5 >=kde-plasma/plasma-desktop-5.10.5:5 >=kde-plasma/plasma-integration-5.10.5:5 >=kde-plasma/plasma-workspace-5.10.5:5 >=kde-plasma/polkit-kde-agent-5.10.5:5 >=kde-plasma/powerdevil-5.10.5:5 >=kde-plasma/systemsettings-5.10.5:5 >=kde-plasma/user-manager-5.10.5:5 bluetooth? ( >=kde-plasma/bluedevil-5.10.5:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.10.5:5 x11-misc/sddm ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.10.5:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.10.5:5 >=kde-plasma/kde-gtk-config-5.10.5:5 ) handbook? ( >=kde-apps/khelpcenter-14.12.0:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.10.5:5 ) pam? ( >=kde-plasma/kwallet-pam-5.10.5:5 ) plymouth? ( >=kde-plasma/breeze-plymouth-5.10.5:5 >=kde-plasma/plymouth-kcm-5.10.5:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.10.5:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.10.5:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.10.5:5 )
 SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b6ceb6db9978153bcda2fb0f6ac82b06
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.11.1 b/metadata/md5-cache/kde-plasma/plasma-meta-5.11.1
deleted file mode 100644
index 289f5a1f92b4..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.11.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Merge this to pull in all Plasma 5 packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/workspaces/plasmadesktop/
-IUSE=bluetooth crypt +display-manager grub gtk +handbook networkmanager pam plymouth pulseaudio +sddm sdk +wallpapers
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-plasma/breeze-5.11.1:5 >=kde-plasma/drkonqi-5.11.1:5 >=kde-plasma/kactivitymanagerd-5.11.1:5 >=kde-plasma/kde-cli-tools-5.11.1:5 >=kde-plasma/kdecoration-5.11.1:5 >=kde-plasma/kdeplasma-addons-5.11.1:5 >=kde-plasma/kgamma-5.11.1:5 >=kde-plasma/khotkeys-5.11.1:5 >=kde-plasma/kinfocenter-5.11.1:5 >=kde-plasma/kmenuedit-5.11.1:5 >=kde-plasma/kscreen-5.11.1:5 >=kde-plasma/kscreenlocker-5.11.1:5 >=kde-plasma/ksshaskpass-5.11.1:5 >=kde-plasma/ksysguard-5.11.1:5 >=kde-plasma/kwayland-integration-5.11.1:5 >=kde-plasma/kwin-5.11.1:5 >=kde-plasma/kwrited-5.11.1:5 >=kde-plasma/libkscreen-5.11.1:5 >=kde-plasma/libksysguard-5.11.1:5 >=kde-plasma/milou-5.11.1:5 >=kde-plasma/oxygen-5.11.1:5 >=kde-plasma/plasma-desktop-5.11.1:5 >=kde-plasma/plasma-integration-5.11.1:5 >=kde-plasma/plasma-workspace-5.11.1:5 >=kde-plasma/polkit-kde-agent-5.11.1:5 >=kde-plasma/powerdevil-5.11.1:5 >=kde-plasma/systemsettings-5.11.1:5 >=kde-plasma/user-manager-5.11.1:5 bluetooth? ( >=kde-plasma/bluedevil-5.11.1:5 ) crypt? ( >=kde-plasma/plasma-vault-5.11.1:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.11.1:5 x11-misc/sddm ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.11.1:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.11.1:5 >=kde-plasma/kde-gtk-config-5.11.1:5 ) handbook? ( >=kde-apps/khelpcenter-14.12.0:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.11.1:5 ) pam? ( >=kde-plasma/kwallet-pam-5.11.1:5 ) plymouth? ( >=kde-plasma/breeze-plymouth-5.11.1:5 >=kde-plasma/plymouth-kcm-5.11.1:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.11.1:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.11.1:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.11.1:5 )
-SLOT=5
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d988fd5a2f2b88b49c0a0de4f1c1a763
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.11.2 b/metadata/md5-cache/kde-plasma/plasma-meta-5.11.2
new file mode 100644
index 000000000000..911175e1e7ce
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.11.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=Merge this to pull in all Plasma 5 packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/workspaces/plasmadesktop/
+IUSE=bluetooth crypt +display-manager grub gtk +handbook networkmanager pam plymouth pulseaudio +sddm sdk +wallpapers
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-plasma/breeze-5.11.2:5 >=kde-plasma/drkonqi-5.11.2:5 >=kde-plasma/kactivitymanagerd-5.11.2:5 >=kde-plasma/kde-cli-tools-5.11.2:5 >=kde-plasma/kdecoration-5.11.2:5 >=kde-plasma/kdeplasma-addons-5.11.2:5 >=kde-plasma/kgamma-5.11.2:5 >=kde-plasma/khotkeys-5.11.2:5 >=kde-plasma/kinfocenter-5.11.2:5 >=kde-plasma/kmenuedit-5.11.2:5 >=kde-plasma/kscreen-5.11.2:5 >=kde-plasma/kscreenlocker-5.11.2:5 >=kde-plasma/ksshaskpass-5.11.2:5 >=kde-plasma/ksysguard-5.11.2:5 >=kde-plasma/kwayland-integration-5.11.2:5 >=kde-plasma/kwin-5.11.2:5 >=kde-plasma/kwrited-5.11.2:5 >=kde-plasma/libkscreen-5.11.2:5 >=kde-plasma/libksysguard-5.11.2:5 >=kde-plasma/milou-5.11.2:5 >=kde-plasma/oxygen-5.11.2:5 >=kde-plasma/plasma-desktop-5.11.2:5 >=kde-plasma/plasma-integration-5.11.2:5 >=kde-plasma/plasma-workspace-5.11.2:5 >=kde-plasma/polkit-kde-agent-5.11.2:5 >=kde-plasma/powerdevil-5.11.2:5 >=kde-plasma/systemsettings-5.11.2:5 >=kde-plasma/user-manager-5.11.2:5 bluetooth? ( >=kde-plasma/bluedevil-5.11.2:5 ) crypt? ( >=kde-plasma/plasma-vault-5.11.2:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.11.2:5 x11-misc/sddm ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.11.2:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.11.2:5 >=kde-plasma/kde-gtk-config-5.11.2:5 ) handbook? ( >=kde-apps/khelpcenter-14.12.0:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.11.2:5 ) pam? ( >=kde-plasma/kwallet-pam-5.11.2:5 ) plymouth? ( >=kde-plasma/breeze-plymouth-5.11.2:5 >=kde-plasma/plymouth-kcm-5.11.2:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.11.2:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.11.2:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.11.2:5 )
+SLOT=5
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d988fd5a2f2b88b49c0a0de4f1c1a763
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.10.5 b/metadata/md5-cache/kde-plasma/plasma-nm-5.10.5
index 842021a4ab2f..9c06eed7e7d3 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.10.5
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.10.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/networkmanager-qt-5.37.0:5[teamd=] >=kde-frameworks/plasma-5.37.0:5 >=kde-frameworks/solid-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/qca-2.1.1:2[qt5] >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.37.0:5 >=dev-qt/qtxml-5.7.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.7.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/plasma-workspace-5.10.5:5 !kde-plasma/plasma-nm:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/plasma-nm-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=de7528d2741473bbe168594a40db5543
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.11.1 b/metadata/md5-cache/kde-plasma/plasma-nm-5.11.1
deleted file mode 100644
index 0b03f4f73617..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/kdelibs4support-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kitemviews-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwallet-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/networkmanager-qt-5.38.0:5[teamd=] >=kde-frameworks/plasma-5.38.0:5 >=kde-frameworks/solid-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/qca-2.1.1:2[qt5] >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.38.0:5 >=dev-qt/qtxml-5.7.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.7.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma applet for NetworkManager
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=modemmanager openconnect teamd debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/kdelibs4support-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kitemviews-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwallet-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/networkmanager-qt-5.38.0:5[teamd=] >=kde-frameworks/plasma-5.38.0:5 >=kde-frameworks/solid-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/qca-2.1.1:2[qt5] >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.38.0:5 >=dev-qt/qtxml-5.7.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.7.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/plasma-workspace-5.11.1:5 !kde-plasma/plasma-nm:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/plasma-nm-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3e200c267b55d7edef959a34d2925139
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.11.2 b/metadata/md5-cache/kde-plasma/plasma-nm-5.11.2
new file mode 100644
index 000000000000..bd58b62400c7
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.11.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/kdelibs4support-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kitemviews-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwallet-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/networkmanager-qt-5.38.0:5[teamd=] >=kde-frameworks/plasma-5.38.0:5 >=kde-frameworks/solid-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/qca-2.1.1:2[qt5] >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.38.0:5 >=dev-qt/qtxml-5.7.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.7.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma applet for NetworkManager
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=modemmanager openconnect teamd debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/kdelibs4support-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kitemviews-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwallet-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/networkmanager-qt-5.38.0:5[teamd=] >=kde-frameworks/plasma-5.38.0:5 >=kde-frameworks/solid-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/qca-2.1.1:2[qt5] >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.38.0:5 >=dev-qt/qtxml-5.7.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.7.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/plasma-workspace-5.11.2:5 !kde-plasma/plasma-nm:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/plasma-nm-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3e200c267b55d7edef959a34d2925139
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.10.5 b/metadata/md5-cache/kde-plasma/plasma-pa-5.10.5
index 7252bdffc2b5..fa4f60b1d215 100644
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.10.5
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.10.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/kglobalaccel-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/plasma-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/glib:2 gnome-base/gconf:2 media-libs/libcanberra media-sound/pulseaudio[gnome] >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/plasma-pa-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a2a78d30e348ddf7755a98ff3c15d7b3
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.11.1 b/metadata/md5-cache/kde-plasma/plasma-pa-5.11.1
deleted file mode 100644
index 549a330a1859..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/glib:2 gnome-base/gconf:2 media-libs/libcanberra media-sound/pulseaudio[gnome] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 handbook? ( >=kde-frameworks/kdoctools-5.38.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma applet for audio volume management using PulseAudio
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/glib:2 gnome-base/gconf:2 media-libs/libcanberra media-sound/pulseaudio[gnome] >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/plasma-pa-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2beea2639a29e0d9758bbc0163d4ffe0
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.11.2 b/metadata/md5-cache/kde-plasma/plasma-pa-5.11.2
new file mode 100644
index 000000000000..bec559589e63
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.11.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/glib:2 gnome-base/gconf:2 media-libs/libcanberra media-sound/pulseaudio[gnome] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 handbook? ( >=kde-frameworks/kdoctools-5.38.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plasma applet for audio volume management using PulseAudio
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/glib:2 gnome-base/gconf:2 media-libs/libcanberra media-sound/pulseaudio[gnome] >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/plasma-pa-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2beea2639a29e0d9758bbc0163d4ffe0
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.10.5 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.10.5
index 1037490ff67d..5a3c4fa3767f 100644
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.10.5
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.10.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kpackage-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktexteditor-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/plasma-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !dev-util/plasmate >=kde-frameworks/kirigami-2.2.0:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/plasma-sdk-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9a23d9828d36e4e6d59e0375b1b13702
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.11.1 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.11.1
deleted file mode 100644
index 6b4d8dc0460f..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kpackage-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/ktexteditor-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Useful applications for Plasma development
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kpackage-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/ktexteditor-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !dev-util/plasmate >=kde-frameworks/kirigami-5.38.0:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/plasma-sdk-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=11693189af88bec3a9bde98882df814f
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.11.2 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.11.2
new file mode 100644
index 000000000000..89c87e054841
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.11.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kpackage-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/ktexteditor-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Useful applications for Plasma development
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kpackage-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/ktexteditor-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !dev-util/plasmate >=kde-frameworks/kirigami-5.38.0:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/plasma-sdk-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=11693189af88bec3a9bde98882df814f
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.11.1 b/metadata/md5-cache/kde-plasma/plasma-vault-5.11.1
deleted file mode 100644
index c5d4cfaa4ec8..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-vault-5.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-plasma/libksysguard-5.11.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma applet and services for creating encrypted vaults
-EAPI=6
-HOMEPAGE=https://www.kde.org/ http://cukic.co/2017/02/03/vaults-encryption-in-plasma/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-3
-RDEPEND=>=kde-frameworks/kcodecs-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-plasma/libksysguard-5.11.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 || ( sys-fs/cryfs sys-fs/encfs ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/plasma-vault-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6133d131fdb8fe57884782cc8ae1258b
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.11.2 b/metadata/md5-cache/kde-plasma/plasma-vault-5.11.2
new file mode 100644
index 000000000000..49fa4991337c
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-vault-5.11.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-plasma/libksysguard-5.11.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plasma applet and services for creating encrypted vaults
+EAPI=6
+HOMEPAGE=https://www.kde.org/ http://cukic.co/2017/02/03/vaults-encryption-in-plasma/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-3
+RDEPEND=>=kde-frameworks/kcodecs-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-plasma/libksysguard-5.11.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 || ( sys-fs/cryfs sys-fs/encfs ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/plasma-vault-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6133d131fdb8fe57884782cc8ae1258b
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.9.96 b/metadata/md5-cache/kde-plasma/plasma-vault-5.9.96
index b8616e90b00c..53d5d0727646 100644
--- a/metadata/md5-cache/kde-plasma/plasma-vault-5.9.96
+++ b/metadata/md5-cache/kde-plasma/plasma-vault-5.9.96
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kd
 RESTRICT=mirror
 SLOT=5
 SRC_URI=mirror://kde/unstable/plasma-vault/plasma-vault-5.9.96.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e991be505a4590a4fba2b4bb53ac6c99
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.10.5-r1 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.10.5-r1
index 341e6d50bf9d..43900bef70d0 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.10.5-r1
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.10.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=gps? ( geolocation )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/plasma-workspace-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1b9f53cd4eb1ef8f7bd24e08409bc9a8
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.11.1 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.11.1
deleted file mode 100644
index 09d9ef42d877..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.11.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.38.0:5 >=kde-frameworks/kauth-5.38.0:5 >=kde-frameworks/kbookmarks-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kcrash-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/kdelibs4support-5.38.0:5 >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/kguiaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kidletime-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kitemmodels-5.38.0:5 >=kde-frameworks/kitemviews-5.38.0:5 >=kde-frameworks/kjobwidgets-5.38.0:5 >=kde-frameworks/kjs-5.38.0:5 >=kde-frameworks/kjsembed-5.38.0:5 >=kde-frameworks/knewstuff-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/knotifyconfig-5.38.0:5 >=kde-frameworks/kpackage-5.38.0:5 >=kde-frameworks/krunner-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/ktexteditor-5.38.0:5 >=kde-frameworks/ktextwidgets-5.38.0:5 >=kde-frameworks/kwallet-5.38.0:5 >=kde-frameworks/kwayland-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=kde-frameworks/solid-5.38.0:5 >=kde-plasma/kscreenlocker-5.11.1:5 >=kde-plasma/kwin-5.11.1:5 >=kde-plasma/libksysguard-5.11.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5[jpeg] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-apps/kholidays-14.12.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.38.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.38.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.38.0:5 ) >=dev-qt/qtconcurrent-5.7.1:5 x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 handbook? ( >=kde-frameworks/kdoctools-5.38.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma workspace
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.38.0:5 >=kde-frameworks/kauth-5.38.0:5 >=kde-frameworks/kbookmarks-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kcrash-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/kdelibs4support-5.38.0:5 >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/kguiaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kidletime-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kitemmodels-5.38.0:5 >=kde-frameworks/kitemviews-5.38.0:5 >=kde-frameworks/kjobwidgets-5.38.0:5 >=kde-frameworks/kjs-5.38.0:5 >=kde-frameworks/kjsembed-5.38.0:5 >=kde-frameworks/knewstuff-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/knotifyconfig-5.38.0:5 >=kde-frameworks/kpackage-5.38.0:5 >=kde-frameworks/krunner-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/ktexteditor-5.38.0:5 >=kde-frameworks/ktextwidgets-5.38.0:5 >=kde-frameworks/kwallet-5.38.0:5 >=kde-frameworks/kwayland-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=kde-frameworks/solid-5.38.0:5 >=kde-plasma/kscreenlocker-5.11.1:5 >=kde-plasma/kwin-5.11.1:5 >=kde-plasma/libksysguard-5.11.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5[jpeg] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-apps/kholidays-14.12.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.38.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.38.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.38.0:5 ) >=kde-frameworks/kded-5.38.0:5 >=kde-frameworks/kdesu-5.38.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.11.1:5 >=kde-plasma/ksysguard-5.11.1:5 >=kde-plasma/milou-5.11.1:5 >=kde-plasma/plasma-integration-5.11.1:5 >=dev-qt/qdbus-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtpaths-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5[widgets] app-text/iso-codes x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !dev-libs/xembed-sni-proxy !kde-plasma/freespacenotifier:4 !kde-plasma/libtaskmanager:4 !kde-plasma/kcminit:4 !kde-plasma/kdebase-startkde:4 !kde-plasma/klipper:4 !kde-plasma/krunner:4 !kde-plasma/ksmserver:4 !kde-plasma/ksplash:4 !kde-plasma/plasma-workspace:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-REQUIRED_USE=gps? ( geolocation )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/plasma-workspace-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b1981d0f4cceeef056f6da878caee836
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.11.2 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.11.2
new file mode 100644
index 000000000000..962a4b61051c
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.11.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.38.0:5 >=kde-frameworks/kauth-5.38.0:5 >=kde-frameworks/kbookmarks-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kcrash-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/kdelibs4support-5.38.0:5 >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/kguiaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kidletime-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kitemmodels-5.38.0:5 >=kde-frameworks/kitemviews-5.38.0:5 >=kde-frameworks/kjobwidgets-5.38.0:5 >=kde-frameworks/kjs-5.38.0:5 >=kde-frameworks/kjsembed-5.38.0:5 >=kde-frameworks/knewstuff-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/knotifyconfig-5.38.0:5 >=kde-frameworks/kpackage-5.38.0:5 >=kde-frameworks/krunner-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/ktexteditor-5.38.0:5 >=kde-frameworks/ktextwidgets-5.38.0:5 >=kde-frameworks/kwallet-5.38.0:5 >=kde-frameworks/kwayland-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=kde-frameworks/solid-5.38.0:5 >=kde-plasma/kscreenlocker-5.11.2:5 >=kde-plasma/kwin-5.11.2:5 >=kde-plasma/libksysguard-5.11.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5[jpeg] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-apps/kholidays-14.12.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.38.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.38.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.38.0:5 ) >=dev-qt/qtconcurrent-5.7.1:5 x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 handbook? ( >=kde-frameworks/kdoctools-5.38.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma workspace
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.38.0:5 >=kde-frameworks/kauth-5.38.0:5 >=kde-frameworks/kbookmarks-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kcrash-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/kdelibs4support-5.38.0:5 >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/kguiaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kidletime-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kitemmodels-5.38.0:5 >=kde-frameworks/kitemviews-5.38.0:5 >=kde-frameworks/kjobwidgets-5.38.0:5 >=kde-frameworks/kjs-5.38.0:5 >=kde-frameworks/kjsembed-5.38.0:5 >=kde-frameworks/knewstuff-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/knotifyconfig-5.38.0:5 >=kde-frameworks/kpackage-5.38.0:5 >=kde-frameworks/krunner-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/ktexteditor-5.38.0:5 >=kde-frameworks/ktextwidgets-5.38.0:5 >=kde-frameworks/kwallet-5.38.0:5 >=kde-frameworks/kwayland-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/plasma-5.38.0:5 >=kde-frameworks/solid-5.38.0:5 >=kde-plasma/kscreenlocker-5.11.2:5 >=kde-plasma/kwin-5.11.2:5 >=kde-plasma/libksysguard-5.11.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5[jpeg] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-apps/kholidays-14.12.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.38.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.38.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.38.0:5 ) >=kde-frameworks/kded-5.38.0:5 >=kde-frameworks/kdesu-5.38.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.11.2:5 >=kde-plasma/ksysguard-5.11.2:5 >=kde-plasma/milou-5.11.2:5 >=kde-plasma/plasma-integration-5.11.2:5 >=dev-qt/qdbus-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtpaths-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5[widgets] app-text/iso-codes x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !dev-libs/xembed-sni-proxy !kde-plasma/freespacenotifier:4 !kde-plasma/libtaskmanager:4 !kde-plasma/kcminit:4 !kde-plasma/kdebase-startkde:4 !kde-plasma/klipper:4 !kde-plasma/krunner:4 !kde-plasma/ksmserver:4 !kde-plasma/ksplash:4 !kde-plasma/plasma-workspace:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+REQUIRED_USE=gps? ( geolocation )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/plasma-workspace-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b1981d0f4cceeef056f6da878caee836
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.10.5 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.10.5
index 6314f23c517e..4f8df47d376b 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.10.5
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.10.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!<kde-apps/kde-wallpapers-15.08.3-r2
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/plasma-workspace-wallpapers-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=38482e7ac7a0917ad0cfebfd3de91d14
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.11.1 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.11.1
deleted file mode 100644
index f50581bd6e6f..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.11.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Additional wallpapers for the Plasma workspace
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=!<kde-apps/kde-wallpapers-15.08.3-r2
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/plasma-workspace-wallpapers-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4630b52bab9ed4e6f4115418c5f5afd7
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.11.2 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.11.2
new file mode 100644
index 000000000000..eef4b59beb48
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.11.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Additional wallpapers for the Plasma workspace
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=!<kde-apps/kde-wallpapers-15.08.3-r2
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/plasma-workspace-wallpapers-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4630b52bab9ed4e6f4115418c5f5afd7
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.10.5 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.10.5
index 73de7d504d9f..3b9fb646c40d 100644
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.10.5
+++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.10.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kauth-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.10.5:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/plymouth-kcm-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1afca2081421a8093d95da37d8d05bd0
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.11.1 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.11.1
deleted file mode 100644
index 0b68e4924b68..000000000000
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.38.0:5 >=kde-frameworks/kauth-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/knewstuff-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-boot/plymouth sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma control module for Plymouth
-EAPI=6
-HOMEPAGE=https://projects.kde.org/projects/kde/workspace/plymouth-kcm
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.38.0:5 >=kde-frameworks/kauth-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/knewstuff-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.11.1:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/plymouth-kcm-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=41fc7b2e0a00cd351f4ed5ebec050f6b
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.11.2 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.11.2
new file mode 100644
index 000000000000..d20ab4223f00
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.11.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.38.0:5 >=kde-frameworks/kauth-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/knewstuff-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-boot/plymouth sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma control module for Plymouth
+EAPI=6
+HOMEPAGE=https://projects.kde.org/projects/kde/workspace/plymouth-kcm
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.38.0:5 >=kde-frameworks/kauth-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/knewstuff-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.11.2:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/plymouth-kcm-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=41fc7b2e0a00cd351f4ed5ebec050f6b
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.10.5 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.10.5
index d6a6e77e7429..a9df937fe153 100644
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.10.5
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.10.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 || ( >=kde-frameworks/polkit-qt-5.37.0:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] ) !sys-auth/polkit-kde-agent:4[-minimal(-)] !sys-auth/polkit-kde-agent:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/polkit-kde-agent-1-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=752cbf4a956713009941b46b2cd58ed3
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.11.1 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.11.1
deleted file mode 100644
index 8ec156183524..000000000000
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kcrash-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 || ( >=kde-frameworks/polkit-qt-5.38.0:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=PolKit agent module for KDE Plasma
-EAPI=6
-HOMEPAGE=https://www.kde.org
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kcrash-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 || ( >=kde-frameworks/polkit-qt-5.38.0:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] ) !sys-auth/polkit-kde-agent:4[-minimal(-)] !sys-auth/polkit-kde-agent:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/polkit-kde-agent-1-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6a40d8a5cd8282fd4b7fbe538e6b3e31
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.11.2 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.11.2
new file mode 100644
index 000000000000..a489a43b6020
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.11.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kcrash-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 || ( >=kde-frameworks/polkit-qt-5.38.0:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=PolKit agent module for KDE Plasma
+EAPI=6
+HOMEPAGE=https://www.kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kcrash-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 || ( >=kde-frameworks/polkit-qt-5.38.0:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] ) !sys-auth/polkit-kde-agent:4[-minimal(-)] !sys-auth/polkit-kde-agent:5 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/polkit-kde-agent-1-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6a40d8a5cd8282fd4b7fbe538e6b3e31
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.10.5 b/metadata/md5-cache/kde-plasma/powerdevil-5.10.5
index 93ca12b291d3..082569dd9184 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.10.5
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.10.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.37.0:5 >=kde-frameworks/kauth-5.37.0:5[policykit] >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/kglobalaccel-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kidletime-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwayland-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/solid-5.37.0:5 >=kde-plasma/libkscreen-5.10.5:5 >=kde-plasma/plasma-workspace-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 virtual/libudev:= x11-libs/libxcb wireless? ( >=kde-frameworks/bluez-qt-5.37.0:5 >=kde-frameworks/networkmanager-qt-5.37.0:5 ) >=kde-plasma/kde-cli-tools-5.10.5:5 >=sys-power/upower-0.9.23 consolekit? ( >=sys-auth/consolekit-1.0.1 sys-auth/polkit-pkla-compat sys-power/pm-utils ) !kde-plasma/powerdevil:4 !kde-plasma/systemsettings:4[handbook] >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/powerdevil-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b9b5ce826cde5cfb25ab67f7aeeb694f
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.11.1 b/metadata/md5-cache/kde-plasma/powerdevil-5.11.1
deleted file mode 100644
index d609f795530c..000000000000
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.38.0:5 >=kde-frameworks/kauth-5.38.0:5[policykit] >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kcrash-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdelibs4support-5.38.0:5 >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kidletime-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/knotifyconfig-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwayland-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/solid-5.38.0:5 >=kde-plasma/libkscreen-5.11.1:5 >=kde-plasma/plasma-workspace-5.11.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.38.0:5 >=kde-frameworks/networkmanager-qt-5.38.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 handbook? ( >=kde-frameworks/kdoctools-5.38.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Power management for KDE Plasma Shell
-EAPI=6
-HOMEPAGE=https://projects.kde.org/projects/kde/workspace/powerdevil
-IUSE=brightness-control consolekit +wireless debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.38.0:5 >=kde-frameworks/kauth-5.38.0:5[policykit] >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kcrash-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdelibs4support-5.38.0:5 >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kidletime-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/knotifyconfig-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwayland-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/solid-5.38.0:5 >=kde-plasma/libkscreen-5.11.1:5 >=kde-plasma/plasma-workspace-5.11.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.38.0:5 >=kde-frameworks/networkmanager-qt-5.38.0:5 ) >=kde-plasma/kde-cli-tools-5.11.1:5 >=sys-power/upower-0.9.23 consolekit? ( >=sys-auth/consolekit-1.0.1 sys-auth/polkit-pkla-compat sys-power/pm-utils ) !kde-plasma/powerdevil:4 !kde-plasma/systemsettings:4[handbook] >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/powerdevil-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e7d104c08f5946d94efed11d11151a1f
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.11.2 b/metadata/md5-cache/kde-plasma/powerdevil-5.11.2
new file mode 100644
index 000000000000..ed0c0b76b5ed
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.11.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.38.0:5 >=kde-frameworks/kauth-5.38.0:5[policykit] >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kcrash-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdelibs4support-5.38.0:5 >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kidletime-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/knotifyconfig-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwayland-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/solid-5.38.0:5 >=kde-plasma/libkscreen-5.11.2:5 >=kde-plasma/plasma-workspace-5.11.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.38.0:5 >=kde-frameworks/networkmanager-qt-5.38.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 handbook? ( >=kde-frameworks/kdoctools-5.38.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Power management for KDE Plasma Shell
+EAPI=6
+HOMEPAGE=https://projects.kde.org/projects/kde/workspace/powerdevil
+IUSE=brightness-control consolekit +wireless debug +handbook
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.38.0:5 >=kde-frameworks/kauth-5.38.0:5[policykit] >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kcrash-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdelibs4support-5.38.0:5 >=kde-frameworks/kglobalaccel-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kidletime-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/knotifications-5.38.0:5 >=kde-frameworks/knotifyconfig-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwayland-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=kde-frameworks/solid-5.38.0:5 >=kde-plasma/libkscreen-5.11.2:5 >=kde-plasma/plasma-workspace-5.11.2:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.38.0:5 >=kde-frameworks/networkmanager-qt-5.38.0:5 ) >=kde-plasma/kde-cli-tools-5.11.2:5 >=sys-power/upower-0.9.23 consolekit? ( >=sys-auth/consolekit-1.0.1 sys-auth/polkit-pkla-compat sys-power/pm-utils ) !kde-plasma/powerdevil:4 !kde-plasma/systemsettings:4[handbook] >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/powerdevil-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e7d104c08f5946d94efed11d11151a1f
diff --git a/metadata/md5-cache/kde-plasma/qguiplatformplugin_kde-4.11.22 b/metadata/md5-cache/kde-plasma/qguiplatformplugin_kde-4.11.22
index ab8be270cc8c..47c1cb808db8 100644
--- a/metadata/md5-cache/kde-plasma/qguiplatformplugin_kde-4.11.22
+++ b/metadata/md5-cache/kde-plasma/qguiplatformplugin_kde-4.11.22
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4/4.11
 SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	kde4-meta	d9eee836f90d24b95a2a7d1ff20dce06	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8cee6d5d976ddc7fbd26d1b87e1fe384
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.10.5 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.10.5
index cf23d91b8f23..1fdf97efb46f 100644
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.10.5
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.10.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kauth-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.10.5:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/sddm-kcm-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8e2d652e7c4dcd320dc9313a685127d0
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.11.1 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.11.1
deleted file mode 100644
index ada40b2458ee..000000000000
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.38.0:5 >=kde-frameworks/kauth-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/knewstuff-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma control module for SDDM
-EAPI=6
-HOMEPAGE=https://projects.kde.org/projects/kdereview/sddm-kcm
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.38.0:5 >=kde-frameworks/kauth-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/knewstuff-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.11.1:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/sddm-kcm-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e69317cf7cc4b27e6c17860b6b7b1c0d
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.11.2 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.11.2
new file mode 100644
index 000000000000..ada89ab4182e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.11.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.38.0:5 >=kde-frameworks/kauth-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/knewstuff-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma control module for SDDM
+EAPI=6
+HOMEPAGE=https://projects.kde.org/projects/kdereview/sddm-kcm
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.38.0:5 >=kde-frameworks/kauth-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/knewstuff-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.11.2:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/sddm-kcm-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e69317cf7cc4b27e6c17860b6b7b1c0d
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.10.5 b/metadata/md5-cache/kde-plasma/systemsettings-5.10.5
index 01a4d85e0005..01fd9f65dcd5 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.10.5
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.10.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kauth-5.37.0:5 >=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 classic? ( >=kde-frameworks/khtml-5.37.0:5 ) gtk? ( >=kde-plasma/kde-gtk-config-5.10.5:5 ) !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/systemsettings-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4cc443e8bf1be98a7d469295e4ba87ca
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.11.1-r1 b/metadata/md5-cache/kde-plasma/systemsettings-5.11.1-r1
deleted file mode 100644
index 0183c75900a4..000000000000
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.11.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.38.0:5 >=kde-frameworks/kactivities-stats-5.38.0:5 >=kde-frameworks/kauth-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kitemviews-5.38.0:5 >=kde-frameworks/kpackage-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 classic? ( >=kde-frameworks/khtml-5.38.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 handbook? ( >=kde-frameworks/kdoctools-5.38.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=System settings utility
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=classic gtk debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.38.0:5 >=kde-frameworks/kactivities-stats-5.38.0:5 >=kde-frameworks/kauth-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kitemviews-5.38.0:5 >=kde-frameworks/kpackage-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 classic? ( >=kde-frameworks/khtml-5.38.0:5 ) !kde-plasma/systemsettings:4 >=kde-frameworks/kirigami-5.38.0:5 gtk? ( >=kde-plasma/kde-gtk-config-5.11.1:5 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/systemsettings-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eb73448ab6aa7b63ef2e70db777004ea
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.11.2 b/metadata/md5-cache/kde-plasma/systemsettings-5.11.2
new file mode 100644
index 000000000000..1e8a12279352
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.11.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.38.0:5 >=kde-frameworks/kactivities-stats-5.38.0:5 >=kde-frameworks/kauth-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kitemviews-5.38.0:5 >=kde-frameworks/kpackage-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 classic? ( >=kde-frameworks/khtml-5.38.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 handbook? ( >=kde-frameworks/kdoctools-5.38.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=System settings utility
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=classic gtk debug +handbook
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.38.0:5 >=kde-frameworks/kactivities-stats-5.38.0:5 >=kde-frameworks/kauth-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kcompletion-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/kdbusaddons-5.38.0:5 >=kde-frameworks/kdeclarative-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kitemviews-5.38.0:5 >=kde-frameworks/kpackage-5.38.0:5 >=kde-frameworks/kservice-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=kde-frameworks/kwindowsystem-5.38.0:5 >=kde-frameworks/kxmlgui-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 classic? ( >=kde-frameworks/khtml-5.38.0:5 ) !kde-plasma/systemsettings:4 >=kde-frameworks/kirigami-5.38.0:5 gtk? ( >=kde-plasma/kde-gtk-config-5.11.2:5 ) >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/systemsettings-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=eb73448ab6aa7b63ef2e70db777004ea
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.10.5 b/metadata/md5-cache/kde-plasma/user-manager-5.10.5
index 50d8d2c01149..6776a64adde6 100644
--- a/metadata/md5-cache/kde-plasma/user-manager-5.10.5
+++ b/metadata/md5-cache/kde-plasma/user-manager-5.10.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kauth-5.37.0:5 >=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-libs/libpwquality-1.3.0 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/user-manager-5.10.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f43cc8b39c1c460fca0817ca076d3fd8
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.11.1 b/metadata/md5-cache/kde-plasma/user-manager-5.11.1
deleted file mode 100644
index 971fc096653c..000000000000
--- a/metadata/md5-cache/kde-plasma/user-manager-5.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-libs/libpwquality-1.3.0 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Simple system settings module to manage the users of your system
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kauth-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-libs/libpwquality-1.3.0 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.1/user-manager-5.11.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=42115a608ee34ff8d2aace065acd4e46
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.11.2 b/metadata/md5-cache/kde-plasma/user-manager-5.11.2
new file mode 100644
index 000000000000..83c6eb06d5eb
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/user-manager-5.11.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-libs/libpwquality-1.3.0 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.38.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Simple system settings module to manage the users of your system
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kauth-5.38.0:5 >=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=kde-frameworks/kconfigwidgets-5.38.0:5 >=kde-frameworks/kcoreaddons-5.38.0:5 >=kde-frameworks/ki18n-5.38.0:5 >=kde-frameworks/kiconthemes-5.38.0:5 >=kde-frameworks/kio-5.38.0:5 >=kde-frameworks/kwidgetsaddons-5.38.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-libs/libpwquality-1.3.0 >=kde-frameworks/kf-env-4 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.11.2/user-manager-5.11.2.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=42115a608ee34ff8d2aace065acd4e46
diff --git a/metadata/md5-cache/mail-client/kube-0.3.1 b/metadata/md5-cache/mail-client/kube-0.3.1
index e89c98f645f3..1bd1f475a0ea 100644
--- a/metadata/md5-cache/mail-client/kube-0.3.1
+++ b/metadata/md5-cache/mail-client/kube-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/breeze-icons-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/unstable/kube/0.3.1/src/kube-0.3.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=de877ea84b14d0b00005cdbbc21d2928
diff --git a/metadata/md5-cache/mail-client/neomutt-20171027 b/metadata/md5-cache/mail-client/neomutt-20171027
new file mode 100644
index 000000000000..22aaebe0ef72
--- /dev/null
+++ b/metadata/md5-cache/mail-client/neomutt-20171027
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A small but very powerful text-based mail client
+EAPI=6
+HOMEPAGE=https://www.neomutt.org/
+IUSE=berkdb crypt debug doc gdbm gnutls gpg idn kerberos kyotocabinet libressl lmdb nls notmuch qdbm sasl selinux slang smime ssl +symlink tokyocabinet
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
+SLOT=0
+SRC_URI=https://github.com/neomutt/neomutt/archive/neomutt-20171027.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=413ea66d467f7aacfd8db474ac82cc04
diff --git a/metadata/md5-cache/mail-filter/spamassassin-3.4.1-r16 b/metadata/md5-cache/mail-filter/spamassassin-3.4.1-r16
index 9df369d901ed..fec3c9f3ca1c 100644
--- a/metadata/md5-cache/mail-filter/spamassassin-3.4.1-r16
+++ b/metadata/md5-cache/mail-filter/spamassassin-3.4.1-r16
@@ -4,10 +4,10 @@ DESCRIPTION=An extensible mail filter which can identify and tag spam
 EAPI=6
 HOMEPAGE=http://spamassassin.apache.org/
 IUSE=berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=Apache-2.0 GPL-2
 RDEPEND=dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-IP virtual/perl-Archive-Tar virtual/perl-Digest-SHA virtual/perl-IO-Zlib virtual/perl-Time-HiRes ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) app-crypt/gnupg dev-perl/Digest-SHA1 dev-perl/Encode-Detect dev-perl/Geo-IP dev-perl/HTTP-Date dev-perl/Mail-DKIM dev-perl/Mail-SPF dev-perl/Net-Patricia dev-perl/Net-CIDR-Lite dev-util/re2c || ( net-misc/wget[ssl] net-misc/curl[ssl] ) virtual/perl-MIME-Base64 virtual/perl-Pod-Parser berkdb? ( virtual/perl-DB_File ) ipv6? ( dev-perl/IO-Socket-INET6 ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) postgres? ( dev-perl/DBI dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBI dev-perl/DBD-SQLite ) ssl? ( dev-perl/IO-Socket-SSL )
 SLOT=0
 SRC_URI=mirror://apache/spamassassin/source/Mail-SpamAssassin-3.4.1.tar.bz2
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=aff2753ccaae0a5e0572d9a61bfecbda
+_md5_=bd50212d1c4eb57b32f22600401befc0
diff --git a/metadata/md5-cache/media-gfx/digikam-5.5.0 b/metadata/md5-cache/media-gfx/digikam-5.5.0
index df1a1f51f46e..bac8944bdc0d 100644
--- a/metadata/md5-cache/media-gfx/digikam-5.5.0
+++ b/metadata/md5-cache/media-gfx/digikam-5.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/digikam/digikam-5.5.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=40617042fdc34d46f267693ee42db213
diff --git a/metadata/md5-cache/media-gfx/digikam-5.7.0 b/metadata/md5-cache/media-gfx/digikam-5.7.0
index caad7648acad..e0ef05ab7286 100644
--- a/metadata/md5-cache/media-gfx/digikam-5.7.0
+++ b/metadata/md5-cache/media-gfx/digikam-5.7.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/digikam/digikam-5.7.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=92b80abb379a8f4d15115c3f429ac757
diff --git a/metadata/md5-cache/media-gfx/fontforge-20170731 b/metadata/md5-cache/media-gfx/fontforge-20170731
index a96fbfe3d905..784c863e6b91 100644
--- a/metadata/md5-cache/media-gfx/fontforge-20170731
+++ b/metadata/md5-cache/media-gfx/fontforge-20170731
@@ -4,7 +4,7 @@ DESCRIPTION=postscript font editor and converter
 EAPI=6
 HOMEPAGE=http://fontforge.github.io/
 IUSE=cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD GPL-3+
 RDEPEND=dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= cairo? ( >=x11-libs/cairo-1.6:0= x11-libs/pango:0= ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( x11-libs/gtk+:2= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) readline? ( sys-libs/readline:0= ) unicode? ( media-libs/libuninameslist:0= ) X? ( x11-libs/libX11:0= x11-libs/libXi:0= >=x11-libs/pango-1.10:0=[X] ) !media-gfx/pfaedit
 REQUIRED_USE=cairo? ( png ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) ) test? ( png python )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fontforge/fontforge/releases/download/20170731/fontforge-dist-20170731.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eb8c1401faf33e6cc884332e9ad26249
+_md5_=f99f0510c3982396d2f67edc5c303885
diff --git a/metadata/md5-cache/media-gfx/freepv-0.3.0-r5 b/metadata/md5-cache/media-gfx/freepv-0.3.0-r5
index f9fc3813932d..d7cc54283e1a 100644
--- a/metadata/md5-cache/media-gfx/freepv-0.3.0-r5
+++ b/metadata/md5-cache/media-gfx/freepv-0.3.0-r5
@@ -3,10 +3,10 @@ DEPEND=dev-libs/libxml2 media-libs/libpng:0= media-libs/freeglut sys-libs/zlib v
 DESCRIPTION=Panorama viewer (Quicktime, PangeaVR, GLPanoView formats)
 EAPI=6
 HOMEPAGE=http://freepv.sourceforge.net/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libxml2 media-libs/libpng:0= media-libs/freeglut sys-libs/zlib virtual/jpeg:0 x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm
 SLOT=0
 SRC_URI=mirror://sourceforge/freepv/freepv-0.3.0.tar.gz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=a64b253769fa6f9e3159b66aa9fa72d8
+_md5_=02a9bef1516773ba6140cb5fae184826
diff --git a/metadata/md5-cache/media-gfx/gimp-2.8.14-r2 b/metadata/md5-cache/media-gfx/gimp-2.8.14-r2
deleted file mode 100644
index 6c86d62f6339..000000000000
--- a/metadata/md5-cache/media-gfx/gimp-2.8.14-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.24.1:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.10 >=media-libs/gegl-0.2.0:0 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) webkit? ( >=net-libs/webkit-gtk-1.6.1:2 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-2.2:2 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.36.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/libgudev:= ) sys-apps/findutils virtual/pkgconfig >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.19 doc? ( >=dev-util/gtk-doc-1 ) >=sys-devel/libtool-2.2 >=sys-devel/automake-1.11 dev-util/gtk-doc-am test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNU Image Manipulation Program
-EAPI=5
-HOMEPAGE=https://www.gimp.org/
-IUSE=alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev webkit wmf xpm linguas_am linguas_ar linguas_ast linguas_az linguas_be linguas_bg linguas_br linguas_ca linguas_ca@valencia linguas_cs linguas_csb linguas_da linguas_de linguas_dz linguas_el linguas_en_CA linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_km linguas_kn linguas_ko linguas_lt linguas_lv linguas_mk linguas_ml linguas_ms linguas_my linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_si linguas_sk linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_ta linguas_te linguas_th linguas_tr linguas_tt linguas_uk linguas_vi linguas_xh linguas_yi linguas_zh_CN linguas_zh_HK linguas_zh_TW test debug python_targets_python2_7
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-3 LGPL-3
-RDEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.24.1:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.10 >=media-libs/gegl-0.2.0:0 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) webkit? ( >=net-libs/webkit-gtk-1.6.1:2 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-2.2:2 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.36.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/libgudev:= )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=2
-SRC_URI=mirror://gimp/v2.8/gimp-2.8.14.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9b97a792601f6cad1bde0360d9cf6f37
diff --git a/metadata/md5-cache/media-gfx/gimp-2.8.14-r4 b/metadata/md5-cache/media-gfx/gimp-2.8.14-r4
deleted file mode 100644
index b28f0512c872..000000000000
--- a/metadata/md5-cache/media-gfx/gimp-2.8.14-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.24.1:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.10 >=media-libs/gegl-0.2.0:0 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-2.2:2 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.36.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/libgudev:= ) sys-apps/findutils virtual/pkgconfig >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.19 doc? ( >=dev-util/gtk-doc-1 ) >=sys-devel/libtool-2.2 >=sys-devel/automake-1.11 dev-util/gtk-doc-am test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNU Image Manipulation Program
-EAPI=5
-HOMEPAGE=https://www.gimp.org/
-IUSE=alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm linguas_am linguas_ar linguas_ast linguas_az linguas_be linguas_bg linguas_br linguas_ca linguas_ca@valencia linguas_cs linguas_csb linguas_da linguas_de linguas_dz linguas_el linguas_en_CA linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_km linguas_kn linguas_ko linguas_lt linguas_lv linguas_mk linguas_ml linguas_ms linguas_my linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_si linguas_sk linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_ta linguas_te linguas_th linguas_tr linguas_tt linguas_uk linguas_vi linguas_xh linguas_yi linguas_zh_CN linguas_zh_HK linguas_zh_TW test debug python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-3 LGPL-3
-RDEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.24.1:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.10 >=media-libs/gegl-0.2.0:0 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-2.2:2 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.36.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/libgudev:= )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=2
-SRC_URI=mirror://gimp/v2.8/gimp-2.8.14.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a18f7f203555ab37b7bbcbed04b6112a
diff --git a/metadata/md5-cache/media-gfx/gimp-2.8.20-r1 b/metadata/md5-cache/media-gfx/gimp-2.8.20-r1
deleted file mode 100644
index c4d8a140e1f1..000000000000
--- a/metadata/md5-cache/media-gfx/gimp-2.8.20-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.24.1:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.10 >=media-libs/gegl-0.2.0:0 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-2.2:2 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.36.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/libgudev:= ) sys-apps/findutils virtual/pkgconfig >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.19 doc? ( >=dev-util/gtk-doc-1 ) >=sys-devel/libtool-2.2 >=sys-devel/automake-1.11 dev-util/gtk-doc-am test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNU Image Manipulation Program
-EAPI=5
-HOMEPAGE=https://www.gimp.org/
-IUSE=alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm linguas_am linguas_ar linguas_ast linguas_az linguas_be linguas_bg linguas_br linguas_ca linguas_ca@valencia linguas_cs linguas_csb linguas_da linguas_de linguas_dz linguas_el linguas_en_CA linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_km linguas_kn linguas_ko linguas_lt linguas_lv linguas_mk linguas_ml linguas_ms linguas_my linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_si linguas_sk linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_ta linguas_te linguas_th linguas_tr linguas_tt linguas_uk linguas_vi linguas_xh linguas_yi linguas_zh_CN linguas_zh_HK linguas_zh_TW test debug python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-3 LGPL-3
-RDEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.24.1:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.10 >=media-libs/gegl-0.2.0:0 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-2.2:2 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.36.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/libgudev:= )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=2
-SRC_URI=mirror://gimp/v2.8/gimp-2.8.20.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=80410452d8141e1c30ef4f097bf2ac9d
diff --git a/metadata/md5-cache/media-gfx/gimp-2.8.22 b/metadata/md5-cache/media-gfx/gimp-2.8.22
index 714c641d7fd5..384bfdb07b2a 100644
--- a/metadata/md5-cache/media-gfx/gimp-2.8.22
+++ b/metadata/md5-cache/media-gfx/gimp-2.8.22
@@ -4,11 +4,11 @@ DESCRIPTION=GNU Image Manipulation Program
 EAPI=5
 HOMEPAGE=https://www.gimp.org/
 IUSE=alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm linguas_am linguas_ar linguas_ast linguas_az linguas_be linguas_bg linguas_br linguas_ca linguas_ca@valencia linguas_cs linguas_csb linguas_da linguas_de linguas_dz linguas_el linguas_en_CA linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_km linguas_kn linguas_ko linguas_lt linguas_lv linguas_mk linguas_ml linguas_ms linguas_my linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_si linguas_sk linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_ta linguas_te linguas_th linguas_tr linguas_tt linguas_uk linguas_vi linguas_xh linguas_yi linguas_zh_CN linguas_zh_HK linguas_zh_TW test debug python_targets_python2_7
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-3 LGPL-3
 RDEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.24.1:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.10 >=media-libs/gegl-0.2.0:0 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-2.2:2 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.36.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/libgudev:= )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=2
 SRC_URI=mirror://gimp/v2.8/gimp-2.8.22.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=00702df7f85fac98b67bfd9b8beff2b4
+_md5_=dc233b7fd8eca26359426a8270826956
diff --git a/metadata/md5-cache/media-gfx/gimp-2.9.4-r3 b/metadata/md5-cache/media-gfx/gimp-2.9.4-r3
deleted file mode 100644
index acfa8fc1428f..000000000000
--- a/metadata/md5-cache/media-gfx/gimp-2.9.4-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 dev-util/gtk-update-icon-cache >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/cairo-1.12.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/harfbuzz-0.9.19 >=media-libs/gexiv2-0.6.1 >=media-libs/libmypaint-1.3.0_beta0[gegl] >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.18 >=media-libs/gegl-0.3.8:0.3[cairo] >=dev-libs/glib-2.43 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) gnome? ( gnome-base/gvfs ) virtual/jpeg:0 jpeg2k? ( media-libs/jasper:= ) >=media-libs/lcms-2.2:2 mng? ( media-libs/libmng ) openexr? ( >=media-libs/openexr-1.6.1 ) pdf? ( >=app-text/poppler-0.12.4[cairo] >=app-text/poppler-data-0.4.7 ) >=media-libs/libpng-1.2.37:0 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pycairo-1.0.2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=media-libs/tiff-3.5.7:0 >=gnome-base/librsvg-2.36.0:2 wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib app-arch/bzip2 >=app-arch/xz-utils-5.0.0 postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/libgudev:= ) sys-apps/findutils virtual/pkgconfig >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.19 doc? ( >=dev-util/gtk-doc-1 ) >=sys-devel/libtool-2.2 >=sys-devel/automake-1.11 dev-util/gtk-doc-am test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNU Image Manipulation Program
-EAPI=5
-HOMEPAGE=https://www.gimp.org/
-IUSE=alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev vector-icons wmf xpm linguas_am linguas_ar linguas_ast linguas_az linguas_be linguas_bg linguas_br linguas_ca linguas_ca@valencia linguas_cs linguas_csb linguas_da linguas_de linguas_dz linguas_el linguas_en_CA linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_km linguas_kn linguas_ko linguas_lt linguas_lv linguas_mk linguas_ml linguas_ms linguas_my linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_si linguas_sk linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_ta linguas_te linguas_th linguas_tr linguas_tt linguas_uk linguas_vi linguas_xh linguas_yi linguas_zh_CN linguas_zh_HK linguas_zh_TW test debug python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86
-LICENSE=GPL-3 LGPL-3
-RDEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 dev-util/gtk-update-icon-cache >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/cairo-1.12.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/harfbuzz-0.9.19 >=media-libs/gexiv2-0.6.1 >=media-libs/libmypaint-1.3.0_beta0[gegl] >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.18 >=media-libs/gegl-0.3.8:0.3[cairo] >=dev-libs/glib-2.43 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) gnome? ( gnome-base/gvfs ) virtual/jpeg:0 jpeg2k? ( media-libs/jasper:= ) >=media-libs/lcms-2.2:2 mng? ( media-libs/libmng ) openexr? ( >=media-libs/openexr-1.6.1 ) pdf? ( >=app-text/poppler-0.12.4[cairo] >=app-text/poppler-data-0.4.7 ) >=media-libs/libpng-1.2.37:0 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pycairo-1.0.2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=media-libs/tiff-3.5.7:0 >=gnome-base/librsvg-2.36.0:2 wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib app-arch/bzip2 >=app-arch/xz-utils-5.0.0 postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/libgudev:= )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=2
-SRC_URI=https://www.hartwork.org/public/gimp-2.9.4-r1.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=337a5943b3611f7c831dbac6b04c3254
diff --git a/metadata/md5-cache/media-gfx/gphoto2-2.5.14 b/metadata/md5-cache/media-gfx/gphoto2-2.5.14
index 031adfd33f2c..e0f0ca767b26 100644
--- a/metadata/md5-cache/media-gfx/gphoto2-2.5.14
+++ b/metadata/md5-cache/media-gfx/gphoto2-2.5.14
@@ -4,10 +4,10 @@ DESCRIPTION=Free, redistributable digital camera software application
 EAPI=6
 HOMEPAGE=http://www.gphoto.org/
 IUSE=aalib exif ncurses nls readline
-KEYWORDS=alpha ~amd64 ~hppa ppc ppc64 ~sparc x86
+KEYWORDS=alpha ~amd64 hppa ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/popt >=media-libs/libgphoto2-2.5.10:=[exif?] aalib? ( media-libs/aalib virtual/jpeg:0 ) exif? ( media-libs/libexif ) ncurses? ( dev-libs/cdk:0= ) readline? ( sys-libs/readline:0= )
 SLOT=0
 SRC_URI=mirror://sourceforge/gphoto/gphoto2-2.5.14.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=f9179a10d4c5cfd481af68ee484d31cf
+_md5_=06a4d8855953a99bc2c18d0cdf269759
diff --git a/metadata/md5-cache/media-gfx/graphicsmagick-1.3.26 b/metadata/md5-cache/media-gfx/graphicsmagick-1.3.26
index cb20f4396c22..f252c8e0c5e2 100644
--- a/metadata/md5-cache/media-gfx/graphicsmagick-1.3.26
+++ b/metadata/md5-cache/media-gfx/graphicsmagick-1.3.26
@@ -4,10 +4,10 @@ DESCRIPTION=Collection of tools and libraries for many image formats
 EAPI=6
 HOMEPAGE=http://www.graphicsmagick.org/
 IUSE=bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp perl png postscript q16 q32 static-libs svg test threads tiff truetype webp wmf X zlib
-KEYWORDS=~alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
 RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) fpx? ( media-libs/libfpx ) imagemagick? ( !media-gfx/imagemagick ) jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0 ) postscript? ( app-text/ghostscript-gpl ) svg? ( dev-libs/libxml2 ) tiff? ( media-libs/tiff:0 ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libSM x11-libs/libXext ) zlib? ( sys-libs/zlib )
 SLOT=0/1.3
 SRC_URI=mirror://sourceforge/graphicsmagick/GraphicsMagick-1.3.26.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=04e6cb253aa2517f85bc3cbdf2293309
+_md5_=4c11d7a179d9308ce96796615bf7f719
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.9.20 b/metadata/md5-cache/media-gfx/imagemagick-6.9.9.20
new file mode 100644
index 000000000000..dda25c9884a2
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.9.20
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-proto/xextproto ) >=app-portage/elt-patches-20170422
+DESCRIPTION=A collection of tools and libraries for many image formats
+EAPI=6
+HOMEPAGE=http://www.imagemagick.org/
+IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=imagemagick
+RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
+RESTRICT=perl? ( userpriv )
+SLOT=0/6.9.9.20
+SRC_URI=mirror://imagemagick/ImageMagick-6.9.9-20.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b23ce63f09b241e1cbb571d2afbf20eb
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.7.8 b/metadata/md5-cache/media-gfx/imagemagick-7.0.7.8
new file mode 100644
index 000000000000..ed534aebf792
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imagemagick-7.0.7.8
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-proto/xextproto ) >=app-portage/elt-patches-20170422
+DESCRIPTION=A collection of tools and libraries for many image formats
+EAPI=6
+HOMEPAGE=http://www.imagemagick.org/
+IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=imagemagick
+RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
+RESTRICT=perl? ( userpriv )
+SLOT=0/7.0.7.8
+SRC_URI=mirror://imagemagick/ImageMagick-7.0.7-8.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3ef809ee1c7ed4f217be7b87006c3f09
diff --git a/metadata/md5-cache/media-gfx/imageworsener-1.3.2 b/metadata/md5-cache/media-gfx/imageworsener-1.3.2
index f739a1d443f3..84d1102f0661 100644
--- a/metadata/md5-cache/media-gfx/imageworsener-1.3.2
+++ b/metadata/md5-cache/media-gfx/imageworsener-1.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=Utility for image scaling and processing
 EAPI=6
 HOMEPAGE=http://entropymine.com/imageworsener/
 IUSE=jpeg png static-libs test webp zlib
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=MIT-with-advertising
 RDEPEND=png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg:0 ) webp? ( >=media-libs/libwebp-0.1.3 ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=test? ( jpeg png webp zlib )
 SLOT=0
 SRC_URI=http://entropymine.com/imageworsener/imageworsener-1.3.2.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=d29b98731f41fe1edbdd17323f04a4e5
+_md5_=2818e5ee38936b82b2b30240eefcb3d4
diff --git a/metadata/md5-cache/media-gfx/kcoloredit-2.0.0-r1 b/metadata/md5-cache/media-gfx/kcoloredit-2.0.0-r1
index 35c5c419e0ec..2ce0bbd1a188 100644
--- a/metadata/md5-cache/media-gfx/kcoloredit-2.0.0-r1
+++ b/metadata/md5-cache/media-gfx/kcoloredit-2.0.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
 DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.7.2 dev-util/automoc virtual/pkgconfig >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 DESCRIPTION=Tool for editing color palettes
-EAPI=5
-HOMEPAGE=https://www.kde.org/
+EAPI=6
+HOMEPAGE=https://userbase.kde.org/KColorEdit
 IUSE=debug l10n_af l10n_ar l10n_be l10n_bg l10n_br l10n_ca l10n_ca-valencia l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_ga l10n_gl l10n_he l10n_hi l10n_hne l10n_hr l10n_hu l10n_is l10n_it l10n_ja l10n_km l10n_ku l10n_lt l10n_lv l10n_mai l10n_mk l10n_ms l10n_nb l10n_nds l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt l10n_pt-BR l10n_ro l10n_ru l10n_se l10n_sk l10n_sl l10n_sv l10n_ta l10n_tg l10n_th l10n_tr l10n_uk l10n_vi l10n_xh l10n_zh-CN l10n_zh-HK l10n_zh-TW +handbook
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons l10n_af? ( >=kde-apps/kde4-l10n-4.4:4[l10n_af(+)] ) l10n_ar? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ar(+)] ) l10n_be? ( >=kde-apps/kde4-l10n-4.4:4[l10n_be(+)] ) l10n_bg? ( >=kde-apps/kde4-l10n-4.4:4[l10n_bg(+)] ) l10n_br? ( >=kde-apps/kde4-l10n-4.4:4[l10n_br(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[l10n_cs(+)] ) l10n_cy? ( >=kde-apps/kde4-l10n-4.4:4[l10n_cy(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[l10n_en-GB(+)] ) l10n_eo? ( >=kde-apps/kde4-l10n-4.4:4[l10n_eo(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[l10n_et(+)] ) l10n_eu? ( >=kde-apps/kde4-l10n-4.4:4[l10n_eu(+)] ) l10n_fa? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fa(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_gl(+)] ) l10n_he? ( >=kde-apps/kde4-l10n-4.4:4[l10n_he(+)] ) l10n_hi? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hi(+)] ) l10n_hne? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hne(+)] ) l10n_hr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hu(+)] ) l10n_is? ( >=kde-apps/kde4-l10n-4.4:4[l10n_is(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ja(+)] ) l10n_km? ( >=kde-apps/kde4-l10n-4.4:4[l10n_km(+)] ) l10n_ku? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ku(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[l10n_lt(+)] ) l10n_lv? ( >=kde-apps/kde4-l10n-4.4:4[l10n_lv(+)] ) l10n_mai? ( >=kde-apps/kde4-l10n-4.4:4[l10n_mai(+)] ) l10n_mk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_mk(+)] ) l10n_ms? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ms(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nds(+)] ) l10n_ne? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ne(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nl(+)] ) l10n_nn? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nn(+)] ) l10n_oc? ( >=kde-apps/kde4-l10n-4.4:4[l10n_oc(+)] ) l10n_pa? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pa(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ru(+)] ) l10n_se? ( >=kde-apps/kde4-l10n-4.4:4[l10n_se(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sl(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sv(+)] ) l10n_ta? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ta(+)] ) l10n_tg? ( >=kde-apps/kde4-l10n-4.4:4[l10n_tg(+)] ) l10n_th? ( >=kde-apps/kde4-l10n-4.4:4[l10n_th(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_uk(+)] ) l10n_vi? ( >=kde-apps/kde4-l10n-4.4:4[l10n_vi(+)] ) l10n_xh? ( >=kde-apps/kde4-l10n-4.4:4[l10n_xh(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-CN(+)] ) l10n_zh-HK? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-HK(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-TW(+)] ) handbook? ( kde-frameworks/kdelibs:4[handbook] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4
 SRC_URI=mirror://kde/stable/4.4.0/src/extragear/kcoloredit-2.0.0-kde4.4.0.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=053fd17f575040d069ca21ce1da64bcb
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d06bb4f2dbf7de8ee4323e56748eaa65
diff --git a/metadata/md5-cache/media-gfx/kfax-3.3.6-r1 b/metadata/md5-cache/media-gfx/kfax-3.3.6-r1
index 9d93ec4702e8..dfc530ac8cba 100644
--- a/metadata/md5-cache/media-gfx/kfax-3.3.6-r1
+++ b/metadata/md5-cache/media-gfx/kfax-3.3.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=x11-libs/libX11 kde-frameworks/oxygen-icons l10n_af? ( >=kde-apps/kde4-l10n-4.4:4[l10n_af(+)] ) l10n_ar? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ar(+)] ) l10n_be? ( >=kde-apps/kde4-l10n-4.4:4[l10n_be(+)] ) l10n_bg? ( >=kde-apps/kde4-l10n-4.4:4[l10n_bg(+)] ) l10n_br? ( >=kde-apps/kde4-l10n-4.4:4[l10n_br(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[l10n_cs(+)] ) l10n_cy? ( >=kde-apps/kde4-l10n-4.4:4[l10n_cy(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[l10n_en-GB(+)] ) l10n_eo? ( >=kde-apps/kde4-l10n-4.4:4[l10n_eo(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[l10n_et(+)] ) l10n_eu? ( >=kde-apps/kde4-l10n-4.4:4[l10n_eu(+)] ) l10n_fa? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fa(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_gl(+)] ) l10n_he? ( >=kde-apps/kde4-l10n-4.4:4[l10n_he(+)] ) l10n_hi? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hi(+)] ) l10n_hne? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hne(+)] ) l10n_hr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hu(+)] ) l10n_is? ( >=kde-apps/kde4-l10n-4.4:4[l10n_is(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ja(+)] ) l10n_km? ( >=kde-apps/kde4-l10n-4.4:4[l10n_km(+)] ) l10n_ko? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ko(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[l10n_lt(+)] ) l10n_lv? ( >=kde-apps/kde4-l10n-4.4:4[l10n_lv(+)] ) l10n_mai? ( >=kde-apps/kde4-l10n-4.4:4[l10n_mai(+)] ) l10n_mk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_mk(+)] ) l10n_ms? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ms(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nds(+)] ) l10n_ne? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ne(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nl(+)] ) l10n_nn? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nn(+)] ) l10n_oc? ( >=kde-apps/kde4-l10n-4.4:4[l10n_oc(+)] ) l10n_pa? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pa(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ru(+)] ) l10n_se? ( >=kde-apps/kde4-l10n-4.4:4[l10n_se(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sl(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sv(+)] ) l10n_ta? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ta(+)] ) l10n_tg? ( >=kde-apps/kde4-l10n-4.4:4[l10n_tg(+)] ) l10n_th? ( >=kde-apps/kde4-l10n-4.4:4[l10n_th(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_uk(+)] ) l10n_vi? ( >=kde-apps/kde4-l10n-4.4:4[l10n_vi(+)] ) l10n_wa? ( >=kde-apps/kde4-l10n-4.4:4[l10n_wa(+)] ) l10n_xh? ( >=kde-apps/kde4-l10n-4.4:4[l10n_xh(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-CN(+)] ) l10n_zh-HK? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-HK(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-TW(+)] ) handbook? ( kde-frameworks/kdelibs:4[handbook] ) >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
 SLOT=4
 SRC_URI=mirror://kde/stable/4.4.0/src/extragear/kfax-3.3.6-kde4.4.0.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b1aeb92b51bec68f1b2ee62fe3165b13
diff --git a/metadata/md5-cache/media-gfx/kgraphviewer-2.4.2 b/metadata/md5-cache/media-gfx/kgraphviewer-2.4.2
index 6381160da2a5..54f8377de6ae 100644
--- a/metadata/md5-cache/media-gfx/kgraphviewer-2.4.2
+++ b/metadata/md5-cache/media-gfx/kgraphviewer-2.4.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=media-gfx/graphviz-2.30 !media-gfx/kgraphviewer:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kgraphviewer/2.4.2/kgraphviewer-2.4.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=711b98ebd3051f8258f7f95b48e710f5
diff --git a/metadata/md5-cache/media-gfx/kphotoalbum-5.2 b/metadata/md5-cache/media-gfx/kphotoalbum-5.2
index 73b3d9dc6deb..3b731adc9d27 100644
--- a/metadata/md5-cache/media-gfx/kphotoalbum-5.2
+++ b/metadata/md5-cache/media-gfx/kphotoalbum-5.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ FDL-1.2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-gfx/exiv2:= media-libs/phonon[qt5(+)] virtual/jpeg:0 face? ( >=kde-apps/libkface-14.12.0:5 ) kipi? ( >=kde-apps/libkipi-14.12.0:5 ) map? ( >=kde-apps/libkgeomap-14.12.0:5 ) raw? ( >=kde-apps/libkdcraw-14.12.0:5 ) media-video/mplayer kipi? ( media-plugins/kipi-plugins:5 ) !media-gfx/kphotoalbum:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kphotoalbum/5.2/kphotoalbum-5.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e2c7e9642dc57290cb125df6b1438a90
diff --git a/metadata/md5-cache/media-gfx/kpovmodeler-1.1.3-r1 b/metadata/md5-cache/media-gfx/kpovmodeler-1.1.3-r1
index bf614bed1bab..e4da430869f4 100644
--- a/metadata/md5-cache/media-gfx/kpovmodeler-1.1.3-r1
+++ b/metadata/md5-cache/media-gfx/kpovmodeler-1.1.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1 FDL-1.2
 RDEPEND=media-libs/freetype virtual/glu x11-libs/libX11 media-gfx/povray kde-frameworks/oxygen-icons l10n_af? ( >=kde-apps/kde4-l10n-4.4:4[l10n_af(+)] ) l10n_ar? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ar(+)] ) l10n_be? ( >=kde-apps/kde4-l10n-4.4:4[l10n_be(+)] ) l10n_bg? ( >=kde-apps/kde4-l10n-4.4:4[l10n_bg(+)] ) l10n_br? ( >=kde-apps/kde4-l10n-4.4:4[l10n_br(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ca(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[l10n_cs(+)] ) l10n_cy? ( >=kde-apps/kde4-l10n-4.4:4[l10n_cy(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[l10n_en-GB(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[l10n_et(+)] ) l10n_eu? ( >=kde-apps/kde4-l10n-4.4:4[l10n_eu(+)] ) l10n_fa? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fa(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_gl(+)] ) l10n_he? ( >=kde-apps/kde4-l10n-4.4:4[l10n_he(+)] ) l10n_hi? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hi(+)] ) l10n_hr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hu(+)] ) l10n_is? ( >=kde-apps/kde4-l10n-4.4:4[l10n_is(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ja(+)] ) l10n_km? ( >=kde-apps/kde4-l10n-4.4:4[l10n_km(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[l10n_lt(+)] ) l10n_mk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_mk(+)] ) l10n_ms? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ms(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nds(+)] ) l10n_ne? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ne(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nl(+)] ) l10n_nn? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nn(+)] ) l10n_oc? ( >=kde-apps/kde4-l10n-4.4:4[l10n_oc(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ru(+)] ) l10n_se? ( >=kde-apps/kde4-l10n-4.4:4[l10n_se(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sl(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sv(+)] ) l10n_ta? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ta(+)] ) l10n_tg? ( >=kde-apps/kde4-l10n-4.4:4[l10n_tg(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_uk(+)] ) l10n_vi? ( >=kde-apps/kde4-l10n-4.4:4[l10n_vi(+)] ) l10n_xh? ( >=kde-apps/kde4-l10n-4.4:4[l10n_xh(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-TW(+)] ) >=dev-qt/qtopengl-4.8.5:4 dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4
 SRC_URI=https://dev.gentoo.org/~kensington/kpovmodeler-1.1.3-kde4.1.1.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=cf7eeaffa85c9f3c3eecbacf8d12de3e
diff --git a/metadata/md5-cache/media-gfx/krita-3.1.4 b/metadata/md5-cache/media-gfx/krita-3.1.4
index 2b848f743183..2470a3315ce7 100644
--- a/metadata/md5-cache/media-gfx/krita-3.1.4
+++ b/metadata/md5-cache/media-gfx/krita-3.1.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[-gles2] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/boost:= media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= net-misc/curl sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXi color-management? ( media-libs/opencolorio ) fftw? ( sci-libs/fftw:3.0= ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) openexr? ( media-libs/ilmbase:= media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.7.1:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) !app-office/calligra:4[calligra_features_krita] !app-office/calligra-l10n:4[calligra_features_krita(+)] >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/krita/3.1.4/krita-3.1.4.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=928fd3e52bab7b6c2c7b57f66908a705
diff --git a/metadata/md5-cache/media-gfx/krita-3.2.1 b/metadata/md5-cache/media-gfx/krita-3.2.1
index cc78d8558c15..a3632baacf98 100644
--- a/metadata/md5-cache/media-gfx/krita-3.2.1
+++ b/metadata/md5-cache/media-gfx/krita-3.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[-gles2] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/boost:= media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXi color-management? ( media-libs/opencolorio ) fftw? ( sci-libs/fftw:3.0= ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) openexr? ( media-libs/ilmbase:= media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.7.1:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) !app-office/calligra:4[calligra_features_krita] !app-office/calligra-l10n:4[calligra_features_krita(+)] >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/krita/3.2.1/krita-3.2.1.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d2251404ccc9f3fe08f596bcf1c95938
diff --git a/metadata/md5-cache/media-gfx/krita-3.3.1 b/metadata/md5-cache/media-gfx/krita-3.3.1
index cc84af18e9de..0b6783d8c9dd 100644
--- a/metadata/md5-cache/media-gfx/krita-3.3.1
+++ b/metadata/md5-cache/media-gfx/krita-3.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemmodels-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[-gles2] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/boost:= media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXi color-management? ( media-libs/opencolorio ) fftw? ( sci-libs/fftw:3.0= ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) openexr? ( media-libs/ilmbase:= media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.7.1:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) !app-office/calligra:4[calligra_features_krita] !app-office/calligra-l10n:4[calligra_features_krita(+)] >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/krita/3.3.1/krita-3.3.1.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d2251404ccc9f3fe08f596bcf1c95938
diff --git a/metadata/md5-cache/media-gfx/kuickshow-0.9.1-r2 b/metadata/md5-cache/media-gfx/kuickshow-0.9.1-r2
index 80444f92c415..4ba1bb5d0164 100644
--- a/metadata/md5-cache/media-gfx/kuickshow-0.9.1-r2
+++ b/metadata/md5-cache/media-gfx/kuickshow-0.9.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/imlib kde-frameworks/oxygen-icons l10n_af? ( >=kde-apps/kde4-l10n-4.4:4[l10n_af(+)] ) l10n_ar? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ar(+)] ) l10n_be? ( >=kde-apps/kde4-l10n-4.4:4[l10n_be(+)] ) l10n_bg? ( >=kde-apps/kde4-l10n-4.4:4[l10n_bg(+)] ) l10n_bn? ( >=kde-apps/kde4-l10n-4.4:4[l10n_bn(+)] ) l10n_br? ( >=kde-apps/kde4-l10n-4.4:4[l10n_br(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[l10n_cs(+)] ) l10n_cy? ( >=kde-apps/kde4-l10n-4.4:4[l10n_cy(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[l10n_en-GB(+)] ) l10n_eo? ( >=kde-apps/kde4-l10n-4.4:4[l10n_eo(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[l10n_et(+)] ) l10n_eu? ( >=kde-apps/kde4-l10n-4.4:4[l10n_eu(+)] ) l10n_fa? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fa(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_gl(+)] ) l10n_he? ( >=kde-apps/kde4-l10n-4.4:4[l10n_he(+)] ) l10n_hi? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hi(+)] ) l10n_hne? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hne(+)] ) l10n_hr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hu(+)] ) l10n_is? ( >=kde-apps/kde4-l10n-4.4:4[l10n_is(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ja(+)] ) l10n_km? ( >=kde-apps/kde4-l10n-4.4:4[l10n_km(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[l10n_lt(+)] ) l10n_lv? ( >=kde-apps/kde4-l10n-4.4:4[l10n_lv(+)] ) l10n_mai? ( >=kde-apps/kde4-l10n-4.4:4[l10n_mai(+)] ) l10n_mk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_mk(+)] ) l10n_ms? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ms(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nds(+)] ) l10n_ne? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ne(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nl(+)] ) l10n_nn? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nn(+)] ) l10n_oc? ( >=kde-apps/kde4-l10n-4.4:4[l10n_oc(+)] ) l10n_pa? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pa(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ru(+)] ) l10n_se? ( >=kde-apps/kde4-l10n-4.4:4[l10n_se(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sl(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sv(+)] ) l10n_ta? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ta(+)] ) l10n_tg? ( >=kde-apps/kde4-l10n-4.4:4[l10n_tg(+)] ) l10n_th? ( >=kde-apps/kde4-l10n-4.4:4[l10n_th(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_uk(+)] ) l10n_uz? ( >=kde-apps/kde4-l10n-4.4:4[l10n_uz(+)] ) l10n_uz-Cyrl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_uz-Cyrl(+)] ) l10n_vi? ( >=kde-apps/kde4-l10n-4.4:4[l10n_vi(+)] ) l10n_xh? ( >=kde-apps/kde4-l10n-4.4:4[l10n_xh(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-TW(+)] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4
 SRC_URI=mirror://kde/Attic/4.4.0/src/extragear/kuickshow-0.9.1-kde4.4.0.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=af35ccd20619fa3c3b914ad7a4619bdd
diff --git a/metadata/md5-cache/media-gfx/kxstitch-2.0.0 b/metadata/md5-cache/media-gfx/kxstitch-2.0.0
index 35168c0b9235..95e16065b600 100644
--- a/metadata/md5-cache/media-gfx/kxstitch-2.0.0
+++ b/metadata/md5-cache/media-gfx/kxstitch-2.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-gfx/imagemagick[cxx] x11-libs/libX11 !media-gfx/kxstitch:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kxstitch/2.0.0/src/kxstitch-2.0.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e8c889143be73ce84c56df21fde1a8ae
diff --git a/metadata/md5-cache/media-gfx/librecad-2.1.3 b/metadata/md5-cache/media-gfx/librecad-2.1.3
index 1089c3508e7b..95be79f3465a 100644
--- a/metadata/md5-cache/media-gfx/librecad-2.1.3
+++ b/metadata/md5-cache/media-gfx/librecad-2.1.3
@@ -4,11 +4,11 @@ DESCRIPTION=Generic 2D CAD program
 EAPI=5
 HOMEPAGE=http://www.librecad.org/
 IUSE=3d debug doc tools qt4 +qt5
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qthelp:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) dev-libs/boost:= dev-cpp/muParser media-libs/freetype:2
 REQUIRED_USE=|| ( qt4 qt5 )
 SLOT=0
 SRC_URI=https://github.com/LibreCAD/LibreCAD/archive/2.1.3.zip -> librecad-2.1.3.zip
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=fef1c6abfae7ccbdb04f8edc568ff6d8
+_md5_=54cdf8ec7cefe1721f714e6c3ebfad06
diff --git a/metadata/md5-cache/media-gfx/openscad-2015.03_p2-r1 b/metadata/md5-cache/media-gfx/openscad-2015.03_p2-r1
deleted file mode 100644
index 80fd1d2fcdc4..000000000000
--- a/metadata/md5-cache/media-gfx/openscad-2015.03_p2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=media-gfx/opencsg sci-mathematics/cgal dev-qt/qtcore:4 dev-qt/qtgui:4[-egl] dev-qt/qtopengl:4[-egl] dev-cpp/eigen:3 dev-libs/glib:2 dev-libs/gmp:0= dev-libs/mpfr:0= dev-libs/boost:= media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/glew:* media-libs/harfbuzz x11-libs/qscintilla:=[qt4(-)]
-DESCRIPTION=The Programmers Solid 3D CAD Modeller
-EAPI=6
-HOMEPAGE=http://www.openscad.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-gfx/opencsg sci-mathematics/cgal dev-qt/qtcore:4 dev-qt/qtgui:4[-egl] dev-qt/qtopengl:4[-egl] dev-cpp/eigen:3 dev-libs/glib:2 dev-libs/gmp:0= dev-libs/mpfr:0= dev-libs/boost:= media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/glew:* media-libs/harfbuzz x11-libs/qscintilla:=[qt4(-)]
-SLOT=0
-SRC_URI=http://files.openscad.org/openscad-2015.03-2.src.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=1655a34f4f7651ea2fcdd99c7e5bb6d7
diff --git a/metadata/md5-cache/media-gfx/openscad-2015.03_p2-r2 b/metadata/md5-cache/media-gfx/openscad-2015.03_p2-r2
deleted file mode 100644
index 7ca75f4d5479..000000000000
--- a/metadata/md5-cache/media-gfx/openscad-2015.03_p2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=media-gfx/opencsg sci-mathematics/cgal dev-qt/qtcore:4 dev-qt/qtgui:4[-egl] dev-qt/qtopengl:4[-egl] dev-cpp/eigen:3 dev-libs/glib:2 dev-libs/gmp:0= dev-libs/mpfr:0= dev-libs/boost:= media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/glew:* media-libs/harfbuzz x11-libs/qscintilla:=[qt4(-)] emacs? ( virtual/emacs )
-DESCRIPTION=The Programmers Solid 3D CAD Modeller
-EAPI=6
-HOMEPAGE=http://www.openscad.org/
-IUSE=emacs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-gfx/opencsg sci-mathematics/cgal dev-qt/qtcore:4 dev-qt/qtgui:4[-egl] dev-qt/qtopengl:4[-egl] dev-cpp/eigen:3 dev-libs/glib:2 dev-libs/gmp:0= dev-libs/mpfr:0= dev-libs/boost:= media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/glew:* media-libs/harfbuzz x11-libs/qscintilla:=[qt4(-)] emacs? ( virtual/emacs )
-SLOT=0
-SRC_URI=http://files.openscad.org/openscad-2015.03-2.src.tar.gz
-_eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=d9b633cddc594efd066f8a1580c55421
diff --git a/metadata/md5-cache/media-gfx/openscad-2015.03_p2-r3 b/metadata/md5-cache/media-gfx/openscad-2015.03_p2-r3
new file mode 100644
index 000000000000..995084a302c3
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/openscad-2015.03_p2-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare
+DEPEND=dev-cpp/eigen:3 dev-libs/boost:= dev-libs/glib:2 dev-libs/gmp:0= dev-libs/mpfr:0= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 media-gfx/opencsg media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/glew:* media-libs/harfbuzz sci-mathematics/cgal:= >=x11-libs/qscintilla-2.9.4:=[qt5(+)] emacs? ( virtual/emacs )
+DESCRIPTION=The Programmers Solid 3D CAD Modeller
+EAPI=6
+HOMEPAGE=http://www.openscad.org/
+IUSE=emacs
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= dev-libs/glib:2 dev-libs/gmp:0= dev-libs/mpfr:0= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 media-gfx/opencsg media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/glew:* media-libs/harfbuzz sci-mathematics/cgal:= >=x11-libs/qscintilla-2.9.4:=[qt5(+)] emacs? ( virtual/emacs )
+SLOT=0
+SRC_URI=http://files.openscad.org/openscad-2015.03-2.src.tar.gz
+_eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6c1a62daf2484e81637d7d0868d2cadb
diff --git a/metadata/md5-cache/media-gfx/openscad-9999 b/metadata/md5-cache/media-gfx/openscad-9999
index 8376ca0220aa..cb4097dd1ea6 100644
--- a/metadata/md5-cache/media-gfx/openscad-9999
+++ b/metadata/md5-cache/media-gfx/openscad-9999
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=media-gfx/opencsg sci-mathematics/cgal dev-qt/qtcore:4 dev-qt/qtgui:4[-egl] dev-qt/qtopengl:4[-egl] dev-cpp/eigen:3 dev-libs/glib:2 dev-libs/gmp:0= dev-libs/mpfr:0= dev-libs/boost:= media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/glew:* media-libs/harfbuzz x11-libs/qscintilla:=[qt4(-)] emacs? ( virtual/emacs ) >=dev-vcs/git-1.8.2.1
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=dev-cpp/eigen:3 dev-libs/boost:= dev-libs/glib:2 dev-libs/gmp:0= dev-libs/mpfr:0= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 media-gfx/opencsg media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/glew:* media-libs/harfbuzz sci-mathematics/cgal:= >=x11-libs/qscintilla-2.9.4:=[qt5(+)] emacs? ( virtual/emacs ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=The Programmers Solid 3D CAD Modeller
 EAPI=6
 HOMEPAGE=http://www.openscad.org/
 IUSE=emacs
 LICENSE=GPL-2
-RDEPEND=media-gfx/opencsg sci-mathematics/cgal dev-qt/qtcore:4 dev-qt/qtgui:4[-egl] dev-qt/qtopengl:4[-egl] dev-cpp/eigen:3 dev-libs/glib:2 dev-libs/gmp:0= dev-libs/mpfr:0= dev-libs/boost:= media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/glew:* media-libs/harfbuzz x11-libs/qscintilla:=[qt4(-)] emacs? ( virtual/emacs )
+RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= dev-libs/glib:2 dev-libs/gmp:0= dev-libs/mpfr:0= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 media-gfx/opencsg media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/glew:* media-libs/harfbuzz sci-mathematics/cgal:= >=x11-libs/qscintilla-2.9.4:=[qt5(+)] emacs? ( virtual/emacs )
 SLOT=0
-_eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	git-r3	52a888802d25387c2c74cb845d1219bc	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=ce6c1428ebcde1a3e24d0fb0a4e71853
+_eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	52a888802d25387c2c74cb845d1219bc	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=540bf92ca1cbe18d9dcadcc9dc9adacb
diff --git a/metadata/md5-cache/media-gfx/potrace-1.15 b/metadata/md5-cache/media-gfx/potrace-1.15
index d0cc3a18e313..8927c492159f 100644
--- a/metadata/md5-cache/media-gfx/potrace-1.15
+++ b/metadata/md5-cache/media-gfx/potrace-1.15
@@ -4,10 +4,10 @@ DESCRIPTION=Transforming bitmaps into vector graphics
 EAPI=6
 HOMEPAGE=http://potrace.sourceforge.net/
 IUSE=metric static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=http://potrace.sourceforge.net/download/1.15/potrace-1.15.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=c0509c6c1261928cde9ee57c8b8141a4
+_md5_=f63dfbf91ca9cf753dd40e9dc94b661b
diff --git a/metadata/md5-cache/media-gfx/rawtherapee-5.2 b/metadata/md5-cache/media-gfx/rawtherapee-5.2
index 72587db9aaf8..5cec67574dcb 100644
--- a/metadata/md5-cache/media-gfx/rawtherapee-5.2
+++ b/metadata/md5-cache/media-gfx/rawtherapee-5.2
@@ -4,10 +4,10 @@ DESCRIPTION=A powerful cross-platform raw image processing program
 EAPI=6
 HOMEPAGE=http://www.rawtherapee.com/
 IUSE=openmp
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-3
 RDEPEND=x11-libs/gtk+:3 dev-libs/expat dev-libs/libsigc++:2 media-libs/libcanberra[gtk3] media-libs/tiff:0 media-libs/libpng:0 media-libs/libiptcdata media-libs/lcms:2 sci-libs/fftw:3.0 sys-libs/zlib virtual/jpeg:0
 SLOT=0
 SRC_URI=http://rawtherapee.com/shared/source/rawtherapee-5.2.tar.xz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b891a5a67642482a93f2c6fb185617bb
+_md5_=5eee611eed9f2f1bbe1d13153204eade
diff --git a/metadata/md5-cache/media-gfx/sane-backends-1.0.27 b/metadata/md5-cache/media-gfx/sane-backends-1.0.27
index 50811d868d62..312d490bb89c 100644
--- a/metadata/md5-cache/media-gfx/sane-backends-1.0.27
+++ b/metadata/md5-cache/media-gfx/sane-backends-1.0.27
@@ -4,11 +4,11 @@ DESCRIPTION=Scanner Access Now Easy - Backends
 EAPI=6
 HOMEPAGE=http://www.sane-project.org/
 IUSE=gphoto2 ipv6 snmp systemd threads usb v4l xinetd zeroconf +sane_backends_abaton +sane_backends_agfafocus +sane_backends_apple +sane_backends_artec +sane_backends_artec_eplus48u +sane_backends_as6e +sane_backends_avision +sane_backends_bh +sane_backends_canon +sane_backends_canon630u +sane_backends_canon_dr -sane_backends_canon_pp +sane_backends_cardscan +sane_backends_coolscan +sane_backends_coolscan2 +sane_backends_coolscan3 +sane_backends_dc210 +sane_backends_dc240 +sane_backends_dc25 +sane_backends_dell1600n_net +sane_backends_dmc +sane_backends_epjitsu +sane_backends_epson +sane_backends_epson2 +sane_backends_fujitsu +sane_backends_genesys +sane_backends_gt68xx +sane_backends_hp +sane_backends_hp3500 +sane_backends_hp3900 +sane_backends_hp4200 +sane_backends_hp5400 +sane_backends_hp5590 +sane_backends_hpljm1005 -sane_backends_hpsj5s +sane_backends_hs2p +sane_backends_ibm +sane_backends_kodak +sane_backends_kodakaio +sane_backends_kvs1025 +sane_backends_kvs20xx sane_backends_kvs40xx +sane_backends_leo +sane_backends_lexmark +sane_backends_ma1509 +sane_backends_magicolor +sane_backends_matsushita +sane_backends_microtek +sane_backends_microtek2 +sane_backends_mustek -sane_backends_mustek_pp +sane_backends_mustek_usb sane_backends_mustek_usb2 +sane_backends_nec +sane_backends_net +sane_backends_niash +sane_backends_p5 +sane_backends_pie +sane_backends_pixma +sane_backends_plustek +sane_backends_plustek_pp -sane_backends_pnm +sane_backends_qcam +sane_backends_ricoh +sane_backends_rts8891 +sane_backends_s9036 +sane_backends_sceptre +sane_backends_sharp +sane_backends_sm3600 +sane_backends_sm3840 +sane_backends_snapscan +sane_backends_sp15c +sane_backends_st400 +sane_backends_stv680 +sane_backends_tamarack +sane_backends_teco1 +sane_backends_teco2 +sane_backends_teco3 +sane_backends_test +sane_backends_u12 +sane_backends_umax +sane_backends_umax1220u +sane_backends_umax_pp +sane_backends_xerox_mfp 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
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2 public-domain
 RDEPEND=sane_backends_dc210? ( >=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(-)?] ) sane_backends_dc240? ( >=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(-)?] ) sane_backends_dell1600n_net? ( >=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(-)?] >=media-libs/tiff-3.9.7-r1: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(-)?] ) sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-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(-)?] ) sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-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(-)?] ) sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-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(-)?] ) usb? ( >=virtual/libusb-1-r1: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(-)?] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.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(-)?] >=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(-)?] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinetd? ( sys-apps/xinetd ) snmp? ( net-analyzer/net-snmp ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[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-fs/udev-114
 REQUIRED_USE=sane_backends_mustek_usb2? ( threads ) sane_backends_kvs40xx? ( threads )
 SLOT=0
 SRC_URI=https://alioth.debian.org/frs/download.php/file/4224/sane-backends-1.0.27.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=84f0bf7029b68c70a4c03eea48ba23c0
+_md5_=783a336e63f7d7b8a178c2989065b338
diff --git a/metadata/md5-cache/media-gfx/shotwell-0.27.1 b/metadata/md5-cache/media-gfx/shotwell-0.27.1
new file mode 100644
index 000000000000..ea85ffec81ac
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/shotwell-0.27.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=app-crypt/gcr-3[gtk] >=dev-db/sqlite-3.5.9:3 >=dev-libs/glib-2.40.0:2 >=dev-libs/json-glib-0.7.6 >=dev-libs/libgee-0.8.5:0.8 >=dev-libs/libxml2-2.6.32:2 gnome-base/dconf >=media-libs/gexiv2-0.10.4 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0 media-libs/lcms:2 >=media-libs/libexif-0.6.16:= >=media-libs/libgphoto2-2.5:= >=media-libs/libraw-0.13.2:= media-plugins/gst-plugins-gdkpixbuf:1.0 >=net-libs/libsoup-2.42.0:2.4 net-libs/webkit-gtk:4 virtual/libgudev:=[introspection] >=x11-libs/gtk+-3.14.0:3[X] dev-libs/libgdata || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) dev-util/itstool >=sys-devel/gettext-0.19.7 >=sys-devel/m4-1.4.13 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Open source photo manager for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Shotwell
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=app-crypt/gcr-3[gtk] >=dev-db/sqlite-3.5.9:3 >=dev-libs/glib-2.40.0:2 >=dev-libs/json-glib-0.7.6 >=dev-libs/libgee-0.8.5:0.8 >=dev-libs/libxml2-2.6.32:2 gnome-base/dconf >=media-libs/gexiv2-0.10.4 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0 media-libs/lcms:2 >=media-libs/libexif-0.6.16:= >=media-libs/libgphoto2-2.5:= >=media-libs/libraw-0.13.2:= media-plugins/gst-plugins-gdkpixbuf:1.0 >=net-libs/libsoup-2.42.0:2.4 net-libs/webkit-gtk:4 virtual/libgudev:=[introspection] >=x11-libs/gtk+-3.14.0:3[X] dev-libs/libgdata
+SLOT=0
+SRC_URI=mirror://gnome/sources/shotwell/0.27/shotwell-0.27.1.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vala	103e6885c83965507391cdc5b6fa0e67	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7f97db972ecf3d8b385159dcb262ddad
diff --git a/metadata/md5-cache/media-gfx/slic3r-1.1.7 b/metadata/md5-cache/media-gfx/slic3r-1.1.7
index b430df0ea33e..162f2364e612 100644
--- a/metadata/md5-cache/media-gfx/slic3r-1.1.7
+++ b/metadata/md5-cache/media-gfx/slic3r-1.1.7
@@ -4,10 +4,10 @@ DESCRIPTION=A mesh slicer to generate G-code for fused-filament-fabrication (3D
 EAPI=6
 HOMEPAGE=http://slic3r.org
 IUSE=+gui test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=AGPL-3 CC-BY-3.0
 RDEPEND=!=dev-lang/perl-5.16* >=dev-libs/boost-1.55[threads] dev-perl/Class-XSAccessor dev-perl/Encode-Locale dev-perl/IO-stringy >=dev-perl/Math-PlanePath-53.0.0 >=dev-perl/Moo-1.3.1 dev-perl/XML-SAX-ExpatXS virtual/perl-Carp virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-parent virtual/perl-Scalar-List-Utils virtual/perl-Test-Simple virtual/perl-Thread-Semaphore >=virtual/perl-threads-1.960.0 virtual/perl-Time-HiRes virtual/perl-XSLoader gui? ( dev-perl/Class-Accessor dev-perl/Growl-GNTP dev-perl/libwww-perl dev-perl/Module-Pluggable dev-perl/Net-Bonjour dev-perl/Net-DBus dev-perl/OpenGL >=dev-perl/Wx-0.991.800 dev-perl/Wx-GLCanvas >=media-libs/freeglut-3 virtual/perl-Math-Complex >=virtual/perl-Socket-2.16.0 x11-libs/libXmu ) dev-lang/perl:=
 SLOT=0
 SRC_URI=https://github.com/alexrj/slic3r/archive/1.1.7.tar.gz -> slic3r-1.1.7.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=368b3708b64d3f7d731d5ffced5bd4ca
+_md5_=00e5e9b25eda817e66ca3f4b26c21aff
diff --git a/metadata/md5-cache/media-gfx/sxiv-24 b/metadata/md5-cache/media-gfx/sxiv-24
new file mode 100644
index 000000000000..f79e36273bdf
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/sxiv-24
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEPEND=exif? ( media-libs/libexif ) gif? ( media-libs/giflib:0= ) media-libs/imlib2[X,gif?] x11-libs/libX11 x11-libs/libXft >=sys-apps/sed-4
+DESCRIPTION=Simple (or small or suckless) X Image Viewer
+EAPI=6
+HOMEPAGE=https://github.com/muennich/sxiv/
+IUSE=exif gif savedconfig
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=exif? ( media-libs/libexif ) gif? ( media-libs/giflib:0= ) media-libs/imlib2[X,gif?] x11-libs/libX11 x11-libs/libXft
+SLOT=0
+SRC_URI=https://github.com/muennich/sxiv/archive/v24.tar.gz -> sxiv-24.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a8bec5c1bb444a128042228fbc6c6f9c
diff --git a/metadata/md5-cache/media-gfx/sxiv-9999 b/metadata/md5-cache/media-gfx/sxiv-9999
index adbe863346bc..9660b6a0f449 100644
--- a/metadata/md5-cache/media-gfx/sxiv-9999
+++ b/metadata/md5-cache/media-gfx/sxiv-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=exif? ( media-libs/libexif ) gif? ( media-libs/giflib:0= ) media-libs/imlib2[X,gif?] x11-libs/libX11 x11-libs/libXft
 SLOT=0
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	git-r3	52a888802d25387c2c74cb845d1219bc	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c83d875e7f5b8df8469120c0f0f73e5c
+_md5_=a8bec5c1bb444a128042228fbc6c6f9c
diff --git a/metadata/md5-cache/media-gfx/symboleditor-2.0.0 b/metadata/md5-cache/media-gfx/symboleditor-2.0.0
index 3afb35bc1b5c..fb0e306dcab7 100644
--- a/metadata/md5-cache/media-gfx/symboleditor-2.0.0
+++ b/metadata/md5-cache/media-gfx/symboleditor-2.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !media-gfx/symboleditor:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/symboleditor/2.0.0/src/SymbolEditor-2.0.0.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=096fa8c2f08cd4a870cc12b9e93ba8b5
diff --git a/metadata/md5-cache/media-gfx/valentina-0.4.2-r3 b/metadata/md5-cache/media-gfx/valentina-0.4.2-r3
deleted file mode 100644
index 3a01fdee0e02..000000000000
--- a/metadata/md5-cache/media-gfx/valentina-0.4.2-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=app-text/poppler dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 app-arch/unzip >=sys-apps/sed-4
-DESCRIPTION=Cloth patternmaking software
-EAPI=5
-HOMEPAGE=http://valentinaproject.bitbucket.org/
-IUSE=gnome linguas_cs_CZ linguas_de_DE linguas_en_CA linguas_en_US linguas_es_ES linguas_fi_FI linguas_fr_FR linguas_he_IL linguas_id_ID linguas_it_IT linguas_nl_NL linguas_ro_RO linguas_ru_RU linguas_uk_UA linguas_zh_CN
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-text/poppler dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5
-SLOT=0
-SRC_URI=https://bitbucket.org/dismine/valentina/get/v0.4.2.zip -> valentina-0.4.2.zip
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f30c41944bb05f11821a0aec3dee0e0d
diff --git a/metadata/md5-cache/media-gfx/valentina-0.4.5 b/metadata/md5-cache/media-gfx/valentina-0.4.5
deleted file mode 100644
index dce36e811e0f..000000000000
--- a/metadata/md5-cache/media-gfx/valentina-0.4.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=app-text/poppler dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 app-arch/unzip >=sys-apps/sed-4
-DESCRIPTION=Cloth patternmaking software
-EAPI=5
-HOMEPAGE=http://valentinaproject.bitbucket.org/
-IUSE=gnome linguas_cs_CZ linguas_de_DE linguas_en_CA linguas_en_US linguas_es_ES linguas_fi_FI linguas_fr_FR linguas_he_IL linguas_id_ID linguas_it_IT linguas_nl_NL linguas_ro_RO linguas_ru_RU linguas_uk_UA linguas_zh_CN
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-text/poppler dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5
-SLOT=0
-SRC_URI=https://bitbucket.org/dismine/valentina/get/v0.4.2.zip -> valentina-0.4.5.zip
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f30c41944bb05f11821a0aec3dee0e0d
diff --git a/metadata/md5-cache/media-gfx/valentina-0.5.0 b/metadata/md5-cache/media-gfx/valentina-0.5.0
deleted file mode 100644
index d937ae9f1289..000000000000
--- a/metadata/md5-cache/media-gfx/valentina-0.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=app-text/poppler dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 app-arch/unzip >=sys-apps/sed-4
-DESCRIPTION=Cloth patternmaking software
-EAPI=6
-HOMEPAGE=http://valentinaproject.bitbucket.org/
-IUSE=gnome linguas_cs_CZ linguas_de_DE linguas_en_CA linguas_en_US linguas_es_ES linguas_fi_FI linguas_fr_FR linguas_he_IL linguas_id_ID linguas_it_IT linguas_nl_NL linguas_ro_RO linguas_ru_RU linguas_uk_UA
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-text/poppler dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5
-SLOT=0
-SRC_URI=https://bitbucket.org/dismine/valentina/get/v0.4.2.zip -> valentina-0.5.0.zip
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c47ed21992973d5e38d2cee8da307fed
diff --git a/metadata/md5-cache/media-gfx/valentina-0.5.0-r2 b/metadata/md5-cache/media-gfx/valentina-0.5.0-r2
new file mode 100644
index 000000000000..dff45ae06bd3
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/valentina-0.5.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=app-text/poppler dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 app-arch/unzip >=sys-apps/sed-4
+DESCRIPTION=Cloth patternmaking software
+EAPI=6
+HOMEPAGE=https://valentinaproject.bitbucket.io/
+IUSE=gnome linguas_cs_CZ linguas_de_DE linguas_el_GR linguas_en_CA linguas_en_US linguas_es_ES linguas_fi_FI linguas_fr_FR linguas_he_IL linguas_id_ID linguas_it_IT linguas_nl_NL linguas_pt_BR linguas_ro_RO linguas_ru_RU linguas_uk_UA linguas_zh_CN
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=app-text/poppler dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5
+SLOT=0
+SRC_URI=https://bitbucket.org/dismine/valentina/get/v0.5.0.zip -> valentina-0.5.0.zip https://bitbucket.org/dismine/valentina/commits/d78ca13c4891ccf3542b0704a7d66af0f9b02938/raw -> valentina-4798.patch https://bitbucket.org/dismine/valentina/commits/98e869c4146204ef31822087fa826cfa1cd7e0f4/raw -> valentina-4802.patch
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ad9eb53d4eb3467a3d584ffb8f69a766
diff --git a/metadata/md5-cache/media-gfx/valentina-9999 b/metadata/md5-cache/media-gfx/valentina-9999
index 495d1bbe829e..923a2df94d14 100644
--- a/metadata/md5-cache/media-gfx/valentina-9999
+++ b/metadata/md5-cache/media-gfx/valentina-9999
@@ -2,10 +2,10 @@ DEFINED_PHASES=configure install postinst unpack
 DEPEND=app-text/poppler dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 dev-vcs/mercurial >=sys-apps/sed-4
 DESCRIPTION=Cloth patternmaking software
 EAPI=6
-HOMEPAGE=http://valentinaproject.bitbucket.org/
+HOMEPAGE=https://valentinaproject.bitbucket.io/
 IUSE=gnome linguas_cs_CZ linguas_de_DE linguas_el_GR linguas_en_CA linguas_en_US linguas_es_ES linguas_fi_FI linguas_fr_FR linguas_he_IL linguas_id_ID linguas_it_IT linguas_nl_NL linguas_pt_BR linguas_ro_RO linguas_ru_RU linguas_uk_UA linguas_zh_CN
 LICENSE=GPL-3
 RDEPEND=app-text/poppler dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5
 SLOT=0
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	mercurial	0bdc9ce12272665fa3749c8408b4d389	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9a6c8d7d0b0b8d0640f300265c1853dc
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	mercurial	0bdc9ce12272665fa3749c8408b4d389	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=be9a42102957751efd5370b6b358f83c
diff --git a/metadata/md5-cache/media-libs/avidemux-core-2.6.20 b/metadata/md5-cache/media-libs/avidemux-core-2.6.20
deleted file mode 100644
index e77e69dfa241..000000000000
--- a/metadata/md5-cache/media-libs/avidemux-core-2.6.20
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!<media-video/avidemux-2.6.20:2.6 dev-db/sqlite:3 sdl? ( media-libs/libsdl:0 ) system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] ) xv? ( x11-libs/libXv:0 ) vaapi? ( x11-libs/libva:0 ) vdpau? ( x11-libs/libvdpau:0 ) nvenc? ( media-video/nvidia_video_sdk ) video_cards_fglrx? ( || ( >=x11-drivers/ati-drivers-14.12-r3 x11-libs/xvba-video:0 ) ) virtual/pkgconfig nls? ( sys-devel/gettext ) !system-ffmpeg? ( dev-lang/yasm[nls=] ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Core libraries for a video editor designed for simple cutting, filtering and encoding tasks
-EAPI=6
-HOMEPAGE=http://fixounet.free.fr/avidemux
-IUSE=debug nls nvenc sdl system-ffmpeg vaapi vdpau video_cards_fglrx xv
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-1 GPL-2 MIT PSF-2 public-domain
-RDEPEND=!<media-video/avidemux-2.6.20:2.6 dev-db/sqlite:3 sdl? ( media-libs/libsdl:0 ) system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] ) xv? ( x11-libs/libXv:0 ) vaapi? ( x11-libs/libva:0 ) vdpau? ( x11-libs/libvdpau:0 ) nvenc? ( media-video/nvidia_video_sdk ) video_cards_fglrx? ( || ( >=x11-drivers/ati-drivers-14.12-r3 x11-libs/xvba-video:0 ) ) nls? ( virtual/libintl:0 )
-SLOT=2.6
-SRC_URI=mirror://sourceforge/avidemux/avidemux/2.6.20/avidemux_2.6.20.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=205df2ab97d525cee6775e0de5744a5e
diff --git a/metadata/md5-cache/media-libs/avidemux-core-2.6.8 b/metadata/md5-cache/media-libs/avidemux-core-2.6.8
deleted file mode 100644
index 9177ede4fde9..000000000000
--- a/metadata/md5-cache/media-libs/avidemux-core-2.6.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!<media-video/avidemux-2.6.8:2.6 dev-db/sqlite:3 sdl? ( media-libs/libsdl:0 ) system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] ) xv? ( x11-libs/libXv:0 ) vaapi? ( x11-libs/libva:0 ) vdpau? ( x11-libs/libvdpau:0 ) video_cards_fglrx? ( || ( >=x11-drivers/ati-drivers-14.12-r3 x11-libs/xvba-video:0 ) ) virtual/pkgconfig nls? ( sys-devel/gettext ) !system-ffmpeg? ( dev-lang/yasm[nls=] ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Core libraries for a video editor designed for simple cutting, filtering and encoding tasks
-EAPI=5
-HOMEPAGE=http://fixounet.free.fr/avidemux
-IUSE=debug nls sdl system-ffmpeg vaapi vdpau video_cards_fglrx xv
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-1 GPL-2 MIT PSF-2 public-domain
-RDEPEND=!<media-video/avidemux-2.6.8:2.6 dev-db/sqlite:3 sdl? ( media-libs/libsdl:0 ) system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] ) xv? ( x11-libs/libXv:0 ) vaapi? ( x11-libs/libva:0 ) vdpau? ( x11-libs/libvdpau:0 ) video_cards_fglrx? ( || ( >=x11-drivers/ati-drivers-14.12-r3 x11-libs/xvba-video:0 ) ) nls? ( virtual/libintl:0 )
-SLOT=2.6
-SRC_URI=mirror://sourceforge/avidemux/avidemux/2.6.8/avidemux_2.6.8.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=e30e00dcbb81373758c495d287f38ffe
diff --git a/metadata/md5-cache/media-libs/avidemux-plugins-2.6.8 b/metadata/md5-cache/media-libs/avidemux-plugins-2.6.8
deleted file mode 100644
index 8b1268f3f2cf..000000000000
--- a/metadata/md5-cache/media-libs/avidemux-plugins-2.6.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=~media-libs/avidemux-core-2.6.8:2.6[vdpau?] ~media-video/avidemux-2.6.8:2.6[opengl?,qt4?] >=dev-lang/spidermonkey-1.5-r2:0= dev-libs/libxml2:2 media-libs/libpng:0= virtual/libiconv:0 aac? ( media-libs/faac:0 media-libs/faad2:0 ) aften? ( media-libs/aften:0 ) alsa? ( >=media-libs/alsa-lib-1.0.3b-r2:0 ) amr? ( media-libs/opencore-amr:0 ) dts? ( media-libs/libdca:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) fribidi? ( dev-libs/fribidi:0 ) jack? ( media-sound/jack-audio-connection-kit:0 libsamplerate? ( media-libs/libsamplerate:0 ) ) lame? ( media-sound/lame:0 ) pulseaudio? ( media-sound/pulseaudio:0 ) truetype? ( media-libs/freetype:2 ) twolame? ( media-sound/twolame:0 ) x264? ( media-libs/x264:0= ) xv? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXv:0 ) xvid? ( media-libs/xvid:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0 ) 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] oss? ( virtual/os-headers:0 ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Plugins for the video editor media-video/avidemux
-EAPI=5
-HOMEPAGE=http://fixounet.free.fr/avidemux
-IUSE=aac aften a52 alsa amr debug dts fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx opengl oss pulseaudio qt4 vorbis truetype twolame xv xvid x264 vdpau vpx python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-1 GPL-2 MIT PSF-2 public-domain
-RDEPEND=~media-libs/avidemux-core-2.6.8:2.6[vdpau?] ~media-video/avidemux-2.6.8:2.6[opengl?,qt4?] >=dev-lang/spidermonkey-1.5-r2:0= dev-libs/libxml2:2 media-libs/libpng:0= virtual/libiconv:0 aac? ( media-libs/faac:0 media-libs/faad2:0 ) aften? ( media-libs/aften:0 ) alsa? ( >=media-libs/alsa-lib-1.0.3b-r2:0 ) amr? ( media-libs/opencore-amr:0 ) dts? ( media-libs/libdca:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) fribidi? ( dev-libs/fribidi:0 ) jack? ( media-sound/jack-audio-connection-kit:0 libsamplerate? ( media-libs/libsamplerate:0 ) ) lame? ( media-sound/lame:0 ) pulseaudio? ( media-sound/pulseaudio:0 ) truetype? ( media-libs/freetype:2 ) twolame? ( media-sound/twolame:0 ) x264? ( media-libs/x264:0= ) xv? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXv:0 ) xvid? ( media-libs/xvid:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0 ) 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=2.6
-SRC_URI=mirror://sourceforge/avidemux/avidemux/2.6.8/avidemux_2.6.8.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d56805a4f18d73d32bf2f7aeda49f291
diff --git a/metadata/md5-cache/media-libs/faac-1.29.8.3 b/metadata/md5-cache/media-libs/faac-1.29.8.3
new file mode 100644
index 000000000000..71c4d3a77519
--- /dev/null
+++ b/metadata/md5-cache/media-libs/faac-1.29.8.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=app-portage/elt-patches-20170317
+DESCRIPTION=Free MPEG-4 audio codecs by AudioCoding.com
+EAPI=6
+HOMEPAGE=http://www.audiocoding.com
+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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=LGPL-2.1 MPEG-4
+SLOT=0
+SRC_URI=mirror://sourceforge/faac/faac-1.29.8.3.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=0068434daa8590d72df618211b4078a4
diff --git a/metadata/md5-cache/media-libs/gst-plugins-bad-1.10.5 b/metadata/md5-cache/media-libs/gst-plugins-bad-1.10.5
index d9b176054a62..748d8c20e1a3 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-bad-1.10.5
+++ b/metadata/md5-cache/media-libs/gst-plugins-bad-1.10.5
@@ -4,7 +4,7 @@ DESCRIPTION=Less plugins for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=X bzip2 egl gles2 gtk +introspection opengl +orc vcd vnc wayland 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 nls test
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.40.0: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(-)?] >=media-libs/gstreamer-1.10.5:1.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(-)?,introspection?] >=media-libs/gst-plugins-base-1.10.5:1.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(-)?,introspection?] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) 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(-)?] ) egl? ( >=media-libs/mesa-9.1.6[egl,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(-)?] ) gles2? ( >=media-libs/mesa-9.1.6[gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.1.6[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/glu[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(-)?] ) X? ( x11-libs/libX11[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.4.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(-)?] ) gtk? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,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(-)?] ) orc? ( >=dev-lang/orc-0.4.17[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/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?]
 REQUIRED_USE=gles2? ( !opengl ) opengl? ( X ) wayland? ( egl )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b3cc6cc1957bcd9fcb2e8da6b1885dbf
+_md5_=c54bb889c0679f2568c0384a9616f688
diff --git a/metadata/md5-cache/media-libs/gst-plugins-bad-1.12.3 b/metadata/md5-cache/media-libs/gst-plugins-bad-1.12.3
index a2aab582925e..30412fec7f74 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-bad-1.12.3
+++ b/metadata/md5-cache/media-libs/gst-plugins-bad-1.12.3
@@ -3,13 +3,13 @@ DEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 DESCRIPTION=Less plugins for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
-IUSE=X bzip2 egl gles2 gtk +introspection opengl +orc vcd vnc wayland 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 nls test
+IUSE=X bzip2 +egl gles2 gtk +introspection +opengl +orc vcd vnc wayland 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 nls test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.40.0: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(-)?] >=media-libs/gstreamer-1.12.3:1.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(-)?,introspection?] >=media-libs/gst-plugins-base-1.12.3:1.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(-)?,introspection?] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) 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(-)?] ) egl? ( >=media-libs/mesa-9.1.6[egl,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(-)?] ) gles2? ( >=media-libs/mesa-9.1.6[gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.1.6[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/glu[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(-)?] ) X? ( x11-libs/libX11[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.4.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(-)?] >=x11-libs/libdrm-2.4.55[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.4 ) gtk? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,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(-)?] ) orc? ( >=dev-lang/orc-0.4.17[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/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?]
-REQUIRED_USE=gles2? ( !opengl ) opengl? ( X ) wayland? ( egl )
+REQUIRED_USE=gles2? ( !opengl ) opengl? ( X ) wayland? ( egl ) egl? ( || ( opengl gles2 ) )
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.3.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=03ca8cda3e830cf143e4be16b56cb14a
+_md5_=bf5399aa87fe1a5ef0830c1e9ceac682
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-1.10.5 b/metadata/md5-cache/media-libs/gst-plugins-base-1.10.5
index 401181f74d3e..b926f6a20cc8 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-base-1.10.5
+++ b/metadata/md5-cache/media-libs/gst-plugins-base-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=Basepack of plugins for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=alsa +introspection ivorbis +ogg +orc +pango theora +vorbis X 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 nls
-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 ~x64-solaris ~x86-solaris
+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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.40.0: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(-)?] >=media-libs/gstreamer-1.10.5:1.0[introspection?,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-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(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) ivorbis? ( >=media-libs/tremor-0_pre20130223[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(-)?] ) ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.24[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(-)?] ) pango? ( >=x11-libs/pango-1.36.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(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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/libXv-1.0.10[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/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?]
 REQUIRED_USE=ivorbis? ( ogg ) theora? ( ogg ) vorbis? ( ogg )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d72c7ad6a73f86354358a1a24be09d33
+_md5_=e70b75d17c17224a525284bd3d80b53b
diff --git a/metadata/md5-cache/media-libs/gst-plugins-good-1.10.5 b/metadata/md5-cache/media-libs/gst-plugins-good-1.10.5
index d7e5ce0576b9..e2d85994966e 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-good-1.10.5
+++ b/metadata/md5-cache/media-libs/gst-plugins-good-1.10.5
@@ -4,10 +4,10 @@ DESCRIPTION=Basepack of plugins for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=+orc 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 nls
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.40.0: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(-)?] >=media-libs/gst-plugins-base-1.10.5:1.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(-)?] >=media-libs/gstreamer-1.10.5:1.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(-)?] >=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(-)?] >=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(-)?] orc? ( >=dev-lang/orc-0.4.17[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/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?]
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f94924c46adb86ee877336eda3bcbfa0
+_md5_=9a37c0748f9aafeac10cf5ce2ac8a99c
diff --git a/metadata/md5-cache/media-libs/gst-plugins-ugly-1.10.5 b/metadata/md5-cache/media-libs/gst-plugins-ugly-1.10.5
index 0a55147d0e52..13f1a5c37179 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-ugly-1.10.5
+++ b/metadata/md5-cache/media-libs/gst-plugins-ugly-1.10.5
@@ -4,10 +4,10 @@ DESCRIPTION=Basepack of plugins for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=+orc 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 nls
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.40.0: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(-)?] >=media-libs/gstreamer-1.10.5:1.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(-)?] >=media-libs/gst-plugins-base-1.10.5:1.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(-)?] orc? ( >=dev-lang/orc-0.4.17[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/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?]
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c0087a7bb8bfc09ff061fa90128c72e8
+_md5_=1e5a10a980afc77de0190af3f974c8cf
diff --git a/metadata/md5-cache/media-libs/gstreamer-1.10.5 b/metadata/md5-cache/media-libs/gstreamer-1.10.5
index 5e4bf30efa73..098d403b32b5 100644
--- a/metadata/md5-cache/media-libs/gstreamer-1.10.5
+++ b/metadata/md5-cache/media-libs/gstreamer-1.10.5
@@ -4,10 +4,10 @@ DESCRIPTION=Open source multimedia framework
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=+caps +introspection nls +orc test unwind 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 ~x64-solaris ~x86-solaris
+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 ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40.0: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(-)?] caps? ( sys-libs/libcap[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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) unwind? ( >=sys-libs/libunwind-1.2_rc1[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=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.10.5.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=352758d3f26f04e33234b9736628691c
+_md5_=31c30ecf1c6b58517b9d36d257c76001
diff --git a/metadata/md5-cache/media-libs/harfbuzz-1.4.6-r2 b/metadata/md5-cache/media-libs/harfbuzz-1.4.6-r2
index 1e9179e65986..d14bcb1620ed 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-1.4.6-r2
+++ b/metadata/md5-cache/media-libs/harfbuzz-1.4.6-r2
@@ -4,11 +4,11 @@ DESCRIPTION=An OpenType text shaping engine
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
 IUSE=+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype 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 ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=Old-MIT ISC icu
 RDEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.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(-)?] ) glib? ( >=dev-libs/glib-2.38: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(-)?] ) graphite? ( >=media-gfx/graphite2-1.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(-)?] ) icu? ( >=dev-libs/icu-51.2-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=introspection? ( glib )
 SLOT=0/0.9.18
 SRC_URI=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.4.6.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=61b1f69fc2735344bbc5e22eab66e35c
+_md5_=1d27261b6cb9758ea584633593ed0cc3
diff --git a/metadata/md5-cache/media-libs/harfbuzz-1.6.2 b/metadata/md5-cache/media-libs/harfbuzz-1.6.2
new file mode 100644
index 000000000000..51622f513a59
--- /dev/null
+++ b/metadata/md5-cache/media-libs/harfbuzz-1.6.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.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(-)?] ) glib? ( >=dev-libs/glib-2.38: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(-)?] ) graphite? ( >=media-gfx/graphite2-1.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(-)?] ) icu? ( >=dev-libs/icu-51.2-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-util/gtk-doc-am virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170422
+DESCRIPTION=An OpenType text shaping engine
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
+IUSE=+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype 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 ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
+LICENSE=Old-MIT ISC icu
+RDEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.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(-)?] ) glib? ( >=dev-libs/glib-2.38: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(-)?] ) graphite? ( >=media-gfx/graphite2-1.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(-)?] ) icu? ( >=dev-libs/icu-51.2-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=introspection? ( glib )
+SLOT=0/0.9.18
+SRC_URI=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.6.2.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5cc780beff71e41ce61a0069dffea159
diff --git a/metadata/md5-cache/media-libs/herqq-1.0.0-r2 b/metadata/md5-cache/media-libs/herqq-1.0.0-r2
deleted file mode 100644
index d5024d373332..000000000000
--- a/metadata/md5-cache/media-libs/herqq-1.0.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-qt/qtcore:4 !media-libs/hupnp-ng app-arch/unzip
-DESCRIPTION=A software library for building UPnP devices
-EAPI=5
-HOMEPAGE=http://www.herqq.org
-IUSE=doc
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:4 !media-libs/hupnp-ng
-SLOT=0
-SRC_URI=mirror://sourceforge/hupnp/herqq-1.0.0.zip
-_eclasses_=base	df2aa567b3f0595aae0d0923889f7631	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=59dc65dcf6a1c680632e6cb03bb0d1a5
diff --git a/metadata/md5-cache/media-libs/libepoxy-9999 b/metadata/md5-cache/media-libs/libepoxy-9999
index 67aa0116a13b..473ac1cc2175 100644
--- a/metadata/md5-cache/media-libs/libepoxy-9999
+++ b/metadata/md5-cache/media-libs/libepoxy-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/anholt/libepoxy
 IUSE=test +X 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
 LICENSE=MIT
 SLOT=0
-_eclasses_=git-r3	52a888802d25387c2c74cb845d1219bc	meson	958769e8b8b5a79afc3f22f3915cebbc	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
+_eclasses_=git-r3	52a888802d25387c2c74cb845d1219bc	meson	38757afcd8d9f0d1d44ba4cefc33b99d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
 _md5_=29a1fdcd637d45287a014519056f55c6
diff --git a/metadata/md5-cache/media-libs/libfpx-1.3.1_p10 b/metadata/md5-cache/media-libs/libfpx-1.3.1_p10
index 5d6466a9a54c..3d0df25206ce 100644
--- a/metadata/md5-cache/media-libs/libfpx-1.3.1_p10
+++ b/metadata/md5-cache/media-libs/libfpx-1.3.1_p10
@@ -4,9 +4,9 @@ DESCRIPTION=A library for manipulating FlashPIX images
 EAPI=6
 HOMEPAGE=http://www.i3a.org/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=Flashpix
 SLOT=0/1
 SRC_URI=mirror://imagemagick/delegates/libfpx-1.3.1-10.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=bf2a22dad0b704b1d82726fc2e7028c5
+_md5_=573b8bb335526da030fdb073ff35f662
diff --git a/metadata/md5-cache/media-libs/libkate-0.4.1-r2 b/metadata/md5-cache/media-libs/libkate-0.4.1-r2
index 43813916688c..7aad917b8ceb 100644
--- a/metadata/md5-cache/media-libs/libkate-0.4.1-r2
+++ b/metadata/md5-cache/media-libs/libkate-0.4.1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Codec for karaoke and text encapsulation for Ogg
 EAPI=6
 HOMEPAGE=https://code.google.com/p/libkate/
 IUSE=debug doc wxwidgets python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 RDEPEND=media-libs/libogg:= media-libs/libpng:0= wxwidgets? ( 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] media-libs/liboggz )
 REQUIRED_USE=wxwidgets? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://libkate.googlecode.com/files/libkate-0.4.1.tar.gz
 _eclasses_=ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=833f52351e59d38bdd736cf77bccca77
+_md5_=247f10a3788df3fa223d3f2b92edf7ea
diff --git a/metadata/md5-cache/media-libs/libmpdclient-2.13 b/metadata/md5-cache/media-libs/libmpdclient-2.13
index e369e7bb9962..31afc63b6a42 100644
--- a/metadata/md5-cache/media-libs/libmpdclient-2.13
+++ b/metadata/md5-cache/media-libs/libmpdclient-2.13
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.13.tar.xz
-_eclasses_=meson	958769e8b8b5a79afc3f22f3915cebbc	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
+_eclasses_=meson	38757afcd8d9f0d1d44ba4cefc33b99d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
 _md5_=1220fbbae41d7f7f33b557de988e3601
diff --git a/metadata/md5-cache/media-libs/libprojectm-2.1.0-r2 b/metadata/md5-cache/media-libs/libprojectm-2.1.0-r2
index 83e55ab04006..ee2d9b42bd8b 100644
--- a/metadata/md5-cache/media-libs/libprojectm-2.1.0-r2
+++ b/metadata/md5-cache/media-libs/libprojectm-2.1.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A graphical music visualization plugin similar to milkdrop
 EAPI=6
 HOMEPAGE=http://projectm.sourceforge.net
 IUSE=debug openmp video_cards_nvidia
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2
 RDEPEND=media-fonts/dejavu >=media-libs/ftgl-2.1.3_rc5 media-libs/freetype:2 media-libs/mesa media-libs/glew:= sys-libs/zlib video_cards_nvidia? ( media-gfx/nvidia-cg-toolkit )
 SLOT=0
 SRC_URI=mirror://sourceforge/projectm/projectM-complete-2.1.0-Source.tar.gz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=79ecc96b6dd6f86808a31826e264520f
+_md5_=7646794a265a8acb593721b0628dd507
diff --git a/metadata/md5-cache/media-libs/libqaccessibilityclient-0.2.0 b/metadata/md5-cache/media-libs/libqaccessibilityclient-0.2.0
index 370171b57ffd..e346fb618045 100644
--- a/metadata/md5-cache/media-libs/libqaccessibilityclient-0.2.0
+++ b/metadata/md5-cache/media-libs/libqaccessibilityclient-0.2.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/unstable/libqaccessibilityclient/libqaccessibilityclient-0.2.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=193f52222804db547b7bc04fca4296dc
diff --git a/metadata/md5-cache/media-libs/libsdl2-2.0.7 b/metadata/md5-cache/media-libs/libsdl2-2.0.7
new file mode 100644
index 000000000000..f7e81be75428
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libsdl2-2.0.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( >=sys-apps/dbus-1.6.18-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(-)?] ) fusionsound? ( || ( >=media-libs/FusionSound-1.1.1 >=dev-libs/DirectFB-1.7.1[fusionsound] ) ) gles? ( >=media-libs/mesa-9.1.6[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(-)?,gles2] ) nas? ( >=media-libs/nas-1.9.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/glu-9.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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tslib? ( >=x11-libs/tslib-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(-)?] ) udev? ( >=virtual/libudev-208:=[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.0.6[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/mesa-9.1.6[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(-)?,egl,gles2,wayland] >=x11-libs/libxkbcommon-0.2.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(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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/libXi-1.7.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/libXrandr-1.4.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/libXt-1.1.4[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(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-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(-)?] ) ) X? ( >=x11-proto/xextproto-7.2.1-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-proto/xproto-7.0.24[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/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Simple Direct Media Layer
+EAPI=6
+HOMEPAGE=http://www.libsdl.org
+IUSE=cpu_flags_x86_3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver 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 ~ppc ~ppc64 ~x86
+LICENSE=ZLIB
+RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( >=sys-apps/dbus-1.6.18-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(-)?] ) fusionsound? ( || ( >=media-libs/FusionSound-1.1.1 >=dev-libs/DirectFB-1.7.1[fusionsound] ) ) gles? ( >=media-libs/mesa-9.1.6[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(-)?,gles2] ) nas? ( >=media-libs/nas-1.9.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/glu-9.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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tslib? ( >=x11-libs/tslib-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(-)?] ) udev? ( >=virtual/libudev-208:=[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.0.6[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/mesa-9.1.6[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(-)?,egl,gles2,wayland] >=x11-libs/libxkbcommon-0.2.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(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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/libXi-1.7.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/libXrandr-1.4.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/libXt-1.1.4[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(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-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=alsa? ( sound ) fusionsound? ( sound ) gles? ( video ) nas? ( sound ) opengl? ( video ) pulseaudio? ( sound ) wayland? ( gles ) xinerama? ( X ) xscreensaver? ( X )
+SLOT=0
+SRC_URI=http://www.libsdl.org/release/SDL2-2.0.7.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=240c8b3bfd945543d5f7c04e19f7ec35
diff --git a/metadata/md5-cache/media-libs/libsidplay-1.36.59-r2 b/metadata/md5-cache/media-libs/libsidplay-1.36.59-r2
index cbe193d36b72..0a28b09fc287 100644
--- a/metadata/md5-cache/media-libs/libsidplay-1.36.59-r2
+++ b/metadata/md5-cache/media-libs/libsidplay-1.36.59-r2
@@ -4,9 +4,9 @@ DESCRIPTION=C64 SID player library
 EAPI=6
 HOMEPAGE=http://critical.ch/distfiles/
 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 ~hppa ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=1
 SRC_URI=http://critical.ch/distfiles/libsidplay-1.36.59.tgz
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=f1c0b87f4b446c1cc4b9815facfcd715
+_md5_=2b9ceff95081b5763239e0041959eda5
diff --git a/metadata/md5-cache/media-libs/mesa-17.1.8 b/metadata/md5-cache/media-libs/mesa-17.1.8
index c194e28dab57..027e1e9260c4 100644
--- a/metadata/md5-cache/media-libs/mesa-17.1.8
+++ b/metadata/md5-cache/media-libs/mesa-17.1.8
@@ -4,7 +4,7 @@ DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=6
 HOMEPAGE=https://www.mesa3d.org/
 IUSE=video_cards_i915 video_cards_i965 video_cards_intel video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_imx video_cards_nouveau video_cards_vc4 video_cards_vivante video_cards_vmware bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind vdpau vulkan wayland xvmc xa 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 ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.3.0 >=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.9.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/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(-)?] 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(-)?] vulkan? ( >=sys-devel/llvm-3.9.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(-)?] ) >=sys-devel/llvm-3.6.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(-)?] ) opencl? ( app-eselect/eselect-opencl 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(-)?] ) openmax? ( >=media-libs/libomxil-bellagio-0.9.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(-)?] ) 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(-)?] ) wayland? ( >=dev-libs/wayland-1.11.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(-)?] ) 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(-)?] ) >=x11-libs/libdrm-2.4.77[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_i915? ( >=x11-libs/libdrm-2.4.77[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.77[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.77[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.77[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.77[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.77[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.77[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.77[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.77[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.77[video_cards_amdgpu] )
 REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) openmax? ( gallium ) gles1? ( egl ) gles2? ( egl ) vaapi? ( gallium ) vdpau? ( gallium ) vulkan? ( || ( video_cards_i965 video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) wayland? ( egl gbm ) xa? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_imx? ( gallium ) 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_vivante? ( gallium gbm ) video_cards_vmware? ( gallium )
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-17.1.8.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	llvm	fe231a791db197943447fdeadafa7e08	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=38206e54361e11d1bb65907daf775da7
+_md5_=78e121414979026a30fb9bcd91e1cf7f
diff --git a/metadata/md5-cache/media-libs/mesa-9999 b/metadata/md5-cache/media-libs/mesa-9999
index aac13b9ecd44..a5ba45c49026 100644
--- a/metadata/md5-cache/media-libs/mesa-9999
+++ b/metadata/md5-cache/media-libs/mesa-9999
@@ -6,8 +6,8 @@ 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 bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind vdpau vulkan wayland xvmc xa 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
 LICENSE=MIT
 RDEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.3.0 >=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.9.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/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(-)?] 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(-)?] ) ) opencl? ( app-eselect/eselect-opencl 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(-)?] ) openmax? ( >=media-libs/libomxil-bellagio-0.9.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(-)?] ) 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(-)?] ) wayland? ( >=dev-libs/wayland-1.11.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 ) 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(-)?] ) >=x11-libs/libdrm-2.4.85[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.85[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.85[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.85[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.85[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.85[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.85[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.85[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.85[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.85[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:6[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:5[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:4[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-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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:6[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:5[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:4[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-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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:6[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:5[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:4[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-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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:6[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:5[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:4[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-3.9.0: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(-)?] ) sys-devel/clang:=[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:6[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:5[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:4[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-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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:6[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:5[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:4[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-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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:6[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:5[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:4[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-3.9.0: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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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:6[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:5[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:4[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-3.9.0: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(-)?] ) sys-devel/llvm:=[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 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) openmax? ( gallium ) gles1? ( egl ) gles2? ( egl ) vaapi? ( gallium ) vdpau? ( gallium ) vulkan? ( || ( video_cards_i965 video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) wayland? ( egl gbm ) xa? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_imx? ( gallium ) 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 )
+REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) openmax? ( gallium ) gles1? ( egl ) gles2? ( egl ) vaapi? ( gallium ) vdpau? ( gallium ) vulkan? ( || ( video_cards_i965 video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) wayland? ( egl gbm ) xa? ( gallium ) 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=!bindist? ( bindist )
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	git-r3	52a888802d25387c2c74cb845d1219bc	libtool	0081a71a261724730ec4c248494f044d	llvm	fe231a791db197943447fdeadafa7e08	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=bd9dfe9de1ab250b70d40c922d8b60ef
+_md5_=83d690a8c963fe0c52fe0479feb792ce
diff --git a/metadata/md5-cache/media-libs/mlt-6.4.1-r3 b/metadata/md5-cache/media-libs/mlt-6.4.1-r3
index d24278a29db2..ad49e8b91386 100644
--- a/metadata/md5-cache/media-libs/mlt-6.4.1-r3
+++ b/metadata/md5-cache/media-libs/mlt-6.4.1-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=>=media-libs/libebur128-1.2.2 ffmpeg? ( libav? ( media-video/libav:0=[vdpau?] ) !libav? ( media-video/ffmpeg:0=[vdpau?] ) ) xml? ( >=dev-libs/libxml2-2.5 ) sdl? ( >=media-libs/libsdl-1.2.10[X,opengl,video] >=media-libs/sdl-image-1.2.4 ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.3 media-libs/ladspa-sdk >=dev-libs/libxml2-2.5 ) fftw? ( sci-libs/fftw:3.0= ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( x11-libs/gtk+:2 media-libs/libexif x11-libs/pango ) opencv? ( >=media-libs/opencv-3.1.0:= ) opengl? ( media-video/movit ) rtaudio? ( media-libs/rtaudio kernel_linux? ( media-libs/alsa-lib ) ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/libexif x11-libs/libX11 opengl? ( dev-qt/qtopengl:5 ) ) lua? ( >=dev-lang/lua-5.1.4-r4:= ) 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.2 ) virtual/rubygems ) virtual/pkgconfig compressed-lumas? ( virtual/imagemagick-tools[png] ) lua? ( >=dev-lang/swig-2.0 virtual/pkgconfig ) python? ( >=dev-lang/swig-2.0 ) ruby? ( >=dev-lang/swig-2.0 )
+DEPEND=>=media-libs/libebur128-1.2.2 ffmpeg? ( libav? ( media-video/libav:0=[vdpau?] ) !libav? ( media-video/ffmpeg:0=[vdpau?] ) ) fftw? ( sci-libs/fftw:3.0= ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( media-libs/libexif x11-libs/gtk+:2 x11-libs/pango ) jack? ( >=dev-libs/libxml2-2.5 media-libs/ladspa-sdk >=media-sound/jack-audio-connection-kit-0.121.3 ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) lua? ( >=dev-lang/lua-5.1.4-r4:= ) opencv? ( >=media-libs/opencv-3.1.0:= ) opengl? ( media-video/movit ) 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/libexif x11-libs/libX11 opengl? ( dev-qt/qtopengl:5 ) ) rtaudio? ( media-libs/rtaudio kernel_linux? ( media-libs/alsa-lib ) ) ruby? ( || ( dev-lang/ruby:2.2 ) virtual/rubygems ) sdl? ( >=media-libs/libsdl-1.2.10[X,opengl,video] >=media-libs/sdl-image-1.2.4 ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 ) virtual/pkgconfig compressed-lumas? ( virtual/imagemagick-tools[png] ) lua? ( >=dev-lang/swig-2.0 virtual/pkgconfig ) python? ( >=dev-lang/swig-2.0 ) ruby? ( >=dev-lang/swig-2.0 )
 DESCRIPTION=Open source multimedia framework for television broadcasting
 EAPI=6
 HOMEPAGE=https://www.mltframework.org/
-IUSE=compressed-lumas debug ffmpeg fftw frei0r gtk jack kdenlive libav libsamplerate melt opencv opengl cpu_flags_x86_mmx qt5 rtaudio sdl cpu_flags_x86_sse cpu_flags_x86_sse2 xine xml lua python ruby vdpau kernel_linux python_targets_python2_7
+IUSE=compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r gtk jack kdenlive libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau xine xml kernel_linux python_targets_python2_7
 KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-3
-RDEPEND=>=media-libs/libebur128-1.2.2 ffmpeg? ( libav? ( media-video/libav:0=[vdpau?] ) !libav? ( media-video/ffmpeg:0=[vdpau?] ) ) xml? ( >=dev-libs/libxml2-2.5 ) sdl? ( >=media-libs/libsdl-1.2.10[X,opengl,video] >=media-libs/sdl-image-1.2.4 ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.3 media-libs/ladspa-sdk >=dev-libs/libxml2-2.5 ) fftw? ( sci-libs/fftw:3.0= ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( x11-libs/gtk+:2 media-libs/libexif x11-libs/pango ) opencv? ( >=media-libs/opencv-3.1.0:= ) opengl? ( media-video/movit ) rtaudio? ( media-libs/rtaudio kernel_linux? ( media-libs/alsa-lib ) ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/libexif x11-libs/libX11 opengl? ( dev-qt/qtopengl:5 ) ) lua? ( >=dev-lang/lua-5.1.4-r4:= ) 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.2 ) virtual/rubygems ) !media-libs/mlt++
+RDEPEND=>=media-libs/libebur128-1.2.2 ffmpeg? ( libav? ( media-video/libav:0=[vdpau?] ) !libav? ( media-video/ffmpeg:0=[vdpau?] ) ) fftw? ( sci-libs/fftw:3.0= ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( media-libs/libexif x11-libs/gtk+:2 x11-libs/pango ) jack? ( >=dev-libs/libxml2-2.5 media-libs/ladspa-sdk >=media-sound/jack-audio-connection-kit-0.121.3 ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) lua? ( >=dev-lang/lua-5.1.4-r4:= ) opencv? ( >=media-libs/opencv-3.1.0:= ) opengl? ( media-video/movit ) 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/libexif x11-libs/libX11 opengl? ( dev-qt/qtopengl:5 ) ) rtaudio? ( media-libs/rtaudio kernel_linux? ( media-libs/alsa-lib ) ) ruby? ( || ( dev-lang/ruby:2.2 ) virtual/rubygems ) sdl? ( >=media-libs/libsdl-1.2.10[X,opengl,video] >=media-libs/sdl-image-1.2.4 ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 ) !media-libs/mlt++
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/mltframework/mlt/archive/v6.4.1.tar.gz -> mlt-6.4.1.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=930b6b421ff3b92fb6117a0c8cfd52cd
+_md5_=2c61f2fc1bd710d1466e36bff1b0e9be
diff --git a/metadata/md5-cache/media-libs/mlt-6.4.1-r4 b/metadata/md5-cache/media-libs/mlt-6.4.1-r4
new file mode 100644
index 000000000000..7ced8d072274
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mlt-6.4.1-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=>=media-libs/libebur128-1.2.2 ffmpeg? ( libav? ( media-video/libav:0=[vdpau?] ) !libav? ( media-video/ffmpeg:0=[vdpau?] ) ) fftw? ( sci-libs/fftw:3.0= ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( media-libs/libexif x11-libs/gtk+:2 x11-libs/pango ) jack? ( >=dev-libs/libxml2-2.5 media-libs/ladspa-sdk >=media-sound/jack-audio-connection-kit-0.121.3 ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) lua? ( >=dev-lang/lua-5.1.4-r4:= ) opencv? ( >=media-libs/opencv-3.1.0:= ) opengl? ( media-video/movit ) 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/libexif x11-libs/libX11 opengl? ( dev-qt/qtopengl:5 ) ) rtaudio? ( media-libs/rtaudio kernel_linux? ( media-libs/alsa-lib ) ) ruby? ( || ( dev-lang/ruby:2.2 ) virtual/rubygems ) sdl? ( >=media-libs/libsdl-1.2.10[X,opengl,video] >=media-libs/sdl-image-1.2.4 ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 ) virtual/pkgconfig compressed-lumas? ( virtual/imagemagick-tools[png] ) lua? ( >=dev-lang/swig-2.0 virtual/pkgconfig ) python? ( >=dev-lang/swig-2.0 ) ruby? ( >=dev-lang/swig-2.0 )
+DESCRIPTION=Open source multimedia framework for television broadcasting
+EAPI=6
+HOMEPAGE=https://www.mltframework.org/
+IUSE=compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r gtk jack kdenlive libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau xine xml kernel_linux python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=>=media-libs/libebur128-1.2.2 ffmpeg? ( libav? ( media-video/libav:0=[vdpau?] ) !libav? ( media-video/ffmpeg:0=[vdpau?] ) ) fftw? ( sci-libs/fftw:3.0= ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( media-libs/libexif x11-libs/gtk+:2 x11-libs/pango ) jack? ( >=dev-libs/libxml2-2.5 media-libs/ladspa-sdk >=media-sound/jack-audio-connection-kit-0.121.3 ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) lua? ( >=dev-lang/lua-5.1.4-r4:= ) opencv? ( >=media-libs/opencv-3.1.0:= ) opengl? ( media-video/movit ) 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/libexif x11-libs/libX11 opengl? ( dev-qt/qtopengl:5 ) ) rtaudio? ( media-libs/rtaudio kernel_linux? ( media-libs/alsa-lib ) ) ruby? ( || ( dev-lang/ruby:2.2 ) virtual/rubygems ) sdl? ( >=media-libs/libsdl-1.2.10[X,opengl,video] >=media-libs/sdl-image-1.2.4 ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 ) !media-libs/mlt++
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/mltframework/mlt/archive/v6.4.1.tar.gz -> mlt-6.4.1.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=f6ab5f3cc5dd166278f0fc5608ccf856
diff --git a/metadata/md5-cache/media-libs/openjpeg-2.3.0 b/metadata/md5-cache/media-libs/openjpeg-2.3.0
index f6dc0c044b6d..eb9bf034a451 100644
--- a/metadata/md5-cache/media-libs/openjpeg-2.3.0
+++ b/metadata/md5-cache/media-libs/openjpeg-2.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=An open-source JPEG 2000 library
 EAPI=6
 HOMEPAGE=http://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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=30c44c59e9efb870b54d1a683d5c9ddc
+_md5_=de53b42b3060a1f0095c710d2be9f66c
diff --git a/metadata/md5-cache/media-libs/sdl2-image-2.0.2 b/metadata/md5-cache/media-libs/sdl2-image-2.0.2
new file mode 100644
index 000000000000..a1fdab6ac06c
--- /dev/null
+++ b/metadata/md5-cache/media-libs/sdl2-image-2.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libsdl2-2.0.1-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-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(-)?] png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] ) tiff? ( >=media-libs/tiff-3.9.7-r1: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(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Image file loading library
+EAPI=6
+HOMEPAGE=http://www.libsdl.org/projects/SDL_image/
+IUSE=gif jpeg png static-libs tiff webp 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=~amd64 ~x86
+LICENSE=ZLIB
+RDEPEND=>=media-libs/libsdl2-2.0.1-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-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(-)?] png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] ) tiff? ( >=media-libs/tiff-3.9.7-r1: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(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=http://www.libsdl.org/projects/SDL_image/release/SDL2_image-2.0.2.tar.gz
+_eclasses_=ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=cd6e2eaec5741366a428d52476e0e5ae
diff --git a/metadata/md5-cache/media-libs/sdl2-mixer-2.0.2 b/metadata/md5-cache/media-libs/sdl2-mixer-2.0.2
new file mode 100644
index 000000000000..31e762b0968c
--- /dev/null
+++ b/metadata/md5-cache/media-libs/sdl2-mixer-2.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst test
+DEPEND=>=media-libs/libsdl2-2.0.1-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(-)?] flac? ( >=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) midi? ( fluidsynth? ( >=media-sound/fluidsynth-1.1.6-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(-)?] ) timidity? ( media-sound/timidity++ ) ) mp3? ( mad? ( >=media-libs/libmad-0.15.1b-r8[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(-)?] ) smpeg? ( >=media-libs/smpeg2-2.0.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(-)?] ) ) mod? ( modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mikmod? ( >=media-libs/libmikmod-3.3.6-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(-)?] ) ) vorbis? ( tremor? ( >=media-libs/tremor-0_pre20130223[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(-)?] ) !tremor? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+DESCRIPTION=Simple Direct Media Layer Mixer Library
+EAPI=6
+HOMEPAGE=http://www.libsdl.org/projects/SDL_mixer/
+IUSE=flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity tremor vorbis +wav 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=~amd64 ~x86
+LICENSE=ZLIB
+RDEPEND=>=media-libs/libsdl2-2.0.1-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(-)?] flac? ( >=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) midi? ( fluidsynth? ( >=media-sound/fluidsynth-1.1.6-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(-)?] ) timidity? ( media-sound/timidity++ ) ) mp3? ( mad? ( >=media-libs/libmad-0.15.1b-r8[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(-)?] ) smpeg? ( >=media-libs/smpeg2-2.0.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(-)?] ) ) mod? ( modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mikmod? ( >=media-libs/libmikmod-3.3.6-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(-)?] ) ) vorbis? ( tremor? ( >=media-libs/tremor-0_pre20130223[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(-)?] ) !tremor? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+REQUIRED_USE=midi? ( || ( timidity fluidsynth ) ) timidity? ( midi ) fluidsynth? ( midi ) mp3? ( || ( smpeg mad ) ) smpeg? ( mp3 ) mad? ( mp3 ) mod? ( || ( mikmod modplug ) ) mikmod? ( mod ) modplug? ( mod ) tremor? ( vorbis )
+SLOT=0
+SRC_URI=http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.2.tar.gz
+_eclasses_=ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=60cf33a526c96b94c39200dc59a3daf7
diff --git a/metadata/md5-cache/media-libs/spandsp-0.0.6 b/metadata/md5-cache/media-libs/spandsp-0.0.6
index 57d7c9469f1e..acb2b99e472c 100644
--- a/metadata/md5-cache/media-libs/spandsp-0.0.6
+++ b/metadata/md5-cache/media-libs/spandsp-0.0.6
@@ -4,11 +4,11 @@ DESCRIPTION=SpanDSP is a library of DSP functions for telephony
 EAPI=5
 HOMEPAGE=http://www.soft-switch.org/
 IUSE=doc fixed-point cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 static-libs
-KEYWORDS=~amd64 ~arm ~arm64 hppa ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=media-libs/tiff virtual/jpeg
 REQUIRED_USE=cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmx )
 SLOT=0
 SRC_URI=http://www.soft-switch.org/downloads/spandsp/spandsp-0.0.6.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=fe6f1ffd21fe28ecc72576c669ff6cd8
+_md5_=53d759554214cf404d2a3cc67d7e42de
diff --git a/metadata/md5-cache/media-plugins/caps-plugins-0.9.24 b/metadata/md5-cache/media-plugins/caps-plugins-0.9.24
index 08599a49e5ea..042e669d9483 100644
--- a/metadata/md5-cache/media-plugins/caps-plugins-0.9.24
+++ b/metadata/md5-cache/media-plugins/caps-plugins-0.9.24
@@ -4,9 +4,9 @@ DESCRIPTION=The CAPS Audio Plugin Suite - LADSPA plugin suite
 EAPI=6
 HOMEPAGE=http://quitte.de/dsp/caps.html
 IUSE=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=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://quitte.de/dsp/caps_0.9.24.tar.bz2
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=6396daccfe69fe8e5101ff054b0a3dc7
+_md5_=9dffe4b480b60d7627067cf5beca5d3a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.10.5
index a1e7d1e987c3..390f282e97f5 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=ATSC A/52 audio decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=+orc 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 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/a52dec-0.7.4-r6[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(-)?] orc? ( >=dev-lang/orc-0.4.17[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/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-ugly-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=db0e4d79db2437fab3df1f9f9af16349
+_md5_=cb1800638ea0c6cd62a593ff3002e73a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.10.5
index 95bdbe862cf3..2ccb4adab321 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=ASS/SSA rendering with effects support plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libass-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=275d14e300fd5fc3cad6bcae0ca7778d
+_md5_=914ca70350556fe6693b95fae0c3387b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.10.5
index f80a705201f3..71dd85abe6ed 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=CD Audio Source (cdda) plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libcdio-0.90-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/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-ugly-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6e155bf8545fa99e9c2cc5f54407360c
+_md5_=4182d43629fbd8d2fec26edb57a57de9
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.10.5
index b571e0383d6b..cae2ca1b1373 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=CD Audio Source (cdda) plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-sound/cdparanoia-3.10.2-r6[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/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-base-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=30bac52d3f9baf3f1f52c67fa92e204f
+_md5_=8d9f7a50720051347279fc37b6ccc040
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dv-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-dv-1.10.5
index 7f6d2a9867ce..242cf4b6773e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dv-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dv-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=DV demuxer and decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libdv-1.0.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(-)?] >=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=07a9e3ed08a92b0f030397c9388159df
+_md5_=194f4819f3a086a21500f0b9c34bd81d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.10.5
index 98e6e9a3a2ac..6e6a3dd831af 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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 ~ppc ~ppc64 x86
+KEYWORDS=alpha amd64 arm ~arm64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=27648d8da03e3dd533865f60614eeeab
+_md5_=059317a2fb175cece129abae45afbe20
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.10.5
index fb4e9e859261..234d44828330 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=DVD read plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libdvdread-4.2.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(-)?] >=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-ugly-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8a17ac4a640b1fa2f3d4de2539e7e441
+_md5_=8b8ce2e315a80f903f996c963abec887
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faac-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-faac-1.10.5
index ec235837b064..1ad9f087d29a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faac-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faac-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=AAC audio encoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/faac-1.28-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(-)?] >=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e3982055a8eab3099c9e6824afed765e
+_md5_=d74f52cceb56f0157cc7bd9624158996
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faad-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-faad-1.10.5
index f2fc3311d814..f59f6a597200 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faad-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faad-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=AAC audio decoder plugin.
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/faad2-2.7-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(-)?] >=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5bf213e99989d19f5612f14d6714a740
+_md5_=00680fa3c0d7697181558dc9312725a9
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-flac-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.10.5
index a557d7ce88ce..a7d67bb68f69 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-flac-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=FLAC encoder/decoder/tagger plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cf48c521fc63f903085cf9ab2bfbf524
+_md5_=e4eb7d8d529e8d72e53d8cb1bfa68859
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.10.5
index 5e2eea0a9642..77ca631e694b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/gdk-pixbuf-2.30.7: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(-)?] >=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a10a08224950b67a2ef0200fb2d33b48
+_md5_=96717d706d1c2ef749ac91b9de6f0e4f
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.10.5
index bc5f900d0331..f5201b3c1eb1 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=virtual/jack[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/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=450808b6ee29769feb2e2e03fca64c68
+_md5_=3de552a8e3f27c746ad0ed41865f1092
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.10.5
index 03ae05938d08..1f7330ddeb9a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=JPEG image encoder/decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=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(-)?] >=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d1417a9055d304942d74f534ebf32012
+_md5_=37c9a5ca6512c225dbd377d9a96c8fef
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-lame-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-lame-1.10.5
index 54b3878aef24..b09e14dc97b6 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-lame-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-lame-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=MP3 encoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-ugly-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e3e3214edb80efb4464c36d78379e789
+_md5_=ea18b47d5f93af53df59e89d0bfe52f8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.10.5
index a68818c67c34..8b1a780163a5 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=FFmpeg based gstreamer plugin
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/modules/gst-libav.html
 IUSE=libav +orc 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 x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 app-arch/xz-utils >=dev-libs/glib-2.40.0: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(-)?] >=media-libs/gstreamer-1.10.3:1.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(-)?] >=media-libs/gst-plugins-base-1.10.3:1.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(-)?] !libav? ( >=media-video/ffmpeg-3.2.4: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(-)?] ) orc? ( >=dev-lang/orc-0.4.17[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(-)?] )
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=6fdf4e620ea6ccdb1d3baf70fff83c1c
+_md5_=77c35b1028b6fe9d5830865efa7889a2
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.10.5
index a56aa6763d55..eaf0343978f3 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=Microsoft Multi Media Server source plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libmms-0.6.2-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/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=07787cb73e0df787c7a5621463a12e2f
+_md5_=3787a91a4395c9bee1331b2eb88095a8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.10.5
index b9d56cc52251..31700d49bbd9 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=PNG image encoder/decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=10ea61e7f9ed99adcbebb8fc9ed1a68e
+_md5_=1ca598c636315f7354353feed76c9dfb
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.10.5
index 9615cc430096..91c4956012ea 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=Visualization elements for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libvisual-0.4.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(-)?] >=media-plugins/libvisual-plugins-0.4.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(-)?] >=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-base-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1b346b0992e4ae74bd0263f2d24bc75f
+_md5_=59585cb763f1d5128ed6f0943864cb9c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mad-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-mad-1.10.5
index 88a0e37be8ef..ca296b237626 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mad-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mad-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=MP3 decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libmad-0.15.1b-r8[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/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-ugly-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=56cdeb1c2cf7cf5d530f4a2e68b74d8e
+_md5_=126c6078b6ed649bf0a71d6b85b3a854
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-meta-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-meta-1.10.5
index 6a4909445ddf..de0c3468e72e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-meta-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-meta-1.10.5
@@ -3,10 +3,10 @@ DESCRIPTION=Meta ebuild to pull in gst plugins for apps
 EAPI=6
 HOMEPAGE=https://www.gentoo.org
 IUSE=aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264 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 ~ppc ~ppc64 ~sh x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=metapackage
 RDEPEND=>=media-libs/gstreamer-1.10.5:1.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(-)?] >=media-libs/gst-plugins-base-1.10.5:1.0[alsa?,ogg?,theora?,vorbis?,X?,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/gst-plugins-good-1.10.5:1.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(-)?] a52? ( >=media-plugins/gst-plugins-a52dec-1.10.5:1.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(-)?] ) aac? ( >=media-plugins/gst-plugins-faad-1.10.5:1.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(-)?] ) cdda? ( || ( >=media-plugins/gst-plugins-cdparanoia-1.10.5:1.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(-)?] >=media-plugins/gst-plugins-cdio-1.10.5:1.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(-)?] ) ) dts? ( >=media-plugins/gst-plugins-dts-1.10.5:1.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(-)?] ) dv? ( >=media-plugins/gst-plugins-dv-1.10.5:1.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(-)?] ) dvb? ( >=media-plugins/gst-plugins-dvb-1.10.5:1.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(-)?] >=media-libs/gst-plugins-bad-1.10.5:1.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(-)?] ) dvd? ( >=media-libs/gst-plugins-ugly-1.10.5:1.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(-)?] >=media-plugins/gst-plugins-a52dec-1.10.5:1.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(-)?] >=media-plugins/gst-plugins-dvdread-1.10.5:1.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(-)?] >=media-plugins/gst-plugins-mpeg2dec-1.10.5:1.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(-)?] >=media-plugins/gst-plugins-resindvd-1.10.5:1.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(-)?] ) ffmpeg? ( >=media-plugins/gst-plugins-libav-1.10.5:1.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(-)?] ) flac? ( >=media-plugins/gst-plugins-flac-1.10.5:1.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(-)?] ) http? ( >=media-plugins/gst-plugins-soup-1.10.5:1.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(-)?] ) jack? ( >=media-plugins/gst-plugins-jack-1.10.5:1.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(-)?] ) lame? ( >=media-plugins/gst-plugins-lame-1.10.5:1.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(-)?] ) libass? ( >=media-plugins/gst-plugins-assrender-1.10.5:1.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(-)?] ) libvisual? ( >=media-plugins/gst-plugins-libvisual-1.10.5:1.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(-)?] ) mms? ( >=media-plugins/gst-plugins-libmms-1.10.5:1.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(-)?] ) modplug? ( >=media-plugins/gst-plugins-modplug-1.10.5:1.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(-)?] ) mp3? ( >=media-libs/gst-plugins-ugly-1.10.5:1.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(-)?] || ( >=media-plugins/gst-plugins-mad-1.10.5:1.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(-)?] >=media-plugins/gst-plugins-mpg123-1.10.5:1.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(-)?] ) ) mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-1.10.5:1.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(-)?] ) opus? ( >=media-plugins/gst-plugins-opus-1.10.5:1.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(-)?] ) oss? ( >=media-plugins/gst-plugins-oss-1.10.5:1.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(-)?] ) pulseaudio? ( >=media-plugins/gst-plugins-pulse-1.10.5:1.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(-)?] ) taglib? ( >=media-plugins/gst-plugins-taglib-1.10.5:1.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(-)?] ) v4l? ( >=media-plugins/gst-plugins-v4l2-1.10.5:1.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? ( >=media-plugins/gst-plugins-vaapi-1.10.5:1.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(-)?] ) vcd? ( >=media-plugins/gst-plugins-mplex-1.10.5:1.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(-)?] >=media-plugins/gst-plugins-mpeg2dec-1.10.5:1.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(-)?] ) vpx? ( >=media-plugins/gst-plugins-vpx-1.10.5:1.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(-)?] ) wavpack? ( >=media-plugins/gst-plugins-wavpack-1.10.5:1.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(-)?] ) x264? ( >=media-plugins/gst-plugins-x264-1.10.5:1.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(-)?] )
 REQUIRED_USE=opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )
 SLOT=1.0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=4be799900222ca26ec1c46a05f6032dc
+_md5_=64e771861f67ff211310b6a0d00ea86c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-meta-1.12.3 b/metadata/md5-cache/media-plugins/gst-plugins-meta-1.12.3
new file mode 100644
index 000000000000..2f5489859791
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-meta-1.12.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=-
+DESCRIPTION=Meta ebuild to pull in gst plugins for apps
+EAPI=6
+HOMEPAGE=https://www.gentoo.org
+IUSE=aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264 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=~amd64 ~arm64 ~ia64 ~x86
+LICENSE=metapackage
+RDEPEND=>=media-libs/gstreamer-1.12.3:1.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(-)?] >=media-libs/gst-plugins-base-1.12.3:1.0[alsa?,ogg?,theora?,vorbis?,X?,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/gst-plugins-good-1.12.3:1.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(-)?] a52? ( >=media-plugins/gst-plugins-a52dec-1.12.3:1.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(-)?] ) aac? ( >=media-plugins/gst-plugins-faad-1.12.3:1.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(-)?] ) cdda? ( || ( >=media-plugins/gst-plugins-cdparanoia-1.12.3:1.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(-)?] >=media-plugins/gst-plugins-cdio-1.12.3:1.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(-)?] ) ) dts? ( >=media-plugins/gst-plugins-dts-1.12.3:1.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(-)?] ) dv? ( >=media-plugins/gst-plugins-dv-1.12.3:1.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(-)?] ) dvb? ( >=media-plugins/gst-plugins-dvb-1.12.3:1.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(-)?] >=media-libs/gst-plugins-bad-1.12.3:1.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(-)?] ) dvd? ( >=media-libs/gst-plugins-ugly-1.12.3:1.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(-)?] >=media-plugins/gst-plugins-a52dec-1.12.3:1.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(-)?] >=media-plugins/gst-plugins-dvdread-1.12.3:1.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(-)?] >=media-plugins/gst-plugins-mpeg2dec-1.12.3:1.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(-)?] >=media-plugins/gst-plugins-resindvd-1.12.3:1.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(-)?] ) ffmpeg? ( >=media-plugins/gst-plugins-libav-1.12.3:1.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(-)?] ) flac? ( >=media-plugins/gst-plugins-flac-1.12.3:1.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(-)?] ) http? ( >=media-plugins/gst-plugins-soup-1.12.3:1.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(-)?] ) jack? ( >=media-plugins/gst-plugins-jack-1.12.3:1.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(-)?] ) lame? ( >=media-plugins/gst-plugins-lame-1.12.3:1.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(-)?] ) libass? ( >=media-plugins/gst-plugins-assrender-1.12.3:1.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(-)?] ) libvisual? ( >=media-plugins/gst-plugins-libvisual-1.12.3:1.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(-)?] ) mms? ( >=media-plugins/gst-plugins-libmms-1.12.3:1.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(-)?] ) modplug? ( >=media-plugins/gst-plugins-modplug-1.12.3:1.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(-)?] ) mp3? ( >=media-libs/gst-plugins-ugly-1.12.3:1.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(-)?] >=media-plugins/gst-plugins-mpg123-1.12.3:1.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(-)?] ) mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-1.12.3:1.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(-)?] ) opus? ( >=media-plugins/gst-plugins-opus-1.12.3:1.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(-)?] ) oss? ( >=media-plugins/gst-plugins-oss-1.12.3:1.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(-)?] ) pulseaudio? ( >=media-plugins/gst-plugins-pulse-1.12.3:1.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(-)?] ) taglib? ( >=media-plugins/gst-plugins-taglib-1.12.3:1.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(-)?] ) v4l? ( >=media-plugins/gst-plugins-v4l2-1.12.3:1.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? ( >=media-plugins/gst-plugins-vaapi-1.12.3:1.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(-)?] ) vcd? ( >=media-plugins/gst-plugins-mplex-1.12.3:1.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(-)?] >=media-plugins/gst-plugins-mpeg2dec-1.12.3:1.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(-)?] ) vpx? ( >=media-plugins/gst-plugins-vpx-1.12.3:1.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(-)?] ) wavpack? ( >=media-plugins/gst-plugins-wavpack-1.12.3:1.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(-)?] ) x264? ( >=media-plugins/gst-plugins-x264-1.12.3:1.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(-)?] )
+REQUIRED_USE=opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )
+SLOT=1.0
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=d887e71caeb3d3116e26710498620dd7
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.10.5
index 918e733c2377..ad1b6d412c7f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=MOD audio decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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 ~arm64 ~hppa ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=48c922b73474389b210b568bcbbaa401
+_md5_=d664366c71684dd069ab5f9fd32b7a51
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.10.5
index 8e9246c9cbb1..d0e324408698 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=MPEG2 decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libmpeg2-0.5.1-r2[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/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-ugly-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9b9a0535fbcc15d16a4f61b4522052e4
+_md5_=5369177b4988e56e255faa0dc05c9829
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.12.3 b/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.12.3
index bc23ddd70c2d..2dfe9e51b74b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.12.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=MP3 decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ia64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-sound/mpg123-1.23[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/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-ugly-1.12.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.12.3.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8c88be8dab9dfc648abfdf3a5aca17c2
+_md5_=d1fc7dd959b4511d2d9e412147032369
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-neon-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-neon-1.10.5
index 12c567744767..737fd929096d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-neon-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-neon-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP client source plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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 ~ppc ~ppc64 x86
+KEYWORDS=alpha amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/neon-0.30.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/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=24c003e89c0069331c41b37872708eed
+_md5_=a9bb42f7e3b4d9c67811ff9a3ac8d0a7
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.10.5
index 7f5dd1ebc312..177df31d64cc 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=Opus audio parser plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/opus-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(-)?] >=media-libs/gst-plugins-base-1.10.5:1.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(-)?,ogg] >=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-base-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b323844e120fd478b0b4e3bc0a98995d
+_md5_=f001ce933a927a43bb479dbac6e63d68
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-oss-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.10.5
index 5f60d45befda..d181fe49ed31 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-oss-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=OSS (Open Sound System) support plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=af012d5fce64378a6b8c96c71c1c0159
+_md5_=7e5cd7cc063e0ed12e70c2238fc53772
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.10.5
index 9bba6201d080..c77851eade8d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=PulseAudio sound server plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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 ~ppc ~ppc64 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/gst-plugins-base-1.10.5:1.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(-)?] >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=87fa489289be5594a2de297ca94da1b9
+_md5_=a87c8fe95fe04d6dbb99d4cfb00d13fd
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.10.5
index 11916e8e49e3..7809faed6221 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=Fiwewire DV/HDV capture plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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=amd64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=11d91ad10e0e18c4df9a54ba7d19f160
+_md5_=9c57ef12bc31bb025c8a43daf3b52594
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.10.5
index a1d10c7b2455..9eda346276aa 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=DVD playback support plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libdvdnav-4.2.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(-)?] >=media-libs/libdvdread-4.2.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(-)?] >=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e69a7487b3497ee531d4fe587349765e
+_md5_=b65812616206cfcee1af06a893d1c5d2
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.10.5
index 0d52891218f8..0c38b1834aeb 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=Icecast server sink plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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 ~ppc ~ppc64 x86
+KEYWORDS=alpha amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libshout-2.3.1-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/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4310216688f412bed424d0e5cd3382e1
+_md5_=684d5e30ed7610ba0542fefd2a927cdf
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.10.5
index 33dc108e0361..c9db429fcfcc 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=Sid decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libsidplay-1.36.59-r1: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(-)?] >=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-ugly-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e7f97772aa5910162358490a7c156827
+_md5_=801408b103774a072294b83fe93b94af
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soup-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.10.5
index 43b5312bc504..b1ed50c1a45a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-soup-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP client source/sink plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libsoup-2.48:2.4[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/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=315688014d7a2627400c294274ca79b8
+_md5_=6adcfe4b8e8dab1f987f74372c285cd1
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-speex-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-speex-1.10.5
index 5bd3749632b6..5389ada0c872 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-speex-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-speex-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=Speex encoder/decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4b9d1038419a0f3472022bbf7eaa0ed5
+_md5_=46f4545c4f1646cb9d94e2f113ec2d4e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.10.5
index 7ebae01c632b..482ef443788a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=ID3v2/APEv2 tagger plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/taglib-1.9.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(-)?] >=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2182a4e0567c96bdf1007e5d3cc08b3e
+_md5_=c62e313676120be86bad7728972a0a4c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.10.5
index bf12ebc5ad24..858084673370 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=MPEG2 encoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-ugly-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c86f0bf4bf4dbd9b8a14750267a7f538
+_md5_=40c2b079c36f0a57b704e3e32118e44a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.10.5
index 3d2211121a99..e82a1521ec89 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=udev 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 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.10.5:1.0[X,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(-)?] udev? ( >=virtual/libgudev-208:=[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/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8ecb79adaa8be2b0fa80a6276cc59d62
+_md5_=e7f56955b817101a0870fbb88df6e4bb
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.10.5
index ec2b30dd67eb..04790867dde7 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=VP8/VP9 video encoder/decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libvpx-1.3.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/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6bbdc551a9788baf288adf5fbe8e3256
+_md5_=d38f29d46564580a4a7be864b6fa6115
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.10.5
index fa399b4345b4..6ad0bbc7c134 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=Wavpack audio encoder/decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=43c70e662e582331e30acf89fe36c92a
+_md5_=87cb4adf4ac511e383a7070c9511677d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x264-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-x264-1.10.5
index 55ce15148e82..f9cef8e36f97 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-x264-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-x264-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=H.264 encoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-ugly-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c25d2114d11b30fc2eb0bfd65078748f
+_md5_=fcad3fa9c305ba0501904eee05975ccf
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.10.5
index 962342f9758b..3512555dcadf 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.10.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.10.5
@@ -4,11 +4,11 @@ DESCRIPTION=X11 video capture stream plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=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=amd64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/gst-plugins-base-1.10.5:1.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(-)?] >=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/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/libXfixes-5.0.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(-)?] >=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.10.5:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.10.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4b76f9062c92fa37edd75b6cdb80d634
+_md5_=31b3e99f5b23a3484c14968ddbaec01a
diff --git a/metadata/md5-cache/media-plugins/kipi-plugins-5.5.0 b/metadata/md5-cache/media-plugins/kipi-plugins-5.5.0
index 483f607fb968..b0fc08ddab30 100644
--- a/metadata/md5-cache/media-plugins/kipi-plugins-5.5.0
+++ b/metadata/md5-cache/media-plugins/kipi-plugins-5.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkipi-14.12.0:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 flashexport? ( >=kde-frameworks/karchive-5.37.0:5 ) mediawiki? ( net-libs/libmediawiki:5 ) remotestorage? ( >=kde-frameworks/kio-5.37.0:5 ) vkontakte? ( net-libs/libkvkontakte:5 ) !media-plugins/kipi-plugins:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/digikam/digikam-5.5.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=15c90518768d93b179b14e37112d6666
diff --git a/metadata/md5-cache/media-plugins/kipi-plugins-5.7.0 b/metadata/md5-cache/media-plugins/kipi-plugins-5.7.0
index 9697ecf1654b..ee3d6cfd41e6 100644
--- a/metadata/md5-cache/media-plugins/kipi-plugins-5.7.0
+++ b/metadata/md5-cache/media-plugins/kipi-plugins-5.7.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-apps/libkipi-14.12.0:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 flashexport? ( >=kde-frameworks/karchive-5.37.0:5 ) mediawiki? ( net-libs/libmediawiki:5 ) remotestorage? ( >=kde-frameworks/kio-5.37.0:5 ) vkontakte? ( net-libs/libkvkontakte:5 ) !media-plugins/kipi-plugins:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/digikam/digikam-5.7.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=eaed3dbcc26160a833cecfc52939f70b
diff --git a/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.1.5 b/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.1.5
new file mode 100644
index 000000000000..b7faccb1e2d8
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.1.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/libsamplerate >=media-libs/taglib-1.10 media-sound/mpg123 =media-sound/qmmp-1.1* dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-lang/yasm dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=A set of extra plugins for Qmmp
+EAPI=6
+HOMEPAGE=http://qmmp.ylsoftware.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsamplerate >=media-libs/taglib-1.10 media-sound/mpg123 =media-sound/qmmp-1.1* dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=http://qmmp.ylsoftware.com/files/plugins/qmmp-plugin-pack-1.1.5.tar.bz2
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6770c02af5a5d901a6d42e7206b67f7c
diff --git a/metadata/md5-cache/media-plugins/vdr-lcr-0.0.9-r1 b/metadata/md5-cache/media-plugins/vdr-lcr-0.0.9-r1
index 25a7b593b735..33ce4b848ab2 100644
--- a/metadata/md5-cache/media-plugins/vdr-lcr-0.0.9-r1
+++ b/metadata/md5-cache/media-plugins/vdr-lcr-0.0.9-r1
@@ -3,10 +3,10 @@ DEPEND=>=media-video/vdr-1.5.7 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linux
 DESCRIPTION=VDR Plugin: informe about Least Cost Routing (LCR)
 EAPI=6
 HOMEPAGE=http://lcr.vdr-developer.org
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-perl/libwww-perl-5.69-r2 >=dev-perl/HTML-Parser-3.34-r1 >=www-client/lynx-2.8.4 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://lcr.vdr-developer.org/downloads/vdr-lcr-0.0.9.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vdr-plugin-2	786b4f5aa9f17e2d5cec5e628f462c01
-_md5_=11e8cc57bc15865736181b17ee6602f7
+_md5_=9a9e6ffcd80a1e784a882e08e7e34fd6
diff --git a/metadata/md5-cache/media-plugins/vdr-mailbox-0.7.0-r1 b/metadata/md5-cache/media-plugins/vdr-mailbox-0.7.0-r1
index 7ee4e1e6b8e8..93f4b95d1c76 100644
--- a/metadata/md5-cache/media-plugins/vdr-mailbox-0.7.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-mailbox-0.7.0-r1
@@ -3,10 +3,10 @@ DEPEND=>=media-video/vdr-1.7.41 >=net-libs/c-client-2002e-r1 >=media-tv/gentoo-v
 DESCRIPTION=VDR plugin: MailBox provides access to multiple e-mail accounts
 EAPI=6
 HOMEPAGE=http://alex.vdr-developer.org
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.7.41 >=net-libs/c-client-2002e-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://alex.vdr-developer.org/download/vdr-mailbox-0.7.0.tgz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vdr-plugin-2	786b4f5aa9f17e2d5cec5e628f462c01
-_md5_=94ed4dd18cf9b12b2da85f2a05f45525
+_md5_=e60d3c2e0235f0c24de8511a03808c81
diff --git a/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1-r1 b/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1-r1
index ba833c636ceb..8ef3e87f168c 100644
--- a/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1-r1
@@ -3,10 +3,10 @@ DEPEND=>=media-video/vdr-2.2.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1
 DESCRIPTION=VDR Plugin: RSS reader
 EAPI=5
 HOMEPAGE=http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-2.2.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/files/vdr-rssreader-2.2.1.tgz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vdr-plugin-2	786b4f5aa9f17e2d5cec5e628f462c01
-_md5_=24fb0e187f3928669fd84fe3554d50ef
+_md5_=90f8596d1114671cb16f95983a2f9635
diff --git a/metadata/md5-cache/media-plugins/vdr-sudoku-0.3.5-r1 b/metadata/md5-cache/media-plugins/vdr-sudoku-0.3.5-r1
index 6383a47be5d4..6993e14e762a 100644
--- a/metadata/md5-cache/media-plugins/vdr-sudoku-0.3.5-r1
+++ b/metadata/md5-cache/media-plugins/vdr-sudoku-0.3.5-r1
@@ -3,10 +3,10 @@ DEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linux
 DESCRIPTION=VDR plugin: to generate and solve Number Place puzzles, so called Sudokus
 EAPI=6
 HOMEPAGE=http://projects.vdr-developer.org/projects/show/plg-sudoku
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/280/vdr-sudoku-0.3.5.tgz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vdr-plugin-2	786b4f5aa9f17e2d5cec5e628f462c01
-_md5_=4fabbdd0ea4903df389fede8f312142e
+_md5_=8bfa38c639b69043842c03bea88168c3
diff --git a/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r3 b/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r3
index 0baa698bc75c..9bc66bf3e4aa 100644
--- a/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r3
+++ b/metadata/md5-cache/media-plugins/vdr-vcd-0.9-r3
@@ -3,10 +3,10 @@ DEPEND=>=media-video/vdr-1.5.9 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linux
 DESCRIPTION=VDR plugin: play video cds
 EAPI=5
 HOMEPAGE=http://www.heiligenmann.de/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.5.9 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.heiligenmann.de/vdr/download/vdr-vcd-0.9.tgz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vdr-plugin-2	786b4f5aa9f17e2d5cec5e628f462c01
-_md5_=db86319eea0781340d7df1dee86e5996
+_md5_=5a43b6e5d220aca6fd4b25839c749f0e
diff --git a/metadata/md5-cache/media-radio/fldigi-4.0.8 b/metadata/md5-cache/media-radio/fldigi-4.0.8
index cb754a736006..e2c9bcc487ba 100644
--- a/metadata/md5-cache/media-radio/fldigi-4.0.8
+++ b/metadata/md5-cache/media-radio/fldigi-4.0.8
@@ -4,10 +4,10 @@ DESCRIPTION=Sound card based multimode software modem for Amateur Radio use
 EAPI=5
 HOMEPAGE=http://www.w1hkj.com
 IUSE=hamlib nls pulseaudio
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-3
 RDEPEND=x11-libs/fltk:1[threads,xft] media-libs/libsamplerate media-libs/libpng:0 x11-misc/xdg-utils dev-perl/RPC-XML dev-perl/Term-ReadLine-Perl >=media-libs/portaudio-19_pre20071207 hamlib? ( media-libs/hamlib ) pulseaudio? ( media-sound/pulseaudio ) >=media-libs/libsndfile-1.0.10
 SLOT=0
 SRC_URI=mirror://sourceforge/fldigi/fldigi-4.0.8.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=2a58ee45a04091df7f788c74e563a784
+_md5_=e135dc05999d37d9294b9c2febda7d1f
diff --git a/metadata/md5-cache/media-radio/flrig-1.3.33 b/metadata/md5-cache/media-radio/flrig-1.3.33
index 1f4241c48b55..c2bd5f553245 100644
--- a/metadata/md5-cache/media-radio/flrig-1.3.33
+++ b/metadata/md5-cache/media-radio/flrig-1.3.33
@@ -4,10 +4,10 @@ DESCRIPTION=Transceiver control program for Amateur Radio use
 EAPI=5
 HOMEPAGE=http://www.w1hkj.com/flrig-help/index.html
 IUSE=nls
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils
 SLOT=0
 SRC_URI=mirror://sourceforge/fldigi/flrig-1.3.33.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=28c2257537753eb773bb1822ef2958f9
+_md5_=6cd3dfcd35b59fead001869e745e024f
diff --git a/metadata/md5-cache/media-sound/abcmidi-2017.10.23 b/metadata/md5-cache/media-sound/abcmidi-2017.10.23
new file mode 100644
index 000000000000..8517eb2b6f46
--- /dev/null
+++ b/metadata/md5-cache/media-sound/abcmidi-2017.10.23
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=app-arch/unzip >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Programs for processing ABC music notation files
+EAPI=6
+HOMEPAGE=http://ifdo.ca/~seymour/runabc/top.html
+IUSE=examples
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://ifdo.ca/~seymour/runabc/abcMIDI-2017.10.23.zip
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=35cc25d55455c2a4784d056b97a7eb29
diff --git a/metadata/md5-cache/media-sound/amarok-2.8.90-r3 b/metadata/md5-cache/media-sound/amarok-2.8.90-r3
index c3affaa26652..d99830ae95cc 100644
--- a/metadata/md5-cache/media-sound/amarok-2.8.90-r3
+++ b/metadata/md5-cache/media-sound/amarok-2.8.90-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/qca:2[qt4(+)] kde-frameworks/kdelibs:4[opengl?,plasma(+)] >=kde-apps/kdebase-kioslaves-4.4:4 >=media-libs/taglib-1.7[asf(+),mp4(+)] >=media-libs/taglib-extras-1.0.1 sys-libs/zlib >=virtual/mysql-5.1[embedded?] >=dev-qt/qtcore-4.8:4 >=dev-qt/qtdbus-4.8:4 >=dev-qt/qtscript-4.8:4 >=x11-libs/qtscriptgenerator-0.1.0 ipod? ( >=media-libs/libgpod-0.7.0[gtk] ) lastfm? ( >=media-libs/liblastfm-1.0.3[qt4(+)] ) mp3tunes? ( dev-libs/glib:2 dev-libs/libxml2 dev-libs/openssl:0 >=dev-qt/qtcore-4.8.4:4[glib] net-libs/loudmouth net-misc/curl ) mtp? ( >=media-libs/libmtp-1.0.0 ) ofa? ( >=media-libs/libofa-0.9.0 ) opengl? ( virtual/opengl ) !media-sound/amarok-utils >=kde-apps/phonon-kde-4.4:4 >=dev-qt/qtsql-4.8.5:4
 SLOT=4
 SRC_URI=mirror://kde/stable/amarok/2.8.90/src/amarok-2.8.90.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=de5e505eb61337fa3591fc5e817f5898
diff --git a/metadata/md5-cache/media-sound/audex-0.95_pre20170727 b/metadata/md5-cache/media-sound/audex-0.95_pre20170727
index a6a02a8b8999..0ef92b021bca 100644
--- a/metadata/md5-cache/media-sound/audex-0.95_pre20170727
+++ b/metadata/md5-cache/media-sound/audex-0.95_pre20170727
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/solid-5.37.0:5 >=kde-apps/libkcddb-14.12.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-sound/cdparanoia !media-sound/audex:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/audex-0.95_pre20170727.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e6e1204b0330f02df081a493aacd3e07
diff --git a/metadata/md5-cache/media-sound/cantata-2.1.0 b/metadata/md5-cache/media-sound/cantata-2.1.0
index 1e45f002f3e5..910394af1f43 100644
--- a/metadata/md5-cache/media-sound/cantata-2.1.0
+++ b/metadata/md5-cache/media-sound/cantata-2.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Featureful and configurable Qt client for the music player daemon (M
 EAPI=6
 HOMEPAGE=https://github.com/CDrummond/cantata
 IUSE=cdda cddb cdio http-server mtp musicbrainz replaygain taglib udisks linguas_cs linguas_de linguas_en_GB linguas_es linguas_fr linguas_hu linguas_it linguas_ja linguas_ko linguas_pl linguas_ru linguas_zh_CN
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* ) sys-libs/zlib virtual/libudev:= cdda? ( media-sound/cdparanoia ) cdio? ( dev-libs/libcdio-paranoia ) cddb? ( media-libs/libcddb ) mtp? ( media-libs/libmtp ) musicbrainz? ( media-libs/musicbrainz:5= ) replaygain? ( media-libs/libebur128 media-sound/mpg123 virtual/ffmpeg ) taglib? ( media-libs/taglib[asf(+),mp4(+)] media-libs/taglib-extras udisks? ( sys-fs/udisks:2 ) )
 REQUIRED_USE=?? ( cdda cdio ) cdda? ( udisks || ( cddb musicbrainz ) ) cddb? ( || ( cdio cdda ) taglib ) cdio? ( udisks || ( cddb musicbrainz ) ) mtp? ( taglib udisks ) musicbrainz? ( || ( cdio cdda ) taglib ) replaygain? ( taglib )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/CDrummond/cantata/releases/download/v2.1.0/cantata-2.1.0.tar.bz2
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	2c2e15383ba891d642f51896a7f0ecfe	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3e8d5cfb281cc5ffd2d76fb5d0f26824
+_md5_=cf9f37e84ae610141116236c27bdab64
diff --git a/metadata/md5-cache/media-sound/gmorgan-0.79 b/metadata/md5-cache/media-sound/gmorgan-0.79
index ec34baa3dd8c..f68cb567ecb8 100644
--- a/metadata/md5-cache/media-sound/gmorgan-0.79
+++ b/metadata/md5-cache/media-sound/gmorgan-0.79
@@ -4,10 +4,10 @@ DESCRIPTION=Opensource software rhythm station
 EAPI=6
 HOMEPAGE=http://gmorgan.sourceforge.net/
 IUSE=nls
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib x11-libs/fltk:1
 SLOT=0
 SRC_URI=mirror://sourceforge/gmorgan/gmorgan-0.79.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=5d1cc61be7cebaa2cf084d8a4033f5eb
+_md5_=fd4fb8f648751ab9bc001180846d9dc4
diff --git a/metadata/md5-cache/media-sound/grip-3.4.3 b/metadata/md5-cache/media-sound/grip-3.4.3
index f16aebaa2031..8f45f587ab13 100644
--- a/metadata/md5-cache/media-sound/grip-3.4.3
+++ b/metadata/md5-cache/media-sound/grip-3.4.3
@@ -4,10 +4,10 @@ DESCRIPTION=GTK+ based Audio CD Player/Ripper
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/grip/
 IUSE=vorbis
-KEYWORDS=alpha ~amd64 ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha ~amd64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=gnome-base/libgnome >=gnome-base/libgnomeui-2.2.0 >=media-libs/id3lib-3.8.3 media-sound/cdparanoia media-sound/lame net-misc/curl >=x11-libs/gtk+-2.2:2 x11-libs/libX11 x11-libs/pango x11-libs/vte:0 vorbis? ( media-sound/vorbis-tools )
 SLOT=0
 SRC_URI=mirror://sourceforge/grip/grip-3.4.3.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=467bf831955429b93bb40d6207957e70
+_md5_=82e1d9ba1c810ff7deddaff9016e3b70
diff --git a/metadata/md5-cache/media-sound/k4guitune-1.1.1 b/metadata/md5-cache/media-sound/k4guitune-1.1.1
index b1015e2b1e55..6be12577cbfe 100644
--- a/metadata/md5-cache/media-sound/k4guitune-1.1.1
+++ b/metadata/md5-cache/media-sound/k4guitune-1.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=sci-libs/fftw:3.0= kde-frameworks/oxygen-icons handbook? ( kde-frameworks/kdelibs:4[handbook] ) >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/117669-k4guitune-1.1.1.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a9126ac8702c046deae855891c92896e
diff --git a/metadata/md5-cache/media-sound/kaudiocreator-1.3_p20170806 b/metadata/md5-cache/media-sound/kaudiocreator-1.3_p20170806
index 220518a06028..22bc3fdd9ca5 100644
--- a/metadata/md5-cache/media-sound/kaudiocreator-1.3_p20170806
+++ b/metadata/md5-cache/media-sound/kaudiocreator-1.3_p20170806
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/solid-5.37.0:5 >=kde-apps/libkcddb-14.12.0:5 >=kde-apps/libkcompactdisc-14.12.0:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/libdiscid media-libs/phonon[qt5(+)] >=media-libs/taglib-1.5 >=kde-apps/audiocd-kio-14.12.0:5 !media-sound/kaudiocreator:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/kaudiocreator-1.3_p20170806.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3ae24318560fdaf05599d14215feb15f
diff --git a/metadata/md5-cache/media-sound/kenvy24-1.2 b/metadata/md5-cache/media-sound/kenvy24-1.2
index ae2cbb3ab6d0..de092bedfd9b 100644
--- a/metadata/md5-cache/media-sound/kenvy24-1.2
+++ b/metadata/md5-cache/media-sound/kenvy24-1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/alsa-lib kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4
 SRC_URI=mirror://sourceforge/kenvy24/kenvy24-1.2-src.tgz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a304f3d70687ebe6b3d7f36e6649b0d8
diff --git a/metadata/md5-cache/media-sound/kid3-3.4.5 b/metadata/md5-cache/media-sound/kid3-3.4.5
index 4de86940b843..9e435565a0be 100644
--- a/metadata/md5-cache/media-sound/kid3-3.4.5
+++ b/metadata/md5-cache/media-sound/kid3-3.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.
 REQUIRED_USE=flac? ( vorbis )
 SLOT=5
 SRC_URI=mirror://sourceforge/kid3/kid3-3.4.5.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0b90058ddb2cc08533594d4d5534f46b
diff --git a/metadata/md5-cache/media-sound/kid3-3.5.0 b/metadata/md5-cache/media-sound/kid3-3.5.0
index d381fc83da79..11adbf859a70 100644
--- a/metadata/md5-cache/media-sound/kid3-3.5.0
+++ b/metadata/md5-cache/media-sound/kid3-3.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.
 REQUIRED_USE=flac? ( vorbis )
 SLOT=5
 SRC_URI=mirror://sourceforge/kid3/kid3-3.5.0.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=14fa4a648645abcdaebb98090a3c7377
diff --git a/metadata/md5-cache/media-sound/kmid-2.4.0-r1 b/metadata/md5-cache/media-sound/kmid-2.4.0-r1
index ad62680ec804..fef7f85a353d 100644
--- a/metadata/md5-cache/media-sound/kmid-2.4.0-r1
+++ b/metadata/md5-cache/media-sound/kmid-2.4.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib >=media-sound/drumstick-0.4 <media-sound/drumstick-1.0.0 kde-frameworks/oxygen-icons l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[l10n_de(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[l10n_en-GB(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[l10n_es(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fr(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_gl(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nb(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt-BR(+)] ) l10n_sr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sr(+)] ) l10n_sr-ijekavsk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sr-ijekavsk(+)] ) l10n_sr-Latn-ijekavsk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sr-Latn-ijekavsk(+)] ) l10n_sr-Latn? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sr-Latn(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-CN(+)] ) handbook? ( kde-frameworks/kdelibs:4[handbook] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4
 SRC_URI=mirror://sourceforge/kmid2/kmid-2.4.0.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c059286b6b0b76787daf84466a8c29c0
diff --git a/metadata/md5-cache/media-sound/kmidimon-0.7.5 b/metadata/md5-cache/media-sound/kmidimon-0.7.5
index 28b97eae7742..d05d8e969f29 100644
--- a/metadata/md5-cache/media-sound/kmidimon-0.7.5
+++ b/metadata/md5-cache/media-sound/kmidimon-0.7.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib >=media-sound/drumstick-0.5 <media-sound/drumstick-1.0.0 kde-frameworks/oxygen-icons l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[l10n_cs(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[l10n_es(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ja(+)] ) handbook? ( kde-frameworks/kdelibs:4[handbook] ) >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
 SLOT=4
 SRC_URI=mirror://sourceforge/kmidimon/kmidimon-0.7.5.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a773eda0216b48ddf0d43a3b3cfcca38
diff --git a/metadata/md5-cache/media-sound/konvertible-1.0.1 b/metadata/md5-cache/media-sound/konvertible-1.0.1
index aa295499453d..68cba6da37a0 100644
--- a/metadata/md5-cache/media-sound/konvertible-1.0.1
+++ b/metadata/md5-cache/media-sound/konvertible-1.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=taglib? ( media-libs/taglib ) virtual/ffmpeg kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/116892-konvertible-1.0.1.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=42d7cce36c77b6b55d7f66a5c6a2ef1a
diff --git a/metadata/md5-cache/media-sound/kradio-4.0.8 b/metadata/md5-cache/media-sound/kradio-4.0.8
index b9f1da0577db..3115d676ae40 100644
--- a/metadata/md5-cache/media-sound/kradio-4.0.8
+++ b/metadata/md5-cache/media-sound/kradio-4.0.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsndfile alsa? ( media-libs/alsa-lib ) ffmpeg? ( >=media-libs/libmms-0.4 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) lirc? ( app-misc/lirc ) mp3? ( media-sound/lame ) vorbis? ( media-libs/libvorbis media-libs/libogg ) kde-frameworks/oxygen-icons l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[l10n_cs(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[l10n_de(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[l10n_es(+)] ) l10n_is? ( >=kde-apps/kde4-l10n-4.4:4[l10n_is(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[l10n_it(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt-BR(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sk(+)] ) l10n_sr-Latn? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sr-Latn(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_uk(+)] ) >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
 SLOT=4
 SRC_URI=mirror://sourceforge/kradio/kradio4-4.0.8.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=58735f37ffb69c567465b8d63942cf27
diff --git a/metadata/md5-cache/media-sound/kstreamripper-0.7.100-r2 b/metadata/md5-cache/media-sound/kstreamripper-0.7.100-r2
index 8a8fb3883c1b..f5a0c0099012 100644
--- a/metadata/md5-cache/media-sound/kstreamripper-0.7.100-r2
+++ b/metadata/md5-cache/media-sound/kstreamripper-0.7.100-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-3
 RDEPEND=media-sound/streamripper kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4
 SRC_URI=mirror://sourceforge/kstreamripper/kstreamripper-0.7.100.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=413eb6bb8789d7bdda69658fecc997a9
diff --git a/metadata/md5-cache/media-sound/lame-3.100 b/metadata/md5-cache/media-sound/lame-3.100
index 10135ecfdcb0..b003a25284e0 100644
--- a/metadata/md5-cache/media-sound/lame-3.100
+++ b/metadata/md5-cache/media-sound/lame-3.100
@@ -4,10 +4,10 @@ DESCRIPTION=LAME Ain't an MP3 Encoder
 EAPI=6
 HOMEPAGE=http://lame.sourceforge.net/
 IUSE=debug cpu_flags_x86_mmx +frontend mp3rtp sndfile static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=frontend? ( >=sys-libs/ncurses-5.7-r7:0= sndfile? ( >=media-libs/libsndfile-1.0.2 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/lame/lame-3.100.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=70d8630ee69d7c73895523d15d0cb75b
+_md5_=dfe4501ec7057a6ea0ae368a8348dcea
diff --git a/metadata/md5-cache/media-sound/lame-3.99.5-r1 b/metadata/md5-cache/media-sound/lame-3.99.5-r1
index befe29ff7447..6ae4d8cb251a 100644
--- a/metadata/md5-cache/media-sound/lame-3.99.5-r1
+++ b/metadata/md5-cache/media-sound/lame-3.99.5-r1
@@ -10,4 +10,4 @@ RDEPEND=frontend? ( >=sys-libs/ncurses-5.7-r7:0= sndfile? ( >=media-libs/libsndf
 SLOT=0
 SRC_URI=mirror://sourceforge/lame/lame-3.99.5.tar.gz mirror://gentoo/lame-3.99.5-automake-2.12.patch.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=1d4a929e016d789b15339d8d5beb926a
+_md5_=1c0fb64a7bbd545c07b1b9810767cce2
diff --git a/metadata/md5-cache/media-sound/mac-4.11.4.5.7 b/metadata/md5-cache/media-sound/mac-4.11.4.5.7
index e7db01ae856e..e2279925b8b3 100644
--- a/metadata/md5-cache/media-sound/mac-4.11.4.5.7
+++ b/metadata/md5-cache/media-sound/mac-4.11.4.5.7
@@ -4,10 +4,10 @@ DESCRIPTION=Monkey's Audio Codecs
 EAPI=6
 HOMEPAGE=http://etree.org/shnutils/shntool/ http://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php
 IUSE=cpu_flags_x86_mmx static-libs
-KEYWORDS=~alpha amd64 ppc ppc64 x86
+KEYWORDS=alpha amd64 ppc ppc64 x86
 LICENSE=mac
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://www.deb-multimedia.org/pool/main/m/monkeys-audio/monkeys-audio_4.11-u4-b5-s7.orig.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=96a201fa7b302cd9c66a3a013fd7886d
+_md5_=1ff7160ae42cdb7a1f31d69691294fb4
diff --git a/metadata/md5-cache/media-sound/mp3blaster-3.2.6 b/metadata/md5-cache/media-sound/mp3blaster-3.2.6
index 7c39a4ee3668..a5ac65bf1eaa 100644
--- a/metadata/md5-cache/media-sound/mp3blaster-3.2.6
+++ b/metadata/md5-cache/media-sound/mp3blaster-3.2.6
@@ -4,11 +4,11 @@ DESCRIPTION=Text console based program for playing audio files
 EAPI=6
 HOMEPAGE=http://www.mp3blaster.org/ http://mp3blaster.sourceforge.net/ https://github.com/stragulus/mp3blaster
 IUSE=lirc oss +sdl sid vorbis
-KEYWORDS=~alpha amd64 ~arm ppc ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= lirc? ( app-misc/lirc ) sdl? ( media-libs/libsdl ) sid? ( media-libs/libsidplay:1 ) vorbis? ( media-libs/libvorbis )
 REQUIRED_USE=|| ( oss sdl )
 SLOT=0
 SRC_URI=mirror://sourceforge/mp3blaster/mp3blaster-3.2.6.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=2865cc71d4520598ea1eed67faea255e
+_md5_=4d6d09f812da25b5a6725e0e3df8b7d5
diff --git a/metadata/md5-cache/media-sound/mpg123-1.25.6 b/metadata/md5-cache/media-sound/mpg123-1.25.6
index 0bfd90b59ff0..47ee63917b15 100644
--- a/metadata/md5-cache/media-sound/mpg123-1.25.6
+++ b/metadata/md5-cache/media-sound/mpg123-1.25.6
@@ -4,10 +4,10 @@ DESCRIPTION=a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3
 EAPI=6
 HOMEPAGE=https://www.mpg123.org/
 IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse 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 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=app-eselect/eselect-mpg123 dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r9 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=https://www.mpg123.org/download/mpg123-1.25.6.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=dc51de37bb7c35e69df1ae7e427a9213
+_md5_=69e72d11335d0481df80fe345491c185
diff --git a/metadata/md5-cache/media-sound/ncmpcpp-0.8.1 b/metadata/md5-cache/media-sound/ncmpcpp-0.8.1
new file mode 100644
index 000000000000..1e6860cc5de8
--- /dev/null
+++ b/metadata/md5-cache/media-sound/ncmpcpp-0.8.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=!dev-libs/boost:0/1.57.0 >=media-libs/libmpdclient-2.1 dev-libs/boost:=[nls,threads] net-misc/curl sys-libs/ncurses:= sys-libs/readline:* taglib? ( media-libs/taglib ) visualizer? ( sci-libs/fftw:3.0= ) virtual/pkgconfig
+DESCRIPTION=featureful ncurses based MPD client inspired by ncmpc
+EAPI=6
+HOMEPAGE=https://rybczak.net/ncmpcpp/
+IUSE=clock outputs taglib visualizer
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!dev-libs/boost:0/1.57.0 >=media-libs/libmpdclient-2.1 dev-libs/boost:=[nls,threads] net-misc/curl sys-libs/ncurses:= sys-libs/readline:* taglib? ( media-libs/taglib ) visualizer? ( sci-libs/fftw:3.0= )
+SLOT=0
+SRC_URI=https://rybczak.net/ncmpcpp/stable/ncmpcpp-0.8.1.tar.bz2
+_md5_=dac259eb97b030753266e30e39282711
diff --git a/metadata/md5-cache/media-sound/picard-1.4.2 b/metadata/md5-cache/media-sound/picard-1.4.2
index 0f4cecb88aa9..19f8c39a1d21 100644
--- a/metadata/md5-cache/media-sound/picard-1.4.2
+++ b/metadata/md5-cache/media-sound/picard-1.4.2
@@ -4,7 +4,7 @@ DESCRIPTION=A cross-platform music tagger
 EAPI=6
 HOMEPAGE=https://picard.musicbrainz.org
 IUSE=nls python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-2+
 RDEPEND=dev-python/PyQt4[X,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-qt/qtgui:4[accessibility] media-libs/mutagen 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://ftp.musicbrainz.org/pub/musicbrainz/picard/picard-1.4.2.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=37bd02fc8d736887a5680d60a95b674a
+_md5_=431a7e1cdec90ef1b32229d938902a56
diff --git a/metadata/md5-cache/media-sound/playerctl-0.5.0 b/metadata/md5-cache/media-sound/playerctl-0.5.0
index 925e92ff3c84..9f8475604832 100644
--- a/metadata/md5-cache/media-sound/playerctl-0.5.0
+++ b/metadata/md5-cache/media-sound/playerctl-0.5.0
@@ -4,10 +4,10 @@ DESCRIPTION=A CLI utility to control media players over MPRIS
 EAPI=6
 HOMEPAGE=https://github.com/acrisci/playerctl
 IUSE=doc
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-3+
 RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection
 SLOT=0
 SRC_URI=https://github.com/acrisci/playerctl/archive/v0.5.0.tar.gz -> playerctl-0.5.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f7b3a34e59277299cdbbfe5b0c50a1fb
+_md5_=845573991d212846c1097942330d3eaf
diff --git a/metadata/md5-cache/media-sound/qmmp-1.1.12 b/metadata/md5-cache/media-sound/qmmp-1.1.12
new file mode 100644
index 000000000000..08b809879a02
--- /dev/null
+++ b/metadata/md5-cache/media-sound/qmmp-1.1.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/taglib x11-libs/libX11 aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:5 ) enca? ( app-i18n/enca ) ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate media-sound/jack-audio-connection-kit ) ladspa? ( media-libs/ladspa-cmt ) mad? ( media-libs/libmad ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) modplug? ( >=media-libs/libmodplug-0.8.4 ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) projectm? ( dev-qt/qtgui:5[-gles2] dev-qt/qtopengl:5 media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) sndfile? ( media-libs/libsndfile ) sid? ( >=media-libs/libsidplayfp-1.1.0 ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Qt5-based audio player with winamp/xmms skins support
+EAPI=6
+HOMEPAGE=http://qmmp.ylsoftware.com
+IUSE=aac +alsa analyzer bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm pulseaudio qsui qtmedia scrobbler sid sndfile soxr stereo tray udisks +vorbis wavpack
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/taglib x11-libs/libX11 aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:5 ) enca? ( app-i18n/enca ) ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate media-sound/jack-audio-connection-kit ) ladspa? ( media-libs/ladspa-cmt ) mad? ( media-libs/libmad ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) modplug? ( >=media-libs/libmodplug-0.8.4 ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) projectm? ( dev-qt/qtgui:5[-gles2] dev-qt/qtopengl:5 media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) sndfile? ( media-libs/libsndfile ) sid? ( >=media-libs/libsidplayfp-1.1.0 ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack )
+REQUIRED_USE=gnome? ( dbus ) udisks? ( dbus )
+SLOT=0
+SRC_URI=http://qmmp.ylsoftware.com/files/qmmp-1.1.12.tar.bz2
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6e83dfe9b3afc5ba63001f278a186695
diff --git a/metadata/md5-cache/media-sound/qmmp-1.1.9 b/metadata/md5-cache/media-sound/qmmp-1.1.9
deleted file mode 100644
index bf65dfe172dc..000000000000
--- a/metadata/md5-cache/media-sound/qmmp-1.1.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/taglib x11-libs/libX11 aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:5 ) enca? ( app-i18n/enca ) ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate media-sound/jack-audio-connection-kit ) ladspa? ( media-libs/ladspa-cmt ) mad? ( media-libs/libmad ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) modplug? ( >=media-libs/libmodplug-0.8.4 ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) projectm? ( dev-qt/qtgui:5[-gles2] dev-qt/qtopengl:5 media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) sndfile? ( media-libs/libsndfile ) sid? ( >=media-libs/libsidplayfp-1.1.0 ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Qt5-based audio player with winamp/xmms skins support
-EAPI=6
-HOMEPAGE=http://qmmp.ylsoftware.com
-IUSE=aac +alsa analyzer bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm pulseaudio qsui qtmedia scrobbler sid sndfile soxr stereo tray udisks +vorbis wavpack
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/taglib x11-libs/libX11 aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:5 ) enca? ( app-i18n/enca ) ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate media-sound/jack-audio-connection-kit ) ladspa? ( media-libs/ladspa-cmt ) mad? ( media-libs/libmad ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) modplug? ( >=media-libs/libmodplug-0.8.4 ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) projectm? ( dev-qt/qtgui:5[-gles2] dev-qt/qtopengl:5 media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) sndfile? ( media-libs/libsndfile ) sid? ( >=media-libs/libsidplayfp-1.1.0 ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack )
-REQUIRED_USE=gnome? ( dbus ) udisks? ( dbus )
-SLOT=0
-SRC_URI=http://qmmp.ylsoftware.com/files/qmmp-1.1.9.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=6e83dfe9b3afc5ba63001f278a186695
diff --git a/metadata/md5-cache/media-sound/qsynth-0.4.4 b/metadata/md5-cache/media-sound/qsynth-0.4.4
index 835b0ed280b6..b7c05562d94c 100644
--- a/metadata/md5-cache/media-sound/qsynth-0.4.4
+++ b/metadata/md5-cache/media-sound/qsynth-0.4.4
@@ -4,11 +4,11 @@ DESCRIPTION=A Qt application to control FluidSynth
 EAPI=6
 HOMEPAGE=http://qsynth.sourceforge.net/
 IUSE=debug jack alsa pulseaudio
-KEYWORDS=~amd64 ppc ~x86
+KEYWORDS=~amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-sound/fluidsynth[jack?,alsa?,pulseaudio?] x11-libs/libX11
 REQUIRED_USE=|| ( alsa jack pulseaudio )
 SLOT=0
 SRC_URI=mirror://sourceforge/qsynth/qsynth-0.4.4.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=4b0dcfcc25eed664d2b64275e2607e38
+_md5_=5e1178855e1f3b1622dee7baa8558d69
diff --git a/metadata/md5-cache/media-sound/qtmpc-0.6.1 b/metadata/md5-cache/media-sound/qtmpc-0.6.1
deleted file mode 100644
index df0d2967d3fd..000000000000
--- a/metadata/md5-cache/media-sound/qtmpc-0.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.7.2 dev-util/automoc virtual/pkgconfig >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
-DESCRIPTION=Qt MPD client with a tree view music library interface
-EAPI=5
-HOMEPAGE=http://lowblog.nl/category/qtmpc/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
-SLOT=0
-SRC_URI=http://files.lowblog.nl/qtmpc/QtMPC-0.6.1.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7adf57c23728aeca763f5acaf9e9258d
diff --git a/metadata/md5-cache/media-sound/soundkonverter-3.0.1 b/metadata/md5-cache/media-sound/soundkonverter-3.0.1
index ad0cd29d74bf..b2ec0b6d6caf 100644
--- a/metadata/md5-cache/media-sound/soundkonverter-3.0.1
+++ b/metadata/md5-cache/media-sound/soundkonverter-3.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/solid-5.37.0:5 >=kde-apps/libkcddb-14.12.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5] >=media-libs/taglib-1.10 media-sound/cdparanoia >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://github.com/dfaust/soundkonverter/archive/v3.0.1.tar.gz -> soundkonverter-3.0.1.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e9da2b90a193e191aafb7cd3427b506d
diff --git a/metadata/md5-cache/media-sound/spotify-1.0.66 b/metadata/md5-cache/media-sound/spotify-1.0.66
new file mode 100644
index 000000000000..bbc0866edd5b
--- /dev/null
+++ b/metadata/md5-cache/media-sound/spotify-1.0.66
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=Spotify is a social music platform
+EAPI=6
+HOMEPAGE=https://www.spotify.com/ch-de/download/previews/
+IUSE=gnome pax_kernel pulseaudio
+KEYWORDS=~amd64 ~x86
+LICENSE=Spotify
+RDEPEND=dev-libs/nss gnome-base/gconf gnome-extra/zenity media-libs/alsa-lib media-libs/harfbuzz media-libs/fontconfig media-libs/mesa net-misc/curl[ssl,curl_ssl_openssl] net-print/cups[ssl] x11-libs/gtk+:2 x11-libs/libXScrnSaver x11-libs/libXtst dev-python/pygobject:3 dev-python/dbus-python pulseaudio? ( media-sound/pulseaudio ) gnome? ( gnome-extra/gnome-integration-spotify )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=amd64? ( http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.0.66.478.g1296534d-39_amd64.deb ) x86? ( http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.0.66.478.g1296534d-39_i386.deb )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=68ccb29dd6c2bed70d86a196718fc183
diff --git a/metadata/md5-cache/media-sound/tomahawk-0.9.0_pre20161029-r1 b/metadata/md5-cache/media-sound/tomahawk-0.9.0_pre20161029-r1
index 1fd97b92d908..3f5622e49f52 100644
--- a/metadata/md5-cache/media-sound/tomahawk-0.9.0_pre20161029-r1
+++ b/metadata/md5-cache/media-sound/tomahawk-0.9.0_pre20161029-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3 BSD
 RDEPEND=>=kde-frameworks/attica-5.37.0 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 app-crypt/qca:2[qt5] dev-cpp/lucene++ dev-cpp/sparsehash dev-libs/boost:= dev-libs/qtkeychain:=[qt5(+)] >=dev-libs/quazip-0.7.2[qt5] media-libs/liblastfm[qt5] >=media-libs/taglib-1.8.0 media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3] >=net-libs/gnutls-3.2:= x11-libs/libX11 hatchet? ( dev-cpp/websocketpp ) telepathy? ( net-libs/telepathy-qt[qt5(+)] ) xmpp? ( net-libs/jreen[qt5] ) app-crypt/qca:2[ssl] >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~johu/distfiles/tomahawk-0.9.0_pre20161029.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f75cc57a5162f78efda7d47124dea9dc
diff --git a/metadata/md5-cache/media-sound/tomahawk-9999 b/metadata/md5-cache/media-sound/tomahawk-9999
index b0fddcd5363f..460863776072 100644
--- a/metadata/md5-cache/media-sound/tomahawk-9999
+++ b/metadata/md5-cache/media-sound/tomahawk-9999
@@ -7,5 +7,5 @@ IUSE=+hatchet telepathy xmpp debug
 LICENSE=GPL-3 BSD
 RDEPEND=>=kde-frameworks/attica-5.37.0 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 app-crypt/qca:2[qt5] dev-cpp/lucene++ dev-cpp/sparsehash dev-libs/boost:= dev-libs/qtkeychain:=[qt5(+)] >=dev-libs/quazip-0.7.2[qt5] media-libs/liblastfm[qt5] >=media-libs/taglib-1.8.0 media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3] >=net-libs/gnutls-3.2:= x11-libs/libX11 hatchet? ( dev-cpp/websocketpp ) telepathy? ( net-libs/telepathy-qt[qt5(+)] ) xmpp? ( net-libs/jreen[qt5] ) app-crypt/qca:2[ssl] >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=0
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=656eb8966a37ecf728e28cccc87b26be
diff --git a/metadata/md5-cache/media-sound/waheela-0.3 b/metadata/md5-cache/media-sound/waheela-0.3
index cb76b346e19c..f81bb327efde 100644
--- a/metadata/md5-cache/media-sound/waheela-0.3
+++ b/metadata/md5-cache/media-sound/waheela-0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-sound/amarok:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=0
 SRC_URI=http://linux.wuertz.org/dists/sid/main/source/waheela_0.3.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5ca66de8b7453c8dc7e21da1e2fe289c
diff --git a/metadata/md5-cache/media-tv/kodi-17.3 b/metadata/md5-cache/media-tv/kodi-17.3
deleted file mode 100644
index 64d397bd91f0..000000000000
--- a/metadata/md5-cache/media-tv/kodi-17.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/libcdio gles? ( media-libs/mesa[gles2] ) libusb? ( virtual/libusb:1 ) media-fonts/corefonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.6:=[encode,postproc] ) mysql? ( virtual/mysql ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) X? ( x11-libs/libdrm x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/unzip app-arch/xz-utils app-arch/zip dev-lang/swig dev-libs/crossguid dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-1.5.1:= >=media-libs/libpng-1.6.26:0= test? ( dev-cpp/gtest ) virtual/pkgconfig x86? ( dev-lang/nasm ) java? ( virtual/jre ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Kodi is a free and open source media-player and entertainment hub
-EAPI=6
-HOMEPAGE=https://kodi.tv/ http://kodi.wiki/
-IUSE=airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf java python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/libcdio gles? ( media-libs/mesa[gles2] ) libusb? ( virtual/libusb:1 ) media-fonts/corefonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.6:=[encode,postproc] ) mysql? ( virtual/mysql ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) X? ( x11-libs/libdrm x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( || ( app-misc/lirc app-misc/inputlircd ) ) !media-tv/xbmc udisks? ( sys-fs/udisks:0 ) upower? ( systemd? ( sys-power/upower ) !systemd? ( || ( sys-power/upower-pm-utils sys-power/upower ) ) )
-REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) gles? ( X ) opengl? ( X ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
-SLOT=0
-SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/3.1.6-Krypton.tar.gz -> ffmpeg-kodi-3.1.6-Krypton.tar.gz ) https://github.com/xbmc/xbmc/archive/17.3-Krypton.tar.gz -> kodi-17.3.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.3-generated-addons.tar.xz )
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1d9dad79e001e17c02c0d8cf65bd3599
diff --git a/metadata/md5-cache/media-tv/kodi-17.4 b/metadata/md5-cache/media-tv/kodi-17.4
deleted file mode 100644
index a7fb7ae3e5fa..000000000000
--- a/metadata/md5-cache/media-tv/kodi-17.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/libcdio gles? ( media-libs/mesa[gles2] ) libusb? ( virtual/libusb:1 ) media-fonts/corefonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.9:=[encode,openssl,postproc] ) mysql? ( virtual/mysql ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) X? ( x11-libs/libdrm x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/unzip app-arch/xz-utils app-arch/zip dev-lang/swig dev-libs/crossguid dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-1.5.1:= >=media-libs/libpng-1.6.26:0= test? ( dev-cpp/gtest ) virtual/pkgconfig x86? ( dev-lang/nasm ) java? ( virtual/jre ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Kodi is a free and open source media-player and entertainment hub
-EAPI=6
-HOMEPAGE=https://kodi.tv/ http://kodi.wiki/
-IUSE=airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf java python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/libcdio gles? ( media-libs/mesa[gles2] ) libusb? ( virtual/libusb:1 ) media-fonts/corefonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.9:=[encode,openssl,postproc] ) mysql? ( virtual/mysql ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) X? ( x11-libs/libdrm x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( || ( app-misc/lirc app-misc/inputlircd ) ) !media-tv/xbmc udisks? ( sys-fs/udisks:0 ) upower? ( systemd? ( sys-power/upower ) !systemd? ( || ( sys-power/upower-pm-utils sys-power/upower ) ) )
-REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) gles? ( X ) opengl? ( X ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
-SLOT=0
-SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/3.1.9-Krypton-17.4.tar.gz -> ffmpeg-kodi-3.1.9-Krypton-17.4.tar.gz ) https://github.com/xbmc/xbmc/archive/17.4-Krypton.tar.gz -> kodi-17.4.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.4-generated-addons.tar.xz )
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=6f7e70092cc9d5d7fc107fbe7f631c89
diff --git a/metadata/md5-cache/media-tv/kodi-17.4-r1 b/metadata/md5-cache/media-tv/kodi-17.4-r1
deleted file mode 100644
index 1e990ef621a5..000000000000
--- a/metadata/md5-cache/media-tv/kodi-17.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) media-fonts/corefonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.9:=[encode,openssl,postproc] ) mysql? ( virtual/mysql ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) X? ( x11-libs/libdrm x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/unzip app-arch/xz-utils app-arch/zip dev-lang/swig dev-libs/crossguid dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-1.5.1:= >=media-libs/libpng-1.6.26:0= test? ( dev-cpp/gtest ) virtual/pkgconfig x86? ( dev-lang/nasm ) java? ( virtual/jre ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Kodi is a free and open source media-player and entertainment hub
-EAPI=6
-HOMEPAGE=https://kodi.tv/ http://kodi.wiki/
-IUSE=airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles lcms libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf java python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) media-fonts/corefonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.9:=[encode,openssl,postproc] ) mysql? ( virtual/mysql ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) X? ( x11-libs/libdrm x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( || ( app-misc/lirc app-misc/inputlircd ) ) !media-tv/xbmc udisks? ( sys-fs/udisks:0 ) upower? ( systemd? ( sys-power/upower ) !systemd? ( || ( sys-power/upower-pm-utils sys-power/upower ) ) )
-REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) gles? ( X ) opengl? ( X ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
-SLOT=0
-SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/3.1.9-Krypton-17.4.tar.gz -> ffmpeg-kodi-3.1.9-Krypton-17.4.tar.gz ) https://github.com/xbmc/xbmc/archive/17.4-Krypton.tar.gz -> kodi-17.4.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.4-generated-addons.tar.xz )
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=07f9fff9f7aa5088b21d5e712cfc6e50
diff --git a/metadata/md5-cache/media-tv/kodi-17.5-r1 b/metadata/md5-cache/media-tv/kodi-17.5-r1
new file mode 100644
index 000000000000..f99659789cee
--- /dev/null
+++ b/metadata/md5-cache/media-tv/kodi-17.5-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) media-fonts/corefonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( virtual/mysql ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) X? ( x11-libs/libdrm x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/unzip app-arch/xz-utils app-arch/zip dev-lang/swig dev-libs/crossguid dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-1.5.1:= >=media-libs/libpng-1.6.26:0= test? ( dev-cpp/gtest ) virtual/pkgconfig x86? ( dev-lang/nasm ) java? ( virtual/jre ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Kodi is a free and open source media-player and entertainment hub
+EAPI=6
+HOMEPAGE=https://kodi.tv/ http://kodi.wiki/
+IUSE=airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles lcms libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf java python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) media-fonts/corefonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( virtual/mysql ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) X? ( x11-libs/libdrm x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( || ( app-misc/lirc app-misc/inputlircd ) ) !media-tv/xbmc udisks? ( sys-fs/udisks:0 ) upower? ( systemd? ( sys-power/upower ) !systemd? ( || ( sys-power/upower-pm-utils sys-power/upower ) ) )
+REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) gles? ( X ) opengl? ( X ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
+SLOT=0
+SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz -> ffmpeg-kodi-3.1.11-Krypton-17.5.tar.gz ) https://github.com/xbmc/xbmc/archive/17.5-Krypton.tar.gz -> kodi-17.5.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.5-generated-addons.tar.xz )
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=62aa24609ea1c850055cb3c441400f05
diff --git a/metadata/md5-cache/media-tv/kodi-9999 b/metadata/md5-cache/media-tv/kodi-9999
index ebd595283896..33efda6b1f52 100644
--- a/metadata/md5-cache/media-tv/kodi-9999
+++ b/metadata/md5-cache/media-tv/kodi-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.0.1 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-libs/libcdio-0.94 dev-libs/libfmt gbm? ( media-libs/mesa[gbm] ) gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) media-fonts/corefonts >=media-fonts/noto-20160531 media-fonts/roboto >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.8 >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.4:=[encode,openssl,postproc] ) mysql? ( virtual/mysql ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva[egl] opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( dev-cpp/waylandpp media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 x11-libs/libxkbcommon ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/xz-utils dev-lang/swig dev-libs/crossguid dev-libs/rapidjson dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-1.5.1:= >=media-libs/libpng-1.6.26:0= test? ( dev-cpp/gtest ) virtual/pkgconfig x86? ( dev-lang/nasm ) virtual/jre >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.0.1 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-libs/libcdio-0.94 dev-libs/libfmt gbm? ( media-libs/mesa[gbm] ) gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) media-fonts/corefonts >=media-fonts/noto-20160531 media-fonts/roboto >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.8 >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.4:=[encode,openssl,postproc] ) mysql? ( virtual/mysql ) >=net-misc/curl-7.56.1 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva[egl] opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( dev-cpp/waylandpp media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 x11-libs/libxkbcommon ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/xz-utils dev-lang/swig dev-libs/crossguid dev-libs/rapidjson dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-1.5.1:= >=media-libs/libpng-1.6.26:0= test? ( dev-cpp/gtest ) virtual/pkgconfig x86? ( dev-lang/nasm ) virtual/jre >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Kodi is a free and open source media-player and entertainment hub
 EAPI=6
 HOMEPAGE=https://kodi.tv/ http://kodi.wiki/
 IUSE=airplay alsa bluetooth bluray caps cec +css dbus debug dvd gbm gles lcms libressl libusb lirc mysql nfs +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf python_targets_python2_7
 LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.0.1 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-libs/libcdio-0.94 dev-libs/libfmt gbm? ( media-libs/mesa[gbm] ) gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) media-fonts/corefonts >=media-fonts/noto-20160531 media-fonts/roboto >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.8 >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.4:=[encode,openssl,postproc] ) mysql? ( virtual/mysql ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva[egl] opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( dev-cpp/waylandpp media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 x11-libs/libxkbcommon ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( || ( app-misc/lirc app-misc/inputlircd ) ) !media-tv/xbmc udisks? ( sys-fs/udisks:0 ) upower? ( systemd? ( sys-power/upower ) !systemd? ( || ( sys-power/upower-pm-utils sys-power/upower ) ) )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.0.1 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-libs/libcdio-0.94 dev-libs/libfmt gbm? ( media-libs/mesa[gbm] ) gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) media-fonts/corefonts >=media-fonts/noto-20160531 media-fonts/roboto >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.8 >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.4:=[encode,openssl,postproc] ) mysql? ( virtual/mysql ) >=net-misc/curl-7.56.1 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva[egl] opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( dev-cpp/waylandpp media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 x11-libs/libxkbcommon ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( || ( app-misc/lirc app-misc/inputlircd ) ) !media-tv/xbmc udisks? ( sys-fs/udisks:0 ) upower? ( systemd? ( sys-power/upower ) !systemd? ( || ( sys-power/upower-pm-utils sys-power/upower ) ) )
 REQUIRED_USE=python_targets_python2_7 gbm? ( gles ) || ( gles opengl ) ^^ ( gbm wayland X ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/3.4-Leia-Alpha-1.tar.gz -> ffmpeg-kodi-3.4-Leia-Alpha-1.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=3e520b94a77fb7e30389436684b8dfd1
+_md5_=1fd060fdaac312ac38aa40266611060c
diff --git a/metadata/md5-cache/media-video/avidemux-2.6.8 b/metadata/md5-cache/media-video/avidemux-2.6.8
deleted file mode 100644
index ea62b9e8606f..000000000000
--- a/metadata/md5-cache/media-video/avidemux-2.6.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~media-libs/avidemux-core-2.6.8:2.6[nls?,sdl?,vaapi?,vdpau?,video_cards_fglrx?,xv?] opengl? ( virtual/opengl:0 ) qt4? ( >=dev-qt/qtgui-4.8.3:4 ) vaapi? ( x11-libs/libva:0 ) video_cards_fglrx? ( || ( >=x11-drivers/ati-drivers-14.12-r3 x11-libs/xvba-video:0 ) ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Video editor designed for simple cutting, filtering and encoding tasks
-EAPI=5
-HOMEPAGE=http://fixounet.free.fr/avidemux
-IUSE=debug opengl nls qt4 sdl vaapi vdpau video_cards_fglrx xv linguas_ca linguas_cs linguas_de linguas_el linguas_es linguas_fr linguas_it linguas_ja linguas_pt_BR linguas_ru linguas_sr linguas_sr@latin linguas_tr
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-1 GPL-2 MIT PSF-2 public-domain
-PDEPEND=~media-libs/avidemux-plugins-2.6.8:2.6[opengl?,qt4?]
-RDEPEND=~media-libs/avidemux-core-2.6.8:2.6[nls?,sdl?,vaapi?,vdpau?,video_cards_fglrx?,xv?] opengl? ( virtual/opengl:0 ) qt4? ( >=dev-qt/qtgui-4.8.3:4 ) vaapi? ( x11-libs/libva:0 ) video_cards_fglrx? ( || ( >=x11-drivers/ati-drivers-14.12-r3 x11-libs/xvba-video:0 ) )
-SLOT=2.6
-SRC_URI=mirror://sourceforge/avidemux/avidemux/2.6.8/avidemux_2.6.8.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	l10n	2c2e15383ba891d642f51896a7f0ecfe	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8e0015212abe8026c09ad26b89bab697
diff --git a/metadata/md5-cache/media-video/dvgrab-3.5-r1 b/metadata/md5-cache/media-video/dvgrab-3.5-r1
index fee21a43fd59..64c88a6a5692 100644
--- a/metadata/md5-cache/media-video/dvgrab-3.5-r1
+++ b/metadata/md5-cache/media-video/dvgrab-3.5-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Digital Video (DV) grabber for GNU/Linux
 EAPI=6
 HOMEPAGE=http://www.kinodv.org/
 IUSE=jpeg quicktime
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/libraw1394-1.1 >=media-libs/libdv-0.103 >=media-libs/libiec61883-1 >=sys-libs/libavc1394-0.5.1 jpeg? ( virtual/jpeg:0 ) quicktime? ( media-libs/libquicktime )
 SLOT=0
 SRC_URI=mirror://sourceforge/kino/dvgrab-3.5.tar.gz
-_md5_=44ac882d0c4773401c599fad9285fb33
+_md5_=edd43b3c84523119bdea150a3a4f3a38
diff --git a/metadata/md5-cache/media-video/ffmpeg-3.3.4 b/metadata/md5-cache/media-video/ffmpeg-3.3.4
index 1a8cc8796fbd..5bfdd7e9ac8e 100644
--- a/metadata/md5-cache/media-video/ffmpeg-3.3.4
+++ b/metadata/md5-cache/media-video/ffmpeg-3.3.4
@@ -4,7 +4,7 @@ DESCRIPTION=Complete solution to record, convert and stream audio and video. Inc
 EAPI=6
 HOMEPAGE=http://ffmpeg.org/
 IUSE=alsa chromium doc +encode jack oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt gnutls gmp +gpl +hardcoded-tables +iconv lzma +network openssl +postproc samba sdl sdl vaapi vdpau X xcb xcb xcb +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio amr amr fdk jpeg2k bluray celt gme gsm mmal modplug opus libilbc librtmp ssh schroedinger speex vorbis vpx zvbi bs2b chromaprint flite frei0r fribidi fontconfig ladspa libass truetype rubberband sofalizer zeromq zimg libsoxr +threads amrenc mp3 kvazaar nvenc openh264 snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) celt? ( >=media-libs/celt-0.11.1-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(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( media-libs/kvazaar[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(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( media-video/nvidia_video_sdk ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.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(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-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(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-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(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sofalizer? ( >=sci-libs/netcdf-4.3.2-r1[hdf5] >=sci-libs/hdf5-1.8.18[hl] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-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(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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/libXv-1.0.10[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(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[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(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.4:=[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(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
@@ -12,4 +12,4 @@ RESTRICT=gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
 SLOT=0/55.57.57
 SRC_URI=http://ffmpeg.org/releases/ffmpeg-3.3.4.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=79a52b79a1030c03de7c7cb44b2888fc
+_md5_=ee45b713d95b4ac507842c8d1de1e101
diff --git a/metadata/md5-cache/media-video/kaffeine-2.0.12 b/metadata/md5-cache/media-video/kaffeine-2.0.12
index 959959def191..b2cbc34111b0 100644
--- a/metadata/md5-cache/media-video/kaffeine-2.0.12
+++ b/metadata/md5-cache/media-video/kaffeine-2.0.12
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.3 )
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/solid-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/libv4l media-video/vlc[X] x11-libs/libXScrnSaver !media-video/kaffeine:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kaffeine/2.0.12/src/kaffeine-2.0.12.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=15e43d23f516ca1a08c4b758d4bd5eb7
diff --git a/metadata/md5-cache/media-video/kaffeine-2.0.12.1 b/metadata/md5-cache/media-video/kaffeine-2.0.12.1
index d4aca30cb335..22d9d99b8e34 100644
--- a/metadata/md5-cache/media-video/kaffeine-2.0.12.1
+++ b/metadata/md5-cache/media-video/kaffeine-2.0.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.3 )
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/solid-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/libv4l media-video/vlc[X] x11-libs/libXScrnSaver !media-video/kaffeine:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kaffeine/2.0.12/src/kaffeine-2.0.12.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ecea70b91fabc0d5cd8fcb7db1168283
diff --git a/metadata/md5-cache/media-video/kaffeine-2.0.13 b/metadata/md5-cache/media-video/kaffeine-2.0.13
index ac479912cbf0..8e35554ff0e7 100644
--- a/metadata/md5-cache/media-video/kaffeine-2.0.13
+++ b/metadata/md5-cache/media-video/kaffeine-2.0.13
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.3 )
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/solid-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/libv4l media-video/vlc[X] x11-libs/libXScrnSaver !media-video/kaffeine:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kaffeine/kaffeine-2.0.13.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fc957f9c17c211ae218fce08d32d8f62
diff --git a/metadata/md5-cache/media-video/kaffeine-2.0.9 b/metadata/md5-cache/media-video/kaffeine-2.0.9
index 9e5a02337cfd..6f906aeed5b7 100644
--- a/metadata/md5-cache/media-video/kaffeine-2.0.9
+++ b/metadata/md5-cache/media-video/kaffeine-2.0.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.3 )
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/solid-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/libv4l media-video/vlc[X] x11-libs/libXScrnSaver !media-video/kaffeine:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kaffeine/2.0.9/src/kaffeine-2.0.9.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=22fedca7a0dd11b3dc6711b697d3b68d
diff --git a/metadata/md5-cache/media-video/kamerka-0.12_p20161002 b/metadata/md5-cache/media-video/kamerka-0.12_p20161002
index 1db212000009..e03d87e942e4 100644
--- a/metadata/md5-cache/media-video/kamerka-0.12_p20161002
+++ b/metadata/md5-cache/media-video/kamerka-0.12_p20161002
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0 >=kde-frameworks/kconfig-5.37.0 >=kde-frameworks/kconfigwidgets-5.37.0 >=kde-frameworks/kcoreaddons-5.37.0 >=kde-frameworks/kdeclarative-5.37.0 >=kde-frameworks/kdelibs4support-5.37.0 >=kde-frameworks/ki18n-5.37.0 >=kde-frameworks/kio-5.37.0 >=kde-frameworks/knotifications-5.37.0 >=kde-frameworks/kwidgetsaddons-5.37.0 >=kde-frameworks/kxmlgui-5.37.0 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/libv4l media-libs/phonon[qt5(+)] media-libs/qimageblitz[qt5] >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=0
 SRC_URI=https://github.com/dos1/kamerka/archive/a201df47a0849a09a20617fedfee26a407dc847c.tar.gz -> kamerka-0.12_p20161002.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=56b699d90f0c5bb33b7368f255e4058c
diff --git a/metadata/md5-cache/media-video/kamoso-3.2.4 b/metadata/md5-cache/media-video/kamoso-3.2.4
index fa8dac5ad645..b54a3bfc50ed 100644
--- a/metadata/md5-cache/media-video/kamoso-3.2.4
+++ b/metadata/md5-cache/media-video/kamoso-3.2.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/purpose:5 media-libs/qt-gstreamer[qt5(+)] virtual/libudev:= media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l] >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kamoso/3.2/src/kamoso-3.2.4.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=64b7af3691f7026b44b6b269df6401e6
diff --git a/metadata/md5-cache/media-video/kmplayer-0.12.0b b/metadata/md5-cache/media-video/kmplayer-0.12.0b
index 09d53c28a0f1..d835f39363fc 100644
--- a/metadata/md5-cache/media-video/kmplayer-0.12.0b
+++ b/metadata/md5-cache/media-video/kmplayer-0.12.0b
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2 LGPL-2.1
 RDEPEND=>=kde-frameworks/kbookmarks-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kmediaplayer-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libxcb cairo? ( x11-libs/cairo[xcb] ) npp? ( dev-libs/dbus-glib dev-libs/glib:2 www-plugins/adobe-flash:* >=x11-libs/gtk+-2.10.14:2 ) media-video/mplayer !media-video/kmplayer:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kmplayer//kmplayer-0.12.0b.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1184600c69045fa35da886537b332fc9
diff --git a/metadata/md5-cache/media-video/loopy-0.5.3 b/metadata/md5-cache/media-video/loopy-0.5.3
index 37302ed105d2..b3de957bd303 100644
--- a/metadata/md5-cache/media-video/loopy-0.5.3
+++ b/metadata/md5-cache/media-video/loopy-0.5.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[l10n_cs(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[l10n_de(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hu(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt-BR(+)] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4
 SRC_URI=http://www.kde-apps.org/CONTENT/content-files/120880-loopy_0.5.3.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7f7c7aed94f81e30186d0685f95be506
diff --git a/metadata/md5-cache/media-video/makemkv-1.10.7 b/metadata/md5-cache/media-video/makemkv-1.10.7
deleted file mode 100644
index 677019d93370..000000000000
--- a/metadata/md5-cache/media-video/makemkv-1.10.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst
-DEPEND=sys-libs/glibc[multilib?] dev-libs/expat dev-libs/openssl:0[-bindist(-)] sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !qt5? ( qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 ) ) !libav? ( >=media-video/ffmpeg-1.0.0:0= ) libav? ( >=media-video/libav-0.8.9:0= ) >=sys-apps/sed-4
-DESCRIPTION=Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs
-EAPI=6
-HOMEPAGE=http://www.makemkv.com/
-IUSE=libav multilib qt4 qt5
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl
-RDEPEND=sys-libs/glibc[multilib?] dev-libs/expat dev-libs/openssl:0[-bindist(-)] sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !qt5? ( qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 ) ) !libav? ( >=media-video/ffmpeg-1.0.0:0= ) libav? ( >=media-video/libav-0.8.9:0= ) net-misc/wget
-SLOT=0
-SRC_URI=http://www.makemkv.com/download/makemkv-oss-1.10.7.tar.gz http://www.makemkv.com/download/makemkv-bin-1.10.7.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4f10316268c8660f0fb614f2170488ef
diff --git a/metadata/md5-cache/media-video/makemkv-1.10.7-r1 b/metadata/md5-cache/media-video/makemkv-1.10.7-r1
new file mode 100644
index 000000000000..7f7085d6efd8
--- /dev/null
+++ b/metadata/md5-cache/media-video/makemkv-1.10.7-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst
+DEPEND=sys-libs/glibc[multilib?] dev-libs/expat dev-libs/openssl:0[-bindist(-)] sys-libs/zlib gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !libav? ( >=media-video/ffmpeg-1.0.0:0= ) libav? ( >=media-video/libav-0.8.9:0= ) >=sys-apps/sed-4
+DESCRIPTION=Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs
+EAPI=6
+HOMEPAGE=http://www.makemkv.com/
+IUSE=+gui libav multilib
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl
+RDEPEND=sys-libs/glibc[multilib?] dev-libs/expat dev-libs/openssl:0[-bindist(-)] sys-libs/zlib gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !libav? ( >=media-video/ffmpeg-1.0.0:0= ) libav? ( >=media-video/libav-0.8.9:0= ) net-misc/wget
+SLOT=0
+SRC_URI=http://www.makemkv.com/download/makemkv-oss-1.10.7.tar.gz http://www.makemkv.com/download/makemkv-bin-1.10.7.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f358acea772f7e3435d5f4520123f2eb
diff --git a/metadata/md5-cache/media-video/mplayer-1.3.0-r3 b/metadata/md5-cache/media-video/mplayer-1.3.0-r3
index 5731a045969e..d5dda1693a7b 100644
--- a/metadata/md5-cache/media-video/mplayer-1.3.0-r3
+++ b/metadata/md5-cache/media-video/mplayer-1.3.0-r3
@@ -4,7 +4,7 @@ DESCRIPTION=Media Player for Linux
 EAPI=5
 HOMEPAGE=http://www.mplayerhq.hu/
 IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray bs2b cddb +cdio cdparanoia cpudetection debug dga directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon ftp gif ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa +libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas +network nut openal opengl +osdmenu oss png pnm pulseaudio pvr radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3 tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran video_cards_s3virge video_cards_mga video_cards_tdfx
-KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= app-arch/bzip2 sys-libs/zlib >=media-video/ffmpeg-3.0:0=[vdpau?] a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1:= ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 ) dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gif? ( media-libs/giflib:0= ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:= ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) nut? ( >=media-libs/libnut-661 ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( virtual/ttf-fonts media-libs/fontconfig >=media-libs/freetype-2.2.1:2 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) selinux? ( sec-policy/selinux-mplayer )
 REQUIRED_USE=dga? ( X ) dvdnav? ( dvd ) enca? ( iconv ) ggi? ( X ) libass? ( truetype ) opengl? ( X ) osdmenu? ( X ) truetype? ( iconv ) vdpau? ( X ) vidix? ( X ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X ) xvmc? ( xv )
@@ -12,4 +12,4 @@ RESTRICT=faac? ( bindist )
 SLOT=0
 SRC_URI=mirror://mplayer/releases/MPlayer-1.3.0.tar.xz !truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
 _eclasses_=base	df2aa567b3f0595aae0d0923889f7631	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=54250fec238d5441e46710409a385a7f
+_md5_=63066241b77707be3ed754be81f33f1c
diff --git a/metadata/md5-cache/media-video/obs-studio-18.0.2 b/metadata/md5-cache/media-video/obs-studio-18.0.2
deleted file mode 100644
index 42be71b2907f..000000000000
--- a/metadata/md5-cache/media-video/obs-studio-18.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] net-misc/curl x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) imagemagick? ( || ( <media-gfx/imagemagick-7 ( >=media-gfx/imagemagick-7 >=dev-util/cmake-3.9 ) ) ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
-DESCRIPTION=Software for Recording and Streaming Live Video Content
-EAPI=6
-HOMEPAGE=https://obsproject.com
-IUSE=+alsa fdk imagemagick jack pulseaudio truetype v4l
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] net-misc/curl x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l )
-SLOT=0
-SRC_URI=https://github.com/jp9000/obs-studio/archive/18.0.2.tar.gz -> obs-studio-18.0.2.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4145708cdd62fe1da11055a081f40683
diff --git a/metadata/md5-cache/media-video/obs-studio-20.1.0 b/metadata/md5-cache/media-video/obs-studio-20.1.0
new file mode 100644
index 000000000000..17ac77406d22
--- /dev/null
+++ b/metadata/md5-cache/media-video/obs-studio-20.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] net-misc/curl x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) imagemagick? ( || ( <media-gfx/imagemagick-7 ( >=media-gfx/imagemagick-7 >=dev-util/cmake-3.9 ) ) ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DESCRIPTION=Software for Recording and Streaming Live Video Content
+EAPI=6
+HOMEPAGE=https://obsproject.com
+IUSE=+alsa fdk imagemagick jack pulseaudio truetype v4l
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg:=[x264] net-misc/curl x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l )
+SLOT=0
+SRC_URI=https://github.com/jp9000/obs-studio/archive/20.1.0.tar.gz -> obs-studio-20.1.0.tar.gz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=904e3e1e9d78e2bde637a9dba3e73f5b
diff --git a/metadata/md5-cache/media-video/pitivi-0.98.1 b/metadata/md5-cache/media-video/pitivi-0.98.1
index c0bf4531c39d..69411111732f 100644
--- a/metadata/md5-cache/media-video/pitivi-0.98.1
+++ b/metadata/md5-cache/media-video/pitivi-0.98.1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[sqlite] ) python_s
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pitivi/0.98/pitivi-0.98.1.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	958769e8b8b5a79afc3f22f3915cebbc	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	38757afcd8d9f0d1d44ba4cefc33b99d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
 _md5_=2ef3f39092f64f7389389dc635650d31
diff --git a/metadata/md5-cache/media-video/plasma-mediacenter-5.7.5 b/metadata/md5-cache/media-video/plasma-mediacenter-5.7.5
index 325b6988eecf..01add1d4d387 100644
--- a/metadata/md5-cache/media-video/plasma-mediacenter-5.7.5
+++ b/metadata/md5-cache/media-video/plasma-mediacenter-5.7.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdeclarative-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/plasma-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/taglib semantic-desktop? ( >=kde-frameworks/baloo-5.37.0:5 >=kde-frameworks/kfilemetadata-5.37.0:5 ) >=kde-plasma/plasma-workspace-5.10.5:5 >=dev-qt/qtmultimedia-5.7.1:5[qml] !media-video/plasma-mediacenter:0 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma-mediacenter/5.7.5/plasma-mediacenter-5.7.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ce1fb81930d6da291322b3e379cf312a
diff --git a/metadata/md5-cache/media-video/subtitlecomposer-0.6.4 b/metadata/md5-cache/media-video/subtitlecomposer-0.6.4
index fee673aa231d..b844a841570e 100644
--- a/metadata/md5-cache/media-video/subtitlecomposer-0.6.4
+++ b/metadata/md5-cache/media-video/subtitlecomposer-0.6.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!media-video/subtitlecomposer:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://github.com/maxrd2/subtitlecomposer/archive/v0.6.4.tar.gz -> subtitlecomposer-0.6.4.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=763c238fbce676f56e804b9ba2379704
diff --git a/metadata/md5-cache/media-video/syncplay-1.4.0 b/metadata/md5-cache/media-video/syncplay-1.4.0
index 787e61536f5d..23e9b631e5b5 100644
--- a/metadata/md5-cache/media-video/syncplay-1.4.0
+++ b/metadata/md5-cache/media-video/syncplay-1.4.0
@@ -3,11 +3,11 @@ DESCRIPTION=Client/server to synchronize media playback
 EAPI=6
 HOMEPAGE=http://syncplay.pl
 IUSE=+client +server gui vlc python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+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(-)] || ( >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gui? ( dev-python/pyside[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) vlc? ( media-video/vlc[lua] )
 REQUIRED_USE=vlc? ( client ) gui? ( client ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/Syncplay/syncplay/archive/v1.4.0.tar.gz -> syncplay-1.4.0.tar.gz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=9b3a541dcbc252182e1b616c7d8b0f30
+_md5_=3dc27f3122d2596029c3a65d3f8ea203
diff --git a/metadata/md5-cache/net-analyzer/arpwatch-2.1.15-r10 b/metadata/md5-cache/net-analyzer/arpwatch-2.1.15-r10
new file mode 100644
index 000000000000..4d74c2f0c4f8
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/arpwatch-2.1.15-r10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=net-libs/libpcap sys-libs/ncurses:*
+DESCRIPTION=An ethernet monitor program that keeps track of ethernet/IP address pairings
+EAPI=6
+HOMEPAGE=http://ee.lbl.gov/
+IUSE=selinux
+KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd
+LICENSE=BSD GPL-2
+RDEPEND=net-libs/libpcap sys-libs/ncurses:* selinux? ( sec-policy/selinux-arpwatch )
+SLOT=0
+SRC_URI=ftp://ftp.ee.lbl.gov/arpwatch-2.1a15.tar.gz https://dev.gentoo.org/~jer/arpwatch-patchset-0.8.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3cbf733b8fa343acb60ae6129656f597
diff --git a/metadata/md5-cache/net-analyzer/cacti-1.1.20 b/metadata/md5-cache/net-analyzer/cacti-1.1.20
index 13e5c8361ebd..31d732b0956e 100644
--- a/metadata/md5-cache/net-analyzer/cacti-1.1.20
+++ b/metadata/md5-cache/net-analyzer/cacti-1.1.20
@@ -4,10 +4,10 @@ DESCRIPTION=Cacti is a complete frontend to rrdtool
 EAPI=6
 HOMEPAGE=https://www.cacti.net/
 IUSE=snmp doc vhosts
-KEYWORDS=alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/php[cli,mysql,session,sockets,xml] dev-php/adodb net-analyzer/rrdtool[graph] virtual/cron virtual/mysql snmp? ( >=net-analyzer/net-snmp-5.2.0 ) >=app-admin/webapp-config-1.50.15
 SLOT=1.1.20
 SRC_URI=https://www.cacti.net/downloads/cacti-1.1.20.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=5a2fbe825d9f6c0947202143f27a3d7a
+_md5_=ad820feac5b5713100f7f99fc9245a92
diff --git a/metadata/md5-cache/net-analyzer/cacti-spine-1.1.20 b/metadata/md5-cache/net-analyzer/cacti-spine-1.1.20
index b3bff4678ac8..0bd436e19908 100644
--- a/metadata/md5-cache/net-analyzer/cacti-spine-1.1.20
+++ b/metadata/md5-cache/net-analyzer/cacti-spine-1.1.20
@@ -3,10 +3,10 @@ DEPEND=dev-libs/openssl:* net-analyzer/net-snmp virtual/mysql sys-apps/help2man
 DESCRIPTION=Spine is a fast poller for Cacti (formerly known as Cactid)
 EAPI=6
 HOMEPAGE=https://cacti.net/spine_info.php
-KEYWORDS=alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/openssl:* net-analyzer/net-snmp virtual/mysql >net-analyzer/cacti-0.8.8
 SLOT=0
 SRC_URI=https://www.cacti.net/downloads/spine/cacti-spine-1.1.20.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=cefd0ecc4d01ffa1e55eff5b449b23ab
+_md5_=9d5bc44874a30656f8359f28b6fd1c77
diff --git a/metadata/md5-cache/net-analyzer/hexinject-1.6 b/metadata/md5-cache/net-analyzer/hexinject-1.6
new file mode 100644
index 000000000000..6b715fd4f4eb
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/hexinject-1.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=net-libs/libpcap
+DESCRIPTION=Network packet sniffer and injector
+EAPI=6
+HOMEPAGE=http://hexinject.sourceforge.net/
+IUSE=+tools experimental
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=net-libs/libpcap experimental? ( dev-lang/tcl )
+SLOT=0
+SRC_URI=http://downloads.sourceforge.net/project/hexinject/hexinject-1.6/hexinject-1.6.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=7580ba65f90beb5b64bda5ee93598387
diff --git a/metadata/md5-cache/net-analyzer/hexinject-1.6-r1 b/metadata/md5-cache/net-analyzer/hexinject-1.6-r1
new file mode 100644
index 000000000000..72a3db4f4a52
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/hexinject-1.6-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=net-libs/libpcap
+DESCRIPTION=Network packet sniffer and injector
+EAPI=6
+HOMEPAGE=http://hexinject.sourceforge.net/
+IUSE=+tools experimental
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=net-libs/libpcap experimental? ( dev-lang/tcl )
+SLOT=0
+SRC_URI=mirror://sourceforge/hexinject/hexinject-1.6.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=ecb5cbe9733f4273e13be40281db732f
diff --git a/metadata/md5-cache/net-analyzer/ifstatus-1.1.0-r2 b/metadata/md5-cache/net-analyzer/ifstatus-1.1.0-r2
index 1adde3ea5247..bb29677ba9d7 100644
--- a/metadata/md5-cache/net-analyzer/ifstatus-1.1.0-r2
+++ b/metadata/md5-cache/net-analyzer/ifstatus-1.1.0-r2
@@ -3,10 +3,10 @@ DEPEND=>=sys-libs/ncurses-4.2:0= virtual/pkgconfig
 DESCRIPTION=A simple CLI program for displaying network statistics in real time
 EAPI=6
 HOMEPAGE=http://ifstatus.sourceforge.net/
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-4.2:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/ifstatus/ifstatus-v1.1.0.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=5946a875a8cc2c6645c7272da6f66eaf
+_md5_=5941fe9b92137de9ae6e8c3c6321ebb0
diff --git a/metadata/md5-cache/net-analyzer/monitoring-plugins-2.2-r2 b/metadata/md5-cache/net-analyzer/monitoring-plugins-2.2-r2
new file mode 100644
index 000000000000..a35410414b3c
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/monitoring-plugins-2.2-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure postinst preinst
+DEPEND=dev-lang/perl ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls ) ) radius? ( net-dialup/freeradius-client ) dns? ( net-dns/bind-tools ) game? ( games-util/qstat ) fping? ( net-analyzer/fping ) samba? ( net-fs/samba ) ssh? ( net-misc/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] )
+DESCRIPTION=50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu
+EAPI=6
+HOMEPAGE=https://www.monitoring-plugins.org/
+IUSE=gnutls ipv6 ldap libressl mysql dns fping game postgres radius samba snmp ssh +ssl
+KEYWORDS=~amd64 ~arm ~arm64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=dev-lang/perl ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls ) ) radius? ( net-dialup/freeradius-client ) dns? ( net-dns/bind-tools ) game? ( games-util/qstat ) fping? ( net-analyzer/fping ) samba? ( net-fs/samba ) ssh? ( net-misc/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] ) !net-analyzer/nagios-plugins
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.monitoring-plugins.org/download/monitoring-plugins-2.2.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
+_md5_=022671b032df743814fc0d4ed3e3abe7
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.34 b/metadata/md5-cache/net-analyzer/munin-2.0.34
new file mode 100644
index 000000000000..f8c11603f3d7
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.34
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare setup test
+DEPEND=dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) dev-perl/Module-Build java? ( >=virtual/jdk-1.5 ) test? ( dev-perl/Test-Deep dev-perl/Test-LongString dev-perl/Test-Differences dev-perl/Test-MockModule dev-perl/Test-MockObject dev-perl/File-Slurp dev-perl/IO-stringy dev-perl/IO-Socket-INET6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=Munin Server Monitoring Tool
+EAPI=6
+HOMEPAGE=http://munin-monitoring.org/
+IUSE=asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2 elibc_FreeBSD java
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.5 || ( net-analyzer/netcat6 net-analyzer/netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) selinux? ( sec-policy/selinux-munin ) !<sys-apps/openrc-0.11.8 java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=cgi? ( !minimal ) apache2? ( cgi )
+SLOT=0
+SRC_URI=https://github.com/munin-monitoring/munin/archive/2.0.34.tar.gz -> munin-2.0.34.tar.gz https://dev.gentoo.org/~graaff/munin/munin-2.0.34-gentoo-1.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8e4ddc7ccb05212427e259e98cd7ca85
diff --git a/metadata/md5-cache/net-analyzer/nagios-plugins-2.2.1-r2 b/metadata/md5-cache/net-analyzer/nagios-plugins-2.2.1-r2
new file mode 100644
index 000000000000..fc8eefba3374
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nagios-plugins-2.2.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure postinst preinst prepare
+DEPEND=dev-lang/perl ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) radius? ( net-dialup/freeradius-client ) nagios-dns? ( net-dns/bind-tools ) nagios-game? ( games-util/qstat ) nagios-ping? ( net-analyzer/fping ) samba? ( net-fs/samba ) ssh? ( net-misc/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] )
+DESCRIPTION=Official plugins for Nagios
+EAPI=6
+HOMEPAGE=http://nagios-plugins.org/
+IUSE=ipv6 ldap libressl mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) radius? ( net-dialup/freeradius-client ) nagios-dns? ( net-dns/bind-tools ) nagios-game? ( games-util/qstat ) nagios-ping? ( net-analyzer/fping ) samba? ( net-fs/samba ) ssh? ( net-misc/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] ) !net-analyzer/monitoring-plugins selinux? ( sec-policy/selinux-nagios )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://nagios-plugins.org/download/nagios-plugins-2.2.1.tar.gz
+_eclasses_=user	e4b567c44272a719fabf53f0f885d3f7
+_md5_=5ba26a4da11de286c8f155ad4f482c11
diff --git a/metadata/md5-cache/net-analyzer/pmacct-1.5.2 b/metadata/md5-cache/net-analyzer/pmacct-1.5.2
deleted file mode 100644
index 92eebcb29df2..000000000000
--- a/metadata/md5-cache/net-analyzer/pmacct-1.5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=net-libs/libpcap geoip? ( dev-libs/geoip ) mongodb? ( >=dev-libs/mongo-c-driver-0.8.1-r1 <dev-libs/mongo-c-driver-0.98 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) sqlite? ( =dev-db/sqlite-3* ) virtual/pkgconfig
-DESCRIPTION=A network tool to gather IP traffic information
-EAPI=5
-HOMEPAGE=http://www.pmacct.net/
-IUSE=64bit debug geoip ipv6 mongodb mysql postgres sqlite threads ulog
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libpcap geoip? ( dev-libs/geoip ) mongodb? ( >=dev-libs/mongo-c-driver-0.8.1-r1 <dev-libs/mongo-c-driver-0.98 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) sqlite? ( =dev-db/sqlite-3* )
-SLOT=0
-SRC_URI=http://www.pmacct.net/pmacct-1.5.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=90760b3bc9982d08b3708c396313f682
diff --git a/metadata/md5-cache/net-analyzer/pmacct-1.5.3_pre20150925 b/metadata/md5-cache/net-analyzer/pmacct-1.5.3_pre20150925
deleted file mode 100644
index cc009bc66b85..000000000000
--- a/metadata/md5-cache/net-analyzer/pmacct-1.5.3_pre20150925
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=net-libs/libpcap geoip? ( dev-libs/geoip ) mongodb? ( >=dev-libs/mongo-c-driver-0.8.1-r1 <dev-libs/mongo-c-driver-0.98 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) sqlite? ( =dev-db/sqlite-3* ) virtual/pkgconfig
-DESCRIPTION=A network tool to gather IP traffic information
-EAPI=5
-HOMEPAGE=http://www.pmacct.net/
-IUSE=64bit debug geoip ipv6 mongodb mysql postgres sqlite threads ulog
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libpcap geoip? ( dev-libs/geoip ) mongodb? ( >=dev-libs/mongo-c-driver-0.8.1-r1 <dev-libs/mongo-c-driver-0.98 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) sqlite? ( =dev-db/sqlite-3* )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jer/pmacct-1.5.3_pre20150925.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=752bb9ff02254ea4dce186eb4edcc69e
diff --git a/metadata/md5-cache/net-analyzer/pmacct-1.5.3_pre20150925-r1 b/metadata/md5-cache/net-analyzer/pmacct-1.5.3_pre20150925-r1
deleted file mode 100644
index db6ea73190fa..000000000000
--- a/metadata/md5-cache/net-analyzer/pmacct-1.5.3_pre20150925-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) mongodb? ( >=dev-libs/mongo-c-driver-0.8.1-r1 <dev-libs/mongo-c-driver-0.98 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) sqlite? ( =dev-db/sqlite-3* ) virtual/pkgconfig
-DESCRIPTION=A network tool to gather IP traffic information
-EAPI=5
-HOMEPAGE=http://www.pmacct.net/
-IUSE=64bit debug geoip geoipv2 ipv6 mongodb mysql postgres sqlite threads ulog
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) mongodb? ( >=dev-libs/mongo-c-driver-0.8.1-r1 <dev-libs/mongo-c-driver-0.98 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) sqlite? ( =dev-db/sqlite-3* )
-REQUIRED_USE=?? ( geoip geoipv2 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jer/pmacct-1.5.3_pre20150925.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=2ed1e8cc3cf20a05e800cdf061ddb0d3
diff --git a/metadata/md5-cache/net-analyzer/pmacct-1.6.0 b/metadata/md5-cache/net-analyzer/pmacct-1.6.0
deleted file mode 100644
index 4f8ef6197ce6..000000000000
--- a/metadata/md5-cache/net-analyzer/pmacct-1.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) mongodb? ( >=dev-libs/mongo-c-driver-0.8.1-r1 <dev-libs/mongo-c-driver-0.98 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) sqlite? ( =dev-db/sqlite-3* ) virtual/pkgconfig
-DESCRIPTION=A network tool to gather IP traffic information
-EAPI=6
-HOMEPAGE=http://www.pmacct.net/
-IUSE=64bit debug geoip geoipv2 ipv6 mongodb mysql postgres sqlite threads
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) mongodb? ( >=dev-libs/mongo-c-driver-0.8.1-r1 <dev-libs/mongo-c-driver-0.98 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) sqlite? ( =dev-db/sqlite-3* )
-REQUIRED_USE=?? ( geoip geoipv2 )
-SLOT=0
-SRC_URI=http://www.pmacct.net/pmacct-1.6.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=779723c8a219103fe2d15f91d9f801c2
diff --git a/metadata/md5-cache/net-analyzer/pmacct-1.6.1 b/metadata/md5-cache/net-analyzer/pmacct-1.6.1
deleted file mode 100644
index eeb7b075f7d4..000000000000
--- a/metadata/md5-cache/net-analyzer/pmacct-1.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) mongodb? ( >=dev-libs/mongo-c-driver-0.8.1-r1 <dev-libs/mongo-c-driver-0.98 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) sqlite? ( =dev-db/sqlite-3* ) virtual/pkgconfig
-DESCRIPTION=A network tool to gather IP traffic information
-EAPI=6
-HOMEPAGE=http://www.pmacct.net/
-IUSE=64bit debug geoip geoipv2 ipv6 mongodb mysql postgres sqlite threads
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) mongodb? ( >=dev-libs/mongo-c-driver-0.8.1-r1 <dev-libs/mongo-c-driver-0.98 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) sqlite? ( =dev-db/sqlite-3* )
-REQUIRED_USE=?? ( geoip geoipv2 )
-SLOT=0
-SRC_URI=http://www.pmacct.net/pmacct-1.6.1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=779723c8a219103fe2d15f91d9f801c2
diff --git a/metadata/md5-cache/net-analyzer/pmacct-1.6.1-r1 b/metadata/md5-cache/net-analyzer/pmacct-1.6.1-r1
deleted file mode 100644
index 01cd473cc8ac..000000000000
--- a/metadata/md5-cache/net-analyzer/pmacct-1.6.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) jansson? ( dev-libs/jansson ) kafka? ( dev-libs/librdkafka ) mongodb? ( >=dev-libs/mongo-c-driver-0.8.1-r1 <dev-libs/mongo-c-driver-0.98 ) mysql? ( virtual/mysql ) nflog? ( net-libs/libnetfilter_log ) postgres? ( dev-db/postgresql:* ) rabbitmq? ( net-libs/rabbitmq-c ) sqlite? ( =dev-db/sqlite-3* ) virtual/pkgconfig
-DESCRIPTION=A network tool to gather IP traffic information
-EAPI=6
-HOMEPAGE=http://www.pmacct.net/
-IUSE=64bit debug geoip geoipv2 ipv6 jansson kafka mongodb mysql nflog postgres rabbitmq sqlite threads
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) jansson? ( dev-libs/jansson ) kafka? ( dev-libs/librdkafka ) mongodb? ( >=dev-libs/mongo-c-driver-0.8.1-r1 <dev-libs/mongo-c-driver-0.98 ) mysql? ( virtual/mysql ) nflog? ( net-libs/libnetfilter_log ) postgres? ( dev-db/postgresql:* ) rabbitmq? ( net-libs/rabbitmq-c ) sqlite? ( =dev-db/sqlite-3* )
-REQUIRED_USE=?? ( geoip geoipv2 ) kafka? ( jansson ) rabbitmq? ( jansson )
-SLOT=0
-SRC_URI=http://www.pmacct.net/pmacct-1.6.1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=d10a74aeb60c907c1db62daa8990cdab
diff --git a/metadata/md5-cache/net-analyzer/pmacct-1.6.2 b/metadata/md5-cache/net-analyzer/pmacct-1.6.2
index 0ce86d6e8e58..a54ebee19291 100644
--- a/metadata/md5-cache/net-analyzer/pmacct-1.6.2
+++ b/metadata/md5-cache/net-analyzer/pmacct-1.6.2
@@ -4,11 +4,11 @@ DESCRIPTION=A network tool to gather IP traffic information
 EAPI=6
 HOMEPAGE=http://www.pmacct.net/
 IUSE=64bit debug geoip geoipv2 ipv6 jansson kafka mongodb mysql nflog postgres rabbitmq sqlite threads
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) jansson? ( dev-libs/jansson ) kafka? ( dev-libs/librdkafka ) mongodb? ( >=dev-libs/mongo-c-driver-0.8.1-r1 <dev-libs/mongo-c-driver-0.98 ) mysql? ( virtual/mysql ) nflog? ( net-libs/libnetfilter_log ) postgres? ( dev-db/postgresql:* ) rabbitmq? ( net-libs/rabbitmq-c ) sqlite? ( =dev-db/sqlite-3* )
 REQUIRED_USE=?? ( geoip geoipv2 ) kafka? ( jansson ) rabbitmq? ( jansson )
 SLOT=0
 SRC_URI=http://www.pmacct.net/pmacct-1.6.2.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=422e82e8bf0c747212524dc1dd83813d
+_md5_=d10a74aeb60c907c1db62daa8990cdab
diff --git a/metadata/md5-cache/net-analyzer/pmacct-1.7.0 b/metadata/md5-cache/net-analyzer/pmacct-1.7.0
new file mode 100644
index 000000000000..411590b82a65
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/pmacct-1.7.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install
+DEPEND=net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) jansson? ( dev-libs/jansson ) kafka? ( dev-libs/librdkafka ) mongodb? ( >=dev-libs/mongo-c-driver-0.8.1-r1 <dev-libs/mongo-c-driver-0.98 ) mysql? ( virtual/mysql ) ndpi? ( net-libs/nDPI ) nflog? ( net-libs/libnetfilter_log ) postgres? ( dev-db/postgresql:* ) rabbitmq? ( net-libs/rabbitmq-c ) sqlite? ( =dev-db/sqlite-3* ) zmq? ( >=net-libs/zeromq-4.2.0:= ) virtual/pkgconfig
+DESCRIPTION=A network tool to gather IP traffic information
+EAPI=6
+HOMEPAGE=http://www.pmacct.net/
+IUSE=64bit debug geoip geoipv2 ipv6 jansson kafka mongodb mysql ndpi nflog postgres rabbitmq sqlite threads zmq
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=net-libs/libpcap geoip? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb ) jansson? ( dev-libs/jansson ) kafka? ( dev-libs/librdkafka ) mongodb? ( >=dev-libs/mongo-c-driver-0.8.1-r1 <dev-libs/mongo-c-driver-0.98 ) mysql? ( virtual/mysql ) ndpi? ( net-libs/nDPI ) nflog? ( net-libs/libnetfilter_log ) postgres? ( dev-db/postgresql:* ) rabbitmq? ( net-libs/rabbitmq-c ) sqlite? ( =dev-db/sqlite-3* ) zmq? ( >=net-libs/zeromq-4.2.0:= )
+REQUIRED_USE=?? ( geoip geoipv2 ) kafka? ( jansson ) rabbitmq? ( jansson )
+SLOT=0
+SRC_URI=http://www.pmacct.net/pmacct-1.7.0.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=68f4f8c8ff2aae1e12cbac6dda58ccb9
diff --git a/metadata/md5-cache/net-analyzer/prometheus-1.8.0 b/metadata/md5-cache/net-analyzer/prometheus-1.8.0
deleted file mode 100644
index cc6a6a51bb4c..000000000000
--- a/metadata/md5-cache/net-analyzer/prometheus-1.8.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.8 dev-util/promu >=dev-lang/go-1.8
-DESCRIPTION=Prometheus monitoring system and time series database
-EAPI=6
-HOMEPAGE=https://github.com/prometheus/prometheus
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/prometheus/prometheus/archive/v1.8.0.tar.gz -> prometheus-1.8.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=900befa9467302196aae55175b9d0907
diff --git a/metadata/md5-cache/net-analyzer/prometheus-1.8.1 b/metadata/md5-cache/net-analyzer/prometheus-1.8.1
new file mode 100644
index 000000000000..09d72d6aed92
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/prometheus-1.8.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=>=dev-lang/go-1.8 dev-util/promu >=dev-lang/go-1.8
+DESCRIPTION=Prometheus monitoring system and time series database
+EAPI=6
+HOMEPAGE=https://github.com/prometheus/prometheus
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/prometheus/prometheus/archive/v1.8.1.tar.gz -> prometheus-1.8.1.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	e4b567c44272a719fabf53f0f885d3f7
+_md5_=c5282bc0f754392fc339aaafbbb7fa09
diff --git a/metadata/md5-cache/net-analyzer/prometheus-2.0.0_rc1 b/metadata/md5-cache/net-analyzer/prometheus-2.0.0_rc1
deleted file mode 100644
index d90800ccf246..000000000000
--- a/metadata/md5-cache/net-analyzer/prometheus-2.0.0_rc1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup test unpack
-DEPEND=dev-util/promu >=dev-lang/go-1.8
-DESCRIPTION=Prometheus monitoring system and time series database
-EAPI=6
-HOMEPAGE=https://github.com/prometheus/prometheus
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/prometheus/prometheus/archive/v2.0.0-rc.1.tar.gz -> prometheus-2.0.0_rc1.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=1d35906d3f383503c73bae913005f432
diff --git a/metadata/md5-cache/net-analyzer/prometheus-2.0.0_rc2 b/metadata/md5-cache/net-analyzer/prometheus-2.0.0_rc2
new file mode 100644
index 000000000000..acd234590922
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/prometheus-2.0.0_rc2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare setup test unpack
+DEPEND=dev-util/promu >=dev-lang/go-1.8
+DESCRIPTION=Prometheus monitoring system and time series database
+EAPI=6
+HOMEPAGE=https://github.com/prometheus/prometheus
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/prometheus/prometheus/archive/v2.0.0-rc.2.tar.gz -> prometheus-2.0.0_rc2.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	e4b567c44272a719fabf53f0f885d3f7
+_md5_=ceb921eb374c6a488ac291d189e4ef03
diff --git a/metadata/md5-cache/net-analyzer/prometheus-node_exporter-0.14.0-r1 b/metadata/md5-cache/net-analyzer/prometheus-node_exporter-0.14.0-r1
deleted file mode 100644
index fdefdb818375..000000000000
--- a/metadata/md5-cache/net-analyzer/prometheus-node_exporter-0.14.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-util/promu >=dev-lang/go-1.8
-DESCRIPTION=Prometheus exporter for machine metrics
-EAPI=6
-HOMEPAGE=https://github.com/prometheus/prometheus
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/prometheus/node_exporter/archive/v0.14.0.tar.gz -> prometheus-node_exporter-0.14.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=fe009ee9ac89744d52bef77b16e01db9
diff --git a/metadata/md5-cache/net-analyzer/wireshark-2.4.2 b/metadata/md5-cache/net-analyzer/wireshark-2.4.2
index 7e1ecd11089f..2903d613213c 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-2.4.2
+++ b/metadata/md5-cache/net-analyzer/wireshark-2.4.2
@@ -4,11 +4,11 @@ DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=6
 HOMEPAGE=https://www.wireshark.org/
 IUSE=adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2 +dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua +mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump zlib +filecaps
-KEYWORDS=amd64 ~arm ~arm64 hppa ~ppc ~ppc64 x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libssh? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 media-libs/speex x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) gtk? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
 REQUIRED_USE=ciscodump? ( libssh ) sshdump? ( libssh )
 SLOT=0/2.4.2
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-2.4.2.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fcaps	e80204189039ecc03f24151c518375f0	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d825db30a42d1171113b2c1caacb3b4e
+_md5_=4d132f8fea16a28e90504f3c957d4d71
diff --git a/metadata/md5-cache/net-dns/avahi-0.7 b/metadata/md5-cache/net-dns/avahi-0.7
index 954d9b970416..4549fca6111f 100644
--- a/metadata/md5-cache/net-dns/avahi-0.7
+++ b/metadata/md5-cache/net-dns/avahi-0.7
@@ -4,11 +4,11 @@ DESCRIPTION=System which facilitates service discovery on a local network
 EAPI=6
 HOMEPAGE=http://avahi.org/
 IUSE=autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt4 selinux 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 python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libdaemon dev-libs/expat dev-libs/glib: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(-)?] gdbm? ( sys-libs/gdbm[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(-)?] ) qt4? ( dev-qt/qtcore:4[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(-)?] ) gtk? ( x11-libs/gtk+: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(-)?] ) gtk3? ( x11-libs/gtk+: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(-)?] ) dbus? ( sys-apps/dbus[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(-)?] ) kernel_linux? ( sys-libs/libcap ) introspection? ( dev-libs/gobject-introspection:= ) mono? ( dev-lang/mono gtk? ( dev-dotnet/gtk-sharp ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) introspection? ( dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) bookmarks? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) howl-compat? ( !net-misc/howl ) mdnsresponder-compat? ( !net-misc/mDNSResponder ) selinux? ( sec-policy/selinux-avahi )
 REQUIRED_USE=python? ( dbus gdbm || ( python_targets_python2_7 ) ) mono? ( dbus ) howl-compat? ( dbus ) mdnsresponder-compat? ( dbus )
 SLOT=0
 SRC_URI=https://github.com/lathiat/avahi/archive/v0.7.tar.gz -> avahi-0.7.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=5babec77ec8d734bb4d7871808a531bb
+_md5_=6ae0eba61eab30af05afc9fdf0c2ac7b
diff --git a/metadata/md5-cache/net-dns/bind-9.11.1_p3 b/metadata/md5-cache/net-dns/bind-9.11.1_p3
index 6124ad3d5c7a..aa03865529d9 100644
--- a/metadata/md5-cache/net-dns/bind-9.11.1_p3
+++ b/metadata/md5-cache/net-dns/bind-9.11.1_p3
@@ -4,7 +4,7 @@ DESCRIPTION=BIND - Berkeley Internet Name Domain - Name Server
 EAPI=5
 HOMEPAGE=http://www.isc.org/software/bind
 IUSE=-berkdb +caps dlz dnstap doc filter-aaaa fixed-rrset geoip gost gssapi idn ipv6 json ldap libressl lmdb mysql nslint odbc postgres python rpz seccomp selinux ssl static-libs +threads urandom xml +zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) ) mysql? ( >=virtual/mysql-4.0 ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) idn? ( net-dns/idnkit ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) seccomp? ( sys-libs/libseccomp ) json? ( dev-libs/json-c ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) selinux? ( sec-policy/selinux-bind ) || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd )
 REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz !threads ) odbc? ( dlz ) ldap? ( dlz ) gost? ( !libressl ssl ) threads? ( caps ) dnstap? ( threads ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/bind9/9.11.1-P3/bind-9.11.1-P3.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	db-use	582140d1a711279e50ce284fc7b609f5	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f9cd42803cf7b8fdd8c060f33d5211f5
+_md5_=789374209e08a2001a2e0595d070eb71
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.11.1_p3 b/metadata/md5-cache/net-dns/bind-tools-9.11.1_p3
index 6284a37a9642..8f10310f30e7 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.11.1_p3
+++ b/metadata/md5-cache/net-dns/bind-tools-9.11.1_p3
@@ -4,7 +4,7 @@ DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
 EAPI=5
 HOMEPAGE=http://www.isc.org/software/bind
 IUSE=doc gost gssapi idn ipv6 libressl readline seccomp ssl urandom xml
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline:0= ) seccomp? ( sys-libs/libseccomp ) !<net-dns/bind-9.10.2
 REQUIRED_USE=gost? ( !libressl ssl )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/bind9/9.11.1-P3/bind-9.11.1-P3.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=6e35b8fa4c6fde32af72792171e0236b
+_md5_=5798f4d27721d04da47d207a6e2dec4d
diff --git a/metadata/md5-cache/net-dns/coredns-0.9.9 b/metadata/md5-cache/net-dns/coredns-0.9.9
new file mode 100644
index 000000000000..fce803fbecb8
--- /dev/null
+++ b/metadata/md5-cache/net-dns/coredns-0.9.9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.8
+DESCRIPTION=A DNS server that chains middleware
+EAPI=6
+HOMEPAGE=https://github.com/coredns/coredns
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/coredns/coredns/archive/v0.9.9.tar.gz -> coredns-0.9.9.tar.gz https://github.com/mholt/caddy/archive/c4dfbb9956095c92d0586a52723748c070c7b459.tar.gz -> github.com-mholt-caddy-c4dfbb9956095c92d0586a52723748c070c7b459.tar.gz https://github.com/miekg/dns/archive/822ae18e7187e1bbde923a37081f6c1b8e9ba68a.tar.gz -> github.com-miekg-dns-822ae18e7187e1bbde923a37081f6c1b8e9ba68a.tar.gz https://github.com/golang/net/archive/c73622c77280266305273cb545f54516ced95b93.tar.gz -> github.com-golang-net-c73622c77280266305273cb545f54516ced95b93.tar.gz https://github.com/golang/text/archive/6eab0e8f74e86c598ec3b6fad4888e0c11482d48.tar.gz -> github.com-golang-text-6eab0e8f74e86c598ec3b6fad4888e0c11482d48.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=375ca0f8446c341b09208246c80ca976
diff --git a/metadata/md5-cache/net-dns/coredns-010 b/metadata/md5-cache/net-dns/coredns-010
deleted file mode 100644
index 7a8474789a11..000000000000
--- a/metadata/md5-cache/net-dns/coredns-010
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
-DESCRIPTION=A DNS server that chains middleware
-EAPI=6
-HOMEPAGE=https://github.com/coredns/coredns
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/coredns/coredns/archive/v010.tar.gz -> coredns-010.tar.gz https://github.com/mholt/caddy/archive/bd67ec99f01797931a0787b9c2de0f04fa0e5980.tar.gz -> github.com-mholt-caddy-bd67ec99f01797931a0787b9c2de0f04fa0e5980.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=a88f29963ccc5856125ddf15d9559f31
diff --git a/metadata/md5-cache/net-dns/dnsdist-1.1.0-r1 b/metadata/md5-cache/net-dns/dnsdist-1.1.0-r1
deleted file mode 100644
index 244d7bae9eb8..000000000000
--- a/metadata/md5-cache/net-dns/dnsdist-1.1.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=>=dev-libs/boost-1.35:= dev-libs/libedit:= luajit? ( dev-lang/luajit:= ) !luajit? ( >=dev-lang/lua-5.1:= ) remote-logging? ( dev-libs/protobuf:= ) regex? ( dev-libs/re2:= ) ssl? ( dev-libs/libsodium:= )
-DESCRIPTION=A highly DNS-, DoS- and abuse-aware loadbalancer
-EAPI=6
-HOMEPAGE=http://dnsdist.org
-IUSE=dnscrypt luajit regex remote-logging +ssl test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/boost-1.35:= dev-libs/libedit:= luajit? ( dev-lang/luajit:= ) !luajit? ( >=dev-lang/lua-5.1:= ) remote-logging? ( dev-libs/protobuf:= ) regex? ( dev-libs/re2:= ) ssl? ( dev-libs/libsodium:= )
-REQUIRED_USE=dnscrypt? ( ssl )
-SLOT=0
-SRC_URI=https://downloads.powerdns.com/releases/dnsdist-1.1.0.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=5a0d9b7d9c0df1811a461ea8b766f1d2
diff --git a/metadata/md5-cache/net-dns/dnsdist-1.2.0 b/metadata/md5-cache/net-dns/dnsdist-1.2.0
new file mode 100644
index 000000000000..1ca605a6575b
--- /dev/null
+++ b/metadata/md5-cache/net-dns/dnsdist-1.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst preinst prepare
+DEPEND=>=dev-libs/boost-1.35:= dev-libs/libedit:= luajit? ( dev-lang/luajit:= ) !luajit? ( >=dev-lang/lua-5.1:= ) remote-logging? ( dev-libs/protobuf:= ) regex? ( dev-libs/re2:= ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( dev-libs/libsodium:= )
+DESCRIPTION=A highly DNS-, DoS- and abuse-aware loadbalancer
+EAPI=6
+HOMEPAGE=http://dnsdist.org
+IUSE=dnscrypt luajit regex remote-logging snmp +ssl test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/boost-1.35:= dev-libs/libedit:= luajit? ( dev-lang/luajit:= ) !luajit? ( >=dev-lang/lua-5.1:= ) remote-logging? ( dev-libs/protobuf:= ) regex? ( dev-libs/re2:= ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( dev-libs/libsodium:= )
+REQUIRED_USE=dnscrypt? ( ssl )
+SLOT=0
+SRC_URI=https://downloads.powerdns.com/releases/dnsdist-1.2.0.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
+_md5_=f2ad8c20aeab343f0eb3199ab71322ae
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.78 b/metadata/md5-cache/net-dns/dnsmasq-2.78
index a31b84f3fb73..1e2710c35f5b 100644
--- a/metadata/md5-cache/net-dns/dnsmasq-2.78
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.78
@@ -4,11 +4,11 @@ DESCRIPTION=Small forwarding DNS server
 EAPI=6
 HOMEPAGE=http://www.thekelleys.org.uk/dnsmasq/doc.html
 IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec +id idn libidn2 +inotify ipv6 lua nls script selinux static tftp linguas_de linguas_es linguas_fi linguas_fr linguas_id linguas_it linguas_no linguas_pl linguas_pt_BR linguas_ro
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=dbus? ( sys-apps/dbus ) idn? ( !libidn2? ( net-dns/libidn ) libidn2? ( >=net-dns/libidn2-2.0 ) ) lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack ) nls? ( sys-devel/gettext ) dnssec? ( !static? ( dev-libs/nettle[gmp] ) ) selinux? ( sec-policy/selinux-dnsmasq )
 REQUIRED_USE=dhcp-tools? ( dhcp ) lua? ( script ) libidn2? ( idn )
 SLOT=0
 SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.78.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=1af6e0a0c787ac4185e24736fc58d85b
+_md5_=e777bf000dc9db4a43ebb984912f6ad6
diff --git a/metadata/md5-cache/net-dns/libidn-1.33-r1 b/metadata/md5-cache/net-dns/libidn-1.33-r1
index c90db0b6f00a..bef5512c1f0b 100644
--- a/metadata/md5-cache/net-dns/libidn-1.33-r1
+++ b/metadata/md5-cache/net-dns/libidn-1.33-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Internationalized Domain Names (IDN) implementation
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libidn/
 IUSE=doc emacs java mono nls static-libs elibc_FreeBSD java 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 ~sparc-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 ~x64-cygwin ~amd64-fbsd ~sparc-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-2 GPL-3 LGPL-3 java? ( Apache-2.0 )
 RDEPEND=emacs? ( virtual/emacs ) mono? ( >=dev-lang/mono-0.95 ) 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(-)?] ) java? ( >=virtual/jre-1.5 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://gnu/libidn/libidn-1.33.tar.gz
 _eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=3620a750888184b1071862766eb0ff5c
+_md5_=516865aed01ab8337744b761b8a79cd7
diff --git a/metadata/md5-cache/net-dns/libidn2-0.16-r1 b/metadata/md5-cache/net-dns/libidn2-0.16-r1
deleted file mode 100644
index deb9f7cb0fc1..000000000000
--- a/metadata/md5-cache/net-dns/libidn2-0.16-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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-lang/perl sys-apps/help2man virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)
-EAPI=6
-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-linux ~arm-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-alpha/libidn/libidn2-0.16.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=155e2e6d395a59fc96f91c473242e856
diff --git a/metadata/md5-cache/net-dns/libidn2-2.0.2 b/metadata/md5-cache/net-dns/libidn2-2.0.2
deleted file mode 100644
index 30ca88b5abea..000000000000
--- a/metadata/md5-cache/net-dns/libidn2-2.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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-lang/perl sys-apps/help2man
-DESCRIPTION=An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)
-EAPI=6
-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-linux ~arm-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.0.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=f4292d3fcc15d8ee21078b31ce614a31
diff --git a/metadata/md5-cache/net-dns/libidn2-2.0.4 b/metadata/md5-cache/net-dns/libidn2-2.0.4
index 81e222076cc7..70c665447108 100644
--- a/metadata/md5-cache/net-dns/libidn2-2.0.4
+++ b/metadata/md5-cache/net-dns/libidn2-2.0.4
@@ -4,10 +4,10 @@ DESCRIPTION=An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5
 EAPI=6
 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-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-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.0.4.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=38aeffd15d8f4e98e1788fa24c72b2a6
+_md5_=2eb0ea0a07f7a7e2ecab6beaef2f8489
diff --git a/metadata/md5-cache/net-dns/openresolv-3.9.0 b/metadata/md5-cache/net-dns/openresolv-3.9.0
index 789a030848a6..7ee268420885 100644
--- a/metadata/md5-cache/net-dns/openresolv-3.9.0
+++ b/metadata/md5-cache/net-dns/openresolv-3.9.0
@@ -4,9 +4,9 @@ DESCRIPTION=A framework for managing DNS information
 EAPI=6
 HOMEPAGE=http://roy.marples.name/projects/openresolv
 IUSE=selinux
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=BSD-2
 RDEPEND=selinux? ( sec-policy/selinux-resolvconf )
 SLOT=0
 SRC_URI=http://roy.marples.name/downloads/openresolv/openresolv-3.9.0.tar.xz
-_md5_=96dfbf0f51d9386b72f36a02e9df3b02
+_md5_=a36b24e93363fff99cd59882f06e85da
diff --git a/metadata/md5-cache/net-firewall/nftables-0.8-r2 b/metadata/md5-cache/net-firewall/nftables-0.8-r2
deleted file mode 100644
index cf35af48a11a..000000000000
--- a/metadata/md5-cache/net-firewall/nftables-0.8-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=net-libs/libmnl-1.0.3:0= gmp? ( dev-libs/gmp:0= ) readline? ( sys-libs/readline:0= ) >=net-libs/libnftnl-1.0.8:0= >=app-text/docbook2X-0.8.8-r4 doc? ( >=app-text/dblatex-0.3.7 ) sys-devel/bison sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Linux kernel (3.13+) firewall, NAT and packet mangling tools
-EAPI=6
-HOMEPAGE=https://netfilter.org/projects/nftables/
-IUSE=debug doc +gmp +readline
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=net-libs/libmnl-1.0.3:0= gmp? ( dev-libs/gmp:0= ) readline? ( sys-libs/readline:0= ) >=net-libs/libnftnl-1.0.8:0=
-SLOT=0
-SRC_URI=https://git.netfilter.org/nftables/snapshot/v0.8.tar.gz -> nftables-0.8.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=601e22c245396722e7c4cd8afabf2327
diff --git a/metadata/md5-cache/net-firewall/nftables-0.8-r3 b/metadata/md5-cache/net-firewall/nftables-0.8-r3
new file mode 100644
index 000000000000..4ca86efa1595
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/nftables-0.8-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=>=net-libs/libmnl-1.0.3:0= gmp? ( dev-libs/gmp:0= ) readline? ( sys-libs/readline:0= ) >=net-libs/libnftnl-1.0.8:0= >=app-text/docbook2X-0.8.8-r4 doc? ( >=app-text/dblatex-0.3.7 ) sys-devel/bison sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Linux kernel (3.13+) firewall, NAT and packet mangling tools
+EAPI=6
+HOMEPAGE=https://netfilter.org/projects/nftables/
+IUSE=debug doc +gmp +readline
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-libs/libmnl-1.0.3:0= gmp? ( dev-libs/gmp:0= ) readline? ( sys-libs/readline:0= ) >=net-libs/libnftnl-1.0.8:0=
+SLOT=0
+SRC_URI=https://git.netfilter.org/nftables/snapshot/v0.8.tar.gz -> nftables-0.8.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=68937e81c6ffba2065f62f23c2de7eb0
diff --git a/metadata/md5-cache/net-fs/samba-4.6.9 b/metadata/md5-cache/net-fs/samba-4.6.9
new file mode 100644
index 000000000000..c1a624b22121
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.6.9
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.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(-)?] dev-lang/perl:= dev-libs/libaio[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/libbsd[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/iniparser:0 dev-libs/popt[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-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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(-)?] >=dev-util/cmocka-1.0.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(-)?] sys-apps/attr[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/ldb-1.1.29[ldap(+)?,python(+),python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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-libs/ldb-1.1.31[ldap(+)?,python(+),python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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-libs/libcap sys-libs/ncurses: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(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.9[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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-libs/tdb-1.3.12[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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-libs/tevent-0.9.31-r1[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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-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(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[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(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,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(-)?] ) system-mitkrb5? ( app-crypt/mit-krb5[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(-)?] ) systemd? ( sys-apps/systemd:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DESCRIPTION=Samba Suite Version 4
+EAPI=6
+HOMEPAGE=http://www.samba.org/
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python2_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=~amd64 ~arm64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-arch/libarchive-3.1.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(-)?] dev-lang/perl:= dev-libs/libaio[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/libbsd[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/iniparser:0 dev-libs/popt[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-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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(-)?] >=dev-util/cmocka-1.0.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(-)?] sys-apps/attr[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/ldb-1.1.29[ldap(+)?,python(+),python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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-libs/ldb-1.1.31[ldap(+)?,python(+),python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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-libs/libcap sys-libs/ncurses: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(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.9[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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-libs/tdb-1.3.12[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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-libs/tevent-0.9.31-r1[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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-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(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[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(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,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(-)?] ) system-mitkrb5? ( app-crypt/mit-krb5[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(-)?] ) systemd? ( sys-apps/systemd:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
+REQUIRED_USE=addc? ( python gnutls !system-mitkrb5 ) test? ( python ) addns? ( python ) ads? ( acl gnutls ldap ) gpg? ( addc ) ?? ( system-heimdal system-mitkrb5 ) python_targets_python2_7
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/stable/samba-4.6.9.tar.gz https://dev.gentoo.org/~axs/samba-4.6.7-disable-python-patches.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
+_md5_=70246faff38560a537679e0bec94cc82
diff --git a/metadata/md5-cache/net-fs/samba-4.7.0-r1 b/metadata/md5-cache/net-fs/samba-4.7.0-r1
index a72f56e561bc..378ff01b69da 100644
--- a/metadata/md5-cache/net-fs/samba-4.7.0-r1
+++ b/metadata/md5-cache/net-fs/samba-4.7.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.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(-)?] dev-lang/perl:= dev-libs/libaio[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/libbsd[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/iniparser:0 dev-libs/popt[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-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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(-)?] >=dev-util/cmocka-1.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(-)?] sys-apps/attr[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/ldb-1.2.2[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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-libs/libcap sys-libs/ncurses: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(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.9[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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-libs/tdb-1.3.14[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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-libs/tevent-0.9.33[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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-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(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[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(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,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(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.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(-)?] ) systemd? ( sys-apps/systemd:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DEPEND=>=app-arch/libarchive-3.1.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(-)?] dev-lang/perl:= dev-libs/libaio[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/libbsd[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/iniparser:0 dev-libs/popt[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-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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(-)?] >=dev-util/cmocka-1.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(-)?] sys-apps/attr[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/ldb-1.2.2[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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-libs/libcap sys-libs/ncurses: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(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.9[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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-libs/tdb-1.3.14[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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-libs/tevent-0.9.33[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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-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(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[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(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,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(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.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(-)?] ) systemd? ( sys-apps/systemd:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
 DESCRIPTION=Samba Suite Version 4
 EAPI=6
 HOMEPAGE=http://www.samba.org/
-IUSE=acl addc addns ads client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python2_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
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python2_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=~amd64 ~arm64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=app-arch/libarchive-3.1.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(-)?] dev-lang/perl:= dev-libs/libaio[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/libbsd[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/iniparser:0 dev-libs/popt[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-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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(-)?] >=dev-util/cmocka-1.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(-)?] sys-apps/attr[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/ldb-1.2.2[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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-libs/libcap sys-libs/ncurses: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(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.9[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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-libs/tdb-1.3.14[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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-libs/tevent-0.9.33[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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-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(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[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(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,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(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.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(-)?] ) systemd? ( sys-apps/systemd:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
+RDEPEND=>=app-arch/libarchive-3.1.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(-)?] dev-lang/perl:= dev-libs/libaio[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/libbsd[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/iniparser:0 dev-libs/popt[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-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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(-)?] >=dev-util/cmocka-1.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(-)?] sys-apps/attr[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/ldb-1.2.2[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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-libs/libcap sys-libs/ncurses: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(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.9[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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-libs/tdb-1.3.14[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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-libs/tevent-0.9.33[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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-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(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[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(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,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(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.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(-)?] ) systemd? ( sys-apps/systemd:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
 REQUIRED_USE=addc? ( python gnutls ) test? ( python ) addns? ( python ) ads? ( acl gnutls ldap ) gpg? ( addc ) ?? ( system-heimdal system-mitkrb5 ) python_targets_python2_7
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.7.0.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=2f5565443ef60ee3e69fd9532638312d
+_md5_=7ded499b0ac32dcb527be13755c3ba97
diff --git a/metadata/md5-cache/net-im/choqok-1.6.0 b/metadata/md5-cache/net-im/choqok-1.6.0
index 317ae307f6f9..cd19009be8cf 100644
--- a/metadata/md5-cache/net-im/choqok-1.6.0
+++ b/metadata/md5-cache/net-im/choqok-1.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kemoticons-5.37.0:5 >=kde-frameworks/kglobalaccel-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/sonnet-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 app-crypt/qca[qt5] dev-libs/qoauth:5 attica? ( >=kde-frameworks/attica-5.37.0:5 ) konqueror? ( >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kdewebkit-5.37.0:5 >=dev-qt/qtwebkit-5.7.1:5 ) telepathy? ( net-libs/telepathy-qt[qt5(+)] ) !net-im/choqok:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/choqok/1.6/src/choqok-1.6.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=db2ce6d7e017250c403acb88c0363464
diff --git a/metadata/md5-cache/net-im/corebird-1.6 b/metadata/md5-cache/net-im/corebird-1.6
new file mode 100644
index 000000000000..35d2820f24c0
--- /dev/null
+++ b/metadata/md5-cache/net-im/corebird-1.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.44:2 dev-libs/json-glib gstreamer? ( >=media-libs/gst-plugins-bad-1.6:1.0[X,gtk] media-libs/gst-plugins-base:1.0[X] media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-hls:1.0 media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-meta:1.0[X] media-plugins/gst-plugins-soup:1.0 ) spellcheck? ( >=app-text/gspell-1.0[vala] ) >=net-libs/libsoup-2.42.3.1 >=net-libs/rest-0.7.91:0.7 >=x11-libs/gtk+-3.20:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 ) >=dev-util/intltool-0.40 sys-apps/sed virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Native GTK+3 Twitter client
+EAPI=6
+HOMEPAGE=http://corebird.baedert.org/
+IUSE=debug gstreamer spellcheck test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.44:2 dev-libs/json-glib gstreamer? ( >=media-libs/gst-plugins-bad-1.6:1.0[X,gtk] media-libs/gst-plugins-base:1.0[X] media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-hls:1.0 media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-meta:1.0[X] media-plugins/gst-plugins-soup:1.0 ) spellcheck? ( >=app-text/gspell-1.0[vala] ) >=net-libs/libsoup-2.42.3.1 >=net-libs/rest-0.7.91:0.7 >=x11-libs/gtk+-3.20:3
+SLOT=0
+SRC_URI=https://github.com/baedert/corebird/archive/1.6.tar.gz -> corebird-1.6.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vala	103e6885c83965507391cdc5b6fa0e67	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d3860b8b8972112d1dba03ac774b41fb
diff --git a/metadata/md5-cache/net-im/slack-bin-2.8.2 b/metadata/md5-cache/net-im/slack-bin-2.8.2
new file mode 100644
index 000000000000..6f51006d6569
--- /dev/null
+++ b/metadata/md5-cache/net-im/slack-bin-2.8.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=Team collaboration tool
+EAPI=6
+HOMEPAGE=http://www.slack.com/
+KEYWORDS=~amd64
+LICENSE=all-rights-reserved
+RDEPEND=app-crypt/libsecret:0 dev-libs/atk:0 dev-libs/expat:0 dev-libs/glib:2 dev-libs/nspr:0 dev-libs/nss:0 gnome-base/gconf:2 media-libs/alsa-lib:0 media-libs/fontconfig:1.0 media-libs/freetype:2 net-misc/curl:0 net-print/cups:0 sys-apps/dbus:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11:0 x11-libs/libxcb:0/1.12 x11-libs/libXcomposite:0 x11-libs/libXcursor:0 x11-libs/libXdamage:0 x11-libs/libXext:0 x11-libs/libXfixes:0 x11-libs/libXi:0 x11-libs/libxkbfile:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 x11-libs/libXScrnSaver:0 x11-libs/libXtst:0 x11-libs/pango:0
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-2.8.2-amd64.deb
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4e1ccedb720535e02c53c9292812321d
diff --git a/metadata/md5-cache/net-irc/irssi-1.0.5 b/metadata/md5-cache/net-irc/irssi-1.0.5
new file mode 100644
index 000000000000..a5b38756d158
--- /dev/null
+++ b/metadata/md5-cache/net-irc/irssi-1.0.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) virtual/pkgconfig dev-lang/perl:=
+DESCRIPTION=A modular textUI IRC client with IPv6 support
+EAPI=6
+HOMEPAGE=https://irssi.org/
+IUSE=+perl selinux socks5 +proxy libressl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) selinux? ( sec-policy/selinux-irc ) perl? ( !net-im/silc-client ) dev-lang/perl:=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/irssi/irssi/releases/download/1.0.5/irssi-1.0.5.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=e7b04ad31943e739581f381eae504bd2
diff --git a/metadata/md5-cache/net-irc/konversation-1.7.2 b/metadata/md5-cache/net-irc/konversation-1.7.2
index 985a460521e1..adb962545fcc 100644
--- a/metadata/md5-cache/net-irc/konversation-1.7.2
+++ b/metadata/md5-cache/net-irc/konversation-1.7.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kbookmarks-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kemoticons-5.37.0:5 >=kde-frameworks/kglobalaccel-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kidletime-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] sys-devel/gettext crypt? ( app-crypt/qca:2[qt5] ) !net-irc/konversation:4 crypt? ( app-crypt/qca:2[ssl] ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/konversation/1.7.2/src/konversation-1.7.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f10324ab0cbce30f0f54548bd008c933
diff --git a/metadata/md5-cache/net-irc/konversation-1.7.2-r1 b/metadata/md5-cache/net-irc/konversation-1.7.2-r1
index f58138126ad6..a456c980aae5 100644
--- a/metadata/md5-cache/net-irc/konversation-1.7.2-r1
+++ b/metadata/md5-cache/net-irc/konversation-1.7.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kbookmarks-5.37.0:5 >=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kemoticons-5.37.0:5 >=kde-frameworks/kglobalaccel-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kidletime-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] sys-devel/gettext crypt? ( app-crypt/qca:2[qt5] ) !net-irc/konversation:4 crypt? ( app-crypt/qca:2[ssl] ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/konversation/1.7.2/src/konversation-1.7.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8cf08855e16fa517970408347732bca8
diff --git a/metadata/md5-cache/net-libs/axtls-2.1.3 b/metadata/md5-cache/net-libs/axtls-2.1.3
index 42abb308fe0a..a1416fabe46d 100644
--- a/metadata/md5-cache/net-libs/axtls-2.1.3
+++ b/metadata/md5-cache/net-libs/axtls-2.1.3
@@ -4,11 +4,11 @@ DESCRIPTION=Embedded client/server TLSv1 SSL library and small HTTP(S) server
 EAPI=6
 HOMEPAGE=http://axtls.sourceforge.net/
 IUSE=httpd cgi-lua cgi-php static static-libs doc 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 savedconfig
-KEYWORDS=~amd64 arm ~arm64 hppa ~mips ppc ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~amd64 arm ~arm64 hppa ~mips ppc ppc64 ~s390 ~sparc x86
 LICENSE=BSD GPL-2
 RDEPEND=httpd? ( cgi-lua? ( dev-lang/lua ) cgi-php? ( dev-lang/php[cgi] ) )
 REQUIRED_USE=static? ( httpd ) cgi-lua? ( httpd ) cgi-php? ( httpd )
 SLOT=0/1
 SRC_URI=mirror://sourceforge/axtls/axTLS-2.1.3.tar.gz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=151f96cafbade3506ef835cb037a8f9c
+_md5_=d06311373d2d8b03a711788fa180790c
diff --git a/metadata/md5-cache/net-libs/gloox-1.0.18 b/metadata/md5-cache/net-libs/gloox-1.0.18
deleted file mode 100644
index e66dddb96af4..000000000000
--- a/metadata/md5-cache/net-libs/gloox-1.0.18
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=idn? ( net-dns/libidn ) gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) zlib? ( sys-libs/zlib )
-DESCRIPTION=A portable high-level Jabber/XMPP library for C++
-EAPI=6
-HOMEPAGE=http://camaya.net/gloox
-IUSE=debug gnutls idn libressl ssl static-libs test zlib
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~ia64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=idn? ( net-dns/libidn ) gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) zlib? ( sys-libs/zlib )
-SLOT=0/15
-SRC_URI=http://camaya.net/download/gloox-1.0.18.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=f6ccf0f44cf4de0515184089d080d48b
diff --git a/metadata/md5-cache/net-libs/gloox-1.0.19 b/metadata/md5-cache/net-libs/gloox-1.0.19
deleted file mode 100644
index 111c77ddac17..000000000000
--- a/metadata/md5-cache/net-libs/gloox-1.0.19
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=idn? ( net-dns/libidn ) gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) zlib? ( sys-libs/zlib )
-DESCRIPTION=A portable high-level Jabber/XMPP library for C++
-EAPI=6
-HOMEPAGE=http://camaya.net/gloox
-IUSE=debug gnutls idn libressl ssl static-libs test zlib
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~ia64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=idn? ( net-dns/libidn ) gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) zlib? ( sys-libs/zlib )
-SLOT=0/16
-SRC_URI=http://camaya.net/download/gloox-1.0.19.tar.bz2
-_md5_=f337dc04f80f0926ac61637ee74b391c
diff --git a/metadata/md5-cache/net-libs/gloox-1.0.9 b/metadata/md5-cache/net-libs/gloox-1.0.9
deleted file mode 100644
index 7c697178ccb9..000000000000
--- a/metadata/md5-cache/net-libs/gloox-1.0.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=idn? ( net-dns/libidn ) gnutls? ( net-libs/gnutls ) ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib )
-DESCRIPTION=A portable high-level Jabber/XMPP library for C++
-EAPI=5
-HOMEPAGE=http://camaya.net/gloox
-IUSE=debug gnutls idn ssl zlib
-KEYWORDS=alpha amd64 ~arm ia64 ppc ~ppc64 sparc x86
-LICENSE=GPL-3
-RDEPEND=idn? ( net-dns/libidn ) gnutls? ( net-libs/gnutls ) ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=http://camaya.net/download/gloox-1.0.9.tar.bz2
-_md5_=89dd2acae1793567ff4a2e4fd6a2152a
diff --git a/metadata/md5-cache/net-libs/gnutls-3.5.15 b/metadata/md5-cache/net-libs/gnutls-3.5.15
index ff8f2b196009..575db7be2e1f 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.5.15
+++ b/metadata/md5-cache/net-libs/gnutls-3.5.15
@@ -4,11 +4,11 @@ DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
 EAPI=6
 HOMEPAGE=http://www.gnutls.org/
 IUSE=+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib linguas_en linguas_cs linguas_de linguas_fi linguas_fr linguas_it linguas_ms linguas_nl linguas_pl linguas_sv linguas_uk linguas_vi linguas_zh_CN 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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.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-1.8:=[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(-)?] ) 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(-)?] ) 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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=test-full? ( guile pkcs11 openpgp openssl idn seccomp tools zlib )
 SLOT=0/30
 SRC_URI=mirror://gnupg/gnutls/v3.5/gnutls-3.5.15.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=4336e3681c9760517a36e5b2b8392c16
+_md5_=c0d2719b6a74c54a5176e19f959a881a
diff --git a/metadata/md5-cache/net-libs/gtk-vnc-0.6.0 b/metadata/md5-cache/net-libs/gtk-vnc-0.6.0
deleted file mode 100644
index 90225dd01f46..000000000000
--- a/metadata/md5-cache/net-libs/gtk-vnc-0.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.30.1:2 >=dev-libs/libgcrypt-1.4.2:0= dev-libs/libgpg-error >=net-libs/gnutls-3.0:0= >=x11-libs/cairo-1.2 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 gtk3? ( >=x11-libs/gtk+-2.91.3:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.4:= ) pulseaudio? ( media-sound/pulseaudio ) 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(-)] >=dev-python/pygtk-2:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sasl? ( dev-libs/cyrus-sasl ) >=dev-lang/perl-5 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) >=dev-libs/gobject-introspection-0.9.4 ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=VNC viewer widget for GTK
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/gtk-vnc
-IUSE=examples +gtk3 +introspection pulseaudio python sasl vala python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.30.1:2 >=dev-libs/libgcrypt-1.4.2:0= dev-libs/libgpg-error >=net-libs/gnutls-3.0:0= >=x11-libs/cairo-1.2 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 gtk3? ( >=x11-libs/gtk+-2.91.3:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.4:= ) pulseaudio? ( media-sound/pulseaudio ) 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(-)] >=dev-python/pygtk-2:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sasl? ( dev-libs/cyrus-sasl )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) ) vala? ( gtk3 introspection )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gtk-vnc/0.6/gtk-vnc-0.6.0.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vala	103e6885c83965507391cdc5b6fa0e67	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=48adf6033964dc46b985bad6aa57c314
diff --git a/metadata/md5-cache/net-libs/kdav2-0.1.0 b/metadata/md5-cache/net-libs/kdav2-0.1.0
index f74c5f0ae653..c9bdac722547 100644
--- a/metadata/md5-cache/net-libs/kdav2-0.1.0
+++ b/metadata/md5-cache/net-libs/kdav2-0.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/unstable/kdav2/0.1.0/src/kdav2-0.1.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d19bd9b820593324b6bbd8047667ffc1
diff --git a/metadata/md5-cache/net-libs/kimap2-0.1.1 b/metadata/md5-cache/net-libs/kimap2-0.1.1
index f83ac4ba4c13..2fab145bf7d4 100644
--- a/metadata/md5-cache/net-libs/kimap2-0.1.1
+++ b/metadata/md5-cache/net-libs/kimap2-0.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/unstable/kimap2/0.1.1/src/kimap2-0.1.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c78eca5def300bf3b0625ca8a1ae7e29
diff --git a/metadata/md5-cache/net-libs/kimap2-0.2.0 b/metadata/md5-cache/net-libs/kimap2-0.2.0
index feb09d1051c8..3b93bd20b18c 100644
--- a/metadata/md5-cache/net-libs/kimap2-0.2.0
+++ b/metadata/md5-cache/net-libs/kimap2-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/unstable/kimap2/0.2.0/src/kimap2-0.2.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c78eca5def300bf3b0625ca8a1ae7e29
diff --git a/metadata/md5-cache/net-libs/libktorrent-2.1 b/metadata/md5-cache/net-libs/libktorrent-2.1
index 3615597eeb7b..5f9039b938df 100644
--- a/metadata/md5-cache/net-libs/libktorrent-2.1
+++ b/metadata/md5-cache/net-libs/libktorrent-2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/solid-5.37.0:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 app-crypt/qca:2[qt5] >=dev-libs/gmp-6.0.0a:0= dev-libs/libgcrypt:0= !net-libs/libktorrent:4 !dev-libs/botan[gmp(-)] >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/ktorrent/5.1/libktorrent-2.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0dd90fb41fdddfb042d4b5d870a0fcf3
diff --git a/metadata/md5-cache/net-libs/libkvkontakte-5.0.0 b/metadata/md5-cache/net-libs/libkvkontakte-5.0.0
index 59b3bba6dc41..ca5e1b421fee 100644
--- a/metadata/md5-cache/net-libs/libkvkontakte-5.0.0
+++ b/metadata/md5-cache/net-libs/libkvkontakte-5.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdewebkit-5.37.0:
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/libkvkontakte/5.0.0/src/libkvkontakte-5.0.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8f8fb03993ccabd819ec98060259dd8c
diff --git a/metadata/md5-cache/net-libs/libkvkontakte-5.0.0_pre20170128 b/metadata/md5-cache/net-libs/libkvkontakte-5.0.0_pre20170128
index ce19746fe5ee..0b9b504b6cc3 100644
--- a/metadata/md5-cache/net-libs/libkvkontakte-5.0.0_pre20170128
+++ b/metadata/md5-cache/net-libs/libkvkontakte-5.0.0_pre20170128
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5
 RESTRICT=test
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~asturm/libkvkontakte-5.0.0_pre20170128.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bce276de2d0b6a566ace593132959eca
diff --git a/metadata/md5-cache/net-libs/libmediawiki-5.0.0_pre20170128 b/metadata/md5-cache/net-libs/libmediawiki-5.0.0_pre20170128
index 3359f17b9d42..cc0c9a72fb47 100644
--- a/metadata/md5-cache/net-libs/libmediawiki-5.0.0_pre20170128
+++ b/metadata/md5-cache/net-libs/libmediawiki-5.0.0_pre20170128
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=dev-qt/qtnetwork-5.7.1:5 !net-libs/libmediawiki:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~asturm/libmediawiki-5.0.0_pre20170128.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b73f0d69001522348c7aef7d4ab2299f
diff --git a/metadata/md5-cache/net-libs/libmediawiki-5.37.0 b/metadata/md5-cache/net-libs/libmediawiki-5.37.0
index 0c5b1de71ce7..3b8eaa14a4a8 100644
--- a/metadata/md5-cache/net-libs/libmediawiki-5.37.0
+++ b/metadata/md5-cache/net-libs/libmediawiki-5.37.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=dev-qt/qtnetwork-5.7.1:5 !net-libs/libmediawiki:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/libmediawiki/libmediawiki-5.37.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b46571acd420b065383497ba2a595be0
diff --git a/metadata/md5-cache/net-libs/libnsl-0 b/metadata/md5-cache/net-libs/libnsl-0
new file mode 100644
index 000000000000..a4c76b64a6a3
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libnsl-0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DEPEND=<sys-libs/glibc-2.26
+DESCRIPTION=Public client interface for NIS(YP) and NIS+ in a IPv6 ready version
+EAPI=6
+HOMEPAGE=https://github.com/thkukuk/libnsl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=<sys-libs/glibc-2.26
+SLOT=0/1
+_md5_=2b4ccce516af3b9a46d04fa73826bc97
diff --git a/metadata/md5-cache/net-libs/libnsl-1.1.0 b/metadata/md5-cache/net-libs/libnsl-1.1.0
deleted file mode 100644
index 2d95a7333260..000000000000
--- a/metadata/md5-cache/net-libs/libnsl-1.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!<sys-libs/glibc-2.26 net-libs/libtirpc[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-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Public client interface for NIS(YP) and NIS+ in a IPv6 ready version
-EAPI=6
-HOMEPAGE=https://github.com/thkukuk/libnsl
-IUSE=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 ~arm-linux ~x86-linux
-LICENSE=LGPL-2.1+
-RDEPEND=!<sys-libs/glibc-2.26 net-libs/libtirpc[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=https://github.com/thkukuk/libnsl/archive/libnsl-1.1.0.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=44c7002bb06149d0968b236da344eca0
diff --git a/metadata/md5-cache/net-libs/libnsl-1.1.0-r1 b/metadata/md5-cache/net-libs/libnsl-1.1.0-r1
new file mode 100644
index 000000000000..f4a65a758bb9
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libnsl-1.1.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-libs/libtirpc[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-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Public client interface for NIS(YP) and NIS+ in a IPv6 ready version
+EAPI=6
+HOMEPAGE=https://github.com/thkukuk/libnsl
+IUSE=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
+LICENSE=LGPL-2.1+
+RDEPEND=net-libs/libtirpc[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/glibc-2.26
+SLOT=0/2
+SRC_URI=https://github.com/thkukuk/libnsl/archive/libnsl-1.1.0.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=e53e12f04fc1ad6cfbe8a43290d8c4c1
diff --git a/metadata/md5-cache/net-libs/librsync-2.0.0-r1 b/metadata/md5-cache/net-libs/librsync-2.0.0-r1
index 149da0fc88c0..e54af1ddffb5 100644
--- a/metadata/md5-cache/net-libs/librsync-2.0.0-r1
+++ b/metadata/md5-cache/net-libs/librsync-2.0.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/popt sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=Remote delta-compression library
 EAPI=5
 HOMEPAGE=http://librsync.sourcefrog.net/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/popt
 SLOT=0/2
 SRC_URI=https://github.com/librsync/librsync/archive/v2.0.0.tar.gz -> librsync-2.0.0.tar.gz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=efeec960574740e4f758dbbe8b979829
+_md5_=a9c90bb623b85e9fa7c1558dd8005514
diff --git a/metadata/md5-cache/net-libs/libsignon-glib-1.13-r1 b/metadata/md5-cache/net-libs/libsignon-glib-1.13-r1
index 31a627ed6ea2..8ecf3889ee52 100644
--- a/metadata/md5-cache/net-libs/libsignon-glib-1.13-r1
+++ b/metadata/md5-cache/net-libs/libsignon-glib-1.13-r1
@@ -7,9 +7,9 @@ IUSE=debug doc +introspection python test python_targets_python2_7 python_target
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 net-libs/signond introspection? ( dev-libs/gobject-introspection:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) python? ( introspection )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) introspection )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.com/accounts-sso/libsignon-glib/repository/archive.tar.gz?ref=VERSION_1.13 -> libsignon-glib-1.13.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e83ef6c9ec61858ff9d77486e0c7244b
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f5282ab4746f7b912eadba8b9d305b78
diff --git a/metadata/md5-cache/net-libs/libsignon-glib-1.14 b/metadata/md5-cache/net-libs/libsignon-glib-1.14
new file mode 100644
index 000000000000..8f177652c797
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libsignon-glib-1.14
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=dev-libs/glib:2 net-libs/signond introspection? ( dev-libs/gobject-introspection:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-util/gdbus-codegen doc? ( dev-util/gtk-doc ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=GLib binding for the D-Bus API provided by signond
+EAPI=6
+HOMEPAGE=https://01.org/gsso/
+IUSE=debug doc +introspection python test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/glib:2 net-libs/signond introspection? ( dev-libs/gobject-introspection:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) introspection )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://gitlab.com/accounts-sso/libsignon-glib/repository/archive.tar.gz?ref=VERSION_1.14 -> libsignon-glib-1.14.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cea3c31c0691e63a2542a4a4ae4aff42
diff --git a/metadata/md5-cache/net-libs/libtirpc-1.0.2-r1 b/metadata/md5-cache/net-libs/libtirpc-1.0.2-r1
index ad1ae1c5f264..c71623cfa9a6 100644
--- a/metadata/md5-cache/net-libs/libtirpc-1.0.2-r1
+++ b/metadata/md5-cache/net-libs/libtirpc-1.0.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Transport Independent RPC library (SunRPC replacement)
 EAPI=5
 HOMEPAGE=http://libtirpc.sourceforge.net/
 IUSE=ipv6 kerberos 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 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=kerberos? ( >=virtual/krb5-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/3
 SRC_URI=mirror://sourceforge/libtirpc/libtirpc-1.0.2.tar.bz2 mirror://gentoo/libtirpc-glibc-nfs.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=ed00f3d06a08f0333428b7961ff229bb
+_md5_=794600e1cae2945e8b84a127e04f5842
diff --git a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.0.10 b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.0.10
deleted file mode 100644
index c05062755665..000000000000
--- a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.0.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/boost:=[threads] virtual/libiconv examples? ( !net-p2p/mldonkey ) geoip? ( dev-libs/geoip ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) python_targets_python3_5? ( dev-lang/python:3.5[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/boost:=[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) sys-devel/libtool
-DESCRIPTION=C++ BitTorrent implementation focusing on efficiency and scalability
-EAPI=6
-HOMEPAGE=http://libtorrent.org
-IUSE=debug +dht doc examples +geoip libressl python +ssl static-libs test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 arm ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] virtual/libiconv examples? ( !net-p2p/mldonkey ) geoip? ( dev-libs/geoip ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) python_targets_python3_5? ( dev-lang/python:3.5[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/boost:=[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) )
-SLOT=0/8
-SRC_URI=https://github.com/arvidn/libtorrent/releases/download/libtorrent-1_0_10/libtorrent-rasterbar-1.0.10.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=59a987dc12071b052b4f03e23b9634ac
diff --git a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.0.11-r1 b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.0.11-r1
index 539e84a15c37..62a5c52aac6d 100644
--- a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.0.11-r1
+++ b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.0.11-r1
@@ -4,11 +4,11 @@ DESCRIPTION=C++ BitTorrent implementation focusing on efficiency and scalability
 EAPI=6
 HOMEPAGE=http://libtorrent.org
 IUSE=debug +dht doc examples +geoip libressl python +ssl static-libs test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=amd64 arm ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=dev-libs/boost:=[threads] virtual/libiconv geoip? ( dev-libs/geoip ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) python_targets_python3_5? ( dev-lang/python:3.5[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/boost:=[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) examples? ( !net-p2p/mldonkey )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) )
 SLOT=0/8
 SRC_URI=https://github.com/arvidn/libtorrent/releases/download/libtorrent-1_0_11/libtorrent-rasterbar-1.0.11.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8d31adefd50f940e53ff679938b4b01d
+_md5_=54b31704c01ec09ecc99e060ea019778
diff --git a/metadata/md5-cache/net-libs/liquid-dsp-1.3.1 b/metadata/md5-cache/net-libs/liquid-dsp-1.3.1
new file mode 100644
index 000000000000..4608c471b17b
--- /dev/null
+++ b/metadata/md5-cache/net-libs/liquid-dsp-1.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=sci-libs/fftw:3.0= >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=digital signal processing library for software-defined radios
+EAPI=6
+HOMEPAGE=http://liquidsdr.org
+IUSE=static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=sci-libs/fftw:3.0=
+SLOT=0
+SRC_URI=https://github.com/jgaeddert/liquid-dsp/archive/v1.3.1.tar.gz -> liquid-dsp-1.3.1.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=036fdb2fb0ad75f42ba57ba31398284b
diff --git a/metadata/md5-cache/net-libs/liquid-dsp-9999 b/metadata/md5-cache/net-libs/liquid-dsp-9999
index 8bab1435c100..fa6480384062 100644
--- a/metadata/md5-cache/net-libs/liquid-dsp-9999
+++ b/metadata/md5-cache/net-libs/liquid-dsp-9999
@@ -8,4 +8,4 @@ LICENSE=MIT
 RDEPEND=sci-libs/fftw:3.0=
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	git-r3	52a888802d25387c2c74cb845d1219bc	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=7027887beb7fd77f9a4f684b1e05944e
+_md5_=036fdb2fb0ad75f42ba57ba31398284b
diff --git a/metadata/md5-cache/net-libs/loudmouth-1.5.2-r1 b/metadata/md5-cache/net-libs/loudmouth-1.5.2-r1
index 425ae85fa898..f16c3fa702dd 100644
--- a/metadata/md5-cache/net-libs/loudmouth-1.5.2-r1
+++ b/metadata/md5-cache/net-libs/loudmouth-1.5.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Lightweight C Jabber library
 EAPI=5
 HOMEPAGE=https://github.com/mcabber/loudmouth
 IUSE=asyncns ssl openssl static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos
+KEYWORDS=alpha ~amd64 ~arm ia64 ~ppc ppc64 ~sparc ~x86 ~ppc-macos
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.16:2 net-dns/libidn ssl? ( !openssl? ( >=net-libs/gnutls-1.4.0 ) openssl? ( dev-libs/openssl:0 ) ) asyncns? ( >=net-libs/libasyncns-0.3 )
 SLOT=0
 SRC_URI=https://github.com/mcabber/loudmouth/archive/1.5.2.tar.gz -> loudmouth-1.5.2.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=7d70e9a05fec430e2a3451f3756aa917
+_md5_=068fabe1cd2a66bfeb4f10e2eab46ff0
diff --git a/metadata/md5-cache/net-libs/nDPI-2.0 b/metadata/md5-cache/net-libs/nDPI-2.0
index 2307ef95b686..504dccfa8769 100644
--- a/metadata/md5-cache/net-libs/nDPI-2.0
+++ b/metadata/md5-cache/net-libs/nDPI-2.0
@@ -1,12 +1,13 @@
-DEFINED_PHASES=prepare
+DEFINED_PHASES=install prepare
 DEPEND=dev-libs/json-c net-libs/libpcap >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Open Source Deep Packet Inspection Software Toolkit
 EAPI=6
 HOMEPAGE=http://www.ntop.org/
+IUSE=static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/json-c net-libs/libpcap
 SLOT=0
 SRC_URI=https://github.com/ntop/nDPI/archive/2.0.tar.gz -> nDPI-2.0.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a4b2f3bda72600ebe94b8c77328587dd
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=a88a0b54d4d56e23e9a8bbbac6af3e72
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.25.0 b/metadata/md5-cache/net-libs/nghttp2-1.25.0
deleted file mode 100644
index 48f222165c4b..000000000000
--- a/metadata/md5-cache/net-libs/nghttp2-1.25.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=cxx? ( dev-libs/boost:=[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(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/libev-4.15[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(-)?] !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig test? ( >=dev-util/cunit-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(-)?] )
-DESCRIPTION=HTTP/2 C Library
-EAPI=6
-HOMEPAGE=https://nghttp2.org/
-IUSE=cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_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
-LICENSE=MIT
-RDEPEND=cxx? ( dev-libs/boost:=[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(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/libev-4.15[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(-)?] !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/1.14
-SRC_URI=https://github.com/tatsuhiro-t/nghttp2/releases/download/v1.25.0/nghttp2-1.25.0.tar.gz
-_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=fb9bc401afbe4344df8e1428fa5af237
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.27.0 b/metadata/md5-cache/net-libs/nghttp2-1.27.0
new file mode 100644
index 000000000000..0905b2c49a4d
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nghttp2-1.27.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=cxx? ( dev-libs/boost:=[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(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/libev-4.15[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(-)?] !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig test? ( >=dev-util/cunit-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(-)?] )
+DESCRIPTION=HTTP/2 C Library
+EAPI=6
+HOMEPAGE=https://nghttp2.org/
+IUSE=cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_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
+LICENSE=MIT
+RDEPEND=cxx? ( dev-libs/boost:=[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(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/libev-4.15[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(-)?] !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0/1.14
+SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.27.0/nghttp2-1.27.0.tar.xz
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=d2601c2e3ac6d19023128137efa6dad3
diff --git a/metadata/md5-cache/net-libs/nghttp2-9999 b/metadata/md5-cache/net-libs/nghttp2-9999
index 7c62a256c138..c46951c4213e 100644
--- a/metadata/md5-cache/net-libs/nghttp2-9999
+++ b/metadata/md5-cache/net-libs/nghttp2-9999
@@ -8,4 +8,4 @@ LICENSE=MIT
 RDEPEND=cxx? ( dev-libs/boost:=[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(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/libev-4.15[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(-)?] !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/1.14
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	git-r3	52a888802d25387c2c74cb845d1219bc	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=b49253ba9014227c97d4741007760670
+_md5_=4b1f0cde933f74da4cec4fd63b59b286
diff --git a/metadata/md5-cache/net-libs/nodejs-4.8.5 b/metadata/md5-cache/net-libs/nodejs-4.8.5
new file mode 100644
index 000000000000..889d63dafcb4
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-4.8.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=icu? ( >=dev-libs/icu-55:= ) npm? ( 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.5.2:= >=dev-libs/libuv-1.8.0:= >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] test? ( net-misc/curl )
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=5
+HOMEPAGE=https://nodejs.org/
+IUSE=cpu_flags_x86_sse2 debug icu +npm snapshot +ssl test python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=icu? ( >=dev-libs/icu-55:= ) npm? ( 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.5.2:= >=dev-libs/libuv-1.8.0:= >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://nodejs.org/dist/v4.8.5/node-v4.8.5.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=549b3a85a4be0f00c8601a8607f6b883
diff --git a/metadata/md5-cache/net-libs/nodejs-6.11.2 b/metadata/md5-cache/net-libs/nodejs-6.11.2
deleted file mode 100644
index 7fe89e805caa..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-6.11.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.6.2:= >=dev-libs/libuv-1.9.0:= >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] test? ( net-misc/curl )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=6
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl test python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.6.2:= >=dev-libs/libuv-1.9.0:= >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib
-REQUIRED_USE=python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nodejs.org/dist/v6.11.2/node-v6.11.2.tar.xz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=663d84cfded956ce6c0e4fe26af15da1
diff --git a/metadata/md5-cache/net-libs/nodejs-6.11.3 b/metadata/md5-cache/net-libs/nodejs-6.11.3
deleted file mode 100644
index 020f8a0e1645..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-6.11.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.6.2:= >=dev-libs/libuv-1.9.0:= >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] test? ( net-misc/curl )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=6
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl test python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.6.2:= >=dev-libs/libuv-1.9.0:= >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib
-REQUIRED_USE=python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nodejs.org/dist/v6.11.3/node-v6.11.3.tar.xz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=663d84cfded956ce6c0e4fe26af15da1
diff --git a/metadata/md5-cache/net-libs/nodejs-6.11.5 b/metadata/md5-cache/net-libs/nodejs-6.11.5
new file mode 100644
index 000000000000..f8bd51911685
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-6.11.5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.6.2:= >=dev-libs/libuv-1.9.0:= >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] test? ( net-misc/curl )
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=6
+HOMEPAGE=https://nodejs.org/
+IUSE=cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl test python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.6.2:= >=dev-libs/libuv-1.9.0:= >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib
+REQUIRED_USE=python_targets_python2_7
+RESTRICT=test
+SLOT=0
+SRC_URI=https://nodejs.org/dist/v6.11.5/node-v6.11.5.tar.xz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=663d84cfded956ce6c0e4fe26af15da1
diff --git a/metadata/md5-cache/net-libs/nodejs-7.10.0 b/metadata/md5-cache/net-libs/nodejs-7.10.0
deleted file mode 100644
index fed29f26d829..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-7.10.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.6.2:= >=dev-libs/libuv-1.11.0:= >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=6
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl systemtap test python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.6.2:= >=dev-libs/libuv-1.11.0:= >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib
-REQUIRED_USE=python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nodejs.org/dist/v7.10.0/node-v7.10.0.tar.xz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=53fde4f4167a1268ce48e632e872919e
diff --git a/metadata/md5-cache/net-libs/nodejs-8.2.1 b/metadata/md5-cache/net-libs/nodejs-8.2.1
deleted file mode 100644
index ae154389a9cd..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-8.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.6.2:= >=dev-libs/libuv-1.11.0:= >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=6
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl systemtap test python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.6.2:= >=dev-libs/libuv-1.11.0:= >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib
-REQUIRED_USE=python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nodejs.org/dist/v8.2.1/node-v8.2.1.tar.xz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=53fde4f4167a1268ce48e632e872919e
diff --git a/metadata/md5-cache/net-libs/nodejs-8.4.0 b/metadata/md5-cache/net-libs/nodejs-8.4.0
deleted file mode 100644
index 693a6f0663fc..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-8.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.6.2:= >=dev-libs/libuv-1.11.0:= net-libs/nghttp2 >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=6
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl systemtap test python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.6.2:= >=dev-libs/libuv-1.11.0:= net-libs/nghttp2 >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib
-REQUIRED_USE=python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nodejs.org/dist/v8.4.0/node-v8.4.0.tar.xz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=539586923a06aafd2494c67f4b1be9ea
diff --git a/metadata/md5-cache/net-libs/nodejs-8.5.0 b/metadata/md5-cache/net-libs/nodejs-8.5.0
deleted file mode 100644
index 7f734104c8b7..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-8.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.6.2:= >=dev-libs/libuv-1.14.1:= >=net-libs/nghttp2-1.25.0 >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=6
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl systemtap test python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.6.2:= >=dev-libs/libuv-1.14.1:= >=net-libs/nghttp2-1.25.0 >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib
-REQUIRED_USE=python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nodejs.org/dist/v8.5.0/node-v8.5.0.tar.xz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=ae9abfaa039757c1ad4890845e513ba6
diff --git a/metadata/md5-cache/net-libs/nodejs-8.8.1 b/metadata/md5-cache/net-libs/nodejs-8.8.1
new file mode 100644
index 000000000000..9ee199527d41
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-8.8.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.7.0:= >=dev-libs/libuv-1.15.0:= >=net-libs/nghttp2-1.25.0 >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=6
+HOMEPAGE=https://nodejs.org/
+IUSE=cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl systemtap test python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.7.0:= >=dev-libs/libuv-1.15.0:= >=net-libs/nghttp2-1.25.0 >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib
+REQUIRED_USE=python_targets_python2_7
+RESTRICT=test
+SLOT=0
+SRC_URI=https://nodejs.org/dist/v8.8.1/node-v8.8.1.tar.xz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=bdc74a4c909c7d62a77974f716f2932d
diff --git a/metadata/md5-cache/net-libs/signond-8.59 b/metadata/md5-cache/net-libs/signond-8.59
new file mode 100644
index 000000000000..6fb0eeee079b
--- /dev/null
+++ b/metadata/md5-cache/net-libs/signond-8.59
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 net-libs/libproxy doc? ( app-doc/doxygen ) test? ( dev-qt/qttest:5 )
+DESCRIPTION=Signon daemon for libaccounts-glib
+EAPI=6
+HOMEPAGE=https://01.org/gsso/
+IUSE=doc test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 net-libs/libproxy !<net-libs/libproxy-0.4.12[kde]
+RESTRICT=test
+SLOT=0
+SRC_URI=https://gitlab.com/accounts-sso/signond/repository/archive.tar.gz?ref=VERSION_8.59 -> signond-8.59.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e
+_md5_=4fc746bcb872344277e42af8db5cf478
diff --git a/metadata/md5-cache/net-libs/telepathy-logger-qt-15.04.0 b/metadata/md5-cache/net-libs/telepathy-logger-qt-15.04.0
index a07d2562054b..43b8bb75e014 100644
--- a/metadata/md5-cache/net-libs/telepathy-logger-qt-15.04.0
+++ b/metadata/md5-cache/net-libs/telepathy-logger-qt-15.04.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtdbus-5.7.1:5 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libxml2 net-im/telepathy-logger net-libs/telepathy-glib net-libs/telepathy-qt[qt5(+)] sys-apps/dbus >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/telepathy-logger-qt/15.04/src/telepathy-logger-qt-15.04.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ec39519b79155d7961281673aca47a18
diff --git a/metadata/md5-cache/net-libs/telepathy-logger-qt-17.08.0 b/metadata/md5-cache/net-libs/telepathy-logger-qt-17.08.0
index 2b84ef4eea7d..9ee8baf5b62d 100644
--- a/metadata/md5-cache/net-libs/telepathy-logger-qt-17.08.0
+++ b/metadata/md5-cache/net-libs/telepathy-logger-qt-17.08.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtdbus-5.7.1:5 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libxml2 net-im/telepathy-logger net-libs/telepathy-glib net-libs/telepathy-qt[qt5(+)] sys-apps/dbus >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/telepathy-logger-qt/17.08/src/telepathy-logger-qt-17.08.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=61cfc557b425f43dfed8dd35884ea757
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.18.1 b/metadata/md5-cache/net-libs/webkit-gtk-2.18.1
new file mode 100644
index 000000000000..3458df089f6d
--- /dev/null
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.18.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=x11-libs/cairo-1.10.2:= >=media-libs/fontconfig-2.8.0:1.0 >=media-libs/freetype-2.4.2:2 >=dev-libs/libgcrypt-1.6.0:0= >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.3.3:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.48:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.8.0 media-libs/libwebp:= >=dev-libs/glib-2.40:2 >=dev-libs/libxslt-1.1.7 gnome-keyring? ( app-crypt/libsecret ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= >=dev-libs/libgcrypt-1.7.0:0= nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.2.3:1.0 >=media-libs/gst-plugins-base-1.2.3:1.0 >=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] ) X? ( x11-libs/cairo[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen egl? ( media-libs/mesa[egl] ) gles2? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl x11-libs/cairo[opengl] ) webgl? ( x11-libs/cairo[opengl] x11-libs/libXcomposite x11-libs/libXdamage ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/ruby:2.2 dev-lang/ruby:2.3 dev-lang/ruby:2.4 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 >=dev-lang/perl-5.10 >=dev-util/gtk-doc-am-1.10 >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 ) sys-devel/gettext virtual/pkgconfig dev-lang/perl virtual/perl-Data-Dumper virtual/perl-Carp doc? ( >=dev-util/gtk-doc-1.10 ) geolocation? ( dev-util/gdbus-codegen ) introspection? ( jit? ( sys-apps/paxctl ) ) test? ( dev-lang/python:2.7 dev-python/pygobject:3[python_targets_python2_7] x11-themes/hicolor-icon-theme jit? ( sys-apps/paxctl ) ) dev-util/ninja >=dev-util/cmake-3.7.2 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Open source web browser engine
+EAPI=6
+HOMEPAGE=http://www.webkitgtk.org/
+IUSE=aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=LGPL-2+ BSD
+RDEPEND=>=x11-libs/cairo-1.10.2:= >=media-libs/fontconfig-2.8.0:1.0 >=media-libs/freetype-2.4.2:2 >=dev-libs/libgcrypt-1.6.0:0= >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.3.3:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.48:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.8.0 media-libs/libwebp:= >=dev-libs/glib-2.40:2 >=dev-libs/libxslt-1.1.7 gnome-keyring? ( app-crypt/libsecret ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= >=dev-libs/libgcrypt-1.7.0:0= nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.2.3:1.0 >=media-libs/gst-plugins-base-1.2.3:1.0 >=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] ) X? ( x11-libs/cairo[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen egl? ( media-libs/mesa[egl] ) gles2? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl x11-libs/cairo[opengl] ) webgl? ( x11-libs/cairo[opengl] x11-libs/libXcomposite x11-libs/libXdamage )
+REQUIRED_USE=geolocation? ( introspection ) gles2? ( egl ) introspection? ( gstreamer ) nsplugin? ( X ) webgl? ( ^^ ( gles2 opengl ) ) !webgl? ( ?? ( gles2 opengl ) ) webgl? ( gstreamer ) wayland? ( egl ) || ( aqua wayland X )
+RESTRICT=test
+SLOT=4/37
+SRC_URI=http://www.webkitgtk.org/releases/webkitgtk-2.18.1.tar.xz
+_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=701f3d80577a6a33a791e6f5fc23f80f
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.18.2 b/metadata/md5-cache/net-libs/webkit-gtk-2.18.2
new file mode 100644
index 000000000000..65dc5d6f7a8f
--- /dev/null
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.18.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=x11-libs/cairo-1.10.2:= >=media-libs/fontconfig-2.8.0:1.0 >=media-libs/freetype-2.4.2:2 >=dev-libs/libgcrypt-1.6.0:0= >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.3.3:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.48:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.8.0 media-libs/libwebp:= >=dev-libs/glib-2.40:2 >=dev-libs/libxslt-1.1.7 gnome-keyring? ( app-crypt/libsecret ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= >=dev-libs/libgcrypt-1.7.0:0= nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.2.3:1.0 >=media-libs/gst-plugins-base-1.2.3:1.0 >=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] ) X? ( x11-libs/cairo[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen egl? ( media-libs/mesa[egl] ) gles2? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl x11-libs/cairo[opengl] ) webgl? ( x11-libs/cairo[opengl] x11-libs/libXcomposite x11-libs/libXdamage ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/ruby:2.2 dev-lang/ruby:2.3 dev-lang/ruby:2.4 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 >=dev-lang/perl-5.10 >=dev-util/gtk-doc-am-1.10 >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 ) sys-devel/gettext virtual/pkgconfig dev-lang/perl virtual/perl-Data-Dumper virtual/perl-Carp doc? ( >=dev-util/gtk-doc-1.10 ) geolocation? ( dev-util/gdbus-codegen ) introspection? ( jit? ( sys-apps/paxctl ) ) test? ( dev-lang/python:2.7 dev-python/pygobject:3[python_targets_python2_7] x11-themes/hicolor-icon-theme jit? ( sys-apps/paxctl ) ) dev-util/ninja >=dev-util/cmake-3.7.2 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Open source web browser engine
+EAPI=6
+HOMEPAGE=http://www.webkitgtk.org/
+IUSE=aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=LGPL-2+ BSD
+RDEPEND=>=x11-libs/cairo-1.10.2:= >=media-libs/fontconfig-2.8.0:1.0 >=media-libs/freetype-2.4.2:2 >=dev-libs/libgcrypt-1.6.0:0= >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.3.3:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.48:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.8.0 media-libs/libwebp:= >=dev-libs/glib-2.40:2 >=dev-libs/libxslt-1.1.7 gnome-keyring? ( app-crypt/libsecret ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= >=dev-libs/libgcrypt-1.7.0:0= nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.2.3:1.0 >=media-libs/gst-plugins-base-1.2.3:1.0 >=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] ) X? ( x11-libs/cairo[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen egl? ( media-libs/mesa[egl] ) gles2? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl x11-libs/cairo[opengl] ) webgl? ( x11-libs/cairo[opengl] x11-libs/libXcomposite x11-libs/libXdamage )
+REQUIRED_USE=geolocation? ( introspection ) gles2? ( egl ) introspection? ( gstreamer ) nsplugin? ( X ) webgl? ( ^^ ( gles2 opengl ) ) !webgl? ( ?? ( gles2 opengl ) ) webgl? ( gstreamer ) wayland? ( egl ) || ( aqua wayland X )
+RESTRICT=test
+SLOT=4/37
+SRC_URI=http://www.webkitgtk.org/releases/webkitgtk-2.18.2.tar.xz
+_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=701f3d80577a6a33a791e6f5fc23f80f
diff --git a/metadata/md5-cache/net-libs/zeromq-4.2.2-r2 b/metadata/md5-cache/net-libs/zeromq-4.2.2-r2
index ad98c7068894..38c25e964f80 100644
--- a/metadata/md5-cache/net-libs/zeromq-4.2.2-r2
+++ b/metadata/md5-cache/net-libs/zeromq-4.2.2-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A brokerless kernel
 EAPI=6
 HOMEPAGE=http://www.zeromq.org/
 IUSE=doc pgm +sodium static-libs test unwind elibc_Darwin
-KEYWORDS=amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-3
 RDEPEND=!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) ) sodium? ( dev-libs/libsodium:= ) pgm? ( =net-libs/openpgm-5.2.122 )
 SLOT=0/5
 SRC_URI=https://github.com/zeromq/libzmq/releases/download/v4.2.2/zeromq-4.2.2.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=22619412b35ae868f80a3768bc942ac8
+_md5_=7ae73140a9d7d3d8aa87b4e388a140e1
diff --git a/metadata/md5-cache/net-mail/amavis-logwatch-1.51.03 b/metadata/md5-cache/net-mail/amavis-logwatch-1.51.03
deleted file mode 100644
index 09a61fa76c5a..000000000000
--- a/metadata/md5-cache/net-mail/amavis-logwatch-1.51.03
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=A log analyzer for amavisd-new
-EAPI=5
-HOMEPAGE=http://logreporters.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=mirror://sourceforge/logreporters/amavis-logwatch-1.51.03.tgz
-_md5_=c50e8c94716acbd7b46445f1906c3792
diff --git a/metadata/md5-cache/net-mail/amavis-logwatch-1.51.03-r3 b/metadata/md5-cache/net-mail/amavis-logwatch-1.51.03-r3
index 3e8b56ec70f6..03d8e06593b5 100644
--- a/metadata/md5-cache/net-mail/amavis-logwatch-1.51.03-r3
+++ b/metadata/md5-cache/net-mail/amavis-logwatch-1.51.03-r3
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=A log analyzer for amavisd-new
 EAPI=6
 HOMEPAGE=http://logreporters.sourceforge.net/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=mirror://sourceforge/logreporters/amavis-logwatch-1.51.03.tgz
-_md5_=dbd25555d90fac45cadd19bb78aa9f11
+_md5_=c719b8e06c9818776c8a7db87072a35f
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.4 b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.4
index d7e27cde13c7..84ca322a47d2 100644
--- a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.4
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=The Cyrus IMAP Server
 EAPI=6
 HOMEPAGE=http://www.cyrusimap.org/
 IUSE=afs backup calalarm caps clamav http jmap kerberos ldap lmdb mysql nntp pam perl postgres replication +server sieve snmp sphinx sqlite ssl static-libs tcpd test xapian ssl
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86
 LICENSE=BSD-with-attribution
 RDEPEND=sys-libs/zlib dev-libs/libpcre >=dev-libs/cyrus-sasl-2.1.13 dev-libs/jansson dev-libs/icu:= afs? ( net-fs/openafs ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) http? ( dev-libs/libxml2 dev-libs/libical ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb ) mysql? ( >=virtual/mysql-5.5 ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam >=net-mail/mailbase-1 ) perl? ( dev-lang/perl:= ) postgres? ( dev-db/postgresql:* ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) xapian? ( >=dev-libs/xapian-1.4.0 ) !mail-mta/courier !net-mail/bincimap !net-mail/courier-imap !net-mail/uw-imap !net-mail/cyrus-imap-admin
 REQUIRED_USE=afs? ( kerberos ) backup? ( sqlite ) calalarm? ( http ) http? ( sqlite ) jmap? ( http xapian ) sphinx? ( mysql )
 SLOT=0
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-imapd/cyrus-imapd-3.0.4.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=e75ef14b2274c207a5b910dcda27d4e1
+_md5_=f31c48c48e8454243ba3ad92b7c70541
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.32 b/metadata/md5-cache/net-mail/dovecot-2.2.32
index 5a5678ee2419..bb16952cf2e9 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.2.32
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.32
@@ -4,11 +4,11 @@ DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
 EAPI=6
 HOMEPAGE=http://www.dovecot.org/
 IUSE=kerberos ldap mysql pam postgres sqlite vpopmail bzip2 lzma lz4 zlib caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat ssl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 ~x86
+KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 x86
 LICENSE=LGPL-2.1 MIT
 RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
 REQUIRED_USE=ssl
 SLOT=0
 SRC_URI=https://dovecot.org/releases/2.2/dovecot-2.2.32.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.20.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.20.tar.gz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ccf328a746a57be1ab77c676f1104485
+_md5_=d4dfbfa2b894b15d7d39046964a06cc4
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.33.2 b/metadata/md5-cache/net-mail/dovecot-2.2.33.2
new file mode 100644
index 000000000000..5f8e265c59a1
--- /dev/null
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.33.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) ) virtual/pkgconfig
+DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
+EAPI=6
+HOMEPAGE=http://www.dovecot.org/
+IUSE=kerberos ldap mysql pam postgres sqlite vpopmail bzip2 lzma lz4 zlib caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat ssl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86
+LICENSE=LGPL-2.1 MIT
+RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
+REQUIRED_USE=ssl
+SLOT=0
+SRC_URI=https://dovecot.org/releases/2.2/dovecot-2.2.33.2.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.21.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.21.tar.gz )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=2621f9fe18392d2e9124274a15556504
diff --git a/metadata/md5-cache/net-mail/mailman-2.1.24 b/metadata/md5-cache/net-mail/mailman-2.1.24
index 80698654d4d8..4084db6c7175 100644
--- a/metadata/md5-cache/net-mail/mailman-2.1.24
+++ b/metadata/md5-cache/net-mail/mailman-2.1.24
@@ -4,11 +4,11 @@ DESCRIPTION=A python-based mailing list server with an extensive web interface
 EAPI=5
 HOMEPAGE=http://www.list.org/
 IUSE=selinux python_targets_python2_7
-KEYWORDS=~amd64 ppc x86
+KEYWORDS=amd64 ppc 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] virtual/mta virtual/cron virtual/httpd-cgi virtual/python-dnspython[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] selinux? ( sec-policy/selinux-mailman )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sourceforge/mailman/mailman-2.1.24.tgz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=a96a8fcd67a6a5dcce2a08e4bd8e04b2
+_md5_=3564fa29cb27290d487fc7329a19fda6
diff --git a/metadata/md5-cache/net-mail/mailutils-3.3 b/metadata/md5-cache/net-mail/mailutils-3.3
index 870d14ca2458..362b6d0c41aa 100644
--- a/metadata/md5-cache/net-mail/mailutils-3.3
+++ b/metadata/md5-cache/net-mail/mailutils-3.3
@@ -4,11 +4,11 @@ DESCRIPTION=A useful collection of mail servers, clients, and filters
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/mailutils/mailutils.html
 IUSE=berkdb bidi +clients gdbm sasl guile ipv6 kerberos kyotocabinet ldap mysql nls pam postgres python servers ssl static-libs +threads tcpd tokyocabinet python_targets_python2_7
-KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~x86 ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm64 ~hppa ~ia64 ~ppc ~x86 ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses:= sys-libs/readline:= dev-libs/libltdl:0 virtual/mta berkdb? ( sys-libs/db:= ) bidi? ( dev-libs/fribidi ) gdbm? ( sys-libs/gdbm ) guile? ( dev-scheme/guile:= ) kerberos? ( virtual/krb5 ) kyotocabinet? ( dev-db/kyotocabinet ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) nls? ( sys-devel/gettext ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:= ) 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet )
 REQUIRED_USE=python? ( python_targets_python2_7 ) servers? ( tcpd )
 SLOT=0
 SRC_URI=mirror://gnu/mailutils/mailutils-3.3.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=ba0c4967a544952f4e1ea313610781b8
+_md5_=acb7a97eccc906d9a5665901923be335
diff --git a/metadata/md5-cache/net-mail/postfix-logwatch-1.40.03 b/metadata/md5-cache/net-mail/postfix-logwatch-1.40.03
deleted file mode 100644
index 0702e7f69c51..000000000000
--- a/metadata/md5-cache/net-mail/postfix-logwatch-1.40.03
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=A log analyzer for postfix
-EAPI=5
-HOMEPAGE=http://logreporters.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=mirror://sourceforge/logreporters/postfix-logwatch-1.40.03.tgz
-_md5_=fe18e6ce7863f31ff87666f49ae690d2
diff --git a/metadata/md5-cache/net-mail/postfix-logwatch-1.40.03-r2 b/metadata/md5-cache/net-mail/postfix-logwatch-1.40.03-r2
index ea1d634d4cf8..1b9ecc1a530d 100644
--- a/metadata/md5-cache/net-mail/postfix-logwatch-1.40.03-r2
+++ b/metadata/md5-cache/net-mail/postfix-logwatch-1.40.03-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=A log analyzer for postfix
 EAPI=6
 HOMEPAGE=http://logreporters.sourceforge.net/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=mirror://sourceforge/logreporters/postfix-logwatch-1.40.03.tgz
-_md5_=183b4cdf285b1e1c3f917b9a2751054a
+_md5_=0877871fe5aca62fdb19b7db4367eefd
diff --git a/metadata/md5-cache/net-misc/asterisk-11.25.3 b/metadata/md5-cache/net-misc/asterisk-11.25.3
index 3a12e4ed57eb..6beb22a41dcb 100644
--- a/metadata/md5-cache/net-misc/asterisk-11.25.3
+++ b/metadata/md5-cache/net-misc/asterisk-11.25.3
@@ -4,7 +4,7 @@ DESCRIPTION=Asterisk: A Modular Open Source PBX System
 EAPI=6
 HOMEPAGE=http://www.asterisk.org/
 IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis
-KEYWORDS=~amd64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 PDEPEND=net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound
 RDEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/libxml2 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/ncurses:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp:0 ) vorbis? ( media-libs/libvorbis ) selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger )
@@ -12,4 +12,4 @@ REQUIRED_USE=gtalk? ( xmpp ) ^^ ( voicemail_storage_file voicemail_storage_odbc
 SLOT=0
 SRC_URI=http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-11.25.3.tar.gz mirror://gentoo/gentoo-asterisk-patchset-3.17.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=6bf242e5377c8db3e036a572a0b12f0d
+_md5_=f9b540eaf120510a913097c7cdd9ed02
diff --git a/metadata/md5-cache/net-misc/axel-2.14.1 b/metadata/md5-cache/net-misc/axel-2.14.1
index 8c7d4e5d2cf7..e98c97d3364c 100644
--- a/metadata/md5-cache/net-misc/axel-2.14.1
+++ b/metadata/md5-cache/net-misc/axel-2.14.1
@@ -11,4 +11,4 @@ REQUIRED_USE=libressl? ( ssl )
 SLOT=0
 SRC_URI=https://github.com/axel-download-accelerator/axel/archive/v2.14.1.tar.gz -> axel-2.14.1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=985e7c8aeae1f20532cb79d192a87660
+_md5_=ec19cd34714463f4ce7f33e4ab594e79
diff --git a/metadata/md5-cache/net-misc/axel-2.15 b/metadata/md5-cache/net-misc/axel-2.15
new file mode 100644
index 000000000000..35b6de35b517
--- /dev/null
+++ b/metadata/md5-cache/net-misc/axel-2.15
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure postinst prepare
+DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Light Unix download accelerator
+EAPI=6
+HOMEPAGE=https://github.com/axel-download-accelerator/axel
+IUSE=debug libressl nls ssl
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris
+LICENSE=GPL-2
+RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) nls? ( virtual/libintl virtual/libiconv )
+REQUIRED_USE=libressl? ( ssl )
+SLOT=0
+SRC_URI=https://github.com/axel-download-accelerator/axel/archive/v2.15.tar.gz -> axel-2.15.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=ec19cd34714463f4ce7f33e4ab594e79
diff --git a/metadata/md5-cache/net-misc/axel-9999 b/metadata/md5-cache/net-misc/axel-9999
index f5ec3903b65c..7184e1326341 100644
--- a/metadata/md5-cache/net-misc/axel-9999
+++ b/metadata/md5-cache/net-misc/axel-9999
@@ -2,11 +2,11 @@ DEFINED_PHASES=configure postinst prepare unpack
 DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Light Unix download accelerator
 EAPI=6
-HOMEPAGE=https://github.com/eribertomota/axel
+HOMEPAGE=https://github.com/axel-download-accelerator/axel
 IUSE=debug libressl nls ssl
 LICENSE=GPL-2
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) nls? ( virtual/libintl virtual/libiconv )
 REQUIRED_USE=libressl? ( ssl )
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	git-r3	52a888802d25387c2c74cb845d1219bc	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=fc0efddb6b1ded7caffe5f42c863f026
+_md5_=df5c22a682a7b57c082f4d7b1b20f94c
diff --git a/metadata/md5-cache/net-misc/buka-2.0 b/metadata/md5-cache/net-misc/buka-2.0
deleted file mode 100644
index 7c70b04df85d..000000000000
--- a/metadata/md5-cache/net-misc/buka-2.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Download manga from buka.cn
-EAPI=6
-HOMEPAGE=https://gitgud.io/drylemon/buka
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=sys-process/parallel net-misc/curl dev-util/dialog
-SLOT=0
-SRC_URI=http://lick.moe/buka/buka-2.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=53ea9f87442d41c293a4ce98b574d263
diff --git a/metadata/md5-cache/net-misc/buka-3.0.1 b/metadata/md5-cache/net-misc/buka-3.0.1
new file mode 100644
index 000000000000..f8aecd92d8f9
--- /dev/null
+++ b/metadata/md5-cache/net-misc/buka-3.0.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=Download manga from buka.cn
+EAPI=6
+HOMEPAGE=https://gitlab.com/drylemon/buka
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-python/beautifulsoup dev-python/requests sys-process/parallel net-misc/curl dev-util/dialog
+SLOT=0
+SRC_URI=https://gitlab.com/drylemon/buka/repository/3.0.1/archive.tar.gz?ref=3.0.1 -> buka-3.0.1.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=a7570615b7ecdba094eec73e0eede226
diff --git a/metadata/md5-cache/net-misc/curl-7.56.1 b/metadata/md5-cache/net-misc/curl-7.56.1
new file mode 100644
index 000000000000..c5371f6541b8
--- /dev/null
+++ b/metadata/md5-cache/net-misc/curl-7.56.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=ldap? ( net-nds/openldap[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(-)?] ) ssl? ( curl_ssl_axtls? ( net-libs/axtls: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(-)?] app-misc/ca-certificates ) curl_ssl_gnutls? ( net-libs/gnutls: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(-)?] dev-libs/nettle: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(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl: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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls: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(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl: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(-)?] ) curl_ssl_nss? ( dev-libs/nss: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(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[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[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(-)?] ) adns? ( net-dns/c-ares: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(-)?] ) kerberos? ( >=virtual/krb5-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(-)?] ) metalink? ( >=media-libs/libmetalink-0.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(-)?] ) rtmp? ( media-video/rtmpdump[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(-)?] ) ssh? ( net-libs/libssh2[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(-)?] ) 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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r13 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=virtual/pkgconfig-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(-)?] test? ( sys-apps/diffutils dev-lang/perl ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A Client that groks URLs
+EAPI=6
+HOMEPAGE=https://curl.haxx.se/
+IUSE=adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl elibc_Winnt 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-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ldap? ( net-nds/openldap[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(-)?] ) ssl? ( curl_ssl_axtls? ( net-libs/axtls: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(-)?] app-misc/ca-certificates ) curl_ssl_gnutls? ( net-libs/gnutls: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(-)?] dev-libs/nettle: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(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl: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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls: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(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl: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(-)?] ) curl_ssl_nss? ( dev-libs/nss: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(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[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[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(-)?] ) adns? ( net-dns/c-ares: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(-)?] ) kerberos? ( >=virtual/krb5-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(-)?] ) metalink? ( >=media-libs/libmetalink-0.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(-)?] ) rtmp? ( media-video/rtmpdump[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(-)?] ) ssh? ( net-libs/libssh2[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(-)?] ) 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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r13 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://curl.haxx.se/download/curl-7.56.1.tar.bz2
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=547e18ebe45fc9cca5f7531f646021c3
diff --git a/metadata/md5-cache/net-misc/eventd-0.23.0 b/metadata/md5-cache/net-misc/eventd-0.23.0
index 1f893b9f0d25..766ec77c581c 100644
--- a/metadata/md5-cache/net-misc/eventd-0.23.0
+++ b/metadata/md5-cache/net-misc/eventd-0.23.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.40:2 sys-apps/util-linux introspection? ( >=dev-libs/g
 REQUIRED_USE=X? ( notification ) fbcon? ( notification ) notification? ( || ( X fbcon ) ) test? ( websocket )
 SLOT=0
 SRC_URI=https://www.eventd.org/download/eventd/eventd-0.23.0.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	958769e8b8b5a79afc3f22f3915cebbc	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	38757afcd8d9f0d1d44ba4cefc33b99d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=148c48a9342df13034a412530dfaa064
diff --git a/metadata/md5-cache/net-misc/freerdp-2.0.0_rc0 b/metadata/md5-cache/net-misc/freerdp-2.0.0_rc0
index 772156ab11ca..96f931e7ba94 100644
--- a/metadata/md5-cache/net-misc/freerdp-2.0.0_rc0
+++ b/metadata/md5-cache/net-misc/freerdp-2.0.0_rc0
@@ -4,10 +4,10 @@ DESCRIPTION=Free implementation of the Remote Desktop Protocol
 EAPI=6
 HOMEPAGE=http://www.freerdp.com/
 IUSE=alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg libav libressl neon openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) client? ( usb? ( virtual/libudev:0= sys-apps/util-linux:0= dev-libs/dbus-glib:0= virtual/libusb:1= ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) jpeg? ( virtual/jpeg:0 ) openh264? ( media-libs/openh264 ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) X? ( x11-libs/libX11 x11-libs/libxkbfile )
 SLOT=0/2
 SRC_URI=https://github.com/FreeRDP/FreeRDP/archive/2.0.0-rc0.tar.gz -> FreeRDP-2.0.0-rc0.tar.gz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0f9fb909e018c99b5adda3c39c37f18f
+_md5_=cb5cbd929831a80a37f79342071ad542
diff --git a/metadata/md5-cache/net-misc/grive-0.5.1_pre20171005 b/metadata/md5-cache/net-misc/grive-0.5.1_pre20171005
new file mode 100644
index 000000000000..b8e8dd59fe50
--- /dev/null
+++ b/metadata/md5-cache/net-misc/grive-0.5.1_pre20171005
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-libs/boost:= dev-libs/expat >=dev-libs/json-c-0.11-r1:= dev-libs/libgcrypt:0= || ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] ) sys-libs/binutils-libs:0= sys-libs/glibc dev-libs/yajl sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=An open source Linux client for Google Drive
+EAPI=5
+HOMEPAGE=https://github.com/vitalif/grive2
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/boost:= dev-libs/expat >=dev-libs/json-c-0.11-r1:= dev-libs/libgcrypt:0= || ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] ) sys-libs/binutils-libs:0= sys-libs/glibc dev-libs/yajl
+SLOT=0
+SRC_URI=https://github.com/vitalif/grive2/archive/3c90425b8f46b62365ec3d84de628163865dbb1e.tar.gz -> grive-0.5.1_pre20171005.tar.gz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=40101d4e03c5a0ccc30f7d196c74ce2f
diff --git a/metadata/md5-cache/net-misc/iputils-20171016_pre b/metadata/md5-cache/net-misc/iputils-20171016_pre
new file mode 100644
index 000000000000..374d8de7d312
--- /dev/null
+++ b/metadata/md5-cache/net-misc/iputils-20171016_pre
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) traceroute? ( !net-analyzer/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn ) ipv6? ( ssl? ( gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( dev-libs/nettle ) openssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) ) ) ) static? ( caps? ( sys-libs/libcap[static-libs(+)] ) idn? ( net-dns/libidn[static-libs(+)] ) ipv6? ( ssl? ( gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( dev-libs/nettle[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0[static-libs(+)] ) libressl? ( dev-libs/libressl[static-libs(+)] ) ) ) ) ) virtual/os-headers filecaps? ( sys-libs/libcap )
+DESCRIPTION=Network monitoring tools including ping and ping6
+EAPI=6
+HOMEPAGE=https://wiki.linuxfoundation.org/networking/iputils
+IUSE=+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle +openssl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute +filecaps
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux
+LICENSE=BSD GPL-2+ rdisc
+RDEPEND=arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) traceroute? ( !net-analyzer/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn ) ipv6? ( ssl? ( gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( dev-libs/nettle ) openssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) ) ) )
+REQUIRED_USE=ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) )
+SLOT=0
+SRC_URI=https://github.com/iputils/iputils/archive/67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf.tar.gz -> iputils-20171016_pre.tar.gz https://dev.gentoo.org/~whissi/dist/iputils/iputils-manpages-20171016_pre.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fcaps	e80204189039ecc03f24151c518375f0	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=4b427d1d310468f4c18e4c29c47bcd8f
diff --git a/metadata/md5-cache/net-misc/iputils-99999999 b/metadata/md5-cache/net-misc/iputils-99999999
index b9ee930fe0a8..916437cacfc2 100644
--- a/metadata/md5-cache/net-misc/iputils-99999999
+++ b/metadata/md5-cache/net-misc/iputils-99999999
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) traceroute? ( !net-analyzer/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn ) ipv6? ( ssl? ( gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( dev-libs/nettle ) openssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) ) ) ) static? ( caps? ( sys-libs/libcap[static-libs(+)] ) idn? ( net-dns/libidn[static-libs(+)] ) ipv6? ( ssl? ( gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( dev-libs/nettle[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0[static-libs(+)] ) libressl? ( dev-libs/libressl[static-libs(+)] ) ) ) ) ) virtual/os-headers app-text/openjade dev-perl/SGMLSpm app-text/docbook-sgml-dtd app-text/docbook-sgml-utils filecaps? ( sys-libs/libcap ) >=dev-vcs/git-1.8.2.1
+DEPEND=arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) traceroute? ( !net-analyzer/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn ) ipv6? ( ssl? ( gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( dev-libs/nettle ) openssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) ) ) ) static? ( caps? ( sys-libs/libcap[static-libs(+)] ) idn? ( net-dns/libidn[static-libs(+)] ) ipv6? ( ssl? ( gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( dev-libs/nettle[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0[static-libs(+)] ) libressl? ( dev-libs/libressl[static-libs(+)] ) ) ) ) ) virtual/os-headers app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 filecaps? ( sys-libs/libcap ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Network monitoring tools including ping and ping6
-EAPI=5
+EAPI=6
 HOMEPAGE=https://wiki.linuxfoundation.org/networking/iputils
 IUSE=+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle +openssl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute +filecaps
 LICENSE=BSD GPL-2+ rdisc
@@ -9,4 +9,4 @@ RDEPEND=arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) traceroute? ( !n
 REQUIRED_USE=ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) )
 SLOT=0
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fcaps	e80204189039ecc03f24151c518375f0	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=2f08acdfd9e78822a4f436dcd5ef7a99
+_md5_=7e59598b5453f8fdd402a412a13c95b1
diff --git a/metadata/md5-cache/net-misc/knemo-0.8.0_pre20161211 b/metadata/md5-cache/net-misc/knemo-0.8.0_pre20161211
index 731ec6e2060a..fdc851570397 100644
--- a/metadata/md5-cache/net-misc/knemo-0.8.0_pre20161211
+++ b/metadata/md5-cache/net-misc/knemo-0.8.0_pre20161211
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/kglobalaccel-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/plasma-5.37.0:5 >=kde-plasma/libksysguard-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/libnl:3 sys-apps/net-tools wifi? ( net-wireless/wireless-tools ) !net-misc/knemo:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~johu/distfiles/knemo-0.8.0_pre20161211.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d451d074a7508e7f7b64b7f374745bbf
diff --git a/metadata/md5-cache/net-misc/knutclient-1.0.5 b/metadata/md5-cache/net-misc/knutclient-1.0.5
index a41ac4f953f5..ede4db476f66 100644
--- a/metadata/md5-cache/net-misc/knutclient-1.0.5
+++ b/metadata/md5-cache/net-misc/knutclient-1.0.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kde-frameworks/oxygen-icons l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[l10n_cs(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[l10n_de(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[l10n_es(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fr(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[l10n_it(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pl(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt-BR(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ru(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_uk(+)] ) handbook? ( kde-frameworks/kdelibs:4[handbook] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4
 SRC_URI=ftp://ftp.buzuluk.cz/pub/alo/knutclient/stable/knutclient-1.0.5.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=24978d43a6ddf2f5106d3f495f0edcee
diff --git a/metadata/md5-cache/net-misc/rclone-1.38 b/metadata/md5-cache/net-misc/rclone-1.38
new file mode 100644
index 000000000000..595f468e5a87
--- /dev/null
+++ b/metadata/md5-cache/net-misc/rclone-1.38
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.8
+DESCRIPTION=A program to sync files to and from various cloud storage providers
+EAPI=6
+HOMEPAGE=https://rclone.org/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/ncw/rclone/archive/v1.38.tar.gz -> rclone-1.38.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=748b03cb9428becba5208c6c8a77f211
diff --git a/metadata/md5-cache/net-misc/remmina-1.2.0_rc24 b/metadata/md5-cache/net-misc/remmina-1.2.0_rc24
new file mode 100644
index 000000000000..8ed660d3cb27
--- /dev/null
+++ b/metadata/md5-cache/net-misc/remmina-1.2.0_rc24
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile ayatana? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc0 ) gnome-keyring? ( app-crypt/libsecret ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver ) zeroconf? ( net-dns/avahi[gtk3] ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DESCRIPTION=A GTK+ RDP, SPICE, VNC, XDMCP and SSH client
+EAPI=6
+HOMEPAGE=https://remmina.org/
+IUSE=ayatana crypt rdp gnome-keyring nls spice ssh telepathy vnc zeroconf
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile ayatana? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc0 ) gnome-keyring? ( app-crypt/libsecret ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver ) zeroconf? ( net-dns/avahi[gtk3] ) virtual/freedesktop-icon-theme
+SLOT=0
+SRC_URI=https://github.com/FreeRDP/Remmina/archive/v1.2.0-rcgit.24.tar.gz -> remmina-1.2.0_rc24.tar.gz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5a687667732b94bc4c1cb7dbe00570c7
diff --git a/metadata/md5-cache/net-misc/smb4k-2.0.2 b/metadata/md5-cache/net-misc/smb4k-2.0.2
index ea70c616eadf..504c253b4727 100644
--- a/metadata/md5-cache/net-misc/smb4k-2.0.2
+++ b/metadata/md5-cache/net-misc/smb4k-2.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kauth-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/solid-5.37.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qttest-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !net-misc/smb4k:4 >=net-fs/samba-3.4.2[cups] >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://sourceforge/smb4k/smb4k-2.0.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=51fbacf2a3141bef2d13fae14aa81671
diff --git a/metadata/md5-cache/net-misc/unison-2.48.4 b/metadata/md5-cache/net-misc/unison-2.48.4
index f4c80a293d3d..05b10ed11267 100644
--- a/metadata/md5-cache/net-misc/unison-2.48.4
+++ b/metadata/md5-cache/net-misc/unison-2.48.4
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install postinst test
+DEFINED_PHASES=compile install postinst prepare test
 DEPEND=dev-lang/ocaml[ocamlopt?] gtk? ( dev-ml/lablgtk ) test? ( || ( dev-util/ctags virtual/emacs ) )
 DESCRIPTION=Two-way cross-platform file synchronizer
 EAPI=5
@@ -10,4 +10,4 @@ RDEPEND=gtk? ( dev-ml/lablgtk || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass
 SLOT=2.48
 SRC_URI=https://www.seas.upenn.edu/~bcpierce/unison/download/releases/unison-2.48.4/unison-2.48.4.tar.gz doc? ( https://www.seas.upenn.edu/~bcpierce/unison/download/releases/unison-2.48.4/unison-2.48.4-manual.pdf https://www.seas.upenn.edu/~bcpierce/unison/download/releases/unison-2.48.4/unison-2.48.4-manual.html )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=3b54664497839beb7e92b9456b44aad9
+_md5_=2bcc19b597d78ff86d68dfbad29c14f0
diff --git a/metadata/md5-cache/net-misc/wget-1.19.1-r2 b/metadata/md5-cache/net-misc/wget-1.19.1-r2
new file mode 100644
index 000000000000..f54867f44702
--- /dev/null
+++ b/metadata/md5-cache/net-misc/wget-1.19.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=!static? ( idn? ( >=net-dns/libidn2-0.14 ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) app-arch/xz-utils virtual/pkgconfig static? ( idn? ( >=net-dns/libidn2-0.14[static-libs(+)] ) pcre? ( dev-libs/libpcre[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs(+)] ) !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl[static-libs(+)] ) ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) ) test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) dev-lang/perl dev-perl/HTTP-Daemon dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) nls? ( sys-devel/gettext )
+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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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/libpcre ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) ) 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.19.1.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=86aa97ff1678cce18bed6a706da7b732
diff --git a/metadata/md5-cache/net-misc/wget-1.19.2 b/metadata/md5-cache/net-misc/wget-1.19.2
new file mode 100644
index 000000000000..cb3b3389e891
--- /dev/null
+++ b/metadata/md5-cache/net-misc/wget-1.19.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=!static? ( idn? ( >=net-dns/libidn2-0.14 ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) app-arch/xz-utils virtual/pkgconfig static? ( idn? ( >=net-dns/libidn2-0.14[static-libs(+)] ) pcre? ( dev-libs/libpcre[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs(+)] ) !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl[static-libs(+)] ) ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) ) test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) dev-lang/perl dev-perl/HTTP-Daemon dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) nls? ( sys-devel/gettext )
+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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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/libpcre ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) ) 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.19.2.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=c3968be0567d19c7f1b4b23d739a0daa
diff --git a/metadata/md5-cache/net-misc/wicd-1.7.4-r2 b/metadata/md5-cache/net-misc/wicd-1.7.4-r3
index 0e27ab8332d5..0e27ab8332d5 100644
--- a/metadata/md5-cache/net-misc/wicd-1.7.4-r2
+++ b/metadata/md5-cache/net-misc/wicd-1.7.4-r3
diff --git a/metadata/md5-cache/net-misc/x2goclient-4.1.0.0-r1 b/metadata/md5-cache/net-misc/x2goclient-4.1.0.0-r1
index a0f3ea5f6598..1c705ddb52b0 100644
--- a/metadata/md5-cache/net-misc/x2goclient-4.1.0.0-r1
+++ b/metadata/md5-cache/net-misc/x2goclient-4.1.0.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=The X2Go Qt client
 EAPI=6
 HOMEPAGE=http://www.x2go.org
 IUSE=ldap nsplugin qt5
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libssh-0.6.0_rc1 net-print/cups x11-libs/libXpm ldap? ( net-nds/openldap ) !qt5? ( dev-qt/qtcore:4[ssl] dev-qt/qtgui:4 dev-qt/qtsvg:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) net-misc/nx
 REQUIRED_USE=nsplugin? ( !qt5 )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/x2goclient/x2goclient-4.1.0.0.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	e5d920147bfccf4930062e462e2a417d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b314edb7ad1bf677082864786bbe2ddd
+_md5_=4f983ce30e19b3e42abee3e1b66dd2b6
diff --git a/metadata/md5-cache/net-misc/x2goserver-4.0.1.20 b/metadata/md5-cache/net-misc/x2goserver-4.0.1.20
index 631cc4a77623..aa8be0c2aa93 100644
--- a/metadata/md5-cache/net-misc/x2goserver-4.0.1.20
+++ b/metadata/md5-cache/net-misc/x2goserver-4.0.1.20
@@ -4,11 +4,11 @@ DESCRIPTION=The X2Go server
 EAPI=6
 HOMEPAGE=http://www.x2go.org
 IUSE=+fuse postgres +sqlite
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/Capture-Tiny dev-perl/Config-Simple dev-perl/File-BaseDir dev-perl/File-ReadBackwards dev-perl/File-Which media-fonts/font-cursor-misc media-fonts/font-misc-misc[nls] >=net-misc/nx-3.5.0.25 net-misc/openssh >=sys-apps/iproute2-4.3.0 x11-apps/xauth x11-apps/xhost x11-apps/xwininfo fuse? ( net-fs/sshfs ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
 REQUIRED_USE=|| ( postgres sqlite )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/x2goserver/x2goserver-4.0.1.20.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=13eddeca846432e79184df08de02e815
+_md5_=b3b4f9761b71365e3d60d33c31091076
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2017.10.07 b/metadata/md5-cache/net-misc/youtube-dl-2017.10.07
deleted file mode 100644
index 4291f5f727a6..000000000000
--- a/metadata/md5-cache/net-misc/youtube-dl-2017.10.07
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[coverage(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Download videos from YouTube.com (and more sites...)
-EAPI=6
-HOMEPAGE=https://rg3.github.com/youtube-dl/
-IUSE=+offensive test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=http://youtube-dl.org/downloads/2017.10.07/youtube-dl-2017.10.07.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=34313dda9d0bc4ea708bbd95bfbaa3d1
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2017.10.20 b/metadata/md5-cache/net-misc/youtube-dl-2017.10.20
new file mode 100644
index 000000000000..35535ff416b5
--- /dev/null
+++ b/metadata/md5-cache/net-misc/youtube-dl-2017.10.20
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[coverage(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Download videos from YouTube.com (and more sites...)
+EAPI=6
+HOMEPAGE=https://rg3.github.com/youtube-dl/
+IUSE=+offensive test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=http://youtube-dl.org/downloads/2017.10.20/youtube-dl-2017.10.20.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=34313dda9d0bc4ea708bbd95bfbaa3d1
diff --git a/metadata/md5-cache/net-nntp/kwooty-1.1.0_p20150623 b/metadata/md5-cache/net-nntp/kwooty-1.1.0_p20150623
index 041df07d3db5..2e2e55ca6183 100644
--- a/metadata/md5-cache/net-nntp/kwooty-1.1.0_p20150623
+++ b/metadata/md5-cache/net-nntp/kwooty-1.1.0_p20150623
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/kguiaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwallet-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !net-nntp/kwooty:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~kensington/distfiles/kwooty-1.1.0_p20150623.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ad545b56a8a48303e63c0c9c7452bdd2
diff --git a/metadata/md5-cache/net-nntp/nzbget-20.0_pre2108-r1 b/metadata/md5-cache/net-nntp/nzbget-20.0_pre2108-r1
index 43dcc77bc946..122d8d085566 100644
--- a/metadata/md5-cache/net-nntp/nzbget-20.0_pre2108-r1
+++ b/metadata/md5-cache/net-nntp/nzbget-20.0_pre2108-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst preinst prepare pretend setup test
-DEPEND=dev-libs/libxml2 ncurses? ( sys-libs/ncurses:0= ) ssl? ( gnutls? ( net-libs/gnutls:= dev-libs/nettle:= ) !gnutls? ( dev-libs/openssl:0= ) ) zlib? ( sys-libs/zlib ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/libxml2 ncurses? ( sys-libs/ncurses:0= ) ssl? ( gnutls? ( net-libs/gnutls:= dev-libs/nettle:= ) !gnutls? ( dev-libs/openssl:0=[-bindist] ) ) zlib? ( sys-libs/zlib ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A command-line based binary newsgrabber supporting .nzb files
 EAPI=6
 HOMEPAGE=https://nzbget.net/
 IUSE=debug gnutls ncurses parcheck ssl test zlib
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2+
-RDEPEND=dev-libs/libxml2 ncurses? ( sys-libs/ncurses:0= ) ssl? ( gnutls? ( net-libs/gnutls:= dev-libs/nettle:= ) !gnutls? ( dev-libs/openssl:0= ) ) zlib? ( sys-libs/zlib )
+RDEPEND=dev-libs/libxml2 ncurses? ( sys-libs/ncurses:0= ) ssl? ( gnutls? ( net-libs/gnutls:= dev-libs/nettle:= ) !gnutls? ( dev-libs/openssl:0=[-bindist] ) ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=https://github.com/nzbget/nzbget/releases/download/v20.0-r2108/nzbget-20.0-testing-r2108-src.tar.gz -> nzbget-20.0_pre2108.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=4c7d7285f688dde9b060e5f64baecf94
+_md5_=b244a4a60730073314a90140067e48a7
diff --git a/metadata/md5-cache/net-p2p/gtk-gnutella-1.1.12 b/metadata/md5-cache/net-p2p/gtk-gnutella-1.1.12
deleted file mode 100644
index b098c6e22a93..000000000000
--- a/metadata/md5-cache/net-p2p/gtk-gnutella-1.1.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/binutils-libs:= dev-libs/glib:2 sys-libs/zlib gtk? ( >=x11-libs/gtk+-2.2.1:2 ) dbus? ( >=sys-apps/dbus-0.35.2 ) ssl? ( >=net-libs/gnutls-2.2.5 ) nls? ( >=sys-devel/gettext-0.11.5 ) virtual/pkgconfig
-DESCRIPTION=A GTK+ Gnutella client
-EAPI=6
-HOMEPAGE=http://gtk-gnutella.sourceforge.net/
-IUSE=nls dbus ssl +gtk
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=sys-libs/binutils-libs:= dev-libs/glib:2 sys-libs/zlib gtk? ( >=x11-libs/gtk+-2.2.1:2 ) dbus? ( >=sys-apps/dbus-0.35.2 ) ssl? ( >=net-libs/gnutls-2.2.5 ) nls? ( >=sys-devel/gettext-0.11.5 )
-SLOT=0
-SRC_URI=mirror://sourceforge/gtk-gnutella/gtk-gnutella-1.1.12.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=6eb723253e843b5c608641567e3750ad
diff --git a/metadata/md5-cache/net-p2p/gtk-gnutella-1.1.13 b/metadata/md5-cache/net-p2p/gtk-gnutella-1.1.13
new file mode 100644
index 000000000000..7486129860ad
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/gtk-gnutella-1.1.13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=sys-libs/binutils-libs:= dev-libs/glib:2 sys-libs/zlib gtk? ( >=x11-libs/gtk+-2.2.1:2 ) dbus? ( >=sys-apps/dbus-0.35.2 ) ssl? ( >=net-libs/gnutls-2.2.5 ) nls? ( >=sys-devel/gettext-0.11.5 ) virtual/pkgconfig
+DESCRIPTION=A GTK+ Gnutella client
+EAPI=6
+HOMEPAGE=http://gtk-gnutella.sourceforge.net/
+IUSE=nls dbus ssl +gtk
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=sys-libs/binutils-libs:= dev-libs/glib:2 sys-libs/zlib gtk? ( >=x11-libs/gtk+-2.2.1:2 ) dbus? ( >=sys-apps/dbus-0.35.2 ) ssl? ( >=net-libs/gnutls-2.2.5 ) nls? ( >=sys-devel/gettext-0.11.5 )
+SLOT=0
+SRC_URI=mirror://sourceforge/gtk-gnutella/gtk-gnutella-1.1.13.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=8b84ab92501f9406919405036c7489da
diff --git a/metadata/md5-cache/net-p2p/kmldonkey-2.0.7 b/metadata/md5-cache/net-p2p/kmldonkey-2.0.7
index f21d66625b32..7211c0a316e4 100644
--- a/metadata/md5-cache/net-p2p/kmldonkey-2.0.7
+++ b/metadata/md5-cache/net-p2p/kmldonkey-2.0.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=kde-frameworks/kdelibs:4[plasma(+)] kde-frameworks/oxygen-icons >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
 SLOT=4
 SRC_URI=https://api.opensuse.org/public/source/home:eduardhc/kmldonkey-kde4/kmldonkey-2.0.7.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=287b039211f258313ecbe43cc657a3f8
diff --git a/metadata/md5-cache/net-p2p/ktorrent-5.1.0 b/metadata/md5-cache/net-p2p/ktorrent-5.1.0
index 3894c5d1eac8..af8d7bc77a86 100644
--- a/metadata/md5-cache/net-p2p/ktorrent-5.1.0
+++ b/metadata/md5-cache/net-p2p/ktorrent-5.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdbusaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/knotifyconfig-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=kde-frameworks/solid-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 =net-libs/libktorrent-2.1*:5 infowidget? ( dev-libs/geoip ) kross? ( >=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kitemviews-5.37.0:5 >=kde-frameworks/kross-5.37.0:5 ) mediaplayer? ( media-libs/phonon[qt5(+)] >=media-libs/taglib-1.5 ) rss? ( >=kde-frameworks/kdewebkit-5.37.0:5 >=kde-apps/syndication-14.12.0:5 ) search? ( >=kde-frameworks/kdewebkit-5.37.0:5 >=dev-qt/qtwebkit-5.7.1:5 ) shutdown? ( >=kde-plasma/plasma-workspace-5.10.5:5 ) stats? ( >=kde-frameworks/kplotting-5.37.0:5 ) upnp? ( >=kde-frameworks/kcompletion-5.37.0:5 ) zeroconf? ( >=kde-frameworks/kdnssd-5.37.0:5 ) ipfilter? ( app-arch/bzip2 app-arch/unzip >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-apps/kio-extras-14.12.0:5 ) !net-p2p/ktorrent:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/ktorrent/5.1/ktorrent-5.1.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bb30bb43f5dffa2e67ebd19ea8db9e20
diff --git a/metadata/md5-cache/net-p2p/qbittorrent-9999 b/metadata/md5-cache/net-p2p/qbittorrent-9999
index 6d87d64eb19a..22cbdba0c9e0 100644
--- a/metadata/md5-cache/net-p2p/qbittorrent-9999
+++ b/metadata/md5-cache/net-p2p/qbittorrent-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/boost-1.62.0-r1:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5,X?] dev-qt/qtxml:5 >=net-libs/libtorrent-rasterbar-1.0.6 sys-libs/zlib dbus? ( dev-qt/qtdbus:5 ) X? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
+DEPEND=>=dev-libs/boost-1.62.0-r1:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5,X?] dev-qt/qtxml:5 >=net-libs/libtorrent-rasterbar-1.0.6 sys-libs/zlib dbus? ( dev-qt/qtdbus:5 ) X? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=BitTorrent client in C++ and Qt
 EAPI=6
 HOMEPAGE=https://www.qbittorrent.org/
 IUSE=+dbus debug webui +X
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/boost-1.62.0-r1:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5,X?] dev-qt/qtxml:5 >=net-libs/libtorrent-rasterbar-1.0.6 sys-libs/zlib dbus? ( dev-qt/qtdbus:5 ) X? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+RDEPEND=>=dev-libs/boost-1.62.0-r1:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5,X?] dev-qt/qtxml:5 >=net-libs/libtorrent-rasterbar-1.0.6 sys-libs/zlib dbus? ( dev-qt/qtdbus:5 ) X? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 REQUIRED_USE=dbus? ( X )
 SLOT=0
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=81e46415e7509c34e1186b468bb94d93
+_md5_=cdb8b5d1f9981785c3f188c6fff9edac
diff --git a/metadata/md5-cache/net-p2p/syncthing-0.14.38 b/metadata/md5-cache/net-p2p/syncthing-0.14.38
index 11ddbefe51d3..26debed1a5f9 100644
--- a/metadata/md5-cache/net-p2p/syncthing-0.14.38
+++ b/metadata/md5-cache/net-p2p/syncthing-0.14.38
@@ -4,10 +4,10 @@ DESCRIPTION=Open Source Continuous File Synchronization
 EAPI=6
 HOMEPAGE=https://syncthing.net
 IUSE=selinux tools
-KEYWORDS=~amd64 ~x86 ~arm
+KEYWORDS=~amd64 ~arm x86
 LICENSE=MPL-2.0
 RDEPEND=selinux? ( sec-policy/selinux-syncthing )
 SLOT=0
 SRC_URI=https://github.com/syncthing/syncthing/archive/v0.14.38.tar.gz -> syncthing-0.14.38.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=79756a14d125e631ac68e6143bd4646a
+_md5_=caef5fdb63d145d2f0fd63c6a2f4a15e
diff --git a/metadata/md5-cache/net-print/cups-filters-1.16.4 b/metadata/md5-cache/net-print/cups-filters-1.16.4
index 3005398723f8..c54a93e8c903 100644
--- a/metadata/md5-cache/net-print/cups-filters-1.16.4
+++ b/metadata/md5-cache/net-print/cups-filters-1.16.4
@@ -4,10 +4,10 @@ DESCRIPTION=Cups filters
 EAPI=6
 HOMEPAGE=https://wiki.linuxfoundation.org/openprinting/cups-filters
 IUSE=dbus +foomatic ipp_autosetup jpeg ldap pdf perl png +postscript static-libs test tiff zeroconf
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~m68k-mint
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~m68k-mint
 LICENSE=MIT GPL-2
 RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-3.0.2:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.16.4.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=f08d713ed2acf7db24b1bd9c99de7633
+_md5_=837c15d379e5c4bb1024539245c202b7
diff --git a/metadata/md5-cache/net-print/hplip-3.17.10 b/metadata/md5-cache/net-print/hplip-3.17.10
new file mode 100644
index 000000000000..4244d10bbe2e
--- /dev/null
+++ b/metadata/md5-cache/net-print/hplip-3.17.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[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] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp ) ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=HP Linux Imaging and Printing - Print, scan, fax drivers and service tools
+EAPI=6
+HOMEPAGE=http://hplipopensource.com/hplip-web/index.html
+IUSE=doc fax +hpcups hpijs kde libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[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] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp ) ) app-text/ghostscript-gpl !minimal? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python2_7(-)?,python_targets_python3_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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] python_single_target_python2_7? ( dev-python/pygobject:2[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) python_single_target_python3_4? ( dev-python/pygobject:3[python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) python_single_target_python3_5? ( dev-python/pygobject:3[python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) fax? ( dev-python/reportlab[python_targets_python2_7(-)?,python_targets_python3_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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) kernel_linux? ( virtual/udev ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python2_7(-)?,python_targets_python3_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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python2_7(-)?,python_targets_python3_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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pillow-3.1.1[python_targets_python2_7(-)?,python_targets_python3_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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) policykit? ( sys-auth/polkit )
+REQUIRED_USE=!minimal? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/hplip/hplip-3.17.10.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.17.9-patches-1.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=da1aea4c0ee189cac9ce5ff29df02986
diff --git a/metadata/md5-cache/net-print/hplip-plugin-3.17.10 b/metadata/md5-cache/net-print/hplip-plugin-3.17.10
new file mode 100644
index 000000000000..983f25066c21
--- /dev/null
+++ b/metadata/md5-cache/net-print/hplip-plugin-3.17.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install unpack
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Proprietary plugins and firmware for HPLIP
+EAPI=6
+HOMEPAGE=http://hplipopensource.com/hplip-web/index.html
+KEYWORDS=~amd64 ~x86
+LICENSE=hplip-plugin
+RDEPEND=~net-print/hplip-3.17.10 virtual/udev
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://hplipopensource.com/hplip-web/plugin/hplip-3.17.10-plugin.run
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
+_md5_=0efeb09a42621cc4b4b7d2147f4922b4
diff --git a/metadata/md5-cache/net-vpn/kvpnc-0.9.6a-r2 b/metadata/md5-cache/net-vpn/kvpnc-0.9.6a-r2
index 27daf310cf36..c57449841941 100644
--- a/metadata/md5-cache/net-vpn/kvpnc-0.9.6a-r2
+++ b/metadata/md5-cache/net-vpn/kvpnc-0.9.6a-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libgcrypt:0 kde-frameworks/oxygen-icons l10n_ar? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ar(+)] ) l10n_br? ( >=kde-apps/kde4-l10n-4.4:4[l10n_br(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[l10n_en-GB(+)] ) l10n_eo? ( >=kde-apps/kde4-l10n-4.4:4[l10n_eo(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[l10n_et(+)] ) l10n_eu? ( >=kde-apps/kde4-l10n-4.4:4[l10n_eu(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_gl(+)] ) l10n_hi? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hi(+)] ) l10n_hne? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hne(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ja(+)] ) l10n_ka? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ka(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[l10n_lt(+)] ) l10n_ms? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ms(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nl(+)] ) l10n_nn? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nn(+)] ) l10n_pa? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pa(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ru(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-TW(+)] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4
 SRC_URI=http://download.gna.org/kvpnc/kvpnc-0.9.6a-kde4.tar.bz2 http://download.gna.org/kvpnc/kvpnc-0.9.6-kde4-locale.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d76ee7889fd4762fe6a054c8f893ad43
diff --git a/metadata/md5-cache/net-vpn/kvpnc-0.9.6a-r3 b/metadata/md5-cache/net-vpn/kvpnc-0.9.6a-r3
index f2df81da4bca..46e339e14b30 100644
--- a/metadata/md5-cache/net-vpn/kvpnc-0.9.6a-r3
+++ b/metadata/md5-cache/net-vpn/kvpnc-0.9.6a-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libgcrypt:0 kde-frameworks/oxygen-icons l10n_ar? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ar(+)] ) l10n_br? ( >=kde-apps/kde4-l10n-4.4:4[l10n_br(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[l10n_en-GB(+)] ) l10n_eo? ( >=kde-apps/kde4-l10n-4.4:4[l10n_eo(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[l10n_et(+)] ) l10n_eu? ( >=kde-apps/kde4-l10n-4.4:4[l10n_eu(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_gl(+)] ) l10n_hi? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hi(+)] ) l10n_hne? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hne(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ja(+)] ) l10n_ka? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ka(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[l10n_lt(+)] ) l10n_ms? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ms(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nl(+)] ) l10n_nn? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nn(+)] ) l10n_pa? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pa(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ru(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_uk(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-TW(+)] ) >=dev-qt/qt3support-4.8.5:4[accessibility] dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4[qt3support(+)]
 SLOT=4
 SRC_URI=http://download.gna.org/kvpnc/kvpnc-0.9.6a-kde4.tar.bz2 http://download.gna.org/kvpnc/kvpnc-0.9.6-kde4-locale.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ededc7ecebcc5f35c1bb7d0f5c284773
diff --git a/metadata/md5-cache/net-vpn/libreswan-3.18 b/metadata/md5-cache/net-vpn/libreswan-3.18
deleted file mode 100644
index 73592e9855ad..000000000000
--- a/metadata/md5-cache/net-vpn/libreswan-3.18
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( net-dns/unbound net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:0= ) app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=IPsec implementation for Linux, fork of Openswan
-EAPI=6
-HOMEPAGE=https://libreswan.org/
-IUSE=caps curl dnssec ldap pam systemd
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2 BSD-4 RSA DES
-RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( net-dns/unbound net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-misc/openswan !net-vpn/strongswan
-SLOT=0
-SRC_URI=https://download.libreswan.org/libreswan-3.18.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=9430e469e042485cea68fa716ff85a7d
diff --git a/metadata/md5-cache/net-vpn/openvpn-2.4.4 b/metadata/md5-cache/net-vpn/openvpn-2.4.4
index a89006468174..857495ca53a7 100644
--- a/metadata/md5-cache/net-vpn/openvpn-2.4.4
+++ b/metadata/md5-cache/net-vpn/openvpn-2.4.4
@@ -4,11 +4,11 @@ DESCRIPTION=Robust and highly flexible tunneling application compatible with man
 EAPI=6
 HOMEPAGE=http://openvpn.net/
 IUSE=down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam pkcs11 +plugins selinux +ssl static systemd test userland_BSD
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( >=sys-apps/net-tools-1.60_p20160215155418 ) ) pam? ( virtual/pam ) ssl? ( !mbedtls? ( !libressl? ( >=dev-libs/openssl-0.9.8:* ) libressl? ( dev-libs/libressl ) ) mbedtls? ( net-libs/mbedtls ) ) lz4? ( app-arch/lz4 ) lzo? ( >=dev-libs/lzo-1.07 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-openvpn )
 REQUIRED_USE=static? ( !plugins !pkcs11 ) mbedtls? ( ssl !libressl ) pkcs11? ( ssl ) !plugins? ( !pam !down-root ) inotify? ( plugins )
 SLOT=0
 SRC_URI=http://swupdate.openvpn.net/community/releases/openvpn-2.4.4.tar.gz test? ( https://raw.githubusercontent.com/OpenVPN/openvpn/v2.4.4/tests/unit_tests/openvpn/mock_msg.h )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=fc59180097c120612e1c58a10d7e695f
+_md5_=1ccb897c175b419f1b0b4a48e34c4f57
diff --git a/metadata/md5-cache/net-vpn/tor-0.3.0.11 b/metadata/md5-cache/net-vpn/tor-0.3.0.11
deleted file mode 100644
index 66e1add6583e..000000000000
--- a/metadata/md5-cache/net-vpn/tor-0.3.0.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) virtual/pkgconfig
-DESCRIPTION=Anonymizing overlay network for TCP
-EAPI=6
-HOMEPAGE=http://www.torproject.org/
-IUSE=libressl scrypt seccomp selinux systemd tor-hardening test web
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos
-LICENSE=BSD GPL-2
-RDEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-tor )
-SLOT=0
-SRC_URI=https://www.torproject.org/dist/tor-0.3.0.11.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.3.0.11.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=16c71fac405869cc9953e8bbc1f76a46
diff --git a/metadata/md5-cache/net-vpn/tor-0.3.0.12 b/metadata/md5-cache/net-vpn/tor-0.3.0.12
new file mode 100644
index 000000000000..c59dc5955b89
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/tor-0.3.0.12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install setup
+DEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) virtual/pkgconfig
+DESCRIPTION=Anonymizing overlay network for TCP
+EAPI=6
+HOMEPAGE=http://www.torproject.org/
+IUSE=libressl scrypt seccomp selinux systemd tor-hardening test web
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos
+LICENSE=BSD GPL-2
+RDEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-tor )
+SLOT=0
+SRC_URI=https://www.torproject.org/dist/tor-0.3.0.12.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.3.0.12.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=16c71fac405869cc9953e8bbc1f76a46
diff --git a/metadata/md5-cache/net-vpn/tor-0.3.1.7 b/metadata/md5-cache/net-vpn/tor-0.3.1.7
index b071ffbf6373..6af0effafa94 100644
--- a/metadata/md5-cache/net-vpn/tor-0.3.1.7
+++ b/metadata/md5-cache/net-vpn/tor-0.3.1.7
@@ -4,10 +4,10 @@ DESCRIPTION=Anonymizing overlay network for TCP
 EAPI=6
 HOMEPAGE=http://www.torproject.org/
 IUSE=libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd
-KEYWORDS=amd64 arm ~mips ~ppc ~ppc64 x86 ~ppc-macos
+KEYWORDS=amd64 arm ~mips ppc ppc64 x86 ~ppc-macos
 LICENSE=BSD GPL-2
 RDEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
 SLOT=0
 SRC_URI=https://www.torproject.org/dist/tor-0.3.1.7.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.3.1.7.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=55e57c5debce7e8dc119aedc644d94c9
+_md5_=32cc51fa1cde4a951b55896a98364917
diff --git a/metadata/md5-cache/net-vpn/tor-0.3.1.8 b/metadata/md5-cache/net-vpn/tor-0.3.1.8
new file mode 100644
index 000000000000..adefd190cd98
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/tor-0.3.1.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install setup
+DEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) virtual/pkgconfig
+DESCRIPTION=Anonymizing overlay network for TCP
+EAPI=6
+HOMEPAGE=http://www.torproject.org/
+IUSE=libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos
+LICENSE=BSD GPL-2
+RDEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
+SLOT=0
+SRC_URI=https://www.torproject.org/dist/tor-0.3.1.8.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.3.1.8.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=87f370554a19f1412f49b2259494d303
diff --git a/metadata/md5-cache/net-vpn/tor-0.3.2.2_alpha b/metadata/md5-cache/net-vpn/tor-0.3.2.2_alpha
deleted file mode 100644
index 86bd215e61cf..000000000000
--- a/metadata/md5-cache/net-vpn/tor-0.3.2.2_alpha
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) virtual/pkgconfig
-DESCRIPTION=Anonymizing overlay network for TCP
-EAPI=6
-HOMEPAGE=http://www.torproject.org/
-IUSE=libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos
-LICENSE=BSD GPL-2
-RDEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
-SLOT=0
-SRC_URI=https://www.torproject.org/dist/tor-0.3.2.2-alpha.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.3.2.2-alpha.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=87f370554a19f1412f49b2259494d303
diff --git a/metadata/md5-cache/net-vpn/tor-0.3.2.3_alpha b/metadata/md5-cache/net-vpn/tor-0.3.2.3_alpha
new file mode 100644
index 000000000000..53e1c53e5989
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/tor-0.3.2.3_alpha
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install setup
+DEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) virtual/pkgconfig
+DESCRIPTION=Anonymizing overlay network for TCP
+EAPI=6
+HOMEPAGE=http://www.torproject.org/
+IUSE=libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos
+LICENSE=BSD GPL-2
+RDEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
+SLOT=0
+SRC_URI=https://www.torproject.org/dist/tor-0.3.2.3-alpha.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.3.2.3-alpha.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=87f370554a19f1412f49b2259494d303
diff --git a/metadata/md5-cache/net-wireless/blueberry-1.1.13 b/metadata/md5-cache/net-wireless/blueberry-1.1.13
deleted file mode 100644
index 39e16d026ed2..000000000000
--- a/metadata/md5-cache/net-wireless/blueberry-1.1.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/setproctitle[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=net-wireless/gnome-bluetooth-3.14[introspection] net-wireless/bluez[obex] net-wireless/bluez-tools net-wireless/rfkill x11-libs/libnotify[introspection] x11-misc/wmctrl >=sys-apps/sed-4
-DESCRIPTION=A Bluetooth configuration tool
-EAPI=6
-HOMEPAGE=https://github.com/linuxmint/blueberry
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/setproctitle[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=net-wireless/gnome-bluetooth-3.14[introspection] net-wireless/bluez[obex] net-wireless/bluez-tools net-wireless/rfkill x11-libs/libnotify[introspection] x11-misc/wmctrl
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/linuxmint/blueberry/archive/1.1.13.tar.gz -> blueberry-1.1.13.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2171b52b717f6219cf67b508adc03d1f
diff --git a/metadata/md5-cache/net-wireless/blueberry-1.1.13-r1 b/metadata/md5-cache/net-wireless/blueberry-1.1.13-r1
new file mode 100644
index 000000000000..687d1f67098b
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/blueberry-1.1.13-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/setproctitle[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=net-wireless/gnome-bluetooth-3.14[introspection] net-wireless/bluez[obex] net-wireless/bluez-tools || ( >=sys-apps/util-linux-2.31_rc1 net-wireless/rfkill ) x11-libs/libnotify[introspection] x11-misc/wmctrl >=sys-apps/sed-4
+DESCRIPTION=A Bluetooth configuration tool
+EAPI=6
+HOMEPAGE=https://github.com/linuxmint/blueberry
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/setproctitle[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=net-wireless/gnome-bluetooth-3.14[introspection] net-wireless/bluez[obex] net-wireless/bluez-tools || ( >=sys-apps/util-linux-2.31_rc1 net-wireless/rfkill ) x11-libs/libnotify[introspection] x11-misc/wmctrl
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://github.com/linuxmint/blueberry/archive/1.1.13.tar.gz -> blueberry-1.1.13.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=95f6bb35f80cb85f43ac6f063d2395ed
diff --git a/metadata/md5-cache/net-wireless/blueberry-1.1.8 b/metadata/md5-cache/net-wireless/blueberry-1.1.8
deleted file mode 100644
index ff64cddee154..000000000000
--- a/metadata/md5-cache/net-wireless/blueberry-1.1.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=net-wireless/gnome-bluetooth-3.14[introspection] net-wireless/rfkill x11-misc/wmctrl >=sys-apps/sed-4
-DESCRIPTION=A Bluetooth configuration tool
-EAPI=5
-HOMEPAGE=https://github.com/linuxmint/blueberry
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=net-wireless/gnome-bluetooth-3.14[introspection] net-wireless/rfkill x11-misc/wmctrl
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/linuxmint/blueberry/archive/1.1.8.tar.gz -> blueberry-1.1.8.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9fd7772bed7df23249a3cbff800dd4dd
diff --git a/metadata/md5-cache/net-wireless/blueberry-1.1.8-r1 b/metadata/md5-cache/net-wireless/blueberry-1.1.8-r1
new file mode 100644
index 000000000000..0d87f4f3863f
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/blueberry-1.1.8-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=net-wireless/gnome-bluetooth-3.14[introspection] || ( >=sys-apps/util-linux-2.31_rc1 net-wireless/rfkill ) x11-misc/wmctrl >=sys-apps/sed-4
+DESCRIPTION=A Bluetooth configuration tool
+EAPI=5
+HOMEPAGE=https://github.com/linuxmint/blueberry
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=net-wireless/gnome-bluetooth-3.14[introspection] || ( >=sys-apps/util-linux-2.31_rc1 net-wireless/rfkill ) x11-misc/wmctrl
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://github.com/linuxmint/blueberry/archive/1.1.8.tar.gz -> blueberry-1.1.8.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b54d28fc4ab7869f43064a7e1f87122e
diff --git a/metadata/md5-cache/net-wireless/hostapd-2.6 b/metadata/md5-cache/net-wireless/hostapd-2.6
deleted file mode 100644
index 7a154ce75667..000000000000
--- a/metadata/md5-cache/net-wireless/hostapd-2.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=ssl? ( dev-libs/openssl:*[-bindist] ) kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) ) netlink? ( net-libs/libnfnetlink ) sqlite? ( >=dev-db/sqlite-3 ) virtual/pkgconfig
-DESCRIPTION=IEEE 802.11 wireless LAN Host AP daemon
-EAPI=6
-HOMEPAGE=http://hostap.epitest.fi
-IUSE=ipv6 logwatch netlink sqlite +ssl +wps +crda
-KEYWORDS=amd64 ~arm ~mips ppc x86
-LICENSE=|| ( GPL-2 BSD )
-RDEPEND=ssl? ( dev-libs/openssl:*[-bindist] ) kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) ) netlink? ( net-libs/libnfnetlink ) sqlite? ( >=dev-db/sqlite-3 )
-SLOT=0
-SRC_URI=http://hostap.epitest.fi/releases/hostapd-2.6.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=f4decc51fc84b222b4eece78aed83d96
diff --git a/metadata/md5-cache/net-wireless/rfkill-0.5 b/metadata/md5-cache/net-wireless/rfkill-0.5
deleted file mode 100644
index 3a504fe2eb01..000000000000
--- a/metadata/md5-cache/net-wireless/rfkill-0.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Tool to read and control rfkill status through /dev/rfkill
-EAPI=6
-HOMEPAGE=https://wireless.kernel.org/en/users/Documentation/rfkill
-KEYWORDS=amd64 arm ~mips ppc ppc64 x86
-LICENSE=ISC
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/software/network/rfkill/rfkill-0.5.tar.xz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=fbf54ba0399abb79938f8ed1ae77f9a6
diff --git a/metadata/md5-cache/net-wireless/rfkill-0.5-r1 b/metadata/md5-cache/net-wireless/rfkill-0.5-r1
deleted file mode 100644
index b5f89190d250..000000000000
--- a/metadata/md5-cache/net-wireless/rfkill-0.5-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Tool to read and control rfkill status through /dev/rfkill
-EAPI=6
-HOMEPAGE=https://wireless.kernel.org/en/users/Documentation/rfkill
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
-LICENSE=ISC
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/software/network/rfkill/rfkill-0.5.tar.xz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=edfa61239a31fffe22d0604e0bfd0634
diff --git a/metadata/md5-cache/net-wireless/rfkill-0.5-r2 b/metadata/md5-cache/net-wireless/rfkill-0.5-r2
new file mode 100644
index 000000000000..de8ea207d23f
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/rfkill-0.5-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Tool to read and control rfkill status through /dev/rfkill
+EAPI=6
+HOMEPAGE=https://wireless.kernel.org/en/users/Documentation/rfkill
+KEYWORDS=amd64 arm ~mips ppc ppc64 x86
+LICENSE=ISC
+RDEPEND=!>=sys-apps/util-linux-2.31_rc1
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/software/network/rfkill/rfkill-0.5.tar.xz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=eb8775c55780f61dda5e15f76ab7d25d
diff --git a/metadata/md5-cache/net-wireless/rfkill-0.5-r3 b/metadata/md5-cache/net-wireless/rfkill-0.5-r3
new file mode 100644
index 000000000000..e5ef0b174067
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/rfkill-0.5-r3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Tool to read and control rfkill status through /dev/rfkill
+EAPI=6
+HOMEPAGE=https://wireless.kernel.org/en/users/Documentation/rfkill
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
+LICENSE=ISC
+RDEPEND=!>=sys-apps/util-linux-2.31_rc1
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/software/network/rfkill/rfkill-0.5.tar.xz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=fde6120399d89e8f7bf324b75ed1432b
diff --git a/metadata/md5-cache/net-wireless/wpa_supplicant-2.6 b/metadata/md5-cache/net-wireless/wpa_supplicant-2.6
deleted file mode 100644
index 4d2d3c630190..000000000000
--- a/metadata/md5-cache/net-wireless/wpa_supplicant-2.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=dbus? ( sys-apps/dbus ) kernel_linux? ( eap-sim? ( sys-apps/pcsc-lite ) dev-libs/libnl:3 net-wireless/crda ) !kernel_linux? ( net-libs/libpcap ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtsvg:5 ) readline? ( sys-libs/ncurses:0= sys-libs/readline:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) !ssl? ( gnutls? ( net-libs/gnutls dev-libs/libgcrypt:* ) !gnutls? ( dev-libs/libtommath ) ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=IEEE 802.1X/WPA supplicant for secure wireless transfers
-EAPI=5
-HOMEPAGE=http://hostap.epitest.fi/wpa_supplicant/
-IUSE=ap dbus gnutls eap-sim fasteap +hs2-0 libressl p2p ps3 qt4 qt5 readline selinux smartcard ssl tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd
-LICENSE=|| ( GPL-2 BSD )
-RDEPEND=dbus? ( sys-apps/dbus ) kernel_linux? ( eap-sim? ( sys-apps/pcsc-lite ) dev-libs/libnl:3 net-wireless/crda ) !kernel_linux? ( net-libs/libpcap ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtsvg:5 ) readline? ( sys-libs/ncurses:0= sys-libs/readline:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) !ssl? ( gnutls? ( net-libs/gnutls dev-libs/libgcrypt:* ) !gnutls? ( dev-libs/libtommath ) ) selinux? ( sec-policy/selinux-networkmanager )
-REQUIRED_USE=fasteap? ( !gnutls !ssl ) smartcard? ( ssl ) ?? ( qt4 qt5 )
-SLOT=0
-SRC_URI=http://hostap.epitest.fi/releases/wpa_supplicant-2.6.tar.gz
-_eclasses_=base	df2aa567b3f0595aae0d0923889f7631	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=11170ad4bc2510bebae67334b39537a7
diff --git a/metadata/md5-cache/net-wireless/wpa_supplicant-2.6-r3 b/metadata/md5-cache/net-wireless/wpa_supplicant-2.6-r3
index b3287945a068..6863b3c438ac 100644
--- a/metadata/md5-cache/net-wireless/wpa_supplicant-2.6-r3
+++ b/metadata/md5-cache/net-wireless/wpa_supplicant-2.6-r3
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install postinst prepare setup
 DEPEND=dbus? ( sys-apps/dbus ) kernel_linux? ( dev-libs/libnl:3 net-wireless/crda eap-sim? ( sys-apps/pcsc-lite ) ) !kernel_linux? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) readline? ( sys-libs/ncurses:0= sys-libs/readline:0= ) ssl? ( gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) !ssl? ( dev-libs/libtommath ) virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=IEEE 802.1X/WPA supplicant for secure wireless transfers
 EAPI=6
-HOMEPAGE=http://hostap.epitest.fi/wpa_supplicant/
+HOMEPAGE=https://w1.fi/wpa_supplicant/
 IUSE=ap dbus gnutls eap-sim fasteap +hs2-0 libressl p2p ps3 qt5 readline selinux smartcard ssl tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=|| ( GPL-2 BSD )
 RDEPEND=dbus? ( sys-apps/dbus ) kernel_linux? ( dev-libs/libnl:3 net-wireless/crda eap-sim? ( sys-apps/pcsc-lite ) ) !kernel_linux? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) readline? ( sys-libs/ncurses:0= sys-libs/readline:0= ) ssl? ( gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) !ssl? ( dev-libs/libtommath ) selinux? ( sec-policy/selinux-networkmanager )
 REQUIRED_USE=fasteap? ( !ssl ) smartcard? ( ssl )
 SLOT=0
 SRC_URI=http://hostap.epitest.fi/releases/wpa_supplicant-2.6.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=92182435cbc228222f456ed066e22c98
+_md5_=9f79c30e89c5191cf2e2fb67b7acfdd2
diff --git a/metadata/md5-cache/sci-calculators/keurocalc-1.2.3 b/metadata/md5-cache/sci-calculators/keurocalc-1.2.3
index ce939d7c5e75..1eb306880c22 100644
--- a/metadata/md5-cache/sci-calculators/keurocalc-1.2.3
+++ b/metadata/md5-cache/sci-calculators/keurocalc-1.2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ FDL-1.2
 RDEPEND=kde-frameworks/oxygen-icons l10n_bg? ( >=kde-apps/kde4-l10n-4.4:4[l10n_bg(+)] ) l10n_bs? ( >=kde-apps/kde4-l10n-4.4:4[l10n_bs(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ca(+)] ) l10n_ca-valencia? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ca-valencia(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[l10n_cs(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[l10n_en-GB(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[l10n_et(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_gl(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hu(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ja(+)] ) l10n_ko? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ko(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nds(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nl(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt-BR(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ru(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sl(+)] ) l10n_sr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sr(+)] ) l10n_sr-Latn? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sr-Latn(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sv(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_tr(+)] ) l10n_ug? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ug(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_uk(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-TW(+)] ) handbook? ( kde-frameworks/kdelibs:4[handbook] ) dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4
 SRC_URI=http://opensource.bureau-cornavin.com/keurocalc/sources/keurocalc-1.2.3.tgz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0cfdd1405dfc5684fb145f1d76504838
diff --git a/metadata/md5-cache/sci-calculators/units-2.15 b/metadata/md5-cache/sci-calculators/units-2.15
new file mode 100644
index 000000000000..af425bb634d9
--- /dev/null
+++ b/metadata/md5-cache/sci-calculators/units-2.15
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install setup
+DEPEND=sys-libs/readline:= units_cur? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] )
+DESCRIPTION=Unit conversion program
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/units/units.html
+IUSE=+units_cur python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=FDL-1.3 GPL-3
+RDEPEND=sys-libs/readline:= units_cur? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] )
+REQUIRED_USE=units_cur? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
+SLOT=0
+SRC_URI=mirror://gnu/units/units-2.15.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=b53aed608bb3ed4220ee58a804aa6d2b
diff --git a/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r5 b/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r5
index f0b0f2069f2d..89c305819dbe 100644
--- a/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r5
+++ b/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r5
@@ -3,10 +3,10 @@ DEPEND=|| ( ( media-libs/mesa x11-libs/libGLw ) media-libs/mesa[motif] ) media-l
 DESCRIPTION=Publication-quality molecular visualization package
 EAPI=5
 HOMEPAGE=http://hugin.ethz.ch/wuthrich/software/molmol/index.html
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=molmol
 RDEPEND=|| ( ( media-libs/mesa x11-libs/libGLw ) media-libs/mesa[motif] ) media-libs/libpng:0 media-libs/tiff:0 sys-libs/zlib virtual/glu virtual/jpeg:0 x11-libs/libXpm x11-libs/motif:0 x11-apps/xdpyinfo
 SLOT=0
 SRC_URI=ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/molmol-2k.2.0-src.tar.gz ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/molmol-2k.2.0-doc.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=c4e43dd9e34d3bb38efb4fa48eed0dbc
+_md5_=758379890a7e56b8f6962231870c9f95
diff --git a/metadata/md5-cache/sci-electronics/cirkuit-0.4.3-r1 b/metadata/md5-cache/sci-electronics/cirkuit-0.4.3-r1
index f274c4e2e97c..65665b9c4780 100644
--- a/metadata/md5-cache/sci-electronics/cirkuit-0.4.3-r1
+++ b/metadata/md5-cache/sci-electronics/cirkuit-0.4.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-text/poppler-0.12.3-r3[qt4] app-text/ghostscript-gpl app-text/ps2eps dev-texlive/texlive-pstricks media-gfx/dpic media-gfx/pdf2svg media-libs/netpbm virtual/latex-base kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=4
 SRC_URI=http://wwwu.uni-klu.ac.at/magostin/src/cirkuit-0.4.3.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=00f293b6e2b5eed289a2dc7c3a607489
diff --git a/metadata/md5-cache/sci-geosciences/qgis-2.18.14 b/metadata/md5-cache/sci-geosciences/qgis-2.18.14
new file mode 100644
index 000000000000..113359fc0f62
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/qgis-2.18.14
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=app-crypt/qca:2[qt4,ssl] >=dev-db/spatialite-4.1.0 dev-db/sqlite:3 dev-libs/expat dev-libs/qjson dev-qt/designer:4 dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtscript:4 dev-qt/qtsvg:4 dev-qt/qtsql:4 sci-libs/gdal:=[geos,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj x11-libs/qscintilla:=[qt4(-)] >=x11-libs/qwt-6.1.2:6=[svg,qt4(-)] >=x11-libs/qwtpolar-1[qt4(-)] georeferencer? ( sci-libs/gsl:= ) grass? ( >=sci-geosciences/grass-7.0.0:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/future[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/PyQt4[X,sql,svg,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pytz[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/qscintilla-python[qt4(+),python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/sip:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] postgres? ( dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ) sys-devel/bison sys-devel/flex sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DESCRIPTION=User friendly Geographic Information System
+EAPI=6
+HOMEPAGE=https://www.qgis.org/
+IUSE=examples georeferencer grass mapserver oracle postgres python python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ GPL-3+
+RDEPEND=app-crypt/qca:2[qt4,ssl] >=dev-db/spatialite-4.1.0 dev-db/sqlite:3 dev-libs/expat dev-libs/qjson dev-qt/designer:4 dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtscript:4 dev-qt/qtsvg:4 dev-qt/qtsql:4 sci-libs/gdal:=[geos,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj x11-libs/qscintilla:=[qt4(-)] >=x11-libs/qwt-6.1.2:6=[svg,qt4(-)] >=x11-libs/qwtpolar-1[qt4(-)] georeferencer? ( sci-libs/gsl:= ) grass? ( >=sci-geosciences/grass-7.0.0:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/future[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/PyQt4[X,sql,svg,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pytz[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/qscintilla-python[qt4(+),python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/sip:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] postgres? ( dev-python/psycopg:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ) sci-geosciences/gpsbabel
+REQUIRED_USE=mapserver? ( python ) python? ( python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://qgis.org/downloads/qgis-2.18.14.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7e4bd990eb76e59eb85f4fc8fa3e8c03
diff --git a/metadata/md5-cache/sci-geosciences/routino-3.1.1 b/metadata/md5-cache/sci-geosciences/routino-3.1.1
index ff17e875b036..9b644fd3e1ff 100644
--- a/metadata/md5-cache/sci-geosciences/routino-3.1.1
+++ b/metadata/md5-cache/sci-geosciences/routino-3.1.1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure
+DEFINED_PHASES=compile prepare
 DESCRIPTION=Routing application based on openstreetmap data
 EAPI=6
 HOMEPAGE=http://www.routino.org/
@@ -6,4 +6,5 @@ KEYWORDS=amd64 x86
 LICENSE=AGPL-3+
 SLOT=0
 SRC_URI=http://www.routino.org/download/routino-3.1.1.tgz
-_md5_=6b6e9bf76b6f35a55e9c9cad96f6104c
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=0e67372a692fcf870f95f4ca613d7276
diff --git a/metadata/md5-cache/sci-geosciences/routino-3.2 b/metadata/md5-cache/sci-geosciences/routino-3.2
index baf7069c15c0..efd5cdb71148 100644
--- a/metadata/md5-cache/sci-geosciences/routino-3.2
+++ b/metadata/md5-cache/sci-geosciences/routino-3.2
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure
+DEFINED_PHASES=compile prepare
 DESCRIPTION=Routing application based on openstreetmap data
 EAPI=6
 HOMEPAGE=http://www.routino.org/
@@ -6,4 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3+
 SLOT=0
 SRC_URI=http://www.routino.org/download/routino-3.2.tgz
-_md5_=562051c0ffe83572eda06d3bf4eeb630
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=74c3a729c7fb0358108fe35c453018c8
diff --git a/metadata/md5-cache/sci-libs/colpack-1.0.10 b/metadata/md5-cache/sci-libs/colpack-1.0.10
index d68be3a1f5d4..5615ff0bd2bc 100644
--- a/metadata/md5-cache/sci-libs/colpack-1.0.10
+++ b/metadata/md5-cache/sci-libs/colpack-1.0.10
@@ -4,9 +4,9 @@ DESCRIPTION=C++ algorithms for specialized vertex coloring problems
 EAPI=6
 HOMEPAGE=http://cscapes.cs.purdue.edu/coloringpage/
 IUSE=openmp static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3 LGPL-3
 SLOT=0
 SRC_URI=https://github.com/CSCsw/ColPack/archive/v1.0.10.tar.gz -> colpack-1.0.10.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=53a4755aa0fef3ca60f75c0a09625949
+_md5_=e6714cb2fc00ae60a803b91e03f128ef
diff --git a/metadata/md5-cache/sci-mathematics/rkward-0.6.5_p20170420 b/metadata/md5-cache/sci-mathematics/rkward-0.6.5_p20170420
index 8226f798c90e..3048df74a132 100644
--- a/metadata/md5-cache/sci-mathematics/rkward-0.6.5_p20170420
+++ b/metadata/md5-cache/sci-mathematics/rkward-0.6.5_p20170420
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/kdewebkit-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/knotifications-5.37.0:5 >=kde-frameworks/kparts-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/ktexteditor-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kwindowsystem-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-lang/R virtual/libintl !sci-mathematics/rkward:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~kensington/distfiles/rkward-0.6.5_p20170420.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=851e1b7b240866e9d0e508555be0138e
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-1.1.368 b/metadata/md5-cache/sci-mathematics/rstudio-1.1.368
new file mode 100644
index 000000000000..9a593dbed822
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/rstudio-1.1.368
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=app-text/pandoc dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.63:= >=dev-libs/mathjax-2.7.0 dev-libs/openssl:0 sys-apps/util-linux >=sys-devel/clang-3.5.0:* sys-libs/zlib >=virtual/jre-1.8:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-5.4:5 >=dev-qt/qtdeclarative-5.4:5 >=dev-qt/qtdbus-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtnetwork-5.4:5 >=dev-qt/qtopengl-5.4:5 >=dev-qt/qtpositioning-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] >=dev-qt/qtsensors-5.4:5 >=dev-qt/qtsql-5.4:5 >=dev-qt/qtsvg-5.4:5 >=dev-qt/qtwebchannel-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxml-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) app-arch/unzip dev-java/ant-core >=virtual/jdk-1.8:= virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=IDE for the R language
+EAPI=6
+HOMEPAGE=http://www.rstudio.org https://github.com/rstudio/rstudio/
+IUSE=dedicated server elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=AGPL-3
+RDEPEND=app-text/pandoc dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.63:= >=dev-libs/mathjax-2.7.0 dev-libs/openssl:0 sys-apps/util-linux >=sys-devel/clang-3.5.0:* sys-libs/zlib >=virtual/jre-1.8:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-5.4:5 >=dev-qt/qtdeclarative-5.4:5 >=dev-qt/qtdbus-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtnetwork-5.4:5 >=dev-qt/qtopengl-5.4:5 >=dev-qt/qtpositioning-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] >=dev-qt/qtsensors-5.4:5 >=dev-qt/qtsql-5.4:5 >=dev-qt/qtsvg-5.4:5 >=dev-qt/qtwebchannel-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxml-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) >=dev-java/java-config-2.2.0-r3
+SLOT=0
+SRC_URI=https://github.com/rstudio/rstudio/archive/v1.1.368.tar.gz -> rstudio-1.1.368.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.7.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-java-2.37.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-2.37.0.jar https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip https://dev.gentoo.org/~gienah/distfiles/packrat-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rmarkdown-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/shinyapps-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	pax-utils	4f95120230a315c8caaabeb2307b7eee	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c373f28e4ccaa3c9d6a91ffabe870b5b
diff --git a/metadata/md5-cache/sci-mathematics/why3-for-spark-2017 b/metadata/md5-cache/sci-mathematics/why3-for-spark-2017
index 2260c7612554..3dddb89874db 100644
--- a/metadata/md5-cache/sci-mathematics/why3-for-spark-2017
+++ b/metadata/md5-cache/sci-mathematics/why3-for-spark-2017
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lang/ocaml-4.02.3 dev-ml/menhir coq? ( sci-mathematics/coq ) doc? ( dev-tex/rubber ) gtk? ( dev-ml/lablgtk[sourceview] ) emacs? ( app-editors/emacs:* ) html? ( dev-tex/hevea ) hypothesis-selection? ( dev-ml/ocamlgraph ) zarith? ( dev-ml/zarith ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-lang/ocaml-4.02.3 dev-ml/menhir coq? ( sci-mathematics/coq ) doc? ( dev-tex/rubber ) gtk? ( dev-ml/lablgtk[sourceview] ) emacs? ( app-editors/emacs:* ) html? ( dev-tex/hevea ) hypothesis-selection? ( dev-ml/ocamlgraph ) zarith? ( dev-ml/zarith ) zip? ( dev-ml/camlzip ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Platform for deductive program verification
 EAPI=6
 HOMEPAGE=http://why3.lri.fr/
-IUSE=coq doc emacs gtk html hypothesis-selection profiling zarith
+IUSE=coq doc emacs gtk html hypothesis-selection profiling zarith zip
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=>=dev-lang/ocaml-4.02.3 dev-ml/menhir coq? ( sci-mathematics/coq ) doc? ( dev-tex/rubber ) gtk? ( dev-ml/lablgtk[sourceview] ) emacs? ( app-editors/emacs:* ) html? ( dev-tex/hevea ) hypothesis-selection? ( dev-ml/ocamlgraph ) zarith? ( dev-ml/zarith )
+RDEPEND=>=dev-lang/ocaml-4.02.3 dev-ml/menhir coq? ( sci-mathematics/coq ) doc? ( dev-tex/rubber ) gtk? ( dev-ml/lablgtk[sourceview] ) emacs? ( app-editors/emacs:* ) html? ( dev-tex/hevea ) hypothesis-selection? ( dev-ml/ocamlgraph ) zarith? ( dev-ml/zarith ) zip? ( dev-ml/camlzip )
 REQUIRED_USE=html? ( doc )
 SLOT=0
-SRC_URI=https//mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed055 -> why3-for-spark-gpl-2017-src.tar.gz
+SRC_URI=http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed055 -> why3-for-spark-gpl-2017-src.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=3b036bb9e1be99d971f76fb71838a9ac
+_md5_=2dd74b899b6e05aec52d1e8511af0718
diff --git a/metadata/md5-cache/sci-visualization/labplot-2.4.0 b/metadata/md5-cache/sci-visualization/labplot-2.4.0
index 9b84500bea91..edbcfe61d17f 100644
--- a/metadata/md5-cache/sci-visualization/labplot-2.4.0
+++ b/metadata/md5-cache/sci-visualization/labplot-2.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=sci-libs/gsl-1.15:= cantor? ( >=kde-apps/cantor-14.12.0:5 ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) netcdf? ( sci-libs/netcdf:= ) !sci-visualization/labplot:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/labplot/2.4.0/labplot-2.4.0-kf5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=47c01a51a03a09bb1a95c1ca3364fc5f
diff --git a/metadata/md5-cache/sci-visualization/labplot-9999 b/metadata/md5-cache/sci-visualization/labplot-9999
index 5d002ffec142..8c98ac0d79d4 100644
--- a/metadata/md5-cache/sci-visualization/labplot-9999
+++ b/metadata/md5-cache/sci-visualization/labplot-9999
@@ -7,5 +7,5 @@ IUSE=cantor fftw fits hdf5 netcdf debug +handbook
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.37.0:5 >=kde-frameworks/kcompletion-5.37.0:5 >=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/knewstuff-5.37.0:5 >=kde-frameworks/ktextwidgets-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=sci-libs/gsl-1.15:= cantor? ( >=kde-apps/cantor-14.12.0:5 ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) netcdf? ( sci-libs/netcdf:= ) !sci-visualization/labplot:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=dce661ac899ae534407324f9cff75034
diff --git a/metadata/md5-cache/sys-apps/accountsservice-0.6.43-r1 b/metadata/md5-cache/sys-apps/accountsservice-0.6.43-r1
index 844ea2823eee..3b4a6bfb0e90 100644
--- a/metadata/md5-cache/sys-apps/accountsservice-0.6.43-r1
+++ b/metadata/md5-cache/sys-apps/accountsservice-0.6.43-r1
@@ -4,11 +4,11 @@ DESCRIPTION=D-Bus interfaces for querying and manipulating user account informat
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/AccountsService/
 IUSE=doc elogind +introspection selinux systemd
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~ppc ppc64 ~sparc x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.37.3:2 sys-auth/polkit elogind? ( >=sys-auth/elogind-229.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) systemd? ( >=sys-apps/systemd-186:0= ) !systemd? ( !elogind? ( sys-auth/consolekit ) ) selinux? ( sec-policy/selinux-accountsd )
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/accountsservice/accountsservice-0.6.43.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e32825cac69a91a87a2fb10b29b9d28a
+_md5_=5116ce48116edf9b0a3d5670804437bb
diff --git a/metadata/md5-cache/sys-apps/ack-2.18-r1 b/metadata/md5-cache/sys-apps/ack-2.18-r1
index cfde86b5f8cb..0b760a0d4303 100644
--- a/metadata/md5-cache/sys-apps/ack-2.18-r1
+++ b/metadata/md5-cache/sys-apps/ack-2.18-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-perl/File-Next-1.160.0 test? ( dev-perl/IO-Tty ) dev-lang/perl:=
 DESCRIPTION=ack is a tool like grep, optimized for programmers
 EAPI=6
-HOMEPAGE=http://betterthangrep.com/ http://search.cpan.org/dist/ack/
+HOMEPAGE=https://beyondgrep.com/ http://search.cpan.org/dist/ack/
 IUSE=test
 KEYWORDS=~alpha amd64 ~arm ~hppa x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=Artistic-2
@@ -10,4 +10,4 @@ RDEPEND=>=dev-perl/File-Next-1.160.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/ack-2.18.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=fa87fcf0c61ec120d8dad12c9f710031
+_md5_=907d83a44e455197ee5ca9e7c5cdd4e9
diff --git a/metadata/md5-cache/sys-apps/dbus-broker-4 b/metadata/md5-cache/sys-apps/dbus-broker-4
index 56d99dece159..474bbd1e95bb 100644
--- a/metadata/md5-cache/sys-apps/dbus-broker-4
+++ b/metadata/md5-cache/sys-apps/dbus-broker-4
@@ -10,5 +10,5 @@ RDEPEND=audit? ( sys-process/audit ) launcher? ( >=dev-libs/expat-2.2 >=dev-libs
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bus1/dbus-broker/archive/v4.tar.gz -> dbus-broker-4.tar.gz https://github.com/c-util/c-dvar/archive/e1c94e3c3c42ca9bcb336ccd7c3693bcd330c6fc.tar.gz -> c-dvar-e1c94e3c3c42ca9bcb336ccd7c3693bcd330c6fc.tar.gz https://github.com/c-util/c-list/archive/9e50b8b08e0b0b75e1c651d5aa4e3cf94368a574.tar.gz -> c-list-9e50b8b08e0b0b75e1c651d5aa4e3cf94368a574.tar.gz https://github.com/c-util/c-rbtree/archive/6181232360c9b517a6af3d82ebdbdce5fe36933a.tar.gz -> c-rbtree-6181232360c9b517a6af3d82ebdbdce5fe36933a.tar.gz https://github.com/c-util/c-sundry/archive/644ea3c2ce5b78d2433c111694f5d602d1aa7fa9.tar.gz -> c-sundry-644ea3c2ce5b78d2433c111694f5d602d1aa7fa9.tar.gz
-_eclasses_=meson	958769e8b8b5a79afc3f22f3915cebbc	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
+_eclasses_=meson	38757afcd8d9f0d1d44ba4cefc33b99d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
 _md5_=a2da0f3ffff387ad3de11d58f22d3835
diff --git a/metadata/md5-cache/sys-apps/dbus-broker-7 b/metadata/md5-cache/sys-apps/dbus-broker-7
new file mode 100644
index 000000000000..73181076f3d3
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/dbus-broker-7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=audit? ( sys-process/audit ) launcher? ( >=dev-libs/expat-2.2 >=dev-libs/glib-2.50:2 >=sys-apps/systemd-230 ) selinux? ( sys-libs/libselinux ) dev-python/docutils virtual/pkgconfig test? ( >=sys-apps/dbus-1.10 ) >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2
+DESCRIPTION=Linux D-Bus Message Broker
+EAPI=6
+HOMEPAGE=https://github.com/bus1/dbus-broker/wiki
+IUSE=audit +launcher selinux test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=audit? ( sys-process/audit ) launcher? ( >=dev-libs/expat-2.2 >=dev-libs/glib-2.50:2 >=sys-apps/systemd-230 ) selinux? ( sys-libs/libselinux )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/bus1/dbus-broker/archive/v7.tar.gz -> dbus-broker-7.tar.gz https://github.com/c-util/c-dvar/archive/7706828ecda2d8c508d6fc233dc9d198bab482ad.tar.gz -> c-dvar-7706828ecda2d8c508d6fc233dc9d198bab482ad.tar.gz https://github.com/c-util/c-list/archive/9e50b8b08e0b0b75e1c651d5aa4e3cf94368a574.tar.gz -> c-list-9e50b8b08e0b0b75e1c651d5aa4e3cf94368a574.tar.gz https://github.com/c-util/c-rbtree/archive/6181232360c9b517a6af3d82ebdbdce5fe36933a.tar.gz -> c-rbtree-6181232360c9b517a6af3d82ebdbdce5fe36933a.tar.gz https://github.com/c-util/c-sundry/archive/50c8ccf01b39b3f11e59c69d1cafea5bef5a9769.tar.gz -> c-sundry-50c8ccf01b39b3f11e59c69d1cafea5bef5a9769.tar.gz
+_eclasses_=meson	38757afcd8d9f0d1d44ba4cefc33b99d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=b38cdcba411134bb23d85248d10e73d5
diff --git a/metadata/md5-cache/sys-apps/dbus-broker-9999 b/metadata/md5-cache/sys-apps/dbus-broker-9999
index 7b373e4947c1..28469b221bcc 100644
--- a/metadata/md5-cache/sys-apps/dbus-broker-9999
+++ b/metadata/md5-cache/sys-apps/dbus-broker-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=audit? ( sys-process/audit ) launcher? ( >=dev-libs/expat-2.2 >=dev-libs/glib-2.50:2 >=sys-apps/systemd-230 ) selinux? ( sys-libs/libselinux ) virtual/pkgconfig test? ( >=sys-apps/dbus-1.10 ) >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2 >=dev-vcs/git-1.8.2.1
+DEPEND=audit? ( sys-process/audit ) launcher? ( >=dev-libs/expat-2.2 >=dev-libs/glib-2.50:2 >=sys-apps/systemd-230 ) selinux? ( sys-libs/libselinux ) dev-python/docutils virtual/pkgconfig test? ( >=sys-apps/dbus-1.10 ) >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Linux D-Bus Message Broker
 EAPI=6
 HOMEPAGE=https://github.com/bus1/dbus-broker/wiki
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=audit? ( sys-process/audit ) launcher? ( >=dev-libs/expat-2.2 >=dev-libs/glib-2.50:2 >=sys-apps/systemd-230 ) selinux? ( sys-libs/libselinux )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	52a888802d25387c2c74cb845d1219bc	meson	958769e8b8b5a79afc3f22f3915cebbc	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a2da0f3ffff387ad3de11d58f22d3835
+_eclasses_=git-r3	52a888802d25387c2c74cb845d1219bc	meson	38757afcd8d9f0d1d44ba4cefc33b99d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=b38cdcba411134bb23d85248d10e73d5
diff --git a/metadata/md5-cache/sys-apps/elivepatch-client-9999 b/metadata/md5-cache/sys-apps/elivepatch-client-9999
new file mode 100644
index 000000000000..29aa99f9f00c
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/elivepatch-client-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=app-admin/sudo dev-python/git-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Live patch installer client working with elivepatch-server
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Elivepatch
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=GPL-2+
+RDEPEND=app-admin/sudo dev-python/git-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	git-r3	52a888802d25387c2c74cb845d1219bc	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fb5eb7058eeee1b927bf5bb2e6f99793
diff --git a/metadata/md5-cache/sys-apps/elivepatch-server-9999 b/metadata/md5-cache/sys-apps/elivepatch-server-9999
new file mode 100644
index 000000000000..83a63fe3db9f
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/elivepatch-server-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/werkzeug[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flask-restful[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =sys-kernel/kpatch-9999 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Live patch building server with RESTFul Api for elivepatch-client
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Elivepatch
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=GPL-2+
+RDEPEND=dev-python/werkzeug[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flask-restful[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =sys-kernel/kpatch-9999 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	git-r3	52a888802d25387c2c74cb845d1219bc	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a3ca248302b3576ac580d86b9dbe9d4b
diff --git a/metadata/md5-cache/sys-apps/ethtool-4.13 b/metadata/md5-cache/sys-apps/ethtool-4.13
new file mode 100644
index 000000000000..d472ccf93e77
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/ethtool-4.13
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DEPEND=app-arch/xz-utils
+DESCRIPTION=Utility for examining and tuning ethernet-based network interfaces
+EAPI=5
+HOMEPAGE=https://www.kernel.org/pub/software/network/ethtool/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://kernel/software/network/ethtool/ethtool-4.13.tar.xz
+_md5_=d4c5b2f8ea4d7ae046b7ed7cdb7ba65c
diff --git a/metadata/md5-cache/sys-apps/fwupd-0.9.5-r1 b/metadata/md5-cache/sys-apps/fwupd-0.9.5-r1
index 6a770fff34f2..90f84a839a8b 100644
--- a/metadata/md5-cache/sys-apps/fwupd-0.9.5-r1
+++ b/metadata/md5-cache/sys-apps/fwupd-0.9.5-r1
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/gpgme dev-db/sqlite >=dev-libs/appstream-glib-0.6.13[introspec
 REQUIRED_USE=dell? ( uefi )
 SLOT=0
 SRC_URI=https://github.com/hughsie/fwupd/archive/0.9.5.tar.gz -> fwupd-0.9.5.tar.gz
-_eclasses_=meson	958769e8b8b5a79afc3f22f3915cebbc	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=meson	38757afcd8d9f0d1d44ba4cefc33b99d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9e7a1fccd3af967f4ff3f697f230e38c
diff --git a/metadata/md5-cache/sys-apps/fwupd-0.9.6 b/metadata/md5-cache/sys-apps/fwupd-0.9.6
index c22082a4c401..859868191fde 100644
--- a/metadata/md5-cache/sys-apps/fwupd-0.9.6
+++ b/metadata/md5-cache/sys-apps/fwupd-0.9.6
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/gpgme dev-db/sqlite >=dev-libs/appstream-glib-0.6.13[introspec
 REQUIRED_USE=dell? ( uefi )
 SLOT=0
 SRC_URI=https://github.com/hughsie/fwupd/archive/0.9.6.tar.gz -> fwupd-0.9.6.tar.gz
-_eclasses_=meson	958769e8b8b5a79afc3f22f3915cebbc	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=meson	38757afcd8d9f0d1d44ba4cefc33b99d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3ed43431312955fc15eff382bd08c399
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.0.0 b/metadata/md5-cache/sys-apps/fwupd-1.0.0
index 3b1c5844e774..b967f049c4db 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.0.0
+++ b/metadata/md5-cache/sys-apps/fwupd-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/gpgme dev-db/sqlite >=dev-libs/appstream-glib-0.6.13[introspec
 REQUIRED_USE=dell? ( uefi )
 SLOT=0
 SRC_URI=https://github.com/hughsie/fwupd/archive/1.0.0.tar.gz -> fwupd-1.0.0.tar.gz
-_eclasses_=meson	958769e8b8b5a79afc3f22f3915cebbc	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=meson	38757afcd8d9f0d1d44ba4cefc33b99d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fabd62078293f847a6770c0c5c5999bc
diff --git a/metadata/md5-cache/sys-apps/gawk-4.1.4 b/metadata/md5-cache/sys-apps/gawk-4.1.4
index fc4097910235..cc5175514704 100644
--- a/metadata/md5-cache/sys-apps/gawk-4.1.4
+++ b/metadata/md5-cache/sys-apps/gawk-4.1.4
@@ -4,10 +4,10 @@ DESCRIPTION=GNU awk pattern-matching language
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/gawk/gawk.html
 IUSE=mpfr nls readline
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=mpfr? ( dev-libs/mpfr:0= ) readline? ( sys-libs/readline:0= )
 SLOT=0
 SRC_URI=mirror://gnu/gawk/gawk-4.1.4.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=962673a748130a811c91f200dd4fe5ea
+_md5_=0e7e9113889d90cbc5f5c19568323c1b
diff --git a/metadata/md5-cache/sys-apps/gawk-4.2.0 b/metadata/md5-cache/sys-apps/gawk-4.2.0
index 599312f1c4b4..072fd7d1e573 100644
--- a/metadata/md5-cache/sys-apps/gawk-4.2.0
+++ b/metadata/md5-cache/sys-apps/gawk-4.2.0
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/gmp:0= mpfr? ( dev-libs/mpfr:0= ) readline? ( sys-libs/readline
 SLOT=0
 SRC_URI=mirror://gnu/gawk/gawk-4.2.0.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=3fb18e884c759742386bbe388754eb82
+_md5_=7a78e0fdca8d85e9891a7084bd7ac218
diff --git a/metadata/md5-cache/sys-apps/gsmartcontrol-1.0.2 b/metadata/md5-cache/sys-apps/gsmartcontrol-1.0.2
index 138272b3940d..c53db2a16913 100644
--- a/metadata/md5-cache/sys-apps/gsmartcontrol-1.0.2
+++ b/metadata/md5-cache/sys-apps/gsmartcontrol-1.0.2
@@ -4,10 +4,10 @@ DESCRIPTION=Hard disk drive health inspection tool
 EAPI=6
 HOMEPAGE=https://gsmartcontrol.sourceforge.io/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=|| ( GPL-2 GPL-3 ) Boost-1.0 BSD Unlicense ZLIB
 RDEPEND=dev-cpp/gtkmm:3.0 dev-libs/libpcre:3 sys-apps/smartmontools x11-apps/xmessage
 SLOT=0
 SRC_URI=mirror://sourceforge/gsmartcontrol/gsmartcontrol-1.0.2.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7a45074f016164e9616db59aeb09ad9d
+_md5_=fa2ff1b3a94d510c70c807cc169eed56
diff --git a/metadata/md5-cache/sys-apps/help2man-1.47.4 b/metadata/md5-cache/sys-apps/help2man-1.47.4
index 9b7e510a60a1..58fc02596fa6 100644
--- a/metadata/md5-cache/sys-apps/help2man-1.47.4
+++ b/metadata/md5-cache/sys-apps/help2man-1.47.4
@@ -4,10 +4,10 @@ DESCRIPTION=GNU utility to convert program --help output to a man page
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/help2man/
 IUSE=nls
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl nls? ( dev-perl/Locale-gettext )
 SLOT=0
 SRC_URI=mirror://gnu/help2man/help2man-1.47.4.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=0a17b6324ae8258dc1c838d0dc92857c
+_md5_=dc8fa723b47d4f8e3acb72cad289069c
diff --git a/metadata/md5-cache/sys-apps/openrc-0.32.1 b/metadata/md5-cache/sys-apps/openrc-0.32.1
index 7686b6091baa..46687e5424cd 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.32.1
+++ b/metadata/md5-cache/sys-apps/openrc-0.32.1
@@ -4,11 +4,11 @@ DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
 EAPI=6
 HOMEPAGE=https://github.com/openrc/openrc/
 IUSE=audit debug ncurses pam newnet prefix +netifrc selinux static-libs unicode kernel_linux kernel_FreeBSD
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=BSD-2
 PDEPEND=netifrc? ( net-misc/netifrc )
 RDEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 !prefix? ( kernel_linux? ( >=sys-apps/sysvinit-2.86-r6[selinux?] virtual/tmpfiles ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 )
 SLOT=0
 SRC_URI=https://github.com/openrc/openrc/archive/0.32.1.tar.gz -> openrc-0.32.1.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=660a458ee83567135ee8a624c9369a3e
+_md5_=50bad9e44a21e37e8cbb74cecb2e2ca1
diff --git a/metadata/md5-cache/sys-apps/openrc-0.34 b/metadata/md5-cache/sys-apps/openrc-0.34
new file mode 100644
index 000000000000..864a8dadebfe
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/openrc-0.34
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst preinst prepare
+DEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 virtual/os-headers ncurses? ( virtual/pkgconfig )
+DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
+EAPI=6
+HOMEPAGE=https://github.com/openrc/openrc/
+IUSE=audit debug ncurses pam newnet prefix +netifrc selinux static-libs unicode kernel_linux kernel_FreeBSD
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=BSD-2
+PDEPEND=netifrc? ( net-misc/netifrc )
+RDEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 !prefix? ( kernel_linux? ( >=sys-apps/sysvinit-2.86-r6[selinux?] virtual/tmpfiles ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 )
+SLOT=0
+SRC_URI=https://github.com/openrc/openrc/archive/0.34.tar.gz -> openrc-0.34.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=befb52289084248d85d012712f7edde4
diff --git a/metadata/md5-cache/sys-apps/openrc-0.34.1 b/metadata/md5-cache/sys-apps/openrc-0.34.1
new file mode 100644
index 000000000000..929ed8c5a7b2
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/openrc-0.34.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst preinst prepare
+DEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 virtual/os-headers ncurses? ( virtual/pkgconfig )
+DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
+EAPI=6
+HOMEPAGE=https://github.com/openrc/openrc/
+IUSE=audit debug ncurses pam newnet prefix +netifrc selinux static-libs unicode kernel_linux kernel_FreeBSD
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=BSD-2
+PDEPEND=netifrc? ( net-misc/netifrc )
+RDEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 !prefix? ( kernel_linux? ( >=sys-apps/sysvinit-2.86-r6[selinux?] virtual/tmpfiles ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 )
+SLOT=0
+SRC_URI=https://github.com/openrc/openrc/archive/0.34.1.tar.gz -> openrc-0.34.1.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=befb52289084248d85d012712f7edde4
diff --git a/metadata/md5-cache/sys-apps/openrc-0.34.2 b/metadata/md5-cache/sys-apps/openrc-0.34.2
new file mode 100644
index 000000000000..62ada88c9eb8
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/openrc-0.34.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst preinst prepare
+DEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 virtual/os-headers ncurses? ( virtual/pkgconfig )
+DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
+EAPI=6
+HOMEPAGE=https://github.com/openrc/openrc/
+IUSE=audit debug ncurses pam newnet prefix +netifrc selinux static-libs unicode kernel_linux kernel_FreeBSD
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=BSD-2
+PDEPEND=netifrc? ( net-misc/netifrc )
+RDEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 !prefix? ( kernel_linux? ( >=sys-apps/sysvinit-2.86-r6[selinux?] virtual/tmpfiles ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 )
+SLOT=0
+SRC_URI=https://github.com/openrc/openrc/archive/0.34.2.tar.gz -> openrc-0.34.2.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=befb52289084248d85d012712f7edde4
diff --git a/metadata/md5-cache/sys-apps/openrc-0.34.3 b/metadata/md5-cache/sys-apps/openrc-0.34.3
new file mode 100644
index 000000000000..8270bd10402f
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/openrc-0.34.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst preinst prepare
+DEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 virtual/os-headers ncurses? ( virtual/pkgconfig )
+DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
+EAPI=6
+HOMEPAGE=https://github.com/openrc/openrc/
+IUSE=audit debug ncurses pam newnet prefix +netifrc selinux static-libs unicode kernel_linux kernel_FreeBSD
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=BSD-2
+PDEPEND=netifrc? ( net-misc/netifrc )
+RDEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 !prefix? ( kernel_linux? ( >=sys-apps/sysvinit-2.86-r6[selinux?] virtual/tmpfiles ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 )
+SLOT=0
+SRC_URI=https://github.com/openrc/openrc/archive/0.34.3.tar.gz -> openrc-0.34.3.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=befb52289084248d85d012712f7edde4
diff --git a/metadata/md5-cache/sys-apps/openrc-0.34.4 b/metadata/md5-cache/sys-apps/openrc-0.34.4
new file mode 100644
index 000000000000..7b7befba99d5
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/openrc-0.34.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst preinst prepare
+DEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 virtual/os-headers ncurses? ( virtual/pkgconfig )
+DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
+EAPI=6
+HOMEPAGE=https://github.com/openrc/openrc/
+IUSE=audit debug ncurses pam newnet prefix +netifrc selinux static-libs unicode kernel_linux kernel_FreeBSD
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=BSD-2
+PDEPEND=netifrc? ( net-misc/netifrc )
+RDEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 !prefix? ( kernel_linux? ( >=sys-apps/sysvinit-2.86-r6[selinux?] virtual/tmpfiles ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 )
+SLOT=0
+SRC_URI=https://github.com/openrc/openrc/archive/0.34.4.tar.gz -> openrc-0.34.4.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=befb52289084248d85d012712f7edde4
diff --git a/metadata/md5-cache/sys-apps/pacman-5.0.2 b/metadata/md5-cache/sys-apps/pacman-5.0.2
deleted file mode 100644
index 9d72d3be7a28..000000000000
--- a/metadata/md5-cache/sys-apps/pacman-5.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=app-arch/libarchive:=[lzma] gpg? ( >=app-crypt/gpgme-1.4.0:= ) dev-libs/openssl:0= curl? ( net-misc/curl ) virtual/libiconv virtual/libintl app-text/asciidoc doc? ( app-doc/doxygen )
-DESCRIPTION=Archlinux's binary package manager
-EAPI=6
-HOMEPAGE=https://archlinux.org/pacman/
-IUSE=curl debug doc +gpg
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=app-arch/libarchive:=[lzma] gpg? ( >=app-crypt/gpgme-1.4.0:= ) dev-libs/openssl:0= curl? ( net-misc/curl ) virtual/libiconv virtual/libintl
-SLOT=0
-SRC_URI=https://sources.archlinux.org/other/pacman/pacman-5.0.2.tar.gz
-_md5_=da5c5a5472366b175090eef33d46b772
diff --git a/metadata/md5-cache/sys-apps/pacman-5.0.2-r1 b/metadata/md5-cache/sys-apps/pacman-5.0.2-r1
new file mode 100644
index 000000000000..a69dbe311138
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/pacman-5.0.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=app-arch/libarchive:=[lzma] gpg? ( >=app-crypt/gpgme-1.4.0:= ) dev-libs/openssl:0= curl? ( net-misc/curl ) virtual/libiconv virtual/libintl app-text/asciidoc doc? ( app-doc/doxygen ) test? ( sys-apps/fakeroot sys-apps/fakechroot ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Archlinux's binary package manager
+EAPI=6
+HOMEPAGE=https://archlinux.org/pacman/
+IUSE=curl debug doc +gpg test
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=app-arch/libarchive:=[lzma] gpg? ( >=app-crypt/gpgme-1.4.0:= ) dev-libs/openssl:0= curl? ( net-misc/curl ) virtual/libiconv virtual/libintl
+RESTRICT=test
+SLOT=0/10
+SRC_URI=https://sources.archlinux.org/other/pacman/pacman-5.0.2.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=54394dacecf31b89e9c2dba4b6adc815
diff --git a/metadata/md5-cache/sys-apps/pcsc-lite-1.8.22 b/metadata/md5-cache/sys-apps/pcsc-lite-1.8.22
index 05ac3e8c9793..f03d33bfc84f 100644
--- a/metadata/md5-cache/sys-apps/pcsc-lite-1.8.22
+++ b/metadata/md5-cache/sys-apps/pcsc-lite-1.8.22
@@ -4,11 +4,11 @@ DESCRIPTION=PC/SC Architecture smartcard middleware library
 EAPI=6
 HOMEPAGE=https://pcsclite.alioth.debian.org/
 IUSE=python libusb policykit selinux +udev python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 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 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD ISC MIT GPL-3+ GPL-2
 RDEPEND=libusb? ( virtual/libusb:1 ) udev? ( virtual/udev ) policykit? ( >=sys-auth/polkit-0.111 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) 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_python2_7(-)?,python_targets_python3_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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) !<app-crypt/ccid-1.4.1-r1 !<sys-apps/baselayout-2 !<sys-apps/openrc-0.11.8 selinux? ( sec-policy/selinux-pcscd )
 REQUIRED_USE=^^ ( udev libusb ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://alioth.debian.org/download.php/file/4225/pcsc-lite-1.8.22.tar.bz2
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=778876f84b531528f02e50cf9ce73b89
+_md5_=8109280e0f25cfd8e253607eefeddf2a
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.11 b/metadata/md5-cache/sys-apps/portage-2.3.11
deleted file mode 100644
index 7bb4439da7bc..000000000000
--- a/metadata/md5-cache/sys-apps/portage-2.3.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=!build? ( python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Portage is the package management and distribution system for Gentoo
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-IUSE=build doc epydoc +ipc linguas_ru +native-extensions selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
-RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://gentoo/portage-2.3.11.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.11.tar.bz2
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e1ec7598e680c3b1f409631562a3e2cf
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.13 b/metadata/md5-cache/sys-apps/portage-2.3.13
new file mode 100644
index 000000000000..9a26fa39e446
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/portage-2.3.13
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=!build? ( python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Portage is the package management and distribution system for Gentoo
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
+IUSE=build doc epydoc +ipc linguas_ru +native-extensions selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=GPL-2
+PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
+RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://gentoo/portage-2.3.13.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.13.tar.bz2
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e1ec7598e680c3b1f409631562a3e2cf
diff --git a/metadata/md5-cache/sys-apps/ripgrep-0.7.1 b/metadata/md5-cache/sys-apps/ripgrep-0.7.1
new file mode 100644
index 000000000000..c3b919ab41c1
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/ripgrep-0.7.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=virtual/rust-1.17 >=dev-util/cargo-0.13.0
+DESCRIPTION=a search tool that combines the usability of ag with the raw speed of grep
+EAPI=6
+HOMEPAGE=https://github.com/BurntSushi/ripgrep
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( MIT Unlicense )
+SLOT=0
+SRC_URI=https://github.com/BurntSushi/ripgrep/archive/0.7.1.tar.gz -> ripgrep-0.7.1.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.6.3/download -> aho-corasick-0.6.3.crate https://crates.io/api/v1/crates/ansi_term/0.9.0/download -> ansi_term-0.9.0.crate https://crates.io/api/v1/crates/atty/0.2.3/download -> atty-0.2.3.crate https://crates.io/api/v1/crates/bitflags/0.9.1/download -> bitflags-0.9.1.crate https://crates.io/api/v1/crates/bytecount/0.1.7/download -> bytecount-0.1.7.crate https://crates.io/api/v1/crates/cfg-if/0.1.2/download -> cfg-if-0.1.2.crate https://crates.io/api/v1/crates/clap/2.26.2/download -> clap-2.26.2.crate https://crates.io/api/v1/crates/crossbeam/0.2.10/download -> crossbeam-0.2.10.crate https://crates.io/api/v1/crates/encoding_rs/0.7.1/download -> encoding_rs-0.7.1.crate https://crates.io/api/v1/crates/env_logger/0.4.3/download -> env_logger-0.4.3.crate https://crates.io/api/v1/crates/fnv/1.0.5/download -> fnv-1.0.5.crate https://crates.io/api/v1/crates/fs2/0.4.2/download -> fs2-0.4.2.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/0.2.9/download -> lazy_static-0.2.9.crate https://crates.io/api/v1/crates/libc/0.2.32/download -> libc-0.2.32.crate https://crates.io/api/v1/crates/log/0.3.8/download -> log-0.3.8.crate https://crates.io/api/v1/crates/memchr/1.0.2/download -> memchr-1.0.2.crate https://crates.io/api/v1/crates/memchr/2.0.0/download -> memchr-2.0.0.crate https://crates.io/api/v1/crates/memmap/0.5.2/download -> memmap-0.5.2.crate https://crates.io/api/v1/crates/num_cpus/1.7.0/download -> num_cpus-1.7.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.31/download -> redox_syscall-0.1.31.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/0.2.2/download -> regex-0.2.2.crate https://crates.io/api/v1/crates/regex-syntax/0.4.1/download -> regex-syntax-0.4.1.crate https://crates.io/api/v1/crates/same-file/1.0.0/download -> same-file-1.0.0.crate https://crates.io/api/v1/crates/simd/0.1.1/download -> simd-0.1.1.crate https://crates.io/api/v1/crates/simd/0.2.0/download -> simd-0.2.0.crate https://crates.io/api/v1/crates/strsim/0.6.0/download -> strsim-0.6.0.crate https://crates.io/api/v1/crates/term_size/0.3.0/download -> term_size-0.3.0.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.8.0/download -> textwrap-0.8.0.crate https://crates.io/api/v1/crates/thread_local/0.3.4/download -> thread_local-0.3.4.crate https://crates.io/api/v1/crates/unicode-width/0.1.4/download -> unicode-width-0.1.4.crate https://crates.io/api/v1/crates/unreachable/1.0.0/download -> unreachable-1.0.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.0/download -> utf8-ranges-1.0.0.crate https://crates.io/api/v1/crates/vec_map/0.8.0/download -> vec_map-0.8.0.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/walkdir/2.0.1/download -> walkdir-2.0.1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate
+_eclasses_=cargo	5a58e76471ae53decd3da1fa44915831
+_md5_=ab766d929ba11d1ba06062e48d9c64c5
diff --git a/metadata/md5-cache/sys-apps/rng-tools-6 b/metadata/md5-cache/sys-apps/rng-tools-6
deleted file mode 100644
index 1176a87b2021..000000000000
--- a/metadata/md5-cache/sys-apps/rng-tools-6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-libs/libgcrypt:0 dev-libs/libgpg-error >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Daemon to use hardware random number generators
-EAPI=6
-HOMEPAGE=https://github.com/nhorman/rng-tools
-IUSE=selinux
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libgcrypt:0 dev-libs/libgpg-error sys-fs/sysfsutils selinux? ( sec-policy/selinux-rngd )
-SLOT=0
-SRC_URI=https://github.com/nhorman/rng-tools/archive/rng-tools-6.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=c86444fc3367412dd1a859a4d04fa5e2
diff --git a/metadata/md5-cache/sys-apps/rng-tools-6-r1 b/metadata/md5-cache/sys-apps/rng-tools-6-r1
new file mode 100644
index 000000000000..0e0149c4a3ca
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/rng-tools-6-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=dev-libs/libgcrypt:0 dev-libs/libgpg-error >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Daemon to use hardware random number generators
+EAPI=6
+HOMEPAGE=https://github.com/nhorman/rng-tools
+IUSE=selinux
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libgcrypt:0 dev-libs/libgpg-error sys-fs/sysfsutils selinux? ( sec-policy/selinux-rngd )
+SLOT=0
+SRC_URI=https://github.com/nhorman/rng-tools/archive/rng-tools-6.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=cd788d99cb1e6dfcd478221d269fa1ce
diff --git a/metadata/md5-cache/sys-apps/rng-tools-6.1 b/metadata/md5-cache/sys-apps/rng-tools-6.1
deleted file mode 100644
index c36db7acc103..000000000000
--- a/metadata/md5-cache/sys-apps/rng-tools-6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/libgcrypt:0 dev-libs/libgpg-error nistbeacon? ( net-misc/curl[ssl] dev-libs/libxml2:2= dev-libs/openssl:0= ) nistbeacon? ( virtual/pkgconfig ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Daemon to use hardware random number generators
-EAPI=6
-HOMEPAGE=https://github.com/nhorman/rng-tools
-IUSE=nistbeacon selinux
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libgcrypt:0 dev-libs/libgpg-error nistbeacon? ( net-misc/curl[ssl] dev-libs/libxml2:2= dev-libs/openssl:0= ) sys-fs/sysfsutils selinux? ( sec-policy/selinux-rngd )
-SLOT=0
-SRC_URI=https://github.com/nhorman/rng-tools/archive/v6.1.tar.gz -> rng-tools-6.1.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=e10e41bcf75be712c96680f1663287b5
diff --git a/metadata/md5-cache/sys-apps/rng-tools-6.1-r1 b/metadata/md5-cache/sys-apps/rng-tools-6.1-r1
new file mode 100644
index 000000000000..4d9f12520775
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/rng-tools-6.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/libgcrypt:0 dev-libs/libgpg-error nistbeacon? ( net-misc/curl[ssl] dev-libs/libxml2:2= dev-libs/openssl:0= ) nistbeacon? ( virtual/pkgconfig ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Daemon to use hardware random number generators
+EAPI=6
+HOMEPAGE=https://github.com/nhorman/rng-tools
+IUSE=nistbeacon selinux
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libgcrypt:0 dev-libs/libgpg-error nistbeacon? ( net-misc/curl[ssl] dev-libs/libxml2:2= dev-libs/openssl:0= ) sys-fs/sysfsutils selinux? ( sec-policy/selinux-rngd )
+SLOT=0
+SRC_URI=https://github.com/nhorman/rng-tools/archive/v6.1.tar.gz -> rng-tools-6.1.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=eea1fe2a5c12f9d363255615133b8430
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.10-r4 b/metadata/md5-cache/sys-apps/sandbox-2.10-r4
index 924d3cdcf518..8778c17d024f 100644
--- a/metadata/md5-cache/sys-apps/sandbox-2.10-r4
+++ b/metadata/md5-cache/sys-apps/sandbox-2.10-r4
@@ -4,9 +4,9 @@ DESCRIPTION=sandbox'd LD_PRELOAD hack
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/proj/en/portage/sandbox/
 IUSE=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 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/sandbox-2.10.tar.xz https://dev.gentoo.org/~vapier/dist/sandbox-2.10.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=8dcb0bcaa78adeaefdb7f70bcd7ac035
+_md5_=1f6003b52be229311921bae5687e3c3b
diff --git a/metadata/md5-cache/sys-apps/systemd-233-r5 b/metadata/md5-cache/sys-apps/systemd-233-r5
new file mode 100644
index 000000000000..9afef5c7301f
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-233-r5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm pretend setup test unpack
+DEPEND=>=sys-apps/util-linux-2.27.1: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(-)?] sys-libs/libcap: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(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( net-dns/libidn:0= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[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(-)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) app-arch/xz-utils:0 dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 >=sys-kernel/linux-headers-3.11 virtual/pkgconfig gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 doc? ( || ( ( dev-lang/python:3.6 dev-python/lxml[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/lxml[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/lxml[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=System and service manager for Linux
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
+IUSE=acl apparmor audit build cryptsetup curl doc elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam policykit qrcode +seccomp selinux ssl sysv-utils test vanilla xkb 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 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-apps/hwids-20150417[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
+RDEPEND=>=sys-apps/util-linux-2.27.1: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(-)?] sys-libs/libcap: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(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( net-dns/libidn:0= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[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(-)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !<sys-kernel/dracut-044 !sys-fs/eudev !sys-fs/udev
+REQUIRED_USE=importd? ( curl gcrypt lzma )
+SLOT=0/2
+SRC_URI=https://github.com/systemd/systemd/archive/v233.tar.gz -> systemd-233.tar.gz !doc? ( https://dev.gentoo.org/~floppym/dist/systemd-233-man.tar.gz )
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pam	3e788d86170dfcd5b06824d898315e18	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6c2aa75a13795f6a8fe8095b5019a75e
diff --git a/metadata/md5-cache/sys-apps/systemd-233-r6 b/metadata/md5-cache/sys-apps/systemd-233-r6
new file mode 100644
index 000000000000..c10d8cc3ced7
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-233-r6
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm pretend setup test unpack
+DEPEND=>=sys-apps/util-linux-2.27.1: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(-)?] sys-libs/libcap: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(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( net-dns/libidn:0= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[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(-)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) app-arch/xz-utils:0 dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 >=sys-kernel/linux-headers-3.11 virtual/pkgconfig gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 doc? ( || ( ( dev-lang/python:3.6 dev-python/lxml[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/lxml[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/lxml[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=System and service manager for Linux
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
+IUSE=acl apparmor audit build cryptsetup curl doc elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam policykit qrcode +seccomp selinux ssl sysv-utils test vanilla xkb 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 ia64 ppc ppc64 ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-apps/hwids-20150417[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
+RDEPEND=>=sys-apps/util-linux-2.27.1: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(-)?] sys-libs/libcap: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(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( net-dns/libidn:0= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[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(-)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !<sys-kernel/dracut-044 !sys-fs/eudev !sys-fs/udev
+REQUIRED_USE=importd? ( curl gcrypt lzma )
+SLOT=0/2
+SRC_URI=https://github.com/systemd/systemd/archive/v233.tar.gz -> systemd-233.tar.gz !doc? ( https://dev.gentoo.org/~floppym/dist/systemd-233-man.tar.gz )
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pam	3e788d86170dfcd5b06824d898315e18	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=02a3fec367af007b418fc3ea30b786e7
diff --git a/metadata/md5-cache/sys-apps/systemd-234-r4 b/metadata/md5-cache/sys-apps/systemd-234-r4
deleted file mode 100644
index aec843cb9338..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-234-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
-DEPEND=>=sys-apps/util-linux-2.27.1: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(-)?] sys-libs/libcap: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(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( libidn2? ( net-dns/libidn2 ) !libidn2? ( net-dns/libidn ) ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[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(-)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) app-arch/xz-utils:0 dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 >=sys-kernel/linux-headers-3.11 virtual/pkgconfig gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( dev-lang/python:3.6 dev-python/lxml[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/lxml[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/lxml[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ) >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2 virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=System and service manager for Linux
-EAPI=6
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam policykit qrcode +seccomp selinux ssl sysv-utils test vanilla xkb 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 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-apps/hwids-20150417[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
-RDEPEND=>=sys-apps/util-linux-2.27.1: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(-)?] sys-libs/libcap: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(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( libidn2? ( net-dns/libidn2 ) !libidn2? ( net-dns/libidn ) ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[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(-)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !<sys-kernel/dracut-044 !sys-fs/eudev !sys-fs/udev
-REQUIRED_USE=importd? ( curl gcrypt lzma )
-SLOT=0/2
-SRC_URI=https://github.com/systemd/systemd/archive/v234.tar.gz -> systemd-234.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	958769e8b8b5a79afc3f22f3915cebbc	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=de00b8418454173556dec92e9ab07ebc
diff --git a/metadata/md5-cache/sys-apps/systemd-235 b/metadata/md5-cache/sys-apps/systemd-235
deleted file mode 100644
index 074f1dc0ea21..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-235
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
-DEPEND=>=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( libidn2? ( net-dns/libidn2 ) !libidn2? ( net-dns/libidn ) ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[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(-)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) app-arch/xz-utils:0 dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 >=sys-kernel/linux-headers-3.11 virtual/pkgconfig gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( dev-lang/python:3.6 dev-python/lxml[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/lxml[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/lxml[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ) >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2 virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=System and service manager for Linux
-EAPI=6
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam policykit qrcode +seccomp selinux ssl sysv-utils test vanilla xkb 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 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-apps/hwids-20150417[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
-RDEPEND=>=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( libidn2? ( net-dns/libidn2 ) !libidn2? ( net-dns/libidn ) ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[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(-)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !<sys-kernel/dracut-044 !sys-fs/eudev !sys-fs/udev
-REQUIRED_USE=importd? ( curl gcrypt lzma )
-SLOT=0/2
-SRC_URI=https://github.com/systemd/systemd/archive/v235.tar.gz -> systemd-235.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	958769e8b8b5a79afc3f22f3915cebbc	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9a55c81d667101079073437ef88624b9
diff --git a/metadata/md5-cache/sys-apps/systemd-235-r1 b/metadata/md5-cache/sys-apps/systemd-235-r1
new file mode 100644
index 000000000000..2f14b01f0a43
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-235-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
+DEPEND=>=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( libidn2? ( net-dns/libidn2 ) !libidn2? ( net-dns/libidn ) ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[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(-)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) app-arch/xz-utils:0 dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 >=sys-kernel/linux-headers-3.11 virtual/pkgconfig gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( dev-lang/python:3.6 dev-python/lxml[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/lxml[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/lxml[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ) >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=System and service manager for Linux
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
+IUSE=acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam policykit qrcode +seccomp selinux ssl sysv-utils test vanilla xkb 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 ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-apps/hwids-20150417[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
+RDEPEND=>=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( libidn2? ( net-dns/libidn2 ) !libidn2? ( net-dns/libidn ) ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[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(-)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !<sys-kernel/dracut-044 !sys-fs/eudev !sys-fs/udev
+REQUIRED_USE=importd? ( curl gcrypt lzma )
+SLOT=0/2
+SRC_URI=https://github.com/systemd/systemd/archive/v235.tar.gz -> systemd-235.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	38757afcd8d9f0d1d44ba4cefc33b99d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5da9b72d0a83d4228658ab3fbcbccf95
diff --git a/metadata/md5-cache/sys-apps/systemd-9999 b/metadata/md5-cache/sys-apps/systemd-9999
index a8446d0c5093..97e1d8ec0bdf 100644
--- a/metadata/md5-cache/sys-apps/systemd-9999
+++ b/metadata/md5-cache/sys-apps/systemd-9999
@@ -9,5 +9,5 @@ PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-apps/hwids-20150417[udev] >=sys-fs/
 RDEPEND=>=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( libidn2? ( net-dns/libidn2 ) !libidn2? ( net-dns/libidn ) ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[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(-)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !<sys-kernel/dracut-044 !sys-fs/eudev !sys-fs/udev
 REQUIRED_USE=importd? ( curl gcrypt lzma )
 SLOT=0/2
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	958769e8b8b5a79afc3f22f3915cebbc	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	38757afcd8d9f0d1d44ba4cefc33b99d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=4ff3af62f51bd3f7cd53e8acc24770af
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.31 b/metadata/md5-cache/sys-apps/util-linux-2.31
new file mode 100644
index 000000000000..aff81e24deca
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/util-linux-2.31
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) 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_python2_7(-)?,python_targets_python3_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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) 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-20170422 virtual/pkgconfig
+DESCRIPTION=Various useful Linux utilities
+EAPI=6
+HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/
+IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 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 ~arm-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?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) 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_python2_7(-)?,python_targets_python3_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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) 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-block/eject !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.7-r1
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=mirror://kernel/linux/utils/util-linux/v2.31/util-linux-2.31.tar.xz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pam	3e788d86170dfcd5b06824d898315e18	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=4b2cbcc469b7ea9439c94992335666d1
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.31_rc1 b/metadata/md5-cache/sys-apps/util-linux-2.31_rc1
deleted file mode 100644
index 0696f72af511..000000000000
--- a/metadata/md5-cache/sys-apps/util-linux-2.31_rc1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) 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_python2_7(-)?,python_targets_python3_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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) 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-20170422 virtual/pkgconfig
-DESCRIPTION=Various useful Linux utilities
-EAPI=6
-HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/
-IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 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
-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?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) 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_python2_7(-)?,python_targets_python3_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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) 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-block/eject !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.3-r2
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=mirror://kernel/linux/utils/util-linux/v2.31/util-linux-2.31-rc1.tar.xz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pam	3e788d86170dfcd5b06824d898315e18	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=c68fe59fbd58673a27b3d17d89421c96
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.31_rc2 b/metadata/md5-cache/sys-apps/util-linux-2.31_rc2
deleted file mode 100644
index 17e2ef163140..000000000000
--- a/metadata/md5-cache/sys-apps/util-linux-2.31_rc2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) 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_python2_7(-)?,python_targets_python3_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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) 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-20170422 virtual/pkgconfig
-DESCRIPTION=Various useful Linux utilities
-EAPI=6
-HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/
-IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 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
-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?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) 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_python2_7(-)?,python_targets_python3_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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) 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-block/eject !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.3-r2
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=mirror://kernel/linux/utils/util-linux/v2.31/util-linux-2.31-rc2.tar.xz https://github.com/karelzak/util-linux/commit/c4e60bc0807b04ab104594abc83301481d5d5995.patch -> util-linux-2.31_rc2-losetup_types.patch
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pam	3e788d86170dfcd5b06824d898315e18	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=876010323d9cc0e0f00727cedc2fab98
diff --git a/metadata/md5-cache/sys-apps/util-linux-9999 b/metadata/md5-cache/sys-apps/util-linux-9999
index f646edd2f632..48d61926fe2b 100644
--- a/metadata/md5-cache/sys-apps/util-linux-9999
+++ b/metadata/md5-cache/sys-apps/util-linux-9999
@@ -5,8 +5,8 @@ EAPI=6
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/
 IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 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
 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?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) 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_python2_7(-)?,python_targets_python3_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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) 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-block/eject !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.3-r2
+RDEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) 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_python2_7(-)?,python_targets_python3_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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) 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-block/eject !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.7-r1
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pam	3e788d86170dfcd5b06824d898315e18	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=c68fe59fbd58673a27b3d17d89421c96
+_md5_=4b2cbcc469b7ea9439c94992335666d1
diff --git a/metadata/md5-cache/sys-auth/consolekit-1.0.1 b/metadata/md5-cache/sys-auth/consolekit-1.0.1
deleted file mode 100644
index e0f689ddadb4..000000000000
--- a/metadata/md5-cache/sys-auth/consolekit-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=>=dev-libs/glib-2.40:2=[dbus] >=sys-devel/gettext-0.19 sys-apps/dbus sys-libs/zlib:= x11-libs/libX11:= acl? ( sys-apps/acl:= >=virtual/udev-200 ) cgroups? ( app-admin/cgmanager >=sys-libs/libnih-1.0.2[dbus] ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.110 ) dev-libs/libxslt virtual/pkgconfig doc? ( app-text/xmlto ) test? ( app-text/docbook-xml-dtd:4.1.2 app-text/xmlto )
-DESCRIPTION=Framework for defining and tracking users, login sessions and seats
-EAPI=5
-HOMEPAGE=https://github.com/ConsoleKit2/ConsoleKit2 https://www.freedesktop.org/wiki/Software/ConsoleKit
-IUSE=acl cgroups debug doc kernel_linux pam pm-utils policykit selinux test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.40:2=[dbus] >=sys-devel/gettext-0.19 sys-apps/dbus sys-libs/zlib:= x11-libs/libX11:= acl? ( sys-apps/acl:= >=virtual/udev-200 ) cgroups? ( app-admin/cgmanager >=sys-libs/libnih-1.0.2[dbus] ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.110 ) kernel_linux? ( sys-apps/coreutils[acl?] ) pm-utils? ( sys-power/pm-utils ) selinux? ( sec-policy/selinux-consolekit )
-SLOT=0
-SRC_URI=https://github.com/ConsoleKit2/ConsoleKit2/releases/download/1.0.1/ConsoleKit2-1.0.1.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0a394ef07009a20a7a7dd238df9ee228
diff --git a/metadata/md5-cache/sys-auth/consolekit-1.1.0 b/metadata/md5-cache/sys-auth/consolekit-1.1.0
deleted file mode 100644
index cbe158ba6fa0..000000000000
--- a/metadata/md5-cache/sys-auth/consolekit-1.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=>=dev-libs/glib-2.40:2=[dbus] >=sys-devel/gettext-0.19 sys-apps/dbus sys-libs/zlib:= x11-libs/libX11:= acl? ( sys-apps/acl:= >=virtual/udev-200 ) cgroups? ( app-admin/cgmanager >=sys-libs/libnih-1.0.2[dbus] ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.110 ) dev-libs/libxslt virtual/pkgconfig doc? ( app-text/xmlto ) test? ( app-text/docbook-xml-dtd:4.1.2 app-text/xmlto )
-DESCRIPTION=Framework for defining and tracking users, login sessions and seats
-EAPI=6
-HOMEPAGE=https://github.com/ConsoleKit2/ConsoleKit2 https://www.freedesktop.org/wiki/Software/ConsoleKit
-IUSE=acl cgroups debug doc kernel_linux pam pm-utils policykit selinux test
-KEYWORDS=alpha amd64 arm hppa ~ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.40:2=[dbus] >=sys-devel/gettext-0.19 sys-apps/dbus sys-libs/zlib:= x11-libs/libX11:= acl? ( sys-apps/acl:= >=virtual/udev-200 ) cgroups? ( app-admin/cgmanager >=sys-libs/libnih-1.0.2[dbus] ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.110 ) kernel_linux? ( sys-apps/coreutils[acl?] ) pm-utils? ( sys-power/pm-utils ) selinux? ( sec-policy/selinux-consolekit )
-SLOT=0
-SRC_URI=https://github.com/ConsoleKit2/ConsoleKit2/releases/download/1.1.0/ConsoleKit2-1.1.0.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0e0c7fd68f62f5231dd897fc4abe0881
diff --git a/metadata/md5-cache/sys-auth/consolekit-1.1.1 b/metadata/md5-cache/sys-auth/consolekit-1.1.1
deleted file mode 100644
index b240738a2375..000000000000
--- a/metadata/md5-cache/sys-auth/consolekit-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=>=dev-libs/glib-2.40:2=[dbus] >=sys-devel/gettext-0.19 sys-apps/dbus sys-libs/zlib:= x11-libs/libX11:= acl? ( sys-apps/acl:= >=virtual/udev-200 ) cgroups? ( app-admin/cgmanager >=sys-libs/libnih-1.0.2[dbus] ) evdev? ( dev-libs/libevdev:= ) udev? ( virtual/libudev x11-libs/libdrm:= ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.110 ) selinux? ( sys-libs/libselinux ) dev-libs/libxslt virtual/pkgconfig doc? ( app-text/xmlto ) test? ( app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Framework for defining and tracking users, login sessions and seats
-EAPI=6
-HOMEPAGE=https://github.com/ConsoleKit2/ConsoleKit2 https://www.freedesktop.org/wiki/Software/ConsoleKit
-IUSE=acl cgroups debug doc evdev kernel_linux pam pm-utils policykit selinux test udev
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.40:2=[dbus] >=sys-devel/gettext-0.19 sys-apps/dbus sys-libs/zlib:= x11-libs/libX11:= acl? ( sys-apps/acl:= >=virtual/udev-200 ) cgroups? ( app-admin/cgmanager >=sys-libs/libnih-1.0.2[dbus] ) evdev? ( dev-libs/libevdev:= ) udev? ( virtual/libudev x11-libs/libdrm:= ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.110 ) selinux? ( sys-libs/libselinux ) kernel_linux? ( sys-apps/coreutils[acl?] ) pm-utils? ( sys-power/pm-utils ) selinux? ( sec-policy/selinux-consolekit )
-SLOT=0
-SRC_URI=https://github.com/ConsoleKit2/ConsoleKit2/releases/download/1.1.1/ConsoleKit2-1.1.1.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d4a053ebc1bdbb51b095ab18d6c3d47e
diff --git a/metadata/md5-cache/sys-auth/consolekit-1.2.0 b/metadata/md5-cache/sys-auth/consolekit-1.2.0
index 54e6f1d00269..ca7de7b70d4e 100644
--- a/metadata/md5-cache/sys-auth/consolekit-1.2.0
+++ b/metadata/md5-cache/sys-auth/consolekit-1.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for defining and tracking users, login sessions and seats
 EAPI=6
 HOMEPAGE=https://github.com/ConsoleKit2/ConsoleKit2 https://www.freedesktop.org/wiki/Software/ConsoleKit
 IUSE=acl cgroups debug doc evdev kernel_linux pam pm-utils policykit selinux test udev
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.40:2=[dbus] >=sys-devel/gettext-0.19 sys-apps/dbus sys-libs/zlib:= x11-libs/libX11:= acl? ( sys-apps/acl:= >=virtual/udev-200 ) cgroups? ( app-admin/cgmanager >=sys-libs/libnih-1.0.2[dbus] ) evdev? ( dev-libs/libevdev:= ) udev? ( virtual/libudev x11-libs/libdrm:= ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.110 ) selinux? ( sys-libs/libselinux ) kernel_linux? ( sys-apps/coreutils[acl?] ) pm-utils? ( sys-power/pm-utils ) selinux? ( sec-policy/selinux-consolekit )
 SLOT=0
 SRC_URI=https://github.com/ConsoleKit2/ConsoleKit2/releases/download/1.2.0/ConsoleKit2-1.2.0.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fbde432e54c03d719eca522a0d411254
+_md5_=deee24dc7ee8e3f6b1d062646a2dadea
diff --git a/metadata/md5-cache/sys-auth/polkit-0.113-r4 b/metadata/md5-cache/sys-auth/polkit-0.113-r4
index b1ee6c04e725..8d964a1c044d 100644
--- a/metadata/md5-cache/sys-auth/polkit-0.113-r4
+++ b/metadata/md5-cache/sys-auth/polkit-0.113-r4
@@ -4,7 +4,7 @@ DESCRIPTION=Policy framework for controlling privileges for system-wide services
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/polkit
 IUSE=elogind examples gtk +introspection jit kde nls pam selinux systemd test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86
 LICENSE=LGPL-2
 PDEPEND=gtk? ( || ( >=gnome-extra/polkit-gnome-0.105 >=lxde-base/lxsession-0.5.2 ) ) kde? ( kde-plasma/polkit-kde-agent ) !systemd? ( !elogind? ( sys-auth/consolekit[policykit] ) )
 RDEPEND=dev-lang/spidermonkey:0/mozjs185[-debug] dev-libs/glib:2 dev-libs/expat elogind? ( sys-auth/elogind ) introspection? ( dev-libs/gobject-introspection ) pam? ( sys-auth/pambase virtual/pam ) systemd? ( sys-apps/systemd:0= ) selinux? ( sec-policy/selinux-policykit )
@@ -12,4 +12,4 @@ REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/polkit/releases/polkit-0.113.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	pax-utils	4f95120230a315c8caaabeb2307b7eee	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=007731da840529faf31583c4dcf18ab6
+_md5_=c2b372d85ee37f373a94237c581632ff
diff --git a/metadata/md5-cache/sys-block/gparted-0.29.0 b/metadata/md5-cache/sys-block/gparted-0.29.0
index 237a093b15e4..7b535d91b9b2 100644
--- a/metadata/md5-cache/sys-block/gparted-0.29.0
+++ b/metadata/md5-cache/sys-block/gparted-0.29.0
@@ -4,10 +4,10 @@ DESCRIPTION=Gnome Partition Editor
 EAPI=6
 HOMEPAGE=http://gparted.sourceforge.net/
 IUSE=btrfs cryptsetup dmraid f2fs fat hfs jfs kde mdadm ntfs policykit reiserfs reiser4 udf xfs
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~ppc x86
 LICENSE=GPL-2+ FDL-1.2+
 RDEPEND=>=dev-cpp/glibmm-2.14:2 >=dev-cpp/gtkmm-2.22:2.4 >=dev-libs/glib-2:2 >=sys-block/parted-3.2:= !policykit? ( kde? ( >=kde-plasma/kde-cli-tools-5.8.6-r1[kdesu] ) ) policykit? ( sys-auth/polkit ) >=sys-apps/util-linux-2.20 >=sys-fs/e2fsprogs-1.41 btrfs? ( sys-fs/btrfs-progs ) cryptsetup? ( sys-fs/cryptsetup ) dmraid? ( >=sys-fs/lvm2-2.02.45 sys-fs/dmraid sys-fs/multipath-tools ) f2fs? ( sys-fs/f2fs-tools ) fat? ( sys-fs/dosfstools sys-fs/mtools ) hfs? ( sys-fs/diskdev_cmds virtual/udev sys-fs/hfsutils ) jfs? ( sys-fs/jfsutils ) mdadm? ( sys-fs/mdadm ) ntfs? ( >=sys-fs/ntfs3g-2011.4.12[ntfsprogs] ) reiserfs? ( sys-fs/reiserfsprogs ) reiser4? ( sys-fs/reiser4progs ) udf? ( sys-fs/udftools ) xfs? ( sys-fs/xfsprogs sys-fs/xfsdump )
 SLOT=0
 SRC_URI=mirror://sourceforge/gparted/gparted-0.29.0.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b59bb662e29837f341f037c121532ce6
+_md5_=60361e3e673fdac3b64d1512f188e689
diff --git a/metadata/md5-cache/sys-block/kvpm-0.9.10 b/metadata/md5-cache/sys-block/kvpm-0.9.10
index 237791a99a3c..92ecef6d2100 100644
--- a/metadata/md5-cache/sys-block/kvpm-0.9.10
+++ b/metadata/md5-cache/sys-block/kvpm-0.9.10
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kdelibs4support-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-apps/util-linux >=sys-block/parted-2.3 >=sys-fs/lvm2-2.02.120 !sys-block/kvpm:4 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://sourceforge/kvpm/kvpm-0.9.10.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2f189daf0432c2a30c10016436607262
diff --git a/metadata/md5-cache/sys-block/partitionmanager-3.1.0 b/metadata/md5-cache/sys-block/partitionmanager-3.1.0
deleted file mode 100644
index 2184db09ef16..000000000000
--- a/metadata/md5-cache/sys-block/partitionmanager-3.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-apps/util-linux >=sys-libs/kpmcore-3.0.2:5= sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.37.0:5 handbook? ( >=kde-frameworks/kdoctools-5.37.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE utility for management of partitions and file systems
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/system/kdepartitionmanager
-IUSE=debug +handbook
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-3
-RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-apps/util-linux >=sys-libs/kpmcore-3.0.2:5= >=kde-plasma/kde-cli-tools-5.10.5:5[kdesu] >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/partitionmanager/3.1.0/src/partitionmanager-3.1.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=87f4859c45986314d9c7f806fadf29e7
diff --git a/metadata/md5-cache/sys-block/partitionmanager-3.1.2 b/metadata/md5-cache/sys-block/partitionmanager-3.1.2
index 0eec3b2e8522..ee326764c6b8 100644
--- a/metadata/md5-cache/sys-block/partitionmanager-3.1.2
+++ b/metadata/md5-cache/sys-block/partitionmanager-3.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=KDE utility for management of partitions and file systems
 EAPI=6
 HOMEPAGE=https://www.kde.org/applications/system/kdepartitionmanager
 IUSE=debug +handbook
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-apps/util-linux >=sys-libs/kpmcore-3.0.2:5= >=kde-plasma/kde-cli-tools-5.10.5:5[kdesu] >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/partitionmanager/3.1.2/src/partitionmanager-3.1.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ad2d58d64495fb9700abe1856f95245d
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=87f4859c45986314d9c7f806fadf29e7
diff --git a/metadata/md5-cache/sys-block/partitionmanager-3.2.1 b/metadata/md5-cache/sys-block/partitionmanager-3.2.1
index 0f3dd8396b14..5747395f9887 100644
--- a/metadata/md5-cache/sys-block/partitionmanager-3.2.1
+++ b/metadata/md5-cache/sys-block/partitionmanager-3.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kjobwidgets-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-apps/util-linux >=sys-libs/kpmcore-3.2.0:5= >=kde-plasma/kde-cli-tools-5.10.5:5[kdesu] >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/partitionmanager/3.2.1/src/partitionmanager-3.2.1.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=365d19547365f3414227fc555892fe7a
diff --git a/metadata/md5-cache/sys-boot/grub-0.97-r17 b/metadata/md5-cache/sys-boot/grub-0.97-r17
index f98b449cbfd3..a2ec4da2e7c6 100644
--- a/metadata/md5-cache/sys-boot/grub-0.97-r17
+++ b/metadata/md5-cache/sys-boot/grub-0.97-r17
@@ -10,4 +10,4 @@ RDEPEND=!static? ( ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] ) ) !s
 SLOT=0
 SRC_URI=mirror://gentoo/grub-0.97.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.97-patches-1.14.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=cc6b4edb5210b81b516547a6c7dff559
+_md5_=f1e77e18920e46dad07e59a75ac1f54a
diff --git a/metadata/md5-cache/sys-boot/plymouth-0.9.3-r1 b/metadata/md5-cache/sys-boot/plymouth-0.9.3-r1
index c5a59fa4edbb..b344e3440f4c 100644
--- a/metadata/md5-cache/sys-boot/plymouth-0.9.3-r1
+++ b/metadata/md5-cache/sys-boot/plymouth-0.9.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Graphical boot animation (splash) and logger
 EAPI=6
 HOMEPAGE=https://cgit.freedesktop.org/plymouth/
 IUSE=debug gdm +gtk +libkms +pango static-libs
-KEYWORDS=alpha ~amd64 ~arm ia64 ppc ppc64 ~sparc ~x86
+KEYWORDS=alpha ~amd64 ~arm ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.2.16:= gtk? ( dev-libs/glib:2 >=x11-libs/gtk+-3.14:3 x11-libs/cairo ) libkms? ( x11-libs/libdrm[libkms] ) pango? ( >=x11-libs/pango-1.21 ) virtual/udev !<sys-kernel/dracut-0.37-r3
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~aidecoe/distfiles/sys-boot/plymouth/gentoo-logo.png https://www.freedesktop.org/software/plymouth/releases/plymouth-0.9.3.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=246896ebe203d5895bf80aa814a92fd6
+_md5_=7f5462f78d77996cf7916cecef03d36c
diff --git a/metadata/md5-cache/sys-boot/syslinux-6.04_pre1 b/metadata/md5-cache/sys-boot/syslinux-6.04_pre1
index ff85d6827d9d..cb80dc9a647f 100644
--- a/metadata/md5-cache/sys-boot/syslinux-6.04_pre1
+++ b/metadata/md5-cache/sys-boot/syslinux-6.04_pre1
@@ -4,10 +4,10 @@ DESCRIPTION=SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders
 EAPI=5
 HOMEPAGE=http://www.syslinux.org/
 IUSE=custom-cflags
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=GPL-2
 RDEPEND=sys-fs/mtools dev-perl/Crypt-PasswdMD5 dev-perl/Digest-SHA1
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/boot/syslinux/Testing/6.04/syslinux-6.04-pre1.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=7bc1f49414b6b51b83e7d32b39f976bb
+_md5_=4e30db0f643eb78670c55ee2e0062185
diff --git a/metadata/md5-cache/sys-cluster/csync2-2.0 b/metadata/md5-cache/sys-cluster/csync2-2.0
index 4e806378aed3..5d74a17a0f9c 100644
--- a/metadata/md5-cache/sys-cluster/csync2-2.0
+++ b/metadata/md5-cache/sys-cluster/csync2-2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Cluster synchronization tool
 EAPI=5
 HOMEPAGE=http://oss.linbit.com/csync2/
 IUSE=mysql postgres sqlite ssl xinetd
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/librsync-0.9.5 mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) sqlite? ( >=dev-db/sqlite-3.0 ) ssl? ( >=net-libs/gnutls-2.7.3 ) xinetd? ( sys-apps/xinetd )
 REQUIRED_USE=|| ( mysql postgres sqlite )
 SLOT=0
 SRC_URI=http://oss.linbit.com/csync2/csync2-2.0.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a773f597bcd2c1a6a5d6753aa3dbc6dc
+_md5_=e4fb0397a054c4f9f1cb63f97608908e
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-3.12.2 b/metadata/md5-cache/sys-cluster/glusterfs-3.12.2
new file mode 100644
index 000000000000..ed6c48efb656
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/glusterfs-3.12.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=bd-xlator? ( sys-fs/lvm2 ) emacs? ( virtual/emacs ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) qemu-block? ( dev-libs/glib:2 ) systemtap? ( dev-util/systemtap ) tiering? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) sys-libs/readline:= dev-libs/libaio dev-libs/openssl:=[-bindist] dev-libs/userspace-rcu:= || ( sys-libs/glibc sys-libs/argp-standalone ) sys-apps/util-linux virtual/acl virtual/pkgconfig sys-devel/bison sys-devel/flex test? ( >=dev-util/cmocka-1.0.1 app-benchmarks/dbench dev-vcs/git net-fs/nfs-utils virtual/perl-Test-Harness dev-libs/yajl sys-fs/xfsprogs sys-apps/attr ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
+EAPI=6
+HOMEPAGE=https://www.gluster.org/
+IUSE=bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband qemu-block rsyslog static-libs +syslog systemtap test +tiering vim-syntax +xml python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 LGPL-3+ )
+RDEPEND=bd-xlator? ( sys-fs/lvm2 ) emacs? ( virtual/emacs ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) qemu-block? ( dev-libs/glib:2 ) systemtap? ( dev-util/systemtap ) tiering? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) sys-libs/readline:= dev-libs/libaio dev-libs/openssl:=[-bindist] dev-libs/userspace-rcu:= || ( sys-libs/glibc sys-libs/argp-standalone ) sys-apps/util-linux
+REQUIRED_USE=georeplication? ( python_targets_python2_7 ) glupy? ( python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/3.12/3.12.2/glusterfs-3.12.2.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=36ebc028360143222045877fc997121d
diff --git a/metadata/md5-cache/sys-cluster/heat-8.0.5 b/metadata/md5-cache/sys-cluster/heat-8.0.5
new file mode 100644
index 000000000000..2c4ddef26a4f
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/heat-8.0.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchistration engine.
+EAPI=6
+HOMEPAGE=https://launchpad.net/heat
+IUSE=+mysql +memcached postgres sqlite python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/croniter-0.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cryptography-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/cryptography-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-2.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystonemiddleware-4.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/lxml-3.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-3.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-db-4.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-messaging-5.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-policy-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-versionedobjects-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/aodhclient-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-barbicanclient-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-ceilometerclient-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-cinderclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-cinderclient-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-cinderclient-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-designateclient-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-glanceclient-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-heatclient-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-magnumclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-manilaclient-1.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-mistralclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-monascaclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-neutronclient-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-novaclient-6.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-novaclient-7.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-openstackclient-3.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-saharaclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-senlinclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-troveclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-zaqarclient-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/requests-2.12.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/tenacity-3.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) postgres? ( >=dev-python/psycopg-2.5.0 >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.17.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/yaql-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://tarballs.openstack.org/heat/heat-8.0.5.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.ocata -> heat.conf.sample-8.0.5
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7aa68dcf4165788b8e904737e5fdc47d
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.7.5 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.7.5
deleted file mode 100644
index 4a9baf760f9b..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.7.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
-DESCRIPTION=Kubernetes API server
-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.7.5.tar.gz -> kubernetes-1.7.5.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=6f6ffe2ecf7f14bec24b881347e4ecd3
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.7.6 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.7.6
deleted file mode 100644
index 3a7f606f02de..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.7.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
-DESCRIPTION=Kubernetes API server
-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.7.6.tar.gz -> kubernetes-1.7.6.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=6f6ffe2ecf7f14bec24b881347e4ecd3
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.8.0 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.8.0
deleted file mode 100644
index a96787443eb4..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.8.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
-DESCRIPTION=Kubernetes API server
-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.8.0.tar.gz -> kubernetes-1.8.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=6f6ffe2ecf7f14bec24b881347e4ecd3
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.8.2 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.8.2
new file mode 100644
index 000000000000..0e25fe72f38c
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.8.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DESCRIPTION=Kubernetes API server
+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.8.2.tar.gz -> kubernetes-1.8.2.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	e4b567c44272a719fabf53f0f885d3f7
+_md5_=6f6ffe2ecf7f14bec24b881347e4ecd3
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.7.5 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.7.5
deleted file mode 100644
index 6ea0ae144dfc..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.7.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
-DESCRIPTION=Kubernetes Controller Manager
-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.7.5.tar.gz -> kubernetes-1.7.5.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=affbb6928d8c31e861ba3b0d1c7d2a7e
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.7.6 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.7.6
deleted file mode 100644
index 5666b8836d47..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.7.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
-DESCRIPTION=Kubernetes Controller Manager
-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.7.6.tar.gz -> kubernetes-1.7.6.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=affbb6928d8c31e861ba3b0d1c7d2a7e
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.8.0 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.8.0
deleted file mode 100644
index 41066a919bd6..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.8.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
-DESCRIPTION=Kubernetes Controller Manager
-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.8.0.tar.gz -> kubernetes-1.8.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=affbb6928d8c31e861ba3b0d1c7d2a7e
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.8.2 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.8.2
new file mode 100644
index 000000000000..6dd0f70f2e42
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.8.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DESCRIPTION=Kubernetes Controller Manager
+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.8.2.tar.gz -> kubernetes-1.8.2.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	e4b567c44272a719fabf53f0f885d3f7
+_md5_=affbb6928d8c31e861ba3b0d1c7d2a7e
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.7.5 b/metadata/md5-cache/sys-cluster/kube-proxy-1.7.5
deleted file mode 100644
index 5bd1623da816..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.7.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
-DESCRIPTION=Kubernetes Proxy service
-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.7.5.tar.gz -> kubernetes-1.7.5.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=4f6447d7215d306c846b2b3f9e1bbe60
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.7.6 b/metadata/md5-cache/sys-cluster/kube-proxy-1.7.6
deleted file mode 100644
index c55410d15174..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.7.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
-DESCRIPTION=Kubernetes Proxy service
-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.7.6.tar.gz -> kubernetes-1.7.6.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=4f6447d7215d306c846b2b3f9e1bbe60
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.8.0 b/metadata/md5-cache/sys-cluster/kube-proxy-1.8.0
deleted file mode 100644
index c3a43110f6e2..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.8.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
-DESCRIPTION=Kubernetes Proxy service
-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.8.0.tar.gz -> kubernetes-1.8.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=4f6447d7215d306c846b2b3f9e1bbe60
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.8.2 b/metadata/md5-cache/sys-cluster/kube-proxy-1.8.2
new file mode 100644
index 000000000000..6ce44a6ed576
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.8.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DESCRIPTION=Kubernetes Proxy service
+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.8.2.tar.gz -> kubernetes-1.8.2.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=4f6447d7215d306c846b2b3f9e1bbe60
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.7.5 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.7.5
deleted file mode 100644
index c42094fd2e60..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.7.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
-DESCRIPTION=Kubernetes Controller Manager
-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.7.5.tar.gz -> kubernetes-1.7.5.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=e7854620f20b4c4c4dda5fdd08715a2f
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.7.6 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.7.6
deleted file mode 100644
index 5160c4583cfd..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.7.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
-DESCRIPTION=Kubernetes Controller Manager
-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.7.6.tar.gz -> kubernetes-1.7.6.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=e7854620f20b4c4c4dda5fdd08715a2f
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.8.0 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.8.0
deleted file mode 100644
index c908b885c2d5..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.8.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
-DESCRIPTION=Kubernetes Controller Manager
-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.8.0.tar.gz -> kubernetes-1.8.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=e7854620f20b4c4c4dda5fdd08715a2f
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.8.2 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.8.2
new file mode 100644
index 000000000000..60520c5d92ff
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.8.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DESCRIPTION=Kubernetes Controller Manager
+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.8.2.tar.gz -> kubernetes-1.8.2.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	e4b567c44272a719fabf53f0f885d3f7
+_md5_=e7854620f20b4c4c4dda5fdd08715a2f
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.7.6 b/metadata/md5-cache/sys-cluster/kubectl-1.7.6
deleted file mode 100644
index eeaf36fecb53..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.7.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-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.7.6.tar.gz -> kubernetes-1.7.6.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=2b096707fcb3aba1d03f419f23beb2e5
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.8.0 b/metadata/md5-cache/sys-cluster/kubectl-1.8.0
deleted file mode 100644
index 985e712cd4e2..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.8.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-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.8.0.tar.gz -> kubernetes-1.8.0.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=2b096707fcb3aba1d03f419f23beb2e5
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.8.2 b/metadata/md5-cache/sys-cluster/kubectl-1.8.2
new file mode 100644
index 000000000000..0076b0d7ccbd
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.8.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DESCRIPTION=CLI to run commands against Kubernetes clusters
+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.8.2.tar.gz -> kubernetes-1.8.2.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=6062fc61d5d4e42b14f091e08637c4cf
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.7.5 b/metadata/md5-cache/sys-cluster/kubelet-1.7.5
deleted file mode 100644
index 7ff0274edfa0..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.7.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
-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.7.5.tar.gz -> kubernetes-1.7.5.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=c512cda9ad01877130b6f72a8e35ccac
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.7.6 b/metadata/md5-cache/sys-cluster/kubelet-1.7.6
deleted file mode 100644
index 073a94954426..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.7.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
-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.7.6.tar.gz -> kubernetes-1.7.6.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=c512cda9ad01877130b6f72a8e35ccac
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.8.0 b/metadata/md5-cache/sys-cluster/kubelet-1.8.0
deleted file mode 100644
index 304341162aa6..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.8.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
-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.8.0.tar.gz -> kubernetes-1.8.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=c512cda9ad01877130b6f72a8e35ccac
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.8.2 b/metadata/md5-cache/sys-cluster/kubelet-1.8.2
new file mode 100644
index 000000000000..ea794d425a09
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.8.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+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.8.2.tar.gz -> kubernetes-1.8.2.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=c512cda9ad01877130b6f72a8e35ccac
diff --git a/metadata/md5-cache/sys-cluster/legion-17.10.0 b/metadata/md5-cache/sys-cluster/legion-17.10.0
new file mode 100644
index 000000000000..59603d733b4f
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/legion-17.10.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 ) hwloc? ( sys-apps/hwloc ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=A data-centric parallel programming system
+EAPI=6
+HOMEPAGE=http://legion.stanford.edu/
+IUSE=gasnet +hwloc test
+KEYWORDS=~amd64
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/StanfordLegion/legion/archive/legion-17.10.0.tar.gz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=88621e70b3d650da3a05a54d748f14b6
diff --git a/metadata/md5-cache/sys-cluster/minikube-0.23.0 b/metadata/md5-cache/sys-cluster/minikube-0.23.0
new file mode 100644
index 000000000000..21e422d16b21
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/minikube-0.23.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/go-1.8
+DESCRIPTION=Single Node Kubernetes Cluster
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/minikube https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=sys-cluster/kubectl-1.8.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/minikube/archive/v0.23.0.tar.gz -> minikube-0.23.0.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=06af3b9a3803467065ecafc33305c197
diff --git a/metadata/md5-cache/sys-cluster/neutron-10.0.3 b/metadata/md5-cache/sys-cluster/neutron-10.0.3
deleted file mode 100644
index 706ac76a539c..000000000000
--- a/metadata/md5-cache/sys-cluster/neutron-10.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare pretend setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-admin/sudo 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(-)]
-DESCRIPTION=A virtual network service for Openstack
-EAPI=6
-HOMEPAGE=https://launchpad.net/neutron
-IUSE=compute-only dhcp ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres python_targets_python2_7
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pecan-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pecan-1.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pecan-1.0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pecan-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pecan-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/requests-2.12.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/jinja-2.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/jinja-2.9.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/jinja-2.9.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/jinja-2.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/jinja-2.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keystonemiddleware-4.12.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/neutron-lib-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-neutronclient-5.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/tenacity-3.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ryu-4.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] compute-only? ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0 >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/webob-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keystoneauth-2.18.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/alembic-0.8.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.17.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-config-3.18.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-db-4.15.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-log-3.11.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-messaging-5.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-policy-1.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-privsep-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-rootwrap-5.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-3.18.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-versionedobjects-1.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ovs-2.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyroute2-0.4.12[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/weakrefmethod-1.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-novaclient-6.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/python-novaclient-7.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-designateclient-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-singledispatch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyudev[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/iproute2 net-misc/iputils[arping] net-misc/bridge-utils net-firewall/ipset net-firewall/iptables net-firewall/ebtables net-firewall/conntrack-tools openvswitch? ( <=net-misc/openvswitch-2.6.9999 ) ipv6? ( net-misc/radvd >=net-misc/dibbler-1.0.1 ) dhcp? ( net-dns/dnsmasq[dhcp-tools] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ocata/configs.tar.gz -> neutron-configs-10.0.3.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ocata/ml2_plugins.tar.gz -> neutron-ml2-plugins-10.0.3.tar.gz https://tarballs.openstack.org/neutron/neutron-10.0.3.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f64f66fb508666e9cbb2ffe293f48a23
diff --git a/metadata/md5-cache/sys-cluster/neutron-10.0.4 b/metadata/md5-cache/sys-cluster/neutron-10.0.4
index ce52f0e40240..13230537cf60 100644
--- a/metadata/md5-cache/sys-cluster/neutron-10.0.4
+++ b/metadata/md5-cache/sys-cluster/neutron-10.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=A virtual network service for Openstack
 EAPI=6
 HOMEPAGE=https://launchpad.net/neutron
 IUSE=compute-only dhcp ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres python_targets_python2_7
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pecan-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pecan-1.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pecan-1.0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pecan-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pecan-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/requests-2.12.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/jinja-2.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/jinja-2.9.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/jinja-2.9.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/jinja-2.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/jinja-2.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keystonemiddleware-4.12.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/neutron-lib-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-neutronclient-5.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/tenacity-3.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ryu-4.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] compute-only? ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0 >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/webob-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keystoneauth-2.18.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/alembic-0.8.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.17.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-config-3.18.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-db-4.15.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-log-3.11.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-messaging-5.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-policy-1.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-privsep-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-rootwrap-5.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-3.18.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-versionedobjects-1.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ovs-2.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyroute2-0.4.12[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/weakrefmethod-1.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-novaclient-6.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/python-novaclient-7.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-designateclient-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-singledispatch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyudev[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/iproute2 net-misc/iputils[arping] net-misc/bridge-utils net-firewall/ipset net-firewall/iptables net-firewall/ebtables net-firewall/conntrack-tools openvswitch? ( <=net-misc/openvswitch-2.6.9999 ) ipv6? ( net-misc/radvd >=net-misc/dibbler-1.0.1 ) dhcp? ( net-dns/dnsmasq[dhcp-tools] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ocata/configs.tar.gz -> neutron-configs-10.0.4.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ocata/ml2_plugins.tar.gz -> neutron-ml2-plugins-10.0.4.tar.gz https://tarballs.openstack.org/neutron/neutron-10.0.4.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ee08c57093d8a57552b61ca60e7ed721
+_md5_=f64f66fb508666e9cbb2ffe293f48a23
diff --git a/metadata/md5-cache/sys-cluster/nova-16.0.2 b/metadata/md5-cache/sys-cluster/nova-16.0.2
new file mode 100644
index 000000000000..a23cfae1c133
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/nova-16.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-python/setuptools-16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-24.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-36.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Cloud computing fabric controller (main part of an IaaS system) in Python
+EAPI=6
+HOMEPAGE=https://launchpad.net/nova
+IUSE=+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/setuptools-16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-24.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-36.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 compute-only? ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/eventlet-0.21.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystonemiddleware-4.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/lxml-3.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cryptography-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/cryptography-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/paramiko-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jsonschema-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-cinderclient-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-neutronclient-6.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-glanceclient-2.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/websockify-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-db-4.24.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-rootwrap-5.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-messaging-5.24.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-messaging-5.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-policy-1.23.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-privsep-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-privsep-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/rfc3986-0.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.27.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/psutil-3.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-versionedobjects-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-brick-1.15.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-traits-0.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-vif-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-win-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/castellan-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/microversion-parse-0.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-xenapi-0.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/tooz-1.47.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cursive-0.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pypowervm-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/libvirt-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-emulation/libvirt[iscsi?] novncproxy? ( www-apps/novnc ) sys-apps/iproute2 openvswitch? ( net-misc/openvswitch ) rabbitmq? ( net-misc/rabbitmq-server ) memcached? ( net-misc/memcached >=dev-python/python-memcached-1.58 ) sys-fs/sysfsutils sys-fs/multipath-tools net-misc/bridge-utils compute? ( app-cdr/cdrtools sys-fs/dosfstools app-emulation/qemu ) iscsi? ( sys-fs/lsscsi >=sys-block/open-iscsi-2.0.873-r1 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/pike/nova.conf.sample -> nova.conf.sample-16.0.2 https://tarballs.openstack.org/nova/nova-16.0.2.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=849a5614f912b05df55b978575f352e6
diff --git a/metadata/md5-cache/sys-cluster/singularity-2.2.1 b/metadata/md5-cache/sys-cluster/singularity-2.2.1
deleted file mode 100644
index 223f76195cc7..000000000000
--- a/metadata/md5-cache/sys-cluster/singularity-2.2.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Application containers for Linux
-EAPI=6
-HOMEPAGE=http://singularity.lbl.gov/
-IUSE=examples
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=cctbx-2.0
-SLOT=0
-SRC_URI=https://github.com/singularityware/singularity/releases/download/2.2.1/singularity-2.2.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=f1e3da6b783b90e450238aa1cdfd4958
diff --git a/metadata/md5-cache/sys-devel/autoconf-archive-2017.03.21 b/metadata/md5-cache/sys-devel/autoconf-archive-2017.03.21
index b9844e7208c9..ed213217b48a 100644
--- a/metadata/md5-cache/sys-devel/autoconf-archive-2017.03.21
+++ b/metadata/md5-cache/sys-devel/autoconf-archive-2017.03.21
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=GNU Autoconf Macro Archive
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/autoconf-archive/
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!=gnome-base/gnome-common-3.14.0 !>=gnome-base/gnome-common-3.14.0-r1[-autoconf-archive(+)]
 SLOT=0
 SRC_URI=mirror://gnu/autoconf-archive/autoconf-archive-2017.03.21.tar.xz
-_md5_=665bce0e3f842cc8eae790b3fd6abe5e
+_md5_=951d9ad3e70570b5d49531cf465b4004
diff --git a/metadata/md5-cache/sys-devel/autogen-5.18.4-r1 b/metadata/md5-cache/sys-devel/autogen-5.18.4-r1
index c71717045d6e..ddc3b14b4877 100644
--- a/metadata/md5-cache/sys-devel/autogen-5.18.4-r1
+++ b/metadata/md5-cache/sys-devel/autogen-5.18.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Program and text file generation
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/autogen/
 IUSE=libopts static-libs
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-scheme/guile-1.8:= dev-libs/libxml2
 SLOT=0
 SRC_URI=mirror://gnu/autogen/rel5.18.4/autogen-5.18.4.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=dc1707aa5dd0c4c4a6abe8d8a690e7e1
+_md5_=d99b0edb0f2749777e19c8be8b3000c7
diff --git a/metadata/md5-cache/sys-devel/automake-1.10.3-r2 b/metadata/md5-cache/sys-devel/automake-1.10.3-r2
index 734bba6c9c83..d472bee1804c 100644
--- a/metadata/md5-cache/sys-devel/automake-1.10.3-r2
+++ b/metadata/md5-cache/sys-devel/automake-1.10.3-r2
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 s
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/automake/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 sys-devel/gnuconfig
 SLOT=1.10
 SRC_URI=mirror://gnu/automake/automake-1.10.3.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=1af109592f57ce154e2fbd8f8aa7eb1c
+_md5_=566367b417ca7202def13dec9a30320c
diff --git a/metadata/md5-cache/sys-devel/automake-1.11.6-r2 b/metadata/md5-cache/sys-devel/automake-1.11.6-r2
index 78da83d0d4a8..1934130dd9c9 100644
--- a/metadata/md5-cache/sys-devel/automake-1.11.6-r2
+++ b/metadata/md5-cache/sys-devel/automake-1.11.6-r2
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 s
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/automake/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 sys-devel/gnuconfig
 SLOT=1.11
 SRC_URI=mirror://gnu/automake/automake-1.11.6.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=28c195d2ee7728c6e23dfd5f0bcaf25d
+_md5_=067e09432e995f6440cfe26a31ed2e57
diff --git a/metadata/md5-cache/sys-devel/automake-1.12.6-r1 b/metadata/md5-cache/sys-devel/automake-1.12.6-r1
index 07e5f8085378..0b75e0da86a3 100644
--- a/metadata/md5-cache/sys-devel/automake-1.12.6-r1
+++ b/metadata/md5-cache/sys-devel/automake-1.12.6-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 s
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/automake/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 sys-devel/gnuconfig
 SLOT=1.12
 SRC_URI=mirror://gnu/automake/automake-1.12.6.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=dde5f415ff2713d19278edb29878c8ba
+_md5_=b0197908931c0c9733e040657c6c8ef4
diff --git a/metadata/md5-cache/sys-devel/automake-1.13.4-r1 b/metadata/md5-cache/sys-devel/automake-1.13.4-r1
index 00c63d107640..2a1c0d1c8fd0 100644
--- a/metadata/md5-cache/sys-devel/automake-1.13.4-r1
+++ b/metadata/md5-cache/sys-devel/automake-1.13.4-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 s
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/automake/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 sys-devel/gnuconfig
 SLOT=1.13
 SRC_URI=mirror://gnu/automake/automake-1.13.4.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=4842ef93276f636587878c4a89ab6ed8
+_md5_=984ba9a4a754e088cc13b0c6a9e46d88
diff --git a/metadata/md5-cache/sys-devel/automake-1.14.1-r1 b/metadata/md5-cache/sys-devel/automake-1.14.1-r1
index b7077e09c6b4..f8dd82636cb4 100644
--- a/metadata/md5-cache/sys-devel/automake-1.14.1-r1
+++ b/metadata/md5-cache/sys-devel/automake-1.14.1-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 s
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/automake/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 sys-devel/gnuconfig
 SLOT=1.14
 SRC_URI=mirror://gnu/automake/automake-1.14.1.tar.xz ftp://alpha.gnu.org/pub/gnu/automake/automake-1.14.1.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c19d5a8c03f3d1ea6d2800ea4243627b
+_md5_=bcc81d394f23ea1183ab9b34469b9b0f
diff --git a/metadata/md5-cache/sys-devel/automake-1.15.1-r1 b/metadata/md5-cache/sys-devel/automake-1.15.1-r1
index d6a494eb0ddb..2c5ba19f4fd1 100644
--- a/metadata/md5-cache/sys-devel/automake-1.15.1-r1
+++ b/metadata/md5-cache/sys-devel/automake-1.15.1-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:*
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/automake/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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 ~sparc-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-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 SLOT=1.15
 SRC_URI=mirror://gnu/automake/automake-1.15.1.tar.xz ftp://alpha.gnu.org/pub/gnu/automake/automake-1.15.1.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=eb2dea6d5f23dcdcc7601ec62a203f45
+_md5_=80c480fb69f39af8987cbfe985504450
diff --git a/metadata/md5-cache/sys-devel/bc-1.07.1 b/metadata/md5-cache/sys-devel/bc-1.07.1
deleted file mode 100644
index 2b633bef4d25..000000000000
--- a/metadata/md5-cache/sys-devel/bc-1.07.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure
-DEPEND=!readline? ( libedit? ( dev-libs/libedit:= ) ) readline? ( >=sys-libs/readline-4.1:0= >=sys-libs/ncurses-5.2:= ) sys-apps/ed sys-devel/flex
-DESCRIPTION=Handy console-based calculator utility
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/bc/bc.html
-IUSE=libedit readline static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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-2 LGPL-2.1
-RDEPEND=!readline? ( libedit? ( dev-libs/libedit:= ) ) readline? ( >=sys-libs/readline-4.1:0= >=sys-libs/ncurses-5.2:= )
-SLOT=0
-SRC_URI=mirror://gnu-alpha/bc/bc-1.07.1.tar.gz mirror://gnu/bc/bc-1.07.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=cb6e47395778f7134d776fc7a067831f
diff --git a/metadata/md5-cache/sys-devel/bc-1.07.1-r1 b/metadata/md5-cache/sys-devel/bc-1.07.1-r1
new file mode 100644
index 000000000000..6cae901569f1
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/bc-1.07.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure
+DEPEND=!readline? ( libedit? ( dev-libs/libedit:= ) ) readline? ( >=sys-libs/readline-4.1:0= >=sys-libs/ncurses-5.2:= ) sys-apps/ed sys-devel/flex
+DESCRIPTION=Handy console-based calculator utility
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/bc/bc.html
+IUSE=libedit readline static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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-2 LGPL-2.1
+RDEPEND=!readline? ( libedit? ( dev-libs/libedit:= ) ) readline? ( >=sys-libs/readline-4.1:0= >=sys-libs/ncurses-5.2:= )
+SLOT=0
+SRC_URI=mirror://gnu/bc/bc-1.07.1.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=0e185f1a3ce65c59310b185f3244ff53
diff --git a/metadata/md5-cache/sys-devel/flex-2.6.4-r1 b/metadata/md5-cache/sys-devel/flex-2.6.4-r1
index 903f9342ad4f..e599e12e210f 100644
--- a/metadata/md5-cache/sys-devel/flex-2.6.4-r1
+++ b/metadata/md5-cache/sys-devel/flex-2.6.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=The Fast Lexical Analyzer
 EAPI=6
 HOMEPAGE=https://flex.sourceforge.net/ https://github.com/westes/flex
 IUSE=nls static 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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=FLEX
 RDEPEND=sys-devel/m4
 SLOT=0
 SRC_URI=https://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=feb8f85ac683a680e82c6c65516497c3
+_md5_=bb39929f3c9c01cfc117c17a0dfcd2a6
diff --git a/metadata/md5-cache/sys-devel/gcc-2.95.3-r10 b/metadata/md5-cache/sys-devel/gcc-2.95.3-r10
index 7de9e54642b6..4732da5f723a 100644
--- a/metadata/md5-cache/sys-devel/gcc-2.95.3-r10
+++ b/metadata/md5-cache/sys-devel/gcc-2.95.3-r10
@@ -10,6 +10,6 @@ PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl )
 RESTRICT=strip
 SLOT=2.95.3
-SRC_URI=mirror://gnu/gcc/gcc-2.95.3/gcc-2.95.3.tar.bz2 mirror://gentoo/gcc-2.95.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-2.95.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-2.95.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-2.95.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-2.95.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-2.95.3-patches-1.4.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-2.95.3/gcc-2.95.3.tar.bz2 mirror://gentoo/gcc-2.95.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-2.95.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-2.95.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-2.95.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-2.95.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-2.95.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-2.95.3-patches-1.4.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=812d2060d64ba720c343a27801254181
diff --git a/metadata/md5-cache/sys-devel/gcc-3.3.6-r1 b/metadata/md5-cache/sys-devel/gcc-3.3.6-r1
index dc6caa4aad9e..ed5d78565201 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.3.6-r1
+++ b/metadata/md5-cache/sys-devel/gcc-3.3.6-r1
@@ -10,6 +10,6 @@ PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=sys-devel/binutils-2.14.90.0.6-r1 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=strip
 SLOT=3.3.6
-SRC_URI=mirror://gnu/gcc/gcc-3.3.6/gcc-3.3.6.tar.bz2 mirror://gentoo/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-3.3.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.3.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.3.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.3.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.3.6-patches-1.9.tar.bz2 boundschecking? ( mirror://sourceforge/boundschecking/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 mirror://gentoo/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~vapier/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~rhill/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~blueness/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~tamiko/distfiles/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-3.3.6/gcc-3.3.6.tar.bz2 mirror://gentoo/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-3.3.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.3.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.3.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.3.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.3.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.3.6-patches-1.9.tar.bz2 boundschecking? ( mirror://sourceforge/boundschecking/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 mirror://gentoo/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~vapier/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~rhill/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~blueness/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~tamiko/distfiles/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~slyfox/distfiles/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=63f1d1e629319cdadc549e36aa390c53
diff --git a/metadata/md5-cache/sys-devel/gcc-3.4.6-r2 b/metadata/md5-cache/sys-devel/gcc-3.4.6-r2
index 52a8729e51d5..42e17e255a38 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.4.6-r2
+++ b/metadata/md5-cache/sys-devel/gcc-3.4.6-r2
@@ -10,6 +10,6 @@ PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=strip
 SLOT=3.4.6
-SRC_URI=mirror://gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2 mirror://gentoo/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 mirror://gentoo/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.4.6-patches-1.8.tar.bz2 boundschecking? ( mirror://sourceforge/boundschecking/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 mirror://gentoo/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~vapier/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~rhill/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~blueness/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~tamiko/distfiles/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 ) d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2 mirror://gentoo/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 mirror://gentoo/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.4.6-patches-1.8.tar.bz2 boundschecking? ( mirror://sourceforge/boundschecking/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 mirror://gentoo/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~vapier/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~rhill/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~blueness/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~tamiko/distfiles/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~slyfox/distfiles/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 ) d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d7dec1766720fc67e21b08bfe6022486
diff --git a/metadata/md5-cache/sys-devel/gcc-4.0.4 b/metadata/md5-cache/sys-devel/gcc-4.0.4
index ed538efcfe99..985bc4690b00 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.0.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.0.4
@@ -9,6 +9,6 @@ PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 )
 RESTRICT=strip
 SLOT=4.0.4
-SRC_URI=mirror://gnu/gcc/gcc-4.0.4/gcc-4.0.4.tar.bz2 mirror://gentoo/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.0.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.0.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.0.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.0.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.0.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.0.4-patches-1.3.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-4.0.4/gcc-4.0.4.tar.bz2 mirror://gentoo/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.0.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.0.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.0.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.0.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.0.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.0.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.0.4-patches-1.3.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=3dd4f8122c4cea5a0e80d9e034d8c6f3
diff --git a/metadata/md5-cache/sys-devel/gcc-4.1.2 b/metadata/md5-cache/sys-devel/gcc-4.1.2
index 3bbc88e030e5..9523b218c82b 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.1.2
+++ b/metadata/md5-cache/sys-devel/gcc-4.1.2
@@ -10,6 +10,6 @@ PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 )
 RESTRICT=strip
 SLOT=4.1.2
-SRC_URI=mirror://gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 mirror://gentoo/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.1.2-patches-1.6.tar.bz2 d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 mirror://gentoo/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.1.2-patches-1.6.tar.bz2 d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=d2b6a7ada9a05741d707db6fa3633dac
diff --git a/metadata/md5-cache/sys-devel/gcc-4.2.4-r1 b/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
index 0b357264d283..f35a4f1f4f29 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
@@ -10,6 +10,6 @@ PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 )
 RESTRICT=strip
 SLOT=4.2.4
-SRC_URI=mirror://gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2 mirror://gentoo/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.2.4-patches-1.4.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2 mirror://gentoo/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.2.4-patches-1.4.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=6feb8d4b6b63e3ef610aab5ec9f9ec34
diff --git a/metadata/md5-cache/sys-devel/gcc-4.3.6-r1 b/metadata/md5-cache/sys-devel/gcc-4.3.6-r1
index 8a3e5588ec69..1e5e391a6dfe 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.3.6-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.3.6-r1
@@ -10,6 +10,6 @@ PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0
 RESTRICT=strip
 SLOT=4.3.6
-SRC_URI=mirror://gnu/gcc/gcc-4.3.6/gcc-4.3.6.tar.bz2 mirror://gentoo/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.3.6-patches-1.2.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-4.3.6/gcc-4.3.6.tar.bz2 mirror://gentoo/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.3.6-patches-1.2.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=96b4ef1a01a77ed5ac862323a395109e
diff --git a/metadata/md5-cache/sys-devel/gcc-4.4.7 b/metadata/md5-cache/sys-devel/gcc-4.4.7
index 54a1a1833f09..391a9da0e352 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.4.7
+++ b/metadata/md5-cache/sys-devel/gcc-4.4.7
@@ -10,6 +10,6 @@ PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0
 RESTRICT=strip
 SLOT=4.4.7
-SRC_URI=mirror://gnu/gcc/gcc-4.4.7/gcc-4.4.7.tar.bz2 mirror://gentoo/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.7-patches-1.3.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-4.4.7/gcc-4.4.7.tar.bz2 mirror://gentoo/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.7-patches-1.3.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=dceb9c7c83221cc16d1e96976accad5e
diff --git a/metadata/md5-cache/sys-devel/gcc-4.5.4 b/metadata/md5-cache/sys-devel/gcc-4.5.4
index a0f1ad8aa507..8a4fd368c535 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.5.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.5.4
@@ -10,6 +10,6 @@ PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0
 RESTRICT=strip
 SLOT=4.5.4
-SRC_URI=mirror://gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2 mirror://gentoo/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.4-patches-1.3.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2 mirror://gentoo/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.4-patches-1.3.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=571cff20a06f6ff7c1aca3aaa417c068
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.4 b/metadata/md5-cache/sys-devel/gcc-4.6.4
index 41f449eaefdb..c82cd3ca44c7 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.6.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.4
@@ -10,6 +10,6 @@ PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0
 RESTRICT=strip
 SLOT=4.6.4
-SRC_URI=mirror://gnu/gcc/gcc-4.6.4/gcc-4.6.4.tar.bz2 mirror://gentoo/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.6.4-patches-1.3.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-4.6.4/gcc-4.6.4.tar.bz2 mirror://gentoo/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.6.4-patches-1.3.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0b8362c82ddcd2644cca03e1d286bbaa
diff --git a/metadata/md5-cache/sys-devel/gcc-4.7.4 b/metadata/md5-cache/sys-devel/gcc-4.7.4
index 72a547fb2fda..fc5e7b7163d1 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.7.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.7.4
@@ -10,6 +10,6 @@ PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0
 RESTRICT=strip
 SLOT=4.7.4
-SRC_URI=mirror://gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.bz2 mirror://gentoo/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-patches-1.4.tar.bz2 mirror://gentoo/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.bz2 mirror://gentoo/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-patches-1.4.tar.bz2 mirror://gentoo/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a71bba3a6bdba5f633dca867109b0c16
diff --git a/metadata/md5-cache/sys-devel/gcc-4.8.5 b/metadata/md5-cache/sys-devel/gcc-4.8.5
index d508c31dbccc..992dfeae813e 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.8.5
+++ b/metadata/md5-cache/sys-devel/gcc-4.8.5
@@ -10,6 +10,6 @@ PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 )
 RESTRICT=strip
 SLOT=4.8.5
-SRC_URI=mirror://gnu/gcc/gcc-4.8.5/gcc-4.8.5.tar.bz2 mirror://gentoo/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-patches-1.3.tar.bz2 mirror://gentoo/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-4.8.5/gcc-4.8.5.tar.bz2 mirror://gentoo/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-patches-1.3.tar.bz2 mirror://gentoo/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=af50cc77b195a79557166739169748f1
diff --git a/metadata/md5-cache/sys-devel/gcc-4.9.4 b/metadata/md5-cache/sys-devel/gcc-4.9.4
index 94747d7b104e..cd39634b8483 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.9.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.9.4
@@ -10,6 +10,6 @@ PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 )
 RESTRICT=strip
 SLOT=4.9.4
-SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d30d948db5047d95716fff11e806a034
+SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.2.tar.bz2 mirror://gentoo/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d0e62d09aba7d943cd248d522d4453c2
diff --git a/metadata/md5-cache/sys-devel/gcc-4.9.4-r1 b/metadata/md5-cache/sys-devel/gcc-4.9.4-r1
deleted file mode 100644
index 7400b8254f90..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-4.9.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170422 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( awt? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=5
-HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla altivec debug nopie nossp doc gcj awt hardened multilib objc pgo objc-gc libssp objc++ fixed-point go graphite cilk +vtv +nls +nptl +cxx +fortran +openmp +sanitize
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 )
-RESTRICT=strip
-SLOT=4.9.4
-SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.1.tar.bz2 mirror://gentoo/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=544d661cf6980ff80b64dc9a5a76cdbf
diff --git a/metadata/md5-cache/sys-devel/gcc-5.4.0 b/metadata/md5-cache/sys-devel/gcc-5.4.0
index 9e69f51e7011..8a4691cd069d 100644
--- a/metadata/md5-cache/sys-devel/gcc-5.4.0
+++ b/metadata/md5-cache/sys-devel/gcc-5.4.0
@@ -10,6 +10,6 @@ PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0 graphite? ( >=dev-libs/isl-0.14 )
 RESTRICT=strip
 SLOT=5.4.0
-SRC_URI=mirror://gnu/gcc/gcc-5.4.0/gcc-5.4.0.tar.bz2 mirror://gentoo/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-patches-1.0.tar.bz2 mirror://gentoo/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-5.4.0/gcc-5.4.0.tar.bz2 mirror://gentoo/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-patches-1.0.tar.bz2 mirror://gentoo/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=faaaec388f0c13cf550b82a069e36f69
diff --git a/metadata/md5-cache/sys-devel/gcc-5.4.0-r3 b/metadata/md5-cache/sys-devel/gcc-5.4.0-r3
index 19016d7c5f7a..3fd9099bca0b 100644
--- a/metadata/md5-cache/sys-devel/gcc-5.4.0-r3
+++ b/metadata/md5-cache/sys-devel/gcc-5.4.0-r3
@@ -10,6 +10,6 @@ PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0 graphite? ( >=dev-libs/isl-0.14 )
 RESTRICT=strip
 SLOT=5.4.0
-SRC_URI=mirror://gnu/gcc/gcc-5.4.0/gcc-5.4.0.tar.bz2 mirror://gentoo/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-5.4.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-patches-1.4.tar.bz2 mirror://gentoo/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=aaea0ad99ce15a90478402bef35a650e
+SRC_URI=mirror://gnu/gcc/gcc-5.4.0/gcc-5.4.0.tar.bz2 mirror://gentoo/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-5.4.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-patches-1.7.tar.bz2 mirror://gentoo/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=48cfe461fab9dc2c7dda3040cb2ba451
diff --git a/metadata/md5-cache/sys-devel/gcc-6.3.0 b/metadata/md5-cache/sys-devel/gcc-6.3.0
index 3bc2000177a6..8ecb667f6bdc 100644
--- a/metadata/md5-cache/sys-devel/gcc-6.3.0
+++ b/metadata/md5-cache/sys-devel/gcc-6.3.0
@@ -10,6 +10,6 @@ PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0 graphite? ( >=dev-libs/isl-0.14 )
 RESTRICT=strip
 SLOT=6.3.0
-SRC_URI=mirror://gnu/gcc/gcc-6.3.0/gcc-6.3.0.tar.bz2 mirror://gentoo/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-6.3.0/gcc-6.3.0.tar.bz2 mirror://gentoo/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1be0a5872ee64ee60a3986270cb6b2d6
diff --git a/metadata/md5-cache/sys-devel/gcc-6.4.0 b/metadata/md5-cache/sys-devel/gcc-6.4.0
index da81f5d9ff0d..493d14d7147c 100644
--- a/metadata/md5-cache/sys-devel/gcc-6.4.0
+++ b/metadata/md5-cache/sys-devel/gcc-6.4.0
@@ -10,6 +10,6 @@ PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0 graphite? ( >=dev-libs/isl-0.14 )
 RESTRICT=strip
 SLOT=6.4.0
-SRC_URI=mirror://gnu/gcc/gcc-6.4.0/gcc-6.4.0.tar.xz mirror://gentoo/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=e048947297ebceb5dce66cfe45e43171
+SRC_URI=mirror://gnu/gcc/gcc-6.4.0/gcc-6.4.0.tar.xz mirror://gentoo/gcc-6.4.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-patches-1.1.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=1fa20125057473f56dd7f66a07764fa6
diff --git a/metadata/md5-cache/sys-devel/gcc-7.1.0-r1 b/metadata/md5-cache/sys-devel/gcc-7.1.0-r1
index 098a7339a77e..1c4172702288 100644
--- a/metadata/md5-cache/sys-devel/gcc-7.1.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-7.1.0-r1
@@ -9,6 +9,6 @@ PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0 objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14 )
 RESTRICT=strip
 SLOT=7.1.0
-SRC_URI=mirror://gnu/gcc/gcc-7.1.0/gcc-7.1.0.tar.bz2 mirror://gentoo/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.1.0-patches-1.1.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-7.1.0/gcc-7.1.0.tar.bz2 mirror://gentoo/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.1.0-patches-1.1.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=ad092ecec8d8fc21f35f68df76da6aa1
diff --git a/metadata/md5-cache/sys-devel/gcc-7.2.0 b/metadata/md5-cache/sys-devel/gcc-7.2.0
index 28552ecd7249..e4da297d982c 100644
--- a/metadata/md5-cache/sys-devel/gcc-7.2.0
+++ b/metadata/md5-cache/sys-devel/gcc-7.2.0
@@ -9,6 +9,6 @@ PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0 objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14 )
 RESTRICT=strip
 SLOT=7.2.0
-SRC_URI=mirror://gnu/gcc/gcc-7.2.0/gcc-7.2.0.tar.xz mirror://gentoo/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.1.0-patches-1.1.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-7.2.0/gcc-7.2.0.tar.xz mirror://gentoo/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.1.0-patches-1.1.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=cdc342cec11a70d6d23b870af0cf7d37
diff --git a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2 b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
index 15d51f2b67fb..09b97a004b04 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
@@ -11,5 +11,5 @@ RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext
 RESTRICT=strip
 SLOT=42
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5666.3.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-16.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/gcc-apple-4.2.1_p5646-gfortran.patch )
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=22cb2739f33745ab8dd495b8879df938
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.1.2 b/metadata/md5-cache/sys-devel/kgcc64-4.1.2
index 1915cea3b9b6..1506b1b704b0 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.1.2
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.1.2
@@ -10,6 +10,6 @@ PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=strip
 SLOT=4.1.2
-SRC_URI=mirror://gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 mirror://gentoo/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.1.2-patches-1.0.1.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 mirror://gentoo/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.1.2-patches-1.0.1.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b3a73f8513af67c01e6b3415927604cc
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.2.4 b/metadata/md5-cache/sys-devel/kgcc64-4.2.4
index 9a1fde3d77e4..7d1e764fc972 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.2.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.2.4
@@ -10,6 +10,6 @@ PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=strip
 SLOT=4.2.4
-SRC_URI=mirror://gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2 mirror://gentoo/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.2.4-patches-1.0.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2 mirror://gentoo/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.2.4-patches-1.0.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=cbecd20792d178deb8a11c3ccf999f6c
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.3.5 b/metadata/md5-cache/sys-devel/kgcc64-4.3.5
index ab507f7c3bbf..7196af38f7f7 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.3.5
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.3.5
@@ -10,6 +10,6 @@ PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0
 RESTRICT=strip
 SLOT=4.3.5
-SRC_URI=mirror://gnu/gcc/gcc-4.3.5/gcc-4.3.5.tar.bz2 mirror://gentoo/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.3.5-patches-1.1.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-4.3.5/gcc-4.3.5.tar.bz2 mirror://gentoo/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.3.5-patches-1.1.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=2c088bca55b5f9b69d143908b0c76d8f
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.4.5 b/metadata/md5-cache/sys-devel/kgcc64-4.4.5
index 8db79146f709..3a19a358d822 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.4.5
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.4.5
@@ -10,6 +10,6 @@ PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-devel/gcc-config-1.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0
 RESTRICT=strip
 SLOT=4.4.5
-SRC_URI=mirror://gnu/gcc/gcc-4.4.5/gcc-4.4.5.tar.bz2 mirror://gentoo/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.5-patches-1.2.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-4.4.5/gcc-4.4.5.tar.bz2 mirror://gentoo/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.5-patches-1.2.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=51fee21d02f927573158908607c51293
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.4.6 b/metadata/md5-cache/sys-devel/kgcc64-4.4.6
index d8795abcd386..99eb70ffa166 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.4.6
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.4.6
@@ -10,6 +10,6 @@ PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-devel/gcc-config-1.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0
 RESTRICT=strip
 SLOT=4.4.6
-SRC_URI=mirror://gnu/gcc/gcc-4.4.6/gcc-4.4.6.tar.bz2 mirror://gentoo/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.6-patches-1.0.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-4.4.6/gcc-4.4.6.tar.bz2 mirror://gentoo/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.6-patches-1.0.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=05f6ddb47e2eb20387a63006627f6ed4
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.5.3 b/metadata/md5-cache/sys-devel/kgcc64-4.5.3
index eeff71c54d70..f0e698bfc94e 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.5.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.5.3
@@ -10,6 +10,6 @@ PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-devel/gcc-config-1.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0
 RESTRICT=strip
 SLOT=4.5.3
-SRC_URI=mirror://gnu/gcc/gcc-4.5.3/gcc-4.5.3.tar.bz2 mirror://gentoo/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.3-patches-1.4.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-4.5.3/gcc-4.5.3.tar.bz2 mirror://gentoo/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.3-patches-1.4.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a2ecb0058f3f23341c9a4b2544c46e7b
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.5.4 b/metadata/md5-cache/sys-devel/kgcc64-4.5.4
index bf385ae82d15..72a7493887b9 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.5.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.5.4
@@ -10,6 +10,6 @@ PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-devel/gcc-config-1.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0
 RESTRICT=strip
 SLOT=4.5.4
-SRC_URI=mirror://gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2 mirror://gentoo/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.4-patches-1.2.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2 mirror://gentoo/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.4-patches-1.2.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7cb6eca8d21add81c702831178ea5069
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.6.4 b/metadata/md5-cache/sys-devel/kgcc64-4.6.4
index 45791dcf816f..7a96ec595ea1 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.6.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.6.4
@@ -10,6 +10,6 @@ PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-devel/gcc-config-1.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0
 RESTRICT=strip
 SLOT=4.6.4
-SRC_URI=mirror://gnu/gcc/gcc-4.6.4/gcc-4.6.4.tar.bz2 mirror://gentoo/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.6.4-patches-1.0.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-4.6.4/gcc-4.6.4.tar.bz2 mirror://gentoo/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.6.4-patches-1.0.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=0b151dae104d953c297367cef455cacd
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.7.3 b/metadata/md5-cache/sys-devel/kgcc64-4.7.3
index 18e2cd7ee109..b275d78e6881 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.7.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.7.3
@@ -10,6 +10,6 @@ PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-devel/gcc-config-1.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0
 RESTRICT=strip
 SLOT=4.7.3
-SRC_URI=mirror://gnu/gcc/gcc-4.7.3/gcc-4.7.3.tar.bz2 mirror://gentoo/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-patches-1.3.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-4.7.3/gcc-4.7.3.tar.bz2 mirror://gentoo/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-patches-1.3.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1c809fb99ca2f62f150cbb3b143707b3
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.7.4 b/metadata/md5-cache/sys-devel/kgcc64-4.7.4
index 15b209a3765c..3e4e3e06edac 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.7.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.7.4
@@ -10,6 +10,6 @@ PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-devel/gcc-config-1.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0
 RESTRICT=strip
 SLOT=4.7.4
-SRC_URI=mirror://gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.bz2 mirror://gentoo/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-patches-1.0.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.bz2 mirror://gentoo/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-patches-1.0.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=f656912b30f81eabebf4466b261dc7a6
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.8.3 b/metadata/md5-cache/sys-devel/kgcc64-4.8.3
index 9924b6139f3b..1dd880d4c546 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.8.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.8.3
@@ -10,6 +10,6 @@ PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-devel/gcc-config-1.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0
 RESTRICT=strip
 SLOT=4.8.3
-SRC_URI=mirror://gnu/gcc/gcc-4.8.3/gcc-4.8.3.tar.bz2 mirror://gentoo/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.3-patches-1.1.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-4.8.3/gcc-4.8.3.tar.bz2 mirror://gentoo/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.3-patches-1.1.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=832461d75c5fab3b1de82c5fc7b55eb3
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.8.5 b/metadata/md5-cache/sys-devel/kgcc64-4.8.5
index ea940e4a839e..d9c3a92fa0fb 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.8.5
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.8.5
@@ -10,6 +10,6 @@ PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-devel/gcc-config-1.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0
 RESTRICT=strip
 SLOT=4.8.5
-SRC_URI=mirror://gnu/gcc/gcc-4.8.5/gcc-4.8.5.tar.bz2 mirror://gentoo/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-patches-1.3.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-4.8.5/gcc-4.8.5.tar.bz2 mirror://gentoo/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-patches-1.3.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=69bea1f40f496966906931823da83007
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.9.4 b/metadata/md5-cache/sys-devel/kgcc64-4.9.4
index 397b07ff0953..20a0315907ab 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.9.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.9.4
@@ -10,6 +10,6 @@ PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-devel/gcc-config-1.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0
 RESTRICT=strip
 SLOT=4.9.4
-SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.0.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.0.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b4f750b11206593179f98f7ab235e839
diff --git a/metadata/md5-cache/sys-devel/kgcc64-5.4.0 b/metadata/md5-cache/sys-devel/kgcc64-5.4.0
index 09a0eb5d7f6f..23fa75c00c8f 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-5.4.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-5.4.0
@@ -10,6 +10,6 @@ PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-devel/gcc-config-1.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0
 RESTRICT=strip
 SLOT=5.4.0
-SRC_URI=mirror://gnu/gcc/gcc-5.4.0/gcc-5.4.0.tar.bz2 mirror://gentoo/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-patches-1.0.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-5.4.0/gcc-5.4.0.tar.bz2 mirror://gentoo/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-patches-1.0.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b4f750b11206593179f98f7ab235e839
diff --git a/metadata/md5-cache/sys-devel/kgcc64-6.3.0 b/metadata/md5-cache/sys-devel/kgcc64-6.3.0
index c25242ba2676..3de1d22fd5d8 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-6.3.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-6.3.0
@@ -10,6 +10,6 @@ PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-devel/gcc-config-1.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0
 RESTRICT=strip
 SLOT=6.3.0
-SRC_URI=mirror://gnu/gcc/gcc-6.3.0/gcc-6.3.0.tar.bz2 mirror://gentoo/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.3.0-patches-1.0.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-6.3.0/gcc-6.3.0.tar.bz2 mirror://gentoo/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.3.0-patches-1.0.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=528009f64c56b405457e379d06af1a3f
diff --git a/metadata/md5-cache/sys-devel/kgcc64-6.4.0 b/metadata/md5-cache/sys-devel/kgcc64-6.4.0
index c890a0a82b7f..28277e2f4ed9 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-6.4.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-6.4.0
@@ -10,6 +10,6 @@ PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-devel/gcc-config-1.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0
 RESTRICT=strip
 SLOT=6.4.0
-SRC_URI=mirror://gnu/gcc/gcc-6.4.0/gcc-6.4.0.tar.xz mirror://gentoo/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-patches-1.0.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-6.4.0/gcc-6.4.0.tar.xz mirror://gentoo/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-patches-1.0.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=528009f64c56b405457e379d06af1a3f
diff --git a/metadata/md5-cache/sys-devel/kgcc64-7.2.0 b/metadata/md5-cache/sys-devel/kgcc64-7.2.0
index 2a464c2d58e4..85499832b514 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-7.2.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-7.2.0
@@ -9,6 +9,6 @@ PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-devel/gcc-config-1.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0
 RESTRICT=strip
 SLOT=7.2.0
-SRC_URI=mirror://gnu/gcc/gcc-7.2.0/gcc-7.2.0.tar.xz mirror://gentoo/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.1.0-patches-1.1.tar.bz2
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	a254a6de1ff0f916f976c96bd7f47bb8	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+SRC_URI=mirror://gnu/gcc/gcc-7.2.0/gcc-7.2.0.tar.xz mirror://gentoo/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.1.0-patches-1.1.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	23b6193e644e0ab5567f696dd80e6f1b	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=8ffa570c4adc043b28023ad7cce411d1
diff --git a/metadata/md5-cache/sys-firmware/firmware-imx-5.4 b/metadata/md5-cache/sys-firmware/firmware-imx-5.4
new file mode 100644
index 000000000000..b19520f85aa8
--- /dev/null
+++ b/metadata/md5-cache/sys-firmware/firmware-imx-5.4
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=NXP i.MX firmware
+EAPI=6
+HOMEPAGE=http://www.timesys.com/
+KEYWORDS=~arm
+LICENSE=LA_OPT_BASE_LICENSE
+SLOT=0
+SRC_URI=http://repository.timesys.com/buildsources/f/firmware-imx/firmware-imx-5.4/firmware-imx-5.4.bin
+_md5_=26616ded8cfda282eb1a3cb2b8065d76
diff --git a/metadata/md5-cache/sys-fs/bindfs-1.13.6 b/metadata/md5-cache/sys-fs/bindfs-1.13.6
deleted file mode 100644
index 438e41a837b0..000000000000
--- a/metadata/md5-cache/sys-fs/bindfs-1.13.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=>=sys-fs/fuse-2.9 virtual/pkgconfig
-DESCRIPTION=FUSE filesystem for bind mounting with altered permissions
-EAPI=6
-HOMEPAGE=http://bindfs.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-fs/fuse-2.9
-RESTRICT=test
-SLOT=0
-SRC_URI=http://bindfs.org/downloads/bindfs-1.13.6.tar.gz
-_md5_=b34d3659b75e886e1bf144afca993bf9
diff --git a/metadata/md5-cache/sys-fs/bindfs-1.13.7 b/metadata/md5-cache/sys-fs/bindfs-1.13.7
deleted file mode 100644
index a8a8b0887c47..000000000000
--- a/metadata/md5-cache/sys-fs/bindfs-1.13.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=>=sys-fs/fuse-2.9 virtual/pkgconfig
-DESCRIPTION=FUSE filesystem for bind mounting with altered permissions
-EAPI=6
-HOMEPAGE=http://bindfs.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-fs/fuse-2.9
-RESTRICT=test
-SLOT=0
-SRC_URI=http://bindfs.org/downloads/bindfs-1.13.7.tar.gz
-_md5_=b34d3659b75e886e1bf144afca993bf9
diff --git a/metadata/md5-cache/sys-fs/bindfs-1.13.8 b/metadata/md5-cache/sys-fs/bindfs-1.13.8
new file mode 100644
index 000000000000..d93ed8f13ec1
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/bindfs-1.13.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure
+DEPEND=>=sys-fs/fuse-2.9:0 virtual/pkgconfig
+DESCRIPTION=FUSE filesystem for bind mounting with altered permissions
+EAPI=6
+HOMEPAGE=http://bindfs.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-fs/fuse-2.9:0
+RESTRICT=test
+SLOT=0
+SRC_URI=http://bindfs.org/downloads/bindfs-1.13.8.tar.gz
+_md5_=80e512272acfadea97668d4c69ff2259
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-4.13.3 b/metadata/md5-cache/sys-fs/btrfs-progs-4.13.3
index 0acbea2a9782..1f612511b254 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-4.13.3
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-4.13.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( sys-fs/reiserfsprogs ) ) convert? ( sys-apps/acl ) >=app-text/asciidoc-8.6.0 app-text/docbook-xml-dtd:4.5 app-text/xmlto static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs:0[static-libs(+)] sys-libs/e2fsprogs-libs:0[static-libs(+)] reiserfs? ( sys-fs/reiserfsprogs[static-libs(+)] ) ) )
+DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) convert? ( sys-apps/acl ) >=app-text/asciidoc-8.6.0 app-text/docbook-xml-dtd:4.5 app-text/xmlto static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs:0[static-libs(+)] sys-libs/e2fsprogs-libs:0[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) )
 DESCRIPTION=Btrfs filesystem utilities
 EAPI=6
 HOMEPAGE=https://btrfs.wiki.kernel.org
 IUSE=+convert reiserfs static static-libs
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( sys-fs/reiserfsprogs ) )
+RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) )
 RESTRICT=test
 SLOT=0/0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v4.13.3.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=4b97a7e679a5438bb558490593c03434
+_md5_=706754434ae8cadc03a6b1c146dd7385
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-9999 b/metadata/md5-cache/sys-fs/btrfs-progs-9999
index 9a152035cacc..b57f35dd4b9e 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-9999
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( sys-fs/reiserfsprogs ) ) convert? ( sys-apps/acl ) >=app-text/asciidoc-8.6.0 app-text/docbook-xml-dtd:4.5 app-text/xmlto static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs:0[static-libs(+)] sys-libs/e2fsprogs-libs:0[static-libs(+)] reiserfs? ( sys-fs/reiserfsprogs[static-libs(+)] ) ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=dev-vcs/git-1.8.2.1
+DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) convert? ( sys-apps/acl ) >=app-text/asciidoc-8.6.0 app-text/docbook-xml-dtd:4.5 app-text/xmlto static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs:0[static-libs(+)] sys-libs/e2fsprogs-libs:0[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Btrfs filesystem utilities
 EAPI=6
 HOMEPAGE=https://btrfs.wiki.kernel.org
 IUSE=+convert reiserfs static static-libs
 LICENSE=GPL-2
-RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( sys-fs/reiserfsprogs ) )
+RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) )
 RESTRICT=test
 SLOT=0/0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	git-r3	52a888802d25387c2c74cb845d1219bc	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=e777f01b370ec52de8c5f286aa3b09ee
+_md5_=58273ea1f4f4b2169f2b16b8ffbd0403
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.43.6 b/metadata/md5-cache/sys-fs/e2fsprogs-1.43.6
index b8af4d470528..aad975139205 100644
--- a/metadata/md5-cache/sys-fs/e2fsprogs-1.43.6
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.43.6
@@ -4,10 +4,10 @@ DESCRIPTION=Standard EXT2/EXT3/EXT4 filesystem utilities
 EAPI=6
 HOMEPAGE=http://e2fsprogs.sourceforge.net/
 IUSE=fuse nls static-libs elibc_FreeBSD
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint
 LICENSE=GPL-2 BSD
 RDEPEND=~sys-libs/e2fsprogs-libs-1.43.6 >=sys-apps/util-linux-2.16 fuse? ( sys-fs/fuse ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.43.6.tar.gz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.43.6/e2fsprogs-1.43.6.tar.gz elibc_mintlib? ( mirror://gentoo/e2fsprogs-1.42.9-mint-r1.patch.xz )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=b7005ad61e4706facdb8163843f30069
+_md5_=8069caa2d65597912d9832a36fe7c987
diff --git a/metadata/md5-cache/sys-fs/fuse-3.1.0 b/metadata/md5-cache/sys-fs/fuse-3.1.0
index ae4750cf2880..b5fe24dc9d7b 100644
--- a/metadata/md5-cache/sys-fs/fuse-3.1.0
+++ b/metadata/md5-cache/sys-fs/fuse-3.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2.1
 RESTRICT=test
 SLOT=3
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.1.0/fuse-3.1.0.tar.gz
-_eclasses_=meson	958769e8b8b5a79afc3f22f3915cebbc	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
+_eclasses_=meson	38757afcd8d9f0d1d44ba4cefc33b99d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
 _md5_=5fdca9384feeb4ed7a39e020ea8b69b3
diff --git a/metadata/md5-cache/sys-fs/fuse-3.1.1 b/metadata/md5-cache/sys-fs/fuse-3.1.1
index c89c5fd0c130..3972c368ba6b 100644
--- a/metadata/md5-cache/sys-fs/fuse-3.1.1
+++ b/metadata/md5-cache/sys-fs/fuse-3.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2.1
 RESTRICT=test
 SLOT=3
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.1.1/fuse-3.1.1.tar.gz
-_eclasses_=meson	958769e8b8b5a79afc3f22f3915cebbc	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
+_eclasses_=meson	38757afcd8d9f0d1d44ba4cefc33b99d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
 _md5_=c7f8884827124cf9a8c9e4fee629c72f
diff --git a/metadata/md5-cache/sys-fs/rar2fs-1.26.0 b/metadata/md5-cache/sys-fs/rar2fs-1.26.0
new file mode 100644
index 000000000000..d1e12c0e2820
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/rar2fs-1.26.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=>=app-arch/unrar-5:= sys-fs/fuse:0
+DESCRIPTION=A FUSE based filesystem that can mount one or multiple RAR archive(s)
+EAPI=6
+HOMEPAGE=https://hasse69.github.io/rar2fs/ https://github.com/hasse69/rar2fs
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-arch/unrar-5:= sys-fs/fuse:0
+SLOT=0
+SRC_URI=https://github.com/hasse69/rar2fs/releases/download/v1.26.0/rar2fs-1.26.0.tar.gz
+_md5_=e27ecd8976d7e09e38e13045e8757185
diff --git a/metadata/md5-cache/sys-fs/udev-234-r1 b/metadata/md5-cache/sys-fs/udev-234-r1
index be32873fdff6..ae81363650b4 100644
--- a/metadata/md5-cache/sys-fs/udev-234-r1
+++ b/metadata/md5-cache/sys-fs/udev-234-r1
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.27.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v234.tar.gz -> systemd-234.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	958769e8b8b5a79afc3f22f3915cebbc	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	38757afcd8d9f0d1d44ba4cefc33b99d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=1059d407bf5a923e29edf94123fc9719
diff --git a/metadata/md5-cache/sys-fs/udev-235 b/metadata/md5-cache/sys-fs/udev-235
index f03f57599b37..6d16e91d7049 100644
--- a/metadata/md5-cache/sys-fs/udev-235
+++ b/metadata/md5-cache/sys-fs/udev-235
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v235.tar.gz -> systemd-235.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	958769e8b8b5a79afc3f22f3915cebbc	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	38757afcd8d9f0d1d44ba4cefc33b99d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9b02197b9ec6f1af42dc6c75fd94035e
diff --git a/metadata/md5-cache/sys-fs/udev-9999 b/metadata/md5-cache/sys-fs/udev-9999
index 382addb000a7..b8fcf62210a3 100644
--- a/metadata/md5-cache/sys-fs/udev-9999
+++ b/metadata/md5-cache/sys-fs/udev-9999
@@ -9,5 +9,5 @@ PDEPEND=>=sys-apps/hwids-20140304[udev] >=sys-fs/udev-init-scripts-26
 RDEPEND=>=sys-apps/util-linux-2.30[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/libcap[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(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	git-r3	52a888802d25387c2c74cb845d1219bc	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	958769e8b8b5a79afc3f22f3915cebbc	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	git-r3	52a888802d25387c2c74cb845d1219bc	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	38757afcd8d9f0d1d44ba4cefc33b99d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=9b02197b9ec6f1af42dc6c75fd94035e
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-9999 b/metadata/md5-cache/sys-fs/zfs-kmod-9999
index 3ab7791de449..8730a137da62 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-9999
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-9999
@@ -9,4 +9,4 @@ RDEPEND==sys-kernel/spl-9999* dev-lang/perl virtual/awk !sys-fs/zfs-fuse kernel_
 RESTRICT=debug? ( strip ) test
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	e77cdec133261f6bfa67560748277269	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=26a995f915f54cf63863cc0c5dff531e
+_md5_=0ee1d2f8fb6b2c7af20ee106afdbd684
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.13.10 b/metadata/md5-cache/sys-kernel/ck-sources-4.13.10
new file mode 100644
index 000000000000..51ba8836f0bb
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.13.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.13
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://users.tpg.com.au/ckolivas/kernel/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+IUSE=symlink build deblob
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.13.10
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.13-gnu/deblob-4.13 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.13-gnu/deblob-check -> deblob-check-4.13 ) mirror://gentoo/genpatches-4.13-12.base.tar.xz mirror://gentoo/genpatches-4.13-12.extras.tar.xz mirror://gentoo/genpatches-4.13-12.experimental.tar.xz http://ck.kolivas.org/patches/4.0/4.13/4.13-ck1/patch-4.13-ck1.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=af0265a8b541bf682fa09b670f45c2d4
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.13.9 b/metadata/md5-cache/sys-kernel/ck-sources-4.13.9
new file mode 100644
index 000000000000..365fa0dfe1bf
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.13.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.13
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://users.tpg.com.au/ckolivas/kernel/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+IUSE=symlink build deblob
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.13.9
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.13-gnu/deblob-4.13 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.13-gnu/deblob-check -> deblob-check-4.13 ) mirror://gentoo/genpatches-4.13-11.base.tar.xz mirror://gentoo/genpatches-4.13-11.extras.tar.xz mirror://gentoo/genpatches-4.13-11.experimental.tar.xz http://ck.kolivas.org/patches/4.0/4.13/4.13-ck1/patch-4.13-ck1.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7832778eeb6da5488419635dd7adbcd8
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.58 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.58
new file mode 100644
index 000000000000..802850678b8e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.58
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.9
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://users.tpg.com.au/ckolivas/kernel/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+IUSE=symlink build deblob
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.9.58
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-4.9 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-60.base.tar.xz mirror://gentoo/genpatches-4.9-60.extras.tar.xz mirror://gentoo/genpatches-4.9-60.experimental.tar.xz http://ck.kolivas.org/patches/4.0/4.9/4.9-ck1/patch-4.9-ck1.xz https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d69f797a894c83eeb09557202cafe4b3
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.59 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.59
new file mode 100644
index 000000000000..d425df72f0af
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.59
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.9
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://users.tpg.com.au/ckolivas/kernel/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+IUSE=symlink build deblob
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.9.59
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-4.9 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-61.base.tar.xz mirror://gentoo/genpatches-4.9-61.extras.tar.xz mirror://gentoo/genpatches-4.9-61.experimental.tar.xz http://ck.kolivas.org/patches/4.0/4.9/4.9-ck1/patch-4.9-ck1.xz https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=000e1281c5c7cb00f61b345a0ca91ac1
diff --git a/metadata/md5-cache/sys-kernel/dracut-045-r2 b/metadata/md5-cache/sys-kernel/dracut-045-r2
index d01a1530eba6..f68b9f3de151 100644
--- a/metadata/md5-cache/sys-kernel/dracut-045-r2
+++ b/metadata/md5-cache/sys-kernel/dracut-045-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Generic initramfs generation tool
 EAPI=6
 HOMEPAGE=https://dracut.wiki.kernel.org
 IUSE=debug selinux
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/udev virtual/pkgconfig >=sys-apps/kmod-15[tools] app-arch/cpio >=app-shells/bash-4.0:0 || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/systemd[sysv-utils] sys-apps/systemd-sysv-utils ) sys-apps/coreutils[xattr(-)] >=sys-apps/util-linux-2.21 debug? ( dev-util/strace ) selinux? ( sys-libs/libselinux sys-libs/libsepol sec-policy/selinux-dracut ) !net-analyzer/arping
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-045.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9e2c0efadb1ffb5df8a24e0faa7ae4e0
+_md5_=e42f3489de61048440a9021a377ed7de
diff --git a/metadata/md5-cache/sys-kernel/genkernel-3.5.2.2 b/metadata/md5-cache/sys-kernel/genkernel-3.5.2.2
new file mode 100644
index 000000000000..8be7ba78b189
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/genkernel-3.5.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare pretend unpack
+DEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux )
+DESCRIPTION=Gentoo automatic kernel building scripts
+EAPI=5
+HOMEPAGE=https://www.gentoo.org
+IUSE=cryptsetup ibm +firmware selinux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux ) cryptsetup? ( sys-fs/cryptsetup ) app-arch/cpio >=app-misc/pax-utils-1.2.2 sys-apps/util-linux[static-libs(+)] firmware? ( sys-kernel/linux-firmware ) !<sys-apps/openrc-0.9.9
+SLOT=0
+SRC_URI=mirror://gentoo/genkernel-3.5.2.2.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-1.0.0.rc16-3.tar.bz2 mirror://kernel/linux/utils/raid/mdadm/mdadm-4.0.tar.xz ftp://sourceware.org/pub/lvm2/LVM2.2.02.173.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.173.tgz https://busybox.net/downloads/busybox-1.27.2.tar.bz2 http://www.open-iscsi.org/bits/open-iscsi-2.0-872.tar.gz mirror://sourceforge/fuse/fuse-2.8.6.tar.gz http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-0.24.tar.bz2 mirror://gnupg/gnupg/gnupg-1.4.22.tar.bz2
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=04d80ada7f37efd1b181536041c9e148
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.13.10 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.13.10
new file mode 100644
index 000000000000..a2943ac109e6
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.13.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.13 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.13.10
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz mirror://gentoo/genpatches-4.13-12.base.tar.xz mirror://gentoo/genpatches-4.13-12.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.13-12.experimental.tar.xz )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d73a0dbaec0583d46d63ba1f764f07ef
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.13.9 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.13.9
new file mode 100644
index 000000000000..459dd5e468bb
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.13.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.13 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.13.9
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz mirror://gentoo/genpatches-4.13-11.base.tar.xz mirror://gentoo/genpatches-4.13-11.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.13-11.experimental.tar.xz )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d7492c52f21f9aa799d09c9c8c8e6c7c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.94 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.94
new file mode 100644
index 000000000000..98713735d55b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.94
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.4.94
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-98.base.tar.xz mirror://gentoo/genpatches-4.4-98.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-98.experimental.tar.xz )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d9b66973ebaab1cebbd71e71ede0e58f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.95 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.95
new file mode 100644
index 000000000000..f7796b1b10a8
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.95
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.4.95
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-99.base.tar.xz mirror://gentoo/genpatches-4.4-99.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-99.experimental.tar.xz )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d7c4a341ccec593580218d22b3b4647c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.58 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.58
new file mode 100644
index 000000000000..79b1d479dda3
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.58
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.9.58
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-60.base.tar.xz mirror://gentoo/genpatches-4.9-60.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-60.experimental.tar.xz )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7aa722df527f24791a88587ef2a25cb2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.59 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.59
new file mode 100644
index 000000000000..c5e65ff625be
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.59
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.9.59
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-61.base.tar.xz mirror://gentoo/genpatches-4.9-61.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-61.experimental.tar.xz )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c98928a40f7c18ccfc20166d9a70aebf
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.14_rc6 b/metadata/md5-cache/sys-kernel/git-sources-4.14_rc6
new file mode 100644
index 000000000000..e93170e46fce
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-4.14_rc6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-devel/patch-2.7.5 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=5
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.14_rc6
+SRC_URI=https://git.kernel.org/torvalds/p/v4.14-rc6/v4.13 -> patch-4.14-rc6.patch mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8406adf09cb48d9eec2277c1c9f9c041
diff --git a/metadata/md5-cache/sys-kernel/kpatch-9999 b/metadata/md5-cache/sys-kernel/kpatch-9999
new file mode 100644
index 000000000000..2b681c0bbb69
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/kpatch-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare pretend setup unpack
+DEPEND=app-crypt/pesign dev-libs/openssl:0= sys-libs/zlib sys-apps/pciutils test? ( dev-util/shellcheck ) dev-libs/elfutils sys-devel/bison kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Dynamic kernel patching for Linux
+EAPI=6
+HOMEPAGE=https://github.com/dynup/kpatch
+IUSE=examples +modules test kernel_linux
+LICENSE=GPL-2+
+RDEPEND=app-crypt/pesign dev-libs/openssl:0= sys-libs/zlib sys-apps/pciutils kernel_linux? ( virtual/modutils )
+SLOT=0
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	e77cdec133261f6bfa67560748277269	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=6d9d2aa13b9d8501ef2cf8d4eb221e3c
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20160331 b/metadata/md5-cache/sys-kernel/linux-firmware-20160331
deleted file mode 100644
index 6d82b96bff2c..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20160331
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst preinst prepare unpack
-DESCRIPTION=Linux firmware files
-EAPI=5
-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+ freedist
-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 )
-SLOT=0
-SRC_URI=mirror://gentoo/linux-firmware-20160331.tar.xz
-_eclasses_=portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e
-_md5_=3f2bca2081ec23b8c7df6d048e875473
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20170113 b/metadata/md5-cache/sys-kernel/linux-firmware-20170113
deleted file mode 100644
index 98ba84617c7b..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20170113
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst preinst prepare unpack
-DESCRIPTION=Linux firmware files
-EAPI=5
-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+ freedist
-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 )
-SLOT=0
-SRC_URI=mirror://gentoo/linux-firmware-20170113.tar.xz
-_eclasses_=portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e
-_md5_=797a8a1ba1e65bd75685759b65dac4a7
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20170519 b/metadata/md5-cache/sys-kernel/linux-firmware-20170519
deleted file mode 100644
index f86c852964ba..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20170519
+++ /dev/null
@@ -1,12 +0,0 @@
-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+ freedist
-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 )
-SLOT=0
-SRC_URI=https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-df40d15d6ad617e72ce7ea00b91d9117d92dcccc.tar.gz -> linux-firmware-20170519.tar.gz
-_eclasses_=portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e
-_md5_=6743becb13ef019a2f2eb8929aa54c00
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-3.18.59_p65 b/metadata/md5-cache/sys-kernel/rt-sources-3.18.59_p65
deleted file mode 100644
index 9b519368bb51..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-3.18.59_p65
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 3.18 kernel sources with the CONFIG_PREEMPT_RT patch
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://www.kernel.org/pub/linux/kernel/projects/rt/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=symlink build deblob
-KEYWORDS=~amd64
-LICENSE=GPL-2 !deblob? ( freedist )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.18.59_p65
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.18.59.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-3.18 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-check -> deblob-check-3.18 ) mirror://kernel/linux/kernel/projects/rt/3.18/patch-3.18.59-rt65.patch.xz mirror://kernel/linux/kernel/projects/rt/3.18/older/patch-3.18.59-rt65.patch.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1cc47731c209f7c2ef71623ffbc33dbf
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.1.42_p49 b/metadata/md5-cache/sys-kernel/rt-sources-4.1.42_p49
deleted file mode 100644
index 1884b027d87f..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.1.42_p49
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 4.1 kernel sources with the CONFIG_PREEMPT_RT patch
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://www.kernel.org/pub/linux/kernel/projects/rt/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=symlink build deblob
-KEYWORDS=~amd64
-LICENSE=GPL-2 !deblob? ( freedist )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.1.42_p49
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.1.42.xz mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-4.1 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-check -> deblob-check-4.1 ) mirror://kernel/linux/kernel/projects/rt/4.1/patch-4.1.42-rt49.patch.xz mirror://kernel/linux/kernel/projects/rt/4.1/older/patch-4.1.42-rt49.patch.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1cc47731c209f7c2ef71623ffbc33dbf
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.11.12_p16 b/metadata/md5-cache/sys-kernel/rt-sources-4.11.12_p16
new file mode 100644
index 000000000000..ae29a7c0339e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.11.12_p16
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full Linux 4.11 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://www.kernel.org/pub/linux/kernel/projects/rt/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+IUSE=symlink build deblob
+KEYWORDS=~amd64
+LICENSE=GPL-2 !deblob? ( freedist )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.11.12_p16
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.11.12.xz mirror://kernel/linux/kernel/v4.x/linux-4.11.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.11-gnu/deblob-4.11 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.11-gnu/deblob-check -> deblob-check-4.11 ) mirror://kernel/linux/kernel/projects/rt/4.11/patch-4.11.12-rt16.patch.xz mirror://kernel/linux/kernel/projects/rt/4.11/older/patch-4.11.12-rt16.patch.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4cbe80675612d523b955d0c55fdc34f6
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.11.12_p9 b/metadata/md5-cache/sys-kernel/rt-sources-4.11.12_p9
deleted file mode 100644
index 2d314b61bc77..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.11.12_p9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 4.11 kernel sources with the CONFIG_PREEMPT_RT patch
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://www.kernel.org/pub/linux/kernel/projects/rt/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=symlink build deblob
-KEYWORDS=~amd64
-LICENSE=GPL-2 !deblob? ( freedist )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.11.12_p9
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.11.12.xz mirror://kernel/linux/kernel/v4.x/linux-4.11.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.11-gnu/deblob-4.11 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.11-gnu/deblob-check -> deblob-check-4.11 ) mirror://kernel/linux/kernel/projects/rt/4.11/patch-4.11.12-rt9.patch.xz mirror://kernel/linux/kernel/projects/rt/4.11/older/patch-4.11.12-rt9.patch.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1cc47731c209f7c2ef71623ffbc33dbf
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.13.7_p1 b/metadata/md5-cache/sys-kernel/rt-sources-4.13.7_p1
new file mode 100644
index 000000000000..94a1fe4cfb31
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.13.7_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full Linux 4.13 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://www.kernel.org/pub/linux/kernel/projects/rt/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+IUSE=symlink build deblob
+KEYWORDS=~amd64
+LICENSE=GPL-2 !deblob? ( freedist )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.13.7_p1
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.13.7.xz mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.13-gnu/deblob-4.13 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.13-gnu/deblob-check -> deblob-check-4.13 ) mirror://kernel/linux/kernel/projects/rt/4.13/patch-4.13.7-rt1.patch.xz mirror://kernel/linux/kernel/projects/rt/4.13/older/patch-4.13.7-rt1.patch.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=003f54fe0756b0ba387ee77c54b5ea27
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.4.79_p92 b/metadata/md5-cache/sys-kernel/rt-sources-4.4.79_p92
deleted file mode 100644
index 2ad41985cbeb..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.4.79_p92
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 4.4 kernel sources with the CONFIG_PREEMPT_RT patch
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://www.kernel.org/pub/linux/kernel/projects/rt/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=symlink build deblob
-KEYWORDS=~amd64
-LICENSE=GPL-2 !deblob? ( freedist )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.4.79_p92
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.79.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.4-gnu/deblob-4.4 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.4-gnu/deblob-check -> deblob-check-4.4 ) mirror://kernel/linux/kernel/projects/rt/4.4/patch-4.4.79-rt92.patch.xz mirror://kernel/linux/kernel/projects/rt/4.4/older/patch-4.4.79-rt92.patch.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1cc47731c209f7c2ef71623ffbc33dbf
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.9.40_p30 b/metadata/md5-cache/sys-kernel/rt-sources-4.9.40_p30
deleted file mode 100644
index a7495385b773..000000000000
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.9.40_p30
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 4.9 kernel sources with the CONFIG_PREEMPT_RT patch
-EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://www.kernel.org/pub/linux/kernel/projects/rt/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=symlink build deblob
-KEYWORDS=~amd64
-LICENSE=GPL-2 !deblob? ( freedist )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.9.40_p30
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.40.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-4.9 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://kernel/linux/kernel/projects/rt/4.9/patch-4.9.40-rt30.patch.xz mirror://kernel/linux/kernel/projects/rt/4.9/older/patch-4.9.40-rt30.patch.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1cc47731c209f7c2ef71623ffbc33dbf
diff --git a/metadata/md5-cache/sys-kernel/spl-9999 b/metadata/md5-cache/sys-kernel/spl-9999
index 586f7134aad8..b543f2136bba 100644
--- a/metadata/md5-cache/sys-kernel/spl-9999
+++ b/metadata/md5-cache/sys-kernel/spl-9999
@@ -9,4 +9,4 @@ RDEPEND=dev-lang/perl virtual/awk !sys-devel/spl kernel_linux? ( virtual/modutil
 RESTRICT=debug? ( strip ) test
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	e77cdec133261f6bfa67560748277269	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=202b650f480a74292e9400c6e82d29b8
+_md5_=9a8a088148da85f25ea824a00080bd58
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.13.10 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.13.10
new file mode 100644
index 000000000000..396b4162e361
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.13.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=5
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.13.10
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.13.10.xz mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7df30779922bb2272dc09a0172b257c0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.13.8 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.13.8
deleted file mode 100644
index 72e30d6619a8..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.13.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=5
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.13.8
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.13.8.xz mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=7df30779922bb2272dc09a0172b257c0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.93 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.93
deleted file mode 100644
index dd2609b01e33..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.93
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=5
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.4.93
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.93.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=7df30779922bb2272dc09a0172b257c0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.95 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.95
new file mode 100644
index 000000000000..35c21d020a9d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.95
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=5
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.4.95
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.95.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7df30779922bb2272dc09a0172b257c0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.57 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.57
deleted file mode 100644
index 2c24cb50f6c0..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.57
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=5
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.9.57
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.57.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=7df30779922bb2272dc09a0172b257c0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.59 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.59
new file mode 100644
index 000000000000..a0dc9f25fbf0
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.59
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=5
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.9.59
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.59.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7df30779922bb2272dc09a0172b257c0
diff --git a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.6 b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.6
index cba34361ad44..dca41945cfed 100644
--- a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.6
+++ b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.6
@@ -4,10 +4,10 @@ DESCRIPTION=e2fsprogs libraries (common error and subsystem)
 EAPI=6
 HOMEPAGE=http://e2fsprogs.sourceforge.net/
 IUSE=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 ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8
 SLOT=0
 SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-libs-1.43.6.tar.gz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.43.6/e2fsprogs-libs-1.43.6.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a0181571ca8589ef7abc94dbd4dd2951
+_md5_=ddd4ee5f00921e65d698026bd8b3828c
diff --git a/metadata/md5-cache/sys-libs/glibc-2.25-r4 b/metadata/md5-cache/sys-libs/glibc-2.25-r4
deleted file mode 100644
index 25c4f225d677..000000000000
--- a/metadata/md5-cache/sys-libs/glibc-2.25-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
-DEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) >=app-misc/pax-utils-0.1.10 !<sys-apps/sandbox-1.6 !<sys-apps/portage-2.1.2 >=sys-devel/binutils-2.24 >=sys-devel/gcc-4.7 virtual/os-headers sys-devel/gnuconfig virtual/pkgconfig
-DESCRIPTION=GNU libc6 (also called glibc2) C library
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/libc/libc.html
-IUSE=audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_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=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) !sys-kernel/ps3-sources sys-apps/gentoo-functions !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data )
-RESTRICT=strip
-SLOT=2.2
-SRC_URI=mirror://gnu/glibc/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25-patches-8.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.25-patches-8.tar.bz2 https://dev.gentoo.org/~azarah/glibc/glibc-2.25-patches-8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/glibc-2.25-patches-8.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/glibc-2.25-patches-8.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 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	toolchain-glibc	f5c5d253dc6b28e3711b690fb3486f57	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f25f244c2a74135de6476076d4aea3da
diff --git a/metadata/md5-cache/sys-libs/glibc-2.25-r5 b/metadata/md5-cache/sys-libs/glibc-2.25-r5
deleted file mode 100644
index 41b0cf3a481f..000000000000
--- a/metadata/md5-cache/sys-libs/glibc-2.25-r5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
-DEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) >=app-misc/pax-utils-0.1.10 !<sys-apps/sandbox-1.6 !<sys-apps/portage-2.1.2 >=sys-devel/binutils-2.24 >=sys-devel/gcc-4.7 virtual/os-headers sys-devel/gnuconfig virtual/pkgconfig
-DESCRIPTION=GNU libc6 (also called glibc2) C library
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/libc/libc.html
-IUSE=audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_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=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !sys-kernel/ps3-sources sys-apps/gentoo-functions !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data )
-RESTRICT=strip
-SLOT=2.2
-SRC_URI=mirror://gnu/glibc/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25-patches-9.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.25-patches-9.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.25-patches-9.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/glibc-2.25-patches-9.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/glibc-2.25-patches-9.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	toolchain-glibc	f5c5d253dc6b28e3711b690fb3486f57	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=315e090531e64dc37c04e0a823494274
diff --git a/metadata/md5-cache/sys-libs/glibc-2.25-r7 b/metadata/md5-cache/sys-libs/glibc-2.25-r7
deleted file mode 100644
index 85c6311e066f..000000000000
--- a/metadata/md5-cache/sys-libs/glibc-2.25-r7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
-DEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) >=app-misc/pax-utils-0.1.10 !<sys-apps/sandbox-1.6 !<sys-apps/portage-2.1.2 >=sys-devel/binutils-2.24 >=sys-devel/gcc-4.7 virtual/os-headers sys-devel/gnuconfig virtual/pkgconfig
-DESCRIPTION=GNU libc6 (also called glibc2) C library
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/libc/libc.html
-IUSE=audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_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=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !sys-kernel/ps3-sources sys-apps/gentoo-functions !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data )
-RESTRICT=strip
-SLOT=2.2
-SRC_URI=mirror://gnu/glibc/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25-patches-11.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.25-patches-11.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.25-patches-11.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/glibc-2.25-patches-11.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/glibc-2.25-patches-11.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	toolchain-glibc	f5c5d253dc6b28e3711b690fb3486f57	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=5e76d171c3a7df3cd19339e7bd543aef
diff --git a/metadata/md5-cache/sys-libs/glibc-2.25-r8 b/metadata/md5-cache/sys-libs/glibc-2.25-r8
index b8c9eec359c6..eadae71d19b9 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.25-r8
+++ b/metadata/md5-cache/sys-libs/glibc-2.25-r8
@@ -4,6 +4,7 @@ DESCRIPTION=GNU libc6 (also called glibc2) C library
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/libc/libc.html
 IUSE=audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_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=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !sys-kernel/ps3-sources sys-apps/gentoo-functions !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data )
@@ -11,4 +12,4 @@ RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25-patches-11.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.25-patches-11.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.25-patches-11.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/glibc-2.25-patches-11.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/glibc-2.25-patches-11.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	toolchain-glibc	f5c5d253dc6b28e3711b690fb3486f57	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=41ca664ce6e52283c0d884de64d8815e
+_md5_=ae25f085756dd9172edb97b0c83d2a0e
diff --git a/metadata/md5-cache/sys-libs/glibc-2.25-r9 b/metadata/md5-cache/sys-libs/glibc-2.25-r9
new file mode 100644
index 000000000000..2962c832ec7d
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/glibc-2.25-r9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
+DEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) >=app-misc/pax-utils-0.1.10 !<sys-apps/sandbox-1.6 !<sys-apps/portage-2.1.2 >=sys-devel/binutils-2.24 >=sys-devel/gcc-4.7 virtual/os-headers sys-devel/gnuconfig virtual/pkgconfig
+DESCRIPTION=GNU libc6 (also called glibc2) C library
+EAPI=5
+HOMEPAGE=https://www.gnu.org/software/libc/libc.html
+IUSE=audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_headers-only
+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-kernel/ps3-sources sys-apps/gentoo-functions !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data )
+RESTRICT=strip
+SLOT=2.2
+SRC_URI=mirror://gnu/glibc/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25-patches-12.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.25-patches-12.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.25-patches-12.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/glibc-2.25-patches-12.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/glibc-2.25-patches-12.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	toolchain-glibc	f5c5d253dc6b28e3711b690fb3486f57	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9dce7ec6425265c7c22f76d6f527fa7f
diff --git a/metadata/md5-cache/sys-libs/glibc-2.26-r1 b/metadata/md5-cache/sys-libs/glibc-2.26-r1
deleted file mode 100644
index 609a66ec938f..000000000000
--- a/metadata/md5-cache/sys-libs/glibc-2.26-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend test unpack
-DEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) >=app-misc/pax-utils-0.1.10 !<sys-apps/sandbox-1.6 !<sys-apps/portage-2.1.2 >=sys-devel/binutils-2.24 >=sys-devel/gcc-4.9 virtual/os-headers sys-devel/gnuconfig virtual/pkgconfig
-DESCRIPTION=GNU libc C library
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/libc/
-IUSE=audit caps debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only
-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-kernel/ps3-sources sys-apps/gentoo-functions !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data )
-RESTRICT=strip
-SLOT=2.2
-SRC_URI=mirror://gnu/glibc/glibc-2.26.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.26-patches-1.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	toolchain-glibc	f5c5d253dc6b28e3711b690fb3486f57	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=37f2dda6b8a74d334ae799bba918d1c9
diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999
index 949388e90310..35123041fc43 100644
--- a/metadata/md5-cache/sys-libs/glibc-9999
+++ b/metadata/md5-cache/sys-libs/glibc-9999
@@ -3,7 +3,7 @@ DEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap )
 DESCRIPTION=GNU libc C library
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libc/
-IUSE=audit caps debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only
+IUSE=audit caps compile-locales debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only
 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-kernel/ps3-sources sys-apps/gentoo-functions !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data )
@@ -11,4 +11,4 @@ RESTRICT=strip
 SLOT=2.2
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/glibc-9999-patches-3.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	toolchain-glibc	f5c5d253dc6b28e3711b690fb3486f57	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=6ab1fadc7877f180887517559227d5dc
+_md5_=821b6f4b3906846674881cf286e70117
diff --git a/metadata/md5-cache/sys-libs/kpmcore-3.1.2 b/metadata/md5-cache/sys-libs/kpmcore-3.1.2
index 659b871c6864..a9b9bc3437b7 100644
--- a/metadata/md5-cache/sys-libs/kpmcore-3.1.2
+++ b/metadata/md5-cache/sys-libs/kpmcore-3.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kiconthemes-5.37.0:5 >=kde-frameworks/kio-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/libatasmart sys-apps/util-linux >=sys-block/parted-3 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5
 SRC_URI=mirror://kde/stable/kpmcore/3.1.2/src/kpmcore-3.1.2.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1c51822e28ecd2b687ea27afff1e8e0d
diff --git a/metadata/md5-cache/sys-libs/kpmcore-3.2.0 b/metadata/md5-cache/sys-libs/kpmcore-3.2.0
index 852f2643fb7e..a991907ba667 100644
--- a/metadata/md5-cache/sys-libs/kpmcore-3.2.0
+++ b/metadata/md5-cache/sys-libs/kpmcore-3.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kservice-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/libatasmart >=sys-apps/util-linux-2.30 >=sys-block/parted-3 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5/6
 SRC_URI=mirror://kde/stable/kpmcore/3.2.0/src/kpmcore-3.2.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4fec173ad54cbacd74e93544a38a2d41
diff --git a/metadata/md5-cache/sys-libs/zlib-1.2.11-r1 b/metadata/md5-cache/sys-libs/zlib-1.2.11-r1
index dd2e2eedbe85..0c99171ba3f9 100644
--- a/metadata/md5-cache/sys-libs/zlib-1.2.11-r1
+++ b/metadata/md5-cache/sys-libs/zlib-1.2.11-r1
@@ -4,10 +4,10 @@ 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 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=ZLIB
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<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	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=584c4326a0917ff84707e7fe147af5b4
+_md5_=d838e4bc82ed94c95f51b55887c06344
diff --git a/metadata/md5-cache/sys-power/upower-0.99.5 b/metadata/md5-cache/sys-power/upower-0.99.5
index f92e3ae74ae0..9cfe163c7622 100644
--- a/metadata/md5-cache/sys-power/upower-0.99.5
+++ b/metadata/md5-cache/sys-power/upower-0.99.5
@@ -4,10 +4,10 @@ DESCRIPTION=D-Bus abstraction for enumerating power devices, querying history an
 EAPI=6
 HOMEPAGE=https://upower.freedesktop.org/
 IUSE=doc +introspection ios kernel_FreeBSD kernel_linux selinux
-KEYWORDS=alpha ~amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.34:2 sys-apps/dbus:= introspection? ( dev-libs/gobject-introspection:= ) kernel_linux? ( virtual/libusb:1 virtual/libgudev:= virtual/udev ios? ( >=app-pda/libimobiledevice-1:= >=app-pda/libplist-1:= ) ) selinux? ( sec-policy/selinux-devicekit )
 SLOT=0/3
 SRC_URI=https://upower.freedesktop.org/releases/upower-0.99.5.tar.xz
 _eclasses_=ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=4134bc9abd23ca63eba1dc4ffe04f0d1
+_md5_=d6723a8eb92ead81cf7ae9d441e21700
diff --git a/metadata/md5-cache/sys-process/acct-6.6.4-r1 b/metadata/md5-cache/sys-process/acct-6.6.4-r1
index faf631559bf2..f62e499023c6 100644
--- a/metadata/md5-cache/sys-process/acct-6.6.4-r1
+++ b/metadata/md5-cache/sys-process/acct-6.6.4-r1
@@ -3,9 +3,9 @@ DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >
 DESCRIPTION=GNU system accounting utilities
 EAPI=6
 HOMEPAGE=https://savannah.gnu.org/projects/acct/
-KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/acct/acct-6.6.4.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=d96d13fdf4275b11809467f30b7a7769
+_md5_=1230f1abe76e415ec70fe3af8aab6a84
diff --git a/metadata/md5-cache/sys-process/atop-2.3.0-r1 b/metadata/md5-cache/sys-process/atop-2.3.0-r1
index 6a07bda9bb4b..e7c54c03abd4 100644
--- a/metadata/md5-cache/sys-process/atop-2.3.0-r1
+++ b/metadata/md5-cache/sys-process/atop-2.3.0-r1
@@ -3,10 +3,10 @@ DEPEND=sys-libs/ncurses:0= >=sys-process/acct-6.6.4-r1 virtual/pkgconfig virtual
 DESCRIPTION=Resource-specific view of processes
 EAPI=6
 HOMEPAGE=https://www.atoptool.nl/ https://github.com/Atoptool/atop
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= >=sys-process/acct-6.6.4-r1
 SLOT=0
 SRC_URI=https://github.com/Atoptool/atop/archive/v2.3.0.tar.gz -> atop-2.3.0.tar.gz https://github.com/Atoptool/atop/commit/42e86fcc42ce60f8c92f3c7d5f3a6ccde47c0b33.patch -> atop-2.3.0-version_h.patch https://github.com/Atoptool/atop/commit/a8d850d06efc8d70a19f55ec93fe83df51e99077.patch -> atop-2.3.0-version_c.patch https://github.com/Atoptool/atop/commit/5f101e656a24271726d1e9cd672631b6033c36c1.patch -> atop-2.3.0-netatop_h.patch
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=223f2deda206fff6c3cfa2c0007263c8
+_md5_=a21014a30a09da396647f946783cbdd5
diff --git a/metadata/md5-cache/sys-process/parallel-20170422 b/metadata/md5-cache/sys-process/parallel-20170422
deleted file mode 100644
index 54903635ba99..000000000000
--- a/metadata/md5-cache/sys-process/parallel-20170422
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=dev-lang/perl:= dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
-DESCRIPTION=A shell tool for executing jobs in parallel locally or on remote machines
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/parallel/
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=dev-lang/perl:= dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
-SLOT=0
-SRC_URI=mirror://gnu/parallel/parallel-20170422.tar.bz2
-_md5_=d90d6489817cb50f8de4b2216029db65
diff --git a/metadata/md5-cache/sys-process/parallel-20170822 b/metadata/md5-cache/sys-process/parallel-20170822
index 7917b5e3f034..8e181fd1eb84 100644
--- a/metadata/md5-cache/sys-process/parallel-20170822
+++ b/metadata/md5-cache/sys-process/parallel-20170822
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl:= dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl
 DESCRIPTION=A shell tool for executing jobs in parallel locally or on remote machines
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/parallel/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl:= dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
 SLOT=0
 SRC_URI=mirror://gnu/parallel/parallel-20170822.tar.bz2
-_md5_=218d2e29557fd1c18099e3e1d2906ace
+_md5_=d90d6489817cb50f8de4b2216029db65
diff --git a/metadata/md5-cache/sys-process/parallel-20171022 b/metadata/md5-cache/sys-process/parallel-20171022
new file mode 100644
index 000000000000..0ab209534884
--- /dev/null
+++ b/metadata/md5-cache/sys-process/parallel-20171022
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=dev-lang/perl:= dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
+DESCRIPTION=A shell tool for executing jobs in parallel locally or on remote machines
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/parallel/
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=dev-lang/perl:= dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
+SLOT=0
+SRC_URI=mirror://gnu/parallel/parallel-20171022.tar.bz2
+_md5_=218d2e29557fd1c18099e3e1d2906ace
diff --git a/metadata/md5-cache/sys-process/tiptop-2.3.1 b/metadata/md5-cache/sys-process/tiptop-2.3.1
new file mode 100644
index 000000000000..81c0b0c8639b
--- /dev/null
+++ b/metadata/md5-cache/sys-process/tiptop-2.3.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=sys-libs/ncurses dev-libs/libxml2
+DESCRIPTION=top for performance counters
+EAPI=5
+HOMEPAGE=http://tiptop.gforge.inria.fr/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses dev-libs/libxml2
+SLOT=0
+SRC_URI=http://tiptop.gforge.inria.fr/releases/tiptop-2.3.1.tar.gz
+_md5_=ec9d29e3bbd3b7276805998887a2e45b
diff --git a/metadata/md5-cache/virtual/perl-Module-CoreList-5.201.709.220-r1 b/metadata/md5-cache/virtual/perl-Module-CoreList-5.201.709.220-r1
index c3ba75baebc7..44079e1e2533 100644
--- a/metadata/md5-cache/virtual/perl-Module-CoreList-5.201.709.220-r1
+++ b/metadata/md5-cache/virtual/perl-Module-CoreList-5.201.709.220-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Module-CoreList
 EAPI=6
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26.1* =dev-lang/perl-5.24.3* ~perl-core/Module-CoreList-5.201.709.220 ) dev-lang/perl:= !<perl-core/Module-CoreList-5.201.709.220 !>perl-core/Module-CoreList-5.201.709.220-r999
 SLOT=0
-_md5_=c2b832137da438c3b5422213349e21c7
+_md5_=b1d68b6e03d2257acfaa23a15c29ee52
diff --git a/metadata/md5-cache/virtual/perl-Time-HiRes-1.974.100-r1 b/metadata/md5-cache/virtual/perl-Time-HiRes-1.974.100-r1
index 8afde1cadfce..e57ebf0566b2 100644
--- a/metadata/md5-cache/virtual/perl-Time-HiRes-1.974.100-r1
+++ b/metadata/md5-cache/virtual/perl-Time-HiRes-1.974.100-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Time-HiRes
 EAPI=6
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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 ~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.26* =dev-lang/perl-5.24.3* ~perl-core/Time-HiRes-1.974.100 ) dev-lang/perl:= !<perl-core/Time-HiRes-1.974.100 !>perl-core/Time-HiRes-1.974.100-r999
 SLOT=0
-_md5_=029f58248071aab4a506c6a6a6ba7d21
+_md5_=0853de7793a4a9ec710e53d0bf3c0f2e
diff --git a/metadata/md5-cache/www-apache/mod_gnutls-0.8.3 b/metadata/md5-cache/www-apache/mod_gnutls-0.8.3
new file mode 100644
index 000000000000..a2df2807374e
--- /dev/null
+++ b/metadata/md5-cache/www-apache/mod_gnutls-0.8.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=net-libs/gnutls-3.3.0:= test? ( app-crypt/monkeysphere ) =www-servers/apache-2.4* >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=mod_gnutls uses GnuTLS to provide SSL/TLS encryption for Apache2, similarly to mod_ssl
+EAPI=6
+HOMEPAGE=https://mod.gnutls.org/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=net-libs/gnutls-3.3.0:= =www-servers/apache-2.4*
+RESTRICT=test
+SLOT=0
+SRC_URI=https://mod.gnutls.org/downloads/mod_gnutls-0.8.3.tar.bz2
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	dc412f38566b91012efd58b9c203e6c3	depend.apache	0917334d570e07f9743a04ff85b3bf1b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=2babe9ec807116a83bf7dd8545999165
diff --git a/metadata/md5-cache/www-apache/mod_nss-1.0.12-r1 b/metadata/md5-cache/www-apache/mod_nss-1.0.12-r1
index 3f0592067dc0..bc2e8b7f458e 100644
--- a/metadata/md5-cache/www-apache/mod_nss-1.0.12-r1
+++ b/metadata/md5-cache/www-apache/mod_nss-1.0.12-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install postinst prepare setup
 DEPEND=>=dev-libs/nspr-4.6.4 >=dev-libs/nss-3.11.4 sys-apps/sed virtual/pkgconfig =www-servers/apache-2* >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=SSL/TLS module for the Apache HTTP server
 EAPI=6
-HOMEPAGE=https://fedorahosted.org/mod_nss/
+HOMEPAGE=https://pagure.io/mod_nss
 IUSE=+ecc
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/nspr-4.6.4 >=dev-libs/nss-3.11.4 net-dns/bind-tools =www-servers/apache-2*
 SLOT=0
-SRC_URI=https://fedorahosted.org/released/mod_nss/mod_nss-1.0.12.tar.gz
+SRC_URI=https://releases.pagure.org/mod_nss/mod_nss-1.0.12.tar.gz
 _eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	dc412f38566b91012efd58b9c203e6c3	depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=50c0596855f51dbed508c6be5eb652ac
+_md5_=1f5e01b7daef9edafb1e05f54678dfac
diff --git a/metadata/md5-cache/www-apache/passenger-5.1.11 b/metadata/md5-cache/www-apache/passenger-5.1.11
index 897d018f0829..90fdfdf6d0dc 100644
--- a/metadata/md5-cache/www-apache/passenger-5.1.11
+++ b/metadata/md5-cache/www-apache/passenger-5.1.11
@@ -4,11 +4,11 @@ DESCRIPTION=Passenger makes deployment of Ruby on Rails applications a breeze
 EAPI=6
 HOMEPAGE=https://www.phusionpassenger.com/
 IUSE=apache2 debug test apache2 elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rake-0.8.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rake-0.8.1[ruby_targets_ruby24] ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-2* ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-5.1.11.tar.gz
 _eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f9535bd4b0291b889245322d57cbe5ec
+_md5_=69e45f284356aaf5a5c10b2d6cac7c4e
diff --git a/metadata/md5-cache/www-apps/gitea-1.0.2 b/metadata/md5-cache/www-apps/gitea-1.0.2
deleted file mode 100644
index 8d4b1e352f9a..000000000000
--- a/metadata/md5-cache/www-apps/gitea-1.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
-DESCRIPTION=A painless self-hosted Git service, written in Go
-EAPI=6
-HOMEPAGE=https://github.com/go-gitea/gitea
-KEYWORDS=~amd64 ~arm
-LICENSE=MIT
-RDEPEND=dev-vcs/git
-SLOT=0
-SRC_URI=https://github.com/go-gitea/gitea/archive/e2c8d6fcb2c4073ed5cf164d88e7b5d44d95943c.tar.gz -> gitea-1.0.2.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=efc34830946421c28917679c2d232d00
diff --git a/metadata/md5-cache/www-apps/gitea-1.1.3 b/metadata/md5-cache/www-apps/gitea-1.1.3
deleted file mode 100644
index b514c26b6267..000000000000
--- a/metadata/md5-cache/www-apps/gitea-1.1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
-DESCRIPTION=A painless self-hosted Git service, written in Go
-EAPI=6
-HOMEPAGE=https://github.com/go-gitea/gitea
-KEYWORDS=~amd64 ~arm
-LICENSE=MIT
-RDEPEND=dev-vcs/git
-SLOT=0
-SRC_URI=https://github.com/go-gitea/gitea/archive/v1.1.3.tar.gz -> gitea-1.1.3.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=9da345120be2feb66c32d53d45280721
diff --git a/metadata/md5-cache/www-apps/gitea-1.2.1 b/metadata/md5-cache/www-apps/gitea-1.2.1
new file mode 100644
index 000000000000..f99c956b927e
--- /dev/null
+++ b/metadata/md5-cache/www-apps/gitea-1.2.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DESCRIPTION=A painless self-hosted Git service, written in Go
+EAPI=6
+HOMEPAGE=https://github.com/go-gitea/gitea
+KEYWORDS=~amd64 ~arm
+LICENSE=MIT
+RDEPEND=dev-vcs/git
+SLOT=0
+SRC_URI=https://github.com/go-gitea/gitea/archive/v1.2.1.tar.gz -> gitea-1.2.1.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	e4b567c44272a719fabf53f0f885d3f7
+_md5_=44b36219d0b5b8b84954847ad16ae9f4
diff --git a/metadata/md5-cache/www-apps/grafana-bin-4.4.3 b/metadata/md5-cache/www-apps/grafana-bin-4.4.3
deleted file mode 100644
index c245132882ee..000000000000
--- a/metadata/md5-cache/www-apps/grafana-bin-4.4.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
-EAPI=5
-HOMEPAGE=http://grafana.org
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-4.4.3.linux-x64.tar.gz -> grafana-bin-4.4.3.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=11236376477609af59e5a1a5ae48b942
diff --git a/metadata/md5-cache/www-apps/grafana-bin-4.6.0 b/metadata/md5-cache/www-apps/grafana-bin-4.6.0
new file mode 100644
index 000000000000..f7cd79f174d5
--- /dev/null
+++ b/metadata/md5-cache/www-apps/grafana-bin-4.6.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
+EAPI=5
+HOMEPAGE=http://grafana.org
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-4.6.0.linux-x64.tar.gz -> grafana-bin-4.6.0.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
+_md5_=11236376477609af59e5a1a5ae48b942
diff --git a/metadata/md5-cache/www-apps/icingaweb2-2.4.1-r1 b/metadata/md5-cache/www-apps/icingaweb2-2.4.1-r1
deleted file mode 100644
index 03de796d256e..000000000000
--- a/metadata/md5-cache/www-apps/icingaweb2-2.4.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=config install postinst setup
-DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2? ( >=www-servers/apache-2.4.0 || ( dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) ) nginx? ( >=www-servers/nginx-1.7.0:* || ( dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) ) apache2? ( =www-servers/apache-2* )
-DESCRIPTION=Icinga Web 2 - Frontend for icinga2
-EAPI=6
-HOMEPAGE=http://www.icinga.org/
-IUSE=apache2 ldap mysql nginx pdf postgres apache2
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2? ( >=www-servers/apache-2.4.0 || ( dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) ) nginx? ( >=www-servers/nginx-1.7.0:* || ( dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) ) apache2? ( =www-servers/apache-2* )
-REQUIRED_USE=^^ ( apache2 nginx )
-SLOT=0
-SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.4.1 -> icingaweb2-2.4.1.tar.gz
-_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=a8b0752ca8563d1ebf3cc7a18c02f03d
diff --git a/metadata/md5-cache/www-apps/icingaweb2-2.4.2 b/metadata/md5-cache/www-apps/icingaweb2-2.4.2
index 23639283c95e..2f09d38fe293 100644
--- a/metadata/md5-cache/www-apps/icingaweb2-2.4.2
+++ b/metadata/md5-cache/www-apps/icingaweb2-2.4.2
@@ -4,11 +4,11 @@ DESCRIPTION=Icinga Web 2 - Frontend for icinga2
 EAPI=6
 HOMEPAGE=http://www.icinga.org/
 IUSE=apache2 ldap mysql nginx pdf postgres apache2
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2? ( >=www-servers/apache-2.4.0 || ( dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) ) nginx? ( >=www-servers/nginx-1.7.0:* || ( dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) ) apache2? ( =www-servers/apache-2* )
 REQUIRED_USE=^^ ( apache2 nginx )
 SLOT=0
 SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.4.2 -> icingaweb2-2.4.2.tar.gz
 _eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=36d5db170d5584972d087c038a9eb446
+_md5_=a8b0752ca8563d1ebf3cc7a18c02f03d
diff --git a/metadata/md5-cache/www-apps/metadot-6.4.5.4-r1 b/metadata/md5-cache/www-apps/metadot-6.4.5.4-r1
deleted file mode 100644
index 55972d0ebb64..000000000000
--- a/metadata/md5-cache/www-apps/metadot-6.4.5.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=Metadot is a CMS with file, page and link management, and collaboration features
-EAPI=0
-HOMEPAGE=http://www.metadot.com
-IUSE=vhosts
-KEYWORDS=ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.6 =www-apache/mod_perl-2* dev-perl/DBI >=dev-perl/DBD-mysql-2.1027 dev-perl/Apache-DBI >=dev-perl/AppConfig-1.55 >=dev-perl/XML-RSS-1.02 dev-perl/perl-ldap >=dev-perl/Log-Agent-0.304 dev-perl/Mail-POP3Client >=dev-perl/IO-stringy-2.108 dev-perl/MailTools dev-perl/MIME-tools >=dev-perl/Unicode-String-2.07 >=dev-perl/Spreadsheet-WriteExcel-0.41 >=dev-perl/Date-Calc-5.3 >=dev-perl/Image-Size-2.991.0 >=dev-perl/Template-Toolkit-2.09 >=virtual/perl-Time-HiRes-1.48 >=virtual/perl-Test-Harness-2.28 >=dev-perl/Test-Manifest-0.91 >=virtual/perl-Test-Simple-0.47 >=dev-perl/Lingua-EN-NameParse-1.18 >=dev-perl/Number-Format-1.45 >=dev-perl/XML-Simple-2.08 dev-perl/XML-Dumper dev-perl/Archive-Zip dev-perl/Date-Manip dev-perl/Text-CSV_XS dev-perl/HTML-Tree dev-perl/HTML-Format dev-perl/Data-ShowTable >=app-admin/webapp-config-1.50.15
-SLOT=6.4.5.4-r1
-SRC_URI=http://download.metadot.com/Metadot6.4.5.4.tar.gz
-_eclasses_=webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=96e25769e5962385fc3b56b14203422c
diff --git a/metadata/md5-cache/www-apps/metadot-6.4.5.4-r2 b/metadata/md5-cache/www-apps/metadot-6.4.5.4-r2
new file mode 100644
index 000000000000..7596d79e0dcd
--- /dev/null
+++ b/metadata/md5-cache/www-apps/metadot-6.4.5.4-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=Metadot is a CMS with file, page and link management, and collaboration features
+EAPI=0
+HOMEPAGE=http://www.metadot.com
+IUSE=vhosts
+KEYWORDS=ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.6 =www-apache/mod_perl-2* dev-perl/DBI >=dev-perl/DBD-mysql-2.1027 dev-perl/Apache-DBI >=dev-perl/AppConfig-1.55 >=dev-perl/XML-RSS-1.02 dev-perl/perl-ldap >=dev-perl/Log-Agent-0.304 dev-perl/Mail-POP3Client >=dev-perl/IO-stringy-2.108 dev-perl/MailTools dev-perl/MIME-tools >=dev-perl/Unicode-String-2.07 >=dev-perl/Spreadsheet-WriteExcel-0.41 >=dev-perl/Date-Calc-5.3 >=dev-perl/Image-Size-2.991.0 >=dev-perl/Template-Toolkit-2.09 >=virtual/perl-Time-HiRes-1.48 >=virtual/perl-Test-Harness-2.28 >=dev-perl/Test-Manifest-0.91 >=virtual/perl-Test-Simple-0.47 >=dev-perl/Lingua-EN-NameParse-1.18 >=dev-perl/Number-Format-1.45 >=dev-perl/XML-Simple-2.08 dev-perl/XML-Dumper dev-perl/Archive-Zip dev-perl/Date-Manip dev-perl/Text-CSV_XS dev-perl/HTML-Tree dev-perl/HTML-Formatter dev-perl/Data-ShowTable >=app-admin/webapp-config-1.50.15
+SLOT=6.4.5.4-r2
+SRC_URI=http://download.metadot.com/Metadot6.4.5.4.tar.gz
+_eclasses_=webapp	a76ebd3cb5649737496e8238992dd7ca
+_md5_=86f4002e620689efc169133d6897ff09
diff --git a/metadata/md5-cache/www-apps/nanoc-4.8.10 b/metadata/md5-cache/www-apps/nanoc-4.8.10
new file mode 100644
index 000000000000..daabab888c0e
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nanoc-4.8.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( app-text/asciidoc app-text/highlight ) test? ( ruby_targets_ruby23? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/rack:*[ruby_targets_ruby23] www-servers/adsf[ruby_targets_ruby23] ) >=dev-ruby/addressable-2.5[ruby_targets_ruby23] >=dev-ruby/cri-2.8:0[ruby_targets_ruby23] dev-ruby/ddplugin:1[ruby_targets_ruby23] =dev-ruby/hamster-3*[ruby_targets_ruby23] dev-ruby/ref:2[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/fuubar[ruby_targets_ruby23] >=dev-ruby/mocha-0.13[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] dev-ruby/systemu[ruby_targets_ruby23] dev-ruby/vcr[ruby_targets_ruby23] dev-ruby/webmock[ruby_targets_ruby23] dev-ruby/yard[ruby_targets_ruby23] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby23] dev-ruby/rdiscount[ruby_targets_ruby23] dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=nanoc is a simple but very flexible static site generator written in Ruby
+EAPI=6
+HOMEPAGE=https://nanoc.ws/
+IUSE=minimal test elibc_FreeBSD ruby_targets_ruby23 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/rack:*[ruby_targets_ruby23] www-servers/adsf[ruby_targets_ruby23] ) >=dev-ruby/addressable-2.5[ruby_targets_ruby23] >=dev-ruby/cri-2.8:0[ruby_targets_ruby23] dev-ruby/ddplugin:1[ruby_targets_ruby23] =dev-ruby/hamster-3*[ruby_targets_ruby23] dev-ruby/ref:2[ruby_targets_ruby23] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 )
+SLOT=0
+SRC_URI=mirror://rubygems/nanoc-4.8.10.gem
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4e6f4344e9b970128ffd8c3c1d323513
diff --git a/metadata/md5-cache/www-apps/redmine-3.2.7 b/metadata/md5-cache/www-apps/redmine-3.2.7
deleted file mode 100644
index 5d57f7e6d149..000000000000
--- a/metadata/md5-cache/www-apps/redmine-3.2.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/rubygems[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] >=dev-ruby/builder-3.0.4:*[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] =dev-ruby/request_store-1.0.5[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.0[ruby_targets_ruby22] dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:*[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.7.2[ruby_targets_ruby22] ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/rubygems[ruby_targets_ruby23] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby23] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] >=dev-ruby/builder-3.0.4:*[ruby_targets_ruby23] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby23] dev-ruby/mime-types:*[ruby_targets_ruby23] =dev-ruby/request_store-1.0.5[ruby_targets_ruby23] >=dev-ruby/rbpdf-1.19.0[ruby_targets_ruby23] dev-ruby/actionpack-action_caching[ruby_targets_ruby23] dev-ruby/actionpack-xml_parser:*[ruby_targets_ruby23] dev-ruby/protected_attributes[ruby_targets_ruby23] >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.7.2[ruby_targets_ruby23] ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby23] ) >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby23] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby23] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby23] ) passenger? ( www-apache/passenger[ruby_targets_ruby23] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby23] ) ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-DESCRIPTION=Flexible project management web application using the Ruby on Rails framework
-EAPI=5
-HOMEPAGE=http://www.redmine.org/
-IUSE=ldap fastcgi passenger imagemagick test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/rubygems[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] >=dev-ruby/builder-3.0.4:*[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] =dev-ruby/request_store-1.0.5[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.0[ruby_targets_ruby22] dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:*[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.7.2[ruby_targets_ruby22] ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/rubygems[ruby_targets_ruby23] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby23] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] >=dev-ruby/builder-3.0.4:*[ruby_targets_ruby23] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby23] dev-ruby/mime-types:*[ruby_targets_ruby23] =dev-ruby/request_store-1.0.5[ruby_targets_ruby23] >=dev-ruby/rbpdf-1.19.0[ruby_targets_ruby23] dev-ruby/actionpack-action_caching[ruby_targets_ruby23] dev-ruby/actionpack-xml_parser:*[ruby_targets_ruby23] dev-ruby/protected_attributes[ruby_targets_ruby23] >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.7.2[ruby_targets_ruby23] ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby23] ) >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby23] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby23] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby23] ) passenger? ( www-apache/passenger[ruby_targets_ruby23] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=http://www.redmine.org/releases/redmine-3.2.7.tar.gz
-_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=232c69d1a8b29c06c2055bab0a2b184a
diff --git a/metadata/md5-cache/www-apps/redmine-3.2.7-r1 b/metadata/md5-cache/www-apps/redmine-3.2.7-r1
deleted file mode 100644
index 1e7e2e922010..000000000000
--- a/metadata/md5-cache/www-apps/redmine-3.2.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/rubygems[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] >=dev-ruby/builder-3.0.4:*[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] =dev-ruby/request_store-1.0.5[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.0[ruby_targets_ruby22] dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.7.2[ruby_targets_ruby22] ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/rubygems[ruby_targets_ruby23] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby23] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] >=dev-ruby/builder-3.0.4:*[ruby_targets_ruby23] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby23] dev-ruby/mime-types:*[ruby_targets_ruby23] =dev-ruby/request_store-1.0.5[ruby_targets_ruby23] >=dev-ruby/rbpdf-1.19.0[ruby_targets_ruby23] dev-ruby/actionpack-action_caching[ruby_targets_ruby23] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby23] dev-ruby/protected_attributes[ruby_targets_ruby23] >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.7.2[ruby_targets_ruby23] ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby23] ) >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby23] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby23] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby23] ) passenger? ( www-apache/passenger[ruby_targets_ruby23] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby23] ) ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-DESCRIPTION=Flexible project management web application using the Ruby on Rails framework
-EAPI=5
-HOMEPAGE=http://www.redmine.org/
-IUSE=ldap fastcgi passenger imagemagick test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/rubygems[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] >=dev-ruby/builder-3.0.4:*[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] =dev-ruby/request_store-1.0.5[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.0[ruby_targets_ruby22] dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.7.2[ruby_targets_ruby22] ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/rubygems[ruby_targets_ruby23] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby23] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] >=dev-ruby/builder-3.0.4:*[ruby_targets_ruby23] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby23] dev-ruby/mime-types:*[ruby_targets_ruby23] =dev-ruby/request_store-1.0.5[ruby_targets_ruby23] >=dev-ruby/rbpdf-1.19.0[ruby_targets_ruby23] dev-ruby/actionpack-action_caching[ruby_targets_ruby23] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby23] dev-ruby/protected_attributes[ruby_targets_ruby23] >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.7.2[ruby_targets_ruby23] ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby23] ) >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby23] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby23] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby23] ) passenger? ( www-apache/passenger[ruby_targets_ruby23] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=http://www.redmine.org/releases/redmine-3.2.7.tar.gz
-_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=552640f1d36ff77a385317294b029ec0
diff --git a/metadata/md5-cache/www-apps/redmine-3.2.8 b/metadata/md5-cache/www-apps/redmine-3.2.8
new file mode 100644
index 000000000000..9e51cc155703
--- /dev/null
+++ b/metadata/md5-cache/www-apps/redmine-3.2.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/rubygems[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] >=dev-ruby/builder-3.0.4:*[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] =dev-ruby/request_store-1.0.5[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.0[ruby_targets_ruby22] dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.7.2[ruby_targets_ruby22] ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/rubygems[ruby_targets_ruby23] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby23] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] >=dev-ruby/builder-3.0.4:*[ruby_targets_ruby23] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby23] dev-ruby/mime-types:*[ruby_targets_ruby23] =dev-ruby/request_store-1.0.5[ruby_targets_ruby23] >=dev-ruby/rbpdf-1.19.0[ruby_targets_ruby23] dev-ruby/actionpack-action_caching[ruby_targets_ruby23] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby23] dev-ruby/protected_attributes[ruby_targets_ruby23] >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.7.2[ruby_targets_ruby23] ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby23] ) >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby23] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby23] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby23] ) passenger? ( www-apache/passenger[ruby_targets_ruby23] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby23] ) ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+DESCRIPTION=Flexible project management web application using the Ruby on Rails framework
+EAPI=6
+HOMEPAGE=http://www.redmine.org/
+IUSE=ldap fastcgi passenger imagemagick test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/rubygems[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] >=dev-ruby/builder-3.0.4:*[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] =dev-ruby/request_store-1.0.5[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.0[ruby_targets_ruby22] dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.7.2[ruby_targets_ruby22] ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/rubygems[ruby_targets_ruby23] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby23] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] >=dev-ruby/builder-3.0.4:*[ruby_targets_ruby23] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby23] dev-ruby/mime-types:*[ruby_targets_ruby23] =dev-ruby/request_store-1.0.5[ruby_targets_ruby23] >=dev-ruby/rbpdf-1.19.0[ruby_targets_ruby23] dev-ruby/actionpack-action_caching[ruby_targets_ruby23] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby23] dev-ruby/protected_attributes[ruby_targets_ruby23] >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.7.2[ruby_targets_ruby23] ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby23] ) >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby23] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby23] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby23] ) passenger? ( www-apache/passenger[ruby_targets_ruby23] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=0
+SRC_URI=http://www.redmine.org/releases/redmine-3.2.8.tar.gz
+_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=65b90950dddc0613639acf1a7271be48
diff --git a/metadata/md5-cache/www-apps/redmine-3.3.4 b/metadata/md5-cache/www-apps/redmine-3.3.4
deleted file mode 100644
index 9a597b5bf0a0..000000000000
--- a/metadata/md5-cache/www-apps/redmine-3.3.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:*[ruby_targets_ruby22] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] dev-ruby/i18n:0.7[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] dev-ruby/loofah[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/mimemagic[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby22] dev-ruby/request_store:1.0.5[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby22] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] dev-ruby/rubygems[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby23] dev-ruby/actionpack-xml_parser:*[ruby_targets_ruby23] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby23] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] dev-ruby/i18n:0.7[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby23] dev-ruby/loofah[ruby_targets_ruby23] dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/mimemagic[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby23] dev-ruby/protected_attributes[ruby_targets_ruby23] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby23] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby23] dev-ruby/request_store:1.0.5[ruby_targets_ruby23] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby23] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby23] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby23] dev-ruby/rubygems[ruby_targets_ruby23] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby23] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby23] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby23] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby23] ) passenger? ( www-apache/passenger[ruby_targets_ruby23] ) ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-DESCRIPTION=Flexible project management web application using the Ruby on Rails framework
-EAPI=6
-HOMEPAGE=http://www.redmine.org/
-IUSE=imagemagick fastcgi ldap markdown passenger test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:*[ruby_targets_ruby22] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] dev-ruby/i18n:0.7[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] dev-ruby/loofah[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/mimemagic[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby22] dev-ruby/request_store:1.0.5[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby22] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] dev-ruby/rubygems[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby23] dev-ruby/actionpack-xml_parser:*[ruby_targets_ruby23] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby23] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] dev-ruby/i18n:0.7[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby23] dev-ruby/loofah[ruby_targets_ruby23] dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/mimemagic[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby23] dev-ruby/protected_attributes[ruby_targets_ruby23] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby23] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby23] dev-ruby/request_store:1.0.5[ruby_targets_ruby23] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby23] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby23] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby23] dev-ruby/rubygems[ruby_targets_ruby23] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby23] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby23] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby23] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby23] ) passenger? ( www-apache/passenger[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=http://www.redmine.org/releases/redmine-3.3.4.tar.gz
-_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9f2a97f26e883fb63aa9e633ecd02569
diff --git a/metadata/md5-cache/www-apps/redmine-3.3.4-r1 b/metadata/md5-cache/www-apps/redmine-3.3.4-r1
deleted file mode 100644
index dc5b39290c50..000000000000
--- a/metadata/md5-cache/www-apps/redmine-3.3.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby22] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] dev-ruby/i18n:0.7[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] dev-ruby/loofah[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/mimemagic[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby22] dev-ruby/request_store:1.0.5[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby22] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] dev-ruby/rubygems[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby23] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby23] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby23] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] dev-ruby/i18n:0.7[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby23] dev-ruby/loofah[ruby_targets_ruby23] dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/mimemagic[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby23] dev-ruby/protected_attributes[ruby_targets_ruby23] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby23] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby23] dev-ruby/request_store:1.0.5[ruby_targets_ruby23] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby23] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby23] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby23] dev-ruby/rubygems[ruby_targets_ruby23] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby23] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby23] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby23] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby23] ) passenger? ( www-apache/passenger[ruby_targets_ruby23] ) ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-DESCRIPTION=Flexible project management web application using the Ruby on Rails framework
-EAPI=6
-HOMEPAGE=http://www.redmine.org/
-IUSE=imagemagick fastcgi ldap markdown passenger test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby22] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] dev-ruby/i18n:0.7[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] dev-ruby/loofah[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/mimemagic[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby22] dev-ruby/request_store:1.0.5[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby22] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] dev-ruby/rubygems[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby23] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby23] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby23] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] dev-ruby/i18n:0.7[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby23] dev-ruby/loofah[ruby_targets_ruby23] dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/mimemagic[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby23] dev-ruby/protected_attributes[ruby_targets_ruby23] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby23] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby23] dev-ruby/request_store:1.0.5[ruby_targets_ruby23] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby23] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby23] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby23] dev-ruby/rubygems[ruby_targets_ruby23] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby23] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby23] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby23] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby23] ) passenger? ( www-apache/passenger[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=http://www.redmine.org/releases/redmine-3.3.4.tar.gz
-_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8a8a3ab15c1b764fe454b0b1f787ff50
diff --git a/metadata/md5-cache/www-apps/redmine-3.3.5 b/metadata/md5-cache/www-apps/redmine-3.3.5
new file mode 100644
index 000000000000..343a34973757
--- /dev/null
+++ b/metadata/md5-cache/www-apps/redmine-3.3.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby22] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] dev-ruby/i18n:0.7[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] dev-ruby/loofah[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/mimemagic[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby22] dev-ruby/request_store:1.0.5[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby22] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] dev-ruby/rubygems[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby23] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby23] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby23] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] dev-ruby/i18n:0.7[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby23] dev-ruby/loofah[ruby_targets_ruby23] dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/mimemagic[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby23] dev-ruby/protected_attributes[ruby_targets_ruby23] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby23] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby23] dev-ruby/request_store:1.0.5[ruby_targets_ruby23] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby23] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby23] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby23] dev-ruby/rubygems[ruby_targets_ruby23] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby23] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby23] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby23] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby23] ) passenger? ( www-apache/passenger[ruby_targets_ruby23] ) ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+DESCRIPTION=Flexible project management web application using the Ruby on Rails framework
+EAPI=6
+HOMEPAGE=http://www.redmine.org/
+IUSE=imagemagick fastcgi ldap markdown passenger test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby22] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] dev-ruby/i18n:0.7[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] dev-ruby/loofah[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/mimemagic[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby22] dev-ruby/request_store:1.0.5[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby22] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] dev-ruby/rubygems[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby23] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby23] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby23] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] dev-ruby/i18n:0.7[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby23] dev-ruby/loofah[ruby_targets_ruby23] dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/mimemagic[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby23] dev-ruby/protected_attributes[ruby_targets_ruby23] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby23] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby23] dev-ruby/request_store:1.0.5[ruby_targets_ruby23] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby23] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby23] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby23] dev-ruby/rubygems[ruby_targets_ruby23] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby23] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby23] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby23] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby23] ) passenger? ( www-apache/passenger[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=0
+SRC_URI=http://www.redmine.org/releases/redmine-3.3.5.tar.gz
+_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=73d18836314c8e2ae66801d202f86b8e
diff --git a/metadata/md5-cache/www-apps/redmine-3.4.2 b/metadata/md5-cache/www-apps/redmine-3.4.2
deleted file mode 100644
index e908f4733d21..000000000000
--- a/metadata/md5-cache/www-apps/redmine-3.4.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:*[ruby_targets_ruby22] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] dev-ruby/i18n:0.7[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] dev-ruby/loofah[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/mimemagic[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby22] dev-ruby/request_store:1.0.5[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby22] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] dev-ruby/rubygems[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby23] dev-ruby/actionpack-xml_parser:*[ruby_targets_ruby23] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby23] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] dev-ruby/i18n:0.7[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby23] dev-ruby/loofah[ruby_targets_ruby23] dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/mimemagic[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby23] dev-ruby/protected_attributes[ruby_targets_ruby23] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby23] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby23] dev-ruby/request_store:1.0.5[ruby_targets_ruby23] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby23] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby23] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby23] dev-ruby/rubygems[ruby_targets_ruby23] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby23] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby23] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby23] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby23] ) passenger? ( www-apache/passenger[ruby_targets_ruby23] ) ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-DESCRIPTION=Flexible project management web application using the Ruby on Rails framework
-EAPI=6
-HOMEPAGE=http://www.redmine.org/
-IUSE=imagemagick fastcgi ldap markdown passenger test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:*[ruby_targets_ruby22] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] dev-ruby/i18n:0.7[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] dev-ruby/loofah[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/mimemagic[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby22] dev-ruby/request_store:1.0.5[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby22] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] dev-ruby/rubygems[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby23] dev-ruby/actionpack-xml_parser:*[ruby_targets_ruby23] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby23] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] dev-ruby/i18n:0.7[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby23] dev-ruby/loofah[ruby_targets_ruby23] dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/mimemagic[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby23] dev-ruby/protected_attributes[ruby_targets_ruby23] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby23] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby23] dev-ruby/request_store:1.0.5[ruby_targets_ruby23] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby23] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby23] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby23] dev-ruby/rubygems[ruby_targets_ruby23] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby23] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby23] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby23] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby23] ) passenger? ( www-apache/passenger[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=http://www.redmine.org/releases/redmine-3.4.2.tar.gz
-_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=afeba41084147f8080b9e3da87c96ad4
diff --git a/metadata/md5-cache/www-apps/redmine-3.4.2-r1 b/metadata/md5-cache/www-apps/redmine-3.4.2-r1
deleted file mode 100644
index 4003aa5c8ad3..000000000000
--- a/metadata/md5-cache/www-apps/redmine-3.4.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby22] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] dev-ruby/i18n:0.7[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] dev-ruby/loofah[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/mimemagic[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby22] dev-ruby/request_store:1.0.5[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby22] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] dev-ruby/rubygems[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby23] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby23] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby23] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] dev-ruby/i18n:0.7[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby23] dev-ruby/loofah[ruby_targets_ruby23] dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/mimemagic[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby23] dev-ruby/protected_attributes[ruby_targets_ruby23] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby23] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby23] dev-ruby/request_store:1.0.5[ruby_targets_ruby23] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby23] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby23] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby23] dev-ruby/rubygems[ruby_targets_ruby23] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby23] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby23] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby23] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby23] ) passenger? ( www-apache/passenger[ruby_targets_ruby23] ) ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-DESCRIPTION=Flexible project management web application using the Ruby on Rails framework
-EAPI=6
-HOMEPAGE=http://www.redmine.org/
-IUSE=imagemagick fastcgi ldap markdown passenger test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby22] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] dev-ruby/i18n:0.7[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] dev-ruby/loofah[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/mimemagic[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby22] dev-ruby/request_store:1.0.5[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby22] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] dev-ruby/rubygems[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby23] dev-ruby/actionpack-xml_parser:0[ruby_targets_ruby23] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby23] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] dev-ruby/i18n:0.7[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby23] dev-ruby/loofah[ruby_targets_ruby23] dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/mimemagic[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby23] dev-ruby/protected_attributes[ruby_targets_ruby23] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby23] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby23] dev-ruby/request_store:1.0.5[ruby_targets_ruby23] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby23] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby23] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby23] dev-ruby/rubygems[ruby_targets_ruby23] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby23] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby23] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby23] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby23] ) passenger? ( www-apache/passenger[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=http://www.redmine.org/releases/redmine-3.4.2.tar.gz
-_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=84d7ea6ceee0adfc2305f57322cbb0c8
diff --git a/metadata/md5-cache/www-apps/redmine-3.4.3 b/metadata/md5-cache/www-apps/redmine-3.4.3
new file mode 100644
index 000000000000..3f0f547e8aee
--- /dev/null
+++ b/metadata/md5-cache/www-apps/redmine-3.4.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:*[ruby_targets_ruby22] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] dev-ruby/i18n:0.7[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] dev-ruby/loofah[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/mimemagic[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby22] dev-ruby/request_store:1.0.5[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby22] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] dev-ruby/rubygems[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby23] dev-ruby/actionpack-xml_parser:*[ruby_targets_ruby23] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby23] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] dev-ruby/i18n:0.7[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby23] dev-ruby/loofah[ruby_targets_ruby23] dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/mimemagic[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby23] dev-ruby/protected_attributes[ruby_targets_ruby23] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby23] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby23] dev-ruby/request_store:1.0.5[ruby_targets_ruby23] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby23] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby23] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby23] dev-ruby/rubygems[ruby_targets_ruby23] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby23] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby23] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby23] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby23] ) passenger? ( www-apache/passenger[ruby_targets_ruby23] ) ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+DESCRIPTION=Flexible project management web application using the Ruby on Rails framework
+EAPI=6
+HOMEPAGE=http://www.redmine.org/
+IUSE=imagemagick fastcgi ldap markdown passenger test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby22] dev-ruby/actionpack-xml_parser:*[ruby_targets_ruby22] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby22] dev-ruby/i18n:0.7[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby22] dev-ruby/loofah[ruby_targets_ruby22] dev-ruby/mime-types:*[ruby_targets_ruby22] dev-ruby/mimemagic[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby22] dev-ruby/protected_attributes[ruby_targets_ruby22] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby22] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby22] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby22] dev-ruby/request_store:1.0.5[ruby_targets_ruby22] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby22] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby22] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby22] dev-ruby/rubygems[ruby_targets_ruby22] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby22] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby22] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby22] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby22] ) passenger? ( www-apache/passenger[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/actionpack-action_caching[ruby_targets_ruby23] dev-ruby/actionpack-xml_parser:*[ruby_targets_ruby23] >=dev-ruby/builder-3.2.2:3.2[ruby_targets_ruby23] >=dev-ruby/coderay-1.1.0[ruby_targets_ruby23] dev-ruby/i18n:0.7[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.1.4:3[ruby_targets_ruby23] dev-ruby/loofah[ruby_targets_ruby23] dev-ruby/mime-types:*[ruby_targets_ruby23] dev-ruby/mimemagic[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.8[ruby_targets_ruby23] dev-ruby/protected_attributes[ruby_targets_ruby23] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby23] >=dev-ruby/rails-4.2.5.2:4.2[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3[ruby_targets_ruby23] dev-ruby/request_store:1.0.5[ruby_targets_ruby23] >=dev-ruby/roadie-rails-1.1.0[ruby_targets_ruby23] >=dev-ruby/rbpdf-1.19.2[ruby_targets_ruby23] >=dev-ruby/ruby-openid-2.3.0[ruby_targets_ruby23] dev-ruby/rubygems[ruby_targets_ruby23] fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby23] ) imagemagick? ( >=dev-ruby/rmagick-2.14.0[ruby_targets_ruby23] ) ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0[ruby_targets_ruby23] ) markdown? ( >=dev-ruby/redcarpet-3.3.2[ruby_targets_ruby23] ) passenger? ( www-apache/passenger[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=0
+SRC_URI=http://www.redmine.org/releases/redmine-3.4.3.tar.gz
+_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=08d252d11926626020e600908489de12
diff --git a/metadata/md5-cache/www-apps/rt-4.2.12-r1 b/metadata/md5-cache/www-apps/rt-4.2.12-r1
deleted file mode 100644
index 4bd6272f1dff..000000000000
--- a/metadata/md5-cache/www-apps/rt-4.2.12-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup
-DEPEND=>=dev-lang/perl-5.10.1 >=dev-perl/Apache-Session-1.53 >=dev-perl/CGI-4 >=dev-perl/CSS-Squish-0.06 >=dev-perl/Class-Accessor-0.34 >=dev-perl/Class-ReturnValue-0.550.0-r1 >=dev-perl/DBI-1.37 >=dev-perl/Date-Extract-0.02 >=dev-perl/DateTime-Format-Natural-0.67 >=dev-perl/Devel-StackTrace-1.19 >=dev-perl/HTML-FormatText-WithLinks-0.14 >=dev-perl/HTML-Mason-1.43 >=dev-perl/HTML-Scrubber-0.08 >=dev-perl/HTTP-Server-Simple-0.34 >=dev-perl/HTTP-Server-Simple-Mason-0.14 >=dev-perl/Locale-Maketext-Lexicon-0.32 >=dev-perl/Log-Dispatch-2.410.0 >=dev-perl/MIME-tools-5.425 >=dev-perl/MailTools-1.60 >=dev-perl/Module-Versions-Report-1.05 >=dev-perl/Role-Basic-0.12 >=dev-perl/Symbol-Global-Name-0.04 >=dev-perl/Text-Quoted-2.80.0 >=dev-perl/Text-WikiFormat-0.76 >=dev-perl/Tree-Simple-1.04 >=dev-perl/XML-RSS-1.05 >=dev-perl/DBIx-SearchBuilder-1.660.0 >=virtual/perl-Digest-MD5-2.27 >=virtual/perl-Encode-2.730.0 >=virtual/perl-File-Spec-0.8 >=virtual/perl-Getopt-Long-2.24 >=virtual/perl-Locale-Maketext-1.06 >=virtual/perl-Storable-2.08 dev-perl/CGI-Emulate-PSGI dev-perl/CGI-PSGI dev-perl/Cache-Simple-TimedExpiry dev-perl/Calendar-Simple dev-perl/Convert-Color dev-perl/Crypt-Eksblowfish dev-perl/Crypt-SSLeay dev-perl/Crypt-X509 dev-perl/DBD-SQLite dev-perl/Data-GUID dev-perl/Data-ICal dev-perl/Date-Manip dev-perl/Devel-GlobalDestruction dev-perl/Email-Address dev-perl/Email-Address-List dev-perl/File-ShareDir dev-perl/File-Which dev-perl/GDGraph dev-perl/GDTextUtil dev-perl/GD[png,gif] dev-perl/GnuPG-Interface dev-perl/GraphViz dev-perl/HTML-Format dev-perl/HTML-FormatText-WithLinks-AndTables dev-perl/HTML-Mason-PSGIHandler dev-perl/HTML-Parser dev-perl/HTML-Quoted dev-perl/HTML-RewriteAttributes dev-perl/HTML-Tree dev-perl/IPC-Run3 dev-perl/JSON dev-perl/JavaScript-Minifier dev-perl/MIME-Types dev-perl/Module-Refresh dev-perl/Mozilla-CA dev-perl/Net-CIDR dev-perl/PerlIO-eol dev-perl/Plack dev-perl/Regexp-Common-net-CIDR dev-perl/Regexp-IPv6 dev-perl/Starlet dev-perl/String-ShellQuote dev-perl/TermReadKey dev-perl/Text-Autoformat dev-perl/Text-Password-Pronounceable dev-perl/Time-ParseDate dev-perl/TimeDate dev-perl/UNIVERSAL-require dev-perl/libwww-perl dev-perl/Locale-Maketext-Fuzzy dev-perl/Net-Server dev-perl/Regexp-Common dev-perl/Text-Template dev-perl/Text-Wrapper virtual/perl-Digest virtual/perl-File-Temp virtual/perl-Scalar-List-Utils virtual/perl-Time-HiRes virtual/perl-libnet fastcgi? ( dev-perl/FCGI dev-perl/FCGI-ProcManager ) !lighttpd? ( dev-perl/Apache-DBI !fastcgi? ( >=www-apache/mod_perl-2 ) ) lighttpd? ( dev-perl/FCGI ) mysql? ( >=dev-perl/DBD-mysql-2.1018 ) postgres? ( >=dev-perl/DBD-Pg-1.43 ) || ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=RT is an enterprise-grade ticketing system
-EAPI=5
-HOMEPAGE=http://www.bestpractical.com/rt/
-IUSE=mysql +postgres fastcgi lighttpd vhosts
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.10.1 >=dev-perl/Apache-Session-1.53 >=dev-perl/CGI-4 >=dev-perl/CSS-Squish-0.06 >=dev-perl/Class-Accessor-0.34 >=dev-perl/Class-ReturnValue-0.550.0-r1 >=dev-perl/DBI-1.37 >=dev-perl/Date-Extract-0.02 >=dev-perl/DateTime-Format-Natural-0.67 >=dev-perl/Devel-StackTrace-1.19 >=dev-perl/HTML-FormatText-WithLinks-0.14 >=dev-perl/HTML-Mason-1.43 >=dev-perl/HTML-Scrubber-0.08 >=dev-perl/HTTP-Server-Simple-0.34 >=dev-perl/HTTP-Server-Simple-Mason-0.14 >=dev-perl/Locale-Maketext-Lexicon-0.32 >=dev-perl/Log-Dispatch-2.410.0 >=dev-perl/MIME-tools-5.425 >=dev-perl/MailTools-1.60 >=dev-perl/Module-Versions-Report-1.05 >=dev-perl/Role-Basic-0.12 >=dev-perl/Symbol-Global-Name-0.04 >=dev-perl/Text-Quoted-2.80.0 >=dev-perl/Text-WikiFormat-0.76 >=dev-perl/Tree-Simple-1.04 >=dev-perl/XML-RSS-1.05 >=dev-perl/DBIx-SearchBuilder-1.660.0 >=virtual/perl-Digest-MD5-2.27 >=virtual/perl-Encode-2.730.0 >=virtual/perl-File-Spec-0.8 >=virtual/perl-Getopt-Long-2.24 >=virtual/perl-Locale-Maketext-1.06 >=virtual/perl-Storable-2.08 dev-perl/CGI-Emulate-PSGI dev-perl/CGI-PSGI dev-perl/Cache-Simple-TimedExpiry dev-perl/Calendar-Simple dev-perl/Convert-Color dev-perl/Crypt-Eksblowfish dev-perl/Crypt-SSLeay dev-perl/Crypt-X509 dev-perl/DBD-SQLite dev-perl/Data-GUID dev-perl/Data-ICal dev-perl/Date-Manip dev-perl/Devel-GlobalDestruction dev-perl/Email-Address dev-perl/Email-Address-List dev-perl/File-ShareDir dev-perl/File-Which dev-perl/GDGraph dev-perl/GDTextUtil dev-perl/GD[png,gif] dev-perl/GnuPG-Interface dev-perl/GraphViz dev-perl/HTML-Format dev-perl/HTML-FormatText-WithLinks-AndTables dev-perl/HTML-Mason-PSGIHandler dev-perl/HTML-Parser dev-perl/HTML-Quoted dev-perl/HTML-RewriteAttributes dev-perl/HTML-Tree dev-perl/IPC-Run3 dev-perl/JSON dev-perl/JavaScript-Minifier dev-perl/MIME-Types dev-perl/Module-Refresh dev-perl/Mozilla-CA dev-perl/Net-CIDR dev-perl/PerlIO-eol dev-perl/Plack dev-perl/Regexp-Common-net-CIDR dev-perl/Regexp-IPv6 dev-perl/Starlet dev-perl/String-ShellQuote dev-perl/TermReadKey dev-perl/Text-Autoformat dev-perl/Text-Password-Pronounceable dev-perl/Time-ParseDate dev-perl/TimeDate dev-perl/UNIVERSAL-require dev-perl/libwww-perl dev-perl/Locale-Maketext-Fuzzy dev-perl/Net-Server dev-perl/Regexp-Common dev-perl/Text-Template dev-perl/Text-Wrapper virtual/perl-Digest virtual/perl-File-Temp virtual/perl-Scalar-List-Utils virtual/perl-Time-HiRes virtual/perl-libnet fastcgi? ( dev-perl/FCGI dev-perl/FCGI-ProcManager ) !lighttpd? ( dev-perl/Apache-DBI !fastcgi? ( >=www-apache/mod_perl-2 ) ) lighttpd? ( dev-perl/FCGI ) mysql? ( >=dev-perl/DBD-mysql-2.1018 ) postgres? ( >=dev-perl/DBD-Pg-1.43 ) virtual/mta !lighttpd? ( =www-servers/apache-2* ) lighttpd? ( >=www-servers/lighttpd-1.3.13 sys-apps/openrc ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=^^ ( mysql postgres )
-RESTRICT=test
-SLOT=4.2.12-r1
-SRC_URI=http://download.bestpractical.com/pub/rt/release/rt-4.2.12.tar.gz
-_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=bff1c916a78476164bd4fb2b837124d5
diff --git a/metadata/md5-cache/www-apps/rt-4.2.12-r2 b/metadata/md5-cache/www-apps/rt-4.2.12-r2
new file mode 100644
index 000000000000..01477b7c7eeb
--- /dev/null
+++ b/metadata/md5-cache/www-apps/rt-4.2.12-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup
+DEPEND=>=dev-lang/perl-5.10.1 >=dev-perl/Apache-Session-1.53 >=dev-perl/CGI-4 >=dev-perl/CSS-Squish-0.06 >=dev-perl/Class-Accessor-0.34 >=dev-perl/Class-ReturnValue-0.550.0-r1 >=dev-perl/DBI-1.37 >=dev-perl/Date-Extract-0.02 >=dev-perl/DateTime-Format-Natural-0.67 >=dev-perl/Devel-StackTrace-1.19 >=dev-perl/HTML-FormatText-WithLinks-0.14 >=dev-perl/HTML-Mason-1.43 >=dev-perl/HTML-Scrubber-0.08 >=dev-perl/HTTP-Server-Simple-0.34 >=dev-perl/HTTP-Server-Simple-Mason-0.14 >=dev-perl/Locale-Maketext-Lexicon-0.32 >=dev-perl/Log-Dispatch-2.410.0 >=dev-perl/MIME-tools-5.425 >=dev-perl/MailTools-1.60 >=dev-perl/Module-Versions-Report-1.05 >=dev-perl/Role-Basic-0.12 >=dev-perl/Symbol-Global-Name-0.04 >=dev-perl/Text-Quoted-2.80.0 >=dev-perl/Text-WikiFormat-0.76 >=dev-perl/Tree-Simple-1.04 >=dev-perl/XML-RSS-1.05 >=dev-perl/DBIx-SearchBuilder-1.660.0 >=virtual/perl-Digest-MD5-2.27 >=virtual/perl-Encode-2.730.0 >=virtual/perl-File-Spec-0.8 >=virtual/perl-Getopt-Long-2.24 >=virtual/perl-Locale-Maketext-1.06 >=virtual/perl-Storable-2.08 dev-perl/CGI-Emulate-PSGI dev-perl/CGI-PSGI dev-perl/Cache-Simple-TimedExpiry dev-perl/Calendar-Simple dev-perl/Convert-Color dev-perl/Crypt-Eksblowfish dev-perl/Crypt-SSLeay dev-perl/Crypt-X509 dev-perl/DBD-SQLite dev-perl/Data-GUID dev-perl/Data-ICal dev-perl/Date-Manip dev-perl/Devel-GlobalDestruction dev-perl/Email-Address dev-perl/Email-Address-List dev-perl/File-ShareDir dev-perl/File-Which dev-perl/GDGraph dev-perl/GDTextUtil dev-perl/GD[png,gif] dev-perl/GnuPG-Interface dev-perl/GraphViz dev-perl/HTML-Formatter dev-perl/HTML-FormatText-WithLinks-AndTables dev-perl/HTML-Mason-PSGIHandler dev-perl/HTML-Parser dev-perl/HTML-Quoted dev-perl/HTML-RewriteAttributes dev-perl/HTML-Tree dev-perl/IPC-Run3 dev-perl/JSON dev-perl/JavaScript-Minifier dev-perl/MIME-Types dev-perl/Module-Refresh dev-perl/Mozilla-CA dev-perl/Net-CIDR dev-perl/PerlIO-eol dev-perl/Plack dev-perl/Regexp-Common-net-CIDR dev-perl/Regexp-IPv6 dev-perl/Starlet dev-perl/String-ShellQuote dev-perl/TermReadKey dev-perl/Text-Autoformat dev-perl/Text-Password-Pronounceable dev-perl/Time-ParseDate dev-perl/TimeDate dev-perl/UNIVERSAL-require dev-perl/libwww-perl dev-perl/Locale-Maketext-Fuzzy dev-perl/Net-Server dev-perl/Regexp-Common dev-perl/Text-Template dev-perl/Text-Wrapper virtual/perl-Digest virtual/perl-File-Temp virtual/perl-Scalar-List-Utils virtual/perl-Time-HiRes virtual/perl-libnet fastcgi? ( dev-perl/FCGI dev-perl/FCGI-ProcManager ) !lighttpd? ( dev-perl/Apache-DBI !fastcgi? ( >=www-apache/mod_perl-2 ) ) lighttpd? ( dev-perl/FCGI ) mysql? ( >=dev-perl/DBD-mysql-2.1018 ) postgres? ( >=dev-perl/DBD-Pg-1.43 ) || ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=RT is an enterprise-grade ticketing system
+EAPI=5
+HOMEPAGE=http://www.bestpractical.com/rt/
+IUSE=mysql +postgres fastcgi lighttpd vhosts
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.10.1 >=dev-perl/Apache-Session-1.53 >=dev-perl/CGI-4 >=dev-perl/CSS-Squish-0.06 >=dev-perl/Class-Accessor-0.34 >=dev-perl/Class-ReturnValue-0.550.0-r1 >=dev-perl/DBI-1.37 >=dev-perl/Date-Extract-0.02 >=dev-perl/DateTime-Format-Natural-0.67 >=dev-perl/Devel-StackTrace-1.19 >=dev-perl/HTML-FormatText-WithLinks-0.14 >=dev-perl/HTML-Mason-1.43 >=dev-perl/HTML-Scrubber-0.08 >=dev-perl/HTTP-Server-Simple-0.34 >=dev-perl/HTTP-Server-Simple-Mason-0.14 >=dev-perl/Locale-Maketext-Lexicon-0.32 >=dev-perl/Log-Dispatch-2.410.0 >=dev-perl/MIME-tools-5.425 >=dev-perl/MailTools-1.60 >=dev-perl/Module-Versions-Report-1.05 >=dev-perl/Role-Basic-0.12 >=dev-perl/Symbol-Global-Name-0.04 >=dev-perl/Text-Quoted-2.80.0 >=dev-perl/Text-WikiFormat-0.76 >=dev-perl/Tree-Simple-1.04 >=dev-perl/XML-RSS-1.05 >=dev-perl/DBIx-SearchBuilder-1.660.0 >=virtual/perl-Digest-MD5-2.27 >=virtual/perl-Encode-2.730.0 >=virtual/perl-File-Spec-0.8 >=virtual/perl-Getopt-Long-2.24 >=virtual/perl-Locale-Maketext-1.06 >=virtual/perl-Storable-2.08 dev-perl/CGI-Emulate-PSGI dev-perl/CGI-PSGI dev-perl/Cache-Simple-TimedExpiry dev-perl/Calendar-Simple dev-perl/Convert-Color dev-perl/Crypt-Eksblowfish dev-perl/Crypt-SSLeay dev-perl/Crypt-X509 dev-perl/DBD-SQLite dev-perl/Data-GUID dev-perl/Data-ICal dev-perl/Date-Manip dev-perl/Devel-GlobalDestruction dev-perl/Email-Address dev-perl/Email-Address-List dev-perl/File-ShareDir dev-perl/File-Which dev-perl/GDGraph dev-perl/GDTextUtil dev-perl/GD[png,gif] dev-perl/GnuPG-Interface dev-perl/GraphViz dev-perl/HTML-Formatter dev-perl/HTML-FormatText-WithLinks-AndTables dev-perl/HTML-Mason-PSGIHandler dev-perl/HTML-Parser dev-perl/HTML-Quoted dev-perl/HTML-RewriteAttributes dev-perl/HTML-Tree dev-perl/IPC-Run3 dev-perl/JSON dev-perl/JavaScript-Minifier dev-perl/MIME-Types dev-perl/Module-Refresh dev-perl/Mozilla-CA dev-perl/Net-CIDR dev-perl/PerlIO-eol dev-perl/Plack dev-perl/Regexp-Common-net-CIDR dev-perl/Regexp-IPv6 dev-perl/Starlet dev-perl/String-ShellQuote dev-perl/TermReadKey dev-perl/Text-Autoformat dev-perl/Text-Password-Pronounceable dev-perl/Time-ParseDate dev-perl/TimeDate dev-perl/UNIVERSAL-require dev-perl/libwww-perl dev-perl/Locale-Maketext-Fuzzy dev-perl/Net-Server dev-perl/Regexp-Common dev-perl/Text-Template dev-perl/Text-Wrapper virtual/perl-Digest virtual/perl-File-Temp virtual/perl-Scalar-List-Utils virtual/perl-Time-HiRes virtual/perl-libnet fastcgi? ( dev-perl/FCGI dev-perl/FCGI-ProcManager ) !lighttpd? ( dev-perl/Apache-DBI !fastcgi? ( >=www-apache/mod_perl-2 ) ) lighttpd? ( dev-perl/FCGI ) mysql? ( >=dev-perl/DBD-mysql-2.1018 ) postgres? ( >=dev-perl/DBD-Pg-1.43 ) virtual/mta !lighttpd? ( =www-servers/apache-2* ) lighttpd? ( >=www-servers/lighttpd-1.3.13 sys-apps/openrc ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=^^ ( mysql postgres )
+RESTRICT=test
+SLOT=4.2.12-r2
+SRC_URI=http://download.bestpractical.com/pub/rt/release/rt-4.2.12.tar.gz
+_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	webapp	a76ebd3cb5649737496e8238992dd7ca
+_md5_=2e3e8804abcff8ba8c265e4d130338c0
diff --git a/metadata/md5-cache/www-apps/rt-4.4.1 b/metadata/md5-cache/www-apps/rt-4.4.1
deleted file mode 100644
index 1ca071b8ccf2..000000000000
--- a/metadata/md5-cache/www-apps/rt-4.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup
-DEPEND=>=dev-lang/perl-5.10.1 >=dev-perl/Apache-Session-1.53 >=dev-perl/CGI-4 >=dev-perl/CSS-Squish-0.06 >=dev-perl/Class-Accessor-0.34 >=dev-perl/Class-ReturnValue-0.550.0-r1 >=dev-perl/DBI-1.37 >=dev-perl/Date-Extract-0.02 >=dev-perl/DateTime-Format-Natural-0.67 >=dev-perl/Devel-StackTrace-1.19 >=dev-perl/HTML-FormatText-WithLinks-0.14 >=dev-perl/HTML-Mason-1.43 >=dev-perl/HTML-Scrubber-0.08 >=dev-perl/HTTP-Server-Simple-0.34 >=dev-perl/HTTP-Server-Simple-Mason-0.14 >=dev-perl/Locale-Maketext-Lexicon-0.32 >=dev-perl/Log-Dispatch-2.410.0 >=dev-perl/MIME-tools-5.425 >=dev-perl/MailTools-1.60 >=dev-perl/Module-Versions-Report-1.05 >=dev-perl/Role-Basic-0.12 >=dev-perl/Symbol-Global-Name-0.04 >=dev-perl/Text-Quoted-2.80.0 >=dev-perl/Text-WikiFormat-0.76 >=dev-perl/Tree-Simple-1.04 >=dev-perl/XML-RSS-1.05 >=dev-perl/DBIx-SearchBuilder-1.660.0 >=virtual/perl-Digest-MD5-2.27 >=virtual/perl-Encode-2.730.0 >=virtual/perl-File-Spec-0.8 >=virtual/perl-Getopt-Long-2.24 >=virtual/perl-Locale-Maketext-1.06 >=virtual/perl-Storable-2.08 dev-perl/Business-Hours dev-perl/CGI-Emulate-PSGI dev-perl/CGI-PSGI dev-perl/Cache-Simple-TimedExpiry dev-perl/Calendar-Simple dev-perl/Convert-Color dev-perl/Crypt-Eksblowfish dev-perl/Crypt-SSLeay dev-perl/Crypt-X509 dev-perl/CSS-Minifier-XS dev-perl/Data-Page-Pageset dev-perl/DBD-SQLite dev-perl/Data-GUID dev-perl/Data-ICal dev-perl/Date-Manip dev-perl/Devel-GlobalDestruction dev-perl/Email-Address dev-perl/Email-Address-List dev-perl/File-ShareDir dev-perl/File-Which dev-perl/GDGraph dev-perl/GDTextUtil dev-perl/GD[png,gif] dev-perl/GnuPG-Interface dev-perl/GraphViz dev-perl/HTML-Format dev-perl/HTML-FormatText-WithLinks-AndTables dev-perl/HTML-Mason-PSGIHandler dev-perl/HTML-Parser dev-perl/HTML-Quoted dev-perl/HTML-RewriteAttributes dev-perl/HTML-Tree dev-perl/IPC-Run3 dev-perl/JSON dev-perl/JavaScript-Minifier-XS dev-perl/MIME-Types dev-perl/Module-Refresh dev-perl/Mozilla-CA dev-perl/Net-CIDR dev-perl/PerlIO-eol dev-perl/Plack dev-perl/Regexp-Common-net-CIDR dev-perl/Regexp-IPv6 dev-perl/Scope-Upper dev-perl/Starlet dev-perl/String-ShellQuote dev-perl/TermReadKey dev-perl/Text-Autoformat dev-perl/Text-Password-Pronounceable dev-perl/Time-ParseDate dev-perl/TimeDate dev-perl/UNIVERSAL-require dev-perl/libwww-perl dev-perl/Locale-Maketext-Fuzzy dev-perl/Net-IP dev-perl/Net-Server dev-perl/Regexp-Common dev-perl/Text-Template dev-perl/Text-Wrapper virtual/perl-Digest virtual/perl-File-Temp virtual/perl-Scalar-List-Utils virtual/perl-Time-HiRes virtual/perl-libnet fastcgi? ( dev-perl/FCGI dev-perl/FCGI-ProcManager ) !lighttpd? ( dev-perl/Apache-DBI !fastcgi? ( >=www-apache/mod_perl-2 ) ) lighttpd? ( dev-perl/FCGI ) mysql? ( >=dev-perl/DBD-mysql-2.1018 ) postgres? ( >=dev-perl/DBD-Pg-1.43 ) || ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=RT is an enterprise-grade ticketing system
-EAPI=5
-HOMEPAGE=http://www.bestpractical.com/rt/
-IUSE=mysql +postgres fastcgi lighttpd vhosts
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.10.1 >=dev-perl/Apache-Session-1.53 >=dev-perl/CGI-4 >=dev-perl/CSS-Squish-0.06 >=dev-perl/Class-Accessor-0.34 >=dev-perl/Class-ReturnValue-0.550.0-r1 >=dev-perl/DBI-1.37 >=dev-perl/Date-Extract-0.02 >=dev-perl/DateTime-Format-Natural-0.67 >=dev-perl/Devel-StackTrace-1.19 >=dev-perl/HTML-FormatText-WithLinks-0.14 >=dev-perl/HTML-Mason-1.43 >=dev-perl/HTML-Scrubber-0.08 >=dev-perl/HTTP-Server-Simple-0.34 >=dev-perl/HTTP-Server-Simple-Mason-0.14 >=dev-perl/Locale-Maketext-Lexicon-0.32 >=dev-perl/Log-Dispatch-2.410.0 >=dev-perl/MIME-tools-5.425 >=dev-perl/MailTools-1.60 >=dev-perl/Module-Versions-Report-1.05 >=dev-perl/Role-Basic-0.12 >=dev-perl/Symbol-Global-Name-0.04 >=dev-perl/Text-Quoted-2.80.0 >=dev-perl/Text-WikiFormat-0.76 >=dev-perl/Tree-Simple-1.04 >=dev-perl/XML-RSS-1.05 >=dev-perl/DBIx-SearchBuilder-1.660.0 >=virtual/perl-Digest-MD5-2.27 >=virtual/perl-Encode-2.730.0 >=virtual/perl-File-Spec-0.8 >=virtual/perl-Getopt-Long-2.24 >=virtual/perl-Locale-Maketext-1.06 >=virtual/perl-Storable-2.08 dev-perl/Business-Hours dev-perl/CGI-Emulate-PSGI dev-perl/CGI-PSGI dev-perl/Cache-Simple-TimedExpiry dev-perl/Calendar-Simple dev-perl/Convert-Color dev-perl/Crypt-Eksblowfish dev-perl/Crypt-SSLeay dev-perl/Crypt-X509 dev-perl/CSS-Minifier-XS dev-perl/Data-Page-Pageset dev-perl/DBD-SQLite dev-perl/Data-GUID dev-perl/Data-ICal dev-perl/Date-Manip dev-perl/Devel-GlobalDestruction dev-perl/Email-Address dev-perl/Email-Address-List dev-perl/File-ShareDir dev-perl/File-Which dev-perl/GDGraph dev-perl/GDTextUtil dev-perl/GD[png,gif] dev-perl/GnuPG-Interface dev-perl/GraphViz dev-perl/HTML-Format dev-perl/HTML-FormatText-WithLinks-AndTables dev-perl/HTML-Mason-PSGIHandler dev-perl/HTML-Parser dev-perl/HTML-Quoted dev-perl/HTML-RewriteAttributes dev-perl/HTML-Tree dev-perl/IPC-Run3 dev-perl/JSON dev-perl/JavaScript-Minifier-XS dev-perl/MIME-Types dev-perl/Module-Refresh dev-perl/Mozilla-CA dev-perl/Net-CIDR dev-perl/PerlIO-eol dev-perl/Plack dev-perl/Regexp-Common-net-CIDR dev-perl/Regexp-IPv6 dev-perl/Scope-Upper dev-perl/Starlet dev-perl/String-ShellQuote dev-perl/TermReadKey dev-perl/Text-Autoformat dev-perl/Text-Password-Pronounceable dev-perl/Time-ParseDate dev-perl/TimeDate dev-perl/UNIVERSAL-require dev-perl/libwww-perl dev-perl/Locale-Maketext-Fuzzy dev-perl/Net-IP dev-perl/Net-Server dev-perl/Regexp-Common dev-perl/Text-Template dev-perl/Text-Wrapper virtual/perl-Digest virtual/perl-File-Temp virtual/perl-Scalar-List-Utils virtual/perl-Time-HiRes virtual/perl-libnet fastcgi? ( dev-perl/FCGI dev-perl/FCGI-ProcManager ) !lighttpd? ( dev-perl/Apache-DBI !fastcgi? ( >=www-apache/mod_perl-2 ) ) lighttpd? ( dev-perl/FCGI ) mysql? ( >=dev-perl/DBD-mysql-2.1018 ) postgres? ( >=dev-perl/DBD-Pg-1.43 ) virtual/mta !lighttpd? ( =www-servers/apache-2* ) lighttpd? ( >=www-servers/lighttpd-1.3.13 sys-apps/openrc ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=^^ ( mysql postgres )
-RESTRICT=test
-SLOT=4.4.1
-SRC_URI=http://download.bestpractical.com/pub/rt/release/rt-4.4.1.tar.gz
-_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=1cc5b8abf976a85221cccb3b03b01cf1
diff --git a/metadata/md5-cache/www-apps/rt-4.4.1-r1 b/metadata/md5-cache/www-apps/rt-4.4.1-r1
new file mode 100644
index 000000000000..0497386d6c8a
--- /dev/null
+++ b/metadata/md5-cache/www-apps/rt-4.4.1-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup
+DEPEND=>=dev-lang/perl-5.10.1 >=dev-perl/Apache-Session-1.53 >=dev-perl/CGI-4 >=dev-perl/CSS-Squish-0.06 >=dev-perl/Class-Accessor-0.34 >=dev-perl/Class-ReturnValue-0.550.0-r1 >=dev-perl/DBI-1.37 >=dev-perl/Date-Extract-0.02 >=dev-perl/DateTime-Format-Natural-0.67 >=dev-perl/Devel-StackTrace-1.19 >=dev-perl/HTML-FormatText-WithLinks-0.14 >=dev-perl/HTML-Mason-1.43 >=dev-perl/HTML-Scrubber-0.08 >=dev-perl/HTTP-Server-Simple-0.34 >=dev-perl/HTTP-Server-Simple-Mason-0.14 >=dev-perl/Locale-Maketext-Lexicon-0.32 >=dev-perl/Log-Dispatch-2.410.0 >=dev-perl/MIME-tools-5.425 >=dev-perl/MailTools-1.60 >=dev-perl/Module-Versions-Report-1.05 >=dev-perl/Role-Basic-0.12 >=dev-perl/Symbol-Global-Name-0.04 >=dev-perl/Text-Quoted-2.80.0 >=dev-perl/Text-WikiFormat-0.76 >=dev-perl/Tree-Simple-1.04 >=dev-perl/XML-RSS-1.05 >=dev-perl/DBIx-SearchBuilder-1.660.0 >=virtual/perl-Digest-MD5-2.27 >=virtual/perl-Encode-2.730.0 >=virtual/perl-File-Spec-0.8 >=virtual/perl-Getopt-Long-2.24 >=virtual/perl-Locale-Maketext-1.06 >=virtual/perl-Storable-2.08 dev-perl/Business-Hours dev-perl/CGI-Emulate-PSGI dev-perl/CGI-PSGI dev-perl/Cache-Simple-TimedExpiry dev-perl/Calendar-Simple dev-perl/Convert-Color dev-perl/Crypt-Eksblowfish dev-perl/Crypt-SSLeay dev-perl/Crypt-X509 dev-perl/CSS-Minifier-XS dev-perl/Data-Page-Pageset dev-perl/DBD-SQLite dev-perl/Data-GUID dev-perl/Data-ICal dev-perl/Date-Manip dev-perl/Devel-GlobalDestruction dev-perl/Email-Address dev-perl/Email-Address-List dev-perl/File-ShareDir dev-perl/File-Which dev-perl/GDGraph dev-perl/GDTextUtil dev-perl/GD[png,gif] dev-perl/GnuPG-Interface dev-perl/GraphViz dev-perl/HTML-Formatter dev-perl/HTML-FormatText-WithLinks-AndTables dev-perl/HTML-Mason-PSGIHandler dev-perl/HTML-Parser dev-perl/HTML-Quoted dev-perl/HTML-RewriteAttributes dev-perl/HTML-Tree dev-perl/IPC-Run3 dev-perl/JSON dev-perl/JavaScript-Minifier-XS dev-perl/MIME-Types dev-perl/Module-Refresh dev-perl/Mozilla-CA dev-perl/Net-CIDR dev-perl/PerlIO-eol dev-perl/Plack dev-perl/Regexp-Common-net-CIDR dev-perl/Regexp-IPv6 dev-perl/Scope-Upper dev-perl/Starlet dev-perl/String-ShellQuote dev-perl/TermReadKey dev-perl/Text-Autoformat dev-perl/Text-Password-Pronounceable dev-perl/Time-ParseDate dev-perl/TimeDate dev-perl/UNIVERSAL-require dev-perl/libwww-perl dev-perl/Locale-Maketext-Fuzzy dev-perl/Net-IP dev-perl/Net-Server dev-perl/Regexp-Common dev-perl/Text-Template dev-perl/Text-Wrapper virtual/perl-Digest virtual/perl-File-Temp virtual/perl-Scalar-List-Utils virtual/perl-Time-HiRes virtual/perl-libnet fastcgi? ( dev-perl/FCGI dev-perl/FCGI-ProcManager ) !lighttpd? ( dev-perl/Apache-DBI !fastcgi? ( >=www-apache/mod_perl-2 ) ) lighttpd? ( dev-perl/FCGI ) mysql? ( >=dev-perl/DBD-mysql-2.1018 ) postgres? ( >=dev-perl/DBD-Pg-1.43 ) || ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=RT is an enterprise-grade ticketing system
+EAPI=5
+HOMEPAGE=http://www.bestpractical.com/rt/
+IUSE=mysql +postgres fastcgi lighttpd vhosts
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.10.1 >=dev-perl/Apache-Session-1.53 >=dev-perl/CGI-4 >=dev-perl/CSS-Squish-0.06 >=dev-perl/Class-Accessor-0.34 >=dev-perl/Class-ReturnValue-0.550.0-r1 >=dev-perl/DBI-1.37 >=dev-perl/Date-Extract-0.02 >=dev-perl/DateTime-Format-Natural-0.67 >=dev-perl/Devel-StackTrace-1.19 >=dev-perl/HTML-FormatText-WithLinks-0.14 >=dev-perl/HTML-Mason-1.43 >=dev-perl/HTML-Scrubber-0.08 >=dev-perl/HTTP-Server-Simple-0.34 >=dev-perl/HTTP-Server-Simple-Mason-0.14 >=dev-perl/Locale-Maketext-Lexicon-0.32 >=dev-perl/Log-Dispatch-2.410.0 >=dev-perl/MIME-tools-5.425 >=dev-perl/MailTools-1.60 >=dev-perl/Module-Versions-Report-1.05 >=dev-perl/Role-Basic-0.12 >=dev-perl/Symbol-Global-Name-0.04 >=dev-perl/Text-Quoted-2.80.0 >=dev-perl/Text-WikiFormat-0.76 >=dev-perl/Tree-Simple-1.04 >=dev-perl/XML-RSS-1.05 >=dev-perl/DBIx-SearchBuilder-1.660.0 >=virtual/perl-Digest-MD5-2.27 >=virtual/perl-Encode-2.730.0 >=virtual/perl-File-Spec-0.8 >=virtual/perl-Getopt-Long-2.24 >=virtual/perl-Locale-Maketext-1.06 >=virtual/perl-Storable-2.08 dev-perl/Business-Hours dev-perl/CGI-Emulate-PSGI dev-perl/CGI-PSGI dev-perl/Cache-Simple-TimedExpiry dev-perl/Calendar-Simple dev-perl/Convert-Color dev-perl/Crypt-Eksblowfish dev-perl/Crypt-SSLeay dev-perl/Crypt-X509 dev-perl/CSS-Minifier-XS dev-perl/Data-Page-Pageset dev-perl/DBD-SQLite dev-perl/Data-GUID dev-perl/Data-ICal dev-perl/Date-Manip dev-perl/Devel-GlobalDestruction dev-perl/Email-Address dev-perl/Email-Address-List dev-perl/File-ShareDir dev-perl/File-Which dev-perl/GDGraph dev-perl/GDTextUtil dev-perl/GD[png,gif] dev-perl/GnuPG-Interface dev-perl/GraphViz dev-perl/HTML-Formatter dev-perl/HTML-FormatText-WithLinks-AndTables dev-perl/HTML-Mason-PSGIHandler dev-perl/HTML-Parser dev-perl/HTML-Quoted dev-perl/HTML-RewriteAttributes dev-perl/HTML-Tree dev-perl/IPC-Run3 dev-perl/JSON dev-perl/JavaScript-Minifier-XS dev-perl/MIME-Types dev-perl/Module-Refresh dev-perl/Mozilla-CA dev-perl/Net-CIDR dev-perl/PerlIO-eol dev-perl/Plack dev-perl/Regexp-Common-net-CIDR dev-perl/Regexp-IPv6 dev-perl/Scope-Upper dev-perl/Starlet dev-perl/String-ShellQuote dev-perl/TermReadKey dev-perl/Text-Autoformat dev-perl/Text-Password-Pronounceable dev-perl/Time-ParseDate dev-perl/TimeDate dev-perl/UNIVERSAL-require dev-perl/libwww-perl dev-perl/Locale-Maketext-Fuzzy dev-perl/Net-IP dev-perl/Net-Server dev-perl/Regexp-Common dev-perl/Text-Template dev-perl/Text-Wrapper virtual/perl-Digest virtual/perl-File-Temp virtual/perl-Scalar-List-Utils virtual/perl-Time-HiRes virtual/perl-libnet fastcgi? ( dev-perl/FCGI dev-perl/FCGI-ProcManager ) !lighttpd? ( dev-perl/Apache-DBI !fastcgi? ( >=www-apache/mod_perl-2 ) ) lighttpd? ( dev-perl/FCGI ) mysql? ( >=dev-perl/DBD-mysql-2.1018 ) postgres? ( >=dev-perl/DBD-Pg-1.43 ) virtual/mta !lighttpd? ( =www-servers/apache-2* ) lighttpd? ( >=www-servers/lighttpd-1.3.13 sys-apps/openrc ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=^^ ( mysql postgres )
+RESTRICT=test
+SLOT=4.4.1-r1
+SRC_URI=http://download.bestpractical.com/pub/rt/release/rt-4.4.1.tar.gz
+_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	webapp	a76ebd3cb5649737496e8238992dd7ca
+_md5_=c52b2fc148d4b01b45f2909296c8b838
diff --git a/metadata/md5-cache/www-client/chromium-62.0.3202.75 b/metadata/md5-cache/www-client/chromium-62.0.3202.75
new file mode 100644
index 000000000000..d983c3d29511
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-62.0.3202.75
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.4.2:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-4.6.1 sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=6
+HOMEPAGE=http://chromium.org/
+IUSE=component-build cups gnome-keyring +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.4.2:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-62.0.3202.75.tar.xz
+_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fabc6994238c984ac9accfe506324d20
diff --git a/metadata/md5-cache/www-client/elinks-0.12_pre6-r2 b/metadata/md5-cache/www-client/elinks-0.12_pre6-r2
index 21457464b1e1..cc5a8dcb16ef 100644
--- a/metadata/md5-cache/www-client/elinks-0.12_pre6-r2
+++ b/metadata/md5-cache/www-client/elinks-0.12_pre6-r2
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://elinks.or.cz/download/elinks-0.12pre6.tar.bz2 https://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2 https://dev.gentoo.org/~axs/distfiles/elinks-0.12_pre5-js185-patches.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a66c5e7e299204c140dd6ced1f7cda5c
+_md5_=9b824dc9ae64d790e18917e15410ab1e
diff --git a/metadata/md5-cache/www-client/elinks-0.12_pre6-r3 b/metadata/md5-cache/www-client/elinks-0.12_pre6-r3
new file mode 100644
index 000000000000..4f53620649c6
--- /dev/null
+++ b/metadata/md5-cache/www-client/elinks-0.12_pre6-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=bzip2? ( >=app-arch/bzip2-1.0.2 ) gc? ( dev-libs/boehm-gc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) xml? ( >=dev-libs/expat-1.95.4 ) X? ( x11-libs/libX11 x11-libs/libXt ) zlib? ( >=sys-libs/zlib-1.1.4 ) lua? ( >=dev-lang/lua-5:0= ) gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) idn? ( net-dns/libidn ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* ) samba? ( net-fs/samba ) tre? ( dev-libs/tre ) javascript? ( >=dev-lang/spidermonkey-1.8.5:0= ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Advanced and well-established text-mode web browser
+EAPI=6
+HOMEPAGE=http://elinks.or.cz/
+IUSE=bittorrent bzip2 debug finger ftp gc gopher gpm guile idn ipv6 javascript libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=bzip2? ( >=app-arch/bzip2-1.0.2 ) gc? ( dev-libs/boehm-gc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) xml? ( >=dev-libs/expat-1.95.4 ) X? ( x11-libs/libX11 x11-libs/libXt ) zlib? ( >=sys-libs/zlib-1.1.4 ) lua? ( >=dev-lang/lua-5:0= ) gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) idn? ( net-dns/libidn ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* ) samba? ( net-fs/samba ) tre? ( dev-libs/tre ) javascript? ( >=dev-lang/spidermonkey-1.8.5:0= )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://elinks.or.cz/download/elinks-0.12pre6.tar.bz2 https://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2 https://dev.gentoo.org/~axs/distfiles/elinks-0.12_pre5-js185-patches.tar.bz2
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=81b7a4e0180c851a07d6ff0333eb3fb1
diff --git a/metadata/md5-cache/www-client/elinks-9999 b/metadata/md5-cache/www-client/elinks-9999
index 8933e8fb4da7..a8d96484690e 100644
--- a/metadata/md5-cache/www-client/elinks-9999
+++ b/metadata/md5-cache/www-client/elinks-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gc? ( dev-libs/boehm-gc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) xml? ( >=dev-libs/expat-1.95.4 ) X? ( x11-libs/libX11 x11-libs/libXt ) zlib? ( >=sys-libs/zlib-1.1.4 ) lua? ( >=dev-lang/lua-5:0= ) gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) idn? ( net-dns/libidn ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* ) samba? ( net-fs/samba ) javascript? ( >=dev-lang/spidermonkey-1.8.5:0= ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
+DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) brotli? ( app-arch/brotli ) bzip2? ( >=app-arch/bzip2-1.0.2 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) xml? ( >=dev-libs/expat-1.95.4 ) X? ( x11-libs/libX11 x11-libs/libXt ) zlib? ( >=sys-libs/zlib-1.1.4 ) lua? ( >=dev-lang/lua-5:0= ) gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) idn? ( net-dns/libidn ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* ) samba? ( net-fs/samba ) tre? ( dev-libs/tre ) javascript? ( >=dev-lang/spidermonkey-1.8.5:0= ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Advanced and well-established text-mode web browser
-EAPI=5
+EAPI=6
 HOMEPAGE=http://elinks.or.cz/
-IUSE=bittorrent bzip2 debug finger ftp gc gopher gpm guile idn ipv6 javascript libressl lua +mouse nls nntp perl ruby samba ssl unicode X xml zlib
+IUSE=bittorrent brotli bzip2 debug finger ftp gopher gpm guile idn ipv6 javascript libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib
 LICENSE=GPL-2
-RDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gc? ( dev-libs/boehm-gc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) xml? ( >=dev-libs/expat-1.95.4 ) X? ( x11-libs/libX11 x11-libs/libXt ) zlib? ( >=sys-libs/zlib-1.1.4 ) lua? ( >=dev-lang/lua-5:0= ) gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) idn? ( net-dns/libidn ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* ) samba? ( net-fs/samba ) javascript? ( >=dev-lang/spidermonkey-1.8.5:0= )
+RDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) brotli? ( app-arch/brotli ) bzip2? ( >=app-arch/bzip2-1.0.2 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) xml? ( >=dev-libs/expat-1.95.4 ) X? ( x11-libs/libX11 x11-libs/libXt ) zlib? ( >=sys-libs/zlib-1.1.4 ) lua? ( >=dev-lang/lua-5:0= ) gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) idn? ( net-dns/libidn ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* ) samba? ( net-fs/samba ) tre? ( dev-libs/tre ) javascript? ( >=dev-lang/spidermonkey-1.8.5:0= )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=70b054e8687671cec170f0c8a5a9d5d0
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	git-r3	52a888802d25387c2c74cb845d1219bc	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=2df37a2ed50f64eda42b47a42f776883
diff --git a/metadata/md5-cache/www-client/epiphany-3.24.4 b/metadata/md5-cache/www-client/epiphany-3.24.4
deleted file mode 100644
index 72d00bd91e78..000000000000
--- a/metadata/md5-cache/www-client/epiphany-3.24.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.46.0:2[dbus] >=x11-libs/gtk+-3.22.13:3 >=net-libs/webkit-gtk-2.15.90:4= >=x11-libs/cairo-1.2 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 >=gnome-base/gnome-desktop-2.91.2:3= dev-libs/icu:= >=dev-libs/json-glib-1.2.0 >=x11-libs/libnotify-0.5.1:= >=app-crypt/libsecret-0.14 >=net-libs/libsoup-2.48:2.4 >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 dev-db/sqlite:3 >=app-text/iso-codes-0.35 >=gnome-base/gsettings-desktop-schemas-0.0.1 app-text/yelp-tools dev-libs/appstream-glib sys-apps/paxctl >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=GNOME webbrowser based on Webkit
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Web
-IUSE=test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/glib-2.46.0:2[dbus] >=x11-libs/gtk+-3.22.13:3 >=net-libs/webkit-gtk-2.15.90:4= >=x11-libs/cairo-1.2 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 >=gnome-base/gnome-desktop-2.91.2:3= dev-libs/icu:= >=dev-libs/json-glib-1.2.0 >=x11-libs/libnotify-0.5.1:= >=app-crypt/libsecret-0.14 >=net-libs/libsoup-2.48:2.4 >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 dev-db/sqlite:3 >=app-text/iso-codes-0.35 >=gnome-base/gsettings-desktop-schemas-0.0.1 x11-themes/adwaita-icon-theme !www-client/epiphany-extensions
-SLOT=0
-SRC_URI=mirror://gnome/sources/epiphany/3.24/epiphany-3.24.4.tar.xz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5bc993806e2a7cd08dacb0d0dcaad53c
diff --git a/metadata/md5-cache/www-client/epiphany-3.24.5 b/metadata/md5-cache/www-client/epiphany-3.24.5
new file mode 100644
index 000000000000..3a60d31ab434
--- /dev/null
+++ b/metadata/md5-cache/www-client/epiphany-3.24.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.46.0:2[dbus] >=x11-libs/gtk+-3.22.13:3 >=net-libs/webkit-gtk-2.15.90:4= >=x11-libs/cairo-1.2 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 >=gnome-base/gnome-desktop-2.91.2:3= dev-libs/icu:= >=x11-libs/libnotify-0.5.1:= >=app-crypt/libsecret-0.14 >=net-libs/libsoup-2.48:2.4 >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 dev-db/sqlite:3 >=app-text/iso-codes-0.35 >=gnome-base/gsettings-desktop-schemas-0.0.1 app-text/yelp-tools dev-libs/appstream-glib sys-apps/paxctl >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=GNOME webbrowser based on Webkit
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Web
+IUSE=test test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.46.0:2[dbus] >=x11-libs/gtk+-3.22.13:3 >=net-libs/webkit-gtk-2.15.90:4= >=x11-libs/cairo-1.2 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 >=gnome-base/gnome-desktop-2.91.2:3= dev-libs/icu:= >=x11-libs/libnotify-0.5.1:= >=app-crypt/libsecret-0.14 >=net-libs/libsoup-2.48:2.4 >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 dev-db/sqlite:3 >=app-text/iso-codes-0.35 >=gnome-base/gsettings-desktop-schemas-0.0.1 x11-themes/adwaita-icon-theme !www-client/epiphany-extensions
+SLOT=0
+SRC_URI=mirror://gnome/sources/epiphany/3.24/epiphany-3.24.5.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=08d61e33edbf6dd99754e9032407bc11
diff --git a/metadata/md5-cache/www-client/google-chrome-62.0.3202.62 b/metadata/md5-cache/www-client/google-chrome-62.0.3202.62
deleted file mode 100644
index 80da31000e6c..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-62.0.3202.62
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=The web browser from Google
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+plugins +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* amd64
-LICENSE=google-chrome
-RDEPEND=app-arch/bzip2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 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 >=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/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_62.0.3202.62-1_amd64.deb
-_eclasses_=chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=566f41fcc29dce056b7a044300805704
diff --git a/metadata/md5-cache/www-client/google-chrome-62.0.3202.75 b/metadata/md5-cache/www-client/google-chrome-62.0.3202.75
new file mode 100644
index 000000000000..abb515bf7fce
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-62.0.3202.75
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=The web browser from Google
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+plugins +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* amd64
+LICENSE=google-chrome
+RDEPEND=app-arch/bzip2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 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 >=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/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_62.0.3202.75-1_amd64.deb
+_eclasses_=chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=566f41fcc29dce056b7a044300805704
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-62.0.3202.62 b/metadata/md5-cache/www-client/google-chrome-beta-62.0.3202.62
deleted file mode 100644
index 800f91dcae71..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-beta-62.0.3202.62
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=The web browser from Google
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+plugins +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=app-arch/bzip2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 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 >=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/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_62.0.3202.62-1_amd64.deb
-_eclasses_=chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6cdf7c4d2429baad20b9cfbd73d530cd
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-63.0.3239.18 b/metadata/md5-cache/www-client/google-chrome-beta-63.0.3239.18
new file mode 100644
index 000000000000..ad3233799f53
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-beta-63.0.3239.18
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=The web browser from Google
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+plugins +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=app-arch/bzip2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 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 >=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/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_63.0.3239.18-1_amd64.deb
+_eclasses_=chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6cdf7c4d2429baad20b9cfbd73d530cd
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-63.0.3236.7 b/metadata/md5-cache/www-client/google-chrome-unstable-63.0.3236.7
deleted file mode 100644
index 2f8d3dc217a8..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-unstable-63.0.3236.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=The web browser from Google
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+plugins +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=app-arch/bzip2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 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 >=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/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_63.0.3236.7-1_amd64.deb
-_eclasses_=chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6cdf7c4d2429baad20b9cfbd73d530cd
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-64.0.3251.0 b/metadata/md5-cache/www-client/google-chrome-unstable-64.0.3251.0
new file mode 100644
index 000000000000..cab1290d42e0
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-64.0.3251.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=The web browser from Google
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+plugins +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=app-arch/bzip2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 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 >=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/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_64.0.3251.0-1_amd64.deb
+_eclasses_=chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6cdf7c4d2429baad20b9cfbd73d530cd
diff --git a/metadata/md5-cache/www-client/opera-48.0.2685.39 b/metadata/md5-cache/www-client/opera-48.0.2685.39
deleted file mode 100644
index 190615f3cf0d..000000000000
--- a/metadata/md5-cache/www-client/opera-48.0.2685.39
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=5
-HOMEPAGE=http://www.opera.com/
-IUSE=+l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
-SLOT=0
-SRC_URI=http://download1.operacdn.com/pub/opera/desktop/48.0.2685.39/linux/opera-stable_48.0.2685.39_amd64.deb http://download2.operacdn.com/pub/opera/desktop/48.0.2685.39/linux/opera-stable_48.0.2685.39_amd64.deb http://download3.operacdn.com/pub/opera/desktop/48.0.2685.39/linux/opera-stable_48.0.2685.39_amd64.deb http://download4.operacdn.com/pub/opera/desktop/48.0.2685.39/linux/opera-stable_48.0.2685.39_amd64.deb
-_eclasses_=chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=7a5314a73caa178adc7cf4c9e41a354a
diff --git a/metadata/md5-cache/www-client/opera-48.0.2685.52-r1 b/metadata/md5-cache/www-client/opera-48.0.2685.52-r1
new file mode 100644
index 000000000000..50f796857fa6
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-48.0.2685.52-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=A fast and secure web browser
+EAPI=5
+HOMEPAGE=http://www.opera.com/
+IUSE=+l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64
+LICENSE=OPERA-2014
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
+SLOT=0
+SRC_URI=http://download1.operacdn.com/pub/opera/desktop/48.0.2685.52/linux/opera-stable_48.0.2685.52_amd64.deb http://download2.operacdn.com/pub/opera/desktop/48.0.2685.52/linux/opera-stable_48.0.2685.52_amd64.deb http://download3.operacdn.com/pub/opera/desktop/48.0.2685.52/linux/opera-stable_48.0.2685.52_amd64.deb http://download4.operacdn.com/pub/opera/desktop/48.0.2685.52/linux/opera-stable_48.0.2685.52_amd64.deb
+_eclasses_=chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=33d594c0ed068eb4da2121866821040d
diff --git a/metadata/md5-cache/www-client/opera-beta-49.0.2725.18 b/metadata/md5-cache/www-client/opera-beta-49.0.2725.18
deleted file mode 100644
index cad49973a1ea..000000000000
--- a/metadata/md5-cache/www-client/opera-beta-49.0.2725.18
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=5
-HOMEPAGE=http://www.opera.com/
-IUSE=+l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
-SLOT=0
-SRC_URI=amd64? ( http://download1.operacdn.com/pub/opera-beta/49.0.2725.18/linux/opera-beta_49.0.2725.18_amd64.deb http://download2.operacdn.com/pub/opera-beta/49.0.2725.18/linux/opera-beta_49.0.2725.18_amd64.deb http://download3.operacdn.com/pub/opera-beta/49.0.2725.18/linux/opera-beta_49.0.2725.18_amd64.deb http://download4.operacdn.com/pub/opera-beta/49.0.2725.18/linux/opera-beta_49.0.2725.18_amd64.deb )
-_eclasses_=chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=cb5a936376dbfd4b3baa37d419ce9c09
diff --git a/metadata/md5-cache/www-client/opera-beta-49.0.2725.27-r1 b/metadata/md5-cache/www-client/opera-beta-49.0.2725.27-r1
new file mode 100644
index 000000000000..27303dfcaec2
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-beta-49.0.2725.27-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=A fast and secure web browser
+EAPI=5
+HOMEPAGE=http://www.opera.com/
+IUSE=+l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64
+LICENSE=OPERA-2014
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
+SLOT=0
+SRC_URI=amd64? ( http://download1.operacdn.com/pub/opera-beta/49.0.2725.27/linux/opera-beta_49.0.2725.27_amd64.deb http://download2.operacdn.com/pub/opera-beta/49.0.2725.27/linux/opera-beta_49.0.2725.27_amd64.deb http://download3.operacdn.com/pub/opera-beta/49.0.2725.27/linux/opera-beta_49.0.2725.27_amd64.deb http://download4.operacdn.com/pub/opera-beta/49.0.2725.27/linux/opera-beta_49.0.2725.27_amd64.deb )
+_eclasses_=chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a6d32e775c69bfd0749142d0a327c22d
diff --git a/metadata/md5-cache/www-client/opera-developer-50.0.2739.0 b/metadata/md5-cache/www-client/opera-developer-50.0.2739.0
deleted file mode 100644
index a33db660fb6d..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-50.0.2739.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=5
-HOMEPAGE=http://www.opera.com/
-IUSE=+l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
-SLOT=0
-SRC_URI=amd64? ( http://download1.operacdn.com/pub/opera-developer/50.0.2739.0/linux/opera-developer_50.0.2739.0_amd64.deb http://download2.operacdn.com/pub/opera-developer/50.0.2739.0/linux/opera-developer_50.0.2739.0_amd64.deb http://download3.operacdn.com/pub/opera-developer/50.0.2739.0/linux/opera-developer_50.0.2739.0_amd64.deb http://download4.operacdn.com/pub/opera-developer/50.0.2739.0/linux/opera-developer_50.0.2739.0_amd64.deb )
-_eclasses_=chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=5e4ec924fb9b28e0f603f1d16d45593a
diff --git a/metadata/md5-cache/www-client/opera-developer-50.0.2753.0-r1 b/metadata/md5-cache/www-client/opera-developer-50.0.2753.0-r1
new file mode 100644
index 000000000000..97334bcdf6a7
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-developer-50.0.2753.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=A fast and secure web browser
+EAPI=5
+HOMEPAGE=http://www.opera.com/
+IUSE=+l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64
+LICENSE=OPERA-2014
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
+SLOT=0
+SRC_URI=amd64? ( http://download1.operacdn.com/pub/opera-developer/50.0.2753.0/linux/opera-developer_50.0.2753.0_amd64.deb http://download2.operacdn.com/pub/opera-developer/50.0.2753.0/linux/opera-developer_50.0.2753.0_amd64.deb http://download3.operacdn.com/pub/opera-developer/50.0.2753.0/linux/opera-developer_50.0.2753.0_amd64.deb http://download4.operacdn.com/pub/opera-developer/50.0.2753.0/linux/opera-developer_50.0.2753.0_amd64.deb )
+_eclasses_=chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2f289653ba805aca8e89ce3ba7355cb9
diff --git a/metadata/md5-cache/www-client/qutebrowser-0.8.4 b/metadata/md5-cache/www-client/qutebrowser-0.8.4
deleted file mode 100644
index 01114809ad66..000000000000
--- a/metadata/md5-cache/www-client/qutebrowser-0.8.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-text/asciidoc test? ( dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=sys-apps/sed-4 python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A keyboard-driven, vim-like browser based on PyQt5 and QtWebKit
-EAPI=6
-HOMEPAGE=http://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser
-IUSE=gstreamer test python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cssutils-1.0.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jinja-2.8[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pygments-2.1.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pypeg2-2.15.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/PyQt5[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),gui,network,printsupport,webkit,widgets] dev-python/sip[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyyaml-3.11[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] gstreamer? ( dev-qt/qtwebkit:5[gstreamer] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/The-Compiler/qutebrowser/releases/download/v0.8.4/qutebrowser-0.8.4.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dabc24679a4766659c56c446662a3e38
diff --git a/metadata/md5-cache/www-client/qutebrowser-1.0.2 b/metadata/md5-cache/www-client/qutebrowser-1.0.2
new file mode 100644
index 000000000000..0059c310ce0c
--- /dev/null
+++ b/metadata/md5-cache/www-client/qutebrowser-1.0.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-text/asciidoc test? ( dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4
+DESCRIPTION=A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine
+EAPI=6
+HOMEPAGE=https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser
+IUSE=test python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/attrs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.8[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.1.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pypeg2-2.15.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/PyQt5-5.7.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),declarative,gui,network,opengl,printsupport,sql,webengine,widgets] >=dev-python/pyyaml-3.12[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v1.0.2/qutebrowser-1.0.2.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=719e566d331c7f1822cb1dca2e77ce3a
diff --git a/metadata/md5-cache/www-client/qutebrowser-9999 b/metadata/md5-cache/www-client/qutebrowser-9999
index f70ca4940696..5989a4fad071 100644
--- a/metadata/md5-cache/www-client/qutebrowser-9999
+++ b/metadata/md5-cache/www-client/qutebrowser-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-text/asciidoc test? ( dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=sys-apps/sed-4 python_targets_python3_4? ( dev-lang/python:3.4 ) 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1
-DESCRIPTION=A keyboard-driven, vim-like browser based on PyQt5 and QtWebKit / QtWebEngine
+DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-text/asciidoc test? ( dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine
 EAPI=6
 HOMEPAGE=https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser
-IUSE=gstreamer test webengine +webkit python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python3_5 python_targets_python3_6
 LICENSE=GPL-3
-RDEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cssutils-1.0.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.8[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.1.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pypeg2-2.15.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/PyQt5[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),declarative,gui,network,printsupport,webengine?,webkit?,widgets] dev-python/sip[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.12[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] gstreamer? ( dev-qt/qtwebkit:5[gstreamer] ) webengine? ( >=dev-python/PyQt5-5.7.1 >=dev-qt/qtwebengine-5.7.1:5 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( webengine webkit ) || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/attrs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.8[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.1.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pypeg2-2.15.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/PyQt5-5.7.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),declarative,gui,network,opengl,printsupport,sql,webengine,widgets] >=dev-python/pyyaml-3.12[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	git-r3	52a888802d25387c2c74cb845d1219bc	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0b57955c2ef03050f341fd358d881c20
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	git-r3	52a888802d25387c2c74cb845d1219bc	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8bb41af4e8829c67041ac9ebb874c4ec
diff --git a/metadata/md5-cache/www-client/vivaldi-1.12.955.36_p1 b/metadata/md5-cache/www-client/vivaldi-1.12.955.36_p1
deleted file mode 100644
index 7535a3d1001f..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-1.12.955.36_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare setup unpack
-DEPEND=virtual/libiconv
-DESCRIPTION=A new browser for our friends
-EAPI=5
-HOMEPAGE=http://vivaldi.com/
-IUSE=+l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* amd64 x86
-LICENSE=Vivaldi
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss >=dev-libs/openssl-1.0.1:0 gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_1.12.955.36-1_amd64.deb -> vivaldi-1.12.955.36_p1-amd64.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_1.12.955.36-1_i386.deb -> vivaldi-1.12.955.36_p1-i386.deb )
-_eclasses_=chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=3a27955a58a26324441cef9b20dad724
diff --git a/metadata/md5-cache/www-client/vivaldi-1.12.955.38_p1 b/metadata/md5-cache/www-client/vivaldi-1.12.955.38_p1
index 2e7ca7461900..667671553f7e 100644
--- a/metadata/md5-cache/www-client/vivaldi-1.12.955.38_p1
+++ b/metadata/md5-cache/www-client/vivaldi-1.12.955.38_p1
@@ -4,11 +4,11 @@ DESCRIPTION=A new browser for our friends
 EAPI=5
 HOMEPAGE=http://vivaldi.com/
 IUSE=+l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=Vivaldi
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss >=dev-libs/openssl-1.0.1:0 gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_1.12.955.38-1_amd64.deb -> vivaldi-1.12.955.38_p1-amd64.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_1.12.955.38-1_i386.deb -> vivaldi-1.12.955.38_p1-i386.deb )
 _eclasses_=chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d5d4c166028c1dc2fbf83f17caaf3691
+_md5_=3a27955a58a26324441cef9b20dad724
diff --git a/metadata/md5-cache/www-client/vivaldi-1.12.955.42_p1-r1 b/metadata/md5-cache/www-client/vivaldi-1.12.955.42_p1-r1
new file mode 100644
index 000000000000..be07baae3aa6
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-1.12.955.42_p1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=virtual/libiconv >=sys-apps/sed-4
+DESCRIPTION=A new browser for our friends
+EAPI=5
+HOMEPAGE=http://vivaldi.com/
+IUSE=+l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=Vivaldi
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss >=dev-libs/openssl-1.0.1:0 gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_1.12.955.42-1_amd64.deb -> vivaldi-1.12.955.42_p1-amd64.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_1.12.955.42-1_i386.deb -> vivaldi-1.12.955.42_p1-i386.deb )
+_eclasses_=chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ff3ccfac14ad7fedffda509eba43387e
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-1.13.966.3_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-1.13.966.3_p1
deleted file mode 100644
index 8da683c68e76..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-1.13.966.3_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare setup unpack
-DEPEND=virtual/libiconv
-DESCRIPTION=A new browser for our friends
-EAPI=5
-HOMEPAGE=http://vivaldi.com/
-IUSE=+l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=Vivaldi
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss >=dev-libs/openssl-1.0.1:0 gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.13.966.3-1_amd64.deb -> vivaldi-snapshot-1.13.966.3_p1-amd64.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.13.966.3-1_i386.deb -> vivaldi-snapshot-1.13.966.3_p1-i386.deb )
-_eclasses_=chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ca6222c645332663d7c7628683843f9f
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-1.13.997.3_p1-r1 b/metadata/md5-cache/www-client/vivaldi-snapshot-1.13.997.3_p1-r1
new file mode 100644
index 000000000000..f74577693a93
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-1.13.997.3_p1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup unpack
+DEPEND=virtual/libiconv
+DESCRIPTION=A new browser for our friends
+EAPI=5
+HOMEPAGE=http://vivaldi.com/
+IUSE=+l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=Vivaldi
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss >=dev-libs/openssl-1.0.1:0 gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.13.997.3-1_amd64.deb -> vivaldi-snapshot-1.13.997.3_p1-amd64.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.13.997.3-1_i386.deb -> vivaldi-snapshot-1.13.997.3_p1-i386.deb )
+_eclasses_=chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d6bd36e57f34fa879cdccf7f2a051ec9
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-1.13.998.3_p1-r1 b/metadata/md5-cache/www-client/vivaldi-snapshot-1.13.998.3_p1-r1
new file mode 100644
index 000000000000..e339c73165fb
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-1.13.998.3_p1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=virtual/libiconv >=sys-apps/sed-4
+DESCRIPTION=A new browser for our friends
+EAPI=5
+HOMEPAGE=http://vivaldi.com/
+IUSE=+l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=Vivaldi
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss >=dev-libs/openssl-1.0.1:0 gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.13.998.3-1_amd64.deb -> vivaldi-snapshot-1.13.998.3_p1-amd64.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.13.998.3-1_i386.deb -> vivaldi-snapshot-1.13.998.3_p1-i386.deb )
+_eclasses_=chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=91cbaac6aabd63bff6bbfc566193477b
diff --git a/metadata/md5-cache/www-misc/htdig-3.2.0_beta6-r5 b/metadata/md5-cache/www-misc/htdig-3.2.0_beta6-r5
index 3e43ee8dd4f2..a7ccec8a68d0 100644
--- a/metadata/md5-cache/www-misc/htdig-3.2.0_beta6-r5
+++ b/metadata/md5-cache/www-misc/htdig-3.2.0_beta6-r5
@@ -4,9 +4,9 @@ DESCRIPTION=HTTP/HTML indexing and searching system
 EAPI=6
 HOMEPAGE=http://www.htdig.org
 IUSE=libressl ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.htdig.org/files/htdig-3.2.0b6.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=2ad01fe52b5ef5369edbe68064357a68
+_md5_=6479ece9a81e94c4bafedfbc8280523f
diff --git a/metadata/md5-cache/www-plugins/adobe-flash-27.0.0.170 b/metadata/md5-cache/www-plugins/adobe-flash-27.0.0.170
deleted file mode 100644
index f5372998aba9..000000000000
--- a/metadata/md5-cache/www-plugins/adobe-flash-27.0.0.170
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm test unpack
-DEPEND=>=sys-apps/sed-4 app-arch/unzip
-DESCRIPTION=Adobe Flash Player
-EAPI=6
-HOMEPAGE=https://www.adobe.com/products/flashplayer.html https://get.adobe.com/flashplayer/ https://helpx.adobe.com/security/products/flash-player.html
-IUSE=+nsplugin +ppapi 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=-* amd64 x86
-LICENSE=AdobeFlash-11.x
-RDEPEND=!www-plugins/chrome-binary-plugins[flash(-)] nsplugin? ( dev-libs/atk[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/glib: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(-)?] dev-libs/nspr[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/nss[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/fontconfig[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/freetype[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/glibc-2.4 x11-libs/cairo[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/gdk-pixbuf[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/gtk+: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/libX11[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/libXcursor[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[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/libXrender[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/libXt[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/pango[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(-)?] !www-plugins/adobe-flash:0 )
-REQUIRED_USE=|| ( nsplugin ppapi )
-RESTRICT=strip mirror
-SLOT=22
-SRC_URI=nsplugin? ( abi_x86_32? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/27.0.0.170/flash_player_npapi_linux.i386.tar.gz -> adobe-flash-27.0.0.170-npapi.i386.tar.gz ) abi_x86_64? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/27.0.0.170/flash_player_npapi_linux.x86_64.tar.gz -> adobe-flash-27.0.0.170-npapi.x86_64.tar.gz ) ) ppapi? ( abi_x86_32? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/27.0.0.170/flash_player_ppapi_linux.i386.tar.gz -> adobe-flash-27.0.0.170-ppapi.i386.tar.gz ) abi_x86_64? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/27.0.0.170/flash_player_ppapi_linux.x86_64.tar.gz -> adobe-flash-27.0.0.170-ppapi.x86_64.tar.gz ) )
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	e5d920147bfccf4930062e462e2a417d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	nsplugins	2049586e425364a1c5bdb004205d1758	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=599c09e5a8b798188eaea58d9068f453
diff --git a/metadata/md5-cache/www-plugins/adobe-flash-27.0.0.183 b/metadata/md5-cache/www-plugins/adobe-flash-27.0.0.183
new file mode 100644
index 000000000000..9138f46a09d8
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/adobe-flash-27.0.0.183
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm test unpack
+DEPEND=>=sys-apps/sed-4 app-arch/unzip
+DESCRIPTION=Adobe Flash Player
+EAPI=6
+HOMEPAGE=https://www.adobe.com/products/flashplayer.html https://get.adobe.com/flashplayer/ https://helpx.adobe.com/security/products/flash-player.html
+IUSE=+nsplugin +ppapi 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=-* amd64 x86
+LICENSE=AdobeFlash-11.x
+RDEPEND=!www-plugins/chrome-binary-plugins[flash(-)] nsplugin? ( dev-libs/atk[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/glib: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(-)?] dev-libs/nspr[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/nss[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/fontconfig[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/freetype[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/glibc-2.4 x11-libs/cairo[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/gdk-pixbuf[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/gtk+: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/libX11[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/libXcursor[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[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/libXrender[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/libXt[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/pango[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(-)?] !www-plugins/adobe-flash:0 )
+REQUIRED_USE=|| ( nsplugin ppapi )
+RESTRICT=strip mirror
+SLOT=22
+SRC_URI=nsplugin? ( abi_x86_32? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/27.0.0.183/flash_player_npapi_linux.i386.tar.gz -> adobe-flash-27.0.0.183-npapi.i386.tar.gz ) abi_x86_64? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/27.0.0.183/flash_player_npapi_linux.x86_64.tar.gz -> adobe-flash-27.0.0.183-npapi.x86_64.tar.gz ) ) ppapi? ( abi_x86_32? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/27.0.0.183/flash_player_ppapi_linux.i386.tar.gz -> adobe-flash-27.0.0.183-ppapi.i386.tar.gz ) abi_x86_64? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/27.0.0.183/flash_player_ppapi_linux.x86_64.tar.gz -> adobe-flash-27.0.0.183-ppapi.x86_64.tar.gz ) )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	e5d920147bfccf4930062e462e2a417d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	nsplugins	2049586e425364a1c5bdb004205d1758	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=599c09e5a8b798188eaea58d9068f453
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-62.0.3202.62 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-62.0.3202.62
deleted file mode 100644
index 3839c20a441d..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-62.0.3202.62
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=5
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+widevine
-KEYWORDS=-* amd64
-LICENSE=google-chrome
-RDEPEND=widevine? ( !<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_62.0.3202.62-1_amd64.deb
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=a7a46c05b68e5c1b7d995128487bc53a
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-62.0.3202.62_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-62.0.3202.62_beta
deleted file mode 100644
index 6d8934cb974c..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-62.0.3202.62_beta
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=5
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+widevine
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=widevine? ( !<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_62.0.3202.62-1_amd64.deb
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=e6bda532181b632aa3e6c51ebf1fc380
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-62.0.3202.75 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-62.0.3202.75
new file mode 100644
index 000000000000..f326dc7c688f
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-62.0.3202.75
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=5
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+widevine
+KEYWORDS=-* amd64
+LICENSE=google-chrome
+RDEPEND=widevine? ( !<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_62.0.3202.75-1_amd64.deb
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
+_md5_=a7a46c05b68e5c1b7d995128487bc53a
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-63.0.3236.7_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-63.0.3236.7_alpha
deleted file mode 100644
index d775e4378921..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-63.0.3236.7_alpha
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=5
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+widevine
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=widevine? ( !<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_63.0.3236.7-1_amd64.deb
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=e6bda532181b632aa3e6c51ebf1fc380
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-63.0.3239.18_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-63.0.3239.18_beta
new file mode 100644
index 000000000000..b735eb9b61b2
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-63.0.3239.18_beta
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=5
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+widevine
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=widevine? ( !<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_63.0.3239.18-1_amd64.deb
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
+_md5_=e6bda532181b632aa3e6c51ebf1fc380
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3251.0_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3251.0_alpha
new file mode 100644
index 000000000000..115168c3fd6b
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3251.0_alpha
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=5
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+widevine
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=widevine? ( !<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_64.0.3251.0-1_amd64.deb
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
+_md5_=e6bda532181b632aa3e6c51ebf1fc380
diff --git a/metadata/md5-cache/www-servers/apache-2.2.31-r1 b/metadata/md5-cache/www-servers/apache-2.2.31-r1
deleted file mode 100644
index 31002e46adf5..000000000000
--- a/metadata/md5-cache/www-servers/apache-2.2.31-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) ) dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:= ) ) !=www-servers/apache-1* virtual/pkgconfig
-DESCRIPTION=The Apache Web Server
-EAPI=5
-HOMEPAGE=https://httpd.apache.org/
-IUSE=ssl debug doc ldap libressl selinux ssl static suexec threads apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_authn_alias apache2_modules_authn_anon apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_default apache2_modules_authn_file apache2_modules_authz_dbm apache2_modules_authz_default apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_cache apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_disk_cache apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_mem_cache apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_rewrite apache2_modules_reqtimeout apache2_modules_setenvif apache2_modules_speling apache2_modules_status apache2_modules_substitute apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_version apache2_modules_vhost_alias apache2_mpms_itk apache2_mpms_peruser apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=Apache-2.0 Apache-1.1
-PDEPEND=~app-admin/apache-tools-2.2.31
-RDEPEND=>=dev-libs/apr-1.4.5 dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:= ) ) !=www-servers/apache-1* selinux? ( sec-policy/selinux-apache )
-SLOT=2
-SRC_URI=mirror://apache/httpd/httpd-2.2.31.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.2.29-20140922.tar.bz2
-_eclasses_=apache-2	492ecb92fcce249fe77c9e88eaa20720	autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d61b73a8f2a335e7f4e941d40ba62818
diff --git a/metadata/md5-cache/www-servers/apache-2.2.34 b/metadata/md5-cache/www-servers/apache-2.2.34
index 2208bbb26eee..e28c2fd26c52 100644
--- a/metadata/md5-cache/www-servers/apache-2.2.34
+++ b/metadata/md5-cache/www-servers/apache-2.2.34
@@ -4,11 +4,11 @@ DESCRIPTION=The Apache Web Server
 EAPI=5
 HOMEPAGE=https://httpd.apache.org/
 IUSE=ssl debug doc ldap libressl selinux ssl static suexec threads apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_authn_alias apache2_modules_authn_anon apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_default apache2_modules_authn_file apache2_modules_authz_dbm apache2_modules_authz_default apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_cache apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_disk_cache apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_mem_cache apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_rewrite apache2_modules_reqtimeout apache2_modules_setenvif apache2_modules_speling apache2_modules_status apache2_modules_substitute apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_version apache2_modules_vhost_alias apache2_mpms_itk apache2_mpms_peruser apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=Apache-2.0 Apache-1.1
 PDEPEND=~app-admin/apache-tools-2.2.34
 RDEPEND=>=dev-libs/apr-1.4.5 dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:= ) ) !=www-servers/apache-1* selinux? ( sec-policy/selinux-apache )
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.2.34.tar.bz2 https://dev.gentoo.org/~whissi/dist/apache/gentoo-apache-2.2.34-20170918.tar.bz2
 _eclasses_=apache-2	492ecb92fcce249fe77c9e88eaa20720	autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f1f059eb9a6d3de64eaed740bc76bdcd
+_md5_=4c3d870ff3e54bbc53ca4793d0a5d9c6
diff --git a/metadata/md5-cache/www-servers/apache-2.4.29 b/metadata/md5-cache/www-servers/apache-2.4.29
new file mode 100644
index 000000000000..c3c6853dc663
--- /dev/null
+++ b/metadata/md5-cache/www-servers/apache-2.4.29
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) ) dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:= ) ) !=www-servers/apache-1* virtual/pkgconfig
+DESCRIPTION=The Apache Web Server
+EAPI=6
+HOMEPAGE=https://httpd.apache.org/
+IUSE=ssl debug doc ldap libressl selinux ssl static suexec threads apache2_modules_access_compat apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_authn_alias apache2_modules_authn_anon apache2_modules_authn_core apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_file apache2_modules_authz_core apache2_modules_authz_dbd apache2_modules_authz_dbm apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_cache apache2_modules_cache_disk apache2_modules_cache_socache apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers apache2_modules_http2 apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_lbmethod_byrequests apache2_modules_lbmethod_bytraffic apache2_modules_lbmethod_bybusyness apache2_modules_lbmethod_heartbeat apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_macro apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_html apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_proxy_fcgi apache2_modules_proxy_wstunnel apache2_modules_rewrite apache2_modules_ratelimit apache2_modules_remoteip apache2_modules_reqtimeout apache2_modules_setenvif apache2_modules_slotmem_shm apache2_modules_speling apache2_modules_socache_shmcb apache2_modules_status apache2_modules_substitute apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_unixd apache2_modules_version apache2_modules_vhost_alias apache2_modules_watchdog apache2_modules_xml2enc apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
+LICENSE=Apache-2.0 Apache-1.1
+PDEPEND=~app-admin/apache-tools-2.4.29
+RDEPEND=>=dev-libs/apr-1.5.1 !www-apache/mod_macro dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:= ) ) !=www-servers/apache-1* selinux? ( sec-policy/selinux-apache )
+REQUIRED_USE=apache2_modules_http2? ( ssl )
+SLOT=2
+SRC_URI=mirror://apache/httpd/httpd-2.4.29.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.18-r1-20160303.tar.bz2
+_eclasses_=apache-2	492ecb92fcce249fe77c9e88eaa20720	autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=2d83256526fe14d6b393c2c41d89f854
diff --git a/metadata/md5-cache/www-servers/h2o-2.2.2 b/metadata/md5-cache/www-servers/h2o-2.2.2
deleted file mode 100644
index 1f1941eb068e..000000000000
--- a/metadata/md5-cache/www-servers/h2o-2.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) mruby? ( sys-devel/bison || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) sys-devel/make >=dev-util/cmake-3.7.2 virtual/pkgconfig
-DESCRIPTION=An optimized HTTP server with support for HTTP/1.x and HTTP/2
-EAPI=6
-HOMEPAGE=https://h2o.examp1e.net
-IUSE=libressl +mruby
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-SLOT=0
-SRC_URI=https://github.com/h2o/h2o/archive/v2.2.2.tar.gz -> h2o-2.2.2.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=6a0ec15aa74d7ff0d921b78b1acaa365
diff --git a/metadata/md5-cache/www-servers/h2o-2.2.3 b/metadata/md5-cache/www-servers/h2o-2.2.3
new file mode 100644
index 000000000000..37be5ca11593
--- /dev/null
+++ b/metadata/md5-cache/www-servers/h2o-2.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) mruby? ( sys-devel/bison || ( dev-lang/ruby:2.2 dev-lang/ruby:2.3 dev-lang/ruby:2.4 ) virtual/rubygems ) sys-devel/make >=dev-util/cmake-3.7.2 virtual/pkgconfig
+DESCRIPTION=An optimized HTTP server with support for HTTP/1.x and HTTP/2
+EAPI=6
+HOMEPAGE=https://h2o.examp1e.net
+IUSE=libressl +mruby
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+SLOT=0
+SRC_URI=https://github.com/h2o/h2o/archive/v2.2.3.tar.gz -> h2o-2.2.3.tar.gz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	453e0fe0dd06baac93b584c91528cc62	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b6d1db4644a909040a42e96581acaa5f
diff --git a/metadata/md5-cache/www-servers/h2o-9999 b/metadata/md5-cache/www-servers/h2o-9999
index e34a4c7532c6..39e9c7dbe759 100644
--- a/metadata/md5-cache/www-servers/h2o-9999
+++ b/metadata/md5-cache/www-servers/h2o-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) mruby? ( sys-devel/bison || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1 virtual/pkgconfig
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) mruby? ( sys-devel/bison || ( dev-lang/ruby:2.2 dev-lang/ruby:2.3 dev-lang/ruby:2.4 ) virtual/rubygems ) sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1 virtual/pkgconfig
 DESCRIPTION=An optimized HTTP server with support for HTTP/1.x and HTTP/2
 EAPI=6
 HOMEPAGE=https://h2o.examp1e.net
@@ -7,5 +7,5 @@ IUSE=libressl +mruby
 LICENSE=MIT
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 SLOT=0
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=92f826b23970bd05010f7b0894fe856d
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	ruby-single	af6ea0a8fe4c4faf733f4dbafae9e233	ruby-utils	453e0fe0dd06baac93b584c91528cc62	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f9fa318c815d9cf93229d2b53df0ea5c
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.47 b/metadata/md5-cache/www-servers/lighttpd-1.4.47
new file mode 100644
index 000000000000..4c3980f47bbc
--- /dev/null
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.47
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] ) libressl? ( dev-libs/libressl:= ) ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) virtual/pkgconfig doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Lightweight high-performance web server
+EAPI=6
+HOMEPAGE=http://www.lighttpd.net/
+IUSE=bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+LICENSE=BSD GPL-2
+RDEPEND=bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] ) libressl? ( dev-libs/libressl:= ) ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) selinux? ( sec-policy/selinux-apache )
+REQUIRED_USE=kerberos? ( ssl !libressl )
+SLOT=0
+SRC_URI=http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.47.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
+_md5_=b924b8b0c3ce754b064937d8d135b7e3
diff --git a/metadata/md5-cache/www-servers/nginx-1.12.2-r1 b/metadata/md5-cache/www-servers/nginx-1.12.2-r1
new file mode 100644
index 000000000000..19769d26d1fa
--- /dev/null
+++ b/metadata/md5-cache/www-servers/nginx-1.12.2-r1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/expat ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_http_security? ( !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops ) >=app-portage/elt-patches-20170422 virtual/pkgconfig
+DESCRIPTION=Robust, small and high performance http and reverse proxy server
+EAPI=6
+HOMEPAGE=https://nginx.org
+IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_upload_progress nginx_modules_http_headers_more nginx_modules_http_cache_purge nginx_modules_http_slowfs_cache nginx_modules_http_fancyindex nginx_modules_http_lua nginx_modules_http_auth_pam nginx_modules_http_upstream_check nginx_modules_http_metrics nginx_modules_http_naxsi nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_security nginx_modules_http_push_stream nginx_modules_http_sticky nginx_modules_http_mogilefs nginx_modules_http_memc nginx_modules_http_auth_ldap nginx_modules_http_spdy
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
+PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
+RDEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/expat ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:mainline
+REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_lua? ( nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://nginx.org/download/nginx-1.12.2.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.0.tar.gz -> ngx_devel_kit-0.3.0-r1.tar.gz nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.32.tar.gz -> ngx_http_headers_more-0.32.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.2.tar.gz -> ngx_http_fancyindex-0.4.2.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.10.tar.gz -> ngx_http_lua-0.10.10.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.1.tar.gz -> ngx_http_auth_pam-1.5.1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/31b1b42873fa56620d8a873ac13f5f26b52d0cd6.tar.gz -> ngx_http_upstream_check-31b1b42873fa56620d8a873ac13f5f26b52d0cd6.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.55.3.tar.gz -> ngx_http_naxsi-0.55.3.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.0.tar.gz -> ngx_rtmp-1.2.0.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v0.1.0.tar.gz -> ngx_http_dav_ext-0.1.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.61.tar.gz -> ngx_http_echo-0.61.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.2/modsecurity-2.9.2.tar.gz -> modsecurity-2.9.2.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.2.tar.gz -> ngx_http_push_stream-0.5.2.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.18.tar.gz -> ngx_memc_module-0.18.tar.gz ) nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/49a8b4d28fc4a518563c82e0b52821e5f37db1fc.tar.gz -> nginx-auth-ldap-49a8b4d28fc4a518563c82e0b52821e5f37db1fc.tar.gz )
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9bb86d17296c8351e54f17f633c8df49
diff --git a/metadata/md5-cache/www-servers/nginx-1.13.6-r1 b/metadata/md5-cache/www-servers/nginx-1.13.6-r1
new file mode 100644
index 000000000000..0b0bfc2bc269
--- /dev/null
+++ b/metadata/md5-cache/www-servers/nginx-1.13.6-r1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/expat ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_http_security? ( !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops ) >=app-portage/elt-patches-20170422 virtual/pkgconfig
+DESCRIPTION=Robust, small and high performance http and reverse proxy server
+EAPI=6
+HOMEPAGE=https://nginx.org
+IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_upload_progress nginx_modules_http_headers_more nginx_modules_http_cache_purge nginx_modules_http_slowfs_cache nginx_modules_http_fancyindex nginx_modules_http_lua nginx_modules_http_auth_pam nginx_modules_http_upstream_check nginx_modules_http_metrics nginx_modules_http_naxsi nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_security nginx_modules_http_push_stream nginx_modules_http_sticky nginx_modules_http_mogilefs nginx_modules_http_memc nginx_modules_http_auth_ldap nginx_modules_http_spdy
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
+PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
+RDEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/expat ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0
+REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_lua? ( nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
+RESTRICT=test
+SLOT=mainline
+SRC_URI=https://nginx.org/download/nginx-1.13.6.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.0.tar.gz -> ngx_devel_kit-0.3.0-r1.tar.gz nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.32.tar.gz -> ngx_http_headers_more-0.32.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.2.tar.gz -> ngx_http_fancyindex-0.4.2.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.10.tar.gz -> ngx_http_lua-0.10.10.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.1.tar.gz -> ngx_http_auth_pam-1.5.1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/31b1b42873fa56620d8a873ac13f5f26b52d0cd6.tar.gz -> ngx_http_upstream_check-31b1b42873fa56620d8a873ac13f5f26b52d0cd6.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.55.3.tar.gz -> ngx_http_naxsi-0.55.3.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.0.tar.gz -> ngx_rtmp-1.2.0.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v0.1.0.tar.gz -> ngx_http_dav_ext-0.1.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.61.tar.gz -> ngx_http_echo-0.61.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.2/modsecurity-2.9.2.tar.gz -> modsecurity-2.9.2.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.2.tar.gz -> ngx_http_push_stream-0.5.2.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.18.tar.gz -> ngx_memc_module-0.18.tar.gz ) nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/49a8b4d28fc4a518563c82e0b52821e5f37db1fc.tar.gz -> nginx-auth-ldap-49a8b4d28fc4a518563c82e0b52821e5f37db1fc.tar.gz )
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=222f3c42efa0423caa1e95725ff05b57
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.19.5 b/metadata/md5-cache/x11-base/xorg-server-1.19.5
index 869a0d8b1582..28b261b091f9 100644
--- a/metadata/md5-cache/x11-base/xorg-server-1.19.5
+++ b/metadata/md5-cache/x11-base/xorg-server-1.19.5
@@ -4,7 +4,7 @@ DESCRIPTION=X.Org X servers
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/
 IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind xcsecurity static-libs doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=MIT
 PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.19 )
 RDEPEND=>=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.46 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) glamor? ( media-libs/libepoxy[X] >=media-libs/mesa-10.3.4-r1[egl,gbm] !x11-libs/glamor ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-10.3.4-r1 ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 media-libs/libepoxy >=dev-libs/wayland-protocols-1.1 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) selinux? ( sec-policy/selinux-xserver ) !x11-drivers/xf86-video-modesetting
@@ -12,4 +12,4 @@ REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) xeph
 SLOT=0/1.19.5
 SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-1.19.5.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=406fd7cd594d7919bd5bae9ad6da6fd3
+_md5_=e0836211e05f058addc3004174a1e5df
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.26.0 b/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.26.0
index c49ff8578358..a5175f5391a3 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.26.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.26.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/libinput-1.5.0:0= >=app-portage/elt-patches-20170422 !<sys-dev
 DESCRIPTION=X.org input driver based on libinput
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libinput-1.5.0:0= x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-libinput-0.26.0.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=605ede0ee892f0b30dc382f5538903df
+_md5_=56e340a5b77089937186c9ec363b727e
diff --git a/metadata/md5-cache/x11-libs/compizconfig-backend-kconfig4-0.8.8 b/metadata/md5-cache/x11-libs/compizconfig-backend-kconfig4-0.8.8
index df55b1804f84..de4e3815f255 100644
--- a/metadata/md5-cache/x11-libs/compizconfig-backend-kconfig4-0.8.8
+++ b/metadata/md5-cache/x11-libs/compizconfig-backend-kconfig4-0.8.8
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
 SLOT=0
 SRC_URI=http://releases.compiz.org/0.8.8/compizconfig-backend-kconfig4-0.8.8.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	4dd1bbb7aed9ca9a21e3dc940cbd2ce7	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c42cf00935a26af653af641b9449c5ad
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.22.16 b/metadata/md5-cache/x11-libs/gtk+-3.22.16
index 18855a4483fd..75eac4f602d9 100644
--- a/metadata/md5-cache/x11-libs/gtk+-3.22.16
+++ b/metadata/md5-cache/x11-libs/gtk+-3.22.16
@@ -4,7 +4,7 @@ DESCRIPTION=Gimp ToolKit +
 EAPI=6
 HOMEPAGE=https://www.gtk.org/
 IUSE=aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama 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 ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 PDEPEND=gnome-base/librsvg[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(-)?] vim-syntax? ( app-vim/gtk-syntax )
 RDEPEND=>=dev-libs/atk-2.15[introspection?,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/glib-2.49.4: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(-)?] media-libs/fontconfig[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/libepoxy-1.0[X(+)?,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/cairo-1.14[aqua?,glib,svg,X?,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/gdk-pixbuf-2.30:2[introspection?,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/pango-1.37.3[introspection?,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-misc/shared-mime-info cloudprint? ( >=net-libs/rest-0.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(-)?] >=dev-libs/json-glib-1.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(-)?] ) colord? ( >=x11-misc/colord-0.1.9: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(-)?] ) cups? ( >=net-print/cups-1.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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) wayland? ( >=dev-libs/wayland-1.9.91[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.7 media-libs/mesa[wayland,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/libxkbcommon-0.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(-)?] ) X? ( >=app-accessibility/at-spi2-atk-2.5.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/libX11[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/libXi-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/libXext[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/libXrandr-1.5[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/libXcursor[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(-)?] x11-libs/libXcomposite[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[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(-)?] xinerama? ( x11-libs/libXinerama[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-util/gtk-update-icon-cache-3 !<gnome-base/gail-1000 !<x11-libs/vte-0.31.0:2.90 >=x11-themes/adwaita-icon-theme-3.14
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=3
 SRC_URI=mirror://gnome/sources/gtk+/3.22/gtk+-3.22.16.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=74acbe85d715c2aaf01347896ce93462
+_md5_=0c82a0b875eccf580a135f6f847ae7cd
diff --git a/metadata/md5-cache/x11-libs/libXfont-1.5.3 b/metadata/md5-cache/x11-libs/libXfont-1.5.3
index 1544f0578a40..e5536bb9d2c3 100644
--- a/metadata/md5-cache/x11-libs/libXfont-1.5.3
+++ b/metadata/md5-cache/x11-libs/libXfont-1.5.3
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xfont library
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/
 IUSE=bzip2 ipv6 truetype static-libs doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/xtrans x11-libs/libfontenc sys-libs/zlib truetype? ( >=media-libs/freetype-2 ) bzip2? ( app-arch/bzip2 ) x11-proto/xproto >=x11-proto/fontsproto-2.1.3 !<x11-base/xorg-server-1.5.99.901
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXfont-1.5.3.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=7f6593d11e8086c82330c03eb0e58698
+_md5_=cef9c0c696cee1097a72138df73ed04f
diff --git a/metadata/md5-cache/x11-libs/libXfont2-2.0.2 b/metadata/md5-cache/x11-libs/libXfont2-2.0.2
index 28c69689c8fe..89e692770d63 100644
--- a/metadata/md5-cache/x11-libs/libXfont2-2.0.2
+++ b/metadata/md5-cache/x11-libs/libXfont2-2.0.2
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xfont library
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/
 IUSE=bzip2 ipv6 truetype static-libs doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/xtrans x11-libs/libfontenc sys-libs/zlib truetype? ( >=media-libs/freetype-2 ) bzip2? ( app-arch/bzip2 ) x11-proto/xproto >=x11-proto/fontsproto-2.1.3
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXfont2-2.0.2.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=f0d4dbec92289fa6439e1d3ec949a351
+_md5_=47b47040ee325998d6a7003fdaf284b9
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.82 b/metadata/md5-cache/x11-libs/libdrm-2.4.82
index 39bfd2c6ecbb..f445d4bcd59b 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.82
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.82
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org libdrm library
 EAPI=5
 HOMEPAGE=https://dri.freedesktop.org/
 IUSE=video_cards_amdgpu video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_tegra video_cards_vc4 video_cards_vivante video_cards_vmware libkms valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs
-KEYWORDS=alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-libs/libpthread-stubs-0.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(-)?] video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.82.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=5858947a9c9f32547d1658a0cfe514a8
+_md5_=689007976b585a2c9b6febdba6325f55
diff --git a/metadata/md5-cache/x11-libs/neXtaw-0.15.1-r2 b/metadata/md5-cache/x11-libs/neXtaw-0.15.1-r2
new file mode 100644
index 000000000000..0809bbdc0232
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/neXtaw-0.15.1-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=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-proto/xextproto x11-proto/xproto !<x11-libs/neXtaw-0.15.1-r1
+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
+LICENSE=BSD
+RDEPEND=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-proto/xextproto x11-proto/xproto !<x11-libs/neXtaw-0.15.1-r1
+SLOT=0
+SRC_URI=http://siag.nu/pub/neXtaw/neXtaw-0.15.1.tar.gz
+_md5_=423e7b1d2dccb5dfcc75ef95dd034ad7
diff --git a/metadata/md5-cache/x11-libs/pango-1.40.6 b/metadata/md5-cache/x11-libs/pango-1.40.6
index 7108169f77e9..8a2f9e4589a0 100644
--- a/metadata/md5-cache/x11-libs/pango-1.40.6
+++ b/metadata/md5-cache/x11-libs/pango-1.40.6
@@ -4,10 +4,10 @@ DESCRIPTION=Internationalized text layout and rendering library
 EAPI=6
 HOMEPAGE=http://www.pango.org/
 IUSE=X +introspection 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+ FTL
 RDEPEND=>=media-libs/harfbuzz-1.2.3:=[glib(+),truetype(+),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/glib-2.34.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(-)?] >=media-libs/fontconfig-2.10.92:1.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(-)?] >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4:=[X?,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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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/libXft-2.3.1-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
 SRC_URI=mirror://gnome/sources/pango/1.40/pango-1.40.6.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6844948614ba654c36c2611e1769f71f
+_md5_=516237a615352ab1a17dda995e1efd16
diff --git a/metadata/md5-cache/x11-libs/vte-0.46.2 b/metadata/md5-cache/x11-libs/vte-0.46.2
index b7cb99442750..5b04e484927a 100644
--- a/metadata/md5-cache/x11-libs/vte-0.46.2
+++ b/metadata/md5-cache/x11-libs/vte-0.46.2
@@ -4,11 +4,11 @@ DESCRIPTION=Library providing a virtual terminal emulator widget
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/action/show/Apps/Terminal/VTE
 IUSE=+crypt debug glade +introspection vala
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40:2 >=dev-libs/libpcre2-10.21 >=x11-libs/gtk+-3.8:3[introspection?] >=x11-libs/pango-1.22.0 sys-libs/ncurses:0= sys-libs/zlib crypt? ( >=net-libs/gnutls-3.2.7 ) glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) !x11-libs/vte:2.90[glade]
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.91
 SRC_URI=mirror://gnome/sources/vte/0.46/vte-0.46.2.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vala	103e6885c83965507391cdc5b6fa0e67	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7c45c6ea6f8f74742053375784ce91a0
+_md5_=e7e1dfc069667222be89d75a13c4e8a8
diff --git a/metadata/md5-cache/x11-libs/wxGTK-2.8.12.1-r1 b/metadata/md5-cache/x11-libs/wxGTK-2.8.12.1-r1
index d38ca6d3dc77..108a78fd4b99 100644
--- a/metadata/md5-cache/x11-libs/wxGTK-2.8.12.1-r1
+++ b/metadata/md5-cache/x11-libs/wxGTK-2.8.12.1-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare
 DEPEND=dev-libs/expat odbc? ( dev-db/unixODBC ) sdl? ( media-libs/libsdl ) X? ( dev-libs/glib:2 media-libs/libpng:0= sys-libs/zlib virtual/jpeg:0= x11-libs/gtk+:2 x11-libs/libSM x11-libs/libXinerama x11-libs/libXxf86vm x11-libs/pango[X] gnome? ( gnome-base/libgnomeprintui:2.2 ) gstreamer? ( gnome-base/gconf:2 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) opengl? ( virtual/opengl ) tiff? ( media-libs/tiff:0 ) ) aqua? ( x11-libs/gtk+:2[aqua=] virtual/jpeg:0= tiff? ( media-libs/tiff:0 ) ) virtual/pkgconfig opengl? ( virtual/glu ) X? ( x11-proto/xproto x11-proto/xineramaproto x11-proto/xf86vidmodeproto )
 DESCRIPTION=GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit
 EAPI=5
-HOMEPAGE=http://wxwidgets.org/
+HOMEPAGE=https://wxwidgets.org/
 IUSE=+X aqua doc debug gnome gstreamer odbc opengl pch sdl tiff
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=wxWinLL-3 GPL-2 odbc? ( LGPL-2 ) doc? ( wxWinFDL-3 )
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/expat odbc? ( dev-db/unixODBC ) sdl? ( media-libs/libsdl ) X? (
 SLOT=2.8
 SRC_URI=mirror://sourceforge/wxpython/wxPython-src-2.8.12.1.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=05d705b24c6bac315a0716d61731ce2b
+_md5_=9038b93e0fa711c15a2c1b75033b1f49
diff --git a/metadata/md5-cache/x11-libs/wxGTK-2.8.12.1-r2 b/metadata/md5-cache/x11-libs/wxGTK-2.8.12.1-r2
index 696438669dd2..45fded24a011 100644
--- a/metadata/md5-cache/x11-libs/wxGTK-2.8.12.1-r2
+++ b/metadata/md5-cache/x11-libs/wxGTK-2.8.12.1-r2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=dev-libs/expat[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(-)?] odbc? ( dev-db/unixODBC[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(-)?] ) sdl? ( media-libs/libsdl[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(-)?] ) X? ( dev-libs/glib: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(-)?] media-libs/libpng: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(-)?] 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(-)?] virtual/jpeg: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(-)?] x11-libs/gtk+: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/libSM[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/libXinerama[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[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/pango[X,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(-)?] gnome? ( gnome-base/libgnomeprintui:2.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(-)?] ) gstreamer? ( gnome-base/gconf: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(-)?] media-libs/gstreamer:0.10[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/gst-plugins-base:0.10[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(-)?] ) opengl? ( virtual/opengl[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(-)?] ) tiff? ( media-libs/tiff: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(-)?] ) ) aqua? ( x11-libs/gtk+:2[aqua=,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/jpeg: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(-)?] tiff? ( media-libs/tiff: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/pkgconfig[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(-)?] opengl? ( virtual/glu[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(-)?] ) X? ( x11-proto/xproto[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-proto/xineramaproto[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-proto/xf86vidmodeproto[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-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit
 EAPI=5
-HOMEPAGE=http://wxwidgets.org/
+HOMEPAGE=https://wxwidgets.org/
 IUSE=+X aqua doc debug gnome gstreamer odbc opengl pch sdl tiff 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=wxWinLL-3 GPL-2 odbc? ( LGPL-2 ) doc? ( wxWinFDL-3 )
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n3
 SLOT=2.8
 SRC_URI=mirror://sourceforge/wxpython/wxPython-src-2.8.12.1.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ccc4ac4e085a56c88f9fa51bcef8fc8a
+_md5_=a173de01ec6888f201259349da97766f
diff --git a/metadata/md5-cache/x11-libs/wxGTK-3.0.2.0-r1 b/metadata/md5-cache/x11-libs/wxGTK-3.0.2.0-r1
index 95f508c8529c..03832caa8797 100644
--- a/metadata/md5-cache/x11-libs/wxGTK-3.0.2.0-r1
+++ b/metadata/md5-cache/x11-libs/wxGTK-3.0.2.0-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare
 DEPEND=dev-libs/expat sdl? ( media-libs/libsdl ) X? ( >=dev-libs/glib-2.22:2 media-libs/libpng:0= sys-libs/zlib virtual/jpeg:0= >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf x11-libs/libSM x11-libs/libXxf86vm x11-libs/pango[X] gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) libnotify? ( x11-libs/libnotify ) opengl? ( virtual/opengl ) tiff? ( media-libs/tiff:0 ) webkit? ( net-libs/webkit-gtk:2 ) ) aqua? ( x11-libs/gtk+:2[aqua=] virtual/jpeg:0= tiff? ( media-libs/tiff:0 ) ) virtual/pkgconfig opengl? ( virtual/glu ) X? ( x11-proto/xproto x11-proto/xineramaproto x11-proto/xf86vidmodeproto )
 DESCRIPTION=GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit
 EAPI=5
-HOMEPAGE=http://wxwidgets.org/
+HOMEPAGE=https://wxwidgets.org/
 IUSE=+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/expat sdl? ( media-libs/libsdl ) X? ( >=dev-libs/glib-2.22:2 me
 SLOT=3.0
 SRC_URI=mirror://sourceforge/wxpython/wxPython-src-3.0.2.0.tar.bz2 doc? ( mirror://sourceforge/wxpython/wxPython-docs-3.0.2.0.tar.bz2 )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=1aa1f77fd00f3d52505c735a0f354da6
+_md5_=c879fc589857fcffe4cfdea8a4ae6efd
diff --git a/metadata/md5-cache/x11-libs/wxGTK-3.0.2.0-r2 b/metadata/md5-cache/x11-libs/wxGTK-3.0.2.0-r2
index 7ffefd3f9623..646c636430e6 100644
--- a/metadata/md5-cache/x11-libs/wxGTK-3.0.2.0-r2
+++ b/metadata/md5-cache/x11-libs/wxGTK-3.0.2.0-r2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=dev-libs/expat[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(-)?] sdl? ( media-libs/libsdl[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(-)?] ) X? ( >=dev-libs/glib-2.22: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(-)?] media-libs/libpng: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(-)?] 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(-)?] virtual/jpeg: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(-)?] >=x11-libs/gtk+-2.18: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/gdk-pixbuf[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/libSM[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[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/pango[X,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(-)?] gstreamer? ( media-libs/gstreamer:0.10[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/gst-plugins-base:0.10[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(-)?] ) libnotify? ( x11-libs/libnotify[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(-)?] ) opengl? ( virtual/opengl[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(-)?] ) tiff? ( media-libs/tiff: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(-)?] ) webkit? ( net-libs/webkit-gtk:2 ) ) aqua? ( x11-libs/gtk+:2[aqua=,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/jpeg: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(-)?] tiff? ( media-libs/tiff: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/pkgconfig[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(-)?] opengl? ( virtual/glu[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(-)?] ) X? ( x11-proto/xproto[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-proto/xineramaproto[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-proto/xf86vidmodeproto[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(-)?] )
 DESCRIPTION=GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit
 EAPI=5
-HOMEPAGE=http://wxwidgets.org/
+HOMEPAGE=https://wxwidgets.org/
 IUSE=+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit 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 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n3
 SLOT=3.0
 SRC_URI=mirror://sourceforge/wxpython/wxPython-src-3.0.2.0.tar.bz2 doc? ( mirror://sourceforge/wxpython/wxPython-docs-3.0.2.0.tar.bz2 )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=73fdbb60ea8e35459ffdc812a16abf8d
+_md5_=fbb309791d03854de1afe1ea1607d868
diff --git a/metadata/md5-cache/x11-libs/wxGTK-3.0.2.0-r3 b/metadata/md5-cache/x11-libs/wxGTK-3.0.2.0-r3
index 9796aaf17643..3df4cc4ea416 100644
--- a/metadata/md5-cache/x11-libs/wxGTK-3.0.2.0-r3
+++ b/metadata/md5-cache/x11-libs/wxGTK-3.0.2.0-r3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=dev-libs/expat[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(-)?] sdl? ( media-libs/libsdl[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(-)?] ) X? ( >=dev-libs/glib-2.22: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(-)?] media-libs/libpng: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(-)?] 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(-)?] virtual/jpeg: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(-)?] >=x11-libs/gtk+-2.18: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/gdk-pixbuf[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/libSM[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[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/pango[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(-)?] gstreamer? ( media-libs/gstreamer:0.10[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/gst-plugins-base:0.10[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(-)?] ) libnotify? ( x11-libs/libnotify[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(-)?] ) opengl? ( virtual/opengl[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(-)?] ) tiff? ( media-libs/tiff: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(-)?] ) webkit? ( net-libs/webkit-gtk:2 ) ) aqua? ( x11-libs/gtk+:2[aqua=,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/jpeg: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(-)?] tiff? ( media-libs/tiff: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/pkgconfig[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(-)?] opengl? ( virtual/glu[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(-)?] ) X? ( x11-proto/xproto[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-proto/xineramaproto[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-proto/xf86vidmodeproto[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-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit
 EAPI=5
-HOMEPAGE=http://wxwidgets.org/
+HOMEPAGE=https://wxwidgets.org/
 IUSE=+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n3
 SLOT=3.0
 SRC_URI=mirror://sourceforge/wxpython/wxPython-src-3.0.2.0.tar.bz2 doc? ( mirror://sourceforge/wxpython/wxPython-docs-3.0.2.0.tar.bz2 )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=825e296f695f66c3bb1a60cf08c07457
+_md5_=7709613ec78f69c8beab0ba0345e8514
diff --git a/metadata/md5-cache/x11-libs/wxGTK-3.0.2.0-r300 b/metadata/md5-cache/x11-libs/wxGTK-3.0.2.0-r300
index 85b792f452dd..e9bc58445375 100644
--- a/metadata/md5-cache/x11-libs/wxGTK-3.0.2.0-r300
+++ b/metadata/md5-cache/x11-libs/wxGTK-3.0.2.0-r300
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=dev-libs/expat[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(-)?] sdl? ( media-libs/libsdl[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(-)?] ) X? ( >=dev-libs/glib-2.22: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(-)?] media-libs/libpng: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(-)?] 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(-)?] virtual/jpeg: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(-)?] x11-libs/cairo[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/gtk+: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/gdk-pixbuf[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/libSM[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[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[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/pango[X,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(-)?] gstreamer? ( media-libs/gstreamer:0.10[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/gst-plugins-base:0.10[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(-)?] ) libnotify? ( x11-libs/libnotify[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(-)?] ) opengl? ( virtual/opengl[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(-)?] ) tiff? ( media-libs/tiff: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(-)?] ) webkit? ( net-libs/webkit-gtk:2 ) ) aqua? ( x11-libs/gtk+:3[aqua=,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/jpeg: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(-)?] tiff? ( media-libs/tiff: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/pkgconfig[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(-)?] opengl? ( virtual/glu[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(-)?] ) X? ( x11-proto/xproto[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-proto/xineramaproto[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-proto/xf86vidmodeproto[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(-)?] )
 DESCRIPTION=GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit
 EAPI=6
-HOMEPAGE=http://wxwidgets.org/
+HOMEPAGE=https://wxwidgets.org/
 IUSE=+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n3
 SLOT=3.0-gtk3
 SRC_URI=mirror://sourceforge/wxpython/wxPython-src-3.0.2.0.tar.bz2 doc? ( mirror://sourceforge/wxpython/wxPython-docs-3.0.2.0.tar.bz2 )
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=c9ae205a60aa51ef7bac738c7dd4cee7
+_md5_=6274921fff2a3454b393a65d76fa29c0
diff --git a/metadata/md5-cache/x11-libs/wxGTK-3.0.2.0-r301 b/metadata/md5-cache/x11-libs/wxGTK-3.0.2.0-r301
index 67a4f2364e2d..be9c24b5fb34 100644
--- a/metadata/md5-cache/x11-libs/wxGTK-3.0.2.0-r301
+++ b/metadata/md5-cache/x11-libs/wxGTK-3.0.2.0-r301
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=dev-libs/expat[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(-)?] sdl? ( media-libs/libsdl[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(-)?] ) X? ( >=dev-libs/glib-2.22: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(-)?] media-libs/libpng: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(-)?] 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(-)?] virtual/jpeg: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(-)?] x11-libs/cairo[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/gtk+: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/gdk-pixbuf[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/libSM[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[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[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/pango[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(-)?] gstreamer? ( media-libs/gstreamer:0.10[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/gst-plugins-base:0.10[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(-)?] ) libnotify? ( x11-libs/libnotify[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(-)?] ) opengl? ( virtual/opengl[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(-)?] ) tiff? ( media-libs/tiff: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(-)?] ) webkit? ( net-libs/webkit-gtk:3 ) ) aqua? ( x11-libs/gtk+:3[aqua=,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/jpeg: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(-)?] tiff? ( media-libs/tiff: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/pkgconfig[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(-)?] opengl? ( virtual/glu[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(-)?] ) X? ( x11-proto/xproto[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-proto/xineramaproto[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-proto/xf86vidmodeproto[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-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit
 EAPI=6
-HOMEPAGE=http://wxwidgets.org/
+HOMEPAGE=https://wxwidgets.org/
 IUSE=+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n3
 SLOT=3.0-gtk3
 SRC_URI=mirror://sourceforge/wxpython/wxPython-src-3.0.2.0.tar.bz2 doc? ( mirror://sourceforge/wxpython/wxPython-docs-3.0.2.0.tar.bz2 )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a645af09e0cce6d2e4e12eb6ab4e34e3
+_md5_=0cf38cb7d63c2520c00f6010e3de3b35
diff --git a/metadata/md5-cache/x11-misc/albert-0.14.3 b/metadata/md5-cache/x11-misc/albert-0.14.3
new file mode 100644
index 000000000000..69426427ce2c
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/albert-0.14.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-cpp/muParser dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DESCRIPTION=Desktop agnostic launcher
+EAPI=6
+HOMEPAGE=https://albertlauncher.github.io/
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=dev-cpp/muParser dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11
+SLOT=0
+SRC_URI=https://github.com/albertlauncher/albert/archive/v0.14.3.tar.gz -> albert-0.14.3.tar.gz https://github.com/albertlauncher/plugins/archive/16b4f9c39b91ef0435dc8a0eeb714800b7b99d4b.tar.gz -> albert-0.14.3-plugins.tar.gz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2bc995c568c3fa0353584887621847ce
diff --git a/metadata/md5-cache/x11-misc/albert-0.14.4 b/metadata/md5-cache/x11-misc/albert-0.14.4
new file mode 100644
index 000000000000..e374454720cf
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/albert-0.14.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-cpp/muParser dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DESCRIPTION=Desktop agnostic launcher
+EAPI=6
+HOMEPAGE=https://albertlauncher.github.io/
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=dev-cpp/muParser dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11
+SLOT=0
+SRC_URI=https://github.com/albertlauncher/albert/archive/v0.14.4.tar.gz -> albert-0.14.4.tar.gz https://github.com/albertlauncher/plugins/archive/1f0eb7495747793e8e2102012d7d387bc7ca356d.tar.gz -> albert-0.14.4-plugins.tar.gz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1efc61c990a77e0e2b2bc5af643dd6e4
diff --git a/metadata/md5-cache/x11-misc/compton-0.1_beta2 b/metadata/md5-cache/x11-misc/compton-0.1_beta2
index 3b832d123bf6..c95a3f3c983a 100644
--- a/metadata/md5-cache/x11-misc/compton-0.1_beta2
+++ b/metadata/md5-cache/x11-misc/compton-0.1_beta2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install setup
-DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/libconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender dbus? ( sys-apps/dbus ) opengl? ( virtual/opengl ) pcre? ( dev-libs/libpcre:3 ) xinerama? ( x11-libs/libXinerama ) app-text/asciidoc virtual/pkgconfig x11-proto/xproto drm? ( x11-libs/libdrm )
+DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender dbus? ( sys-apps/dbus ) opengl? ( virtual/opengl ) pcre? ( dev-libs/libpcre:3 ) xinerama? ( x11-libs/libXinerama ) app-text/asciidoc virtual/pkgconfig x11-proto/xproto drm? ( x11-libs/libdrm )
 DESCRIPTION=A compositor for X, and a fork of xcompmgr-dana
-EAPI=5
+EAPI=6
 HOMEPAGE=https://github.com/chjj/compton
-IUSE=dbus +drm opengl +pcre xinerama python_targets_python3_4 python_targets_python3_5
+IUSE=dbus +drm opengl +pcre xinerama python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/libconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender dbus? ( sys-apps/dbus ) opengl? ( virtual/opengl ) pcre? ( dev-libs/libpcre:3 ) xinerama? ( x11-libs/libXinerama ) x11-apps/xprop x11-apps/xwininfo
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
+RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender dbus? ( sys-apps/dbus ) opengl? ( virtual/opengl ) pcre? ( dev-libs/libpcre:3 ) xinerama? ( x11-libs/libXinerama ) x11-apps/xprop x11-apps/xwininfo
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/chjj/compton/archive/v0.1_beta2.tar.gz -> compton-0.1_beta2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=1b4b10efadf0696f54b25dbb370c6c97
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=6cdf783fbb3065ccf04be334a9f42140
diff --git a/metadata/md5-cache/x11-misc/compton-9999 b/metadata/md5-cache/x11-misc/compton-9999
index 5125c25ecdfa..58aed6f34f66 100644
--- a/metadata/md5-cache/x11-misc/compton-9999
+++ b/metadata/md5-cache/x11-misc/compton-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/libconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender dbus? ( sys-apps/dbus ) opengl? ( virtual/opengl ) pcre? ( dev-libs/libpcre:3 ) xinerama? ( x11-libs/libXinerama ) app-text/asciidoc virtual/pkgconfig x11-proto/xproto drm? ( x11-libs/libdrm ) >=dev-vcs/git-1.8.2.1
+DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender dbus? ( sys-apps/dbus ) opengl? ( virtual/opengl ) pcre? ( dev-libs/libpcre:3 ) xinerama? ( x11-libs/libXinerama ) app-text/asciidoc virtual/pkgconfig x11-proto/xproto drm? ( x11-libs/libdrm ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=A compositor for X, and a fork of xcompmgr-dana
 EAPI=6
 HOMEPAGE=https://github.com/chjj/compton
-IUSE=dbus +drm opengl +pcre xinerama python_targets_python3_4 python_targets_python3_5
+IUSE=dbus +drm opengl +pcre xinerama python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 LICENSE=MIT
-RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/libconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender dbus? ( sys-apps/dbus ) opengl? ( virtual/opengl ) pcre? ( dev-libs/libpcre:3 ) xinerama? ( x11-libs/libXinerama ) x11-apps/xprop x11-apps/xwininfo
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
+RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) 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_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender dbus? ( sys-apps/dbus ) opengl? ( virtual/opengl ) pcre? ( dev-libs/libpcre:3 ) xinerama? ( x11-libs/libXinerama ) x11-apps/xprop x11-apps/xwininfo
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=git-r3	52a888802d25387c2c74cb845d1219bc	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=2dc0c14caf421970b1d4a0bb8de35eca
+_md5_=e647263e68f15b6423d3958b032bfd60
diff --git a/metadata/md5-cache/x11-misc/i3blocks-1.4-r1 b/metadata/md5-cache/x11-misc/i3blocks-1.4-r1
index 6cf34bdbf427..02b1b0fcd4d1 100644
--- a/metadata/md5-cache/x11-misc/i3blocks-1.4-r1
+++ b/metadata/md5-cache/x11-misc/i3blocks-1.4-r1
@@ -3,9 +3,9 @@ DEPEND=app-text/ronn
 DESCRIPTION=highly flexible status line for the i3 window manager
 EAPI=6
 HOMEPAGE=https://github.com/vivien/i3blocks
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-3
 RDEPEND=app-admin/sysstat media-sound/playerctl sys-apps/lm_sensors sys-power/acpi x11-wm/i3
 SLOT=0
 SRC_URI=https://github.com/vivien/i3blocks/archive/1.4.tar.gz -> i3blocks-1.4.tar.gz
-_md5_=751b62559cf614ec073189494dd445d1
+_md5_=59cb82583b7eb21d1599c96d160d4b55
diff --git a/metadata/md5-cache/x11-misc/kapow-1.5.2 b/metadata/md5-cache/x11-misc/kapow-1.5.2
index 1c9fff2f52d6..448f0112a9e1 100644
--- a/metadata/md5-cache/x11-misc/kapow-1.5.2
+++ b/metadata/md5-cache/x11-misc/kapow-1.5.2
@@ -2,11 +2,11 @@ DEFINED_PHASES=configure install
 DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5
 DESCRIPTION=A punch clock program designed to easily keep track of your hours
 EAPI=6
-HOMEPAGE=http://gottcode.org/kapow/
+HOMEPAGE=https://gottcode.org/kapow/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
 SLOT=0
-SRC_URI=http://gottcode.org/kapow/kapow-1.5.2-src.tar.bz2
+SRC_URI=https://gottcode.org/kapow/kapow-1.5.2-src.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=57c7d477f0d2cc86d172efd5c2abbd7b
+_md5_=9a907502fd97d445924343024025bf81
diff --git a/metadata/md5-cache/x11-misc/kapow-1.5.3 b/metadata/md5-cache/x11-misc/kapow-1.5.3
index a78816920cd4..d33237702ecd 100644
--- a/metadata/md5-cache/x11-misc/kapow-1.5.3
+++ b/metadata/md5-cache/x11-misc/kapow-1.5.3
@@ -2,11 +2,11 @@ DEFINED_PHASES=configure install
 DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5
 DESCRIPTION=A punch clock program designed to easily keep track of your hours
 EAPI=6
-HOMEPAGE=http://gottcode.org/kapow/
+HOMEPAGE=https://gottcode.org/kapow/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
 SLOT=0
-SRC_URI=http://gottcode.org/kapow/kapow-1.5.3-src.tar.bz2
+SRC_URI=https://gottcode.org/kapow/kapow-1.5.3-src.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=57c7d477f0d2cc86d172efd5c2abbd7b
+_md5_=9a907502fd97d445924343024025bf81
diff --git a/metadata/md5-cache/x11-misc/kronometer-2.1.5 b/metadata/md5-cache/x11-misc/kronometer-2.1.5
index 3b5c2479dcd5..92a05831e570 100644
--- a/metadata/md5-cache/x11-misc/kronometer-2.1.5
+++ b/metadata/md5-cache/x11-misc/kronometer-2.1.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.37.0:5 >=kde-frameworks/kconfigwidgets-5.37.0:5 >=kde-frameworks/kcoreaddons-5.37.0:5 >=kde-frameworks/kcrash-5.37.0:5 >=kde-frameworks/ki18n-5.37.0:5 >=kde-frameworks/kwidgetsaddons-5.37.0:5 >=kde-frameworks/kxmlgui-5.37.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kronometer/2.1.5/src/kronometer-2.1.5.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d3875ecfce882b2a31d7f7e4666abe27
diff --git a/metadata/md5-cache/x11-misc/sddm-0.14.0-r4 b/metadata/md5-cache/x11-misc/sddm-0.14.0-r4
deleted file mode 100644
index 166197374b1e..000000000000
--- a/metadata/md5-cache/x11-misc/sddm-0.14.0-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend test
-DEPEND=>=dev-qt/qtcore-5.6:5 >=dev-qt/qtdbus-5.6:5 >=dev-qt/qtgui-5.6:5 >=dev-qt/qtdeclarative-5.6:5 >=dev-qt/qtnetwork-5.6:5 >=x11-base/xorg-server-1.15.1 x11-libs/libxcb[xkb(-)] consolekit? ( >=sys-auth/consolekit-0.9.4 ) elogind? ( sys-auth/elogind ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:= ) !systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) ) dev-python/docutils >=dev-qt/linguist-tools-5.6:5 >=dev-qt/qttest-5.6:5 kde-frameworks/extra-cmake-modules virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 virtual/pkgconfig
-DESCRIPTION=Simple Desktop Display Manager
-EAPI=6
-HOMEPAGE=https://github.com/sddm/sddm
-IUSE=consolekit elogind +pam systemd
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain
-RDEPEND=>=dev-qt/qtcore-5.6:5 >=dev-qt/qtdbus-5.6:5 >=dev-qt/qtgui-5.6:5 >=dev-qt/qtdeclarative-5.6:5 >=dev-qt/qtnetwork-5.6:5 >=x11-base/xorg-server-1.15.1 x11-libs/libxcb[xkb(-)] consolekit? ( >=sys-auth/consolekit-0.9.4 ) elogind? ( sys-auth/elogind ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:= ) !systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )
-REQUIRED_USE=?? ( elogind systemd )
-SLOT=0
-SRC_URI=https://github.com/sddm/sddm/releases/download/v0.14.0/sddm-0.14.0.tar.xz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2cd018818cf4a576b147a84d160624f4
diff --git a/metadata/md5-cache/x11-misc/sddm-0.15.0 b/metadata/md5-cache/x11-misc/sddm-0.15.0
index 0f468b913838..36001c48c428 100644
--- a/metadata/md5-cache/x11-misc/sddm-0.15.0
+++ b/metadata/md5-cache/x11-misc/sddm-0.15.0
@@ -4,11 +4,11 @@ DESCRIPTION=Simple Desktop Display Manager
 EAPI=6
 HOMEPAGE=https://github.com/sddm/sddm
 IUSE=consolekit elogind +pam systemd
-KEYWORDS=amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain
 RDEPEND=>=dev-qt/qtcore-5.6:5 >=dev-qt/qtdbus-5.6:5 >=dev-qt/qtgui-5.6:5 >=dev-qt/qtdeclarative-5.6:5 >=dev-qt/qtnetwork-5.6:5 >=x11-base/xorg-server-1.15.1 x11-libs/libxcb[xkb] consolekit? ( >=sys-auth/consolekit-0.9.4 ) elogind? ( sys-auth/elogind ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:= ) !systemd? ( sys-power/upower )
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://github.com/sddm/sddm/releases/download/v0.15.0/sddm-0.15.0.tar.gz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=69d13f5a80ad36d7547e6f1edaa5d09c
+_md5_=bc8affc071a210e835e8bf7d6e3b76bb
diff --git a/metadata/md5-cache/x11-misc/sddm-0.16.0-r2 b/metadata/md5-cache/x11-misc/sddm-0.16.0-r2
new file mode 100644
index 000000000000..81d01dbd2028
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/sddm-0.16.0-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-qt/qtcore-5.6:5 >=dev-qt/qtdbus-5.6:5 >=dev-qt/qtgui-5.6:5 >=dev-qt/qtdeclarative-5.6:5 >=dev-qt/qtnetwork-5.6:5 >=x11-base/xorg-server-1.15.1 x11-libs/libxcb[xkb] consolekit? ( >=sys-auth/consolekit-0.9.4 ) elogind? ( sys-auth/elogind ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:= ) !systemd? ( sys-power/upower ) dev-python/docutils >=dev-qt/linguist-tools-5.6:5 >=dev-qt/qttest-5.6:5 kde-frameworks/extra-cmake-modules virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 virtual/pkgconfig
+DESCRIPTION=Simple Desktop Display Manager
+EAPI=6
+HOMEPAGE=https://github.com/sddm/sddm
+IUSE=consolekit elogind +pam systemd
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain
+RDEPEND=>=dev-qt/qtcore-5.6:5 >=dev-qt/qtdbus-5.6:5 >=dev-qt/qtgui-5.6:5 >=dev-qt/qtdeclarative-5.6:5 >=dev-qt/qtnetwork-5.6:5 >=x11-base/xorg-server-1.15.1 x11-libs/libxcb[xkb] consolekit? ( >=sys-auth/consolekit-0.9.4 ) elogind? ( sys-auth/elogind ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:= ) !systemd? ( sys-power/upower )
+REQUIRED_USE=?? ( elogind systemd )
+SLOT=0
+SRC_URI=https://github.com/sddm/sddm/releases/download/v0.16.0/sddm-0.16.0.tar.gz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a45c33751477b87038fb8540933c1676
diff --git a/metadata/md5-cache/x11-misc/spacefm-1.0.5-r2 b/metadata/md5-cache/x11-misc/spacefm-1.0.5-r2
index 6a216b0ce4bd..2d489d88bde3 100644
--- a/metadata/md5-cache/x11-misc/spacefm-1.0.5-r2
+++ b/metadata/md5-cache/x11-misc/spacefm-1.0.5-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A multi-panel tabbed file manager
 EAPI=6
 HOMEPAGE=https://ignorantguru.github.com/spacefm/
 IUSE=gtk2 +gtk3 +startup-notification +video-thumbnails
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-libs/glib:2 dev-util/desktop-file-utils >=virtual/udev-143 virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf gtk2? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk2? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/libX11 x11-misc/shared-mime-info video-thumbnails? ( media-video/ffmpegthumbnailer ) startup-notification? ( x11-libs/startup-notification )
 SLOT=0
 SRC_URI=https://github.com/ignorantguru/spacefm/archive/1.0.5.tar.gz -> spacefm-1.0.5.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=338d77d777eb43ce2b288a79e7e21cf7
+_md5_=e43c9d82d3482695bddd97ea775f445c
diff --git a/metadata/md5-cache/x11-misc/spnavcfg-0.3 b/metadata/md5-cache/x11-misc/spnavcfg-0.3
index 31fcb6369c45..13fca091b15c 100644
--- a/metadata/md5-cache/x11-misc/spnavcfg-0.3
+++ b/metadata/md5-cache/x11-misc/spnavcfg-0.3
@@ -3,10 +3,10 @@ DEPEND=x11-libs/gtk+:2 virtual/pkgconfig
 DESCRIPTION=GTK-based GUI to configure a space navigator device
 EAPI=6
 HOMEPAGE=http://spacenav.sourceforge.net/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-3
 RDEPEND=x11-libs/gtk+:2 app-misc/spacenavd[X]
 SLOT=0
 SRC_URI=mirror://sourceforge/project/spacenav/spacenavd%20config%20gui/spnavcfg%200.3/spnavcfg-0.3.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=362664bc0b9551ab381dce1fcf60c9f4
+_md5_=7bf7508c3342b158f167eb852b99e195
diff --git a/metadata/md5-cache/x11-misc/xsr-1.0.0 b/metadata/md5-cache/x11-misc/xsr-1.0.0
new file mode 100644
index 000000000000..27389e07e8d1
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xsr-1.0.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=X Steps Recorder
+EAPI=6
+HOMEPAGE=https://github.com/nonnymoose/xsr
+IUSE=cursor
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-lang/perl media-gfx/scrot cursor? ( media-gfx/imagemagick x11-misc/xdotool )
+SLOT=0
+SRC_URI=https://github.com/nonnymoose/xsr/archive/v1.0.0.tar.gz -> xsr-1.0.0.tar.gz
+_md5_=1dff5fbc017b62139ba04dfdd945b4c2
diff --git a/metadata/md5-cache/x11-misc/zim-0.67 b/metadata/md5-cache/x11-misc/zim-0.67
new file mode 100644
index 000000000000..fa300fdc5e00
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/zim-0.67
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x11-misc/xdg-utils test? ( dev-vcs/bzr dev-vcs/git dev-vcs/mercurial ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A desktop wiki
+EAPI=6
+HOMEPAGE=http://zim-wiki.org/
+IUSE=test python_targets_python2_7 test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD GPL-2+
+RDEPEND=dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://zim-wiki.org/downloads/zim-0.67.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=33fbbb7fb984a12143a92e37d3ca8475
diff --git a/metadata/md5-cache/x11-plugins/pidgin-gnome-keyring-2.0 b/metadata/md5-cache/x11-plugins/pidgin-gnome-keyring-2.0
index c0116820d3cd..5cd5822eea0f 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-gnome-keyring-2.0
+++ b/metadata/md5-cache/x11-plugins/pidgin-gnome-keyring-2.0
@@ -3,9 +3,9 @@ DEPEND=app-crypt/libsecret net-im/pidgin virtual/pkgconfig
 DESCRIPTION=Integrates Pidgin (and libpurple) with the system keyring
 EAPI=6
 HOMEPAGE=https://github.com/aebrahim/pidgin-gnome-keyring
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=app-crypt/libsecret net-im/pidgin
 SLOT=0
 SRC_URI=https://github.com/aebrahim/pidgin-gnome-keyring/archive/2.0.tar.gz -> pidgin-gnome-keyring-2.0.tar.gz
-_md5_=687f69db54398411ffd746d71b3b1819
+_md5_=64685d11aca52203e4ab5d4ff87b634f
diff --git a/metadata/md5-cache/x11-plugins/pidgin-sipe-1.22.0 b/metadata/md5-cache/x11-plugins/pidgin-sipe-1.22.0
index 9da824182de2..18146e04eb05 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-sipe-1.22.0
+++ b/metadata/md5-cache/x11-plugins/pidgin-sipe-1.22.0
@@ -4,10 +4,10 @@ DESCRIPTION=Pidgin Plug-in SIPE (Sip Exchange Protocol)
 EAPI=6
 HOMEPAGE=http://sipe.sourceforge.net/
 IUSE=debug kerberos ocs2005-message-hack openssl telepathy voice
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmime:2.6 dev-libs/libxml2 openssl? ( dev-libs/openssl:= ) !openssl? ( dev-libs/nss ) kerberos? ( virtual/krb5 ) voice? ( >=dev-libs/glib-2.28.0 >=net-libs/libnice-0.1.0 media-libs/gstreamer:1.0 >=net-im/pidgin-2.8.0 net-libs/farstream:0.2 ) !voice? ( >=dev-libs/glib-2.12.0:2 net-im/pidgin ) telepathy? ( >=sys-apps/dbus-1.1.0 >=dev-libs/dbus-glib-0.61 >=dev-libs/glib-2.28:2 >=net-libs/telepathy-glib-0.18.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/sipe/pidgin-sipe-1.22.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=e2f599bd6c6f1483b33afc8966498b1c
+_md5_=44af923bb4a4bd875b3b7788230c8e94
diff --git a/metadata/md5-cache/x11-plugins/purple-mattermost-1.2 b/metadata/md5-cache/x11-plugins/purple-mattermost-1.2
new file mode 100644
index 000000000000..7554d51758e4
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/purple-mattermost-1.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile
+DEPEND=app-text/discount dev-libs/glib dev-libs/json-glib net-im/pidgin
+DESCRIPTION=A libpurple/Pidgin plugin for Mattermost
+EAPI=6
+HOMEPAGE=https://github.com/EionRobb/purple-mattermost
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=app-text/discount dev-libs/glib dev-libs/json-glib net-im/pidgin
+SLOT=0
+SRC_URI=https://github.com/EionRobb/purple-mattermost/archive/v1.2.tar.gz -> purple-mattermost-1.2.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=4d9796c671fced6198d8a2a9c79253f5
diff --git a/metadata/md5-cache/x11-plugins/wmudmount-2.2-r1 b/metadata/md5-cache/x11-plugins/wmudmount-2.2-r1
deleted file mode 100644
index 0188ec94e3d9..000000000000
--- a/metadata/md5-cache/x11-plugins/wmudmount-2.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm preinst prepare
-DEPEND=sys-fs/udisks:2 >=x11-libs/gtk+-3.8.0:3 gnome-keyring? ( gnome-base/libgnome-keyring ) libnotify? ( >=x11-libs/libnotify-0.7 ) virtual/pkgconfig || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] ) >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A filesystem mounter that uses udisks to handle notification and mounting
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/wmudmount/
-IUSE=gnome-keyring libnotify
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/udisks:2 >=x11-libs/gtk+-3.8.0:3 gnome-keyring? ( gnome-base/libgnome-keyring ) libnotify? ( >=x11-libs/libnotify-0.7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/wmudmount/wmudmount-2.2.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bf40e7ac37c26483fef72c1ad48a8ea1
diff --git a/metadata/md5-cache/x11-plugins/wmudmount-2.2-r2 b/metadata/md5-cache/x11-plugins/wmudmount-2.2-r2
index c4d1042cfe8c..350457284a57 100644
--- a/metadata/md5-cache/x11-plugins/wmudmount-2.2-r2
+++ b/metadata/md5-cache/x11-plugins/wmudmount-2.2-r2
@@ -10,4 +10,4 @@ RDEPEND=sys-fs/udisks:2 >=x11-libs/gtk+-3.8.0:3 gnome-keyring? ( gnome-base/libg
 SLOT=0
 SRC_URI=mirror://sourceforge/wmudmount/wmudmount-2.2.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b6f6dc546a9207eba4c4e5690c4b6ef2
+_md5_=05575f806d755174f8b33ea242c880d1
diff --git a/metadata/md5-cache/x11-themes/qtcurve-1.9.0_rc1-r1 b/metadata/md5-cache/x11-themes/qtcurve-1.9.0_rc1-r1
index 41f1b8eff529..b013f3155614 100644
--- a/metadata/md5-cache/x11-themes/qtcurve-1.9.0_rc1-r1
+++ b/metadata/md5-cache/x11-themes/qtcurve-1.9.0_rc1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Widget styles for Qt and GTK2
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/qtcurve.git
 IUSE=+X gtk nls plasma qt4 +qt5 test debug
-KEYWORDS=~alpha amd64 ~hppa ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~hppa ppc ppc64 ~sparc x86
 LICENSE=LGPL-2+
 RDEPEND=gtk? ( x11-libs/gtk+:2 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 ) qt5? ( >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 ) plasma? ( >=kde-frameworks/frameworkintegration-5.37.0 >=kde-frameworks/karchive-5.37.0 >=kde-frameworks/kcompletion-5.37.0 >=kde-frameworks/kconfig-5.37.0 >=kde-frameworks/kconfigwidgets-5.37.0 >=kde-frameworks/kcoreaddons-5.37.0 >=kde-frameworks/kdelibs4support-5.37.0 >=kde-frameworks/kguiaddons-5.37.0 >=kde-frameworks/ki18n-5.37.0 >=kde-frameworks/kiconthemes-5.37.0 >=kde-frameworks/kio-5.37.0 >=kde-frameworks/kwidgetsaddons-5.37.0 >=kde-frameworks/kwindowsystem-5.37.0 >=kde-frameworks/kxmlgui-5.37.0 >=dev-qt/qtprintsupport-5.7.1:5 ) X? ( x11-libs/libX11 x11-libs/libxcb ) !x11-themes/gtk-engines-qtcurve
 REQUIRED_USE=gtk? ( X ) || ( gtk qt4 qt5 ) plasma? ( qt5 )
 SLOT=0
 SRC_URI=https://github.com/KDE/qtcurve/archive/1.9.0-rc1.tar.gz -> qtcurve-1.9.0_rc1.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7130732095a65923636709d37b1bc2a2
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=60cf47407fe011be03aae1e019f48c4f
diff --git a/metadata/md5-cache/x11-themes/qtcurve-9999 b/metadata/md5-cache/x11-themes/qtcurve-9999
index 622769efea05..8e55e9ff32c8 100644
--- a/metadata/md5-cache/x11-themes/qtcurve-9999
+++ b/metadata/md5-cache/x11-themes/qtcurve-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2+
 RDEPEND=gtk? ( x11-libs/gtk+:2 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 ) qt5? ( >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 ) plasma? ( >=kde-frameworks/frameworkintegration-5.37.0 >=kde-frameworks/karchive-5.37.0 >=kde-frameworks/kcompletion-5.37.0 >=kde-frameworks/kconfig-5.37.0 >=kde-frameworks/kconfigwidgets-5.37.0 >=kde-frameworks/kcoreaddons-5.37.0 >=kde-frameworks/kdelibs4support-5.37.0 >=kde-frameworks/kguiaddons-5.37.0 >=kde-frameworks/ki18n-5.37.0 >=kde-frameworks/kiconthemes-5.37.0 >=kde-frameworks/kio-5.37.0 >=kde-frameworks/kwidgetsaddons-5.37.0 >=kde-frameworks/kwindowsystem-5.37.0 >=kde-frameworks/kxmlgui-5.37.0 >=dev-qt/qtprintsupport-5.7.1:5 ) X? ( x11-libs/libX11 x11-libs/libxcb ) !x11-themes/gtk-engines-qtcurve
 REQUIRED_USE=gtk? ( X ) || ( gtk qt4 qt5 ) plasma? ( qt5 )
 SLOT=0
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	186c36517327615304bdc71c5f2bf6f7	kde5-functions	48ad3d5429e273ff79fa3fef2572d679	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	git-r3	52a888802d25387c2c74cb845d1219bc	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	674cf942c2873cefcc3b34e058c84968	kde5-functions	adc3902b801da8e33081fe9353aa126a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a94e785c14ac1f6792c241f0fe6af3d8
diff --git a/metadata/md5-cache/x11-wm/lumina-1.3.0_p1 b/metadata/md5-cache/x11-wm/lumina-1.3.0_p1
index 2dc5ec544dcd..d24dc638f9ec 100644
--- a/metadata/md5-cache/x11-wm/lumina-1.3.0_p1
+++ b/metadata/md5-cache/x11-wm/lumina-1.3.0_p1
@@ -4,10 +4,10 @@ DESCRIPTION=Lumina desktop environment
 EAPI=6
 HOMEPAGE=https://lumina-desktop.org/
 IUSE=desktop-utils
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=BSD
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtsvg:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtgui:5 dev-qt/qtdeclarative:5 x11-libs/libxcb:0 x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-wm sys-fs/inotify-tools x11-misc/numlockx x11-wm/fluxbox || ( x11-apps/xbacklight sys-power/acpilight ) media-sound/alsa-utils sys-power/acpi app-admin/sysstat
 SLOT=0
 SRC_URI=https://github.com/trueos/lumina/archive/v1.3.0-p1.tar.gz -> lumina-1.3.0_p1.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=70d2c659d1ad3809ed1e962a003940d7
+_md5_=bc0f63f0ace4552b366a780dcb9ffbb1
diff --git a/metadata/md5-cache/x11-wm/stumpwm-1.0.1_rc b/metadata/md5-cache/x11-wm/stumpwm-1.0.1_rc
new file mode 100644
index 000000000000..2fbeced17b9d
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/stumpwm-1.0.1_rc
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare
+DEPEND=dev-lisp/cl-ppcre >=dev-lisp/sbcl-1.3.0 emacs? ( virtual/emacs app-emacs/slime ) sys-apps/texinfo doc? ( virtual/texi2dvi ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Stumpwm is a Window Manager written entirely in Common Lisp.
+EAPI=6
+HOMEPAGE=https://stumpwm.github.io/
+IUSE=contrib doc emacs
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=contrib? ( x11-wm/stumpwm-contrib ) virtual/commonlisp
+RDEPEND=dev-lisp/cl-ppcre >=dev-lisp/sbcl-1.3.0 emacs? ( virtual/emacs app-emacs/slime )
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=https://github.com/stumpwm/stumpwm/archive/v1.0.1-rc.tar.gz -> stumpwm-1.0.1_rc.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	common-lisp-3	8c4aaa6d66cd2daed8572bb60bf6fe07	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=dfa8590d790676d129d915cdd279230a
diff --git a/metadata/md5-cache/x11-wm/stumpwm-contrib-20171028 b/metadata/md5-cache/x11-wm/stumpwm-contrib-20171028
new file mode 100644
index 000000000000..9d4ac879104d
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/stumpwm-contrib-20171028
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Extension Modules for StumpWM
+EAPI=6
+HOMEPAGE=https://github.com/stumpwm/stumpwm-contrib/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 GPL-3 BSD-2
+PDEPEND=virtual/commonlisp
+RDEPEND=>=x11-wm/stumpwm-1.0.0
+SLOT=0
+SRC_URI=mirror://gentoo/stumpwm-contrib-20171028.tar.bz2
+_eclasses_=common-lisp-3	8c4aaa6d66cd2daed8572bb60bf6fe07	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=39482b2a2f19ec52a585641dd2c29d8e
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 4751ffbdb218..efc7a33c3304 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 21 Oct 2017 19:09:17 +0000
+Sun, 29 Oct 2017 10:39:29 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 2e1b71e4139b..4d68a7110726 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Oct 21 19:09:17 UTC 2017
+Sun Oct 29 10:39:29 UTC 2017
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 52efc052270a..6828338b68a3 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 21 Oct 2017 19:15:01 +0000
+Sun, 29 Oct 2017 10:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 86bb0b926af4..12823788d5e9 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-88f7e3dae2765cc795f4e36683b5a9c8d8a94fa8 1508611258 2017-10-21T18:40:58+00:00
+09bd3482ef26dc37528c4ff6425beeabff85ac82 1509272084 2017-10-29T10:14:44+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 9b1b6324c9d2..86b9e3ff5fc2 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1508612701 Sat 21 Oct 2017 07:05:01 PM UTC
+1509273301 Sun 29 Oct 2017 10:35:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 4751ffbdb218..efc7a33c3304 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 21 Oct 2017 19:09:17 +0000
+Sun, 29 Oct 2017 10:39:29 +0000
diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest
index c96cd30927b4..a1b5804104fd 100644
--- a/net-analyzer/arpwatch/Manifest
+++ b/net-analyzer/arpwatch/Manifest
@@ -1,8 +1,11 @@
 AUX arpwatch.confd 270 SHA256 bf36f7b717291733787bd00ac22d49dafc251cd50fcc27266d56d51364fd62fa SHA512 901375c1031c776f159cc526662e727be41dd9630037a492b718c9cc48d2fb580b22bcdf90a84a02049924e67fb84a2668e3519a7ab24e6c8ad07d20cc5adf41 WHIRLPOOL d6f691d769f2320870061667b241e8504207e1e326ab9c6cdede575f2e34696fc3f722a8038044c500855ff361c7f64aa3a64e3086b2c03665d41cabc1c32c35
+AUX arpwatch.confd-r1 559 SHA256 b52aab07e97c0a8771d9a44ee0e88b3c675f9041f5afd0d09fcdec8f1220dc3b SHA512 d1fc4993db4b9a1e11fee0629b92b6372266085551e6e89f5f33a9dd092ee70087f2766c46cb983040917c47e478c0c8206efd1b9fde8d030a3e249c28970c9c WHIRLPOOL dd3ca9304c724622ecb4216f7e024f07cffd16528e06c3ed4ed320d9cd044a0919b851c045e69c240737a20af4fa37084f58a8f9993812d9e70a151f71fdf973
 AUX arpwatch.initd 991 SHA256 d1b6667f2abf5910b6b1d845049b6504faa3346cc8cc4744a8314e4fad0d3672 SHA512 de62ab2026bb04f557731b741023b6fc2333656f4709226459e8bb17fee2959ad9e24077eae730443efa3736b6f0268c474ca65905c371d228c2f2869ec4986e WHIRLPOOL 36c4a091b888f69ca3a17b2a9e494c2162ea7a01bd7cd521b645009028855ec621936a867a9fb4b362b59cfde1e82414a2a6e1eb5ed44295fe0fa87b13376315
+AUX arpwatch.initd-r1 752 SHA256 99590d709dce12503388432406dcf908c3c689ecb7952e2afe9084ac65686a0d SHA512 735e284132aaa2125d7b248c81a27be2208963d84b7b434f251ee3f7a350e81c9e3cff58bc812bebd26450b711322c188876e96d6638a4ba3dbde4e8fc040c04 WHIRLPOOL 5f0fd3739a82bf01fa0803a948ac3df7658bd3c00722a1e63bc08087eb9418b3e9bdc7c6c6c7abda2e6e899d66890e25e1f61fefc063be2e7a24c2a6ef12e2ba
 DIST arpwatch-2.1a15.tar.gz 202729 SHA256 c1df9737e208a96a61fa92ddad83f4b4d9be66f8992f3c917e9edf4b05ff5898 SHA512 f770b5b7954afe910dafb016e6e886a4e785564bcdc0ea0de9d7b1ca6a9a0b219a9d1b50b6f42a67afc2f836e782e8ff85ba5780583015d62c9694ac53f0bf90 WHIRLPOOL e653eb83d8dbc8777c3aaa5920bc1e5b46c64aa740c64a79b24a42abdee4625baa72a51f9f0441549b7325fcb07b94f1964887df1b6d707eddde162e1073691f
 DIST arpwatch-patchset-0.7.tar.xz 132868 SHA256 ccc3f84f452306b153175bbdec33f9913848ac57866a4ee52b974d7087b7fe48 SHA512 2cbfa37acd29c30232da9ad0a742ddc9cd35c228fb786c6798555962841006ba0f47e31097722a3303e25f2e7c665b6e93707e49c02a8a9171b484b56a133e00 WHIRLPOOL f6624f459f2172b10beb6eaa15e0e5111566cd360195e4ca08ec4e5962bb1156aaf133701730e8146cb049a9759f7063bbc225d99f824827bb8bb72d3e0cebb3
 DIST arpwatch-patchset-0.8.tar.xz 131692 SHA256 de504e93277696b35c2e184a3ff6cf28f4ff559a549873af3cb4aa8b0965e00f SHA512 3e8f1c043f09fbeacadb40c1db47fb907314ed18bb3fb506c6c510977fd0e6dd9950becc830cf7c10911a7eec97e56e0af8c8c3d7df811e8ab820290973ea0b0 WHIRLPOOL 9b8efd22dc3f5500868c092bc4c3a022094b2e134b9098dcb2596aca8ba411592ecfb1f54d7f01fcf117d3109ed4c2c3db21225970bc15a8c437da93a9181dcb
+EBUILD arpwatch-2.1.15-r10.ebuild 1608 SHA256 9ad4248e0f1523feafbaa3cbcbb017ec5c69d7cdcf3aff11de27290e9975a9de SHA512 1c7bebf0f62c0b421b87dc18f5b509495b30a75b997c748b00420333bc3815b6236a64fc3be60173fa353b813c1de0b33207173dea3c2750314bb0439e38a271 WHIRLPOOL bdb53beac6b9f835c64382e2801e91e2e669b4b84a243eb794b21dc4733b8e7f4ca63bbc9f9f868e3ac94a9479ecd68f471e31ec1a927b08dc8f99bbc2619ec2
 EBUILD arpwatch-2.1.15-r8.ebuild 1388 SHA256 25b638af397f39831891ead4ad2d001a460e64d41d753f2d936ae6a05b1c0f7c SHA512 73e3289f751cce19f522353c68b65d7222561adc70e79f58b848344487258c744541b03179bf712a38ed81f3565bb41c1262aa78eaa2ede1314a9751353fb0fe WHIRLPOOL a9301dd755f82d55e8bc3eee5879f2c5b19b8162c4b299c3e7d4a8936d410b17d67131d84e99aa71ea7f32ba58ddde36bee8a304ead31598881a3f8167e69856
 EBUILD arpwatch-2.1.15-r9.ebuild 1370 SHA256 5835ab298ceb0f6b74b4d134b9755d1a3aaf0105a7c8568a9ba077b3c0555673 SHA512 dbd27d01b2be37e056bad0d23544c43f75ddf6f0f4fba8e9a2a21d5d10c5ceccde02a0882548c8350b9510d90ebce87e60485dad1521363e882deec3396741bb WHIRLPOOL d5c06bb39913cff9124b6d90ec499d0e38634eedada5252206bf3eff54409a3428e26151d1c988a387a00cc808031c9b64d718bfd02048df7e1be69907ad9260
 MISC ChangeLog 4319 SHA256 6e635c33144ae5f6e740999ffa3fdc17db6c040bf2a6c8d2a7da89153b7e3e6f SHA512 29e6a5722940d97daccf157d21ed8d4fb710b8f2bc830dd94f087db73969ffd5a3fdf5645782370c80f1297c7538830c05303aa9824a11eb1a6466b502232afb WHIRLPOOL f61b3a72ed41351d56ce1e6e86374a70e0a20fe855af726396c1d1dde76767eeefbbb5507233347c08eb5c26a3665cba537693766b540009e5d0b91d9c169c3e
diff --git a/net-analyzer/arpwatch/arpwatch-2.1.15-r10.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r10.ebuild
new file mode 100644
index 000000000000..986da0386f7d
--- /dev/null
+++ b/net-analyzer/arpwatch/arpwatch-2.1.15-r10.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user versionator
+
+PATCH_VER="0.8"
+MY_P="${PN}-$(replace_version_separator 2 'a')"
+
+DESCRIPTION="An ethernet monitor program that keeps track of ethernet/IP address pairings"
+HOMEPAGE="http://ee.lbl.gov/"
+SRC_URI="
+	ftp://ftp.ee.lbl.gov/${MY_P}.tar.gz
+	https://dev.gentoo.org/~jer/arpwatch-patchset-${PATCH_VER}.tar.xz
+"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="selinux"
+
+DEPEND="
+	net-libs/libpcap
+	sys-libs/ncurses:*
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-arpwatch )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	# We need to create /var/lib/arpwatch with this group, so it must
+	# exist during src_install.
+	enewgroup arpwatch
+}
+
+pkg_postinst() {
+	# The user, however, is not needed until runtime.
+	enewuser arpwatch -1 -1 -1 arpwatch
+}
+
+src_prepare() {
+	local patchdir="${WORKDIR}/arpwatch-patchset"
+
+	eapply "${patchdir}"/*.patch
+	eapply_user
+
+	cp "${patchdir}"/*.8 ./ || die "failed to copy man pages from ${patchdir}"
+}
+
+src_install () {
+	dosbin arpwatch arpsnmp arp2ethers massagevendor arpfetch bihourly.sh
+	doman arpwatch.8 arpsnmp.8 arp2ethers.8 massagevendor.8 arpfetch.8 bihourly.8
+
+	insinto /usr/share/arpwatch
+	doins ethercodes.dat
+
+	insinto /usr/share/arpwatch/awk
+	doins duplicates.awk euppertolower.awk p.awk e.awk d.awk
+
+	diropts --group=arpwatch --mode=770
+	dodir /var/lib/arpwatch
+	dodoc README CHANGES
+
+	newinitd "${FILESDIR}"/arpwatch.initd-r1 arpwatch
+	newconfd "${FILESDIR}"/arpwatch.confd-r1 arpwatch
+}
diff --git a/net-analyzer/arpwatch/files/arpwatch.confd-r1 b/net-analyzer/arpwatch/files/arpwatch.confd-r1
new file mode 100644
index 000000000000..a4da503406a2
--- /dev/null
+++ b/net-analyzer/arpwatch/files/arpwatch.confd-r1
@@ -0,0 +1,17 @@
+# See arpwatch.8 for more information
+
+# Specify the interface for arpwatch to listen on here (default: lo).
+# If you need to listen on more than one interface, you should
+# run multiple arpwatch services; for example "arpwatch" and
+# "arpwatch.eth1". These additional services can be configured by
+# symlinking to the "arpwatch" service script, and by creating a new
+# conf.d file whose name matches the new service (symlink) name.
+#
+# Example:
+#
+# ARPWATCH_IFACE="eth0"
+#
+ARPWATCH_IFACE="lo"
+
+# Additional options to pass to arpwatch.
+ARPWATCH_OPTS="-N -p"
diff --git a/net-analyzer/arpwatch/files/arpwatch.initd-r1 b/net-analyzer/arpwatch/files/arpwatch.initd-r1
new file mode 100644
index 000000000000..ffe165205c6a
--- /dev/null
+++ b/net-analyzer/arpwatch/files/arpwatch.initd-r1
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Default to "lo" for the interface, so that the init script will work
+# out-of-the-box.
+: ${ARPWATCH_IFACE:=lo}
+
+ARPWATCH_DATAFILE="/var/lib/arpwatch/${RC_SVCNAME}.dat"
+
+command="/usr/sbin/arpwatch"
+pidfile="/run/${RC_SVCNAME}.pid"
+command_args="-i ${ARPWATCH_IFACE}
+              -u arpwatch
+              -f ${ARPWATCH_DATAFILE}
+              -P ${pidfile}
+              ${ARPWATCH_OPTS}"
+
+depend() {
+    need "net.${ARPWATCH_IFACE}"
+}
+
+start_pre() {
+    # The "arpwatch" user must be a member of the "arpwatch" group for
+    # this to work.
+    checkpath --file --owner root:arpwatch --mode 0660 "${ARPWATCH_DATAFILE}"
+}
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index c4534e0b84d1..b225c55fc3ca 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -7,7 +7,7 @@ DIST cacti-spine-1.1.20.tar.gz 801877 SHA256 a8ccb24980099fbb6ee0a16f397f10fb9b3
 DIST cacti-spine-1.1.21.tar.gz 801907 SHA256 031c7eeea7e64b20754cccfcc65851443847a31765893ddcc528da4e384ca4bf SHA512 0dfdd3444639a471bc5c0d35ea3898532f2ebf16679677fee8ad291221ed607b54acc7fbf25e78da7c5597eeaed6b870ad7af66a95e20f95afce3270c8da5dd0 WHIRLPOOL 6521e622329c1a6e6ca5b8c97717380a4bc2fadde37af42fa6c1fd83f82a35ebc5cefce9788a360ff46abc62a9918e327404188f6c9b611b0064e1a86b41cab0
 DIST cacti-spine-1.1.25.tar.gz 802127 SHA256 d5452d320781107a2cbc289247ecf8c0b29f55379a0c008b020843508c7e435d SHA512 d9c4a924ce08d363a1ce7327172b6c83d606ccfb2b623b3b5a0f6df534a031caedbe55314cd415a58484c89df49d5e682853e5001849bd8e9767190fdc367809 WHIRLPOOL 0c2d5ec02c110b5ef5545ca1be769a2632c2bedd9c7627ef7f9a53995a956151627a10293fcfb19f34e223cb8c6cde914a2b399f14c2426a57bbdfe5f2046617
 EBUILD cacti-spine-0.8.8h.ebuild 999 SHA256 9dfc1173686e7bb7cdc44895735a91f77e0412436b90af2fada2670d74eeb827 SHA512 5b1226090b6cc63715b45e46a5d258b25ab67d596894212c755fc8c3602db4d8f96f9c26208b7bf4c3c27b11ef57cc3cda9913d709fc7d5f1ed9b44c5f52c241 WHIRLPOOL 3763b3ae6bc822edcc6e526bbb137be74766bdc105e58dd8e2d6a1969f352ed302508c6b09e2d34febf3fc1fb24e469edfec49f4db059167a1f47101b7843526
-EBUILD cacti-spine-1.1.20.ebuild 861 SHA256 1339a910525d2e15412e9b805c92877bdb49fdc9f462b6dc0abb6ac3d906d29d SHA512 4820e9d6245df29dfb6dd57cdc6a41dab158e177e4273895748612d2de9089f61dc3984fef204ac0ec0321d97c94258962edb14ac84a983ce34b7b2234dce2be WHIRLPOOL c671990e7c4c899be726dfab136ff50abc2cbc97440f88446e6f912f14b8f03c4e9a2fa884f909cccdcab1f5cfbee968923c93896c0a4871e703375b7f96c00e
+EBUILD cacti-spine-1.1.20.ebuild 860 SHA256 b9a076ee6ef9abc8bfa430481b2a614d3aa8b63ebdef3ac9f5434f3e8ebb1e18 SHA512 dc1c9f975baea6553163fd29c13fff1bb3a99e268b2bab5fca31619e9880f579545ccf75a508525889ccd9d96923f29703f1860e5b35acbcbee69a12b064fb1a WHIRLPOOL b0c5f96ad0e67152cccd9006eafab167fe8564d4d5520019602b17e4e8d0dbef83dbbb3f6cbeb2ed91e430a8d21010ccbb8f5076f7d0c86234bd18903ac45db5
 EBUILD cacti-spine-1.1.21.ebuild 862 SHA256 05dac1a6ed0de32c13e63983c62738089ebf30ad0c053ec2caafe47c33147a6d SHA512 2c241b9da06c6e069736d7f517f56cd2690e2a89a4c1d11c148761d0d8cae05aee0a48d74d264ec166c8d74477b7d3738170a37577119c2bc3a8ef2d697811c2 WHIRLPOOL ae366e77ff4e1b4e3d8ae198918efeb3e207902db4462a3b4211103bc41a2cf208b927d530f60c4748114c6a735db073da0daac19e96e6878e09301049733dce
 EBUILD cacti-spine-1.1.25.ebuild 863 SHA256 5e5f9ee85315aef7c3dbdbf8397d5afb857a4647a9ad7a553c87316c760b6eed SHA512 0520ba0fdaa6dee66803ac9567c2e49060e48dcad9d9eae868e3c063e601f45686cd1d46897e26a1843fbd2c854df05b3fa68659eda95b391a321777eefe59fa WHIRLPOOL 20561edecf53e00acbeb99a486f0b9df275fc95c795e92fb8c13e9c0f5f1059aa12b44eb108adcc62fdf685e2842f3aee0f0822af644fe41aedc4149aa59aeed
 MISC ChangeLog 5144 SHA256 f4109f6f6cc548a8d9390a072215bcc6f16fe7724494eb7e14c09093c7700160 SHA512 607568b0cbe9ee8d1bbddaf9d9dd01c9652a5cdf12d7d2e944ca73c4c4550af004ff59276bcb84ac90179b4c4349e33261929703922dbf9862bc32de3939eea9 WHIRLPOOL 8a2b8005b6230e5348bac05fe25c89b3afc862496d00e45333a762bf2563fddd0cc914c53fe433eb9636a61b941667d567c2753031c66e530295f21869fa2545
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.1.20.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.1.20.ebuild
index 278cc3ade74f..0ca89463112f 100644
--- a/net-analyzer/cacti-spine/cacti-spine-1.1.20.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-1.1.20.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 
 CDEPEND="
 	dev-libs/openssl:*
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index aebd444c82cc..9b2c74bfd2c9 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -4,7 +4,7 @@ DIST cacti-1.1.20.tar.gz 8903728 SHA256 cbad90ef98d656bb10814e1444722dc00ff0c3a9
 DIST cacti-1.1.21.tar.gz 8905650 SHA256 e649fea4e8fc9900620af213218989e229aa25a1e1fb10dcde1844b1a2ae3bc0 SHA512 383bfc24c038154fd03d8997cba0fdf8d87ee69305f392b254102b6c279c0b7e53562a2d3d1f996315152a36da467821876e3834dd7b62bdc057a3b7838b94d2 WHIRLPOOL dea91e014e4b64a40bad4ab573a468fae0c6e1f7e380946cec5f5b270fe8abaacd3c73d71ad636e813e443117af0641269cfe2448f8c8487b1b7f7507e2a493e
 DIST cacti-1.1.25.tar.gz 8920466 SHA256 d0b911ff5b46abf858650bcb95bbeb1e482c3815e1a48129fde167ffe2d52389 SHA512 f5574cf0ba9d8fa39a6e547c9fe2a3c007901987abb82ff50d63672009bbf257ee58f47f02cea512dda6809e880e87e8a3ad826c26a9421f195569816d6489e0 WHIRLPOOL e229d13cc133c1e852e248c313ab22e0a1a53a123e6bc98396ea031a8307169a3278a9ef5bb63a69be667bf6d83c1c299cb97116db753a22a318ed061e75f3c5
 EBUILD cacti-0.8.8h.ebuild 1308 SHA256 42fb408c4c187c7733a7741701d94988734649097a6e76842d120fd5272ea1bc SHA512 6d48400c92aa9ef987ac43b5cbb6a4eeb9ad2235ffe1adc40cdadbe54ba0033090e0e4b8a9f48a6b85b0bf4e41c4f4f67da1869218344c59c777ecb173cd8784 WHIRLPOOL 9132c1a334e3426c7817893f212fbac3ffefbf8139e1f0e15b700d97c1cb2019391e420ba36fbc9e61bf992ecf2b567dcb0c838ddd361220435a934ff682f1ba
-EBUILD cacti-1.1.20.ebuild 1258 SHA256 8a90731cd9defdfdefb98d57868e37fc438eb8d16b303c92a33e571340585d5b SHA512 90246b8bbd88ac48ddd24df0dc32a43f8f387f2eb4215ed8280c59e2856f7060027cc4fa590446c2e7c3fce8c663da77ac5d169b9267ed8f04eb9c8207c6f517 WHIRLPOOL 50382cf522323d6c354322ee87c38ff1691049c718cf464a9bf6092cc770ff1a4be2286af3c15ca5773bad34ff25b2ef8ee40b0ab32a54cd8f9da452cdcce742
+EBUILD cacti-1.1.20.ebuild 1257 SHA256 4f18a415eef789a4954134db937336f316eee1c8c0f2f4ecdfed06c1e75473dd SHA512 830f0dff90239b799454a572bf3b3412b59c57b323db30d61337ef7a73023e44cac4267f672f9cb48002afda86ad0091b047ef89a47b09bfc8aa733d0c2a450e WHIRLPOOL 78148e827368503bf79d1ec55ce12b646becc4082adc9b0928d5d082c569a56fa242d46e4a350dd6de6d3e7a14b5f6a2586ba26196d54ff4b526f846c59c4646
 EBUILD cacti-1.1.21.ebuild 1259 SHA256 d85789f10a42d9c56f166df0d5f7185bee5829f754bef93fc2200affe2aa95b1 SHA512 e9f48fbc4348eb47d07c0d47272e001d0f815fa6527b2bb48989e818d4984bb042d19f4c0369f29cc7b2537c884b8c1483f1058c95720c8f440aa62bf4903884 WHIRLPOOL a968f18d75cd7ef0b10cc13e71b878650de242fc8136523b0e52b9b15466e19db269c36fb6823b2280b6210e329c02cf988be7c78a33131131c88ec07962c307
 EBUILD cacti-1.1.25.ebuild 1260 SHA256 9e1f68ebaee9e7229e139e3d95269863d6a4983a41b8de0e0d80dad0284819c5 SHA512 6a2811d73ba933ededc5b1157180f8cfd3aa64da392e34dd56cf8a1402720906b2d7169359fe3f079987cf50014d010f2ac6f6b39b0de379ffd57d6fb5317ad1 WHIRLPOOL c33e5d42e8ebc02465df235c4aaa379b95547537400c2c71aaf585e648855ba99c28c8b3b0db42efa592562c01d143131371e06c1e58d570565db357ded303ff
 MISC ChangeLog 6068 SHA256 b9a798f16089824899d4534b3047ea47bc4c3f5c961bb75939ede4394c939f09 SHA512 d289b3977cd4e2a6029cc976427dbd7258e5d31074ab63b2f0b26820d347b0b6a0a43d395bdf850851402ec36afc3e36d64f094d1e70d546177671276eba0cf2 WHIRLPOOL 36c0d2056e11d758c86a9b3458677ed1682c80a362949660c7a23ee1e3161f622ae80ba792c10e55aae943c0431fc4c373588b3e57ded9af7e131868b48f8367
diff --git a/net-analyzer/cacti/cacti-1.1.20.ebuild b/net-analyzer/cacti/cacti-1.1.20.ebuild
index 7947fe008161..ea74ba637169 100644
--- a/net-analyzer/cacti/cacti-1.1.20.ebuild
+++ b/net-analyzer/cacti/cacti-1.1.20.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.cacti.net/"
 SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="snmp doc"
 
 need_httpd
diff --git a/net-analyzer/hexinject/Manifest b/net-analyzer/hexinject/Manifest
index 6f1954f3ba24..6c24de43327b 100644
--- a/net-analyzer/hexinject/Manifest
+++ b/net-analyzer/hexinject/Manifest
@@ -1,4 +1,8 @@
 AUX hexinject-1.5-fix-build-system.patch 433 SHA256 87a83bb89c834aba9f6fdf5e9c56de6473660278834ee67bfeeeabc64423f89c SHA512 db17bbb6d1ac936b5eedadd9460bacb1f59c21556fcc8c60e135920383d6990b0498a1f74182352b8061629934e728a865e2cba922abec4c7c7035bbc346e2e1 WHIRLPOOL cf691c1ff0c7c7d44abd85a2f6153fe99dce19319dcc009c9259c1a095deac79444ec47bb97b48fcf94b63fd2a6923997332f5b65327d5e8136af147d75b37dd
+AUX hexinject-1.6-fix-build-system.patch 462 SHA256 cb410b131fd447f8b18b2e69bd35a0ae79df1689eb32f8ff97365eb8e250e8c5 SHA512 5cf816c71789d6c487acd757e62d44c4ca0ada32393d2de138311e61eb22c0ca5c49a9e539a7fe333b4fc8ea48ec29b49c4e14db97bc267c45aaa39f8fab04d1 WHIRLPOOL f1ee404a7e79a724495782011e9ec12f3bfa2987775b2f3d421b64b76fcbd3af9c0f3a6e39edf3da012af5ef22c25a240743b6fceb8be73cd241c330993da5b3
 DIST hexinject-1.5.tar.gz 14449 SHA256 329f0686069988ac0dae4a00082b205ac9669bc8e202d4b112c600bcbc198ce9 SHA512 cd145b6f2ae9d739effca03959fb474df11d28ff015c0e5bd1e30c341f60085154795f3c8a601b7241623944b3868b6fc9a3e1530a3aa4e7aaa2b3794a5aa34a WHIRLPOOL 96e065ca7135f12db6e5949fb8fd537e0981f5b0cc1d57d40eb59003aabc87ae2459872cb11108727c0032b6c5282d385512678859da081d783bc692f8044c93
+DIST hexinject-1.6.tar.gz 16876 SHA256 06e64636923af593c742129d81b717667223bff39918f26bf56809ead9700e65 SHA512 7432122a7ca42b7ac066cc55daec2d4a656b08e0f390db1a49f626181080d07687026d04a150573e3341e4e76f87a20b6466deddcc9d022e7d66fadcb8dac1ad WHIRLPOOL 8c49413e47e142aa6b48acad8cb9b4510065a76f6615ad417a7e0734aaa481f1ee126ca9824e075fce7a614162ef22a8c46ed7d78b13b7db60876548fa71e009
 EBUILD hexinject-1.5.ebuild 756 SHA256 09565bedd7830e8f0d97ffdd8a51d4fe2da4ea8909b8e99465849c801184c513 SHA512 2d17be0ac7931ac94d94924681f8f6f7ed0ed4b2072f2e5e46a5bf1277b4a67b62cdcabdad61d3db5fc7eb216258135d4ce389e4cae4a5ab476a209a62878a92 WHIRLPOOL 8fd175a1aeaca97833912647e1e8414ee268c19a7bb229a7ed8fa227346e076036e319451037b8a39b75e342e21e9f4969680dc9f2c161f8b4d6f45e2d81152e
+EBUILD hexinject-1.6-r1.ebuild 697 SHA256 41e20a5b1b14c9bb9f13cd55009c1a3d5a4646a802f3e53616bb75342ebf4c28 SHA512 89ca26ae193bca85ca9fe8ca0e5075f96254887666f24d84ae2e194d941d3e50bc7f46a40bbde3c319b3cdf977080e29b5924a1d2e11dfadb601f23c9914f2a8 WHIRLPOOL 5412f1c71a395a23aad3bac62fe55832268415f19c948af8a1698708c8def0f5fedc4664115c8051ff240dfe2b0a0b248bf8da3294d21b36b418bfcea072a373
+EBUILD hexinject-1.6.ebuild 696 SHA256 029ad872cb49c6de2cd30dadb23792e253044998d08e538577a54a06f1685eb7 SHA512 0a41dbb13e7551603261a7c40ce956779a62a1bb6e35fa35530d957f3872fb223cd961cf6e1734fcd7bc6ce9c91b81e799b18699e1ac5c8d82eb42c55beb91f5 WHIRLPOOL e3ca179cb32794d7a760cdb5896f4bea4e1dd73d6d50d1cebcd0c2c4b0b98785177e00902dc1e540c96c73d0fb62319342a8efb2155522f9c583a708060e617f
 MISC metadata.xml 1004 SHA256 e507c67a149b536ccfaaaaf3bbbcf5f2afb75e19fa2a3a641dfa400ded2ff182 SHA512 e9e01a46cc45ab6625e4d444d857a31340b93879c24cb7e2a1d420e644b376f484ad4076bc36302ab536bf88a9ffd7c1850115d3c2433181b82c948e84077ccd WHIRLPOOL 891d1d137c3481c9bb69cf843fed93fe0167b328cbd5e95bbbe115bb8802ec9923a896b3d0b1296838bbc563d584c66f95e7b1c4f8ff3c41d72d5499f853546c
diff --git a/net-analyzer/hexinject/files/hexinject-1.6-fix-build-system.patch b/net-analyzer/hexinject/files/hexinject-1.6-fix-build-system.patch
new file mode 100644
index 000000000000..fbe91199bbfa
--- /dev/null
+++ b/net-analyzer/hexinject/files/hexinject-1.6-fix-build-system.patch
@@ -0,0 +1,18 @@
+Author: holgersson <holgersson@posteo.de>
+Date:   Fri Oct 20 18:30:00 2017 +0200
+
+Don’t call gcc directly, and respect CFLAGS. As this project
+is plain C I don’t care fore CXXFLAGS here.
+
+--- a/Makefile	2017-10-20 18:15:11.743805540 +0200
++++ b/Makefile	2017-10-20 18:24:55.120009439 +0200
+@@ -1,6 +1,6 @@
+-CC = gcc
+-CFLAGS = -Wall
+-LDFLAGS = -lpcap
++CC ?= gcc
++CFLAGS += -Wall
++LDFLAGS = -lpcap
+ 
+ all:
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o hexinject hexinject.c
diff --git a/net-analyzer/hexinject/hexinject-1.6-r1.ebuild b/net-analyzer/hexinject/hexinject-1.6-r1.ebuild
new file mode 100644
index 000000000000..e36c1803461e
--- /dev/null
+++ b/net-analyzer/hexinject/hexinject-1.6-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Network packet sniffer and injector"
+HOMEPAGE="http://hexinject.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+tools experimental"
+
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}
+	experimental? ( dev-lang/tcl )"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.6-fix-build-system.patch )
+
+src_configure() {
+	default
+
+	tc-export CC
+}
+
+src_install() {
+	dobin hexinject
+	use tools && dobin hex2raw prettypacket
+	use experimental && dobin packets.tcl
+	einstalldocs
+}
diff --git a/net-analyzer/hexinject/hexinject-1.6.ebuild b/net-analyzer/hexinject/hexinject-1.6.ebuild
new file mode 100644
index 000000000000..5d8011ced352
--- /dev/null
+++ b/net-analyzer/hexinject/hexinject-1.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Network packet sniffer and injector"
+HOMEPAGE="http://hexinject.sourceforge.net/"
+SRC_URI="http://downloads.sourceforge.net/project/${PN}/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+tools experimental"
+
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}
+	experimental? ( dev-lang/tcl )"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	default
+	append-cflags -std=gnu89
+	tc-export CC
+}
+
+src_install() {
+	dobin hexinject
+	use tools && dobin hex2raw prettypacket
+	use experimental && dobin packets.tcl
+	einstalldocs
+}
diff --git a/net-analyzer/ifstatus/Manifest b/net-analyzer/ifstatus/Manifest
index 8f8aead801f0..c6b4ff4833db 100644
--- a/net-analyzer/ifstatus/Manifest
+++ b/net-analyzer/ifstatus/Manifest
@@ -3,7 +3,7 @@ AUX ifstatus-1.1.0-gcc6.patch 397 SHA256 d27ccad23815b517d1bd56a5b97ad2a0b71efcc
 AUX ifstatus-1.1.0-tinfo.patch 472 SHA256 3206a39f60b2174c38bc96bb3e942549fb579bdee074a42e49637b55a83bce80 SHA512 0b30c07113d2bd8012438bdefcc494d8a80e14143af9e2099d511f934d50995e3f9cf3fcbafce947c139753f118dbee484742241a1ee3ea85593012a4835b56c WHIRLPOOL eea8ce897de8efcfe90cc28ad1b71f9800fd9536b562592b164639d793a7f9a7ce923e8fefb86c136590db3bb640fbe036cf61e31fe398407c36067876dda95a
 DIST ifstatus-v1.1.0.tar.gz 25233 SHA256 0ca8a8655a1edf07698efbd5e1d4adc962dbb1bfb078b4899062e89bb05eac10 SHA512 2660310be7186067315414218e3d3d269499e391c7ffa12022ac53a0456ddbe0f7d5562b788fe6b2569b7d0eba7acf5699e0386769a91606a3e14b51239a2766 WHIRLPOOL 7aebc62d229160a07a28e876d2d7daa6847ed16d6c6b0f457de70d85584afce36f6e4903befb383720426f6ee20def4d1d02245fabf8671a6df367517d2a648b
 EBUILD ifstatus-1.1.0-r1.ebuild 897 SHA256 2f1ced83f8dc72cbb326abbb4de97aa3b01f97a3ded12134c14c6cd2d842cf69 SHA512 71e51872bfb0653fa56446ee7be7c5e09f4dd88ebd41d670c7ef1ac769b480a66437ab739a84418b1a86dce9beec9fac822b96e2fe0456b58c5e00d5e47d7b6b WHIRLPOOL 0ea24e6583a26380487a89bf9fdcd44940a27b1ac2ac3ae5cc5cdf9f7c566d9ac30670a4ee10803f090c619ab1b35271d0bd9f06bfb75bc755ee8c24b7646baa
-EBUILD ifstatus-1.1.0-r2.ebuild 931 SHA256 bb30b3789bccabdb1752ccd4ebed58f1b4844e0d7a3c63023c08a6fd3ed418fb SHA512 8176f35ded4077fea63ebe1a599182bb21f0fcb31d156c61cc475908c2998aca1c16cdb20e1e2f67a7c049bbc0296e7d65784cc958537a968c9f5016b7c9813a WHIRLPOOL 3a57618022eb7e7570daeb5886bcf9c67c4f4514c9c7fbaed2e2c84fe195733974ec649a0ae9f169ce7fc0260d0d77fa86bc3ddb0fcfdbbee679e88102127774
+EBUILD ifstatus-1.1.0-r2.ebuild 930 SHA256 090de08d43be72e3739b986de63d2fb141b84c01013f087851aba46afb675816 SHA512 cb6db21e6b3e09a0488ae5a6f3f0735b765ff56f023a605960f02a3e81e7d8757881f53324dd761d25d44c766851ca606232bcf02e0ffb8ce2c49e7c5286e12f WHIRLPOOL 3e1d4c5b8da478e02a1e75424f9172a1df3dfa81f8367bf60f669020d4a245d16565d079f3cd74290f89f2a6af1ec42f592e28bc189d90fefabb1f525569d4d5
 MISC ChangeLog 2512 SHA256 0c2cc57a849fd2b11e60ba40aa1b6defa0f5f228bba97c3b7ab40e115c766275 SHA512 02a80f476fffbc87d25c4aeb2d3af82d719afc923559c10f92e72799eb83166900678b6eec059d484c41f4e2accf772a887be79db1ddd16100d768cd42f7e5e9 WHIRLPOOL 8ec55abf53e17de826029fedc6dfb319181fe9d422eea8300849a0e042da50bc388b50347509846d4b2c4a1c61f9cb0e2f1870dee78c347be70134645836b287
 MISC ChangeLog-2015 2829 SHA256 800ae990ab28b0396c1ca27625925756348ba1fb1e75f2f89e8c7f8e6b26e953 SHA512 1ad26b9846faea01376f3f7195ffea9a41db1e654870113d5f254866003fd92d86156e71a594e0e0ce9b1d4d2e19556508b4b7c51f9e7bc5e7e164085113bbd3 WHIRLPOOL 9d9944020146238167408284645b9d6275f5736348f359dd27321421cf46aba351c63db90990e802052575027aad17f53207aeb1fdff842b074aa225c14c282a
 MISC metadata.xml 358 SHA256 702bea6dc122b1e98b1408004c4a30767a184c15119451fe9984e9e2f406a682 SHA512 b23a7f0e009c71d86cd145b033b4bc7f77e7a316f048d8236e9bb2bf9cd34671ec24af37b11ef934791c6f046e1a761087c7f5e570bac80b09e30862e162d005 WHIRLPOOL 40cba310ce594df402e63c6ce5967f6a18bce005b90d6d8473b7902d49428d3eda01268c4909b49dcaab6fcde7202bdb2ccc1f7bcf678b944ce8398eb66175b4
diff --git a/net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild b/net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild
index cc2baff02f50..dcd4cdbcb380 100644
--- a/net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild
+++ b/net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 inherit eutils toolchain-funcs
 
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc x86"
 
 DESCRIPTION="A simple CLI program for displaying network statistics in real time"
 HOMEPAGE="http://ifstatus.sourceforge.net/"
diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest
index a4bebc0963d7..c2d42024ff99 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -1,6 +1,8 @@
+AUX define-own-mysql-port-constant.patch 3296 SHA256 1fbc168247ccd2664063ecda4d57ce5fe5e21d027fefd4b95857aab945453abb SHA512 3ead6340800ac15fbe76e223599a5b3dbc6b6b13b72b684919aa43487838564ad7117b4e67fa7f36f0f58554fd8b8d6233efbcb82e6927a0c31f22c6a9ab5dbb WHIRLPOOL edf49532bbdd8583723721a1055d008f44102391f9bf5d653ce1b6efc6aec3fb807fc06cb5b87523709c2e20851e89ebad1d2b8080f74b11b7993af1fc3085a5
 DIST monitoring-plugins-2.1.2.tar.gz 2613060 SHA256 76c6b58f0867ab7b6c8c86c7e94fcce7183618f6daab63488990d0355f5600aa SHA512 845eb7636691aa5402119384c3d4256969e959fbc29ef5257c24fc4c21536cad3dade30747f36c9ad998cb37df0f325df66ea679d3d5b96c2993b59a9a325fed WHIRLPOOL aea22e1a3d3c7622b4645118cf8b5d499882bd30b6af8bdd81287fb99fe42bff7f906b54fda411ac2c33ff6e42872a6ea6af4dcd7611bdc95d308c0fcd954e43
 DIST monitoring-plugins-2.2.tar.gz 2461548 SHA256 296a538f00a9cbef7f528ff2d43af357a44b384dc98a32389a675b62a6dd3665 SHA512 5f8cfa132891d6d96e69bee3f2c26f7d4546f572be6a18f25ea5d9069f162cb2e424361289a5c26bec60d7b63d28a269437fd6f25645903a1c142fdcbbf77f27 WHIRLPOOL 5ca16cbc63cbbe3472f82b87b2c4111df4877bc33b0a9bf638507aaf8020194adc6e8244c5a002ae636121ae58d7a112cb2c5cba6e384c136e5636bbfc4a6141
 EBUILD monitoring-plugins-2.1.2.ebuild 2858 SHA256 64a1c31aa98c89bce7e97adc9ebc4d1880caa4bf5ea4d4ba8718857ea71e3a05 SHA512 9426fdb164c60771cc3dddc6cff2e526ae7770400378b74dde706a2cfce7dba51aecddfb7c7a532e6bc07078d05cf28d64ddddc3e4eefeb4ec2bb70f44151f7a WHIRLPOOL 53739d5dc73981a520bae34597014c2bcd3fb916356ab11fdc57fa8618141ce34e2b9dfad64976f607b6a567729654f3c4d0897046e200643a0f6a65c1b2314e
+EBUILD monitoring-plugins-2.2-r2.ebuild 3014 SHA256 5d78f8fdb076820d2334f7405cce0eb64b4a1486c6498b7102347abae61eec50 SHA512 116db40f08b66e142691fd1dafda2c53e5ff8d069617d6778f98ac0aa25b514f6a4a10da8a51a1241921ac7ca43a0c5c6e6df191771cf0a8250874228cd066da WHIRLPOOL 052a29348d950a537c9e370de12c5d6cbe8f14cec76388167b100ee78e713b2d3afdf1cb8c0759cef84a0da63ec33faf96e18314d536f4aa5f6778213fae92a2
 EBUILD monitoring-plugins-2.2.ebuild 2875 SHA256 74d2d84ae9d9620a65801f706f7fe3e0d6846cdad46e381ea773107c3f43737d SHA512 67a2e298d56b06cfa7ef0f718889c4e300cccd668e7335f6574e36b929dbf349473ce4c4541a083a703440e8d61abea0551e2e245bfec4dbf95cd174e72114d5 WHIRLPOOL 30bcf8f9576d35670441d005ba6f5089600d7625010db48f2de26180155c72221783099320c225700242057ff145d4c504ca4e753bb7c549789cec53b75f8287
 MISC ChangeLog 4406 SHA256 0763915a056d3bf9a24757a76b6a36ea9d7ad01e90363cd7129700006ff255cd SHA512 c66af4340242619c68762cd664eea7a81518bbd873747f0d22c5ff902be298e265ee468df03e58ebb7a0142fb2fee9306fc66906c38096845f11188e89ddc464 WHIRLPOOL 9731fa3642854f51a2ca6499a0bfb30e3fdb4574dd34677701a5cc0f2707a8b9836b23abb0d858f532373268c02921ab0cf422154a5571e19489a70d9e84f1a4
 MISC ChangeLog-2015 589 SHA256 f642f2d89f87baaddd8fbdbb798a9e9603a81c39da412d4832668a25ce505ee4 SHA512 dff7df956fa977e38f4b7094d2edd78ca1aaa34b3c8a78620c7d265d8935cb3bf69a1f8446c391b6abb78ee2a82250e47278cc7b5b466c6485c07b8c2b403416 WHIRLPOOL f026417f1ee1dace25a47d2ff59c4dac96abb01ba506c38f69dfae001755589e0ce67fb44e994ac645081e8c12ae12d4efe6bd0b04f2411ad844d87e1bff2bcb
diff --git a/net-analyzer/monitoring-plugins/files/define-own-mysql-port-constant.patch b/net-analyzer/monitoring-plugins/files/define-own-mysql-port-constant.patch
new file mode 100644
index 000000000000..b7406bc9af80
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/files/define-own-mysql-port-constant.patch
@@ -0,0 +1,102 @@
+From d6bd787123aa9ccd96edec8286ec22dd0442c620 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Fri, 27 Oct 2017 07:58:43 -0400
+Subject: [PATCH 1/3] plugins/check_mysql*.c: define our own default MySQL
+ port.
+
+The MYSQL_PORT constant used to be defined in mysql.h, and was used as
+the default port in the two plugins check_mysql and check_mysql_query.
+Now that mysql.h no longer defines that constant, our plugins fail to
+build against newer versions of MySQL and MariaDB.
+
+Since MYSQL_PORT used the "default port" on the local system, it
+actually was not the best choice as the default for the check plugins:
+when monitoring remote MySQL servers, the usual default of 3306 is
+more likely to be correct than whatever the local server happens to be
+listening on.
+
+As a result, we fix the issue by defining our own constant, called
+CHECK_PORT_DEFAULT, as "3306" at the top of both check_mysql.c and
+check_mysql_query.c. The existing uses of MYSQL_PORT have been changed
+to use the new CHECK_PORT_DEFAULT.
+
+This change is backwards-incompatible: any users who compiled in a
+MYSQL_PORT other than 3306 and who were running their checks on the
+same server as the database will now need to specify that port
+explicitly.
+
+Closes: https://github.com/monitoring-plugins/monitoring-plugins/issues/1508
+---
+ plugins/check_mysql.c       | 8 ++++++--
+ plugins/check_mysql_query.c | 8 ++++++--
+ 2 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
+index 5773afd9..c44919d0 100644
+--- a/plugins/check_mysql.c
++++ b/plugins/check_mysql.c
+@@ -36,6 +36,10 @@ const char *email = "devel@monitoring-plugins.org";
+ 
+ #define SLAVERESULTSIZE 70
+ 
++/* The default port that MySQL servers listen on. */
++#define CHECK_PORT_DEFAULT 3306
++
++
+ #include "common.h"
+ #include "utils.h"
+ #include "utils_base.h"
+@@ -58,7 +62,7 @@ char *ciphers = NULL;
+ bool ssl = false;
+ char *opt_file = NULL;
+ char *opt_group = NULL;
+-unsigned int db_port = MYSQL_PORT;
++unsigned int db_port = CHECK_PORT_DEFAULT;
+ int check_slave = 0, warn_sec = 0, crit_sec = 0;
+ int ignore_auth = 0;
+ int verbose = 0;
+@@ -505,7 +509,7 @@ void
+ print_help (void)
+ {
+ 	char *myport;
+-	xasprintf (&myport, "%d", MYSQL_PORT);
++	xasprintf (&myport, "%d", CHECK_PORT_DEFAULT);
+ 
+ 	print_revision (progname, NP_VERSION);
+ 
+diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c
+index 49a14dd3..6f492442 100644
+--- a/plugins/check_mysql_query.c
++++ b/plugins/check_mysql_query.c
+@@ -33,6 +33,10 @@ const char *progname = "check_mysql_query";
+ const char *copyright = "1999-2007";
+ const char *email = "devel@monitoring-plugins.org";
+ 
++/* The default port that MySQL servers listen on. */
++#define CHECK_PORT_DEFAULT 3306
++
++
+ #include "common.h"
+ #include "utils.h"
+ #include "utils_base.h"
+@@ -48,7 +52,7 @@ char *db_pass = NULL;
+ char *db = NULL;
+ char *opt_file = NULL;
+ char *opt_group = NULL;
+-unsigned int db_port = MYSQL_PORT;
++unsigned int db_port = CHECK_PORT_DEFAULT;
+ 
+ int process_arguments (int, char **);
+ int validate_arguments (void);
+@@ -299,7 +303,7 @@ void
+ print_help (void)
+ {
+ 	char *myport;
+-	xasprintf (&myport, "%d", MYSQL_PORT);
++	xasprintf (&myport, "%d", CHECK_PORT_DEFAULT);
+ 
+ 	print_revision (progname, NP_VERSION);
+ 
+-- 
+2.13.6
+
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild
new file mode 100644
index 000000000000..76e7997e8b71
--- /dev/null
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic multilib user
+
+DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu"
+HOMEPAGE="https://www.monitoring-plugins.org/"
+SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres radius samba snmp ssh +ssl"
+
+# Most of the plugins use automagic dependencies, i.e. the plugin will
+# get built if the binary it uses is installed. For example, check_snmp
+# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
+# installed. End result: most of our runtime dependencies are required
+# at build time as well.
+#
+# REAL_DEPEND contains the dependencies that are actually needed to
+# build. DEPEND contains those plus the automagic dependencies.
+#
+REAL_DEPEND="dev-lang/perl
+	ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )
+	ssl? (
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+		gnutls? ( net-libs/gnutls )
+	)
+	radius? ( net-dialup/freeradius-client )"
+
+DEPEND="${REAL_DEPEND}
+	dns? ( net-dns/bind-tools )
+	game? ( games-util/qstat )
+	fping? ( net-analyzer/fping )
+	samba? ( net-fs/samba )
+	ssh? ( net-misc/openssh )
+	snmp? ( dev-perl/Net-SNMP
+			net-analyzer/net-snmp[-minimal] )"
+
+# Basically everything collides with nagios-plugins.
+RDEPEND="${DEPEND}
+	!net-analyzer/nagios-plugins"
+
+# At least one test is interactive.
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" )
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# Use an array to prevent econf from mangling the ping args.
+	local myconf=()
+
+	if use ssl; then
+		myconf+=( $(use_with !gnutls openssl /usr)
+				  $(use_with gnutls gnutls /usr) )
+	else
+		myconf+=( --without-openssl )
+		myconf+=( --without-gnutls )
+	fi
+
+	# The autodetection for these two commands can hang if localhost is
+	# down or ICMP traffic is filtered. Bug #468296.
+	myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" )
+
+	if use ipv6; then
+		myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" )
+	fi
+
+	econf \
+		$(use_with mysql) \
+		$(use_with ipv6) \
+		$(use_with ldap) \
+		$(use_with postgres pgsql /usr) \
+		$(use_with radius) \
+		"${myconf[@]}" \
+		--libexecdir="/usr/$(get_libdir)/nagios/plugins" \
+		--sysconfdir="/etc/nagios"
+}
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
+		NEWS README REQUIREMENTS SUPPORT THANKS )
+
+pkg_preinst() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+pkg_postinst() {
+	elog "This ebuild has a number of USE flags that determine what you"
+	elog "are able to monitor. Depending on what you want to monitor, some"
+	elog "or all of these USE flags need to be set."
+	elog
+	elog "The plugins are installed in ${EROOT%/}/usr/$(get_libdir)/nagios/plugins"
+}
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 3a23696bbcb9..9af74c048f6f 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -17,8 +17,11 @@ AUX munin.apache.include-2.4 577 SHA256 21245e9eb7b759d2d2e65c2d1424da6d8c6fd8f4
 DIST munin-2.0.33-gentoo-1.tar.xz 11024 SHA256 f956d9051e0da05231bb8777c0ca3342ca5bb86e48c44a68289c41c42c440e46 SHA512 c1f49f01fd641e157145d9710a091696c09380887a374ee845e516d40384ee6bc576019f3510ac322436b1f10ee1b675ae512b9f677a6a0fa2ef022cbb7269b8 WHIRLPOOL 3c0fbccc4c8ee9a2dacf8ce1845d149198c8d53ed17cd62fd17bae60986ca6616e12213d4f520fd06e8329accec559a7f9529559f21dc62de3aa0b66680d7ab7
 DIST munin-2.0.33-gentoo-2.tar.xz 11288 SHA256 a7cc6b060cc1344c9b40278a960ab8fa6848e5db53f8665a952fb602ab0c0c55 SHA512 4d185529199377e85fb3e7d0a8c38de2ae500d2f992292e6ae016d11e81642833725987ac006b5f535963593c7698c676d28091805691e8b46c016fc2580917d WHIRLPOOL 98d2916c10adf554ab1672c602271673cb6dea7ae72fb7849b1bdf16d6f63c6f330def1f4a3cb62fd1fab4e888b2dede2807cde9a7907058f37a0f87a8b67a6b
 DIST munin-2.0.33.tar.gz 1349546 SHA256 99dbc1e5f4f0fed4e28f295245333544193f9a26c597f2a78571ae20b4d450b6 SHA512 33c56fcb347396f29662f304aa50f0e3dfc909b067ea49809762bbbb4dd2cd7e95789c318adcef64923e6d0248dcf9ea6fe933c49d920b6b7856d85511d40d67 WHIRLPOOL 2429b605d19bbf4caa460e9f2b46de8e2462bf606bd1143bcdcbb4f2e079b2acf5f87def86affa6152ed8b26cf14bc83d62274bb58424818deb2b5f2024de7f0
+DIST munin-2.0.34-gentoo-1.tar.xz 11920 SHA256 c9c2a7c1e8022092fd661896b9196662b82facab965a70308cb6a273e9bcd40b SHA512 706f8dd1ba49eadb5e89f821f52d4c691b0270885a4167639b6417f9516bb2b0b8b212a82f50fb892e03b57817d650b3552754ecb437718c7e7ef3cdfaf83b2b WHIRLPOOL e82d38d47baf77ea3ad4cab06a6f84d213fe3cf4d1df9911750769409a2ee93366dd6b25e885af01484c708bf658aec8605aff18793e5ee2e8b72b51ea6fe40c
+DIST munin-2.0.34.tar.gz 1349842 SHA256 5152f006900ce5619b5c8d32441c24566f565e3f83e74379b287bef2fae58f6f SHA512 db802266842e103017c8c3bc0fc676d0d6146a37b06e69e709cfb396d67c42ac4932b8d4979e4d1a108fc0c2467c66423799212f6ea1279fb9ed64352ddf41cc WHIRLPOOL a7e491124b882f46fc56f3e2b264380d056f3cabe41f1f5bf8afe47c3e88332b9ad0ef305dfc1f5dfc4ba194d9d58472b5512b01b929a1ccacc1e88092ff8d40
 EBUILD munin-2.0.33-r1.ebuild 12318 SHA256 19905d3f9e0fffa8ad906bf2d9543899eab67a075d121c2bc3d2c38d9654bc01 SHA512 6455ff958815279a54a3123f8705c2076f652eea6d643b9a0505eca4e6dd66c8bae2be419ba9df2109ae410d770dcc2a9f3d8c15d948c093d75c098c36cb6d42 WHIRLPOOL 6e06780811f184410e36037cc51a75d16f53ec8e099042ff258f48f7bb8875a4c312a1e41b996c1eeeafee28a4813ab8f639a9430e83408663037762ba871380
 EBUILD munin-2.0.33.ebuild 12184 SHA256 241922f8f69f56dd3732191e102386392c84dd2ce83ff4161f95f37362d4e227 SHA512 389ac592f1860a021feba2c6beff4d6b55ec5997adbb356b4130ef88e69cb8797e166315af4429956223ae4c6b58b39687dbd1db3578a5f56bff5a8f4d8ccbbb WHIRLPOOL d1bf9b0cf6da0e2a2b7442cf3b02d277ce943881d8245007b5f4c637b570f62091f007ed86eb14dc22eaff1e2946a1d39eedcd269bfd996ec3ccb4451a0921e8
+EBUILD munin-2.0.34.ebuild 12231 SHA256 752f9cafd050ec8be2999df3511683a9257a5de3b4a7aad840f507e16f07c65f SHA512 45ed07d3bcaa18b2c09d2ad7ce8f2d59ef5de79159c968fade90904377229a761ed7e9bb971233b5a39f2ff9faec4916a02e358e36ae7a9942f15a8b6a55de71 WHIRLPOOL c283f5c4a2d3eadec93f1961d9b9272c2e66c28f615fd02c97192bd42d1aa561641c634ba3c0d3ff0115220bd783aed8b8526e554c88639473162a7d6c596070
 EBUILD munin-2.1.9999.ebuild 11520 SHA256 5af629f8ff08f1c76a3e1d8d4eae5db42c2b371dcfb050ba89b90b7f88c52971 SHA512 6069e6d31b9385885e98e815d4bf33227689fa8e74c48f4aa7b6af673be76d25ef26e777ef819563a8978a3cd73bc518b0ad3e5807c58a5b0e575aeb712f5ce5 WHIRLPOOL 6fb6950643ea7fd601be1b877ffcaae1322b8816b17a29e84cc0844ee914ff242e460369218e4adb32d78b4eea1fcbdc244d3fdfada0d43cb77b846c956aac25
 MISC ChangeLog 5446 SHA256 cd90509cc51c905cf6b36f78ff98e3def854593831b4bf9264fb6b0745da36d4 SHA512 ff33e1515f24f42dfb968b44055b931ca2f0312a8e92e04da267298fe64b27c3fc7a8e84584dcf6483d38c92c3cfe54255c5bad5fe9f303f5b3029b995ffb0ff WHIRLPOOL 745f937aee96f15345153b9f9f540baefcd2a549c58086c007d463279a329e67a5339a1a1aad129bca0973391f547f8c7b1d2a721c29bc7a07164a62158ffbbd
 MISC ChangeLog-2015 35218 SHA256 9d7cc15eb23b6e6511947c3bb9c8a38f71febe9be2411fd138dc97bb6b8ff83b SHA512 cd6ea50386d5ad031b82c8b865f3577acdaea375eaf6bcdbc0b22ea7b4de0f4742fb0e2a672d54f0b2a2d8a13e7be083a2884f6f98c3c97fa6d1d3d664ea0540 WHIRLPOOL 9bfcef1920d4470a413bb602261ec2b78499852ff07ccd11e038944ed81092878a8f3746540d5e61776fc080ad41c974d18dc5bc38d13522b1078f7f4b9a559c
diff --git a/net-analyzer/munin/munin-2.0.34.ebuild b/net-analyzer/munin/munin-2.0.34.ebuild
new file mode 100644
index 000000000000..e1f2ead7110a
--- /dev/null
+++ b/net-analyzer/munin/munin-2.0.34.ebuild
@@ -0,0 +1,413 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PATCHSET=1
+
+inherit eutils user java-pkg-opt-2 systemd
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Munin Server Monitoring Tool"
+HOMEPAGE="http://munin-monitoring.org/"
+SRC_URI="
+	https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
+REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
+
+# Upstream's listing of required modules is NOT correct!
+# Some of the postgres plugins use DBD::Pg, while others call psql directly.
+# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
+# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
+DEPEND_COM="
+	dev-lang/perl:=[berkdb]
+	dev-perl/DBI
+	dev-perl/Date-Manip
+	dev-perl/File-Copy-Recursive
+	dev-perl/List-MoreUtils
+	dev-perl/Log-Log4perl
+	dev-perl/Net-CIDR
+	dev-perl/Net-DNS
+	dev-perl/Net-Netmask
+	dev-perl/Net-SNMP
+	dev-perl/Net-Server[ipv6(-)?]
+	virtual/perl-Digest-MD5
+	virtual/perl-Getopt-Long
+	virtual/perl-MIME-Base64
+	virtual/perl-Storable
+	virtual/perl-Text-Balanced
+	virtual/perl-Time-HiRes
+	apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
+	asterisk? ( dev-perl/Net-Telnet )
+	cgi? (
+		dev-perl/FCGI
+		dev-perl/CGI-Fast
+		)
+	dhcpd? (
+		>=net-misc/dhcp-3[server]
+		dev-perl/Net-IP
+		dev-perl/HTTP-Date
+		)
+	doc? ( dev-python/sphinx )
+	http? ( dev-perl/libwww-perl )
+	irc? ( dev-perl/Net-IRC )
+	ldap? ( dev-perl/perl-ldap )
+	kernel_linux? ( sys-process/procps )
+	memcached? ( dev-perl/Cache-Memcached )
+	mysql? (
+		virtual/mysql
+		dev-perl/Cache-Cache
+		dev-perl/DBD-mysql
+		)
+	postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* )
+	ssl? ( dev-perl/Net-SSLeay )
+	syslog? ( virtual/perl-Sys-Syslog )
+	!minimal? (
+		dev-perl/HTML-Template
+		dev-perl/IO-Socket-INET6
+		dev-perl/URI
+		>=net-analyzer/rrdtool-1.3[graph,perl]
+		virtual/ssh
+		)
+	"
+
+# Keep this seperate, as previous versions have had other deps here
+DEPEND="${DEPEND_COM}
+	dev-perl/Module-Build
+	java? ( >=virtual/jdk-1.5 )
+	test? (
+		dev-perl/Test-Deep
+		dev-perl/Test-LongString
+		dev-perl/Test-Differences
+		dev-perl/Test-MockModule
+		dev-perl/Test-MockObject
+		dev-perl/File-Slurp
+		dev-perl/IO-stringy
+		dev-perl/IO-Socket-INET6
+	)"
+RDEPEND="${DEPEND_COM}
+		virtual/awk
+		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
+		java? (
+			>=virtual/jre-1.5
+			|| ( net-analyzer/netcat6 net-analyzer/netcat )
+		)
+		!minimal? (
+			virtual/cron
+			media-fonts/dejavu
+		)
+		selinux? ( sec-policy/selinux-munin )
+		!<sys-apps/openrc-0.11.8"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup munin
+	enewuser munin 177 -1 /var/lib/munin munin
+	enewuser munin-async -1 /bin/sh /var/spool/munin-async
+	esethome munin-async /var/spool/munin-async
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	epatch "${WORKDIR}"/patches/*.patch
+
+	eapply_user
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
+	use cgi || cgidir="${T}/useless/cgi-bin"
+
+	local cgiuser=$(usex apache2 apache munin)
+
+	cat >> "${S}"/Makefile.config <<- EOF
+	PREFIX=\$(DESTDIR)/usr
+	CONFDIR=\$(DESTDIR)/etc/munin
+	DOCDIR=${T}/useless/doc
+	MANDIR=\$(PREFIX)/share/man
+	LIBDIR=\$(PREFIX)/libexec/munin
+	HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
+	CGIDIR=${cgidir}
+	CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi
+	CGIUSER=${cgiuser}
+	DBDIR=\$(DESTDIR)/var/lib/munin
+	DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
+	SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
+	LOGDIR=\$(DESTDIR)/var/log/munin
+	PERLSITELIB=$(perl -V:vendorlib | cut -d"'" -f2)
+	JCVALID=$(usex java yes no)
+	STATEDIR=\$(DESTDIR)/run/munin
+	EOF
+}
+
+# parallel make and install need to be fixed before, and I haven't
+# gotten around to do so yet.
+src_compile() {
+	emake -j1
+	use doc && emake -C doc html
+}
+
+src_test() {
+	if [[ ${EUID} == 0 ]]; then
+		eerror "You cannot run tests as root."
+		eerror "Please enable FEATURES=userpriv before proceeding."
+		return 1
+	fi
+
+	local testtargets="test-common test-node test-plugins"
+	use minimal || testtargets+=" test-master"
+
+	LC_ALL=C emake -j1 ${testtargets}
+}
+
+src_install() {
+	local dirs="
+		/var/log/munin
+		/var/lib/munin/plugin-state
+		/etc/munin/plugin-conf.d
+		/etc/munin/plugins"
+	use minimal || dirs+=" /etc/munin/munin-conf.d/"
+
+	keepdir ${dirs}
+	fowners munin:munin ${dirs}
+
+	# parallel install doesn't work and it's also pointless to have this
+	# run in parallel for now (because it uses internal loops).
+	emake -j1 DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
+
+	# we remove /run from the install, as it's not the package's to deal
+	# with.
+	rm -rf "${D}"/run || die
+
+	# remove the plugins for non-Gentoo package managers; use -f so that
+	# it doesn't fail when installing on non-Linux platforms.
+	rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
+
+	insinto /etc/munin/plugin-conf.d/
+	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
+
+	newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node
+	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
+
+	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
+
+	dodir /usr/lib/tmpfiles.d
+	cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF
+	d /run/munin 0700 munin munin - -
+	EOF
+
+	systemd_dounit "${FILESDIR}"/munin-async.service
+	systemd_dounit "${FILESDIR}"/munin-graph.{service,socket}
+	systemd_dounit "${FILESDIR}"/munin-html.{service,socket}
+	systemd_dounit "${FILESDIR}"/munin-node.service
+
+	cat >> "${T}"/munin.env <<- EOF
+	CONFIG_PROTECT=/var/spool/munin-async/.ssh
+	EOF
+	newenvd "${T}"/munin.env 50munin
+
+	dodoc README ChangeLog INSTALL
+	if use doc; then
+		cd "${S}"/doc/_build/html || die
+		docinto html
+		dodoc -r *
+		cd "${S}" || die
+	fi
+
+	dodir /etc/logrotate.d/
+	sed -e "s:@CGIUSER@:$(usex apache2 apache munin):g" \
+		"${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin
+
+	dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
+
+	if use syslog; then
+		sed -i -e '/log_file/s| .*| Sys::Syslog|' \
+			"${D}"/etc/munin/munin-node.conf || die
+	fi
+
+	# Use a simpler pid file to avoid trouble with /run in tmpfs. The
+	# munin-node service is ran as user root, and only later drops
+	# privileges.
+	sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \
+		"${D}"/etc/munin/munin-node.conf || die
+
+	keepdir /var/spool/munin-async/.ssh
+	touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
+	fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
+	fperms 0750 /var/spool/munin-async{,/.ssh}
+	fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
+
+	if use minimal; then
+		# This requires the presence of munin-update, which is part of
+		# the non-minimal install...
+		rm "${D}"/usr/libexec/munin/plugins/munin_stats
+	else
+		# remove font files so that we don't have to keep them around
+		rm "${D}"/usr/libexec/${PN}/*.ttf || die
+
+		if use cgi; then
+			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
+
+			keepdir /var/cache/munin-cgi
+			touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
+			fowners $(usex apache2 apache munin) \
+				/var/cache/munin-cgi \
+				/var/log/munin/munin-cgi-{graph,html}.log
+
+			if use apache2; then
+				insinto /etc/apache2/vhosts.d
+				newins "${FILESDIR}"/munin.apache.include munin.include
+				newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
+			fi
+		else
+			sed \
+				-e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \
+				-i "${D}"/etc/munin/munin.conf || die
+		fi
+
+		keepdir /var/lib/munin/.ssh
+		cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF
+		IdentityFile /var/lib/munin/.ssh/id_ecdsa
+		IdentityFile /var/lib/munin/.ssh/id_rsa
+		EOF
+
+		fowners munin:munin /var/lib/munin/.ssh/{,config}
+		fperms go-rwx /var/lib/munin/.ssh/{,config}
+
+		dodir /usr/share/${PN}
+		cat >> "${D}"/usr/share/${PN}/crontab <<- EOF
+		# Force the shell to bash
+		SHELL=/bin/bash
+		# Mail reports to root@, not munin@
+		MAILTO=root
+
+		# This runs the munin task every 5 minutes.
+		*/5	* * * *		/usr/bin/munin-cron
+
+		# Alternatively, this route works differently
+		# Update once a minute (for busy sites)
+		#*/1 * * * *		/usr/libexec/munin/munin-update
+		## Check for limit excess every 2 minutes
+		#*/2 * * * *		/usr/libexec/munin/munin-limits
+		## Update graphs every 5 minutes
+		#*/5 * * * *		nice /usr/libexec/munin/munin-graph
+		## Update HTML pages every 15 minutes
+		#*/15 * * * *		nice /usr/libexec/munin/munin-html
+		EOF
+
+		cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF
+		# Mail reports to root@, not munin@, only execute one at a time
+		!mailto(root),serial(true)
+
+		# This runs the munin task every 5 minutes.
+		@ 5		/usr/bin/munin-cron
+
+		# Alternatively, this route works differently
+		# Update once a minute (for busy sites)
+		#@ 1	/usr/libexec/munin/munin-update
+		## Check for limit excess every 2 minutes
+		#@ 2	/usr/libexec/munin/munin-limits
+		## Update graphs every 5 minutes
+		#@ 5	nice /usr/libexec/munin/munin-graph
+		## Update HTML pages every 15 minutes
+		#@ 15	nice /usr/libexec/munin/munin-html
+		EOF
+
+		# remove .htaccess file
+		find "${D}" -name .htaccess -delete || die
+	fi
+}
+
+pkg_config() {
+	if use minimal; then
+		einfo "Nothing to do."
+		return 0
+	fi
+
+	einfo "Press enter to install the default crontab for the munin master"
+	einfo "installation from /usr/share/${PN}/f?crontab"
+	einfo "If you have a large site, you may wish to customize it."
+	read
+
+	ebegin "Setting up cron ..."
+	if has_version sys-process/fcron; then
+		fcrontab - -u munin < /usr/share/${PN}/fcrontab
+	else
+		# dcron is very fussy about syntax
+		# the following is the only form that works in BOTH dcron and vixie-cron
+		crontab - -u munin < /usr/share/${PN}/crontab
+	fi
+	eend $?
+
+	einfo "Press enter to set up the SSH keys used for SSH transport"
+	read
+
+	# generate one rsa (for legacy) and one ecdsa (for new systems)
+	ssh-keygen -t rsa \
+		-f /var/lib/munin/.ssh/id_rsa -N '' \
+		-C "created by portage for ${CATEGORY}/${PN}" || die
+	ssh-keygen -t ecdsa \
+		-f /var/lib/munin/.ssh/id_ecdsa -N '' \
+		-C "created by portage for ${CATEGORY}/${PN}" || die
+	chown -R munin:munin /var/lib/munin/.ssh || die
+	chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
+
+	einfo "Your public keys are available in "
+	einfo "  /var/lib/munin/.ssh/id_rsa.pub"
+	einfo "  /var/lib/munin/.ssh/id_ecdsa.pub"
+	einfo "and follows for convenience"
+	echo
+	cat /var/lib/munin/.ssh/id_*.pub
+}
+
+pkg_postinst() {
+	elog "Please follow the munin documentation to set up the plugins you"
+	elog "need, afterwards start munin-node."
+	elog ""
+	elog "To make use of munin-async, make sure to set up the corresponding"
+	elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
+	elog ""
+	if ! use minimal; then
+		elog "Please run"
+		elog "  emerge --config net-analyzer/munin"
+		elog "to automatically configure munin's cronjobs as well as generate"
+		elog "passwordless SSH keys to be used with munin-async."
+	fi
+	elog ""
+	elog "Further information about setting up Munin in Gentoo can be found"
+	elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
+
+	if use cgi; then
+		chown $(usex apache2 apache munin) \
+			"${ROOT}"/var/cache/munin-cgi \
+			"${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
+
+		if use apache2; then
+			elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
+			elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
+			elog "host you want it to be served."
+			elog "If you want to enable CGI-based HTML as well, you have to add to"
+			elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
+		else
+			elog "Effective CGI support has just been added in 2.0.7-r6."
+			elog "Documentation on how to use it is still sparse."
+		fi
+	fi
+
+	# we create this here as we don't want Portage to check /run
+	# symlinks but we still need this to be present before the reboot.
+	if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
+		mkdir "${ROOT}"/run/munin
+		chown munin:munin "${ROOT}"/run/munin
+		chmod 0700 "${ROOT}"/run/munin
+	fi
+}
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index cdcf3a5744fe..5f467d74eee9 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -1,6 +1,8 @@
+AUX define-own-mysql-port-constant.patch 3271 SHA256 25d25d3aafa1a3e77df0ec87398a066c9db711a2559b32bdaa400ce3760b4da9 SHA512 18cb9be96b3e39a07eeb1cf6bccbbe26766ac355f4822c132253e25a6909c418071c2dc546fb60c055b78f620180035e57436a8ebb771ae1096b78d2e1c7c6ec WHIRLPOOL 0e1995aea8946108c98ad31793406b40b325768482b601530112da121d030375bee961d01e398f756d195097d4e0a196df1e3c5bc19cfece8295c7f5f1805d73
 DIST nagios-plugins-2.0.3.tar.gz 2659772 SHA256 8f0021442dce0138f0285ca22960b870662e28ae8973d49d439463588aada04a SHA512 2753e6f3fc7433a5583fee01e63a65b9ea74155964f2b6e6bf3458e56cb29ea5dbd020f83816044a717b66d6548d203b3a082fba0faedcd629c7a8457bc19b36 WHIRLPOOL 4b0e4024833373df3f0db44657345a1f4495c4022e56bf6b369cc2846f9127e565520f6b7cdf1b94384592e78327d584da7d939a3ac0586e0ae67fd1258c138b
 DIST nagios-plugins-2.2.1.tar.gz 2728818 SHA256 647c0ba4583d891c965fc29b77c4ccfeccc21f409fdf259cb8af52cb39c21e18 SHA512 6ffe313a56a305b382f62abc0f0958d7078f9050e1340f30721d6e6f71944b57b1650e90e6835c35dd7c9f3f4b4cee9f235b8382b0811db30b3729daaafc9bc3 WHIRLPOOL 57579a7948ab1ce5c66db47e7221b5b8087e3fa027b2a69ad95129ba44af6ba13eaa4b766f3a2de11f708a80e3f44d6d54c6d513388e58c5be75c7bb166325e8
 EBUILD nagios-plugins-2.0.3-r2.ebuild 2828 SHA256 8ad04b08572e3e7d56ae11f9e0b82fd87f041040fd8fbf1cfdb8a2fdd4fe6b78 SHA512 cabe19f142006c4d104721361c2c58fc7a103717041050a21bc21b47adb6702bf05c77f1ed8b063f74b11a59a2dd1120d8478e5b1d803636aeb9f1ae92c2ae91 WHIRLPOOL 3bdfcb4df0bb46509d9ce0cdfbe3e0e74cb9e7452f0f0c314f570bffac452366e858f4d0175292da9e97188c5a0ec0ffff972ca0bf821fe93ef520328c12f016
+EBUILD nagios-plugins-2.2.1-r2.ebuild 3115 SHA256 357090140031d7109f91ae8181ba24907a60a5c13eb6ee4f13d7fc2302704712 SHA512 b70231b8e2fd2dedf9e3308ac2005e43d6fef8ea2f17555cc155e689f0194e38977f9961ec233a84f81560c6dedfbdbf1d2108ce5238035a4ed101c46fbf2329 WHIRLPOOL b841614c25cd7de02a397c50581f2699b5998c4934488e040747e700e8f1b431b348785c9e69cc140e5d64c3cab774fc12d72426cbac06cb850901f9191307b4
 EBUILD nagios-plugins-2.2.1.ebuild 2979 SHA256 29d987c96b656566dcc806be515cf6fd157f707f813830bd520fef7690616589 SHA512 d11747ef8007eedb29f51598bdd2109fbb17a8cc93304b441b22be94fbbbb4ce8b59132340e20999428123650972708f3812fc8134cc95256d4ab09cff6f2ba2 WHIRLPOOL 5db78b4a161216381bf3cb3d1488c37f9fd37ae7f0702d0778cdf06047763823bcd4f0710bb2bbb1a38b9b8924f8197645702161cf0d27bd95cde41dc70dc073
 MISC ChangeLog 4744 SHA256 4c08d4f657682469e96dd1a18715ab6b6439de60e0b69132de016bd98acf3138 SHA512 5af2e792504b1771880084c26439b4446bf614c3e1fcc00a1b84c600eb35ce02b729af739d8f7443671a093f16d37ba5f20129c1d43aaab54640e109c128762a WHIRLPOOL 4765d0aae5d3f87f28506bcdbbfbf7e6bcf1dd5a66366b0c05c69423a910b8d4f54168f397dc84343ec85dce9d9a5170c84be02e88dbc837a4698698f0768f4c
 MISC ChangeLog-2015 16032 SHA256 0fcc0dcd50ab5fd579c2fe7d87c33deb815f396f4c70a31909f1da00a47b7a74 SHA512 2ac4eb36d06e72159faa28f62cafa23f8e3b5db0f030209717cf65775f1ff3bd3f95511fd5c17f95866689e77624ab76835876dc00c1598bae45d6f6e4ed9fe5 WHIRLPOOL 2eb21e54a88026a1adfbd242b1ed2892b4c28b8fb418f6dee36f2077571d9b9f25f6c82f9b3774847e62aa6e5261b695d4bdfc3d31cf06ced31aa493a6a47496
diff --git a/net-analyzer/nagios-plugins/files/define-own-mysql-port-constant.patch b/net-analyzer/nagios-plugins/files/define-own-mysql-port-constant.patch
new file mode 100644
index 000000000000..67bc65cad880
--- /dev/null
+++ b/net-analyzer/nagios-plugins/files/define-own-mysql-port-constant.patch
@@ -0,0 +1,100 @@
+From 43ff2e8607c0b7095c2a4dcab6e466bc67e2e2ff Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Thu, 26 Oct 2017 15:01:17 -0400
+Subject: [PATCH 1/3] plugins/check_mysql*.c: define our own default MySQL
+ port.
+
+The MYSQL_PORT constant used to be defined in mysql.h, and was used as
+the default port in the two plugins check_mysql and check_mysql_query.
+Now that mysql.h no longer defines that constant, our plugins fail to
+build against newer versions of MySQL and MariaDB.
+
+Since MYSQL_PORT used the "default port" on the local system, it
+actually was not the best choice as the default for the check plugins:
+when monitoring remote MySQL servers, the usual default of 3306 is
+more likely to be correct than whatever the local server happens to be
+listening on.
+
+As a result, we fix the issue by defining our own constant, called
+CHECK_PORT_DEFAULT, as "3306" at the top of both check_mysql.c and
+check_mysql_query.c. The existing uses of MYSQL_PORT have been changed
+to use the new CHECK_PORT_DEFAULT.
+
+This change is backwards-incompatible: any users who compiled in a
+MYSQL_PORT other than 3306 and who were running their checks on the
+same server as the database will now need to specify that port
+explicitly.
+
+Closes: https://github.com/nagios-plugins/nagios-plugins/issues/288
+---
+ plugins/check_mysql.c       | 7 +++++--
+ plugins/check_mysql_query.c | 7 +++++--
+ 2 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
+index 83f89c85..c0b61292 100644
+--- a/plugins/check_mysql.c
++++ b/plugins/check_mysql.c
+@@ -36,6 +36,9 @@ const char *email = "devel@nagios-plugins.org";
+ 
+ #define SLAVERESULTSIZE 70
+ 
++/* The default port that MySQL servers listen on. */
++#define CHECK_PORT_DEFAULT 3306
++
+ #include "common.h"
+ #include "utils.h"
+ #include "utils_base.h"
+@@ -58,7 +61,7 @@ char *ciphers = NULL;
+ bool ssl = false;
+ char *opt_file = NULL;
+ char *opt_group = NULL;
+-unsigned int db_port = MYSQL_PORT;
++unsigned int db_port = CHECK_PORT_DEFAULT;
+ int check_slave = 0, warn_sec = 0, crit_sec = 0;
+ int ignore_auth = 0;
+ int verbose = 0;
+@@ -505,7 +508,7 @@ void
+ print_help (void)
+ {
+ 	char *myport;
+-	xasprintf (&myport, "%d", MYSQL_PORT);
++	xasprintf (&myport, "%d", CHECK_PORT_DEFAULT);
+ 
+ 	print_revision (progname, NP_VERSION);
+ 
+diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c
+index 436e0685..e9c3acfb 100644
+--- a/plugins/check_mysql_query.c
++++ b/plugins/check_mysql_query.c
+@@ -33,6 +33,9 @@ const char *progname = "check_mysql_query";
+ const char *copyright = "1999-2014";
+ const char *email = "devel@nagios-plugins.org";
+ 
++/* The default port that MySQL servers listen on. */
++#define CHECK_PORT_DEFAULT 3306
++
+ #include "common.h"
+ #include "utils.h"
+ #include "utils_base.h"
+@@ -48,7 +51,7 @@ char *db_pass = NULL;
+ char *db = NULL;
+ char *opt_file = NULL;
+ char *opt_group = NULL;
+-unsigned int db_port = MYSQL_PORT;
++unsigned int db_port = CHECK_PORT_DEFAULT;
+ 
+ int process_arguments (int, char **);
+ int validate_arguments (void);
+@@ -300,7 +303,7 @@ void
+ print_help (void)
+ {
+ 	char *myport;
+-	xasprintf (&myport, "%d", MYSQL_PORT);
++	xasprintf (&myport, "%d", CHECK_PORT_DEFAULT);
+ 
+ 	print_revision (progname, NP_VERSION);
+ 
+-- 
+2.13.6
+
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r2.ebuild
new file mode 100644
index 000000000000..7cdc0f879966
--- /dev/null
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="Official plugins for Nagios"
+HOMEPAGE="http://nagios-plugins.org/"
+SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 ldap libressl mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl"
+
+# Most of the plugins use automagic dependencies, i.e. the plugin will
+# get built if the binary it uses is installed. For example, check_snmp
+# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
+# installed. End result: most of our runtime dependencies are required
+# at build time as well.
+#
+# REAL_DEPEND contains the dependencies that are actually needed to
+# build. DEPEND contains those plus the automagic dependencies.
+#
+REAL_DEPEND="dev-lang/perl
+	ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:* )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	radius? ( net-dialup/freeradius-client )"
+
+DEPEND="${REAL_DEPEND}
+	nagios-dns? ( net-dns/bind-tools )
+	nagios-game? ( games-util/qstat )
+	nagios-ping? ( net-analyzer/fping )
+	samba? ( net-fs/samba )
+	ssh? ( net-misc/openssh )
+	snmp? ( dev-perl/Net-SNMP
+			net-analyzer/net-snmp[-minimal] )"
+
+# Basically everything collides with nagios-plugins.
+RDEPEND="${DEPEND}
+	!net-analyzer/monitoring-plugins
+	selinux? ( sec-policy/selinux-nagios )"
+
+# At least one test is interactive.
+RESTRICT="test"
+
+DOCS=(
+	ACKNOWLEDGEMENTS
+	AUTHORS
+	CODING
+	ChangeLog
+	FAQ
+	NEWS
+	README
+	REQUIREMENTS
+	SUPPORT
+	THANKS
+)
+
+PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" )
+
+src_prepare() {
+	default
+
+	# Fix the path to our perl interpreter
+	sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \
+		"${S}"/plugins-scripts/*.pl \
+		|| die 'failed to fix perl interpreter path'
+}
+
+src_configure() {
+	# Use an array to prevent econf from mangling the ping args.
+	local myconf=()
+
+	if use ssl; then
+		myconf+=( $(use_with ssl openssl /usr) )
+	else
+		myconf+=( --without-openssl )
+		myconf+=( --without-gnutls )
+	fi
+
+	# The autodetection for these two commands can hang if localhost is
+	# down or ICMP traffic is filtered. Bug #468296.
+	myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" )
+
+	if use ipv6; then
+		myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" )
+	fi
+
+	econf \
+		$(use_with mysql) \
+		$(use_with ipv6) \
+		$(use_with ldap) \
+		$(use_with postgres pgsql /usr) \
+		$(use_with radius) \
+		"${myconf[@]}" \
+		--libexecdir="/usr/$(get_libdir)/nagios/plugins" \
+		--sysconfdir="/etc/nagios"
+}
+
+pkg_preinst() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+pkg_postinst() {
+	elog "This ebuild has a number of USE flags that determine what you"
+	elog "are able to monitor. Depending on what you want to monitor, some"
+	elog "or all of these USE flags need to be set."
+	elog
+	elog "The plugins are installed in ${ROOT}usr/$(get_libdir)/nagios/plugins"
+}
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index 79b5eaf36c71..87ab4d553c41 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -1,19 +1,11 @@
 AUX pmacctd-conf.d 153 SHA256 a29a5d9aca2df30ca9c62e3441d2f3616eb506c457074ae690a390d55a040763 SHA512 1637316833db6e2a7c2d531deb4d68d647948bc03da8aecf0c6a34dd2f0c58d58d8473270e6096cf232e98c07946bac265161d4a8577def6cb72a4e8c9778c31 WHIRLPOOL b0a58e7268535eca709371bef9282583fbc70e6ce1d2d92c42203e9a2f227ed0218bf684f3e54241fa80ccd49381b020ecf49f582193d629ae8f8632e17ba901
 AUX pmacctd-init.d 839 SHA256 fc222bea9cde5ce6edac88e2ff16b14b261228a21f4b251f992c4615f70dc58e SHA512 c340e62eebfc15ee72591178451d46052e03ef1656a0b81a4b53c02b69df1e5a365742ddf98d9f7f0a8de1345b6a111b8e5ee9009f33fed2a3204344a15690a3 WHIRLPOOL 8420e71c590bf4875622862ac44dc3d0c47dc28e3d6335a9dca0a8ac30cb571cc535fe08d4c4f4ede6a1acc34fc0a17bc508fb9655aa1bdbec673c10e3458b74
 DIST pmacct-1.5.1.tar.gz 874563 SHA256 96134549a10947f3f6d610b670a26f1a54e01af4be0eff09bf48c19246d33584 SHA512 c3a0ddaf1b8679df2097147ce844eb2a3e3058599aea457e463cd4e65a7601e0ce5bac5ca5e1c82afecd5edc92dae673eed3ed1787bfbd3e8ac2af5677885bb7 WHIRLPOOL bd071ac30493f5ee2e0393eb9277dfae2d2fdd6283293aee589ae41ab326b0aaef0ec9b70a421eeca4df857a0046ca7b196e0692ffdd2ea12d9a7c66a74e9a32
-DIST pmacct-1.5.2.tar.gz 897530 SHA256 c12e3897e2f9aa89333968da46eb46855f357750ac1e06e36e72f374e2b54df9 SHA512 3705432cc2a28e179de637b8fc11becd2022b36191a13d440d5bec7d7e594d0936773f202f3d82e983a83695176380aa6a7c27748b632b180000590be0ead599 WHIRLPOOL e7bb1fa1b7372af7d932e19da1d14f3922d8a8ebda245fa03e2a5f283c66141a9299cc9dfa6f32e9384c7d2c9a2d2ef35ef62d7b9910e4f76cacc132231420e5
-DIST pmacct-1.5.3_pre20150925.tar.gz 896168 SHA256 ae63580ae879b3ce20e9725690b6337a72857376192dd2f610e0359ee9d4364c SHA512 e6675855f403ee746b0243cce1ee0e28fd649d2b1c6c1e33f012d7858f977952ba6ed5d1ee47ce42a4f6950b139be2bc50a88740fd19c4775d61d1fb1aa6c05d WHIRLPOOL c7f5003754835f0e1883f13bfba740667ebcbef54a49cc8b8f6fcca1f2db2dea337c910417ff75d86dcfa6bc294fa9b44567bc0d5d07b79ffcfc9b11b1efad5d
-DIST pmacct-1.6.0.tar.gz 1253947 SHA256 1b8d65032b21e152811b6a20ee38ac18ded7ee9ff27cd86870673f088db3c395 SHA512 6c227648a67b69096c814a41f3931f516f2286c110d635ad351de96ee3a918b53a9c723b2199d0dd3ebff1ac20471d9cde2cab2d1b97c147b08ba1a4bd42f872 WHIRLPOOL 66fe8d57ed04f3433dd9ce974b75d0810fecacbd163cbc29e83de70b211c5a6498fe7c627dfc783c8e123dc742ecfad920b2c8ecc19dc830f328eecf1522b566
-DIST pmacct-1.6.1.tar.gz 1280968 SHA256 eb332a6812d1e02134900a1d115a24f315de7c861a9b63093c1226753486cbe7 SHA512 e4c24d4c09716374a1315f8b4a70f3c58fb45848d80cf5c36e5a7653c47249717353a297826e341ec9fd741dd77b840241ad8f5e9d33f4c3dd0525661127cf27 WHIRLPOOL 2ba781d320ceccf7a815d5dd1f8e2362d3fa5085fecafe4e6d75116ca3dafb7ce49d4c455add1615773a83e614f7b7c941c2e4c6ec8424b1cdaf559227f3ab98
 DIST pmacct-1.6.2.tar.gz 1311678 SHA256 e6ede7f500fb1771b5cdfb63dfa016e34c19b8aa2d2f672bd4c63016a5d6bbe2 SHA512 8495f97752ae586fd842eed49ce91db3e4753133f7d380d067e7df153abeea469e5126800074e9071cb7227a3f1df64d4642dfece624fbbfa39b4537fde38b46 WHIRLPOOL ebfa8caeaa1cf48d6b3785cb600d4459e9408e9e8e110b636d0dd0108fcd33a8660259d99469960d32aff720b5387b029891f4d6419dab88920f3bae89f0871a
+DIST pmacct-1.7.0.tar.gz 1351888 SHA256 19c3795db452191c2b1b9533fecaf69c6767c9fb7b4ae60ae3f28e24eb2ee9c8 SHA512 14f1cecc562f008d9b79259f885fc3a1d0a74efa4840d6150277c9bb3c67a233ca9a6b921d9d83fd488d1eb6f535075d7fbf53de0036c48611ffcbf5eb7559b5 WHIRLPOOL d0b09160195ea53e7b83f7a70cb8a051874dd5d3ef00c27fd9becc0dcf5b72f2ce2e01d73994ca54fee14feacacb0029bbfa94a7e73c40010a21718d48e25891
 EBUILD pmacct-1.5.1.ebuild 1617 SHA256 893f3e9680d8b169475ad664f509ee0c41434221cb6a03fe7ca197760ba1df1c SHA512 8e83f6d7300c20cd083a92bf9f53a9e62767587c950eecd5677c6d7aa0f63efa87f9bd65ad48cbedc5f3597bbc02d6f1d40b78e13aa325b750cf2d7ab32d545d WHIRLPOOL 328e020598b27816d19b5a243bc4803f1074f14181a53eda3e30f2e6f222891a4fb772610c0b195e514a1208d5e5907ce8f22a0e39396c8ddd3ad03a74e29fe5
-EBUILD pmacct-1.5.2.ebuild 1620 SHA256 347e9ba060161fdee3ea24c9925fdcd1f7d47bc396c6c6c1ba13f06a46c89e2f SHA512 74f357d94b6bb4867525abc312e6f0424089b3adda6d3321af15c16136049123e54a77603c7f4c3e04255b4aafc98292b98bd06591bce72eabb7d052512f5514 WHIRLPOOL af3d188e3b4917cbb0c1a21457eebcd63e112c8bd3090f0e0ba07cc0f272a182254de78849466595c43072700939326fa8fbc8ae8b9ccfb47cece2a5317936cf
-EBUILD pmacct-1.5.3_pre20150925-r1.ebuild 1733 SHA256 860fa5ba5c6af4266c73de3a9cf21da657c1c4431a997b3687dff9b9946bab46 SHA512 ea54111bbf5bd0be3eb4a856c1596902dc7df5ad0678b220408a75ea03555a8d94e486e88f45898dc6ae767a1c76e937f2414376648b8ed67bb16074ada62984 WHIRLPOOL c649c38b0ddbebea789f04a6e65e3b53e1107e16cd5f781af369a3c223dffb62e1da7a71d9add77b44ad0bc7e420b041dccd2d8cb642ddd46bab926c021e089a
-EBUILD pmacct-1.5.3_pre20150925.ebuild 1629 SHA256 2cb39f885706ae03524c23dc1318d7c07cd405c74d62fdb6ee646d246b17451b SHA512 dca90f9561ae23b4cd556e8af7d552f04973ace68d77a7eab224fdd263760b7fe257c007e4aa2602f1ec8f478447b0be50006bbc1a922fabb9bb4f739557c459 WHIRLPOOL 695accbe526be5298a1e69f8e9712a7712646d08ad1bc8771cbfdcc699c6f1cd0b77c56919d389a885c98b73899ce3551b1cb17f33e9b56fd570c9d38b1c8828
-EBUILD pmacct-1.6.0.ebuild 1647 SHA256 9c684f5630261c946a0a204a9e9b88cb56b5f5fd7449ebd6ec36df95a9b50120 SHA512 7fd9a1472a047e710fc5f1ef09be2291725aacb0278235f06440e027b95dcaf540e6353f746a62f915760337e00d3704c1f44effcf7cf925bb53567edd2b3f79 WHIRLPOOL ab90646a44861c3cd9576b120de9288cd2d68ceaf89af5f9e0e175c01c1dff29bfe920c086115a003aec4a12e06ca3b876519a6d777cf2d12fa47285bd8d49f7
-EBUILD pmacct-1.6.1-r1.ebuild 1797 SHA256 71a6e8efb3d8d09f2fea98f1770158e1e786a275888518b5a08298c15c2f83c3 SHA512 43fccffe30d711724a937cbbe236f379f33b6d2bdebde91743bc5d05355532a46ac85bb8a949f2563d2d023dd2dbf3b940526698e59ea6acf569f0ff9eea7438 WHIRLPOOL 54a487491997e87644890ee78e86b86bda6cdb80b257a6a245dff1494aacb3f49e737a75f78ed944d65215b0a88e660f9a9ea54710a81685a484fc89af364256
-EBUILD pmacct-1.6.1.ebuild 1647 SHA256 9c684f5630261c946a0a204a9e9b88cb56b5f5fd7449ebd6ec36df95a9b50120 SHA512 7fd9a1472a047e710fc5f1ef09be2291725aacb0278235f06440e027b95dcaf540e6353f746a62f915760337e00d3704c1f44effcf7cf925bb53567edd2b3f79 WHIRLPOOL ab90646a44861c3cd9576b120de9288cd2d68ceaf89af5f9e0e175c01c1dff29bfe920c086115a003aec4a12e06ca3b876519a6d777cf2d12fa47285bd8d49f7
-EBUILD pmacct-1.6.2.ebuild 1792 SHA256 062ba2df34c054b5dfda57e0d65980462718738c3b3e9fdd0fff2f3aa9742621 SHA512 ef4fb78a56a8ffaec1d26bb736bace51641f68f4e67e42dcb7356019000889225cac7472b0074924786521dfcfcc03854a91e88fde6d7ac48d1939b7f99a6fcd WHIRLPOOL 123f4bf4557ab1f87b798debf4a06a6ead402c1b6c56bf92bac04162ef538c5dd67ce0c998bc26b6f0d9aa1af11abcd90122b7add7baa8f98cc1eccd3fc20879
+EBUILD pmacct-1.6.2.ebuild 1797 SHA256 71a6e8efb3d8d09f2fea98f1770158e1e786a275888518b5a08298c15c2f83c3 SHA512 43fccffe30d711724a937cbbe236f379f33b6d2bdebde91743bc5d05355532a46ac85bb8a949f2563d2d023dd2dbf3b940526698e59ea6acf569f0ff9eea7438 WHIRLPOOL 54a487491997e87644890ee78e86b86bda6cdb80b257a6a245dff1494aacb3f49e737a75f78ed944d65215b0a88e660f9a9ea54710a81685a484fc89af364256
+EBUILD pmacct-1.7.0.ebuild 1969 SHA256 7f189f44f3a48e4575821377048376ba809320bae7b3666df05503bba36896fd SHA512 3692ebc01a464fb66bf4fa1891ad8ae5f9c9c2299b9038a1bc49fb742a54312c10005f8e860c268f5727b93ee1fe9059e6d87838318d2940d1048d3f6950928a WHIRLPOOL f8c4a46195ea3acbf37c8771a86aeac638b5f4715cb8ed3cd619e29387aaaec6030909aa9bc85e413ce1d2c403019a166ac2059b347f82104c031da5afe2e694
 MISC ChangeLog 4667 SHA256 76e28f799b6a169c966ab4e4eaf08d9cd4cef27c24ea6b6d32249ce26f781626 SHA512 71550717ae9cb8c2376c6b36e65335037f90f891d7e17ff8ee21b4d969255a4962fcdae982531adbbaaa0747173aef17a8a59ac55e30f138087c0df13c11e651 WHIRLPOOL 3c453b68841013608174bfc2ac9bd0b605911bb511ffc88f46c184cd2a110258ca36dde9fe6ae94a4d6295fd25751826f9e8fd95cd5210e33d53a892fff5fcab
 MISC ChangeLog-2015 16467 SHA256 701fc37effed3fae7496e033804882c9a5b444a768253c24ae2c6426466ad06d SHA512 f064726b88efb5fefc14159aad389238e71076521ec3c89179181e2bea14b92ea07bd75c16ffeae5af68e59945d4a0203fc911cab6a16f512080051470e10796 WHIRLPOOL eb39cb3355047a59500742de13a8fcb224ab51bd94409462c20b77c62c502cd429d385c22acf6d3539e99dffaa03f45b7b7f6580f268795a8d62f853e05eb1b1
-MISC metadata.xml 920 SHA256 7c47d50473b86620b2e2367e5dfe49152a9eaa31eff2cfa82665207642cab6b0 SHA512 a664364683c690536a88f70a9bee2916d58369fc9f4fae16fa818fa27da583214cedc38cabff773577b32786776f4abb382bbccd5584cd049f7f65b3b82decd9 WHIRLPOOL 7063960eeb90eeadfd05115ddc8ffc0ec919cd1040bf1080e574b3afdb45c3fee3328ccddcff3b9ccf2251a2a556799deae03e85fd4bd7c92b52e99486aee22d
+MISC metadata.xml 1140 SHA256 77a23129a81bfeb2a2b255a8b6af510c21610ae197e689407a583413a29b4e1a SHA512 1b35f356c2991f002b7803897442c78040d41cf62cc60833454642e2389c256463df47a43ce125441239370cbcbd388d529146841fa7cb98079e85e23122f51c WHIRLPOOL 6bf403da1202af204ef3e442bc4c98e5e70f1a6af08c2811c85438d0ab85d36af335e2d5e51b63de1505226aa8be3f688dca8888eb02efb7fbb1713813c6da62
diff --git a/net-analyzer/pmacct/metadata.xml b/net-analyzer/pmacct/metadata.xml
index cc407997e255..178cb4633b4f 100644
--- a/net-analyzer/pmacct/metadata.xml
+++ b/net-analyzer/pmacct/metadata.xml
@@ -7,12 +7,14 @@
 </maintainer>
 <use>
 <flag name="64bit">Use 64bit counters instead of 32bit ones</flag>
-<flag name="geoipv2">Add support for GeoIP2 through <pkg>dev-libs/libmaxminddb</pkg></flag>
-<flag name="jansson">Add support for JSON through <pkg>dev-libs/jansson</pkg></flag>
-<flag name="kafka">Add support for Apache Kafka through <pkg>dev-libs/librdkafka</pkg></flag>
-<flag name="mongodb">Add support for mongodb backend</flag>
-<flag name="nflog">Add support for NFLOG through uacctd</flag>
-<flag name="rabbitmq">Add support for RabbitMQ through <pkg>net-libs/rabbitmq-c</pkg></flag>
+<flag name="geoipv2">Enable support for GeoIP2 through <pkg>dev-libs/libmaxminddb</pkg></flag>
+<flag name="jansson">Enable support for JSON through <pkg>dev-libs/jansson</pkg></flag>
+<flag name="kafka">Enable support for Apache Kafka through <pkg>dev-libs/librdkafka</pkg></flag>
+<flag name="mongodb">Enable support for MongoDB through <pkg>dev-libs/mongo-c-driver</pkg></flag>
+<flag name="ndpi">Enable support for nDPI through <pkg>net-libs/nDPI</pkg></flag>
+<flag name="nflog">Enable support for NFLOG through uacctd</flag>
+<flag name="rabbitmq">Enable support for RabbitMQ through <pkg>net-libs/rabbitmq-c</pkg></flag>
 <flag name="ulog">Enable support for ULOG in older kernels (deprecated)</flag>
+<flag name="zmq">Enable support for ZeroMQ through <pkg>net-libs/zeromq</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/net-analyzer/pmacct/pmacct-1.5.2.ebuild b/net-analyzer/pmacct/pmacct-1.5.2.ebuild
deleted file mode 100644
index f27118bbbe3c..000000000000
--- a/net-analyzer/pmacct/pmacct-1.5.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="A network tool to gather IP traffic information"
-HOMEPAGE="http://www.pmacct.net/"
-SRC_URI="http://www.pmacct.net/${P/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="64bit debug geoip ipv6 mongodb mysql postgres sqlite threads ulog"
-
-RDEPEND="
-	net-libs/libpcap
-	geoip? ( dev-libs/geoip )
-	mongodb? (
-		>=dev-libs/mongo-c-driver-0.8.1-r1
-		<dev-libs/mongo-c-driver-0.98
-	)
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( =dev-db/sqlite-3* )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P/_/}"
-
-DOCS=(
-	CONFIG-KEYS ChangeLog FAQS KNOWN-BUGS QUICKSTART README TODO TOOLS UPGRADE
-	docs/INTERNALS docs/PLUGINS docs/SIGNALS
-)
-
-src_configure() {
-	tc-export CC AR RANLIB
-
-	econf \
-		$(use_enable 64bit) \
-		$(use_enable debug) \
-		$(use_enable geoip) \
-		$(use_enable ipv6) \
-		$(use_enable mongodb) \
-		$(use_enable mysql) \
-		$(use_enable postgres pgsql) \
-		$(use_enable sqlite sqlite3) \
-		$(use_enable threads) \
-		$(use_enable ulog) \
-		$(usex mysql "--with-mysql-includes=$(mysql_config --variable=pkgincludedir)" '') \
-		$(usex mysql "--with-mysql-libs=$(mysql_config --variable=pkglibdir)" '') \
-		--disable-debug
-}
-
-src_install() {
-	default
-
-	for dirname in examples sql; do
-		docinto ${dirname}
-		dodoc -r ${dirname}/*
-	done
-
-	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
-	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
-
-	insinto /etc/pmacctd
-	newins examples/pmacctd-imt.conf.example pmacctd.conf
-}
diff --git a/net-analyzer/pmacct/pmacct-1.5.3_pre20150925-r1.ebuild b/net-analyzer/pmacct/pmacct-1.5.3_pre20150925-r1.ebuild
deleted file mode 100644
index bf3780777ae8..000000000000
--- a/net-analyzer/pmacct/pmacct-1.5.3_pre20150925-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="A network tool to gather IP traffic information"
-HOMEPAGE="http://www.pmacct.net/"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="64bit debug geoip geoipv2 ipv6 mongodb mysql postgres sqlite threads ulog"
-REQUIRED_USE="
-	?? ( geoip geoipv2 )
-"
-
-RDEPEND="
-	net-libs/libpcap
-	geoip? ( dev-libs/geoip )
-	geoipv2? ( dev-libs/libmaxminddb )
-	mongodb? (
-		>=dev-libs/mongo-c-driver-0.8.1-r1
-		<dev-libs/mongo-c-driver-0.98
-	)
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( =dev-db/sqlite-3* )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/pmacct-daily"
-
-DOCS=(
-	CONFIG-KEYS ChangeLog FAQS KNOWN-BUGS QUICKSTART README TODO TOOLS UPGRADE
-	docs/INTERNALS docs/PLUGINS docs/SIGNALS
-)
-
-src_configure() {
-	tc-export CC AR RANLIB
-
-	econf \
-		$(use_enable 64bit) \
-		$(use_enable debug) \
-		$(use_enable geoip) \
-		$(use_enable geoipv2) \
-		$(use_enable ipv6) \
-		$(use_enable mongodb) \
-		$(use_enable mysql) \
-		$(use_enable postgres pgsql) \
-		$(use_enable sqlite sqlite3) \
-		$(use_enable threads) \
-		$(use_enable ulog) \
-		$(usex mysql "--with-mysql-includes=$(mysql_config --variable=pkgincludedir)" '') \
-		$(usex mysql "--with-mysql-libs=$(mysql_config --variable=pkglibdir)" '') \
-		--disable-debug
-}
-
-src_install() {
-	default
-
-	for dirname in examples sql; do
-		docinto ${dirname}
-		dodoc -r ${dirname}/*
-	done
-
-	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
-	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
-
-	insinto /etc/pmacctd
-	newins examples/pmacctd-imt.conf.example pmacctd.conf
-}
diff --git a/net-analyzer/pmacct/pmacct-1.5.3_pre20150925.ebuild b/net-analyzer/pmacct/pmacct-1.5.3_pre20150925.ebuild
deleted file mode 100644
index f28070082930..000000000000
--- a/net-analyzer/pmacct/pmacct-1.5.3_pre20150925.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="A network tool to gather IP traffic information"
-HOMEPAGE="http://www.pmacct.net/"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="64bit debug geoip ipv6 mongodb mysql postgres sqlite threads ulog"
-
-RDEPEND="
-	net-libs/libpcap
-	geoip? ( dev-libs/geoip )
-	mongodb? (
-		>=dev-libs/mongo-c-driver-0.8.1-r1
-		<dev-libs/mongo-c-driver-0.98
-	)
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( =dev-db/sqlite-3* )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/pmacct-daily"
-
-DOCS=(
-	CONFIG-KEYS ChangeLog FAQS KNOWN-BUGS QUICKSTART README TODO TOOLS UPGRADE
-	docs/INTERNALS docs/PLUGINS docs/SIGNALS
-)
-
-src_configure() {
-	tc-export CC AR RANLIB
-
-	econf \
-		$(use_enable 64bit) \
-		$(use_enable debug) \
-		$(use_enable geoip) \
-		$(use_enable ipv6) \
-		$(use_enable mongodb) \
-		$(use_enable mysql) \
-		$(use_enable postgres pgsql) \
-		$(use_enable sqlite sqlite3) \
-		$(use_enable threads) \
-		$(use_enable ulog) \
-		$(usex mysql "--with-mysql-includes=$(mysql_config --variable=pkgincludedir)" '') \
-		$(usex mysql "--with-mysql-libs=$(mysql_config --variable=pkglibdir)" '') \
-		--disable-debug
-}
-
-src_install() {
-	default
-
-	for dirname in examples sql; do
-		docinto ${dirname}
-		dodoc -r ${dirname}/*
-	done
-
-	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
-	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
-
-	insinto /etc/pmacctd
-	newins examples/pmacctd-imt.conf.example pmacctd.conf
-}
diff --git a/net-analyzer/pmacct/pmacct-1.6.0.ebuild b/net-analyzer/pmacct/pmacct-1.6.0.ebuild
deleted file mode 100644
index 91a703ca1ffe..000000000000
--- a/net-analyzer/pmacct/pmacct-1.6.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="A network tool to gather IP traffic information"
-HOMEPAGE="http://www.pmacct.net/"
-SRC_URI="http://www.pmacct.net/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="64bit debug geoip geoipv2 ipv6 mongodb mysql postgres sqlite threads"
-REQUIRED_USE="
-	?? ( geoip geoipv2 )
-"
-
-RDEPEND="
-	net-libs/libpcap
-	geoip? ( dev-libs/geoip )
-	geoipv2? ( dev-libs/libmaxminddb )
-	mongodb? (
-		>=dev-libs/mongo-c-driver-0.8.1-r1
-		<dev-libs/mongo-c-driver-0.98
-	)
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( =dev-db/sqlite-3* )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS=(
-	CONFIG-KEYS ChangeLog FAQS QUICKSTART TOOLS UPGRADE
-	docs/INTERNALS docs/PLUGINS docs/SIGNALS
-)
-
-src_configure() {
-	tc-export CC AR RANLIB
-
-	econf \
-		$(use_enable 64bit) \
-		$(use_enable debug) \
-		$(use_enable geoip) \
-		$(use_enable geoipv2) \
-		$(use_enable ipv6) \
-		$(use_enable mongodb) \
-		$(use_enable mysql) \
-		$(use_enable postgres pgsql) \
-		$(use_enable sqlite sqlite3) \
-		$(use_enable threads) \
-		$(usex mysql "--with-mysql-includes=$(mysql_config --variable=pkgincludedir)" '') \
-		$(usex mysql "--with-mysql-libs=$(mysql_config --variable=pkglibdir)" '') \
-		--disable-debug
-}
-
-src_install() {
-	default
-
-	for dirname in examples sql; do
-		docinto ${dirname}
-		dodoc -r ${dirname}/*
-	done
-
-	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
-	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
-
-	insinto /etc/pmacctd
-	newins examples/pmacctd-imt.conf.example pmacctd.conf
-}
diff --git a/net-analyzer/pmacct/pmacct-1.6.1-r1.ebuild b/net-analyzer/pmacct/pmacct-1.6.1-r1.ebuild
deleted file mode 100644
index 0b22f3b865ca..000000000000
--- a/net-analyzer/pmacct/pmacct-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="A network tool to gather IP traffic information"
-HOMEPAGE="http://www.pmacct.net/"
-SRC_URI="http://www.pmacct.net/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="64bit debug geoip geoipv2 ipv6 jansson kafka mongodb mysql nflog postgres rabbitmq sqlite threads"
-REQUIRED_USE="
-	?? ( geoip geoipv2 )
-	kafka? ( jansson )
-	rabbitmq? ( jansson )
-"
-
-RDEPEND="
-	net-libs/libpcap
-	geoip? ( dev-libs/geoip )
-	geoipv2? ( dev-libs/libmaxminddb )
-	jansson? ( dev-libs/jansson )
-	kafka? ( dev-libs/librdkafka )
-	mongodb? (
-		>=dev-libs/mongo-c-driver-0.8.1-r1
-		<dev-libs/mongo-c-driver-0.98
-	)
-	mysql? ( virtual/mysql )
-	nflog? ( net-libs/libnetfilter_log )
-	postgres? ( dev-db/postgresql:* )
-	rabbitmq? ( net-libs/rabbitmq-c )
-	sqlite? ( =dev-db/sqlite-3* )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS=(
-	CONFIG-KEYS ChangeLog FAQS QUICKSTART TOOLS UPGRADE
-	docs/INTERNALS docs/PLUGINS docs/SIGNALS
-)
-
-src_configure() {
-	tc-export CC AR RANLIB
-
-	econf \
-		$(use_enable 64bit) \
-		$(use_enable debug) \
-		$(use_enable geoip) \
-		$(use_enable geoipv2) \
-		$(use_enable ipv6) \
-		$(use_enable jansson) \
-		$(use_enable kafka) \
-		$(use_enable mongodb) \
-		$(use_enable mysql) \
-		$(use_enable nflog) \
-		$(use_enable postgres pgsql) \
-		$(use_enable rabbitmq) \
-		$(use_enable sqlite sqlite3) \
-		$(use_enable threads) \
-		--disable-debug
-}
-
-src_install() {
-	default
-
-	for dirname in examples sql; do
-		docinto ${dirname}
-		dodoc -r ${dirname}/*
-	done
-
-	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
-	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
-
-	insinto /etc/pmacctd
-	newins examples/pmacctd-imt.conf.example pmacctd.conf
-}
diff --git a/net-analyzer/pmacct/pmacct-1.6.1.ebuild b/net-analyzer/pmacct/pmacct-1.6.1.ebuild
deleted file mode 100644
index 91a703ca1ffe..000000000000
--- a/net-analyzer/pmacct/pmacct-1.6.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="A network tool to gather IP traffic information"
-HOMEPAGE="http://www.pmacct.net/"
-SRC_URI="http://www.pmacct.net/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="64bit debug geoip geoipv2 ipv6 mongodb mysql postgres sqlite threads"
-REQUIRED_USE="
-	?? ( geoip geoipv2 )
-"
-
-RDEPEND="
-	net-libs/libpcap
-	geoip? ( dev-libs/geoip )
-	geoipv2? ( dev-libs/libmaxminddb )
-	mongodb? (
-		>=dev-libs/mongo-c-driver-0.8.1-r1
-		<dev-libs/mongo-c-driver-0.98
-	)
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( =dev-db/sqlite-3* )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS=(
-	CONFIG-KEYS ChangeLog FAQS QUICKSTART TOOLS UPGRADE
-	docs/INTERNALS docs/PLUGINS docs/SIGNALS
-)
-
-src_configure() {
-	tc-export CC AR RANLIB
-
-	econf \
-		$(use_enable 64bit) \
-		$(use_enable debug) \
-		$(use_enable geoip) \
-		$(use_enable geoipv2) \
-		$(use_enable ipv6) \
-		$(use_enable mongodb) \
-		$(use_enable mysql) \
-		$(use_enable postgres pgsql) \
-		$(use_enable sqlite sqlite3) \
-		$(use_enable threads) \
-		$(usex mysql "--with-mysql-includes=$(mysql_config --variable=pkgincludedir)" '') \
-		$(usex mysql "--with-mysql-libs=$(mysql_config --variable=pkglibdir)" '') \
-		--disable-debug
-}
-
-src_install() {
-	default
-
-	for dirname in examples sql; do
-		docinto ${dirname}
-		dodoc -r ${dirname}/*
-	done
-
-	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
-	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
-
-	insinto /etc/pmacctd
-	newins examples/pmacctd-imt.conf.example pmacctd.conf
-}
diff --git a/net-analyzer/pmacct/pmacct-1.6.2.ebuild b/net-analyzer/pmacct/pmacct-1.6.2.ebuild
index 72d65265800b..0b22f3b865ca 100644
--- a/net-analyzer/pmacct/pmacct-1.6.2.ebuild
+++ b/net-analyzer/pmacct/pmacct-1.6.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.pmacct.net/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="64bit debug geoip geoipv2 ipv6 jansson kafka mongodb mysql nflog postgres rabbitmq sqlite threads"
 REQUIRED_USE="
 	?? ( geoip geoipv2 )
diff --git a/net-analyzer/pmacct/pmacct-1.7.0.ebuild b/net-analyzer/pmacct/pmacct-1.7.0.ebuild
new file mode 100644
index 000000000000..ff729c382305
--- /dev/null
+++ b/net-analyzer/pmacct/pmacct-1.7.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="A network tool to gather IP traffic information"
+HOMEPAGE="http://www.pmacct.net/"
+SRC_URI="http://www.pmacct.net/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="64bit debug geoip geoipv2 ipv6 jansson kafka mongodb mysql ndpi nflog postgres rabbitmq sqlite threads zmq"
+REQUIRED_USE="
+	?? ( geoip geoipv2 )
+	kafka? ( jansson )
+	rabbitmq? ( jansson )
+"
+
+RDEPEND="
+	net-libs/libpcap
+	geoip? ( dev-libs/geoip )
+	geoipv2? ( dev-libs/libmaxminddb )
+	jansson? ( dev-libs/jansson )
+	kafka? ( dev-libs/librdkafka )
+	mongodb? (
+		>=dev-libs/mongo-c-driver-0.8.1-r1
+		<dev-libs/mongo-c-driver-0.98
+	)
+	mysql? ( virtual/mysql )
+	ndpi? ( net-libs/nDPI )
+	nflog? ( net-libs/libnetfilter_log )
+	postgres? ( dev-db/postgresql:* )
+	rabbitmq? ( net-libs/rabbitmq-c )
+	sqlite? ( =dev-db/sqlite-3* )
+	zmq? ( >=net-libs/zeromq-4.2.0:= )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=(
+	CONFIG-KEYS ChangeLog FAQS QUICKSTART TOOLS UPGRADE
+	docs/INTERNALS docs/PLUGINS docs/SIGNALS
+)
+
+src_configure() {
+	tc-export CC AR RANLIB
+	append-cppflags -DMYSQL_SERVER_VERSION=99999999
+
+	econf \
+		$(use_enable 64bit) \
+		$(use_enable debug) \
+		$(use_enable geoip) \
+		$(use_enable geoipv2) \
+		$(use_enable ipv6) \
+		$(use_enable jansson) \
+		$(use_enable kafka) \
+		$(use_enable mongodb) \
+		$(use_enable mysql) \
+		$(use_enable ndpi) \
+		$(use_enable nflog) \
+		$(use_enable postgres pgsql) \
+		$(use_enable rabbitmq) \
+		$(use_enable sqlite sqlite3) \
+		$(use_enable threads) \
+		$(use_enable zmq) \
+		--disable-debug
+}
+
+src_install() {
+	default
+
+	for dirname in examples sql; do
+		docinto ${dirname}
+		dodoc -r ${dirname}/*
+	done
+
+	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
+	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
+
+	insinto /etc/pmacctd
+	newins examples/pmacctd-imt.conf.example pmacctd.conf
+}
diff --git a/net-analyzer/prometheus-node_exporter/Manifest b/net-analyzer/prometheus-node_exporter/Manifest
index 78cc41f90af7..cdd5cdfe62e6 100644
--- a/net-analyzer/prometheus-node_exporter/Manifest
+++ b/net-analyzer/prometheus-node_exporter/Manifest
@@ -1,9 +1,6 @@
 AUX prometheus-node_exporter-1.initd 615 SHA256 cdc4233ff3430a15a886d5a38e7f7d5b979663bd47e48706ed5de480838f9c25 SHA512 aecc8180b300660cb6b2882c45a99510d5c12aecaf1aaa24d62f2393c3f5c3e5dd9de6c5e73125f4eb6f3e18ca0d7b7e04e6338db2eed5ab06919e245f7e9d6a WHIRLPOOL 366a5cbea77dbd543e4ccb30bb2064dc8d91dd8d113b0b619eb3404034338424de030b0a6443f3b9567c8c6032a36b5e5c2a0eb99786c648430b468932d8cb4c
 AUX prometheus-node_exporter.confd 111 SHA256 51b9d1c0a9a05f7ccaaa88ae8bc5f6c31c10c7efb097e9cae257cc6af658b533 SHA512 cce5db8eccf2ecfe1198aa8252b04fd6a96006f707e7132c2d01c5400d175551c3b9890c4d57fec9ccbe17594dfb937e1f99ead0e1c3fd8cf22930dabd70418d WHIRLPOOL be439ab6a38d5a61b5c33b4140040f61d783b64ec39d7f0bb837ce09f123293eaec435703df0870b80dc1fee73d0a8c86b65db1d6da0c04c34128037d9add866
-AUX prometheus-node_exporter.initd 614 SHA256 2d35b4ecdf385700d1b341a4d4ec0691f9663a220acd45755313d15d7d0209e8 SHA512 5332d59b0548939fa41fa666f013eb573ad7bae699fd65ff6a0171d74ac5ab8d14306beff14046b8eba06fef62963f0f0b7194b47c511ddb4c6050ba72cdb831 WHIRLPOOL 9961e0505c642b82a8af26fe40a3e992504456363014c98536da12d34ec4626dd77c6f030e0512482a6146a1f6d98b22c0624a6a5b22b2681e72eed3e47ca047
-DIST prometheus-node_exporter-0.14.0.tar.gz 1086402 SHA256 312d7e1c07d6a7548f2f116b983da87f7b3a7630f9332eb41c306fd71b2e6ec1 SHA512 28b1c3a17b0065f7005636f0751e535f9455675f7c17546a584fb709f43f2608e4854fe4e7f0e3790b89eff21016b41dccb0a96f16eae466de1040b57c4b1c98 WHIRLPOOL 176eb95a76fefb388817fa27f0b43fca9b1ed235d39e73e97254ef829025d7493f710ce0ef2cf11b00ffa509c08f7b12664cdff38939a5ea62eb79e7991c0bd3
 DIST prometheus-node_exporter-0.15.0.tar.gz 1324698 SHA256 87a057081e2034f85e997f9e1343aaf45e1b6ad9fa51411caf97a03fe1c46ccb SHA512 0630c112742ef029d24a0086f9cf0a2efcf1125987dc1e6978055d3e74b820bbd91fd2e7391aa5108881a08a2ec06aff4c1500ebbb6644b46fd7e6271f2b8fa9 WHIRLPOOL 8d4da98c4df9dd344ea68e64deb550197af04b01251dfc784c992007b24677843af8f5d973fafef6e679ce1b2a769512a43419406252cf5f9d35b91c17011a1f
-EBUILD prometheus-node_exporter-0.14.0-r1.ebuild 1221 SHA256 68421cd22c0a53ef0b1471f326ad6f487f8fb39b7c95447a2d31257a81fd339d SHA512 12573499da3fadf971ce5341d85f06a6157f84294d2e10ed4da246f7af94681741e70a593b16ff4a199174f942c7207a7ffa223f8c631fa822913e902dcbe692 WHIRLPOOL b07e4ee0c052c69a16f98132868ee032bd64f6ff296f4626b787f1a81f9ebe7deb386f484b8d039226de377a5d57d91aad0846a5179d8982aaa09457a2b17b93
 EBUILD prometheus-node_exporter-0.15.0.ebuild 1226 SHA256 7303117307a7839fe48ae34273a2cd2428f78ca4fb04632445685902db309a8a SHA512 1df7bc1054410c4edd5a8849e1375ae5a798d932514349c18778232157b24df5817b2e705c48f2b57852d6d02400329cd34167308ad2f3283a31eb71a8ab6e60 WHIRLPOOL a990f41b989140aa31fbfe8cd0df76e1ed611de0b5173b5a308082dc26f228cc9b840a1bd9a2e9714c9325ed4317e14fe9ab8497956f0b2d78a070da4fa4f380
 MISC ChangeLog 481 SHA256 0ee6994116c7d3d57b63373d23c1eae0c9f937018749b99d9d047fe5fd4d2b23 SHA512 bb4010b6957fef58e18717bed4add6840af8bb60c247e96d1be40612b0d88664186f81f5d99e94c6c0688783424b4bfd0037c71b1ede37097a362520718ef021 WHIRLPOOL b4f6808f2c6c20d1a47c5620942a2dea412f7c0c3bb477be84c89e7fe8dac0dbd107338f0acf344f857bc446e39aa328c62bf601e5d9eff257f4a57cecbb36f2
 MISC metadata.xml 334 SHA256 dce4944e74dfe121777699fe9b10552be275ba92e947a3715f6b60869d67d526 SHA512 da17eb8e555adf4d4922ba8e0a549248dc2adf391f4285ce0f6919f194de327d80205c1e09af073eee526b073aba26e5551aa41a83118961d9e6eddd2887b23e WHIRLPOOL d03773ab82553723915864f5bf084d74183fe56cad0628157e6c97e1e95e922edc180db665b6633e09af7df0d279f7bf075ec9066817bd243e656a8a9d0c32e1
diff --git a/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.initd b/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.initd
deleted file mode 100644
index 57202a4ce47b..000000000000
--- a/net-analyzer/prometheus-node_exporter/files/prometheus-node_exporter.initd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2016-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Prometheus machine metrics exporter"
-pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
-user=${user:-${RC_SVCNAME}}
-group=${group:-${RC_SVCNAME}}
-
-command="/usr/bin/node_exporter"
-command_args="${command_args:--collector.textfile.directory=/var/lib/node_exporter/}"
-command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
-	--stdout /var/log/node_exporter/${RC_SVCNAME}.log \
-	--stderr /var/log/node_exporter/${RC_SVCNAME}.log"
-
-depend() {
-	after net
-}
diff --git a/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.14.0-r1.ebuild b/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.14.0-r1.ebuild
deleted file mode 100644
index 5714d4e1feb6..000000000000
--- a/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.14.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/node_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-NODE_EXPORTER_COMMIT="840ba5d"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus exporter for machine metrics"
-HOMEPAGE="https://github.com/prometheus/prometheus"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${NODE_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix node_exporter || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin node_exporter/node_exporter
-	dodoc {README,CHANGELOG,CONTRIBUTING}.md
-	popd || die
-	keepdir /var/lib/node_exporter /var/log/node_exporter
-	fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/net-analyzer/prometheus/Manifest b/net-analyzer/prometheus/Manifest
index 0d46377b8343..1e225f8a0b34 100644
--- a/net-analyzer/prometheus/Manifest
+++ b/net-analyzer/prometheus/Manifest
@@ -1,9 +1,9 @@
 AUX prometheus-3.initd 659 SHA256 2f5790b241f544e2f73687c15b1cf8efc79fbfbff5502cf973c6bef4ce850498 SHA512 14321f0a0e39e4ed1b879ba956855046c21dff85770d3d269492a6d0b911af69ccbf047ec48b91c56bfb678da9390fb236ce165326dc2139b1255d448f2512fa WHIRLPOOL 595254176744eb3794b760830bb4036813df31dd6ce5f91890463db9db8bde3733b23914c8b725e5543e49d5c3c9ea1a4bd9f87b7ce612e17533ad4bb03884f8
 AUX prometheus.confd 43 SHA256 940f1a3ad08f0eb370951b1a42c29a9217cba9ae2f5cb6cc675bdec1d51e8309 SHA512 37468e897cd34b50b0edc65ada3f0c2e05459c3d96bb7f82d58b6de5bf10a127f1bf7912af93d83d94e3ea7287cfeb2311e36535f291d01a11d152a0b438591c WHIRLPOOL b8bdd0bc16fde3fb99cf8939427781a1b250df7e4a607fb8c780f75d502e7d2aa76aef6a1b4c082d3aa32f0a9a21b3b39df72fcf5e6d26592df43661f8d08169
 AUX prometheus.initd 664 SHA256 566db492c8da87e1de8b655247dce11e43d83b85c9bf9bef7a9fd715e4667516 SHA512 95e2ac4969c26f2e91330b521223e94912d68832ef29429e68930479c29b24027c138011bd1f480546c14a07ae15800967e9ff114cdec3cabd0c15bdca489665 WHIRLPOOL e972726fac805f43772dc871a2a3af45d5421f1c15ab05fd0e7d5368b282164021a0079cfd9d3f5de4656739ccfa339ed80d3fb2ae50b429d5ae806441edc5fa
-DIST prometheus-1.8.0.tar.gz 5194115 SHA256 556247d750b3618b74ccf59669f74a8c0c39e72cdf51cbcc0c0bcc392de195df SHA512 1ac00ddae4753f99f167db9b6efc5fa442918284f59468b8e1c7743e3f946eab895678c87e12a73bf158e3c0bf3df7345dd59855baaabb54fc86f1ae1014192d WHIRLPOOL 9ff6f0dc36f022b2be107ce59878f81b210b196858064655a74e098650abc77d5a0c2afb11dd5ebb242d1e2addbc3a182b1a6ce1f751eed723e3fff3434d319c
-DIST prometheus-2.0.0_rc1.tar.gz 5538094 SHA256 5d80280d4f8de0e5c79b02fa2ab9cbe4cf49a287ed268ed85a0f87abd257d226 SHA512 c89509693608a4f00713cb3b9f11b533236898af4a08580ecb4aa5f198d7f568719ddb78225f9d260128288aa7e037d0a0a820f8e42e2db4c7745e2f993fb4fe WHIRLPOOL 1765d9eb600da28e12d2c679a60f050d9557bbf974a53ff86363fb66fb82d64c4b55a85f9aac4c80039c317a88028c794e8387e0db3f0b925b86057d5ae17f7e
-EBUILD prometheus-1.8.0.ebuild 1603 SHA256 fd4ee62da65a03450f6192c00ba513c82f286d09ecf6e2587e637d3257c19ffb SHA512 dce3a7f7706f60c84aec1e994eba9c8af32995972ac3312e13ce1ea44c79eb8315e32c8ab735b5054bd7f6ff72125e1dd20c62de6360c01de7e18a8bd2a9d8ad WHIRLPOOL b37ddb874abcbae32d01e2700139e3b42f2d8b538d728779e0237376d7a3c88322ad7fb5c9e7649a95b25cb379df78c496ed78366d6a9b659d19d70a2020a8c7
-EBUILD prometheus-2.0.0_rc1.ebuild 2000 SHA256 a4c9a98be5c9fcdfde08360a8eeabf19258d699f9ac402727836b959b237ee9f SHA512 0a141038f1dace00a6ebc0e54b5d4714bb72efdc733e99c8c32efb194f8b1ff7c726f5951199ca64448402d4f9b7aa9985353620bcf3410616532171e97dc0a1 WHIRLPOOL 22e1c4b127f02c5c4a5b00774f2774d56e45274a5bc178d7cbdb1f7586dc06c9ee5591d9dc9ca15194c6787038139378778f361a364df5b8beee428d26e00f6e
+DIST prometheus-1.8.1.tar.gz 5194859 SHA256 dc2b7bb5b5f1273c131921d3e306fd198f2a5547abc58dcf511b700c62963595 SHA512 936728f51a12a080a0689c17b134f70f747bb2219f750ea5f7df7460169b3e484689d75df319cfae12fc939b556e4f59ed49682731e43405a4a91e4bbcd9cbb7 WHIRLPOOL 755ac91ecfe9234675bac2cee2c63a50c80a5e02267818b1ac7747c669df81e4e267dd884aa1da7463339f5344e8fdbb488c7521d0d7817360bad74ece256a86
+DIST prometheus-2.0.0_rc2.tar.gz 5539456 SHA256 99340e1708f9dd216048d0de8ce1a069c70879760d833dfee1ef480966d2d53c SHA512 c895e0a561e89a13cee4cba1f4899ffcb4a8094f72618b9c7c2e48a035ceef3b844c0c8b9603f0886fac3e0d1c43b1e235f784f18d289e47c0e858b5d53ed47b WHIRLPOOL 60070eddcaa06ada89e5612c893c97098c48c6d5953d17e1cfe6b16708c332aa9d855aaecf6aa00c28527b22ad77ce6ff26cbade01ea2e71d1bafc9ece59f655
+EBUILD prometheus-1.8.1.ebuild 1603 SHA256 9993a83bfa5726247b2d48a4d6530ba925722f09d515fd00460d9edf46e48a90 SHA512 ee00454a690fd3bb2990baf2612860938916dae85485ec40c7e5921a9b34920ce88a23d18703daf662959b8bb5952deff68d622c7e1b727b91e3b530304c2b91 WHIRLPOOL bd95c86ecb27317c48648cdd5b77fea8574042856b8a496c9b6d7d7340cef92b15979abc0100e5b9f42a0841ab301899f1902e6f2d9859113fe689fc6b5fcb81
+EBUILD prometheus-2.0.0_rc2.ebuild 2000 SHA256 924c2f0264af7e066a1982f1202b2955255c7f71c7bd5b081d5ec3e63efd21cd SHA512 3926d27cd71e34a32f17d3351874f24138de27c0d951685e12322503cbf086c63e30c85cf32dd4a05c17638d965ae399ff80e505702a57e9573fa2594c83cbd1 WHIRLPOOL a64820058773b240b3b273475485c69eeb4d66d44c166f17dfe061acd809734dff171867208ff80011237b6a891cff69c15afefe26f899792fae584383f08a2d
 MISC ChangeLog 552 SHA256 be1d133e356e6eb2ad19eb3900722da8fa6495af85bc38a2b90f6845c62dc27d SHA512 7d5bf11cda31ce2fcae3a752ec9eb0d17b212c0ea1a480e09436d41a24eae4ba5689aa43727a8ac5882c5b1ddc741c717a3c8d509d69204fd44eeb00460a4e60 WHIRLPOOL 7ddcb758ecc1426a520a97c6b27b1c0e9752422c9c0f16b1746e11aa91edc37f5289b096430a0b8e05535818901f6f1745144107a2000cb771843de038b07963
 MISC metadata.xml 331 SHA256 1e206a714f59c466b3f41285ea73b6b3a0919c2f8c0a4cf5350ccea436bb26d9 SHA512 06fd0da413c0280a902bbdf50e1e0557375d2208021fda3c3081d8a25a4b17ad1ca647d994dd97ba2d838ea5c87148d3ffd13a8a54cb8dc007b45927df8de47a WHIRLPOOL 0c98900489068124a7afcf1f40d1c9964089ead950e8e16dbc4a0389487187d9af6802a6e86fb6dcf541784f09acd8e0ee27f3215deb16de56495af2b1ee85fc
diff --git a/net-analyzer/prometheus/prometheus-1.8.0.ebuild b/net-analyzer/prometheus/prometheus-1.8.0.ebuild
deleted file mode 100644
index de0cc31726df..000000000000
--- a/net-analyzer/prometheus/prometheus-1.8.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/prometheus"
-EGIT_COMMIT="v${PV}"
-PROMETHEUS_COMMIT="3569eef"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus monitoring system and time series database"
-HOMEPAGE="https://github.com/prometheus/prometheus"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.8
-	dev-util/promu"
-
-PROMETHEUS_HOME="/var/lib/prometheus"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup prometheus
-	enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${PROMETHEUS_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" promu build -v || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin promtool prometheus
-	dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
-	insinto /etc/prometheus
-	doins documentation/examples/prometheus.yml
-	insinto /usr/share/prometheus
-	doins -r console_libraries consoles
-	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
-	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
-	popd || die
-
-	newinitd "${FILESDIR}"/prometheus.initd prometheus
-	newconfd "${FILESDIR}"/prometheus.confd prometheus
-	keepdir /var/log/prometheus /var/lib/prometheus
-	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
-}
diff --git a/net-analyzer/prometheus/prometheus-1.8.1.ebuild b/net-analyzer/prometheus/prometheus-1.8.1.ebuild
new file mode 100644
index 000000000000..1a0cce6982b9
--- /dev/null
+++ b/net-analyzer/prometheus/prometheus-1.8.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/prometheus/prometheus"
+EGIT_COMMIT="v${PV}"
+PROMETHEUS_COMMIT="3a7c51a"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Prometheus monitoring system and time series database"
+HOMEPAGE="https://github.com/prometheus/prometheus"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.8
+	dev-util/promu"
+
+PROMETHEUS_HOME="/var/lib/prometheus"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup prometheus
+	enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${PROMETHEUS_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" promu build -v || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin promtool prometheus
+	dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
+	insinto /etc/prometheus
+	doins documentation/examples/prometheus.yml
+	insinto /usr/share/prometheus
+	doins -r console_libraries consoles
+	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
+	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
+	popd || die
+
+	newinitd "${FILESDIR}"/prometheus.initd prometheus
+	newconfd "${FILESDIR}"/prometheus.confd prometheus
+	keepdir /var/log/prometheus /var/lib/prometheus
+	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
+}
diff --git a/net-analyzer/prometheus/prometheus-2.0.0_rc1.ebuild b/net-analyzer/prometheus/prometheus-2.0.0_rc1.ebuild
deleted file mode 100644
index 697c41569454..000000000000
--- a/net-analyzer/prometheus/prometheus-2.0.0_rc1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/prometheus"
-MY_PV=${PV/_rc/-rc.}
-EGIT_COMMIT="v${MY_PV}"
-PROMETHEUS_COMMIT="5ab8834"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus monitoring system and time series database"
-HOMEPAGE="https://github.com/prometheus/prometheus"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-PROMETHEUS_HOME="/var/lib/prometheus"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup prometheus
-	enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${PROMETHEUS_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" promu build -v || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin promtool prometheus
-	dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
-	insinto /etc/prometheus
-	doins documentation/examples/prometheus.yml
-	insinto /usr/share/prometheus
-	doins -r console_libraries consoles
-	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
-	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
-	popd || die
-
-	newinitd "${FILESDIR}"/prometheus-3.initd prometheus
-	newconfd "${FILESDIR}"/prometheus.confd prometheus
-	keepdir /var/log/prometheus /var/lib/prometheus
-	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
-}
-
-pkg_postinst() {
-	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
-		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
-		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
-		ewarn "This release requires a clean storage directory and is not compatible with"
-		ewarn "files created by previous beta releases"
-	fi
-}
diff --git a/net-analyzer/prometheus/prometheus-2.0.0_rc2.ebuild b/net-analyzer/prometheus/prometheus-2.0.0_rc2.ebuild
new file mode 100644
index 000000000000..6aa654dad848
--- /dev/null
+++ b/net-analyzer/prometheus/prometheus-2.0.0_rc2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/prometheus/prometheus"
+MY_PV=${PV/_rc/-rc.}
+EGIT_COMMIT="v${MY_PV}"
+PROMETHEUS_COMMIT="ce63a5a"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Prometheus monitoring system and time series database"
+HOMEPAGE="https://github.com/prometheus/prometheus"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-util/promu"
+
+PROMETHEUS_HOME="/var/lib/prometheus"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup prometheus
+	enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${PROMETHEUS_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" promu build -v || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin promtool prometheus
+	dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
+	insinto /etc/prometheus
+	doins documentation/examples/prometheus.yml
+	insinto /usr/share/prometheus
+	doins -r console_libraries consoles
+	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
+	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
+	popd || die
+
+	newinitd "${FILESDIR}"/prometheus-3.initd prometheus
+	newconfd "${FILESDIR}"/prometheus.confd prometheus
+	keepdir /var/log/prometheus /var/lib/prometheus
+	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
+}
+
+pkg_postinst() {
+	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
+		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
+		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
+		ewarn "This release requires a clean storage directory and is not compatible with"
+		ewarn "files created by previous beta releases"
+	fi
+}
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index e5dac527790e..9cde2e940b47 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -5,8 +5,8 @@ AUX wireshark-99999999-androiddump.patch 198 SHA256 7607082abf45448fd4def4693522
 DIST wireshark-2.2.7.tar.bz2 32309420 SHA256 689ddf62221b152779d8846ab5b2063cc7fd41ec1a9f04eefab09b5d5486dbb5 SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716 WHIRLPOOL 0361821da9c113a8de1339cc48cae0291be84bcffb1ba34b1fc3f457b22525329e954a2060f7eef25bca550d0ccdaf4a9e9587d35394b0abd9b0d38bc6023e44
 DIST wireshark-2.4.2.tar.xz 28791712 SHA256 d1acb24735fd35e18e9b7a0555ec58277c2b87da45a19ebeb8087c3dda55f47d SHA512 212964482a1e45af490ef78b3f2465384f84c007a76c3a99e8de0e2c37d933fb34b0da5631f4a36ca12d2fa7cc4376d3d405cbe7f7113791ea09dba7e5915417 WHIRLPOOL 245454643e138c61ccb380ae236482fea702cf4c0507de1c1d3d6dc9f7312809533db7b0fba585f95b8caf5b76affa4da23ad263b8f95174dfbb9c2ee3300177
 EBUILD wireshark-2.2.7.ebuild 6489 SHA256 0978c03c370a2d1b8e2e910bd1c3a57f8cd6984fa2e25b15e152b3fbbd4b95b9 SHA512 3aad3004619a02cd4a2bb8a9d4f87e0a669e2ea23a0e83377056477af4a2b5a6f7ed95d9c7fe1373e847fb186c014c87f5cb96f5f32d4bff7bfc2700710301f9 WHIRLPOOL a3715bb7c19f1007dac053ec1aaf1e49232b31605ec55761884bb6556e19fb1f0b53440657bf0f49330630d5beef435881f157cb6af3be02cc5cfd90134c156f
-EBUILD wireshark-2.4.2.ebuild 7335 SHA256 18a9b9157b36518f0e6cf805848c1060b7efb362e8c49669435624ba77a6f3ae SHA512 a178a9581aa6fbc6c7ab7b90f816a6c5282d3b6b616a6634e72696ff0b42d19c2b2fcc6ea188c5beba5069472bf141c2af452eab9e56e023f81beb5c8eb2ea13 WHIRLPOOL 99d0d17608ae45d5c1b31d9b1eb1f4825560b31c125f0cf82f82bde7db916c553b8009b1a472631f5c23f7a385188d6f8566d8d7dbe7bf1e42c668b39be0bd19
+EBUILD wireshark-2.4.2.ebuild 7341 SHA256 25f8c3f7da9f8a1c57b842faf8dd5385836815991f69ca52eb9bddc47dfeaf65 SHA512 531a6e329021adffd3d6ad7935b817c8fbdbd7b9956e96765ae68d484351a227bf8d38df175c2c437549ce842ebb48e6eda7c03ede374ffef257bdf045a67051 WHIRLPOOL 86eeecb80d0282370cb04b50537b676616a466db1024d305239f4b12bf8c2aaa7c05d48a6ba7fb81a7eaa938e5c64fe1cfd38c2be725b2c1281197d37a203df0
 EBUILD wireshark-99999999.ebuild 7244 SHA256 72ba7b56f2f65ede095d2694d246225ce9162512166962bcede6fe89d842cc52 SHA512 84107c356b10259f6b230931ff136c3dcd364e7aa928cc29609d253ec36e11193e7f723548965c9f085c49040a9ddcf9bfcfd476242178b25ae8213eb0617742 WHIRLPOOL e985f39f06d5dbda4a4a71290b8f024ef483c65ac3c5cf2fe9aac02c79f7ef685eeefeb5a0a5a75c75765342116d554983620aec0f24b893c86db9cdc19c9e61
 MISC ChangeLog 28152 SHA256 4d533b118cf6326befb9d60fef7212306a14528010f3c1864ea6657e20b00605 SHA512 1dbf03f303e0e05eb243d70595fd88e7ea4d14e397a3d717fe2ac9ba05e2407e1928f2cd78b7bc6fe205ce8d660e75b6f11608546b32a70ffc1ec24629567fd5 WHIRLPOOL fbb5a086aa52c90e28c392813dd7b8ade906f4376ec596741e2396b9160e2e64a45148a793b45530ae3ab6dd744dccf6c30261cdf354ada3a50c11a545afd811
 MISC ChangeLog-2015 107469 SHA256 077b97e93bc0bcebd520af0c72ec9df8da0af9b004423b34190b15c201341b2b SHA512 ce81239e7a9731845ee59ef8206094263b501ab74130cf2a34f8e052e6bf431f019c116c732e2b290c1c61e65ab548e1e10009d1d269cc83fed7f295aee555bc WHIRLPOOL 936c3ea54e274000a61a4114c7d69415f7289183b7c7f75b72925fa9ca0f0f6d42a4ef367d625d4e5892587eee680bbf63eb2945fbc4a98e68b04907ed3fdbc5
-MISC metadata.xml 4697 SHA256 3ac6d14b99bd32da2eda362b754999e36a3d56fdc22abc305a5fba1b39e81b2d SHA512 4ffb089fb47613cce521dac37c8e732ace1acfdb7889dc13538db55362a513078d6f1aab31be353e5b97d86faa18234dcf90afa97e040134af75af060d9c7a40 WHIRLPOOL b1305127e4ee772102a1b104ae87b4c4f29371eca8aedb5d63fc6cb0429bfebc57f8744eefc3e251803f6a4d12b2f5bd3acb8ed5925c2dc476a79bb3ed22e2cc
+MISC metadata.xml 4696 SHA256 b27e2b52729677c9fdf899b53beaed74f9a1cf6aceb2851161814e9f76c8fbf0 SHA512 51ab08d5390ea4d2a4b4e2ce505e9d28932c9dc08d739107e4dada664603fb1a0a89e08f2431af4f84b5f6be303b0b2ad28e2a22fecd7186497809b708be7c51 WHIRLPOOL e217f2ccc3b2a489267e3010c5b78da1e1116111c6670b30a08b92f35209dcd675f0094e29d3f81e9eca83c3bf0fd39e38180ba94df198b90b8712fa3befd662
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index e88111bc335c..2297d39cd5df 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -56,6 +56,6 @@
 		<flag name="text2pcap">Install text2pcap, to generate a capture file from an ASCII hexdump of packets</flag>
 		<flag name="tfshark">Install tfshark, a terminal-based version of the FileShark capability</flag>
 		<flag name="tshark">Install tshark, to dump and analyzer network traffic from the command line</flag>
-		<flag name="udpdump">Install udpdumpi, to get packets exported from a source (like a network device or a GSMTAP producer) that are dumped to a pcap file</flag>
+		<flag name="udpdump">Install udpdump, to get packets exported from a source (like a network device or a GSMTAP producer) that are dumped to a pcap file</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-analyzer/wireshark/wireshark-2.4.2.ebuild b/net-analyzer/wireshark/wireshark-2.4.2.ebuild
index a16ad647b623..9372865de979 100644
--- a/net-analyzer/wireshark/wireshark-2.4.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.4.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 hppa ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2
 	+dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 4c6d3c60e9cf..9db4376ada40 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -18,7 +18,7 @@ EBUILD avahi-0.6.31-r11.ebuild 6261 SHA256 a95ba9cbf383b4367598ea67ddecebed497d4
 EBUILD avahi-0.6.32-r1.ebuild 5732 SHA256 f69aa86fe2d591a9ce8461184a43b334189b9b6d309ed0c60cb3e1714b789ce4 SHA512 d26256a031d5d7ce6cf58ff4c98d5a88ed93498d0383e1a425e88bc9f1de4ee18c0b2ab6e987163b5a27acc807199c8f91276e449dc6d951607c1dfddfaa74c4 WHIRLPOOL bdeeb0d8a5733ccc3c4885747b8c840703ff706720126167fa08835d6f32f03db2649d8293df0394e216e9752cd718cbd509ddda8a787ef0078cacb026f7a1a1
 EBUILD avahi-0.6.32-r2.ebuild 5855 SHA256 83d4f5676138d0545761c046ac0700375254a00b14eb8c7b2ce545365e6d472a SHA512 44aef809779706e5f0e8c5e047b69a795a7d450a59e7fed174c2f7cb5043f6c9d547daff6699ee9e28e9af3ba02caa54a5293ec8ef11219c35bda4b9f3cfdb00 WHIRLPOOL c7558db4af38b6ee799b554f1a4d99921a529725226266c97245fd5806e3e32b8248ba365eedf4edaa3357c2d24496b2d2f37309e0ce8d2f0a069abb00f7f4ab
 EBUILD avahi-0.6.32.ebuild 5584 SHA256 e070550ca49bd56e096a99dcd924d01ed3433f2e46ba61a7a9b93fc819604b52 SHA512 031b6ea7962717de7f984c78a2814312610b86ce391a2474117b34b2e8c542a6de49b75998c99639f866f415b878ed58f807a12ea713d3b1d15ef0657013e4a0 WHIRLPOOL e362983523708a212b840153090ffd3dbcbed1e53965fa805f3c1f8483a9db52951f49161da8a358c94ce81aeba3f648bfd38c2a89c72db94409e83c3c3f9fe5
-EBUILD avahi-0.7.ebuild 5074 SHA256 87423244c19322addee8ed8f980f31b56600f1dd870dacc0dc824ed3c15a45be SHA512 e52a167c7d76257a58062c173765bd5a5f78ecc90e3e5fd254e36ee43db9cf0c63bf530dfe20b7cbf426d1442ca2c2a8851764833a5d876908f18d625637e93c WHIRLPOOL 64c6db3e0cd26e8d2d0602e10beef86b85cba4572183888784abc0ebdc41f3e24987350462d8b222bf32985866e9e91a67f0f74101769cd09ae335fe8441d0be
+EBUILD avahi-0.7.ebuild 5071 SHA256 47ce5c3a1e20eba7e7abf07e5b86daa3598c15e6dff23dcb59af2a59dbfa36ca SHA512 cd6015539336ac69961d77e65c9ae72dc3ab533c5ec90d58de010b06633ad13fdb660589546c2b8b37c9262d8937f81c031f937ab7c6cf06d5d1e9ffd3a460d7 WHIRLPOOL 591382f077b8ad47a0eb31bf146ebd3abda40fc748ee640a55c6894bdda8579c85ecc1b866eadd6c9fc884089093feafca2ecf4558c77d62ede5c69be159626b
 MISC ChangeLog 7687 SHA256 7d2b2911ecc315c9260cc93f78e42fcf442e763a11d6716e547bc73e49db5e45 SHA512 7108d7c7b633ba75c491c38790b771b3ca209d42af98a20244ba756e79196dd28f9a299d13692a51445e0b7a8eef3f5088499b9da178f54a24fd34f0723abb43 WHIRLPOOL 4243d9f9824f678127ffedac72ee8129d7487161ae765828176345d5149531477f4288106b909f4150e6bd5b69c8cf1ef74a4ae4988cb1d0a3c601bd41192ca3
 MISC ChangeLog-2015 43278 SHA256 8127499a1ad257734a5b1e8eef76d640a37fffee164a3a7ef7ec4da4e87d3e06 SHA512 4c2d98e3cc9f9cb91ff28c57d20d57d0f1f1ca14b30c25c43d15963363c2681e3f9b22f9385f4f88812adf041b1edef6a86ca663e59b69f0eaf7de0bb67a0a58 WHIRLPOOL 05760ae18c1d39040d59e95e921479a29c9f44e15985f5b5951943dbd2fa49a2e467bb9236afa59a0082b90928233ce59f297ea4afde98b20271402e1b290899
 MISC metadata.xml 970 SHA256 c14f973568f17f33044e5ad40b4a391cf8ac25ee23bb263d6397f121ea43528a SHA512 b9498d4757b6bd793846e4cbdd5c37da601a8e1430cafd1a6039ff54f8ff10576684c58801ebc679061f975cefa5909c94c30976e84354a5fcc7d2a586f7fa8e WHIRLPOOL a4415d64adc216c956610fe85ba239bce8ac5df4c98b34ca25df71708dd4920ff7a18a31287f3aa09804a4df228de84f399a1c01a6b5047a886848b4ff6bb528
diff --git a/net-dns/avahi/avahi-0.7.ebuild b/net-dns/avahi/avahi-0.7.ebuild
index 536ccf5311dd..06f8841fba8c 100644
--- a/net-dns/avahi/avahi-0.7.ebuild
+++ b/net-dns/avahi/avahi-0.7.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${P}"
 LICENSE="LGPL-2.1"
 SLOT="0"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 x86"
 IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt4 selinux test"
 
 REQUIRED_USE="
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index cde2d04f0d1d..970754401d7d 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -4,7 +4,7 @@ DIST bind-9.11.1-P1.tar.gz 9745364 SHA256 6b1b3e88d51b8471bd6aee24a8cea70817e850
 DIST bind-9.11.1-P3.tar.gz 9749095 SHA256 52426e75432e46996dc90f24fca027805a341c38fbbb022b60dc9acd2677ccf4 SHA512 bf92ce1e07e5c84cc42b413bdbd3ad97f37712a6dc330dc10182992d948b7a393d5446efa188379b39020c34d810cebe2a7acccc9b8aa6bb564e1f3e6be42e96 WHIRLPOOL 93c139c979a60f9f3d8e54cf9f23e25a6d64180f7c2be6ba8c41488e9eec985c0bd67ab28e7f502c155c57b643b47b4c12d1ee5877077be37e07138adbd93a56
 DIST bind-9.11.2.tar.gz 9782180 SHA256 7f46ad8620f7c3b0ac375d7a5211b15677708fda84ce25d7aeb7222fe2e3c77a SHA512 c837c0a360049b0077b155eede9b6a71f63d1caca2ddf20a8ab7860a1033a3750e49cd2804dcf8c43b0aef04bcea99422d1302b4eae1646eb69a5ae6d64625b9 WHIRLPOOL e77846ffbe8f70b295f4aeeb110946ba98a3d4a2fd79b059728226d0916429e8a5657b1dea0f545581588153f3f00ba7c99e326359be4bad3f1ed637a75d52ed
 EBUILD bind-tools-9.11.1_p1.ebuild 3176 SHA256 e0bacacbd9250304b4c697b403e559a930cb114f1c35032a1194d9dde0a374f4 SHA512 b292d3062aa5c37800945446ee05b27d918551cde436dee09b92ac19f26e104cbbac1aaf2f486eca9f591fbea89f4f420e3a75c85fcfbaeb243203ca4accf138 WHIRLPOOL ee452c2aefb9eb985643bbd95165c5ed2e4fb71b093f63cb95c6cce62ecc5beaa65801f29aec580d98666327cab087f056b0c63d653c3dd1f9ca0247a6fe4e89
-EBUILD bind-tools-9.11.1_p3.ebuild 3177 SHA256 108219454a6a48e175524900c3661413d48834c86f70c239e7fe7e6c4ced397d SHA512 b12035e8dad9bf6b0a7f1e948d239e171821b5d3e6526052e15572d09444ea10e6aacdf669ffafc367b234083efb6db69801f3fcd39069d907f5258eee53af87 WHIRLPOOL 524277297467388e77f9dc2f3c99caaa0abbed5001c6a3b5c8d51542883aaa09c8bcf4c7933f9e4beaaeee82fbc93ddbb425129e5fc066d1366455e64f42b2b3
+EBUILD bind-tools-9.11.1_p3.ebuild 3176 SHA256 e0bacacbd9250304b4c697b403e559a930cb114f1c35032a1194d9dde0a374f4 SHA512 b292d3062aa5c37800945446ee05b27d918551cde436dee09b92ac19f26e104cbbac1aaf2f486eca9f591fbea89f4f420e3a75c85fcfbaeb243203ca4accf138 WHIRLPOOL ee452c2aefb9eb985643bbd95165c5ed2e4fb71b093f63cb95c6cce62ecc5beaa65801f29aec580d98666327cab087f056b0c63d653c3dd1f9ca0247a6fe4e89
 EBUILD bind-tools-9.11.2.ebuild 3109 SHA256 7d8c08a4c96a586dcdfb595c280e79e9d2db26bb314360d43f5dca94f4e6cfd9 SHA512 c5f85c61ece7258929af980566958c7591e67703ea28ffa1b4c8d0bfcf30eace5a88180ceff8957cab23327829ea0eb4864d3d6f5092eb5238d084b713e66d5f WHIRLPOOL fc3beefecc2231f15c8ac9d8eb21c280ad97797ffb6a857a45ba13607eefa3249127efb28d1ca3864245926bed5d29f435ba383d7472b96b52ff73835226a8ac
 MISC ChangeLog 11476 SHA256 360ad4a6cc959a1d6368160f97a8ef7ef1a5cede600e25e6b60ce1ea3c0a7c05 SHA512 0a0125707b350812b5b42e8c8cccd6a343eb6b2ed19cf3dfa536290e5d07591f5256abd4f6ca82dc05e8dc749d09dda129fb07a3b31a28f4678d491428967f69 WHIRLPOOL 49a8cb571bda115062f0bd380d2cdb42d349edcaef1cdaf2e1cfeffb54713b9e8e554d17e67816ddf124ecfe402e9cf7a5fda2b63c4f4395b0be8d4f0e3c50a0
 MISC ChangeLog-2015 42396 SHA256 1f35ddc61ee04e1eb7cb0d99f4c49ff665477d456ba1ea08e039eea4b76bdc77 SHA512 c1b8720a91aa51ad540ac28a86579e3f1d7d40d37d08c9046dce84347baed49e5113c2773d2b438d59331aa0d4cbe7e3fd5bf6cb606bd4f7135f9c6b86a949a0 WHIRLPOOL 7c1c9d016271064542b7a7826453f8d25316bcd3a14de15a3a041d34587ac3063e2f1dcff2149e50f5ac60e7554ef0a76bbd889bf9eb2ade67fc163967086b1e
diff --git a/net-dns/bind-tools/bind-tools-9.11.1_p3.ebuild b/net-dns/bind-tools/bind-tools-9.11.1_p3.ebuild
index 6d09ec43ca74..95f347c1a18c 100644
--- a/net-dns/bind-tools/bind-tools-9.11.1_p3.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.11.1_p3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc gost gssapi idn ipv6 libressl readline seccomp ssl urandom xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index acb2017bbac7..34725f9973ed 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -13,7 +13,7 @@ DIST bind-9.11.1-P3.tar.gz 9749095 SHA256 52426e75432e46996dc90f24fca027805a341c
 DIST bind-9.11.2.tar.gz 9782180 SHA256 7f46ad8620f7c3b0ac375d7a5211b15677708fda84ce25d7aeb7222fe2e3c77a SHA512 c837c0a360049b0077b155eede9b6a71f63d1caca2ddf20a8ab7860a1033a3750e49cd2804dcf8c43b0aef04bcea99422d1302b4eae1646eb69a5ae6d64625b9 WHIRLPOOL e77846ffbe8f70b295f4aeeb110946ba98a3d4a2fd79b059728226d0916429e8a5657b1dea0f545581588153f3f00ba7c99e326359be4bad3f1ed637a75d52ed
 DIST dyndns-samples.tbz2 22866 SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac WHIRLPOOL 08d4e6a817f1d02597631e18152dbd55ea1bc4c82174be150cc77efc9e1f0f03b6471d1cefbe4229cd3161de752ef232a43ca274a07b78e9c974ceb04cfe99a2
 EBUILD bind-9.11.1_p1.ebuild 12498 SHA256 62b9f9ef5ecccaf6be82c58ede7b449cd67d7a9a490a1443a4de45d5fb409ea5 SHA512 d7b3972d58d051007b764b7301ba3edd6102f45cb214f4b41c2f6348eac693d86c31f059ff5898dcb7c662ba79dad329d220db9e090e120f378c51ccd8b38bfa WHIRLPOOL cb9e2fb15a13682afbc698605870dedeccff8d2dad98e82dc4469a86631e96f5f30f66a9c53059d85b7b6b05a8f3371cc489a62b8851a6dd082b078aba30fe18
-EBUILD bind-9.11.1_p3.ebuild 12499 SHA256 0b38e97b60487fcbd9ffabf11f700e7cb90a09c0aabead232f320128eb8ac1e3 SHA512 a8ca80141447d31cb6e13e3735b3811bf626d6ee9db251b4180c517521c5e7f02d06f5f9006490950a8eab222d6f0baca1f6cfb519aa431a283b9b0dd5dff2df WHIRLPOOL ea25f316604fcaf3379b178c779a9692e188384cffc8de16f76aaebd94cba424b686b91a766a2aa55b100779b7aa54efda9a6fc3b0f548acd601ba4280d4c330
+EBUILD bind-9.11.1_p3.ebuild 12498 SHA256 62b9f9ef5ecccaf6be82c58ede7b449cd67d7a9a490a1443a4de45d5fb409ea5 SHA512 d7b3972d58d051007b764b7301ba3edd6102f45cb214f4b41c2f6348eac693d86c31f059ff5898dcb7c662ba79dad329d220db9e090e120f378c51ccd8b38bfa WHIRLPOOL cb9e2fb15a13682afbc698605870dedeccff8d2dad98e82dc4469a86631e96f5f30f66a9c53059d85b7b6b05a8f3371cc489a62b8851a6dd082b078aba30fe18
 EBUILD bind-9.11.2.ebuild 12431 SHA256 af45ada25adaac0110363d9ee4d400f71e9307c6ce3b26906ce7448f766e82ae SHA512 fe2b99f8d354eeb88f586a256996d4c03f2bd6b29d5cf9780e79ceb09eec0de0a8606415b48a019a357b598b9ef20db76b0e6617231d31350dbf47476dae26e5 WHIRLPOOL 5b0527fcb9ad14c7d92e6e6fce7de73f31d10abc8274057a5dfa93f3c8f403551a74ee57a71e3b139a3bf367be5dae00409c0188019c53cca04aacb426c48a75
 MISC ChangeLog 13297 SHA256 4d0045e6ff541c64902f94168dfd5ff70e05e7d5bc1cf5e817736fadc1785c92 SHA512 2a5f50500efb399be99d1aada968f779e685a1e7edfcf4d9ef56ddbf7cb47bb29556995731a59b3566f4eb20c71bdb170b7e03f97dcf0108d3b1e583a4e68847 WHIRLPOOL 48a57d85327680fcf62dd26edac49844829ea83e0dd094c21bf3226c25a8667af2b7f8d974bf47855e9b964b4a17779a3a1031ed00ca57c435e23abfdbe4af1d
 MISC ChangeLog-2015 85716 SHA256 b34fb291b038caf3fd1bb5f6553fdb05469ca71cc3ad27366df77432a81ab1cc SHA512 d012fe08e05c7c8d45abc92043cd90b1f24bf9faf038ea529da760cf4ad65946887b694250ac82e7683df67e43a77bb85588af4cae79209d1a83b50c1506957c WHIRLPOOL d2a8db6f2ca33a0e16be2c80bc5c364d1e4e2e4edc63a139b0c440da3ce0ea05715eb41401ec59e1175b10fd2db175924409ad5a76a7985683a747b9f2967c70
diff --git a/net-dns/bind/bind-9.11.1_p3.ebuild b/net-dns/bind/bind-9.11.1_p3.ebuild
index dae4b60bd0f8..7fba0854e43c 100644
--- a/net-dns/bind/bind-9.11.1_p3.ebuild
+++ b/net-dns/bind/bind-9.11.1_p3.ebuild
@@ -38,7 +38,7 @@ SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # -berkdb by default re bug 602682
 IUSE="-berkdb +caps dlz dnstap doc filter-aaaa fixed-rrset geoip gost gssapi idn ipv6
 json ldap libressl lmdb mysql nslint odbc postgres python rpz seccomp selinux ssl static-libs
diff --git a/net-dns/coredns/Manifest b/net-dns/coredns/Manifest
index 24fef0990eb5..e93992f0a52d 100644
--- a/net-dns/coredns/Manifest
+++ b/net-dns/coredns/Manifest
@@ -1,4 +1,7 @@
-DIST coredns-010.tar.gz 4945448 SHA256 a4b31a9f95c4bcfbff1742b7896bdaa38d43866bc3cb25dc0034ba60cbfc31ee SHA512 5e01b32b7350e0b7d02e0328bef038975af965f9b120a2c98602d4356546ba4606f48fc305d02e1c216198715a83a81c8803132aa5737c8e3e67b66d1b1b3da5 WHIRLPOOL a0659b8f68cda5572812ff6289f69f368e5f2a1737d1044d879d473ac68b01455bbbba92245af4532a3a2de33c1f9ee26606dfbb542cef72255b299bc4108e77
-DIST github.com-mholt-caddy-bd67ec99f01797931a0787b9c2de0f04fa0e5980.tar.gz 2672724 SHA256 9d81c2e79d78accc89ddc04a630b3602df5299a1621c7b83651f0607630c46c7 SHA512 a6a337da2c83392820fa11d08f3b5be126e95e5999f0eee86ff1de4726f2221d987dd0b645ffd71989ebcfd9ca65feb82924a19af2b6cc15231831fc0ea48c2f WHIRLPOOL 3496fb275cdb2c61db89c61d175466202613ad5b99cfaa4064a0a677eb49e75b55887b1ab50d6821a4a112f85dcf5be3cb4e2a7a74978805af50ce2501504559
-EBUILD coredns-010.ebuild 760 SHA256 4bc75f54b4c75fce30b176d461c4b6431f35812872274273d785581077c7aa92 SHA512 414036ec1585d5a3b2a40e799fdc0975c3a8eb973aa5ad802630bd65b01352c2608626da321ee790195f64462045c77c479c1e88ad0d91d1de6c5ad9654fbb77 WHIRLPOOL b658436f73db82353d0cd53f1b1d7b73539ac281e0f1cb8af1bdb339ae4a3a08ce2a739f9648332cfb80c65b98a94f8a15e4eff15fbe820cb3811da254ab072d
+DIST coredns-0.9.9.tar.gz 4756460 SHA256 9ca565bfbd708bd9bc66db20ec2feb3cd2a3354cf8590ba99bf2871fb847413b SHA512 340dacfbd65e964a9ab7602024c08d8ab5c04f9748b0975c2cf0000a664672415fbcce809450e54fca8ef838f15deb9258c99eddc98bf4a82e96dacd26050de6 WHIRLPOOL a5263dbe8195048919d366a1f79009f681d8dce2e1268d0609bf21147802615f1c50412787dd4b51b96946ceaf4ff99f7fd76e8bc4bce7cc46ac78436c98aa50
+DIST github.com-golang-net-c73622c77280266305273cb545f54516ced95b93.tar.gz 926104 SHA256 86d516e5c4d1cd4e440eeb68562f6aadbefcbc20ac5bc9684baaf8c65867bb63 SHA512 ce014933d3b8a30057c99bca54e9ba630e1940d1afbba3b9c7ef9d4f3e78d2ad26fa5ea9f0cbb0ada877d651b67d449e099d287b4af1d320fbf0b9d50d8d169a WHIRLPOOL f3494171800990e7906a070c472036bb119c81dfb5cf3d0f3096997f33d5f6e7cf49e7640af15ca1233384c83073a548db420f3ce54b538ab46638c142b58cae
+DIST github.com-golang-text-6eab0e8f74e86c598ec3b6fad4888e0c11482d48.tar.gz 4625238 SHA256 e26765a72f0be922157e22c9fbf6aefeb92294f67e174ccdab13d825eedd635d SHA512 98c651a37fd60e62109d0eac3fe2a21473d7f270ec7a941f4a84485d3276da84b526d406baa185360ac842348320e9f373c124f9d88675e34d8126e71a9e8de9 WHIRLPOOL 63c17d3a6cf4f00820b90d42e43e91394d7bc69d89a4e82218ef2f86487952c48b000b42e371346328390e4b7f46498c3382341cccc0787782030ed4b1bdeacf
+DIST github.com-mholt-caddy-c4dfbb9956095c92d0586a52723748c070c7b459.tar.gz 2708435 SHA256 5dbe7c8b7fb0f57fe645485f863a9a22f195758f74eeec4a2ebb8e909c616ba4 SHA512 6b51fb8bb6689ca15317a8c82d438636975698e900f251081147aab5366829e19c1e8b4710024480e169669c70550e4c802abe40c21fb1c8487025477be49516 WHIRLPOOL 7c792e3fcefc6b267d3a7c1d40230beb722fda05a7bf76bf88d35dc4f583bbe866c67f6db32199a13ee171e245bed56cd907a7b53aebc2819a2bccc54d81aa15
+DIST github.com-miekg-dns-822ae18e7187e1bbde923a37081f6c1b8e9ba68a.tar.gz 182599 SHA256 4f3678a46c75ec50877d80561954b1b89ee31da2551b9ae6b345f3dda910f01a SHA512 cdced57b5fc6093a4de6200efc5558417c13d3e7e82d10dcb58b11e7f827e82c747554e803c8b8fd4b27c086af6f25e27101ceb240d3fdef5698fe3614106b53 WHIRLPOOL 62e084575fd92cad9164291347c791d598021c8ebe4579d2748b50cec2bc2db6e287a0f05ea70ea2d3d9c4117f68d9d6d51bae7cbdfcb64013c2390e3165cdb5
+EBUILD coredns-0.9.9.ebuild 993 SHA256 f6b84f87fbeecf83ded76cc371bf131e7fe9829bbad61b875f057c41195215e5 SHA512 5e7be9091711d82e7ae5803d74983f5de3d6a7f23067e407282a54de591eedaadb5a0e56b268879edf7c34bb2f67e791302760a79b9d60bc960c35356f075fc2 WHIRLPOOL 56bab2bed5b0bb64457833e042e0dc32c9dbac2359d8becc274bb396ce9de69b84fbb4d4445b6c58d25fe2809ab1b501fe296c8d99164a0894222bf69eae30a0
 MISC metadata.xml 335 SHA256 27df438d77f1af6e17ffd325be931b769dd2b11a2d21b550ecab68d692bfda06 SHA512 f520f2f4129fb9ce453cc95527d3ccd30029fdc45411cae376c85bc02870c01b880f593b92ce35cc083e0f65bf8e7a4e0ffc57cfca7cdad84cc41fec995e88ad WHIRLPOOL 9f0550824d8775ddfb16272272f2f5ee1e87aa197891bb54840af32d6778062a1e40e570c196f661c651289137378dbac8c513ee37f49a38825e52859de99ec3
diff --git a/net-dns/coredns/coredns-0.9.9.ebuild b/net-dns/coredns/coredns-0.9.9.ebuild
new file mode 100644
index 000000000000..50bd09a25922
--- /dev/null
+++ b/net-dns/coredns/coredns-0.9.9.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=( "github.com/mholt/caddy c4dfbb9956095c92d0586a52723748c070c7b459"
+	"github.com/miekg/dns 822ae18e7187e1bbde923a37081f6c1b8e9ba68a"
+	"golang.org/x/net c73622c77280266305273cb545f54516ced95b93 github.com/golang/net"
+	"golang.org/x/text 6eab0e8f74e86c598ec3b6fad4888e0c11482d48 github.com/golang/text" )
+
+EGO_PN="github.com/${PN}/${PN}"
+
+inherit golang-build golang-vcs-snapshot
+
+EGIT_COMMIT="v${PV}"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="A DNS server that chains middleware"
+HOMEPAGE="https://github.com/coredns/coredns"
+
+SRC_URI="${ARCHIVE_URI}
+	${EGO_VENDOR_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN}
+	dobin ${PN}
+	dodoc README.md
+	popd || die
+}
diff --git a/net-dns/coredns/coredns-010.ebuild b/net-dns/coredns/coredns-010.ebuild
deleted file mode 100644
index 2e74aadba5e9..000000000000
--- a/net-dns/coredns/coredns-010.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=( "github.com/mholt/caddy bd67ec99f01797931a0787b9c2de0f04fa0e5980" )
-
-EGO_PN="github.com/${PN}/${PN}"
-
-inherit golang-build golang-vcs-snapshot
-
-EGIT_COMMIT="v${PV}"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="A DNS server that chains middleware"
-HOMEPAGE="https://github.com/coredns/coredns"
-
-SRC_URI="${ARCHIVE_URI}
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN}
-	dobin ${PN}
-	dodoc README.md
-	popd || die
-}
diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest
index faeab3b657a7..67f19560ae7e 100644
--- a/net-dns/dnsdist/Manifest
+++ b/net-dns/dnsdist/Manifest
@@ -1,7 +1,7 @@
 AUX dnsdist.conf.example 524 SHA256 86afac1134df0d054940844e294ef7b673c82646f34ab3285279f82629c6166a SHA512 385bee5725d927feb50fc0f40cd48cd365a495e39c0d947aa53dc454d84b7fe3806cd1d206056c96d111e7251db2cda27570ff8154c70bed145d37bc7d1db01d WHIRLPOOL 61d55b320e214084d8cfbd4ddb507e4b5f9197abaeed0a51c36f95df35e9a19ec0ecfea6c89e2e78c390b5671debbf7bf21365d8f4ac7dc188d873cabbccf39e
 AUX dnsdist.confd 266 SHA256 ead9dcb8204376886ed05a1df3b088088f9927f077ac14c72caf21e68d796fc4 SHA512 935afc768ae56d017f6dee8bed7a3e92615055a0d4d2ae9980afef1b8f353da0e8bd6e20b914602e50b116ad33ef17ba05535b225af8b8da9ad005694edc071f WHIRLPOOL 3a089c0af1cf95120e8ccc4de969311be26e085b92111720287866899d04be4e40bb1b5c5004b26e15b4e0a2d7187638c37e6c3cef94a44782c09629413b13a3
 AUX dnsdist.initd 1340 SHA256 59541ccd5d50469b23e0a557e872d4ead060178c205f940ebddd467766b62d1f SHA512 79b7c06adc469fed15b659aec4d674a50b64c80679c3474c87c03ae9b5b8ea63a493397822b8f4cb9e360745f38cc9f742aaa09c856618dd9f6c0f8978fa9616 WHIRLPOOL 22b6153bf8f654802dca246f70788226611997d2c84168628c34d35719da2e41b2b01e8874d84064dbba607a1442072ba9a6dc67ff2c0ebce44be968acdfdd28
-DIST dnsdist-1.1.0.tar.bz2 874837 SHA256 b4a1e8931b6d05a24494f54224211c0de0eeb1f5ff170f6b9f5665219bfeafc2 SHA512 91da716997c2440e153944f510a39dd86c9cf8ba8093a7f51a9a5d58ab0a1c230bd99ec57fe8ff0721279c8c4429ad576fe797c1fbe4cde2b9fb8f0405025320 WHIRLPOOL 6d88f4159b8155c9600af94e6e8401c426f183102a18b3f35fc066b8a19d781f5800a2aa64d306ab4ee0daadbaaab1d29b2df05c10058a9b99b9d9cf1abf071e
-EBUILD dnsdist-1.1.0-r1.ebuild 1893 SHA256 51eeaeda5ce4bfae0fa4cbc774f2fa8c8034591c591df7f2a8c59aeb37bd181c SHA512 d23ebc47ac748623a4ad57a4a30dacddc27c3425e96f55dd126f376dda5a23f92a0eb437dfc5bcd13f2f83c22ea7184ef7a1b744304310789ea05a02267b0ea7 WHIRLPOOL b34302a37dc967bccb4bdbe1646b326184b1bc45ac423f6a67f36f7d2884da2d87151185380c69a3faea3660852fe6a6b0c0178caaae6028274bc66df05bbd6d
+DIST dnsdist-1.2.0.tar.bz2 876104 SHA256 9885c9ee8ac7076aede586ea58d4642eb877e7b2d76c902254494e2a5a5faa78 SHA512 93f8c5f18462d3291c973a690f6ac2b3c5791d9947bee83d9250b503b7526de365bdcb530f3b082e51ae168a9129e77d5558af7cc3b9d2e98a585af53783c237 WHIRLPOOL bec3f7a5174dc7dec71724bb274b3cd02261b666c853bee3a8cce7695fb082cdd09bf28545b7c54355c5d3e15bea33c49ff2f7c0821324e46435efc2ecaba615
+EBUILD dnsdist-1.2.0.ebuild 1963 SHA256 fd6a88d5ccfde44f596e76ae289508bd489a81f8845d7826d0fd5e5cc148a545 SHA512 578263147111bb441842fe31fcd58b1cc92af228e8c86040bc28390a862dd3f083f4781dbcf8117b141f146ed36c0bc5f0bbf884270fc5116c436310c68cf006 WHIRLPOOL 7720a25cb0fcf5ff36d9bce8f212b6b7a75a44792f6bc69d83e9c1004b29be08f9451a7035f0e49a41ad1123ec9fd148e9a8d202af732e6799d40bd2908857dd
 EBUILD dnsdist-9999.ebuild 1963 SHA256 fd6a88d5ccfde44f596e76ae289508bd489a81f8845d7826d0fd5e5cc148a545 SHA512 578263147111bb441842fe31fcd58b1cc92af228e8c86040bc28390a862dd3f083f4781dbcf8117b141f146ed36c0bc5f0bbf884270fc5116c436310c68cf006 WHIRLPOOL 7720a25cb0fcf5ff36d9bce8f212b6b7a75a44792f6bc69d83e9c1004b29be08f9451a7035f0e49a41ad1123ec9fd148e9a8d202af732e6799d40bd2908857dd
 MISC metadata.xml 1138 SHA256 fb371d32f95840b9ef13fda151caba34e984ca14efd936637958ea6308e3a705 SHA512 28e685c390be1061fe1202174abc467223b7f0589648fcdbe3d6cbb93ead037501b33b4244687e66d431fc1d642d45e61be348ffed3086afd497516dd02d0e79 WHIRLPOOL 1d634e708d94420a2acadc2d2948c8e53e20d9bac9b3397afe245c9d0f16b5d994b6fff43a453a4abd448e923ab1db9081f6aa4f0498d72466084077b749a145
diff --git a/net-dns/dnsdist/dnsdist-1.1.0-r1.ebuild b/net-dns/dnsdist/dnsdist-1.1.0-r1.ebuild
deleted file mode 100644
index 765c8a196631..000000000000
--- a/net-dns/dnsdist/dnsdist-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://github.com/PowerDNS/pdns.git"
-
-if [[ ${PV} = 9999 ]]; then
-	ADDITIONAL_ECLASSES="autotools git-r3"
-fi
-
-inherit eutils flag-o-matic user ${ADDITIONAL_ECLASSES}
-
-DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
-HOMEPAGE="http://dnsdist.org"
-
-if [[ ${PV} == 9999 ]]; then
-	SRC_URI=""
-	S="${WORKDIR}/${P}/pdns/dnsdistdist"
-else
-	SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dnscrypt luajit regex remote-logging +ssl test"
-REQUIRED_USE="dnscrypt? ( ssl )"
-
-DEPEND="
-	>=dev-libs/boost-1.35:=
-	dev-libs/libedit:=
-	luajit? ( dev-lang/luajit:= )
-	!luajit? ( >=dev-lang/lua-5.1:= )
-	remote-logging? ( dev-libs/protobuf:= )
-	regex? ( dev-libs/re2:= )
-	ssl? ( dev-libs/libsodium:= )
-"
-
-RDEPEND="${DEPEND}"
-
-[[ ${PV} == 9999 ]] && DEPEND+="
-	app-text/pandoc
-	dev-util/ragel
-"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/dnsdist \
-		$(use_enable ssl libsodium) \
-		$(use_with remote-logging protobuf) \
-		$(use_enable regex re2) \
-		$(use_enable dnscrypt) \
-		$(use_with luajit) \
-		$(use_enable test unit-tests)
-}
-
-src_install() {
-	default
-
-	insinto /etc/dnsdist
-	doins "${FILESDIR}"/dnsdist.conf.example
-
-	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
-	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
-}
-
-pkg_preinst() {
-	enewgroup dnsdist
-	enewuser dnsdist -1 -1 -1 dnsdist
-}
-
-pkg_postinst() {
-	elog "dnsdist provides multiple instances support. You can create more instances"
-	elog "by symlinking the dnsdist init script to another name."
-	elog
-	elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the"
-	elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default."
-}
diff --git a/net-dns/dnsdist/dnsdist-1.2.0.ebuild b/net-dns/dnsdist/dnsdist-1.2.0.ebuild
new file mode 100644
index 000000000000..75b3d1113da0
--- /dev/null
+++ b/net-dns/dnsdist/dnsdist-1.2.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://github.com/PowerDNS/pdns.git"
+
+if [[ ${PV} = 9999 ]]; then
+	ADDITIONAL_ECLASSES="autotools git-r3"
+fi
+
+inherit eutils flag-o-matic user ${ADDITIONAL_ECLASSES}
+
+DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
+HOMEPAGE="http://dnsdist.org"
+
+if [[ ${PV} == 9999 ]]; then
+	SRC_URI=""
+	S="${WORKDIR}/${P}/pdns/dnsdistdist"
+else
+	SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dnscrypt luajit regex remote-logging snmp +ssl test"
+REQUIRED_USE="dnscrypt? ( ssl )"
+
+DEPEND="
+	>=dev-libs/boost-1.35:=
+	dev-libs/libedit:=
+	luajit? ( dev-lang/luajit:= )
+	!luajit? ( >=dev-lang/lua-5.1:= )
+	remote-logging? ( dev-libs/protobuf:= )
+	regex? ( dev-libs/re2:= )
+	snmp? ( net-analyzer/net-snmp:= )
+	ssl? ( dev-libs/libsodium:= )
+"
+
+RDEPEND="${DEPEND}"
+
+[[ ${PV} == 9999 ]] && DEPEND+="
+	app-text/pandoc
+	dev-util/ragel
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/dnsdist \
+		$(use_enable ssl libsodium) \
+		$(use_with remote-logging protobuf) \
+		$(use_enable regex re2) \
+		$(use_enable dnscrypt) \
+		$(use_with luajit) \
+		$(use_enable test unit-tests) \
+		$(use_with snmp net-snmp)
+}
+
+src_install() {
+	default
+
+	insinto /etc/dnsdist
+	doins "${FILESDIR}"/dnsdist.conf.example
+
+	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
+	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
+}
+
+pkg_preinst() {
+	enewgroup dnsdist
+	enewuser dnsdist -1 -1 -1 dnsdist
+}
+
+pkg_postinst() {
+	elog "dnsdist provides multiple instances support. You can create more instances"
+	elog "by symlinking the dnsdist init script to another name."
+	elog
+	elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the"
+	elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default."
+}
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index d9e9c80f042c..87949316105f 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -11,7 +11,7 @@ EBUILD dnsmasq-2.76-r1.ebuild 4434 SHA256 dbce5a41e168eadcb76288763c1c92d4eb063a
 EBUILD dnsmasq-2.76.ebuild 4313 SHA256 de5cea480d2b30ca4fe36b2701efe91188162f9befbd4d8ea1d0303044fbfc79 SHA512 dbe879468b566b1b12f069b7bae4a9abdab7cdd3677fb4aad0c514ab1b2510a5e17910527b107a137454e6008e0717731f7159a8e91736554ff456bb88c70206 WHIRLPOOL 18173c1b9601f466d5b821bc04880b7549d6c67e80da7e47929a8b8df0dc8f87ab2f2518475b9cdc6cd0d9a7ae38770f8e86b7c1e93fdfaf3eddcf51154962e5
 EBUILD dnsmasq-2.77-r1.ebuild 4586 SHA256 63ea93e59a737c9e4c7a3dd7f3b00bb85484070cbb504f7a85c493f6ab7dfb24 SHA512 f4510d0648c3827231b3eb77e8fb151ab6f770c59d15fbf72134509c7d6292af3d43149b81b00a5353a9d69e356abe401e29982f1e0eb141984c2095188eeca7 WHIRLPOOL 0107a6df9b6aa7f95ebcdbf335e075bddeeda3020dec93a0fa05d2bd1d734430883469b1de05d3eb67d7e500ff6e5b6714b7d00dfca1bebfb435d0bb6b1b65ec
 EBUILD dnsmasq-2.77.ebuild 4554 SHA256 4c11d59e86b721755954e553d22b3d3eb81a8fc35e3ecb6a32b4329589a5416a SHA512 0b470711d65db27c994309dd72c213127b1ae87e506fa0ada259152315a06724f2df786c14903bc6b63a50b01948106e68aebc93a5b81a1a3baab353fe37627a WHIRLPOOL 7112ff2c81f411146b9893b192ff7a84e751bd2a54a2be7cddd8f1703b6d0181bd759eafb3b81978af3ab2b52fd0b36750213eb98ef1e326b2f1ab3ea688f7fb
-EBUILD dnsmasq-2.78.ebuild 4579 SHA256 d66711de345246c106773c9fea0a7a4ea1c630fef09c1c11a9252e627940d720 SHA512 de1f31256b5b3c26e05c7ea8b74426944143e3a272b7abb72b0f1f116a6ff25de7e988624b14ba07114e7b741be41c1df890e6e30d8810d8e7fe19d8bf1e96f8 WHIRLPOOL 74f1132f9e8b409023e0c6f330013cf566906d5c350099c3a2ff1bae86da24ef8ab3a16b5fea587f2e96499addbeb858c7777d5d39e10150fb55d70874575490
+EBUILD dnsmasq-2.78.ebuild 4578 SHA256 a5152d7939633c55017fead1674b47dad14ce379baa343e9c70b2ea1a20086eb SHA512 1e7d4223da18289c4c134cdc1a3dde5a69daa620e5c9c563f7e9491522abc0164611fcf9f4975386057286f6bed4e8fb8eeda21fa6e7411deb7f04a0ad5568b5 WHIRLPOOL cf7468cdf134ebedfab71fcf61044f938a2b6a5cfd0617bd789ed984783b3238d153a27100fb3cf20c730fc18c169efb4cfb3bc73b3c5fe8b95accbb97262eeb
 MISC ChangeLog 8738 SHA256 241379ae12e786c5cfa51e58455858bab861389383f4577036615c2d59858758 SHA512 c91759c34187dac57d8fe266204a0538d7daf465c9cb4377037474e2ff33071d7018ecc1e008f62ad36df5363abdeb4fa998e0111df4f844fa7675b48d01e4b8 WHIRLPOOL 789019f9c260e216c5f81606c2df3a9e6a39c8953a63a0ceac032ae85b36dff1fa2eecfb527b3683b8e1a60c93efb3dcf5f5441cde5ea5127b096c1f28061af8
 MISC ChangeLog-2015 38329 SHA256 cd8d8df7e7c362a1f284d2ef412c4d9352a472427f25a4ac677b8e3f6a7bfae0 SHA512 80d2755dc22f94c4b35ae57522bab311541c328c703f897dd2427a158d5faccb3d2f55b222129a300f2dbdb53fe899d0d18ae6fd599639f201311ff05028a056 WHIRLPOOL 629bc81f6d6413e1a581cd65a984fadf7f0002ad7cc9862490fdf8d9c4786ce2e71b9b60a8dc0677ad9d483027eac97ac28a7a86483fd870fbae7ee4ea019ee8
 MISC metadata.xml 1149 SHA256 18b445c1b193937f84d229879321ab7c36199a82a4bcb100e087929f73d5f850 SHA512 7fad0bb400a664a67e82173015dcc2fc95644dd6c357e787b8257a193dc14adbee8f5a04cb4422fadefdeec0d3dc5bd986f4f5b44ee420b8a104cb5a8e1b58a6 WHIRLPOOL 8648a3e6f7424dd49e6d483da4559b3be08de89e730466f1515857505e8f5bf4a70347dff2531f900762fabf9480f1165437e970c4ccfcd0ac7af1a3d76cbd2b
diff --git a/net-dns/dnsmasq/dnsmasq-2.78.ebuild b/net-dns/dnsmasq/dnsmasq-2.78.ebuild
index 463bdb3d94d9..f01b5ac6f7b2 100644
--- a/net-dns/dnsmasq/dnsmasq-2.78.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.78.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 
 IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +id idn libidn2 +inotify"
 IUSE+=" ipv6 lua nls script selinux static tftp"
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index 908b2c47f27b..417a98539bdc 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -1,7 +1,7 @@
 AUX 50libidn-gentoo.el 455 SHA256 b8b5a7df3ef312b47ef44d7b5c9180e06e9d8b9cbe43fa67b8511296381ff937 SHA512 13bcc7078ae8e088014323707d451c0bfdb53414e550945248a9648afa81681db013cb523eae71116c84f1dcfbb3b87e8743971775b75c4ce6dad914b3b0a501 WHIRLPOOL e2925be57973d4f2d9adebaa63bc9a2d63daa0c4ac571790fd564fe4b7a4d5d8db62a0e342a5043b28e2c506bb62f86e9f967e5a680dd50261fa1dfb4214b260
 AUX libidn-1.33-CVE-2017-14062.patch 938 SHA256 c640ebe93568bd2dc2cae2151fa91fb8f4d8190bf2bb3b353a638282ab44cef1 SHA512 a78a57fe5583cb02239fbff11d33b1ee1f84b91817c5376ed441173be5fa47337019b0b098a5134c19f1f62ab5efac0621dd8fc922ec09de21481b9905638f20 WHIRLPOOL e2c0dc34aee544d0a9a35c8afb7f79ed6f6bb5d81b5223b3cd85ee768a82e44eaee1c263137e853551fc059c60b89d479db3d3c73f5be3173701a3a4133cda06
 DIST libidn-1.33.tar.gz 3501056 SHA256 44a7aab635bb721ceef6beecc4d49dfd19478325e1b47f3196f7d2acc4930e19 SHA512 38dd459eaeda0c9e3cc2d24d967113515a499747550a2a9157f32357def90d71a3a3b52398e96a44a28cd5948dc353b0473c4ff0453a69720191c4cb49cac2c6 WHIRLPOOL 3b0c44742c2515e09eaf8f16f32f30bc37478a6273765d71dd9a9283f501998b6d85583cd38810bbdbd6103855e77831360010d707d29956798e3f5d066b0e82
-EBUILD libidn-1.33-r1.ebuild 2987 SHA256 ea1c98a125f8b4da366ef87d0ec7280e9d0975ee37729390e1714e3940883f63 SHA512 f7441293fcd2257fb2015c13e3f7d87f682a85f30cbb9d3cf296b5365b8fb6a1335cc4676be78a1756bfd05250c92af5a693fd80fb6e00687d23aa6e0b04e12d WHIRLPOOL 156dca4164b31c0aed9a6c639e53519c2afd2b56b2df33e561edac17f0b3eebc0a569bef637f8fd7f402fd371b2a520265b1ecee390f97e0a8f34e7a0ce2ebb0
+EBUILD libidn-1.33-r1.ebuild 2986 SHA256 a7b4a57732f6093fe2e2cb76bf05c4922a07b128b278094c420c0cc72bc14d79 SHA512 8a14ce68b976bb01120323cc4cefcd4eace4aa31796d0b08219fa1b162504d34655a8f2c9e43ac6e9c87d42fd6137d4a0c44280f1a64c2ad0770be7718dcee9b WHIRLPOOL caf520d2b0c86c59d89a7713b371d6c0c49fabe5989fb9dfaef885d3c0d6d56c70d870839dbc3de3f2be6c3446d8e22f110da25ea7f656c0f7e10756726d9e86
 EBUILD libidn-1.33.ebuild 2805 SHA256 6d70b0dda51adcedbe3fc41db8f9d998f7129935f1d8617c95c768164a6d1299 SHA512 863f325f2ed868a6b78d542fe584538d67ff6bbe99b1e181416b43c919cfdfc417bd92dc424657d0a632c838735826be7bbfdc82632e04cdeaf5e3bbd4351a15 WHIRLPOOL 20ec2d3960b38bbfc1d80e022855cb812c8e77d3fcc884fac4ecf34fbe44f3b4ee66c4f47797a822637512ad863931f6ddb6d80d6fbaea87f1c4862cc38435b6
 MISC ChangeLog 4866 SHA256 fafa50fd65a41bccaae966e981e3bfc745e1ff956ed3d66a8933933d87267fb1 SHA512 df837de9cd1ac3b0fd364801c147aac996ad42600bb449c85f41a500b535e2db290d17758efd670617567428a3f74b2c5692979580230a6b7f2cf6daacbf2d69 WHIRLPOOL b1d2f31a691277979c3586b9730e3c3c058870a7673fb42ab1585ef09d2dceb79a4adfbf0d597b33a28807f2b4fd84e0d0944dc6eae62c0100ac6489bc5589b9
 MISC ChangeLog-2015 26908 SHA256 f0e4fdf08e48c0b4d012acf9dad9d0555636c3c6a3db591f13632e4260eae940 SHA512 3b29c0708d0a48cfde5d018ae81977eb1f72bfaa45b9035273900975488d98a60989b5ad72c3062a5a1cc4cdc4d35cc0e0e37b093e070c480ab5b122d41dd9b1 WHIRLPOOL 2668887482e4a71b6e42032b35123735aa887cadb539ff1a1ef28b137845df3057cf2b085950595d40815ff4bfd15e748dfb44137636905c9526692597f2c74b
diff --git a/net-dns/libidn/libidn-1.33-r1.ebuild b/net-dns/libidn/libidn-1.33-r1.ebuild
index 75a16b3d74c5..5c43b09c6b7b 100644
--- a/net-dns/libidn/libidn-1.33-r1.ebuild
+++ b/net-dns/libidn/libidn-1.33-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~sparc-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 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs java mono nls static-libs"
 
 DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index 1ba2b497f70f..73cb101fa4d8 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -1,14 +1,5 @@
-AUX libidn2-0.12-Werror.patch 271 SHA256 5347ec484401e39bb2a78a77398589fb30dd7de6c85d5b1cf705309533f03002 SHA512 089cd5d7b0d8d6103559c7706863306acf5beffbbd914a242cd36448c0bead07359ff011a14c1c70a507647f64b3dd79d8ef9ee94d758b927a6d240f074448cf WHIRLPOOL 43641903b6b4c55c652ef16bd0763c00ce1abd7bf43af7e9cd391522bb4156603340eeaad1bfe6b88e7f88d0ff4a90cccc191241622f1bd55a87714a14183d97
-AUX libidn2-0.12-examples.patch 241 SHA256 939a52b77f03c284c8f8b9e66df7af330d9c27d679a69d087bba8b57af0fe9a6 SHA512 5c3c391d207520a2ad5e43374f834fb186c4f545ec49769809fcb57e19355d5e892f9027d2e3ea196a4f95bcf04c734979233bfa5719f71c17b255e8784ae2e0 WHIRLPOOL 16265ed84920ad63471dc75241a81181f20735c09da8e603e2656478747299953262566466c61efea5641d85af879a5a1b5308d0669081982aeb9c658fb8801e
-AUX libidn2-0.16-cross.patch 966 SHA256 02e10090f97c537fd21d10cc936b7f40898f2fd656310405da3f238317f6f13d SHA512 742effd6f2b6ba068c103c3944152a5976b50d51f69252e4770267b4d1ba23772563e9307dc004b06a4c9080b53f85f1c6feb0f0a175f8baae17e60cfcbfb803 WHIRLPOOL c7a1bf8342bf0ce556d718b47c3f3712a33a87f787c84172072d033a2f428df10ce0b0c080e6f47db804243ec5d25cd45c4eb5a08e29af73bcff765962ca8d07
-AUX libidn2-0.16-gengetopt.patch 335 SHA256 0a0ffd51e4e1106ac768332f2391de4fc42e740fd7a42cdca4a1a1d2c805143a SHA512 88573e1b2ae1b084f6b79323228d706dc421efee423c27b516a983173d3814d297f5b7a86577c3a07930bacbc7d4e1c0118f1b758ad81363df352d21d38aaf0e WHIRLPOOL afd3028cc1f2fc749ab6e0b5269a1f6c948dd0476b3f3bed907e861f503ea6ce64a9d474b99acd0b06081a438de003dcc1cae93f22de42362b4ac4fa1238de68
-AUX libidn2-pkgconfig.diff 979 SHA256 971f4e9b3fdc30cde2ff8c761fe908cc26d1417b5a8b0cfbbf9324a513e3b59e SHA512 2d75029e2a3d259b716b7dc3428570028a25b9488aabad01c4a593445c012b801905df581b7ab60fc076a32355aed73b2ddc0f32c3f2d13eba97bf502a334b5c WHIRLPOOL 1d3f1333fefb977a321b5202ccc48666b2dbf2b6ebdc99c208f7c5c0358a05620278039fe50df0c986ef57dc363a97b89b133056f8611363167ee5f51a0b1c30
-DIST libidn2-0.16.tar.gz 1494295 SHA256 2fad9efff4082ae2143f69df76339ca99379e0e0f4231455f5d3d9d2089c688f SHA512 85f41c79bd2b88f2724383461a78e56b47e52e66e3f088d631a922438742938721d26aeebef17f6ca4fd028d95dfb5b0fa298a96982ef777c07fefe5244d1e73 WHIRLPOOL be10d0e2994e4fa0e31d710b358c7375e9454b4291bd4603a683a6ddb737241442007f04893395b36d7ef636614b6982354840bb07570e2a6b8f6aa2d888996a
-DIST libidn2-2.0.2.tar.gz 1925342 SHA256 8cd62828b2ab0171e0f35a302f3ad60c3a3fffb45733318b3a8205f9d187eeab SHA512 c8fd1114fc8df2030abf7c1044da4022989a1cd7ecd92309f62ad0b51b1fcf40418dccd2e397a8335c5e99998130f25339dcb576b4bc88888e3ef0df89714dad WHIRLPOOL fc60b6b8da20b60c851001788541ede0b7ce64ea9701a229b7312b748b02cf99f70d14070ffd64967f6b970f1ce43589956bad693d13f8b51ddde27515fd47c1
 DIST libidn2-2.0.4.tar.gz 2008524 SHA256 644b6b03b285fb0ace02d241d59483d98bc462729d8bb3608d5cad5532f3d2f0 SHA512 1e51bd4b8f8907531576291f1c2a8865d17429b4105418b4c98754eb982cd1cbb3adbeab4ec0c1c561d2dba11d876c7c09e5dc5b315c55a2c24986d7a2a3b4d2 WHIRLPOOL 0caf45267c06bd6d78fc80673a90f718686a98408b2bd668e415b0ee8a5639199091320f9877a25c89de324219e96cd72b7c7d2e4fa52fa7322604b82aede3ce
-EBUILD libidn2-0.16-r1.ebuild 1245 SHA256 0149630898a3379290f58ca48229c00ac63f1345e41632a73a86b81dc8e67f51 SHA512 ccd3857fe7b69afb6e5a214f4c32a638558af0ee8d5d63f16d0e3ef7a5ce0a5c7b12f2e920203e2aee1dfd747ca83700ff291aeaf0c0d8427d7a114944e5a873 WHIRLPOOL 2795ee6c77820bbbb2d892bf7409f5ab6e39138ff8aa0a1c6b8e55e7f1403ebecb67a6cf82e90642e97f8ebb072a418dfa4097f3a58c05280749de8f22fb6321
-EBUILD libidn2-2.0.2.ebuild 1215 SHA256 e26f15e66939fcccb1ff14d392e5d8e58b541edd8fb951d6d3728a056ad572cd SHA512 405982e2c61c980bf2f14fd31255abca41590ef60b1010651846d1d1a8ef64bc282e94b2dd4b460c5ae1912610e0ac69417fa0fa19018e8c30424d153b1f52f4 WHIRLPOOL b87ff2d1d4d131652228fd8c3c9df4b58ab1607218fc083e95835d5da533257795a0c7d714d7fb1b6594f1646b2a8d8f80837f2a6f29ae7eb39ce10531673f70
-EBUILD libidn2-2.0.4.ebuild 1230 SHA256 39ab46e5d9d46bf5118a4573df1b7556be6146efcbb642b4b208eea3cb7bc09a SHA512 a3015fc0d0f51a91d2e646e18358ce91942b0c03338c38f3cb562ee49fa10e1eb9a43eb0bcbcdf2164ad5912d788039ed85ac23f8620b93b57183809df387099 WHIRLPOOL 2445e13b07ff42a11b6776c598f356b5987463385325b8bbcd2e964001500b4783be023300a6b6e76fc5425a9d6437e3d43a2f2c8b1bb29482998ccded17dc8d
+EBUILD libidn2-2.0.4.ebuild 1229 SHA256 3d0c9638fc91d223f19d50aec5d0dafe0263dfba58bd91fdefef54261583a0e7 SHA512 c1f7d5073bb16b0488dc90a212e36b05abaf5685f2b4e0b7ce6c228626e247559766e81d71adb1362e00db7c4b77ca124bda30cbb0c6d33bf8f09c47018dc281 WHIRLPOOL e9aa29d8317884df0b6417252d0f8443eeaf9c4e50fb74a8e4020a11c98453ca4737256a3329eb7e1e5d41e81f3f2de368c6cc4199414950da68c347a754edbd
 MISC ChangeLog 3828 SHA256 aefe244e873ffa922bd5fe4ec1e5e04c0a9e53b4b800ba7d45c852e42c59a174 SHA512 86f81bda7e03947c297ae9e43a099aefdc6998a8167cda8a1528cc331b7de0375269606e1c5ce0b78a4f24099916d2e484337919043b6a1562ebcdab58aba454 WHIRLPOOL 6875b1f712a7dd8e351d47711a458104cc915acd3bc0e0c7e3b1322c2844f8a5403aecfa106cf50e33be416b3d126449af713dc29bf45918f6bcca6a47e5b30b
 MISC ChangeLog-2015 523 SHA256 c7b427322922dc669c3a7181888c9db6e86e5e5dadb447c224a6a6fc9ae5e838 SHA512 383ea04d0912da873aa4c53f2750274e44cc964968da2c7766c34f50d7f6294443856900ac962c642d84976e0135ff43dad3d51b9655aac1bb0d56f209af52ff WHIRLPOOL f0e45be2ab24678fef9bdba1634e27841d3cc841e3c76ed6db9189735a4d44c51680d8877ee1b8c4421030d0f53ebab6fc262749f46c3609229294c33e23de81
 MISC metadata.xml 210 SHA256 59333e331c55cfd39ab5a54817053590464e735d79003424078790bad0f03885 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54 WHIRLPOOL 4720a4dc9840fd244dc5c4ce9695cdb0007a36c7b0262d4db8a8b0fec37fc718fd0c33f87c9ca0cfd5f5f09b6fe42f1cf93103a85de3f2c3d5dce10a82ef082d
diff --git a/net-dns/libidn2/files/libidn2-0.12-Werror.patch b/net-dns/libidn2/files/libidn2-0.12-Werror.patch
deleted file mode 100644
index 9ab14656f9e8..000000000000
--- a/net-dns/libidn2/files/libidn2-0.12-Werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -27,7 +27,7 @@
- AC_CONFIG_AUX_DIR([build-aux])
- AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_MACRO_DIR([m4])
--AM_INIT_AUTOMAKE([-Wall -Werror subdir-objects])
-+AM_INIT_AUTOMAKE([-Wall subdir-objects])
- AC_CANONICAL_HOST
- 
- AC_PROG_CC
diff --git a/net-dns/libidn2/files/libidn2-0.12-examples.patch b/net-dns/libidn2/files/libidn2-0.12-examples.patch
deleted file mode 100644
index 4972fece578d..000000000000
--- a/net-dns/libidn2/files/libidn2-0.12-examples.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -15,7 +15,7 @@
- 
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
- 
--SUBDIRS = lib . src doc examples tests po
-+SUBDIRS = lib . src doc tests po
- ACLOCAL_AMFLAGS = -I m4
- EXTRA_DIST = m4/gnulib-cache.m4
- 
diff --git a/net-dns/libidn2/files/libidn2-0.16-cross.patch b/net-dns/libidn2/files/libidn2-0.16-cross.patch
deleted file mode 100644
index bf963e9f4673..000000000000
--- a/net-dns/libidn2/files/libidn2-0.16-cross.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://gitlab.com/jas/libidn2/issues/6
-
-the release ships with this source file, so don't regen it on every build.
-doing so breaks cross-compilation currently.
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -66,7 +66,8 @@
- noinst_PROGRAMS = gentr46map
- gentr46map_LDADD = $(LTLIBUNISTRING)
- 
--tr46map_data.c: gentr46map.c gentr46map$(EXEEXT) $(TR46MAP) $(NFCQC)
-+tr46map_data.c: $(srcdir)/gentr46map.c $(TR46MAP) $(NFCQC)
-+	$(MAKE) gentr46map$(EXEEXT)
- 	$(builddir)/gentr46map$(EXEEXT) > $@.new
- 	mv $@.new $@
- 
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -34,7 +34,7 @@
- dist_man_MANS = idn2.1 $(gdoc_MANS)
- CLEANFILES = $(dist_man_MANS) lookup.c register.c stamp-vti version.texi $(srcdir)/libidn2.info
- 
--idn2.1: $(top_srcdir)/src/idn2.c $(top_srcdir)/src/idn2.ggo $(top_srcdir)/configure.ac
-+idn2.1: $(top_srcdir)/src/idn2.c $(top_srcdir)/src/idn2.ggo
- 	$(HELP2MAN) \
- 		--name="Libidn2 Internationalized Domain Names (IDNA2008/TR46) conversion" \
- 		--output=$@ \
diff --git a/net-dns/libidn2/files/libidn2-0.16-gengetopt.patch b/net-dns/libidn2/files/libidn2-0.16-gengetopt.patch
deleted file mode 100644
index 80b10de1b80f..000000000000
--- a/net-dns/libidn2/files/libidn2-0.16-gengetopt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -30,7 +30,7 @@
- libidn2_cmd_la_LIBADD = ../lib/libgnu.la
- libidn2_cmd_la_CFLAGS =
- 
--idn2_cmd.c idn2_cmd.h: idn2.ggo Makefile.am
-+idn2_cmd.c idn2_cmd.h: idn2.ggo
- 	gengetopt --unamed-opts --no-handle-version --no-handle-help \
- 		--set-package="idn2" \
- 		--input $^ --file-name idn2_cmd
diff --git a/net-dns/libidn2/files/libidn2-pkgconfig.diff b/net-dns/libidn2/files/libidn2-pkgconfig.diff
deleted file mode 100644
index a5406bd862a1..000000000000
--- a/net-dns/libidn2/files/libidn2-pkgconfig.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-https://bugs.gentoo.org/609188
-
-diff --git a/Makefile.am b/Makefile.am
-index f851231..438b4ce 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -113,3 +113,6 @@ check-coverage:
- 
- clean-local:
- 	rm -rf */*.gc?? */*/*.gc?? $(LCOV_INFO) lcov
-+
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = libidn2.pc
-diff --git a/configure.ac b/configure.ac
-index bfaff9a..6087f20 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -86,6 +86,7 @@ AC_CONFIG_FILES([
-   examples/Makefile
-   idn2.h
-   lib/Makefile
-+  libidn2.pc
-   po/Makefile.in
-   src/Makefile
-   tests/Makefile
-diff --git a/libidn2.pc.in b/libidn2.pc.in
-new file mode 100644
-index 0000000..0dade23
---- /dev/null
-+++ b/libidn2.pc.in
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+includedir=@includedir@
-+libdir=@libdir@
-+
-+Name: libidn2
-+Description: Library implementing IDNA2008 and TR46
-+Version: @PACKAGE_VERSION@
-+Cflags: -I${includedir}
-+Libs: -L${libdir} -lidn2
-+Libs.private: @LTLIBICONV@ @LTLIBUNISTRING@
diff --git a/net-dns/libidn2/libidn2-0.16-r1.ebuild b/net-dns/libidn2/libidn2-0.16-r1.ebuild
deleted file mode 100644
index 44f0043788a3..000000000000
--- a/net-dns/libidn2/libidn2-0.16-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils multilib-minimal
-
-DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)"
-HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/jas/libidn2"
-SRC_URI="
-	mirror://gnu-alpha/libidn/${P}.tar.gz
-"
-
-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-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND="
-	dev-libs/libunistring[${MULTILIB_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	dev-lang/perl
-	sys-apps/help2man
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.12-Werror.patch
-	"${FILESDIR}"/${PN}-0.12-examples.patch
-	"${FILESDIR}"/${PN}-0.16-gengetopt.patch
-	"${FILESDIR}"/${PN}-0.16-cross.patch
-	"${FILESDIR}"/${PN}-pkgconfig.diff
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--disable-gtk-doc
-}
-
-multilib_src_install() {
-	default
-
-	prune_libtool_files
-}
diff --git a/net-dns/libidn2/libidn2-2.0.2.ebuild b/net-dns/libidn2/libidn2-2.0.2.ebuild
deleted file mode 100644
index d2719918e52a..000000000000
--- a/net-dns/libidn2/libidn2-2.0.2.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
-inherit eutils flag-o-matic multilib-minimal
-
-DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)"
-HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/jas/libidn2"
-SRC_URI="
-	mirror://gnu/libidn/${P}.tar.gz
-"
-
-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-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND="
-	dev-libs/libunistring[${MULTILIB_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	dev-lang/perl
-	sys-apps/help2man
-"
-
-src_prepare() {
-	default
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# Darwin ar chokes when TMPDIR doesn't exist (as done for some
-		# reason in the Makefile)
-		sed -i -e '/^TMPDIR = /d' Makefile.in || die
-		export TMPDIR="${T}"
-	fi
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--disable-gtk-doc
-}
-
-multilib_src_install() {
-	default
-
-	prune_libtool_files
-}
diff --git a/net-dns/libidn2/libidn2-2.0.4.ebuild b/net-dns/libidn2/libidn2-2.0.4.ebuild
index 7b568184d25d..c647d4fc56a3 100644
--- a/net-dns/libidn2/libidn2-2.0.4.ebuild
+++ b/net-dns/libidn2/libidn2-2.0.4.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-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-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/openresolv/Manifest b/net-dns/openresolv/Manifest
index 0d869f44991e..de8c5dad7993 100644
--- a/net-dns/openresolv/Manifest
+++ b/net-dns/openresolv/Manifest
@@ -2,7 +2,7 @@ AUX 3.8.1-restore-newline.patch 508 SHA256 1e0f94ee4e3972b9e6287078a02acd4090ba4
 DIST openresolv-3.8.1.tar.xz 18396 SHA256 d259d78fd92ac288f1b27959daee11be9a40d70e91af5432046164c260de1d43 SHA512 390bf30bb85b071839104e5c7e276b402f6f485edc038e38da389730d82e614bb11b0dde44a55aa2ca5e790b374671a9c89cc07b053633401a608150eebbf2c8 WHIRLPOOL 34f1c545053c444d950c3a3f9c0775e377c70a2b45af561cec94f96cd171237e2e2de1cd5a45c39c4e996f87aa206b986740557aaf0104f9af9f3c66f1d1a0c1
 DIST openresolv-3.9.0.tar.xz 18844 SHA256 51a04d39232bb797c9efeaad51a525cf50a1deefcb19a1ea5dd3475118634db8 SHA512 4498db60f0b5a762194dd3651b94cc8b01a349a8cfb891e10d040cd6b8e22fa0e9897909517831591787ad22ffad97c78d3281e32296aa1ee67de5dff9bf765e WHIRLPOOL 2f912211c787517baee2e3b5f5b8036fe3a2c78d62f2366c22e256f2e236fd8a748a3816b8f2c09ba3846377a21c1ddca65a9dc96af37104682e7cbcf6aa52ff
 EBUILD openresolv-3.8.1.ebuild 1138 SHA256 0601f2bf85b5db01904eeb364c83faa8bc2dc8528183f18498d5893bfbf8ba7f SHA512 e372fd7ddbf638112830b475e0f37393d7f3b7834622296adce85ccfdd636073c803810ffd426fbd014cde789ee5572c38f066be3a4f33b1a31eb5967b1ad0e2 WHIRLPOOL 3061c23edc3af8fdfa930b8e089e6af66c2089dabece70639d87060163e1422200eb172525e4d7033a4a50db0a6958134c7393b9633122133442fce7d106f092
-EBUILD openresolv-3.9.0.ebuild 1093 SHA256 8ccb4f269638b81d572e85f9daf756f6bf91e7b140d172ea8022ef9f9e78de48 SHA512 039430b1e5f16dc987b1fce1a4c0d9a96a1f99eea7be0f0e287db65d2951604f0ac4795591307e85624477e615d55e4ed48ccdd367b24176e4a2f2f763eeb086 WHIRLPOOL 4dcd95ef1c2bdc2dde1f86ffccb80a81208338765e630ba1b8e48acf7281a76766ca2763df622ba56053c2bedff54cf54291d799129f7b56b6d8763f5b3bac19
+EBUILD openresolv-3.9.0.ebuild 1092 SHA256 484778e2945d335a49dba4cb097f0511a89831c21034e926ef3fe9766d295a4c SHA512 34119152a7e56664868c95ccf696c2265ac67e55c332ed6dd07028b7c0061c2eaf140b0aca843f4c3bd49f311ee29e1aaa972662ee073ad6d8fad225c614ccca WHIRLPOOL 7108460d2385809c2fc210d31236cada7adc1de4ce4320a8291f155a55a804c35711f3c356ed3931c7aaa14e74cde9a0cfa0352d5f821bbfbcd430adf38fbae7
 MISC ChangeLog 3012 SHA256 a0c2d27c372a9617529b8988652e886579564052453f637680eae493aa9cc190 SHA512 e162ae4dff285debcba56708a06e198a79850fc940b35c34a4578d9314555812b99887fadba1df72c9439144834a7f9f574b90166f5bfe03e68a5750f3edc77d WHIRLPOOL 1d71940ab2149ab61f20449b21138a29fb87ab077b7600b94c4f52d0863e48f86837a890be38b27c62ee3116669eda4ea21ddd3f9ae9363fe49fa0f1bff969cb
 MISC ChangeLog-2015 14172 SHA256 1901fc4b4c6e63864c32fca7927d38ab5b63dce0c2aee3bca8583fe05ea0bd83 SHA512 37c7a5e9a73f8ab006e1fd2ccdaf057cb3a4eeb67a63709bd20f1abedde0749ec675907a3c0552e1aa1c6c0b094c9c53d7797de659849ce7225a9af2f7b0edc4 WHIRLPOOL 39513c89107e6736440b7827e23c9093e37fd303354e66109759ac451cc34e6741c50e49abf449f2253c3471841c72738b0baf31955e1892be15f2e2acb8a86a
 MISC metadata.xml 309 SHA256 8614be1944e84bb7f1d9920e2d66a8b42ab34e7f1509811c02c16d2bdf8f9ecf SHA512 311a9444ac8811bf1ea1a8bb06370b81360c6642921b2932095bd191d8784509bfe46189de8f073a34a831eaf1c8114c3b5bfcf67d0fe042ea2ecd8c1fc7cc0a WHIRLPOOL 9a004dc20a28775a3b04a7d8dd07847d647be4a4bdc38ee53afcacacbb8bf3afbe9ca541c63095919a4d739a6fda021b5d3c78f3a4b302c750eec264a48eed7d
diff --git a/net-dns/openresolv/openresolv-3.9.0.ebuild b/net-dns/openresolv/openresolv-3.9.0.ebuild
index a214ce04e7ea..b15b0b8c86f9 100644
--- a/net-dns/openresolv/openresolv-3.9.0.ebuild
+++ b/net-dns/openresolv/openresolv-3.9.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://roy.marples.name/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="selinux"
 
 DEPEND="!net-dns/resolvconf-gentoo
diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index cca4765d5ec2..f6ae3bbd87bf 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -9,7 +9,7 @@ DIST nftables-0.7.tar.gz 292652 SHA256 192c9d92ee0c56eded599d1c54b0d68f4d9b0286f
 DIST nftables-0.8.tar.gz 327629 SHA256 95603f34e47dbfe89a1d704e17131ba1d60f458343c573c0985ac1e84cbca85a SHA512 90ffebc338c121334ca42822793b6fdeff48390e755c690308919de47064b53f9af735a2c2914e5255f1bddec90484599337d4cdd67f7a01a3956deefcef9fcb WHIRLPOOL ef5224eabdb57a640d4a3d53c90721c5fc473e06af977ea8e8e3fc566f8755e858fa7780642a34c4da72480357671d75a460a32d97d60bb47d009f5cc735f0e2
 EBUILD nftables-0.6-r4.ebuild 2116 SHA256 81001d2c20ee1ca27bf40f397be44d2e830d9fdd48d4ea4b6aa7495d45b8db7b SHA512 4c1a3420d9d228ff1925d91ee0bdd285995b7d06b59453863e5b5fef12813c6f58d8487a10c880c313a328be79e69b49147f0a5c73e07554d665ff24ffe1f265 WHIRLPOOL 3486ed76af507f4a49e8a203d7bf4544b244319c803e272db2b59fb6d7aa53900f8b9e8146de99b2dce41372cf9cd6d03075fbd4577c5b38ba642a2f628c18c8
 EBUILD nftables-0.7.ebuild 2002 SHA256 c909b988d5ddde8cf9365667b8bd5d27314be4bb9a972ce651bc416d6739c33f SHA512 0b6efeee42b09b861a27fb11cf02b2096f5e66f8e80f92d8ed97bfeeabb8fe532b068761ffbadf7603cc6095ddd81abe313dd6f581b0719239411f740a0131bf WHIRLPOOL 2bee002b52161664bdd17ae47558b8a723ec603ab0c3c19454685a2511cd9e62d543db7007c0f64eeb35fef20a5b7edf119e8dfb8be852c2368861a95920ee29
-EBUILD nftables-0.8-r2.ebuild 2045 SHA256 6d1a7917d02feee62fd2f0fe85d84bfc679c05795d27d155d3159f744f9dfecd SHA512 e9722f768b3a9c93d3738386448b5178bb8e6ddfe4b55ceb93a76b678227ef0d0b9cb5b5419510483a34bf547d9d0f41c2debd2825558a738a331dcc70dc329e WHIRLPOOL 0a9019c712182d022470dfc7e77bd29c129264ed8326686de2e6d035729b20f2f39b4dc48f69a9bfc69048a5f543e9db6e0af028e7e39ca3903f587510faa478
+EBUILD nftables-0.8-r3.ebuild 1957 SHA256 9623170eb5544c951343ccfdec6bc6224d6e426b132fc116cc366003c6146d30 SHA512 1250b9995d627558c92122187a0b7219ab170218ccce65dfde33eb0dcea1b100385ddf5479c75dabe14a559a93567154db0e44ec2ec9702ef3f5239b8d7e740d WHIRLPOOL dc8f958e88bd5fc63bf84e2efd9e4bd6a171ba5afa47b5c3cdf99d746ea4bbe95d265f1009d55b07e1b14972751e33f9598ef6bf9b87710119c70b25ab321dac
 MISC ChangeLog 9200 SHA256 2dab66ea101a22a52b3f2cee4afbfa6dbb2545da809a22cbb10ef9341e08f25e SHA512 cf2cf5c185447f5adaf7f1c7be119f1d13e009f450e2e632234b23b132fb478defda597f09ce492aa7f1c846d2c34f2cf7e6f87b450e7713a843e21a09480e79 WHIRLPOOL 25f4c0eb5d2b5d4492636b6c4c5892e68ed6be83b8d8606785c2c583c91d9429dca75014c196d3f991e78b8e97968b526c83d0bc9277b3ab8c8fd919f1592bf3
 MISC ChangeLog-2015 1919 SHA256 36e610e38e898312082803dcc832cf1b808ff8f450e89f73610c8517cea6e045 SHA512 bb7cff250e90ba78e9e47692ddf126056d5d2b50cce7c3442de3b129ff00272e8b0ae2181f4898f424aac506783e4f978a5f2f1228827d3583402396a518e03b WHIRLPOOL b045fb1f27d640ad01b2fa3b28ba12df8d540b6b86657205d3a3bae303da17ccc5f09f441405579f662360200d98e45724b8f3cd579d55d21d82734545f9d98d
 MISC metadata.xml 372 SHA256 e9f3e17475668a443f853ade5d6032a2e6f44726dcc5175c2500a29e21d61910 SHA512 13f7b219a6a043a047b4be99f69cadf76b2a0c20800c1622f08dc9626ebc1115db79a3866fb19c1c00a98b66a692b42d42c2c3e66da654ff83e44d193da8a511 WHIRLPOOL b5a3ea672559d759343b4fb7e501871a485a68f66fbc9e1d7cb94bb11e5c236f253677e75c566a8d6282a87ce87a1109a38f5857b9cf2ffa0832e8dd52af0251
diff --git a/net-firewall/nftables/nftables-0.8-r2.ebuild b/net-firewall/nftables/nftables-0.8-r2.ebuild
deleted file mode 100644
index 4656176d0d39..000000000000
--- a/net-firewall/nftables/nftables-0.8-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools linux-info systemd
-
-DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
-HOMEPAGE="https://netfilter.org/projects/nftables/"
-SRC_URI="https://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug doc +gmp +readline"
-
-RDEPEND=">=net-libs/libmnl-1.0.3:0=
-	gmp? ( dev-libs/gmp:0= )
-	readline? ( sys-libs/readline:0= )
-	>=net-libs/libnftnl-1.0.8:0="
-
-DEPEND="${RDEPEND}
-	>=app-text/docbook2X-0.8.8-r4
-	doc? ( >=app-text/dblatex-0.3.7 )
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig"
-
-S="${WORKDIR}/v${PV}"
-
-pkg_setup() {
-	if kernel_is ge 3 13; then
-		CONFIG_CHECK="~NF_TABLES"
-		linux-info_pkg_setup
-	else
-		eerror "This package requires kernel version 3.13 or newer to work properly."
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--sbindir="${EPREFIX}"/sbin
-		$(use_enable doc pdf-doc)
-		$(use_enable debug)
-		$(use_with readline cli)
-		$(use_with !gmp mini_gmp)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	dodir /usr/libexec/${PN}
-	exeinto /usr/libexec/${PN}
-	doexe "${FILESDIR}"/libexec/${PN}.sh
-
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
-	keepdir /var/lib/nftables
-
-	systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service
-	systemd_enable_service basic.target ${PN}-restore.service
-}
-
-pkg_postinst() {
-	local save_file
-	save_file="${EROOT%/}/var/lib/nftables/rules-save"
-
-	elog "In order for the nftables-restore systemd service to start, "
-	elog "the file, ${save_file}, must exist.  To create this "
-	elog "file run the following command: "
-	elog ""
-	elog "	touch '${save_file}'"
-	elog ""
-	elog "Afterwards, the nftables-restore service should be manually started "
-	elog "to ensure firewall changes are stored on system shutdown.  The "
-	elog "systemd service will function normally thereafter."
-}
diff --git a/net-firewall/nftables/nftables-0.8-r3.ebuild b/net-firewall/nftables/nftables-0.8-r3.ebuild
new file mode 100644
index 000000000000..00a30dec4848
--- /dev/null
+++ b/net-firewall/nftables/nftables-0.8-r3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools linux-info systemd
+
+DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
+HOMEPAGE="https://netfilter.org/projects/nftables/"
+SRC_URI="https://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug doc +gmp +readline"
+
+RDEPEND=">=net-libs/libmnl-1.0.3:0=
+	gmp? ( dev-libs/gmp:0= )
+	readline? ( sys-libs/readline:0= )
+	>=net-libs/libnftnl-1.0.8:0="
+
+DEPEND="${RDEPEND}
+	>=app-text/docbook2X-0.8.8-r4
+	doc? ( >=app-text/dblatex-0.3.7 )
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig"
+
+S="${WORKDIR}/v${PV}"
+
+pkg_setup() {
+	if kernel_is ge 3 13; then
+		CONFIG_CHECK="~NF_TABLES"
+		linux-info_pkg_setup
+	else
+		eerror "This package requires kernel version 3.13 or newer to work properly."
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--sbindir="${EPREFIX}"/sbin
+		$(use_enable doc pdf-doc)
+		$(use_enable debug)
+		$(use_with readline cli)
+		$(use_with !gmp mini_gmp)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	dodir /usr/libexec/${PN}
+	exeinto /usr/libexec/${PN}
+	doexe "${FILESDIR}"/libexec/${PN}.sh
+
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.init ${PN}
+	keepdir /var/lib/nftables
+
+	systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service
+	systemd_enable_service basic.target ${PN}-restore.service
+}
+
+pkg_postinst() {
+	local save_file
+	save_file="${EROOT%/}/var/lib/nftables/rules-save"
+
+	# In order for the nftables-restore systemd service to start
+	# the save_file must exist.
+	if [[ ! -f ${save_file} ]]; then
+		touch ${save_file}
+	fi
+
+	elog "If you are creating firewall rules before the next system restart "
+	elog "the nftables-restore service must be manually started in order to "
+	elog "save those rules on shutdown."
+}
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index ad93e8fbc7fe..fecf7ccff363 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -21,6 +21,7 @@ DIST samba-4.5.13.tar.gz 21013879 SHA256 5fc4762d2259469bfb0067c10f77378cb720f2e
 DIST samba-4.5.14.tar.gz 21016317 SHA256 15dc04fd2b19081daf1118318f43f88ef7260b3fc6e4f86ee7c7913bb7c92ed9 SHA512 35b6ec38b6750ebdd387eade3c7a1f61c83a4d6642c9a2a8a811d84b506c9f20ed69fa1db9065852ce792fd769fe151177200cdd55de308017cd5416f80eb095 WHIRLPOOL b374abd1439072ab16d84f12b4876f4c44c8d34b734e3c4a0b909e685bb3eb1f02f5b58d9c8173909f2154e97d3e60743646252818a527358ba7316f5a348140
 DIST samba-4.6.7-disable-python-patches.tar.xz 8896 SHA256 33702adba80e9886625fda8cba46d4017ae603f5d9cf9d3dc78e5ef30ff6f5eb SHA512 c45e548a49735e17b568bebf07dc7409de3de0f93256d1dcf345d2723a27d22a51d860ed921785354fda691f83be4eca3b9d618d5c332438ebf97518a01983eb WHIRLPOOL 1cb176480b8583369e1085c8e122958112c0d13aa8ba78cd57dfd04b17c7d8f0a0664a43d277deba86775f1944eab052f4fb9459f64506215ae25184c86cbe40
 DIST samba-4.6.8.tar.gz 21139872 SHA256 581deeb2543f5cedcb556cb950d0e82690d9f0cd33811d76624502ca0c32575d SHA512 fb40144210361bdeab09007aa49fa85077fbc8eeae2c49bcdafb01d33ec40425160882979f0829005a89766ed4fd4e36d7f952f6dbf6e0178f5b0945dc8d8efb WHIRLPOOL d669df156dcae5846d814eb30f577b9df0513383be91a87886b91dff12451d82c236dd7c1fd996a378d90619aabee5adc33ecd488534b612b8f82b7b88d0840a
+DIST samba-4.6.9.tar.gz 21154233 SHA256 c31db4aad82f0b9588ef6c4b4dab5dce3fa1787bd298e62d953c2628bb1af21a SHA512 20a0828afe2b7f834543a3efc8618bba78951f728da99434f084b7220477ef9e4b1ef09d5a3a5a16a96e1f0704bb2c8d2c3418402f0b8e5f8201bc022a4937aa WHIRLPOOL 996bc727317f0fa7ce9fd94f68cd9b20b7f10eea08c0ab100af73a2ac5a23700aa26abe3dbca6f384c20bb642ceb3755eb995e62e8991ca09bf94f7898a085fa
 DIST samba-4.7.0.tar.gz 16830569 SHA256 bd16d169988eb513e685a87e9964a5210482498fa9b3a22aaa8287a061e3c936 SHA512 c69da34566ec672ed17f86ecf793154374c71dd33b588adceed5fbd9345d978a4ffeced5d3a4033edb4daedac2294ed088beed8cdde19724f9d03da54e22e4ee WHIRLPOOL d2635df77e8dc82d0a6aeb345eebf5616fba1ab826b90aedac1f49669ff7faae8845737267c908956ade1904a2c85e918b6db678197e3a6c1f35f78ccc78021f
 DIST samba-disable-python-patches-4.2.12.tar.xz 6052 SHA256 8903eacbabdfaf7b64cbde03d7c367d1efdc92e54090f0f4b9ed5d2a462b1c18 SHA512 c527d0a052d3211e5b12c17bc94db56cc5e5545189ed65a760c0656c94c22e27a4b159e6439eb0370873e1619873a741f3b3bd10d3876b38eb3914a87eace372 WHIRLPOOL ad63db55d5dc96f56e6c9b30c2092e2f6e206b0ed5d13c249879d10753c8db2f475c5d4e651e2fc042ad992b648d3b4465f1b28c6b4bbf821cf503d27f741f7e
 DIST samba-disable-python-patches-4.5.0_rc1.tar.xz 6204 SHA256 fa0d776e04e3222c0dc4761e376717f4154937cdcb85f4117b8978dfb770a78e SHA512 920089ba3c6e8e7d913b1d7ef1017262a19d1af41215adb30cfc98a57556efc4b0116931d4ef774c01124149d8eca2be3a23814ce7e11daf0180d2c111799927 WHIRLPOOL 6d55710895435ad012e23f8c252e5276966241014710349ca7fa9cf037e8742030b8e053f7cb71309a0a45f48d2235d55393243bf4d19476a22dd39bb1b7748d
@@ -29,8 +30,9 @@ EBUILD samba-4.5.10-r1.ebuild 7732 SHA256 25dca274a37d51734f784a3d619f452c661665
 EBUILD samba-4.5.13.ebuild 7797 SHA256 31b9e91ac0a2ef2711b17a346a5a43b32dd1116cf0ad5611668b997adb09adf2 SHA512 a45c3285315eb47503df08dd9c027f75b31c5450da026108487d24ea3cdae88129ea9f886fec716b6fbbc995ee32f83d78714b2494f75006979d01e0965a2076 WHIRLPOOL f75074ea63cc5fde0e167b046665df978439ef027df6c74f04395fa072b4af872139ba898fec9665dbc6fc7cdd051cef0af1cf9a847b09bdf234fabe11b66152
 EBUILD samba-4.5.14.ebuild 7797 SHA256 31b9e91ac0a2ef2711b17a346a5a43b32dd1116cf0ad5611668b997adb09adf2 SHA512 a45c3285315eb47503df08dd9c027f75b31c5450da026108487d24ea3cdae88129ea9f886fec716b6fbbc995ee32f83d78714b2494f75006979d01e0965a2076 WHIRLPOOL f75074ea63cc5fde0e167b046665df978439ef027df6c74f04395fa072b4af872139ba898fec9665dbc6fc7cdd051cef0af1cf9a847b09bdf234fabe11b66152
 EBUILD samba-4.6.8-r1.ebuild 8541 SHA256 44f5bc8303cd3530bd9d386f1ff949c7f0019f19d97ffa139787b07e3787a80b SHA512 c9a846198e58746952e74a619316757f8f40891570484cc4e2950a5ba28d91aff198c7de8161735a9239ed1dfc2e6c4d657e0db08d2a46f9ea95705e0910a16f WHIRLPOOL 4ee11b357f9a49fdcb69c64d241c5d3322bc28f331a695e0d9d58b7475b5aeb9e2c87ccb58e124db87b809a6ca9c926166a23cba2b614e7835ec866ae1cf4b22
-EBUILD samba-4.7.0-r1.ebuild 8353 SHA256 86810a734d6688cf2689d8223e4ca9d264ef74b5ce26d1618640448210a5301e SHA512 258f093ca130fdd1132a5aac3ed825e6e1e954490067d04df414061451198a5538112d9d1319c6b57d49bd10b2d7f106f14f82fbd8892670149b2562c12eca69 WHIRLPOOL d61ca69d1f4a7ef730cdd37e464403c38a55dab8e3ac543ab3e348d359f9622dba7f1ae6aa6b67b2da36eed80435570bba566056164d485d39cf70ca07b4ae6a
+EBUILD samba-4.6.9.ebuild 8623 SHA256 378ead6c80dc05395eeee5a2c1b7a3d6a6ef61aa5362d83fbdbd3ae68d4bbf42 SHA512 d2e8225495f8510721c48dc037450f636c69248d49afd7de2aae4519f17eddd58eaf47431d3b60c6627459532e38af696a6bfef32e92af20f8a7da8d733e864b WHIRLPOOL d27eda23197f11b92ad4a060ec83fd5bbd40dcbf081085d4991ccd459b2bb61d6042f96a244665c693d9505e732f96694f2c323caae3d0d03a0a79920e74f141
+EBUILD samba-4.7.0-r1.ebuild 8435 SHA256 7f6e67c6580fa740b524f2c4c9cf700601671cadcee916c026c960fa14bc6df0 SHA512 7cc4c8fa7e58ad2d6588881181cab128c51f79b3297d0412bd6e7dbdc272eeba230f9cd0e4d49a14eebebf14909d8e74fb5e00749bbebbc2541fe3e825e9f0b4 WHIRLPOOL e926e5929bf8c58aaa8f599236beccd10add0032df1a97671dc69da12bca0d624a0c6a7580a8158c7f3ca453ca79d1bfc9bcd56b1d77a2e050b2bc1086822c5b
 MISC ChangeLog 29865 SHA256 9fdf9b583855db807230f491b4957583779bda1b46807e5a1f3fc3f16a584322 SHA512 6ac0456dcf57a73cb9ca984623b5fb4512b9cbcfd9189c3cbeeac5b2135aee2dbb99114e838c8f6438388d948da4ea7fe15712a38bcf834c75d414c538f460b4 WHIRLPOOL 271a5a1c45a6a6b5d41173c677e3c48053bf2aae078098ebdd8ab6de31defd2bbbc6679bbeca8f7a6426edeec9692ad2e86ff465ed7459f5800089ec1abc7a84
 MISC ChangeLog-2013 106689 SHA256 00ac832a137c7ce1d21be794b45339e1f4e9c51eb1b796cbcac90a03e1cf5453 SHA512 9dc4e4e22042db7f5ff3a474eb7a454044ea6958ffc3ba5c5de6f09608cfbbcaed8db00763a38995276de03a5f1c728fc783d4addaca7da16f4be76a4e49fd6f WHIRLPOOL 85a746ae34c0386ecb151f5f323b92615cce971b1e46f249cccfdc682bdddd7dad080dd4ffbe5748f093ee11db3f5182cae6d85191a37014639a56040eff9644
 MISC ChangeLog-2015 11570 SHA256 700ea64c0586d7957e3ef95425683f9bd711ae4311c7cd19575b6d1cdd814e94 SHA512 8d5d99a08a409db4cf8c8e9c3a82a080de66d9aac6ff39e53bb6eb5eeadb625d0ebd07c6fc81bce1755d2441ab91d96f90787d3975814f572e2ce2a366038299 WHIRLPOOL 340948bfd379c419985c93c21a543bb10d10a0c95c8ec2cf1d01697a3e47613b2b6e9f2292c1d03f353121a39b6be809ba432535ccab67b71adf333c69c5bc2e
-MISC metadata.xml 1535 SHA256 e52ce6fb55ee494bc4ed348148a75f496df1fcc5282795c58155d3d770816a4e SHA512 478534265c8b41cc907fd27b7bfdba056a5949d9a6d1c0dec16572eebd7c9eefed24cb625a15f36f457fad0bd321063f0ffe2ed764415f3c09c61458b0751baf WHIRLPOOL dd7e58a5eda413342d65e117d1020c2a11befe5b1577c0569a4c4749b0ca4592a6d086b03079f1e271b375f700868b57e5a9ed7d404e8d3201d1b73c558e7f76
+MISC metadata.xml 1641 SHA256 96e6fd81184640c769aa44a2bead8cd2592868f5b31e68c374bd380c41ffc886 SHA512 9e6bf4cb2b711f48a3f730f2e4e9cc8c460b46013fe78ad376855748bdff0d8e44beb05798de551c0c22cd2b40d74c2c30799393d05bd7c7a9161a74eb0e98be WHIRLPOOL 96bed727bbb509b5abc6783c60ae8e08e673b93d2a937e1b0de419ef7afb7f7543790cb733e9793b3451f328deaf404950d6f6e43d7284a705dabd67f2d6d538
diff --git a/net-fs/samba/metadata.xml b/net-fs/samba/metadata.xml
index c6b9bbe87e47..2a3bd677e0d2 100644
--- a/net-fs/samba/metadata.xml
+++ b/net-fs/samba/metadata.xml
@@ -13,6 +13,7 @@
 		<flag name="addns">Enable AD DNS integration</flag>
 		<flag name="ads">Enable Active Directory support</flag>
 		<flag name="aio">Enable asynchronous IO support</flag>
+		<flag name="ceph">Enable support for Ceph distributed filesystem via <pkg>sys-cluster/ceph</pkg></flag>
 		<flag name="client">Enables the client part</flag>
 		<flag name="cluster">Enable support for clustering</flag>
 		<flag name="dmapi">Enable support for DMAPI. This currently works only in combination with XFS.</flag>
diff --git a/net-fs/samba/samba-4.6.9.ebuild b/net-fs/samba/samba-4.6.9.ebuild
new file mode 100644
index 000000000000..43d075a4a994
--- /dev/null
+++ b/net-fs/samba/samba-4.6.9.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+),xml(+)'
+
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_PATH="stable"
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
+
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
+	https://dev.gentoo.org/~axs/samba-4.6.7-disable-python-patches.tar.xz"
+[[ ${PV} = *_rc* ]] || \
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="http://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
+quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+CDEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/libaio[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/iniparser:0
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=dev-util/cmocka-1.0.0[${MULTILIB_USEDEP}]
+	sys-apps/attr[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.1.29[ldap(+)?,python(+),${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-1.1.31[ldap(+)?,python(+),${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/libcap
+	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.1.9[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.12[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.31-r1[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	pam? ( virtual/pam )
+	acl? ( virtual/acl )
+	addns? (
+		net-dns/bind-tools[gssapi]
+		dev-python/dnspython:=[${PYTHON_USEDEP}]
+	)
+	ceph? ( sys-cluster/ceph )
+	cluster? ( !dev-db/ctdb )
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gnutls? (
+		dev-libs/libgcrypt:0
+		>=net-libs/gnutls-1.4.0
+	)
+	gpg? ( app-crypt/gpgme )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+	test? (
+		!system-mitkrb5? (
+			>=sys-libs/nss_wrapper-1.1.3
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.7
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${CDEPEND}
+	python? ( ${PYTHON_DEPS} )
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+	!dev-perl/Parse-Yapp
+"
+
+REQUIRED_USE="addc? ( python gnutls !system-mitkrb5 )
+	test? ( python )
+	addns? ( python )
+	ads? ( acl gnutls ldap )
+	gpg? ( addc )
+	?? ( system-heimdal system-mitkrb5 )
+	${PYTHON_REQUIRED_USE}"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use cluster ; then
+		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS="idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# install the patches from tarball(s)
+	eapply "${WORKDIR}/patches"
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+
+	# ugly hackaround for bug #592502
+	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to 
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=()
+	myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+	)
+	if multilib_is_native_abi ; then
+		myconf+=(
+			$(use_with acl acl-support)
+			$(usex addc '' '--without-ad-dc')
+			$(use_with addns dnsupdate)
+			$(use_with ads)
+			$(use_enable ceph cephfs)
+			$(use_with cluster cluster-support)
+			$(use_enable cups)
+			$(use_with debug lttng)
+			$(use_with dmapi)
+			$(use_with fam)
+			$(use_enable gnutls)
+			$(use_with gpg gpgme)
+			$(use_enable iprint)
+			$(use_with ldap)
+			$(use_with pam)
+			$(usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+			$(use_with quota quotas)
+			$(use_with syslog)
+			$(use_with systemd)
+			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
+			$(use_with winbind)
+			$(usex python '' '--disable-python')
+			$(usex test '--enable-selftest' '')
+			$(use_enable zeroconf avahi)
+			--with-shared-modules=${SHAREDMODS}
+		)
+	else
+		myconf+=(
+			--without-acl-support
+			--without-ad-dc
+			--without-dnsupdate
+			--without-ads
+			--disable-avahi
+			--disable-cephfs
+			--without-cluster-support
+			--disable-cups
+			--without-dmapi
+			--without-fam
+			--disable-gnutls
+			--without-gpgme
+			--disable-iprint
+			$(use_with ldap)
+			$(use_with debug lttng)
+			--without-pam
+			--without-quotas
+			--without-syslog
+			--without-systemd
+			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
+			--without-winbind
+			--disable-python
+		)
+	fi
+
+	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${D}" -type f -name "*.so" -exec chmod +x {} +
+
+	if multilib_is_native_abi; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym /usr/bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED%/}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+		systemd_dounit "${FILESDIR}"/nmbd.service
+		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+		systemd_dounit "${FILESDIR}"/winbindd.service
+		systemd_dounit "${FILESDIR}"/samba.service
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Be aware the this release contains the best of all of Samba's"
+	ewarn "technology parts, both a file server (that you can reasonably expect"
+	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+	ewarn "controller work previously known as 'samba4'."
+
+	elog "For further information and migration steps make sure to read "
+	elog "http://samba.org/samba/history/${P}.html "
+	elog "http://samba.org/samba/history/${PN}-4.5.0.html and"
+	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-fs/samba/samba-4.7.0-r1.ebuild b/net-fs/samba/samba-4.7.0-r1.ebuild
index 382862651762..8e9afc791ab5 100644
--- a/net-fs/samba/samba-4.7.0-r1.ebuild
+++ b/net-fs/samba/samba-4.7.0-r1.ebuild
@@ -23,7 +23,7 @@ LICENSE="GPL-3"
 
 SLOT="0"
 
-IUSE="acl addc addns ads client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
 quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
 
 MULTILIB_WRAPPED_HEADERS=(
@@ -63,6 +63,7 @@ CDEPEND="
 		net-dns/bind-tools[gssapi]
 		dev-python/dnspython:=[${PYTHON_USEDEP}]
 	)
+	ceph? ( sys-cluster/ceph )
 	cluster? ( !dev-db/ctdb )
 	cups? ( net-print/cups )
 	debug? ( dev-util/lttng-ust )
@@ -183,6 +184,7 @@ multilib_src_configure() {
 			$(usex addc '' '--without-ad-dc')
 			$(use_with addns dnsupdate)
 			$(use_with ads)
+			$(use_enable ceph cephfs)
 			$(use_with cluster cluster-support)
 			$(use_enable cups)
 			$(use_with debug lttng)
@@ -211,6 +213,7 @@ multilib_src_configure() {
 			--without-dnsupdate
 			--without-ads
 			--disable-avahi
+			--disable-cephfs
 			--without-cluster-support
 			--disable-cups
 			--without-dmapi
diff --git a/net-im/corebird/Manifest b/net-im/corebird/Manifest
index 8bf9dad754e9..0f28eac02b6d 100644
--- a/net-im/corebird/Manifest
+++ b/net-im/corebird/Manifest
@@ -3,11 +3,13 @@ DIST corebird-1.0.tar.gz 1697452 SHA256 0ca4ca20b0281b2901382810ef8bd1682bb896c3
 DIST corebird-1.1.tar.gz 1757414 SHA256 f6109cc2bdc7ee5893c28861a73df4eeaec4b76b99222a90aec381b03b19c8a7 SHA512 b753a22ea9f597cb44df367852c27c94972f8747dfc3541826745c29a44c7b25237d40a7927b2be6002651efdd63f5e4bb6bd2b51edf6b66c3a436963be814bc WHIRLPOOL f01ee9e6452dc4f84f93c73c571033c64a4affdfb67c185e45cf1908101966075d2d310575ebfd8e340ba4fc10a8070af869b54b071a4ed6d95fc60cdb387144
 DIST corebird-1.5.1.tar.gz 501313 SHA256 007d0420c8c32134d47d4c06676f9f3fac654ea818af6daf319ac8eb7c007eb6 SHA512 d40c29d687a55a62df873f853ca30c36630a49fc582a9d21cd69c21fee58595df846dc7126f48ef614bde422f5dc481150eaeddae2dd48997ac0ccfb64ee20db WHIRLPOOL e560fe8657240db3bad6cfce33c4c74a6b0ee698e4dda14257d161b59f46d9b98c5a4bae250726e83946541593174ef1f1feb7f2e0e7ed3505a57626370c8f0c
 DIST corebird-1.5.tar.gz 492120 SHA256 39d451238ef30bf2caf5568d9c02c6e2a2f8b7256f19786ebcd6557adc815203 SHA512 eb0356c28bd4a3385c2194a4a05448741a579c521df481cff8c5f873e8769ccfe72a38a3fa709a43276b107a94c8c900e9163c517fcd7fe23cd738ff59de3eb0 WHIRLPOOL bf70be6b271afbe6735dd0d2ce0e0e0162cc2aac7f1336317cce9c446a7c898d29d4b44ea6305674cd9ead8022b1ddc8ea10a9f88d0422ca410168efd675d550
+DIST corebird-1.6.tar.gz 524906 SHA256 95eb5f9c86c08d409a2041e910914cf3e4dc06e1bae16f0adf1ffeb9f5bd05c6 SHA512 4ece734591ce4fdf3f2b7eb343365f436764389f86a872b57c95a5aea99b9c5f827d01417c996e7243dd6675ac5e4456aafa9468601d6d39f2b9efb7402d88dc WHIRLPOOL ff588ed52828439d6a898cb02191004966246e4e61b715125254242dfc3c72f6d1d4d1c6508793b47b164af00a4b68b4ee284b01264adbb4c78e21ec8cb5848f
 EBUILD corebird-0.8.ebuild 1099 SHA256 2c0e2316e4200172b02f21749f0cd9c0e02d099126ab06c44178db8424a860be SHA512 d18d91aec676654cc2785ad2e51e6f9d041894e70eb6d34d36fd4f6823e70381526618ca941f0aaa6ff260596e25450a1615ebe2dc87b3d0bb348b38c4ef45d7 WHIRLPOOL 28d5ec5b6062f88b823c362ce24e36d2c015ad0f50042da99a77f73f15a7e7eee464df4cf2cb9164f6ddd79f076551130c93e5ed74fedd64960777240c3dd8da
 EBUILD corebird-1.0.ebuild 1092 SHA256 7ca96c544dda6ffb8f7071206cefce830b1a5aef5b46764097f39cd01411dea9 SHA512 7245bd8fbd628626ca195f8bdc50e0a6ccd6d7f0d954bdca9984e12a38ec9023082e6a972e89444ba0e1d3899c68a2b82e44f8ad5302e8799629dce770cb4593 WHIRLPOOL 421e6c0d9ea6e6cafcf80be7e5e9c926a763654285585daae4dba93f753b7a7bfac9c4ad0600fb2d0771f443c88ab9205c9e5fb5b9629663d14b9c6904d85c8d
 EBUILD corebird-1.1.ebuild 1092 SHA256 9d8f28b967691714a794ec927008df18e95bcfb589980dfcfc8b2c2c096ec82b SHA512 a58ab7b09cc27f81460428a35dd29b399befdbef63df0f74c75493495e9fe14a0371bcf76f8137f11cf1023c62b5dfdb8ddcdcec4603bf735ff3409b66aae050 WHIRLPOOL 73165b1ff977813c1504529e0a3a526bebc69e1249d15948a7f70235468bf3f10cea4924f911c9a12de93065a11d8eb149816e11c182b945c9a519459012400a
 EBUILD corebird-1.5-r2.ebuild 1430 SHA256 a79a9cc89d03808110c783aac21da64dfdca1e97ec24f8eb7511b20827ab2397 SHA512 6154332e8ed238189d5c10c9e6b70bba2708c5ceb2f04f84f3790a6fc953a1dd00863e639e4bf2b9cebe5847eb559fd9872554f54cfe339e24d2d440ee1141d6 WHIRLPOOL 49ef6ac4c123230de49ffbced9c0b77463d08b23405548c38521cc79e4a3406e328bf95190cfce70e7bf2a77a607e45938073b1fdeb5b500ebd5dc86565b23ac
 EBUILD corebird-1.5.1.ebuild 1430 SHA256 a79a9cc89d03808110c783aac21da64dfdca1e97ec24f8eb7511b20827ab2397 SHA512 6154332e8ed238189d5c10c9e6b70bba2708c5ceb2f04f84f3790a6fc953a1dd00863e639e4bf2b9cebe5847eb559fd9872554f54cfe339e24d2d440ee1141d6 WHIRLPOOL 49ef6ac4c123230de49ffbced9c0b77463d08b23405548c38521cc79e4a3406e328bf95190cfce70e7bf2a77a607e45938073b1fdeb5b500ebd5dc86565b23ac
+EBUILD corebird-1.6.ebuild 1393 SHA256 37f9d999d059180c5314be66f0e99a53afadedb60f278acc024e63a6de7e8acf SHA512 d412440c5719ece6764b2ac7c2483e11fb2424c4d30bd33d360b3d2b075a5886ae4d31f0b3a6ccc9b908c5878162b0bd16f12a6dcd54861de03477841488f09a WHIRLPOOL b962d62758de2d48ebb726ca90c19633d82aaa3179c8c6dfe9a5b9d54ad83c1279916c38e53c385d6e1f8b943c4c6fae396ff610c4e9797d80dbb1a11c79e700
 MISC ChangeLog 2751 SHA256 fc861d557ff715f5c9ea5951a29d59c09e3c8ebf24e416a5a42a78f756cf2da1 SHA512 14eef97f2b7cea014fcc40798c179be548adaceef9039fe30c66b303eb6bec0ca83fb8100ae29ebcfe2fafde332f530d07a746422de2427387a9fcaf2f13c5d4 WHIRLPOOL 5c4dcc82a1e67f30265fc6310ad668e307b2fcba33b8c1c373c6ee7154cd24d5fbd717451dfe9499b8a30cb02dbdb101ab479db66c18a15ec1517944032d1155
 MISC ChangeLog-2015 753 SHA256 0807fbe3f29d69ecc7e7c2161c55f68e109155d0f600bf583f4a0bd50b71a1de SHA512 a683284f19fab798ff4f681b680842eeef5f8af3d2a607f4213cdce0b9a06c9b054b44f5767d11ff50b6f1baddb59b9cf85d3afea7606f64555f3ce762e00fb6 WHIRLPOOL 59a6793f9e8dad3aa9954e7e19c80804f4682d55ff0374e75eb6f9565bae3ef781d96fbaf7c17b68bd7abfaf814368a3b20128ec71f5854bc07f25aa5c68da1b
 MISC metadata.xml 706 SHA256 42656a782d60a99af53e121294b19cbda635056627af77a1c6038fc9c7c326f3 SHA512 ec24b71619f5610115704e8ecf590f69f9364ed8842db9628ee089c8c0867356aa5830a24428117370b658badf1cc2b0adf7468f6183fbff8a5f8d91323b95a2 WHIRLPOOL 4d650ce885ab726bff31dbf0d3935cd48ff0979ac0a451edfed7f99aa41f42dbda52c59870b547b4fb7903a01c24ad3d7f00cac4e5c4d875d1eeb5b9c3348f90
diff --git a/net-im/corebird/corebird-1.6.ebuild b/net-im/corebird/corebird-1.6.ebuild
new file mode 100644
index 000000000000..33c417eb1393
--- /dev/null
+++ b/net-im/corebird/corebird-1.6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VALA_MIN_API_VERSION=0.34
+
+inherit autotools gnome2 vala virtualx
+
+DESCRIPTION="Native GTK+3 Twitter client"
+HOMEPAGE="http://corebird.baedert.org/"
+SRC_URI="https://github.com/baedert/corebird/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug gstreamer spellcheck"
+
+RDEPEND="dev-db/sqlite:3
+	>=dev-libs/glib-2.44:2
+	dev-libs/json-glib
+	gstreamer? ( >=media-libs/gst-plugins-bad-1.6:1.0[X,gtk]
+		media-libs/gst-plugins-base:1.0[X]
+		media-libs/gst-plugins-good:1.0
+		media-plugins/gst-plugins-hls:1.0
+		media-plugins/gst-plugins-libav:1.0
+		media-plugins/gst-plugins-meta:1.0[X]
+		media-plugins/gst-plugins-soup:1.0 )
+	spellcheck? ( >=app-text/gspell-1.0[vala] )
+	>=net-libs/libsoup-2.42.3.1
+	>=net-libs/rest-0.7.91:0.7
+	>=x11-libs/gtk+-3.20:3"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	>=dev-util/intltool-0.40
+	sys-apps/sed
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i -e "/highlighting/d" tests/Makefile.am || die
+	sed -i -e "s/manpagedir.*/&\/man1/g" data/Makefile.am || die
+	eautoreconf
+	gnome2_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable gstreamer video)
+		--disable-gst-check
+		$(use_enable spellcheck)
+	)
+	gnome2_src_configure "${myeconfargs[@]}"
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/net-im/slack-bin/Manifest b/net-im/slack-bin/Manifest
index 808183e53327..76535a04ffa3 100644
--- a/net-im/slack-bin/Manifest
+++ b/net-im/slack-bin/Manifest
@@ -3,9 +3,11 @@ DIST slack-desktop-2.1.2-i386.deb 42997902 SHA256 cc9660d95f5ce765c18b35191e2475
 DIST slack-desktop-2.5.2-amd64.deb 47812458 SHA256 b176a9d292319a5157af4d1fb84cb07111d04ef517663df1f6dc5a8a8296e855 SHA512 0e8f305e33c17884bbb71cdcc236a602918e8596b00c525f155a1e0740ac02d0f99256b2afabe4381a09e6cd06e425f99b9d219bea43f113b9488c9bb0929ca9 WHIRLPOOL 692273af0c9fb6f3fd3871004e2fd7c9eae9ad58c5fb2e4a81695cadaab5a49a6f397f5bfde44af701b2cb08665d66a1820f98c90ac33c26ede7beac1fd9c960
 DIST slack-desktop-2.6.3-amd64.deb 51434914 SHA256 ec11c05e954b1291f2503bbbd9d0b371190bdf157b2d973e54fa42418ea1e2f0 SHA512 943abc3084e395277c41f7a42feffcdeb184900c9cf0bce58bbbe6891d23b97b937fa8d47a1200e9aaa62ed0f7d4b6e3f24d41cd610cd185df570e58c31640bf WHIRLPOOL 0cc64b62f13388fc75b131b18cf8f753c5408d072818b6f6a4c260cc24173580ffe04bc671fc2066dcaac53464c59fea3d475c3cecae570fcbcff0a148673cba
 DIST slack-desktop-2.8.0-amd64.deb 51225854 SHA256 15626e80dfef62d9f26d1c46987f4a6b333d722d49513797913e238741c4700a SHA512 9a3a8c4eec95583cde76003e99679dda9d6e44692258242bef888043666d589da8a7a5d68898f61e645a6810291ef36fea9551834c3d2fbec8e3baa6a84313d0 WHIRLPOOL d4ebec25adb2a5d18ac45e3eebfa90c5a72d04150c0e78b616219864cfe6fdcff17f16b5cf55d589b779f4d2308165919b7d1527dae1d6c439f4e1eb84d7f5ec
+DIST slack-desktop-2.8.2-amd64.deb 51257834 SHA256 75661e19efc7c9760f481a9688e5d6e24a2bdc830bda60ca5ec9876a64fc2f05 SHA512 533b360ff22ff74743fb7323c08f01230509428e752aed2ed090bf002475934063e6c3853727ab030f6267ca332d783a045df02da02a3a12d045d6a168bf5b58 WHIRLPOOL f224a3e561bbd75c41ecfd3384bc46b287f3b30ced14887166c2201d6a7175ce3b910fd56478dcbcfc951759d31ef0f0fd714e82fd4097f1d43eccdfb293aac4
 EBUILD slack-bin-2.1.2.ebuild 1769 SHA256 2f12fe11165bb9ccf2e08855f4584506c4df2f5a2e26e41934877ffa677ccc13 SHA512 195c9b12c1ecda6afcae9cfec0710f30cac1480f5aa5f4ec6f5bd42550b6e012ab30e0be67f5c979db2be41357f47a7bbab44506c67bc23c1caa3ae43125d38b WHIRLPOOL 6091c7706d4b06fbc344662d6f8aa3cd01c4564708adb841f57a244746034b5a80495bfc890fa4b262b10016fd6056d30340aab91f150dd472296055bc1761ce
 EBUILD slack-bin-2.5.2.ebuild 1674 SHA256 c9a35843990e66f0d95801c9b89c699aa7623e2a2f4061922538acef35f24bb8 SHA512 5b975220ef97fe554c46df85cf98eb51c89e48026f460d2e4cfaae1ae72c5af7e919519d2fdf28e95f3d22929caf8b5237075f57b1add35394b621bc987eb62c WHIRLPOOL cfd50bf2b002370f803c75f2bf81c729b586074aa3ce5837bc33521a16ee8facdb0d07eb21f314503822c5fb1e2465c57f86a159291b3dbb5ed7605c53e4a232
 EBUILD slack-bin-2.6.3.ebuild 1674 SHA256 c9a35843990e66f0d95801c9b89c699aa7623e2a2f4061922538acef35f24bb8 SHA512 5b975220ef97fe554c46df85cf98eb51c89e48026f460d2e4cfaae1ae72c5af7e919519d2fdf28e95f3d22929caf8b5237075f57b1add35394b621bc987eb62c WHIRLPOOL cfd50bf2b002370f803c75f2bf81c729b586074aa3ce5837bc33521a16ee8facdb0d07eb21f314503822c5fb1e2465c57f86a159291b3dbb5ed7605c53e4a232
 EBUILD slack-bin-2.8.0.ebuild 1716 SHA256 a871f09e0bc553d26f168b53b99705cffcd5c4cdef3927950ce83f339670bc5c SHA512 2f83f679d34b0e5052379081a69546e336e89ae981db1a991c0178624cc898f2f28fd7849e595c17b1fa3cdf0627796445dab7b79a19fcd61adc6c5d00ad3226 WHIRLPOOL 01351a8089c3dfd054683e7392f5cd94ed944ce6cae36ded46d8d2ac7d3b42228ff9d0d399f762d9295d3bffc2820366e0936e29ca18723643ed3b965cd28399
+EBUILD slack-bin-2.8.2.ebuild 1716 SHA256 a871f09e0bc553d26f168b53b99705cffcd5c4cdef3927950ce83f339670bc5c SHA512 2f83f679d34b0e5052379081a69546e336e89ae981db1a991c0178624cc898f2f28fd7849e595c17b1fa3cdf0627796445dab7b79a19fcd61adc6c5d00ad3226 WHIRLPOOL 01351a8089c3dfd054683e7392f5cd94ed944ce6cae36ded46d8d2ac7d3b42228ff9d0d399f762d9295d3bffc2820366e0936e29ca18723643ed3b965cd28399
 MISC ChangeLog 920 SHA256 df34f9ec77e50aa2c09c92c06c9167140555113ed5e76e760a0a8d28c2cd1d7d SHA512 fdf09663e6d43d33bf2a65174b7602848be4f911deb785ca1a980bf9f94b195cbdcee4888fdd6411d461ee76f15583dd78805f45278f8cee6efaef577e62a6f0 WHIRLPOOL 0ae7d3d1d138d9b510ebda4fd78347eb43fbc6d1cbf97f6e3e656178cc1090d696f279017145efcc6b079e99ffd3453ff913b2e6495dee3f7b717b35c48505c1
 MISC metadata.xml 686 SHA256 24aad708b95356458d295aa3455d6b2ad51184def17589d0774e57d8cfc1b914 SHA512 f887850e1eacc25eaa94f3a249f86664454a05f7d205c67bbd89ed9afb77e1e2b5f3cf3d8596c0a3e26e70e420b486c29f07449929de2a7261aa516e2c887631 WHIRLPOOL 9131d36c8920cf1b19dfcf3b2a53d8860d4f75f64bcb52b34d6f87b7668a86eb424a6dc33f2d562eeefbab64672e84da4384b809c6dfb464bc387356d329857b
diff --git a/net-im/slack-bin/slack-bin-2.8.2.ebuild b/net-im/slack-bin/slack-bin-2.8.2.ebuild
new file mode 100644
index 000000000000..02da826eadc2
--- /dev/null
+++ b/net-im/slack-bin/slack-bin-2.8.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/-bin/}"
+
+inherit eutils gnome2-utils unpacker xdg-utils
+
+DESCRIPTION="Team collaboration tool"
+HOMEPAGE="http://www.slack.com/"
+SRC_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-amd64.deb"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="bindist mirror"
+
+RDEPEND="app-crypt/libsecret:0
+	dev-libs/atk:0
+	dev-libs/expat:0
+	dev-libs/glib:2
+	dev-libs/nspr:0
+	dev-libs/nss:0
+	gnome-base/gconf:2
+	media-libs/alsa-lib:0
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	net-misc/curl:0
+	net-print/cups:0
+	sys-apps/dbus:0
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/libX11:0
+	x11-libs/libxcb:0/1.12
+	x11-libs/libXcomposite:0
+	x11-libs/libXcursor:0
+	x11-libs/libXdamage:0
+	x11-libs/libXext:0
+	x11-libs/libXfixes:0
+	x11-libs/libXi:0
+	x11-libs/libxkbfile:0
+	x11-libs/libXrandr:0
+	x11-libs/libXrender:0
+	x11-libs/libXScrnSaver:0
+	x11-libs/libXtst:0
+	x11-libs/pango:0"
+
+QA_PREBUILT="opt/slack/slack
+	opt/slack/resources/app.asar.unpacked/node_modules/*
+	opt/slack/libnode.so
+	opt/slack/libffmpeg.so
+	opt/slack/libCallsCore.so"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/pixmaps
+	doins usr/share/pixmaps/${MY_PN}.png
+
+	newicon -s 512 usr/share/pixmaps/${MY_PN}.png ${MY_PN}.png
+	domenu usr/share/applications/${MY_PN}.desktop
+
+	insinto /opt/${MY_PN}
+	doins -r usr/lib/${MY_PN}/.
+	fperms +x /opt/${MY_PN}/${MY_PN}
+	dosym /opt/${MY_PN}/${MY_PN} usr/bin/${MY_PN}
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index 145c61b0a5ae..0a8a79d219f8 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,5 +1,7 @@
 DIST irssi-1.0.4.tar.xz 1030956 SHA256 b85c07dbafe178213eccdc69f5f8f0ac024dea01c67244668f91ec1c06b986ca SHA512 8025c3b90275e5c0b910c08efcac80f56da4400662cd4a9f09cc6035ce23840fe6ed0ac5297b9631a5b28bd798b4ebca2bb5550f9e0e01aefc7a69e9f787195d WHIRLPOOL 27065e67eda3fd09a88989456ba36a748965190a1a808a8dcab9c1170e7d7c856987e98801fdc83cdcced6aa47539410be0c2207fb037454a659b0a3973b6f5f
+DIST irssi-1.0.5.tar.xz 1032308 SHA256 c2556427e12eb06cabfed40839ac6f57eb8b1aa6365fab6dfcd331b7a04bb914 SHA512 c3fa94b6ddfa30b18f5ae5de0e607a226eb6e2c20c03a712243b75e8b5896f353c1e7d096094f66e304b5b2691ad3479e26c024245b32b399f08e29815f02bfb WHIRLPOOL aa6828aac12f56fb026fb9bd4a5e6162cc932d24cac5996d49e2b2f28c8c8e8a9073237b70d59b43ce292d350c829e538bf79ca539d776caffbebbc931b37f6c
 EBUILD irssi-1.0.4.ebuild 1262 SHA256 c7285b8b22b4bb139b7324494b9a77bf945f9439d5f61cf363ebecf1e1d86fa0 SHA512 b4ba04fe03cc81a833aa1394303bb2055718293b8c906edd46fcc97af54ffb1cd0a353c16416bb3598626bbdfc2ff1b19c8a93f4f262a18b830eec0b7661c164 WHIRLPOOL b3c640badeaa973f0967709d0f2411a2705da0c5e217088e55ec20a1749b05fb9683507f14e47a407368952e68b1ef6bb89e8746324b4a7a82616fe17b589566
+EBUILD irssi-1.0.5.ebuild 1256 SHA256 29cdf250d409bb1845c28603cc81f1eac5111ab2816237100e9032add1f75d6c SHA512 38514f8afa4bf4f8d92f5a3c25d527db5226443261d6b969b5ae4cc22a5b1767fbaa516f9cd7cb284013439838fad69707533436671f62ccf368daaee972d230 WHIRLPOOL 9bfb42f4bbecf78e57ebc1b4d865ef9bf6c0e73c88e7689829ae77a87080974e095ae1fe7f3beb61c40532b7d08e27b6df88f26323350c0906203b5c8276a1f2
 EBUILD irssi-9999.ebuild 1202 SHA256 cc5f71cddf2eecaadd1ffe49c3c9b90a81440687707ca89473185b9b19c3e69f SHA512 fc9126562591b6df88a71b2c3beb4d99a91f62f65f3df46da2808b63eee490f988291b6271de857ea430fcc3c4e1cedb9bc1e00248877bc22d5414f408943954 WHIRLPOOL 76c0b70e8baa0aa959eaa08137aa11e2f2db56534550d9b35d5180b19d373a88a5108924344f100b165b3154742ef48ea75a7dfd26bef885f27744ec5957a9ae
 MISC ChangeLog 7207 SHA256 6d69fc71b2c617fed5ed3c8fd3dbce54d9a2b5c28bc6e74277a2f891b2881360 SHA512 48602f0c9f995060181002b7e4cb806844a067d698932dd6d2b6094d6e13b6cea19cc5a4f52247fc41d6ea6266ec8fd6a9326b2203d47d8617a4d98acad82cdc WHIRLPOOL 5d56140c7e0f3f37db62f49ea0524702814ec0dc4c5ceadc8d91a0e69b9195fda8c1b8dbb608a5bdca65e0f023628f3e3106cbe1837960d0af321e29075403c4
 MISC ChangeLog-2015 30677 SHA256 88717bc23faff4ed5b75b1e2253dce491386537f43439a0eec75b64f978bf3e3 SHA512 b25d7dce21d3a8191b737bec93f4f9f2e23fce7e605266117244aa8a5d0d97d5ac15f69f6852af33d6a18408f234e93d13ccb775bc3fc43f4bf9566ffc6196e9 WHIRLPOOL 3f204165ccc3e92656fd112215ea2ab38411b122ed670486b1290b24e81fbcd919c3c6ae39acfac8e79c478c073516f04ca30a6951eaff0cd346aa013ec19620
diff --git a/net-irc/irssi/irssi-1.0.5.ebuild b/net-irc/irssi/irssi-1.0.5.ebuild
new file mode 100644
index 000000000000..f8b623c89f35
--- /dev/null
+++ b/net-irc/irssi/irssi-1.0.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils perl-module
+
+# Keep for _rc compability
+MY_P="${P/_/-}"
+
+DESCRIPTION="A modular textUI IRC client with IPv6 support"
+HOMEPAGE="https://irssi.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+perl selinux socks5 +proxy libressl"
+
+CDEPEND="
+	sys-libs/ncurses:0=
+	>=dev-libs/glib-2.6.0
+	!libressl? ( dev-libs/openssl:= )
+	libressl? ( dev-libs/libressl:= )
+	perl? ( dev-lang/perl:= )
+	socks5? ( >=net-proxy/dante-1.1.18 )"
+
+DEPEND="
+	${CDEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-irc )
+	perl? ( !net-im/silc-client )"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	econf \
+		--with-perl-lib=vendor \
+		--enable-true-color \
+		$(use_with proxy) \
+		$(use_with perl) \
+		$(use_with socks5 socks)
+}
+
+src_install() {
+	default
+	use perl && perl_delete_localpod
+	prune_libtool_files --modules
+}
diff --git a/net-libs/axtls/Manifest b/net-libs/axtls/Manifest
index 6930ac2d0811..e096e659c9e6 100644
--- a/net-libs/axtls/Manifest
+++ b/net-libs/axtls/Manifest
@@ -10,7 +10,7 @@ DIST axTLS-2.1.4.tar.gz 1316768 SHA256 e53dd20e2b619349bc48b631176a38742ea600333
 EBUILD axtls-1.5.3.ebuild 4658 SHA256 f901a46ab6f16c6baf8252a66da40a399a2d63966d35e23262e8690886cff1ab SHA512 49d2cd35f692d828e16b56bb6eb0ed2cdc45329fdbf1641fbab53418e237141ad233121e3d1aa663df146ab13cecfefa6c2318457cbcd6f2cd8db1aa9046b2f9 WHIRLPOOL b32a55c7eb1859b54dbbd708b17c03d178dde85cda22affbd958ad4fb9b3eb154dd09af355e2b193762acd5d9080303b7d9ccba5f3607d942092f617aee9cb56
 EBUILD axtls-2.1.1.ebuild 4666 SHA256 0ea032ed20353314b1003fec2ad5c38dc2068b35618e29a358fdbd4bd6bee7e6 SHA512 433b2d36a5e0b0e4b32d7b4724c6dbd7dcc243e5888a51c51cc2da435c908f472ba09cfc5a059cf4a8eb2a721128a3e3bc2ec160b905454b1001d3507adb5a7a WHIRLPOOL 7b3b6ad47f4e8996a924408573d941d266b85d6bb7f4d6ef081710b0b73d1079b081dd1c80e3f3d7dcfc327f3e17e61b5be4d71712bf5537e4fa9e04350c47df
 EBUILD axtls-2.1.2.ebuild 4666 SHA256 0ea032ed20353314b1003fec2ad5c38dc2068b35618e29a358fdbd4bd6bee7e6 SHA512 433b2d36a5e0b0e4b32d7b4724c6dbd7dcc243e5888a51c51cc2da435c908f472ba09cfc5a059cf4a8eb2a721128a3e3bc2ec160b905454b1001d3507adb5a7a WHIRLPOOL 7b3b6ad47f4e8996a924408573d941d266b85d6bb7f4d6ef081710b0b73d1079b081dd1c80e3f3d7dcfc327f3e17e61b5be4d71712bf5537e4fa9e04350c47df
-EBUILD axtls-2.1.3.ebuild 4683 SHA256 9dc2c17e47dc46f1c165599bbfb728e4ffc82eee01f488bd3d19075725059d30 SHA512 bc0d776ad2356009fedde4315e53e486c0a8638e913561a9f2f44260f8f17eb0bc2e42f3e0748a57369a03beed5baf08780d48d75627452d533d1c63fab70c14 WHIRLPOOL 1714109e079c897014cce988b47d9f573fc154e816d71cd6c20e533a59f73883e9e8b4f818e490f23ad7569610e6baa15eec59cc3fbc859177e297d1f0e8ad07
+EBUILD axtls-2.1.3.ebuild 4682 SHA256 91e6a87e49bebcf0e0c301843cf391a56dceab466451150d8c433b79a582a5d8 SHA512 c41e249e8f39c37f1fb89d0f9bdaf5b9c8e7596d3154eb6c32f50b47b5c9f46353221e3f8ed6d8092019e0bde5ab2a4d1da049be2d756aabe40a4c1b1c6c536a WHIRLPOOL ee87624d92a35d7e6217ba867350f58f7cea196a4529b8dfbca94eca1d4f5cdf00dfa1ef13aa0d65268ba7163b5995793335608f260736aa4d0469c46a3d3c47
 EBUILD axtls-2.1.4.ebuild 4687 SHA256 d7b0e29aebb94fabeb10da317c96e63b17d256534f6d9a5299b608b0058bfd1a SHA512 e266f60307098635db515eca0e6dc4aaed14d6c0ebd9b11184afe8bb34a20a1eee9367e8ee8e44ce843811d13c39ea7ba8b114657cdeeaa9c74656175ed33dda WHIRLPOOL 18e066109fe414be7573a7608f987696a67fec31a70dfc73302b7312be14d3061f6bcf20c8b2588ab00213a6ef3165fb2d4930a75c02b9d0d47e87845d6d151b
 MISC ChangeLog 4099 SHA256 968a536c0b0b7b0546c8e34bb2f9e47ec46d73eca507e0d48c128454bf6b6cee SHA512 c6f21424f63f68d6adfe2b61e9599bb69dca9538785ff1dcdf6bb9817c409d62e672f9c27f01dd52a563ccc2af88a708bd5bf9d7b5b2a386bcb0000771b73d37 WHIRLPOOL e76ca51d2ff1cab28833a0fe9f4bbdb542aa6f53a65b707d784fa71587ee2f4980e5fbc2a19bb250b759a42f8c19fe5917d9ae21917e4f1dfc79293dddd91597
 MISC ChangeLog-2015 7324 SHA256 9bcc860808864b9a4cb5bca7831ccc105b7c448ab68b6b7dbab264775207d797 SHA512 0fa7eabb3cb882ed1e93be4605adcaad8f19c251cba71907767348b9e5b11a3f645f9189703b58299290850cdcf8ac8cb54e5ac86c9f87003bc46bc167ccfcb2 WHIRLPOOL d40ed5f71382b38b2d1dba037d99fa1b796a0b6d67ce3f60d1c1dcb1738f9c5b9c3d90429924dfd448ed2a61819937f01bc3777b7ed954d917d2ff8901287cba
diff --git a/net-libs/axtls/axtls-2.1.3.ebuild b/net-libs/axtls/axtls-2.1.3.ebuild
index a701820d392d..48eafc5ea5bd 100644
--- a/net-libs/axtls/axtls-2.1.3.ebuild
+++ b/net-libs/axtls/axtls-2.1.3.ebuild
@@ -40,7 +40,7 @@ S="${WORKDIR}/${PN}-code"
 
 LICENSE="BSD GPL-2"
 SLOT="0/1"
-KEYWORDS="~amd64 arm ~arm64 hppa ~mips ppc ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 
 IUSE="httpd cgi-lua cgi-php static static-libs doc"
 
diff --git a/net-libs/gloox/Manifest b/net-libs/gloox/Manifest
index cbf0a63198b7..6a39901979e0 100644
--- a/net-libs/gloox/Manifest
+++ b/net-libs/gloox/Manifest
@@ -1,11 +1,5 @@
-DIST gloox-1.0.18.tar.bz2 700080 SHA256 16730e7fd4679e098a6d6c1f94ee72aca825e8f40e6744f5921ac32fdf22548e SHA512 b8387796914e237fa07cff17862f8eafad8506173a3bcd7a659158daf845a33606b3ec58822c2f0f8f629aa1ee68a2ac58489dba83516cb7da264da3678317a7 WHIRLPOOL 6b38e7e3d480083fd98fc4d5f8c2402faf1c5242d3201c29d40995cafd2aadafb20780c7219a1a55497ab95754ea1c5b8f79756fed9f2f3b84780dc060f4b1d0
-DIST gloox-1.0.19.tar.bz2 700335 SHA256 88466ab52ca99bfb22a74b738d9713a9cda0b06e539108354156ba408a5283f8 SHA512 6f62773aeb24631ea5edbbf2267275f9e6005bed240dfbd121784238709d85097a096d16b3cd7cb45d34b2daeab026dbb3b84994c504ba03180d9dff90f9fbb5 WHIRLPOOL 98586156b3a88807b3f1aca25b9fb06f17581b4a1e834cf1692b406b879f4f759ec424dfb36527bc0945774a798647a8b033a9ae860960b4f214f9a35051c00f
 DIST gloox-1.0.20.tar.bz2 701114 SHA256 0243086c0f4f0440d6d8e55705f83249a4463a1d75a034be42b5312e8886dea8 SHA512 b94269487875ae32631b5b15eeebe3293c6b8ab4080a6e15926c575305841a609a5e4da25bff266806ef4b65c1db14e9a9e5dabf8af8b174773cbdc37cfa12f8 WHIRLPOOL 872fa9587d9ab1a07197c40790f5ae72748df6f7d835a206c92da5819456118c8c7dc2f70fcf289e2840b272051436f204503ba12b143a33a48c4f150a36db34
-DIST gloox-1.0.9.tar.bz2 670206 SHA256 143dd50e1edc4eb1d304fa28bdd6ab9e53b60c37c1726dd0e34c06c51f9a453e SHA512 a3fa7acc76fdca0421030e71b6a13ca0b04589946df2a781609f1bddae5329299d68ce99a4a94a0760206b112759636379ce67d220422b99302fc799964bfa22 WHIRLPOOL 414eb34fa3ec11ae929f84198d95ed0da9de0739655ae1188ac3eb03998de5cecb9c165ad284496b405b49126236b628dc5b4579e855b10377add145fabb63b1
-EBUILD gloox-1.0.18.ebuild 1034 SHA256 61c818f5145bbe91e873a81712338bf642a094d9bc7f59019329c37153310de3 SHA512 1715e363458fede6ded96566ea70f380ca8875417ca911f4873db3e4c5d501e180d836a24ed398ca252553df4159f70faa00342dd0465ee9b6aa4a877aa551f5 WHIRLPOOL 130183e5b50f61b239757c77a7ad23f28335889fc0bf0252647f6e0135a2d2e483c2e7e5e5d3778d7c9ecca6e887eb71b63ea5537d3b16cd051271db989b24bb
-EBUILD gloox-1.0.19.ebuild 1058 SHA256 3c5015335debdfd8dab125c4e128f78c542e1d348a507d58b2fd1e281e571364 SHA512 37f496c9a2f2761c58b2b3d3350b8639b54fd31be7736964ed5ab7f6e7f1b3cff9bfa4c3411a45f27419b7f17a3e006cd8e15bb040129b65b0fc80b9d97cfbe1 WHIRLPOOL d1341047bcdc7e1dfb6ebc06ede45bf7f5fdb796ffef72846891ef0f6b6c303b49cf061f57449ffe9fce09c24322f4d948f11bc5de02439a396d4cac50114c55
 EBUILD gloox-1.0.20.ebuild 1058 SHA256 3ee0f23ecdf031e1a6e4d9646c16134d52d8c0ff6bd2db7025450185d2e36c0d SHA512 93f02a2cc0551d23a629409480740f80dace9796621b8e5f1097babf9af7f936ee9b8ef81b721d8ca25e7f64ce4aaf9329407674699bcbbbeafd9d2964ac5a1b WHIRLPOOL 50f29ae86cac7757d1ac6c32ad63f034e45ac53df2ffe5c4c7d8b2ba864a3e669e23e3651c151588899fd90785dc3726554a509218168e71ca7040fc5660038d
-EBUILD gloox-1.0.9.ebuild 771 SHA256 567cdc83bfa9d6e524d1ee6fdbfb1121998d58f3405c20c559c665b26243a226 SHA512 0f984b9e82532ae6edc411f6fc12845e1b8aba67bd028d68175bccef38f1f229eeb5fe5112040a5afc2ab687ac85709cfd591f0075aa1a1cdacc84249fad24a0 WHIRLPOOL c99deb08640777a81828020e6b25ffb55e5a2996b3ddbf82e491a0b403006571dc0f0a837e20ebfe30e487f2afa14ab07f10fcf96e34c62ad870004964ac62ce
 MISC ChangeLog 4397 SHA256 7a433aa21474a7ba55950b036ec79db78060bbdf0c723b6918be6394cf6c0bf1 SHA512 40adbffdbbbe4c6aecb99651475bb07e49962b49c53dd7d144780a0139bf1fc2aa565f161a7334eb580fbf0043911d3dba350f1100fa72bfde949e61bfa0ec06 WHIRLPOOL 611017cf23c3810a47db94448d522405d68c480d2f5d556dc5e99c0c737cb5815e6150874b47d60e2b0ad40bd62dc43316a84eb55350b4c5a459ab209b727956
 MISC ChangeLog-2015 5113 SHA256 9764305b6c484a602dd7b7d4878a5c04a3999f645aee62a7af86137974739397 SHA512 2d31099ee1c33d0f9a0d2793f23e2536000c4785609c788966d2c425792635363f441afb7a3395cbc8a7f1885f1fce89070ce541203be198d3d112dddeff5465 WHIRLPOOL e44580c9b663914efb5bbbd458b70a3f63b567c1018b6a25415f24b1fbcbadb2b70a38e27d89987f5c06b8b30083985d9ed94011fbdad054a0b4914cd96ea1be
 MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-libs/gloox/gloox-1.0.18.ebuild b/net-libs/gloox/gloox-1.0.18.ebuild
deleted file mode 100644
index 7472539b1e7c..000000000000
--- a/net-libs/gloox/gloox-1.0.18.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-MY_P="${P/_/-}"
-DESCRIPTION="A portable high-level Jabber/XMPP library for C++"
-HOMEPAGE="http://camaya.net/gloox"
-SRC_URI="http://camaya.net/download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~ia64 ~sparc ~x86"
-IUSE="debug gnutls idn libressl ssl static-libs test zlib"
-
-DEPEND="idn? ( net-dns/libidn )
-	gnutls? ( net-libs/gnutls )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	zlib? ( sys-libs/zlib )"
-
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	# Examples are not installed anyway, so - why should we build them?
-	econf \
-		--without-examples \
-		$(use debug && echo "--enable-debug") \
-		$(use_enable static-libs static) \
-		$(use_with idn libidn) \
-		$(use_with gnutls) \
-		$(use_with ssl openssl) \
-		$(use_with test tests) \
-		$(use_with zlib)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/net-libs/gloox/gloox-1.0.19.ebuild b/net-libs/gloox/gloox-1.0.19.ebuild
deleted file mode 100644
index b645b9a04135..000000000000
--- a/net-libs/gloox/gloox-1.0.19.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
-
-MY_P="${P/_/-}"
-DESCRIPTION="A portable high-level Jabber/XMPP library for C++"
-HOMEPAGE="http://camaya.net/gloox"
-SRC_URI="http://camaya.net/download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0/16"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~ia64 ~sparc ~x86"
-IUSE="debug gnutls idn libressl ssl static-libs test zlib"
-
-DEPEND="idn? ( net-dns/libidn )
-	gnutls? ( net-libs/gnutls )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	zlib? ( sys-libs/zlib )"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	# Examples are not installed anyway, so - why should we build them?
-	econf \
-		--without-examples \
-		$(usex debug "--enable-debug" '') \
-		$(use_enable static-libs static) \
-		$(use_with idn libidn) \
-		$(use_with gnutls) \
-		$(use_with ssl openssl) \
-		$(use_with test tests) \
-		$(use_with zlib)
-}
-
-src_install() {
-	default
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/net-libs/gloox/gloox-1.0.9.ebuild b/net-libs/gloox/gloox-1.0.9.ebuild
deleted file mode 100644
index 3251794a33ee..000000000000
--- a/net-libs/gloox/gloox-1.0.9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P=${P/_/-}
-DESCRIPTION="A portable high-level Jabber/XMPP library for C++"
-HOMEPAGE="http://camaya.net/gloox"
-SRC_URI="http://camaya.net/download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ~ppc64 sparc x86"
-IUSE="debug gnutls idn ssl zlib"
-
-DEPEND="idn? ( net-dns/libidn )
-	gnutls? ( net-libs/gnutls )
-	ssl? ( dev-libs/openssl )
-	zlib? ( sys-libs/zlib )"
-
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	econf \
-		$(use_enable debug debug) \
-		$(use_with idn libidn) \
-		$(use_with gnutls gnutls) \
-		$(use_with ssl openssl) \
-		$(use_with zlib zlib)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 88e936d26af7..97cc5979ded4 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -4,7 +4,7 @@ DIST gnutls-3.5.16.tar.xz 7559812 SHA256 0924dec90c37c05f49fec966eba3672dab4d336
 DIST gnutls-3.6.0.tar.xz 8024972 SHA256 2ab9e3c0131fcd9142382f37ba9c6d20022b76cba83560cbcaa8e4002d71fb72 SHA512 e5f36d7e8d64e8432098e30549c321745d3605eeb85aba2a04bfa92146ca771961f0e2f3682bcae36be5b6095acd25996104a4213ce7b3466d61332a5188dc03 WHIRLPOOL e8e479d7a0adc14c969b7364f58505f68ed92054fb8d8ba862f59d9ab64578e83ae02309ec9b5da2e63fc5dec799d86e434abc32394dbf414dc46bf46b15b0c8
 DIST gnutls-3.6.1.tar.xz 8064408 SHA256 20b10d2c9994bc032824314714d0e84c0f19bdb3d715d8ed55beb7364a8ebaed SHA512 1f2bd3203ea96844c531be700b44623b79f46743143edf97011aab07895ca18d62f1659c7fafc5e1c4b0686fde490836f00358bdd60d6ac0b842526db002da23 WHIRLPOOL aa859108083d7b6580b6e9c6dd2f4cbf43bb444114339ca68bc7bc45a1238b7793b50e95fdd26fa9592a8892881fedd79697999111f568f3a56e32be91996e65
 EBUILD gnutls-3.5.13.ebuild 4239 SHA256 1a469cfd52bb5ae35dd8c082d92da70eb95df5d31d6408ebce877e4ee5414367 SHA512 7a3ab4ada4edc640dac61f6fa7054d4ef1b8e3c434634cbe6edfbc1d7a99694e9612c5d2f6bf39c57389ef55f73f602b90c3a4e472ae3a0e571d83d6bc54fd42 WHIRLPOOL 7558a9899237bd14695304d52e108b0aaf314e489d5635a7180dd063c0c09e95b0ac17482759f59c7a23f38d2188a6030f9ea9fc2bb82d8e45d33247ce933970
-EBUILD gnutls-3.5.15.ebuild 4341 SHA256 41d87ba00de0d1e4410a9fc6b08c275ee698c05fc991131dc87a389b27e3edb9 SHA512 46fd00d54ef3db933d62b1c51290e24e7f7c4972925ede37fd6083e421fb90bb8adb215d446fa201661703020555c443c38090fda2086976b3e8d679221c317f WHIRLPOOL 7ebd1870bf98d39d0bf2d5652f7da5294c4ac1d6df9ad402f2f642e967bba8c5060a092534733d1984088b2978ccd0a0c08adbc4c71df490b6fded931bb6fe62
+EBUILD gnutls-3.5.15.ebuild 4340 SHA256 8d70a35114e01ff61ee54e4f9dd1c8298c8941d81e20a16a9d5f5675c3e11752 SHA512 a014fe4d78c5c76ca379f95be2588ea54c373feeb4269866e7d79b6d10c22e3b063e0e7fea50c44ab3ea491d7a435ee223f92356a9e7260788c8495894e436da WHIRLPOOL c0572c2bea42bf1ffe125321c6315d3df9e69af69b565dc37e14c88b15d99facbb19c43617eec0c6e8f12e287298c9aeaa90c5f28717ae3be3a485b98010ec27
 EBUILD gnutls-3.5.16.ebuild 4348 SHA256 60325da7c14160c32e04a9debd687c857ec204b66f62067b56c8b31b3d7b7f8f SHA512 9937ce68b1e6322a60ad8e03b1e75dbdce825444aa879e563a77002040ac0d26b6b98739ac5b1f70827d93621f873e1f822cf5bc58f1766a7d70207781e75b83 WHIRLPOOL a71d1bfc14f273791af793de045e68810bbfd8c4c0ef0b0d734efee7e8ff283aa87996d91ec97a9331461dca1b7f331db2283fd1136e6ed57640852c83d3f53b
 EBUILD gnutls-3.6.0.ebuild 3965 SHA256 9711114c2b419436ccfa3fae4044802e22fa35471bd9285cfc3408f36be50989 SHA512 87f609adfed0b553b68dac75a4a89a17b6e51a28be4ebb8a4ba810bfa1f984ee6d57a5f0a7c91f32a5af3c0e7548b7abe9ec471352b905227a8897ffbc435f29 WHIRLPOOL 5466e3f81ca9c0ff730274225c38c36d0addb985b2e3c3cf27522cf71d7ae2602039398b4f695185391f77233cd6045edb9cf371988b6d48cb3509fc3f1fcafb
 EBUILD gnutls-3.6.1.ebuild 3965 SHA256 9711114c2b419436ccfa3fae4044802e22fa35471bd9285cfc3408f36be50989 SHA512 87f609adfed0b553b68dac75a4a89a17b6e51a28be4ebb8a4ba810bfa1f984ee6d57a5f0a7c91f32a5af3c0e7548b7abe9ec471352b905227a8897ffbc435f29 WHIRLPOOL 5466e3f81ca9c0ff730274225c38c36d0addb985b2e3c3cf27522cf71d7ae2602039398b4f695185391f77233cd6045edb9cf371988b6d48cb3509fc3f1fcafb
diff --git a/net-libs/gnutls/gnutls-3.5.15.ebuild b/net-libs/gnutls/gnutls-3.5.15.ebuild
index a227bc366700..78d20075ee59 100644
--- a/net-libs/gnutls/gnutls-3.5.15.ebuild
+++ b/net-libs/gnutls/gnutls-3.5.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
 IUSE="+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib ${IUSE_LINGUAS// / linguas_}"
 
diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index 563fdefe9040..916267b1acd8 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -1,6 +1,4 @@
-DIST gtk-vnc-0.6.0.tar.xz 439104 SHA256 9559348805e64d130dae569fee466930175dbe150d2649bb868b5c095f130433 SHA512 38d37753bd8c88d112c046eb8430383b073b6516c72660b3e53612986a6772b72e3e6037f61e7a3700980ab1509c1f44fbfe0b80594c8a5e5520df166212f158 WHIRLPOOL e156f368a9d70e90077253b031db49f5f58e2f248b3e15bc11340f01f6bcbd342cf08dd9810c8ee447ab372159d09c3353aa5ce6195f67c677e7c43a563a75c0
 DIST gtk-vnc-0.7.1.tar.xz 444380 SHA256 f34baa696615ef67666e8465b4d0ac563355e999a77d2cc42ad4625a24f7aab1 SHA512 5d62f60e1c9fe70f93a9d21c529145459f0d59d588631597d533ecba94864271d1095599db9447ac4843814be61af7a7c947f69e5a9cd26db7e811f2c4e95f0c WHIRLPOOL b4736926bbd8ad49c6b2dd2a1b921a35a9ca5b8987c04b03ea588efe09b3db20eade41204d0a0542ee683efd6d2ec23636c13bc2e214ed452d885aef1302902a
-EBUILD gtk-vnc-0.6.0.ebuild 4272 SHA256 cd9d2c1d0ac45f531199575435c401bda98a722bb7e13e4d662080973094070d SHA512 b2a232de413a5be9ef4f0ff8764ffc533f6c6498b3348da255674942e8d474f93327b584db6697afc926cf827808ad0f3334b44d2baca94a1b49fceb4d18ed41 WHIRLPOOL 5ad6090b08b6e471e605dd42a5cf47d148fcb2789b8ab3b781345f314a256934a35e38396270d1e1d6611651a0310b6fcc127b6876da399eef81d378d0900a8b
 EBUILD gtk-vnc-0.7.1.ebuild 4272 SHA256 cd9d2c1d0ac45f531199575435c401bda98a722bb7e13e4d662080973094070d SHA512 b2a232de413a5be9ef4f0ff8764ffc533f6c6498b3348da255674942e8d474f93327b584db6697afc926cf827808ad0f3334b44d2baca94a1b49fceb4d18ed41 WHIRLPOOL 5ad6090b08b6e471e605dd42a5cf47d148fcb2789b8ab3b781345f314a256934a35e38396270d1e1d6611651a0310b6fcc127b6876da399eef81d378d0900a8b
 MISC ChangeLog 3566 SHA256 b3fe6a69fac240ab4d92d7f391665ca02dd0d3d0b5219dfdcd54bbbf0b1d9254 SHA512 6120268845595f9fa76af003600818ce924d6426b611ca086a64449a9cc7fafd09906a0c2ed02e3e380cd1a9a05ae8d2d78efeccd08befff5f944de832874ed0 WHIRLPOOL fdafc9210492328154646791c614402d2969949ca23c5c6d0594e643bf54b9533db20533ab73f3ad9d2dcd7a402233143f8ab02b9a15cf74911eb3ec085b71b5
 MISC ChangeLog-2015 18144 SHA256 2e2e10e3799768848762378e009823ba9a184d506ddd268bbe1207082343a913 SHA512 32da60bfd0f5b28e97eace4df4ca280041760ad64a179394549681fc5de85e1cf6f77b53ad4f07b705773e7ccf0882d2ca0d7410d9457f5fec497527f1360c4e WHIRLPOOL f4ea0319830cbddec3c8a0a2a30e3614ad78ae0b45e7f1f4f231690680397a7b97a63f92a5479d15f3d2ff36a1239b8ad8f439511d734dc238246196122efa68
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.6.0.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.6.0.ebuild
deleted file mode 100644
index e8d0f456c9b3..000000000000
--- a/net-libs/gtk-vnc/gtk-vnc-0.6.0.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-VALA_MIN_API_VERSION="0.16"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 multibuild python-r1 vala
-
-DESCRIPTION="VNC viewer widget for GTK"
-HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="examples +gtk3 +introspection pulseaudio python sasl vala"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	vala? ( gtk3 introspection )
-"
-
-# libview is used in examples/gvncviewer -- no need
-# glib-2.30.1 needed to avoid linking failure due to .la files (bug #399129)
-COMMON_DEPEND="
-	>=dev-libs/glib-2.30.1:2
-	>=dev-libs/libgcrypt-1.4.2:0=
-	dev-libs/libgpg-error
-	>=net-libs/gnutls-3.0:0=
-	>=x11-libs/cairo-1.2
-	>=x11-libs/gtk+-2.18:2
-	x11-libs/libX11
-	gtk3? ( >=x11-libs/gtk+-2.91.3:3[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.4:= )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygtk-2:2[${PYTHON_USEDEP}] )
-	sasl? ( dev-libs/cyrus-sasl )
-"
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? (
-		$(vala_depend)
-		>=dev-libs/gobject-introspection-0.9.4 )
-"
-# eautoreconf requires gnome-common
-
-compute_variants() {
-	MULTIBUILD_VARIANTS=( 2.0 )
-	use gtk3 && MULTIBUILD_VARIANTS+=( 3.0 )
-}
-
-src_prepare() {
-	prepare() {
-		mkdir -p "${BUILD_DIR}" || die
-
-		if [[ ${MULTIBUILD_ID} == 2.0 ]] && use python ; then
-			python_foreach_impl prepare
-		fi
-	}
-
-	local MULTIBUILD_VARIANTS
-	compute_variants
-	multibuild_foreach_variant prepare
-
-	# Fix incorrect codegendir check: h2def.py is in pygobject, not pygtk, upstream bug#744393
-	sed -e 's/codegendir pygtk-2.0/codegendir pygobject-2.0/g' \
-		-i src/Makefile.* || die
-
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		$(use_with examples)
-		$(use_enable introspection)
-		$(use_with pulseaudio)
-		$(use_with sasl)
-		--with-coroutine=gthread
-		--without-libview
-		--disable-static
-		--disable-vala
-	)
-
-	configure_python() {
-		ECONF_SOURCE="${S}" gnome2_src_configure \
-			${myconf[@]} \
-			--with-gtk=2.0 \
-			--with-python
-	}
-
-	configure_normal() {
-		ECONF_SOURCE="${S}" gnome2_src_configure \
-			${myconf[@]} \
-			--with-gtk=${MULTIBUILD_VARIANT} \
-			--without-python
-
-		# for gtk3, python support is via gobject-introspection
-		# Ex: from gi.repository import GtkVnc
-		if [[ ${MULTIBUILD_ID} == 2.0 ]] && use python ; then
-			python_foreach_impl run_in_build_dir configure_python
-		fi
-	}
-
-	local MULTIBUILD_VARIANTS
-	compute_variants
-	multibuild_foreach_variant run_in_build_dir configure_normal
-}
-
-src_compile() {
-	compile_python() {
-		cd "${BUILD_DIR}"/src || die
-		# CPPFLAGS set to help find includes for gvnc.override
-		emake gtkvnc.la \
-			VPATH="${S}/src:${GTK2_BUILDDIR}/src:${BUILD_DIR}/src" \
-			CPPFLAGS="${CPPFLAGS} -I${GTK2_BUILDDIR}/src" \
-			gtkvnc_la_LIBADD="${GTK2_BUILDDIR}/src/libgtk-vnc-1.0.la" \
-			gtkvnc_la_DEPENDENCIES="${GTK2_BUILDDIR}/src/libgtk-vnc-1.0.la"
-	}
-
-	compile_normal() {
-		gnome2_src_compile
-
-		if [[ ${MULTIBUILD_ID} == 2.0 ]] && use python ; then
-			local GTK2_BUILDDIR="${BUILD_DIR}"
-			python_foreach_impl run_in_build_dir compile_python
-		fi
-	}
-
-	local MULTIBUILD_VARIANTS
-	compute_variants
-	multibuild_foreach_variant run_in_build_dir compile_normal
-}
-
-src_test() {
-	local MULTIBUILD_VARIANTS
-	compute_variants
-
-	multibuild_foreach_variant run_in_build_dir default
-}
-
-src_install() {
-	install_python() {
-		cd "${BUILD_DIR}"/src || die
-		emake install-pyexecLTLIBRARIES DESTDIR="${D}" \
-			VPATH="${S}/src:${GTK2_BUILDDIR}/src:${BUILD_DIR}/src" \
-			CPPFLAGS="${CPPFLAGS} -I${GTK2_BUILDDIR}/src" \
-			gtkvnc_la_LIBADD="${GTK2_BUILDDIR}/src/libgtk-vnc-1.0.la" \
-			gtkvnc_la_DEPENDENCIES="${GTK2_BUILDDIR}/src/libgtk-vnc-1.0.la"
-	}
-
-	install_normal() {
-		gnome2_src_install
-
-		if [[ ${MULTIBUILD_ID} == 2.0 ]] && use python ; then
-			local GTK2_BUILDDIR="${BUILD_DIR}"
-			python_foreach_impl run_in_build_dir install_python
-		fi
-	}
-
-	local MULTIBUILD_VARIANTS
-	compute_variants
-	multibuild_foreach_variant run_in_build_dir install_normal
-}
diff --git a/net-libs/libnsl/Manifest b/net-libs/libnsl/Manifest
index adb11981b8ca..ae5f9cae0bb9 100644
--- a/net-libs/libnsl/Manifest
+++ b/net-libs/libnsl/Manifest
@@ -1,3 +1,4 @@
 DIST libnsl-1.1.0.tar.gz 209148 SHA256 a23cfcf7f29f168b95e821d01217600096c05be8cd5c085450cb4f160425277b SHA512 12555ed701d06247b6774c6c2759ada280ffce73820976adb4aaa48b50b97121b1805412541778dfcdd8845af6a10b2e5a9dc0eb7b953e84467d0a40ad3360cd WHIRLPOOL c347bbd72b75d1e3ab0069f802da8e4e4e4931a8a61b4abed1dd664c4576e7e22e96c012858c684ec79a981aea84460eae3a2ccb8e94aa7bfecfdd99c3e54730
-EBUILD libnsl-1.1.0.ebuild 788 SHA256 b3161b67dd23cf274629a7ff5d296e430e5fd8069ce80f4fa39b0cdc6cd2f7ff SHA512 17ba18e3557194108af91690365e5df91a05ac4719440d76a798f10a08000b809808e7f4e39f1d7b91ac32ca400d20b4aaa7e95c69a53111dc852f47fd736f61 WHIRLPOOL 2b9ab19b211648d304c4e3615d8fc437b054cf0df7d2416ad7a5ffaee3e6a0b1ba6949f8d16111556a8da8aa8564a86105f78474efa1b80d97b3d41f2fe903e6
+EBUILD libnsl-0.ebuild 508 SHA256 270e32435767db6bcac69667faf7283f7c759275666a6ec77b824bb000f87306 SHA512 8eb53fa8435bc495128897d323db8f6bc41808e01d2f59797ab901bd3b773952318917bef83e7ed7d89764fdcc6075e210dace1a164d909aecbaee7c53059ce3 WHIRLPOOL 4ccbcfe7942a3124790b9aedaa88559cd5085f4ffd4ad49e223350daead23851b11d23932b72f20e55e820be83dc0474c5c284fb2c56d5a715029bea1e0e6fb0
+EBUILD libnsl-1.1.0-r1.ebuild 736 SHA256 e1b7fdf9602adf1b615b24ec279fe49f973eb1add9e45aa1b6ed411d1bb5d900 SHA512 a3896d15411f106cad1e17252c43a7e36c1922be50af348a8cbb5e8ac435d883a56969d36da3880c5a9ec1dafaeebca8c29ff4cfbee6785029bb3c7c981f3136 WHIRLPOOL be3b7a23937bc2eb6f4f064183f9c70c864ad67e55fad101844e98f352cf2297850408bcea4f3b7c6f3aa941b88b976da4b8699c3883ab8c511507b307a53716
 MISC metadata.xml 379 SHA256 ebf32af5bc074fc17a37c93745bc34847424be60d6d5d23a69d88baabc554bcf SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753 WHIRLPOOL eab5963365c94d28e5e60cc0b4eaee3d576bf8cc3372eb739f0fcbdbf4f3c37fc1af7c90b39866e476fdcd2d529b7e78f2bbcc1d3b938c047702d09db3141fa6
diff --git a/net-libs/libnsl/libnsl-0.ebuild b/net-libs/libnsl/libnsl-0.ebuild
new file mode 100644
index 000000000000..f5c68293a69b
--- /dev/null
+++ b/net-libs/libnsl/libnsl-0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Public client interface for NIS(YP) and NIS+ in a IPv6 ready version"
+HOMEPAGE="https://github.com/thkukuk/libnsl"
+
+# Fake version to help portage upgrading.
+
+SLOT="0/1"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE=""
+
+DEPEND="<sys-libs/glibc-2.26"
+RDEPEND="${DEPEND}"
diff --git a/net-libs/libnsl/libnsl-1.1.0-r1.ebuild b/net-libs/libnsl/libnsl-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..407fc963fdaa
--- /dev/null
+++ b/net-libs/libnsl/libnsl-1.1.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Public client interface for NIS(YP) and NIS+ in a IPv6 ready version"
+HOMEPAGE="https://github.com/thkukuk/libnsl"
+SRC_URI="https://github.com/thkukuk/${PN}/archive/${P}.tar.gz"
+
+SLOT="0/2"
+LICENSE="LGPL-2.1+"
+
+# Restore keywords and stabilize together with glibc-2.26!
+KEYWORDS=""
+
+IUSE=""
+
+DEPEND="
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}
+	!<sys-libs/glibc-2.26
+"
+
+S=${WORKDIR}/${PN}-${P}
+
+src_prepare(){
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# Fool multilib-minimal to run ./configure in out-of-tree build
+	ECONF_SOURCE=${S} econf
+}
diff --git a/net-libs/libnsl/libnsl-1.1.0.ebuild b/net-libs/libnsl/libnsl-1.1.0.ebuild
deleted file mode 100644
index 3abda843bf65..000000000000
--- a/net-libs/libnsl/libnsl-1.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Public client interface for NIS(YP) and NIS+ in a IPv6 ready version"
-HOMEPAGE="https://github.com/thkukuk/libnsl"
-SRC_URI="https://github.com/thkukuk/${PN}/archive/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE=""
-
-DEPEND="
-	!<sys-libs/glibc-2.26
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${PN}-${P}
-
-src_prepare(){
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# Fool multilib-minimal to run ./configure in out-of-tree build
-	ECONF_SOURCE=${S} econf
-}
diff --git a/net-libs/librsync/Manifest b/net-libs/librsync/Manifest
index 4b749f4f1553..60223255bc6a 100644
--- a/net-libs/librsync/Manifest
+++ b/net-libs/librsync/Manifest
@@ -7,7 +7,7 @@ AUX librsync-2.0.0-search.patch 358 SHA256 3a94ba9d2b0847d0dade733c9f4f456f910f2
 DIST librsync-0.9.7.tar.gz 453802 SHA256 6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6 SHA512 339362fd01c94411849d3e4a6e95db1bef6cffa0475b1af49d73f11be0421a12d4c73ecbf1a272af01b2a21cec81b4a801c1f7d735e107d0242707fb4c45f9ef WHIRLPOOL 7cf5cc675c4bf4e041d9132f0a8311f83e827bfa7dd75180f3153cabeab41a94011e1a9b56e63a61dbe119444e2c24a39054986d97b686db99293ad9177b2bf7
 DIST librsync-2.0.0.tar.gz 155049 SHA256 b5c4dd114289832039397789e42d4ff0d1108ada89ce74f1999398593fae2169 SHA512 1a88dcc3aa60949e058c57eb0df3e0086823c493de40fed927246f5aada6274db57202074456a0ce5d9aa8b81b41836b0d6221ded6a75d43829572584177e8c0 WHIRLPOOL a09e76a712ca21a37bc3d06cf2f97a0e7201cfcf82c18cbebf3f07bfd453ac3503d18c900b7c1136e0319ec7f3b7c4a6c43611648c78b31fe13c7298ccf016e0
 EBUILD librsync-0.9.7-r3.ebuild 879 SHA256 10d0895baf99f03c235de45ee3d334759e433dc23a3444e4e4d7e9edecc2c864 SHA512 9c47fefe790a75f0b8921ae400bfc811e8376dcacbd50a4399b49cf390c56dd942dc9f535210f5228606c4069743f1399eb6add6dba7182bdbce89935f02bf8a WHIRLPOOL 784d22288456cf9d994beb650a6631f3e4e0c17d1d22b673fcca2aa611aa81049f0e0ccca09883d5a90348f2f84c6f15512cd92df62a5cbbc62ff67020e4a1b2
-EBUILD librsync-2.0.0-r1.ebuild 832 SHA256 61bc81220dd35d2557856fe94a26d62d0cafed7f50cabc0b0a627fdb9c226fc2 SHA512 c2b8e301e3a81c8d06f8dc00f874075fdcc6f0b112825dc3d0fdae45d09952f17b43b10b8452832d20deadd94333e9ea79d0f0890e58b7cedf94fcb724529b47 WHIRLPOOL b4caa81ee12c84ac60fc7b628f2fbfc007ac9456f01b32d236187eb4eec501320890ece7decade2c1953eb086dc7ae8fc5b0ef617cf1b798f11947277e796abf
+EBUILD librsync-2.0.0-r1.ebuild 830 SHA256 1467809bcff3d5ed61653ab67ce4ce145f71174717b7833c7831fb9e84f0f1d6 SHA512 460aaf5472e2aa2dbe1cd3e6962529df47d4b47c03780017e5aa29cde6dc61ca00c2522c222f506b178c87a2b1ba6d8d6c515e5d302e66a945cdac3079356216 WHIRLPOOL 3c72a93d56dae52717b44105ebe7925bd31d60e304df07e87197220c30a501489ae433d5d50030254b1b680b78dcd817fe524c043e9aabd8370062c8202a82ac
 EBUILD librsync-2.0.0.ebuild 764 SHA256 cd23c43d8611be927f3ff3d7c6500e2c07eeba3aebd44c694dafacba84afc616 SHA512 6a838f1028a13fc27a224fc3be357efc647218bec0b2fd6d0a147118ddaa56f65da13801bddb616a5a1f63b3b9fa3ba971df51c379d985285815cbe8d0ce2f86 WHIRLPOOL 8d2c72e537d85ebe6731cbe01173ba5076f94a04d7183e1b45d241afbe10e09534ba141c9a85596818b8edfa778493b810c66eebc6892bf84bb1a75be5a5ec89
 MISC ChangeLog 6265 SHA256 f7570dcc522328911493ce9390eb94c934819f1fdb527afbedabc0cff0e18a3a SHA512 aee1a18202c634b5e69186f161ec8682bd6051b3c24f44302579b9ed753d710c062f500d0fe3e66ef4418e7122fb574188f6da74e238608dceee7c67dffa08f8 WHIRLPOOL c29ce69104b65ff1588ce5e6266224dbecde9503e437654e4ed738794107c6ae6f3ae8b1136c7da847881566bdc29bc41304c2e1ef197449f1e8d8fa25e8a92f
 MISC ChangeLog-2015 6029 SHA256 89da3593c12b4488f605a06b090d097763499cf690588d88003ac46669653bce SHA512 3156822c3f2131358e41252515b0957e0ce7d9ed49ffd66cc3a7a2572a75f6e89e67f964981e1dfc1e961f5987b508a672f67a6d3cff0a88ed2bfdf6063d2a31 WHIRLPOOL c3cbdf9e6a55298c24b97f7d5f0f0f003bdbc4b6fb79343f7f55668b7590ffbf5ca46aa57ee8c120c8d5846372b185150ea35592173566ed2af7654e996b008c
diff --git a/net-libs/librsync/librsync-2.0.0-r1.ebuild b/net-libs/librsync/librsync-2.0.0-r1.ebuild
index e4f6f64ddb5f..6cfffd0e4a3d 100644
--- a/net-libs/librsync/librsync-2.0.0-r1.ebuild
+++ b/net-libs/librsync/librsync-2.0.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="dev-libs/popt"
 DEPEND="${RDEPEND}"
diff --git a/net-libs/libsignon-glib/Manifest b/net-libs/libsignon-glib/Manifest
index b63f7a3b8016..87b1fcf8e3f6 100644
--- a/net-libs/libsignon-glib/Manifest
+++ b/net-libs/libsignon-glib/Manifest
@@ -1,5 +1,8 @@
 AUX libsignon-glib-1.12-doc-disable.patch 844 SHA256 b1e018828b83454a752d197d5c9db6332584bc94a8eb5f20f55e9ce9b0729299 SHA512 690ee30d4e1d6277c0b02720212654d482173a75657da7f72c30f258921cbe790ea2d47d3de9a598be04e4ef55b995118ab5a537ed728c2735445915810f561d WHIRLPOOL 262f38233ffd5a9834d4513fa5f43d555245a8148e2b4b6f923cbf0b4c5a30e79e2fffa43eb1001effb32b1e3b88d9ae55c9489959e87f96e64776272a3e496c
+AUX libsignon-glib-1.14-default-opts.patch 1714 SHA256 7390b1ee3502fd80b2e7865ace1d2f9288990bbb3ea108019c7d477c924dc87c SHA512 bb27417ff1dc03510fdd1f019b7b8d044a8c281243467dfa7d2fdd8123ef3290a325a7c9a96bd246f37891bd7ac9ce2702b40396ed067dbac4b9e995a89d2430 WHIRLPOOL 3ab8ce2320b33495ab630b6f8c3285c5dd62426d687e60804abb313973e9db9edcf30f0e5700b2b4865b2f110345e28dbc184cf52ecf80eb0a2279ca5eb4a4cd
 DIST libsignon-glib-1.13.tar.gz 51601 SHA256 8e0e450e719c16f79d3c3aadb98656ed5967a2f2cd24c1d9cd5747e670a087bc SHA512 aaae6a37a113685eb36ddccd497e387617cf0900506638cbafbac282c4d63ade41f4c915ad6f04214c58af580b70d9062ecf3e1618b6f5fe07dad50c5dc125a6 WHIRLPOOL 8f0d1d51588e42c9fac51883a9ecb08b6ad4949fc8f335c2259f967ea8f3555b04b3ca46f323b20591a2bc85dc1b5bba3968fec1be3e4dfd7a9464e2c5d6880e
-EBUILD libsignon-glib-1.13-r1.ebuild 1684 SHA256 9481a91440927a361f0960bb7358c7651de3d9a69f5a8730636f3459bbc6edf6 SHA512 4f43d6b4061b0d2198266b8859b3b495d348ec9f918563eac22f486862c812767019bbeada1125937af3f39781501732b16e0aa2f20b0199895210da7caa4d37 WHIRLPOOL af5e0769bbc28d2a14be6de100ad63282ef4487ca4b1c6a9b13de64550241c2e2254a09fd174f40f9e0358c2990f397f5db4d63e1864228de6e2183e3eaa19ee
+DIST libsignon-glib-1.14.tar.gz 54019 SHA256 99db552f250d0853c468a3f03872123bb7102dbdc91e15a7a4855f7a47dd2fca SHA512 c2277933d6ec2c3288ce510c853da7719116dac15d60c7114fcdcb87d04e7f70390d066938dea6aa0f819fbd70158fb875c5be5684c47fd27c0b6c55e9467a1d WHIRLPOOL 17ba0ab1a2cb64d0021aadc1a516d3ac85b86439ffb4d11e6c0ee87c6b39df84b82a89c29ff66e7547ad63137861479b86c91ad960ee4ee40d3f494a56621c78
+EBUILD libsignon-glib-1.13-r1.ebuild 1697 SHA256 00d9251ff29ed866539e7c9d916370d41adde35d43ef71c4a446cec36238b5e6 SHA512 c19bd7185b8aede936c4cf1b0fa6ff237538b7a3b9943670529defb637f116adda61bc7beee5b6acc750f420763afb5eb3d8836cf0c4adbc7b49931ba62b4fa2 WHIRLPOOL cf9561f48a7a1b3e2a84367de81c5632e85c4ce87f98597278975f2528a5d6546f741c31b4d7a1966a29ec3f354e3f8ebc2128c9692f63337b7f2cd92dba7178
+EBUILD libsignon-glib-1.14.ebuild 1754 SHA256 867853043cc92ba99ef70041e12949bea2ed75f9c55a7181cabb976a930aa379 SHA512 8e2dc163b9c68ad2ffd36f5763bb476dd3b43b71979bb601664e2c430416687515c09b01ec27171a09a93dc3dbb4483bb44c287bcae43147c31e04624f3fa907 WHIRLPOOL f9381bc1f712a03c02aa53e9c3b90330aa89954e76542a2cf0716099829f51cb8842fee5662fe4bb4e738e29b6a15dbe8aef08f39de9d05a06bc9251ae2c9b70
 MISC ChangeLog 2717 SHA256 4cc25f89a1e21f313f5ab4b8f2d155b08a414a52e6a01ab0819c5a7153e1d3d4 SHA512 7ad69f6734bd5c6814a7b31f991b04b30c241968c137142dd26eefa775afc683aa3f18a1a838e1cc1ee43fccff7edc05ad75e45671becbb86684822aef213ae7 WHIRLPOOL b060bc259883b87b137cc532d9f9686b4f4303983411a1126ba0c5e52002c7b200bb7ba71e918de6b0ad2022f0d02861579051b8a4779afcf424ddd26149ba83
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/net-libs/libsignon-glib/files/libsignon-glib-1.14-default-opts.patch b/net-libs/libsignon-glib/files/libsignon-glib-1.14-default-opts.patch
new file mode 100644
index 000000000000..5dcf8cc45695
--- /dev/null
+++ b/net-libs/libsignon-glib/files/libsignon-glib-1.14-default-opts.patch
@@ -0,0 +1,45 @@
+From 4982923fdc7be9978d3b089fb443bcb0e20243eb Mon Sep 17 00:00:00 2001
+From: Alberto Mardegan <alberto.mardegan@canonical.com>
+Date: Tue, 21 Jun 2016 13:35:03 +0300
+Subject: [PATCH] Build: fix value of default options in configure.ac
+
+GLib assertions where always disabled, even if the --disable-*
+parameters where not passed to configure.ac.
+
+Quick reference:
+http://www.robster.org.uk/2011/02/07/autofoo-ac_arg_enable/
+---
+ configure.ac |  9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 364f9f2..3cde223 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -63,17 +63,20 @@ AM_CONDITIONAL([ENABLE_TESTS], [test "x$have_check" = "xyes"])
+ GTK_DOC_CHECK([1.14], [--flavour no-tmpl])
+ 
+ AC_ARG_ENABLE([cast-checks],
+-    [AS_HELP_STRING([--disable-cast-checks], [compile with GLib cast checks disabled])])
++    [AS_HELP_STRING([--disable-cast-checks], [compile with GLib cast checks disabled])],
++    [], [enable_cast_checks=yes])
+ AS_IF([test "x$enable_cast_checks" = "xno"],
+     [CFLAGS="$CFLAGS -DG_DISABLE_CAST_CHECKS"])
+ 
+ AC_ARG_ENABLE([asserts],
+-    [AS_HELP_STRING([--disable-asserts], [compile with GLib assertions disabled])])
++    [AS_HELP_STRING([--disable-asserts], [compile with GLib assertions disabled])],
++    [], [enable_asserts=yes])
+ AS_IF([test "x$enable_asserts" = "xno"],
+     [CFLAGS="$CFLAGS -DG_DISABLE_ASSERTS"])
+ 
+ AC_ARG_ENABLE([checks],
+-    [AS_HELP_STRING([--disable-checks], [compile with GLib checks disabled])])
++    [AS_HELP_STRING([--disable-checks], [compile with GLib checks disabled])],
++    [], [enable_checks=yes])
+ AS_IF([test "x$checks" = "xno"],
+     [CFLAGS="$CFLAGS -DG_DISABLE_CHECKS"])
+ 
+--
+libgit2 0.26.0
+
diff --git a/net-libs/libsignon-glib/libsignon-glib-1.13-r1.ebuild b/net-libs/libsignon-glib/libsignon-glib-1.13-r1.ebuild
index 83bffcb79c46..7a39014192a5 100644
--- a/net-libs/libsignon-glib/libsignon-glib-1.13-r1.ebuild
+++ b/net-libs/libsignon-glib/libsignon-glib-1.13-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-inherit autotools eutils python-r1 vcs-snapshot xdg-utils
+inherit autotools python-r1 vcs-snapshot xdg-utils
 
 DESCRIPTION="GLib binding for the D-Bus API provided by signond"
 HOMEPAGE="https://01.org/gsso/"
@@ -15,7 +15,7 @@ LICENSE="LGPL-2.1"
 KEYWORDS="amd64 x86"
 IUSE="debug doc +introspection python test"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE} python? ( introspection )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} introspection )"
 
 RDEPEND="
 	dev-libs/glib:2
@@ -40,7 +40,7 @@ src_prepare() {
 	default
 
 	if ! use doc; then
-		epatch "${FILESDIR}/${PN}-1.12-doc-disable.patch"
+		eapply "${FILESDIR}/${PN}-1.12-doc-disable.patch"
 	fi
 
 	eautoreconf
@@ -83,5 +83,5 @@ src_install() {
 	if use python; then
 		python_foreach_impl run_in_build_dir default
 	fi
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild b/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild
new file mode 100644
index 000000000000..fe543c511282
--- /dev/null
+++ b/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+inherit autotools python-r1 vcs-snapshot xdg-utils
+
+DESCRIPTION="GLib binding for the D-Bus API provided by signond"
+HOMEPAGE="https://01.org/gsso/"
+SRC_URI="https://gitlab.com/accounts-sso/libsignon-glib/repository/archive.tar.gz?ref=VERSION_${PV} -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc +introspection python test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} introspection )"
+
+RDEPEND="
+	dev-libs/glib:2
+	net-libs/signond
+	introspection? ( dev-libs/gobject-introspection:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	doc? ( dev-util/gtk-doc )
+"
+
+DOCS=( AUTHORS NEWS README.md )
+
+# needs more love
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${P}-default-opts.patch" )
+
+src_prepare() {
+	default
+
+	if ! use doc; then
+		eapply "${FILESDIR}/${PN}-1.12-doc-disable.patch"
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	myconfigure() {
+		local myeconfargs=(
+			$(use_enable debug)
+			$(use_enable doc gtk-doc)
+			$(use_enable introspection)
+			$(use_enable python)
+			$(use_enable test tests)
+		)
+
+		econf "${myeconfargs[@]}"
+	}
+
+	if use python; then
+		python_copy_sources
+		python_foreach_impl run_in_build_dir myconfigure
+	else
+		myconfigure
+	fi
+}
+
+src_compile() {
+	# fails to compile with more than one thread
+	MAKEOPTS="${MAKEOPTS} -j1"
+	default
+	if use python; then
+		python_foreach_impl run_in_build_dir default
+	fi
+}
+
+src_install() {
+	default
+	if use python; then
+		python_foreach_impl run_in_build_dir default
+	fi
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index b928b0b1a75a..b1ffce166234 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -24,7 +24,7 @@ EBUILD libtirpc-1.0.1-r1.ebuild 1430 SHA256 ca48870a784ec70469da77ace428b8e3081a
 EBUILD libtirpc-1.0.1-r2.ebuild 1806 SHA256 4d210c54a776163be8031cd189e4e714350df79210b1200181ee0971c84ff4cf SHA512 e7481fadedabd7abaffd842caec5c675904eaa7831952f51c58a2f9a417bce561d8dd67817c97755a2d1f8971a79e78e4107f1a9b669a62d36cc1ecf35d4475c WHIRLPOOL 7768d9236b74d236891bbb198685cca430465c05b38e6ec931ccb79caf9d43b4bffa7d51c093f526eee591e1de00cdf7da8b1aedbf44eb94e197fdaa4cdc7ff9
 EBUILD libtirpc-1.0.1-r3.ebuild 1800 SHA256 85866973a4da6985132a995961fc0fdbb3e8950fd6af8a7e6140b166b3ec1deb SHA512 4ec32de659a18443beb10475739887d08c7f922ff8c9533ff0898ac2e430785a0502d6e858130469638a80764e89d4d4ef15251011f2efc2a738d025efc8d913 WHIRLPOOL 3b784a1daa5ba6f3583c3aabf9f044a712b5dfa4303c2b6e70bf5f96250ec053d641f6da14aa3ab86ebcaddd914a5ab06f888f4e1805756d1c0984d0e6cc5fba
 EBUILD libtirpc-1.0.1.ebuild 1332 SHA256 3853ace7ed906426ad4c143ac5725d455099f1dc9475cfa18958bbd8789a6582 SHA512 694588932991003e27c95a2d80333624ba866f232324d1605b152d3b48a9486c73cbaa145cd8299c0d3bc61e8002bcfce001d91654f5499466f1092d3a42396f WHIRLPOOL 04a6d31a3b26696bc34c5c510ad5150cc9e8874f134da48d8622f5b47aa40672ae559fbd171f5f437a96c009824f8af9d9db0f26cd712ff921a034bf4a409bc0
-EBUILD libtirpc-1.0.2-r1.ebuild 1636 SHA256 d674b14a2b9bba4bb1a992ac603cd4897e067321cc9a6edbb2de5964636351b3 SHA512 20ec130077184b8e9a1b86ea3d9fa79b21ad8885ceebcaf575dda50b38ebad616e9b8365008e803900004a324942170f498ce2b547ef596999fb7b59377ae529 WHIRLPOOL 531faa01e558e8d0f390e2ae03c6b5eb4ca891ee4514ceebf447a2f6f144d2c2ec514ab6866c3a661848509e981d4460d2fbd84ad534b86e6ece0165b475a644
+EBUILD libtirpc-1.0.2-r1.ebuild 1634 SHA256 507ee399070de12758edbf13160b72050d1dda903704dfb902cc69ca93b07fda SHA512 aecd8ccef3b5c6970d6e20ec64e1af46eee7b3d9790c3ea846e492d1ca2fd5ea849cc77d7d0b2f66d15ff16d9509137a4fab1e25559ba491c86e70da1bbc1e55 WHIRLPOOL 37d5638aaae0f96e68aa60df197a8a72dbe2daa1d113e68d5538998175458753ec22ca456c6fb6438ff3fb10b2eaa848cb45d6627abf32476d0452ef049040a4
 EBUILD libtirpc-1.0.2.ebuild 1565 SHA256 3a05578fdd1c861b31f7746cdd2dbd959a69833ffa8c00d1a6a5eb9d3f21ba65 SHA512 39c50eef8a5844a0a7f4327bb5ff04e0bd50fd3c1b01d47e1c56d7c622c8a13eb675ee81108baa80beeb8637be11b665e00b2198c37cc6d5821070973258f572 WHIRLPOOL c92c58ab6aff6e52b591fe3670f85ebe60998e9fedf46da4c73ff078852f6863f4cc30f069bf98d62ec96e505d653ab0ff45cd196ab36796899e22ad7abcd490
 MISC ChangeLog 3619 SHA256 66808f3ec40599ff543cce805e725d0e9d986c06b88d995a21d496016881dddc SHA512 052e389398b2377344603a809f1074ff58c7f4c23ed0fff485e86a42506d3fab02dc5bef607907c30161692e3606e2f5f0630e5676f64f38b91de95cadbba259 WHIRLPOOL f28a3b6934034a6b620ae97cae64e833011e30326d8a96e6b1581fdcd11b5a147e59ace3f69b1fb4375e7bca6cc901f868b76e616cb5c2e3db47ff3c3a895b62
 MISC ChangeLog-2015 7643 SHA256 8e9dc2f8d3f72cdc3e8b5546cf3f2a84bf8ffe18945d1e890fecb4ec56fa11f6 SHA512 dd49b196ee86b22d8de0e424b9139893a7f4f78faed33c3a7b4397e4bee11d95adfad9cb7af497ea6277e770ccb4f14d735af9d257b87aaa8e1cd87603414400 WHIRLPOOL dc837e6a157142e0661512cc03069feb411dfc07a5e7c6da2826e47adf4bd4263c86ba48712ef3ce0bcad5f05dc34fc9a3c6875f9b553a64e21725b551761e5f
diff --git a/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild b/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild
index 7dcf52cf8b7d..a3acffbdaeed 100644
--- a/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0/3" # subslot matches SONAME major
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="ipv6 kerberos static-libs"
 
 RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 3e6a098e99a9..9c0b609f0e8e 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -3,10 +3,8 @@ AUX libtorrent-rasterbar-1.0.11-fix-abicompat.patch 6021 SHA256 044eb8da13db68c1
 AUX libtorrent-rasterbar-1.0.11-fix-test_ssl.patch 652 SHA256 d9177a04bc6ec89988676c5655f90ae417293bd1476769f26280cef8c7b920f8 SHA512 8f9eaa341cf947f318956ad1876e8606ebb53f68222f4290cc35336c3985e92602595c21a0a72d82aa5a39d0a68738e5b9baab46b6e27c15ac047397017cd24c WHIRLPOOL b4cbaf88cad85b499bc28cb76dc3812913f3b9485a99f6a0818d40844a3938f5671e0e50958218fc5fdec6ca0c622b8317cafafa614809e04c879bef376f5ae7
 AUX libtorrent-rasterbar-1.0.11-move-header.patch 1277 SHA256 76b30ae734a927ac8fc868186461c8d69bb64ff36b2d59b6f5dd4a6f9affdae6 SHA512 ed919e9aa249a7ddd81df601616307f08338f7f0f674b666ea9eb2cbfbb28bf70c114a0c316cda136766e5df226666386c527e82b70aafff0cdc33ebf874a706 WHIRLPOOL 038ef7dfdbf69ec9fb6c6201f4a02c841eb1e82185201613d9d44b67199479e2d9acf9ee6da450d0c4a173ed89ce42e1fce106629584bd9c3b464f4ce1b09e5d
 AUX libtorrent-rasterbar-1.0.9-test_torrent_parse.patch 1240 SHA256 c736e1e6641b19d47f11b13e7e732a6344357c47b1c65aa6108ed9eaae641002 SHA512 8e6cca0ac5d1e1b43e771921c64258b61e5c3c1249ae9c1b80d784153d919aff1eb7ebf3141a7bc5b926553b2c3c027a5659703da52b9f901c77bb288436edbb WHIRLPOOL 8ed51aa4b0aecb65c886f73cc1276e845a7e1527a76cc623b49965754018f399721d0f19a5c40452927a69ac390439b40ecbca5c09f68d131f5d935a0c4bce10
-DIST libtorrent-rasterbar-1.0.10.tar.gz 3324494 SHA256 a865ceaca8b14acdd7be56d361ce4e64361299647e157ef7b3ac7e2812ca4c3e SHA512 08976239ec12e2d67a974dadf3f16330f48e4b6de314f9d97c5fbbdbc696b76b6b1f8e20ceab6830d46d17b1bfd7e2fe4048fb1a5a97ece12c242c0cd0f7ded2 WHIRLPOOL 1e4ef2fb41eef0b825bd7c8c665638e3f689c3cefca3caa18a01c328caad9d31cd417fb49d25a7d55da6457a89e35a891427d70fb4f4d070c74be2e2e0347a60
 DIST libtorrent-rasterbar-1.0.11.tar.gz 3325786 SHA256 828d686770346f6da2c143c5a2844c5f5e407eb4a37982e90022763508abd62f SHA512 770d16b241174ae4b121af9b2ac7bcde8b14c6ed99352b827b760a3cbdc2c0ebd0d505319762897720c5f72acdff506ee9948ac1140e6d4591805eca5439b184 WHIRLPOOL e56bfe0830cfc7776436552171b14b08913d99a2c726c9eefa828027caaa96d9c3d97e6442a3b53f315eaa3e7e0f68175d813dbab1d6de1da5937054fc6cac9c
 DIST libtorrent-rasterbar-1.1.5.tar.gz 3942894 SHA256 103134068389155a0f2bccaca72a57765460eb8188495089dcad280dcf426930 SHA512 d0e7fe944c8a396aaf79ce80c7513be07a855bc8a9eee3bca46ed83d5e190aaa5ea4dc9a8a7208e27e18ae8f15733e6e34eabd375f0bde43d4dc4607840782e7 WHIRLPOOL 1f78afceb67a69418d2afac915616812fe3a223c548ba2baf7e643fc5e63c79bd87998473ac4b6cab6ac0093d7f43ac91bcfba41c9d6ce0fc1ac46914fce74d2
-EBUILD libtorrent-rasterbar-1.0.10.ebuild 2431 SHA256 c2b6473d53562301ec57d3ea147d30a61715b5ba3ca027f9c2c90bd4c63c6f44 SHA512 44a727e1e5f8fc1e18d1ba64807fc822e166afb1e2b7b274343232f526972d865c22feccd593dcbdcc488557f139a7aeb6a85bae4cf2e29f8c271a204dfd6857 WHIRLPOOL 8a8ebff96da931f3c402189b1d040998a14f578efcc5efedb5d4b80f71ff3ac94c757c76e6ff0bb832c8bb4dc8cd93b665ed903f05675c10cc1f3f931302ba8c
-EBUILD libtorrent-rasterbar-1.0.11-r1.ebuild 2623 SHA256 5cbf92b7321c8ace0bb9f09219c049ecb09631fe00394d4b4e9840f318bd1362 SHA512 486a328d3ee6cb6d434a75f3368995a28b85193e9aa3b8a761d52c710e201112b2a9a89fd127ae87370d2eebc5cc06c4122f792c21d80c0d698c1125f673bd77 WHIRLPOOL c3b2a633fdc1535e3da2381c79a49da4baf0a94d06dca1a4483cd46388c3c3ae8a2aab04ada68e5895c1226b87bc2d479fc9cb71b2e050aaf0cfeaacfdd8b838
+EBUILD libtorrent-rasterbar-1.0.11-r1.ebuild 2618 SHA256 8a4286cfbcb5a575d2062710e5ac9b4d00310d36011494c0eeb85b15b308293b SHA512 d4ee432b201653ec0dab6623240786bb62be6f46481f53b6732393fd17da6764cda81f5d58cffc8ab16cbeee3332ad9282e173b513096983417a9c39e7f9cd3e WHIRLPOOL 08f251293ac973f961ea17792519462520f35380c5098f14d1d1a05a8213d7a3d044582557eefca76ed150f0e8b03608703391917741ceac6d2c9d9a382e9a52
 EBUILD libtorrent-rasterbar-1.1.5-r1.ebuild 2402 SHA256 40233eee2963010229498247cf8081f1307a6ba51ab3b028ca009b9706365bd9 SHA512 2286e415d754cefbb77fd85ab0bad0ad50811c75c936c2446d09350b9ed2144c39fc8b14c7ec2862fd3c61cce0dfd96ff8e633c03aeb29991331834b0e2f4f52 WHIRLPOOL 2a5a7e0fc15bab29016e6f6942935ad9ac4bce2e40a5ced46e9a93c5307803aff78e74feb79501026a9e5d89ef7e7aed241dc011581b3143825e18ee6b222819
 MISC metadata.xml 527 SHA256 e53fe78e5ff72e704f0119e0226da2416169291e7a840340c811dd123d72538e SHA512 7dd3d0492dd77ffb05fa50b96253d8e7cc01c86b9eedf3891a5b8b09e49ef8d51747890a874609c077d95d5144f949bb31db9bb40e0ba520a3917a548db129f3 WHIRLPOOL 8f531637c7660ea459f60795f94db29f575552fb6a015283c9253d01d7c7140028b645985109e838bdb45ecab9e43acb57b58269c8af69523e3eb7ba1f07f06e
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.0.10.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.0.10.ebuild
deleted file mode 100644
index b5f9a0b39537..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.0.10.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-PYTHON_REQ_USE="threads"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit distutils-r1 eutils versionator
-
-MY_PV=$(replace_all_version_separators _)
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="http://libtorrent.org"
-SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/8"
-KEYWORDS="amd64 arm ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="debug +dht doc examples +geoip libressl python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	virtual/libiconv
-	examples? ( !net-p2p/mldonkey )
-	geoip? ( dev-libs/geoip )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.9-test_torrent_parse.patch"
-	# master branch
-	"${FILESDIR}/${PN}-1.0.11-fix-test_ssl.patch"
-)
-
-src_prepare() {
-	default
-
-	# bug 578026
-	# prepend -L${S}/... to ensure bindings link against the lib we just built
-	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/compile_flags.in || die
-
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable debug logging)
-		$(use_enable debug statistics)
-		$(use_enable debug disk-stats)
-		$(use_enable dht dht $(usex debug logging yes))
-		$(use_enable examples)
-		$(use_enable geoip)
-		$(use_with   geoip libgeoip)
-		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		--with-libiconv
-	)
-	econf "${myeconfargs[@]}"
-
-	if use python; then
-		myeconfargs+=(
-			--enable-python-binding
-			--with-boost-python
-		)
-		python_configure() {
-			econf "${myeconfargs[@]}"
-		}
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	python_compile() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_compile
-	}
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	use doc && HTML_DOCS+=( "${S}"/docs )
-
-	default
-
-	python_install() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_install
-	}
-	use python && distutils-r1_src_install
-
-	prune_libtool_files
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.0.11-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.0.11-r1.ebuild
index 2bdd886902f5..cc369c61d8e9 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.0.11-r1.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.0.11-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_
 
 LICENSE="BSD"
 SLOT="0/8"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="debug +dht doc examples +geoip libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-libs/liquid-dsp/Manifest b/net-libs/liquid-dsp/Manifest
index 35d5d6ab2160..870345898b4c 100644
--- a/net-libs/liquid-dsp/Manifest
+++ b/net-libs/liquid-dsp/Manifest
@@ -1,4 +1,6 @@
 DIST liquid-dsp-1.3.0.tar.gz 1036160 SHA256 b136343d644bc1441f7854f2d292bfa054e8d040c0b745879b205f6836dca0f0 SHA512 d69df2c15ea56cd84be9f77383b9914daa52e89e1136aa84fd14dff7690e98c4e29bb5c4e570cac5ef826b884b8fa382e5d806a711d22b6d5c4ddf5b93a0026b WHIRLPOOL ec0605293e5e0b8b1e276390b007ba8be871f23fdaafa6ec3e5dfb5fd54d1ca5c95b69b807ac4a91db63c673c0cf9df999db3c98bebc556fd4547b13388c8858
+DIST liquid-dsp-1.3.1.tar.gz 1047182 SHA256 e3f66ce72a3b5d74eea5ccffb049c62c422c91b0ab92d6dbbef21af3c3bfec73 SHA512 6da76030fc346e3fadfe70e72be14d1f2ff198d3e9bb5ffb5f4d9b89945686d2474d3bb4911a2b923aad22feabebf2744d47afbffabab87737fe46a24af68917 WHIRLPOOL ab032dffb7ba600b18a2e8a414e2bd43c416e0b7380247c73d03831626598a0438f88032e6deeac7db5fa7f2690c556057faf9467532d63a84ec8d17acc7ac37
 EBUILD liquid-dsp-1.3.0.ebuild 1045 SHA256 23849fa64dc9e5e1f29545ce062d120497e931f8f529ed07405caf9f12936bfd SHA512 949fbf9e3e1e2b7e3f63e6636d41817d0be9942611adc37d02595b4a2cc7df998186fae286f9773f5f193eb6e6c9f1ae6461664d05275c4af3c3289795fb0d2a WHIRLPOOL 4eada6c632c3a566c72a39947603f2370083d2ea7ee1e1023ab3088a3d602b386f3de2167ef6a9950f94e3c393df6b5edc965aaa63bd8982729ff5832db9915d
-EBUILD liquid-dsp-9999.ebuild 1045 SHA256 23849fa64dc9e5e1f29545ce062d120497e931f8f529ed07405caf9f12936bfd SHA512 949fbf9e3e1e2b7e3f63e6636d41817d0be9942611adc37d02595b4a2cc7df998186fae286f9773f5f193eb6e6c9f1ae6461664d05275c4af3c3289795fb0d2a WHIRLPOOL 4eada6c632c3a566c72a39947603f2370083d2ea7ee1e1023ab3088a3d602b386f3de2167ef6a9950f94e3c393df6b5edc965aaa63bd8982729ff5832db9915d
+EBUILD liquid-dsp-1.3.1.ebuild 1045 SHA256 be353111bdd6dad6e45727a6ea234160d73cdc1d652ab6ea561b6df7ff0f4444 SHA512 4786e55d4e0a11792ae681df6dddbc232d03e20b0c40cf871992936e7316432de56fabf03a3ff9051166591e74edba3330dcf0988022d5484d2fb00aead6a8e3 WHIRLPOOL e13c26141c4780131d1b97b9b16bcae171cc436180b66d9976516f13e1dfd1ab3b4787af8c5332daad1abc50ebc2d5c4986f08c230230042745022f84ece587f
+EBUILD liquid-dsp-9999.ebuild 1045 SHA256 be353111bdd6dad6e45727a6ea234160d73cdc1d652ab6ea561b6df7ff0f4444 SHA512 4786e55d4e0a11792ae681df6dddbc232d03e20b0c40cf871992936e7316432de56fabf03a3ff9051166591e74edba3330dcf0988022d5484d2fb00aead6a8e3 WHIRLPOOL e13c26141c4780131d1b97b9b16bcae171cc436180b66d9976516f13e1dfd1ab3b4787af8c5332daad1abc50ebc2d5c4986f08c230230042745022f84ece587f
 MISC metadata.xml 416 SHA256 f60116722af97d8e553abadbd27a86ac435f442686be454193bbd15fe806fe02 SHA512 7dee49689a60f0b24a9435987f3752f53c36c84187e19850bcbe5e2d14b1fd7bf52c3d8de83f91f3e25b3984bbbde9a08150b24d6b62552602ef145821bc95fe WHIRLPOOL 2d23541e01c8d5e76001b1cf4f5565c68bf7b58bfdca10608990fed73b57598b43fea954a92bdb43b0408172cf7c6aab838051ffa62b71589cc08cdc84758a79
diff --git a/net-libs/liquid-dsp/liquid-dsp-1.3.1.ebuild b/net-libs/liquid-dsp/liquid-dsp-1.3.1.ebuild
new file mode 100644
index 000000000000..968f83948b9b
--- /dev/null
+++ b/net-libs/liquid-dsp/liquid-dsp-1.3.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib
+
+DESCRIPTION="digital signal processing library for software-defined radios"
+HOMEPAGE="http://liquidsdr.org"
+
+LICENSE="MIT"
+SLOT="0"
+
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jgaeddert/liquid-dsp.git"
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/jgaeddert/liquid-dsp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+IUSE="static-libs"
+
+DEPEND="sci-libs/fftw:3.0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	#without this rather odd looking bit, it installs libraries into /usr/usr/$(get_libdir)
+	#what is super special is that if exec-prefix is unset, libdir is lib64...
+	#but if exec-prefix is default then libdir ends up as /usr/lib64 in makefile...
+	econf --exec-prefix="" --libdir="/usr/$(get_libdir)"
+}
+
+src_install() {
+	default
+	! use static-libs && rm "${ED}"/usr/"$(get_libdir)"/libliquid.a
+}
diff --git a/net-libs/liquid-dsp/liquid-dsp-9999.ebuild b/net-libs/liquid-dsp/liquid-dsp-9999.ebuild
index fcd3127de23e..968f83948b9b 100644
--- a/net-libs/liquid-dsp/liquid-dsp-9999.ebuild
+++ b/net-libs/liquid-dsp/liquid-dsp-9999.ebuild
@@ -17,7 +17,7 @@ if [ "${PV}" = "9999" ]; then
 	KEYWORDS=""
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/jgaeddert/liquid-dsp/archive/v1.3.0.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/jgaeddert/liquid-dsp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 IUSE="static-libs"
diff --git a/net-libs/loudmouth/Manifest b/net-libs/loudmouth/Manifest
index f2033018e4b8..c57a33323a07 100644
--- a/net-libs/loudmouth/Manifest
+++ b/net-libs/loudmouth/Manifest
@@ -12,7 +12,7 @@ DIST loudmouth-1.4.3.tar.bz2 366818 SHA256 95a93f5d009b71ea8193d994aa11f311bc330
 DIST loudmouth-1.5.2.tar.gz 115940 SHA256 c3dd7b5690a7b6ee4768d71d2bdee4615cfb73b6eeaa342d6a931a5160e47421 SHA512 54c3eb7ef99604d7e2d5560dc6e5be176a188e6a0d82ae6c2f488e30f06553039aa03d6f818cec25f354479a2624f60f2233d7e63b54f331e934d554de9bfc87 WHIRLPOOL 99fd7fa00f08976242313c2bc11e9edfbe1aeea9918090347a1975d5ece438892afbf3b5c16ffe79b1c0a10b28f35f62937d45a234e63b26f051466799fd7685
 DIST loudmouth-1.5.3.tar.gz 114676 SHA256 12972fcffd9bbcc4a3b2b9fbf4b0e549f7b4caf0f11c8d2af2059087ce4e8792 SHA512 afae8b4ad1e9e5558cffa8f6b9f25331b01cfa09ea0b3defb74cac7d39477744e6d9181d3adefe242038020759df43558de0e61305fbc8e12a3b293b82856bf7 WHIRLPOOL 0a7d4a01ec4f0ae68f58f3267aabc2eb9f7eb0e812232a8ecd3664dd5c99ae404c4825bb5ae01f36a1cced48a9aaff67c4a92c23541e2e1fd9f69c4a67962007
 EBUILD loudmouth-1.4.3-r2.ebuild 2498 SHA256 df24c25a75f01711e7c1260ee09bbd383dce86b6e18c2241f0a8fccdef573e53 SHA512 2d0122e816ce11214c6ee00641535d0d9148c1412ee660fb361930e4cea95bf4866fbd68e340c57ec593afc94487a0aaeb1160ee1aff69a41f87138245cf7f4f WHIRLPOOL a9e1c8e8c2ba49b95c8f43b170bdab29288d176b01bfb50878cc36ab9df9ec0425be5808c9495ee76f841fc6e9550ef0e23002c2966827e1fe3430e23907607d
-EBUILD loudmouth-1.5.2-r1.ebuild 1165 SHA256 823877bbd602976e8df023dc4a997cf16d3b208719254f391a3a26dd829ab23a SHA512 7b536b1265090ac5d7bcb6d2460550a36fba4306a964feb5e54c37322187def0e566a85a977d86b6f3be1d6e34e2c3d2de6a988f3e278c26beec280378b15e3c WHIRLPOOL 44b08f38277ba84e0407f992ea1dd7774086b01dd39b60bb48065fa36edf362a2edd941068f781e10060b2c4d574ed0ef506d680e55c458ed32f3c4f37ec9318
+EBUILD loudmouth-1.5.2-r1.ebuild 1163 SHA256 63efe87e8c14e062c809b8050281b7616e060de4460c5429c9c9c80a838f8c21 SHA512 42b8edc99b62273da907fac0a35d95c7085478c9a0da3ef5a047f4372b4fcf632bd3fb2a12c7669a694c40c0690d527dfcf212e0ad4f1e551b52f56c9abdc493 WHIRLPOOL 9b0d529e00a90460f89992f93ef851649d108691aa813339eb210a32d0e6f0da7c99b9b1e1af3eaf38434be9499fd6d94cf8be462a7a817fbe64cf15ee61be23
 EBUILD loudmouth-1.5.3.ebuild 1166 SHA256 487caf946da6057b07075c3a9fc105bd747a8ababc75dda3b59786f7b5958a6e SHA512 7257a30439d6a17b92a04443405ea7ae10b83ad2621a411f25e1e6d593e8252a07012a5ded42d2645c39d45c9494b137fb77585c7bd47379ce128886f6e6ecd1 WHIRLPOOL 183d80e39a847257bcd2805ede690686d9dc0696ba5c1245913930e53b3ab1ef3466a28e1dbfc50c33a76af0509b16fb9c89dd5a601ff86151243abc360b3916
 MISC ChangeLog 4063 SHA256 863df6afc9f522b1f1a4af210e924437080027d82fca2fb2de38946af8e25160 SHA512 25144a9ded7506ae171913e1c1c945c19a88c27eafca6b9874ff18bdd42153b5b6cd256c3a97bf45b5f58d0542161fc4a51a971e356d13b9379f0f4878a14e96 WHIRLPOOL 2ff7e6f2b309b0517d07f873f18052654149d20c7083b3402d6ded7a690334b001e4451a6d40e8d83310fa9b10a94eda56b0baaf47c22c331c11aeda8a3f4a79
 MISC ChangeLog-2015 15204 SHA256 5feb983262f60ea734d8e4c754d13a37fbd8c12750d047fa362420a1875e3cfb SHA512 e71849c239afca32e7cbd4939905806252dab8af6a67751b480116bfb5f0dd06da4e8fd8f6ee4f1b02ab49431ac71904c0cfcb58e6bcbbc96bd110ec1fdf9a97 WHIRLPOOL 89cf0a8db229015f6478357e445a11201b595ac5e2adfc32c9e3a94309d4258a6c7191e3eac02ae07518bef9256485b4a7cdde414bd06a4ad167504c31f0c968
diff --git a/net-libs/loudmouth/loudmouth-1.5.2-r1.ebuild b/net-libs/loudmouth/loudmouth-1.5.2-r1.ebuild
index 0059fb3c90fc..1ff3a71e5dfe 100644
--- a/net-libs/loudmouth/loudmouth-1.5.2-r1.ebuild
+++ b/net-libs/loudmouth/loudmouth-1.5.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mcabber/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+KEYWORDS="alpha ~amd64 ~arm ia64 ~ppc ppc64 ~sparc ~x86 ~ppc-macos"
 
 IUSE="asyncns ssl openssl static-libs test"
 
diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest
index fac37c4a2bc1..aec60702dacf 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -1,3 +1,3 @@
 DIST nDPI-2.0.tar.gz 19280901 SHA256 a42a60ebd64bc8606f780204222893027f6dce0e3b460d7be655e5e065f5f3fa SHA512 c8dac1990ff49fc04ee321068d8fc722528c6be0543af2d0bda77936eff12713c36d5abd3fd2472121f2e322e99ba8e57facca813f7b012240c61e16c1a6cd44 WHIRLPOOL a19c55ae82b99d7a7b4e79a9327832dcb77c8cf62e18a2ff875399580d6157e74358d929025be5ca11b63a969f1cc950b222959b092026286adfbc35fb7c5194
-EBUILD nDPI-2.0.ebuild 470 SHA256 b478e6ddb31c0ce00b16a30819b7310b94f74f25368129a86fba99b19e009140 SHA512 1c00cd3c03d09c3cd8c9d0697a256cd2cfa86067c1494840aa1cb53a524f7bc20fa2766d0310e06596c02d7cff97a6d8dcad8a8fcfa885df29d49c3cd3969b7f WHIRLPOOL 858a0c898b5a0eefe8467fbb1643318f2fd9df9c39bd5e55ec4e25d681531dbac30db49216e13844a7414009da41e92bb08d2d74be32be881d6b3a248309e3f2
+EBUILD nDPI-2.0.ebuild 628 SHA256 02f25de7899b870a28a80e89bc2d65fac226bda544d1bdb74ea220f8591d3eaa SHA512 45282872ef59f84d486bb8ad5c32dfc242a248a8ebc90bea46eee58691a53d22156a2bcf0b06371fb882e4092499eaf4cc72c468bdc6e5ae0a64322bd7f4f368 WHIRLPOOL f87f8f990d9a409d0eb2d102882fa42c6c514395f853ef5ef66184d83229f7a1f41975a98e9b31ecbc31478072e5db28ae9ea9d8de01193f85e70998732a80a5
 MISC metadata.xml 297 SHA256 b4c003997bc1ffe5f90ee46d9a04fd12320ecd3b75ecfcf00513bbd4e876d03a SHA512 5f765ad3cc06c790fb16873bc7a759ebb0a432cde847b4e7b8e9dc0f2049441c44d90d54caf007e11deaeca4282ba213f927951060a0ec62bb1836a9cb94e22a WHIRLPOOL 9b163f7b6a619339fa565bf36b2fbc993c56ea05965c1428e2670227b392519c034b0f0bd553dc577b7fb7f0663a39de796a77e12964d273dcb2c9449d9eeb15
diff --git a/net-libs/nDPI/nDPI-2.0.ebuild b/net-libs/nDPI/nDPI-2.0.ebuild
index 7d4217d49afe..f512638e13d6 100644
--- a/net-libs/nDPI/nDPI-2.0.ebuild
+++ b/net-libs/nDPI/nDPI-2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools
+inherit autotools eutils multilib
 
 DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
 HOMEPAGE="http://www.ntop.org/"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="static-libs"
 
 DEPEND="dev-libs/json-c
 	net-libs/libpcap"
@@ -21,3 +21,11 @@ src_prepare() {
 	default
 	eautoreconf
 }
+
+src_install() {
+	default
+	if ! use static-libs; then
+		rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
+	fi
+	prune_libtool_files
+}
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index dcfb4b567b6d..f581cdcf128a 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,12 +1,12 @@
 DIST nghttp2-1.10.0.tar.gz 2086580 SHA256 192dc031e71e182240079befae9db7e64c9951da3a83c7a438f57cf76145b6a8 SHA512 4341f76ead38ba30e0dfda492e2e0f4c842f453e235fa90ee55b1e556092828236f21c6b212d0099cea005f149e4be3e63ad007009dd5228999101e563009a6f WHIRLPOOL 603391b0d15883cd9db734a0e4bb7d994c17ae4209d5251504e29cc59e0ccf67488b9340acefdb6d6603e9e7d3b0a0491ed18330edce4d20adb0ed19ffc5b975
 DIST nghttp2-1.19.0.tar.gz 2159530 SHA256 b67946ad211aa3f7c91f4d866f47b056e821da8e31ab4636130d59be87f53016 SHA512 50f45082f725c237a0e1d25af57992b9cded6c9b68f0aa95c44c16eb4448e05b14e06c853032924d03034115286163de0ad684827cfa5d70896656868fdb4e01 WHIRLPOOL d6178a31aadfcfc3547ab4b0f58ba8f5b34a95ebc1168b7f03b4bfba58a03737b061eea020c264a2da882f0f6541620cd001e62919b82f5b1ada552402c2fab0
-DIST nghttp2-1.25.0.tar.gz 2213656 SHA256 23fe0c97505a73154bbdfd2fcf47f5fa652ad8be4a88c3a4bfe8ff517026ef0f SHA512 2264b073ddcf1852c9f9c6d104ecba3c6b08385d6933f89f01b0ba915c1715c6a963da69c96eb4eb41622994bac6cd222d24c4dc8e152a45787f06d17693e809 WHIRLPOOL 28fecceefd294d2a7950cc740e01898db6e5901fbf8357f7f3c5cb6170909451be28924de28c1fb2d97fe60a5acfd1599a260aef3bb3ab5fe4173a05fef818cf
 DIST nghttp2-1.26.0.tar.gz 2217713 SHA256 daf7c0ca363efa25b2cbb1e4bd925ac4287b664c3d1465f6a390359daa3f0cf1 SHA512 fd6733e5d30fde03e7d2662df1adc0267f1ff3b3a0fbcd10dd9609b7eb149a94a8441b78aef0f4d34d3c0bbc9a11fcbef1ceb1f7da44091f998f6be93dee3b9d WHIRLPOOL bdde085e730b945b5253b1a3df160d990f72f524b3201bb3b3b4a01a7ed7911c9c35378e957b999135cbaeb694001b7e9410d56901f4cb3badeaa77fad66bf37
+DIST nghttp2-1.27.0.tar.xz 1546064 SHA256 e83819560952a3dc3c8d96c46f60745408f46f5f384168c90b9e3dfa53b2c2c8 SHA512 8156ae4084155d000d1655d43790698b0bf89af3ba3a360cedf6a5744aa2ca9485094e65e09da2850ed6dd55479fe33de0948b734b987c85a63f0b3c83dbafd1 WHIRLPOOL 787adeca9a023714c1cfb8c6a2ccf2ecc429c594482d42768c1e55650a3ee70d84f5704dac2462e5443bfa168684db952fdbe61fb555992ae54bf7a3262b59dc
 EBUILD nghttp2-1.10.0.ebuild 1772 SHA256 7c2b5ff443d23e99f3a289bdf14d1bc623ade04be5d9c1cd88cb55147bc1570b SHA512 65a431e382cc6b7494674b0c662f1f18d0c3fa0b6ca7bb16dc3ad0f60213f51113a73aa1252680c63d687424bae54bfa2fc813501e90ded0cd08e06cb6088809 WHIRLPOOL 6698754715eaf7bc775893276855c7eee5c0048a1b32a027482a56dddd6eebfdafadb75fd4f124aae9e8a8d51b859197d94eaa5a61b376f5f9f5dbce7eb7cfc0
 EBUILD nghttp2-1.19.0.ebuild 1815 SHA256 6989f5c7a2fbb209a14511e8621c44a809ef93756d1254c93c65050eff2bfb26 SHA512 f27e9ccb9a772a90026d4293ff53e6758de29d8baa02e02b2d8a69c987ecdf81f08c7e66153078c0f4e33218c4e24b84123c4a0908860aed7574a07e211b84a2 WHIRLPOOL cd08c25e82d703d67c14f05cdffc8470ac4df61b5ed48f570391d59bdae84f60e4aa355a2b9c3761f7eb5e7003d4d3ac41d94e4ec45555e9d09175b29920c422
-EBUILD nghttp2-1.25.0.ebuild 1823 SHA256 3c341c11522c55965eb1ed3b4096ca2d7b9002dd2ef29dfc8b400203d28b12ca SHA512 661fc8bd70b382b614ceadf16d161816347f7b8b7bd32484315da185d801e14f15fb5dbea58a569c1a0107584598ca5558697de45259740ebfdd36754aa97751 WHIRLPOOL 51af28f103f7c3863d59317a4d97a79f1804d6fdb4bb9a45b5a43fdd96010f14fe88a9b47ad5bd79fde45a99f009fc5a3e274a5ea8fe3b237efb86dc1706b0d3
 EBUILD nghttp2-1.26.0.ebuild 1823 SHA256 3c341c11522c55965eb1ed3b4096ca2d7b9002dd2ef29dfc8b400203d28b12ca SHA512 661fc8bd70b382b614ceadf16d161816347f7b8b7bd32484315da185d801e14f15fb5dbea58a569c1a0107584598ca5558697de45259740ebfdd36754aa97751 WHIRLPOOL 51af28f103f7c3863d59317a4d97a79f1804d6fdb4bb9a45b5a43fdd96010f14fe88a9b47ad5bd79fde45a99f009fc5a3e274a5ea8fe3b237efb86dc1706b0d3
-EBUILD nghttp2-9999.ebuild 1893 SHA256 07a5a2b19a50b027208f3423a1a8499e157440854518b50a116d28e69f263b47 SHA512 9143dc336a572ac1fe9d1b1fbe690f240681bea7ba01271430d44bee0885441fbe16210237605d3b200762c8c84b5100f43ff20b24c1763401ca08850dc55936 WHIRLPOOL ca87e899ec6032f30b96c95791148e2dcfcd53245f445302980c72d6ec4e2ca3fe95b08472c8c61f3f1e623a6f43668be4c6d9e79b1a4ecc8b154b60bcd291c5
+EBUILD nghttp2-1.27.0.ebuild 1815 SHA256 042bd52370a528af7c037ebcbfeafa84a17a39264054c26eebcaed3f4bca13f3 SHA512 fd44ab40a68379bbef08e3471a38db2509b0f8f6fd29db8928e0310ee758a35c1c6b5c032b442aff437020df1e079af59e849aa83e3a019dc9ea6d7fb1c564c6 WHIRLPOOL 2e85cd6caa181d21b64dd620839ca44b9054db01b314cb68adab15e02f62ad367420751fb4a098215a95533132aaf0fb77482138626287c2409051ae09ac1632
+EBUILD nghttp2-9999.ebuild 1885 SHA256 073a5e228d5b7f7fa0191c503c1d44b27f595da6cd71deda1fc890cafb5beebd SHA512 567ca5388d045641606ad995c5b033202bc171247027ee6e40a836db617c5f94faf9294bb5f00a8c726f27bfeb2e8c0002253ead9c0e5d4f07d6b4adaf822ef6 WHIRLPOOL 469fd7cdae0e4b4ffc9436b1384c4c1c87142d659f49645bb4ac7f1055bb4bcb3e13c306d2c4120050b6acdaf65be698fc01196dfa5e34dbba9a0924b12bf5e0
 MISC ChangeLog 15393 SHA256 347706c6b7f4e9b63fda2e214c671bd97aea620e056d466c0cf15049ffa15829 SHA512 4ffb21fa44cb81d33795c10cca5c3c2371b999e58f5f8d47befb1767bd393095d47aabfa342c37756404497f8be5c898cb5d2acb031ea118b9114d0bb69503e0 WHIRLPOOL b04b8e526e202e87aef3f1d74356ad337cb7125ee49f6e355748ab30adb1eb5068257bb7b92ccade82d43be201945357f30f417b10d9bd332cdf0d5b16e337cf
 MISC ChangeLog-2015 917 SHA256 99d727240f9129cd302bef401cd6a15104db2d8300977f7f9c3354ab2da1cf65 SHA512 09e2b3352017e46a884b09f3e592df066950a1091f62c56a725d807b99e31a153509f4a73d175dedba37bf5e5f416c19ff20699e7a9faa1f5631990d76c7c4cc WHIRLPOOL 5b0b4221bfaa365808f87b6b34ddc92d3e0f9b9bf29566b47a916bfc8a72564e58d09516da727e3702b85d4657be659737b2f08fc94b82d50eea607704e68337
-MISC metadata.xml 548 SHA256 303c9bbf4763404a0c7daae66b2f7ec61dd051ce0d5a89e6e6213ba306276295 SHA512 e29edcb283ef5de42e4dec4456a03af0b3ba09e7827c81ad312e42d5bc1348794076c5c28edc9d19de9f50e6035077c89fe7db6ba1454c19f182e7fd73dcb4d4 WHIRLPOOL 9e991e25ff814ef8b57fda6652e4c6fffa39baaaa99d68fcdf351d067bbb48ac4d463cf00b27fbd4411f48372d5c702a3867ecc9ae8d27db15471d920d999d26
+MISC metadata.xml 544 SHA256 f8f00ff71a175cead9c0dde6a46cbc2346b7b674470f4aee6699f279756b5938 SHA512 81588ca1912525e085b71baaa8512b22ff47f7dc2834115c12ccfdc86d42e62048cdf53c3cf2e91d9af50a02dfec352f3b3e0abb47c27fb9056070d553007afe WHIRLPOOL 479a8bcaa3aad6e07212227e89b2f53862382c9e4776bb0b2b214f0c9b4510dbdea9bb88eb0731ca988add13329e65ecb360ecc0fe97c5c19cb8247c41ed5680
diff --git a/net-libs/nghttp2/metadata.xml b/net-libs/nghttp2/metadata.xml
index dccb46fd26a5..39dbfe2a8944 100644
--- a/net-libs/nghttp2/metadata.xml
+++ b/net-libs/nghttp2/metadata.xml
@@ -10,6 +10,6 @@
 		<flag name="utils">Install nghttp, nghttpd and nghttpx</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">tatsuhiro-t/nghttp2</remote-id>
+		<remote-id type="github">nghttp2/nghttp2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-libs/nghttp2/nghttp2-1.25.0.ebuild b/net-libs/nghttp2/nghttp2-1.25.0.ebuild
deleted file mode 100644
index 3ec4b994bb7c..000000000000
--- a/net-libs/nghttp2/nghttp2-1.25.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: Add python support.
-
-EAPI=6
-
-inherit multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/tatsuhiro-t/nghttp2.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-DESCRIPTION="HTTP/2 C Library"
-HOMEPAGE="https://nghttp2.org/"
-
-LICENSE="MIT"
-SLOT="0/1.14" # <C++>.<C> SONAMEs
-IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
-
-RDEPEND="
-	cxx? ( dev-libs/boost:=[${MULTILIB_USEDEP},threads] )
-	hpack-tools? ( >=dev-libs/jansson-2.5 )
-	jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
-	utils? (
-		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
-		!libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
-		net-dns/c-ares:=[${MULTILIB_USEDEP}]
-	)
-	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-examples \
-		--disable-failmalloc \
-		--disable-werror \
-		--without-cython \
-		--disable-python-bindings \
-		--without-spdylay \
-		$(use_enable cxx asio-lib) \
-		$(use_enable debug) \
-		$(multilib_native_use_enable hpack-tools) \
-		$(use_enable static-libs static) \
-		$(use_enable threads) \
-		$(multilib_native_use_enable utils app) \
-		$(multilib_native_use_with jemalloc) \
-		$(multilib_native_use_with xml libxml2)
-}
-
-multilib_src_install_all() {
-	use static-libs || find "${ED}"/usr -name '*.la' -delete
-}
diff --git a/net-libs/nghttp2/nghttp2-1.27.0.ebuild b/net-libs/nghttp2/nghttp2-1.27.0.ebuild
new file mode 100644
index 000000000000..73177fc62199
--- /dev/null
+++ b/net-libs/nghttp2/nghttp2-1.27.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: Add python support.
+
+EAPI=6
+
+inherit multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="HTTP/2 C Library"
+HOMEPAGE="https://nghttp2.org/"
+
+LICENSE="MIT"
+SLOT="0/1.14" # <C++>.<C> SONAMEs
+IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
+
+RDEPEND="
+	cxx? ( dev-libs/boost:=[${MULTILIB_USEDEP},threads] )
+	hpack-tools? ( >=dev-libs/jansson-2.5 )
+	jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
+	utils? (
+		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
+		!libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
+		net-dns/c-ares:=[${MULTILIB_USEDEP}]
+	)
+	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-examples \
+		--disable-failmalloc \
+		--disable-werror \
+		--without-cython \
+		--disable-python-bindings \
+		--without-spdylay \
+		$(use_enable cxx asio-lib) \
+		$(use_enable debug) \
+		$(multilib_native_use_enable hpack-tools) \
+		$(use_enable static-libs static) \
+		$(use_enable threads) \
+		$(multilib_native_use_enable utils app) \
+		$(multilib_native_use_with jemalloc) \
+		$(multilib_native_use_with xml libxml2)
+}
+
+multilib_src_install_all() {
+	use static-libs || find "${ED}"/usr -name '*.la' -delete
+}
diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild
index 6279f2410cbb..f340b41cdaf2 100644
--- a/net-libs/nghttp2/nghttp2-9999.ebuild
+++ b/net-libs/nghttp2/nghttp2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO: Add python support.
@@ -8,10 +8,10 @@ EAPI=6
 inherit multilib-minimal
 
 if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/tatsuhiro-t/nghttp2.git"
+	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
 	inherit autotools git-r3
 else
-	SRC_URI="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${PV}/${P}.tar.gz"
+	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index f18321b1817a..b8c3484c67c6 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,23 +1,18 @@
 AUX gentoo-global-npm-config.patch 1511 SHA256 a6575286a4f0c3b4db07c2f353d2e6c093eb3caba6cd0d3b11e546734b16bfad SHA512 b6c8bf88bd44d5461cbad0354273a6f964429d1cde48ab4c8bef9f50452de22bfc5d15707c5c9adc2a0d8000a6b1be4cffdee039618b627fb0d291886309cc3f WHIRLPOOL 7e748dd02dd248fde544ee088fe4e7b295919f5da1fcaf9511071c716d073ed45380831677082f9748c3802b7bdc6004b78275f39d29f1396330a1b196c5f1e1
 AUX nodejs-8.4.0-shared-nghttp2.patch 3143 SHA256 024374b359044dad8737fcbaccbb6f4968077d3cb8815fbccfd92ad890a4736f SHA512 ccdc2f36114775f497de8487eb187b11d50b6eb3b213d96837029803e864f8faac4a8f0f7d3bdfb42e038ac68ce55dbf6992df1bca5beb9fc9d14a18bd9bb878 WHIRLPOOL 1ca6f20c6f83925ef85437936b068dbf57ebc1d71e319f386c5d3b10f138d527178f74da41381ec5e0979206f7befe3120d7fa1f8eb7c7bbaabdc1e860195937
+AUX nodejs-8.7.0-shared-nghttp2.patch 3162 SHA256 45206aa8cb8832521218a6dc28db0877427a3fc6093311d778e61c21a01c1760 SHA512 e9a142f95c5d5758332b3652d8a821940f541c29664b2788909c20d2b25a61294e2eda712eec1332abb81f5f3d55470c2127585644e3cc9c05c3fe5cb510f54c WHIRLPOOL 1c9a3835e708011abb2306ab760efd2029aebc0f6cf82725582c5ce090bdf0d38b3ad523006e93f0bea4c001ac346371a2ed0c7e3536dcd91d7048f06a1e0df6
 DIST node-v0.12.17.tar.gz 19938029 SHA256 ddea5e253812f167608fbdda6ff29ffc30dc6f669cf2f6e4249938d28b9cd44d SHA512 86c22b17f57018083b07096beeca10e6dfa7569b3d1a25a3b12dd82796db3c9536e6136e0dd0ff62b4de116413f3722b36ce396faa46d8640f80ab09ccfcbca7 WHIRLPOOL 5fba1f95de0a7dbda7e7649bc0f8553cd8595eb87cd27062efbdc59a54673e7e1e6f80191abede683a686043a81d82b76e141aa765b98e3dc39e015aca98e41f
 DIST node-v4.6.1.tar.xz 13295568 SHA256 fe2a85df8758001878abb5bbaf17a6b6cdc12b3e465b1d3bace83b37fdf0345a SHA512 4eb2acbe13ee2373922420e3238be63d2108dacba640438bddbdea12ec2de9c655f33db611e4c0654b66bf4fdb844a7b6554a823aac73171b17599096856abdb WHIRLPOOL a6d21cce7ab8c430528682f78a6e6492f753c87949b7b1bdc15dc02911559cd89deb45329c2ba32da57b776dd4feaabec8a3e7a59a78094cfb079261b6475c76
-DIST node-v6.11.2.tar.xz 15665456 SHA256 04af4992238b19124ea56f1bcfda36827613a24eb3b00fc3b50f261a415a26e4 SHA512 9ea203e402b5d57fb5d30cc4e9e59e9dac5303134d687888ee5e7e004388054086d82dd9097408bb3cfb25826dcefe720b75052542f8c88867de382efe91b3b8 WHIRLPOOL af8467f21b812fa2f6e723dbd7be2579257175cc7a826a1863044b69f8384a74bd9da2a7096cf29b6f1e7cfbb439ce179a66c45e063edd60f456dad0410aa42a
-DIST node-v6.11.3.tar.xz 15684012 SHA256 5f09b77010cb3ec4e321ecdc30beb6b49d8a2843155b7f0ad97202ec308ab6bc SHA512 4afad49499d05f97ba45a27ea64d5ab514b276af5cf3b362a9c418dda8619dbf22baa1c958c2ee48ca576ec350f45f2fe02bf18aee91d82d44126c92e9ba547d WHIRLPOOL 65f1478794ad4f183cc7937987a9add24271c1641d6ab00d337c4415da606bde8378b557d2ac923f1d50b87b4aa06ba3b79488ed49a6f40e54f6c5852d41eb75
+DIST node-v4.8.5.tar.xz 13316060 SHA256 a48aeefc2b4fae0ea6410a8045ca106af244223012eab003bd5cb00aa3b50d53 SHA512 64d936ca14648b5648dedb41f2ee8d39466788762d335fbfc9ce4cb7484d05b6c24ad912fb4b1579a08f466be50b129a96be700fd89cbca5e1de84baa63ddd12 WHIRLPOOL 8d74323f38b4f55bf2e95a628005cbb65c0f4ea0e5dd55699408e26b724ff65fd0a7f674399ed92ac3a56592064133daffcbb37d7076b8da33d28b4d17d61410
+DIST node-v6.11.5.tar.xz 15699404 SHA256 1c6de415216799fbaeca82304b3fef87accc7101ebf2ead7d5c545e0779e8aaf SHA512 62490725ef7957294c1bddf21ef0626c7472876791210168116501255ecee58457e9de9b044e10033706243299bbfd1495efeca169596fbf26f5eeba6d8fa4c9 WHIRLPOOL 6e572e34d473544624734a54243dc41101e91d045f2b9cedc0c1a65c90584deb163efb422a0c992689ef9878cc5b882758795ae4d902c1c5b20468d8fa2151da
 DIST node-v6.9.4.tar.xz 15519264 SHA256 c51d7c61db40455d57428abcadc7eb0f0a08a8878cb1d8ea3c1e211c54532c35 SHA512 86d3e2889031c2b50c021bd3fd63194c2c22c44291d51dff1b5e1652b01853c09d2880c2f58fdad062e3e2a3f637a3f0d78dac66b835b676790cf272e64f8dce WHIRLPOOL d1bcf488ed1aae7959303b988c9467fc5d0930166c7bfe0e441392763e19f788496971c07560a9f62586bbb2be7ce741ece8346140d665d29593b9b8f649b002
-DIST node-v7.10.0.tar.xz 16751724 SHA256 dc34dd15524ba821ffcae7b245eabe8631e2614d5e3cb8ff08fbfdadf5919f21 SHA512 d9bb8b4e17c41a9726bba0e32f0cbcdec9cde920457242a7170c8f8fe37aed21d77a0340b7b9bbca2e60cfe5a41da65f0ce7dc295b0a7a823c9e863bd232171b WHIRLPOOL f7cd2a6a4aa6a5dc6c5f59be6897c13f4bdd1230e1324d97704ed32efcc65685d0d5b180e0f0018f9564bd4f4e6df43c0b90a289d5e5a92937e60a13d0281bf3
-DIST node-v8.2.1.tar.xz 17897168 SHA256 02c46d8914540eea73d0ad33bf9f371a28aa0dc8c5d740948491fef044ad8c8b SHA512 8d84998e8408b89e003929d7fce89c31703aea59ca5826246422d4d1935941730b0b9907a8a9af088ec8ccad60d8919da04104037083a2363daf118682a3b82a WHIRLPOOL dbbf430699f88b1c86b1a818b9c2fe424d3c63eb36c2b85b54de78954d8f01dc47a2f66a6cecf30c43e8ab29236f0a7509a26afc4586501abcda4494a78a21c7
-DIST node-v8.4.0.tar.xz 18265792 SHA256 5d5aa2a101dcc617231a475812eb8ed87cac21491f1dcc7997b9dd463563f361 SHA512 7d0d97ca64db0bf87f1892490f8b7758a879d2ac22532b69e8e0ee5c04bd11073fd917353eeeabdcfbebc83540715d8c520ec9bf9ea1afc82d8ee7b6caf819f1 WHIRLPOOL 23f50be06615350564577349f6388d6563cbcae9e9b0229133baaab30852be7c759fbb4f265816ab999fa2bfa8666b47fb3ba438e09beff8e030fa2db547001c
-DIST node-v8.5.0.tar.xz 18326412 SHA256 e1cde5d8e5049e7e1b61aef128f26162059d885dc8cab5014bf5cbf693f75c3c SHA512 7ef83a6da7ba9d61c19df0530dfee7b769c0bc7ab066fc29fdb54c9b09085a3536699c7c92889cea8fbf3d6241cc66c383cd351451da8019fea4e0d25d043f3d WHIRLPOOL 63576159748e9423a0b1df7d032d4f5edc23d33f22fd76d3dc0f0b4804606abf57011097dcf4fd2d3707b22babe69bcd976133b7450558925b5d679872abd382
+DIST node-v8.8.1.tar.xz 18209260 SHA256 5ce2c47ab779992db49942f757a01cc5131db5cef4e0dd270e48151b0887b57a SHA512 368eafd66d2108ebce4593bf496e129287949ea6d6b7d4b1f0f02e91ae1ef9632a63838dda752f12b4c2b133c2b2ae74b390717c02778c427e8e17964c002c0f WHIRLPOOL 26ab36f120ad068f5e36c06c6c7224fdaedcfd88d519ff573a984d83b07c5aafe0fcc773ebedab43326de32e20bfed4c681c7f14a9563733b0f091bc0ded39a5
 EBUILD nodejs-0.12.17.ebuild 3425 SHA256 4dbd8abed45e7a0266b9cd379bb95e205e8edf006e57711dde176ba954b996a8 SHA512 5507119d2bf420f8096c15258dded17cd5bc5470aa36d8ca1ef4324c183536580965b5c0b8022f22ebce509621d84ab2423d768e2c5d8e2268a40f622ead8075 WHIRLPOOL fee27aa0ccbcc6e8d827de12e49fb1e549b2784b9edf6e19304ccc24ad243a28556d01fdc046a74e9023ebf394d0e47f2e60442b2c23b0b49c7c169a66beeb11
 EBUILD nodejs-4.6.1.ebuild 4435 SHA256 0ffa9d22c3264d0bcd11ad6fddba92c55257d9da1a732ed70421a844f09857b3 SHA512 989f6f6375723a6de89aa9f593585557032f4794be80e39d68fb2fb7dab6de0fbaf6b2b56205ac21f3f9bb2b2cae92505efc9b644f99fa33f24cfbfa469fc358 WHIRLPOOL c34ce2816c957622d87abbd54f04b8763f1bdb9caada6d909e761ab024d70d2a04a41a0714339da42d445a018d9a0b9830d2e1849b00de14b8c2d5a7ffb6cab9
-EBUILD nodejs-6.11.2.ebuild 6094 SHA256 7bfa8c4347e75e4d753084aa97aa9c966184312469aaaa78fbadf3ff4702babd SHA512 4a9968d5e5e2ffea375208e3b91ee972b14ffd8dcbe24b77bc86990bc8f863831d3c96de8764368d37163462009bc0ef47ac96c528f0b04cc4554fbfc59a80b2 WHIRLPOOL 874ad9b6bdda3b115170bb811ebec675f87daeeadd0812b5f0caf042570bb26b49baa77db32742a3714e5478ffebf40fa5fba4c3ac2da82f72aeb19683ce5764
-EBUILD nodejs-6.11.3.ebuild 6094 SHA256 7bfa8c4347e75e4d753084aa97aa9c966184312469aaaa78fbadf3ff4702babd SHA512 4a9968d5e5e2ffea375208e3b91ee972b14ffd8dcbe24b77bc86990bc8f863831d3c96de8764368d37163462009bc0ef47ac96c528f0b04cc4554fbfc59a80b2 WHIRLPOOL 874ad9b6bdda3b115170bb811ebec675f87daeeadd0812b5f0caf042570bb26b49baa77db32742a3714e5478ffebf40fa5fba4c3ac2da82f72aeb19683ce5764
+EBUILD nodejs-4.8.5.ebuild 4437 SHA256 9ba83181dd49f1c758430db5c0c588d9b03eda0dcfb01bff2b22a047a72daab0 SHA512 4d005e665935845424b336e6d561a3eedf38194460cd16e4db5940d8750d97b27a51fc2a077e12832b07f75a01c8dba3ff38eea84d081ed89cd99b959702545c WHIRLPOOL 4b47a76d0bea7b57558b5dd339796e80c5e67ea38de831cbd1cc011bbdf0da4086577b2d5b5471c8db04b7a51c9f40d1a351a8641ab29e2e3d5bbbf1f2e6fd10
+EBUILD nodejs-6.11.5.ebuild 6094 SHA256 7bfa8c4347e75e4d753084aa97aa9c966184312469aaaa78fbadf3ff4702babd SHA512 4a9968d5e5e2ffea375208e3b91ee972b14ffd8dcbe24b77bc86990bc8f863831d3c96de8764368d37163462009bc0ef47ac96c528f0b04cc4554fbfc59a80b2 WHIRLPOOL 874ad9b6bdda3b115170bb811ebec675f87daeeadd0812b5f0caf042570bb26b49baa77db32742a3714e5478ffebf40fa5fba4c3ac2da82f72aeb19683ce5764
 EBUILD nodejs-6.9.4.ebuild 6073 SHA256 150fdc85c99024a7280f3b5c23f11c9a5c7f99ac5a075fccaa8c1dfd4f52865d SHA512 aefc407c057e7c660ed0be4adc5056c9130b95adb63b22bd55d06c4981d70d53d82a65350df4778684c597de5b5bf6b2f8cd28b0ce61de4914c4db02ac3461f7 WHIRLPOOL 58aabc7cc764c8a47538dff634bdb295a2c93ab646ae544cbd61fb32961a465a5da65cb9a068ff837675cd5f41ef8c769d1e06a184740e7fc86819fb4e1d1be2
-EBUILD nodejs-7.10.0.ebuild 6152 SHA256 dd32cd53dd8f66dacd397db141dea21d2030bc6dc79719714541440734e9ec2c SHA512 70b272065b7dcec036d37bea63c3047c848219eac5d3b0086689cece1c12315d6cbdfb90fded78ce117a23f82aec5f7db6098019f47b53715ee3b6f35d97777f WHIRLPOOL 646f190d8775b75419f6ced6894c442387d4209148f855109ba9b1d6dc7ac7eacbaa7ef698709b929a985d4d15c19b2f9e86e2a6cf0ff019b601d081d6cdafb3
-EBUILD nodejs-8.2.1.ebuild 6152 SHA256 dd32cd53dd8f66dacd397db141dea21d2030bc6dc79719714541440734e9ec2c SHA512 70b272065b7dcec036d37bea63c3047c848219eac5d3b0086689cece1c12315d6cbdfb90fded78ce117a23f82aec5f7db6098019f47b53715ee3b6f35d97777f WHIRLPOOL 646f190d8775b75419f6ced6894c442387d4209148f855109ba9b1d6dc7ac7eacbaa7ef698709b929a985d4d15c19b2f9e86e2a6cf0ff019b601d081d6cdafb3
-EBUILD nodejs-8.4.0.ebuild 6236 SHA256 486d66ddf4e938e3a6d34191c20ec0eef9833ac52c7a92b79fc83a7c45503908 SHA512 c6d4ed336aed843bec749b6e83af527d586fb6378904a2f3b0971d48269ec1584efc7f8fa01aa5520b6751b419e9b503d2536a0b53a1dc37a9de3ceaddb5fd6b WHIRLPOOL 75f75f2eb4b39a6690f22cc34ebf14d81f06aa4ef0c43215ae165f6c371718e2e8a3362a70921ee1fb23b58475d97e1d90ed1c89bc23de9949d79aadb426bda9
-EBUILD nodejs-8.5.0.ebuild 6245 SHA256 5933fe6f7092a60264171773f9bc442c5dad97610e82e2838f0181ebef256b7c SHA512 67d9bded8b6615fa5cbc30ff35c67facdcad32cea81fd473fbf312cd21b4c68213d329274bc5340bad1b7e3cf2e444743fda5cf22df3f11622679661e2e6cdc1 WHIRLPOOL 9aad22b07b82c2a25cbe75f3897de7fa2451f6c25f79e13e9684f6cae7cd1e3fb317c3fd8ec63492437b7af5b658b7333a4a4dcea9fada6153e5df22233316a1
+EBUILD nodejs-8.8.1.ebuild 6245 SHA256 7bb3d99a63a7847de0fe72029efc4268edffccc4e61a1399ffc0ae7a81660670 SHA512 af76765d0385310b96e5e6b9645255874d9c36be8582c83f0bf2f8be810dcf175a827ccacb1f8ad38ed4a99ed390f78c3a0996d433ccc4edc540f38de89a8984 WHIRLPOOL 416ae7ebf0fed3615d0f23e2491654962a78f9839bdcaafe2ae051fddb80ea1a4669d1ac1458bdabd23425993312bc6e8c25172a7d5b170c34732a9fe4ab8476
 MISC ChangeLog 16331 SHA256 16702a204cff5e2c71e5b982f323aa3aeaa29a6f3b2da7d23745b81a7f9e01bc SHA512 a98fae5176a945e301bb763d80c44c641295dabdd8cd6d8226106db206b5e3d90654f3b9d98f5adb2291218c97c1707daec05f68f5d1036edba0129c5d86169d WHIRLPOOL 7a409b0f4f81d549f26f777325c4149a645e275fd83b5128252dd27596654e6800454692664e3cf5d41030794215e8e39cbc05ff3cd6db7bd681a12a96eeffec
 MISC ChangeLog-2015 23934 SHA256 354bd9c41192f651dd4426b236bc63a6bb41ea76831855a0ec00550a369a1b97 SHA512 28421b67fa37d71d97f976bd938cdaded4c994c08fa68d469b1d193a4cb380da633acb352cdcbda0f4cdfaf6cf671c82132c3e64bb48721df9d78843bcf49d74 WHIRLPOOL 65cad5043c8d83e0d342c1e593a7c0eb2d2400968507ef48e2de0384baab13861c99ed7e44cdf41eb6027826b174695be598d77077587a01ce96adbb43a5b633
 MISC metadata.xml 749 SHA256 7bd1463235daf323e99518809d179f158263c5b702cb3b06433e33527a78f0ba SHA512 6b1115136449fad2edd373b2b853874b54da2dfab5a30a36f54bd8c0ac61636139f3c59bbd4618460c725bf9981c71731c33ccb07900c38c58bf4b9511254ee3 WHIRLPOOL 3bb964d5b3a51c2895fdf5c0d6cfcde5391f8cabf4f559e78c0988558f14c6c026d9523a89e14a8d8ff605d33a39982884d85397b6871aec4d5a862b2b3e2777
diff --git a/net-libs/nodejs/files/nodejs-8.7.0-shared-nghttp2.patch b/net-libs/nodejs/files/nodejs-8.7.0-shared-nghttp2.patch
new file mode 100644
index 000000000000..5f5a2c7b7ff0
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-8.7.0-shared-nghttp2.patch
@@ -0,0 +1,105 @@
+--- a/configure
++++ b/configure
+@@ -182,6 +182,27 @@
+     dest='shared_http_parser_libpath',
+     help='a directory to search for the shared http_parser DLL')
+ 
++shared_optgroup.add_option('--shared-nghttp2',
++    action='store_true',
++    dest='shared_nghttp2',
++    help='link to a shared nghttp2 DLL instead of static linking')
++
++shared_optgroup.add_option('--shared-nghttp2-includes',
++    action='store',
++    dest='shared_nghttp2_includes',
++    help='directory containing nghttp2 header files')
++
++shared_optgroup.add_option('--shared-nghttp2-libname',
++    action='store',
++    dest='shared_nghttp2_libname',
++    default='nghttp2',
++    help='alternative lib name to link to [default: %default]')
++
++shared_optgroup.add_option('--shared-nghttp2-libpath',
++    action='store',
++    dest='shared_nghttp2_libpath',
++    help='a directory to search for the shared nghttp2 DLL')
++
+ shared_optgroup.add_option('--shared-libuv',
+     action='store_true',
+     dest='shared_libuv',
+@@ -1360,6 +1381,7 @@
+ configure_node(output)
+ configure_library('zlib', output)
+ configure_library('http_parser', output)
++configure_library('nghttp2', output)
+ configure_library('libuv', output)
+ configure_library('libcares', output)
+ # stay backwards compatible with shared cares builds
+--- a/node.gyp
++++ b/node.gyp
+@@ -14,6 +14,7 @@
+     'node_module_version%': '',
+     'node_shared_zlib%': 'false',
+     'node_shared_http_parser%': 'false',
++    'node_shared_nghttp2%': 'false',
+     'node_shared_cares%': 'false',
+     'node_shared_libuv%': 'false',
+     'node_use_openssl%': 'true',
+@@ -151,8 +152,15 @@
+       'type': '<(node_target_type)',
+ 
+       'dependencies': [
+-        'node_js2c#host',
+-        'deps/nghttp2/nghttp2.gyp:nghttp2'
++        'node_js2c#host'
++      ],
++
++      'conditions': [
++        [ 'node_shared_nghttp2=="false"', {
++          'dependencies': [
++            'deps/nghttp2/nghttp2.gyp:nghttp2'
++          ]
++        }]
+       ],
+ 
+       'includes': [
+@@ -163,8 +171,7 @@
+         'src',
+         'tools/msvs/genfiles',
+         'deps/uv/src/ares',
+-        '<(SHARED_INTERMEDIATE_DIR)', # for node_natives.h
+-        'deps/nghttp2/lib/includes'
++        '<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h
+       ],
+ 
+       'sources': [
+@@ -691,6 +696,15 @@
+                 'deps/http_parser/http_parser.gyp:http_parser'
+               ]
+             }],
++            [ 'node_shared_nghttp2=="false"', {
++              'dependencies': [
++                'deps/nghttp2/nghttp2.gyp:nghttp2'
++              ],
++              'defines': [
++                # We're using the nghttp2 static lib
++                'NGHTTP2_STATICLIB'
++              ]
++            }],
+             [ 'node_shared_libuv=="false"', {
+               'dependencies': [
+                 'deps/uv/uv.gyp:libuv'
+--- a/node.gypi
++++ b/node.gypi
+@@ -251,6 +251,10 @@
+       'dependencies': [ 'deps/http_parser/http_parser.gyp:http_parser' ],
+     }],
+ 
++    [ 'node_shared_nghttp2=="false"', {
++      'dependencies': [ 'deps/nghttp2/nghttp2.gyp:nghttp2' ],
++    }],
++
+     [ 'node_shared_cares=="false"', {
+       'dependencies': [ 'deps/cares/cares.gyp:cares' ],
+     }],
diff --git a/net-libs/nodejs/nodejs-4.8.5.ebuild b/net-libs/nodejs/nodejs-4.8.5.ebuild
new file mode 100644
index 000000000000..9de641b4dac9
--- /dev/null
+++ b/net-libs/nodejs/nodejs-4.8.5.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit flag-o-matic pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug icu +npm snapshot +ssl test"
+
+RDEPEND="icu? ( >=dev-libs/icu-55:= )
+	npm? ( ${PYTHON_DEPS} )
+	>=net-libs/http-parser-2.5.2:=
+	>=dev-libs/libuv-1.8.0:=
+	>=dev-libs/openssl-1.0.2g:0=[-bindist]
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	test? ( net-misc/curl )"
+
+S="${WORKDIR}/node-v${PV}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1 # Verbose build
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# make sure we use python2.* while using gyp
+	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+	sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
+	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	local myarch=""
+	local myconf+=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib )
+	use npm || myconf+=( --without-npm )
+	use icu && myconf+=( --with-intl=system-icu )
+	use snapshot && myconf+=( --with-snapshot )
+	use ssl || myconf+=( --without-ssl )
+	use debug && myconf+=( --debug )
+
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) die "Unrecognized ARCH ${ARCH}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${PYTHON}" configure \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		--without-dtrace \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	emake install DESTDIR="${ED}" PREFIX=/usr
+	if use npm; then
+		dodoc -r "${LIBDIR}"/node_modules/npm/html
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die
+		find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or -name "LICENCE*" -delete || die
+	fi
+
+	# set up a symlink structure that npm expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	pax-mark -m "${ED}"/usr/bin/node
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	einfo "When using node-gyp to install native modules, you can avoid"
+	einfo "having to download the full tarball by doing the following:"
+	einfo ""
+	einfo "node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/nodejs/nodejs-6.11.3.ebuild b/net-libs/nodejs/nodejs-6.11.3.ebuild
deleted file mode 100644
index 67c451917337..000000000000
--- a/net-libs/nodejs/nodejs-6.11.3.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-RESTRICT="test"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl test"
-
-RDEPEND="icu? ( >=dev-libs/icu-56:= )
-	npm? ( ${PYTHON_DEPS} )
-	>=net-libs/http-parser-2.6.2:=
-	>=dev-libs/libuv-1.9.0:=
-	>=dev-libs/openssl-1.0.2g:0=[-bindist]
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	test? ( net-misc/curl )"
-
-S="${WORKDIR}/node-v${PV}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}"/gentoo-global-npm-config.patch
-)
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
-	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	local myarch=""
-	local myconf=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib )
-	use npm || myconf+=( --without-npm )
-	use icu && myconf+=( --with-intl=system-icu )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl || myconf+=( --without-ssl )
-	use debug && myconf+=( --debug )
-
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${PYTHON}" configure \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		--without-dtrace \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	emake install DESTDIR="${D}"
-	pax-mark -m "${ED}"usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		# Patch docs to make them offline readable
-		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
-			sed -i '/fonts.googleapis.com/ d' $i;
-		done
-		# Install docs!
-		dohtml -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	einfo "The global npm config lives in /etc/npm. This deviates slightly"
-	einfo "from upstream which otherwise would have it live in /usr/etc/."
-	einfo ""
-	einfo "Protip: When using node-gyp to install native modules, you can"
-	einfo "avoid having to download extras by doing the following:"
-	einfo "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-6.11.2.ebuild b/net-libs/nodejs/nodejs-6.11.5.ebuild
index 67c451917337..67c451917337 100644
--- a/net-libs/nodejs/nodejs-6.11.2.ebuild
+++ b/net-libs/nodejs/nodejs-6.11.5.ebuild
diff --git a/net-libs/nodejs/nodejs-7.10.0.ebuild b/net-libs/nodejs/nodejs-7.10.0.ebuild
deleted file mode 100644
index 5144cf86d427..000000000000
--- a/net-libs/nodejs/nodejs-7.10.0.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-RESTRICT="test"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl systemtap test"
-
-RDEPEND="icu? ( >=dev-libs/icu-56:= )
-	npm? ( ${PYTHON_DEPS} )
-	>=net-libs/http-parser-2.6.2:=
-	>=dev-libs/libuv-1.11.0:=
-	>=dev-libs/openssl-1.0.2g:0=[-bindist]
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )"
-
-S="${WORKDIR}/node-v${PV}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}"/gentoo-global-npm-config.patch
-)
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
-	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	local myarch=""
-	local myconf=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib )
-	use npm || myconf+=( --without-npm )
-	use icu && myconf+=( --with-intl=system-icu )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl || myconf+=( --without-ssl )
-	use debug && myconf+=( --debug )
-
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${PYTHON}" configure \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	emake install DESTDIR="${D}"
-	pax-mark -m "${ED}"usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		# Patch docs to make them offline readable
-		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
-			sed -i '/fonts.googleapis.com/ d' $i;
-		done
-		# Install docs!
-		dohtml -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	einfo "The global npm config lives in /etc/npm. This deviates slightly"
-	einfo "from upstream which otherwise would have it live in /usr/etc/."
-	einfo ""
-	einfo "Protip: When using node-gyp to install native modules, you can"
-	einfo "avoid having to download extras by doing the following:"
-	einfo "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-8.2.1.ebuild b/net-libs/nodejs/nodejs-8.2.1.ebuild
deleted file mode 100644
index 5144cf86d427..000000000000
--- a/net-libs/nodejs/nodejs-8.2.1.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-RESTRICT="test"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl systemtap test"
-
-RDEPEND="icu? ( >=dev-libs/icu-56:= )
-	npm? ( ${PYTHON_DEPS} )
-	>=net-libs/http-parser-2.6.2:=
-	>=dev-libs/libuv-1.11.0:=
-	>=dev-libs/openssl-1.0.2g:0=[-bindist]
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )"
-
-S="${WORKDIR}/node-v${PV}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}"/gentoo-global-npm-config.patch
-)
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
-	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	local myarch=""
-	local myconf=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib )
-	use npm || myconf+=( --without-npm )
-	use icu && myconf+=( --with-intl=system-icu )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl || myconf+=( --without-ssl )
-	use debug && myconf+=( --debug )
-
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${PYTHON}" configure \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	emake install DESTDIR="${D}"
-	pax-mark -m "${ED}"usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		# Patch docs to make them offline readable
-		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
-			sed -i '/fonts.googleapis.com/ d' $i;
-		done
-		# Install docs!
-		dohtml -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	einfo "The global npm config lives in /etc/npm. This deviates slightly"
-	einfo "from upstream which otherwise would have it live in /usr/etc/."
-	einfo ""
-	einfo "Protip: When using node-gyp to install native modules, you can"
-	einfo "avoid having to download extras by doing the following:"
-	einfo "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-8.4.0.ebuild b/net-libs/nodejs/nodejs-8.4.0.ebuild
deleted file mode 100644
index a86e5fe18f8c..000000000000
--- a/net-libs/nodejs/nodejs-8.4.0.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-RESTRICT="test"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl systemtap test"
-
-RDEPEND="icu? ( >=dev-libs/icu-56:= )
-	npm? ( ${PYTHON_DEPS} )
-	>=net-libs/http-parser-2.6.2:=
-	>=dev-libs/libuv-1.11.0:=
-	net-libs/nghttp2
-	>=dev-libs/openssl-1.0.2g:0=[-bindist]
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )"
-
-S="${WORKDIR}/node-v${PV}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}"/gentoo-global-npm-config.patch
-	"${FILESDIR}"/nodejs-8.4.0-shared-nghttp2.patch
-)
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
-	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	local myarch=""
-	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-openssl --shared-zlib )
-	use npm || myconf+=( --without-npm )
-	use icu && myconf+=( --with-intl=system-icu )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl || myconf+=( --without-ssl )
-	use debug && myconf+=( --debug )
-
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${PYTHON}" configure \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	emake install DESTDIR="${D}"
-	pax-mark -m "${ED}"usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		# Patch docs to make them offline readable
-		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
-			sed -i '/fonts.googleapis.com/ d' $i;
-		done
-		# Install docs!
-		dohtml -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	einfo "The global npm config lives in /etc/npm. This deviates slightly"
-	einfo "from upstream which otherwise would have it live in /usr/etc/."
-	einfo ""
-	einfo "Protip: When using node-gyp to install native modules, you can"
-	einfo "avoid having to download extras by doing the following:"
-	einfo "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-8.5.0.ebuild b/net-libs/nodejs/nodejs-8.5.0.ebuild
deleted file mode 100644
index 337dc33d32c6..000000000000
--- a/net-libs/nodejs/nodejs-8.5.0.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-RESTRICT="test"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl systemtap test"
-
-RDEPEND="icu? ( >=dev-libs/icu-56:= )
-	npm? ( ${PYTHON_DEPS} )
-	>=net-libs/http-parser-2.6.2:=
-	>=dev-libs/libuv-1.14.1:=
-	>=net-libs/nghttp2-1.25.0
-	>=dev-libs/openssl-1.0.2g:0=[-bindist]
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )"
-
-S="${WORKDIR}/node-v${PV}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}"/gentoo-global-npm-config.patch
-	"${FILESDIR}"/nodejs-8.4.0-shared-nghttp2.patch
-)
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
-	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	local myarch=""
-	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-openssl --shared-zlib )
-	use npm || myconf+=( --without-npm )
-	use icu && myconf+=( --with-intl=system-icu )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl || myconf+=( --without-ssl )
-	use debug && myconf+=( --debug )
-
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${PYTHON}" configure \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	emake install DESTDIR="${D}"
-	pax-mark -m "${ED}"usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		# Patch docs to make them offline readable
-		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
-			sed -i '/fonts.googleapis.com/ d' $i;
-		done
-		# Install docs!
-		dohtml -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	einfo "The global npm config lives in /etc/npm. This deviates slightly"
-	einfo "from upstream which otherwise would have it live in /usr/etc/."
-	einfo ""
-	einfo "Protip: When using node-gyp to install native modules, you can"
-	einfo "avoid having to download extras by doing the following:"
-	einfo "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-8.8.1.ebuild b/net-libs/nodejs/nodejs-8.8.1.ebuild
new file mode 100644
index 000000000000..2739d2a8cd9c
--- /dev/null
+++ b/net-libs/nodejs/nodejs-8.8.1.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+RESTRICT="test"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl systemtap test"
+
+RDEPEND="icu? ( >=dev-libs/icu-56:= )
+	npm? ( ${PYTHON_DEPS} )
+	>=net-libs/http-parser-2.7.0:=
+	>=dev-libs/libuv-1.15.0:=
+	>=net-libs/nghttp2-1.25.0
+	>=dev-libs/openssl-1.0.2g:0=[-bindist]
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )"
+
+S="${WORKDIR}/node-v${PV}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+PATCHES=(
+	"${FILESDIR}"/gentoo-global-npm-config.patch
+	"${FILESDIR}"/nodejs-8.7.0-shared-nghttp2.patch
+)
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# make sure we use python2.* while using gyp
+	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+	sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
+	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	default
+}
+
+src_configure() {
+	local myarch=""
+	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-openssl --shared-zlib )
+	use npm || myconf+=( --without-npm )
+	use icu && myconf+=( --with-intl=system-icu )
+	use snapshot && myconf+=( --with-snapshot )
+	use ssl || myconf+=( --without-ssl )
+	use debug && myconf+=( --debug )
+
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${PYTHON}" configure \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	emake install DESTDIR="${D}"
+	pax-mark -m "${ED}"usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		# Patch docs to make them offline readable
+		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
+			sed -i '/fonts.googleapis.com/ d' $i;
+		done
+		# Install docs!
+		dohtml -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	einfo "The global npm config lives in /etc/npm. This deviates slightly"
+	einfo "from upstream which otherwise would have it live in /usr/etc/."
+	einfo ""
+	einfo "Protip: When using node-gyp to install native modules, you can"
+	einfo "avoid having to download extras by doing the following:"
+	einfo "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/signond/Manifest b/net-libs/signond/Manifest
index c0790a673da8..a03fe18f6c08 100644
--- a/net-libs/signond/Manifest
+++ b/net-libs/signond/Manifest
@@ -1,4 +1,6 @@
 DIST signond-8.58.tar.gz 277287 SHA256 301e2e3b6919585c8ffc56f73ec1f0f9b18a533e1db88461e9fa4e2acf75a34a SHA512 74c9f32ea99c869c0aa72b5816962336869131ea4e8484c53636b35f2ed669a49cbc0ccf10c2c446697892235b94cf2c74f8d5402f430081d7d51421646eec91 WHIRLPOOL 7cff41e9ca37627a6a80a3c23d960958543ee2344ee24771d5e02c6a519d82f68a5003bf9a2bb413c9cbf20f7b450adaf9a82160cd422146431fce237d87d084
+DIST signond-8.59.tar.gz 281298 SHA256 23f6658bf358cc09b858402ee0857db2a2809276625eb01673a0a77969740762 SHA512 b8db03127df7b62dbf046841568c12f29c48c0b3272751600637864caa1c10b05ee9abce20fa41fb8eb7133c6bb20d18ca40803077e9e7808dba5afd108a36bb WHIRLPOOL 67afcc0fcdcc6012f747bab4e2c00e4131ba1e4c92b2742d9772c6b1060d72ceeb711df6785739562f5bf0964bedee69d2ea5f7413eac829131b02fe267d4f19
 EBUILD signond-8.58.ebuild 1504 SHA256 d46d897a80c24033efa562578c02badc70d85bd222b17e3b252997a5928b8811 SHA512 79dcd94289c7580d6ea79886f1e34b675702b6b4776a38296ca48b9d1130658829f452c4a1c92a9909c195dc60cc0dd0187ae9c40ccdab0e98df1793894af6f4 WHIRLPOOL e9ac53ac3501cc3343a2c7ef98bb594898d431c8e0575d20903290963330c12846ef9d1035abfcfd90320b125d07132d76f85c16a1fbb049f48ee8807f4d167b
+EBUILD signond-8.59.ebuild 1556 SHA256 08cf423ddc87fc4a2d8242f1df2f03bf908983917136fe1bf659e5296348311a SHA512 1520361b6a80553639e51e20a26b1c7d878464406d1ac5b6cb5c4da22442a95733718532673a4e187e17eaa131059d28dfb395bbdcb0d0ef75d80953f4811fbc WHIRLPOOL 2b4db1b426a2841e409b97ae171b8d03118e7ac4079777546246fc15880b4d730541cbbff1df4cecf69bda4aa44a8485d2fabae053717f2549df1f906c6ea955
 MISC ChangeLog 2047 SHA256 36114df8ecf58dfc2ece09dcbff1a0db98541b7e99f1315c64773dae9c1180b1 SHA512 ccf1950064e45a40d5300d663915d1f65b5fbf11d7a2add973e9005a71c56a839474af67416e5c48727529d7fbae30355644901f631d4353d51bfcab8e44b47c WHIRLPOOL ad1ab2f8c3e986cc34dae63069a307df1f7aaaad5d69c06443f618c2479eded415437323bd6f41e2c69f459f5269ccb419014bde61270cf8877aa3d8220f60ff
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/net-libs/signond/signond-8.59.ebuild b/net-libs/signond/signond-8.59.ebuild
new file mode 100644
index 000000000000..b094d09479cc
--- /dev/null
+++ b/net-libs/signond/signond-8.59.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils vcs-snapshot
+
+DESCRIPTION="Signon daemon for libaccounts-glib"
+HOMEPAGE="https://01.org/gsso/"
+SRC_URI="https://gitlab.com/accounts-sso/signond/repository/archive.tar.gz?ref=VERSION_8.59 -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc test"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	net-libs/libproxy
+"
+DEPEND="${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( dev-qt/qttest:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<net-libs/libproxy-0.4.12[kde]
+"
+# <libproxy-0.4.12[kde] results in segfaults due to symbol collisions with qt4
+
+src_prepare() {
+	default
+
+	# remove unused dependency
+	sed -e "/xml \\\/d" -i src/signond/signond.pro || die
+
+	# ensure qt5 version of binary is used
+	sed -e "s|qdbusxml2cpp|$(qt5_get_bindir)/&|" -i src/signond/signond.pro || die
+
+	# install docs to correct location
+	sed -e "s|share/doc/\$\${PROJECT_NAME}|share/doc/${PF}|" -i doc/doc.pri || die
+
+	# don't install example plugin
+	sed -e "/example/d" -i src/plugins/plugins.pro || die
+
+	# make tests optional
+	use test || sed -i -e '/^SUBDIRS/s/tests//' signon.pro || die "couldn't disable tests"
+
+	# make docs optional
+	use doc || sed -e "/include(\s*doc\/doc.pri\s*)/d" -i \
+		signon.pro -i lib/SignOn/SignOn.pro lib/plugins/plugins.pro || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest
index b9e4b3ab10a7..881f51b0b952 100644
--- a/net-libs/tox/Manifest
+++ b/net-libs/tox/Manifest
@@ -1,7 +1,7 @@
 AUX confd 27 SHA256 eb0aa3b25232a64971c6b39799c384577cf85ffe16ec41119b6b4e8336649cd5 SHA512 1f7d9888a794ca4db64332430f6fd4ed3e257618fd87855922ff9186bca332827197f4f5aa199a27586fd2fcee04ed4d617bbaeb3866d9ba6f9c37ff8cb61ba1 WHIRLPOOL 6ee1adbbaf88b3334c19b60ec4b25081900afcf95f290b1376ef70c39bdeb5dfc7cb5e02f396dd2d2f010bba924595fa39d35cbfab01e03c1c274a0f8a171524
-AUX initd 524 SHA256 6d490b473102783ec9a491a9b7f4886d52393498e5495bca4d27a95fcbf35f52 SHA512 01e564d9e056b55e68586630cb5af5875c9ad02cde74610d85ea2c23673a4b9fd2b6fe206f25e9c625d63dc41fa56f6360de9191ba46851b88d090cce0ea34ad WHIRLPOOL 0dddf412173493e4e464df9bf9b71669f0a5a29398af793f59b59c47788556adc02fe31f14bd65849eccccbf6fe39cbb851330de88d95db6d2152bad72383939
+AUX initd 533 SHA256 88fac7885b62e4aef89b2be52496912752c3bc14f543b6c4330a1077a31d5867 SHA512 46fb490c26244a894e2a33b464083c0b653f9c195af08848cd85b6f74f1677ffe66664c90e9c85e8ddbefec91d773ceec95e7043ea678f7f96c50ed0f96efb56 WHIRLPOOL 2d23dcee4b584e300c7007ff81ce6a011e5f0bb814eb207b059749fe730e9a9f5411d4f54dfb846a5028e7db2f4ba7bb48771be5382e97c935a4582dc57c8f3e
 AUX tox-bootstrapd.conf 2171 SHA256 50857064339feba2e087364984d2af329fcf3c526fb559f1ee52d6f7406a1a62 SHA512 b2fc5db3facc47bc9ae13824ff355b2e7fb496f489ef5e5cc01d17d8fe31befa740d510d76130967c858930ae6ef6183a5feff5a6a0b6853a008100859e4afda WHIRLPOOL 11af2838d1f0e471194303021c0653ce4166493f59eb55affffd66d5e3bc83d446275d553db5c458dcd36a8ea0b29bdc17d00b5815bdd0449708a8bea75693a0
-AUX tox-bootstrapd.service 356 SHA256 cf871bebb33b4b1e3bf15bceb6809fa8ab85d16d1c1f8ef86e42a93d8d32d9e0 SHA512 7811da914bd0f496cec0540470ef2263c7899c0adbc27611c0ce5c108507b0c27978785d675c93d6fd7ef826336551fec534d39338e581e4d0e81af30581772d WHIRLPOOL 94b9fcdb039b690cd8f5cb0eac49eb9362ca1ff365ccbfb952e7a83767a6eec96c8e96ce925397aaa49bebf09d2c87b190062609414772625a5c91fd2ec6c85c
+AUX tox-bootstrapd.service 365 SHA256 f6b6ed17e7f31e1b5bcbc6067de3a919807f4e499c009d13df2f7bf3d73aca27 SHA512 d565430c53b91343d57b6db573884c9f11aaf8bbddfd70bf3a46a6dede91c01ab8f1371ae052b4dd529cc521bef28924069fc7f4bc3d610c01cbd6d6569707f8 WHIRLPOOL 7b89ec33f96728d583e29f2f94151432fe4374992cfeb04786704352e728b5074057dd789f75fb21a51eb1665180d56700bf840a8a8ec493aaa36f168ccdb358
 DIST c-toxcore-0.1.10.tar.gz 820090 SHA256 4e9a2881dd0ea8e65a35fc9621644ccf500c1797a2d37983b0057ed3be971299 SHA512 428fee2d811d0b6d5d005f082aa06f95765794b1a8bc77ec4411bb9ec9085b99675535b88db50f5ad7313850a0bb3c54c4e2e8d8864cea7c0c7d81be9879b157 WHIRLPOOL 122a6f89c1d34afc685b80e74b9c20e3175ba49865d25a580f0e850d7851304b9077842f23084d4691efa9896d33ddfe136deac034d0eb51f821622e068bc988
 DIST tox-0.1.6.tar.lz 314837 SHA256 c51dfaf30cddbfb9a6080c8202d68113452224570109cd9a6f1b7d9709eae6af SHA512 57ed7cee2c621c57e24f5ab36d68d99414d9820cdb3e8b7c4390818222f9d885f352f9cf76c8eb522c238bebc7d420bcf3cdd5f6ab65b9801aadbd225765166c WHIRLPOOL f75b27ade0f87f3793affbd291aba4b9e2387a29cd89deaf1351ed0797f634737938ff68d95a9fa1866891a68fa7a3b7f1c7ff0b68e3865eb7835fb9c4e5ff8b
 DIST tox-0_pre20160904.tar.gz 395495 SHA256 2d4a0d096bdb81b12b10551765fb9f87270e170f10f387f700b3def68cb6c35c SHA512 c0da52ac908141e97e96510a05431cbfb4b9aae81faf4c136c95e21b90a23e3bbe6db88303e48c0f4f3c74ca954229787564b7aa41bfb462afb0d8f8430cdaa1 WHIRLPOOL abd3f61784fac93d983e453515d1e8bc87f7d76651a53ce6f566a277d7ec7c1e03294d95781364ce9ab30f2698c6f5cd552bfa4888f8d5d0d315daf038980c63
diff --git a/net-libs/tox/files/initd b/net-libs/tox/files/initd
index f08c59457e5a..101d3297056f 100644
--- a/net-libs/tox/files/initd
+++ b/net-libs/tox/files/initd
@@ -15,7 +15,7 @@ start() {
 	start-stop-daemon --start \
 		--pidfile "${PIDFILE}" \
 		--user="${TOX_USER}" --group="${TOX_GROUP}" \
-		--exec /usr/bin/tox-bootstrapd -- /etc/tox-bootstrapd.conf
+		--exec /usr/bin/tox-bootstrapd -- --config /etc/tox-bootstrapd.conf
 
 	eend $?
 }
diff --git a/net-libs/tox/files/tox-bootstrapd.service b/net-libs/tox/files/tox-bootstrapd.service
index c841b3c2cd9d..ae2f238cd60c 100644
--- a/net-libs/tox/files/tox-bootstrapd.service
+++ b/net-libs/tox/files/tox-bootstrapd.service
@@ -8,7 +8,7 @@ Group=tox
 RuntimeDirectory=tox-bootstrapd
 PIDFile=/run/tox-bootstrapd/tox-bootstrapd.pid
 WorkingDirectory=/var/lib/tox-bootstrapd
-ExecStart=/usr/bin/tox-bootstrapd /etc/tox-bootstrapd.conf
+ExecStart=/usr/bin/tox-bootstrapd --config /etc/tox-bootstrapd.conf
 #CapabilityBoundingSet=CAP_NET_BIND_SERVICE
 
 [Install]
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 7b168001cc30..6bcc13e0780f 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -11,10 +11,14 @@ AUX webkit-gtk-2.4.9-gcc-6.patch 1890 SHA256 d0d82c1a1e955e03dd7667e351d99da485d
 AUX webkit-gtk-2.8.5-fix-alpha-build.patch 914 SHA256 aa6617505fe9342153ba9442ea109d880ca6c3315777c57ab599f67515e2a9f7 SHA512 c3599c21dbcc709cf1bbc56eafdff8f8d30d65732fff73e601a828b397523d9a0cec96a4e7940ad1b4b3d9b4711f6d5f2935dcd34cac9adec63b73401638fd5e WHIRLPOOL 68a39ccf49e7719393f14cd5d53497148527bd697b010378bdec4cdefb21c5fc7ce5081ce10b412c61390a82e45fa44d9d34aa7f223c51ad15eb1d0288ccbe60
 AUX webkit-gtk-2.8.5-fix-ia64-build.patch 663 SHA256 d076739707de117fbc9aebc684c4a43024e1673e4c30fdfa3be529331f0c1f78 SHA512 ce8dbe7f2bacfc6d1ad70d39d80447ab90e6daf63bc1dc4a49c406255f76eff090f79e6076ebc349d69193b72a821fa6591692cf74a28e529f8db95cf86358fc WHIRLPOOL adf8e11ee3060bcba606cf17673d06d9c98034a71f6a7406832fabf461c4697abcd0c3d4cdb8d8298caf221c797e0732a9f865d761fcf05753a1dfd96dfd3d82
 DIST webkitgtk-2.16.6.tar.xz 14658120 SHA256 fc23650df953123c59b9c0edf3855e7bd55bd107820997fc72375811e1ea4b21 SHA512 bb488d7a60e4d6f9683ac343852a75854ef73e6b5aa093361ffe2d08e71e2f11c19da4447f9937221e518cda784bdacfcfd151f9395605a1957380fbc5b1533b WHIRLPOOL b3053979c1837d97ba525e078d4a14c64a66c61cb0117041af02c8fd250b2062fda66e782134d6bf44f3f80a04917a9b2ac61aa4e800f0011e5243d7eb8583f4
+DIST webkitgtk-2.18.1.tar.xz 14823708 SHA256 9cdb7b302fbc8a2a7e1e783b80391e64f8b12d70d6ebad4eb756dd59bf3ed795 SHA512 671392f46a34def51df34e5ce384acdcf7526b286e64f1220921f6c654a28148553e815f6f0fd02252b642dcabef9c646f5386b9ec3d2cb01520782833bb650b WHIRLPOOL e16e1e295d99d6589787fb51e2e3c5867877206428294b824307a5e7af43bdebeda3050a397fffee154c1a624fd21d59e25387fba58c91ce5ab30613773db056
+DIST webkitgtk-2.18.2.tar.xz 14823612 SHA256 b14cb3f1b5321b1dc50abcc0445a97f8e2f8813562bca7ce4d2f8069f6fec8e7 SHA512 94c8ce0fcee741dc9c054fa3f8ecac9756245c623f36e6b0bb5588d12b660aaa8bbbe28e82d0f694b94b75f1985f9dbf9231a4b63832fcf4efbe7a0116c7585c WHIRLPOOL a1ccd765d6699f07ecad8b4c899398bb2152076eda4f3a86af61d67c741229cf3d0ef02a7c8fbca2fb494e1bb1822518a18aa4f88026e91ebd2d4835d6807545
 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3
 EBUILD webkit-gtk-2.16.6.ebuild 8423 SHA256 9043479f20882e6ba2c68cdfdeebb2bc15802cbc910764ae1a9fde04698a0496 SHA512 aecbca385defdaaf9f24aedbac7c149007fb6f2367ec2efa704083c9dbd24f7d38bee04a3c8b42b412f66c2d0228e5183b9aaa3316b528b9771cb6b00e26fb0d WHIRLPOOL 0a048e4ffffca3ba71a174da7a211d5213c0291e01a7e09a0eb9b0048613726c0514bdcac0f503571c70a92975f70cb1ac6bc64ce665fc0ee52a19b5915de66b
+EBUILD webkit-gtk-2.18.1.ebuild 8284 SHA256 5d7e8f4d89b47210692d1eb6066ad29cba1a8d7946aafc0b07cfa7d6e0d57c0f SHA512 10541ed0a4758e99c50e8c2f2470bea744476231041f2a4ba3f6669f043dfc02ed5a334c649c3a8d841ed54057ff46537fc4efd3ab50cce569339d987c09866e WHIRLPOOL 8443233bdde89e8bcf60df0b96268d258795e7640fc5908917d0759c49a542eacf3bae0f6d57da4f88a0d57740f782c10bcb88821326162682f5aaed43f5f513
+EBUILD webkit-gtk-2.18.2.ebuild 8284 SHA256 5d7e8f4d89b47210692d1eb6066ad29cba1a8d7946aafc0b07cfa7d6e0d57c0f SHA512 10541ed0a4758e99c50e8c2f2470bea744476231041f2a4ba3f6669f043dfc02ed5a334c649c3a8d841ed54057ff46537fc4efd3ab50cce569339d987c09866e WHIRLPOOL 8443233bdde89e8bcf60df0b96268d258795e7640fc5908917d0759c49a542eacf3bae0f6d57da4f88a0d57740f782c10bcb88821326162682f5aaed43f5f513
 EBUILD webkit-gtk-2.4.11-r1.ebuild 8966 SHA256 7f1f65d1ae35ca378ff6f349e8a11abf470eb123e45a3bdbe9c52ecbc779a744 SHA512 559a7228b2c7f2dd00c26c7d4b0b935850eb93cc1e192c2e6695e5a418766050c80181d3b96254dcbfc3b9a8419c0605835a13b7640ceb6b750ec40edff35cd9 WHIRLPOOL 9c2fc07c2b3bdb5dc87ab91054df2bbc5605208167940e9604dc5e680a57a72958fed48b09fd64c95888e5bc0aafbfaa33821322a3cc040691a29b50a7ab989a
 EBUILD webkit-gtk-2.4.11-r200.ebuild 8373 SHA256 fd9192efa1b99815a456576fb1c2546747b7d4ebe07bbba2a79df26db0aee254 SHA512 7b96440750ed9f5e6402aed773cfe1e40e419364d7d526922247e58c9cb7ead97960f9866d90cc990abce8e183d06bd66191d09991d137b7b9ba86faee4f4dca WHIRLPOOL 49a2b920b0fdc7b0bc4846279060ab842494ca04a6748617b54d3ee7ec6622225c6405097c797402bf208b495802588fb1e08ef659ce3393c762821b1745bbaa
 MISC ChangeLog 15451 SHA256 0b65bc7fdc313946992c6be4dc78e9eab37283a4f68e5597dc30b51d667f8e73 SHA512 4baaa1690d1b2b0aff0bf6c82e3f3dcfe51c2100e64874f350c57f74da673f82248280ba6459c7a11f54c59687b1e7780e92ba0076fe365d390e8ed740aa7f32 WHIRLPOOL 7cafcdfcc3450bd74ff57f7f845ea814284fcc29aa9eb1a97254898fd1032c3a6994fb4aafc6a1d914a804a3e6d40e4e3e6e5a8049e760645e59dc0fbe930c53
 MISC ChangeLog-2015 68642 SHA256 5bff244006d996d0c8420da452b9f38139d3090da7ebade2985991ed283f470a SHA512 dac3a9c9f9ccd64fb1554a5e2c919e1306a69b1757f34e0082f76cdcd45188e8f2e299b5181fa8dcda1480263dc242b91a63449c9c7dd344386be81cc1ae66ae WHIRLPOOL b069be8455c7d13a2552ef91029cf37dd6dc47d93bd96793dead7595f19442fa4ec8ff0da0e1f194dde93b5d88683750f4969cd46848417e44f40d6d8fa991f7
-MISC metadata.xml 697 SHA256 4f096b51e01f6f74430bbca04ba292bcc015631d57417deb91a995fe943203a6 SHA512 64bebe1fd72f81707b462bdf3630404e71a87d1807519c86ed5eff393a324e30a32c489f0c7d86d3b6dc2b3855758452e95ae98fb4d0c27555947b35b28907d9 WHIRLPOOL 17cce501d17ac9a29c142462737d223b087bf80b18284fb346de62e9c9f9f23e02efa6a30ec63780ee48d0b2c21a34af9fdc6fd7f72ac152fb272085214adea1
+MISC metadata.xml 771 SHA256 b59662217120ef1a7edb3454ef844a0f53a0e585ea294a545b821dc0b20c88be SHA512 a4f15ea6644bf827f15628917d7af57f6569a2273cdf1246d468af95ab776ffe89fa305f842c869ad75c2b9a9480c4d5bc0e00732952ded75607de7ed9695236 WHIRLPOOL 78368036e7299c5ee0549798aa9a0130ea5f8287b151b8a1fe252c57b2d5d025cc307763a82c017d3216bfd0a204d1167e5a5c80cc5139d8f7ecf7dddc6d627c
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index 2aec05767e2c..9a96619fdf3e 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -11,6 +11,7 @@
 	<flag name="geoloc">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
 	<flag name="geolocation">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
 	<flag name="gles2">Enable GLESv2 support</flag>
+	<flag name="nsplugin">Enable full nsplugin support (GTK2 plugins)</flag>
 	<flag name="webgl">Build support for the WebGL HTML API using <pkg>virtual/opengl</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.1.ebuild
new file mode 100644
index 000000000000..2be3f452f740
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.1.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby22 ruby23 ruby24"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
+
+# webgl needs gstreamer, bug #560612
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	webgl? ( gstreamer )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+RDEPEND="
+	>=x11-libs/cairo-1.10.2:=
+	>=media-libs/fontconfig-2.8.0:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=dev-libs/libgcrypt-1.6.0:0=
+	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.48:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.8.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libxslt-1.1.7
+	gnome-keyring? ( app-crypt/libsecret )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	>=dev-libs/libgcrypt-1.7.0:0=
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2.3:1.0
+		>=media-libs/gst-plugins-base-1.2.3:1.0
+		>=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] )
+
+	X? (
+		x11-libs/cairo[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+
+	egl? ( media-libs/mesa[egl] )
+	gles2? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-lang/perl-5.10
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-lang/perl
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=555504
+	eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
+	else
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	# support for webgl (aka 2d-canvas accelerating)
+	local canvas_enabled
+	if use webgl && ! use gles2 ; then
+		canvas_enabled=ON
+	else
+		canvas_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.2.ebuild
new file mode 100644
index 000000000000..2be3f452f740
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.2.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby22 ruby23 ruby24"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
+
+# webgl needs gstreamer, bug #560612
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	webgl? ( gstreamer )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+RDEPEND="
+	>=x11-libs/cairo-1.10.2:=
+	>=media-libs/fontconfig-2.8.0:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=dev-libs/libgcrypt-1.6.0:0=
+	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.48:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.8.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libxslt-1.1.7
+	gnome-keyring? ( app-crypt/libsecret )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	>=dev-libs/libgcrypt-1.7.0:0=
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2.3:1.0
+		>=media-libs/gst-plugins-base-1.2.3:1.0
+		>=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] )
+
+	X? (
+		x11-libs/cairo[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+
+	egl? ( media-libs/mesa[egl] )
+	gles2? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-lang/perl-5.10
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-lang/perl
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=555504
+	eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
+	else
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	# support for webgl (aka 2d-canvas accelerating)
+	local canvas_enabled
+	if use webgl && ! use gles2 ; then
+		canvas_enabled=ON
+	else
+		canvas_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index e3107f905c0c..0080984c0a6e 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -18,7 +18,7 @@ EBUILD zeromq-4.1.6.ebuild 1154 SHA256 ef66d74781366df3528c621badcdd276f437597a4
 EBUILD zeromq-4.2.0-r1.ebuild 1268 SHA256 75bc198b2329465b1ec660fd47824e6c163ecfb7e2787c7c1de5a9976d9416d9 SHA512 e899d165a43f8d07a1f653e046483219f1dc1827e946c48490af8ce7a156e229a7041a4051076a3584d3768fbc80f8220d8453e7f5e8c0129abf86f411c098a1 WHIRLPOOL 2331c987bda2e176c811b0d0a5576ecba9dfe5da49328eec582649b14b898bf65385b266f8750efe117107c27937f4a8a6fe34951c61e66f4d3c5e2693e52509
 EBUILD zeromq-4.2.1.ebuild 1209 SHA256 5aa692b77bdcc6976cfb9e2da25a5b402e1ebe53d1eb2cc879e07b29048fe5b1 SHA512 d748d27548088f9121f1b3143fed334f5d69527a2868f46d6a1cc74daf0e6164801573d2c4065b9383245ec686680245dc46a036e1e6432d7f138f7a39136154 WHIRLPOOL 7fe0b358f2825a828f7f07272468cbe72d32c36a70165d37de61a0d85ca498ed42d0d3066920cfb2755ce67bfe5f22cbf2478919512b3cb9300c23e1fbc7aea0
 EBUILD zeromq-4.2.2-r1.ebuild 1380 SHA256 66efe92bf053d55886ce2b04f9d50d47292329fff2e02781c9085bf824e79432 SHA512 5ce25d3196c4be51420af99b4590d54c79b687d74a3b64ee44b1322bbce829e3e04b99ea5cb840f1f991f36cc12f9080806aa91666ba183372dee6963442b7d9 WHIRLPOOL e04341b6e82e0bd3fed692a1b1ed197bdca0ff0665291ab338baa5955061ad767ee40c2c6aa4a3da81b1c0de1e7e4f12d42d2af886d69c2cd1758aac92b80257
-EBUILD zeromq-4.2.2-r2.ebuild 1520 SHA256 9a420f2f43826dcde119390ec286b20f86ad5e8ec5f1eb91199e85f50caf2e39 SHA512 b325df97ae4985875b6faffae2dec934fd871ec77e4383a1fe4e7e5a6323e28b4dcaabd89429b9654702aef5e9e1204b35ad1a17b5e77d53b895e3a63482a366 WHIRLPOOL 7b7802130bc4fea98be8f15d67479850493d88400a4b562c68d9f9a1e4c413acff8e35517ef4d0a88fe40ff37820abb38ea33574d72c3209708272e7cd97516f
+EBUILD zeromq-4.2.2-r2.ebuild 1519 SHA256 3ae27be8bb2a9eb78327c224685847f7747faee362954181ca37025e5b88cbd3 SHA512 6b2c909473551ed11fbf3ebf319651e2cec2fb3a0ed0e920d8fc12ea9aae9a1475648daedb4d61bbf3c8c3afdfa47f0baca52db1b12f792b2f7afa71c1e87077 WHIRLPOOL 3657373c4e3526e3a6376a311653b6b0cfda94b444da64baf38fe20ff7057131da273139488ca2c084e6831bf6b7fc9b602b8c2420a502a4534a39acb1f40ff3
 EBUILD zeromq-4.2.2.ebuild 1217 SHA256 e3f0fa3c5448ff5a22003c12e9bbc7a8fec740d23a56fa2c0ab9ec239131a8b1 SHA512 097c10c8db5d2526d8eb5b0958d92be09c842373aad9b22dfa4c8d26cc6fa982440d28b8ac1ddabf1bce0e4a8f5e71ba16ebeecd7de02304ccdf2e5509da655c WHIRLPOOL e7d225fa284a750650e338f88913d7e1c0f861be4edea16ac0d716c58f8cf75e3612134569554ce87766f912cadf5055390dab495f4bbf20c674d4f7d8a588a4
 MISC ChangeLog 6676 SHA256 311b48768020ed8e2252dcc9a034995b81f00a182e02b8ec5f8e37617b78f97b SHA512 e4494ca72365f8c03f0bedec66ac2860f5c120ad2858a9204a674b72a318bedddd7db1581d5941af7fbde3cba57010f1447d54c1fd96c5f0abfedc6e95944ce6 WHIRLPOOL 351de5f5eaefecf51db8692b7677409b96560272e80df1d535a106a8ae38d21412b2f6a167322d71f90604e23f8a88217cb0c640a8017b9ba464885a4dd64cfd
 MISC ChangeLog-2015 10008 SHA256 7d620c3e362a41c8fadacd9c1e7ab9c058189ff9b5340265782937b21f89759a SHA512 15977242729f75e7c57e0f89698576afbd09d3b7ed30f79ef9fd41dd05db1290f37c92e9a5f1eefaea619ee21ed182826535c59519755669be2cf9661f5a9b54 WHIRLPOOL 61d74b6551db99a8d15ebc2e70bd9f86a04272c895dd78676bf11ecc46d6f3101df8306e44375b0eb219b1f0ecfaaed0108a6ae02baf2a9babe31a905f0edb66
diff --git a/net-libs/zeromq/zeromq-4.2.2-r2.ebuild b/net-libs/zeromq/zeromq-4.2.2-r2.ebuild
index 2a885496ff3c..dc958dca3e4b 100644
--- a/net-libs/zeromq/zeromq-4.2.2-r2.ebuild
+++ b/net-libs/zeromq/zeromq-4.2.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/5"
-KEYWORDS="amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc pgm +sodium static-libs test unwind elibc_Darwin"
 
 RDEPEND="
diff --git a/net-mail/amavis-logwatch/Manifest b/net-mail/amavis-logwatch/Manifest
index b8a5cd675aaa..ca8e0b9d28e3 100644
--- a/net-mail/amavis-logwatch/Manifest
+++ b/net-mail/amavis-logwatch/Manifest
@@ -5,8 +5,7 @@ AUX redundant-argument-to-sprintf.patch 1738 SHA256 6f7e911096abe09ccd88ed8fa326
 AUX unchecked-encrypted.patch 2022 SHA256 f6d4dba2dce5580f6ebbb6d0235b7841ea87b0105b3bbe1dc5740c4d4d8a2331 SHA512 6fc07898123012d2755851fa9a4ab026174fb82f1a85361ddc95f407c0f4ac9b1e8979215c1264c21775f997dff343f209676b6055728a52590b37d8e7e2f4ba WHIRLPOOL 9015a2527c6136731af83d0834f5ee8500ce6942d1965c30afc6d58b3afc517ebf6cbbbc51204ba8fa4d200502a15ce6642beb98dd15aacc919e11b87e7c8af7
 AUX unescaped-left-brace.patch 2043 SHA256 a1582521379af0bad46391de151fdf83144a67759ee32fe7cd1a8e2b9976359e SHA512 3e2f18070a76624b260bdb11586abf79ae16f237d0e765a766ce770e35c8aab6afbda58589514b65a3afedfc9104f491c1e69e3201f764b6590b5f34cde9e745 WHIRLPOOL 3cf1e2bafe00846d35dd41f9e57f679efd207837591598e02cb2b1fc1f26e48a2d0fb426d3676edcd514595ee8d4287621e23ed88f9574072527d4de930298c0
 DIST amavis-logwatch-1.51.03.tgz 87304 SHA256 247f12646f834f6ed067d7aa79ef89f458284a6141391c3d96d6225bb1679c92 SHA512 27338abf676f05ec77e3ffb65a1f9ab5274bf8de3ab65fa29d4584ed6fdeedcb85e9e95b124549afdc3fc47780540c1790fa8b273ee296fbd44378d4da450db5 WHIRLPOOL 3da18a7eedad87b609cf3b8573d1bdfb4ee3561776a500f88b58e5576e33a3184cc1deec32a8d0b9252ac51d9e97ba74c5b223080e82f4fce38a156f3ac6df3c
-EBUILD amavis-logwatch-1.51.03-r3.ebuild 1193 SHA256 ba2c74784ea248442c9c2b3abb892f8c41b4ac107315d1c2bc21a964cdc843b7 SHA512 ea96a9ea428d6b260266b74c44ca7eec0f6a760739439c1d36e66bfe89e37201546930ce89296b1750f15f4f41a17e712061abf0b07b14f4459499976092fac0 WHIRLPOOL 1290875ed39d80db0f6dba81f84386e97846cbb7857b25b09b277d41f0912b96b9f85109a2a59965e39c0a3a97eaca46176d85f3659299bfa99f7554c91152fe
-EBUILD amavis-logwatch-1.51.03.ebuild 893 SHA256 101cddc25741f51005e02d08bd4f90d612787c46bad197554b917b619bb42904 SHA512 f665e621e964bd62b2f76d9b893b172818a3a8f709e2fda4072f1b7a0751f8e9c5a42f2416bb93e4def055091b397247c04aef5911906932f9f077b01e0c07a3 WHIRLPOOL 98bc365221e2c819677fa934a32367c28fc3bf2aff0411de6aa6891c0e0b39163ba9bcab983db04eadc029667d424ffbd5df01e11e6bb211a588c7e43b1574f5
+EBUILD amavis-logwatch-1.51.03-r3.ebuild 1191 SHA256 d1238973e4426a1074edfa4715b932efd34ee486618cf0a08224bdd56db006aa SHA512 f6d22402f6b81587d8d98696f345bbda89b3e4c1b312e2713affda611a1b4faec324aea02deec07f6ee65e447a7a5c17f2d5a8376c0ce6fb1009a4e75baabe15 WHIRLPOOL 6cf71087f0f6ceacfc1bc249f2e1fe1094bdecc5bb532a0a5615300c8d5b5c9bb0afd8dc3f2788e3d6427fa45fcce21760def744c97cc97c11a92bcddf7a158d
 MISC ChangeLog 2204 SHA256 95cbfb16c6eebcef18a8559e6b16f61f69b57ba7c2e60ff0e1506374a0669336 SHA512 46e9fc2dc8ec7db7ca1ef4110857c0f042427c47edb4d6d5d7fca65e372f93bf1d841c0207e1cebd9827406032360694c82cf43157ccabbd66d6d27e261bb00c WHIRLPOOL 494bbb01369304c7a8f4abb7fb85938d5cba9f3c245c7cf1e012e182d577fa492639dbfd347f107219b0c1f9910701089536b8fb31ce944b4dceda07a54dfaaa
 MISC ChangeLog-2015 928 SHA256 c1e501d8ed1ecb5abf16abb6df2ea2bc326df14796d05423505b27530e8ad746 SHA512 c553a5750544c2006c8aea1c1d32b7df8e1d90b2096f5369b50e288e2bf56300a0ac82318eec3626db8226dca67c3a100081e1f690677df6a2e4a4ae1927ea22 WHIRLPOOL 61d96d5f0d4233414a70181629fdad2c1f82a3b9c347de7722392b73dfd17cb793dc83234fd3c007b22b9866d4246d337abd13850d7a27622a108cbf590ad005
 MISC metadata.xml 296 SHA256 9964c7a00fb143c08fd771f7d3601f658282cf28e5eecf249487c4b5f1e95b23 SHA512 ba96de61eeaec557c21ba83c0701d6b83f0e25752a4b949a2562e3eb4a0ceef44d0029d5a5bf5fed5ff7d9add59b8d40cfeac7a57ec566a48d23dca3c327e720 WHIRLPOOL ce6b711172c28911c1b8a31a1d58eba66ca1ebdd5307efdfc3d5def0543de5d8c52830e7109252a91b1b425d7b385711972b4827693d9218f2dbb4d0891d1922
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r3.ebuild b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r3.ebuild
index e312caecfdf7..79d11a94ef74 100644
--- a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r3.ebuild
+++ b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-lang/perl"
 
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03.ebuild b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03.ebuild
deleted file mode 100644
index f8eb3efd3b4f..000000000000
--- a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A log analyzer for amavisd-new"
-HOMEPAGE="http://logreporters.sourceforge.net/"
-SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-lang/perl"
-
-src_prepare() {
-	# Replace the default config file location with ours.
-	local cfg_default='/usr/local/etc/${progname_prefix}-logwatch.conf'
-	local cfg_gentoo='/etc/${progname_prefix}-logwatch.conf';
-	sed -i "s~${cfg_default}~${cfg_gentoo}~" ${PN} \
-		|| die 'failed to update the default config location'
-}
-
-src_compile() {
-	# The default make target just outputs instructions. We don't want
-	# the user to see these, so we avoid the default emake.
-	:
-}
-
-src_install() {
-	dodoc Bugs Changes README
-	doman ${PN}.1
-	dobin ${PN}
-	insinto /etc
-	doins ${PN}.conf
-}
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 691be3b60c43..8280d80a7975 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -19,7 +19,7 @@ EBUILD cyrus-imapd-2.5.11-r1.ebuild 4772 SHA256 27af620af50e6d70d44c781dc9a01f3e
 EBUILD cyrus-imapd-2.5.11.ebuild 4709 SHA256 6ccf2d3c818f0e387ce8652c0a3e745134bd88df4e62aab70f3c6ea32e886fcf SHA512 a07326ba69a7f81d900838e4796f85c90c00aaf16385818b8d3f47f70e77ff9a2de135a76effda42db5656b96f70c3369632c1138cb5fd377a2b8507da6e9d71 WHIRLPOOL e6c8f37a65d43a81a38065ca7b60521f6b769c48f8bbd0ef8f89c67b703cd8e2b3e4feffd679b0b7c3dcbd7cda3480fe41c73b802dc8f9b3dee83d527c9cd5c1
 EBUILD cyrus-imapd-3.0.3-r1.ebuild 5754 SHA256 652447ca47a913dd53d20ed976f630351d86e69104dc11afa01c7125a2a1b0c2 SHA512 d345ee957cbeca761b6bc6f60fa4c010e2887f73a08cec49c16fb7082450258d3d900856e6773ba9ffa7fdba5ddf061616adc626c61b44e6f98b1dea8c218a1b WHIRLPOOL 87519e916aab206173862f4c55e59a1d2b23cc0a7d38b9ad341da236a0be17115297b9d013310fb7effa173279f2f3ab4aac10a20d6992f867e78e2f8a04b12a
 EBUILD cyrus-imapd-3.0.3.ebuild 5702 SHA256 e47b9be010571ac5f464486dfd1f84ef1afeb57ea35a0f9ee87251f3c185d5c0 SHA512 35aaa7a6d27ac8186fde64371b9866cd1683e923d31a04cf2a11207955e0b92a181fba5a2707ccf8e4dd3906a7041046c9254fd09b18e6f110a58416e98cdecb WHIRLPOOL e5a165c709ceb05acb009db4ce7bab6277efde3dcfa5b2668d0e052e6fec7fb2a881f8b7c8b6a70be443936795638b8c10a896aa8e7f2d64ea9a4f80412c9060
-EBUILD cyrus-imapd-3.0.4.ebuild 5898 SHA256 f58fda33718256405e1cc31e47dc7533b4aa5f43556302369966850cd1517917 SHA512 35d2cf349e15d5aab22e9dc0dc154ade68d805d318a7d78fb54ec58155040ecd44cdb92ae029ee3a3ad5294a1524270d2d228997203e62e5eb33d6ab91e3b78b WHIRLPOOL c1f160e57f99e7ca625a057182c64debe74d4f98c8eba06083b9111b3b9970c294318329a8fbc6d5ac73a3e0bf44fdfc444cc2f607f6a4b260e0c9346d4ea471
+EBUILD cyrus-imapd-3.0.4.ebuild 5897 SHA256 1632bb5b14968ca18db416c7d4c1fcba7ccd5362ead438c9d58003a156381da6 SHA512 0fa1ecd5a28447c8ce13addf964ee35763865af6ae2d9d0d51bfa31c16a03c5aad4bb51b8ad577f5cccf9fdf915987fc8a29610a3366ebea468e74d646e70e5c WHIRLPOOL bcbd56cd2887c8ac5db836a986dae46c6928e750a4bf7ddc5762fdd7cda4a95a4b621c2c798a7ab60f5a342959ab7ded096f91d44ad3b0aa1545e630d7d2efd8
 MISC ChangeLog 4804 SHA256 d41f017230fe0f2251e7c5f25cbcb6bacde54806993d247f4efb5707312f7298 SHA512 f9109b2a23461c41b418476e2ce4c9a0bee7ee5572213406ffe74c4d1733f207bc8971cd6dac4fd77a762cbc294f5bf84d7ee8031acb39ad799f46b48e925213 WHIRLPOOL dfe3c74426eb843f9cb6b47c37702c2050769434c2e805beb793389d7081c37e69f02ed08389b8906823da724e075ffc4c300a5e0d542d3d328e560b7888f037
 MISC ChangeLog-2015 39151 SHA256 c2bd8f1276a9e00cef3d08c00d5f78aa34a4732c654c3f126ac3d126f804244d SHA512 253f158b336687ed21cdc0507c03bde6e440dc6ea0080d80ca6dd883c279db4f72b9e25f69ceed7c9300011a7705d040c64d2d8445bf45bcaf3e53c1afc08458 WHIRLPOOL ce61597c095271d0d4d613c89b734ac5f12c1f8f04a535cc9bb0e6cc7b5928c5ebc9c69c6f80b0badec8846109ab31f47f4276ecbf47a95167f361c5d1d675bb
 MISC metadata.xml 871 SHA256 2534843965cc06933180f661fe8126b607696e39f1c77112446ae262a5c7fe16 SHA512 25449c1218dfad7b692b37b799a659b6a10e0e31bb003fbed27b3b43ce3610f9ee5f17a995cf9244d5027ad84889a8e79a774f63101bb6ea35054ce9dbb1fe20 WHIRLPOOL 506cdb8d91ee25f145e2cb784612a5fada49974bc6e674ea5068ef1d3a445a747f44b60b59f693f6aeae609f683cfd643498fd6c36973436901217fc6b6ed3ad
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
index ea3be88683a3..013513de3487 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http jmap kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sphinx sqlite ssl static-libs tcpd test xapian"
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 9931f90409f4..40792e14b5da 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -12,13 +12,15 @@ DIST dovecot-2.2.30.2.tar.gz 6008134 SHA256 f3dba79c1ceeaa9dd0633f648d3a607704bf
 DIST dovecot-2.2.31.tar.gz 5993283 SHA256 034be40907748128d65088a4f59789b2f99ae7b33a88974eae0b6a68ece376a1 SHA512 071797e260a75de9117b03c0fa9d903de82b1f1c039c2aece2d7313587e6673c49174bfce17b80fe3f3725fcbc42ed3a1bd1f1c22efef5bc016752277eff3266 WHIRLPOOL cc54758f65cc1f6295cc5533dd784b888d53d9b884016de08ddd16d893f3dc43df2cff87e474dd9f0f4b9df1c90f62330f7c70f051497f34729829849b39e519
 DIST dovecot-2.2.32.tar.gz 6100268 SHA256 160b2151e2af359877f69cb2dcdfe1a3f4138ad3766e3b8562b96616e2f6bc2e SHA512 a26ce763fdea7d72ff9801d3b7d57a1f0d00278e4a1aa60d1be070fe5a6d2c6a15f266a519119492bee7a3e7a6b7d0732e9879e5c5841adbab8c0952cd1b7c7c WHIRLPOOL 11ec82d0648a3fcbeb803f23672c2a734b2bc41828d71990ff72d5f6bfa56e3b294034de615b5b34da257477727832025988446f0baa92a0a56f61aa1d695297
 DIST dovecot-2.2.33.1.tar.gz 6131180 SHA256 e4d9a182408100dce70e05dad1f8a703252a497aeb25706642286d84a118890b SHA512 46760a1d52f8d64c36bd4f589f7f240a13d66500c93e47ce479551647e8e4ef7322fc0c325c418c3e0495910292abae105ca5680cd4b0fcd78746723f1549b71 WHIRLPOOL 941cd157aadbbf6c46c2dca56708e14dea1b2a3103ff84c41e625f5a3b0a75ab15a4b8c2d4e45915fb92a4bd2d589e640425f2354524bc8bdda9604cdc39af3f
+DIST dovecot-2.2.33.2.tar.gz 6131086 SHA256 fe1e3b78609a56ee22fc209077e4b75348fa1bbd54c46f52bde2472a4c4cee84 SHA512 028910a4d02b1630f1ada4d1c45fcc3ea2057969db7078a78d46e2a578b4dceaf8be0ac8de4a613b4890019e721871f2d366ec651db658da4cc72977d3e09931 WHIRLPOOL a861ef3ef9f7cdb8926255c5d51f9d908fa84d671acbab676a8a4f1dbab9173c7005e8079519139a3b359b20f937cd3843a38686c03dab150855ca38c9ee3733
 EBUILD dovecot-2.2.19.ebuild 9085 SHA256 c6ba82ed8109d79688c2127479da169fdf6dc5a65552cf13af3d81e681c274d2 SHA512 cb619f9f5588ab1be1b5de749663e4798044d695a359c96182037c8b3cdb94c8a7b41eac93054f2979b30d09405a3396e83d0d08cad3ad964654ae98f7632098 WHIRLPOOL 170cd361c69375216783253103dd28fd9cb51ba4d46f800e2dc196aaeef26acb917fcdbb4b16c90e0fcc740449304c8170fa3fa9fa39e0d88ecbb5c3739d8860
 EBUILD dovecot-2.2.29.1.ebuild 9207 SHA256 9b76684eb0c7052510f3e29a3e03458235f6ea1327f6dae0d24a759148ef8d1c SHA512 ca5a2af20756d5ac72dc96dd2a80334a3dc533a55b13b1d78ffaf29754795c4af353e39ea34d8e76f82054cec154d4128dc958c855aefdc5ca1877f7c0f3d06b WHIRLPOOL 2087852cf3a36a46f25ecb200f80f7dfbc1d215f48ff574856124a7bdfb0d3a692793c98889797ef58dcd3d4f2c4fc23ff8b60ab9dbcf98e4de6b016fa035305
 EBUILD dovecot-2.2.30.1.ebuild 8646 SHA256 5abad12b2792e8d8022d9bf51485ecb472bc83243f44c1bc751932c1966fdd22 SHA512 b9460cd076d8cb35699abe54ed7dcffa77c83f920bc01ae451fcfefa609850323d6da91e84deb77f38c48174e60c7a9d26e7f086a0e65c7dfb96e3e2e0d8eb0a WHIRLPOOL b4299ee41581612994709e02350ddd4572c82a19bd4832d2d7d444afa36fdf2087437c99b8a771ac1157270f7d791b1447a41486014c9fdddeb71e60df7f568b
 EBUILD dovecot-2.2.30.2.ebuild 8646 SHA256 5abad12b2792e8d8022d9bf51485ecb472bc83243f44c1bc751932c1966fdd22 SHA512 b9460cd076d8cb35699abe54ed7dcffa77c83f920bc01ae451fcfefa609850323d6da91e84deb77f38c48174e60c7a9d26e7f086a0e65c7dfb96e3e2e0d8eb0a WHIRLPOOL b4299ee41581612994709e02350ddd4572c82a19bd4832d2d7d444afa36fdf2087437c99b8a771ac1157270f7d791b1447a41486014c9fdddeb71e60df7f568b
 EBUILD dovecot-2.2.31.ebuild 8652 SHA256 e6d18d821a52fdec681e96f909d47c55c22b1857d574d7ed6af3cde2cdc796a6 SHA512 c2780f5ecbe58947fd9ef01f5df4ee371aa224f63b86b9ddcee4c38cc11eeceff96880b29a29739b7b2479bc0b646ae09b57f38ee4cb31b005b5576e2edbffec WHIRLPOOL 0f3d2437d8d5e6ede3b4b4580513ae48863ddc6f52fb65efb97f46d0a6f1b4d3a01a8e12c836d4315c41cf364dd1cb35a83c1f88336dc6204d7fd8551d0fb568
-EBUILD dovecot-2.2.32.ebuild 8650 SHA256 a504fc429e85f6ffafed742343a3d1f964c30a249c561c19471ded7aa1148460 SHA512 9f9e05cf4274056ccbdb203abb2531c21918bd23ca748729edad71e04e5217300211c48d9e3cd572de76dbae8ad6230d6955bd12c76c19b13b2dd15f8bcdb19a WHIRLPOOL e6fd43467e88f88ddc7fc3f68c63f93113f55071bbb17e823a926ab4ae816a273448d4e7a2ed9743dffa992fbf1884926d6d9e44efa760855e386932adc2e5ce
+EBUILD dovecot-2.2.32.ebuild 8647 SHA256 d4a3496eaf022624cdf0fd996004340d3e1553257ade5b2d46998342735d0281 SHA512 f7e769155d455fbfce2b9ee3ee8e6aa7e123df8698adbf8c14cecdb9a46e6a45d7e50ed7f2482f7622c9fe480349fc9b3af9bd30e3faffcdb69341e812ae2665 WHIRLPOOL 5ffa113e322d2d23d873f1d736f1d771fd365ba909fcf618cbe7abd2c6c3fc85fec445dc1bbc9df4193bd80c6c4acf2438b49e15f9025ecbad8fd07c91b389c2
 EBUILD dovecot-2.2.33.1.ebuild 8652 SHA256 56fd02871646e19777d1a5e5f7878958c56dc5348e88b479947ec354d828fc6b SHA512 24dd9cbdfb0abfa7fa70ba07a77c8ecbe59a4ec22f20a840cb40cf7d9234dd003e4c5d0c5b52d32adc3dd76b7eb1af90a4f539d8f3dfa3e83c42a7e0c6a4e28d WHIRLPOOL a873f961994bccfeb3d586274f526e8251673c06b6e7e2239bcd0542cd371e3f3c8be2ac80a997a93ddf480665458a0b2c089dda397351d4654ae9b30f4530e6
+EBUILD dovecot-2.2.33.2.ebuild 8652 SHA256 56fd02871646e19777d1a5e5f7878958c56dc5348e88b479947ec354d828fc6b SHA512 24dd9cbdfb0abfa7fa70ba07a77c8ecbe59a4ec22f20a840cb40cf7d9234dd003e4c5d0c5b52d32adc3dd76b7eb1af90a4f539d8f3dfa3e83c42a7e0c6a4e28d WHIRLPOOL a873f961994bccfeb3d586274f526e8251673c06b6e7e2239bcd0542cd371e3f3c8be2ac80a997a93ddf480665458a0b2c089dda397351d4654ae9b30f4530e6
 MISC ChangeLog 9857 SHA256 973c08c13df5fb24d94aed96c681cf0ec7539b24581fd0caac2ab3c6e0b192e1 SHA512 0ff9e788bd55fac94e1e641edcbe7849e0dfc0d8152a2df047353f90c8de61655e79f450dbaedec27ffaa29853d3bd603960567109c41500aafafc77cb646206 WHIRLPOOL 32858c3ace71c60b6f0cd95b2dd380acee65dabf57253dc2be4a4dfe11b5468708a351a6591d5cbfa72b054666a0a0221d5e68702f530faf06e40d2d6a11a8bf
 MISC ChangeLog-2015 75391 SHA256 223be6e013f9d10fafa0176b5aee5e71b049add2a493aaa0cf379d9ea40aa04b SHA512 f333fd9ab300bfde52a6ca236fea8110f49362bfc2852783cb483f3769ab8df8c68f1fed0ac2271226bf5a829dc711dd683d5ee7a18313429f027e718cdf4c3d WHIRLPOOL fd8f34b8e8e18c13f98b668e0323d15bd75ee4fbd30258edaf46b93caf3beae51a189bc685b1b2fa3d0c565d5c57ca8f57ef8c89edc9fca362edece65b2c2c12
 MISC metadata.xml 1303 SHA256 50a1e4e8eec92e6c44f7bdb75934727fe0334e6ec6454946c4664a63b0303d16 SHA512 6c574a0373c64e3eaeb6f8a3f4ea88437afe8c43cae6ab7c9144cb75973e0e8b4d66f805fecc7aca62257f0e7ad581a6834d1ad06e5773b6617f0d0e8b623e7d WHIRLPOOL 00ca51b94155b00b3b2fae67daaeb9afb8e8a6fee12fc768964926914cae389053369fc0a73b6826fb24b8d0f4356d3e901f9dbd41b27eb354d852f26f36f592
diff --git a/net-mail/dovecot/dovecot-2.2.32.ebuild b/net-mail/dovecot/dovecot-2.2.32.ebuild
index 1f9dab308838..f6397ad5adc5 100644
--- a/net-mail/dovecot/dovecot-2.2.32.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.32.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 ~x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
 IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
diff --git a/net-mail/dovecot/dovecot-2.2.33.2.ebuild b/net-mail/dovecot/dovecot-2.2.33.2.ebuild
new file mode 100644
index 000000000000..350498e8c2f4
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.2.33.2.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit ssl-cert systemd user versionator
+
+MY_P="${P/_/.}"
+major_minor="$(get_version_component_range 1-2)"
+sieve_version="0.4.21"
+if [[ ${PV} == *_rc* ]] ; then
+	rc_dir="rc/"
+else
+	rc_dir=""
+fi
+SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
+	sieve? (
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	)
+	managesieve? (
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	) "
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="http://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
+IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+DEPEND="bzip2? ( app-arch/bzip2 )
+	caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lucene? ( >=dev-cpp/clucene-2.3 )
+	lzma? ( app-arch/xz-utils )
+	lz4? ( app-arch/lz4 )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
+	selinux? ( sec-policy/selinux-dovecot )
+	solr? ( net-misc/curl dev-libs/expat )
+	sqlite? ( dev-db/sqlite:* )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	tcpd? ( sys-apps/tcp-wrappers )
+	textcat? ( app-text/libexttextcat )
+	vpopmail? ( net-mail/vpopmail )
+	zlib? ( sys-libs/zlib )
+	virtual/libiconv
+	dev-libs/icu:="
+
+RDEPEND="${DEPEND}
+	net-mail/mailbase"
+
+# Dovecot does not support building without ssl.  Force it for now
+REQUIRED_USE="ssl"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if use managesieve && ! use sieve; then
+		ewarn "managesieve USE flag selected but sieve USE flag unselected"
+		ewarn "sieve USE flag will be turned on"
+	fi
+	# default internal user
+	enewgroup dovecot 97
+	enewuser dovecot 97 -1 /dev/null dovecot
+	# default login user
+	enewuser dovenull -1 -1 /dev/null
+	# add "mail" group for suid'ing. Better security isolation.
+	if use suid; then
+		enewgroup mail
+	fi
+}
+
+src_prepare() {
+	eapply -p0 "${FILESDIR}/${PN}-10-ssl.patch"
+	eapply_user
+}
+
+src_configure() {
+	local conf=""
+
+	if use postgres || use mysql || use sqlite; then
+		conf="${conf} --with-sql"
+	fi
+
+	# turn valgrind tests off. Bug #340791
+	VALGRIND=no econf \
+		--localstatedir="${EPREFIX}/var" \
+		--runstatedir="${EPREFIX}/run" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+		--without-stemmer \
+		--disable-rpath \
+		--with-icu \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		$( use_with bzip2 bzlib ) \
+		$( use_with caps libcap ) \
+		$( use_with kerberos gssapi ) \
+		$( use_with ldap ) \
+		$( use_with lucene ) \
+		$( use_with lz4 ) \
+		$( use_with lzma ) \
+		$( use_with mysql ) \
+		$( use_with pam ) \
+		$( use_with postgres pgsql ) \
+		$( use_with sqlite ) \
+		$( use_with solr ) \
+		$( use_with ssl ) \
+		$( use_with tcpd libwrap ) \
+		$( use_with textcat ) \
+		$( use_with vpopmail ) \
+		$( use_with zlib ) \
+		$( use_enable static-libs static ) \
+		${conf}
+
+	if use sieve || use managesieve ; then
+		# The sieve plugin needs this file to be build to determine the plugin
+		# directory and the list of libraries to link to.
+		emake dovecot-config
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		econf \
+			$( use_enable static-libs static ) \
+			--localstatedir="${EPREFIX}/var" \
+			--enable-shared \
+			--with-dovecot="../${MY_P}" \
+			$( use_with managesieve )
+	fi
+}
+
+src_compile() {
+	default
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	fi
+}
+
+src_test() {
+	default
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		default
+	fi
+}
+
+src_install () {
+	default
+
+	# insecure:
+	# use suid && fperms u+s /usr/libexec/dovecot/deliver
+	# better:
+	if use suid;then
+		einfo "Changing perms to allow deliver to be suided"
+		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+	fi
+
+	newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
+
+	rm -rf "${ED}"/usr/share/doc/dovecot
+
+	dodoc AUTHORS NEWS README TODO
+	dodoc doc/*.{txt,cnf,xml,sh}
+	docinto example-config
+	dodoc doc/example-config/*.{conf,ext}
+	docinto example-config/conf.d
+	dodoc doc/example-config/conf.d/*.{conf,ext}
+	docinto wiki
+	dodoc doc/wiki/*
+	doman doc/man/*.{1,7}
+
+	# Create the dovecot.conf file from the dovecot-example.conf file that
+	# the dovecot folks nicely left for us....
+	local conf="${ED}/etc/dovecot/dovecot.conf"
+	local confd="${ED}/etc/dovecot/conf.d"
+
+	insinto /etc/dovecot
+	doins doc/example-config/*.{conf,ext}
+	insinto /etc/dovecot/conf.d
+	doins doc/example-config/conf.d/*.{conf,ext}
+	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
+	rm -f "${confd}/../README"
+
+	# .maildir is the Gentoo default
+	local mail_location="maildir:~/.maildir"
+	sed -i -e \
+		"s|#mail_location =|mail_location = ${mail_location}|" \
+		"${confd}/10-mail.conf" \
+		|| die "failed to update mail location settings in 10-mail.conf"
+
+	# We're using pam files (imap and pop3) provided by mailbase
+	if use pam; then
+		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+			"${confd}/auth-system.conf.ext" \
+			|| die "failed to update PAM settings in auth-system.conf.ext"
+		# mailbase does not provide a sieve pam file
+		use managesieve && dosym imap /etc/pam.d/sieve
+		sed -i -e \
+			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update PAM settings in 10-auth.conf"
+	fi
+
+	# Disable ipv6 if necessary
+	if ! use ipv6; then
+		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
+			|| die "failed to update listen settings in dovecot.conf"
+	fi
+
+	# Update ssl cert locations
+	if use ssl; then
+		sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
+		|| die "ssl conf failed"
+		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
+			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
+			"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
+	fi
+
+	# Install SQL configuration
+	if use mysql || use postgres; then
+		sed -i -e \
+			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
+			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
+			10-auth.conf"
+	fi
+
+	# Install LDAP configuration
+	if use ldap; then
+		sed -i -e \
+			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update ldap settings in 10-auth.conf"
+	fi
+
+	if use vpopmail; then
+		sed -i -e \
+			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update vpopmail settings in 10-auth.conf"
+	fi
+
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake DESTDIR="${ED}" install
+		sed -i -e \
+			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
+			|| die "failed to update sieve settings in 15-lda.conf"
+		rm -rf "${ED}"/usr/share/doc/dovecot
+		docinto example-config/conf.d
+		dodoc doc/example-config/conf.d/*.conf
+		insinto /etc/dovecot/conf.d
+		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
+		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
+		docinto sieve/rfc
+		dodoc doc/rfc/*.txt
+		docinto sieve/devel
+		dodoc doc/devel/DESIGN
+		docinto plugins
+		dodoc doc/plugins/*.txt
+		docinto extensions
+		dodoc doc/extensions/*.txt
+		docinto locations
+		dodoc doc/locations/*.txt
+		doman doc/man/*.{1,7}
+	fi
+
+	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
+}
+
+pkg_postinst() {
+	if use ssl; then
+	# Let's not make a new certificate if we already have one
+		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
+		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
+			einfo "Creating SSL	certificate"
+			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+			install_cert /etc/ssl/dovecot/server
+		fi
+	fi
+
+	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
+}
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index 425c9b7ed253..e81fa5970720 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -7,7 +7,7 @@ AUX mailman.service 288 SHA256 6cd1c76bac4ce0c6e15886089a62ed70012653a6416fc1d0c
 DIST mailman-2.1.23.tgz 9290881 SHA256 b022ca6f8534621c9dbe50c983948688bc4623214773b580c2c78e4a7ae43e69 SHA512 398dd5c301005512900aff38c068ee641eea9f2970dfde17c37a8641759bd6fff8e6d37ad63c0c86b4b1594459b3c92023844ca4ec23d1681ac02542bd97f8db WHIRLPOOL c5e45bd4fb59dca5017f547e25986addff8079bf10bdcb6f814942e56cfc618d0e6e075beb7d5240e591d809f27af442c4da9c5e5f35358f5bf86a4f24c1d38d
 DIST mailman-2.1.24.tgz 9251009 SHA256 89b0cfc13c52915b9cdebd4b772852f1043e7435554050b4f5f7094f9093cd77 SHA512 f62f224abe5eb4804828a4d83389432b34595b8d4533310cda4da58ab10c2e62e0b2419929dcc53c32e2754d8f62fa8ef68877db4c65f6112f08f0e452fd6a38 WHIRLPOOL 583f8157de5c93ad6e97f49921f57af65d272da801f3534b454992034484924efde2d792334b7db7dc90b02bbae92a796352a1a65e8576affa80eef9b5cedfc8
 EBUILD mailman-2.1.23.ebuild 5835 SHA256 789686a01c1e7e410094e235d72043106fca41e79d9871980e421c33ea54aaa4 SHA512 bb1e4b7ae51537c1d2d4e27ea96e58e4967a03cc6b7fded302bcbb67ff6d4d21186abc1829147c47ecedb361495ba07c543335b6f6edbc9e38f0e12fd42cd4ab WHIRLPOOL 4572f2c32186f6434aa9f79b9039e783f78f28f4763484feae50d92afca7e8a8f9000330cab38ae04f202d39a09a259eb67a1d9e5e27b70a8dafc0ee13b3ac13
-EBUILD mailman-2.1.24.ebuild 5836 SHA256 ce0fcfbfc506c2b886cb02c5d5ea84d7cdd869c54ec6a6ae46da349039d18665 SHA512 f1a9d9051e558719e4da671285baccebf454c8e2102943c7bec3cf37fbe282a9ac73e748c25ce0af25a1a41ebfd6ff83a90211b0cfba46a43466fbc6dc6ec010 WHIRLPOOL 2d0018829969d60d1175150abc46a953c9205987c24b3f44a6106ae46e64d3a488e23f1c7953c6cb697d279f806eeb815bc06e9371d31fbba39ca37e86df1e8f
+EBUILD mailman-2.1.24.ebuild 5835 SHA256 789686a01c1e7e410094e235d72043106fca41e79d9871980e421c33ea54aaa4 SHA512 bb1e4b7ae51537c1d2d4e27ea96e58e4967a03cc6b7fded302bcbb67ff6d4d21186abc1829147c47ecedb361495ba07c543335b6f6edbc9e38f0e12fd42cd4ab WHIRLPOOL 4572f2c32186f6434aa9f79b9039e783f78f28f4763484feae50d92afca7e8a8f9000330cab38ae04f202d39a09a259eb67a1d9e5e27b70a8dafc0ee13b3ac13
 MISC ChangeLog 4399 SHA256 a8af4fc02594e94c0f97bd5b4cb76da002a3706ca1508842b74f6e1342424d71 SHA512 ec569bc87d5841102bfcbcf2ec94d4d77a237906f63937cacdd76aa4e6a19a89690fd9a22d642f5d5711da76d5a69892e0f9aa77ef09381e8439cdce3c1c41d7 WHIRLPOOL e23b9c5853508342a4fc7281cd23cb6155300afee7152e73261df4e456b1854516b19c80b4174dc948b50c61f3c98f79cb232cca6d0ab5a42201182ec4029b08
 MISC ChangeLog-2015 20958 SHA256 913282d55fad5cfe19703c8c3de63e957c8df5929410d3c4331d8342b9280f62 SHA512 2dd773d7ea3ccdf1a2241e90f13f5585d9dbf7656c26ae196ac5219828aefba1cbe2c6dbdbfe1b6f584820d9a05f9af6ad8e7e34cc90fad15679bca54d12b967 WHIRLPOOL 2d047534d4739f8b82c7aa20e7e20b12f4c3b7b9252db3456d8c08d28bccc59c6ec375be64130bdc4eb91c355bb8ed87aa10da797da2add76ef0243060986ea0
 MISC metadata.xml 398 SHA256 8a1ea66253161fe81ab1e3f541237be1fef45d8bc64a21a230ffb67b3d6f0fe2 SHA512 e12fcde6e9360aaab80a5cece049ca20ba8deca00c7051987d0903d1dd9992545d62c10186f05dca6fed28682050efe704cc3ffd92bbcb0ceb9ce5ce972cf62f WHIRLPOOL b081299391465ee0a7f22ba0542c79a06e0e00d50497a24fe6463c32f6e545231d815cffb8b6ed3128da0623b1ae4a317dec4977e9a9cf59a2113e103c39ca67
diff --git a/net-mail/mailman/mailman-2.1.24.ebuild b/net-mail/mailman/mailman-2.1.24.ebuild
index 977d9d38712a..8c9de0c02035 100644
--- a/net-mail/mailman/mailman-2.1.24.ebuild
+++ b/net-mail/mailman/mailman-2.1.24.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.list.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="selinux"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 17551cdfe881..382431c7fc0d 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -14,7 +14,7 @@ DIST mailutils-3.2.tar.xz 2795512 SHA256 96d354e69e93d5ed6dc2e1019bc3ed3c6e32224
 DIST mailutils-3.3.tar.xz 2618632 SHA256 27d7fbdff904abf4eebf008c56ca61f135b110f8304c22bc4926dca4f944b4f6 SHA512 ece4e59ca46e287b8e69e45b9ca1207f9a7ef450ea009212ed9284d5aceaeafe64b0ee6333f42c1edcea2a2c45d414b8436e49bf342938bd78b7157a751bce9c WHIRLPOOL cf78b4d5762c7888c8995603b772d6b9b2485cd48c149d22c2c61a646857cf0f23f80a285a740b5d8ad177999eae302b90eb931d08021ee7fbd813463ce147ab
 EBUILD mailutils-3.1.1.ebuild 3575 SHA256 a3a8f2f6878946f91853ad2989e277e90e4c7abad868778b5ad275d84b7c4b74 SHA512 3fa3501b885b254bfaf86786d67a3177f0756cb0346ba630dc9b902c851ceb708abce1057d326de769704ff50d713859f0280433b384a6f17b016a4045d05570 WHIRLPOOL efb958c29b2e8ed499997cdc5e6e4fb78a2069750077acb605a17ef828f21931a9a5e3d2a6b00fac20f15c7d530ca18def937c2898fce872a6ec1193e154c8cc
 EBUILD mailutils-3.2.ebuild 3572 SHA256 2444d17d022ceedd371f2a76906d62b2778f04d45b6758c5205a182418980ec7 SHA512 eb2de61804c2e6da6a6c704f7df7e88b6ab8682b1e023e2f47661c504a38bea4fbe391fb4fce462f6674e1de645422c0a991f4d906635d41163dd9ac7874ad03 WHIRLPOOL 884887b2ecf8a6928e5b9f3af118dc808977f9826b7f19c59b1965a798471e16634e542f5e4f8b6712c6c5de7770c90839fe655802d4167e491911a52405adb8
-EBUILD mailutils-3.3.ebuild 3462 SHA256 a865dcc9e2cd804dd01e1c13b5fc9d804ea1b006394935e8eff26988ea4b5a17 SHA512 0cac9a11d3b995aff0cf97b633b64ef3f4b3807e5d0d1b355fe3e16e5b9ef1abfe0874c936cf5b8b67468188b3ba73c764945b6028cae14b97e7d05e2e716033 WHIRLPOOL 40f8f90250e0957ec7ae636a50defe11e0b858cf8590a71f5fbc7c431b708294a4c625f1e63168255a029b3767fe111a950aaede0e1d682f1c9377bf3856cdc1
+EBUILD mailutils-3.3.ebuild 3468 SHA256 796f08cb2af91b934cde1606abadef5dfb83dbd20aaaf842f52a42fd88891167 SHA512 0e2691b30d4da040975c89c059d2f79b5025a8f6a686e4d4a45bbbd49db9793b40caff76d4f9a6986132c88fd00657d930c2871020ae01ca3651dfd97b3a3f11 WHIRLPOOL bb64e4c4ea9be1144f6ea369fd573e06e73a47c16f1bbe2f32a85546949896be29287a5e980c6a81e1c9fbfbadacb4c8b3793fe1af4e5cdc93ed08f6abe9a8df
 MISC ChangeLog 5455 SHA256 22024cf49b78294fdbf350d540c1cbff74ded9b5ed5790552ad3063ff7940ba5 SHA512 b16a07cda1196de4eb31e60ad88a0aa9e28e43d7dd810d18269892a849ec70ebe4d1af7299a76557ef10289eade0c85cfa1fe4fc8af2ab6f622b5b70128ba7c4 WHIRLPOOL 57e8d636f52f82d34a233ceed610cdae1f84d4f73924fc2ce170cfd2c72105ca1924af35f59ab3bd7a0ff37113502597f1634ed2bcbf4cba3fbe22d8bd2cf38c
 MISC ChangeLog-2015 10533 SHA256 6005cfed69eb8d6065cbc67be396bb130ceb3a4c40427e17b5608ac72ed719cb SHA512 8351be5fb052ca348935f535ac456034fb1342871d6eb0ff3a66cd6565b33a383c197be33b6a42f0b57f15f6730f8f549f48d7a96142a124ef3f17a83651963f WHIRLPOOL 11932cba8f90b74c53f55de61748f1ca217ad5137376572d34166f19345e12bb5ce1b3fffb16b6a3e051c8e0407c2616b6d52d433b367bad1746740be1184fc0
 MISC metadata.xml 598 SHA256 11e28455f0762275ad80e82ebb26de0119b7791916fbb5a6c677185e213b6ecc SHA512 16f2b6b082da7c932457df31809c8ca1caca1f8439037f56b5751c28cf1217658ed60fd4155871d4d5d71e7040c01edbe37198dee27beeae1905da954317c8e7 WHIRLPOOL 34b3346cb70bb38e74fd021b28b21578dfa82a7b038db8ec5109b0e58a489cf8dece99cf33c970d22e7f410641c58ccc39ef8fea57b72f109b8c883791e74d0f
diff --git a/net-mail/mailutils/mailutils-3.3.ebuild b/net-mail/mailutils/mailutils-3.3.ebuild
index 00ddc41f835c..7c001e0b6168 100644
--- a/net-mail/mailutils/mailutils-3.3.ebuild
+++ b/net-mail/mailutils/mailutils-3.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="berkdb bidi +clients gdbm sasl guile ipv6 kerberos kyotocabinet ldap \
 	mysql nls pam postgres python servers ssl static-libs +threads tcpd \
 	tokyocabinet"
diff --git a/net-mail/postfix-logwatch/Manifest b/net-mail/postfix-logwatch/Manifest
index f672357c5ec6..1d61ba184874 100644
--- a/net-mail/postfix-logwatch/Manifest
+++ b/net-mail/postfix-logwatch/Manifest
@@ -2,8 +2,7 @@ AUX multi-digit-enhanced-status.patch 1479 SHA256 89c7b86632ccff9f1cb2720a585100
 AUX redundant-argument-to-sprintf.patch 1744 SHA256 a3e500da7b5379f3c0600904b2092e7a6b3a9a8270d1137ebc0f0c07211a4103 SHA512 31e35603cee7c51ffe126ba0caeadbbca564694439101d92293d2163d3b674be552ac3e781d4b10fab11435d072bf3bb540e3070bd3a839dd6297fff02cf5b04 WHIRLPOOL 408129f782a7fd6a40f72061f4953726c48e87b5b3fdbb3b2e58e5f488a17e584ca411786591cbdc7d0f7e2745e8b5005b420a62b5c1811c92a0268d8c5f597d
 AUX unescaped-left-brace.patch 1277 SHA256 cf57345d6dec8bf8d45020af79d4c15bb95d4c3d98b2495bea39df561439eb15 SHA512 dcfdb1fc7793fcf8a1e41fd890023c901bccff5c241601f99a5aef398fe35c1eae82d786064e189ef2113aad9d2081a67d8451d9c58ceefc78192e22ac5d3033 WHIRLPOOL fde7e75c52ca4afc97bc7d8183c5161badf379f71ae543f5660cf566f7a42a780153457d18ce18492eb8aa9f524ac06e7f28539ec5e155649151b12127d4793b
 DIST postfix-logwatch-1.40.03.tgz 107065 SHA256 c9aae87471554bb93c9d91bd2df3999ce3fae19f75ffd43fdee3f8552232c748 SHA512 7059f409cabb3cb638885342ab876e1c85c87530c3544bf04c54a56707695acdc5cbb706e3f192ef5608c9a00706e4d7be3cc7b32286460719d7b497e44b3341 WHIRLPOOL 3c8e556863a79ec55af5e1a19204ddbc2fb3ac60c1a8162239f465da2cda465983f705755be7750e58e0a196c680b1e880f5c6aed0157baf275f6443535104a4
-EBUILD postfix-logwatch-1.40.03-r2.ebuild 1071 SHA256 e26f7d9d889364847fceec4712ffa74aff48319aa9a446500d0ab41c7cb5c46f SHA512 4fe1e57565820139e3228d3b3a10400d0ae68bfd89aa3a066bf2e83247244a2fd704c8c7ed7c2140659dabe8e2a3887c02fddbd40b6763e599d4594f24d40456 WHIRLPOOL dc557e7a7fe266617e7b1ad950c8411b7a893463633c5470690e16b1d1c46edb0d64d9c4ad29faea46f1f119b748f37b4c757121ec7216ad6305954094fcae5e
-EBUILD postfix-logwatch-1.40.03.ebuild 905 SHA256 d27fe92c7a60846aa5a796c2e22ed7cd1684699b853ff0e2d40c011dae12ec03 SHA512 ab5358dacd8bcbf723d2c8a310f67b2a351bf814a018f3a258d6ae68ca244aca34b214194d53678caa5cd5ba99e24a0c74a2fe068078659a955694c02adbca30 WHIRLPOOL 05afddb1f12be1e8a2a6e93a75692e1e7d6796afe560e434f75c04e31dd467e380d4dc55c3ac40bd1b4e06b0241987ed92a95dfdae1c9a1ed9defa8f7db89976
+EBUILD postfix-logwatch-1.40.03-r2.ebuild 1069 SHA256 67ad1c36450f608ae3a6d52f8a7e0cef8b61278ad83cd694cff6c19f695c34e8 SHA512 c92f554614484baba18a9a3e178e4a6d419f2c41cac23f951a518fd63513b8e9df278391441ec8ae2cf9c68f2923e274e3e436bbbf3761430a6c5d797635c5e7 WHIRLPOOL 8d94e99aa55903279a07e4cdb9d462757c34150e2b2eed679539dbeb719359cbc9a0192c27af791ecd982e492dd65082549843856881cfb6aa8c361a0b78e8a5
 MISC ChangeLog 2439 SHA256 23a257bb21b554b1099d717e06e9c6e22c92b564e921edafcf3297e53c361f66 SHA512 a78e1a9c4d3d70f6d2fcbff2201d0d348441f1ad1ce3d690cefcc82286f0571afda1676efb3c97a7f8cb34dee12f8f1f5dd86f0361562fede4b2750d6ad3e26f WHIRLPOOL 5967139fac80d2013a40056206dca62a5606f88a6b8cf2bf6580b438aa1ca57ecbf49e3ede57088cfcdfbd2a230263f16b6aa39e2509705c8365427f3524fbbf
 MISC ChangeLog-2015 1150 SHA256 0ea7b481e33e04aa79b6033fe7b2197661fc5599c5fa0c9df9382e98d536c3d6 SHA512 6d84cd9cba19e811f48b254cddd65d3fb43064f644ed179e95588c73b287520b78c272d43db1297b53dff6fda222ed6f5e45166acdede705b63aabe0530e30cd WHIRLPOOL 8eeffdfb7b8bae200f8ac33bd6b25339cc8b9d1bc4fe997c5fcb926af4b3aab3ecd0a2acdfd2c316a21d8e513f01dab3dce0f2f1a9bb0535ebe7abc25d88d523
 MISC metadata.xml 304 SHA256 b182e57c2917b40d2337cc57fe76f04e36af8c24004a80c61c3eea94f9b5477f SHA512 6df4937b334df95e1178cd70c594d9ef08e52f5b34f4da0a129cd3586192dabe974623b13b6992021231150e8a70b7c2d68e7b65faea39113efe04f9a2244cb1 WHIRLPOOL b774e93c9c2e496b4d859e2149b688d68785cb18bde4a6f17dc10dc1e09c199b0d3c775441b863936ce726a392adc7d6f69eeb2a45fd33ea7967984165cfb272
diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r2.ebuild b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r2.ebuild
index b798aeb3512f..f1ae6f1bf1c9 100644
--- a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r2.ebuild
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-lang/perl"
 
diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03.ebuild b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03.ebuild
deleted file mode 100644
index 375d2ed98b4b..000000000000
--- a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A log analyzer for postfix"
-HOMEPAGE="http://logreporters.sourceforge.net/"
-SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-lang/perl"
-
-src_prepare() {
-	# Replace the default config file location with ours.
-	local cfg_default='/usr/local/etc/${progname_prefix}-logwatch.conf'
-	local cfg_gentoo='/etc/${progname_prefix}-logwatch.conf';
-	sed -i "s~${cfg_default}~${cfg_gentoo}~" ${PN} \
-		|| die 'failed to update the default config location'
-}
-
-src_compile() {
-	# The default make target just outputs instructions. We don't want
-	# the user to see these, so we avoid the default emake.
-	:
-}
-
-src_install() {
-	dodoc Bugs Changes README ${PN}.conf-topn
-	doman ${PN}.1
-	dobin ${PN}
-	insinto /etc
-	doins ${PN}.conf
-}
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index fd932557f74b..cf655ecbbab1 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -18,7 +18,7 @@ DIST asterisk-13.17.2.tar.gz 32899368 SHA256 19ae0565687b85bde382b2cc274dd5a27ac
 DIST gentoo-asterisk-patchset-3.17.tar.bz2 5074 SHA256 2af864f0b40b42c55f3c3ac737856942c9393adddd47ebf6d982d9214b85a2ad SHA512 37f86f3c699b2643afd8080391e817a282571694bb56e00efd0734918dbc33d6c12a2463dbc24667597420863b4f506870140fbb8ef3f1700124ef790ae7252d WHIRLPOOL 79017eeb3737953515286db6386bfd848f7501b6f2abbc1ba6b6865a75495ce999d555e3112336abae23371a21a2d64a10f1d173e285314bb5bab22bfe2d4c1a
 DIST gentoo-asterisk-patchset-4.05.tar.bz2 2889 SHA256 2d5d90777c896065d1f1ab7e44c7040ec2b143ee816080791a1c357efe6a0a60 SHA512 6fdb245e37074f124f4725c25a1547c872f6216eb1d37faeda8ed7c5e4dc87424e9c1ba20bb34722165027692916bde4c8bfc816ac5c89710972bb3f51bd1b75 WHIRLPOOL 5d89902c3863027780d67f9aa6428a2788f191582d03e905642fc817bbb7aa7991c04423a09e06d95e92c5ba15b6ca193c47a146379ef5c120f07b9fa6419126
 EBUILD asterisk-11.25.1.ebuild 9618 SHA256 c36cb43c5dc9918bb400363b1db4358a9c80897400cfb08c7907dc6150e97cba SHA512 2408972c5322735a4f4ea8ad7ea09bd7813e1618935f2f6f8655eeeddea7bc7e7a85fc37f1ee6084661dcc04d73279ac71e7a0ef029908e45d5844223fa4e7b0 WHIRLPOOL 4d0da52291605b3f4fa9cf42619f5b7ed40054b6e677723287f4c21b1e92004327e78c53a31b6e912ab3f2b88d8cbacd38fad6cde2b884f9e9187c9b08f06d1d
-EBUILD asterisk-11.25.3.ebuild 9619 SHA256 2cd85a29897525cc1e259b2e1aa94daee07f74b086552592e36d6be86b94a5cf SHA512 fe13a2ffb8fffa30eb08c50498d4c40ee405779a251249edf80990b9fc1f6a6a5fdf5ed72ce6bf1becf55ef83ddb1b40684ef0f6d9614f379e707aa6921139f0 WHIRLPOOL d1bbad206cfb8dad5008ce01b419fed48ecce3a105c32085deb6a317257b9f0f93c7794befb54f7a3810f53f02f15c287f4bc31f9ebcc22949d7821f21e187a5
+EBUILD asterisk-11.25.3.ebuild 9618 SHA256 c36cb43c5dc9918bb400363b1db4358a9c80897400cfb08c7907dc6150e97cba SHA512 2408972c5322735a4f4ea8ad7ea09bd7813e1618935f2f6f8655eeeddea7bc7e7a85fc37f1ee6084661dcc04d73279ac71e7a0ef029908e45d5844223fa4e7b0 WHIRLPOOL 4d0da52291605b3f4fa9cf42619f5b7ed40054b6e677723287f4c21b1e92004327e78c53a31b6e912ab3f2b88d8cbacd38fad6cde2b884f9e9187c9b08f06d1d
 EBUILD asterisk-13.17.2.ebuild 9724 SHA256 b48a4c39c998641495d22c16d5591dba2184160577681bfb367ce501bcce553a SHA512 a3f8b96be8dab1b8a28177dcef963463122c1fc459419550d2329c8e054b08c9ea27bc5147c60cd6ac47ebacaa8b040691bb2a401de342b31a3073a79ba9043e WHIRLPOOL 8f6a0453196da182014a9209f62b56d59b7b9355992bda09ac327e427ec712466860e88658f15845394a4d680a325fcd547fcb7706c1027a857c66114dca5bc4
 MISC ChangeLog 9607 SHA256 db6299ba91496cb960e55aef762d7f9302a773908d501fda6550d52f412b0e0b SHA512 1994f299ab6f31a02df2aac6ac566373eaa04b7b4049a2e5d3bc04b3eb56bbf1bcce1d3553a931011c5d8105c55e8691f1991fafc67e21924848d3a43083d7ea WHIRLPOOL 44249abc5d6cac9f19cdd8eed42dec2e845d1031ca690297ba856f8d670b7b0488be1e675eecb2554291caa972b29b8d2ddc88951f64764cd986f95867f6c61d
 MISC ChangeLog-2012 113409 SHA256 6beb419f0c2e63641c73f2c14bd0c3a6a319c65bca8be526aa441fac2104fc9c SHA512 08c037acd578b9c3c387a80e45e80a68c4da84e63fced30215f22ec14eb6e223348d8e7d68f4decdf8a2d8cd0933b3f7fa3adddf7cd80bb407498b3e2868d917 WHIRLPOOL be0f2192531f7477545ccc0f10d9a50f36228e8d8d0e2773ccce3799c2d1b5e1b7be70d96502f759c7c878f88efd83122fc9230374c40c8963fe0bc7ff014b87
diff --git a/net-misc/asterisk/asterisk-11.25.3.ebuild b/net-misc/asterisk/asterisk-11.25.3.ebuild
index 3d1accfa89ce..5733b5cc4eab 100644
--- a/net-misc/asterisk/asterisk-11.25.3.ebuild
+++ b/net-misc/asterisk/asterisk-11.25.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.t
 	 mirror://gentoo/gentoo-asterisk-patchset-3.17.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 IUSE_VOICEMAIL_STORAGE="
 	+voicemail_storage_file
diff --git a/net-misc/axel/Manifest b/net-misc/axel/Manifest
index 1dc3cba80865..0a2b81b1c7cc 100644
--- a/net-misc/axel/Manifest
+++ b/net-misc/axel/Manifest
@@ -3,11 +3,13 @@ AUX axel-2.4-buildsystem.patch 566 SHA256 da7ccc2dc5969eb4c4f5cc8631c1f75823cb3f
 AUX axel-2.4-max-redir.patch 412 SHA256 0007c9c2f61ec39769d13ef93e4820f0f819d598bcd40aca7382fe098071b55c SHA512 81aa9e566798959af38ff9f59f493462acfdff7e817c2285717456463505149a00970a39cf7f14cc4f5c79c159e5a57b83b76eff690d454921ecb80efabd7491 WHIRLPOOL 3e01fa52c69a4c28d552faf326405ee89eb523f3c1ff4069f440466c939d6426fc15d08f8f468a6379caa57a9b1b95343d29a0c29c87ab4f40401323716cba2d
 DIST axel-2.12.tar.gz 82995 SHA256 28e7bb26b7be3f56a61b60ef07e15e05ea9a41850b0ed45a0c56d6d2202f4a8b SHA512 5e163c319366f7efd16f8b35dbcf901300c884ab303696dabe87ad47511f56cc3f1e399af738dc79ca717ca70fd529b6dd1adf30f5162cfb530105ce34e2eaf2 WHIRLPOOL dece4ad9eae5441e0b24952a96189417e75eb155ad46b199ce531b35fa6d027ffb75a16c016044a37dd4e76601865e51c0310b69b7fc70b974f9b67a6b2b1fe5
 DIST axel-2.14.1.tar.gz 89356 SHA256 acf6820d98a792faf309fc9acf22f7caf4b8a4b7001072c8f546b3c4fc755e39 SHA512 72c37fc6def0c765ed8220c27efe22255073b1e3cf1c8f6bda5ee2ce9cd36ac46263ac602a185efd40ca8f197a268612f2dcda69bcb49891c2538b910d971e8b WHIRLPOOL 1384ab65a689200f68d2549deb2f22526ae82a25f1b580ce5a270babc33d577513c2732a57676ea1e51b99eb09267960a5e24b6507ebca64a61d6ab4070eb374
+DIST axel-2.15.tar.gz 96474 SHA256 0e223f18954e4c6c34b882a474c526b9c7d107168220c2f3892598248236a172 SHA512 b0a516850b56b74fe763df3320b98e47f9977dda208cff9a98a87bdc63e37f5e0fd31d30c240a375f9d992320674983ced8201ee631187149e62b42804c48eb6 WHIRLPOOL 64b0d6f071ddd66fefc5d980b34797feece8fbba2bab173c3fe6627c9b6fdcb213e30b84e26d1d6699d9cdf514bda1fb39985ef820fae0c31f3533a7c8e756eb
 DIST axel-2.4.tar.bz2 44995 SHA256 ebc7d40e989c680d2afa632a17e5208101608924cf446da20814a6f3c3338612 SHA512 34d73cea19f2bf393aa8d3e4b6c24296f8b1d4e6177da6f4728763e013d5d9d073aa5dae31d0ff175126e8fcbd973daf94674a70f100afc9e7d00b92b78b8ec9 WHIRLPOOL 373af984738008572847ae0ed84a518d0b61323e3612f48affa96175792b0856c2bd13601ddcdd0c81ead5059ee41130759bf9b0ada2a2654f767ec69d992a0f
 EBUILD axel-2.12.ebuild 1155 SHA256 989c636775a189e4ba72c9054bc0b8c1a0fc70e6168115184eca34af2ed3dea2 SHA512 5070aeaefbc1649011db1791fd3594adc79f39aa530207324e73fafbffb3496da83302dfe3c994dae87d90bf28c7ecebd327458882629061f0255d61ac6bb1f2 WHIRLPOOL c317ec66f89658047214f4db1d13ba45e67179a0f18276f668e7c02e7935f70b2b401e8982ff382fd6b4f8b894d057bdd706ada27404877e0e6abe196552a469
-EBUILD axel-2.14.1.ebuild 1358 SHA256 2dff4ac46259acc893742f994e9d529958fd5228fcfeaaf2235392f760a14ab2 SHA512 d5e22c787ca992239a5d7cf3064cb1cc074fcc3d3d95635ed9fa5b7f2f6243ba1ca024d4e3b17ab4a7fe3af72c115fcf6b487698503543a4d39ebdb6ecde548b WHIRLPOOL 3473f00f6c7e8ed74b5e0550fbffa9b0ebf226f39523052630177acd9727b52b63a12ab289d5267ef932427f6f89a009e7db4840a678c28b2dac216c7614f538
+EBUILD axel-2.14.1.ebuild 1353 SHA256 da687dbca7356076af719084130989404809c6658a029d4a6df1f9752046a4ac SHA512 9a112722dea3a9c143dcf30dd761ded084193f26df326353533f51b3100746a7a3a8e7bd9144bd057344b725806c639e15889947133b90b690d31dc8a23633e1 WHIRLPOOL 75ca32c8dc83cba2552a6d268432018d0937dee343968f285526be8285c6a305719fd64dbfd1096c7fa5d3ac22a8f9e7fe89f3c044c495af355b556e31f6be31
+EBUILD axel-2.15.ebuild 1353 SHA256 da687dbca7356076af719084130989404809c6658a029d4a6df1f9752046a4ac SHA512 9a112722dea3a9c143dcf30dd761ded084193f26df326353533f51b3100746a7a3a8e7bd9144bd057344b725806c639e15889947133b90b690d31dc8a23633e1 WHIRLPOOL 75ca32c8dc83cba2552a6d268432018d0937dee343968f285526be8285c6a305719fd64dbfd1096c7fa5d3ac22a8f9e7fe89f3c044c495af355b556e31f6be31
 EBUILD axel-2.4-r3.ebuild 1247 SHA256 60e4e41abe8d92a8c3052d870e9db0ccaaae9ca18319c42025feb1afcfaf6c22 SHA512 faa5ee4628df473cef38395d5e458743697ee03cca323a690796d21ea26427e052b25a42b3362fa289a716fb12b600eeb19ef2fa833448aa150d9afe41221b08 WHIRLPOOL 3795796d1a229df4333c243c22cb442419a2524c36c8e29f1960726729194e3be7be8de7459106ccfc042fcc7dbc2099fa9aefc26aa6b8c17d01552ab05782fc
-EBUILD axel-9999.ebuild 1027 SHA256 72ea1aa89eed76250fabe357198536e6e61bbd1dbedad3c2681f9223d0ef72ce SHA512 86dc06242516228d50eef795f79124dc085660fa6f1b6eee9fa62a404fd1762683de8c242a08feea7ffa4dcfa1552cbc0f91d6d0d967223a4ef3864f887b5bc5 WHIRLPOOL f79ce7e7554a0f7a5d8b2f56897e41d14a2e2aa037153b08a1ae1b702ab57d31dded65eb44ac301705d5bf553315c5c7da82ec14900ecb40ac45c8ec519ea018
+EBUILD axel-9999.ebuild 1224 SHA256 4e79789a4cf31621cc40c45c92523484da9f969ee18994a18804a4a45b848ab9 SHA512 0b08a3fdbce4297c749d35a3e490bc2f2581058fe385a6e326d10fb052af93af1c7646fef76d133b14c5f67b828f0de973c385a49a55dd65fec50fd50e50f0e7 WHIRLPOOL bc40e0263f47dde19a1a9118315f9faeb35adb912caf54177517c66ea22ec6fd67aeb2f9349f4ec5807f5bf6a32312d012d28f38c72de59dec1e9bfb399be077
 MISC ChangeLog 4030 SHA256 9d962ecf6ad498532e81f70f07ce29ce08a68cccc01a69afe9a1ba323b60d98e SHA512 3cfcb2b934827c5c62718148eef092a02d5701fcda79eea1b98a9cdfe69284a1f58b522115271ea470f0ff039de3b937f93a3c2ac0ff4286dc5650f11ea63530 WHIRLPOOL b2f9256f8245dc5ad5788ed0dc661b82a9266afbe8bccbc1d56303db297b57b341ca91505c3dab188c435c8a820e67902cd8e211acceb8683e78e12f3a2f18d3
 MISC ChangeLog-2015 7608 SHA256 579fc6aa7f68ef2c3554329a481c9bd7008ce2844e61207b69398d83b5c55831 SHA512 904527bdfd9f6ad80eb103a811cf162d1a0781067063b3b4171e3ecf3af380e22d23ce5a3b041611ed6e7dde2e79384664a115fba8c36d0c509102248640254f WHIRLPOOL 50cf0a4a76766fa482212e44549392d9d952d4c02f2e29dd2b975fcd6db30858add12ff4794c0e285f9886371ac70bd21fd6ed7173f0dc874cf803ade371aae4
 MISC metadata.xml 297 SHA256 2f8bb0e67e181f88997e57eee8f05aef14fe9d99261a632031f1a0504feb0aef SHA512 8d005244ca7b5f8dd30f9a158e4a53880d8a395bf11c73f8a3c7a3c668153a4c126b0a88942d3bd895a0e5ddc1f672eb770858356d0e12af75a098d36a80d56d WHIRLPOOL f08be791e102bbce96877f9e1e97ae9a0c53ea595739388e5a4ee25e27d13baf90594d80b0513622ccfe997f17fd0bf48749bd682908f9d6b7d4b4959306f1a8
diff --git a/net-misc/axel/axel-2.14.1.ebuild b/net-misc/axel/axel-2.14.1.ebuild
index 4bd7ad89659d..778e289857a0 100644
--- a/net-misc/axel/axel-2.14.1.ebuild
+++ b/net-misc/axel/axel-2.14.1.ebuild
@@ -50,6 +50,6 @@ pkg_postinst() {
 	einfo ' mv "$1.axel" "$1"'
 	einfo
 	einfo 'and then add the following to your make.conf:'
-	einfo ' FETCHCOMMAND='\''/usr/local/bin/fetchwrapper.sh "\${DISTDIR}/\${FILE}.axel" "\${URI}"'\'
+	einfo ' FETCHCOMMAND='\''/usr/local/bin/fetchwrapper.sh "\${DISTDIR}/\${FILE}" "\${URI}"'\'
 	einfo ' RESUMECOMMAND="${FETCHCOMMAND}"'
 }
diff --git a/net-misc/axel/axel-2.15.ebuild b/net-misc/axel/axel-2.15.ebuild
new file mode 100644
index 000000000000..778e289857a0
--- /dev/null
+++ b/net-misc/axel/axel-2.15.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Light Unix download accelerator"
+HOMEPAGE="https://github.com/axel-download-accelerator/axel"
+SRC_URI="https://github.com/axel-download-accelerator/axel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
+IUSE="debug libressl nls ssl"
+
+REQUIRED_USE="libressl? ( ssl )"
+
+CDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="${CDEPEND}
+	nls? ( sys-devel/gettext )"
+RDEPEND="${CDEPEND}
+	nls? ( virtual/libintl virtual/libiconv )"
+
+DOCS=( doc/. )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with ssl)
+}
+
+pkg_postinst() {
+	einfo 'To use axel with portage, create a script in'
+	einfo '/usr/local/bin/fetchwrapper.sh with the following content:'
+	einfo
+	einfo ' #!/bin/bash'
+	einfo ' set -e'
+	einfo ' /usr/bin/axel -o "$1.axel" "$2"'
+	einfo ' mv "$1.axel" "$1"'
+	einfo
+	einfo 'and then add the following to your make.conf:'
+	einfo ' FETCHCOMMAND='\''/usr/local/bin/fetchwrapper.sh "\${DISTDIR}/\${FILE}" "\${URI}"'\'
+	einfo ' RESUMECOMMAND="${FETCHCOMMAND}"'
+}
diff --git a/net-misc/axel/axel-9999.ebuild b/net-misc/axel/axel-9999.ebuild
index 70eda56e3f0d..d4a43d0094fd 100644
--- a/net-misc/axel/axel-9999.ebuild
+++ b/net-misc/axel/axel-9999.ebuild
@@ -6,9 +6,9 @@ EAPI=6
 inherit autotools git-r3
 
 DESCRIPTION="Light Unix download accelerator"
-HOMEPAGE="https://github.com/eribertomota/axel"
+HOMEPAGE="https://github.com/axel-download-accelerator/axel"
 SRC_URI=""
-EGIT_REPO_URI="https://github.com/eribertomota/axel.git"
+EGIT_REPO_URI="https://github.com/axel-download-accelerator/axel.git"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -38,12 +38,19 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable nls) \
-		$(use_with ssl openssl)
+		$(use_with ssl)
 }
 
 pkg_postinst() {
-	einfo 'To use axel with portage, try these settings in your make.conf'
+	einfo 'To use axel with portage, create a script in'
+	einfo '/usr/local/bin/fetchwrapper.sh with the following content:'
 	einfo
-	einfo ' FETCHCOMMAND='\''axel -a -o "\${DISTDIR}/\${FILE}.axel" "\${URI}" && mv "\${DISTDIR}/\${FILE}.axel" "\${DISTDIR}/\${FILE}"'\'
+	einfo ' #!/bin/bash'
+	einfo ' set -e'
+	einfo ' /usr/bin/axel -o "$1.axel" "$2"'
+	einfo ' mv "$1.axel" "$1"'
+	einfo
+	einfo 'and then add the following to your make.conf:'
+	einfo ' FETCHCOMMAND='\''/usr/local/bin/fetchwrapper.sh "\${DISTDIR}/\${FILE}" "\${URI}"'\'
 	einfo ' RESUMECOMMAND="${FETCHCOMMAND}"'
 }
diff --git a/net-misc/buka/Manifest b/net-misc/buka/Manifest
index d74bea4ecb72..07bf4a73ad99 100644
--- a/net-misc/buka/Manifest
+++ b/net-misc/buka/Manifest
@@ -1,4 +1,4 @@
-DIST buka-2.0.tar.gz 14088 SHA256 b7d33f15687198a78b7114251038e54ef70f3ef1a74dd84a36176874ca699793 SHA512 809c35fa0caed30c11f438fc5d68a446a2c8a6ffa6b233f5e65bb522d8de8db095ad3ef8c0811a3670a49e3994d4956f917d3d2dfda3ff488ca8793d7389e4a6 WHIRLPOOL 761a9614b41cecc821bc1279d863b620512fd7788a1ec3cbd8ad3d75e89a47ffd8e485b45b323964970ae90c5852becc10fdb61672b19e4d26bae76b67ff0135
-EBUILD buka-2.0.ebuild 537 SHA256 dd92b1d620abeba736272ab4000e3b9d07a14be4068fa6aa4aaabbd425fd5ae1 SHA512 cabf5066540c8f7297a27c5fda9e8c430e01538114c6a3a4d608a7c17c1b3c9b2a173261fbe76b1a97fcdca496eec4f21d7a656abd80d2799a345ccb2fbc0182 WHIRLPOOL 163b38fc55b3ce58d0b95f6c07a1f36dde11ff53734d4145e5fc89aea5f085d6697b822c7f0bb7c9a00aea3c9780265972c7a476074a9dfe318ad809bad20d69
+DIST buka-3.0.1.tar.gz 14697 SHA256 9ceb9605a7d9c2b05b2058665a7351dd4cd0c23672c921fd279abcc20bc6f9df SHA512 6893f1ad63130c55d2023abc0839e20f02ae4cede2162ec1d6e52d43f6b49cfc734b569776172b38bf2c208c2b41d123cb7bba9398ad689a22ce6703fa47eb22 WHIRLPOOL 403ecd8f816f28dac18bedb5925991f151f2362981b6bbcdfd191956e2d751f014f8f2e71e0fe898222605c7f3ac27107751f1028fe09419948bbde05567ea80
+EBUILD buka-3.0.1.ebuild 739 SHA256 6cb656091be75f12ad7bcf172315f42bf4ed5a86fd7cb25f152480a408b61e5b SHA512 eea2e21d435febb0e57f87d4b4dafdbd062a54af2f51d468810c78d0fff0ece75e8374eb1aea6840e2b18e074b6c75d8b175ae66c737fc0bc1a7cd02b6b698e7 WHIRLPOOL 04c9365f710c83bd55ed890a0a12b33b8bb799de4ace3f3672b1b5627fecd89162a163685cddd98797007fd4d2b1fe63541fb35e682c05f11e4484ee2f36643a
 MISC ChangeLog 745 SHA256 d0d7cb1cdb8b6405f30f6c3aa7c8ddc0241ce1ec4b7d254743e9f89f36b090ce SHA512 164eab5085a2e972868af640a3c6a387cadf12d63022388f0d3aed4148483c0e6907dfefc32592f97c86487d1c37cc4d4d44349f7dbdb9e01c3d834cbb96b0fa WHIRLPOOL ea32823a368172c09c76ed0758b113ea719499b7e72a581f467a64fd23ce4ebeb1725dd036090416eb7eb5d75a4dfe3d012cee913fd45c25ff11636a0a2dd992
 MISC metadata.xml 384 SHA256 19f8daf79678a832958b2f485c94fa7f56c5ae6607ba54ad4aad0af98949360f SHA512 2887c3fdb384617067e693c4ef66e74353127b9e95f756c510d928ae0bc2423f6812b0be1d5d0ff49af8d7b57d13c6c5cadb21d86fc74516172ce05d1a570e65 WHIRLPOOL 1ada4800acf890782a22c011c4af59acc2b1e85097486f73471534e620843bdbc5d29bc8076d58fe0d1320fdf1971d54a07cf8a9e98bde991382056acd481ac2
diff --git a/net-misc/buka/buka-2.0.ebuild b/net-misc/buka/buka-2.0.ebuild
deleted file mode 100644
index ad08fbeb3b37..000000000000
--- a/net-misc/buka/buka-2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="Download manga from buka.cn"
-HOMEPAGE="https://gitgud.io/drylemon/buka"
-SRC_URI="http://lick.moe/buka/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="sys-process/parallel
-	net-misc/curl
-	dev-util/dialog"
-
-src_install()
-{
-	default
-	doman ${PN}.1
-	dobin ${PN}
-}
-
-pkg_postinst()
-{
-	optfeature "pdf support" media-gfx/imagemagick
-	optfeature "cbz support" app-arch/zip
-}
diff --git a/net-misc/buka/buka-3.0.1.ebuild b/net-misc/buka/buka-3.0.1.ebuild
new file mode 100644
index 000000000000..1aa8b0d6554b
--- /dev/null
+++ b/net-misc/buka/buka-3.0.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+COMMIT="45e6b32de708759a4e15181a8e2ad5de55cc78ef"
+S=${WORKDIR}/${P}-${COMMIT}
+
+DESCRIPTION="Download manga from buka.cn"
+HOMEPAGE="https://gitlab.com/drylemon/buka"
+SRC_URI="https://gitlab.com/drylemon/buka/repository/${PV}/archive.tar.gz?ref=${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/beautifulsoup
+	dev-python/requests
+	sys-process/parallel
+	net-misc/curl
+	dev-util/dialog"
+
+src_install() {
+	default
+	doman "${PN}.1"
+	dobin "${PN}" "${PN}-parse"
+}
+
+pkg_postinst() {
+	optfeature "pdf support" media-gfx/imagemagick
+	optfeature "cbz support" app-arch/zip
+}
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 39c78e9b28aa..b386936959e7 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -4,8 +4,10 @@ AUX curl-fix-gnutls-nettle.patch 1186 SHA256 d7a0f1ae6dcd50adddc9d7cd6dfcdb6b5ba
 AUX curl-respect-cflags-3.patch 406 SHA256 b87bf2c491b057bc5af5258fffcf72d7c5e86b03218f497f097eeca845c0bc0d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54 WHIRLPOOL 5d61ec7f36376bd9712e0fc7984006462ab27a7e2003dd92a8d9e78e97a2e620a5cbf6a62855ebff45b2fbf9f0bca821ffdf6ce8ff81cf2a047af9e168fb61bd
 DIST curl-7.55.1.tar.bz2 2786830 SHA256 e5b1a92ed3b0c11f149886458fa063419500819f1610c020d62f25b8e4b16cfb SHA512 bfeb39e94b8378519b2efba0a476636b80dbee3434104b98464ee81ce3871eb134e065f52abe8bedb69681b43576cb30655c8be0be6115386859d0cb426d745b WHIRLPOOL 287f6f4f5464a780c338755e4e9870381937768c9f4c9545436856ea690ae6bf4d3f886dd816cf080d2ee84e2a3fbf1a0a5a78e5fbc9d9d18bde428458819a8e
 DIST curl-7.56.0.tar.bz2 2838517 SHA256 de60a4725a3d461c70aa571d7d69c788f1816d9d1a8a2ef05f864ce8f01279df SHA512 ba17a9fdc4b540d6053fa542bd875f321d009b9ba0cb56b16fe6c217f3856ab061f2a6c735771a0eadc28338889d071884680b4d4c243b4179872abb29915e3b WHIRLPOOL 89bdd5fdf4c99fd30bd7a63ad19d2285591b19134911160c94bf46bb4cdf6156544142b47e29d7c0c9cf06536215604cfc6bc59a5ba570dc16b23626fd1b44b2
+DIST curl-7.56.1.tar.bz2 2824548 SHA256 2594670367875e7d87b0f129b5e4690150780884d90244ba0fe3e74a778b5f90 SHA512 f8a602e6890b2791ea9199c80801ffd027980de3733d4ab001ee80b5167f840cc821c6fe7852087c88a471edc9d3f328cf660af3e2c6f7139d6c8de62b0ade68 WHIRLPOOL 428a2f90657cbe3fdc8a837b28f7ad7d80a1c1321a6976e885f79bc3a428c187e1fbc2c6ec48ffa99773aecb27647a46867c35b2fc0c29dbb6fb7f4e7d13f442
 EBUILD curl-7.55.1.ebuild 7028 SHA256 74a04321cd4ea3deb75fb08cd7c822ba28f4dac5add2eff3797c33e849bb5606 SHA512 84861e9e5edb6622c58c1a68f44365026ce328fbf26cab05948fdb7e6b7975328b0f46cbf18a2f749dfdb93727981d1147680d5235af0a36aebd6be74da666c6 WHIRLPOOL 6fecd0fee9c91312cff60846ccdff16038ace4de168d5b20d6005f5f1f5f2c2f3df15e83dd3f00a565b9d3a61cae983554c98034d44a52fce43f478e0c76c182
 EBUILD curl-7.56.0.ebuild 6968 SHA256 ace2b5c63d00b56f37f2469cd49daccef912b81a8e7fe0df52a81ca78ab59637 SHA512 a5d04df77ee897e1f516a9ae885dc76a5a575ab29afa6d5396d6667e5a081399c3dd6f2961464eb0a50dfa1cfdc72f4ae4eaf30b9fa9d85e152516aed39f2df5 WHIRLPOOL 622377aa37b18a90f5e32a82cbf910c2c16ec39e4e969f6171d962677d1dd80374a3589ef42038d9bad613c733c633f129afd169d32427ff847807537080582a
+EBUILD curl-7.56.1.ebuild 6961 SHA256 ed6ec03e9a087bb894879fabbf22894dc6193c337710c71b4b5b0f7e9de55db9 SHA512 0f5fdaa7b5a2ad9d192e99127f5484fab0a4e2098ba04316469ab74c68234375bc9e554a77656fc4ddedff27c2b1e5a34de5000905b467b8ef01951732bf8687 WHIRLPOOL 035d615c9632e4e887fa9d18074ac64a4e7a2b1a7f8c59c7afe90217182a453c96c0b3ce8a8f5f0a2fa557618931e0c966e24f5d44466dd92655ea66766fcc4b
 MISC ChangeLog 16015 SHA256 d7818e6e555538c789a1e06565284ef0aa229a2eb019fa2f4b667f961c919853 SHA512 76b6eb67198e504b72b2367929edcbb90cf252c0b26cf0526a3145a99d3a6004aed57761770675558a9f1445ee796d80cab12d647aea2676b21eb5acae8a9f97 WHIRLPOOL ac33e39317b19015bc478210a9ceaac3d8fd6497bc6217cd3c11b60e442e7f58e693690b8d22498b0862d703174ce72487f879639a7298459945cb680ba1a566
 MISC ChangeLog-2015 61885 SHA256 8589ecee2da6b3ef8823e053b3522234733a2273e7a6b18f0b47aaa9e678a1cd SHA512 d44de33943e2a8ed1eabc0bece3203f1794ffcc4d0a19898b67f82c2dfb54906ea3c09053421e13610218619577fd2b67e726a9cc5895e162a1ebf0a58038124 WHIRLPOOL 73c5089f0bdb1ca427591584ee4253e40418ed8a967f5e9f60775ec4d652868925c599f36f1708d39f8663fb734b74a301e4ea82050805639ed5a45cf45e6fd7
 MISC metadata.xml 837 SHA256 950e71139d4fc99ff18c0ec34b2ced72e933c6e311f0bbdb599fbc944db509e2 SHA512 27e75529e492f897705e249135c7ed661de04eef216fe62669fce544b8c318e44c5435b884fb8f206433293be894bbe1b6214b6cf1a394c9cb907dad48db00a0 WHIRLPOOL 93920381ae926c74157e2a0486cee5630789ce66b1aec25ead41a45f911ac7b2f87ad604f249c4ef03f2b7f19dfe567628140d34e753ea0fca10d2a3af3151e7
diff --git a/net-misc/curl/curl-7.56.1.ebuild b/net-misc/curl/curl-7.56.1.ebuild
new file mode 100644
index 000000000000..8c26d7e77fa4
--- /dev/null
+++ b/net-misc/curl/curl-7.56.1.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools eutils prefix multilib-minimal
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/"
+SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
+IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
+IUSE+=" elibc_Winnt"
+
+#lead to lots of false negatives, bug #285669
+RESTRICT="test"
+
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	ssl? (
+		curl_ssl_axtls? (
+			net-libs/axtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_gnutls? (
+			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_libressl? (
+			dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_mbedtls? (
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_openssl? (
+			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_nss? (
+			dev-libs/nss:0[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+	)
+	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:0[static-libs?,${MULTILIB_USEDEP}] )
+	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r13
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#	rtmp? (
+#		media-video/rtmpdump
+#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#	)
+
+# ssl providers to be added:
+# fbopenssl  $(use_with spnego)
+
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+
+# c-ares must be disabled for threads
+# only one ssl provider can be enabled
+REQUIRED_USE="
+	curl_ssl_winssl? ( elibc_Winnt )
+	threads? ( !adns )
+	ssl? (
+		^^ (
+			curl_ssl_axtls
+			curl_ssl_gnutls
+			curl_ssl_libressl
+			curl_ssl_mbedtls
+			curl_ssl_nss
+			curl_ssl_openssl
+			curl_ssl_winssl
+		)
+	)"
+
+DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
+	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
+	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
+	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+
+	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+
+	eapply_user
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	local myconf=()
+	myconf+=( --without-axtls --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
+	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
+	if use ssl ; then
+		if use curl_ssl_axtls; then
+			einfo "SSL provided by axtls"
+			myconf+=( --with-axtls )
+		elif use curl_ssl_gnutls; then
+			einfo "SSL provided by gnutls"
+			myconf+=( --with-gnutls --with-nettle )
+		elif use curl_ssl_libressl; then
+			einfo "SSL provided by LibreSSL"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_mbedtls; then
+			einfo "SSL provided by mbedtls"
+			myconf+=( --with-mbedtls )
+		elif use curl_ssl_nss; then
+			einfo "SSL provided by nss"
+			myconf+=( --with-nss )
+		elif use curl_ssl_openssl; then
+			einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_winssl; then
+			einfo "SSL provided by Windows"
+			myconf+=( --with-winssl )
+		else
+			eerror "We can't be here because of REQUIRED_USE."
+		fi
+	else
+		einfo "SSL disabled"
+	fi
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-crypto-auth \
+		--enable-dict \
+		--enable-file \
+		--enable-ftp \
+		--enable-gopher \
+		--enable-http \
+		--enable-imap \
+		$(use_enable ldap) \
+		$(use_enable ldap ldaps) \
+		--disable-ntlm-wb \
+		--enable-pop3 \
+		--enable-rt  \
+		--enable-rtsp \
+		$(use_enable samba smb) \
+		$(use_with ssh libssh2) \
+		--enable-smtp \
+		--enable-telnet \
+		--enable-tftp \
+		--enable-tls-srp \
+		$(use_enable adns ares) \
+		--enable-cookies \
+		--enable-hidden-symbols \
+		$(use_enable ipv6) \
+		--enable-largefile \
+		--without-libpsl \
+		--enable-manual \
+		--enable-proxy \
+		--disable-sspi \
+		$(use_enable static-libs static) \
+		$(use_enable threads threaded-resolver) \
+		$(use_enable threads pthreads) \
+		--disable-versioned-symbols \
+		--without-cyassl \
+		--without-darwinssl \
+		$(use_with idn libidn2) \
+		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
+		$(use_with metalink libmetalink) \
+		$(use_with http2 nghttp2) \
+		$(use_with rtmp librtmp) \
+		--without-spnego \
+		--without-winidn \
+		--with-zlib \
+		"${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# avoid building the client
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+	# Fix up the pkg-config file to be more robust.
+	# https://github.com/curl/curl/issues/864
+	local priv=() libs=()
+	# We always enable zlib.
+	libs+=( "-lz" )
+	priv+=( "zlib" )
+	if use http2; then
+		libs+=( "-lnghttp2" )
+		priv+=( "libnghttp2" )
+	fi
+	if use curl_ssl_openssl; then
+		libs+=( "-lssl" "-lcrypto" )
+		priv+=( "openssl" )
+	fi
+	grep -q Requires.private libcurl.pc && die "need to update ebuild"
+	libs=$(printf '|%s' "${libs[@]}")
+	sed -i -r \
+		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
+		libcurl.pc || die
+	echo "Requires.private: ${priv[*]}" >> libcurl.pc
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+
+	rm -rf "${ED}"/etc/
+}
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 70b8f7cf06b1..cc9c45a5024d 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -11,7 +11,7 @@ DIST freerdp-2.0.0_pre20161219.tar.gz 6425913 SHA256 b71aa5e99624f7bd4c28e69cb2b
 EBUILD freerdp-1.2.1_pre20150326-r1.ebuild 2786 SHA256 a7d5d3266839d0064003a7af8d56f2be0edb386da45c96267e6cbef2ccc54732 SHA512 57788c008c8d32a69ae90ce741cca7b12d7b8d0808fd4e151bd99febb70b7d7d016dc6d586eaf9dfc3ef888cec0b752c0eb9805610ac6910dbd0808914bb5900 WHIRLPOOL 80c393052b9d482dd5ecd94460b416110abdb4a62a44044594fc4c18c93fc489de7f3d7aacc4f4468e788a51ec81f7cb1ba064ddd2ecf0de866b2860756738d9
 EBUILD freerdp-2.0.0_pre20160722.ebuild 2618 SHA256 f8c2359f54efa6ba9b33210ce67be89268dcc7872113d897a2f307e6f7cec6a3 SHA512 0b287c9c0aa5cc661077aba27d19b66e7df14286b026e096a8bc6caf29089130af8e8a8c07972157698ed6e2718d7c4ec2e98771688c49084d4ae9157913df25 WHIRLPOOL e11a14ae7d10cc1ff1b8b9915956c98333017d73e533dfe67d1d4f9ccdf22d03cb30f417b7d99e919140f3b4156b73e08ff25c686f9eb3ab4374406ff5c203a1
 EBUILD freerdp-2.0.0_pre20161219.ebuild 2717 SHA256 79f4ed394816e0d62cd3577519e973a89b61e4bfa0ee464d83a60e13c41ce7be SHA512 9b9c7c9183248983953e9dd654c804809f9c0be94eff4738d2d302e139e54aebdc76cadec90cd5fe0f54d3f687b1c68eb129316eb16e50df513fd343136570c2 WHIRLPOOL 73bc2054bf69a909accb11e58da82ecd47dbcd6b39d4cdc6612149bce93b4466d88cec2252019a0793ce798582437e1c90213841721c8ddbfaa5cfdef04f9219
-EBUILD freerdp-2.0.0_rc0.ebuild 2859 SHA256 2056d92fbebc2a1b6d5de98a27cc1da7fb2c28dfc7f3b17cd181ac947a282b05 SHA512 0e04d79ddd6dafec57f013f454f0cbff07c13ad906c9956c968e23ae84d61c0ffc4c1cdfd1ae821e05c29657a84967ee8f0942488e5840f8613376e5fc83e347 WHIRLPOOL 5039f73774ca3b423f219b3ef5f4ecda16410482fae0cc265ffc54d8b354eb84bfef70ad323cd5e9e9908f971897747e1f3043828fa011f3ec88c24e41fe71a3
+EBUILD freerdp-2.0.0_rc0.ebuild 2858 SHA256 ea9f428a5f81f427a66e8d0cf0d75d84f1fdd0e036772e4ae2c8b793f55d7a6f SHA512 7615ad8cefa50ef9120d7f0121736cb8fda6668cec404391c45c4c843715863df745d762dbbd2f01cb0239933e76aea0a192b11f054c68b6f44200f71517c61b WHIRLPOOL 56f3957d6157a63357064c3d944f18d2c6f0178ae9e714908df67eee32f1d607c1af0a57ad8e78d4e69c8fd6611378dd330e62dbe2db4ec152dafb9e2a689e88
 EBUILD freerdp-9999.ebuild 2750 SHA256 920ece2f9682ee7f2596683a2a066582a0a1d13e438349b1523d227bfa7cb3de SHA512 67262976d2f1e4b990aa02347c81bd91f916425ba3ef1963800ee98632c5f9cb54121f1548125d83b0c83222508fdf8788f566d37cfbcdf9fc8d58543cb2ade4 WHIRLPOOL 906978a8f4303c093134f8126de0391d412e11065ec5b06c352d72e443b81dd884cb9bb843e9ad5171a4b7460d8141f3dcdd9275461e85cdf310dbdbf05f41d6
 MISC ChangeLog 6836 SHA256 3c7bef6d4b666b0d2a39418b1b3782a2f08bcc3dfdd844251cbd4af9552581d6 SHA512 67939aa2da6a6846b44cd211c85536bed311e43ea3177bc13599fffacccf7de0559ea3c01b2f7ea0477542bc33a265c8631060286770385132bc09f9c647d763 WHIRLPOOL a79bc36cf9dca2cee4f7a3eb0bef7f41c8357d8c5ebfe01c4dbbe601f8451ac713e8aa983d17c25c5557ad76a21b1bc89a42fdaeb60d97cd0c4ed6e05b027927
 MISC ChangeLog-2015 15438 SHA256 441eb5b5de512e3a69e2d6534e6df2887eac0dc47442bbae9d9d38da4c8e6418 SHA512 860511c1522ab39ac87790071dcf3d184b482747c95c26262a0dda8e169c27ea543132f342e24f706acd4149e2e974070313244a900b457c6b9c8b083a7a34bf WHIRLPOOL a66bd0559152bb47bec372a8e90e5877d863f3fcf25ed22a04bf5bc87a45bdbb5b909dea6e3fcc25b11b301ee3857c609d6c15749c955cfd80da65cef532b01b
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild
index eef56aa415d3..7d33504d37ca 100644
--- a/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild
+++ b/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} != 9999 ]]; then
 	MY_P="FreeRDP-${MY_PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~x86"
 else
 	inherit git-r3
 	SRC_URI=""
diff --git a/net-misc/grive/Manifest b/net-misc/grive/Manifest
index f13b11d64928..11feecb81777 100644
--- a/net-misc/grive/Manifest
+++ b/net-misc/grive/Manifest
@@ -3,12 +3,14 @@ DIST grive-0.4.0_pre20151011.tar.gz 160502 SHA256 0e480a0f5aa1ba008d8e7e3f8cb019
 DIST grive-0.5.1_pre20160114.tar.gz 162888 SHA256 20c15d84894a2943c50e6a9c1c95d1d29b5ca7240427dcd32e96113e5246a420 SHA512 8d10a9c1f36149def23326f3edd4350b156c59d6c2caa3d9ea262d9f61e174f0af2264a0c8d57592625c0e7cd5f9e7e171d01ff0c6a879a5605e44bb4c9a62d7 WHIRLPOOL 782fd3160f8970b837b989129993cfdb4e12327df46806c66aa8a5417ef9295373fe7e6acebfe7c30a00c936be67d127d8b886cb7cd3b4bfd79c8b71437bc91c
 DIST grive-0.5.1_pre20160706.tar.gz 163646 SHA256 299257850a482a08f556992c5cc895e1335206a13f94c40eb6afeb203f3e9cd1 SHA512 05496c9d38b13804b5839cf6a5d64a588e670b0e6d2796fe7f7a66267ade34f22bde28cf34210a4f2d36f12671ba38c963b3fc3fa6f8f80ff8b143aace648b52 WHIRLPOOL 44f0d778dd7e8240f6dec2ce437016cef1cd2fc824fd2e0c1d406758facea46e356e0716d438dcd07992c35f722e807db531c639385ff03e38a5653ffd0567ea
 DIST grive-0.5.1_pre20161004.tar.gz 163085 SHA256 d3ca4b728ba38ff735afbd308effaf18a6c1586487e9e15c8b4854144eb916f7 SHA512 1de5c2956d898d0a67e28469d7cf054e83b63f6dca736a60f875fbaac3197bc425432c43db2472e87113df2fa5da49eff9e17cd33610ccda7ba5bf0c2d4966c0 WHIRLPOOL 76148f8fe94cb0f5846e178d3bc9f35d61bded9181cc2835ae78040ee1b37fedeca6e1d7e8db7a55ed6e9390aca4135fda4e7f1aaa40621d618aab908c33e075
+DIST grive-0.5.1_pre20171005.tar.gz 164450 SHA256 b30f7c91cb93690ca263615a407e10bbff369c39b627d9b58cbdbd5d70761cde SHA512 d1f2b3bb5206aef3afeebd48f198a287f97a016f5da00f954fbdcf366ea7178c0e2c6e48250cdb0869bc850380ed09790b5bbdc1ecf3cdd7b484fcf9b85c793c WHIRLPOOL ef51324264a332af4d17510cabe7573d944d43d4f55fca681c3523b77b551bf1469389535377898244ea80b8d8a67969eefb69ddfa9493c308b46c6208a95f36
 EBUILD grive-0.4.0_pre20150905-r1.ebuild 756 SHA256 652d5d74c6a50c64d405a6d90dbc70ac2486f8adbd6db86f4baae0d473387abc SHA512 42f1338b6ff0290c6f2c3ff2c415790dbef5200edfdf11e349a1a4113375c1a59aa270a22d86c449c6fecccf5ca2b066557c733b418816a79ec3a78e59ba34d6 WHIRLPOOL 22b54e1e4c68e37eef4c2c2c8de469eca5c0a7e174137129fa9d03e4e6f59b2da1244688398b8c24d7695f967fe532eb82387b66ebffcf623e0d18b41000a2b5
 EBUILD grive-0.4.0_pre20150905.ebuild 729 SHA256 d782a0d72f9948e332a778e7248637a0f621804ee9d04db54eb8e2ef1e2ff54f SHA512 2bb48709a5ef707789bb8ee82eb146c467b11569b55fb420ee5fb6bb1227e306ad8a443c8ba69065e6e645d81b7457d61cf1ba4d0f8c7b55965db962a095854f WHIRLPOOL f3d2a01ca521c118395e8e4454a7a25e9e2a83f7202036803366336a22d6bff5298124cc6b25f8b12f20248c05b861a4ed377d644ab591a9f2811e0ce5e3cba2
 EBUILD grive-0.4.0_pre20151011.ebuild 756 SHA256 ffa8d273aba4693c4c28f0c59d0b902f4f79e8085b3ad3b32bb596cb1d4b33c2 SHA512 e5a8a365d6df018fb8d17b86becf6a00816518a81ead442148d49b6f937b3fac96f9dc5865846dba788b662f104142278312f88e4e4be72084700150451223ab WHIRLPOOL acc9620211567c2e271ccdae79d6b253ed5d159c1b0f5ceb0489045fd0c8a5043eaddb59ce242217cf9729e9e4ded41f36337553c1c41e85ff09d7920f014e36
 EBUILD grive-0.5.1_pre20160114.ebuild 756 SHA256 c50948d668c8cd1499134e5ec10055f9aa74f4339d769e5d19ab59686732bab1 SHA512 93784b777dfbd9614856b9ead55cedf7dc3ef216cdf6533a22b82b9b9e28d634a173f33482a929e42c303d13e1390c9468007110a5dc7aa5c51dd30308a396c6 WHIRLPOOL 7df0c934382bf4987fbe9f60f84b62ea3f2a1b0fd3a835444f3dd17f97e67e1b31301b23e9ab3dd30d89f38878e8275c0adc13bd631475339308a6344f6799bd
 EBUILD grive-0.5.1_pre20160706.ebuild 812 SHA256 dc312b5c170bec979c7723f4d2d06bd58e5096fef8f115c251e43031900e574c SHA512 c352c56b885251e3e7d0243ebfa23dd5945dd57b010e277c595f9ac93657cde1ccddcc3cddabf9356433cedc47b47b861906133fea3a3b5985c8d6125cffd161 WHIRLPOOL 972a7b77949744cec9a72455f4f9c3b4e3e07ed4d9a45c1a57fe720c8c366fc2d45863bf1a29208ea571a34e426de0b640db620962c1668b1d6a4f25205503b8
 EBUILD grive-0.5.1_pre20161004.ebuild 812 SHA256 51e5d1862675264a5f1ce296b194822172ac3f3a3ee27c0fa57401a61543349f SHA512 7b0dab16186ed93f95dfedf9f9ab04aef9bb0a259843e178fc8d83f47f8cbae0d45fa98d246cd39394a4612ce9a47b7e6e53de5cef31209d67feb144eb1496cf WHIRLPOOL 617c69cdc9e54b1a63651cc7d2f52184210aa04ca93f65170fe2519366defcdd32fc020910ccb56101d416d21f54c4fbec52f9b7b1f98501c81b5bc9b4e61560
+EBUILD grive-0.5.1_pre20171005.ebuild 813 SHA256 2939afa688a41b06cdcdd1a4a6b557a20bb0152d87210a79e2d1f2be840a21e6 SHA512 8efff2dace77362f70f1c5c1ff9d51ac23da448301bca844b670183982f733c599a2ff9e1f09f2f0be0f86894e8458f3efa05c9e49a1843031153cde8e01bb7d WHIRLPOOL 7d858b3ef430a09e610a86ab8f28b2a72789d775d6321b52b76018ccced3d22523e43f2f64e31b1460675b326d4c1d25b763ef2d30a8b3012ed0af2527e3d454
 MISC ChangeLog 3904 SHA256 152780d525509d11d620c516e27b258fde8156a3be3458f349ef1ea879fa8573 SHA512 a7c3593311b7578a4688831fb06672927d1fde04accacc9365e0588f3a87e5ccfd9b279c05377295e7aa0283c0886bdf861288dab3bae525d9cc91db542c6f05 WHIRLPOOL 09c80fc8310eac2982ff25c6f5b777e11810b067afe21beaa4c4ea9251c141b10edeecfb3a217374ff078755f6a7327a6d8be16fee3d95872e7fdf8064aa1f9c
 MISC ChangeLog-2015 2321 SHA256 fea33186e53950e1acef7faba8a4d0fa18509bc0097d0cfa9568e1112f5a88f8 SHA512 258d4f0aad33ac7b1f98902f429db9d82d0428213fc89dcb2240e059537b804e8f02cbae6ed07c60ddf94063247a07bd734627a8dfb172dd692cc4ce7f805406 WHIRLPOOL f1310de874f525e28bb1d4d8f3108e4e1508f8bd1d189e130167db9bda42a8a8e521101a6b50aee3d1c55dfb9bb51b172e2dcb409fedb47f6ce3bd516076f00a
 MISC metadata.xml 329 SHA256 e495e865f6ff660bfee1d79d7b97a0b44ac2d5c611cb84432fb9e3f3a15471d6 SHA512 532fad0c5d87182dc633286d564f01cfe82a455b8514e2147de1bcc366d3d6655917936bedfb5ef8182266cd9a270efbe0e77fcab654b1472c244b260d2b3997 WHIRLPOOL 6409be4dd1e38bc73d484cc42be69ee79e3a44dcc4521b55ed62ef05d2a20bed03539882bea05c7ad3e99d964338d8a6ac47b29054a64afad0aa83bc2a2b29e9
diff --git a/net-misc/grive/grive-0.5.1_pre20171005.ebuild b/net-misc/grive/grive-0.5.1_pre20171005.ebuild
new file mode 100644
index 000000000000..744cc461a623
--- /dev/null
+++ b/net-misc/grive/grive-0.5.1_pre20171005.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
+else
+	inherit vcs-snapshot
+	COMMIT="3c90425b8f46b62365ec3d84de628163865dbb1e"
+	SRC_URI="https://github.com/vitalif/${PN}2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="An open source Linux client for Google Drive"
+HOMEPAGE="https://github.com/vitalif/grive2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/expat
+	>=dev-libs/json-c-0.11-r1:=
+	dev-libs/libgcrypt:0=
+	|| ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] )
+	sys-libs/binutils-libs:0=
+	sys-libs/glibc
+	dev-libs/yajl
+"
+DEPEND="${RDEPEND}"
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 5ca0d28c7f1a..98544fe1b5cd 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -13,10 +13,13 @@ AUX iputils-20121221-tftpd-syslog.patch 1075 SHA256 8502f11dd440a9df42da52e3426f
 AUX iputils-20150815-nonroot-floodping.patch 406 SHA256 0a2409e1dd040620adc88720f1bb3955d2121762dc600865167332f9b90f3f57 SHA512 4f63d788d4aeccd66c410b6cc3352934a9b7d9b1222dedbcd7688c2b884b620a308b44e2dc777421cef20365a6ae371d59ad349f76bc5fcc751f90169a8f0d34 WHIRLPOOL 56d86953105832e589e2b75ea6a806c09ae21d8b9f82e6734cd0b5522b7dfb0291c6f65fdd4baffa120281dc176dd6a5d0bf6f730bd35147a6e654feb02eb5cf
 AUX iputils-99999999-openssl.patch 2532 SHA256 0ffcce81badea00e84bdaf49929bc657ab574e98824a65ea3cd9015421372644 SHA512 2f782d93466d2db7d01295c7ec7c24fdb529e28f76c703c112d5dc8b4600402a68d4caf3c1df4f8879149e6fa52bb208dd14879cb01741544ccd49552e017afb WHIRLPOOL f51c56cbf23076f3db504a008e1eb732c9f961c86f815af57dfde96627fd2f15cc9fccae26481bb39a4365d3333e9080984f46bbd9370b9cfbfaf52625b5dfe3
 AUX iputils-99999999-tftpd-syslog.patch 1075 SHA256 8502f11dd440a9df42da52e3426fa93aa4e4d879093be723601a4adf52c62d2b SHA512 43fa506475f138e92d04bd6a4417511caa3ed1636f6dea5d3930b6dca164a809338ab1f24b4bf084581ff849189a8240929182fa24897e252994851a6aae5188 WHIRLPOOL b32d3eeb0dd48012e8e5ed6ad14d603c1280e7203ce5ba6f465bfc005bb44b5fcac23eced9a6b7353966749541ab75380b347c98e46805e3e542562474f024df
+AUX iputils-99999999-tracepath46.patch 824 SHA256 883504e64394506473e48943fdafa60c2d90e267ff61b89cf78a824f62b7084f SHA512 65638246a73334640b02a136aa55a4a709d7c4639c57b7634d5595ec40d4bc9c41068a1469a76d22d0a216e9a2c8a52f7840432c435f40ee7035981494d0a443 WHIRLPOOL dabc88ec500a54418b999697e21ca9d0b570c05df8f289b8f518af81e0c547588c406741e78f0a1a6d6384f01121d28d90b69413d5cae7d68361d551af1a641e
 AUX rarpd.conf.d 250 SHA256 86e79f5a4be44f8b15a8743b4b3128f2bcc40a553f81ebfd902c590f82d12a60 SHA512 8ff4c38b4f51f92ec6d66a446272e0cd9d958c3075162c5a4aa47eb54bb69f27045b888f8a547394ab3de51bdb69f14b8df528785a8c967fa33ab0c4db329338 WHIRLPOOL bf9e8b6d15dfaa4e76e0af91781cfa675b6db547e9293ea67f0ced50ed2e7ccd880bcbdffac12a197f85f1d643148cb806a10ce9d586c89be1f26248c1fc6aaf
 AUX rarpd.init.d 583 SHA256 4b3efb6723a0c0b9ef7988ed9d3100ece49180483aa51fb69cf055e5d1565391 SHA512 926feed1792799ba63afd9a67111c7c3bf8157b758190a5f1587c25b016aa82cdeb4fbffa41ffa5012f2c3dae05fb8f4c0f0bf0ae2b3048c1299d9489ce1bada WHIRLPOOL aa25eb5ca849825842d9968ff0928552bb6070b1e8435e74b1af579c6382332941ae4f99c02c3a3eedd34474814e74733d9f15e4c88583aeb06003d508338e48
 DIST iputils-20160308.tar.gz 195348 SHA256 803d11b14af1bd3852c83111cc29e904bc3ca936c093dbb419d0671d3c9d964b SHA512 6b4d6e58ab8f1218f3ab52da695f252bd3e0004ffce755f2378b44fc3b4fbf9beb9beef51ff12f14348a07f6fe8525e64dba7f5d7b70997423d2c98c5ff7dde2 WHIRLPOOL 8a5691fdb70c6a9741adfc09206a4fac041616c6e81e9ef918435fed09c6085a35592eb72055dfbe2a237ab8ed1a018aa824968ff15ad842b923e28743f5cdbf
 DIST iputils-20161105.tar.gz 195879 SHA256 f813092f03d17294fd23544b129b95cdb87fe19f7970a51908a6b88509acad8a SHA512 1593077b6eff1e57eb8a32897dd9624a745d0c87db1501a96436b168b109ef22d41ee69406a4a2154d8d72c823c1df723b4c52eeec8d82ba2762fb01dc0d4797 WHIRLPOOL c5c693cca2dbe24c41e6cda123565bd4638641ddf7c69919d17d0ba9f45e1f289b9e5dd5819b24a9a1968f7f89a18d4ff295e963c299d3988aff71460677976c
+DIST iputils-20171016_pre.tar.gz 195254 SHA256 2f1870633baeb999fe214a8958353f291caf3cedac242862930d41c760bf1748 SHA512 570896fc58d945e08032134701ab6ea02bbf6fff420437bc5f89687cdcce6f3c1c64418a4c5ff54ca3cdc582bae2c95e196b2c8368eba2b163ebf88490aabf99 WHIRLPOOL 76600ed31bfa10535c7aa6e33ab5019db8814c55ca9941a3857300bccb89650cdc8edea9d654103151bc5f54643f5618c9261d7ba5fa5c14e8f6293bca340db7
+DIST iputils-manpages-20171016_pre.tar.xz 29764 SHA256 f23e5bee1d59c5b8cabc47faab5d175de1c5b663379108ec70e75d2a74888883 SHA512 31b4b0b4e46d7c98530577392c636e4397917cbe415762145a119e68e3223bc85b9d5afcfe61ae01584a35f6a1a772adffc52deeedc722c474179fa1d208d8d9 WHIRLPOOL a80cfa73dd326dedff76de06b3939f631ff017e3bd5cbeb0f988eb27ad997c62c2be1dc645f3e415b7081942a0cbf9139729c998c77b47c989ccd61ad272cf6e
 DIST iputils-s20121221-manpages.tar.bz2 23778 SHA256 6fc7ed7d281b7a2ee00e4f75e5465c90498c685bcc988afdff74db4eaa736d1c SHA512 006be62e61bf1555c99dbd5aac270cbd8d1074a3016fdde3aeed47e5c9b1acd326aa30a596c532d6688827f7f61966a6e3141eaa3b6f4f943eb21ac227282d8c WHIRLPOOL da0ccb577c4b2189553419df2c093404752fb2865eb3e0bfececfc242d930ceb44f96b32d945cfdd0c9ca060359651b2ec8479db5cc9220cda412dfeee5e910d
 DIST iputils-s20121221.tar.bz2 155344 SHA256 450f549fc5b620c23c5929aa6d54b7ddfc7ee1cb1e8efdc5e8bb21d8d0c5319f SHA512 693d240becd766c345c3af2053fc0699b9358e54d667d40738c21d731b70e779112d81476a220d8300ca54250120385414a13610d445996f95a90571047389f4 WHIRLPOOL 64529180eb4b8e2f7a60c18df7cac49e10a4b7702514252d418b16dcdc10a85ccb0a7f8beb51274cc9d708be2026c4c136e720986795fd39d314e4f9d5590ec9
 DIST iputils-s20151218-manpages.tar.xz 22336 SHA256 ae60dcf7a5a83d02008c03888935fd2dcff56c9f86734d4656b6284a7631a28d SHA512 964b9e22b18b67215ea48e046c45768cd86076b53db2131b00ac721be9e7de4edadefb74855d81861f12b4e10dcecd90d29f0098c2c4568d7601d97e756be0a3 WHIRLPOOL 82e3c9930861ed2df00c3b40488212dc36d5d65d62e1e7245d778ff77c6660a93bdd1dd8931cdddba4a631a9321741c0c2246d0cf48b22fc562ee7a066ac75fd
@@ -28,7 +31,8 @@ EBUILD iputils-20121221-r2.ebuild 4051 SHA256 0a64b2b06d19398aeb897343331a6726c1
 EBUILD iputils-20151218.ebuild 3977 SHA256 9624dd416733b58c1a9815304144fbcb0de07940dc6e471ea9e8f26555660752 SHA512 b07ffea44d85ea3aa0a92ab606386d7d1a917eed700c421aabb4af6ae4b46b1fc5e9ef1f942a441441ec4171548b9dc04f7bd73b75804568579ec044b297dbc0 WHIRLPOOL 7b34b8d257060570c7d837c6ed055e7e2c5a56c312b3e9ff00254268ec52bdf77511dd7fee0501f2a39dd11d3c12df67331c901655491165c9bd8104fa36a701
 EBUILD iputils-20160308.ebuild 3838 SHA256 7d5e1ea302cb909cad75f3caae438cec9c7b9d98170a13972d9d284da363fb5b SHA512 596ab450370cb8883d3480e8e0a21cc27ecaa19ba7499296a0c67e84fa8bce3c085f66d87eea03be19d54b780a8933f752999196b13d2b3d0a66faec2f756d08 WHIRLPOOL 39f3b25e0ebbde84a1935aced624b3c4004c40d992bb84542cd214003fdd2d6169a0c5374a11e8116177d4fd9b27ac0437547b3fc1ab9fcf2b2b9a411730bc20
 EBUILD iputils-20161105.ebuild 3870 SHA256 2a735d03e5d5e68917eff814f785ece65814b796ad7c82fb995bb0510fb05fd2 SHA512 64f9077c8e69b02db0560a1213293d27cfebbd5a02d62f75b53f6ee3d76b46c64ce2995ca1c6e7b3fb22185f33fd40a0da4a1796307883adcbbb47ed123b9611 WHIRLPOOL 0ce5472affdeec7294d315f446bb4ea44cb645c11af82a6e2b9278d4b5cbe41162eb2c98d36bf8e325153c8c390b17f7fc65f9cec2a54e11b3d95d8458c071a1
-EBUILD iputils-99999999.ebuild 3782 SHA256 587d4ab16e53b0956626bcfee225c4f8d56fce7fc7b343038c18979eaeb06305 SHA512 ddb3c5f8c70bd80011b876773a77ef825913a1b21840d68c511eb5015e52aebc8860c6fc65e81618ec6b247fcf90416cf3593fab60e6cef7d3a9867332435bad WHIRLPOOL b0ac4f70d18ce2c24e61620488b9fc88b253ef2ad21cc408de30d5fb6dca0d1bd2ef488c2774bee84adc26cd2e0bf61711c15e29e4db2b5a1d5863d36c537cc6
+EBUILD iputils-20171016_pre.ebuild 4047 SHA256 f59e918116747eb88f5302d8114cdda78298ea6b871aa4a30d533c9ca40abba3 SHA512 3880b66f83d0fd16264d33bdf921a20dbfeb36aba0e0bfb4f66edf7263f2073d1b11b640c767fff7e2b942e579b169a84635fc39d663b7dfc23391e7a9fbb3dd WHIRLPOOL 4e82c0eda67cf89c736f90e91404cb7ea131ab6e15bd1911a65883adc737c0a2ca1d3ade2772fbedeb2693d91358f8b2ce182cb198456b24202e1fde6bdef930
+EBUILD iputils-99999999.ebuild 3952 SHA256 83b873e1928ceeb5395b548036eb45fe69bcc32408f30b2e6dbc036a6d35fe5f SHA512 6a8b9785e417e02b7bc197971e83a7f548e5881a13308ffdb91dbb0f57931eb602761d9282323700272e03ff1f622af2fca4cda8553fc65b4f864bad81af91de WHIRLPOOL 682db8620f2543227d73c87c3c8800f4c46cdfaec91275e16af1bb777e9042af5c6686b460b30b1d04498b7ef20c11667ba1b128fac7fc34d0f88fc293c9ff41
 MISC ChangeLog 9602 SHA256 b860b10f98c5ce47173ef3e78599cc524579114a8fcfb2a0ea4e3938cc42244e SHA512 7824d23cb1249c0008aa507cea0d30be9d2dcce0053bf1a20a12df3527357530120c9559c7f4ac353e880ca1c3d07c4c56a29301e59ed43ca3a5362e552f7015 WHIRLPOOL 63cde37c69f443e03196145b99456ebf254d766988272002c38484e1139bf42efd57b7d976ce2064a41398346fe67d3a27b275ec84a998f300422b528782d2a9
 MISC ChangeLog-2015 22418 SHA256 9558c8a0c5143189ef51deae9371d71bd200f5f08a8aff2de94786c42a06b400 SHA512 01a5bbc5d9f4cadd403c4a455d029792278e23c5d78c830fcc685e5706bc19ec240e3807e48da80d0ed84e103e7ddf465f7b9500af42b31bd6fb8d22465e76cb WHIRLPOOL 3aa152858f0cca507036021355ce50823635655e932d51c3f4e7915b1239385931f07385d19a0e04e6795b628f356cdf8a7e6b39b20280c9de7eaf7e4cf6fade
 MISC metadata.xml 1698 SHA256 f42c67ff65e69eecd35829e42ad6f7ecddc6a92c79996557146f1c2099eaedf4 SHA512 f1d211dbe4212072614039c5aea1996270560a24dfa3734af86c4f1f4254cc3abf8440c03d8894b925b71b970e70fb60e79682753655a68b82203cdc401f6ebc WHIRLPOOL 745fa143c468727485be53de43f4748f170588a9d2f36a2d5aff4681c1e1a484866b7e59e91db724fb5948d383f61ff232791966fe112bd6a2e34d4d671d521e
diff --git a/net-misc/iputils/files/iputils-99999999-tracepath46.patch b/net-misc/iputils/files/iputils-99999999-tracepath46.patch
new file mode 100644
index 000000000000..20d017b34ee9
--- /dev/null
+++ b/net-misc/iputils/files/iputils-99999999-tracepath46.patch
@@ -0,0 +1,30 @@
+From 2c4d0838dda90515d4971881d86e8b969baebe01 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Thu, 19 Oct 2017 17:38:20 +0200
+Subject: [PATCH] tracepath: Support calling `tracepath` as `tracepath4` or
+ `tracepath6`
+
+---
+ tracepath.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/tracepath.c b/tracepath.c
+index b0eb911..d2a6edf 100644
+--- a/tracepath.c
++++ b/tracepath.c
+@@ -394,6 +394,12 @@ int main(int argc, char **argv)
+ 	setlocale(LC_ALL, "");
+ #endif
+ 
++	/* Support being called using `tracepath4` or `tracepath6` symlinks */
++	if (argv[0][strlen(argv[0])-1] == '4')
++		hints.ai_family = AF_INET;
++	else if (argv[0][strlen(argv[0])-1] == '6')
++		hints.ai_family = AF_INET6;
++
+ 	while ((ch = getopt(argc, argv, "46nbh?l:m:p:")) != EOF) {
+ 		switch(ch) {
+ 		case '4':
+-- 
+2.14.3
+
diff --git a/net-misc/iputils/iputils-20171016_pre.ebuild b/net-misc/iputils/iputils-20171016_pre.ebuild
new file mode 100644
index 000000000000..691040d27e10
--- /dev/null
+++ b/net-misc/iputils/iputils-20171016_pre.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# For released versions, we precompile the man/html pages and store
+# them in a tarball on our mirrors.  This avoids ugly issues while
+# building stages, and reduces depedencies.
+# To regenerate man/html pages emerge iputils-99999999[doc] with
+# EGIT_COMMIT set to release tag and tar ${S}/doc folder.
+
+EAPI="6"
+
+inherit flag-o-matic toolchain-funcs fcaps
+
+MY_COMMIT="67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf"
+
+PATCHES=( "${FILESDIR}"/${PN}-99999999-tracepath46.patch )
+
+if [[ ${PV} == "99999999" ]] ; then
+	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/iputils/iputils/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Network monitoring tools including ping and ping6"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
+
+LICENSE="BSD GPL-2+ rdisc"
+SLOT="0"
+IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle +openssl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
+
+LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
+	idn? ( net-dns/libidn[static-libs(+)] )
+	ipv6? ( ssl? (
+		gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+		nettle? ( dev-libs/nettle[static-libs(+)] )
+		openssl? (
+			!libressl? ( dev-libs/openssl:0[static-libs(+)] )
+			libressl? ( dev-libs/libressl[static-libs(+)] )
+		)
+	) )"
+RDEPEND="arping? ( !net-misc/arping )
+	rarpd? ( !net-misc/rarpd )
+	traceroute? ( !net-analyzer/traceroute )
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/os-headers
+"
+if [[ ${PV} == "99999999" ]] ; then
+	DEPEND+="app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt:0
+	"
+fi
+
+REQUIRED_USE="ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) )"
+
+[ "${PV}" = "99999999" ] || S="${WORKDIR}/${PN}-s${PV}"
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+src_prepare() {
+	use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch )
+
+	default
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	TARGETS=(
+		ping
+		$(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done)
+	)
+	if use ipv6 ; then
+		TARGETS+=(
+			$(usex traceroute 'traceroute6' '')
+		)
+	fi
+
+	myconf=(
+		USE_CRYPTO=no
+		USE_GCRYPT=no
+		USE_NETTLE=no
+	)
+
+	if use ipv6 && use ssl ; then
+		myconf=(
+			USE_CRYPTO=$(usex openssl)
+			USE_GCRYPT=$(usex gcrypt)
+			USE_NETTLE=$(usex nettle)
+		)
+	fi
+}
+
+src_compile() {
+	tc-export CC
+	emake \
+		USE_CAP=$(usex caps) \
+		USE_IDN=$(usex idn) \
+		IPV4_DEFAULT=$(usex ipv6 'no' 'yes') \
+		TARGETS="${TARGETS[*]}" \
+		${myconf[@]}
+
+	if [[ ${PV} == "99999999" ]] ; then
+		emake man
+
+		use doc && emake html
+	fi
+}
+
+src_install() {
+	into /
+	dobin ping
+	dosym ping /bin/ping4
+	if use ipv6 ; then
+		dosym ping /bin/ping6
+		dosym ping.8 /usr/share/man/man8/ping6.8
+	fi
+	doman doc/ping.8
+
+	if use arping ; then
+		dobin arping
+		doman doc/arping.8
+	fi
+
+	into /usr
+
+	if use tracepath ; then
+		dosbin tracepath
+		doman doc/tracepath.8
+		dosym tracepath /usr/sbin/tracepath4
+	fi
+
+	local u
+	for u in clockdiff rarpd rdisc tftpd ; do
+		if use ${u} ; then
+			case ${u} in
+			clockdiff) dobin ${u};;
+			*) dosbin ${u};;
+			esac
+			doman doc/${u}.8
+		fi
+	done
+
+	if use tracepath && use ipv6 ; then
+		dosym tracepath /usr/sbin/tracepath6
+		dosym tracepath.8 /usr/share/man/man8/tracepath6.8
+	fi
+
+	if use traceroute && use ipv6 ; then
+		dosbin traceroute6
+		doman doc/traceroute6.8
+	fi
+
+	if use rarpd ; then
+		newinitd "${FILESDIR}"/rarpd.init.d rarpd
+		newconfd "${FILESDIR}"/rarpd.conf.d rarpd
+	fi
+
+	dodoc INSTALL.md
+
+	use doc && dodoc doc/*.html
+}
+
+pkg_postinst() {
+	fcaps cap_net_raw \
+		bin/ping \
+		$(usex arping 'bin/arping' '') \
+		$(usex clockdiff 'usr/bin/clockdiff' '')
+}
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index ce003cbf4fee..9731575e02e3 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -3,20 +3,22 @@
 
 # For released versions, we precompile the man/html pages and store
 # them in a tarball on our mirrors.  This avoids ugly issues while
-# building stages, and when the jade/sgml packages are broken (which
-# seems to be more common than would be nice).
-# Required packages for doc generation:
-# app-text/docbook-sgml-utils
+# building stages, and reduces depedencies.
+# To regenerate man/html pages emerge iputils-99999999[doc] with
+# EGIT_COMMIT set to release tag and tar ${S}/doc folder.
 
-EAPI=5
+EAPI="6"
+
+inherit flag-o-matic toolchain-funcs fcaps
+
+PATCHES=( "${FILESDIR}"/${PN}-99999999-tracepath46.patch )
 
-inherit flag-o-matic eutils toolchain-funcs fcaps
 if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
 	inherit git-r3
 else
 	SRC_URI="https://github.com/iputils/iputils/archive/s${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~polynomial-c/iputils-s${PV}-manpages.tar.xz"
+		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
 fi
 
@@ -43,13 +45,13 @@ RDEPEND="arping? ( !net-misc/arping )
 	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
-	virtual/os-headers"
+	virtual/os-headers
+"
 if [[ ${PV} == "99999999" ]] ; then
-	DEPEND+="
-		app-text/openjade
-		dev-perl/SGMLSpm
-		app-text/docbook-sgml-dtd
-		app-text/docbook-sgml-utils
+	DEPEND+="app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt:0
 	"
 fi
 
@@ -58,7 +60,9 @@ REQUIRED_USE="ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) )"
 [ "${PV}" = "99999999" ] || S="${WORKDIR}/${PN}-s${PV}"
 
 src_prepare() {
-	use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch
+	use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch )
+
+	default
 }
 
 src_configure() {
@@ -70,7 +74,6 @@ src_configure() {
 	)
 	if use ipv6 ; then
 		TARGETS+=(
-			$(usex tracepath 'tracepath6' '')
 			$(usex traceroute 'traceroute6' '')
 		)
 	fi
@@ -100,7 +103,9 @@ src_compile() {
 		${myconf[@]}
 
 	if [[ ${PV} == "99999999" ]] ; then
-		emake html man
+		emake man
+
+		use doc && emake html
 	fi
 }
 
@@ -121,8 +126,14 @@ src_install() {
 
 	into /usr
 
+	if use tracepath ; then
+		dosbin tracepath
+		doman doc/tracepath.8
+		dosym tracepath /usr/sbin/tracepath4
+	fi
+
 	local u
-	for u in clockdiff rarpd rdisc tftpd tracepath ; do
+	for u in clockdiff rarpd rdisc tftpd ; do
 		if use ${u} ; then
 			case ${u} in
 			clockdiff) dobin ${u};;
@@ -133,7 +144,7 @@ src_install() {
 	done
 
 	if use tracepath && use ipv6 ; then
-		dosbin tracepath6
+		dosym tracepath /usr/sbin/tracepath6
 		dosym tracepath.8 /usr/share/man/man8/tracepath6.8
 	fi
 
@@ -147,9 +158,9 @@ src_install() {
 		newconfd "${FILESDIR}"/rarpd.conf.d rarpd
 	fi
 
-	dodoc INSTALL.md RELNOTES
+	dodoc INSTALL.md
 
-	use doc && dohtml doc/*.html
+	use doc && dodoc doc/*.html
 }
 
 pkg_postinst() {
diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest
index 6000e66779a4..a6bacf69e096 100644
--- a/net-misc/rclone/Manifest
+++ b/net-misc/rclone/Manifest
@@ -1,6 +1,8 @@
 DIST rclone-1.36.tar.gz 14013564 SHA256 a573b70e3aeb355b943dddd6ae9375386fc21bf12dfba601d8d7280f97c4c884 SHA512 589b5e2370244b5609d1ec8245f9f5f5cf58d6a2d507768db2cfc5a5b882f7d277d797fd0068b904538f3700e1751df03a21697d5295c83a2bf01a78d0ac6b13 WHIRLPOOL aa75c6c32cdcebd79ecf79abd03b4dc0205517808eb232a9655e8ae3da327cd62ad7183f4e0b0f6b7b52649c0c5058fdc2b57bc7b31b7dffb05e8a1508307d5c
 DIST rclone-1.37.tar.gz 37684683 SHA256 a74e284d2368f6fb8e4ac654a31b9b1328ac6078acd3446c9a892cd4bcbe8660 SHA512 683c88c04aa3d6f7057937c431bc56b20c9218c3a01f8baa4fb63ed716a0a3397855c1a9bf485041354bc6696f54f670b5cd9945c0465b4dc65595a9f606427b WHIRLPOOL c43709f66f0de6e66f073e34e4896707db0b91cf556cc225bdc22b7195c92e5777fbf7dc6983d57bcb11cab825ec7c222e0f75c6e52949a68fe5a7b4e43da1ff
+DIST rclone-1.38.tar.gz 36890082 SHA256 d4806a55b64ab54923b55b230f2b2679406d5de995884433d3d60516bb8ebcc0 SHA512 8dba3af1d576aac2b4b230eb6cb3072f0178e420f017dd715744ae2d8061f830b8079b7cc1cc09e7395ab3639b600b47768300d5f9da80a2f9626c26002a604e WHIRLPOOL 4b5ed7e1eea99dda55f05ad4dfc7922db1733eecd2f4b4df5f3cd50928209842222632b9735e27c6c6aad56d111160086f08bd681461efcc665cb501399cd1f4
 EBUILD rclone-1.36.ebuild 649 SHA256 5030efbfd59058359c1817c80328c6be92c5977f59933e0231be948154b6bd68 SHA512 a1e84507ede33b5c53cce142c3f01b3ec8e907c1d5f54757734d0bc4bdf56ff8fb7510dd1ab8ae3f142e2f9851ee34cbcce1d1ea3433d0a4c13d51b4ab2e8845 WHIRLPOOL 2f09593d98d60d3ad5b29c3f5f99af61218648fa1ef45d2f85b2e5f0e0ffc1eb934d0f3650ed6851e06b281f7b19783db1d9688ea3a15db9edc976283fa2ef29
 EBUILD rclone-1.37.ebuild 649 SHA256 5030efbfd59058359c1817c80328c6be92c5977f59933e0231be948154b6bd68 SHA512 a1e84507ede33b5c53cce142c3f01b3ec8e907c1d5f54757734d0bc4bdf56ff8fb7510dd1ab8ae3f142e2f9851ee34cbcce1d1ea3433d0a4c13d51b4ab2e8845 WHIRLPOOL 2f09593d98d60d3ad5b29c3f5f99af61218648fa1ef45d2f85b2e5f0e0ffc1eb934d0f3650ed6851e06b281f7b19783db1d9688ea3a15db9edc976283fa2ef29
+EBUILD rclone-1.38.ebuild 612 SHA256 b1986773c37df7dbfdc87f5107c72b9777d0605a42570d71e0344410066b0ba6 SHA512 ff5ef20f5ca7fcbf6988576a9b32fc51ef18deceb7bb35cbb0b63d555ad426fa49c920dfe67bfa91e2f660642f008fef6652bb31ddd25f65dbf1644f610556cf WHIRLPOOL dbd1afc58796e72db94f016d14de706ec0e31fcb14221d59c347ba8417c5e7c307d50f651b4196e4276a7b4a441a8834d8fa246eade5e41b7bafeafd40ddd090
 EBUILD rclone-9999.ebuild 649 SHA256 5030efbfd59058359c1817c80328c6be92c5977f59933e0231be948154b6bd68 SHA512 a1e84507ede33b5c53cce142c3f01b3ec8e907c1d5f54757734d0bc4bdf56ff8fb7510dd1ab8ae3f142e2f9851ee34cbcce1d1ea3433d0a4c13d51b4ab2e8845 WHIRLPOOL 2f09593d98d60d3ad5b29c3f5f99af61218648fa1ef45d2f85b2e5f0e0ffc1eb934d0f3650ed6851e06b281f7b19783db1d9688ea3a15db9edc976283fa2ef29
 MISC metadata.xml 247 SHA256 476881b53a1d153f1c3c21b5e7b81ca4d704b7b868aa58eef6a2faa531aabb5d SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46 WHIRLPOOL 2225cc6e12a88d99aca5e7b1a986bc808e64840a95fa9cfba2b21f841eb1619c8c86170d0701c3088bc9acac4cdb86467dd85f36e5315b635dcfed348b289bc8
diff --git a/net-misc/rclone/rclone-1.38.ebuild b/net-misc/rclone/rclone-1.38.ebuild
new file mode 100644
index 000000000000..ab1b0c69b3d5
--- /dev/null
+++ b/net-misc/rclone/rclone-1.38.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build
+
+EGO_PN="github.com/ncw/${PN}"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	EGIT_COMMIT="v${PV}"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A program to sync files to and from various cloud storage providers"
+HOMEPAGE="https://rclone.org/"
+
+LICENSE="MIT"
+SLOT="0"
+
+src_install() {
+	dobin ${PN}
+	doman src/${EGO_PN}/${PN}.1
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 28cf32402d9a..a6190bab2be8 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,9 +1,11 @@
 DIST remmina-1.2.0_rc16.tar.gz 1008438 SHA256 edb347f9e4d0a2e682f7ffd22caa364b477653a1aca31d1c1922a86d81df4995 SHA512 a6d2fb95a3fc68ee7ce4c8205c775cbc7bb83fa2f90b68d04f355b4ca8b4d0956a29ecbc028260c432b55c582802e9f243ad62426212d9fd0f02f7e50a56856f WHIRLPOOL a5d136e1abaeafcc1ad070c400a0c7456e29d1406ea3542add5eb36c4cb1e32cedf0a2bac855298a5e1e703e19774d007ec70c822c49ec13a9f565123b33181d
 DIST remmina-1.2.0_rc20.tar.gz 1016674 SHA256 5663105735600cfe5dbbcd62e64ffb27bb6587e1035b04b2b63a32a98d25ef30 SHA512 096cbb9cf45e911466a6123eead727d45365ee434bf371603733de4e7ab9b445ce67019f2a66d45fe33aecab4d163f6f31ca38811adadc125494f8575fa3a64a WHIRLPOOL b3b218c32e46516f80f637dd8fefc59c16ed437b24b0d7a20336ee90b5364e29e618dfb1705de31341b3dfd0220df3ff38021f782e57127b193f6b58193b761e
 DIST remmina-1.2.0_rc21.tar.gz 1028685 SHA256 9b4ac39a4ca40fffc9ce52e4a504839626eb4e0b3d1cdddf54217beef1fcd535 SHA512 5b3f0bab14c57ae91375373b0181bdb4e6d933332ef1b5c590988b29d6afccfd77cece371e3bbf98bedc6c35a9ee8eefa37201ec09fb44d62de83a1cdaf706b0 WHIRLPOOL 560779b36f2efe830f69121ac532f4558acf3e6c82fe826308d4402d8710b1976b3f773ba3873387d9e0b2575c2be63531cecd272305ebdde47046ce342bef71
+DIST remmina-1.2.0_rc24.tar.gz 1052140 SHA256 7d959485469b8e99d4d950e6e916b22e28a6855d58955a1be7f49b3a5650e82c SHA512 aab421c580e434ca673be063f3662f1d9128cc83aaee6f9bc6acf6996af0379af6fb99cc63273941c40c6b989653b972de6c43b575ca06bf56ec7c266590c17e WHIRLPOOL 9bbe41519b782d9ddd641e1d00ac1697e7965a553e1827c73152f73964b0db0c1eb7046d6f33d7b596af1669464b7b5adffb5fc8c73716ae433438692746a966
 EBUILD remmina-1.2.0_rc16-r1.ebuild 1987 SHA256 30f663885a1b1445d73bcf2eddf4d85b7849a6133cef5a48b55acd4a2e4c114a SHA512 8301d870a34688124dafbd9199c5364ab9fe7d3b4439e0d3fd62258bb64d89544b212ecd73dcb194ddbee17d8aa7308e09182f127bc74319c5ee27ac7c7627ce WHIRLPOOL 78a68b2640c79b49b550ae0350e399a831c8b5296b4df75ce0ebbc68fb13ccdd345ecb154b1e5b1321b0a1d4043da741ae13eb2e9d7364849fe8b2ba7d23b4a7
 EBUILD remmina-1.2.0_rc20.ebuild 1917 SHA256 13c1105f0bd4d23be4cca821ae81f16a32f86af93bd47683729f25e807fa35fd SHA512 3312e56870c95d24962805d2fa7bc6bab8d31b52f69650501ba7c25deec47ddddfd93aa8fffb4dfcad931744c1a48b63f361286a89235286044645e79660688c WHIRLPOOL 7b40e3cef3d7bc85e2d2ebad679107308814f0cd1c06509c6101247226ab2cb1d43c1306b52d3c7f6e3cf7d363796b70b1771dc05e6ae5cf9e2d1cf08f90ccc2
 EBUILD remmina-1.2.0_rc21.ebuild 2009 SHA256 61d372997400ed98e827d0ce926cdfad57e6b9931e8c50b1bf41a1fe127141dc SHA512 e3da5aa9cdbe94bc3bc61f2540495879d6ee1b69931f673ed126dfcf071379c5ee96d18a0c9e3e2a076029172e94333ebd81dbfe816d5b28bc35ca48d6eb5fe7 WHIRLPOOL 1cd9cb78054c71b5ff79f931dbd086f0c9c9853d28f39db19a8469e3df2d810fbc742e4367904e42a7ca3704d864971d37cf7563adf901445bc053d88da2e27a
+EBUILD remmina-1.2.0_rc24.ebuild 2009 SHA256 61d372997400ed98e827d0ce926cdfad57e6b9931e8c50b1bf41a1fe127141dc SHA512 e3da5aa9cdbe94bc3bc61f2540495879d6ee1b69931f673ed126dfcf071379c5ee96d18a0c9e3e2a076029172e94333ebd81dbfe816d5b28bc35ca48d6eb5fe7 WHIRLPOOL 1cd9cb78054c71b5ff79f931dbd086f0c9c9853d28f39db19a8469e3df2d810fbc742e4367904e42a7ca3704d864971d37cf7563adf901445bc053d88da2e27a
 MISC ChangeLog 7914 SHA256 4cd426f03bede791325c1b418f3cd0f0741aa13290cbbc7b43b6e9eec8c8aa6c SHA512 432595f86ba602b39daa9fb421c4113a534e3f04e1de6cf2c0c36f2dde817e68e655c74d5485c16861593c1adcb616065b96d881715fd4abb7b4c02f4c3c1b40 WHIRLPOOL 77f28921d4bcafd53a7e34020f6c08246d372b066696ad7fddcf96eda25a9eba3a0eab444e509ae3b2a81c54fbe8b4a9c016e989f418632b0e3af673757c893c
 MISC ChangeLog-2015 9985 SHA256 eab7fd33caffb1587ad50d8e4b5045d3ae8838d43c3bcab12d6a501889ae878b SHA512 9f8975961cbcf0d454e866619682c5443921db015ad5df0869666c379a558f4e241555a4d75be93fcaaad9e7a9c27cca833db4e870640e84d466d7fc7ff52776 WHIRLPOOL 2b8d6b906e127ebe13bbd3c308a0704d96ea3cc481ccab62366565656a4c434171daddb85a18e0e38abdebc311a327d2374123cda2ed8456a1a3514facca5552
 MISC metadata.xml 1246 SHA256 a3dcd2337b18f953e5f388ae9b80611ac0f78be5fbeec90b08a7cfcbea16c2d9 SHA512 4116cdb618584c5b95ff0330fb9c9efad2736cafcf4e3622fd074d5026f1adc5b7ab8e420188bc3a689b31cc285318db953bfa66c54b7fe91de242136787a5d8 WHIRLPOOL ea28c105a203978b44ea8aad120ca0f3754f1fe3a21d0ec414808dbfd1d63ba57b39c7f6409539114c6072a79303bf5f9d2cc9fe6754e891675a7995dce6dd26
diff --git a/net-misc/remmina/remmina-1.2.0_rc24.ebuild b/net-misc/remmina/remmina-1.2.0_rc24.ebuild
new file mode 100644
index 000000000000..e0491b743f19
--- /dev/null
+++ b/net-misc/remmina/remmina-1.2.0_rc24.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils gnome2-utils
+
+MY_PV="${PV//_rc/-rcgit.}"
+
+DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
+HOMEPAGE="https://remmina.org/"
+SRC_URI="https://github.com/FreeRDP/Remmina/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ayatana crypt rdp gnome-keyring nls spice ssh telepathy vnc zeroconf"
+
+CDEPEND="
+	dev-libs/glib:2
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	ayatana? ( dev-libs/libappindicator:3 )
+	crypt? ( dev-libs/libgcrypt:0= )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc0 )
+	gnome-keyring? ( app-crypt/libsecret )
+	spice? ( net-misc/spice-gtk[gtk3] )
+	ssh? ( net-libs/libssh[sftp]
+		x11-libs/vte:2.91 )
+	telepathy? ( net-libs/telepathy-glib )
+	vnc? ( net-libs/libvncserver )
+	zeroconf? ( net-dns/avahi[gtk3] )
+"
+DEPEND="${CDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="${CDEPEND}
+	virtual/freedesktop-icon-theme
+"
+
+DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
+
+S="${WORKDIR}/Remmina-${MY_PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_APPINDICATOR=$(usex ayatana)
+		-DWITH_GCRYPT=$(usex crypt)
+		-DWITH_LIBSECRET=$(usex gnome-keyring)
+		-DWITH_GETTEXT=$(usex nls)
+		-DWITH_TRANSLATIONS=$(usex nls)
+		-DWITH_FREERDP=$(usex rdp)
+		-DWITH_SPICE=$(usex spice)
+		-DWITH_LIBSSH=$(usex ssh)
+		-DWITH_VTE=$(usex ssh)
+		-DWITH_TELEPATHY=$(usex telepathy)
+		-DWITH_LIBVNCSERVER=$(usex vnc)
+		-DWITH_AVAHI=$(usex zeroconf)
+		-DGTK_VERSION=3
+	)
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	elog "To get additional features, some optional runtime dependencies"
+	elog "may be installed:"
+	elog ""
+	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
+	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 53b26a8092eb..c4ce69b9d7fb 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,3 +1,4 @@
+AUX unison-2.48.4-Makefile-dep.patch 542 SHA256 4e3a9a38a7c3deb3a7d1331a3d41a4dd08f19332df9474237e19135a8da0ff8e SHA512 e36704c7ac0fee66a308364ad72443a36ac14c1aacca0728b50f1770df91bf77347b58d218e93943a91cf2e99672840a6c322a5a4a5f238797d440ae16aa2394 WHIRLPOOL 8205385cf29fb013d75e94e62d9541ea4105a73de1a403cc2cb7d5752dc872de4e32b9897fd6344ac142362a17be51592fd5b9272cba78fba117ae368e7cf950
 DIST unison-2.48.3-manual.html 278156 SHA256 500d8f83770fc3b07cf443dfb1579281d4379002d51523aa73451e03f6cdbe1a SHA512 50924c624abd86f231ad8cbcfd4e383322a55733108685255df21df6da26d9ad1ac7d4f7d7dcd82faf4696f3f0136c0ff3c8cf5ffda4042f63451f2b7c8e9502 WHIRLPOOL 9a48a23049cd8753ebfd71e2f396107039b1fdc76877a8dc4f229ef8dda6a9481b80156e66c27015c96e7a752dedb2ca7781f42c01a8839ec0361f150910dfcd
 DIST unison-2.48.3-manual.pdf 516703 SHA256 cba2946656e04b856d98184b539e382ed85d987d24458a39e156946125f7b578 SHA512 3a16d6e0df6370784f960d37749f56a223c5eaab24ded299f6a61058f7692139239d0d64436d93268b4cbd8031de6139e187aca0beb54345a615e71253bce977 WHIRLPOOL fd57fec2e5a2605bca216bc4ae441ecd122faa26cd5abdfb39ea19ca4f44961691d266e86b702536dd7326b4072718d9c67739d7a264f9b4127330a41aff6823
 DIST unison-2.48.3.tar.gz 1172646 SHA256 f40d3cfbe82078d79328b51acab3e5179f844135260c2f4710525b9b45b15483 SHA512 169b272119b33146e4f770d1fc9a45d8278502a85a4ae02fd5cb94bade667bdd0ee31bef9acf6cf5170368ecfff948ee668ee195ff7e956c4eeaeed6f83d8d0d WHIRLPOOL a903f1f5e996655e3e001f33b959d839d2540d0a5c0584fded7aa483a774d8b07b3e7997357f03426f41ef6505cf3d40dec18616252c02add4a417dfef4c8df4
@@ -5,7 +6,7 @@ DIST unison-2.48.4-manual.html 278110 SHA256 2b5674e2fd7751148784a716ce5a03f8cd0
 DIST unison-2.48.4-manual.pdf 516093 SHA256 eaf9bf89967eb17c59b98f0a7ba6b6ff260b6c6de73277a633d954ceb42f5f93 SHA512 514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9 WHIRLPOOL a2fd465e13c7d5832684e2ddf194c24d5e4e278ed5c8b53f2e7acac8f4ae2810bf74a3db0674ef73e2a686cf3a66db5b28dbf1320f78b8dc7568ee3cec4cd152
 DIST unison-2.48.4.tar.gz 1200861 SHA256 30aa53cd671d673580104f04be3cf81ac1e20a2e8baaf7274498739d59e99de8 SHA512 c8e7bd2b14edae31e7d08154cdc2dce8173546b6163b9e5f4f2b1c8255792a7645d8449da88d7acfcbf498746481d24d0a3936978969920530a15a16bcbc6024 WHIRLPOOL 73d8637106cf43ab945a026310276f3636867f609e7d4491a80ff4b7dc98d5d737ee56d00987253e98200e13d971d09e41164b40283530df19f681000bf4733e
 EBUILD unison-2.48.3.ebuild 2194 SHA256 a6555a1aabf065cfce0101802d7385f8a76589682994e8caa846f60a0c8339f0 SHA512 602cfa6731ff3844c5abdd03b8b4e4e327fc80ac9c1aee7fd8a8292c81f880472748741f09e4ec43ddab71e739036a4f494c0eafd38073a535cd160eb3ef09d7 WHIRLPOOL 6df006c0a6a76bd3551ca6a153cfdb29a512fb9ec5d47623163927638965abb7f0f46395a146cb3412fd776aa356d59d6d8fee3fa893406bf2ad15444d772aaa
-EBUILD unison-2.48.4.ebuild 2248 SHA256 809a036f8a3e1383f197d10a1978e21f025f49eeccdacd75822cea0498b63dc9 SHA512 effb9b4e782b8c168d2a5e4002db1cdddf99335d68f75c17e55d54384e41687b48b851f51a2f89b0f14bff2e6d920925a4a3f5670f0a5da6f530cea2560bceaf WHIRLPOOL 38e1308509091672b01e046d335a84b5af389c6e285eb2ec00b9a2a985bc9efedc054a18979444a9edbf60d3e6ddbcf46c784816855c1b13cde6e763e772bf8e
+EBUILD unison-2.48.4.ebuild 2330 SHA256 95f208e6ddf5c31ff8d324fbdb83b667c2e4c2bd3a963bcc2900f8b10c807266 SHA512 22857d074ba34c63342927e21b5774d6bbe4da10ff23b63e55784d056477a1c21b9b9c92a422c4623977c67e3989b072927b171cee00802797844bc03e79e2e9 WHIRLPOOL aee3d461a532ec55d4d2ad614f0fd4a39c0947db99c31f2967f41fdda84013144e926d3e5474954c5766da8a24e72e938f917fa99035c2ed3a0caee3bdaf3948
 MISC ChangeLog 3687 SHA256 1f9c193957af831b7449b5ae18693fc3c77b1649b40f3c68cfec96bf0d5d27bb SHA512 33f8b1bfe50e5985ea2eb55954f67c87f480838b90440733add0bcfc8a78c7aeb654b0064084c99ea75529acb830c21558c47f752f4370cae85a5d78c7617d15 WHIRLPOOL 1a68015e6b2bdfbe155654bb2df94865778eed82a09a10fd2a7878dc77d4b1582d75058807069d7d925d5b581a21b37aad7c2f602c736dff986da6f892b563a1
 MISC ChangeLog-2015 11268 SHA256 d7c0324a2251676c6453a0713a9e00536bc2be8ea0ef0f99cbf392cb03e96de6 SHA512 58044c03a0d728fb0a85b87c2e2b2794151e00699c52d51661b967b52b0b47ad281fcef717af19ade76fd63c80ffc642d3bb54a24665fbbcc72153c46dfe5d16 WHIRLPOOL 069d779860f2d062bf1ec186a9eee52fa77daa17145a7e0715baf6433663d6828c46919d50ad93ad42613a8783173d6fc854459d3b46e7d089182b9dd72d1c2f
 MISC metadata.xml 243 SHA256 5e9b58b0b795266f973d066675839499e3a56d7d932d702404a4b91ded8eb26c SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449 WHIRLPOOL 085df2e84901cbe563c7c1d30d04c229547f15f8ee26ac61d44d07c3f6999f2bbfa4cf309963172fb507cce5450d27598b762c3ccab92351601965c3afc05e3a
diff --git a/net-misc/unison/files/unison-2.48.4-Makefile-dep.patch b/net-misc/unison/files/unison-2.48.4-Makefile-dep.patch
new file mode 100644
index 000000000000..f65959dfb4ac
--- /dev/null
+++ b/net-misc/unison/files/unison-2.48.4-Makefile-dep.patch
@@ -0,0 +1,20 @@
+Makefile.OCaml: fswatch.cmi depends on ubase/prefs.cmi.
+
+  The dependency is needed to compile unison
+  in parallel.
+
+Reference: https://github.com/bcpierce00/unison/pull/100
+
+diff --git a/Makefile.OCaml b/Makefile.OCaml
+index 21610ce..84fe7ad 100644
+--- a/Makefile.OCaml
++++ b/Makefile.OCaml
+@@ -426,6 +426,8 @@ win32rc/unison.res.lib: win32rc/unison.res
+ 	@echo "$(CAMLC): $< ---> $@"
+ 	$(CAMLC) $(CAMLFLAGS) -c $(CWD)/$<
+ 
++fswatch.cmi : ubase/prefs.cmi
++
+ %.cmo: %.ml
+ 	@echo "$(OCAMLC): $< ---> $@"
+ 	$(OCAMLC) $(CAMLFLAGS) -c $(CWD)/$<
diff --git a/net-misc/unison/unison-2.48.4.ebuild b/net-misc/unison/unison-2.48.4.ebuild
index a1f428de517b..951e84771c95 100644
--- a/net-misc/unison/unison-2.48.4.ebuild
+++ b/net-misc/unison/unison-2.48.4.ebuild
@@ -30,6 +30,11 @@ SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}
 		https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html )"
 S="${WORKDIR}"/src
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.48.4-Makefile-dep.patch
+	default
+}
+
 src_compile() {
 	local myconf
 
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 4775ef27454f..aeeda043c571 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,6 +1,13 @@
 AUX wget-1.19.1-CRLF_injection.patch 1051 SHA256 4eb2932d33f79b59af345b6ad075893f0a146547d8a7266edfea0d3e7c612093 SHA512 fd36c9225c567e9958f030449f40cb747c0a23b7023fd4eee4e982c867d96be1562377a2d9b80150d9dc714bdbdc2bd509a8a244c4969c731002bdf6434d9cf8 WHIRLPOOL 90cf4613f9e65fabc6d228d361e8ef31a72dc00f5a165ce922fd4ee34568ccabf43954f900a94f13ab51b0d81d1a7272c10c646472066e373ceadd3e4bc4efe1
+AUX wget-1.19.1-CVE-2017-13089.patch 1093 SHA256 06631755cbd42eb092d4f158a348c0bcd94fbdba357595a5fd7336d2f10aba97 SHA512 c3f44138aa105fa6572b3083671a95f4c819a65667d3d0ba1489a043390a184c5b442f5c134ab868360b01c6662b4bfb52588242273af5012d76099cb5511c77 WHIRLPOOL 20958618a92e0333a849a5e01fc9dd40a0354e665e9159c89f735f2edb717c921d2d330499114d29818cfd3d07cbe9178c90abbebe37265e49475d8829c5b593
+AUX wget-1.19.1-CVE-2017-13090.patch 1167 SHA256 25b6fcff6ff926b21d4ced14463521cebaba9e51de28269d69e8761676aeeb81 SHA512 b9aa7972ff6523bf32810d3fca46ba1bb0c65b0075945c61d8009f39dc87202432ae1e0b9e4a861652001203ec8935078f0db171eda518cc01b72863c8c5ac36 WHIRLPOOL 6b40cd713357a4ebf47b6012ed23c5049718e572a51ec06ac4d9b941defd494c06aab916d3aa2947f718ca4bee316ff2475a4830b1f02e4af2f8204ad16d45ab
+AUX wget-1.19.1-fix-Perl-warnings-in-tests.patch 3666 SHA256 d351ada0a6ba3db96c71aee5372b2d21d56a2035192cf46562c28d78f4a4fab5 SHA512 9f1b7ffded3422c995a51e346e3957024f4b5435cf51d491f3d4816620376539bffe2d3a7d7dcd03ca99828f06a21ebaa846b3a1755cd020a29f166c0fa2f7d9 WHIRLPOOL e2708491ec1ed57a010b15eccc76c754745c939fde5eb282a7eb0fb322723c8f7cfa79aa06bc882207ded54f8902b5fe71cea018d9719ba2e667d561d9d63cac
+AUX wget-1.19.1-fix-Python-test-suite.patch 8721 SHA256 d9549cc04352b5efdd8a44c36644fd86054527394fff965800a7977d9c3d899e SHA512 e7905dc70c59e9c6b2fcc6c1a058fe98e8681492f034f2cd00aac5f1674d7dca0520bcf30d8b2563983bcb4388c6e35f66e772f833a364810f523784f8de3b19 WHIRLPOOL aed5cdf47deffcff06acad56e8700ed74a210951a0e412f1822c2daabeb78bd43aa689f2a6743b3b519172241319d1b209c46207e614a755852ec0de71aeb9f0
 DIST wget-1.19.1.tar.xz 2111756 SHA256 0c950b9671881222a4d385b013c9604e98a8025d1988529dfca0e93617744cd2 SHA512 00864d225439bcb7c5af01d7ef19efa615427812d3320ab3f4c8f62c38191e837b1392397843f935d7dc5860a4d0ce89ee31f2730c4a729402f1f2bf3e5f64e5 WHIRLPOOL 2a4bd80f1e7134637227609f532ee3385472a6895ff22efeface42d082072a09abaa5dd2d8653bfdab015de801d31426b01d73ab5dd1a6864b84c29dc8e72462
+DIST wget-1.19.2.tar.gz 4349267 SHA256 4f4a673b6d466efa50fbfba796bd84a46ae24e370fa562ede5b21ab53c11a920 SHA512 a0f8afcc0767a8fd1acd64b1b1b27d177bc938e70cc3709c1b3faa6c1426ec926642cd8e49d292cec0268ee507683539b5152072110106de5a728a03efd8cedd WHIRLPOOL 64398a8fc132a21d81d6fd7c97335739525fb8b31eca4aa4aa7048f251691c05ad1f004c36d6e633abf02d174ffefcb2176213e68fefb76bce505d247940af3a
 EBUILD wget-1.19.1-r1.ebuild 3197 SHA256 29fc6002b0afa09b6b8718ba1e1a77e1329d4b8b58cd9d95644d7f2c09e968f2 SHA512 bf0b1c2275c6252f8f17c630aa9bb89e9276097f1fa74cf9d56d67c3ea099851ae64cd08996653493dadc39e31737fbeed88f5fc8cc0cbf1313b0b23e824befc WHIRLPOOL 4a989f7804950fa9b4bf1890f717e46a3dd64591df82b9627349b8a4bab9dbba4c9b83ade854effd5e8fd445a5f4223aa807dd3134583e831fde890f71e36926
+EBUILD wget-1.19.1-r2.ebuild 3380 SHA256 8f5b2d642003f0ea147b370634579e605c59b775747192181776e52e91d7f016 SHA512 82f4a4baf6755a056cbdc0f43ca6a226f069b51f2ab1a6f7dc5dc9976437011f54fd32261ed6b6c6d972b8bc9be704271b1c1a560fbc37f4b170d81da0702e07 WHIRLPOOL 4690671f26ed2a1b0df20b58119b70850e736f5ddc347d514b5ac9f07ba0bf9d56b3c4fa7abc452f7e5a7018adae2d467b003601b06b8bd00c8c3660a69589b0
+EBUILD wget-1.19.2.ebuild 3118 SHA256 084c69c9ae1e1a242e85fb6d21d8e8c8643fe047162797500cd268b4b91d37fa SHA512 e4a6f74d9e7feddab9d9849e32f75f8a383e648b592ec0beb79c20a560c9e0156e4494059a3f95afe3135538e460abc0f5966b4002549e2c94ae572f2ef71738 WHIRLPOOL eadbe036d1a37bd4a0cc92d15282728d37a9cfd3d01d280a6782df59b714659c27f9b97c5f266f5b922934cae62bc5aa83fc0e2919d64781028db59be5585c09
 MISC ChangeLog 11759 SHA256 b0200db8aa9205aa6cf590936f1758619e1b56fdb17c76314175d6031c287ccf SHA512 eb9e6c7b1d5cb9f3e550b3c7d89493da0026492b629d3b76c5f096b9ef7de499addb31fcf43dd4cfd01eaf73253ddd10ceef5937a9a1a8d18142f9e5c22b764b WHIRLPOOL 679e53afbcbdadd297e78cfbbbbbb4406d23f993f44d38388c0f55b74ec888ea1f81b29be95e36b19dcc92fe6f350861d59549b28a77eb884eba6bee3d0844a2
 MISC ChangeLog-2015 29939 SHA256 902a2f6576d8c8dd01ee76cad7a689cb260d153139adc04b8d76abe91860d86d SHA512 55c752f56737ab6116057f3c158fcd4ba9b0405d43796e4114076c6fe849f7bdf3f771606c69551d5a1bd8a408ff5099158d461b26c840c6a4fe05824d8ae11e WHIRLPOOL 4b1c46b1c0c25428559442be8e2aef443686e00fd1889c908bf7d28291a5064e2dbe9879f0bd2025a8e0f49e42ed89334198f5dc9ee1122c91e1ba7c317678c7
 MISC metadata.xml 570 SHA256 82fb121ee11ecf4d5b5a20e885a9773b301061d7a2b19755c01322aef615e1ae SHA512 add9378a31ae7abc66d8dc6bfc3d355af3eb683ce177e68fbcbedb4b69435d7254b4cac1897d3b8267bddb23467e8f4bb16e439c09a4f91be16845b1113e055c WHIRLPOOL 08ddfe93af78d6f213e2a08f2414e2ae7e1442ec0eddf34ea29e1383a694f342c1dc72df8370b61828e7ef7914f2863519afc83e83a3cbd783a1be015703bcfb
diff --git a/net-misc/wget/files/wget-1.19.1-CVE-2017-13089.patch b/net-misc/wget/files/wget-1.19.1-CVE-2017-13089.patch
new file mode 100644
index 000000000000..f961741aa288
--- /dev/null
+++ b/net-misc/wget/files/wget-1.19.1-CVE-2017-13089.patch
@@ -0,0 +1,34 @@
+From 3dbc2e06ad487862c2fcc64d4891ff8aeb254bad Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
+Date: Fri, 20 Oct 2017 10:59:38 +0200
+Subject: [PATCH 1/2] Fix stack overflow in HTTP protocol handling
+ (CVE-2017-13089)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* src/http.c (skip_short_body): Return error on negative chunk size
+
+Reported-by: Antti Levomäki, Christian Jalio, Joonas Pihlaja from Forcepoint
+Reported-by: Juhani Eronen from Finnish National Cyber Security Centre
+---
+ src/http.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/http.c b/src/http.c
+index 55367688..dc318231 100644
+--- a/src/http.c
++++ b/src/http.c
+@@ -973,6 +973,9 @@ skip_short_body (int fd, wgint contlen, bool chunked)
+               remaining_chunk_size = strtol (line, &endl, 16);
+               xfree (line);
+ 
++              if (remaining_chunk_size < 0)
++                return false;
++
+               if (remaining_chunk_size == 0)
+                 {
+                   line = fd_read_line (fd);
+-- 
+2.15.0.rc1
+
diff --git a/net-misc/wget/files/wget-1.19.1-CVE-2017-13090.patch b/net-misc/wget/files/wget-1.19.1-CVE-2017-13090.patch
new file mode 100644
index 000000000000..4e600fe784ff
--- /dev/null
+++ b/net-misc/wget/files/wget-1.19.1-CVE-2017-13090.patch
@@ -0,0 +1,37 @@
+From 28925c37b72867c0819799c6f35caf9439080f83 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
+Date: Fri, 20 Oct 2017 15:15:47 +0200
+Subject: [PATCH 2/2] Fix heap overflow in HTTP protocol handling
+ (CVE-2017-13090)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* src/retr.c (fd_read_body): Stop processing on negative chunk size
+
+Reported-by: Antti Levomäki, Christian Jalio, Joonas Pihlaja from Forcepoint
+Reported-by: Juhani Eronen from Finnish National Cyber Security Centre
+---
+ src/retr.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/retr.c b/src/retr.c
+index a27d58af..723ac725 100644
+--- a/src/retr.c
++++ b/src/retr.c
+@@ -378,6 +378,12 @@ fd_read_body (const char *downloaded_filename, int fd, FILE *out, wgint toread,
+               remaining_chunk_size = strtol (line, &endl, 16);
+               xfree (line);
+ 
++              if (remaining_chunk_size < 0)
++                {
++                  ret = -1;
++                  break;
++                }
++
+               if (remaining_chunk_size == 0)
+                 {
+                   ret = 0;
+-- 
+2.15.0.rc1
+
diff --git a/net-misc/wget/files/wget-1.19.1-fix-Perl-warnings-in-tests.patch b/net-misc/wget/files/wget-1.19.1-fix-Perl-warnings-in-tests.patch
new file mode 100644
index 000000000000..334bcef8659b
--- /dev/null
+++ b/net-misc/wget/files/wget-1.19.1-fix-Perl-warnings-in-tests.patch
@@ -0,0 +1,104 @@
+From 7ffe93cabb181f39ad5091c31ab9f61bd940a55f Mon Sep 17 00:00:00 2001
+From: Anton Yuzhaninov <citrin+github@citrin.ru>
+Date: Wed, 5 Apr 2017 19:06:42 +0300
+Subject: [PATCH] Fix perl warnings in tests
+
+* tests/FTPServer.pm: Escape '{' in RE to fix warnings
+* tests/FTPTest.pm: Likewise
+* tests/HTTPServer.pm: Likewise
+* tests/HTTPTest.pm: Likewise
+* tests/Test-proxied-https-auth-keepalive.px: Likewise
+* tests/Test-proxied-https-auth.px: Likewise
+Escape '{' in RE to fix warnings:
+Unescaped left brace in regex is deprecated, passed through in regex;
+marked by <-- HERE in m/{{ <-- HERE port}}/
+---
+ tests/FTPServer.pm                         | 2 +-
+ tests/FTPTest.pm                           | 2 +-
+ tests/HTTPServer.pm                        | 2 +-
+ tests/HTTPTest.pm                          | 2 +-
+ tests/Test-proxied-https-auth-keepalive.px | 2 +-
+ tests/Test-proxied-https-auth.px           | 2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/tests/FTPServer.pm b/tests/FTPServer.pm
+index a5185d66..cac80942 100644
+--- a/tests/FTPServer.pm
++++ b/tests/FTPServer.pm
+@@ -589,7 +589,7 @@ sub new
+     foreach my $file (keys %{$self->{_input}})
+     {
+         my $ref = \$self->{_input}{$file}{content};
+-        $$ref =~ s/{{port}}/$self->sockport/eg;
++        $$ref =~ s/\Q{{port}}/$self->sockport/eg;
+     }
+ 
+     return $self;
+diff --git a/tests/FTPTest.pm b/tests/FTPTest.pm
+index 50385ad0..0a1c768c 100644
+--- a/tests/FTPTest.pm
++++ b/tests/FTPTest.pm
+@@ -53,7 +53,7 @@ sub _substitute_port
+ {
+     my $self = shift;
+     my $ret  = shift;
+-    $ret =~ s/{{port}}/$self->{_server}->sockport/eg;
++    $ret =~ s/\Q{{port}}/$self->{_server}->sockport/eg;
+     return $ret;
+ }
+ 
+diff --git a/tests/HTTPServer.pm b/tests/HTTPServer.pm
+index dd8ec043..78609f65 100644
+--- a/tests/HTTPServer.pm
++++ b/tests/HTTPServer.pm
+@@ -310,7 +310,7 @@ sub _substitute_port
+ {
+     my $self = shift;
+     my $ret  = shift;
+-    $ret =~ s/{{port}}/$self->sockport/eg;
++    $ret =~ s/\Q{{port}}/$self->sockport/eg;
+     return $ret;
+ }
+ 
+diff --git a/tests/HTTPTest.pm b/tests/HTTPTest.pm
+index 00f079f8..6225c7f1 100644
+--- a/tests/HTTPTest.pm
++++ b/tests/HTTPTest.pm
+@@ -47,7 +47,7 @@ sub _substitute_port
+ {
+     my $self = shift;
+     my $ret  = shift;
+-    $ret =~ s/{{port}}/$self->{_server}->sockport/eg;
++    $ret =~ s/\Q{{port}}/$self->{_server}->sockport/eg;
+     return $ret;
+ }
+ 
+diff --git a/tests/Test-proxied-https-auth-keepalive.px b/tests/Test-proxied-https-auth-keepalive.px
+index 049bebec..2a18ccfd 100755
+--- a/tests/Test-proxied-https-auth-keepalive.px
++++ b/tests/Test-proxied-https-auth-keepalive.px
+@@ -153,7 +153,7 @@ my $cmdline = $WgetTest::WGETPATH . " --user=fiddle-dee-dee"
+     . " --password=Dodgson -e https_proxy=localhost:{{port}}"
+     . " --no-check-certificate"
+     . " https://no.such.domain/needs-auth.txt";
+-$cmdline =~ s/{{port}}/$SOCKET->sockport()/e;
++$cmdline =~ s/\Q{{port}}/$SOCKET->sockport()/e;
+ 
+ if (defined $srcdir) {
+     $VALGRIND_SUPP_FILE = $srcdir . '/valgrind-suppressions-ssl';
+diff --git a/tests/Test-proxied-https-auth.px b/tests/Test-proxied-https-auth.px
+index ce4e736c..878114e7 100755
+--- a/tests/Test-proxied-https-auth.px
++++ b/tests/Test-proxied-https-auth.px
+@@ -152,7 +152,7 @@ my $cmdline = $WgetTest::WGETPATH . " --user=fiddle-dee-dee"
+     . " --password=Dodgson -e https_proxy=localhost:{{port}}"
+     . " --no-check-certificate"
+     . " https://no.such.domain/needs-auth.txt";
+-$cmdline =~ s/{{port}}/$SOCKET->sockport()/e;
++$cmdline =~ s/\Q{{port}}/$SOCKET->sockport()/e;
+ 
+ if (defined $srcdir) {
+     $VALGRIND_SUPP_FILE = $srcdir . '/valgrind-suppressions-ssl';
+-- 
+2.14.3
+
diff --git a/net-misc/wget/files/wget-1.19.1-fix-Python-test-suite.patch b/net-misc/wget/files/wget-1.19.1-fix-Python-test-suite.patch
new file mode 100644
index 000000000000..11736675dcc8
--- /dev/null
+++ b/net-misc/wget/files/wget-1.19.1-fix-Python-test-suite.patch
@@ -0,0 +1,172 @@
+Fix python test suite for GnuTLS 3.5.12+
+
+Backport of f42229b1fdf30ee30c6e13b01eb0c4ebd9ea9169
+
+--- a/testenv/Test--rejected-log.py
++++ b/testenv/Test--rejected-log.py
+@@ -14,7 +14,7 @@ mainpage = """
+ </head>
+ <body>
+   <p>
+-    Recurse to a <a href="http://127.0.0.1:{{port}}/secondpage.html">second page</a>.
++    Recurse to a <a href="http://localhost:{{port}}/secondpage.html">second page</a>.
+   </p>
+ </body>
+ </html>
+@@ -27,8 +27,8 @@ secondpage = """
+ </head>
+ <body>
+   <p>
+-    Recurse to a <a href="http://127.0.0.1:{{port}}/thirdpage.html">third page</a>.
+-    Try the blacklisted <a href="http://127.0.0.1:{{port}}/index.html">main page</a>.
++    Recurse to a <a href="http://localhost:{{port}}/thirdpage.html">third page</a>.
++    Try the blacklisted <a href="http://localhost:{{port}}/index.html">main page</a>.
+   </p>
+ </body>
+ </html>
+@@ -41,7 +41,7 @@ thirdpage = """
+ </head>
+ <body>
+   <p>
+-    Try a hidden <a href="http://127.0.0.1:{{port}}/dummy.txt">dummy file</a>.
++    Try a hidden <a href="http://localhost:{{port}}/dummy.txt">dummy file</a>.
+     Try to leave to <a href="http://no.such.domain/">another domain</a>.
+   </p>
+ </body>
+@@ -55,9 +55,9 @@ Disallow: /dummy.txt
+ 
+ log = """\
+ REASON\tU_URL\tU_SCHEME\tU_HOST\tU_PORT\tU_PATH\tU_PARAMS\tU_QUERY\tU_FRAGMENT\tP_URL\tP_SCHEME\tP_HOST\tP_PORT\tP_PATH\tP_PARAMS\tP_QUERY\tP_FRAGMENT
+-BLACKLIST\thttp%3A//127.0.0.1%3A{{port}}/index.html\tSCHEME_HTTP\t127.0.0.1\t{{port}}\tindex.html\t\t\t\thttp%3A//127.0.0.1%3A{{port}}/secondpage.html\tSCHEME_HTTP\t127.0.0.1\t{{port}}\tsecondpage.html\t\t\t
+-ROBOTS\thttp%3A//127.0.0.1%3A{{port}}/dummy.txt\tSCHEME_HTTP\t127.0.0.1\t{{port}}\tdummy.txt\t\t\t\thttp%3A//127.0.0.1%3A{{port}}/thirdpage.html\tSCHEME_HTTP\t127.0.0.1\t{{port}}\tthirdpage.html\t\t\t
+-SPANNEDHOST\thttp%3A//no.such.domain/\tSCHEME_HTTP\tno.such.domain\t80\t\t\t\t\thttp%3A//127.0.0.1%3A{{port}}/thirdpage.html\tSCHEME_HTTP\t127.0.0.1\t{{port}}\tthirdpage.html\t\t\t
++BLACKLIST\thttp%3A//localhost%3A{{port}}/index.html\tSCHEME_HTTP\tlocalhost\t{{port}}\tindex.html\t\t\t\thttp%3A//localhost%3A{{port}}/secondpage.html\tSCHEME_HTTP\tlocalhost\t{{port}}\tsecondpage.html\t\t\t
++ROBOTS\thttp%3A//localhost%3A{{port}}/dummy.txt\tSCHEME_HTTP\tlocalhost\t{{port}}\tdummy.txt\t\t\t\thttp%3A//localhost%3A{{port}}/thirdpage.html\tSCHEME_HTTP\tlocalhost\t{{port}}\tthirdpage.html\t\t\t
++SPANNEDHOST\thttp%3A//no.such.domain/\tSCHEME_HTTP\tno.such.domain\t80\t\t\t\t\thttp%3A//localhost%3A{{port}}/thirdpage.html\tSCHEME_HTTP\tlocalhost\t{{port}}\tthirdpage.html\t\t\t
+ """
+ 
+ dummyfile = "Don't care."
+--- a/testenv/Test--spider-r.py
++++ b/testenv/Test--spider-r.py
+@@ -14,8 +14,8 @@ mainpage = """
+ </head>
+ <body>
+   <p>
+-    Some text and a link to a <a href="http://127.0.0.1:{{port}}/secondpage.html">second page</a>.
+-    Also, a <a href="http://127.0.0.1:{{port}}/nonexistent">broken link</a>.
++    Some text and a link to a <a href="http://localhost:{{port}}/secondpage.html">second page</a>.
++    Also, a <a href="http://localhost:{{port}}/nonexistent">broken link</a>.
+   </p>
+ </body>
+ </html>
+@@ -29,8 +29,8 @@ secondpage = """
+ </head>
+ <body>
+   <p>
+-    Some text and a link to a <a href="http://127.0.0.1:{{port}}/thirdpage.html">third page</a>.
+-    Also, a <a href="http://127.0.0.1:{{port}}/nonexistent">broken link</a>.
++    Some text and a link to a <a href="http://localhost:{{port}}/thirdpage.html">third page</a>.
++    Also, a <a href="http://localhost:{{port}}/nonexistent">broken link</a>.
+   </p>
+ </body>
+ </html>
+@@ -43,8 +43,8 @@ thirdpage = """
+ </head>
+ <body>
+   <p>
+-    Some text and a link to a <a href="http://127.0.0.1:{{port}}/dummy.txt">text file</a>.
+-    Also, another <a href="http://127.0.0.1:{{port}}/againnonexistent">broken link</a>.
++    Some text and a link to a <a href="http://localhost:{{port}}/dummy.txt">text file</a>.
++    Also, another <a href="http://localhost:{{port}}/againnonexistent">broken link</a>.
+   </p>
+ </body>
+ </html>
+--- a/testenv/certs/server-cert.pem
++++ b/testenv/certs/server-cert.pem
+@@ -1,21 +1,21 @@
+ -----BEGIN CERTIFICATE-----
+-MIIDgDCCAmigAwIBAgIIVGI73zrIeeMwDQYJKoZIhvcNAQELBQAwMDERMA8GA1UE
+-AxMIR05VIFdnZXQxDTALBgNVBAsTBFdnZXQxDDAKBgNVBAoTA0dOVTAiGA8yMDE0
+-MTExMTE2NDAwMFoYDzk5OTkxMjMxMjM1OTU5WjAxMRIwEAYDVQQDEwkxMjcuMC4w
+-LjExDTALBgNVBAsTBFdnZXQxDDAKBgNVBAoTA0dOVTCCASIwDQYJKoZIhvcNAQEB
+-BQADggEPADCCAQoCggEBAMjC3Gt55EfStl6mE371+pD3/cpR5MLxkdbBss5MlIP2
+-TDhiPOItLXml8oxs4BjUm3wfn3GV9iJLmbzbIWL+0kbRkQ2LCPKUf+Cln3z2ZE+r
+-XwdWlT8gVfv51Opfkp2lLDVUqLfNKRGQgivjSCmLqY2LqeB0SaVNvuaD3EpqZyIH
+-0E5SZgjqBHgRRtvGkcy0rOmp5SI2NASLugUioXa9OLWjpYDwodsd3ERlL0DJ1aJW
+-8TC8Tqix4i0osWzar+LXBIin0Qvar9/uRHN0p1kq3p0XgNHKqWpiTT54+WYx7Pem
+-v4qRXz11swiJzUL+Pw1DurQ9smbzDgAsz7V2FJnUeCcCAwEAAaOBmDCBlTAMBgNV
+-HRMBAf8EAjAAMB8GA1UdEQQYMBaCCTEyNy4wLjAuMYIJbG9jYWxob3N0MBMGA1Ud
+-JQQMMAoGCCsGAQUFBwMBMA8GA1UdDwEB/wQFAwMHoAAwHQYDVR0OBBYEFJfm323L
+-JbKTM/tMKSt0qlUqewbnMB8GA1UdIwQYMBaAFPM+TjiESqm+wW/HYaNQ2m4pi+tU
+-MA0GCSqGSIb3DQEBCwUAA4IBAQCDmuSD4IGmn0UQ5jhGQquh92Iu59j64Rrg7EIM
+-zoppciyYR8gDUutOI9CEisxJz6umvAdOo5L981gcFaBv6hHWaE/krAZccR+ZXZP6
+-fI9btO8My8O63fYcd2KkLEFqvKDF43i01S2LrqXdPo3uELbFZwxCmUKsexFGsoW1
+-CbXbRjnS7w/f72myRmvBeDiNMuGfe1lb4IflybH3DMlKC7i0AN1JKglp+IKn5XAE
+-neWR03i3UaYJsibIxj0DkTS+hVPu5MXQ9RlF5CkRdFKjGinLE/u70XyAyx0/IeAN
+-e7c2MJvpdfRmTXm2ew4sNyK9RXo7Bv0Yqkl65iMscF8LNnxL
++MIIDdzCCAl+gAwIBAgIMWWD1GB1UFkEICdQvMA0GCSqGSIb3DQEBCwUAMDAxETAP
++BgNVBAMTCEdOVSBXZ2V0MQ0wCwYDVQQLEwRXZ2V0MQwwCgYDVQQKEwNHTlUwIBcN
++MTcwNzA4MTUwNzA0WhgPOTk5OTEyMzEyMzU5NTlaMDExEjAQBgNVBAMTCTEyNy4w
++LjAuMTENMAsGA1UECxMEV2dldDEMMAoGA1UEChMDR05VMIIBIjANBgkqhkiG9w0B
++AQEFAAOCAQ8AMIIBCgKCAQEAyMLca3nkR9K2XqYTfvX6kPf9ylHkwvGR1sGyzkyU
++g/ZMOGI84i0teaXyjGzgGNSbfB+fcZX2IkuZvNshYv7SRtGRDYsI8pR/4KWffPZk
++T6tfB1aVPyBV+/nU6l+SnaUsNVSot80pEZCCK+NIKYupjYup4HRJpU2+5oPcSmpn
++IgfQTlJmCOoEeBFG28aRzLSs6anlIjY0BIu6BSKhdr04taOlgPCh2x3cRGUvQMnV
++olbxMLxOqLHiLSixbNqv4tcEiKfRC9qv3+5Ec3SnWSrenReA0cqpamJNPnj5ZjHs
++96a/ipFfPXWzCInNQv4/DUO6tD2yZvMOACzPtXYUmdR4JwIDAQABo4GNMIGKMAwG
++A1UdEwEB/wQCMAAwFAYDVR0RBA0wC4IJbG9jYWxob3N0MBMGA1UdJQQMMAoGCCsG
++AQUFBwMBMA8GA1UdDwEB/wQFAwMHoAAwHQYDVR0OBBYEFJfm323LJbKTM/tMKSt0
++qlUqewbnMB8GA1UdIwQYMBaAFPM+TjiESqm+wW/HYaNQ2m4pi+tUMA0GCSqGSIb3
++DQEBCwUAA4IBAQC1a0NQfmqT8Ky/BFo5H+G+GoQTlqi3J83ujAMdLUD57zYCEyDL
++XzAhMPfrOSLPDcQb0ooD1Ie+Rz8Xs1h00cD2OGKwH479+nisF5ksqJVJ4fn/aNFE
++6W2Xb3MCB+4FRdmy0UeDDA6N2OpVskCM30s9tmovlBLVK46HogdLvy/O1o7z/gbx
++vV8luevxobnevZ3NdWLyVE3BJZiThBHmZUvL1XNy4KAR4wDAkbCwoTN/JkehTu0i
++WR6DaG7N7M6psc7rctfzRqimlAkxnoAUwc8LwNLTB3v613xXX8iSUsLKsh6pQfZR
++e5wnYQIS4MzowvDx8WevTPMRKlN72d8HHuv9
+ -----END CERTIFICATE-----
+--- a/testenv/certs/server-crl.pem
++++ b/testenv/certs/server-crl.pem
+@@ -1,12 +1,12 @@
+ -----BEGIN X509 CRL-----
+-MIIB1DCBvQIBATANBgkqhkiG9w0BAQsFADAwMREwDwYDVQQDEwhHTlUgV2dldDEN
+-MAsGA1UECxMEV2dldDEMMAoGA1UEChMDR05VGA8yMDE0MTExMTE2NDU1NFoYDzk5
+-OTkxMjMxMjM1OTU5WjAdMBsCCFRiO986yHnjGA8yMDE0MTExMTE2NDU1NFqgNjA0
+-MB8GA1UdIwQYMBaAFPM+TjiESqm+wW/HYaNQ2m4pi+tUMBEGA1UdFAQKAghUYj1E
+-KHs9ijANBgkqhkiG9w0BAQsFAAOCAQEAZgwqs1VOFG39dFHHMXvBr4eJfhwiG4bC
+-cL6IvLhvl9ikcyQMHrpOBtNjkCtgclSbJjjTDdera1+zuCWE0WBOJ4mojYdAIOhR
+-QvSwp4NwAtibu2F/fjeXoo+LEpcRKtLvAotB30eCZ1OPrijsa/HxFILOLlayjns8
+-wM4RmQC4o43y1G/1jqM8hGDg4Wz0j1URVuyP+pU55JpubV5LlExy3gIRwevD2lam
+-q3hiighenJYFO3HGZkYT2SIoSpXZnQqKPJ4HwRBSg/cjOpc1y1lIIvKhmk+Cut6M
+-+S5HL4pIk8vGYg57nTfOOkj1goqFkfU0DBqvVAZj02ay/VIDu61T1g==
++MIIB1jCBvwIBATANBgkqhkiG9w0BAQsFADAwMREwDwYDVQQDEwhHTlUgV2dldDEN
++MAsGA1UECxMEV2dldDEMMAoGA1UEChMDR05VFw0xNzA3MDgxNTA3MDRaFw0xODA3
++MDgxNTA3MDRaMB8wHQIMWWD1GB1UFkEICdQvFw0xNzA3MDgxNTA3MDRaoDowODAf
++BgNVHSMEGDAWgBTzPk44hEqpvsFvx2GjUNpuKYvrVDAVBgNVHRQEDgIMWWD1GB4C
++YfERSnyEMA0GCSqGSIb3DQEBCwUAA4IBAQAAKu+Lum1l/XtcCJ43WveouPK97iOE
++bjUZWaGYx8Ys/iBdhTa1GXG+E+JuyqgyHTW0HrWJi1D+GiYmsjPJXoEgVgtxXEQ7
++8b3NyIQ8OCsSTTlVCmLECN9R0xlsitzH+HXOaIEs5sbmIxCnxu+brqno9gQocmCv
++LHYvoSxsSsOCkkmodbYtKssl2dBonvQPSijN/z3NhZ259e2U3Yv4V7/MrEoTvOxg
++M0GC0u0Nx86EWbq0sWeiUu270Qk9En5YGNtRhkeq0bXerJswmMAmvrtuKdyfouny
++4WMvtn30xsO3WwWSV2oyrDSN/IQdDbcmul/bg8ewqlnN77cVf2m70c/W
+ -----END X509 CRL-----
+--- a/testenv/certs/server-template.cfg
++++ b/testenv/certs/server-template.cfg
+@@ -68,7 +68,6 @@ expiration_days = -1
+ # X.509 v3 extensions
+ 
+ # A dnsname in case of a WWW server.
+-dns_name = "127.0.0.1"
+ dns_name = "localhost"
+ 
+ # A subject alternative name URI
+--- a/testenv/test/base_test.py
++++ b/testenv/test/base_test.py
+@@ -90,7 +90,7 @@ class BaseTest:
+             # ports and etc.
+             # so we should record different domains respect to servers.
+             domain = self.get_domain_addr(instance.server_address)
+-            self.domains.append(domain[0])
++            self.domains.append('localhost')
+             self.ports.append(domain[1])
+ 
+     def exec_wget(self):
diff --git a/net-misc/wget/wget-1.19.1-r2.ebuild b/net-misc/wget/wget-1.19.1-r2.ebuild
new file mode 100644
index 000000000000..8d84a93dfa73
--- /dev/null
+++ b/net-misc/wget/wget-1.19.1-r2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit flag-o-matic python-any-r1 toolchain-funcs
+
+DESCRIPTION="Network utility to retrieve files from the WWW"
+HOMEPAGE="https://www.gnu.org/software/wget/"
+SRC_URI="mirror://gnu/wget/${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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 )"
+
+# Force a newer libidn2 to avoid libunistring deps. #612498
+LIB_DEPEND="idn? ( >=net-dns/libidn2-0.14[static-libs(+)] )
+	pcre? ( dev-libs/libpcre[static-libs(+)] )
+	ssl? (
+		gnutls? ( net-libs/gnutls:0=[static-libs(+)] )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+			libressl? ( dev-libs/libressl[static-libs(+)] )
+		)
+	)
+	uuid? ( sys-apps/util-linux[static-libs(+)] )
+	zlib? ( sys-libs/zlib[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	static? ( ${LIB_DEPEND} )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/perl
+		dev-perl/HTTP-Daemon
+		dev-perl/HTTP-Message
+		dev-perl/IO-Socket-SSL
+	)
+	nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-CRLF_injection.patch
+	"${FILESDIR}"/${PN}-1.19.1-fix-Perl-warnings-in-tests.patch
+	"${FILESDIR}"/${PN}-1.19.1-fix-Python-test-suite.patch
+	"${FILESDIR}"/${PN}-1.19.1-CVE-2017-13089.patch
+	"${FILESDIR}"/${PN}-1.19.1-CVE-2017-13090.patch
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# revert some hack that breaks linking, bug #585924
+	if [[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-solaris* ]] || [[ ${CHOST} == *-uclibc* ]]; then
+		sed -i \
+			-e 's/^  LIBICONV=$/:/' \
+			configure || die
+	fi
+}
+
+src_configure() {
+	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
+	# the included gnutls -- force ioctl.h to include this header
+	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
+
+	if use static ; then
+		append-ldflags -static
+		tc-export PKG_CONFIG
+		PKG_CONFIG+=" --static"
+	fi
+
+	# There is no flag that controls this.  libunistring-prefix only
+	# controls the search path (which is why we turn it off below).
+	# Further, libunistring is only needed w/older libidn2 installs,
+	# and since we force the latest, we can force off libunistring. #612498
+	ac_cv_libunistring=no \
+	econf \
+		--disable-assert \
+		--disable-rpath \
+		--without-included-libunistring \
+		--without-libunistring-prefix \
+		$(use_enable debug) \
+		$(use_enable idn iri) \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_enable ntlm) \
+		$(use_enable pcre) \
+		$(use_enable ssl digest) \
+		$(use_enable ssl opie) \
+		$(use_with idn libidn) \
+		$(use_with ssl ssl $(usex gnutls gnutls openssl)) \
+		$(use_with uuid libuuid) \
+		$(use_with zlib)
+}
+
+src_install() {
+	default
+
+	sed -i \
+		-e "s:/usr/local/etc:${EPREFIX}/etc:g" \
+		"${ED}"/etc/wgetrc \
+		"${ED}"/usr/share/man/man1/wget.1 \
+		"${ED}"/usr/share/info/wget.info \
+		|| die
+}
diff --git a/net-misc/wget/wget-1.19.2.ebuild b/net-misc/wget/wget-1.19.2.ebuild
new file mode 100644
index 000000000000..454b396597e1
--- /dev/null
+++ b/net-misc/wget/wget-1.19.2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit flag-o-matic python-any-r1 toolchain-funcs
+
+DESCRIPTION="Network utility to retrieve files from the WWW"
+HOMEPAGE="https://www.gnu.org/software/wget/"
+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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 )"
+
+# Force a newer libidn2 to avoid libunistring deps. #612498
+LIB_DEPEND="idn? ( >=net-dns/libidn2-0.14[static-libs(+)] )
+	pcre? ( dev-libs/libpcre[static-libs(+)] )
+	ssl? (
+		gnutls? ( net-libs/gnutls:0=[static-libs(+)] )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+			libressl? ( dev-libs/libressl[static-libs(+)] )
+		)
+	)
+	uuid? ( sys-apps/util-linux[static-libs(+)] )
+	zlib? ( sys-libs/zlib[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	static? ( ${LIB_DEPEND} )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/perl
+		dev-perl/HTTP-Daemon
+		dev-perl/HTTP-Message
+		dev-perl/IO-Socket-SSL
+	)
+	nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# revert some hack that breaks linking, bug #585924
+	if [[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-solaris* ]] || [[ ${CHOST} == *-uclibc* ]]; then
+		sed -i \
+			-e 's/^  LIBICONV=$/:/' \
+			configure || die
+	fi
+}
+
+src_configure() {
+	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
+	# the included gnutls -- force ioctl.h to include this header
+	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
+
+	if use static ; then
+		append-ldflags -static
+		tc-export PKG_CONFIG
+		PKG_CONFIG+=" --static"
+	fi
+
+	# There is no flag that controls this.  libunistring-prefix only
+	# controls the search path (which is why we turn it off below).
+	# Further, libunistring is only needed w/older libidn2 installs,
+	# and since we force the latest, we can force off libunistring. #612498
+	ac_cv_libunistring=no \
+	econf \
+		--disable-assert \
+		--disable-rpath \
+		--without-included-libunistring \
+		--without-libunistring-prefix \
+		$(use_enable debug) \
+		$(use_enable idn iri) \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_enable ntlm) \
+		$(use_enable pcre) \
+		$(use_enable ssl digest) \
+		$(use_enable ssl opie) \
+		$(use_with idn libidn) \
+		$(use_with ssl ssl $(usex gnutls gnutls openssl)) \
+		$(use_with uuid libuuid) \
+		$(use_with zlib)
+}
+
+src_install() {
+	default
+
+	sed -i \
+		-e "s:/usr/local/etc:${EPREFIX}/etc:g" \
+		"${ED}"/etc/wgetrc \
+		"${ED}"/usr/share/man/man1/wget.1 \
+		"${ED}"/usr/share/info/wget.info \
+		|| die
+}
diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest
index 7be8165d0bf5..7d359ff1eedc 100644
--- a/net-misc/wicd/Manifest
+++ b/net-misc/wicd/Manifest
@@ -7,7 +7,7 @@ AUX wicd-init-sve-start.patch 317 SHA256 20d7ada99465da5b50d03e5ef117226910bc202
 DIST Icone-Wicd-Lucid.tar.gz 9015 SHA256 6e4e3483c6cff7398e6871dd3e4360e361e5c6e64007e8e1240fd1c259ac707e SHA512 0df0dbdf05b462264dca2dd9955454a82f688b0fbfa7c2ad70a424df57eb27b35561d37819fc88b5746cff8a54de5b7b43ec325d2f98a4a1a30e4d500e86d2f8 WHIRLPOOL 336f363092c9bac7523047b6052a856a699820147967820418c6ac1ca528c472d371c6c211c505c325b5eb001812042c01425b05e1dfdf2d4a528f96686c530a
 DIST wicd-1.7.4.tar.gz 547393 SHA256 67989614004773db349791c37675efb914d084bdb221356a05e4369c35e7eb62 SHA512 1e99a45daa858eba634e60e50c22aa2fab3fc4d643979a6741b6164bf500bd6db285d11c12ccd164ab6cf0792284e319e3c3447804088e74b4fc67bb6f431959 WHIRLPOOL 680c79380ea645a286889c737c7b478a933e4243ad20c5c0f8cf53d37747a1d98780e21a4aeb98bed6da37f93f61d5dd4a42b22466f2feceae08e87d853b80fd
 DIST wicd-mac4lin-icons.tar.xz 53136 SHA256 4c48c769c71f962415e3bd3573557e9288351afb867347f9a6f652883ae31011 SHA512 98ed3f92ec361aa8651c64efdb5128b8f73068f1cf2423640dafc4b46889ae32c1d1f56f509ad609b2bf98f634f8ada4c501f2294e3a64affd1befd4400498a8 WHIRLPOOL 84c097432ebb6ca66c0fa48d4226c8da5f6342b6fdeeb9546c98952b8f6e52a1f87d0ba23c1b409f3008432e5c6346bf65949dad99070804b1dcc2c1055eb9ea
-EBUILD wicd-1.7.4-r2.ebuild 5090 SHA256 655787b6e96bcfbe6d65262917855c966b642006cd664e7e00ba1a4a8a8bd123 SHA512 70de74c229f32ef67472b5e4bb90e11aa6db3c964cb2e584128c73217ede9e7b01d307e5d488ae7808fd33c8d2eea753e7e7938c70012d1fce5f861454da5248 WHIRLPOOL b201cb9f889760a5fbe5430be55cc014881762310215a4ff580ec161ca407c89d522032c8dc85dedf665ddefbac7c7131930f100e1827d64c5a6a4f1888c780e
+EBUILD wicd-1.7.4-r3.ebuild 5090 SHA256 655787b6e96bcfbe6d65262917855c966b642006cd664e7e00ba1a4a8a8bd123 SHA512 70de74c229f32ef67472b5e4bb90e11aa6db3c964cb2e584128c73217ede9e7b01d307e5d488ae7808fd33c8d2eea753e7e7938c70012d1fce5f861454da5248 WHIRLPOOL b201cb9f889760a5fbe5430be55cc014881762310215a4ff580ec161ca407c89d522032c8dc85dedf665ddefbac7c7131930f100e1827d64c5a6a4f1888c780e
 MISC ChangeLog 6589 SHA256 40c4d124de33cac3e06ca57c7739fd18fdfbd7b3404920e2b112171732227043 SHA512 52583ce554757db55effec9b9282ef15886034edb85e009ebd838c71f14fee3975706dec7352211ae3b47ab9fa1d91f47d042f3fc1f254e128415d4f41ce5b4a WHIRLPOOL de6f7117fc6178cf45c8994eb8a04ef472fb5332acf03493fe05b9212dfc57dfa20b3494473365650cf5f901b55f64779726334ddf5001e179b698f5bba6b6e0
 MISC ChangeLog-2015 26387 SHA256 a7f737451ae142fbf394d86d0ea0b45aa0569a783ab741b0fb625949d82dd6a8 SHA512 9116e57c3808bf057848c154f8d7db97c2d4d8a5cb550755b7c153cddcf00172624cb2144dd97507d8477634b60593b9888e50457c5c5d9b2d7e8be1ea440b80 WHIRLPOOL 665ea3e24b5e4ff25340bde9e96babea90437a320cb9d593bb7996b0b8796556c4c55ca087a297b16815d387f22d41cc0685b4acf8a93a777184cc17750244bc
 MISC metadata.xml 913 SHA256 093b6929d3794e81c15c1ceb1c2460d998f3a4c32e78e8459c1255d982c57054 SHA512 2cc53e7e0f14169b88d26324b071b2078012cc57bd9ddae0b14f18efbe2d1bc1ef0b66122c178b0e3019a48bec2ba87fc09186b4d8a96e8e7d8e51a997c09d69 WHIRLPOOL ec17032c4cfb7e9046a4ea13cb5fd7763c2ec4534e3d58c4c2ae846e108acadf72ad7c2a6b90132d94a17a56a98c866415af54fdbf144e9f534e5d4a07da8d60
diff --git a/net-misc/wicd/wicd-1.7.4-r2.ebuild b/net-misc/wicd/wicd-1.7.4-r3.ebuild
index c06f9fd6f0ff..c06f9fd6f0ff 100644
--- a/net-misc/wicd/wicd-1.7.4-r2.ebuild
+++ b/net-misc/wicd/wicd-1.7.4-r3.ebuild
diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest
index dda31b8337d9..fbb71ab45ef3 100644
--- a/net-misc/x2goclient/Manifest
+++ b/net-misc/x2goclient/Manifest
@@ -2,7 +2,7 @@ DIST x2goclient-4.0.3.2.tar.gz 1560536 SHA256 f65a70463eae3d6d9fe6e4379f4ffacda5
 DIST x2goclient-4.1.0.0.tar.gz 1889861 SHA256 4b5915bc3666228910342810a34f7a03fb6967c6b9c796633d9cdf8b89cc2b6a SHA512 cb7023b0b9de6d83ee8206bc0a36be0306cea19a3a8fc081ffe704691ae8744848bc3c329b3bf475e838b93c2ee4b9c96af20fae34e6d4822fcf7feb9c3cf6d0 WHIRLPOOL c2f3de5f164ae6794f439c8b59e72782f54ca802ee7ce5f3f52e0cd79625b372d61e8f5d8a6b2127fa3520545922150fc761a1874640ad1e3fbf7b5066ce3ade
 DIST x2goclient-4.1.0.1.tar.gz 1891484 SHA256 0681b8a11b02652643cf1451a75d812c3ce9f3ee33c348b34178c130dcf77484 SHA512 6cbfb70fb7f522f0a5557ab36b6e15b6cae9ad184bd1d51b6c2f2acfa7b22d8fd9344bbfee141f2d5bd71f5adf9d3bd6d2c7db7b774cd8f8af5bcd25144de98d WHIRLPOOL cb4510229b20fcb5574ba8cdaf7e313ab9d37db99fb39a16d6088f545f39c7587f844f890c02c941674f8021fd5f5425d51aaaee34704f7c66c0addad98cf4ea
 EBUILD x2goclient-4.0.3.2.ebuild 1533 SHA256 70e9d824501daf0e092ac668d03c7378d0beae26de39ecd46857295f40a5d7f0 SHA512 e33ee793ed8d269fad7b98328096cc713224635d6218122cbf9303e7a4aa0463cd0baf725089d0b17bfb08deb4c96a3610c3a6a3175c5d09fcb52ff5f2a029e7 WHIRLPOOL f2bdc8c30e94fd12a522c1a94a178a30a8d6ec5e49847f186c059b9e184a6cd649edd577f2f5975493a6fb2946a43a9784f1756d6638654c799c7e4db3efe51a
-EBUILD x2goclient-4.1.0.0-r1.ebuild 2011 SHA256 d22f1389bf9c766ff7bb5864cc6c42425c878e6873c577cb05db01a3106b8df6 SHA512 d21c351bc31138aea429131051428b574ebd3aa79558f3fd432f71f35d41196d5a172bd7579cdbba84a6d3edb956c9a3e1397d9afb09a37cf26c586e253d9cf9 WHIRLPOOL b6e20db4750c32ee9e121cf377fbf0aaf3114e0e59b72c256af6760728474f846ea74d723b2c8d46f454e617edad0aaeb61af3eaf4642d65b9775e46006c7d7b
+EBUILD x2goclient-4.1.0.0-r1.ebuild 2010 SHA256 58a713e4dfa5db8ccab3e2866c4d0937e080380047bf4243b8df501b7e766139 SHA512 d0c42256d725c6eab22bb0aee1614910e85c8dd73d4914c83bdace2ba9328fce783d75e9b8f9ec0b14ee3c336a91a6edd21a92e32ef5fe74aedf4243c124b883 WHIRLPOOL 9cf9cdc7e28d6b62577399d9e2cf4ea69cf87cc10d97095fd912a8a30744528eb005e3228eb35f4e0ae74bab7aca5d1d3885539a9c9128c5c4fd0811e2574284
 EBUILD x2goclient-4.1.0.1-r1.ebuild 1212 SHA256 0775c1aefddd9271478abcc772754d3bd12cb60b315be869f4fd35a1bd61625c SHA512 6828dde23894609af104231e8e3f86e473bb9491caafe9016ffa2da2415813f785525169b288a23439d26926528bb8a2b26a1e77bf0fbd46ccc803c09527cef3 WHIRLPOOL 3eb1b7454e853c2abd4845cabc95a8073d93a126743df1715d9204b91f806475b33a0c2ea01fc3261644833efa17789e1adefdac2f722d30ec91ea19893321e4
 EBUILD x2goclient-4.1.0.1.ebuild 2011 SHA256 d22f1389bf9c766ff7bb5864cc6c42425c878e6873c577cb05db01a3106b8df6 SHA512 d21c351bc31138aea429131051428b574ebd3aa79558f3fd432f71f35d41196d5a172bd7579cdbba84a6d3edb956c9a3e1397d9afb09a37cf26c586e253d9cf9 WHIRLPOOL b6e20db4750c32ee9e121cf377fbf0aaf3114e0e59b72c256af6760728474f846ea74d723b2c8d46f454e617edad0aaeb61af3eaf4642d65b9775e46006c7d7b
 MISC ChangeLog 4293 SHA256 ef5abb9965123178b0268a9bbd672ae0dfc491060e04df60cf11814fda3fc811 SHA512 57fbd4efda2682b9a9b8b95eed298d99ade59cc24134c0e15170c469c9eb25fcd08f8fd15274b36c4cdefe75aea0f383d60f2decd3c381a2538c7001c7318682 WHIRLPOOL 3bc0cd004550fb82aae2fa0ed12b5191191538418d6eed4e94a94cf626080e95bc0128f0fb959bbee806e436e41446b9e36c4dad76eafd0473296ae41e40a50c
diff --git a/net-misc/x2goclient/x2goclient-4.1.0.0-r1.ebuild b/net-misc/x2goclient/x2goclient-4.1.0.0-r1.ebuild
index 4774046e76f9..c5c50ad7ccc5 100644
--- a/net-misc/x2goclient/x2goclient-4.1.0.0-r1.ebuild
+++ b/net-misc/x2goclient/x2goclient-4.1.0.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="ldap nsplugin qt5"
 
 REQUIRED_USE="nsplugin? ( !qt5 )"
diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index 388cac47c61d..df1f8650b884 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -7,7 +7,7 @@ DIST x2goserver-4.0.1.20.tar.gz 96412 SHA256 f8bf48e1c8995bd5a7cde6de1c006fdb77f
 EBUILD x2goserver-4.0.1.19-r2.ebuild 2589 SHA256 a39bbbf33fe3476890ad3f0aa631202b587455e7b8f54a3ea63a802514022bd1 SHA512 48b8e813b688ae3195bb16bcbacc7f025ca6fb83574300854be69e443c98663835b8854534d4f5295dc8dacfb60727aea78409d362617c4ded76204e77c4affe WHIRLPOOL 001e9d6ea95f3cb167e049c5dee1068dad77114247e0e9bce751100d30c03aaa385e482807c42b5eefccf2dee555a7a9e1a0ccc8185e47917266bc86c85fad9d
 EBUILD x2goserver-4.0.1.19-r3.ebuild 2638 SHA256 721107c845f2f5177ae2348a9fbe4a6c7037267e5a2fc0e611b93398be1918e3 SHA512 f911bb6de40573af208611ef5fada2b29b6e3e92120e228500a27144f6c8309a104cbaf0a972f53b9d5421c55f8a4f8c97458d7fe9802eb11cf9b0b25f7bca58 WHIRLPOOL 407251c7774ca0bd81ee3bda3b1fec4e636c6b0762eafd9979abf79a6442f972b974ad505f724f11202d8e111dde6ecb9b13a8ed76be57eea5f9a8b0056e4a71
 EBUILD x2goserver-4.0.1.19.ebuild 2499 SHA256 82523c984842bc75e1c012083299d49e2adb4eb98b14f6990456d6dec076fb53 SHA512 f6883747893843fd472344c1bbd578982e878866f60e3fb5fdd4a313a9009bca2498d7ac286dfe96fc16c5002240d4fae3c2972393c248f3d6d034d59b2d3b65 WHIRLPOOL 4e6eea122b607a8b09838eff5d21e8d640fdad341c8394773d0dac919c030bd3b8df7c0aae92cd47614744cf5a6bb28d0a88a8761bf51131a07b5c59bd7e1336
-EBUILD x2goserver-4.0.1.20.ebuild 2545 SHA256 53bd88ef5f0ac8b0a4fa5adcc022558829c23094193292f9d9cbc81863af9726 SHA512 f84fdbaadafaeadc058f573d394f2dd7e60fd965c7970bdcb3ad43e6a6e3fbd3d9fc374cd364fa9761079145c3aedcfc2ea1730c7b8e7b7546ec4570da607533 WHIRLPOOL 638b473e6a0a7e5f864883fbd01b25685fb9d3c411a9f49c950a2b50c8ba4ce66bb68b5bc279e3d6442913294b27ecee376c84c290e6e2ffe4f55f7ced382a9f
+EBUILD x2goserver-4.0.1.20.ebuild 2544 SHA256 76fed816c4230129c427be207eae126c229be67ce306c6d69ed3e881ebffbfc3 SHA512 e67ed7fe6fe116bb9d29912ed71b0be31229662add077d3aef350299303849088e77dbabb5a7a53c511f9f5384e435ab03a4be35fbc3745b84bd47f5bfc39884 WHIRLPOOL 742c74d7942bdf98100645fe8d9f0237052b3abe0f3a02a25e2064f78cfddbc8d6a11073f602a45fe9e98990d8d3190495bbb2c571284ff566c6e73678e88759
 MISC ChangeLog 6358 SHA256 7198ac7c75a68c2db074471238263afed1f53cfceb1e3807a524ec685cd2d228 SHA512 cea547af5c82dc689ea3b820fc1177d4ea66a5f3fe31d125a5968409e905fa6507b0dfb27b0bef7d6472937ba961c625b87eb74903c65cc2d136232961b5d2d8 WHIRLPOOL c90284259476f7e92da3f318ee8c34eef6108522d5a234f6d144f1cae2d381e4e7f0cb5f53bf2ec6bc67240f51fd26d11fe712836ac706b3f1bfb8fa4d723a9a
 MISC ChangeLog-2015 10694 SHA256 280d067f8ea15916b3cdc56ab84c2661fd563272720a933bc10c0250c5378479 SHA512 2588cebd5262b439ab73f00ed6dbaa34d025766b89d47e6e8129401dc56016fb90a100ed1893b185c77a0f197c7e1445ff484c1d617084b7564b02aa8e7a0ec9 WHIRLPOOL de650169bdee0fc545d93e0462ef94e163cde7d4c47f0b4170360b68d3d5452b7e8912acd5be11a73ef1419b10f99b8416db834566311daed5c713963f5d9f9b
 MISC metadata.xml 398 SHA256 232f483c766fd0dac22180147361f9fcbbd69b6ba3d3e2ea4b660ad99787266f SHA512 f0c209499689338c77517afd3c49153e822ba45d29bf575dd6d3e8266bcbe4cb87d9a0a1744178a0392a7358b7164c765157831710ff85cb38dea5b76fd7b65f WHIRLPOOL 6db594132a762989765659193a778362327e9b467d8a9973dbb3e3fe77810798e306901ba5a603bef4c71ee2e90458d500174879fe295c44278caa45d66afbdd
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.20.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.20.ebuild
index edd8b54c43bc..8ec714bca8f1 100644
--- a/net-misc/x2goserver/x2goserver-4.0.1.20.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.0.1.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="+fuse postgres +sqlite"
 
 REQUIRED_USE="|| ( postgres sqlite )"
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 7bd537ee94e3..cb6534b33b79 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,9 +1,9 @@
 DIST youtube-dl-2017.03.16.tar.gz 2631620 SHA256 55df3cbda9cf86e49baf54040340ec74c692bb3d6da3d2f5a1bc1238017dd492 SHA512 f3b8942f6b2be3b1cfd4bddfb74c17bad48c8ef4bea34114970ecb9d65b5a3dcbe71beba6d7c2dbda168371bbb2e8bbaddce58039bd9d158bf23950a2a88123c WHIRLPOOL 8345da00074e62ec9a9c244cb9ef64930fbd0e5e9e5bc1709bfcf56517cc6312031a09523c3016db2a1542c16a0297bea9d6883a201ae94e347e358307e92422
-DIST youtube-dl-2017.10.07.tar.gz 2816312 SHA256 d9a8935087c1e2fa3307594ae15f1e9ea0f8676e825fa676a50a3a3d471bba83 SHA512 4842c8b324a10a4eff398226749ff8394ca60cf1e47873c1dfb5cf9828b77772670ea30891f32b26bab421aa0e7ca95e2815e062061a2cbaf22e6c5f76e1d87d WHIRLPOOL 525eb2eb3f18bf5ed1776f1a4d43dd010793b3b1681f27b3ed4ed4afdbd0c3dcd2c18b8e532de1fa3c318ac6a5f186c0bdf60fa4c7c69fe939335a7235679c3c
 DIST youtube-dl-2017.10.15.1.tar.gz 2820437 SHA256 da6ae68b2fbe81da7cf4ac6b989fa7bf27b3beb214eed551d466cc6e41d7297f SHA512 6093747f732dac4eda4c71d334ed01fc24ba70d29e5660c38ff795861f06c4029441c3a4576e6a5463974488aeb7732687e5634481c8b04127f77499a2405a1c WHIRLPOOL cc8fca27f2a110fde556e6c6506a88715d4e4a03c971b7e74e77a91a5b28916c66146afd6e476a19aca2fff3270719da102d254a05f62dbabb5dc2a10040d839
+DIST youtube-dl-2017.10.20.tar.gz 2824647 SHA256 3e920a573218328a0864ffda5084093ec03108a7d4cd13cea7be85d7c342f95a SHA512 973465ad7d04f9d790fb9d36ca1c2c89c13f64b599ac3ef61f7720cd9d618d01619f76b419044eb716123e8300c1e2b4d881972a8240e0421f396dddd7affef1 WHIRLPOOL 2292bb5bdde62bc94b83d01da7b9a251fa88feaf95d2df703b40db36297cee75e76e776db4e0ca2959873f30655ee93cc52c76731230957a3bbbff0e5e736b0a
 EBUILD youtube-dl-2017.03.16.ebuild 2381 SHA256 9503230e2716a18498b74f5047095216fa36cdf4801cc6446e6f2075fa5cde50 SHA512 b47b7f8c00e04879aaac6bc70621d28f9e6e153b618bd246f95a2b11f8f09bf77cfefc5f0869b379759edf68a8f5d4afded6425032a9efdb8a1cbf44a23e9862 WHIRLPOOL ded7fa74a8649db1cc5c16eb98ab557853d264bcc458429374b0bbb29773f993a8621285bcfcbe243cf3892d982f91ff5278c45cb0e50b824b156a0a57786911
-EBUILD youtube-dl-2017.10.07.ebuild 2382 SHA256 6bcc95505bb69e73c3cbf3c7824a96e42e651b0461a44a27dda5549e8bf7e625 SHA512 ab1e5bfe8a287cf5ad8f74efeaa95469b66d62f28f45e65c0aa41e352661de8e3fac99a1d60f15c33b312985794ce6b08fd8e08340f2adce1d46391065be4e20 WHIRLPOOL 41f2c088f6bf4a0692e76a67a70c01f8d07ec381690316544b2d6267a8ef6ff3480800d5ff387cad24c306413b778abba3aa43da0aa67a561de70b5b6072b280
 EBUILD youtube-dl-2017.10.15.1.ebuild 2382 SHA256 6bcc95505bb69e73c3cbf3c7824a96e42e651b0461a44a27dda5549e8bf7e625 SHA512 ab1e5bfe8a287cf5ad8f74efeaa95469b66d62f28f45e65c0aa41e352661de8e3fac99a1d60f15c33b312985794ce6b08fd8e08340f2adce1d46391065be4e20 WHIRLPOOL 41f2c088f6bf4a0692e76a67a70c01f8d07ec381690316544b2d6267a8ef6ff3480800d5ff387cad24c306413b778abba3aa43da0aa67a561de70b5b6072b280
+EBUILD youtube-dl-2017.10.20.ebuild 2382 SHA256 6bcc95505bb69e73c3cbf3c7824a96e42e651b0461a44a27dda5549e8bf7e625 SHA512 ab1e5bfe8a287cf5ad8f74efeaa95469b66d62f28f45e65c0aa41e352661de8e3fac99a1d60f15c33b312985794ce6b08fd8e08340f2adce1d46391065be4e20 WHIRLPOOL 41f2c088f6bf4a0692e76a67a70c01f8d07ec381690316544b2d6267a8ef6ff3480800d5ff387cad24c306413b778abba3aa43da0aa67a561de70b5b6072b280
 EBUILD youtube-dl-99999999.ebuild 2089 SHA256 a46031a2c229d820634b16d31efc904c44bafe1d04c3367b9e40e5e0c8b1c953 SHA512 a390ee79a77aa98603ca01a702df6621ac4630e62e7afd089e065bd4468fc38bfd13bba365e28916024f0eb9e92627133281985f57692432522aeb4671a0cf11 WHIRLPOOL a358657c660c533e1b506339c615e781998aa5465408629c51722f6999fc3e5d3fd11b617b89314ada35df0d93aeaa514837ac1a2e3b7573c43657394f6ef4ae
 MISC ChangeLog 32089 SHA256 377c688fd528de367a40230423162256199da2c475ef85d3dc986b622e322fd6 SHA512 955715fa5304b1ee5ab4436e232b4ac5c882e28f4755d2edcd23cc4c760575518dc8c349c20b2e1b41145ca55bbd8df292d12a1b34768acf55ae1d6b80e2f2ca WHIRLPOOL a925103ccb1de53ada47dd94f927a42eff5f97e14b47c607ddfaeda4e719a2eb8be78be8e008e4b3036ab48acb946e283876d646388745288ad5b992e2574104
 MISC ChangeLog-2015 75434 SHA256 71ef7accb3e09eadb601b4541ead4ed3019cbd1e86b56df23130cc0e49572dd5 SHA512 3517da9014199375d7bb8d4841b52ad12eb3a25ca7a225e767dd9b60f8b81848cf7f6763066fb7c7bb7826602711e22f56d710fa319cb8172843a31eb69228e6 WHIRLPOOL 32aee6516cd3e7848eeb08ccd47cb60bc04da646b2e448970ce40fa5d0e8dc591ae5d7c8e1dfe99229b6ee70805e070d8dee2353a41515377083bd7d2f02b073
diff --git a/net-misc/youtube-dl/youtube-dl-2017.10.07.ebuild b/net-misc/youtube-dl/youtube-dl-2017.10.20.ebuild
index 975ce26c347e..975ce26c347e 100644
--- a/net-misc/youtube-dl/youtube-dl-2017.10.07.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2017.10.20.ebuild
diff --git a/net-nntp/nzbget/Manifest b/net-nntp/nzbget/Manifest
index c3a11e073c05..316311093e72 100644
--- a/net-nntp/nzbget/Manifest
+++ b/net-nntp/nzbget/Manifest
@@ -9,7 +9,7 @@ DIST nzbget-20.0_pre2108.tar.gz 1820172 SHA256 6889079774f847334dbecf0c4e700eaab
 EBUILD nzbget-14.1.ebuild 2575 SHA256 508be9c30d98e788e319108eb5c19a0cdaf92292244c07e2b0c984e11ecb4929 SHA512 a263b13e0884c4848a762d4bb739da5e8eae5b7dfac96feb5812fc4f81928d4e600d3cdb9dbf35c407dc81ed1dfa0ce1341bb595f488c4ece75c5feb967660d4 WHIRLPOOL f6601ba182c4774dde2094df62ae44cfa94adca58a7425107d37dee534963334d4e12713c737d2a0c19d41e25dacec8361001cba9fd9f968ed66880487127dd2
 EBUILD nzbget-19.1.ebuild 2992 SHA256 35fd39fcd7e1742d85360a298b6f796a5558d63c5e989fc9449cbf6d61c76bad SHA512 a8ad9f64f7520f2e2174124676cd6764ebfa063408e2c45861dbcf49919b5b1b028df4d9db2601a0399cf315637a0b297cac24f54befb878c7a78691e4f658a1 WHIRLPOOL b604ca5481b151e036a2effbe5e45773afe9f90d12445da80ef165d2c9ec81adb4d61bbeaeb15c59a5ab1891d4c81f896d163584c67f68ddcc405e6f84986830
 EBUILD nzbget-20.0_pre2075.ebuild 2992 SHA256 35fd39fcd7e1742d85360a298b6f796a5558d63c5e989fc9449cbf6d61c76bad SHA512 a8ad9f64f7520f2e2174124676cd6764ebfa063408e2c45861dbcf49919b5b1b028df4d9db2601a0399cf315637a0b297cac24f54befb878c7a78691e4f658a1 WHIRLPOOL b604ca5481b151e036a2effbe5e45773afe9f90d12445da80ef165d2c9ec81adb4d61bbeaeb15c59a5ab1891d4c81f896d163584c67f68ddcc405e6f84986830
-EBUILD nzbget-20.0_pre2108-r1.ebuild 2938 SHA256 405c7bff2fcbce3bb3089d6963dce9972f21ccfe3099c65cd4ee01541e2bd570 SHA512 617b7e19686ad09e3fd93457c764efef48bfeaeca048f5496885aac83cacdc82754748c5e11d9b3fb785e45c6b4375d78c2cd098189366ffe84eacd44a0d9cbb WHIRLPOOL d335df369d7b10bad72a9b28cb3363d338fc82d88209fa0d5fd3620e20a3754567ab0c60457a64c7d9a0f00e82fda6f3f5a82da74025ed9976b6c062b5e67776
+EBUILD nzbget-20.0_pre2108-r1.ebuild 2948 SHA256 f6786241db0de04ebbdffd898d03d84cdd160e09363be26bc5a524563dd67e37 SHA512 0c84923653f454416ebedc8a33ff367076ab4f2a26c1c6d2f3a6eeebfcfeff6459e134b3d2fc2d233cc88e4d410c75360a41fb6c2e9beb2296e6d25e633a6696 WHIRLPOOL db5f798015396f9765d748ebc9323ce5525ece5b3c1f345f9cb4e21f426d94f27f658fd9d3f5d594a781dba88b53443ab083b89bfd84b54b7b0a99d0ee5b4d03
 MISC ChangeLog 8446 SHA256 f62b61b41d42de0b4def3400945521f82f8fa9b0541e584054bf2f555e0303c6 SHA512 5d024a50de0f9bd590b0cadeb418d8cf5aa9bca80e61d67e1a527580cd4597a9c120d568265742723fb0f69430b76460937c99fe7e364970b17fcade3d294a21 WHIRLPOOL 28cd2da9f67d690c7c2aa2013556910cda3164391a54a9ffe37e1650849e3646a601994d1be7aedd19e65ec50842346eb2f16a7b3064c267e90b6f92c124dfbf
 MISC ChangeLog-2015 14706 SHA256 15d07db9cc64825833ed79c7ba89033625004e7085af3572ea61697c4514ae31 SHA512 8ec273509759582f56d0adaa0c2ba046ecc50c11658e56a05afc8d63cb0eba30e2573435c245c67c901b52376107a632c7e508b9eaebc94e22cadc5575aa1caf WHIRLPOOL aae0c6bc74b61fa6415912c6828c2ac7bb4a84abef53dc2ad2928c36befb3442b19ede802fb9291cf3d5470398ec5d410e386d5caf512436d1db089ac69f38b1
 MISC metadata.xml 853 SHA256 f2eea21f51150e93ffaea82958e32bd2d20586a347457305a65795cfd52cc1a4 SHA512 c35eaebbf56d6809e91f62440fb3b4f09911d10a2798741647b063074c77aed9079a6a6d2355d229571d82eb5be9f65f21ce449547e7ea05183d583e9bcf1ae2 WHIRLPOOL a74a60f5d3b3549ace1619e0ff6503376d76716913a64014cf7c6a06d396f29d180d76c6cfcf64fd93edb0a7954c0dee097772efff032cf8390325ce7c4d313b
diff --git a/net-nntp/nzbget/nzbget-20.0_pre2108-r1.ebuild b/net-nntp/nzbget/nzbget-20.0_pre2108-r1.ebuild
index 3e119a13d9e8..4ecdab2b2eee 100644
--- a/net-nntp/nzbget/nzbget-20.0_pre2108-r1.ebuild
+++ b/net-nntp/nzbget/nzbget-20.0_pre2108-r1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="dev-libs/libxml2
 			net-libs/gnutls:=
 			dev-libs/nettle:=
 		)
-		!gnutls? ( dev-libs/openssl:0= )
+		!gnutls? ( dev-libs/openssl:0=[-bindist] )
 	)
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index e9b5999b6430..61bb8b3d4c90 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -1,8 +1,8 @@
 DIST gtk-gnutella-1.1.11.tar.bz2 19966423 SHA256 e46ffa3905831828f867709aa346cd88576075bd1299ef396962ad860e2589d5 SHA512 87d2d66b555180c0db7c360106377133b9e1f8ad8d28fc0f9a38498f3b4502a817650f9683cf92919b7d3a1b3602f7136143d2f1c920e10727576c703e233d07 WHIRLPOOL d70a4dd39ac25856fd3fbe4b4d4f2447f1ed8448e672fb64ab1e66bcc59a2e36b30112db0123aed1b52a6fa00c274d17ac47bb2ac9a775182516558e9d38dd08
-DIST gtk-gnutella-1.1.12.tar.bz2 20075956 SHA256 ca65f9c56a5e17e6cb84246d5e2db453f1c73863ef937b8a1772ff4572d562ff SHA512 3b95f66389ed45f45ff8cc1c5f4eda0d03d5a4060a083f23fd5318ec004c3e96a37a6909688828cd8de97067d18280cc533146ce6de2129c83f9aeb8a3c5a589 WHIRLPOOL a7efc554ee6aad289444aa59e73ed4b0b7701c7a87a98b2f9cd45ef1439fe53cfa8d4f9722854ea90600d37e225e3be80533971f056d9ef831fec0b151629218
+DIST gtk-gnutella-1.1.13.tar.xz 19207704 SHA256 2126cd08941ba0847c06f1034c5e2a9428b67b2fd1685c0e3ab878cb0179f647 SHA512 14ff19a3f0bf55101570b4268cdd422defd2ccd112d80e9bafe2f6eb019b94c3c72763e67e2853d4446e68943355093c1279c6d67c101ca6d9b7f05ddd9ac7e0 WHIRLPOOL 5c1dbcf48b53d268e698d381ec88d680f79c79403e937dbc6995143b64f278588a7a5de9f7365237351079b7f54dc2b4b2d6520b80226cf9c9a0ff2ef99f4632
 EBUILD gtk-gnutella-1.1.11-r1.ebuild 1869 SHA256 8ae03f066aa6bdf57c4833fd2e93320b2c2e276a3018f622d89dd75716ae7d7a SHA512 3df30186715ee7497e6a5f68ad38dbb1ee8dd9e04b9a9ba0d67e603df2661ad929944e21a291ddb4243866417504da64e56ac0bca5f626f76b6525e91148e700 WHIRLPOOL fff3e33745b809773108a05d73bd3d951fb6362a6ca1dec8d759b94e4163f18d7724c27674038ad2913511d27ae78ea5a310862d4504e75b67cd55aa5c9ea4a3
 EBUILD gtk-gnutella-1.1.11.ebuild 1840 SHA256 f31f6a81e06c6c6f2f4a91e2d838f7b160425383ba32e379fac9513abf70b32f SHA512 ba05eaeef63243a39fdc801f1a6fa7581506dd7721c3615f23665cf5aa43d945cfd620831b06de958af8d8180fffdc0685fedbecd4884947ab56ce386218cf52 WHIRLPOOL 41c1d89596e2018e86657728b73f878b89332fdde334cbc2f2d65ede2847e017b6f58e33dd8898d61a74bb4cb4d00570c17350a8ec3ea0ea26c0e02622246528
-EBUILD gtk-gnutella-1.1.12.ebuild 1869 SHA256 8ae03f066aa6bdf57c4833fd2e93320b2c2e276a3018f622d89dd75716ae7d7a SHA512 3df30186715ee7497e6a5f68ad38dbb1ee8dd9e04b9a9ba0d67e603df2661ad929944e21a291ddb4243866417504da64e56ac0bca5f626f76b6525e91148e700 WHIRLPOOL fff3e33745b809773108a05d73bd3d951fb6362a6ca1dec8d759b94e4163f18d7724c27674038ad2913511d27ae78ea5a310862d4504e75b67cd55aa5c9ea4a3
+EBUILD gtk-gnutella-1.1.13.ebuild 1868 SHA256 745e22ffdd4e8ec0875c1a8239ba92a419df2b53596d47ded50e9297c2df7221 SHA512 0fdd065af1e12aef93d40c9e21893586c69f3b94ec9b1c4cdaaa57f42950669d72016af40032372f24555b6473c9d401dbe107b851953737aedc07c4a8e1b167 WHIRLPOOL 684bf05e6cf2d8400f761bb853c1cd08530a6f590d5febc3ded13e686ec8cfea87cff7d50a27b62e4f20a954a7ff097f26719848f3278caae0d19927d71ed147
 MISC ChangeLog 7436 SHA256 bb390eb374b1b3d3ff18b873dabe4c72d30bb2ac40bf3fd7c8a39c79d963926b SHA512 660fc73286da22168592cf2d9db5e9e1070bc8de9991b7eb3ab0d388f0b00dada15eda0a29658c5cfd7877a7e1e574b9c720ffbdc7e90d5c4b9b84c981c52ac8 WHIRLPOOL 426fe29b197f404655b05df1c439c9e52e22ca0b8863e4c88ce47f3414a86a0776fd313252cf824528d15031b0306467f4f57ccb82ea236cffc2eec553eb8ea9
 MISC ChangeLog-2015 24687 SHA256 c8dfc417de42e1a4d3fb61db052f1748e3647e596038edddaf57ecfc1b0a1178 SHA512 283f12f05c1e26314b9fc5ab5eaa260f22e63140335d3dd310058d52da2421a09d3a7c9fd61ff48122483ec7e27aec1fe7aab1a5d5372f6b77ccdbd40f1e9015 WHIRLPOOL 9a5bdd57fd95d47fdcbb4c436576a6e24c47c00fe2c2c873df747253611ba4ab6a3c13ceb4ffdf7dfb6c19ffa8b9703f3fab919d86014f0ec7b87ea28112ee19
 MISC metadata.xml 299 SHA256 4173f9e375db3721bbf02ca502d32e01d98125b1acd6633cc5afef6689916008 SHA512 ab18fa3318fdd64a0e4bff392a88d9f58b1c611c71ee090a767a4a25f75f273dc60a7cfeb7e386e5fbed548d982788c16654584938aec8ef5f6b11cd6d5b3c61 WHIRLPOOL fca824142c235c26a89e7ee25eecfbbed70eb0766b21d090e5b87d0d42312b3680101d92c3063d18326bf9ee5822c4925036f35768f22033a612bbbb31b5ca92
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.12.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.12.ebuild
deleted file mode 100644
index 6cbf0a7e3653..000000000000
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.12.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-IUSE="nls dbus ssl +gtk"
-
-DESCRIPTION="A GTK+ Gnutella client"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-
-RDEPEND="
-	sys-libs/binutils-libs:=
-	dev-libs/glib:2
-	sys-libs/zlib
-	gtk? ( >=x11-libs/gtk+-2.2.1:2 )
-	dbus? ( >=sys-apps/dbus-0.35.2 )
-	ssl? ( >=net-libs/gnutls-2.2.5 )
-	nls? ( >=sys-devel/gettext-0.11.5 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	strip-linguas -i po
-
-	echo "# Gentoo-selected LINGUAS" > po/LINGUAS
-	for ling in ${LINGUAS}; do
-		echo $ling >> po/LINGUAS
-	done
-
-	default
-}
-
-src_configure() {
-	# There is no option to turn off optimization through the build.sh
-	# script.
-	sed -i -e "s/Configure -Oder/Configure -Oder -Doptimize=none/" build.sh || die
-
-	# The build script does not support the equivalent --enable
-	# options so we must construct the configuration by hand.
-
-	local myconf
-
-	if ! use nls; then
-		myconf="${myconf} --disable-nls"
-	fi
-
-	if ! use dbus; then
-		myconf="${myconf} --disable-dbus"
-	fi
-
-	if ! use ssl; then
-		myconf="${myconf} --disable-gnutls"
-	fi
-
-	if use gtk; then
-		myconf="${myconf} --gtk2"
-	else
-		myconf="${myconf} --topless"
-	fi
-
-	./build.sh \
-		--configure-only \
-		--prefix="/usr" \
-		--cc=$(tc-getCC) \
-		${myconf}
-}
-
-src_compile() {
-	# Build system is not parallel-safe, bug 500760
-	emake -j1
-}
-
-src_install() {
-	dodir /usr/bin
-	emake INSTALL_PREFIX="${D}" install || die "Install failed"
-	dodoc AUTHORS ChangeLog README TODO
-
-	# Touch the symbols file into the future to avoid warnings from
-	# gtk-gnutella later on, since we will most likely strip the binary.
-	touch --date="next minute" "${D}/usr/lib/gtk-gnutella/gtk-gnutella.nm" || die
-}
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.13.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.13.ebuild
new file mode 100644
index 000000000000..3593ea42e7f7
--- /dev/null
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.13.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+IUSE="nls dbus ssl +gtk"
+
+DESCRIPTION="A GTK+ Gnutella client"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+RDEPEND="
+	sys-libs/binutils-libs:=
+	dev-libs/glib:2
+	sys-libs/zlib
+	gtk? ( >=x11-libs/gtk+-2.2.1:2 )
+	dbus? ( >=sys-apps/dbus-0.35.2 )
+	ssl? ( >=net-libs/gnutls-2.2.5 )
+	nls? ( >=sys-devel/gettext-0.11.5 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	strip-linguas -i po
+
+	echo "# Gentoo-selected LINGUAS" > po/LINGUAS
+	for ling in ${LINGUAS}; do
+		echo $ling >> po/LINGUAS
+	done
+
+	default
+}
+
+src_configure() {
+	# There is no option to turn off optimization through the build.sh
+	# script.
+	sed -i -e "s/Configure -Oder/Configure -Oder -Doptimize=none/" build.sh || die
+
+	# The build script does not support the equivalent --enable
+	# options so we must construct the configuration by hand.
+
+	local myconf
+
+	if ! use nls; then
+		myconf="${myconf} --disable-nls"
+	fi
+
+	if ! use dbus; then
+		myconf="${myconf} --disable-dbus"
+	fi
+
+	if ! use ssl; then
+		myconf="${myconf} --disable-gnutls"
+	fi
+
+	if use gtk; then
+		myconf="${myconf} --gtk2"
+	else
+		myconf="${myconf} --topless"
+	fi
+
+	./build.sh \
+		--configure-only \
+		--prefix="/usr" \
+		--cc=$(tc-getCC) \
+		${myconf}
+}
+
+src_compile() {
+	# Build system is not parallel-safe, bug 500760
+	emake -j1
+}
+
+src_install() {
+	dodir /usr/bin
+	emake INSTALL_PREFIX="${D}" install || die "Install failed"
+	dodoc AUTHORS ChangeLog README TODO
+
+	# Touch the symbols file into the future to avoid warnings from
+	# gtk-gnutella later on, since we will most likely strip the binary.
+	touch --date="next minute" "${D}/usr/lib/gtk-gnutella/gtk-gnutella.nm" || die
+}
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 3c6557e2e538..65a65cd15431 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -6,7 +6,7 @@ DIST qbittorrent-3.3.16.tar.xz 2961420 SHA256 ea08a61872c397258c2627780f6e09fe77
 EBUILD qbittorrent-3.3.10.ebuild 1143 SHA256 456ebc7325327db1f1d1b038133beec898c92934d64a6b6bbf11995d0dbcca6e SHA512 61cb17043dbce205655b77e1c0012b7666b15cb48427344b57c17ad770fe95225eabcffd1d09fe4043bd9a10a9c448938a8f10802f89453bce8b884ba698fa1e WHIRLPOOL dec4961d20b0d9011ca3813ca853b4b3da782a58b1e94442c08992ea6dbf5804a49f5d6a1234ce90aea7bddb25786097d9dd3cba923f561c7b97d6e811975e21
 EBUILD qbittorrent-3.3.12.ebuild 1271 SHA256 fe043fa87998e4c7c106a98e0d37c59e9b19150cf58cf1324743e2237d048ed7 SHA512 d9c51c941f70188ece4a0eccdcb72520c04fb0e08270aa3dff9cc7d44f7033d0e4bd9ac45d8a0231c6a7287bc26fff6f084b51390de36ef704855e107436ce3f WHIRLPOOL 4cc0bb6e9b890a8c23d06abdcf143a94ef3754343f885795c3f23196615dfc96ebef435873faa79bd14c59a77b1b92f3d8554f7670bd0dfe0c6534e7581c010d
 EBUILD qbittorrent-3.3.16.ebuild 1292 SHA256 e0f1ce4ff81aee64819d7db22b41df6ea6f3eafb46126be55a63ee768e038684 SHA512 936e7cdbe423847ae5e738d5a3dd66ecaa88e257d01d8dc6dc80e0a626ca46793fdee459f71045d43fff2341150553368340860a1f03bd708474aba3887364eb WHIRLPOOL 697651d20cd532fede6ff059103001e2a43fcab6ffb4f511f3b18ccb32b9ffbf6f8fd32a99f63f4573784ef7b19b45620b5f12cee096788672a9c83217cee806
-EBUILD qbittorrent-9999.ebuild 1142 SHA256 3efb30ed6ef8a448ee58e2d357d30fe640302bdb449c4634d1cb6eef74b7741e SHA512 43e4c4fe3b11c708ba69e3fd8c1fdfe954c4f0c035b4209d4a78e99fa1e7d37ea0e7dcdd73de74b4c691d17b1a987cc02c55429e81bb7bdc05f47070134c3d46 WHIRLPOOL 9ebe30f3423cac78bb8289d84bfb022a822f3625275f639eac841ba8982af69f315377d9fcf24f9873a9f2cdfd411c5bf90fc3a792f0a1bfc54ac10043fbbde6
+EBUILD qbittorrent-9999.ebuild 1119 SHA256 84a1b93ffc45398b59b158ebf1ce4e3e2c9f3029174267942f477d3bea43b8ed SHA512 a52298e91c666f3d16cd730ecd3752c058490bef3ea8c563fabcaa7b2ecec279febdee48ae28a96d0c0d0f997bca777778443ac53716a6f69ce62ad992a9233b WHIRLPOOL d1718b83679df5ac48f7341457705ec07aee445d6f337dbea7c226866359cef6ac44580ee44b29d2e28d94944febbe11a8d861ffa537d2ff91aa2d7b43e05531
 MISC ChangeLog 6485 SHA256 51231493196f2cc40fc1694d37d523c7a0655a5829fe1377166aa664a3a5bca3 SHA512 ba632cc51536c468fe5f8a16359b4b202d8555b12d7cb2fed0c2005f0e96ea540c91e93c29f3efc6ebe546290812fb9b2497b8217d96c070506aa34e61d33bf9 WHIRLPOOL e60ba9887bccd2d4c341436f5239295af7c6995658e128a3e317330b231781af687b6a9e6bdaa699caf0f240b8dbf3ebcb8f0b0a912f562e90747e60407573e4
 MISC ChangeLog-2015 42305 SHA256 8f6966bb488506981770b475e1d8ecd358be38443a5a7aed21a01322cb8ffd8d SHA512 0ccca0b46e2b34918746869484455a4e3216760fde4f959083646633cf22ec40dca153197d4b0a5603aca2b83cc1a8c51a9aaedc5ecac37bd6d285fdf20a8628 WHIRLPOOL b2d3e248049eb72d243b256cfd7a2085520d58b1e16c2259f8861ced04fadc800aebdad6a30763269398b7697be445422f796f83a91ad483be63ad5eb242d76a
 MISC metadata.xml 563 SHA256 bdde38ab74aa974f4ed26b07745d97f2c8c26a5370056a005ea1a89e5ffd8333 SHA512 23f8dfd139eed877c504f7661e98168c561385930afe5b910bb60040d01b33820f25b8a9f6048001fae462bddc2199532ebd05fefe4937639f4c68e906d59462 WHIRLPOOL 48b52ddb96251e163a0fdd10f44df07c406ba521fee4a583312d3f91ce27edf0c5d2c3261eff2644869a8e0e13f10252e77d054159cd423fbf69650e2708ed51
diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
index 867cc4a2d2a1..a946e1511962 100644
--- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
@@ -25,7 +25,6 @@ REQUIRED_USE="dbus? ( X )"
 
 RDEPEND="
 	>=dev-libs/boost-1.62.0-r1:=
-	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtnetwork:5[ssl]
 	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5,X?]
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index a2b13509cdfa..dc02b83b2425 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -7,6 +7,6 @@ AUX syncthing.logrotate 101 SHA256 2a0932721a2e7b0393318e686cfd91de70a693cecb900
 DIST syncthing-0.14.35.tar.gz 8235883 SHA256 58509294a150d137fbd005b5629d2859cce661d25e8063505813c4e7faa62fae SHA512 2a3de76e7118be6e91b8bc6bc69b10e250755836b378fa762e0feaed280bb2206d2e4552f09fd230d51e246633108fd8cff343ac355742ebb1bd06c2145fe086 WHIRLPOOL bdc971896378fe04576273cab23432f3dfdd96f77d464c0ea0bc8143771a40a15520d20ce2e76ccd790e78c04421f92e31ce1af04f66760a4f101b8b67b6c852
 DIST syncthing-0.14.38.tar.gz 8246629 SHA256 76c1dab5873d6f3b9799ad3e5dcab4c17fb0f5a699fe845bd081f162d96f4477 SHA512 be5f7527d63e8db427705c34b26d783d9abd7cb5727d3dcf08ee62b1ace5454b7dfed4f030ec53e847a34f560cf349460f68c859a1008c5105aef65ef42c5cc5 WHIRLPOOL c71799207eaa6dfac7839ead25dd551c76f00823f70d9bfc1bc72409ef410dbdb28cf9df3742a97a56f12cf0c705262299eec164313a027118be177ce6b5458f
 EBUILD syncthing-0.14.35.ebuild 3607 SHA256 6901ccf02eca84c69a72ade9ec1b3bd4ce4135a992f933b04c1f97ade6f5ab2b SHA512 b284114b05f85bdc2849588726c637229fe4cdefe1706bc37bc6def80e77d4d3cda68d6e268f0dc5da915b241d157e8a7f21bab2708f305b86de5706aaa78baa WHIRLPOOL ea5aaa0a7f25733d8a52b68b4b18ecb6109111de1e126755cefdf9870d26de2e8293e5d8a33cf65e3866905f288760bbb114aa4a8994515b112c16ff69809bfd
-EBUILD syncthing-0.14.38.ebuild 3607 SHA256 6901ccf02eca84c69a72ade9ec1b3bd4ce4135a992f933b04c1f97ade6f5ab2b SHA512 b284114b05f85bdc2849588726c637229fe4cdefe1706bc37bc6def80e77d4d3cda68d6e268f0dc5da915b241d157e8a7f21bab2708f305b86de5706aaa78baa WHIRLPOOL ea5aaa0a7f25733d8a52b68b4b18ecb6109111de1e126755cefdf9870d26de2e8293e5d8a33cf65e3866905f288760bbb114aa4a8994515b112c16ff69809bfd
+EBUILD syncthing-0.14.38.ebuild 3606 SHA256 a739a992e9ddab3286b9894b7a63c6564f9355f34e1d4064014e4483c8f1646e SHA512 938ed70df23ac18d3c96ca48fd27670c9c1d386877e3012ef9267582247bc7f2ebe8b036e0f913906d721b89fe8941177d931e8a7ee06fd12ab841e81f2d4cfd WHIRLPOOL 6a4b3519e3a927b110368b2814b2feddcee1a77510a8dcd0cb783558397af44a3af5a83bb928e8f5659f4e7620eb6f545d001ede17884a425c10ed0f5bb23b5e
 MISC ChangeLog 13264 SHA256 2e3ae89570dc2f95fa7d62fd713ec4d56cadf71bfe4d8b77fc68f96843b21da6 SHA512 451d42e235ab534be4fc93c84f632b2b861bcbcb111679f22b7bc279e08e72f2475d4f54d987dbc0466a9357b5ac1f0058330e1fbd464a25aa3755a6505db24b WHIRLPOOL 6b0051bb5d8dde5bbf8d62c3237e57bf2a7b9fb80e29b7c9fa45f57ae67b20687f85b6d54ca3aa864ba03c8a923a752c7fa7f87bf7a607508ae648486d666f5d
 MISC metadata.xml 869 SHA256 7f7c7164638ec1ce450031fd3a99efc7c8d16749bea972365d43b11e336ee457 SHA512 f58ce3a33241a316a81ba94318cd8fa1ea8a9954cd3721ae6f78f96df08b38a6ee5ea214483dc92aa4301a2252bc712a65c196da4c871962d76d17d5ba2b7238 WHIRLPOOL 0f5a6475810b8aa47fb7696ff4f20b9954552143a4612d292b7c6b3f764d63112eb71796e9d4e21266c67e49bccf8a07e145f6f0c1705179bdb0c108435bef8b
diff --git a/net-p2p/syncthing/syncthing-0.14.38.ebuild b/net-p2p/syncthing/syncthing-0.14.38.ebuild
index 27a867b3abad..d489d3489745 100644
--- a/net-p2p/syncthing/syncthing-0.14.38.ebuild
+++ b/net-p2p/syncthing/syncthing-0.14.38.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm"
+KEYWORDS="~amd64 ~arm x86"
 IUSE="selinux tools"
 
 RDEPEND="selinux? ( sec-policy/selinux-syncthing )"
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 0d560953a895..a9dea802cd2f 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -4,7 +4,7 @@ DIST cups-filters-1.16.4.tar.xz 1440964 SHA256 2642c6a3cbf10a38d91f20b7b292583d1
 DIST cups-filters-1.17.8.tar.xz 1455096 SHA256 9acefd72f8e6a6e5fb6e80d37aad8c712c326bf484afb735e8ff7d7b86975870 SHA512 01f4499fb1db456a1fb11b8e39b5de273229c7aa2f87d079e237501ccd70bf637ca5e15d19fb9f7930be700ab6958e1a597bda8d0970260b5e7577eb5447f797 WHIRLPOOL 2bfd485b053b33882cff8cff27b7db62a903be30f4597324326b8cf70d1e3ce75b1ee5c1712099ced498fb1267274032f20c85dddac0d4033dc98dfc34f435ff
 DIST cups-filters-1.17.9.tar.xz 1454068 SHA256 98ae3f8c8309ea950144e582d252e65f4636e8812832a982edd0ab83eddef544 SHA512 811d2671c660a2129c207d5d8daaa576b027ba14ac4cf4753d0e8c1190866a684e284f1e7439b864aaab332e429befbc13c567bf6c9fc1a502fe2cd7d11e5ed4 WHIRLPOOL 0b838e546bc505353a7e6294b536ddd3a68b767fa63495f289faa96f9196b2b345a75e611cf082d3c45976658be8eaad60ea5a11d57f7bff9f826b6f3a1835d7
 EBUILD cups-filters-1.13.5.ebuild 3277 SHA256 a33ffe542c3fb84f9e652262d1fc366fc8694f23facd116d7f0c2777594d1e60 SHA512 0a09a543209e460550b2fce7de17453c63c84a3b7e314a0ae82c85760f0b0dbe12b5768381466a5be4fa45af0f5fcaf3723b0d13a818d9ad96473d2e7a20b87b WHIRLPOOL 4f500493906d1b2730272aef6879337786082fb8bd964c5e60469a972557aa6480c980660e9d2588231d88bfebd2bd389d999016c1bf3327e1c9be6ec5422c0e
-EBUILD cups-filters-1.16.4.ebuild 3433 SHA256 b2371c3fe8ac0720f348a426684bbb7dd9125d4523fff77ac52f1fd4c6e0910b SHA512 8e0328861fb7484064d00ea664fda902e0fd255a6c51ff43f57267fa84e08bdb9bf5c6a274505ddab3717022dcf67030a6c97e43a205b56bbcc54eb876380603 WHIRLPOOL 41dfcd77134bd89b1597791b5049fa935cb748035a7ebcbbbabc596bab6c290126f36f2a7a5627399de1a806daf4175f9a494d7e839d35544e5f86fc9c875fef
+EBUILD cups-filters-1.16.4.ebuild 3432 SHA256 d3bf3ba9c13422b26ae1136c1f32e74750f440895c5b38eb8c3186b48dd8b5eb SHA512 4a69c596427cbca25b3549aeb2fa91733065f1fd7a30d236234633a9955998147614d53b2e7e8044c034f297b292a67d83ebdba603079223f4f8352b4d4c3049 WHIRLPOOL 23164ae3c382756ae623e084e8bd13df79434824ea40dd55e406d39d6667b2bd22a2803c8875e72441bd517f3a63c8915fead9d573015c9d230ccc4a6ede83d1
 EBUILD cups-filters-1.17.8.ebuild 3504 SHA256 6e8abc343b1ab58b8b5489038e2bcb7fffbe9efddb1e50eb0c80e8041911b536 SHA512 4eeff094b85dc861d817a58211fed3b812b9e8b7d73c2ffb2dd2245cfa53e325c0f8d7844b20580331f1d72c24f7d2e5bc2bb44e4385a83f7e2b466e30268a02 WHIRLPOOL d71a7b303a8e01a3f24f6222cfd9587b3ac0356b7323363b0fc713040644df7980af01f6fe6341a3fae86ec758530e78eb42e8ec9ccaedb85f77bf374dfbf18a
 EBUILD cups-filters-1.17.9.ebuild 3504 SHA256 6e8abc343b1ab58b8b5489038e2bcb7fffbe9efddb1e50eb0c80e8041911b536 SHA512 4eeff094b85dc861d817a58211fed3b812b9e8b7d73c2ffb2dd2245cfa53e325c0f8d7844b20580331f1d72c24f7d2e5bc2bb44e4385a83f7e2b466e30268a02 WHIRLPOOL d71a7b303a8e01a3f24f6222cfd9587b3ac0356b7323363b0fc713040644df7980af01f6fe6341a3fae86ec758530e78eb42e8ec9ccaedb85f77bf374dfbf18a
 EBUILD cups-filters-9999.ebuild 3504 SHA256 6e8abc343b1ab58b8b5489038e2bcb7fffbe9efddb1e50eb0c80e8041911b536 SHA512 4eeff094b85dc861d817a58211fed3b812b9e8b7d73c2ffb2dd2245cfa53e325c0f8d7844b20580331f1d72c24f7d2e5bc2bb44e4385a83f7e2b466e30268a02 WHIRLPOOL d71a7b303a8e01a3f24f6222cfd9587b3ac0356b7323363b0fc713040644df7980af01f6fe6341a3fae86ec758530e78eb42e8ec9ccaedb85f77bf374dfbf18a
diff --git a/net-print/cups-filters/cups-filters-1.16.4.ebuild b/net-print/cups-filters/cups-filters-1.16.4.ebuild
index b04d4aab8ff3..47c50dafb04b 100644
--- a/net-print/cups-filters/cups-filters-1.16.4.ebuild
+++ b/net-print/cups-filters/cups-filters-1.16.4.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
 else
 	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~m68k-mint"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~m68k-mint"
 fi
 DESCRIPTION="Cups filters"
 HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
diff --git a/net-print/hplip-plugin/Manifest b/net-print/hplip-plugin/Manifest
index 48592fab1b24..4957d3f2d433 100644
--- a/net-print/hplip-plugin/Manifest
+++ b/net-print/hplip-plugin/Manifest
@@ -1,6 +1,8 @@
 DIST hplip-3.16.3-plugin.run 2084271 SHA256 b7edef2a1c5c0a5e001deb4a18c0ef7202e653596e97144b8908ae093818070f SHA512 2ae8aeb40c2604a2c6b9725700f9addf7a82e819d603631158a5d5feac931248e53e7533178100df1fc12b0dc2340cb3ae0d85f145cd023a311f77bbe67e7c7f WHIRLPOOL 928117f862030eca9c3e5813eb8c4db66570923695b0c7af17df1992f339d2478f42af67ca0e0eb8cfa1d7425b522082fde3b8c829c3f5167e1ec503c95a986b
+DIST hplip-3.17.10-plugin.run 2062947 SHA256 2fd26f6d5b437a4f1aa9f560e816ce094aea73becdf2f2b976ef46406d1b551d SHA512 98eef413b122527c4a7860b621baf11c04ec9d7f4e43ce4f36e7822a633c64b3d98cbc86cd7d305c74d9a49a4159ebd7280d652e1ba430cad4cc70f66d23ee07 WHIRLPOOL d087e7f857f8bc0a7a0b4f44f07ca15feaff6847cd719a2cb48240dd3aca7df93932eef7a849598ad313b4373e9f50b61bf3c0846c64d1002f1cfd9470a27717
 DIST hplip-3.17.9-plugin.run 2059585 SHA256 98f717266340baa15e0385dc4928cc9c127a9403b72749f4899657cef8dfe883 SHA512 a7a9ee8b7edda3641b5c3aa403570aad72ce9cd42cdd4c64904a0be409cefa838712390c7f535482028ac2d494c711baef77f2f601835b01591fa673272c01ba WHIRLPOOL e6615652382d11ddbe646b793d1f5aff61872ab4f30925855be66faa4d8ebace113a43e369e1b4d199bb65d3bd0315de32cd49d264c52f6d47e7f17990f0263f
 EBUILD hplip-plugin-3.16.3.ebuild 1503 SHA256 feda237c7ac2e7f46407495a4800fb73ab098573fbcff03ee46944ad1bcb2e0c SHA512 1680865ff9741ffa1ca1bb0e6b55ad3b8427c3c0766a717dad082dbceee5f39545b5f7d9bbe28121579c946a260eb49799f720ea0005510e3908593b8904a2c3 WHIRLPOOL d5a999891f1c29b131a95c007e465300efe6427d69548896393c9e4affb8aaf806605dafc9a19b7571e2a5e274226dc3cae8c667741dee39cd4767ea85b86d99
+EBUILD hplip-plugin-3.17.10.ebuild 1623 SHA256 9172560f387cdda70faee2aad869d14eb7d2bc2d9fbdacae628c18c92931efa0 SHA512 7f8a8b4fe9845ad9a43669aaf2d5332053335db6a17e9d0eda8f881dcd53cceed837d1ffd4da273db461cd06d690a58fb080a20c8a87ba6061cc1ad1bd5b9060 WHIRLPOOL 8a39b66de7735fea710e8ece9e93b55198caeec1cf02a2e81641cc226b5531086969e318483534754e62f79a1f48462fcce76b78c8476047d860ffa327d7b703
 EBUILD hplip-plugin-3.17.9.ebuild 1623 SHA256 9172560f387cdda70faee2aad869d14eb7d2bc2d9fbdacae628c18c92931efa0 SHA512 7f8a8b4fe9845ad9a43669aaf2d5332053335db6a17e9d0eda8f881dcd53cceed837d1ffd4da273db461cd06d690a58fb080a20c8a87ba6061cc1ad1bd5b9060 WHIRLPOOL 8a39b66de7735fea710e8ece9e93b55198caeec1cf02a2e81641cc226b5531086969e318483534754e62f79a1f48462fcce76b78c8476047d860ffa327d7b703
 MISC ChangeLog 4207 SHA256 dba1c3d48453b6f15d38c4967ee9b15ffe22850630e584cafa36ea12da4a5e71 SHA512 4be1d86940dea35e1c89cd2c3067ad0c9c03b35b6df0cc7df0a243b0f389ac24b120057a8b9723c2855e6b8049c17eb8c9eef3727c9a55b598a24aaa720a1564 WHIRLPOOL 50e03b23716cbc460dfb7740681c021579e03f74cbf8ff73ba51028573514e681e7a15ed75e4f01df11badd9e507683183869c53113702126b916361fcad65b1
 MISC metadata.xml 334 SHA256 082d9160d1818ef495b10b1a852139c7204a5b902b2a6eda23263084d158620a SHA512 105a5442ba05b94b2886f9075bd89268d4f2e0567ad69a637a1bd7d7d0eafdc280dfdb198aab5d72525300a9be0d4ad78f6bfe6398c896cc9de0f591651d102c WHIRLPOOL 4097a8bf70b145b21a6b6306895a5262a4e59443bebc93234114b171555756afe9e0cf53efc036c53b849426fdb2086759b50533219278034abc3e75f9f329c1
diff --git a/net-print/hplip-plugin/hplip-plugin-3.17.10.ebuild b/net-print/hplip-plugin/hplip-plugin-3.17.10.ebuild
new file mode 100644
index 000000000000..8617df53c8dc
--- /dev/null
+++ b/net-print/hplip-plugin/hplip-plugin-3.17.10.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit udev unpacker
+
+DESCRIPTION="Proprietary plugins and firmware for HPLIP"
+HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
+#SRC_URI="http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/hplip-${PV}-plugin.run"
+SRC_URI="http://hplipopensource.com/hplip-web/plugin/hplip-${PV}-plugin.run"
+
+LICENSE="hplip-plugin"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	~net-print/hplip-${PV}
+	virtual/udev
+"
+DEPEND=""
+
+S=${WORKDIR}
+
+HPLIP_HOME=/usr/share/hplip
+
+# Binary prebuilt package
+QA_PRESTRIPPED="
+	/usr/share/hplip/fax/plugins/fax_marvell.so
+	/usr/share/hplip/prnt/plugins/hbpl1.so
+	/usr/share/hplip/prnt/plugins/lj.so
+	/usr/share/hplip/scan/plugins/bb_escl.so
+	/usr/share/hplip/scan/plugins/bb_marvell.so
+	/usr/share/hplip/scan/plugins/bb_soapht.so
+	/usr/share/hplip/scan/plugins/bb_soap.so
+"
+
+# License does not allow us to redistribute the "source" package
+RESTRICT="mirror"
+
+src_unpack() {
+	unpack_makeself "hplip-${PV}-plugin.run"
+}
+
+src_install() {
+	local hplip_arch=$(use amd64 && echo 'x86_64' || echo 'x86_32')
+
+	insinto "${HPLIP_HOME}"/data/firmware
+	doins *.fw.gz
+
+	for plugin in *-${hplip_arch}.so; do
+		local plugin_type=prnt
+		case "${plugin}" in
+			fax_*) plugin_type=fax ;;
+			bb_*)  plugin_type=scan ;;
+		esac
+
+		exeinto "${HPLIP_HOME}"/${plugin_type}/plugins
+		newexe ${plugin} ${plugin/-${hplip_arch}}
+	done
+
+	mkdir -p "${ED}/var/lib/hp/"
+	cat >> "${ED}/var/lib/hp/hplip.state" <<-_EOF_
+		[plugin]
+		installed = 1
+		eula = 1
+		version = ${PV}
+	_EOF_
+}
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 67eb7f29c4ae..bbb4395314c8 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,8 +1,10 @@
 DIST hplip-3.16.2-patches-1.tar.xz 8188 SHA256 8a9a78e0caac1731eae79f047a6054b411c237c579fdfd07bc59d435db708705 SHA512 7eb03c093cfb9ef6b9a980ef5520575310d080c45ed13191933a5facaf9bbb04b38c8381762a3ecd33884ad582830e61e17b6c17f2ed7cdf910670e05eed2510 WHIRLPOOL 6721eac17977485eae0cb22b1702d0479003e3639e806ecd3c5888f1b5015a0bf904512104ebefee4b3d5f64abebd0608090e00310ec8d5b48f210c7e4a95e4e
 DIST hplip-3.16.3.tar.gz 22408596 SHA256 42d2302ee38bda41caa0f2f9524a91f531e3aa432814ffd45b3e5c396dc30194 SHA512 32d2f88c0983208e77592f73bf65cf2900cd6aa234d09220a18b45b5fc4bd0d10e9cfc8c7a10639e5a51ad5f5d0f8ed7bd477d08c86b89c633a1bbcd42682915 WHIRLPOOL b287ecf80c2e7b0da0de0afefcf60c507f9d42c74dbba1e745b4b43f253a5b0dedb6398a1f073e14d196296da47764e983138c0151e05bfc7a5dd416458662a0
+DIST hplip-3.17.10.tar.gz 23878364 SHA256 0f7344174672f63a98a22f3c109005b6eb89fe738b7d466316bf2c53d083476c SHA512 0c1c78730d269ec41f95bbde887a490aebb4c9c3dcb9784052a1c3b537c12093cbc426e1f79266c63dd5e7adecdda0735b9bf964ddc1307b2c6603f3fa0462a8 WHIRLPOOL d8bffafedcfa40686d4e076c9a74af461a0ea29fec2a2effb5324fba8e60d9c85b13a0e8f73bfaf014ccb7bf4eb4e0d1eeffcdecc0efc4d1f31dd065d4093090
 DIST hplip-3.17.9-patches-1.tar.xz 8484 SHA256 2ec368039a59e375bebf565bd679dd3bedb1e0c1ecfc103c5dcf9bb2701ba9d7 SHA512 125f9cfd1c3cad662ce33954b8ab9ab1898368b449c4ad78dfe99f29de8025183773272b9865cd22b976a30c502e38254ce0ac59d685299dff7f9314927d546a WHIRLPOOL 2354bd3b158733b668c731ea3fd605170dd4cc0df5ffebc327a69ad33995ec02166d34897567ed69d608a62e97b33bd12fc0066acb6c302677cc68830a2661cf
 DIST hplip-3.17.9.tar.gz 23862533 SHA256 b2aad842f51dae7da2dd08d09ce2c27bc5f73c82a560b9494dd33589b0948678 SHA512 25508b91723be9564b9a7e8093159507a1a01a9e50e9e801f452f71c28cce0bddee2f5bf796214fa5752de8d1799fc6fe102779dabae0dbcba1f4de6b207c095 WHIRLPOOL df3bd0a8c4af9e7bf2a4ee534b317e84d89707587f770ab0c6ae98ccd5bea50d8be704ed2f855c9f67af8cdd34afc2ab0b07bd150f8861fc4900aa471a85b6ee
 EBUILD hplip-3.16.3.ebuild 7462 SHA256 b878478540933b2f1c3b855d2dd88dccd02d8f45559c55c0661a53e1d52f7729 SHA512 d85473a09df3afada1a1a45aae2490adfa7853a426e8f05f3b86db381c15cde6db952e22535241505932a1ed9187646a1bb89ce7ce96db6f2e6e49ee819e5ca3 WHIRLPOOL 2121b7385aaaee2dde3a24fb098669f78575eb829dcffa96bd7f07ec8875da68a0d1da119dc922ba0dcd287ba964c3d5de1cb43cfadbad1f713887c30d02e84c
+EBUILD hplip-3.17.10.ebuild 7400 SHA256 b18d117216f2fe51b0f8f3e22667835c001ad31d06019345637ced8d7aa80edc SHA512 237d4b6bb18c16a812d2fc100f71fc6a3848ff9e5077a5f7acd29cdb5e47f0f8bf5a175e045a10bfac0cf4e7fe4a59c0d7858dbe063740b1a308574a5404326e WHIRLPOOL b6fa6ae42f820ba8149205083e2ef18af471142d0adb3ffe4ad4df5f1ce8df4761f80f9bd68c52ee3c5fd354fb4c2fca9566b75a5195ac112e0dfad8a32d35a9
 EBUILD hplip-3.17.9-r1.ebuild 7400 SHA256 b18d117216f2fe51b0f8f3e22667835c001ad31d06019345637ced8d7aa80edc SHA512 237d4b6bb18c16a812d2fc100f71fc6a3848ff9e5077a5f7acd29cdb5e47f0f8bf5a175e045a10bfac0cf4e7fe4a59c0d7858dbe063740b1a308574a5404326e WHIRLPOOL b6fa6ae42f820ba8149205083e2ef18af471142d0adb3ffe4ad4df5f1ce8df4761f80f9bd68c52ee3c5fd354fb4c2fca9566b75a5195ac112e0dfad8a32d35a9
 MISC ChangeLog 10553 SHA256 478b5142e0cb6d90ed824076a36fc23072d79f259a51ee996c627ab5fe3db088 SHA512 d7dba727b6b20f1898f45d522825f2f0f290242c026380dfbd8f21c9fc13513325e5d068f8ea68966a2a2e5f177a72e356ce7b78f0d954988a72a4b1d45b4052 WHIRLPOOL 20517487b3fa070f441362ce9fce49adf6f747b5433f888b01dd5ff490f0ea9e6f54e389b4e85497cc70c2cb6f007be20326b73395a6a3ff1c6b11f3e89363e8
 MISC ChangeLog-2015 54819 SHA256 554474d3a1d6d3526536b50eb23527cd6747f93ac62bc41609172c7786106c25 SHA512 575bbc609adada123e29a9f311603d8e9c277ef2ad288ff2f85e97e12214eea3ad4c4e18e8d82a6493d12365f3af865a43e7b69da5bdfa2879a11d58b4c079de WHIRLPOOL 7bfc750377d8f3777a212398bee212671b72676588a5b3423212c7f95f061ff07d4330187a6f1a3530df7aedcb6c0ab1f1702e742c87979ec143daad9c348626
diff --git a/net-print/hplip/hplip-3.17.10.ebuild b/net-print/hplip/hplip-3.17.10.ebuild
new file mode 100644
index 000000000000..12247e7fa678
--- /dev/null
+++ b/net-print/hplip/hplip-3.17.10.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2017 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} )
+PYTHON_REQ_USE="threads,xml"
+
+inherit autotools linux-info python-single-r1 readme.gentoo-r1 udev
+
+DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
+HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
+SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
+		https://dev.gentoo.org/~billie/distfiles/${PN}-3.17.9-patches-1.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+IUSE="doc fax +hpcups hpijs kde libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
+
+# dependency on dev-python/notify-python dropped due to python 3 incompatibility
+# possible replacement notify2 (https://pypi.python.org/pypi/notify2/0.3) not in tree
+
+COMMON_DEPEND="
+	net-print/cups
+	virtual/jpeg:0
+	hpijs? ( net-print/cups-filters[foomatic] )
+	!minimal? (
+		${PYTHON_DEPS}
+		sys-apps/dbus
+		!libusb0? ( virtual/libusb:1 )
+		libusb0? ( virtual/libusb:0 )
+		scanner? ( media-gfx/sane-backends )
+		snmp? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+			net-analyzer/net-snmp
+		)
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	app-text/ghostscript-gpl
+	!minimal? (
+		>=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_USEDEP}]' 'python2*')
+		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')
+		fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )
+		kernel_linux? ( virtual/udev )
+		qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}] )
+		scanner? (
+			>=dev-python/reportlab-3.2[${PYTHON_USEDEP}]
+			>=dev-python/pillow-3.1.1[${PYTHON_USEDEP}]
+			X? ( || (
+				kde? ( kde-misc/skanlite )
+				media-gfx/xsane
+				media-gfx/sane-frontends
+			) )
+		)
+	)
+	policykit? ( sys-auth/polkit )
+"
+
+REQUIRED_USE="!minimal? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${WORKDIR}/patches"
+)
+
+CONFIG_CHECK="~PARPORT ~PPDEV"
+ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
+
+#DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+For more information on setting up your printer please take
+a look at the hplip section of the gentoo printing guide:
+https://wiki.gentoo.org/wiki/Printing
+
+Any user who wants to print must be in the lp group.
+"
+
+pkg_setup() {
+	use !minimal && python-single-r1_pkg_setup
+
+	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
+
+	if ! use hpcups && ! use hpijs ; then
+		ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
+		ewarn "which is probably not what you want."
+		ewarn "You will almost certainly not be able to print."
+	fi
+
+	if use minimal ; then
+		ewarn "Installing driver portions only, make sure you know what you are doing."
+		ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
+		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
+	else
+		use parport && linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_fix_shebang .
+	fi
+
+	# Make desktop files follow the specification
+	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Encoding=.*/d' hplip.desktop.in || die
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Version=.*/d' \
+		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
+
+	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
+	# https://bugs.launchpad.net/hplip/+bug/500086
+	local udevdir=$(get_udevdir)
+	sed -i -e "s|/etc/udev|${udevdir}|g" \
+		$(find . -type f -exec grep -l /etc/udev {} +) || die
+
+	# Force recognition of Gentoo distro by hp-check
+	sed -i \
+		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
+		installer/core_install.py || die
+
+	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+	# The hpcups driver does not use foomatic-rip
+	local i
+	for i in ppd/hpijs/*.ppd.gz ; do
+		rm -f ${i}.temp || die
+		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+			gzip > ${i}.temp || die
+		mv ${i}.temp ${i} || die
+	done
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf drv_build minimal_build
+
+	if use libusb0 ; then
+		myconf="${myconf} --enable-libusb01_build"
+	else
+		myconf="${myconf} --disable-libusb01_build"
+	fi
+
+	if use hpcups ; then
+		drv_build="$(use_enable hpcups hpcups-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-cups-ppd-install"
+			drv_build="${drv_build} --disable-cups-drv-install"
+		else
+			drv_build="${drv_build} --enable-cups-drv-install"
+			drv_build="${drv_build} --disable-cups-ppd-install"
+		fi
+	else
+		drv_build="--disable-hpcups-install"
+		drv_build="${drv_build} --disable-cups-drv-install"
+		drv_build="${drv_build} --disable-cups-ppd-install"
+	fi
+
+	if use hpijs ; then
+		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-foomatic-ppd-install"
+			drv_build="${drv_build} --disable-foomatic-drv-install"
+		else
+			drv_build="${drv_build} --enable-foomatic-drv-install"
+			drv_build="${drv_build} --disable-foomatic-ppd-install"
+		fi
+	else
+		drv_build="${drv_build} --disable-hpijs-install"
+		drv_build="${drv_build} --disable-foomatic-drv-install"
+		drv_build="${drv_build} --disable-foomatic-ppd-install"
+	fi
+
+	if use minimal ; then
+		if use hpijs ; then
+			minimal_build="--enable-hpijs-only-build"
+		else
+			minimal_build="--disable-hpijs-only-build"
+		fi
+		if use hpcups ; then
+			minimal_build="${minimal_build} --enable-hpcups-only-build"
+		else
+			minimal_build="${minimal_build} --disable-hpcups-only-build"
+		fi
+	fi
+
+	econf \
+		--disable-cups11-build \
+		--disable-lite-build \
+		--disable-foomatic-rip-hplip-install \
+		--disable-shadow-build \
+		--disable-qt3 \
+		--disable-qt4 \
+		--disable-udev_sysfs_rules \
+		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
+		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-htmldir=/usr/share/doc/${PF}/html \
+		${myconf} \
+		${drv_build} \
+		${minimal_build} \
+		$(use_enable doc doc-build) \
+		$(use_enable fax fax-build) \
+		$(use_enable !minimal gui-build) \
+		$(use_enable !minimal dbus-build) \
+		$(use_enable parport pp-build) \
+		$(use_enable policykit) \
+		$(use_enable qt5) \
+		$(use_enable scanner scan-build) \
+		$(use_enable snmp network-build)
+}
+
+src_install() {
+	# disable parallel install
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=578018
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
+	# default
+
+	# Installed by sane-backends
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
+	rm -f "${ED%/}"/etc/sane.d/dll.conf || die
+
+	rm -f "${ED%/}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
+	rmdir --ignore-fail-on-non-empty "${ED%/}"/usr/share/doc/${PF}/ || die
+
+	# Remove hal fdi files
+	rm -rf "${ED%/}"/usr/share/hal || die
+
+	find "${D}" -name '*.la' -delete || die
+
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_optimize "${ED%/}"/usr/share/hplip
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest
index c467920a9012..0d20aad00a8f 100644
--- a/net-vpn/libreswan/Manifest
+++ b/net-vpn/libreswan/Manifest
@@ -1,7 +1,5 @@
-DIST libreswan-3.18.tar.gz 8766228 SHA256 2ff61178913287567ed2736287df47e7f9a822ddcded967f3af5f03e95b5f17d SHA512 dfc831ae82814a26cac2eb7c8bef4385d8aebb1e62c63f31e0997d49fc6bbcc6e4e2bcd0e07d5c0c1347e5eaca5f6eb1fba98395bc882ab0fddb804a524b57f8 WHIRLPOOL 73ce41988d62d6702837d9ba6c2e123aad678b6d983711e6e5d3a60046bdbf2a37d8f650a8e4ffff24c551a27d50ecbef322bc40a083b852a142b2a5bcda2726
 DIST libreswan-3.20.tar.gz 8898915 SHA256 2f0931c11ea0b9303ce1e4ee76ffe9db6f3bd70ceead51fe4ec11e2f40a9ae2e SHA512 89f562412d03e0e9af1bceeda18ab73a749046c37e05dab719468cb537e16803a3b270781de9de88416b2d63b7b0fd85df0c593ca59c30ba3d681526f272fc93 WHIRLPOOL d5ad79f73cbeab90c1ef68a20e1f5205ecc94b37c64e681856fcec4b67aecf6b95733410c2f859410c876c162280f6ea5cb1b264d484861655a38dce51323c18
 DIST libreswan-3.21.tar.gz 8945666 SHA256 80d09792d27951fb8ba04e41542d4bc3b31d7a15c2b185f2c48f79a454b30d7c SHA512 f1ef002b3e0869920edfebfc8efd73d9a9f84f64a77ad4832f46b12dfdd3c31cdf48c1473522b63f155058592c46af05995756af5440ca3e9c0fa5207436e0fc WHIRLPOOL b5b081121b296ab7381670491d9a35ca5ef1ba456e830b3207f717a86e2ea89ff1c8ee32dfec7618efbb8b19dbd9059309fcec3a9d59c9080086ec826c420b44
-EBUILD libreswan-3.18.ebuild 2451 SHA256 0a53e2d6f4ba6acbff55075f71a8bd6d83ca50e4a1091fcfb40879fbea743bc0 SHA512 775adf6b6c2ade388cdb2882ca6069448ee57888992c3234b1f4be9c3b8b5e653f77fdc38a1b63f2066ce386b5a762464fbff1ff1d06a70ec42abfaf840bac1d WHIRLPOOL 457929ff0424c02be83e11fa4c5864db70c65caa4aaed4656b8b9030b34474563cb95bd44b05cc098ad1c90b07b4a745f9e39471e5012fa6b51535e052ec8a60
 EBUILD libreswan-3.20.ebuild 2336 SHA256 f589c8cfd86154d958a9c748296d786c57e64312431b0526bd6292b2dd8beceb SHA512 4c6ecfb7ebcf4d7e27edab37079a84ae0a39b0bf5a6f0b44b194e960c98caccc52d54f51e1a36a39899ea1ce5295561d1f6aa4a66c416c220d1c4e9d083e740d WHIRLPOOL eee80a13cc61f13f7764ec7045ef9d37dda12f0e70139c9d72a3c28cbcbe863a5de594c73af1a918052e54e71f182905054d9adfec84390525b6c47d73551e0b
 EBUILD libreswan-3.21.ebuild 2570 SHA256 45b159f5391ae053f19ec3436a3c534d371781047e670295c900eaac7e3de102 SHA512 0b646ff5e9658ff114ced0eb168eaf30039ece88e2570e82de4943ccf6414f84170617bfe7127e5187e557139167088cb7d7c8d825349a839092eac6d7eade44 WHIRLPOOL 1db495528fb63d602da63be45856dc0268bef792810d64e3a7d8ba238a17652fd60dad0777ea5da726b308cf6b0dddec661bb9980173b70fae41b680bcb00884
 MISC metadata.xml 319 SHA256 f9f78f03580a597eedf2de4f220ee6b1e052a536359463b6dbd75836f82ba926 SHA512 924161f15c0f7a9666a6d7a422b45da679190e1a0f2859b997ddd753cbf49df9da337e5420040210736f76fa712dca3ec8862480f62bd321de71e74bee7c0865 WHIRLPOOL d67152030c351a145afe67484854ced512c7c2aba2a6474a88b0aa67ab0fe6c0c316c29544f295c8b22ef001acc2c61a3fa9fb57e08b06cfb144afcff04f75a0
diff --git a/net-vpn/libreswan/libreswan-3.18.ebuild b/net-vpn/libreswan/libreswan-3.18.ebuild
deleted file mode 100644
index c7115661250f..000000000000
--- a/net-vpn/libreswan/libreswan-3.18.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd toolchain-funcs
-
-if [[ ${PV} != 9999 ]]; then
-	SRC_URI="https://download.libreswan.org/${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/libreswan/libreswan.git"
-fi
-
-DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
-HOMEPAGE="https://libreswan.org/"
-
-LICENSE="GPL-2 BSD-4 RSA DES"
-SLOT="0"
-IUSE="caps curl dnssec ldap pam systemd"
-
-COMMON_DEPEND="
-	dev-libs/gmp:0=
-	dev-libs/libevent:0=
-	dev-libs/nspr
-	caps? ( sys-libs/libcap-ng )
-	curl? ( net-misc/curl )
-	dnssec? ( net-dns/unbound net-libs/ldns )
-	ldap? ( net-nds/openldap )
-	pam? ( sys-libs/pam )
-	systemd? ( sys-apps/systemd:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/xmlto
-	dev-libs/nss
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-libs/nss[utils(+)]
-	sys-apps/iproute2
-	!net-misc/openswan
-	!net-vpn/strongswan
-"
-
-usetf() {
-	usex "$1" true false
-}
-
-src_prepare() {
-	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
-	default
-}
-
-src_configure() {
-	tc-export AR CC
-	export INC_USRLOCAL=/usr
-	export INC_MANDIR=share/man
-	export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
-	export FINALDOCDIR=/usr/share/doc/${PF}/html
-	export INITSYSTEM=openrc
-	export INC_RCDIRS=
-	export INC_RCDEFAULT=/etc/init.d
-	export USERCOMPILE=
-	export USERLINK=
-	export USE_DNSSEC=$(usetf dnssec)
-	export USE_LIBCAP_NG=$(usetf caps)
-	export USE_LIBCURL=$(usetf curl)
-	export USE_LDAP=$(usetf ldap)
-	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
-	export SD_WATCHDOGSEC=$(usex systemd 200 0)
-	export USE_XAUTHPAM=$(usetf pam)
-	export DEBUG_CFLAGS=
-	export OPTIMIZE_CFLAGS=
-	export WERROR_CFLAGS=
-}
-
-src_compile() {
-	emake all
-	emake -C initsystems INITSYSTEM=systemd UNITDIR="$(systemd_get_systemunitdir)" all
-}
-
-src_install() {
-	default
-	emake -C initsystems INITSYSTEM=systemd UNITDIR="$(systemd_get_systemunitdir)" DESTDIR="${D}" install
-
-	echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
-	fperms 0600 /etc/ipsec.secrets
-
-	dodoc -r docs
-
-	find "${D}" -type d -empty -delete || die
-}
-
-pkg_postinst() {
-	local IPSEC_CONFDIR=${ROOT%/}/etc/ipsec.d
-	if [[ ! -f ${IPSEC_CONFDIR}/cert8.db ]]; then
-		ebegin "Setting up NSS database in ${IPSEC_CONFDIR}"
-		certutil -N -d "${IPSEC_CONFDIR}" -f <(echo)
-		eend $?
-	fi
-}
diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest
index 29afbcbdae48..e79ea8081a54 100644
--- a/net-vpn/openvpn/Manifest
+++ b/net-vpn/openvpn/Manifest
@@ -8,6 +8,6 @@ DIST openvpn-2.4.3.tar.gz 1422692 SHA256 cee3d3ca462960a50a67c0ebd186e01b6d13db7
 DIST openvpn-2.4.4.tar.gz 1390194 SHA256 1ae883d9522c9fa6d189e5e4aaa058a93edd3d0b897e3c2664107c4785099fc3 SHA512 3c3cb77397569e21c5af52b065b081714ce53e2dd0b890c881de8e57220dc23d97cd61eaf5a6bf8e5e89186414c4c93da22a3ab65f4b61f80b04d862b4116e76 WHIRLPOOL d9ed3e499a6e2baf9c74d7ee11931c21744a3d1a5d50c48504247f118a35560409bd53302c2d2482b105847485aff3426f55e6ec0a5dfd9a4f79186b40014c7a
 EBUILD openvpn-2.4.3-r1.ebuild 4689 SHA256 d8a3a1ef1843b6ade6a7a748079e86b4b8aa79d5e843205cab283ea7c2a31e26 SHA512 fb0d83acce76eb3602332df7a618c5073765055819341d1372ed034d4f31b93abbca0615767ae50c2064e3210c9e5d6fa51ca727328b403cab63fa2c9792b83e WHIRLPOOL d3efe27a6e7a1f2f82d662d4f14fd37411cc59b38a78c8f270106f42ebed05ae2da5379f5228c6e24a18b6700500ba211110b85e73e986c1ba3cb4631c86d4a5
 EBUILD openvpn-2.4.3.ebuild 4611 SHA256 152ea1894e39b9a290affe877510113b53c1e8e51e6e8d03851b2489ea7c76a8 SHA512 3a7b7c93df95922eb9d6deb383a63521a5daea9490e90285dc5bd419af0afa484b55c836a41d528462b7301698d7c6c2cfe63b3eea7bfffcf990b7308dd43d17 WHIRLPOOL 29b21e8a81c91b83677906fc3879c24b2ce89e0697a17e2a25969d39401cdb337662d8d4eb5da70cf82bea0edce2896e6ee0e428ef0191402e8ed73e778bbcb0
-EBUILD openvpn-2.4.4.ebuild 4682 SHA256 89898e147e5205687dd422d0d1af69c5813b7997457823a1d3f82189ff534de7 SHA512 e31d6cf498af89736bf2ec88bb3928b6eeaca26865229fbb054cfb220fc9797c0e810045513fb8b223d6adb6c168ccdcc38c2c49611f1045318029caa552a076 WHIRLPOOL cf2150b8840bcd6fdc2559699bc7aa2513cf3bb51df1da5461ff36b55219c9002598050d014536e77f4555f75e189f63dc20df9d027f395d7e421a4b3fd7569b
+EBUILD openvpn-2.4.4.ebuild 4681 SHA256 515650632b78f9bf23fd645e2e7b556cc2139f68245eafea21b200f1c2bb5950 SHA512 c084b89de2eb760483079ae39c922641640df5b2e5f9951881f587ff9d8e3ceb903fd52d9a06a5b7bb79aa701d229b2f065459ec6ea5d3ae3ce5a90c890c1be7 WHIRLPOOL 44e69674013274486e45c141597b8d0321ac20788957ffede7055b9655ac009d53b9ab150ae883f4fba9ac0a1b27d96e78f9e17699f5056136593e3e60b66950
 EBUILD openvpn-9999.ebuild 4473 SHA256 83ed9e44b86ae9200406ee251d76f36493e7cfaec4c051bfbc2c95f8367b2135 SHA512 700392c91522915cb00d9282eb7f53f237b40d78c3d5702dfccd6255e86b7b1a86355fdc45902fcba572cbcbf5ee87239b0b4197557934413884b633b7fdc4fa WHIRLPOOL 89643cd3ffe5111e7dbf52839adffd87cd1a6c5cc90d26c0809c51f9ae2fc2fda9f2c0637c8f3fbf961317d90d1415a5a6e5d4bf7f526848f3116e4d700a9e0b
 MISC metadata.xml 1157 SHA256 667929a10db854b014d33be01fead67aa94176400e35b035db5aaa2859a693e0 SHA512 1408231f0a3d66a762af5482d3e67a2d9e950fd4ef456d9dce45943e21b34eb8178c8085d198fa3ea726f0718c4b1a2a0f94798ee9ef51958807dc305e65c882 WHIRLPOOL 81cd37f460b8295bb6d050f4ecf363378d4434c88c32ffa4919db5b5fe906962887d08744def990dc63882a7486221e378cd54d5d57379868076dcf47aa62ba0
diff --git a/net-vpn/openvpn/openvpn-2.4.4.ebuild b/net-vpn/openvpn/openvpn-2.4.4.ebuild
index 2c174faa4152..c959b3f1fa11 100644
--- a/net-vpn/openvpn/openvpn-2.4.4.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://openvpn.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos"
 
 IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
 IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD"
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index a0fe8163fbaa..e0a8e36567e9 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -6,11 +6,13 @@ AUX tor.initd-r8 953 SHA256 b637006715ab1cb0b321dc9e703b1dcaf61878c13134669eabeb
 AUX tor.service 479 SHA256 647572301c444896c6958af4481f443e39f7232f0ad919e4a154a27733aae709 SHA512 5eab6d99bc9210546b750596e6b660904a098868a07d4df41e14e39586a12965cbed94e7bda2bf315472fd40b4df4f68f1a8393c12e085524b80e02e26de9c14 WHIRLPOOL bf23275b4a847e5a806d7052b17ac9bbbc6c16e23a9add351bc6f7ee3afde844914ed0505fcadd3b15bcf2519fc7a352cb09d2e46cebec19b88ba7ece3c3835d
 AUX torrc-r1 140 SHA256 6766943a69e4784d02f173b5d74b8eb9345f878ef4eb36edab34bbf649ef2738 SHA512 6e3c481b34f2cb6f48bf87fe10565daded00415cc233332d43e18206d46eb7b32f92c55035584b5992e7a056e79e862124a573a9724f7762f76d4c4f0824de82 WHIRLPOOL 14a0e40219457b3ea26113fca561db338fb7324c20fee3b30287315974975001fab3cd3272932a1325e8dc9a227e0242bedf9fb424e2c5db755112f3fdeb815d
 DIST tor-0.3.0.10.tar.gz 5845205 SHA256 9a8e6e49a1688dae64dca10f84a414ec9a4f393fb2256ae28e0c2e3239185ab1 SHA512 e39d56afb6a10194303483552f28f07e5d7b7c5d470de554d92723c8d3c0d5d5a98fc44d23aa9d51bfda51e7d7cbb48fc4d1e3ac82150aeb4ce3e1616695225a WHIRLPOOL 21a2fa2337a3e06a03413a38a593984e384fa4b56c77f7bf7674d5ffa82b158d7a6433349b974e4c0ce2146bc99a5ea332980eb21a8428057f575ac5b2a3db8c
-DIST tor-0.3.0.11.tar.gz 5875170 SHA256 2a5c07140ed1b4692e6b5aa21e6ce56c6eb0baf86371d85a6c9e809ee7ec50c2 SHA512 af14e3dd4980803dc21537eee1a4b13360e13b3ba9fbaa18b0757746deced8cdb296a90d52cf0fbc883e81ddb034c8c08ed77808459c2e2a2f13f834b9b8afca WHIRLPOOL 4e4af96d8da6dae0a9aeebc1bfba9f35aad915dc23623f95c3797a2b0035281c3cb8f57fdfd46e62bdbbce4f5ee7ab1a46e0d041f47b18abb8c2a65a544f10c5
+DIST tor-0.3.0.12.tar.gz 5892571 SHA256 791115f5e17cacbf86a5093ec66774612e235e08186c77effe2d66edf645fc1d SHA512 975a3aa07ca8f51206db3d50f56ed49ea856c466a831fcd0f5d0068455f7d4ebf445015c2a78d2cb8dcdb36278fcd7d16dc4651b5ae0f271bcf8e5474dffc4a5 WHIRLPOOL d57770c5b278e69e0d3d5373f2c43a2ab957e8f90a48114093003b8f1fdd600e6289dbb0b0096b4bbf80331b0f16e772c598d1830a2518c2fda6b87c94614b08
 DIST tor-0.3.1.7.tar.gz 6058284 SHA256 1df5dd4894bb2f5e0dc96c466955146353cf33ac50cd997cfc1b28ea3ed9c08f SHA512 a835526984187fad88cffc39ea8f6a4b61d5f8d2579b5a66425612607a22ff82e0f9da96e029e134e04d25ae0f59a1b4f771e9e8c19ebb563e1a0f5b3a3849e4 WHIRLPOOL 83aaf33aeaa41d165fd11937fea30fe9cd5a7191aa2a0d801b0dcb2533f6beaefa2fc47356127310d84e7eaf9990e0d264992726416b5129272bdce8cfb75714
-DIST tor-0.3.2.2-alpha.tar.gz 6257177 SHA256 948f82246370eadf2d52a5d1797fa8966e5238d28de5ec69120407f22d59e774 SHA512 07c8937115df16bf67c765e66920ea11ba222caa70897ab3a96db55f415a3d7bbc88acc3385ac4195a61ba902ae1ca86d8ddfaca652b44bfada5949f9620a665 WHIRLPOOL 65bac7bc9ccace3ab223b6011a404eccc730e7750e553362160ea9a8fe7cf6aabbe98afe33fe43c69af9de827812eb2f071366fd72e90260ce058653f6121784
+DIST tor-0.3.1.8.tar.gz 6073611 SHA256 7df6298860a59f410ff8829cf7905a50c8b3a9094d51a8553603b401e4b5b1a1 SHA512 0c2d5f6e444815f0812b0f8bb2102f2013c890375cf20b62025d0704e8ee7742bbf7173764795e3e63606a47d0695a5a982c318c55a30ca50600eb6de5b94b16 WHIRLPOOL 5114fd6028b72483ca2769ed55685f9c70822021dd6a89016c276938fefafdef5ae457e946d7609b0eaa12caeddbe9f23c0ccd4b0cb7a40e484410f30186e00d
+DIST tor-0.3.2.3-alpha.tar.gz 6277836 SHA256 1440a4bf6d52cb9831991af6ae7a0fc1c152af59108c9dff6b036e70e3641d19 SHA512 9a122a6673d8dbd4387e601734e8aa7dece7c48c2fae15124e9d619fbef4eb66d9fd6a8698df56dde1c4e4f50606baa01e1ed315d190b513ec508888f7cb2132 WHIRLPOOL ec3799b4d95e8261854bd3078daca15a9a94866b3a350a26e28201b91ca3c1640b2bc2f4537c140bdac005e96a53b97ab17e0770359709b1a03d238ec9934bef
 EBUILD tor-0.3.0.10.ebuild 1837 SHA256 844d165beced6f252ef18aec5a6d94daf00891d91d2562df8e25f4d52bc56467 SHA512 33826b8bfbafcacd58bd471ef7f6c23de461632cf6e3e1f6903755115c1952f90202045694b5fdf5dad6ca1f30359a95630ff3494382d8ce108aed611ec806e4 WHIRLPOOL e32dc9cb25853ca0bfb99caa88ed071a4257a04ec138e80622cb076d5ef53148c5bb7f58868a2c570afc0c512e7435245f488e2302d0008fd56e35ebc28c0504
-EBUILD tor-0.3.0.11.ebuild 1842 SHA256 c20b8200b67e8a355ffd33e6488881bc4206bb27ff8e6d5a131bec032537bf6a SHA512 3b7200a2ec7588b31e471785ef6699b38ed3ffba38b3c0322354b78f4d6401023cd9b5940cd8627800d66ba157729c8424b6d9cad224ab40eec737648bf4c629 WHIRLPOOL 837383956471040f4d979325c70ee93b9aa9afa04367f07e66d73f9500793be7ee9b6967d4c62a7303a3500f753f3314b24c4a0473a707b012f6b46299d8fbc0
-EBUILD tor-0.3.1.7.ebuild 2039 SHA256 40986de035a68851aeb773ee72984d7a9a49c957540f47579dad6d0f72b6dd21 SHA512 6316c8438410513140f325973ef7980d74e66e5adad7b2410864c50c95330e059093d6a9be82e6bd51c897a70f4265dbc73d9f14aaf86db8e0fa5eb9c25d6e13 WHIRLPOOL e89b6f62f5eec1f7f8d2a72e01a2e343b0c6072c12a4b09d1873a01a11c44e5e586017a80f0d4bf204d5845a6a32915373213845732e80b55b5fd4e85c0e98fc
-EBUILD tor-0.3.2.2_alpha.ebuild 2042 SHA256 eb1ef06945a972812a5bb980c55500c5899c0b1ce9371539f0503f8d96cab828 SHA512 74e764c2eba7080ce341ed83a662b01d0cfc36f8966e37fb3e3b424f8c44b736db7f359386251ca8167d2958318f67d2eda2e1e4065a365f8723a3cf8752a1cf WHIRLPOOL 9456854515bd06434d6f4290e30ea4267da05930715b5e9525120ba306f768029341b3f804f20144e30c1a1f8f197a0297fec7c54854a9c558af99fcff5b1f92
+EBUILD tor-0.3.0.12.ebuild 1842 SHA256 c20b8200b67e8a355ffd33e6488881bc4206bb27ff8e6d5a131bec032537bf6a SHA512 3b7200a2ec7588b31e471785ef6699b38ed3ffba38b3c0322354b78f4d6401023cd9b5940cd8627800d66ba157729c8424b6d9cad224ab40eec737648bf4c629 WHIRLPOOL 837383956471040f4d979325c70ee93b9aa9afa04367f07e66d73f9500793be7ee9b6967d4c62a7303a3500f753f3314b24c4a0473a707b012f6b46299d8fbc0
+EBUILD tor-0.3.1.7.ebuild 2037 SHA256 d01da76fea1c5317e953a0923d3e2b5d712754f5e772fac23cbf1f2af6cd9e98 SHA512 efcb53f76c91cf9cd2403025a3290b170f58f0f03cb62fb2dc82a0e0ec55d263d9757b4cf80a825690b6276a01223091d7f6bc2f4d358ad778a82dac987ac56c WHIRLPOOL 7ff57bebf8c8fb8b355cee15079d2324e0ca3b9b6ff46342a43c8964d2f08bd91ee987d741cefecd80170ee01164130af097a816819473c5823dcf29224dfca1
+EBUILD tor-0.3.1.8.ebuild 2042 SHA256 eb1ef06945a972812a5bb980c55500c5899c0b1ce9371539f0503f8d96cab828 SHA512 74e764c2eba7080ce341ed83a662b01d0cfc36f8966e37fb3e3b424f8c44b736db7f359386251ca8167d2958318f67d2eda2e1e4065a365f8723a3cf8752a1cf WHIRLPOOL 9456854515bd06434d6f4290e30ea4267da05930715b5e9525120ba306f768029341b3f804f20144e30c1a1f8f197a0297fec7c54854a9c558af99fcff5b1f92
+EBUILD tor-0.3.2.3_alpha.ebuild 2042 SHA256 eb1ef06945a972812a5bb980c55500c5899c0b1ce9371539f0503f8d96cab828 SHA512 74e764c2eba7080ce341ed83a662b01d0cfc36f8966e37fb3e3b424f8c44b736db7f359386251ca8167d2958318f67d2eda2e1e4065a365f8723a3cf8752a1cf WHIRLPOOL 9456854515bd06434d6f4290e30ea4267da05930715b5e9525120ba306f768029341b3f804f20144e30c1a1f8f197a0297fec7c54854a9c558af99fcff5b1f92
 MISC metadata.xml 594 SHA256 43de427c78833193e0154a8072d904ab5b67bf7b1a664eb4ebb0081d51c9ceec SHA512 011f77654a507d13c0542e6983df8ec86c5f2cff7cd1408f99c9d4da9d00ffb4b432317b2fd21500e62131e6f7c9bc60235cf55f2b8082391b9fe3bcf924ab2b WHIRLPOOL 71b3006ef28544f47988f65ec05a1954b8c5d1ce5425e943db87fb69273e18bbc7894dc96e8398823dd0b9a092fded0b89892fca7d775c1382ee5d91853c165c
diff --git a/net-vpn/tor/tor-0.3.0.11.ebuild b/net-vpn/tor/tor-0.3.0.12.ebuild
index b103e82a8aed..b103e82a8aed 100644
--- a/net-vpn/tor/tor-0.3.0.11.ebuild
+++ b/net-vpn/tor/tor-0.3.0.12.ebuild
diff --git a/net-vpn/tor/tor-0.3.1.7.ebuild b/net-vpn/tor/tor-0.3.1.7.ebuild
index 9024085a6526..55c84d5df6f4 100644
--- a/net-vpn/tor/tor-0.3.1.7.ebuild
+++ b/net-vpn/tor/tor-0.3.1.7.ebuild
@@ -17,7 +17,7 @@ LICENSE="BSD GPL-2"
 SLOT="0"
 # We need to keyword app-arch/zstd
 #KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
-KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 x86 ~ppc-macos"
+KEYWORDS="amd64 arm ~mips ppc ppc64 x86 ~ppc-macos"
 IUSE="libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd"
 
 DEPEND="
diff --git a/net-vpn/tor/tor-0.3.2.2_alpha.ebuild b/net-vpn/tor/tor-0.3.1.8.ebuild
index 2e54066d6ba5..2e54066d6ba5 100644
--- a/net-vpn/tor/tor-0.3.2.2_alpha.ebuild
+++ b/net-vpn/tor/tor-0.3.1.8.ebuild
diff --git a/net-vpn/tor/tor-0.3.2.3_alpha.ebuild b/net-vpn/tor/tor-0.3.2.3_alpha.ebuild
new file mode 100644
index 000000000000..2e54066d6ba5
--- /dev/null
+++ b/net-vpn/tor/tor-0.3.2.3_alpha.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic readme.gentoo-r1 systemd versionator user
+
+MY_PV="$(replace_version_separator 4 -)"
+MY_PF="${PN}-${MY_PV}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/"
+SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
+	https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"
+S="${WORKDIR}/${MY_PF}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+# We need to keyword app-arch/zstd
+#KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
+IUSE="libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd"
+
+DEPEND="
+	app-text/asciidoc
+	dev-libs/libevent[ssl]
+	sys-libs/zlib
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	lzma? ( app-arch/xz-utils )
+	scrypt? ( app-crypt/libscrypt )
+	seccomp? ( sys-libs/libseccomp )
+	systemd? ( sys-apps/systemd )
+	zstd? ( app-arch/zstd )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-tor )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
+)
+
+DOCS=( README ChangeLog ReleaseNotes doc/HACKING )
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		--enable-system-torrc \
+		--enable-asciidoc \
+		--disable-libfuzzer \
+		--disable-rust \
+		$(use_enable scrypt libscrypt) \
+		$(use_enable seccomp) \
+		$(use_enable systemd) \
+		$(use_enable tor-hardening gcc-hardening) \
+		$(use_enable tor-hardening linker-hardening) \
+		$(use_enable web tor2web-mode) \
+		$(use_enable test unittests) \
+		$(use_enable test coverage)
+}
+
+src_install() {
+	default
+	readme.gentoo_create_doc
+
+	newconfd "${FILESDIR}"/tor.confd tor
+	newinitd "${FILESDIR}"/tor.initd-r8 tor
+	systemd_dounit contrib/dist/tor.service
+
+	keepdir /var/lib/tor
+
+	fperms 750 /var/lib/tor
+	fowners tor:tor /var/lib/tor
+
+	insinto /etc/tor/
+	newins "${FILESDIR}"/torrc-r1 torrc
+}
diff --git a/net-wireless/blueberry/Manifest b/net-wireless/blueberry/Manifest
index 9cf059a5ba43..93f877664875 100644
--- a/net-wireless/blueberry/Manifest
+++ b/net-wireless/blueberry/Manifest
@@ -1,6 +1,6 @@
 DIST blueberry-1.1.13.tar.gz 1382261 SHA256 6a1e53d1d543417ec788e1f3dc89126a3e1a4392812977095be383f111cc915c SHA512 587165b33f087720f9ae72dfb37feda9c6c3e4c4ad166a5a410c078a63bea0d33182b781f8f0c7840575917d06faec752866009c9b3664241b7ca23ab1586b94 WHIRLPOOL 63ddd2fbe1871b13b623ff47df599ca7ac222cc20dba04ffb17a76b28ae3340fc1a9df2c47a16c46a53544327f592ceeec05411972e5cf600c93755ae2e47eeb
 DIST blueberry-1.1.8.tar.gz 1342620 SHA256 f794a278d1c58e7b1717da1b89bff0939c4ae47206b6917f335d1b19f7569f55 SHA512 e516294ad9a4c40dee3c1acad2a30d8110631fff9627b2212f0f3168e13e615ca0b44b93ee1da0adf99b0b858effdd61db2a4898000c5cf040d638746a45b1bc WHIRLPOOL ed527e7cfbd41ab8e128c072da251825d2db27347ec452b158efe0e9e766e866cd8a8c131849ef2d29872fac09d97644fcf18b9f7336a3e0e57ad09f90e92dad
-EBUILD blueberry-1.1.13.ebuild 1294 SHA256 b29054d9a7ff7ec628574439363540fb781a66a1e26d3e098fe27d42a013f555 SHA512 d4b7b1fd7d03ec59a1d0b7fe683a541d32855bc75771a1fa2b16b371d2683fa8b998dca9b0350555f38514e179a8ecba7c88533f7baef78a40aa439efb8f0a1a WHIRLPOOL abf281d0a8069b1e592b34fa3e7be508fcda246f1a7a736499aeaa6639ccf5d56a8f733a1bcd671898fc47487f5255de5c41c589cce569a299410f28fd1ba496
-EBUILD blueberry-1.1.8.ebuild 1121 SHA256 bcde5e0e16ed783b950ecacbb7f0da208e094aaf936ec480563cbc32ca3bd0f9 SHA512 7a31601641ccf99978031b061357da58c607bf73529ff2a0dd9df1abbb7eec494c7a6e0131c0f07309cbcf08f64cce66c44a07bec23326b4ceb13226df809d53 WHIRLPOOL 6639d6539c439ab9f66cdbdce18a57b1529be5be64717e933290fcbbbb8ea4705e8d3c9ba7721c116eb2e117907642f51bb5875f0980ca4f3a5d2ee899f22149
+EBUILD blueberry-1.1.13-r1.ebuild 1337 SHA256 31ebb9bf8694bff5eef68fa79efc975769979441f1dd8fdc2d6564d7a8403ac2 SHA512 a3e0fd5df76c02c9cb920120a0b5a57dfe777d5cbdfe870d5bc33440a28c4c39890fb86f4cff72bcf0dd86517317dc1759d5aac5fa03720a4e792abd458b20b8 WHIRLPOOL 1d15975ca776312c1114e1971453e4f7b04b4cad37449c0a3bf58c2d0425e1681f96d150db23534af9e1d45bdc593db590f5d9293422e3a97a4c6885ac38e656
+EBUILD blueberry-1.1.8-r1.ebuild 1164 SHA256 d27b18cda69a14cdc9ae7a8ec20ff7a28a7fbbc3887a89e4ee59da444cb8d851 SHA512 4e4629de42015edeeff44beb59e76a787b2ff75b3f5dfaea1b70014a22e41c456bc57f301c39d3d47f37c45cc1f61562c7ca1677f4b40fcd14e04fa489b4e41a WHIRLPOOL 93c8f6095a7dc7e8fdc899d9986f0f4a2f66f0bd31656c960f696686fedcbed64d43ee972eb77df3f41294634e399fd5b7a79ce1c162251ff65134062674c613
 MISC ChangeLog 387 SHA256 7a9e6d782175478e3025367e982b62d47d2ff25827fedec5998351bdf3177382 SHA512 a1ae8dab3f6dfca758974364100b2e02de09e662f8c3b865e2df9397d50d300ea2e899c30c24b234123c5d3aac39a15b0f810716dfec1927f13dd0e3eab0601c WHIRLPOOL bd49b03031824544be310941012c7ed79287bdf76ddf36f9d26403085cc09a4c19ee72ce0c684b383cf65af84e77ced9b4fad6e36048ce558aad3fdc0de776a1
 MISC metadata.xml 579 SHA256 11b3a3ea497d51740490b018f1f81e7e17376f193cf126b924189caf882be526 SHA512 26def52514f520317b750df8519813d4f62969f9f62942c44f1b7fec69b38c17f457aa9cd728f27e71723b5a9b7ef555766c7d1c7df453e08539fc6216906840 WHIRLPOOL 246f5e60abd85d0afbe9f390b13f76037e5894f6c7f9c9a2e6dede898b3cc66de1908c0822a32d2d1a625820e01e47f7be3fb20a17bbf9f4b2c0939187010799
diff --git a/net-wireless/blueberry/blueberry-1.1.13-r1.ebuild b/net-wireless/blueberry/blueberry-1.1.13-r1.ebuild
new file mode 100644
index 000000000000..82e74e30c65b
--- /dev/null
+++ b/net-wireless/blueberry/blueberry-1.1.13-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils gnome2-utils python-single-r1
+
+DESCRIPTION="A Bluetooth configuration tool"
+HOMEPAGE="https://github.com/linuxmint/blueberry"
+SRC_URI="https://github.com/linuxmint/blueberry/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+	>=net-wireless/gnome-bluetooth-3.14[introspection]
+	net-wireless/bluez[obex]
+	net-wireless/bluez-tools
+	|| (
+		>=sys-apps/util-linux-2.31_rc1
+		net-wireless/rfkill
+	)
+	x11-libs/libnotify[introspection]
+	x11-misc/wmctrl"
+DEPEND="${RDEPEND}"
+
+src_prepare () {
+	sed -i 's@^#!.*python$@#!/usr/bin/python2@' usr/bin/blueberry{,-tray} || die
+	default_src_prepare
+}
+
+src_install() {
+	doins -r etc
+	exeinto /usr/bin
+	doexe usr/bin/*
+	exeinto /usr/lib/blueberry
+	doexe usr/lib/blueberry/*
+	insinto /usr
+	doins -r usr/share
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
diff --git a/net-wireless/blueberry/blueberry-1.1.13.ebuild b/net-wireless/blueberry/blueberry-1.1.13.ebuild
deleted file mode 100644
index 60f995f28aaa..000000000000
--- a/net-wireless/blueberry/blueberry-1.1.13.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils gnome2-utils python-single-r1
-
-DESCRIPTION="A Bluetooth configuration tool"
-HOMEPAGE="https://github.com/linuxmint/blueberry"
-SRC_URI="https://github.com/linuxmint/blueberry/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	>=net-wireless/gnome-bluetooth-3.14[introspection]
-	net-wireless/bluez[obex]
-	net-wireless/bluez-tools
-	net-wireless/rfkill
-	x11-libs/libnotify[introspection]
-	x11-misc/wmctrl"
-DEPEND="${RDEPEND}"
-
-src_prepare () {
-	sed -i 's@^#!.*python$@#!/usr/bin/python2@' usr/bin/blueberry{,-tray} || die
-	default_src_prepare
-}
-
-src_install() {
-	doins -r etc
-	exeinto /usr/bin
-	doexe usr/bin/*
-	exeinto /usr/lib/blueberry
-	doexe usr/lib/blueberry/*
-	insinto /usr
-	doins -r usr/share
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
diff --git a/net-wireless/blueberry/blueberry-1.1.8-r1.ebuild b/net-wireless/blueberry/blueberry-1.1.8-r1.ebuild
new file mode 100644
index 000000000000..d8c1532b0750
--- /dev/null
+++ b/net-wireless/blueberry/blueberry-1.1.8-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils gnome2-utils python-single-r1
+
+DESCRIPTION="A Bluetooth configuration tool"
+HOMEPAGE="https://github.com/linuxmint/blueberry"
+SRC_URI="https://github.com/linuxmint/blueberry/archive/${PV}.tar.gz -> ${PN}-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=net-wireless/gnome-bluetooth-3.14[introspection]
+	|| (
+		>=sys-apps/util-linux-2.31_rc1
+		net-wireless/rfkill
+	)
+	x11-misc/wmctrl"
+DEPEND="${RDEPEND}"
+
+src_prepare () {
+	sed -i 's@^#!.*python$@#!/usr/bin/python2@' usr/bin/blueberry{,-tray} || die
+	epatch_user
+}
+
+src_install() {
+	doins -r etc
+	exeinto /usr/bin
+	doexe usr/bin/*
+	exeinto /usr/lib/blueberry
+	doexe usr/lib/blueberry/*
+	insinto /usr
+	doins -r usr/share
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
diff --git a/net-wireless/blueberry/blueberry-1.1.8.ebuild b/net-wireless/blueberry/blueberry-1.1.8.ebuild
deleted file mode 100644
index 036859a11bd0..000000000000
--- a/net-wireless/blueberry/blueberry-1.1.8.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils gnome2-utils python-single-r1
-
-DESCRIPTION="A Bluetooth configuration tool"
-HOMEPAGE="https://github.com/linuxmint/blueberry"
-SRC_URI="https://github.com/linuxmint/blueberry/archive/${PV}.tar.gz -> ${PN}-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=net-wireless/gnome-bluetooth-3.14[introspection]
-	net-wireless/rfkill
-	x11-misc/wmctrl"
-DEPEND="${RDEPEND}"
-
-src_prepare () {
-	sed -i 's@^#!.*python$@#!/usr/bin/python2@' usr/bin/blueberry{,-tray} || die
-	epatch_user
-}
-
-src_install() {
-	doins -r etc
-	exeinto /usr/bin
-	doexe usr/bin/*
-	exeinto /usr/lib/blueberry
-	doexe usr/lib/blueberry/*
-	insinto /usr
-	doins -r usr/share
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 9a9f7efd7815..3f0ab43bf71d 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -10,7 +10,6 @@ AUX hostapd-init.d 739 SHA256 3678565083106e698ca30c305c4561152a2b043fe894b8b773
 AUX hostapd.service 213 SHA256 16f0612c192fb5d7e7de716f25fdfc2ccecc35a00ff745ae67e02d7292558d8f SHA512 4d1a1619c49ad0272f360d2c9d79f2fd30503786fe8f22dd3fc4abcc39176029fe907c79d22f168c100b0d7b4ac969b5f4b5815d5ebe6805db5881dda69eef29 WHIRLPOOL 3e415fa8068aa429cb37c7957d396d5e261b5843ae06eb81370728be36573e59e90707c7047b336eb82562e98017608e712ceb28afe2bae385b2821e1cdbd856
 DIST hostapd-2.6.tar.gz 1822341 SHA256 01526b90c1d23bec4b0f052039cc4456c2fd19347b4d830d1d58a0a6aea7117d SHA512 e60baaa092786250b8de9935f5417c7626f5d749210cce9f83d776b65c19fc92a8141f41923389f05c16295d482a15ae8d8b744f4667425040c99e3c2f5b1bda WHIRLPOOL fa093c371a66f3aa834d44060330259dc20e3a1937ffacc4450c5c645291c2bd4b31bbe1827f7d27bfca724c5e26f53ea59f2e3aa69a4c87177212bb491b119a
 EBUILD hostapd-2.6-r1.ebuild 6385 SHA256 877d3d7ae0db1a37d581b763e6ec66a2fa45b129c23dc7613d4902e7cdc71704 SHA512 bae75fa20068a5b6e4458d36e4b931bfd467775fa782c630f2a6c9940b16faa0dc0df90ff43f23851b50fd4cb4ae5c560764703afe33c69190af6883796a1461 WHIRLPOOL e0c2826ce75abe4ac3ff9c6786831ccf718fdeb0c9a1d58bcae8ca7a28a48d3f991ff01f5e97a5152e4fd5086e23b2cea2618d428a097cb461e1eef49235a66e
-EBUILD hostapd-2.6.ebuild 5605 SHA256 16afa0cfed68e19f323fad2fbe0936941a236124061a4497de1cfc670c8e5faf SHA512 d73ae79008ed99fa3bac557b43aedda6a8ae225998f3c6820668cc22585bf5efaa66a6c6674244a1656cf5639cf4edf6dc46ca8f787908253dd5fe0ff2271fc5 WHIRLPOOL cfec9547b3d6df34449ccad13cf8e380587c9375c9ebee18589e317603f25e81036a0bfaf453fd79c5914f6a971cf68974432480dea0c1cb4eb5c756c98e4ac8
 MISC ChangeLog 6816 SHA256 5d5d77e87c7e2d1a5eb966cff140f01772fcc993ecd16528d046d9a4fc5ac772 SHA512 548dab0b9d7843847c2ebccb36551fde405e1de5422d1579570d3f16c3073a7e25b5d3bb6813c8e01becb8ba81eebbe482c2639b810ca67b4ecaf3e7fb77e52a WHIRLPOOL aa9919ca20fffb5d9b647fb7bff2066a7c6363d7fdc47db7a6876fc2f1351b9cdb913cc76e1d8dad967688673821fa77903a62fa142c16516dcf039df7cb6c9b
 MISC ChangeLog-2015 28569 SHA256 3ba81aa1723ad809f53045b2c8712d882108a7178b603e3edcfdcc55f1b679b2 SHA512 c569a575176d90ea119280751ccec7b0bc1cf8b405e0d757aca8692ce13d27f5d26152613b28d5b845dacd45e72807cc8e79b4078c63c1e4990f7561e0f7d4e9 WHIRLPOOL 113bfd63779a7d79c63a3537e0585b827b167f4b0ebd194de864bee7118681dedd000cf263bac109fe98ae95df11d1e4dc3b5c141f5cd69ab131f3cf085c9d22
 MISC metadata.xml 803 SHA256 1da3a09cc6e259123e1ab88bfb0bbdad458764141abfb22073482e5d73a19ea4 SHA512 1622b5584f14b0fdea3836a6902ef7562bea4e03cf526fdd68d4e0995354cae2036136a68b1c5ee2439d47c5cf28a73cc9754c8b1be56efb4ad84aec0c073c87 WHIRLPOOL a113189f955b206b2caad18c76cfa6888f3c3f2a1ff98caa033120cb5b32af23312d5f6c1d48f7a4f6b07303d71ccf480db750ec621b3bb578b5e6ab618ce008
diff --git a/net-wireless/hostapd/hostapd-2.6.ebuild b/net-wireless/hostapd/hostapd-2.6.ebuild
deleted file mode 100644
index deae4e47f998..000000000000
--- a/net-wireless/hostapd/hostapd-2.6.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs eutils systemd
-
-# bogus commit to force manifest regeneration #596462
-
-DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
-HOMEPAGE="http://hostap.epitest.fi"
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 BSD )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc x86"
-IUSE="ipv6 logwatch netlink sqlite +ssl +wps +crda"
-
-DEPEND="ssl? ( dev-libs/openssl:*[-bindist] )
-	kernel_linux? (
-		dev-libs/libnl:3
-		crda? ( net-wireless/crda )
-	)
-	netlink? ( net-libs/libnfnetlink )
-	sqlite? ( >=dev-db/sqlite-3 )"
-
-RDEPEND="${DEPEND}"
-
-S="${S}/${PN}"
-
-src_prepare() {
-	# Allow users to apply patches to src/drivers for example,
-	# i.e. anything outside ${S}/${PN}
-	pushd ../ >/dev/null || die
-	default
-	popd >/dev/null || die
-
-	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
-		"${S}/hostapd.conf" || die
-}
-
-src_configure() {
-	local CONFIG="${S}/.config"
-
-	# toolchain setup
-	echo "CC = $(tc-getCC)" > ${CONFIG}
-
-	# EAP authentication methods
-	echo "CONFIG_EAP=y" >> ${CONFIG}
-	echo "CONFIG_ERP=y" >> ${CONFIG}
-	echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
-
-	if use ssl; then
-		# SSL authentication methods
-		echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
-		echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
-		echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
-		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
-		echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
-		echo "CONFIG_TLSV11=y" >> ${CONFIG}
-		echo "CONFIG_TLSV12=y" >> ${CONFIG}
-	fi
-
-	if use wps; then
-		# Enable Wi-Fi Protected Setup
-		echo "CONFIG_WPS=y" >> ${CONFIG}
-		echo "CONFIG_WPS2=y" >> ${CONFIG}
-		echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
-		echo "CONFIG_WPS_NFC=y" >> ${CONFIG}
-		einfo "Enabling Wi-Fi Protected Setup support"
-	fi
-
-	echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG}
-	echo "CONFIG_EAP_TNC=y" >> ${CONFIG}
-	echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
-	echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
-	echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
-	echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG}
-	echo "CONFIG_EAP_EKE=y" >> ${CONFIG}
-	echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
-	echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
-	echo "CONFIG_EAP_SAKE=y" >> ${CONFIG}
-	echo "CONFIG_EAP_GPSK=y" >> ${CONFIG}
-	echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG}
-	echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
-
-	einfo "Enabling drivers: "
-
-	# drivers
-	echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG}
-	einfo "  HostAP driver enabled"
-	echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
-	einfo "  Wired driver enabled"
-	echo "CONFIG_DRIVER_PRISM54=y" >> ${CONFIG}
-	einfo "  Prism54 driver enabled"
-	echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG}
-	einfo "  None driver enabled"
-
-	einfo "  nl80211 driver enabled"
-	echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG}
-
-	# epoll
-	echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG}
-
-	# misc
-	echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG}
-	echo "CONFIG_PKCS12=y" >> ${CONFIG}
-	echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG}
-	echo "CONFIG_IAPP=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211R=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211W=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211N=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211AC=y" >> ${CONFIG}
-	echo "CONFIG_PEERKEY=y" >> ${CONFIG}
-	echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG}
-	echo "CONFIG_INTERWORKING=y" >> ${CONFIG}
-	echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> ${CONFIG}
-	echo "CONFIG_HS20=y" >> ${CONFIG}
-	echo "CONFIG_WNM=y" >> ${CONFIG}
-	echo "CONFIG_FST=y" >> ${CONFIG}
-	echo "CONFIG_FST_TEST=y" >> ${CONFIG}
-	echo "CONFIG_ACS=y" >> ${CONFIG}
-
-	if use netlink; then
-		# Netlink support
-		echo "CONFIG_VLAN_NETLINK=y" >> ${CONFIG}
-	fi
-
-	if use ipv6; then
-		# IPv6 support
-		echo "CONFIG_IPV6=y" >> ${CONFIG}
-	fi
-
-	if use sqlite; then
-		# Sqlite support
-		echo "CONFIG_SQLITE=y" >> ${CONFIG}
-	fi
-
-	# If we are using libnl 2.0 and above, enable support for it
-	# Removed for now, since the 3.2 version is broken, and we don't
-	# support it.
-	if has_version ">=dev-libs/libnl-3.2"; then
-		echo "CONFIG_LIBNL32=y" >> .config
-	fi
-
-	# TODO: Add support for BSD drivers
-
-	default_src_configure
-}
-
-src_compile() {
-	emake V=1
-
-	if use ssl; then
-		emake V=1 nt_password_hash
-		emake V=1 hlr_auc_gw
-	fi
-}
-
-src_install() {
-	insinto /etc/${PN}
-	doins ${PN}.{conf,accept,deny,eap_user,radius_clients,sim_db,wpa_psk}
-
-	fperms -R 600 /etc/${PN}
-
-	dosbin ${PN}
-	dobin ${PN}_cli
-
-	use ssl && dobin nt_password_hash hlr_auc_gw
-
-	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
-	newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	doman ${PN}{.8,_cli.1}
-
-	dodoc ChangeLog README
-	use wps && dodoc README-WPS
-
-	docinto examples
-	dodoc wired.conf
-
-	if use logwatch; then
-		insinto /etc/log.d/conf/services/
-		doins logwatch/${PN}.conf
-
-		exeinto /etc/log.d/scripts/services/
-		doexe logwatch/${PN}
-	fi
-}
-
-pkg_postinst() {
-	einfo
-	einfo "If you are running openRC you need to follow this instructions:"
-	einfo "In order to use ${PN} you need to set up your wireless card"
-	einfo "for master mode in /etc/conf.d/net and then start"
-	einfo "/etc/init.d/${PN}."
-	einfo
-	einfo "Example configuration:"
-	einfo
-	einfo "config_wlan0=( \"192.168.1.1/24\" )"
-	einfo "channel_wlan0=\"6\""
-	einfo "essid_wlan0=\"test\""
-	einfo "mode_wlan0=\"master\""
-	einfo
-	#if [ -e "${KV_DIR}"/net/mac80211 ]; then
-	#	einfo "This package now compiles against the headers installed by"
-	#	einfo "the kernel source for the mac80211 driver. You should "
-	#	einfo "re-emerge ${PN} after upgrading your kernel source."
-	#fi
-
-	if use wps; then
-		einfo "You have enabled Wi-Fi Protected Setup support, please"
-		einfo "read the README-WPS file in /usr/share/doc/${P}"
-		einfo "for info on how to use WPS"
-	fi
-}
diff --git a/net-wireless/rfkill/Manifest b/net-wireless/rfkill/Manifest
index c928bf358687..9e0db5df1f63 100644
--- a/net-wireless/rfkill/Manifest
+++ b/net-wireless/rfkill/Manifest
@@ -1,6 +1,6 @@
 DIST rfkill-0.5.tar.xz 7776 SHA256 e0ae3004215e39a6c5c36e0726558740728d16f67ebdb8bea621250f6091d86a SHA512 6ad4d28e7bf7ec69ec6a600cd774b7b3c60e85849ae3fca0f5509ed6a283ed5656d37cfd770df45ff1ceca59edd814807d116b30e199fca303baf496441419d7 WHIRLPOOL 7f874d05b24f17d7926a8cabb85fad2c41ddad9085286527f8090144e2bc658e2332f9e197f26932770ba67f948e979402f7e8c0c6926f1e2244a0684551ebe8
-EBUILD rfkill-0.5-r1.ebuild 652 SHA256 8e975a614d6bdaa04c02da4782f183b107820d6da7b7c799b58efb6f61bac332 SHA512 dcd48d513018baa4da8b80c8fa54f95fe1a7d99a5dd458dc55b95b718c369bdf59322d14abdaf1b874cb957da76eadf7c3237f72620c0276a9c5fb376b8d568d WHIRLPOOL 568279749dc46c4aabca6cd55bff93487376f29508cb7dd25e481901d211bec7bbf7d28eb65b0fc14349f2e11c00533909dea9f41cebac187e59dfdd4a183353
-EBUILD rfkill-0.5.ebuild 617 SHA256 ad8f0f399f8a459bab980f2d0ab52581ca0d3ba28981c1d5376df650494f041c SHA512 69059256166d30b721722c9333b6c1d9370798c935b9bb46f44bcfe2ce2a44219d05a22b52a7a06df86ad45a29e8cf5566e53dbb4212a98a4a76f028e59fad70 WHIRLPOOL f19d5626f401248470141eba6026a112b51fdb0986728e74e6f48e174bd85e8487cb81185174d23bb121d35d46d007e507dfe8c682c72edd6a505a5f5e3a7530
+EBUILD rfkill-0.5-r2.ebuild 648 SHA256 74cbe90516691827ecce5a1d133b1f5397c2d21cf755c87337d195b91c8fb1c6 SHA512 dc2ce86ace708658872b0fd1d86c5dd83f98bc6270a461746046eaedea1a1e22f73f02664926e8b50a7f764c4e4a932c8d8a903ea2b1a22b7307be93eaf4a451 WHIRLPOOL 2a243ceb107be179c4d558fc788b5693e36043e48b6eb7ef3dfafd7760798f15afac9ad273b25a2b0dca9b0363e111063a029d4181497cef8ddb1d3719c94b1c
+EBUILD rfkill-0.5-r3.ebuild 683 SHA256 fccd4d4f99130b3645d469ce4fd419d8ca473b3a8ce97e66aca0810acf54cb11 SHA512 7a798f04998604d75a2e84c52ed8780502373898611565c07cfc87435ee33e081e517fb6d56b24672272c39dd96a38e45beb2811eda0a1aee1f0441054aa5bc7 WHIRLPOOL 300d936e74eed5623c6ed87e1a2bbab69ae25d432e23ed4d5a3f9bb569499f8b86e8d44e9001fd3dab48e0b10ea048de9ffd333dbc982099ed7997ef81f64ef0
 MISC ChangeLog 3410 SHA256 112d417e3e30512114141529fb4b31743cbdb631c024208ceb035a376b42c6a6 SHA512 3cf065cbf503df7df6c520a2c4b5d095874aa5afd3355e9042930397b277420454ebc4aaeed00fb76b4bb8bc30647f89fc2dd454cb031bcb73c08439a1549cba WHIRLPOOL 428154c04540da48329335cbbaebf6436028a52a5e87d488271a67b97f34538d74a48c9fe36af0a6f058b45dbafea09d152ec462eb7176239ce2f4d605e9e848
 MISC ChangeLog-2015 2567 SHA256 4130b6d6d626dc539b2a7e288be492c44091d600be8b213c8420c998840d366c SHA512 9edbefcaf9f80f3c9f2fcc38b2250f20380702df6c2f7017ed11880dc9d30e6318f51327edc145183afe3fd162100f1c6e5ca07ce436be10e755ce64ca12bd93 WHIRLPOOL 41eeb013204de6e4809cb0442874be8817fcd16e0f187f358f21c20403baeea5fe3e7f8e86f1f8d897bc355c0f87a1cdfbdcdbe41f93f335e6d188a93d7b073f
 MISC metadata.xml 354 SHA256 2d7aa32c3d54bb1de2b052f3a427c92b598e569628662b3d372e72abe7b8a772 SHA512 a20e530ace90b8649cb2c22ea255049aa31142a7b1c839f1f112ab0cfc22927c1d7508625e92b2e13ae2fcb65e8f2088ea16ba1194069911741c5eba45293e17 WHIRLPOOL 67616c97a29bba568dafbe8b2349ee4fdfa572073ca6299c88fdc7852d5ae70fe12de3e42fff99c74978c279fa771700d096388b66d0944387254257575ea206
diff --git a/net-wireless/rfkill/rfkill-0.5-r1.ebuild b/net-wireless/rfkill/rfkill-0.5-r1.ebuild
deleted file mode 100644
index 65a79620fa8e..000000000000
--- a/net-wireless/rfkill/rfkill-0.5-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Tool to read and control rfkill status through /dev/rfkill"
-HOMEPAGE="https://wireless.kernel.org/en/users/Documentation/rfkill"
-SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-src_prepare() {
-	default
-
-	sed -i "s|^SUFFIX=$|SUFFIX=-${PR}|" version.sh || die
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) LD=$(tc-getLD) V=1
-}
-
-src_install() {
-	emake install V=1 DESTDIR="${D}"
-}
diff --git a/net-wireless/rfkill/rfkill-0.5-r2.ebuild b/net-wireless/rfkill/rfkill-0.5-r2.ebuild
new file mode 100644
index 000000000000..ab6b3fa74faf
--- /dev/null
+++ b/net-wireless/rfkill/rfkill-0.5-r2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Tool to read and control rfkill status through /dev/rfkill"
+HOMEPAGE="https://wireless.kernel.org/en/users/Documentation/rfkill"
+SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="amd64 arm ~mips ppc ppc64 x86"
+IUSE=""
+
+RDEPEND="!>=sys-apps/util-linux-2.31_rc1"
+DEPEND=""
+
+src_compile() {
+	emake CC=$(tc-getCC) LD=$(tc-getLD) V=1 || die "Failed to compile"
+}
+
+src_install() {
+	emake install V=1 DESTDIR="${D}" || die "Failed to install"
+}
diff --git a/net-wireless/rfkill/rfkill-0.5-r3.ebuild b/net-wireless/rfkill/rfkill-0.5-r3.ebuild
new file mode 100644
index 000000000000..dad893b293f8
--- /dev/null
+++ b/net-wireless/rfkill/rfkill-0.5-r3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Tool to read and control rfkill status through /dev/rfkill"
+HOMEPAGE="https://wireless.kernel.org/en/users/Documentation/rfkill"
+SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="!>=sys-apps/util-linux-2.31_rc1"
+DEPEND=""
+
+src_prepare() {
+	default
+
+	sed -i "s|^SUFFIX=$|SUFFIX=-${PR}|" version.sh || die
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) LD=$(tc-getLD) V=1
+}
+
+src_install() {
+	emake install V=1 DESTDIR="${D}"
+}
diff --git a/net-wireless/rfkill/rfkill-0.5.ebuild b/net-wireless/rfkill/rfkill-0.5.ebuild
deleted file mode 100644
index 86d4f3feaa82..000000000000
--- a/net-wireless/rfkill/rfkill-0.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Tool to read and control rfkill status through /dev/rfkill"
-HOMEPAGE="https://wireless.kernel.org/en/users/Documentation/rfkill"
-SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-src_compile() {
-	emake CC=$(tc-getCC) LD=$(tc-getLD) V=1 || die "Failed to compile"
-}
-
-src_install() {
-	emake install V=1 DESTDIR="${D}" || die "Failed to install"
-}
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index dbf6e3965d2f..7c4fa431c3cc 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -23,8 +23,7 @@ AUX wpa_supplicant-conf.d 161 SHA256 61ec59007f66ac5bacc0aa095d1f2ccbc977a687038
 AUX wpa_supplicant-init.d 1250 SHA256 98985142371d39ea6294d757e85a3d3fc9fc21718063afbf81869e1d2ca648a7 SHA512 f7439937a11d7a91eee98ab9e16a4853ce8e27395970007ae60ca9a8b1852fadc4a37ee0bf81d7e4806c545f70b139f26942ed1630db070abe8fe8e5ce752403 WHIRLPOOL 01a81c7527561845148102863a6c80c1a0decab56320611a7dc96d7fd0772a75767a5bfcff5fd93a40842e52b517fd417ac21e8233f68e173add847608321a6b
 AUX wpa_supplicant.conf 183 SHA256 15082ad37ebd98f57c3733454a0921a79dc2b41007f1b012fb7e67c09d87de3a SHA512 425a5c955d462ea0d0d3f79c3e1bbf68e15b495df04ad03ed7aee12408b52616af05650dfc147ca5940d69e97360c33995d33733820fef8eb8769b31e58434e8 WHIRLPOOL 4615456a07dfc81139d350cb7618fc204008ae9cfa118f5966f923d758d1339a2d17eb79b631d8eb094225fac583a74705ed5ca4d348554f6b2435f166c16548
 DIST wpa_supplicant-2.6.tar.gz 2753524 SHA256 b4936d34c4e6cdd44954beba74296d964bc2c9668ecaa5255e499636fe2b1450 SHA512 46442cddb6ca043b8b08d143908f149954c238e0f3a57a0df73ca4fab9c1acd91b078f3f26375a1d99cd1d65625986328018c735d8705882c8f91e389cad28a6 WHIRLPOOL 63f91b9f72fee65df5412e90f5a4b38f327f47b44724164aa27a6933a68c68672a129d7c01e658c7fed1f7018fe9e4b743f3c6cef2f69fd75c3f5b9a1cb67c1b
-EBUILD wpa_supplicant-2.6-r3.ebuild 11021 SHA256 7d8a05495ac8254c52af1a7db3f28e3d17d37570aec1ad94dbd9d4868fe878d5 SHA512 e2f99b2b7df5b0203f77e472109739afa5acc0a065d769a7c9874f9f13dada6514292e9613c5220d97d2e849d6ba434fddce5a62db661481052a9227b75606d9 WHIRLPOOL 0141e1cab568c0375e0e970416a497c1126acb5940f1a3096a40b30db93a5194e4ee8598a81701478840e2e5c81dddfbfbb3782c255e0b87e76da2e8b408b736
-EBUILD wpa_supplicant-2.6.ebuild 10387 SHA256 88bcb24afd034a61d838a5ea30a4cdedaf40a46140aaf7c1bad5699c4492ec1f SHA512 f5b2bea3e358363ec89d56efacfcbdf7de6adefc1c8869e80407db300bfa9630db11b0c549cdff0ecd0ca67cc655955f2ca1d468991ddddaaa082274c37cf638 WHIRLPOOL 32a4058cf743743e9545f10bbaad05ca474cd33bb977b470e4d651136f086d1d1a0a998191c743fd5e29fcfeb1b9f4626ee02dd613233489a9642ce7e9bdd1cb
+EBUILD wpa_supplicant-2.6-r3.ebuild 11009 SHA256 4153d626390b54c8aa80118a251ff9574a3b14e0bcafeac360e6fc42005214db SHA512 4c4e0bb9ab8b226e16640daf7751362db531c247f379257b12a0ea341ac1122964dd6e99ee22351f8ca5425c98541e113dab96843aa98c63d0f9b88252afd753 WHIRLPOOL 4a2a6ca59f24b335cd930f156bb7ee6801295c31fc483b29dfba3a47efba06cb82f2019efd07055265d3fb51f1ff9b5a1b73c87ed2941c3287fedd972a343f66
 MISC ChangeLog 11682 SHA256 efbca267d21a112d16d2c31ec937decb8835cb2daf8d49888a65512c5d290561 SHA512 5468ebc87b83245f4f950bf3bf08a027a746e5872b932a65690b5996997028dcfc627e0048f7dafaf427ed944b9afde51adbe194dc5a1ee468e7a6ae1e4f3630 WHIRLPOOL 2da07e6d6d160319f0ecacd2aee323792ae9d05257377521a955f624f1c988cb7ae2fc90659dba6ae8244edd006ba85af7356ee16202ed6b31b556785beb8f41
 MISC ChangeLog-2015 51458 SHA256 b9aa43f72daf3df019ae96e8f49a0825f910d19149712e6e6a30a4fc56dd7476 SHA512 84963b76764be27e85bbf40a74c714702fea51406d6de813624e95408018c66ecf36ef50298fe150278a9ca930c5d21946766d3c0aa624627dd29340abc95eae WHIRLPOOL 10bbade886984c1668850770ddb14a92cd990236f150eb7aa9bfdf421035fb7a864a9551f5ba8a5785da2f53d7bd463488905f3ec3479b498ff6b50b298cd887
 MISC metadata.xml 1298 SHA256 fb99224e36989c66fe85f2e8222521a0a88e1cac6f6a963b6170261e5b720a19 SHA512 166af06f1caf533381cdde208f98863d2e38a7de1ab89a0ec3b7e9e1ffa3e173540564fafd2e032df79197f596e7ad227f8eb6c2c748b2fc1368999f09588044 WHIRLPOOL d6a9ec37350c417dece67ba992b5aaa914e3f9ed11c4b2d5e9cb88ad4db664db84f4e5572e619be1be3e5a96628ff4305a6f87e6f6b52816f96b91de32253eb8
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r3.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r3.ebuild
index 0c7ca6fbc325..756782604758 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r3.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r3.ebuild
@@ -6,12 +6,12 @@ EAPI=6
 inherit eutils qmake-utils systemd toolchain-funcs
 
 DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
-HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
+HOMEPAGE="https://w1.fi/wpa_supplicant/"
 SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
 LICENSE="|| ( GPL-2 BSD )"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="ap dbus gnutls eap-sim fasteap +hs2-0 libressl p2p ps3 qt5 readline selinux smartcard ssl tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
 REQUIRED_USE="fasteap? ( !ssl ) smartcard? ( ssl )"
 
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.6.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.6.ebuild
deleted file mode 100644
index e9c1c8a53ef5..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.6.ebuild
+++ /dev/null
@@ -1,399 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs qt4-r2 qmake-utils systemd multilib
-
-DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
-HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
-LICENSE="|| ( GPL-2 BSD )"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="ap dbus gnutls eap-sim fasteap +hs2-0 libressl p2p ps3 qt4 qt5 readline selinux smartcard ssl tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
-REQUIRED_USE="fasteap? ( !gnutls !ssl ) smartcard? ( ssl ) ?? ( qt4 qt5 )"
-
-CDEPEND="dbus? ( sys-apps/dbus )
-	kernel_linux? (
-		eap-sim? ( sys-apps/pcsc-lite )
-		dev-libs/libnl:3
-		net-wireless/crda
-	)
-	!kernel_linux? ( net-libs/libpcap )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtsvg:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtsvg:5
-	)
-	readline? (
-		sys-libs/ncurses:0=
-		sys-libs/readline:0=
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)
-	!ssl? (
-		gnutls? (
-			net-libs/gnutls
-			dev-libs/libgcrypt:*
-		)
-		!gnutls? ( dev-libs/libtommath )
-	)
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-networkmanager )
-"
-
-S="${WORKDIR}/${P}/${PN}"
-
-Kconfig_style_config() {
-		#param 1 is CONFIG_* item
-		#param 2 is what to set it = to, defaulting in y
-		CONFIG_PARAM="${CONFIG_HEADER:-CONFIG_}$1"
-		setting="${2:-y}"
-
-		if [ ! $setting = n ]; then
-			#first remove any leading "# " if $2 is not n
-			sed -i "/^# *$CONFIG_PARAM=/s/^# *//" .config || echo "Kconfig_style_config error uncommenting $CONFIG_PARAM"
-			#set item = $setting (defaulting to y)
-			sed -i "/^$CONFIG_PARAM/s/=.*/=$setting/" .config || echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting"
-		else
-			#ensure item commented out
-			sed -i "/^$CONFIG_PARAM/s/$CONFIG_PARAM/# $CONFIG_PARAM/" .config || echo "Kconfig_style_config error commenting $CONFIG_PARAM"
-		fi
-}
-
-pkg_setup() {
-	if use gnutls && use ssl ; then
-		elog "You have both 'gnutls' and 'ssl' USE flags enabled: defaulting to USE=\"ssl\""
-	fi
-}
-
-src_prepare() {
-	# net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD
-	sed -i \
-		-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
-		../src/l2_packet/l2_packet_freebsd.c || die
-
-	# People seem to take the example configuration file too literally (bug #102361)
-	sed -i \
-		-e "s:^\(opensc_engine_path\):#\1:" \
-		-e "s:^\(pkcs11_engine_path\):#\1:" \
-		-e "s:^\(pkcs11_module_path\):#\1:" \
-		wpa_supplicant.conf || die
-
-	# Change configuration to match Gentoo locations (bug #143750)
-	sed -i \
-		-e "s:/usr/lib/opensc:/usr/$(get_libdir):" \
-		-e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
-		wpa_supplicant.conf || die
-
-	#if use dbus; then
-	#	epatch "${FILESDIR}/${P}-dbus-path-fix.patch"
-	#fi
-
-	# systemd entries to D-Bus service files (bug #372877)
-	echo 'SystemdService=wpa_supplicant.service' \
-		| tee -a dbus/*.service >/dev/null || die
-
-	cd "${WORKDIR}/${P}"
-
-	if use wimax; then
-		# generate-libeap-peer.patch comes before
-		# fix-undefined-reference-to-random_get_bytes.patch
-		epatch "${FILESDIR}/${P}-generate-libeap-peer.patch"
-
-		# multilib-strict fix (bug #373685)
-		sed -e "s/\/usr\/lib/\/usr\/$(get_libdir)/" -i src/eap_peer/Makefile
-	fi
-
-	# bug (320097)
-	epatch "${FILESDIR}/${P}-do-not-call-dbus-functions-with-NULL-path.patch"
-
-	# TODO - NEED TESTING TO SEE IF STILL NEEDED, NOT COMPATIBLE WITH 1.0 OUT OF THE BOX,
-	# SO WOULD BE NICE TO JUST DROP IT, IF IT IS NOT NEEDED.
-	# bug (374089)
-	#epatch "${FILESDIR}/${P}-dbus-WPAIE-fix.patch"
-
-	# bug (596332)
-	epatch "${FILESDIR}/${P}-libressl.patch"
-}
-
-src_configure() {
-	# Toolchain setup
-	tc-export CC
-
-	cp defconfig .config
-
-	# Basic setup
-	Kconfig_style_config CTRL_IFACE
-	Kconfig_style_config BACKEND file
-	Kconfig_style_config IBSS_RSN
-	Kconfig_style_config IEEE80211W
-	Kconfig_style_config IEEE80211R
-
-	# Basic authentication methods
-	# NOTE: we don't set GPSK or SAKE as they conflict
-	# with the below options
-	Kconfig_style_config EAP_GTC
-	Kconfig_style_config EAP_MD5
-	Kconfig_style_config EAP_OTP
-	Kconfig_style_config EAP_PAX
-	Kconfig_style_config EAP_PSK
-	Kconfig_style_config EAP_TLV
-	Kconfig_style_config EAP_EXE
-	Kconfig_style_config IEEE8021X_EAPOL
-	Kconfig_style_config PKCS12
-	Kconfig_style_config PEERKEY
-	Kconfig_style_config EAP_LEAP
-	Kconfig_style_config EAP_MSCHAPV2
-	Kconfig_style_config EAP_PEAP
-	Kconfig_style_config EAP_TLS
-	Kconfig_style_config EAP_TTLS
-
-	# Enabling background scanning.
-	Kconfig_style_config BGSCAN_SIMPLE
-	Kconfig_style_config BGSCAN_LEARN
-
-	# Enabling mesh networks.
-	Kconfig_style_config MESH
-
-	if use dbus ; then
-		Kconfig_style_config CTRL_IFACE_DBUS
-		Kconfig_style_config CTRL_IFACE_DBUS_NEW
-		Kconfig_style_config CTRL_IFACE_DBUS_INTRO
-	fi
-
-	# Enable support for writing debug info to a log file and syslog.
-	Kconfig_style_config DEBUG_FILE
-	Kconfig_style_config DEBUG_SYSLOG
-
-	if use hs2-0 ; then
-		Kconfig_style_config INTERWORKING
-		Kconfig_style_config HS20
-	fi
-
-	if use uncommon-eap-types; then
-		Kconfig_style_config EAP_GPSK
-		Kconfig_style_config EAP_SAKE
-		Kconfig_style_config EAP_GPSK_SHA256
-		Kconfig_style_config EAP_IKEV2
-		Kconfig_style_config EAP_EKE
-	fi
-
-	if use eap-sim ; then
-		# Smart card authentication
-		Kconfig_style_config EAP_SIM
-		Kconfig_style_config EAP_AKA
-		Kconfig_style_config EAP_AKA_PRIME
-		Kconfig_style_config PCSC
-	fi
-
-	if use fasteap ; then
-		Kconfig_style_config EAP_FAST
-	fi
-
-	if use readline ; then
-		# readline/history support for wpa_cli
-		Kconfig_style_config READLINE
-	else
-		#internal line edit mode for wpa_cli
-		Kconfig_style_config WPA_CLI_EDIT
-	fi
-
-	# SSL authentication methods
-	if use ssl ; then
-		Kconfig_style_config TLS openssl
-	elif use gnutls ; then
-		Kconfig_style_config TLS gnutls
-		Kconfig_style_config GNUTLS_EXTRA
-	else
-		Kconfig_style_config TLS internal
-	fi
-
-	if use smartcard ; then
-		Kconfig_style_config SMARTCARD
-	fi
-
-	if use tdls ; then
-		Kconfig_style_config TDLS
-	fi
-
-	if use kernel_linux ; then
-		# Linux specific drivers
-		Kconfig_style_config DRIVER_ATMEL
-		Kconfig_style_config DRIVER_HOSTAP
-		Kconfig_style_config DRIVER_IPW
-		Kconfig_style_config DRIVER_NL80211
-		Kconfig_style_config DRIVER_RALINK
-		Kconfig_style_config DRIVER_WEXT
-		Kconfig_style_config DRIVER_WIRED
-
-		if use ps3 ; then
-			Kconfig_style_config DRIVER_PS3
-		fi
-
-	elif use kernel_FreeBSD ; then
-		# FreeBSD specific driver
-		Kconfig_style_config DRIVER_BSD
-	fi
-
-	# Wi-Fi Protected Setup (WPS)
-	if use wps ; then
-		Kconfig_style_config WPS
-		Kconfig_style_config WPS2
-		# USB Flash Drive
-		Kconfig_style_config WPS_UFD
-		# External Registrar
-		Kconfig_style_config WPS_ER
-		# Universal Plug'n'Play
-		Kconfig_style_config WPS_UPNP
-		# Near Field Communication
-		Kconfig_style_config WPS_NFC
-	fi
-
-	# Wi-Fi Direct (WiDi)
-	if use p2p ; then
-		Kconfig_style_config P2P
-		Kconfig_style_config WIFI_DISPLAY
-	fi
-
-	# Access Point Mode
-	if use ap ; then
-		Kconfig_style_config AP
-	fi
-
-	# Enable mitigation against certain attacks against TKIP
-	Kconfig_style_config DELAYED_MIC_ERROR_REPORT
-
-	# If we are using libnl 2.0 and above, enable support for it
-	# Bug 382159
-	# Removed for now, since the 3.2 version is broken, and we don't
-	# support it.
-	if has_version ">=dev-libs/libnl-3.2"; then
-		Kconfig_style_config LIBNL32
-	fi
-
-	if use qt4 ; then
-		pushd "${S}"/wpa_gui-qt4 > /dev/null
-		eqmake4 wpa_gui.pro
-		popd > /dev/null
-	fi
-	if use qt5 ; then
-		pushd "${S}"/wpa_gui-qt4 > /dev/null
-		eqmake5 wpa_gui.pro
-		popd > /dev/null
-	fi
-}
-
-src_compile() {
-	einfo "Building wpa_supplicant"
-	emake V=1 BINDIR=/usr/sbin
-
-	if use wimax; then
-		emake -C ../src/eap_peer clean
-		emake -C ../src/eap_peer
-	fi
-
-	if use qt4 || use qt5; then
-		pushd "${S}"/wpa_gui-qt4 > /dev/null
-		einfo "Building wpa_gui"
-		emake
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	dosbin wpa_supplicant
-	dobin wpa_cli wpa_passphrase
-
-	# baselayout-1 compat
-	if has_version "<sys-apps/baselayout-2.0.0"; then
-		dodir /sbin
-		dosym /usr/sbin/wpa_supplicant /sbin/wpa_supplicant
-		dodir /bin
-		dosym /usr/bin/wpa_cli /bin/wpa_cli
-	fi
-
-	if has_version ">=sys-apps/openrc-0.5.0"; then
-		newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant
-		newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant
-	fi
-
-	exeinto /etc/wpa_supplicant/
-	newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh
-
-	dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \
-		wpa_supplicant.conf
-
-	newdoc .config build-config
-
-	doman doc/docbook/*.{5,8}
-
-	if use qt4 || use qt5 ; then
-		into /usr
-		dobin wpa_gui-qt4/wpa_gui
-		doicon wpa_gui-qt4/icons/wpa_gui.svg
-		make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gui" "Qt;Network;"
-	fi
-
-	use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install
-
-	if use dbus ; then
-		pushd "${S}"/dbus > /dev/null
-		insinto /etc/dbus-1/system.d
-		newins dbus-wpa_supplicant.conf wpa_supplicant.conf
-		insinto /usr/share/dbus-1/system-services
-		doins fi.epitest.hostap.WPASupplicant.service fi.w1.wpa_supplicant1.service
-		popd > /dev/null
-
-		# This unit relies on dbus support, bug 538600.
-		systemd_dounit systemd/wpa_supplicant.service
-	fi
-
-	systemd_dounit "systemd/wpa_supplicant@.service"
-	systemd_dounit "systemd/wpa_supplicant-nl80211@.service"
-	systemd_dounit "systemd/wpa_supplicant-wired@.service"
-}
-
-pkg_postinst() {
-	elog "If this is a clean installation of wpa_supplicant, you"
-	elog "have to create a configuration file named"
-	elog "/etc/wpa_supplicant/wpa_supplicant.conf"
-	elog
-	elog "An example configuration file is available for reference in"
-	elog "/usr/share/doc/${PF}/"
-
-	if [[ -e ${ROOT}etc/wpa_supplicant.conf ]] ; then
-		echo
-		ewarn "WARNING: your old configuration file ${ROOT}etc/wpa_supplicant.conf"
-		ewarn "needs to be moved to ${ROOT}etc/wpa_supplicant/wpa_supplicant.conf"
-	fi
-
-	# Mea culpa, feel free to remove that after some time --mgorny.
-	local fn
-	for fn in wpa_supplicant{,@wlan0}.service; do
-		if [[ -e "${ROOT}"/etc/systemd/system/network.target.wants/${fn} ]]
-		then
-			ebegin "Moving ${fn} to multi-user.target"
-			mv "${ROOT}"/etc/systemd/system/network.target.wants/${fn} \
-				"${ROOT}"/etc/systemd/system/multi-user.target.wants/
-			eend ${?} \
-				"Please try to re-enable ${fn}"
-		fi
-	done
-
-	systemd_reenable wpa_supplicant.service
-}
diff --git a/perl-core/ExtUtils-MakeMaker/Manifest b/perl-core/ExtUtils-MakeMaker/Manifest
index bbea0c32cf82..d59a301464fd 100644
--- a/perl-core/ExtUtils-MakeMaker/Manifest
+++ b/perl-core/ExtUtils-MakeMaker/Manifest
@@ -1,5 +1,3 @@
-AUX 6.58-RUNPATH.patch 723 SHA256 e252bd4b044f5b79f19f8263c31ca6bb61686acadbf68c9ef933d51e67274731 SHA512 ba0bc142e3e209606c527f53af9828783450ef55e325fc086413965d24deea65c7b94040764a4891e82662002858defb6fc7d6f7880c58d2c3aaf70dd964eb0c WHIRLPOOL 551ae343a21dfde49a06bbec6fad1dad813c2547b9323480eb2240cd714a3c1c7fa4bd0984ccf3f4a2fd1b0cd718597e8d88ee1717757df19fff4d927d007e7c
-AUX 7.04-delete_packlist_podlocal.patch 2629 SHA256 3114501d67563d3fcc37c00755ed9b0456f8a07841ab9b75a876d3b51ccec7a4 SHA512 513f6c9901dd36dc789051fa04c784171f9f6f8cb8af53bebd1029ad7c2210d38040f33e3813d0effb5708768cf6897da0287c50f3ee7d1cc4fcc53990283044 WHIRLPOOL 2d0783a5dc76b67381a34c73b64f2c1220921e6fb7ab8e8a7b3148e04e834189b94dd86f157a7f7dba19896434bf31ca0faf69c7733c10ee4e122f90337f5e20
 AUX 7.24-RUNPATH.patch 1112 SHA256 6ff6628c720198bec0b073e25f92ca3ce77fd9aa57de3ae26bd572087127c6fa SHA512 35ed3fc4f1254e29b288643e679af28895c5bfa4869c1c0ae7066d3d6599b9b611e6ba302f7388cbe5fd999c800058b169493f52ee28009f3ef13fc81aa1ce92 WHIRLPOOL 79fe1fe139b6a756595ce0800c5306ef743241e1bad90eadd4662a84ce661114e31029ddc0cad647d763d6ba93c5346681ace8bbb838193b1d9021cb35469fcb
 AUX 7.24-delete_podlocal.patch 2585 SHA256 03a58cc2f794a2a3559360d394107c3a4a76c3b7290f876b230bb39dcb2d11e2 SHA512 0b7b6886ea93b38bda7c4776876e227ad2bad8419317ea8f67b4fe605d46a8ec7fab01631d3df434ef0ad5ba61d0d518fd0718768de817ea94ba9a344658f902 WHIRLPOOL 2c184f3cca725dd707d6e26456ae4af8aa84b3687c51d84ddf5b865a565c1bdfff3bbd076e71c9b1faeb28e4d5c6787f666342b751cc046f7ffbb047a8516a7e
 DIST ExtUtils-MakeMaker-7.24.tar.gz 467714 SHA256 416abc97c3bb2cc72bef28852522f2859de53e37bf3d0ae8b292067d78755e69 SHA512 f57f8407aea6101af964f105fb9ddd6567262fa2bad91456573c8fc019cdf1469563945029f5078e20d2f7d1d736a63586e7cde3bb72cb9ae80ad0b8ebe818d5 WHIRLPOOL 1f5856ddf97a9529736513fed672d25456270e6c1305fda709348a0f5ee63ef7ab99ddf50ad93ba0900ffcfd65d16bbf510a36f9c2b7e834efd490d02f1aa0e8
diff --git a/perl-core/ExtUtils-MakeMaker/files/6.58-RUNPATH.patch b/perl-core/ExtUtils-MakeMaker/files/6.58-RUNPATH.patch
deleted file mode 100644
index 41f26098b2bd..000000000000
--- a/perl-core/ExtUtils-MakeMaker/files/6.58-RUNPATH.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/lib/ExtUtils/MM_Any.pm
-+++ b/lib/ExtUtils/MM_Any.pm
-@@ -1900,6 +1900,13 @@ CODE
-             # LD_RUN_PATH now computed by ExtUtils::Liblist
-             ($self->{EXTRALIBS},  $self->{BSLOADLIBS}, 
-              $self->{LDLOADLIBS}, $self->{LD_RUN_PATH}) = @libs;
-+            # We do not want the build root in RPATH
-+            if ( exists $ENV{PORTAGE_TMPDIR} ){
-+                # If we have a PORTAGE_TMPDIR set, strip that, as just testing for
-+                # /usr and /opt might not be sufficient.
-+                $self->{LD_RUN_PATH} = join ':', grep !/^\Q$ENV{PORTAGE_TMPDIR}/,
-+                                       split /:/, $self->{LD_RUN_PATH};
-+            }
-             last;
-         }
-     }
diff --git a/perl-core/ExtUtils-MakeMaker/files/7.04-delete_packlist_podlocal.patch b/perl-core/ExtUtils-MakeMaker/files/7.04-delete_packlist_podlocal.patch
deleted file mode 100644
index 266d5d240c04..000000000000
--- a/perl-core/ExtUtils-MakeMaker/files/7.04-delete_packlist_podlocal.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -ruN ExtUtils-MakeMaker-7.04.orig/lib/ExtUtils/MM_Unix.pm ExtUtils-MakeMaker-7.04/lib/ExtUtils/MM_Unix.pm
---- ExtUtils-MakeMaker-7.04.orig/lib/ExtUtils/MM_Unix.pm	2014-12-02 13:44:33.000000000 +0100
-+++ ExtUtils-MakeMaker-7.04/lib/ExtUtils/MM_Unix.pm	2015-02-25 23:54:03.373862321 +0100
-@@ -1606,6 +1606,16 @@
-     $self->{FULLEXT} = $self->catdir(split /::/, $self->{NAME});
- 
- 
-+    # Workaround for https://bugs.gentoo.org/show_bug.cgi?id=221179
-+    if (!exists($self->{NO_PERLLOCAL})) {
-+        $self->{NO_PERLLOCAL} = 1;
-+    }
-+
-+    if (!exists($self->{NO_PACKLIST})) {
-+        $self->{NO_PACKLIST} = 1;
-+    }
-+
-+
-     # Copied from DynaLoader:
- 
-     my(@modparts) = split(/::/,$self->{NAME});
-diff -ruN ExtUtils-MakeMaker-7.04.orig/lib/ExtUtils/MakeMaker.pm ExtUtils-MakeMaker-7.04/lib/ExtUtils/MakeMaker.pm
---- ExtUtils-MakeMaker-7.04.orig/lib/ExtUtils/MakeMaker.pm	2014-12-02 13:44:33.000000000 +0100
-+++ ExtUtils-MakeMaker-7.04/lib/ExtUtils/MakeMaker.pm	2015-02-25 23:54:03.373862321 +0100
-@@ -2348,13 +2348,13 @@
- When true, suppresses the generation of MYMETA.yml and MYMETA.json module
- meta-data files during 'perl Makefile.PL'.
- 
--Defaults to false.
-+Defaults to true.
- 
- =item NO_PACKLIST
- 
- When true, suppresses the writing of C<packlist> files for installs.
- 
--Defaults to false.
-+Defaults to true.
- 
- =item NO_PERLLOCAL
- 
-diff -ruN ExtUtils-MakeMaker-7.04.orig/t/INSTALL_BASE.t ExtUtils-MakeMaker-7.04/t/INSTALL_BASE.t
---- ExtUtils-MakeMaker-7.04.orig/t/INSTALL_BASE.t	2014-11-11 14:50:52.000000000 +0100
-+++ ExtUtils-MakeMaker-7.04/t/INSTALL_BASE.t	2015-02-25 23:59:00.383878929 +0100
-@@ -42,7 +42,7 @@
- ok( chdir('Big-Dummy'), "chdir'd to Big-Dummy") || diag("chdir failed; $!");
- 
- for my $instdir (@INSTDIRS) {
--  my @mpl_out = run(qq{$perl Makefile.PL "INSTALL_BASE=$instdir"});
-+  my @mpl_out = run(qq{$perl Makefile.PL "INSTALL_BASE=$instdir" NO_PERLLOCAL=0 NO_PACKLIST=0});
- 
-   cmp_ok( $?, '==', 0, 'Makefile.PL exited with zero' ) ||
-     diag(@mpl_out);
-diff -ruN ExtUtils-MakeMaker-7.04.orig/t/basic.t ExtUtils-MakeMaker-7.04/t/basic.t
---- ExtUtils-MakeMaker-7.04.orig/t/basic.t	2014-11-11 14:50:52.000000000 +0100
-+++ ExtUtils-MakeMaker-7.04/t/basic.t	2015-02-25 23:56:51.161871703 +0100
-@@ -59,7 +59,7 @@
- 
- sub extrachar { $] > 5.008 && !$ENV{PERL_CORE} ? utf8::decode(my $c='š') : 's' }
- my $DUMMYINST = '../dummy-in'.extrachar().'tall';
--my @mpl_out = run(qq{$perl Makefile.PL "PREFIX=$DUMMYINST"});
-+my @mpl_out = run(qq{$perl Makefile.PL "PREFIX=$DUMMYINST" NO_PERLLOCAL=0 NO_PACKLIST=0});
- END { rmtree $DUMMYINST; }
- 
- cmp_ok( $?, '==', 0, 'Makefile.PL exited with zero' ) ||
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 06595ee1feb7..db0dbd61abb8 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Ulrich Müller <ulm@gentoo.org> (23 Oct 2017)
+# Needs net-mail/mailutils which is not keyworded, bug #635216.
+app-editors/emacs-vcs mailutils
+
 # Michael Palimaka <kensington@gentoo.org> (30 Sep 2017)
 # Required dependencies are not keyworded.
 x11-themes/qtcurve plasma
diff --git a/profiles/arch/alpha/use.stable.mask b/profiles/arch/alpha/use.stable.mask
index 9a7a23bf7abb..7185868eba82 100644
--- a/profiles/arch/alpha/use.stable.mask
+++ b/profiles/arch/alpha/use.stable.mask
@@ -4,6 +4,13 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Mike Gilbert <floppym@gentoo.org> (28 Oct 2017)
+# Mask python targets until dev-lang/python is stable.
+python_single_target_python3_6
+python_targets_python3_6
+python_single_target_python3_5
+python_targets_python3_5
+
 # Tobias Klausmann <klausman@gentoo.org> (17 Mar 2016)
 # Webkit itself is enormous (~13h compile+test on our fastest dev machine), so
 # it will remain not-stable forever. Mask the USE flag accordingly.
diff --git a/profiles/arch/amd64-fbsd/package.use.mask b/profiles/arch/amd64-fbsd/package.use.mask
index eb02f3b260e6..ada83da9f358 100644
--- a/profiles/arch/amd64-fbsd/package.use.mask
+++ b/profiles/arch/amd64-fbsd/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Ulrich Müller <ulm@gentoo.org> (23 Oct 2017)
+# Needs net-mail/mailutils which is not keyworded, bug #635216.
+app-editors/emacs-vcs mailutils
+
 # Alexis Ballier <aballier@gentoo.org> (31 Jan 2017)
 # nvidia drivers are unmasked here
 media-video/ffmpeg -nvenc
diff --git a/profiles/arch/amd64-fbsd/todo/package.use.mask b/profiles/arch/amd64-fbsd/todo/package.use.mask
index f6e131ae0646..9e862a931d0e 100644
--- a/profiles/arch/amd64-fbsd/todo/package.use.mask
+++ b/profiles/arch/amd64-fbsd/todo/package.use.mask
@@ -13,6 +13,9 @@
 # Keep it simple, we do not really care about the date or who masked it, we want
 # to be easily able to determine what we need to keyword.
 
+# net-dns/libidn2
+net-misc/wget idn
+
 # net-libs/gnome-online-accounts
 gnome-base/gvfs gnome-online-accounts
 
diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask
index 2bf7d3769e73..ee4f220250d9 100644
--- a/profiles/arch/amd64/use.stable.mask
+++ b/profiles/arch/amd64/use.stable.mask
@@ -4,6 +4,11 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Mike Gilbert <floppym@gentoo.org> (28 Oct 2017)
+# Mask python targets until dev-lang/python is stable.
+python_single_target_python3_6
+python_targets_python3_6
+
 # Michael Palimaka <kensington@gentoo.org> (03 Jun 2017)
 # Not yet stable.
 elogind
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index ace8eb3e1dfa..0c0acc547ced 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Ulrich Müller <ulm@gentoo.org> (23 Oct 2017)
+# Needs net-mail/mailutils which is not keyworded, bug #635216.
+app-editors/emacs-vcs mailutils
+
 # Andreas Sturmlechner <asturm@gentoo.org> (11 Oct 2017)
 # Required dependency dev-qt/qtspeech is not keyworded.
 kde-apps/konqueror speech
diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask
index 30e2f3e76a4e..972a345b4e1f 100644
--- a/profiles/arch/arm/use.mask
+++ b/profiles/arch/arm/use.mask
@@ -99,9 +99,13 @@ ace
 # Unmask ARM-only video-cards
 -video_cards_exynos
 -video_cards_freedreno
+-video_cards_imx
 -video_cards_omap
 -video_cards_tegra
 -video_cards_vc4
+
+# James Le Cuirot <chewi@gentoo.org>
+# Unmask as Vivante is available for arm.
 -video_cards_vivante
 
 # 2006/02/05 - Donnie Berkholz <dberkholz@gentoo.org>
diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask
index 8f732238b2cd..4af07de93a12 100644
--- a/profiles/arch/arm/use.stable.mask
+++ b/profiles/arch/arm/use.stable.mask
@@ -4,6 +4,13 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Mike Gilbert <floppym@gentoo.org> (28 Oct 2017)
+# Mask python targets until dev-lang/python is stable.
+python_single_target_python3_6
+python_targets_python3_6
+python_single_target_python3_5
+python_targets_python3_5
+
 # Michael Palimaka <kensington@gentoo.org> (03 Jun 2017)
 # Not yet stable.
 elogind
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index cd50464f8026..9fc805070230 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Thomas Deutschmann <whissi@gentoo.org> (26 Oct 2017)
+# idn: Needs net-dns/libidn2 which is not stabilized yet on arm64
+# gnutls: Needs net-libs/gnutls which is not stabilized yet on arm64
+net-misc/wget idn gnutls
+
 # Michael Weber <xmw@gentoo.org> (29 Mar 2017)
 # unstable deps mesa llvm et al.
 x11-libs/cairo gles2 opengl
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index e1edbff916d0..0acb6cb1d719 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -177,12 +177,16 @@ vim-syntax
 -video_cards_exynos
 # e.g. Snapdragon 410E (dragonboard)
 -video_cards_freedreno
+# e.g. NXP i.MX
+-video_cards_imx
 # e.g. Nvidia's Tegra K1 T132 Denver
 -video_cards_nouveau
 -video_cards_tegra
 # e.g. Raspeberry Pi 3
 -video_cards_vc4
-# e.g. Freescale/NXP i.MX 8
+
+# James Le Cuirot <chewi@gentoo.org>
+# Unmask as Vivante is available for arm.
 -video_cards_vivante
 
 # 2006/02/05 - Donnie Berkholz <dberkholz@gentoo.org>
diff --git a/profiles/arch/arm64/use.stable.mask b/profiles/arch/arm64/use.stable.mask
index 6b0c085c24df..8d566940ad3c 100644
--- a/profiles/arch/arm64/use.stable.mask
+++ b/profiles/arch/arm64/use.stable.mask
@@ -4,6 +4,13 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Mike Gilbert <floppym@gentoo.org> (28 Oct 2017)
+# Mask python targets until dev-lang/python is stable.
+python_single_target_python3_6
+python_targets_python3_6
+python_single_target_python3_5
+python_targets_python3_5
+
 # Hans de Graaff <graaff@gentoo.org> (17 Apr 2017)
 # Temporary mask to support stable bug 615818
 ruby_targets_ruby22
diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index 2ea1fb3d89fa..4bbd9a658e28 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -145,9 +145,13 @@ video_cards_virtualbox
 # not needed on non-arm systems
 video_cards_exynos
 video_cards_freedreno
+video_cards_imx
 video_cards_omap
 video_cards_tegra
 video_cards_vc4
+
+# James Le Cuirot <chewi@gentoo.org>
+# Vivante is only available for arm and mips.
 video_cards_vivante
 
 # linux-only drivers
diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask
new file mode 100644
index 000000000000..b5e3fc794948
--- /dev/null
+++ b/profiles/arch/hppa/use.stable.mask
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+#
+# This file requires eapi 5 or later. New entries go on top.
+# Please use the same syntax as in use.mask
+
+# Mike Gilbert <floppym@gentoo.org> (28 Oct 2017)
+# Mask python targets until dev-lang/python is stable.
+python_single_target_python3_6
+python_targets_python3_6
+python_single_target_python3_5
+python_targets_python3_5
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 98a61f2dfc72..bf5ea1799a8a 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Ulrich Müller <ulm@gentoo.org> (23 Oct 2017)
+# Needs net-mail/mailutils which is not keyworded, bug #635216.
+app-editors/emacs-vcs mailutils
+
 # Michał Górny <mgorny@gentoo.org> (10 Aug 2017)
 # Both USE=fluidsynth and USE=timidity are masked in this profile.
 media-libs/sdl-mixer midi
diff --git a/profiles/arch/ia64/use.stable.mask b/profiles/arch/ia64/use.stable.mask
index 88f33d5ae7be..35a65afb6d71 100644
--- a/profiles/arch/ia64/use.stable.mask
+++ b/profiles/arch/ia64/use.stable.mask
@@ -4,6 +4,11 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Mike Gilbert <floppym@gentoo.org> (28 Oct 2017)
+# Mask python targets until dev-lang/python is stable.
+python_single_target_python3_6
+python_targets_python3_6
+
 # Not stable
 mkl
 
diff --git a/profiles/arch/mips/use.mask b/profiles/arch/mips/use.mask
index 6caff81617cb..53e75e2d1b68 100644
--- a/profiles/arch/mips/use.mask
+++ b/profiles/arch/mips/use.mask
@@ -101,6 +101,10 @@ fuse
 # Modular X: mask for architectures lacking direct rendering
 dri
 
+# James Le Cuirot <chewi@gentoo.org>
+# Unmask as Vivante is available for mips.
+-video_cards_vivante
+
 # Stephen P. Becker <geoman@gentoo.org>
 -video_cards_newport
 
diff --git a/profiles/arch/powerpc/ppc32/use.stable.mask b/profiles/arch/powerpc/ppc32/use.stable.mask
index ab73cb222f1a..723fd2fd6b54 100644
--- a/profiles/arch/powerpc/ppc32/use.stable.mask
+++ b/profiles/arch/powerpc/ppc32/use.stable.mask
@@ -1,3 +1,10 @@
+# Mike Gilbert <floppym@gentoo.org> (28 Oct 2017)
+# Mask python targets until dev-lang/python is stable.
+python_single_target_python3_6
+python_targets_python3_6
+python_single_target_python3_5
+python_targets_python3_5
+
 # Andrey Grozin <grozin@gentoo.org> (25 Jun 2014)
 # no stable versions on ppc
 clisp
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index 4de688019de1..d9ddf5b663e5 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Ulrich Müller <ulm@gentoo.org> (23 Oct 2017)
+# Needs net-mail/mailutils which is not keyworded, bug #635216.
+app-editors/emacs-vcs mailutils
+
 # Gilles Dartiguelongue <eva@gentoo.org> (16 Aug 2017)
 # missing keyword on dev-python/dbusmock, bug #620024
 >=gnome-base/gnome-settings-daemon-3.24 test
diff --git a/profiles/arch/powerpc/ppc64/use.stable.mask b/profiles/arch/powerpc/ppc64/use.stable.mask
index e797af411b72..2600691ce736 100644
--- a/profiles/arch/powerpc/ppc64/use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/use.stable.mask
@@ -3,3 +3,8 @@
 
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
+
+# Mike Gilbert <floppym@gentoo.org> (28 Oct 2017)
+# Mask python targets until dev-lang/python is stable.
+python_single_target_python3_6
+python_targets_python3_6
diff --git a/profiles/arch/sparc/use.stable.mask b/profiles/arch/sparc/use.stable.mask
index ad15d3c33df9..c14380875488 100644
--- a/profiles/arch/sparc/use.stable.mask
+++ b/profiles/arch/sparc/use.stable.mask
@@ -4,6 +4,13 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Mike Gilbert <floppym@gentoo.org> (28 Oct 2017)
+# Mask python targets until dev-lang/python is stable.
+python_single_target_python3_6
+python_targets_python3_6
+python_single_target_python3_5
+python_targets_python3_5
+
 # Hans de Graaff <graaff@gentoo.org> (13 Aug 2017)
 # Drop stable ruby on sparc
 ruby
diff --git a/profiles/arch/x86-fbsd/package.use.mask b/profiles/arch/x86-fbsd/package.use.mask
index 6cf70a4cc213..3eca6ee51047 100644
--- a/profiles/arch/x86-fbsd/package.use.mask
+++ b/profiles/arch/x86-fbsd/package.use.mask
@@ -1,6 +1,15 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Thomas Deutschmann <whissi@gentoo.org> (26 Oct 2017)
+# idn: Needs net-dns/libidn2 which is not keyworded
+# uuid: Needs sys-apps/util-linux which is not keyworded
+net-misc/wget idn uuid
+
+# Ulrich Müller <ulm@gentoo.org> (23 Oct 2017)
+# Needs net-mail/mailutils which is not keyworded, bug #635216.
+app-editors/emacs-vcs mailutils
+
 # Thomas Deutschmann <whissi@gentoo.org> (09 Jun 2017)
 # sys-process/audit not keyworded
 sys-process/fcron audit
diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index 118c3436da94..6272cc052145 100644
--- a/profiles/arch/x86/use.stable.mask
+++ b/profiles/arch/x86/use.stable.mask
@@ -4,6 +4,11 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Mike Gilbert <floppym@gentoo.org> (28 Oct 2017)
+# Mask python targets until dev-lang/python is stable.
+python_single_target_python3_6
+python_targets_python3_6
+
 # Michael Palimaka <kensington@gentoo.org> (03 Jun 2017)
 # Not yet stable.
 elogind
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index b2dd00f03339..f974005ac9ef 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,11 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Andreas Sturmlechner <asturm@gentoo.org> (22 Oct 2017)
+# Requires unmaintained unstable dependency net-libs/gloox.
+# The go flag requires stable masked dev-lang/go[gccgo].
+www-servers/uwsgi go pypy uwsgi_plugins_alarm_xmpp
+
 # Andreas Sturmlechner <asturm@gentoo.org> (11 Oct 2017)
 # Requires unstable dependency dev-qt/qtspeech.
 kde-apps/konqueror speech
@@ -21,15 +26,6 @@ sci-libs/gdal mdb
 # Requires guile-2 which is still unstable.
 >=net-irc/weechat-1.7 guile
 
-# James Le Cuirot <chewi@gentoo.org> (27 Aug 2017)
-# Masked for testing.
-media-video/ffmpeg chromium
-www-client/opera system-ffmpeg
-www-client/opera-beta system-ffmpeg
-www-client/opera-developer system-ffmpeg
-www-client/vivaldi system-ffmpeg
-www-client/vivaldi-snapshot system-ffmpeg
-
 # Andreas Sturmlechner <asturm@gentoo.org> (17 Aug 2017)
 # Unstable dependencies.
 kde-apps/kopete cryptography
@@ -107,12 +103,6 @@ dev-lang/rust system-llvm
 # Will always require unstable packages.
 net-libs/gnutls test-full
 
-# Zac Medico <zmedico@gentoo.org> (19 Dec 2016)
-# The go flag requires dev-lang/go[gccgo], and gccgo
-# is stable masked since it requires gcc-5 which is
-# currently unstable.
-www-servers/uwsgi go pypy
-
 # Lars Wendler <polynomial-c@gentoo.org> (15 Dev 2016)
 # Requires php:7.0 and ruby:2.2 being stable
 >=dev-libs/Ice-3.6.3 php ruby
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index df87aee58c20..6bb1b09bf620 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,6 +4,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Patrick Lauer <patrick@gentoo.org> (22 Oct 2017)
+# postgres-9.2 is EOL and masked
+postgres_targets_postgres9_2
+
 # Brian Evans <grknight@gentoo.org> (14 Aug 2017)
 # php 7.2 beta is masked for initial testing
 php_targets_php7-2
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index 58648158bef0..46cc00274594 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -8,11 +8,6 @@
 # Needs dev-lang/php:7.2 stable
 php_targets_php7-2
 
-# Michał Górny <mgorny@gentoo.org> (25 Jan 2017)
-# Early pre-stabilization mask for dev-lang/python:3.6
-python_targets_python3_6
-python_single_target_python3_6
-
 # Brian Evans <grknight@gentoo.org> (06 Dec 2016)
 # Needs dev-lang/php:7.1 stable
 php_targets_php7-1
@@ -24,11 +19,6 @@ python_single_target_pypy
 python_targets_pypy3
 python_single_target_pypy3
 
-# Mike Gilbert <floppym@gentoo.org> (02 Oct 2015)
-# Needs dev-lang/python:3.5 stable
-python_targets_python3_5
-python_single_target_python3_5
-
 # Justin Lecher <jlec@gentoo.org> (30 Sep 2015)
 # No stable libressl yet
 # Addendum: also mask the USE_EXPAND flag,
diff --git a/profiles/default/bsd/fbsd/package.use.mask b/profiles/default/bsd/fbsd/package.use.mask
index b909539f2dd8..63ee6117c6ba 100644
--- a/profiles/default/bsd/fbsd/package.use.mask
+++ b/profiles/default/bsd/fbsd/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Thomas Deutschmann <whissi@gentoo.org> (26 Oct 2017)
+# libressl: dev-libs/libressl is a base package on FreeBSD
+net-misc/wget libressl
+
 # Thomas Deutschmann <whissi@gentoo.org> (20 Jan 2017)
 # libressl: dev-libs/libressl is a base package on FreeBSD
 net-libs/libvncserver libressl
diff --git a/profiles/default/linux/uclibc/arm/package.use.mask b/profiles/default/linux/uclibc/arm/package.use.mask
index 1f208bf612ca..badc04679396 100644
--- a/profiles/default/linux/uclibc/arm/package.use.mask
+++ b/profiles/default/linux/uclibc/arm/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Ulrich Müller <ulm@gentoo.org> (23 Oct 2017)
+# Needs net-mail/mailutils which is not keyworded, bug #635216.
+app-editors/emacs-vcs mailutils
+
 # Davide Pesavento <pesa@gentoo.org> (19 Dec 2016)
 # Various unkeyworded deps: >=sys-devel/clang-3.9 (#591822),
 # dev-qt/qtquickcontrols2 (#603054), dev-qt/qtwebengine (#581478)
diff --git a/profiles/package.mask b/profiles/package.mask
index da5ce78ecb23..be2b910fc337 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,62 @@
 
 #--- END OF EXAMPLES ---
 
+# Mike Gilbert <floppym@gentoo.org> (28 Oct 2017)
+# Tests segfault, bug 635732.
+# No updates upstream since 2013.
+# Removal in 30 days.
+dev-python/whirlpool
+
+# Patrice Clement <monsieurp@gentoo.org> (28 Oct 2017)
+# Missing dependencies.
+>=dev-python/scrapy-1.4.0
+
+# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (23 Oct 2017)
+# Dropping suid breaks some use cases, bug #635102
+# Mask until they are fixed or properly documented, bug #450364
+>=x11-base/xorg-server-1.19.5-r1
+
+# Agostino Sarubbo <ago@gentoo.org> (23 Oct 2017)
+# It was a fresmee RDEPENDS. Freesmee has been removed since a while
+# so it is not a depend of any package. No upstream releases
+# Masked for removal in 30 days. Reference in bug #634536
+dev-util/ticpp
+
+# Robin H. Johnson <robbat2@gentoo.org> (22 Oct 2017)
+# Masking for testing, contains Fedora Hobbled-EC for USE=bindist
+=dev-libs/openssl-1.0.2l-r1
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (22 Oct 2017)
+# Broken with recent Perl (5.26) and not used by anything
+# in the Gentoo repository. Please uninstall.
+sys-devel/autoconf:2.59
+sys-devel/autoconf:2.61
+sys-devel/autoconf:2.62
+sys-devel/autoconf:2.63
+sys-devel/autoconf:2.65
+sys-devel/autoconf:2.67
+sys-devel/autoconf:2.68
+
+# Andreas Sturmlechner <asturm@gentoo.org> (22 Oct 2017)
+# Dead upstream, depends on dead kdelibs4/Qt4.
+# Masked for removal in 30 days. Bug #634388
+media-sound/kstreamripper
+
+# Andreas Sturmlechner <asturm@gentoo.org> (22 Oct 2017)
+# Dead upstream, depends on dead kdelibs4/Qt4.
+# Masked for removal in 30 days. Bug #634384
+kde-misc/kcollectd
+
+# Andreas Sturmlechner <asturm@gentoo.org> (22 Oct 2017)
+# Dead upstream, depends on dead kdelibs4/Qt4.
+# Masked for removal in 30 days. Bug #579518
+media-sound/kmid
+
+# Andreas Sturmlechner <asturm@gentoo.org> (22 Oct 2017)
+# Reverse-deps on dead, masked Qt4WebKit.
+# Masked for removal in 30 days. Bug #623928
+net-im/qutim
+
 # Kent Fredric <kentnl@gentoo.org> (21 Oct 2017)
 # Has not been usable since we cleaned the last Moose it worked on back
 # in 2012. Removal in 30 days. Bug #634938
@@ -96,7 +152,6 @@ dev-qt/qtwebkit:4
 <app-misc/sleepyhead-1.0.0_beta2
 <media-gfx/freecad-0.17_pre
 media-sound/google-musicmanager
-net-im/qutim
 net-misc/teamviewer
 net-voip/vidyodesktop
 <sci-libs/opencascade-7.0
@@ -110,12 +165,12 @@ kde-misc/kbiff
 
 # Andreas Sturmlechner <asturm@gentoo.org> (15 Oct 2017)
 # Dead upstream, depends on dead kdelibs4/Qt4/Qt3Support.
+# Use any image viewer instead, like gwenview.
 # Masked for removal in 30 days. Bug #629018
 kde-misc/kfax
 
 # Andreas Sturmlechner <asturm@gentoo.org> (15 Oct 2017)
 # Dead upstream, depends on dead kdelibs4/Qt4/Qt3Support.
-# Use any image viewer instead, like gwenview.
 # Masked for removal in 30 days. Bug #629018
 kde-misc/kover
 
@@ -253,38 +308,6 @@ app-office/qcharselect
 # Masked for removal in 30 days. Bug #624244.
 sci-chemistry/mongochem
 
-# Michael Palimaka <kensington@gentoo.org> (26 Sep 2017)
-# Requires dead Qt 4. Dead upstream.
-# Masked for removal in 30 days.
-kde-misc/konstruktor
-
-# Michael Palimaka <kensington@gentoo.org> (26 Sep 2017)
-# Requires dead Qt 4. Dead upstream.
-# Masked for removal in 30 days.
-kde-misc/kookie
-
-# Andreas Sturmlechner <asturm@gentoo.org> (26 Sep 2017)
-# Requires dead Qt 4. Dead upstream. Use media-sound/cantata
-# instead, which originally started as a QtMPC fork but is
-# much more advanced. Masked for removal in 30 days.
-media-sound/qtmpc
-
-# Andreas K. Huettel <dilfridge@gentoo.org> (23 Sep 2017)
-# Broken on Perl 5.26 (bug 623096), no fix in sight. No consumers.
-# Removal in 30 days.
-dev-perl/rpm-build-perl
-
-# Hans de Graaff <graaff@gentoo.org> (23 Sep 2017) Mask old
-# unmaintained slots for removal in 30 days. Upgrade to the newer
-# slots.
-dev-ruby/capybara:0
-dev-ruby/xpath:0
-
-# Michael Palimaka <kensington@gentoo.org> (21 Sep 2017)
-# Requires dead Qt 4. Dead upstream.
-# Masked for removal in 30 days.
-media-libs/herqq
-
 # Andrey Grozin <grozin@gentoo.org> (19 Sep 2017)
 # This package was a stopgap to bump dev-python/spyder to 3.*
 # Now >=dev-python/rope-0.10.7 supports python3, use it instead
@@ -296,12 +319,6 @@ dev-python/rope_py3k
 # experimental features and accept a more unstable release.
 >=www-client/chromium-63
 
-# Kent Fredric <kentnl@gentoo.org> (18 Sep 2017)
-# Dead upstream, requires Module::Install. May be kept
-# if somebody can make an argument for it. Bug #631334
-# Masked for removal in 30 days.
-dev-perl/PerlIO-via-symlink
-
 # Andreas Sturmlechner <asturm@gentoo.org> (16 Sep 2017)
 # Unfortunately broken esp. with USE=python. Bugs #623780, #631064
 =sci-geosciences/qgis-2.18.12-r100
diff --git a/profiles/updates/4Q-2017 b/profiles/updates/4Q-2017
index 3fb12cf6a78f..45464e70bb2c 100644
--- a/profiles/updates/4Q-2017
+++ b/profiles/updates/4Q-2017
@@ -1 +1,3 @@
 move dev-ml/ocaml-dns dev-ml/dns
+move dev-perl/HTML-Format dev-perl/HTML-Formatter
+move app-crypt/kencfs app-crypt/kencfs-plasma
diff --git a/profiles/use.desc b/profiles/use.desc
index 9501b38fe33d..91ae1ac5d496 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -367,8 +367,8 @@ videos - Install optional video files (used in some games)
 vim-syntax - Pulls in related vim syntax scripts
 vnc - Enable VNC (remote desktop viewer) support
 vorbis - Add support for the OggVorbis audio codec
-wayland - Enable dev-libs/wayland backend
 wavpack - Add support for wavpack audio compression tools
+wayland - Enable dev-libs/wayland backend
 wddx - Add support for Web Distributed Data eXchange
 webkit - Add support for the WebKit HTML rendering/layout engine
 webp - Add support for the WebP image format
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 8ad1dd19418c..6120d8fd1055 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -304,6 +304,7 @@ app-crypt/hmaccalc:fips - Enable NSS FIPS mode and support only the FIPS-complia
 app-crypt/johntheripper:cuda - Use nvidia cuda toolkit for speeding up cracking on capable devices
 app-crypt/johntheripper:mozilla - Support mozilla password cracking
 app-crypt/johntheripper:opencl - Enable opencl support for speeding up cracking on capable devices
+app-crypt/kbfs:git - Build the Git remote helper for storing repositories in Keybase
 app-crypt/kstart:afs - Enables afs support which means you can acquire an afs token and set PAGs. It's recommended to set this USE if you need authenticated access to an AFS cell for your daemon/app.
 app-crypt/libu2f-host:systemd - Use user ACLs rather than plugdev group to give user access to the HIDRAW device.
 app-crypt/mit-krb5:doc - Creates and installs the API and implementation documentation. This is only useful if you want to develop software which depends on kerberos.
@@ -893,7 +894,6 @@ app-misc/freemind:pdf - Build plugin for exporting mindmaps to SVG and PDF
 app-misc/freemind:svg - Build plugin for exporting mindmaps to SVG and PDF
 app-misc/gcstar:stats - Enable statistics reporting
 app-misc/gcstar:tellico - Enable support for kde-misc/tellico files
-app-misc/geneweb:ocamlopt - Enable ocamlopt support (dev-lang/ocaml native code compiler)
 app-misc/geoclue:geonames - Install geonames.org provider
 app-misc/geoclue:gsmloc - Install GSM location provider
 app-misc/geoclue:gtk - Install gtk-based geoclue-test-gui
@@ -1158,6 +1158,7 @@ app-text/jmupdf:system-mupdf - Link against system version of app-text/mupdf
 app-text/lcdf-typetools:kpathsea - Enable integration with kpathsea search library (TeX related)
 app-text/libebook:tools - Build file conversion tools
 app-text/libmwaw:tools - Build file conversion tools
+app-text/libqxp:tools - Build file conversion tools
 app-text/libstaroffice:tools - Build conversion tools
 app-text/libstaroffice:zlib - Enable support for compressed data
 app-text/libwpd:tools - Build file conversion tools
@@ -1295,7 +1296,6 @@ dev-ada/xmlada:shared - Build shared library
 dev-ada/xmlada:static - Build static library
 dev-ada/xmlada:static-pic - Build static library with pic code
 dev-cpp/eigen:c++11 - Build using the C++11 standard
-dev-cpp/eigen:cpu_flags_x86_f16c - Take advantage of CPU feature f16c
 dev-cpp/eigen:cuda - Build with cuda support
 dev-cpp/glog:gflags - Use dev-cpp/gflags for flag parsing
 dev-cpp/glog:unwind - Use sys-libs/libunwind for stack unwinding instead of glibc/gcc (may be more reliable on x86_64)
@@ -1816,7 +1816,6 @@ dev-java/jdbc-mysql:log4j - Enable log4 support
 dev-java/jfreesvg:debug - Enable debugging during compilation.
 dev-java/jna:awt - Enables support for Java AWT
 dev-java/jna:nio-buffers - Enables support for NIO buffers
-dev-java/jython:readline - Use GNU readline instead of jline
 dev-java/log4j:javamail - Build the SMTPAppender
 dev-java/log4j:jms - Build the JMSAppender
 dev-java/logback:tomcat - Builds Apache Tomcat support
@@ -2182,6 +2181,8 @@ dev-libs/m17n-lib:libxml2 - Use dev-libs/libxml2 to parse XML
 dev-libs/nss:cacert - Include root/class3 certs from CAcert (http://www.cacert.org/)
 dev-libs/nss:nss-pem - Add support for libnsspem
 dev-libs/nss:utils - Install utilities included with the library
+dev-libs/onigmo:combination-explosion-check - enable combination explosion check
+dev-libs/onigmo:crnl-as-line-terminator - enable CR+NL as line terminator
 dev-libs/oniguruma:combination-explosion-check - enable combination explosion check
 dev-libs/oniguruma:crnl-as-line-terminator - enable CR+NL as line terminator
 dev-libs/opencryptoki:tpm - Enable support for Trusted Platform Module (TPM) using app-crypt/trousers
@@ -2194,7 +2195,7 @@ dev-libs/opensc:openct - Use dev-libs/openct (and CT-API) for accessing Smartcar
 dev-libs/opensc:pcsc-lite - Use sys-apps/pcsc-lite (and PC/SC API) for accessing Smartcard hardware.
 dev-libs/opensc:secure-messaging - Enable secure messaging.
 dev-libs/openssl:asm - Support assembly hand optimized crypto functions (i.e. faster run time)
-dev-libs/openssl:bindist - Disable EC algorithms (as they seem to be patented) -- note: changes the ABI
+dev-libs/openssl:bindist - Disable/Restrict EC algorithms (as they seem to be patented) -- note: changes the ABI
 dev-libs/openssl:rfc3779 - Enable support for RFC 3779 (X.509 Extensions for IP Addresses and AS Identifiers)
 dev-libs/openssl:sslv2 - Support for the old/insecure SSLv2 protocol -- note: not required for TLS/https
 dev-libs/openssl:sslv3 - Support for the old/insecure SSLv3 protocol -- note: not required for TLS/https
@@ -2216,6 +2217,7 @@ dev-libs/poco:zip - Add support for the zip & gz archive formats
 dev-libs/ppl:lpsol - Build the ppl_lpsol linear programming problem solver
 dev-libs/protobuf:java - Builds the Java implementation. This is not needed for Java support in protoc.
 dev-libs/protobuf:python - Builds the Python implementation. This is not needed for Python support in protoc.
+dev-libs/purpose:kaccounts - Enable support for system-wide defined KAccounts
 dev-libs/softhsm:migration-tool - Build db migration tool
 dev-libs/starpu:cuda - Enable NVIDIA CUDA toolkit support
 dev-libs/starpu:gcc-plugin - Enable GCC extension plugin (experimental)
@@ -2538,7 +2540,6 @@ dev-python/passlib:totp - time based one time password support
 dev-python/paste:flup - enable support for flup (and therefore for various wgsi servers and middleware)
 dev-python/paste:openid - enable OpenID support
 dev-python/pillow:imagequant - Build with Image Quantization Library support
-dev-python/pillow:ole - Add support for OLE2 image format
 dev-python/py-amqp:extras - Install extra tools to generate initial Python mod from an AMQP XML file
 dev-python/pygame:midi - Enable midi support using media-libs/portmidi
 dev-python/pygpu:cuda - Enable NVIDIA CUDA toolkit support
@@ -2844,6 +2845,31 @@ dev-util/cwdiff:a2ps - install app-text/a2ps for postscript output
 dev-util/cwdiff:mercurial - install hg wdiff alias for dev-vcs/mercurial
 dev-util/devhelp:gedit - Install plugin for app-editors/gedit
 dev-util/dialog:minimal - Disable library, install command-line program only
+dev-util/diffoscope:R - Use dev-lang/R
+dev-util/diffoscope:binutils - Use sys-devel/binutils
+dev-util/diffoscope:colord - Use x11-misc/colord
+dev-util/diffoscope:cpio - Use app-arch/cpio
+dev-util/diffoscope:diff - Use sys-apps/diffutils
+dev-util/diffoscope:docx - Use app-text/docx2txt
+dev-util/diffoscope:dtc - Use sys-apps/dtc
+dev-util/diffoscope:e2fsprogs - Use sys-fs/e2fsprogs
+dev-util/diffoscope:file - Use sys-apps/file
+dev-util/diffoscope:find - Use sys-apps/findutils
+dev-util/diffoscope:gettext - Use sys-devel/gettext
+dev-util/diffoscope:gpg - Use app-crypt/gnupg
+dev-util/diffoscope:haskell - Use dev-lang/ghc
+dev-util/diffoscope:hex - Use app-editors/vim-core
+dev-util/diffoscope:iso - Use virtual/cdrtools
+dev-util/diffoscope:llvm - Use sys-devel/llvm
+dev-util/diffoscope:opendocument - Use app-text/odt2txt
+dev-util/diffoscope:pascal - Use dev-lang/fpc
+dev-util/diffoscope:rpm - Use app-arch/rpm
+dev-util/diffoscope:squashfs - Use sys-fs/squashfs-tools
+dev-util/diffoscope:ssh - Use net-misc/openssh
+dev-util/diffoscope:tar - Use app-arch/tar
+dev-util/diffoscope:tcpdump - Use net-analyzer/tcpdump
+dev-util/diffoscope:xz - Use app-arch/xz-utils
+dev-util/diffoscope:zip - Use app-arch/unzip
 dev-util/edb-debugger:graphviz - Add support for the Graphviz library
 dev-util/edb-debugger:legacy-mem-write - Probe if writes to /proc/PID/mem are broken.
 dev-util/edb-debugger:pax_kernel - Enable building under a PaX enabled kernel
@@ -4917,6 +4943,7 @@ media-video/libav:vpx - Enable vp8 encoding support using media-libs/libvpx.
 media-video/libav:webp - Enable WebP encoding with media-libs/libwebp.
 media-video/libav:x265 - Enable HEVC encoding with media-libs/x265.
 media-video/libva-utils:drm - Enables VA/DRM API support.
+media-video/makemkv:gui - Build the Qt5 GUI
 media-video/minitube:download - Enable support for downloading YouTube videos
 media-video/mjpegtools:sdlgfx - Enables y4mhist to display a graphical histogram
 media-video/mjpg-streamer:input_control - Plugin giving ability to control camera movement (only specific cameras)
@@ -5263,13 +5290,15 @@ net-analyzer/pchar:pcap - Use the net-libs/libpcap library
 net-analyzer/pinger:gtk2 - Install the gtkpinger GUI utility based on x11-libs/gtk+:2
 net-analyzer/pinger:gtk3 - Install the gtkpinger GUI utility based on x11-libs/gtk+:3
 net-analyzer/pmacct:64bit - Use 64bit counters instead of 32bit ones
-net-analyzer/pmacct:geoipv2 - Add support for GeoIP2 through dev-libs/libmaxminddb
-net-analyzer/pmacct:jansson - Add support for JSON through dev-libs/jansson
-net-analyzer/pmacct:kafka - Add support for Apache Kafka through dev-libs/librdkafka
-net-analyzer/pmacct:mongodb - Add support for mongodb backend
-net-analyzer/pmacct:nflog - Add support for NFLOG through uacctd
-net-analyzer/pmacct:rabbitmq - Add support for RabbitMQ through net-libs/rabbitmq-c
+net-analyzer/pmacct:geoipv2 - Enable support for GeoIP2 through dev-libs/libmaxminddb
+net-analyzer/pmacct:jansson - Enable support for JSON through dev-libs/jansson
+net-analyzer/pmacct:kafka - Enable support for Apache Kafka through dev-libs/librdkafka
+net-analyzer/pmacct:mongodb - Enable support for MongoDB through dev-libs/mongo-c-driver
+net-analyzer/pmacct:ndpi - Enable support for nDPI through net-libs/nDPI
+net-analyzer/pmacct:nflog - Enable support for NFLOG through uacctd
+net-analyzer/pmacct:rabbitmq - Enable support for RabbitMQ through net-libs/rabbitmq-c
 net-analyzer/pmacct:ulog - Enable support for ULOG in older kernels (deprecated)
+net-analyzer/pmacct:zmq - Enable support for ZeroMQ through net-libs/zeromq
 net-analyzer/prelude-lml:tls - Enables Prelude LML support Syslog through TLS using net-libs/gnutls.
 net-analyzer/rrdcollect:exec - Enable exec:/// support
 net-analyzer/rrdcollect:librrd - Use the librrd library from net-analyzer/rrdtool
@@ -5358,7 +5387,7 @@ net-analyzer/wireshark:sshdump - Install sshdump, an extcap interface to capture
 net-analyzer/wireshark:text2pcap - Install text2pcap, to generate a capture file from an ASCII hexdump of packets
 net-analyzer/wireshark:tfshark - Install tfshark, a terminal-based version of the FileShark capability
 net-analyzer/wireshark:tshark - Install tshark, to dump and analyzer network traffic from the command line
-net-analyzer/wireshark:udpdump - Install udpdumpi, to get packets exported from a source (like a network device or a GSMTAP producer) that are dumped to a pcap file
+net-analyzer/wireshark:udpdump - Install udpdump, to get packets exported from a source (like a network device or a GSMTAP producer) that are dumped to a pcap file
 net-analyzer/zabbix:agent - Enable zabbix agent (for to-be-monitored machines)
 net-analyzer/zabbix:frontend - Enable zabbix web frontend
 net-analyzer/zabbix:ipv6 - Turn on support of IPv6
@@ -5554,6 +5583,7 @@ net-fs/samba:addc - Enable Active Directory Domain Controller support
 net-fs/samba:addns - Enable AD DNS integration
 net-fs/samba:ads - Enable Active Directory support
 net-fs/samba:aio - Enable asynchronous IO support
+net-fs/samba:ceph - Enable support for Ceph distributed filesystem via sys-cluster/ceph
 net-fs/samba:client - Enables the client part
 net-fs/samba:cluster - Enable support for clustering
 net-fs/samba:dmapi - Enable support for DMAPI. This currently works only in combination with XFS.
@@ -6060,6 +6090,7 @@ net-libs/webkit-gtk:egl - Enable EGL support
 net-libs/webkit-gtk:geoloc - Enable geolocation support through app-misc/geoclue
 net-libs/webkit-gtk:geolocation - Enable geolocation support through app-misc/geoclue
 net-libs/webkit-gtk:gles2 - Enable GLESv2 support
+net-libs/webkit-gtk:nsplugin - Enable full nsplugin support (GTK2 plugins)
 net-libs/webkit-gtk:webgl - Build support for the WebGL HTML API using virtual/opengl
 net-libs/wvstreams:boost - Use dev-libs/boost to provide TR1-compatible functional interface. This USE flag is only needed with GCC earlier than version 4.1, or with other compilares not providing said interface.
 net-libs/xrootd:fuse - Enable the sys-fs/fuse filesystem driver
@@ -7329,6 +7360,7 @@ sci-mathematics/why3-for-spark:html - Build HTML documentation
 sci-mathematics/why3-for-spark:hypothesis-selection - Enable hypothesis selection
 sci-mathematics/why3-for-spark:profiling - Enable profiling
 sci-mathematics/why3-for-spark:zarith - Use dev-ml/zarith
+sci-mathematics/why3-for-spark:zip - Enable compression of session files
 sci-mathematics/yacas:doc - Generate HTML documentation
 sci-mathematics/yacas:gui - Build graphical interface for the native yacas engine. Requires Qt5
 sci-mathematics/yacas:java - Build the Java yacas engine and text console for it
@@ -8071,6 +8103,7 @@ sys-libs/db:rpc - Enable rpc client/server
 sys-libs/freeipmi:nagios - Install a nagios plugin to check sensors' status.
 sys-libs/gdbm:berkdb - enable compatibility layer for UNIX-like dbm and ndbm interfaces
 sys-libs/gdbm:exporter - enable gdbmexport binary for exporting data from gdbm-1.8 databases into gdbm-1.9
+sys-libs/glibc:compile-locales - build *all* locales in src_install; this is generally meant for stage building only as it ignores /etc/locale.gen file and can be pretty slow
 sys-libs/glibc:debug - When USE=hardened, allow fortify/stack violations to dump core (SIGABRT) and not kill self (SIGKILL)
 sys-libs/glibc:gd - build memusage and memusagestat tools
 sys-libs/glibc:nscd - Build, and enable support for, the Name Service Cache Daemon
@@ -8275,10 +8308,12 @@ www-client/chromium:system-libvpx - Use system libvpx instead of the bundled one
 www-client/chromium:tcmalloc - Use bundled tcmalloc instead of system malloc
 www-client/chromium:widevine - Unsupported closed-source DRM capability (required by Netflix VOD)
 www-client/elinks:bittorrent - Enable support for the BitTorrent protocol
+www-client/elinks:brotli - Enable support for brotli compression
 www-client/elinks:finger - Enable support for the finger protocol
 www-client/elinks:gc - Enable garbage collection support via dev-libs/boehm-gc
 www-client/elinks:gopher - Enable support for the gopher protocol
 www-client/elinks:mouse - Make elinks to grab all mouse events
+www-client/elinks:tre - Enable support for regex searches via dev-libs/tre
 www-client/elinks:xml - Enable support for bookmarks via dev-libs/expat
 www-client/firefox:bindist - Disable official Firefox branding (icons, name) which are not binary-redistributable according to upstream.
 www-client/firefox:custom-optimization - Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)
@@ -8323,7 +8358,6 @@ www-client/netsurf:webp - WebP image support (media-libs/libwebp)
 www-client/opera:gtk - Install support libraries and runtime dependencies to support GTK+/GNOME desktop integration
 www-client/qupzilla:kwallet - Enable encrypted storage of passwords with kde-frameworks/kwallet
 www-client/qupzilla:nonblockdialogs - Enable fancy non-blocking JavaScript dialogs shown inside the page, not blocking the application window. When closing browser windows with open dialogs, this can crash the application.
-www-client/qutebrowser:webengine - Install packages required for experimental rendering support with webengine.
 www-client/seamonkey:calendar - Build Mozilla's calendar
 www-client/seamonkey:chatzilla - Build Mozilla's IRC client (default on)
 www-client/seamonkey:custom-optimization - Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)
@@ -8601,6 +8635,7 @@ x11-misc/xmobar:with_conduit - Use conduit to fetch weather data.
 x11-misc/xmobar:with_uvmeter - Plugin to show UV data for Australia.
 x11-misc/xscreensaver:gdm - Use gdmflexiserver from gnome-base/gdm instead of x11-misc/lightdm
 x11-misc/xscreensaver:new-login - Enable user switching support using gdmflexiserver (x11-misc/lightdm)
+x11-misc/xsr:cursor - Capture mouse cursor using x11-misc/xdotool, and place them on the screenshots using media-gfx/imagemagick
 x11-misc/xss-lock:man - Build and install man pages
 x11-plugins/bfm:gkrellm - Enable building of app-admin/gkrellm module
 x11-plugins/compiz-plugins-extra:gconf - Install GConf schemas for the plugins, needed when using the GConf-based configuration backend in x11-wm/compiz.
diff --git a/sci-biology/psipred/Manifest b/sci-biology/psipred/Manifest
index d97ee24d63d1..7a0c8ba961b3 100644
--- a/sci-biology/psipred/Manifest
+++ b/sci-biology/psipred/Manifest
@@ -1,5 +1,4 @@
 AUX 3.1-Makefile.patch 1103 SHA256 de49b937edc714ba84ea2ae0900ea92b73c58048fafb8d616e8dfa44b548e927 SHA512 6e0daf4478b5b992ed1647bf653320b18cd2582ca69ebe761654bd4bd9c9c46b7de183ae84a28582cb5543603362eb7eb6c306ff562c3ec18c292d89480fd127 WHIRLPOOL 2d491dff1be16cf09413ff2f1087bc6888509a4db5dad56ec79422ed42e688855e1ff6f6d456257631b69ca3c185cba6143c1dcad353fef2b9af49ab9a2f5501
-AUX 3.1-fgets.patch 427 SHA256 a1f52692ad3593278718a8d2cc95d176e8bcd773305a6f6769a5c76106cd6423 SHA512 f6fbea6ff576482d394eeaa841db689d4f410ac29274f20713bfd6ad3ae4182dce1f7675be113a94d2b08dd3cc0c7a900bf23cfdd6a8d034622b8aa06194af90 WHIRLPOOL 01d246024996df3d78f0330b753d2457805c1561a8fa99a080400c0b34730db014d60e5147c6689aa489385bd313a7809b3b22c036cdd6ddd23cf326042cec1d
 AUX 3.1-path.patch 1128 SHA256 0b91a360760bd27f4ba43639d32e891d5576595451e1f7285632fc9ad38a80fa SHA512 e6201669db910f074bb13d1b781416d8d99300f328147cccd7755d5d6595b25aa45353f6da6566f225a067e94ab8ee41ea89bfd75cf2cdf2c076481707acf88c WHIRLPOOL 33802ea504dea3445c8024b9c13eb351a009f13ee4b4a1d126392e5d807006d08dc0c582972eac2d13975d9acc9f6b5ccbf1bdc09115810abcc63dcae5e393cd
 AUX 3.2-fgets.patch 427 SHA256 95d68881c502c567025eb5e74fcd545bf012ded48ab2731aa70827f0ff449696 SHA512 a8a59a765057e20b9c606b8e4d76b5657a9a06150247b426d939805547148ddc8a1cb4282e04bcdcd756bfa6df7bebffcc77b84f62c86be2f643069d2ff913bb WHIRLPOOL 92b0c8af14387db54eef5ea171ffd0c096658f6922729a6a1a1836eeb14b21b1feb3cd330dfb564eb3aaa8435d18b55f4559da96fb32f666f88349a1af3fb191
 DIST psipred3.3.tar.gz 1239746 SHA256 133eef16ba4ac6ff5e10a757290ef794552833f42ed8251ff866ae56d9527c40 SHA512 38f5dd0f6eb6fc38888f9a850604b95904a8626d6862eb0b2a389caaf49af8f81436aa78a087da22281113d8afad2d28e5109ddade7d17718c1028eed8325b7e WHIRLPOOL d3883df88bde12a0f5ba6e195dc37b7104db36d16b5846b978fb045def6c4452edce4361dcced27ed36937bbd8d0e8dd4391b8592dca390941b3450e49cc5d34
diff --git a/sci-biology/psipred/files/3.1-fgets.patch b/sci-biology/psipred/files/3.1-fgets.patch
deleted file mode 100644
index e58d677258e0..000000000000
--- a/sci-biology/psipred/files/3.1-fgets.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/sspred_avpred.c b/src/sspred_avpred.c
-index 4d8e5ff..0d82483 100644
---- a/src/sspred_avpred.c
-+++ b/src/sspred_avpred.c
-@@ -213,7 +213,7 @@ predict(int argc, char **argv)
- int             getmtx(FILE *lfil)
- {
-     int             aa, i, j, naa;
--    char            buf[256], *p;
-+    char            buf[65536], *p;
-     
-     if (fscanf(lfil, "%d", &naa) != 1)
- 	fail("Bad mtx file - no sequence length!");
diff --git a/sci-biology/trnascan-se/Manifest b/sci-biology/trnascan-se/Manifest
index d5df13d2c367..718cc6e7c376 100644
--- a/sci-biology/trnascan-se/Manifest
+++ b/sci-biology/trnascan-se/Manifest
@@ -1,5 +1,3 @@
-AUX trnascan-se-1.23-glibc-2.10.patch 6702 SHA256 16c6083f8a2991d22252a23184a45c74e0fd75b5a45085c3dcea7d1cd503cf42 SHA512 2df0a5d6bf633b9b1c1ccce002c5a751a3f5c5eedf755b24a3af1a6d07a93816b6be4195aa3142ebcbd16ad9b373223f398fbac1d91769b26be1d295f080f181 WHIRLPOOL d8bc3d22d50446ffc628276261d091cb0552e564c0d80c9c6fe6e4108c3c036a11fadd48c45a115fef56ac01a49df0b7a0cebb026fcff05344822c29b074f971
-AUX trnascan-se-1.23-ldflags.patch 971 SHA256 6013162268bc78f6752ce8703d9fd1810f634a9176b55dac67155b8decb8e6e9 SHA512 bcfdc71dc8454e110d45f44bf9c4a0b4e77ca85bcf0b501dd2de60c47418bc5d442b1ac976c6a333eb4398a12e4478b8817436246a1f872df208d5eaf64c3ac2 WHIRLPOOL f1afc811efcc061a114ab6b14ac2ef4ce8c7091bdfa6a392ac55dd6f1e38f1d1ded94f218309e2e3abd515ef80bffbefd7e4ed30d993e16603c0477b988f48b3
 AUX trnascan-se-1.31-ldflags.patch 973 SHA256 e103841dfe3f289493c80fc938a3c9318a550e160b3269b9856405ee48dc648a SHA512 ff677ce9ac3ed9299f6a3bf977642e2a6c300a1b801436bb5d3787968cfe28357a0ec23d0438f0b15c06324cd7e1bbbda590c8fb5574577a3f653779316931df WHIRLPOOL 2ba11012cd414d2dc9a523109bfebe726a347558cf1098f52410fc88c652665e6babeaef5581dce12fdd1a83af8ed417d8040ef481d5036a9632838f997333c2
 DIST trnascan-se-1.31.tar.gz 740960 SHA256 862924d869453d1c111ba02f47d4cd86c7d6896ff5ec9e975f1858682282f316 SHA512 ba55bc8dfa7e5aee9c9a86c135a55b767cda083b74668bd9af4aaaeb693f9c3a17dc8bade5793de12b775564f09fbb861b0ab4f25bf83ccb0954fecd01bb328d WHIRLPOOL aef8b9f8d44799bac134a36af45374cdaba4b30c041e71e3095252aa8272fe9bd0aa76091211ac270ad609f67f388d577a83ec2ed2433997963fd5708c5b6665
 EBUILD trnascan-se-1.31.ebuild 1191 SHA256 f70623b4b41a9efe071bb98865a3eb1ecc67293f42371d32ed118c47c3fb6ebb SHA512 d79fa9d244d4f3ab98fff94aca074bd23cc953c0b812a270daca2e80c440fcdcfd38e92cba2eea6ccd2ad9873c8fb898f46b9f4356c638d01fa0f2b21e23c55b WHIRLPOOL 564cd24e354568dfcedf143fe6a60746ee282c334e6ee20fde196803cf57a237c52913be7be1ef559b0403bdb8676cc9bb3429e4f9f27dcd4b71b6c5c8f4527b
diff --git a/sci-biology/trnascan-se/files/trnascan-se-1.23-glibc-2.10.patch b/sci-biology/trnascan-se/files/trnascan-se-1.23-glibc-2.10.patch
deleted file mode 100644
index e21da6e58db0..000000000000
--- a/sci-biology/trnascan-se/files/trnascan-se-1.23-glibc-2.10.patch
+++ /dev/null
@@ -1,292 +0,0 @@
-diff -ur trnascan-se-1.23.orig/sqio.c trnascan-se-1.23/sqio.c
---- trnascan-se-1.23.orig/sqio.c	2002-04-12 23:12:04.000000000 +0300
-+++ trnascan-se-1.23/sqio.c	2009-08-05 21:45:53.000000000 +0300
-@@ -235,7 +235,7 @@
- }
- 
- static void 
--getline(struct ReadSeqVars *V)
-+get_line(struct ReadSeqVars *V)
- {
-   readline(V->f, V->sbuffer);
- }
-@@ -306,7 +306,7 @@
-   V->seqlen = 0;
-   if (addfirst) addseq(V->sbuffer, V);
-   do {
--    getline(V);
-+    get_line(V);
-     done = feof(V->f);
-     done |= (*endTest)(V->sbuffer, &addend);
-     if (addend || !done)
-@@ -332,7 +332,7 @@
-   char *sptr;
- 				/* load first line of entry  */
-   while (!feof(V->f) && strncmp(V->sbuffer, "ENTRY", 5) != 0)
--    getline(V);
-+    get_line(V);
-   if (feof(V->f)) return;
- 
-   if ((sptr = strtok(V->sbuffer + 15, "\n\t ")) != NULL)
-@@ -341,7 +341,7 @@
-       SetSeqinfoString(V->sqinfo, sptr, SQINFO_ID);
-     }
-   do {
--    getline(V);
-+    get_line(V);
-     if (!feof(V->f) && strncmp(V->sbuffer, "TITLE", 5) == 0)
-       SetSeqinfoString(V->sqinfo, V->sbuffer+15, SQINFO_DESC);
-     else if (!feof(V->f) && strncmp(V->sbuffer, "ACCESSION", 9) == 0)
-@@ -350,7 +350,7 @@
- 	  SetSeqinfoString(V->sqinfo, sptr, SQINFO_ACC);
-       }
-   } while (! feof(V->f) && (strncmp(V->sbuffer,"SEQUENCE", 8) != 0));
--  getline(V);			/* skip next line, coords */
-+  get_line(V);			/* skip next line, coords */
- 
-   readLoop(0, endPIR, V);
- 
-@@ -364,7 +364,7 @@
-   /* get next line
-    */
-   while (!feof(V->f) && strncmp(V->sbuffer, "ENTRY", 5) != 0)
--    getline(V);
-+    get_line(V);
- }
- 
- 
-@@ -382,7 +382,7 @@
-   char *nm;
- 				/* position past ';' comments */
-   do {
--    getline(V);
-+    get_line(V);
-   } while (! (feof(V->f) || ((*V->sbuffer != 0) && (*V->sbuffer != ';')) ));
- 
-   if (!feof(V->f))
-@@ -394,7 +394,7 @@
-     }
-   
-   while (!(feof(V->f) || ((*V->sbuffer != '\0') && (*V->sbuffer == ';'))))
--    getline(V);
-+    get_line(V);
- }
- 
- static int 
-@@ -416,7 +416,7 @@
- 	  if ((nm = strtok(V->sbuffer+16, ",\n\t ")) != NULL)
- 	    SetSeqinfoString(V->sqinfo, nm, SQINFO_NAME);
- 	}
--      getline(V);
-+      get_line(V);
-     }
- 
-   if (! feof(V->f))
-@@ -425,7 +425,7 @@
-   /* load next line
-    */
-   while ((!feof(V->f)) && (*V->sbuffer != ';')) 
--    getline(V);
-+    get_line(V);
- }
- 
- 
-@@ -443,7 +443,7 @@
-   int   in_definition;
- 
-   while (strncmp(V->sbuffer, "LOCUS", 5) != 0)
--    getline(V);
-+    get_line(V);
- 
-   if ((sptr = strtok(V->sbuffer+12, "\n\t ")) != NULL)
-     {
-@@ -454,7 +454,7 @@
-   in_definition = FALSE;
-   while (! feof(V->f))
-     {
--      getline(V);
-+      get_line(V);
-       if (! feof(V->f) && strstr(V->sbuffer, "DEFINITION") == V->sbuffer)
- 	{
- 	  if ((sptr = strtok(V->sbuffer+12, "\n")) != NULL)
-@@ -487,11 +487,11 @@
- 
- 
-   while (!(feof(V->f) || ((*V->sbuffer!=0) && (strstr(V->sbuffer,"LOCUS") == V->sbuffer))))
--    getline(V);
-+    get_line(V);
- 				/* SRE: V->s now holds "//", so sequential
- 				   reads are wedged: fixed Tue Jul 13 1993 */
-   while (!feof(V->f) && strstr(V->sbuffer, "LOCUS  ") != V->sbuffer)
--    getline(V);
-+    get_line(V);
- }
- 
- static int
-@@ -521,12 +521,12 @@
-   if ((sptr = strtok(V->sbuffer+4, "\n\t ")) != NULL)
-     SetSeqinfoString(V->sqinfo, sptr, SQINFO_NAME);
- 
--  getline(V);   /*skip title-junk line*/
-+  get_line(V);   /*skip title-junk line*/
- 
-   readLoop(0, endNBRF, V);
- 
-   while (!(feof(V->f) || (*V->sbuffer != 0 && *V->sbuffer == '>')))
--    getline(V);
-+    get_line(V);
- }
- 
- 
-@@ -559,7 +559,7 @@
-   } else Die("bogus GCGdata format? %s", V->sbuffer);
- 
- 				/* second line contains free text description */
--  getline(V);
-+  get_line(V);
-   SetSeqinfoString(V->sqinfo, V->sbuffer, SQINFO_DESC);
- 
-   if (binary) {
-@@ -579,7 +579,7 @@
-   else readLoop(0, endGCGdata, V);
-   
-   while (!(feof(V->f) || ((*V->sbuffer != 0) && (*V->sbuffer == '>'))))
--    getline(V);
-+    get_line(V);
- }
- 
- static int
-@@ -625,7 +625,7 @@
-     readLoop(0, endPearson, V);
- 
-   while (!(feof(V->f) || ((*V->sbuffer != 0) && (*V->sbuffer == '>'))))
--    getline(V);
-+    get_line(V);
- }
- 
- 
-@@ -652,7 +652,7 @@
- 
- 				/* make sure we have first line */
-   while (!feof(V->f) && strncmp(V->sbuffer, "ID  ", 4) != 0)
--    getline(V);
-+    get_line(V);
- 
-   if ((sptr = strtok(V->sbuffer+5, "\n\t ")) != NULL)
-     {
-@@ -661,7 +661,7 @@
-     }
- 
-   do {
--    getline(V);
-+    get_line(V);
-     if (!feof(V->f) && strstr(V->sbuffer, "AC  ") == V->sbuffer)
-       {
- 	if ((sptr = strtok(V->sbuffer+5, ";  \t\n")) != NULL)
-@@ -685,7 +685,7 @@
- 
- 				/* load next record's ID line */
-   while (!feof(V->f) && strncmp(V->sbuffer, "ID  ", 4) != 0)
--    getline(V);
-+    get_line(V);
- }
- 
- 
-@@ -701,7 +701,7 @@
- {
-   char *sptr;
- 
--  getline(V);  /*s == "seqLen seqid string..."*/
-+  get_line(V);  /*s == "seqLen seqid string..."*/
- 
-   if ((sptr = strtok(V->sbuffer+6, " \t\n")) != NULL)
-     SetSeqinfoString(V->sqinfo, sptr, SQINFO_NAME);
-@@ -712,7 +712,7 @@
-   readLoop(0, endZuker, V);
- 
-   while (!(feof(V->f) | ((*V->sbuffer != '\0') & (*V->sbuffer == '('))))
--    getline(V);
-+    get_line(V);
- }
- 
- static void 
-@@ -734,7 +734,7 @@
- 
-   do {
-     done = feof(V->f);
--    getline(V);
-+    get_line(V);
-     if (! done) addseq(V->sbuffer, V);
-   } while (!done);
- }
-@@ -746,7 +746,7 @@
-   char *sptr;
-   int   dostruc = FALSE;
- 
--  while (strncmp(V->sbuffer, "NAM ", 4) != 0) getline(V);
-+  while (strncmp(V->sbuffer, "NAM ", 4) != 0) get_line(V);
- 
-   if ((sptr = strtok(V->sbuffer+4, "\n\t ")) != NULL)
-     SetSeqinfoString(V->sqinfo, sptr, SQINFO_NAME);
-@@ -754,7 +754,7 @@
-   /*CONSTCOND*/
-   while (1)
-     {
--      getline(V);
-+      get_line(V);
-       if (feof(V->f)) {squid_errno = SQERR_FORMAT; return; }
- 
-       if (strncmp(V->sbuffer, "SRC ", 4) == 0)
-@@ -786,14 +786,14 @@
-   while (1)
-     {
- 				/* sequence line */
--      getline(V);
-+      get_line(V);
-       if (feof(V->f) || strncmp(V->sbuffer, "++", 2) == 0) 
- 	break;
-       addseq(V->sbuffer, V);
- 				/* structure line */
-       if (dostruc)
- 	{
--	  getline(V);
-+	  get_line(V);
- 	  if (feof(V->f)) { squid_errno = SQERR_FORMAT; return; }
- 	  addstruc(V->sbuffer, V);
- 	}
-@@ -801,7 +801,7 @@
- 
- 
-   while (!feof(V->f) && strncmp(V->sbuffer, "NAM ", 4) != 0)
--    getline(V);
-+    get_line(V);
- }
- 
- 
-@@ -848,7 +848,7 @@
- 
-   /* Load the first line.
-    */
--  getline(dbfp);
-+  get_line(dbfp);
- 
-   return dbfp;
- }
-@@ -862,7 +862,7 @@
- SeqfilePosition(SQFILE *sqfp, long offset)
- {
-   fseek(sqfp->f, offset, SEEK_SET);
--  getline(sqfp);
-+  get_line(sqfp);
- }
- 
- 
-@@ -954,7 +954,7 @@
- 	do {			/* skip leading comments on GCG file */
- 	  gotuw = (strstr(V->sbuffer,"..") != NULL);
- 	  if (gotuw) readUWGCG(V);
--	  getline(V);
-+	  get_line(V);
- 	} while (! feof(V->f));
- 	break;
- 
diff --git a/sci-biology/trnascan-se/files/trnascan-se-1.23-ldflags.patch b/sci-biology/trnascan-se/files/trnascan-se-1.23-ldflags.patch
deleted file mode 100644
index 783e4340823d..000000000000
--- a/sci-biology/trnascan-se/files/trnascan-se-1.23-ldflags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 53e5c5b..a2d3feb 100644
---- a/Makefile
-+++ b/Makefile
-@@ -109,17 +109,17 @@ MPOBJ = mpviterbi.o mp-dbviterbi.o
- all: 	$(PROGS) tRNAscanSE setpaths
- 
- covels-SE:  $(OBJ) scan_main.o
--	$(CC) $(CFLAGS) $(RFLAGS) -o covels-SE scan_main.o $(OBJ) $(LIBS)
-+	$(CC) $(CFLAGS) $(RFLAGS) $(LDFLAGS) -o covels-SE scan_main.o $(OBJ) $(LIBS)
- 
- coves-SE: $(OBJ) score_main.o
--	$(CC) $(CFLAGS) $(RFLAGS) -o coves-SE score_main.o $(OBJ) $(LIBS)
-+	$(CC) $(CFLAGS) $(RFLAGS) $(LDFLAGS) -o coves-SE score_main.o $(OBJ) $(LIBS)
- 
- eufindtRNA: $(SQUIDOBJ) pavesi.o eufind_main.o
--	$(CC) $(CFLAGS)  -o eufindtRNA eufind_main.o \
-+	$(CC) $(CFLAGS)  $(LDFLAGS) -o eufindtRNA eufind_main.o \
- 	pavesi.o $(SQUIDOBJ) $(LIBS)
- 
- trnascan-1.4: trnascan.o
--	$(CC) $(CFLAGS) -DTSCANDIR=\"$(LIBDIR)\" -o trnascan-1.4 trnascan.c
-+	$(CC) $(CFLAGS) -DTSCANDIR=\"$(LIBDIR)\" $(LDFLAGS) -o trnascan-1.4 trnascan.c
- 
- tRNAscanSE:
- 	$(PERLDIR)/$(PERLBIN) checkversion.pl
diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index f4de346a31e8..603459f2deca 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -1,5 +1,7 @@
 DIST units-2.14.tar.gz 1177024 SHA256 9d33893d82f3ddd831d5822992007c40bcd0826ae67d3cbc96539951fb0a82e8 SHA512 3cd09a76fb1cccbafaa3e023c791740738c8347425b2645cad1fa768dee3ebde917602cf65988ee8922fed512ec0bc2367f68545450789fc6bf1a79f066a6986 WHIRLPOOL ae4c0297387e9d3e42ae556a5f528f9c6f1b6a75f5f90580c5b9729ccdea011962d0e891c13ed583a97167bb62d5d074ab3b695ffdd23304f72a62098ce87821
+DIST units-2.15.tar.gz 1178099 SHA256 25d6334fafc801e15b3b0388e207e1efc5d4ae88af6dc7b17d3913de6441f47c SHA512 3fd60acd12142ea3c20bf39184394f300a8284a8946beaf89a8bf2f87c77d8a1ab02189c8a2fd3f93d64517945136fe4ea671edd2d48ea9bae55f9a87b30423f WHIRLPOOL ce17241a949c32a602f1a90683a82af973d51bb2ffdea35d9e7d2f23857271aa05519ee4c22eff9c4df9db590115dfd097b1637c4ce58762eebc8afd5e493c95
 EBUILD units-2.14-r1.ebuild 1233 SHA256 e7bad2578a0db2ae9539b23b60c3974f2a2f16cd7ec8b08cd6c3b4b20fa78bfd SHA512 e6d4727b16e7a07817fbe06bcdb7d90049542d22b8987a46aedc7a88d6ce08e7494839e78faf4dc6f6912fc5a746b991c3bb242a353110824cc51d0f61bc7fa6 WHIRLPOOL ae4e1ea8874aca77d766c3177a47d02b2cd04d91e18ef75b90d3a6a1f3d2aa163ca88a18c8a65effea60eb160eccba31ac1f495bc986155c9947bd4c9ec4cc04
+EBUILD units-2.15.ebuild 1263 SHA256 df49bd9bc95fb07f1e88fb904410b35bbfe51f8ffb100bc78129813709667861 SHA512 c34253b448a5e67114c2b9e19aee0f3fb1bcf399ca23ae88d50fb996e46da0325e0ec832da0f5dcef601492e9d704fd3ee984a6aea9f2ece641e76a10b973f3e WHIRLPOOL b53407d8f5d033cbeccbe5e1626b89836eb9916cef31d282aff5b1f66cab73fd4d73f1732e907f8d9902f46e8dbe5f6f45c9456b5ec2a3dda7abe3132f0abeea
 MISC ChangeLog 6034 SHA256 e73eb1cc6c55aaeb8d76aabf9bb5572b6faa29f3aabb2528846c369f25e583a0 SHA512 8706b91f783bb3bcbba2c6f9be8e81038e40a22697efe60fe799eb80bd722b09e406030285f6b53a870cf619aba06103320eb11543094c309f37013548b916c8 WHIRLPOOL ab8d9eec186ebbd84d604cb6638ec96b1022467f44e4fecf56acbcf91b350e1e1ad35f691301155fa588eaeb51042d1897eaa436580cf5734cceb7b577956ab0
 MISC ChangeLog-2015 11855 SHA256 d430fd687dd39cdb3d1a6f2c5f6d164350864c379ed53914dc1873f8193c4548 SHA512 987cc809495fb0e755079fff68a2aff854a0d647833b329eeca58051242ed884c2039c7a724d6e667ed483d3a5b4b4c689fd8f1338e1121be6b48eff36e70fbe WHIRLPOOL 57760593698ef22f8fc8b278a096e44a74181751a9d708ff1e6766fbc3b4c31505d2891f333a1ef72c5c2767f095588fedb786270d8769044633334551ada744
 MISC metadata.xml 341 SHA256 c97f00403f36185d0fcce50329e7c6901903dc66bb5bfffe80c384f22e4923b8 SHA512 b32fc161804c8cd09f6b67923911ddfbdc9c5ba6e5dc61e951bbbe6fd54dd495209c519ead1dd46cb62cf5fd90978472f0d58ed2b66cc079c3ca91a36d22e822 WHIRLPOOL cb29d2f9700eaee9eb3c9d8ff2aee8386b202592022a4185057bc56617c64829e08c27f1d5b8f7f13f2da9e3ae4e280afa3f20784cfccf0ba2f2411694230797
diff --git a/sci-calculators/units/units-2.15.ebuild b/sci-calculators/units/units-2.15.ebuild
new file mode 100644
index 000000000000..052a0fabba92
--- /dev/null
+++ b/sci-calculators/units/units-2.15.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+inherit eutils python-single-r1
+
+DESCRIPTION="Unit conversion program"
+HOMEPAGE="https://www.gnu.org/software/units/units.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="FDL-1.3 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+units_cur"
+REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	sys-libs/readline:=
+	units_cur? (
+		${PYTHON_DEPS}
+		dev-python/future[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+
+pkg_setup() {
+	use units_cur && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	econf ac_cv_path_PYTHON=no
+}
+
+src_compile() {
+	emake ${PN}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc ChangeLog NEWS README
+
+	# we're intentionally delaying this since 'make install' would
+	# get confused if we shove 'units_cur' there, and there is no real
+	# need to add more complexity for it
+	if use units_cur; then
+		sed \
+			-e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \
+			-e 's|^#!|&/usr/bin/python|g' \
+			units_cur_inst > units_cur || die
+		python_fix_shebang units_cur
+		python_doscript units_cur
+	fi
+}
diff --git a/sci-chemistry/jmol/Manifest b/sci-chemistry/jmol/Manifest
index b47b85f09a7c..92e39efcc077 100644
--- a/sci-chemistry/jmol/Manifest
+++ b/sci-chemistry/jmol/Manifest
@@ -2,8 +2,6 @@ AUX 12.0.45/jmol-manifest.patch 3726 SHA256 74cdf274352161ffdf155b34b8d9110dad9c
 AUX 12.0.45/jmol-nointl.patch 13315 SHA256 6bbf13c59bc3633dc089346c1133ad2b3d0614463abdf364f5ec2e2ccd658df0 SHA512 deb54c7f94e3fd4b43a701d58c992edbc80f650397feea97594a8f00cdc14463a19e2314fa616fb3a0ca42af8b70770c0426b8eacfe1d81a30b53c566e6342c0 WHIRLPOOL 570e359517e1011ba76447161e6c03925db0e6533d262f11f13d9553f75989faa27a0ae5f39352dad19ec53e804e8e39e76bbc79f1b44b495fe948e7b8633472
 AUX caffeine.xyz 1116 SHA256 45a9afac0b247780595944a98f8e1076a7e7e0dbb3e02cb54cecb0764b1cb67f SHA512 863ee4a327b2d765ed042cf24055c708d3970a20c3c3b2ee45b46096390be11a7c02915faedb30ee6cb69101faa5942fcfb19fe2b530afb93460a2cd167c3688 WHIRLPOOL 18df972f5cbafc35be4bf20de29ad8049e7c6f921a668f0c80cd9aff2c3ede32b9b30e830f2629be2136923c554c3711b809915d45ea1bd1da854d8768d6e254
 AUX index.html 328 SHA256 8cba2c5eb7f25c0ecf23bc007eb61549a7d2177ac327db6c1e5f51f333ae2451 SHA512 e89c62ba91ecebb38d6f9c88cc1f257600bd7d6005df97713f2715036d3308dee53f7b838ca749c1acc810cc4701c384525f2763b96ac2f1d6802e639cd1961b WHIRLPOOL 0b407f950f4f2523d21c03b6e4f20f9ef4009e54d666ad3a222b87b0e49576816f3940e4fe076e55e9fda9832170c54f17ed543420333fe489f45f4d7296ee79
-AUX jmol-11.0.3-manifest.patch 3726 SHA256 74cdf274352161ffdf155b34b8d9110dad9c4a15720467f73d301104005566bd SHA512 016e57a3c3e55d89fe2a72447160c0b6359affec305c6b4949892ddec3b4a648bad96b87ff0aa5cb0c5187f59e825b441cbbe60e6936a14df536ed0095f67112 WHIRLPOOL abb250bc77d15a5f3e0a441dd0ffd8809642d8959f896c1ae394b85695b74bd4578013ad99b38abca822ad5db514562b121ad6b2f0265090653d7e359ee85a2f
-AUX jmol-11.0.3-nointl.patch 11109 SHA256 56ad460779a0ecfb90ad61cf4cfae2fad9b017f9f78581a720241e4ea208b49a SHA512 0fe07fb53d989298f7395be39c6ee75f56ab59fc096e956d8481c38581706b17f799e745fcd5b6652c4f1115d4425e7ff9ebef454b606d8de7829e07e26b27e2 WHIRLPOOL daf992208b99fec51f5f0b26ca22d520ebd820a22d439c7baa2b84f2b4b3829ac7139d7d3c48076dd4681af1296fd5e61badd91332efa03cc97e58027b21697a
 AUX jmol-12.2.27-nointl.patch 13821 SHA256 330a911405f00552d37a9c241c4a18b9d3e6812ce858933dbc4574df8248e345 SHA512 6ad196dfd6d38a086fad461f8170340f8ef3beb7ae69916e0285d8e30ce8a40efc278e461a3d0ae0da71611529f4a0e58c9a73336319764b1fef62d75336a8dc WHIRLPOOL 94be437d33ec73ed53c8461e78a7799c2aa34c9b606e309554da191ff74a465fe2243f4953a615aca790d3558e2b69b7edd122526f900475f5b05bb20d98d0fe
 DIST Jmol-12.0.45-full.tar.gz 26501382 SHA256 f9a3fe242841f9b56a718f8da2efe4130e497afe2c12d77f2e68344c62d7f70e SHA512 b0e999335c039e5bde5e261c076f3eb75dd0c33a351445d5c086995d32b3fd03795b3a11dc57a06bf8ac39e74945f3c9f4547ecfbf18b56d827b9a42f5208c11 WHIRLPOOL d0bbae1fc5c96ddfb4dd29f6e09701e496a333a2f44ba266e2a24c60de2d36d73c2184bd9b8f6054b0955535d49856154d6101644ef0297b825c4f6745cfe3bb
 DIST Jmol-12.2.27-full.tar.gz 29493780 SHA256 f2ca3b810ea16a488f6f57003d2a407c8ac040d610479a7ae6d95631157db801 SHA512 a8608e64dc06b6d3b0cb7e911f0a224456a65bdc15c51d6b420ee6abf8d82cdcec9f54f6b1a51cfe032e2e074f173f50a88bcff783311de19ce9b95ad990ebca WHIRLPOOL ae0826eab7eb364acb4f30eb77850450b871a24d8940eaabaf8fe9f3770efc39deb604e3c5f875a695c0d33b516ad47d523982c7a6460f2421f961f50a7680bf
diff --git a/sci-chemistry/jmol/files/jmol-11.0.3-manifest.patch b/sci-chemistry/jmol/files/jmol-11.0.3-manifest.patch
deleted file mode 100644
index 3b43c219d94f..000000000000
--- a/sci-chemistry/jmol/files/jmol-11.0.3-manifest.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -aurN jmol-11.0.3-orig/manifest/applet0.txt jmol-11.0.3/manifest/applet0.txt
---- jmol-11.0.3-orig/manifest/applet0.txt	1969-12-31 18:00:00.000000000 -0600
-+++ jmol-11.0.3/manifest/applet0.txt	2007-05-16 01:54:10.000000000 -0500
-@@ -0,0 +1,6 @@
-+Main-Class: JmolApplet

-+Sealed: true

-+

-+Name: org/jmol/api/

-+Sealed: false

-+

-diff -aurN jmol-11.0.3-orig/manifest/applet1.txt jmol-11.0.3/manifest/applet1.txt
---- jmol-11.0.3-orig/manifest/applet1.txt	1969-12-31 18:00:00.000000000 -0600
-+++ jmol-11.0.3/manifest/applet1.txt	2007-05-16 01:54:10.000000000 -0500
-@@ -0,0 +1,6 @@
-+Name: org/jmol/api/

-+Sealed: false

-+

-+Name: org/jmol/applet/

-+Sealed: true

-+

-diff -aurN jmol-11.0.3-orig/manifest/applet2.txt jmol-11.0.3/manifest/applet2.txt
---- jmol-11.0.3-orig/manifest/applet2.txt	1969-12-31 18:00:00.000000000 -0600
-+++ jmol-11.0.3/manifest/applet2.txt	2007-05-16 01:56:19.000000000 -0500
-@@ -0,0 +1,3 @@
-+Name: javax/vecmath/
-+
-+
-diff -aurN jmol-11.0.3-orig/manifest/applet3.txt jmol-11.0.3/manifest/applet3.txt
---- jmol-11.0.3-orig/manifest/applet3.txt	1969-12-31 18:00:00.000000000 -0600
-+++ jmol-11.0.3/manifest/applet3.txt	2007-05-16 01:56:47.000000000 -0500
-@@ -0,0 +1,4 @@
-+
-+Name: org/jmol/g3d/
-+Sealed: true
-+
-diff -aurN jmol-11.0.3-orig/manifest/applet4.txt jmol-11.0.3/manifest/applet4.txt
---- jmol-11.0.3-orig/manifest/applet4.txt	1969-12-31 18:00:00.000000000 -0600
-+++ jmol-11.0.3/manifest/applet4.txt	2007-05-16 01:57:05.000000000 -0500
-@@ -0,0 +1,4 @@
-+
-+Name: org/jmol/adapter/smarter/
-+Sealed: true
-+
-diff -aurN jmol-11.0.3-orig/manifest/applet5.txt jmol-11.0.3/manifest/applet5.txt
---- jmol-11.0.3-orig/manifest/applet5.txt	1969-12-31 18:00:00.000000000 -0600
-+++ jmol-11.0.3/manifest/applet5.txt	2007-05-16 01:57:23.000000000 -0500
-@@ -0,0 +1,4 @@
-+Name: org/openscience/jmol/ui/
-+Sealed: true
-+
-+
-diff -aurN jmol-11.0.3-orig/manifest/applet6.txt jmol-11.0.3/manifest/applet6.txt
---- jmol-11.0.3-orig/manifest/applet6.txt	1969-12-31 18:00:00.000000000 -0600
-+++ jmol-11.0.3/manifest/applet6.txt	2007-05-16 01:57:46.000000000 -0500
-@@ -0,0 +1,4 @@
-+
-+Name: org/jmol/viewer/
-+Sealed: true
-+
-diff -aurN jmol-11.0.3-orig/manifest/appletMain.txt jmol-11.0.3/manifest/appletMain.txt
---- jmol-11.0.3-orig/manifest/appletMain.txt	1969-12-31 18:00:00.000000000 -0600
-+++ jmol-11.0.3/manifest/appletMain.txt	2007-05-16 01:54:10.000000000 -0500
-@@ -0,0 +1,5 @@
-+Manifest-Version: 1.0

-+Sealed: true

-+

-+Name: org/jmol/api/

-+Sealed: false

-diff -aurN jmol-11.0.3-orig/manifest/appletMonolithic.txt jmol-11.0.3/manifest/appletMonolithic.txt
---- jmol-11.0.3-orig/manifest/appletMonolithic.txt	1969-12-31 18:00:00.000000000 -0600
-+++ jmol-11.0.3/manifest/appletMonolithic.txt	2007-05-16 01:54:10.000000000 -0500
-@@ -0,0 +1,7 @@
-+Main-Class: JmolApplet

-+Sealed: true

-+

-+Name: org/jmol/api/

-+Sealed: false

-+

-+

-diff -aurN jmol-11.0.3-orig/manifest/applet.txt jmol-11.0.3/manifest/applet.txt
---- jmol-11.0.3-orig/manifest/applet.txt	1969-12-31 18:00:00.000000000 -0600
-+++ jmol-11.0.3/manifest/applet.txt	2007-05-16 01:54:10.000000000 -0500
-@@ -0,0 +1,2 @@
-+Manifest-Version: 1.0

-+Sealed: true

-\ No newline at end of file
-diff -aurN jmol-11.0.3-orig/manifest/application.txt jmol-11.0.3/manifest/application.txt
---- jmol-11.0.3-orig/manifest/application.txt	1969-12-31 18:00:00.000000000 -0600
-+++ jmol-11.0.3/manifest/application.txt	2007-05-16 01:54:10.000000000 -0500
-@@ -0,0 +1 @@
-+Main-Class: org.openscience.jmol.app.Jmol

-diff -aurN jmol-11.0.3-orig/manifest/jvxl.txt jmol-11.0.3/manifest/jvxl.txt
---- jmol-11.0.3-orig/manifest/jvxl.txt	1969-12-31 18:00:00.000000000 -0600
-+++ jmol-11.0.3/manifest/jvxl.txt	2007-05-16 01:54:10.000000000 -0500
-@@ -0,0 +1 @@
-+Main-Class: org.openscience.jvxl.Jvxl

diff --git a/sci-chemistry/jmol/files/jmol-11.0.3-nointl.patch b/sci-chemistry/jmol/files/jmol-11.0.3-nointl.patch
deleted file mode 100644
index 25fd17e36c68..000000000000
--- a/sci-chemistry/jmol/files/jmol-11.0.3-nointl.patch
+++ /dev/null
@@ -1,266 +0,0 @@
---- jmol-11.0.3-orig/build.xml	2007-05-17 09:35:04.000000000 -0500
-+++ jmol-11.0.3/build.xml	2007-05-17 09:40:21.000000000 -0500
-@@ -100,10 +100,6 @@
-           <srcfiles dir="doc/source"

-                     includes="JmolGuide.docbook.xml, guide/*.docbook.xml"/>

-         </uptodate>

--        <uptodate targetfile="build/doc/JmolUserGuide_fr/index.html">

--          <srcfiles dir="doc/source"

--                    includes="JmolGuide_fr.docbook.xml, guide/*_fr.docbook.xml"/>

--        </uptodate>

-       </and>

-     </condition>

- 

-@@ -113,14 +109,6 @@
-           <srcfiles dir="doc/source"

-                     includes="JmolHistory.xml,JmolHistoryToHtml.xsl,history/changes.xml" />

-         </uptodate>

--        <uptodate targetfile="build/doc/JmolHistory/ChangeLog_fr.html">

--          <srcfiles dir="doc/source"

--                    includes="JmolHistory_fr.xml,JmolHistoryToHtml.xsl,history/changes_fr.xml" />

--        </uptodate>

--        <uptodate targetfile="build/doc/JmolHistory/ChangeLog_nl.html">

--          <srcfiles dir="doc/source"

--                    includes="JmolHistory_nl.xml,JmolHistoryToHtml.xsl,history/changes_nl.xml" />

--        </uptodate>

-       </and>

-     </condition>

-     

-@@ -130,14 +118,6 @@
-           <srcfiles dir="doc/source"

-                     includes="JmolDevelopersGuide.docbook.xml"/>

-         </uptodate>

--        <uptodate targetfile="build/doc/JmolDevelopersGuide_fr.html">

--          <srcfiles dir="doc/source"

--                    includes="JmolDevelopersGuide_fr.docbook.xml"/>

--        </uptodate>

--        <uptodate targetfile="build/doc/JmolDevelopersGuide_de.html">

--          <srcfiles dir="doc/source"

--                    includes="JmolDevelopersGuide_de.docbook.xml"/>

--        </uptodate>

-       </and>

-     </condition>

- 

-@@ -147,14 +127,6 @@
-           <srcfiles dir="doc/source"

-                     includes="JmolAppletGuide.docbook.xml, applet/*.docbook.xml"/>

-         </uptodate>

--        <uptodate targetfile="build/doc/JmolAppletGuide_fr.html">

--          <srcfiles dir="doc/source"

--                    includes="JmolAppletGuide_fr.docbook.xml, applet/*_fr.docbook.xml"/>

--        </uptodate>

--        <uptodate targetfile="build/doc/JmolAppletGuide_de.html">

--          <srcfiles dir="doc/source"

--                    includes="JmolAppletGuide_de.docbook.xml"/>

--        </uptodate>

-       </and>

-     </condition>

- 

-@@ -332,17 +304,12 @@
-   </target>

- 

-   <target name="jar" id="jar"

--          depends="init,classes,jmolGuide,jmolHistory,jmolDevelopersGuide,libjars,main-i18n">

-+          depends="init,classes,jmolGuide,jmolHistory,jmolDevelopersGuide,libjars">

-     <copy todir="${classes.dir}/org/openscience/jmol/Data/guide" >

-       <fileset dir="build/doc/JmolUserGuide">

-         <include name="**/*.html" />

-       </fileset>

-     </copy>

--    <copy todir="${classes.dir}/org/openscience/jmol/Data/guide_fr" >

--      <fileset dir="build/doc/JmolUserGuide_fr">

--        <include name="**/*.html" />

--      </fileset>

--    </copy>

-     <copy todir="${classes.dir}/org/openscience/jmol/Data" >

-       <fileset dir="build/doc/JmolHistory">

-         <include name="**/*.html" />

-@@ -462,7 +429,6 @@
-         <!-- note that this class is included in JmolApplet0.jar -->

-         <exclude name="org/jmol/api/JmolAppletInterface.class" />

-         <include name="org/jmol/applet/**" />

--        <include name="org/jmol/i18n/**" />

-         <include name="org/jmol/popup/**" />

-       </fileset>

-     </jar>

-@@ -502,12 +468,6 @@
-       </fileset>

-     </jar>

- 

--    <jar destfile="${jmol.applet.build.dir}/JmolApplet_i18n.jar" manifest="manifest/applet_i18n.txt" >

--      <fileset dir="${applet.classes.dir}">

--        <include name="org/jmol/translation/**" />

--      </fileset>

--    </jar>

--

-     <!-- vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv -->

-     <!-- changes to this must be replicated below for the signed applet -->

-     <jar destfile="${jmol.applet.build.dir}/JmolApplet0.jar"

-@@ -527,7 +487,6 @@
-         <pathelement path="${jmol.applet.build.dir}/JmolApplet4.jar" />

-         <pathelement path="${jmol.applet.build.dir}/JmolApplet5.jar" />

-         <pathelement path="${jmol.applet.build.dir}/JmolApplet6.jar" />

--        <pathelement path="${jmol.applet.build.dir}/JmolApplet_i18n.jar" />

-       </indexjars>

-     </jar>

-     <!-- changes to this must be replicated below for the signed applet -->

-@@ -564,10 +523,6 @@
-              signedjar="${jmol.applet.build.dir}/JmolAppletSigned6.jar"

-              keystore="selfSignedCertificate/selfSignedCertificate.store"

-              storepass="selfSignedCertificate" alias="selfSignedCertificate" />

--    <signjar jar="${jmol.applet.build.dir}/JmolApplet_i18n.jar"

--             signedjar="${jmol.applet.build.dir}/JmolAppletSigned_i18n.jar"

--             keystore="selfSignedCertificate/selfSignedCertificate.store"

--             storepass="selfSignedCertificate" alias="selfSignedCertificate" />

- 

-     <!-- vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv -->

-     <!-- this one must be treated specially because of jar indexing

-@@ -589,7 +544,6 @@
-         <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned4.jar" />

-         <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned5.jar" />

-         <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned6.jar" />

--        <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned_i18n.jar" />

-       </indexjars>

-     </jar>

-     <signjar jar="${jmol.applet.build.dir}/JmolAppletSigned0.jar"

-@@ -599,7 +553,7 @@
-   </target>

- 

-   <target name="dist" id="dist"

--          depends="doc,main-i18n,main,signed-applet">

-+          depends="doc,main,signed-applet">

-     <!-- first build binary distribution -->

-     <delete dir="build/dist/jmol-${version}"/>

-     <mkdir dir="build/dist/jmol-${version}"/>

-@@ -655,7 +609,6 @@
-       <fileset dir=".">

-         <include name="applet.classes" />

-         <include name="build.xml" />

--        <include name="build-i18n.xml" />

-       </fileset>

-     </copy>

- 

-@@ -744,7 +697,6 @@
-       <fileset dir=".">

-         <include name="apisio.classes" />

-         <include name="build.xml" />

--        <include name="build-i18n.xml" />

-       </fileset>

-     </copy>

- 

-@@ -839,7 +791,7 @@
-   <target name="xclean" id="xclean">

-   </target>

- 

--  <target name="spotless" id="spotless" depends="clean,spotless-i18n">

-+  <target name="spotless" id="spotless" depends="clean">

-     <delete dir="build"/>

-     <delete dir="${javadoc.dir}"/>

-     <delete dir="packaging/rpm/dist"/>

-@@ -900,16 +852,6 @@
-       <arg value="../../../doc/source/JmolGuide.docbook.xml" />

-       <arg value="../../${docbook-xsl}/html/chunk.xsl" />

-     </java>

--    <echo message="Generating user's guide (fr)" />

--    <mkdir dir="build/doc/JmolUserGuide_fr" />

--    <java fork="true" dir="build/doc/JmolUserGuide_fr"

--          classname="com.icl.saxon.StyleSheet"

--          classpath="${lib.dir}/saxon.jar" >

--      <jvmarg value="${proxyHost}" />

--      <jvmarg value="${proxyPort}" />

--      <arg value="../../../doc/source/JmolGuide_fr.docbook.xml" />

--      <arg value="../../${docbook-xsl}/html/chunk.xsl" />

--    </java>

-   </target>

- 

-   <target name="jmolHistory" id="jmolHistory"

-@@ -924,26 +866,6 @@
-       <arg value="../../../doc/source/JmolHistory.xml" />

-       <arg value="../../../doc/source/JmolHistoryToHtml.xsl" />

-     </java>

--    <echo message="Generating history of changes (fr)" />

--    <java fork="true" dir="build/doc/JmolHistory"

--          classname="com.icl.saxon.StyleSheet"

--          classpath="${lib.dir}/saxon.jar" >

--      <arg value="-o" />

--      <arg value="ChangeLog_fr.html" />

--      <arg value="../../../doc/source/JmolHistory_fr.xml" />

--      <arg value="../../../doc/source/JmolHistoryToHtml.xsl" />

--      <arg value="lang=fr" />

--    </java>

--    <echo message="Generating history of changes (nl)" />

--    <java fork="true" dir="build/doc/JmolHistory"

--          classname="com.icl.saxon.StyleSheet"

--          classpath="${lib.dir}/saxon.jar" >

--      <arg value="-o" />

--      <arg value="ChangeLog_nl.html" />

--      <arg value="../../../doc/source/JmolHistory_nl.xml" />

--      <arg value="../../../doc/source/JmolHistoryToHtml.xsl" />

--      <arg value="lang=nl" />

--    </java>

-   </target>

- 

-   <target name="jmolDevelopersGuide" id="jmolDevelopersGuide"

-@@ -957,24 +879,6 @@
-       <arg value="../../doc/source/JmolDevelopersGuide.docbook.xml" />

-       <arg value="../${docbook-xsl}/html/docbook.xsl" />

-     </java>

--    <echo message="Generating developer's guide (fr)" />

--    <java fork="true" dir="build/doc"

--          classname="com.icl.saxon.StyleSheet"

--          classpath="${lib.dir}/saxon.jar" >

--      <arg value="-o" />

--      <arg value="JmolDevelopersGuide_fr.html" />

--      <arg value="../../doc/source/JmolDevelopersGuide_fr.docbook.xml" />

--      <arg value="../${docbook-xsl}/html/docbook.xsl" />

--    </java>

--    <echo message="Generating developer's guide (de)" />

--    <java fork="true" dir="build/doc"

--          classname="com.icl.saxon.StyleSheet"

--          classpath="${lib.dir}/saxon.jar" >

--      <arg value="-o" />

--      <arg value="JmolDevelopersGuide_de.html" />

--      <arg value="../../doc/source/JmolDevelopersGuide_de.docbook.xml" />

--      <arg value="../${docbook-xsl}/html/docbook.xsl" />

--    </java>

-   </target>

- 

-   <target name="jmolAppletGuide" id="jmolAppletGuide" depends="initdoc"

-@@ -988,24 +892,6 @@
-       <arg value="../../doc/source/JmolAppletGuide.docbook.xml" />

-       <arg value="../${docbook-xsl}/html/docbook.xsl" />

-     </java>

--    <echo message="Generating applet guide (fr)" />

--    <java fork="true" dir="build/doc"

--          classname="com.icl.saxon.StyleSheet"

--          classpath="${lib.dir}/saxon.jar" >

--      <arg value="-o" />

--      <arg value="JmolAppletGuide_fr.html" />

--      <arg value="../../doc/source/JmolAppletGuide_fr.docbook.xml" />

--      <arg value="../${docbook-xsl}/html/docbook.xsl" />

--    </java>

--    <echo message="Generating applet guide (de)" />

--    <java fork="true" dir="build/doc"

--          classname="com.icl.saxon.StyleSheet"

--          classpath="${lib.dir}/saxon.jar" >

--      <arg value="-o" />

--      <arg value="JmolAppletGuide_de.html" />

--      <arg value="../../doc/source/JmolAppletGuide_de.docbook.xml" />

--      <arg value="../${docbook-xsl}/html/docbook.xsl" />

--    </java>

-   </target>

- 

-   <target name="test" id="test" depends="main,compile-tests">

-@@ -1036,12 +922,4 @@
-     <jar destfile="${tests.dir}/Tests.jar" basedir="${test-classes.dir}" />

-   </target>

- 

--  <!-- i18n stuff -->

--  <target name="main-i18n" depends="classes">

--    <ant antfile="build-i18n.xml" target="main-i18n"/>

--  </target>

--  <target name="spotless-i18n">

--    <ant antfile="build-i18n.xml" target="spotless-i18n"/>

--  </target>

--

- </project>

diff --git a/sci-chemistry/molmol/Manifest b/sci-chemistry/molmol/Manifest
index a2ea2253be38..5baa7db90f35 100644
--- a/sci-chemistry/molmol/Manifest
+++ b/sci-chemistry/molmol/Manifest
@@ -11,7 +11,7 @@ DIST molmol-2k.2.0-src.tar.gz 1088805 SHA256 1104dcb1b2517581c7d6b1695ff2e92f407
 EBUILD molmol-2k_p2-r2.ebuild 1692 SHA256 bd4feca46efdf75a59ac864bd4b3c5e90997779681c296e871dccdf305bb512e SHA512 60a0fa252d9a6e59d17eb0a5f1df819170e95c1a4857187c5620dc33a01113a87001eff940983861db4b2137fc56026b0a19092681b9738d2055421ba7c0d10a WHIRLPOOL f0578627c681faf49953ed86351bea08706c3f7938a6909989b77afdbe0162a456e2fc1b48510ab601476b4063c5929b2404e9bdf497f307d60080a73358e833
 EBUILD molmol-2k_p2-r3.ebuild 1817 SHA256 9409a09878d0eba2510638843ed671e3c900001f20f778c2db57d95648303ec1 SHA512 723d3cff895cc9a7037de631027485ce35ac3a1ce4621f72cfe9eb26bbbb7554dbea8bce33898ff4c0e7c25addea5f844ba17e4e526689bbd9bcc4f999d78964 WHIRLPOOL 8105575d069f277115165d85d89ca20752e98b3aac74dc0e5082a97b38b0607474782ec6c14c6d39815df28e9cdc72c68d7ebb30638034b068e47c4d42a3dadc
 EBUILD molmol-2k_p2-r4.ebuild 1834 SHA256 fa9dbf6e0d1e1e8ed4a5b2a84b7db3cef9fa716e398037ebedd26a4778777b8f SHA512 7f995739ff9ef95bf9408245957a4a282dd23a309ad8eb791ad688ecac0af51229638c078e924572032d281ff4f1b31b4ad9a97d35cf20c21639b244e2c28c8d WHIRLPOOL fa7d6d1a08bed868dda749ecb071e342c5f5b906d5cf277efb6b38fb1a3a907c1d5ec6f0a855dd23c93411a86b828490e14848d3ceb79f5be8237457ff139ac9
-EBUILD molmol-2k_p2-r5.ebuild 1842 SHA256 77271b14705603d0f8198db6b7f5884ed34a04de1066a2a224135932e071437b SHA512 29e216d410dac3ce982010ace56a02f23d35b3dddc04ad773a5d2a6d1c0e4a002fd0ef8f486c7c6d872800a590cfb996c7d354670e09ce9de578c55fc1548bc9 WHIRLPOOL 3bf1f853446979be17c8674676a9e72e0e185edbf5469230f575fcb8c7fb732cd8c0db170f24d3351caf8eeade8af0a3f55db3735ea5867ead09a4ab6e8893fd
+EBUILD molmol-2k_p2-r5.ebuild 1841 SHA256 7d88081fd46d44a954ede1a166c2a1a9374e4c18b0d6737917c0352479eb0e09 SHA512 e5e0826994823cea86838987eeb8e5f352a5aa5c4acad706e5f5b2023da24edf05d127ed870f20724c3c2247b527efae1e3429b8b0a9cf911b3c3de81a11bc5b WHIRLPOOL 4d96e5e14d093fb248fc29efa50df6d8956553b651eedbe6bc698d01884f524ad95ef37ffa2a87c255385d1253613e923a886a711a65d3a5c57ec76b968ea887
 MISC ChangeLog 3059 SHA256 c09731a5cd875e00a43dc23970cf08d7d30eae68ff674688f7d7e8170dc1c1a3 SHA512 bd7b1586db627d7f9ddeca3bc80febad1ba7073f3e8bc667fba6d3c9608850fec131ac8082845d3b35037267c60caff6b59aa325b10dba6c33cea98e3edfa758 WHIRLPOOL 16df2bdef50a933b13ea413fd3d4e4b4b79237f8c567d8c4863fda6cc063682360e66a235b9cb1c2f1d981092a9d70eda1f4394cf1af3c66cbb2624f71c73096
 MISC ChangeLog-2015 5362 SHA256 5495e3b639f2c394d2a1c373fe680282178d7fe0ac0ec529daa6219b6f2eb1c9 SHA512 e7d0079ecc3703857100d349db4750104ba00fa677827134d1b446ce1c1049dabad667df9513a7e8d08d622d8ca06aa91cceb15fa5cd6dc15e2d105008b44a64 WHIRLPOOL ce38ea072497b114bdc1e67d35155fa6f7b3f4a294810ab2b81b94599617b1dc3a21481bf60189672c352a723163cc015dceca448a702c9bfe42a15d56e99e42
 MISC metadata.xml 271 SHA256 70036ea85140f86ed670bc2791c9de861c4b6164755ee36a2560d1c812ec13f6 SHA512 3e6e6047a29e07123b81279cae1de17bc4bd4c3d7d8a8d26560114a18185f473d038fc220fa81c7213fa203ce197bad8b1c272d9b7e41cd770a953fa6308ff92 WHIRLPOOL 1ccb964819c99258af550a41c6712ba8ebdecbec1c821106de2f22c37b1c981cd4f324856a8014b08bd186bcd2a7fa45a7e772cc15705d1a39016b5229e77269
diff --git a/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild
index 23720c5be51c..16e8b8553600 100644
--- a/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild
+++ b/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="molmol"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="
diff --git a/sci-chemistry/molsketch/Manifest b/sci-chemistry/molsketch/Manifest
index 32b1636db490..5bf5bd9ad0b5 100644
--- a/sci-chemistry/molsketch/Manifest
+++ b/sci-chemistry/molsketch/Manifest
@@ -2,7 +2,6 @@ AUX molsketch-0.3.0-_DEFAULT_SOURCE.patch 661 SHA256 0ee57232a61e2ec9e44250b7a66
 AUX molsketch-0.3.0-desktop.patch 572 SHA256 6273aa20d8498ed522c3dbd5bcb966e7923e56f3497bff6441ff717a0f714486 SHA512 dbb074dd2bff41872ce9363241aa26bdc2537950c7635399c7a173845c30b8603de24bc6dcaf8a27a6eadbdc2c5249aa4cdd2bb63f059475d53f99b99acffd6a WHIRLPOOL 353f839287b5e58700cf25d788fb12b659bb345dbea714c59827957cd19c872660cec3b51619b90717fcc5755d21980258419f9de42586afdf5f1abd1ea6ce0a
 AUX molsketch-0.3.0-no-quotes.patch 490 SHA256 3979e7020f559665692fdade6a4dca2e0d5c840866b88c2a5615f9e908263875 SHA512 cf5028b8b99c77543943f517eee6eafbe8bc8a590fe8dbb9840001e568866a74c852fd59653714f507b0a5a556ce7c40dd1768c29df92af9cb8ff4131ac48e35 WHIRLPOOL 3f2a0999a706e9ec5ebce4697aeba8ce1ea22ec9442c947369afe2292bd2415cf7faceb72e1fe0c8c7dbd9aa9b9ba77382e6fbee052448939e7e7df11802df54
 AUX molsketch-0.4.1-more-quotes.patch 478 SHA256 6cf71ad30457dc6dc6fc1b6f2d884cfd914304d6525faa5bc378c7de03933be8 SHA512 015344abb4aaa7f214e4e8a7eebe1a7a8f4d43b8a76a9c5f984fc4c5cf8da450430330543fe69d481ceec25c5a59ee332439654fd4ce82ce080aa4883cc1d113 WHIRLPOOL bb8a51964018cf50185e6d0e876ad7e2e255658c34b47a6292e7d157cc58b9b2759e2e17d1d3cfb88bab6b014247a09bc122790ba95cba2a63db89f360243ec2
-AUX molsketch-0.4.1-no-quotes.patch 545 SHA256 59a963c1720d39ed82ff3cd3178043c3188d168c79ca6a53ff31def8dfeef5cf SHA512 8bf7db168567f47980e9f7b3547c4359f3ed427187a6f5d3be60658214891362538caa9db9607fd791a34f99961baadfaf50cc07135669471740d77a3b715b6a WHIRLPOOL 128796460a931c6408928330feb05a31cbf6c9972ead3a4d0e14b496565df9752233d2a374999c8086b4469ad13411a695518ef999006ddf5f35ef139146b606
 DIST Molsketch-0.3.0-src.tar.gz 337388 SHA256 078b05bfd591930430bc1e5df802af27bdf40718b9218ba6435eadc209d4d1bc SHA512 405553c9d84f0ce9d70a237834f8273dd5010b95868434f9b1b9042fd626e2782c5d3da7d17d9485946210e48e86d0c2de8385d80667018dbc833c3928d076d4 WHIRLPOOL 659717039bf294072117a8e7dc1cb590c6804d3dbde625aa16451bfdb6371933c71f6241fee1e38cec696bdb89e19111c30cf6ed17810daf09b75272080fbb31
 DIST Molsketch-0.4.1-src.tar.gz 1499842 SHA256 6b183ed3ba92f89f1318879657a79c09d7135c99af28eee8758f46f131e05a30 SHA512 263b088c2b8d01c1f13802b18aea6f6784580fe1a806de45b0e1ecd9f29024350e01a611bdeed1891938acc733a42746203d345d3be13ebaf4c309413e86bf26 WHIRLPOOL 383e9fffd1cd2db195e962f58e97d0ffd858dc14353c99ed0bdd7e577413e5ac991ed18a41b5d4ee4b926887a6a2654fe30167f82759142b21b753c30e41cbd7
 EBUILD molsketch-0.3.0.ebuild 1352 SHA256 b7eae9694ea2ff18229e58b5e0060b6f5e0b8cd74a18ad93ee8a8f6273c27288 SHA512 d63d3a6ac76f071977d1708f072082a1e2ea3c7f02bb6cb37a28cdc62a9255eb2766257cf86b0a9c65ef9c7a0cf5828e7d1afc8616035c2cb93cb155fbbf72e0 WHIRLPOOL 4274d4095329e6ce6d3cf7a34817e9c6e70d3ba138eff52617a4faa2d8f977ad0b7f9c66ae35df2d29fa128f79f9bb6faa296e483c32d5203bca84fd53ca06ed
diff --git a/sci-chemistry/molsketch/files/molsketch-0.4.1-no-quotes.patch b/sci-chemistry/molsketch/files/molsketch-0.4.1-no-quotes.patch
deleted file mode 100644
index 1b63ed51edec..000000000000
--- a/sci-chemistry/molsketch/files/molsketch-0.4.1-no-quotes.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 64c18a2..75c2fb7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -97,7 +97,7 @@ endif(Qt5Core_FOUND AND Qt5Widgets_FOUND AND Qt5Gui_FOUND AND Qt5PrintSupport_FO
- if(FORCEQt4)
-         add_definitions(-DQTVERSIONSUFFIX="")
- else(FORCEQt4)
--        add_definitions(-DQTVERSIONSUFFIX="\\\"-qt5\\\"")
-+        add_definitions(-DQTVERSIONSUFFIX="-qt5")
- endif(FORCEQt4)
- 
- ################ Reading version and default paths
diff --git a/sci-chemistry/reduce/Manifest b/sci-chemistry/reduce/Manifest
index d1a6f3611091..bfebd30206f5 100644
--- a/sci-chemistry/reduce/Manifest
+++ b/sci-chemistry/reduce/Manifest
@@ -1,4 +1,3 @@
-AUX 3.13.080428-CFLAGS.patch 706 SHA256 ce2b82b16421d58bf5de67703f5e9b718f73176891408867460c560ece42cf63 SHA512 849f0ccb7e452a93e4534b232e0ac89a08fcf1c5c34e74910f76e485f12b96ee0aee04728efd8d6a888538ba8a83d4e1604d1a02cdaeeb23aa0d21a80e7b2be9 WHIRLPOOL abfdcd1f5352c282be497a13dd4295fd3bb66267f88f8642fbda14e909d6c52c67d944ff3d0e4c4a27fe57995009290a7a9870ed589c66803890654addbad1a6
 AUX 3.13.080428-LDFLAGS.patch 230 SHA256 9cdcab6d020e8bed56b6938e77c78c66dda91789a29761548511f1ec3220c013 SHA512 f7b471998c1fa5bb5c4eba7fd3f0900469b3ce1d90399413a18b736e5d35d93875c2b1666afe307935c9e71c516a7bd2db7eee1fba9640d403a2401a4427a539 WHIRLPOOL 7d932a12731035f0a3349aaa053f059f83db71d004711c41c33869df7afaeef6fce643f38285ad3ff7215183907be7b42c331d0c8118d11b49d53e90dea11f94
 AUX 3.14.080821-CFLAGS.patch 736 SHA256 18c5e5e6a20f82b0bcfbc3875742fd3de6ac5ae34c4e2aa194aac5515323fc24 SHA512 f435a889845065374753841a0ba5de64e5be0d73935bd145d2e69980671cb3620441e99ec68bedbd876f45a0d61f406dc1a98f1ed7affaf4c923105d7540530a WHIRLPOOL 76b5aad71c1ccef0d0e73159da768f76fee1aea5d07899b82944ef89da3e8f6e44ce40d1f0121b105880279ae9c64af5132485041aaa776aab636ad2e7f5119c
 AUX reduce-3.16.111118-fix-c++14.patch 565 SHA256 785e4d0580150889303f868f630a61a137143f0ef653d00c81912af44774b60a SHA512 8b38d5cbcc76318bb1309185858000daf8cca15a466ce0d4174126c9a5caa50e79d8198d3e3ff3427aa4629d51d0e50773d96b7bce7d94e16cace4bb80f4eed0 WHIRLPOOL 9b9a7622a98b72f099840443d7af8a059af87c98d6c6f599259bcb9ef44369803b71443c3f09678340657a5b4396ef2a941066c5c2af80712c9da194fac19295
diff --git a/sci-chemistry/reduce/files/3.13.080428-CFLAGS.patch b/sci-chemistry/reduce/files/3.13.080428-CFLAGS.patch
deleted file mode 100644
index 7daa5336f689..000000000000
--- a/sci-chemistry/reduce/files/3.13.080428-CFLAGS.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/reduce_src/Makefile b/reduce_src/Makefile
-index 598e367..067ace4 100644
---- a/reduce_src/Makefile
-+++ b/reduce_src/Makefile
-@@ -12,7 +12,7 @@ PROG_FLGS   = -DAROMATICS_ACCEPT_HBONDS \
- #              -DDEBUGMOVABLENODE -DDEBUGDOTCOUNTS
- #              -DMINPREDEFINED -DMAXPREDEFINED\
- 
--CFLAGS = $(OPT) $(DEBUG) $(PROG_FLGS) $(DICT_LOC)\
-+CXXFLAGS = $(OPT) $(DEBUG) $(PROG_FLGS) $(DICT_LOC)\
-          -I$(PDBHOME) -I$(TOOLHOME) 
- #         -Wall
- 
-@@ -26,7 +26,7 @@ OBJLIST = GraphToHoldScores.o reduce.o CTab.o ElementInfo.o StdResH.o ResBlk.o A
- CXX		= g++
- 
- .cpp.o:
--	$(CXX) -c $*.cpp $(CFLAGS)
-+	$(CXX) -c $*.cpp $(CXXFLAGS)
- 
- OPT             = -O3
- DEBUG           = $(CXXDEBUGFLAGS)
diff --git a/sci-electronics/xnec2c/Manifest b/sci-electronics/xnec2c/Manifest
index d19ca2dc9073..de0e5cd9bda6 100644
--- a/sci-electronics/xnec2c/Manifest
+++ b/sci-electronics/xnec2c/Manifest
@@ -2,4 +2,4 @@ DIST xnec2c-3.5.1.tar.bz2 995554 SHA256 1daa6a5d024050a25b7a13052cf8a2d2f9271615
 EBUILD xnec2c-3.5.1.ebuild 717 SHA256 35c7b92a3e018166ef84773da155e4feb36f34f6a460b02efa429f1cdc91a4c8 SHA512 3979a454c3ba3a0a3added8ce8928cbfe861f5e4710f725b617e073ca5d16360b02741ec29033c9c08a214b2ffb12bc95d505d77338693e85eb7ffe6bce2d47a WHIRLPOOL 928354ef8da5ec871e0f58ffa7ae5f8278cc8278c0ed5e09a316fb5173d4def8322aeb3c513cb65439a7b273851e8f9d01500c4d344489334488f7fc19e01988
 MISC ChangeLog 4095 SHA256 690130d1c7602350572d8ed85ca5fb05ada85cbe5b0a8892e576776c36c09085 SHA512 ba517134adedfadeaac9f18954fe75ebb54710f8cd0cbe20b3e05cbf10a80ef203b808f6e568af61b27e156b53476ef790936bc4847b4b1ac5e943d7682c5cff WHIRLPOOL 0d87b4c601ae57f524227d0d7583cf2db34be245867df2901a9ccb08afbc08c5dcb49b47d38c4c3dca2a4f857860dfa3e1670c5b9aa950f1aec48c3a119eafef
 MISC ChangeLog-2015 4053 SHA256 72ad6b715cdff5cf4bf0cf20a940bf8d68bf5bef0ae6aa359c7a8b60403c08af SHA512 4a3fbaeeba06774840133f3e0d10db3854d8d506e7c75312c24451007ebe6dd1cf7d19cf90e4220e7250ef96b328e8788cc2c7e0e06dc780ba86230b94994a8a WHIRLPOOL 778b7735b28400148e1922a93c2b539ac69aff20380ee18e755cd6363d453adae6c795ee8fb24c08f8e5b485c9bad554430803313876e254bb67575da29bb0f1
-MISC metadata.xml 1748 SHA256 49c5143de02d657b1f018bd5170ae8f5e79c67e3668c62ec3cc0f748dd1489f9 SHA512 b10b642f953d2952732bd8e2dcb6d8dc4170308bda22bbfb3ac4636108682de3c1462ed87ec7fc30263e56c45fbbdb482bb49a65bf0f50de7686eca5dfa0ef01 WHIRLPOOL e44cf855f4ea34464c44c484e07f3cc17cba7d737054e10a1c6729b69ebba3a1de0ff38bc5b5a626dbf3268eb07bb45814ba18c590718f1e0a746891cfb14e81
+MISC metadata.xml 1634 SHA256 78d64ef796770540088c1b89f80ae1a5787894894c7607621369d12cbe2398f0 SHA512 3ba6cbd28a2f3d969c392607b29dfbbe225898674bbd9fbd732890a07c68514d3976739b04668bd255aa891480fd05dd3e7bfa6883b6594c00b594f85816ab32 WHIRLPOOL fce345e52bcea729118ee1bc3c7ba7c69b85a64015ce607f7e6d6cc37390b3186704af0400af088e98d97a44fef166ed68c0099aad0144f452dcad6d458e5464
diff --git a/sci-electronics/xnec2c/metadata.xml b/sci-electronics/xnec2c/metadata.xml
index fd9047e711af..378c589f8147 100644
--- a/sci-electronics/xnec2c/metadata.xml
+++ b/sci-electronics/xnec2c/metadata.xml
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+	<maintainer type="person">
 		<email>tomjbe@gentoo.org</email>
 		<name>Thomas Beierlein</name>
 	</maintainer>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>sci-electronics@gentoo.org</email>
 		<name>Gentoo Electronics Project</name>
 	</maintainer>
-<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 <upstream>
 	<maintainer>
 		<email>neoklis.kyriazis@gmail.com</email>
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 51daa3e89ffa..24aa3b3753a1 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,16 +1,14 @@
 AUX qgis-2.18.12-cmake-lib-suffix.patch 454 SHA256 af1f41155f744165eff63a8ebee61849e99048cb96d8bb89273e3744e5c10e36 SHA512 f6b04bddf4d60d4eec257fb71cf87e15e7a72c34c1016e8eadeb660ebc7079cb8b9104041e4df5e7cbe0e00954ad65ced53b7e19f3f9f7cfbee1b791874ddcd7 WHIRLPOOL f60930ed0fb0010ebaf79d5af41e6124a5eb3cc00e74646743b1afa1738973bbc579a91d60316c2a74a48b07bf6ea13f604fe412fbdba360c5f6ff1687dc1051
 AUX qgis-2.18.12-sip.patch 4471 SHA256 9b8be7b20f20361234b2e648ce65278bac8a39107bb52a1badde828002d7f542 SHA512 df08773c915ee640b6ef81ffdb1553e144f5530934bed3a37230824662fa99de91bcc52475f7232e44df3ebd147abf54f537b6a23b02563a5155c14a7d2cb9a6 WHIRLPOOL fec7021a807b4d0f7fefc17fe8699523c7a1fb5da01a090a6c70004990e192cbcf174fcd089a60edd0d9f135ea6493ade10c012c26ed6dfd5e35078003fe2beb
-AUX qgis-2.18.3-app-icon.patch 450 SHA256 7172158c06f80552e5aa1da9c477ad87416290f166195f5959aa34aa66a6403a SHA512 725874337fe5d9301e481cea7f30b3f804b8277a79170dc64a7c24f131cb875c89e2d60f3d8aacf20fb31f6d1d8f0d4ac1750320ed5a6f0d28a20ac026decf7b WHIRLPOOL 6648c8f5e0648fffdc28413fe8bc3e880fc69bc7b79956fdbeb942e932b5cecd570ac2ed9336c9ba8ba12b6fdbe44ec443d1a5f1d2c47b0bd4b8aaf9af7fbc0d
-AUX qgis-2.18.3-qscintilla-2.10.patch 979 SHA256 4cb5a765f10d7f08bbb992e406705b31619373d3fe07e22f49d339b7b1366d33 SHA512 3a74c41e3a27e4d66dc0b6812e987352daa7ea94e9c287867028716c66ef8ed6b959ec26e2a14c4c0e6f3cd29cbd0c34f9fc32f296292e6af4f37dfaba90862a WHIRLPOOL 24522d9da5f3962910b80a77a49171c9fa6a7e1e02a5098334c54504a85248d9611c708e0c32f9d06b294b0cf764d21b0e1b831eca493859ae3caa4e6960ba7d
-AUX qgis-2.18.3-sip-4.19.1.patch 1375 SHA256 9f64810ec9e7956f1ffc94fe793b3f8acb6510a3e2c79007a8b4effbccfe4603 SHA512 178d2ef9196b950b25a90f5fdf296edbc229b1e071f7106d423ab3ac515f361161b495452b62115663c6a658de2b0dd3bae2a443c34d6d5f40db243ec6bccb91 WHIRLPOOL fb770c3c3a4f7ea81c8289630c98dd0c239ac215ff4612d11a6ffdc2aeeca6faacdacdd0f1e135a9cec65744cc6f11fbedb48b1a2012495668594bcf79b7d59f
-AUX qgis-2.18.3-sip-4.19.patch 9262 SHA256 537a525d35bbf8b87f7f01fa4cf0691a2d0ddc7dbfb677ae8a39f2524de0daa6 SHA512 93b1cad9aabb790071da2790359d9703062ab26b2845463c2b8069c48ab57b569e67b5ed318e3740a5cc3714feaa1b16371d91be6aaaa0d166e2f7629b8326c9 WHIRLPOOL ef07b9949fa74486984dfa52adbe9a301cdcbd3d10b79c57ae50de1237edc85d35b2f8d3c69636d48f6d846b57be0102d94d9a322643908d40bdae8a7181dde8
-AUX qgis-2.18.3-webkit.patch 3421 SHA256 9ca27bb9c9ce3859f6ae0ade56f1914b102d7f055dae5cb34055fb5dc2a684ce SHA512 4ef6dcac0c9c8b6fe58fd3ed2bde8bb04377b39bc53a97dbc83873ebc3cdbcd5f31a046563131628578015e2542a37be334dfa6a2eecdef60094b895fc9ac367 WHIRLPOOL e1ffe2f079891551cac58d1cfce74f34cb8a8885fb172596bf51ee681cbf8fd7c4ea3e4cf3c05614d1fdfdfb62d6bb7346f2492056faf2160b3b70d3deff22c1
 AUX qgis-2.18.6-featuresummary.patch 1009 SHA256 a41a5685947e6941318d68da3e309cca387913844654e9859ad6dd863cbf90fe SHA512 4f271d7fb5b39b49bd06cb6308e82b44088978e2fcc17e453dcdc71655000b91be06e08ce05a373ed45d25472422a7b317c12b19a3a41620df07ea723766b44e WHIRLPOOL 2bb5e0e8ba71c43b52d3ce4309f25cf8ed174d53196803521c393b12a3205b8f06fbe5fbcdb300988840c82b2322b222d626b799020cf516121edc642aedc3d2
 AUX qgis-2.18.6-python.patch 647 SHA256 db3fad5e56c1c83b686aea92828f62b015317bd89d42ea02c6d911c64f75416b SHA512 71d3ab2c1669e76fbfdb5700906c4940f74111e698b19111f148c6e96dd900f9527fc92e6ddbd801318d788f7348ad8ac294fd26e5f7e5ed1bde5bdd6b23e49c WHIRLPOOL f4d2e1cb108e34d012fc5b17ad20dfce1fa8ab99fef9fc9a69f4c40de430701b5b8941354a7a9d07b11bb3bca1644c373e2d40e8174b5b61685fc60d888c93fe
 DIST qgis-2.18.12.tar.bz2 84936155 SHA256 7af709ac86bf7fb3350962beddd273f169ecfa6f3f60d3254c708a26a429023a SHA512 e34dd98d0d0aa5fdf1f980dbc1376c25a9a7ffaa59b1a2eba8423e7f44bc039b547f3f65368178a8c485fa34526dd9fece2e09d9372fed3b9a758f7286b690ea WHIRLPOOL 1b58189ade46b1f3d351939aa0b7fd9629fece8bcf419e967006833cad1aa6d799e036b12a856e92a4e3be6c2a768f693d430dffd5d3c706c84978f5b754fcd2
+DIST qgis-2.18.14.tar.bz2 84935301 SHA256 d82176ab71ce3e70aae1bbb65478a730ef85b6263a186fddea0eb599466136a5 SHA512 da738ae25f1207441a52091af9a3e70fd17f95704a23e27f72ee4c7ba213fd9ccf2d6685d91c34f94c555ca2dce420d6a07840b1fa682d6b960abdf3ba177036 WHIRLPOOL 2d43a673e77c460eca9a2a87e914b7ebe1c20315e9ce3133f8285c0c5e5db89e25144a672453fc0ca1441bd1f52cd3bcc507904e3f215def619ef7155487aa35
+DIST qgis_sample_data-2.8.14.tar.gz 22119181 SHA256 cb1d92ce42df1e7c1cc2e25d02cb86e51a007a07f7f9d046123e80b0d4815d66 SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d WHIRLPOOL d17970636b1aad6f25ee5334b9bd9809c4c2f91c69ccf1cf4cc4b158c4484504cf718f18207c24c1865fec3d43f4ea74fa16ff8c8f9a55a65a29aa49aaadef0c
 DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5
 EBUILD qgis-2.18.12-r100.ebuild 6075 SHA256 d28f574e1c37ac4f4ce5074bc2dd5efc12ccacf222d7a693c7ad60c39a7cb59b SHA512 721ed584321140c52890025c78e9faa32fb867fbe24572e3730c0ba3ef24864ab8c8338faf29ec93abc69dd581a00b319e533e42fb0a3c37435596212c8f2971 WHIRLPOOL bfb1cfefe14eba89f6e8a049aaf372d19514a379325353450f16856b24cbecf6575e64db192778c851c55dd941a3adfb12f8baccdb6f4919195873f83ed6598a
 EBUILD qgis-2.18.12.ebuild 5279 SHA256 e26d5ca8092c603a539ce3d2c40b028c4e6ec7253d619bdb250ccd5c02219c22 SHA512 8118478f8aa8bc7ca5221f48125b6fab899bb8bd4db12da89472fc853f1b0eb8094a51c715e1962970b67462b7ed7939f9a92142b52442fd9d735ab3ce9162a4 WHIRLPOOL 9906af26c34de96a6a8eb539da9dd98f3568d0f64a7b86d621a3f540529a636bd13b48742a3ca7f3c4ac815766b9eaf5003252988f787343b71b8d9855fb8e22
+EBUILD qgis-2.18.14.ebuild 5331 SHA256 c8afd993d8ccdae115484c6e64102d7596d9ab2f288e374a6628a1b7b932ccfa SHA512 b62acaea5e1f8a1467593f194cde90ef2558f64cd915f517a042299865822656db8a743c47cd2f8bfd3710fdbb7ec4ed66ba8f5cab681392db6852927d91b341 WHIRLPOOL 6987c7a6b54d8d61b84f31064a5748cdb5ec3c11891e0aa98cc3f038fd8594082782a3c49c2060ee1804d6028a050f30755146cf250da6365f810fa6297c3788
 MISC ChangeLog 5606 SHA256 2194b9ce875fc2c047cd72860eb1102be58bc258fdb2304b3e3b432aabc6e6f6 SHA512 8e9f1a7e76fdd867f6ff55933e5d830ce63a11af198e507ac63398ccbb2d523a8aed5d0bf658fc6a70b2f8e3a67199147afcc5a3ed14875692e2aa765415f0ad WHIRLPOOL 345d823ba23855899e49dc9cc84d14010b0282546cb41904fe0e1752685375409382eb664b96819a0dce6b452a69e8bf93fafa8e53dc3ae34ae5015343f4de15
 MISC ChangeLog-2015 6138 SHA256 b60aea60ba8f8b74f6af622e091a20328543791c9c09a25a0fc81aafbde619ac SHA512 a800fda8303e7cb23248e104b3abe7f3e0504747328cef3bcf59ef42770cc030ef01c0c73fa3f676152eddf6cd72bf570a3beea9936c459806487015a29f1099 WHIRLPOOL eb471fd020db5f343452fd0c2ee1914310d782de5374b5d5c4691b80fdd4a8943ece63717db5cbe619cf7178ddfaef4d97b0d61a3edcfaab0c259aa4143e81d8
 MISC metadata.xml 1105 SHA256 179c61e75a0ca68c842bbb4aae598cd9bd8ed9902eb47459e789eb132d708270 SHA512 d16c2396c35d915e1d284aaa7b59118b9a66284fcd5e8cfef8b5835b88bf75e3a3ede1b6e7d939e403aa212190afc49b51deebc4868bfa38b44d2e6c25150fa4 WHIRLPOOL 1508c63a67b9eff0e6f43b8b7a25c0e5674557edf4c2914ae94d7d2535cd6a200f338b6fffe00059d8a130c22f630f14b57e4768e33b30fceca7dac4688c256b
diff --git a/sci-geosciences/qgis/files/qgis-2.18.3-app-icon.patch b/sci-geosciences/qgis/files/qgis-2.18.3-app-icon.patch
deleted file mode 100644
index 88db963bcaff..000000000000
--- a/sci-geosciences/qgis/files/qgis-2.18.3-app-icon.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
-index 4cdb07e..76ffc09 100644
---- a/src/core/qgsapplication.cpp
-+++ b/src/core/qgsapplication.cpp
-@@ -396,7 +396,7 @@ QString QgsApplication::activeThemePath()
- 
- QString QgsApplication::appIconPath()
- {
--  return QString( "qgis-icon-60x60.png" );
-+  return iconsPath() + QStringLiteral( "qgis-icon-60x60.png" );
- }
- 
- QString QgsApplication::iconPath( const QString& iconFile )
diff --git a/sci-geosciences/qgis/files/qgis-2.18.3-qscintilla-2.10.patch b/sci-geosciences/qgis/files/qgis-2.18.3-qscintilla-2.10.patch
deleted file mode 100644
index fb714654579d..000000000000
--- a/sci-geosciences/qgis/files/qgis-2.18.3-qscintilla-2.10.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 30577386cbe0ee9a5509e7f6f54df2c1194153ee Mon Sep 17 00:00:00 2001
-From: Larry Shaffer <lshaffer@boundlessgeo.com>
-Date: Thu, 2 Mar 2017 15:00:18 -0700
-Subject: [PATCH] Followup to dfe268f; update QScintilla new lib name in 2.10
- for Qt4
-
-[ci skip]
----
- cmake/FindQScintilla.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/FindQScintilla.cmake b/cmake/FindQScintilla.cmake
-index 7f97624..2f87e4c 100644
---- a/cmake/FindQScintilla.cmake
-+++ b/cmake/FindQScintilla.cmake
-@@ -36,7 +36,7 @@ ELSE(EXISTS QSCINTILLA_VERSION_STR)
-   if(ENABLE_QT5)
-     set(QSCINTILLA_LIBRARY_NAMES qscintilla2-qt5 qscintilla2_qt5 libqt5scintilla2 libqscintilla2-qt5 qt5scintilla2 libqscintilla2-qt5.dylib)
-   else(ENABLE_QT5)
--    set(QSCINTILLA_LIBRARY_NAMES qscintilla2 libqscintilla2 libqscintilla2.dylib)
-+    set(QSCINTILLA_LIBRARY_NAMES qscintilla2 qscintilla2_qt4 libqscintilla2 libqscintilla2.dylib)
-   endif(ENABLE_QT5)
- 
-   find_library(QSCINTILLA_LIBRARY
diff --git a/sci-geosciences/qgis/files/qgis-2.18.3-sip-4.19.1.patch b/sci-geosciences/qgis/files/qgis-2.18.3-sip-4.19.1.patch
deleted file mode 100644
index ff8989227f69..000000000000
--- a/sci-geosciences/qgis/files/qgis-2.18.3-sip-4.19.1.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 85a0db24f32351f6096cd8282f03ad5c2f4e6ef5 Mon Sep 17 00:00:00 2001
-From: Sandro Mani <manisandro@gmail.com>
-Date: Wed, 1 Mar 2017 16:12:38 +0100
-Subject: [PATCH] Fix build against recent sip/PyQt4:
-
-qgsfiledownloader.sip:33:0:
-src/gui/qgsfiledownloader.h:94:5: error: overriding non-deleted function 'virtual QgsFileDownloader::~QgsFileDownloader()'
-
-RuntimeError: qgis._core cannot import type 'QList<QVariant>' from PyQt4.QtCore
----
- python/core/core.sip        | 1 +
- src/gui/qgsfiledownloader.h | 4 +++-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/python/core/core.sip b/python/core/core.sip
-index 8f0b6af..41f5450 100644
---- a/python/core/core.sip
-+++ b/python/core/core.sip
-@@ -3,6 +3,7 @@
- 
- %Feature QT5_SUPPORT
- 
-+%Import QtCore/QtCoremod.sip
- %Import QtXml/QtXmlmod.sip
- %Import QtNetwork/QtNetworkmod.sip
- %Import QtSql/QtSqlmod.sip
-diff --git a/src/gui/qgsfiledownloader.h b/src/gui/qgsfiledownloader.h
-index c9276f7..841e4b6 100644
---- a/src/gui/qgsfiledownloader.h
-+++ b/src/gui/qgsfiledownloader.h
-@@ -90,8 +90,10 @@ class GUI_EXPORT QgsFileDownloader : public QObject
-     void onSslErrors( QNetworkReply *reply, const QList<QSslError> &errors );
- #endif
- 
--  private:
-+  protected:
-     ~QgsFileDownloader();
-+
-+  private:
-     /**
-      * Abort current request and show an error if the instance has GUI
-      * notifications enabled.
diff --git a/sci-geosciences/qgis/files/qgis-2.18.3-sip-4.19.patch b/sci-geosciences/qgis/files/qgis-2.18.3-sip-4.19.patch
deleted file mode 100644
index f72e0e4fd17d..000000000000
--- a/sci-geosciences/qgis/files/qgis-2.18.3-sip-4.19.patch
+++ /dev/null
@@ -1,237 +0,0 @@
-commit 718581ffb12b723f9a3c0ae01b7ec2d8aed9d4bb
-Author: Juergen E. Fischer <jef@norbit.de>
-Date:   Sat Feb 11 21:02:05 2017 +0100
-
-    adapt bindings to sip 4.19 (fixes #16071)
-
-diff --git a/python/analysis/analysis.sip b/python/analysis/analysis.sip
-index ceb5056..bd90e10 100644
---- a/python/analysis/analysis.sip
-+++ b/python/analysis/analysis.sip
-@@ -1,5 +1,4 @@
- %Module(name=qgis._analysis,
--        version=0,
-         keyword_arguments="Optional")
- 
- %Import QtCore/QtCoremod.sip
-diff --git a/python/analysis/network/networkanalysis.sip b/python/analysis/network/networkanalysis.sip
-index fb446d1..d2c192b 100644
---- a/python/analysis/network/networkanalysis.sip
-+++ b/python/analysis/network/networkanalysis.sip
-@@ -1,5 +1,4 @@
- %Module(name=qgis._networkanalysis,
--        version=0,
-         keyword_arguments="Optional")
- 
- %Import QtCore/QtCoremod.sip
-diff --git a/python/core/conversions.sip b/python/core/conversions.sip
-index 564d4de..f07d3ab 100644
---- a/python/core/conversions.sip
-+++ b/python/core/conversions.sip
-@@ -747,7 +747,7 @@ template<TYPE>
- 
- // QMap<qint64, TYPE> is implemented as a Python dictionary.
- template<TYPE>
--%MappedType QMap<qint64, TYPE> /DocType="dict-of-qint64-TYPE"/
-+%MappedType QMap<qint64, TYPE>
- {
- %TypeHeaderCode
- #include <qmap.h>
-@@ -1873,7 +1873,7 @@ template <TYPE>
- };
- 
- // QList<QgsField> is implemented as a Python list of QgsField.
--%MappedType QList<QgsField> /DocType="list-of-qgsfield"/
-+%MappedType QList<QgsField>
- {
- %TypeHeaderCode
- #include <qgsfield.h>
-@@ -1978,7 +1978,7 @@ template <TYPE>
- 
- %If (QVECTORINT_CONVERSION)
- // QVector<int> is implemented as a Python list of integers.
--%MappedType QVector<int> /DocType="list-of-int"/
-+%MappedType QVector<int>
- {
- %TypeHeaderCode
- #include <qvector.h>
-diff --git a/python/core/core.sip b/python/core/core.sip
-index 577c4c1..8f0b6af 100644
---- a/python/core/core.sip
-+++ b/python/core/core.sip
-@@ -1,5 +1,4 @@
- %Module(name=qgis._core,
--        version=0,
-         keyword_arguments="Optional")
- 
- %Feature QT5_SUPPORT
-diff --git a/python/core/qgscoordinatetransform.sip b/python/core/qgscoordinatetransform.sip
-index c14ba53..f9b7854 100644
---- a/python/core/qgscoordinatetransform.sip
-+++ b/python/core/qgscoordinatetransform.sip
-@@ -15,6 +15,7 @@
- class QgsCoordinateTransform : QObject
- {
- %TypeHeaderCode
-+extern PyObject *sipExportedExceptions__core[2];  // workaround: sipExportedExceptions__core is only defined in the first sip part
- #include <qgscoordinatetransform.h>
- %End
- 
-@@ -215,5 +216,5 @@ class QgsCoordinateTransform : QObject
- 
-   signals:
-     /** Signal when an invalid pj_transform() has occurred */
--    void  invalidTransformInput() const;
-+    void invalidTransformInput() const;
- };
-diff --git a/python/core/qgsfeature.sip b/python/core/qgsfeature.sip
-index 596f8a8..4009b50 100644
---- a/python/core/qgsfeature.sip
-+++ b/python/core/qgsfeature.sip
-@@ -4,7 +4,7 @@ typedef QMap<int, QVariant> QgsAttributeMap;
- typedef QVector<QVariant> QgsAttributes;
- 
- // QgsAttributes is implemented as a Python list of Python objects.
--%MappedType QgsAttributes /DocType="list-of-attributes"/
-+%MappedType QgsAttributes
- {
- %TypeHeaderCode
- #include <qgsfeature.h>
-diff --git a/python/core/qgspallabeling.sip b/python/core/qgspallabeling.sip
-index 488b58b..3d99555 100644
---- a/python/core/qgspallabeling.sip
-+++ b/python/core/qgspallabeling.sip
-@@ -1,5 +1,5 @@
- // QMap<QgsPalLayerSettings::DataDefinedProperties, QgsDataDefined*> is implemented as a Python dictionary.
--%MappedType QMap<QgsPalLayerSettings::DataDefinedProperties, QgsDataDefined*> /DocType="dict-of-QgsPalLayerSettings.DataDefinedProperties-QgsDataDefined*"/
-+%MappedType QMap<QgsPalLayerSettings::DataDefinedProperties, QgsDataDefined*>
- {
- %TypeHeaderCode
- #include <qmap.h>
-diff --git a/python/core/qgsvectorlayerfeatureiterator.sip b/python/core/qgsvectorlayerfeatureiterator.sip
-index 0685e20..ad3431c 100644
---- a/python/core/qgsvectorlayerfeatureiterator.sip
-+++ b/python/core/qgsvectorlayerfeatureiterator.sip
-@@ -70,5 +70,6 @@ class QgsVectorLayerFeatureIterator : QgsAbstractFeatureIterator
-     //void updateFeatureGeometry( QgsFeature& f );
- 
-   private:
--    QgsVectorLayerFeatureIterator();
-+    QgsVectorLayerFeatureIterator( const QgsVectorLayerFeatureIterator &rhs );
-+
- };
-diff --git a/python/core/raster/qgsrasterprojector.sip b/python/core/raster/qgsrasterprojector.sip
-index 47bb697..40b9a10 100644
---- a/python/core/raster/qgsrasterprojector.sip
-+++ b/python/core/raster/qgsrasterprojector.sip
-@@ -55,7 +55,7 @@ class QgsRasterProjector : QgsRasterInterface
- 
-     int bandCount() const;
- 
--    int dataType( int bandNo ) const;
-+    QGis::DataType dataType( int bandNo ) const;
- 
-     /** \brief set source and destination CRS */
-     void setCRS( const QgsCoordinateReferenceSystem & theSrcCRS, const QgsCoordinateReferenceSystem & theDestCRS,
-diff --git a/python/gui/editorwidgets/qgsdatetimeedit.sip b/python/gui/editorwidgets/qgsdatetimeedit.sip
-index deda76d..be658a1 100644
---- a/python/gui/editorwidgets/qgsdatetimeedit.sip
-+++ b/python/gui/editorwidgets/qgsdatetimeedit.sip
-@@ -37,6 +37,7 @@ class QgsDateTimeEdit : QDateTimeEdit
- 
-   protected:
-     virtual void resizeEvent( QResizeEvent* event );
--
-     void mousePressEvent( QMouseEvent*event );
-+    virtual void fixup(QString & input) const;
-+    virtual QValidator::State validate(QString &text, int &pos) const;
- };
-diff --git a/python/gui/editorwidgets/qgsdoublespinbox.sip b/python/gui/editorwidgets/qgsdoublespinbox.sip
-index 1666a02..58f589d 100644
---- a/python/gui/editorwidgets/qgsdoublespinbox.sip
-+++ b/python/gui/editorwidgets/qgsdoublespinbox.sip
-@@ -80,4 +80,5 @@ class QgsDoubleSpinBox : QDoubleSpinBox
-   protected:
-     virtual void changeEvent( QEvent* event );
-     virtual void paintEvent( QPaintEvent* event );
-+    virtual void fixup(QString & input) const;
- };
-diff --git a/python/gui/editorwidgets/qgsspinbox.sip b/python/gui/editorwidgets/qgsspinbox.sip
-index d560641..c953470 100644
---- a/python/gui/editorwidgets/qgsspinbox.sip
-+++ b/python/gui/editorwidgets/qgsspinbox.sip
-@@ -78,7 +78,7 @@ class QgsSpinBox : QSpinBox
-     virtual QValidator::State validate( QString & input, int & pos ) const;
- 
-   protected:
--
-     virtual void changeEvent( QEvent* event );
-     virtual void paintEvent( QPaintEvent* event );
-+    virtual void fixup(QString &input) const;
- };
-diff --git a/python/gui/gui.sip b/python/gui/gui.sip
-index 240c636..727ac70 100644
---- a/python/gui/gui.sip
-+++ b/python/gui/gui.sip
-@@ -1,5 +1,4 @@
- %Module(name=qgis._gui,
--        version=0,
-         keyword_arguments="Optional")
- 
- %Feature HAVE_QSCI_SIP
-diff --git a/python/gui/qgslonglongvalidator.sip b/python/gui/qgslonglongvalidator.sip
-index 9def830..7500357 100644
---- a/python/gui/qgslonglongvalidator.sip
-+++ b/python/gui/qgslonglongvalidator.sip
-@@ -8,7 +8,7 @@ class QgsLongLongValidator : QValidator
-     QgsLongLongValidator( qint64 bottom, qint64 top, QObject *parent );
-     ~QgsLongLongValidator();
- 
--    QValidator::State validate( QString &input, int& ) const;
-+    virtual QValidator::State validate( QString &input, int& ) const;
- 
-     void setBottom( qint64 bottom );
-     void setTop( qint64 top );
-@@ -17,4 +17,6 @@ class QgsLongLongValidator : QValidator
- 
-     qint64 bottom() const;
-     qint64 top() const;
-+
-+    virtual void fixup(QString &input) const;
- };
-diff --git a/python/server/qgswmsconfigparser.sip b/python/server/qgswmsconfigparser.sip
-index f05752c..d231637 100644
---- a/python/server/qgswmsconfigparser.sip
-+++ b/python/server/qgswmsconfigparser.sip
-@@ -115,7 +115,7 @@ class QgsWMSConfigParser
-     virtual void setScaleDenominator( double denom ) = 0;
-     virtual void addExternalGMLData( const QString& layerName, QDomDocument* gmlDoc ) = 0;
- 
--    virtual QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const = 0;
-+    // virtual QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const = 0;
- 
-     virtual int nLayers() const = 0;
- 
-diff --git a/python/server/qgswmsprojectparser.sip b/python/server/qgswmsprojectparser.sip
-index f6dd579..13fea73 100644
---- a/python/server/qgswmsprojectparser.sip
-+++ b/python/server/qgswmsprojectparser.sip
-@@ -63,7 +63,7 @@ class QgsWMSProjectParser : public QgsWMSConfigParser
-     void setScaleDenominator( double )  /*override*/;
-     void addExternalGMLData( const QString&, QDomDocument* )  /*override*/ ;
- 
--    QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const  /*override*/ ;
-+    // QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const  /*override*/ ;
- 
-     /** Fills a layer and a style list. The two list have the same number of entries and the style and the layer at a position belong together (similar to the HTTP parameters 'Layers' and 'Styles'. Returns 0 in case of success*/
-     int layersAndStyles( QStringList& layers, QStringList& styles ) const  /*override*/ ;
-diff --git a/python/server/server.sip b/python/server/server.sip
-index 537cd0b..355d3fa 100644
---- a/python/server/server.sip
-+++ b/python/server/server.sip
-@@ -1,5 +1,4 @@
- %Module(name=qgis._server,
--        version=0,
-         keyword_arguments="Optional")
- 
- 
diff --git a/sci-geosciences/qgis/files/qgis-2.18.3-webkit.patch b/sci-geosciences/qgis/files/qgis-2.18.3-webkit.patch
deleted file mode 100644
index 971ffde83a9b..000000000000
--- a/sci-geosciences/qgis/files/qgis-2.18.3-webkit.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-commit 222ae663e6ee6f718e45faafd63758c319fec135
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date:   Sun Feb 19 12:51:48 2017 +0100
-
-    Fix QtWebKit automagic
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3936521..4268019 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -288,6 +288,10 @@ ELSE()
-   MESSAGE(STATUS "Found Qt version: ${QTVERSION}")
- ENDIF()
- 
-+IF(WITH_QTWEBKIT)
-+    SET(OPTIONAL_QTWEBKIT ${QT_QTWEBKIT_LIBRARY})
-+ENDIF(WITH_QTWEBKIT)
-+
- IF (WITH_QTMOBILITY)
-     FIND_PACKAGE(QtMobility 1.1.0)
- ENDIF (WITH_QTMOBILITY)
-diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
-index 15579de..b6ef545 100644
---- a/src/app/CMakeLists.txt
-+++ b/src/app/CMakeLists.txt
-@@ -609,7 +609,7 @@ TARGET_LINK_LIBRARIES(qgis_app
-   ${QWT_LIBRARY}
-   ${QT_QTSQL_LIBRARY}
-   ${QT_QTUITOOLS_LIBRARY}
--  ${QT_QTWEBKIT_LIBRARY}
-+  ${OPTIONAL_QTWEBKIT}
-   #should only be needed for win
-   ${QT_QTMAIN_LIBRARY}
-   ${QWTPOLAR_LIBRARY}
-diff --git a/src/browser/CMakeLists.txt b/src/browser/CMakeLists.txt
-index e53c1de..1a72070 100644
---- a/src/browser/CMakeLists.txt
-+++ b/src/browser/CMakeLists.txt
-@@ -80,7 +80,7 @@ TARGET_LINK_LIBRARIES(qbrowser
-   ${QT_QTNETWORK_LIBRARY}
-   ${QT_QTSVG_LIBRARY}
-   ${QT_QTXML_LIBRARY}
--  ${QT_QTWEBKIT_LIBRARY}
-+  ${OPTIONAL_QTWEBKIT}
-   ${QT_QTMAIN_LIBRARY}
-   ${SQLITE3_LIBRARY}
- )
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index e2d9ae8..cd8e305 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -981,7 +981,7 @@ TARGET_LINK_LIBRARIES(qgis_core
-   ${QT_QTGUI_LIBRARY}
-   ${QT_QTNETWORK_LIBRARY}
-   ${QT_QTSVG_LIBRARY}
--  ${QT_QTWEBKIT_LIBRARY}
-+  ${OPTIONAL_QTWEBKIT}
-   ${QT_QTSQL_LIBRARY}
-   ${QCA_LIBRARY}
- 
-diff --git a/src/helpviewer/CMakeLists.txt b/src/helpviewer/CMakeLists.txt
-index cec5ad1..ffd0966 100644
---- a/src/helpviewer/CMakeLists.txt
-+++ b/src/helpviewer/CMakeLists.txt
-@@ -68,7 +68,7 @@ TARGET_LINK_LIBRARIES(qgis_help
-   ${QT_QTNETWORK_LIBRARY}
-   ${QT_QTSVG_LIBRARY}
-   ${QT_QTXML_LIBRARY}
--  ${QT_QTWEBKIT_LIBRARY}
-+  ${OPTIONAL_QTWEBKIT}
-   ${QT_QTMAIN_LIBRARY}
-   ${SQLITE3_LIBRARY}
- )
-diff --git a/tests/bench/CMakeLists.txt b/tests/bench/CMakeLists.txt
-index b605a6a..aa45a27 100644
---- a/tests/bench/CMakeLists.txt
-+++ b/tests/bench/CMakeLists.txt
-@@ -35,7 +35,7 @@ TARGET_LINK_LIBRARIES(qgis_bench
-   ${QT_QTNETWORK_LIBRARY}
-   ${QT_QTSVG_LIBRARY}
-   ${QT_QTXML_LIBRARY}
--  ${QT_QTWEBKIT_LIBRARY}
-+  ${OPTIONAL_QTWEBKIT}
-   ${QT_QTMAIN_LIBRARY}
-   ${QT_QTTEST_LIBRARY}
- )
-diff --git a/tests/src/gui/CMakeLists.txt b/tests/src/gui/CMakeLists.txt
-index f1c823a..94d8692 100644
---- a/tests/src/gui/CMakeLists.txt
-+++ b/tests/src/gui/CMakeLists.txt
-@@ -102,7 +102,7 @@ MACRO (ADD_QGIS_TEST testname testsrc)
-     ${QT_QTSVG_LIBRARY}
-     ${QT_QTTEST_LIBRARY}
-     ${QT_QTNETWORK_LIBRARY}
--    ${QT_QTWEBKIT_LIBRARY}
-+    ${OPTIONAL_QTWEBKIT}
-     ${QT_QTMAIN_LIBRARY}
-     ${PROJ_LIBRARY}
-     ${GEOS_LIBRARY}
-diff --git a/tests/src/providers/CMakeLists.txt b/tests/src/providers/CMakeLists.txt
-index 7e8b2e9..0388150 100644
---- a/tests/src/providers/CMakeLists.txt
-+++ b/tests/src/providers/CMakeLists.txt
-@@ -124,7 +124,7 @@ IF(UNIX AND NOT ANDROID AND CMAKE_BUILD_TYPE MATCHES Debug)
-     ${QT_QTNETWORK_LIBRARY}
-     ${QT_QTSVG_LIBRARY}
-     ${QT_QTXML_LIBRARY}
--    ${QT_QTWEBKIT_LIBRARY}
-+    ${OPTIONAL_QTWEBKIT}
-     ${QT_QTMAIN_LIBRARY}
-     ${QT_QTSCRIPT_LIBRARY}
-     qgis_core
diff --git a/sci-geosciences/qgis/qgis-2.18.14.ebuild b/sci-geosciences/qgis/qgis-2.18.14.ebuild
new file mode 100644
index 000000000000..badd711d115a
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-2.18.14.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit cmake-utils eutils gnome2-utils python-single-r1 qmake-utils xdg-utils
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/"
+SRC_URI="
+	https://qgis.org/downloads/qgis-${PV}.tar.bz2
+	examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples georeferencer grass mapserver oracle postgres python"
+
+REQUIRED_USE="
+	mapserver? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	app-crypt/qca:2[qt4,ssl]
+	>=dev-db/spatialite-4.1.0
+	dev-db/sqlite:3
+	dev-libs/expat
+	dev-libs/qjson
+	dev-qt/designer:4
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtscript:4
+	dev-qt/qtsvg:4
+	dev-qt/qtsql:4
+	sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}]
+	sci-libs/geos
+	sci-libs/libspatialindex:=
+	sci-libs/proj
+	x11-libs/qscintilla:=[qt4(-)]
+	>=x11-libs/qwt-6.1.2:6=[svg,qt4(-)]
+	>=x11-libs/qwtpolar-1[qt4(-)]
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( >=sci-geosciences/grass-7.0.0:= )
+	mapserver? ( dev-libs/fcgi )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS}
+		dev-python/future[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/markupsafe[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt4[X,sql,svg,${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/sip:=[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/bison
+	sys-devel/flex
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+PATCHES=(
+	# TODO upstream
+	"${FILESDIR}/${PN}-2.18.6-featuresummary.patch"
+	# Taken from redhat
+	"${FILESDIR}/${PN}-2.18.12-sip.patch"
+	# git master
+	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i -e "s:\${QT_BINARY_DIR}:$(qt4_get_bindir):" \
+		CMakeLists.txt || die "Failed to fix lrelease path"
+
+	cd src/plugins || die
+	use georeferencer || cmake_comment_add_subdirectory georeferencer
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQGIS_MANUAL_SUBDIR=/share/man/
+		-DBUILD_SHARED_LIBS=ON
+		-DQGIS_LIB_SUBDIR=$(get_libdir)
+		-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
+		-DQWT_INCLUDE_DIR=/usr/include/qwt6
+		-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt4.so
+		-DWITH_INTERNAL_QWTPOLAR=OFF
+		-DPEDANTIC=OFF
+		-DWITH_APIDOC=OFF
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_GRASS=$(usex grass)
+		-DWITH_SERVER=$(usex mapserver)
+		-DWITH_ORACLE=$(usex oracle)
+		-DWITH_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_QTWEBKIT=OFF
+	)
+
+	if has_version '<x11-libs/qscintilla-2.10'; then
+		mycmakeargs+=(
+			-DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/qt4/libqscintilla2.so
+		)
+	fi
+
+	if use grass; then
+		mycmakeargs+=(
+			-DWITH_GRASS7=ON
+			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+		)
+	fi
+
+	if use python; then
+		mycmakeargs+=(
+			-DBINDINGS_GLOBAL_INSTALL=ON
+			-DWITH_PYSPATIALITE=ON
+			-DWITH_INTERNAL_DATEUTIL=OFF
+			-DWITH_INTERNAL_FUTURE=OFF
+			-DWITH_INTERNAL_MARKUPSAFE=OFF
+			-DWITH_INTERNAL_PYTZ=OFF
+			-DWITH_INTERNAL_SIX=OFF
+			-DWITH_INTERNAL_YAML=OFF
+		)
+	fi
+
+	# bug 612956
+	addpredict /dev/dri/renderD128
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	domenu debian/qgis.desktop
+
+	local size type
+	for size in 16 22 24 32 48 64 96 128 256; do
+		newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png
+		newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
+		for type in qgs qml qlr qpt; do
+			newicon -c mimetypes -s ${size} debian/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
+		done
+	done
+	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
+
+	insinto /usr/share/mime/packages
+	doins debian/qgis.xml
+
+	if use examples; then
+		docinto examples
+		dodoc -r "${WORKDIR}"/qgis_sample_data/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	python_optimize "${ED%/}"/usr/share/qgis/python
+
+	if use grass; then
+		python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	if use postgres; then
+		elog "If you don't intend to use an external PostGIS server"
+		elog "you should install:"
+		elog "   dev-db/postgis"
+	elif use python; then
+		elog "Support of PostgreSQL is disabled."
+		elog "But some installed python-plugins import the psycopg2 module."
+		elog "If you do not need these plugins just disable them"
+		elog "in the Plugins menu, else you need to set USE=\"postgres\""
+	fi
+
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/sci-geosciences/routino/Manifest b/sci-geosciences/routino/Manifest
index f8aff98b6c77..b48e6776b6ea 100644
--- a/sci-geosciences/routino/Manifest
+++ b/sci-geosciences/routino/Manifest
@@ -1,8 +1,8 @@
-AUX routino-3.1.1.patch 828 SHA256 e2e73cb49a809c30e3fc94fb49b092dcb0e91d228f640cd689ea949b5ed91b5a SHA512 a7ff4acf285144f714ec3d83201459709aa30929d98215812505dda4c1a8103cd3c75839d22019b24bc1648c035b2bd8f5c71a340f4a10c682e3f45b456ac399 WHIRLPOOL 13b458493dfb53dff6252c98c7f8df33cf4544f4386128c54382e39ef45814e8ebc029d01e7b8301678e95bf29b86a828f21928ecfa1967cce6f89342e24ee9e
-AUX routino-3.2.patch 774 SHA256 374e34c33dad36805842be7ddfe70d8ac9af953d590c35f713eab56ed5c88246 SHA512 0ffb2e3c9183c88e17e720491ab3b3078febcd15d7be777004d9ac2b80cc16225d60f24a0bafc5d36c73db3e8c822ad3f8717e992f4a5bee12b62b2dc710defb WHIRLPOOL c2e8403b39933f3126b9a101d9ce5b9bba9b8783ff05a3153e5d4cbfc7484a867d58d32c1cc9582dbb113cb81ef460790db6d621264d22eecdf2740f85c78420
+AUX routino-3.1.1.patch 1361 SHA256 14d9aeb3585979ccf2e67965297730e77511f9c6457ca9a3b095c8f0aef9ed93 SHA512 c1f12433b478adc05e74d4da2470c80788b788dd6bef16eec2c76a1d209adece11091b3862ccc4c1d0ee105c209f3f332a05181f0c1f83cb9528369a7f6b14b4 WHIRLPOOL 966e764e635e2606739df3aa8709c79a70c5d7bacc293230e5e9f6349e55d753fde740edd22cc25862d3f98d9e890d174a70ebad651c00dd234288f7e4600996
+AUX routino-3.2.patch 1357 SHA256 8af21e0b53b5ceeb1e0cf4cb5eaab9c329831ac83a5ebe814a9cfaf07fddae70 SHA512 f65f123985e858f9c9a1daac0ea0cde3c54387cc7a4c23064630e0e507f90ce767b4c6dd269fd4fddaa3ee1d2b2d55e91f7346f9ca89a001ee5e71155c9cf89d WHIRLPOOL bf9171293feeda7133acf21499c7c148855af84c0e3f8de103a1c64ef0e50e7f68f103bdb32f73c4029b5863478ad2f3693d43a9b77e95b3862ee05a8cc5ee8c
 DIST routino-3.1.1.tgz 1795118 SHA256 23b9fce43f0a85c9efe220c6c72026dd7b37f6a4a5153bb9dc4c4b0747c7f282 SHA512 088f22e9297f485418ed369d00827690f86e224e331b69085513339870fe6d97cffef62aa5e7e14883800469beff4af4b0a581ba8bad78920a383d7152be6ede WHIRLPOOL 914180a728120ba189ff9bc2bf51c64246f635f7cc2e6b6efecf4dbb2c76f9b61f6269225620b5a5204025c838a6fcd8ffc24953a8cf24c084edbbdfb24a6b58
 DIST routino-3.2.tgz 2463662 SHA256 e2a431eaffbafab630835966d342e4ae25d5edb94c8ed419200e1ffb50bc7552 SHA512 f5be46d9c026fcd92658490630d9ff6e4827e84ee57ccbaae48f54372da37ab78de24432ab9fa1d6860304a9a2ac86061eb876c12b39e821693282c4d4aaefcf WHIRLPOOL c30ea87987e60d5ef57591bcba8190ece3cc8acfba2cb62035785238119c0d84db65e9f53a2935d8cd2bb0c3d37cd9b8970e9c6ba897b0874f847db31f0858ee
-EBUILD routino-3.1.1.ebuild 459 SHA256 8c843fde4d6662aea7cf7fdc349c325587a3be1c2b6a74449e982b4518bc83f1 SHA512 143c56bf79d8e1bd62d4c180bdea711c4b67831d8fe5bae162b6bdfa33fe01d092772f16fce23e0a2fc5a6a228e25c7f81edf19e2af5506f989c01955a9b1742 WHIRLPOOL 9d4f9caefbe368f9c8176b5bec008cb06daa76f368205f87df6bb5bb7b35e090b6213738abdba97575cb6e4e05dc39961b71dc7b10e61ed4d39a114ba8f1f9f3
-EBUILD routino-3.2.ebuild 461 SHA256 356983ddeaa999404b1e7ca10a059fdd365473b3a43ca41aab92eab51735f8f5 SHA512 35a464426fa5c408842a73ca46b91e643689b66d0c8877b0781d4be04ece378b0bc352ade48dc5ebc520ee0589032e09c18b0b3928fb6b0a1af372371d9fa76d WHIRLPOOL edcbe0f08de87beb1f91aad70d0a1f255a257022bbecd7192ce91808f4ea0995784d0630b3af40e69477228787220639f58654a0c4f09f7238d55eb37bab4692
+EBUILD routino-3.1.1.ebuild 659 SHA256 ca750fd06eb2c084a1e9308509a900576655c3e3f702dbd9c96cc12b23860701 SHA512 fd1dfd7fc8fc5821e8e7ac976aa04f3d1737509415a5a2451174e6dbe74c8ed5f1638d13cde17bdd1eedfc87c60b638470b49f42cf3e7e0787371395ff92eaba WHIRLPOOL 682299e1b9de5cbbe6054222bbabbb52ac77ada9fa8a3a5defc99f1991f05c0680ce49aa583e6cf1e9d0b249d2255771828a61287dd35b85384efed498ed01a0
+EBUILD routino-3.2.ebuild 661 SHA256 2278b0f5916d85dd8918d2470a5e3b335048402c462f18d00aa2cc6ed19ca48c SHA512 21e36482dfd5145b037ac165881030d9e9ba3bccab480fbca82b32cbf8b0e68662a28bd1a5630d2573f8ff85160c6cfeaa9f3f90df184913c1f984dd5ea1bb1a WHIRLPOOL 43f402b1636e21e8289b9bd19f23a1a77a8f5cc6ac0a3949b02e63c6bca7a6a69eea781151673a939866e6b2097f4f0450ecd376089ff910ab249f75350277bc
 MISC ChangeLog 1223 SHA256 a18015d346097a1e7254ac7fbf768f0e97e7774beb8c66e162f6ab603e4a013f SHA512 16324ad3437549e317af53bd45e354d78b2ba225c3b612e3ca21e5fc0192266a6ff45d998fe071a9571d39ab541d44a870a0b5715da8806763730ce03ff7c98f WHIRLPOOL c8a0a7cec5792d531cad7530e41edb621e172fdaaa63fe6a089f9dc1c075305095b7ad13f56d0acc43715ba05f23f7a278f3133f3cd0528d42394a047ad24681
 MISC metadata.xml 893 SHA256 15702f35b5bbdd59fc05edaf5274c86cd5777ed9f861d409b88801882b7748e1 SHA512 84bd42eadbfae10a8762f0d8e28d410d2bf6c69a02e38cf870a846b5f7431130116658e22de5b2411cca0965e027d2f5c71e02bcf6b5ce1e1a804f1c235f60ff WHIRLPOOL 04fcbc8f5256cb792e05ca3c9abd47f7c6d943faa9d1b1434734ed4e25b345760ebc3edc0055d9fa33fab3ebb021324b59dc5e98289cdffb1a0f3c28cc6598e0
diff --git a/sci-geosciences/routino/files/routino-3.1.1.patch b/sci-geosciences/routino/files/routino-3.1.1.patch
index 15ba41b73feb..ac54fcf9f887 100644
--- a/sci-geosciences/routino/files/routino-3.1.1.patch
+++ b/sci-geosciences/routino/files/routino-3.1.1.patch
@@ -1,17 +1,22 @@
-diff -r -U1 routino-3.1.1.orig/Makefile.conf routino-3.1.1/Makefile.conf
---- routino-3.1.1.orig/Makefile.conf	2016-03-05 19:49:21.000000000 +0600
-+++ routino-3.1.1/Makefile.conf	2016-07-16 20:09:22.208869580 +0600
-@@ -47,3 +47,3 @@
+--- routino-3.1.1/Makefile.conf	2017-10-22 15:55:10.420531850 +0200
++++ routino-3.1.1/Makefile.conf.new	2017-10-22 15:55:32.180533067 +0200
+@@ -45,11 +45,11 @@
+ # Installation locations (edit if required)
+ 
  ifneq ($(HOST),MINGW)
 -prefix=/usr/local
 +prefix=/usr
  bindir=$(prefix)/bin
-@@ -51,3 +51,3 @@
+ incdir=$(prefix)/include
  libdir=$(prefix)/lib
 -docdir=$(prefix)/doc/routino
 +docdir=$(prefix)/share/doc/$(PF)
  datadir=$(prefix)/share/routino
-@@ -76,6 +76,6 @@
+ else
+ prefix="c:/Program Files/Routino"
+@@ -74,16 +74,16 @@
+ 
+ 
  # Maths library
 -LDFLAGS=-lm
 +LDFLAGS+=-lm
@@ -20,15 +25,32 @@ diff -r -U1 routino-3.1.1.orig/Makefile.conf routino-3.1.1/Makefile.conf
 -CFLAGS=-std=c99
 +CFLAGS+=-std=c99
  
-@@ -85,3 +85,3 @@
+ # Warning options
+ CFLAGS+=-Wall -Wmissing-prototypes -Wextra -Wno-unused-parameter -pedantic
+ 
  # Optimisation options
 -CFLAGS+=-O3
 +#CFLAGS+=-O3
  CFLAGS+=-ffast-math
-@@ -141,4 +141,4 @@
+ 
+ # Optimisation option (only works if compilation and execution use exactly the same CPU architecture).
+@@ -118,7 +118,7 @@
+ endif
+ 
+ # Put the current directory in the shared library path for the router using libroutino
+-LDFLAGS_LDSO=-Wl,-R.
++#LDFLAGS_LDSO=-Wl,-R.
+ 
+ 
+ # Required for multi-threaded support (comment these two lines out if not required)
+@@ -139,8 +139,8 @@
+ 
+ 
  # Required for xz support (uncomment these two lines if required)
 -#CFLAGS+=-DUSE_XZ
 -#LDFLAGS+=-llzma
 +CFLAGS+=-DUSE_XZ
 +LDFLAGS+=-llzma
  
+ 
+ # Required to use stdio with files > 2GiB on 32-bit system.
diff --git a/sci-geosciences/routino/files/routino-3.2.patch b/sci-geosciences/routino/files/routino-3.2.patch
index 484b61b68f10..81b6c4d938c9 100644
--- a/sci-geosciences/routino/files/routino-3.2.patch
+++ b/sci-geosciences/routino/files/routino-3.2.patch
@@ -1,30 +1,56 @@
-diff -r -U1 routino-3.2.orig/Makefile.conf routino-3.2/Makefile.conf
---- routino-3.2.orig/Makefile.conf	2016-11-22 20:22:52.000000000 +0100
-+++ routino-3.2/Makefile.conf	2017-04-01 23:58:23.835905270 +0200
-@@ -47,3 +47,3 @@
+--- routino-3.2/Makefile.conf	2017-10-22 16:03:29.917559780 +0200
++++ routino-3.2/Makefile.conf.new	2017-10-22 16:04:23.877562797 +0200
+@@ -45,11 +45,11 @@
+ # Installation locations (edit if required)
+ 
  ifneq ($(HOST),MINGW)
 -prefix=/usr/local
 +prefix=/usr
  bindir=$(prefix)/bin
-@@ -51,3 +51,3 @@
+ incdir=$(prefix)/include
  libdir=$(prefix)/lib
 -docdir=$(prefix)/doc/routino
 +docdir=$(prefix)/share/doc/$(PF)
  datadir=$(prefix)/share/routino
-@@ -79,3 +79,3 @@
+ else
+ prefix="c:/Program Files/Routino"
+@@ -74,16 +74,16 @@
+ 
+ 
+ # Maths library
+-LDFLAGS=-lm
++LDFLAGS+=-lm
+ 
  # Language dialect selection
 -CFLAGS=-std=c99
 +CFLAGS+=-std=c99
  
-@@ -85,3 +85,3 @@
+ # Warning options
+ CFLAGS+=-Wall -Wmissing-prototypes -Wextra -Wno-unused-parameter -pedantic
+ 
  # Optimisation options
 -CFLAGS+=-O3
 +#CFLAGS+=-O3
  CFLAGS+=-ffast-math
-@@ -141,4 +141,4 @@
+ 
+ # Optimisation option (only works if compilation and execution use exactly the same CPU architecture).
+@@ -118,7 +118,7 @@
+ endif
+ 
+ # Put the current directory in the shared library path for the router using libroutino
+-LDFLAGS_LDSO=-Wl,-R.
++#LDFLAGS_LDSO=-Wl,-R.
+ 
+ 
+ # Required for multi-threaded support (comment these two lines out if not required)
+@@ -139,8 +139,8 @@
+ 
+ 
  # Required for xz support (uncomment these two lines if required)
 -#CFLAGS+=-DUSE_XZ
 -#LDFLAGS+=-llzma
 +CFLAGS+=-DUSE_XZ
 +LDFLAGS+=-llzma
  
+ 
+ # Required to use stdio with files > 2GiB on 32-bit system.
diff --git a/sci-geosciences/routino/routino-3.1.1.ebuild b/sci-geosciences/routino/routino-3.1.1.ebuild
index 54aadaee9dd2..724e40b20799 100644
--- a/sci-geosciences/routino/routino-3.1.1.ebuild
+++ b/sci-geosciences/routino/routino-3.1.1.ebuild
@@ -1,7 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=6
 
+inherit toolchain-funcs
+
 DESCRIPTION="Routing application based on openstreetmap data"
 HOMEPAGE="http://www.routino.org/"
 SRC_URI="http://www.routino.org/download/${P}.tgz"
@@ -10,10 +13,16 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 DEPEND=""
-PATCHES=( "${FILESDIR}"/${P}.patch )
 
-src_configure() {
-	:
+src_prepare() {
+	eapply "${FILESDIR}"/${P}.patch
+
+	sed -i -e "s@libdir=\(.*\)@libdir=\$(prefix)/$(get_libdir)@" \
+		-e "s@CC=gcc@CC=$(tc-getCC)@" \
+		-e "s@LD=gcc@LD=$(tc-getCC)@" \
+		Makefile.conf || die "failed sed"
+
+	eapply_user
 }
 
 src_compile() {
diff --git a/sci-geosciences/routino/routino-3.2.ebuild b/sci-geosciences/routino/routino-3.2.ebuild
index cb1ceff2cd3c..19512b20efa7 100644
--- a/sci-geosciences/routino/routino-3.2.ebuild
+++ b/sci-geosciences/routino/routino-3.2.ebuild
@@ -1,7 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=6
 
+inherit toolchain-funcs
+
 DESCRIPTION="Routing application based on openstreetmap data"
 HOMEPAGE="http://www.routino.org/"
 SRC_URI="http://www.routino.org/download/${P}.tgz"
@@ -10,10 +13,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
-PATCHES=( "${FILESDIR}"/${P}.patch )
 
-src_configure() {
-	:
+src_prepare() {
+	eapply "${FILESDIR}"/${P}.patch
+
+	sed -i -e "s@libdir=\(.*\)@libdir=\$(prefix)/$(get_libdir)@" \
+		-e "s@CC=gcc@CC=$(tc-getCC)@" \
+		-e "s@LD=gcc@LD=$(tc-getCC)@" \
+		Makefile.conf || die "failed sed"
+
+	eapply_user
 }
 
 src_compile() {
diff --git a/sci-libs/colpack/Manifest b/sci-libs/colpack/Manifest
index 22447c8f1ca1..b17245dffa64 100644
--- a/sci-libs/colpack/Manifest
+++ b/sci-libs/colpack/Manifest
@@ -5,7 +5,7 @@ AUX colpack-1.0.9-fix_gcc49_omp.patch 1072 SHA256 12c5b9d008e1eef0b63722870e1cbf
 DIST ColPack-1.0.6.tar.gz 1027189 SHA256 d03208883aaa48544124c7fa950c2ea1aa88bc38c7997c4a563b176b6bc212ea SHA512 646ffdd459c40906f6c57888c0e38b791f9559a88ce649e9041271655a9d98658db1c6c0f3b09d64b9bd2c7d74c71a6bd8b13972ae7c7bbac42b300b8e3844c9 WHIRLPOOL 80e5c7f368b362bf4dda84661b364fa1f55215446339fec98bce5dfd7a7dcffc97a79c73329d0a721f012c7bc6651626f6ed5b1f5e284c1b540bcf047d0178b7
 DIST ColPack-1.0.9.tar.gz 1185335 SHA256 06c5d3e61ab873b27d7962a9f09e90cbc52ccd9f480e88f1ecb50e6bced11932 SHA512 762ab506f95788f9134033b60bf582472b80ab14766ad6795a7db1b780de0ae49bb30f1c9bd74b4f62cf46cc6029c37ef90a483e41b62bf4067cd4a71eb3db6c WHIRLPOOL f84e1766350265c3ecfb43d827327a018218be342f22adbd5f95d7172b9b489c12ed3978796b9c9d70b69058d88816ed6cb5979217ccca16c7691ecccedc3a51
 DIST colpack-1.0.10.tar.gz 658087 SHA256 b22ead7da80fa1735291b2d83198adf41bf36101e4fcb2c4f07c1cfacf211c75 SHA512 566b7906c5d0dbcd6dcb9c359510ee8b13bf3249e56d8f88f7806493d1df14f54638a0558d601ab4dbc28f36093795eede57a059a7c4e66438b47bf5a0119808 WHIRLPOOL c416c981aff798c6f0c9c33cf24f93fc0ab498e965159070697bc9eadb0014d9f6729858c7113811eec10e4219867075ef11191f6ca214320f83ccb2bf5bf625
-EBUILD colpack-1.0.10.ebuild 1077 SHA256 19b31460292d361db5d4bf763c3520a595c7d0e7ea63fdfebc58ed6b213afce3 SHA512 a038ace4f1e4c2f2287e55633903688f2da83515ad1b0c9bbf2fd5868333d1761a48dadedb8d2914f84bedd7222b82e6e98d81e84dd66dd88fc7cbd9d23a1e09 WHIRLPOOL 94f39bde414f6f3819eb6efe1c8ce3e0dea88d0e2fed0f2cf2eb9ac6fe2c86284347599d4782e54abab15d1125561678db985f77854f68566a4c8e9a48bb7051
+EBUILD colpack-1.0.10.ebuild 1076 SHA256 ef94f775122cb7e20ed7f68662893d3b8767754f16dbe9565c48d4796a7ab514 SHA512 6d884c14d58a3145d2ed35b51c3f1ba4d0d2ca7d288a45f73bd0d953b1d606acdb2e000b47b0ea35be5075bbc6ecc30df26fbad0de3fed005bfa32833c4c63d2 WHIRLPOOL 5ccb295f8db12fede49bb8b89cc328e6fd5fda5875ae27c7b69f97de2c447800bc011a811b94548130d1c725237d4fc6d2f9950da4da8b80299adbc31298cee0
 EBUILD colpack-1.0.6.ebuild 876 SHA256 91503f45a558206bbc4871f255d8fb8fd5cd623aa9587db5762d97be120b9e2b SHA512 2cc5bcdf1c4939b148eaa860aa74257d8c6a85e6d5a456969ab63a929422c4d195c5ed0cd20837b6fc52b46b038ff7d14312785ee49b037e56377fa3d3623505 WHIRLPOOL 32babd9bb18f0d7733e9ebf130d7f0e2e65c2e36f453f5bd1fa610c2b809b3f8c687660cba609ef350dcbf393903701cb134cdea51dd613ce971f6886b84b5a9
 EBUILD colpack-1.0.9-r1.ebuild 1193 SHA256 3d39c8e18a5bde2c6d3b663d17c27f6c794b1a97d12d34cc7e5952d850f2199a SHA512 27f4ec1eeef4085e13a4b989ac2af2e30f9845f482ed140f0cd6d196d837a1b8b77e6d2a430da400e42cbc7b49480ae34c6619ee89c8fccf2b994d484614d0c7 WHIRLPOOL 75e0c27894d19d7ae4494b956716361ed67d7d3220576bc76a1a482246ee1b8799d5c46d397da53ec6f0f6a6250d96e2f97a4a8044c729930b1b8cd6365521fb
 MISC ChangeLog 3430 SHA256 bd08de5cdef6186724d5c5bc1d402eb50aa61123499a785b8ab71cb65ff7d9eb SHA512 9a0ce2e4a8b2ecc915a6016ff028b4583a21703841775d2ada608c3b0eef0dc48bbdca309fca3abff6274222112221e7cfab3eadd0a23163f3ffc23ab5b495e0 WHIRLPOOL 76292c65acfb98f035ac2d7dd7b18c86ab96af81d91fc18d81eb646c2ad8753ef5a807521808bded8328f7cac2e12ee79f53e09be1eeb36b5bea928344565b9f
diff --git a/sci-libs/colpack/colpack-1.0.10.ebuild b/sci-libs/colpack/colpack-1.0.10.ebuild
index 11fda0e326df..9d8d33575a3d 100644
--- a/sci-libs/colpack/colpack-1.0.10.ebuild
+++ b/sci-libs/colpack/colpack-1.0.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/CSCsw/${MYPN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 IUSE="openmp static-libs"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=""
 DEPEND="${RDEPEND}"
diff --git a/sci-libs/libghemical/Manifest b/sci-libs/libghemical/Manifest
index 1a36d6b7dc0a..b9d46fc19595 100644
--- a/sci-libs/libghemical/Manifest
+++ b/sci-libs/libghemical/Manifest
@@ -1,6 +1,4 @@
-AUX 2.00-really-find-blas-and-lapack.patch 1317 SHA256 4d16fc804523fa24f0eb3fcbe33f3535d0265b6cc858f6291b5304806556d4ff SHA512 5d32b58c62de709ad746e2dfe1ece92ee8985257e95ae9789ea845b758e9ae64072fefe4a563271c5815bd117be175ee5e527c7d9feec2435ac46edfefdd2af6 WHIRLPOOL adffb8c0845d3ef627048c6f3887f5ebc289a759b102b5aaa1d1994eab6fe619740f7de07b48ddd31a2099f3bfc7ff4ee47a1feaecb2029bb0c97fecce431d7b
 AUX libghemical-2.98-gl.patch 402 SHA256 f4f8a83120613e2efe95eaf3e57d1bea9a30cce91d19fa7d1105a066d459af72 SHA512 bf0fee685f2f10f467d92f86db3dea47879651335c6966757e69bf7bac1f9a6ee18bd22c9a61f01ca1babc5c7e14cfc3caba382af764fd1a418ee70e32e2b1a6 WHIRLPOOL a0c6e0d838ebf890574bbec0511f91fd962b964f43eb2d106ac4c6e7ce6be3cbf19036bdd3d8a32f338282ac0de832fbbd0c10c6889817986a949dd995efa0b5
-AUX libghemical-2.99.1-gl.patch 785 SHA256 45551c96af992c538c8bc58f7e8d00aa075d7b1007e0e59007d1df61801fb4a4 SHA512 232bcbbcbb4512f9436ad064b7af08decb0bb46955f6a1db1f3830834b73e13db91426d3edea005e1542a0dcad0f580f449a96c59d6a12481360163f8347ba56 WHIRLPOOL 6d327bd0231d9b5dfd75047b156428eee196943755f608c39149f43614c47f2e13d288a02c0a7fd020aa5d6df187c9836a39f7f0a96cb418040b84e363e7f92e
 DIST libghemical-3.0.0.tar.gz 787947 SHA256 db8c3add0aa1f94c21016d60fa3f66fb194e56b8e9fceaa3860c603700efc3ac SHA512 71531e7bd72a7fa063dd35536a346f15e3c0fd0284112fa2f304580204b93552bd0c9a426cee22044b5dd1662e34e5d191d20af938e474561fe55f2394e7519e WHIRLPOOL fae8e49a2136460013296e0a23a56513a36941ece73013a1a21b530abdfbabfba2b5098457b70a9cd1694759995ffeae01250d05034e0c1186fd2f47af52af08
 EBUILD libghemical-3.0.0.ebuild 800 SHA256 fd2cebdbe0da745f7d0d63c37efc6b386159f826d9d5e8d76c82f02db1452db0 SHA512 bd1cce3e5dd4f9b4c0e3225e5406da281426381a6e6924a8e6044d4735e1e200d2b4bae48dd14aef3688f53d5e4ffbf58898ac255ca81e46fa3a8c5c86272844 WHIRLPOOL 6c8704254af8618d86ec2ec26f69d30ea307c55d9fe83f7307501f262c4fbeff2e17c25c654a93c0d75872949c62894dac08104c385e9d81dab113877138aa77
 MISC ChangeLog 3146 SHA256 f825e26541fcba9744d429175cf034982b728f894539e063b5652571befce469 SHA512 b27a577086aae9b70110b591b9b721ca02f5ea50dcf18f5efec1e75db7d83a12e9ba8f0f6da7faa8e5a745efb8762cab2448f6224a6c861f2854cff4a22b93c4 WHIRLPOOL 0c409dc12ccc99c905e78217434a4f4aff93783f068dec2be831b5eaacc7ca8a38d6795f5350283c069c8eac393cc65337c4ed8430566073d6d04367787d8206
diff --git a/sci-libs/libghemical/files/2.00-really-find-blas-and-lapack.patch b/sci-libs/libghemical/files/2.00-really-find-blas-and-lapack.patch
deleted file mode 100644
index bef730abbe4c..000000000000
--- a/sci-libs/libghemical/files/2.00-really-find-blas-and-lapack.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urN libghemical-2.00.orig/configure.ac libghemical-2.00/configure.ac
---- libghemical-2.00.orig/configure.ac	2006-05-12 23:31:06.000000000 -0700
-+++ libghemical-2.00/configure.ac	2006-05-12 23:54:20.000000000 -0700
-@@ -69,8 +69,18 @@
- AC_CHECK_LIB([m], [acos])
- 
- if test $WITH_MPQC = yes; then
--	AC_CHECK_LIB([blas], [main], , AC_MSG_ERROR([Cannot find blas library needed for MPQC support]))
--	AC_CHECK_LIB([lapack], [main], , AC_MSG_ERROR([Cannot find lapack library needed for MPQC support]))
-+	AC_CHECK_LIB([blas], [dgemm_], HAVE_BLAS="yes", , -lpthread)
-+	AC_CHECK_LIB([blas], [dgemm], HAVE_BLAS="yes", , -lpthread)
-+	AC_CHECK_LIB([blas], [dgemm__], HAVE_BLAS="yes", , -lpthread)
-+	if test "x${HAVE_BLAS}" = "x"; then
-+		AC_MSG_ERROR([Cannot find blas library needed for MPQC support])
-+	fi
-+	AC_CHECK_LIB([lapack], [cheev_], HAVE_LAPACK="yes", , -lpthread)
-+	AC_CHECK_LIB([lapack], [cheev], HAVE_LAPACK="yes", , -lpthread)
-+	AC_CHECK_LIB([lapack], [cheev__], HAVE_LAPACK="yes", , -lpthread)
-+	if test "x${HAVE_LAPACK}" = "x"; then
-+		AC_MSG_ERROR([Cannot find lapack library needed for MPQC support])
-+	fi
- 	AM_PATH_SC(1.2.5, HAVE_MPQC="yes", HAVE_MPQC="no")
- 	if test "${HAVE_MPQC}" = "yes"; then
- 		AC_DEFINE([ENABLE_MPQC], [], [Define if you are building a version that interfaces directly with MPQC])
diff --git a/sci-libs/libghemical/files/libghemical-2.99.1-gl.patch b/sci-libs/libghemical/files/libghemical-2.99.1-gl.patch
deleted file mode 100644
index ad46079e945d..000000000000
--- a/sci-libs/libghemical/files/libghemical-2.99.1-gl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index b01e5fa..943890b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -151,7 +151,7 @@ fi
- # Checks for header files.
- # ^^^^^^^^^^^^^^^^^^^^^^^^
- 
--AC_CHECK_HEADERS([GL/gl.h])
-+# AC_CHECK_HEADERS([GL/gl.h])
- 
- # Checks for typedefs, structures, and compiler characteristics.
- # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-diff --git a/src/typedef.h b/src/typedef.h
-index 8d2efcc..0ba62fe 100644
---- a/src/typedef.h
-+++ b/src/typedef.h
-@@ -27,7 +27,7 @@
- 
- // comment this out if you have no GL/gl.h available...
- 
--#define HAVE_GL_H	// 2008-07-31 ; also with mingw comment this out???
-+// #define HAVE_GL_H	// 2008-07-31 ; also with mingw comment this out???
- 
- // added by Robert Williams for Compaq cxx, alpha 11/28/01
- 
diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index e16435a3b7d3..9d3e01e427b9 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -16,6 +16,7 @@ AUX rstudio-0.99.879-prefs.patch 1859 SHA256 af9e07ced5c0fde92f6804d634750337252
 AUX rstudio-1.0.44-clang-pandoc.patch 3104 SHA256 a7cdd272ae114d90edd15ace2a6691e55af6b0ab847202e83acaca695f4ee091 SHA512 74b0f3dcc3dd60590dd2106861282f55bca7de157fb2e5fe587ca9311aa4527c8a8d64fc3e914f8d4e11ce65de9abbb79f917d7032b2fbfe4a4a9e8b83eea89b WHIRLPOOL 35f85c9417a0bbe20a7f612989d6923d66400bbb375ef14bda4582abe3b47e22c1c5e8b60dff43a5e9cafab91dd7bb9e772005afc0b1f4c71665f73313b53054
 AUX rstudio-1.0.44-paths.patch 6722 SHA256 615db327a359908fe6e9b54fba13d67a960a29fd4d05f48a0e6ad60f1b15f2e1 SHA512 6191520733f33466cf45bcc102a386763acc37a0cc1c58718cb59f3e3b5549afe5a051039f50aa390d773433d992cdff11bdf27c7e2960eb6177cd99c3169828 WHIRLPOOL 2278a1e75f23099f8fbd0e8b9a5ed50c355618b25f9123b4aaaee7882c616cd0b33379db8980c77c3288d6142d178ac7089edfea18e36b5ef7d590daefa50ba5
 AUX rstudio-1.0.44-systemd.patch 1147 SHA256 eb8dd9881fdd98c0f0600cfa77b610452bc6fec229f68bcdbf95f7945beea2a8 SHA512 ee22d4421ab52cff1815200ce1bda33ba7af752363537c6875ea19151767722183861301082eb03cb34403a08981cb10d66fd496e9e2687a4f3ca9de98f33d91 WHIRLPOOL 422ffb90a2efa587ff5fa3823b5cd6e749f30b65a51dc57d5f3a4464e2024926021aea1a7018da05250d4614aee9ea65d1de8e496bb00c7f29118b7a1900aabe
+AUX rstudio-1.1.357-clang-pandoc.patch 3240 SHA256 c190da98b7344f39d357bbda359c871a1331f809a36e68d51bbdc7b5ca983451 SHA512 3a2fc154f934b4bbd92df6359dc26c27bf2f4f06b2dde572faba3c083879c8e0e98ed776701282d9f3a5cb3f4ac2416e04e6a30beedf4ffa5cbeca3a7e72421b WHIRLPOOL 7c9d667bea8642a938cac46e1b4533f46d4f442ba88c94aa6efdb48c4d46cf2c56a81de81720cab2b2e39c83674c875583cc6f3a2765769564347d08c7f4e176
 AUX rstudio-server.conf 1337 SHA256 327e1a2b7d11c28962924290af19db62987a253ae31065e58d00df0b04233d12 SHA512 f166f1aa4bd370fcfcb44c5694d4e6af8bc64c5f43671e0c1def10c555d248bebf54199097f37d628a083c65913f522b7b44c3bd6a1227c011cf25eed1dba4a6 WHIRLPOOL 77695c3c1b09684adf9318ae5febab97199af58436d1cb0783b78c82ff2da33a98bebd7f5ac9c43a90e0ad852a133caac2a3a0568bbaa4fedca50577172b744b
 AUX rstudio-server.initd 377 SHA256 7b9f1ab9ca75426366649e3fd94c779c1e4f907b8b6fac0ef3d6af680ad00b4e SHA512 828a485338088d129c57debec6557ad35db5b042c61489ae4341717ce2218bec59a873541c270f964bb9c708b75896f1a3e2e64a4245a1713979d3bd42c9d5c8 WHIRLPOOL 7c21bbc40c07898b0866e6d49d2310f804e77882854c75da49b71865c33fd43a15ecf1b8d718f42587b37bbf2defd849275a78657337c31ac2b8714cb9269193
 AUX rstudio-server.service.in 161 SHA256 446649a73c0722950656ff858895f9d0eff98f4455082cdf0175ca11bb0d55a7 SHA512 bcf1f30e460dd5f0562b20489ca5544c6bcfbfb0ee1c636c4365df433e97e02e9e3b233e4159a0c71ad6d319f34f93c22b8fbf6b36463e29f22df2acd71da173 WHIRLPOOL 57c8156f37de4eb4b481ca93c63b455b85c7e192c6b2488b0568b6c82238f56277859e10ce1a1fb25aa06cd3c2d37dfc7f4704b802a59daedb8b9893e48c9c5e
@@ -41,6 +42,7 @@ DIST rstudio-1.0.136.tar.gz 17786389 SHA256 bb6a8aa475e09dd090cd2b5ea505f578d270
 DIST rstudio-1.0.143.tar.gz 17791067 SHA256 8ae88731b4474e5e2ff9030aa14e168903fe3a7ffc4fa716f497084a86801062 SHA512 46eaa88dd8332f18bb3a43de6e262d8a365860d9add78aea6a2d345784b239972c9c73bf0b56f1736b2981b8f688dbaf5a83c6848d170c0cf61d0e51dd636a82 WHIRLPOOL db1c11be240db3528e46d359c7d40d64068dfe5f7d915c4a6b690444f7f7fbc11f3898a6e262fa625bfab906f0cbfb2a8e3288a4fd20470423a99d992972fcda
 DIST rstudio-1.0.153.tar.gz 17790922 SHA256 79b90e21e56b114e28b03fd8543a208c55bb9d5f47a87fd29143d08b9a06f7a0 SHA512 d970a9bde88845e3fc6cdaff5233ffb65c03939c685c3fca0dd052246e065c7580b3f9bc4e053a79d2ecbb5f8c283d3fce7b97cc69e43176bd49587c736dab86 WHIRLPOOL c1f4c7bdc8e5a85af53411a35d736278b83f4732d2e273378fecc77cb075dff507147d56012682564edd58041c91cc051189eb38a7348d0827b76c7ac37bd54d
 DIST rstudio-1.0.44.tar.gz 17774065 SHA256 43ece6cfdd1a13ac0e17f2a50154a30a1a14ad6c1b3cf381cc6007988ce44a0f SHA512 a8b975dc517125a257e5f61db5bb137e133b02d738d55553770aa65e388cd112ce646b53b77dc069d1ca95ccd95979f4a57ad60b99fc3b91543cf61e737e8169 WHIRLPOOL 4ad472aed130451e81d8d8e3251d3bbd701a8b8e2fbddf17dc357f39335e33c75505f9443c2c7208e60a19c2767b9328134433e5d4fd22504813020712c658ef
+DIST rstudio-1.1.368.tar.gz 20197144 SHA256 586573707a488b5f528680b932ba5f8ea6d07667cc5ae6426104e2abf5ddab75 SHA512 39cdf583d7dcd22338916cc0ea4f90681580e41663b2d3e04b2e650759c6b030c85ee111cdfe1f717f931932a9b7ca423a21585d69a785f056f754f6d50399a1 WHIRLPOOL e18ff21823638d458179819e0b0b234b80be2f095f5b7bf5b9ac0190b078f0d7acb51e8896cbfcf1ce33cd203ed4e9fbe097aac6eee62515cace1d2f08c08219
 DIST selenium-java-2.37.0.zip 24625928 SHA256 0eebba65d8edb01c1f46e462907c58f5d6e1cb0ddf63660a9985c8432bdffbb7 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779 WHIRLPOOL eb6659aae26f3c78b6f998546b23d0636c9d00ed8a7f985db1463ac4bd483ccb3e643d84e2ca0f59e0636a8de79eb552ff1d68eb6f9c06907029f7552d8f7777
 DIST selenium-server-standalone-2.37.0.jar 34730734 SHA256 97bc8c699037fb6e99ba7af570fb60dbb1b7ce30cde2448287a44ef65b13023e SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018 WHIRLPOOL 20640591534f31f24825a9ed139589b182e8b60d86541bf0be104d3cc0280983f6566bd0459f2253ac3875b48a2798b205bac8f815a119fff6db625ce9bbc29e
 DIST shinyapps-0.98.1000.tar.gz 910095 SHA256 b95c512ae0a0fb4335878d9cfcf9073e2cb3ccfed73543abe27ea8878ed36d57 SHA512 3162317c4c20cfc1497e952a8235867084d629ae88407e6c465b3e208adb1dc97abfe6b9922e0374ddf4c8e38a76e112942bd312c54a66f74e6f2a3fe4c0a07c WHIRLPOOL ecc2bce78387cb42e9989163d8fca29220e66f085acde3323417058aebb624dafa8c0e1873c7d79e67324cbd5aad250ef9fcdbbc8f659d64482233b95d898a15
@@ -59,6 +61,7 @@ EBUILD rstudio-1.0.136.ebuild 8318 SHA256 0d5aa29e848b567bc13475a5e81d0dc198147d
 EBUILD rstudio-1.0.143.ebuild 8318 SHA256 0d5aa29e848b567bc13475a5e81d0dc198147dbdca5d05f2c7de6b577cf944cf SHA512 2e18400a80692509cf5381ea93c322245697e3ee9354aa50c0fb752b3332a5a6db25f0c5df51165202869795fc87a876abe2a370c1be32a41401ec7f911908de WHIRLPOOL b3f584ad5e38a433bd086712bfab22253496d6e1b12b2a2ec3bd8d3f33ed0d596b850118a95049254862047accda829c6b5b55705cb1b5101740301ea97b7cab
 EBUILD rstudio-1.0.153.ebuild 8318 SHA256 0d5aa29e848b567bc13475a5e81d0dc198147dbdca5d05f2c7de6b577cf944cf SHA512 2e18400a80692509cf5381ea93c322245697e3ee9354aa50c0fb752b3332a5a6db25f0c5df51165202869795fc87a876abe2a370c1be32a41401ec7f911908de WHIRLPOOL b3f584ad5e38a433bd086712bfab22253496d6e1b12b2a2ec3bd8d3f33ed0d596b850118a95049254862047accda829c6b5b55705cb1b5101740301ea97b7cab
 EBUILD rstudio-1.0.44.ebuild 8318 SHA256 0d5aa29e848b567bc13475a5e81d0dc198147dbdca5d05f2c7de6b577cf944cf SHA512 2e18400a80692509cf5381ea93c322245697e3ee9354aa50c0fb752b3332a5a6db25f0c5df51165202869795fc87a876abe2a370c1be32a41401ec7f911908de WHIRLPOOL b3f584ad5e38a433bd086712bfab22253496d6e1b12b2a2ec3bd8d3f33ed0d596b850118a95049254862047accda829c6b5b55705cb1b5101740301ea97b7cab
+EBUILD rstudio-1.1.368.ebuild 8369 SHA256 82b1926a1ce7041537fbb2f0ecb707bf4db87476aced4349026845aa72426167 SHA512 3c282333f637fcbe4c3db1672e794037e570c8340c0af831461e711d55926dc4a509b89af709de0f0d554b5b354ea3cf94ea3bcc86cb09a3f0fa92e29557d017 WHIRLPOOL 9743b684844afe904c3be1cca10e10cd7cb284d11a79e63209d2bd2e8a29437fa7b317207cb8e3bf9b431f5fb5eb18db6263dd0cb3e56ced89bfcabc32a9ec4f
 MISC ChangeLog 8907 SHA256 459e4ab51e87acfac9f99eb1c080fe9f34ad5c9e57970b43e4c1cf58b7e62985 SHA512 73e5e23815cb427fb52411f57da406406b602190616ec9a02176aef0a8ce927a27f11d63ebc06fb5ebde1225997999200f1e662c9affa105f2e874cc23e257dd WHIRLPOOL 96c1c0e04217317cf7f662584bece57828f5dc5b39317e34559acd12133c0e87dedc018f2849f40c20ed341deb6652c86cd71658974697e4ba59ea4983903f29
 MISC ChangeLog-2015 5297 SHA256 b7d149869d58c687ab524a33726c4f4df1163475ed6af648fd5eba8e88bc1910 SHA512 cb38d57dc56ec46860e738aa1cd5a8206cc1d74758181900b2cfe60c837160365fec38e68fedf071a16c2296499da7b438cb435487d192b0d52d81e20a7605f2 WHIRLPOOL b3d4cb4b14afeae885e1265bfdc1700061b583152a62db5c4e64add96f0e2e9e3dc3ad6f53397283c85b7eea9fecce589373d392f2f4f3ea94f73267439d3927
 MISC metadata.xml 589 SHA256 9a4c84314097c0bbd3fcd933f22aea585936d114b700c65d5baef3171bb57dc9 SHA512 c2c0e93e8845248cf23b1c85d3373c6c79c5994e077c7ab4050f6460f7852c8ed154b53605acb4495e2b7b7416fddc475a83037511231efb14075b69f9a03b5f WHIRLPOOL bb6aec9bcdf862d61b5f19c7d74a1cf3b45538540825402d253237788b9b93578da51921aa231cdb1455e72f0065eb28d03fc3b4d6d5e98b3367d6f0f9cc04ab
diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.357-clang-pandoc.patch b/sci-mathematics/rstudio/files/rstudio-1.1.357-clang-pandoc.patch
new file mode 100644
index 000000000000..28b0220912a0
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.1.357-clang-pandoc.patch
@@ -0,0 +1,76 @@
+Index: rstudio-1.1.357/src/cpp/session/CMakeLists.txt
+===================================================================
+--- rstudio-1.1.357.orig/src/cpp/session/CMakeLists.txt
++++ rstudio-1.1.357/src/cpp/session/CMakeLists.txt
+@@ -25,9 +25,6 @@ endif()
+ if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-26")
+   message(FATAL_ERROR "Mathjax 2.6 not found (re-run install-dependencies script to install)")
+ endif()
+-if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc")
+-  message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)")
+-endif()
+ 
+ # we often install embedded versions of these packages but don't do so currently
+ 
+@@ -38,22 +35,6 @@ endif()
+ #   message(FATAL_ERROR "rsconnect package not found (re-run install-dependencies script to install)")
+ # endif()
+ 
+-# verify libclang is installed
+-if(WIN32)
+-   set(LIBCLANG_VERSION "3.4")
+-else()
+-   set(LIBCLANG_VERSION "3.5")
+-endif()
+-set(LIBCLANG_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/${LIBCLANG_VERSION}")
+-if(NOT EXISTS "${LIBCLANG_DIR}")
+-  message(FATAL_ERROR "libclang ${LIBCLANG_VERSION} not found  (re-run install-dependencies script to install)")
+-endif()
+-set(LIBCLANG_HEADERS_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers")
+-if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}")
+-  message(FATAL_ERROR "libclang builtin-headers not found  (re-run install-dependencies script to install)")
+-endif()
+-
+-
+ # include files
+ file(GLOB_RECURSE SESSION_HEADER_FILES "*.h*")
+ 
+@@ -465,13 +446,6 @@ if (NOT RSTUDIO_SESSION_WIN64)
+    install(DIRECTORY "resources/connections"
+            DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
+ 
+-   # install pandoc
+-   set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/1.19.2.1")
+-   file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*")
+-   install(FILES ${PANDOC_FILES}
+-           PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+-           DESTINATION  ${RSTUDIO_INSTALL_BIN}/pandoc)
+-
+    # install rmarkdown package
+    # file(GLOB RMARKDOWN_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz")
+    # install(FILES ${RMARKDOWN_PACKAGE}
+@@ -502,24 +476,6 @@ if (NOT RSTUDIO_SESSION_WIN64)
+    install(DIRECTORY "resources/profiler"
+            DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
+ 
+-   # install libclang
+-   if(WIN32)
+-      file(GLOB LIBCLANG_32_FILES "${LIBCLANG_DIR}/x86/libclang.*")
+-      install(PROGRAMS ${LIBCLANG_32_FILES}
+-              DESTINATION  ${RSTUDIO_INSTALL_BIN}/rsclang/x86)
+-      file(GLOB LIBCLANG_64_FILES "${LIBCLANG_DIR}/x86_64/libclang.*")
+-      install(PROGRAMS ${LIBCLANG_64_FILES}
+-              DESTINATION  ${RSTUDIO_INSTALL_BIN}/rsclang/x86_64)
+-   else()
+-      file(GLOB_RECURSE LIBCLANG_FILES "${LIBCLANG_DIR}/libclang.*")
+-      install(PROGRAMS ${LIBCLANG_FILES}
+-              DESTINATION  ${RSTUDIO_INSTALL_BIN}/rsclang)
+-   endif()
+-
+-   # install libclang builtin-headers
+-   install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers"
+-           DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources/libclang")
+-
+    # install winpty on windows
+    if(WIN32)
+       install(PROGRAMS "${WINPTY_BINDIR_32}/winpty.dll"
diff --git a/sci-mathematics/rstudio/rstudio-1.1.368.ebuild b/sci-mathematics/rstudio/rstudio-1.1.368.ebuild
new file mode 100644
index 000000000000..38ac6d8ddf2f
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-1.1.368.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils user cmake-utils gnome2-utils pam versionator xdg-utils java-pkg-2 pax-utils qmake-utils
+
+# TODO
+# * package gin and gwt
+# * use dict from tree, linguas
+# * do src_test (use junit from tree?)
+
+# update from scripts in dependencies/common
+# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt
+GWT_VER=2.7.0
+GIN_VER=1.5
+SELENIUM_VER=2.37.0
+CHROMEDRIVER_VER=2.7
+# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc
+PANDOC_VER=1.13.1
+# ls dependencies/common/*.tar.gz
+PACKRAT_VER=0.98.1000
+RMARKDOWN_VER=0.98.1000
+SHINYAPPS_VER=0.98.1000
+RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
+
+DESCRIPTION="IDE for the R language"
+HOMEPAGE="
+	http://www.rstudio.org
+	https://github.com/rstudio/rstudio/"
+SRC_URI="
+	https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar
+	https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
+	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
+	https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="dedicated server"
+
+QT_VER=5.4
+QT_SLOT=5
+RDEPEND="
+	app-text/pandoc
+	dev-haskell/pandoc-citeproc
+	>=dev-lang/R-2.11.1
+	>=dev-libs/boost-1.63:=
+	>=dev-libs/mathjax-2.7.0
+	dev-libs/openssl:0
+	sys-apps/util-linux
+	>=sys-devel/clang-3.5.0:*
+	sys-libs/zlib
+	>=virtual/jre-1.8:=
+	x11-libs/pango
+	!dedicated? (
+		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5]
+		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
+		server? ( virtual/pam )
+	)
+	dedicated? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-java/ant-core
+	>=virtual/jdk-1.8:=
+	virtual/pkgconfig"
+#	test? ( dev-java/junit:4 )
+
+PATCHES=(
+		"${FILESDIR}/${PN}-0.99.879-prefs.patch"
+		"${FILESDIR}/${PN}-1.0.44-paths.patch"
+		"${FILESDIR}/${PN}-1.1.357-clang-pandoc.patch"
+		"${FILESDIR}/${PN}-0.98.490-linker_flags.patch"
+		"${FILESDIR}/${PN}-0.98.1091-boost-1.57.patch"
+		"${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch"
+		"${FILESDIR}/${PN}-1.0.44-systemd.patch"
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz gwt-${GWT_VER}.zip
+	cd "${S}" || die
+	mkdir -p src/gwt/lib/{gin,gwt} \
+		dependencies/common/dictionaries \
+		src/gwt/lib/selenium/${SELENIUM_VER} \
+		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
+	mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die
+	unzip -qd src/gwt/lib/gin/${GIN_VER} \
+		"${DISTDIR}"/gin-${GIN_VER}.zip || die
+	unzip -qd dependencies/common/dictionaries \
+		"${DISTDIR}"/core-dictionaries.zip || die
+	unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \
+		"${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die
+	cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \
+		src/gwt/lib/selenium/${SELENIUM_VER}/ || die
+	cp "${DISTDIR}"/chromedriver-linux \
+		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die
+	cd dependencies/common || die
+	unpack packrat-${PACKRAT_VER}.tar.gz
+	unpack rmarkdown-${RMARKDOWN_VER}.tar.gz
+	unpack shinyapps-${SHINYAPPS_VER}.tar.gz
+	unpack rsconnect_${RSCONNECT_VER}.tar.gz
+	cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \
+		. || die
+}
+
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+	egit_clean
+
+	# Enable CMake to install our .service file for systemd usage
+	mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die
+	cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die
+
+	# Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using
+	# this sed hack for now. ~RMH
+	sed -i \
+		-e "s|DISTRO_SHARE|\"share/${PN}\"|g" \
+		src/cpp/server/ServerOptions.cpp \
+		src/cpp/session/SessionOptions.cpp || die
+
+	# use mathjax from system
+	ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-26 || die
+
+	# make sure icons and mime stuff are with prefix
+	sed -i \
+		-e "s:/usr:${EPREFIX}/usr:g" \
+		CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
+
+	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
+	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \
+		-i src/cpp/server/ServerOptions.cpp \
+		|| die
+
+	# Set the rsession.conf file location for Gentoo prefix
+	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \
+		-i src/cpp/session/SessionOptions.cpp \
+		|| die
+
+	# dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
+	# It provides a library that has its version number appended to the end,
+	# which is difficult to handle in cmake, as find_library does not support
+	# searching for wildcard library names. So I find the library name from the
+	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
+	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
+	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
+				   $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
+					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
+						   -e 's@LIBS \*= -l@@')
+	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
+		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
+		|| die
+
+	# The git commit for tag: git rev-list -n 1 v0.99.903
+	sed -e 's@git ARGS rev-parse HEAD@echo ARGS 0eb2d8ea28ebc1ac6ac327e023becb6133b679c4@'\
+		-i "${S}"/CMakeLists.txt \
+		"${S}"/CMakeGlobals.txt \
+		|| die
+}
+
+src_configure() {
+	export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1)
+	export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2)
+	export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3)
+
+	local mycmakeargs=(
+		-DDISTRO_SHARE=share/${PN}
+		-DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
+		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
+		-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
+		-DRSTUDIO_VERIFY_R_VERSION=FALSE
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_compile
+}
+
+src_install() {
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_install
+	pax-mark m "${ED}usr/bin/rstudio"
+	doconfd "${FILESDIR}"/rstudio-server.conf
+	dodir /etc/rstudio
+	insinto /etc/rstudio
+	doins "${FILESDIR}"/rsession.conf
+	dosym "${ROOT}etc/conf.d/rstudio-server.conf" "${ROOT}etc/rstudio/rserver.conf"
+	if use dedicated || use server; then
+		dopamd src/cpp/server/extras/pam/rstudio
+		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
+	fi
+}
+
+pkg_preinst() {
+	use dedicated || gnome2_icon_savelist
+	java-pkg-2_pkg_preinst
+}
+
+pkg_postinst() {
+	use dedicated || { xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+		gnome2_icon_cache_update ;}
+
+	if use dedicated || use server; then
+		enewgroup rstudio-server
+		enewuser rstudio-server -1 -1 -1 rstudio-server
+	fi
+}
+
+pkg_postrm() {
+	use dedicated || { xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+		gnome2_icon_cache_update ;}
+}
diff --git a/sci-mathematics/why3-for-spark/Manifest b/sci-mathematics/why3-for-spark/Manifest
index e5c0b2a5e8ea..226a3ac30a8b 100644
--- a/sci-mathematics/why3-for-spark/Manifest
+++ b/sci-mathematics/why3-for-spark/Manifest
@@ -1,4 +1,4 @@
 AUX why3-for-spark-2017-gentoo.patch 488 SHA256 7fe1764ad2502c9983023417e1645299ae9a141e683f2a2b6abdf9fe5920ee7f SHA512 53c31e57021e1f7f9ca3e74447be403f99bff8009634ef400b72c48a15458230f1007e26c4070e04e3bea732d596a68ea20717a413ea13282a518d2eb29c6215 WHIRLPOOL 8514135f362dd67512a19095bfc15fcee2f22e07c9e23a069f18a7bd9e4a4ff15218a8c5368a56a6cefedc3e40ef11051a07243c315f05105c8f083145663fb1
 DIST why3-for-spark-gpl-2017-src.tar.gz 9248235 SHA256 7e7aee3912421847c416bc1f066ac342e811601c29d7b69e98e789a59a724d8e SHA512 8f444402f6c1744cd7c565117732935791b1ae7996a94314c40a66d125eae8a81f2257314246c94fd29d3cd16abcff6a50a152a1191a4aae39a2c8a8d7c3b9e1 WHIRLPOOL 256648567b3a220f762c7e30d0f90265fd10af21b66c3607b9072e81444b0a33dc971126232e11f3edc64eac2598fbd3ad428d063f2c9db8d247be2abe5be904
-EBUILD why3-for-spark-2017.ebuild 1536 SHA256 046ef9e20ce360ada8d848552391e6e304bc3faf10ad6ce0f16434e2b498b59e SHA512 2e8764f302313f5d4779e3a1ead43716ba0da210eaee8a176a983ba3e3fe085d33da032ec78ddbe6c959e147d33d777c6745d2f6691e98e595beafdf2d971f27 WHIRLPOOL 55718e4feeffa9f7c345258d2da626ea25c93ad825f222358fa5b09dbf22046e475bb637360a31c3e7a76fc8ec7e232e5acea25a4062149d3f5b7457d6dc603f
-MISC metadata.xml 1301 SHA256 9a581657e60cdc997d5541d7361ad05353fd278160e3fdb78cb32660f18737c6 SHA512 390303b44331c039d301a143c151c01a9ac6ce2467bf9079b16ac169af4bf5b24e21326c7a01747e8156e661e88d489d440344aa5cfb166e66cd6687fc7b95fd WHIRLPOOL 7b0df2710e2ac8dad3dca0103cc1326d966e9343c6dd7bda0f5103c28615bdaa1a5b6f87399cd124bfdee5d6ff700e2fb8ad61d9c742eabae68a1b8d0da13c79
+EBUILD why3-for-spark-2017.ebuild 1633 SHA256 1d3767e35c285d3933cadd73f315de72abd9433bb63e3eda874d8def4177ae0f SHA512 7ddb95b779680f509f338ecf6bbef138c99294ccc203c18e5a813e008dc0ac38dddf5c622e00f6ed2d910ab716075a8e6244922cf701fd104ccaa6c4e4b799bd WHIRLPOOL 8ea4774e4a7d113f83e8ffecfb0985ca68b230d3fbbe6d53ebd012e625bfac3e4a0a3f9e47d123556048a1ae0ac02664916aa688a1f7d47d1bfcd366502fd5ed
+MISC metadata.xml 1363 SHA256 013b66bd8ddb397a162291f83ed6744ea78521b89ed4014f67ad7f794aa2a3d5 SHA512 ee8323cc37fdea800e355fc14ba67cac66c3ec3c41528d481a7e938b1d3e23859bdddfb06d3b6653725cdcfcc0d07e66ba1d3cc80b3637a781db7bab5f7dc677 WHIRLPOOL f0804ec3311720be99db48f0839ee7269a4aba8ea6c07ea8abb69591c281fca7719b565694f47c43797debcafe65d19005674a1e53e13a8c9701257f50333bf8
diff --git a/sci-mathematics/why3-for-spark/metadata.xml b/sci-mathematics/why3-for-spark/metadata.xml
index f73ffa40b698..dfc2bea31bd5 100644
--- a/sci-mathematics/why3-for-spark/metadata.xml
+++ b/sci-mathematics/why3-for-spark/metadata.xml
@@ -23,5 +23,6 @@
 		<flag name="hypothesis-selection">Enable hypothesis selection</flag>
 		<flag name="profiling">Enable profiling</flag>
 		<flag name="zarith">Use <pkg>dev-ml/zarith</pkg></flag>
+		<flag name="zip">Enable compression of session files</flag>
 	</use>
 </pkgmetadata>
diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2017.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2017.ebuild
index b69b22e506fc..c143320a492d 100644
--- a/sci-mathematics/why3-for-spark/why3-for-spark-2017.ebuild
+++ b/sci-mathematics/why3-for-spark/why3-for-spark-2017.ebuild
@@ -9,13 +9,13 @@ MYP=${PN}-gpl-${PV}-src
 
 DESCRIPTION="Platform for deductive program verification"
 HOMEPAGE="http://why3.lri.fr/"
-SRC_URI="https//mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed055
+SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed055
 	-> ${MYP}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="coq doc emacs gtk html hypothesis-selection profiling zarith"
+IUSE="coq doc emacs gtk html hypothesis-selection profiling zarith zip"
 
 DEPEND=">=dev-lang/ocaml-4.02.3
 	dev-ml/menhir
@@ -25,7 +25,8 @@ DEPEND=">=dev-lang/ocaml-4.02.3
 	emacs? ( app-editors/emacs:* )
 	html? ( dev-tex/hevea )
 	hypothesis-selection? ( dev-ml/ocamlgraph )
-	zarith? ( dev-ml/zarith )"
+	zarith? ( dev-ml/zarith )
+	zip? ( dev-ml/camlzip )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${MYP}
@@ -48,7 +49,6 @@ src_configure() {
 		--disable-coq-tactic \
 		--disable-pvs-libs \
 		--disable-isabelle-libs \
-		--disable-zip \
 		$(use_enable coq coq-libs) \
 		$(use_enable doc) \
 		$(use_enable emacs emacs-compilation) \
@@ -56,7 +56,8 @@ src_configure() {
 		$(use_enable html html-doc) \
 		$(use_enable hypothesis-selection) \
 		$(use_enable profiling) \
-		$(use_enable zarith)
+		$(use_enable zarith) \
+		$(use_enable zip)
 }
 
 src_compile() {
@@ -67,6 +68,8 @@ src_compile() {
 src_install() {
 	default
 	emake DESTDIR="${D}" install_spark2014_dev
+	docompress -x /usr/share/doc/${PF}/examples
+	dodoc -r examples
 	if use doc; then
 		dodoc doc/manual.pdf
 		use html && dodoc -r doc/html
diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index fabed385d9b5..af5d333ef81a 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -2,7 +2,7 @@ AUX accountsservice-0.6.35-gentoo-system-users.patch 1122 SHA256 f1a308a364db53e
 AUX accountsservice-0.6.43-elogind.patch 3677 SHA256 b78dec4892c0e63e5348d1a2ce401583ccf9b46e85c626f5f19f2cd7ac147f5d SHA512 bbdbc77918de27d17c3c0effd1a1f0319f338f312408136563aab5633f5e7f9b705d3348462b3dfb88996d2f40ff382ed6faeecd25b717a2d25d72c44087f7c0 WHIRLPOOL 67105abf3070eb5d86c04b1aaa6fd89135fa7006f2758ced7179ebebe5c136ba8f77dbdc4488b558f78f5d778245c1f0606321a64a2b5697622d1534663f5682
 DIST accountsservice-0.6.43.tar.xz 381008 SHA256 ed3ba94aa38ceb822a0e1a1ac71bf1a8123babf90be049397b3a00900e48d6cc SHA512 0673430b7e5fd726397a9358d60d5c34542afaa786b795d3c8b544dc2bdab151c74f9a3daa4bcd94dc7669400a78cd4cddc453cad78ee8e431bf7c1f417138e2 WHIRLPOOL e704d9dcb5b7c0c6ee7c1ab5ed310ab2428e94d061663367f213c5903f68768680492d651524ef1e7594417335de529463d63b8d8a4d1cc8b6445358f1b97a33
 DIST accountsservice-0.6.45.tar.xz 382740 SHA256 fb0fc293aa75d59f5ef5db719d37a21831c4dd74a97526ee7e51ce936311ef26 SHA512 09975f9fa03a3177d923de6d6f6e6acfffeb2ff4924c45eaac78c994c16974427c8e936a87034747ba494d2bb3df6e8a92ff44db387761b06e06e311d7cf105a WHIRLPOOL 5dce6fc957da0d039f03ba0f9bf06710ecf4d39d81cd6d745bea5358b7bfb582d124a43f7df7603b61d699337ff29c7b0e3c8296da865aa6f260f566e8f86145
-EBUILD accountsservice-0.6.43-r1.ebuild 1538 SHA256 c107ca21b7a4d0844cfc5e8f39ccde2a9498fc9369edf82ded479e77db47f25d SHA512 1e4b22e1ec47f4617493d47a21d8e4ae99157384200571b65cfb246679c2856f481ee5b1ca17a76765c9f07b1c85cb57378b5db3663342a14dd43f316f71fe63 WHIRLPOOL 4aef63e1770e1805533a529cb2d96ef116c997d9de45830f67a84e401788825db03b880ffa317ba3c6bcf99d2260e2da8a76fad39c261c285cae923620276445
+EBUILD accountsservice-0.6.43-r1.ebuild 1537 SHA256 a98834c2188399afac390514026f40bc6650062ecad29879c1ba4fe98c160f2f SHA512 27a2e24139384fd6a3da1643af91f35d736eee8f96a75d0a41b485120836462699d4bfaad7845b64723d1fa75a90045b20d0962942474ebd0a69794d6727450d WHIRLPOOL 0d346b0059e3d95d5bc9653675f162afbbf1aeb9affcded4994c7713ff5e017bc02a5879b364eec4024d91a0e214ff085c17cb1b8c8802f728c9f9c00a214be9
 EBUILD accountsservice-0.6.43.ebuild 1350 SHA256 c28aede58cd4c3f4b4c5b122cf1df93c1329bc9610f82b779aa32a364be325ff SHA512 e73282aa0ac8272e653a2c249a691702e0eb71cce80dacdc89c9b3650b23e1fafd5dd6a1cd915a39e2a8bdcd76eac0188a00bef02948d622b4cdba3afa815660 WHIRLPOOL abac720ecb05bd04f00212c32362546e39c03455da1a9b8ca93e9c582bc9e505933ef16990e754e71dba950db0839036b35926465966daf18501fa95b524e6df
 EBUILD accountsservice-0.6.45.ebuild 1548 SHA256 5074cb1fa2695a51c57e7b4c571e4014a236c070e6a95041e44ccf841840508b SHA512 9e271fabe2a6cee6c1837528c359eceabe95716fbd701e0262bf48f25daa987ab91220e0ee74efaaf8253dec77e0323b1da51687a7563a869dfd696de98f2591 WHIRLPOOL 68838f7362182a1ccb7d0407b941a423c9811011f05a63399b185e6c95e73dc4970ba62cbe659e06890f43f3525b34c32ba668aebd0250818b65e55e8f9fd461
 MISC ChangeLog 4660 SHA256 75aa7970a9f01c40b551539d2acd056606172c27b1172adb97f4be7ef3fad5da SHA512 56ee730dac1b25cd14d3d018a8b362cb80c333add0f832a573030e0576ebf93014211a64ca6106801e768401af9e8de4ab5652952848ff0065b4a0e2ac4ee994 WHIRLPOOL 31471be4823697718fb82a1061b5cbf7a77cb864df07ea72ca100cb756acd5cd5bf15bde5091b32c554c3e365d0cc656fb61b32205b884b5183d5664f7cc2229
diff --git a/sys-apps/accountsservice/accountsservice-0.6.43-r1.ebuild b/sys-apps/accountsservice/accountsservice-0.6.43-r1.ebuild
index 48024bd413af..bd2ef560e8d9 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.43-r1.ebuild
+++ b/sys-apps/accountsservice/accountsservice-0.6.43-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~ppc ppc64 ~sparc x86"
 
 IUSE="doc elogind +introspection selinux systemd"
 
diff --git a/sys-apps/ack/Manifest b/sys-apps/ack/Manifest
index 3f3199152974..010989a5dae3 100644
--- a/sys-apps/ack/Manifest
+++ b/sys-apps/ack/Manifest
@@ -1,6 +1,6 @@
 AUX ack-2.14-gentoo.patch 431 SHA256 7da2f216647e650c63c27b9ff116e977b43a4665b7fea2a44c10b60491f0dd38 SHA512 5eeceda1a764358b4d7f8836cce41d21cdb895f2763325ddfd7ad7456af3d55807113a3702834f097fd513fef20db8de4003344d9ea73a58dac64d4c68e0e99b WHIRLPOOL 7b3e57c7bd937cdfd35038de94db500bd06c9bfd83097b22d8dfc17f2e2baaafd51a4999e296ae83d449b1c668d9eb6e7f21cf812397c2f5e6913eb1c0ae374f
 DIST ack-2.18.tar.gz 232279 SHA256 fb4a0a11a5411cba5764163b8d074a447c2a753758821151b31dc7533663f058 SHA512 4147161baa8d82fb84b29980d5eac7cf3197733192ca827d3fa4e8f55fa9df29d92b2ac21beb69df00186eea03c7ae6fcb85d6e4334a0a21c232ddeb4933bcf5 WHIRLPOOL 03354c31968f39b72b1c88649e4c3ce00619fa1e86540c12ec6f4f9a819e67e5e431358818526c931baabcf3ad8292acfc87c951f8c227aa2acd8487a85f5241
-EBUILD ack-2.18-r1.ebuild 779 SHA256 55a4c2ec1434cbd7c0503dd6460f990da20314ed83e457fb05bd0eb059494db9 SHA512 425f9a474dba32f7871224806905a7fb553110c50c7d7546a9b42209227b495ae2b8e839b097f71e15b7a1f3bae19336b32522eedde483975cd7b428a82edd4c WHIRLPOOL 235c653ccfcea93db4e679ebb94bae554926f8845026ba9e71d1ee82a23029f662220aed3d2d1f00d706ee66a0c16d6165c1097e2de3a5ad822cefa7ab90466e
+EBUILD ack-2.18-r1.ebuild 776 SHA256 455dd84bcc99b5edeac1e71bff6f6db077f57509a4709b7088e87f10a124c3ce SHA512 25979e6b277a49c9b087b987ccc14192d53f9f55ed7efbd55a491f14c2219f7fdeb0ed805e835ea58c893277ea35cc5f43f0974f65454e6fed352c570b468ffe WHIRLPOOL fd08891851c667efb7a09e232fd022451ea502fc82796f6759d8d6e544a117a48567872d05d4e29ae2930e79841f4e12a0497c7000e6e0a2b1e853887e921869
 MISC ChangeLog 2192 SHA256 d1231d87436e984d2cf3e5c90a31c4211aa2774554d2a39341cd4f3610f83303 SHA512 b0159a5e1bbc8f84db3474e3f0f3ba6f67965144f043a99de0fd521ffd94239cd8d3d74071f2e7b7550aedffe61c4289ddd545458d12ebff779e88cffbf4f66c WHIRLPOOL 694c1b633a6a506bca68659d8a236957cf73320dbd744d5b9dcc371812532c7e32d9a3ae8a502dc570e283c33e78bf52355c0f9d20cd0fb9403ee57106fb32a3
 MISC ChangeLog-2015 5290 SHA256 4347b335ae56dfd45f6f753a174223b59c8d472d839587e64b026c7aea741ae0 SHA512 3eb6609c018d0faed1c791280f1d95130c3d66c682f585d5445d77fec07da5a33f8cdddf2a9c5b5ba36198d22272cfedfb817a41daf0461f71c3cd31db8ca1f6 WHIRLPOOL 6170df88e4ac50b99eaae35f71245a7d25f357458b2e35f0fb34920098e7d8150b87c386aa24c2b8c8117672fbb3a4d742967d7e408608d05cb3dd10fe52422c
 MISC metadata.xml 1725 SHA256 ea17e6f8fec12500f0de51c0d6b7886fb1a414bac570af8bbc594ec893376d8a SHA512 9ceab2bd4b599aa83b1b780b322b753a5bdfb51b4883aa804907f5d5d8420276c75a04ae717f8520778cb3fc25ba4c4a710a64ddd49193f050992436c0faeb8f WHIRLPOOL b863ba820547021aa6ca1ac215c39c03dd4c948de3fd99da5b1f785e4b787403a8dc490e6f5399127b3992f881a03d5e0aeec56463c753a17d72a4905afe9c2b
diff --git a/sys-apps/ack/ack-2.18-r1.ebuild b/sys-apps/ack/ack-2.18-r1.ebuild
index b2905c70da31..7dcd5501bd7a 100644
--- a/sys-apps/ack/ack-2.18-r1.ebuild
+++ b/sys-apps/ack/ack-2.18-r1.ebuild
@@ -6,7 +6,7 @@ DIST_AUTHOR=PETDANCE
 inherit perl-module
 
 DESCRIPTION="ack is a tool like grep, optimized for programmers"
-HOMEPAGE="http://betterthangrep.com/ ${HOMEPAGE}"
+HOMEPAGE="https://beyondgrep.com/ ${HOMEPAGE}"
 
 LICENSE="Artistic-2"
 SLOT="0"
diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest
index ae8009673b21..fb3980227ab1 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -1,8 +1,12 @@
+DIST c-dvar-7706828ecda2d8c508d6fc233dc9d198bab482ad.tar.gz 28454 SHA256 07377af5a5ab46e2c1cca5c7a7c743a9e9e34c68b1409c70e7c9b654c9b88f51 SHA512 b6d69b11b3e47e8538c8eab04780966480db3881bf642f732b883f0b995ba374382fff54abe81eabe377d029445cc4af5bf52c8740282b0c03b959d8d5ae944d WHIRLPOOL 9d0af964224e28d62f598355c9c9e477db957a5991e9ed077c1d3b4c586604004ccf4477c5e024c1d220ad7e978dacb93099e1cc5955fd5758a2c1d4a4139645
 DIST c-dvar-e1c94e3c3c42ca9bcb336ccd7c3693bcd330c6fc.tar.gz 28449 SHA256 9004cb8073292beddf6ad410ad029c447d2732a8f2cf5243b0b43538e5f70d33 SHA512 a752a5d8c67c97d672502e814c6930c60d9588f7f77f38a6d027dede71c11cb18e7debcf10fa2f405a117123af386944bb7cf70c90504aed874056c8de1fab05 WHIRLPOOL 2510dabf7273f68c78487cdd354be184181fbdecfc3a15dd32093cece56924c6c83bec2be569d27c2dbc30fd1f87dcd24b131b68c383cfe04a11f507d6cfb769
 DIST c-list-9e50b8b08e0b0b75e1c651d5aa4e3cf94368a574.tar.gz 20459 SHA256 5ed9fc0286507a08f4e4aeae436be45ee05d0c071c1d8418fa77ed777e2f5a25 SHA512 d45630c8a54ca9145862b673afc3a15a19d330f46c9a1eb451c2282c2701d596cead45e6bb57a9e32aab344a3732f70ff8fe27d13065ebd8b402dd37a252ad05 WHIRLPOOL 21fc689d1d7551bfc957e83630ad81b5093b8e67c3c754e2b4173681829f78835ef7fcc94f46c34f7379c21ebdb96ebc83cd50d4e816a25179c60274c9c0c2e0
 DIST c-rbtree-6181232360c9b517a6af3d82ebdbdce5fe36933a.tar.gz 24927 SHA256 5831113e793af5e583cc7844a8961b05ded70dc487877b64bbbf0fef0869c711 SHA512 4ff8d8def07882850b1983f8eb9b4c82e444429beafbf249385717805a5a89427bb91bde6dcfb60565866f90ee3daa8d35e681ab65cb0a1f20dcb96dcd9e0756 WHIRLPOOL 5c8d42a9601362197ba890bc056d46b3cf7f0a99dd07189fd2c1c037a339b58726e5929b7e22d0c960ad6ba380f134b2040fb32aa9da2a95fbe192d3c8f575e0
+DIST c-sundry-50c8ccf01b39b3f11e59c69d1cafea5bef5a9769.tar.gz 26702 SHA256 4041b610d0bae181ce8998ccba5114f7caf19269d108ded28c778022b94bbbd8 SHA512 44fccf4509ad752f7ef8aef7e1afd62eb51660f2daba42f0ad8b1711a62ec53aa2bde78b895fbdd939ba9a1ba1fc06621c2506eb068948da4d6e7192cb8df29e WHIRLPOOL 58b22aedf2c15224acf23a2a5bbb89673ed28097b655f5ed4b503b12cb0f5db5026b2d8df79970d1cbaa088bf37fc0d45b8be169b6edb9d040658f47f6da2458
 DIST c-sundry-644ea3c2ce5b78d2433c111694f5d602d1aa7fa9.tar.gz 26611 SHA256 9ebf3f9e90004b7483d71bf41e2786586e0b192feb1d397536730b0d2304c7cc SHA512 503da82b8cea9eddffbea70ce05c8a6b2684a90a104f6df46a5183ab46844543db1d02e8aaabc4e5d50aa21e239af147309fa9abed5f13cb751bcee310c8234a WHIRLPOOL beff440ecfdff3d636710ab197d73cd628ba3615d6890540ea5014d0fcc318353f083b0d4885a88d3fef502c0fbf801fac7bacaaf0cb4939a7b4251b838309d9
 DIST dbus-broker-4.tar.gz 148231 SHA256 165fab697e0f9ef66588688758edb601c89b65ee3240d462cc278f0755c6e122 SHA512 d4c9974e730d0b6374edb2afb6f928f35e3912f7d5d7d908429581e235ebc013dbab1bd0f0c446547d2a960e762868e2d98ab1cd3ff5e1169240f3e6886236d8 WHIRLPOOL e25075a2cee78bc0be56267a9140a0392bf12ed69c23ea3a8f0b9f8abdc9f86581428a7dbcb8afffa9fba8f03e9b588f896e95ecd53a8317c51030cd94940192
+DIST dbus-broker-7.tar.gz 150606 SHA256 7114ef715b9ea18fea3ed0994e50fa8c0468451f3a1c4d4abaeaa67eeda73fe0 SHA512 529d5b6de402185336eeafb37d70f3fafe19a059c6b766f173eb17c375d3b298871bf7ba36ec3a27cc9e32c1af2669715d9707ac3fdd43f8f8cb8f24740f8c74 WHIRLPOOL a416466e6ac7cfadbddb77ee91a53131da15129451ef5dfe60155a516f402661812143248c25365223b5e0bcf5c88d58323f79c053026ff3b38d74a57de2e1cd
 EBUILD dbus-broker-4.ebuild 1878 SHA256 9b9f020a5f8a76aa6cf85f1889ee74ea4d8ee9b2f021a3d34ba509ace5b871bd SHA512 ab9a8ba244c13c3e836675a841ebbbe2cceb0df0389f5ec2541f04464bce0f74beb31f5eb033e7df7bf918091bc66cf9195e315e7a35d6f4411729c3979eaac3 WHIRLPOOL c80aeb18dea1e256f676df572f189c21b26a82510918105796c91ff4810c036d6003f9655ae431f4b8ea784c9ec22fdc2f02193781c2a49bf140b4dd448b20f9
-EBUILD dbus-broker-9999.ebuild 1878 SHA256 9b9f020a5f8a76aa6cf85f1889ee74ea4d8ee9b2f021a3d34ba509ace5b871bd SHA512 ab9a8ba244c13c3e836675a841ebbbe2cceb0df0389f5ec2541f04464bce0f74beb31f5eb033e7df7bf918091bc66cf9195e315e7a35d6f4411729c3979eaac3 WHIRLPOOL c80aeb18dea1e256f676df572f189c21b26a82510918105796c91ff4810c036d6003f9655ae431f4b8ea784c9ec22fdc2f02193781c2a49bf140b4dd448b20f9
+EBUILD dbus-broker-7.ebuild 1887 SHA256 7c1e3840e589756eceb30bf683564a4cc2a9e25df7b1cdae2d531f9a9583e708 SHA512 68eb24dbfcc75d32953258a6d2fc91254872407a6b5f2bac03a8b3d6d2998c2cfba829890b5495bcb406b7c9d52898f59a36668f4827332472573775340bdcf8 WHIRLPOOL 4befbbdb2cf31246adec47b774448b7b3a7d8144e935c4de9c6a994dacb95a88f40b3cf09efd77c8905ae07552506a411859d42e774f8af2115fa2da7d678c3e
+EBUILD dbus-broker-9999.ebuild 1887 SHA256 7c1e3840e589756eceb30bf683564a4cc2a9e25df7b1cdae2d531f9a9583e708 SHA512 68eb24dbfcc75d32953258a6d2fc91254872407a6b5f2bac03a8b3d6d2998c2cfba829890b5495bcb406b7c9d52898f59a36668f4827332472573775340bdcf8 WHIRLPOOL 4befbbdb2cf31246adec47b774448b7b3a7d8144e935c4de9c6a994dacb95a88f40b3cf09efd77c8905ae07552506a411859d42e774f8af2115fa2da7d678c3e
 MISC metadata.xml 327 SHA256 555a246c137ae0586dc4f3be05f103eba8415e7cd8aafe2336c5b9b659493d8e SHA512 b350af1c8be6e227fb301fca4dc1d6c90a8ceaf1e4cbf3d83ea54a302a15baa9df560d9b728a66be843b3eb679fa9536ca2f531776ee5d09753233148a0cabe1 WHIRLPOOL 6de0c19b78e79898cd78488c3f9d780f26684dea03924ce8efcd532ddf25cc5e1e82477d2069fd0c53f796ce46d0a1348e4a2128dfca0b764102fab35937404c
diff --git a/sys-apps/dbus-broker/dbus-broker-7.ebuild b/sys-apps/dbus-broker/dbus-broker-7.ebuild
new file mode 100644
index 000000000000..ba718173881c
--- /dev/null
+++ b/sys-apps/dbus-broker/dbus-broker-7.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
+else
+	dvar=7706828ecda2d8c508d6fc233dc9d198bab482ad
+	list=9e50b8b08e0b0b75e1c651d5aa4e3cf94368a574
+	rbtree=6181232360c9b517a6af3d82ebdbdce5fe36933a
+	sundry=50c8ccf01b39b3f11e59c69d1cafea5bef5a9769
+	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/c-util/c-dvar/archive/${dvar}.tar.gz -> c-dvar-${dvar}.tar.gz
+		https://github.com/c-util/c-list/archive/${list}.tar.gz -> c-list-${list}.tar.gz
+		https://github.com/c-util/c-rbtree/archive/${rbtree}.tar.gz -> c-rbtree-${rbtree}.tar.gz
+		https://github.com/c-util/c-sundry/archive/${sundry}.tar.gz -> c-sundry-${sundry}.tar.gz
+	"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Linux D-Bus Message Broker"
+HOMEPAGE="https://github.com/bus1/dbus-broker/wiki"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="audit +launcher selinux test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	audit? ( sys-process/audit )
+	launcher? (
+		>=dev-libs/expat-2.2
+		>=dev-libs/glib-2.50:2
+		>=sys-apps/systemd-230
+	)
+	selinux? ( sys-libs/libselinux )
+"
+DEPEND="${RDEPEND}
+	dev-python/docutils
+	virtual/pkgconfig
+	test? ( >=sys-apps/dbus-1.10 )
+"
+
+src_prepare() {
+	if [[ ${PV} != 9999 ]]; then
+		rmdir subprojects/{c-dvar,c-list,c-rbtree,c-sundry} || die
+		mv "${WORKDIR}/c-dvar-${dvar}" subprojects/c-dvar || die
+		mv "${WORKDIR}/c-list-${list}" subprojects/c-list || die
+		mv "${WORKDIR}/c-rbtree-${rbtree}" subprojects/c-rbtree || die
+		mv "${WORKDIR}/c-sundry-${sundry}" subprojects/c-sundry || die
+	fi
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-D audit=$(usex audit true false)
+		-D launcher=$(usex launcher true false)
+		-D selinux=$(usex selinux true false)
+	)
+	meson_src_configure
+}
diff --git a/sys-apps/dbus-broker/dbus-broker-9999.ebuild b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
index a71009e17e72..ba718173881c 100644
--- a/sys-apps/dbus-broker/dbus-broker-9999.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
@@ -9,10 +9,10 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
 else
-	dvar=e1c94e3c3c42ca9bcb336ccd7c3693bcd330c6fc
+	dvar=7706828ecda2d8c508d6fc233dc9d198bab482ad
 	list=9e50b8b08e0b0b75e1c651d5aa4e3cf94368a574
 	rbtree=6181232360c9b517a6af3d82ebdbdce5fe36933a
-	sundry=644ea3c2ce5b78d2433c111694f5d602d1aa7fa9
+	sundry=50c8ccf01b39b3f11e59c69d1cafea5bef5a9769
 	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://github.com/c-util/c-dvar/archive/${dvar}.tar.gz -> c-dvar-${dvar}.tar.gz
 		https://github.com/c-util/c-list/archive/${list}.tar.gz -> c-list-${list}.tar.gz
@@ -40,19 +40,20 @@ RDEPEND="
 	selinux? ( sys-libs/libselinux )
 "
 DEPEND="${RDEPEND}
+	dev-python/docutils
 	virtual/pkgconfig
 	test? ( >=sys-apps/dbus-1.10 )
 "
 
 src_prepare() {
-	default
 	if [[ ${PV} != 9999 ]]; then
 		rmdir subprojects/{c-dvar,c-list,c-rbtree,c-sundry} || die
-		ln -s "${WORKDIR}/c-dvar-${dvar}" subprojects/c-dvar || die
-		ln -s "${WORKDIR}/c-list-${list}" subprojects/c-list || die
-		ln -s "${WORKDIR}/c-rbtree-${rbtree}" subprojects/c-rbtree || die
-		ln -s "${WORKDIR}/c-sundry-${sundry}" subprojects/c-sundry || die
+		mv "${WORKDIR}/c-dvar-${dvar}" subprojects/c-dvar || die
+		mv "${WORKDIR}/c-list-${list}" subprojects/c-list || die
+		mv "${WORKDIR}/c-rbtree-${rbtree}" subprojects/c-rbtree || die
+		mv "${WORKDIR}/c-sundry-${sundry}" subprojects/c-sundry || die
 	fi
+	default
 }
 
 src_configure() {
diff --git a/sys-apps/elivepatch-client/Manifest b/sys-apps/elivepatch-client/Manifest
index ddaacbe64183..9be02e9af836 100644
--- a/sys-apps/elivepatch-client/Manifest
+++ b/sys-apps/elivepatch-client/Manifest
@@ -1,3 +1,4 @@
 DIST elivepatch-client-0.1.tar.gz 88031 SHA256 f529a0872eb42a077909f2b0597d4faff308ed8072ae6932c4f29c164b2c6d3a SHA512 c2e324f2be6d75ffe4b2f329875f6f81ba3e4657aa1c4e6514188d5269fd68f7d50b7d823281b1bb585804f84fda639931fcd349d168c169f736ee8613f9f451 WHIRLPOOL 38e4e30bd3d0302bae742198fdbb4bc31047140f1161bbc90215d8d311380f78ec5fb7100ac7271a44f29dc2d33d4c2867230cb47c5cf5f5fa4ff3047ce91a42
 EBUILD elivepatch-client-0.1.ebuild 620 SHA256 da82c3bba32df4bd028d853ca8cefb66804723276fad8443d2151718ad5eacc6 SHA512 9b54202d494a65590af00b8b230bc4721ef76645e687bcd904bf09374cdb41c82fda916e22aeb51f547adde5591afaa70df01fa70e385c3338cdebfa0d896339 WHIRLPOOL d7d3598ba760a5da1deaf04dfddda2bdc849422dabd06bcd8186335aba6aa3834f65a396230a39999918c30ad785ab022f030e045fa884a694166509e93a8d9d
+EBUILD elivepatch-client-9999.ebuild 742 SHA256 f1fee8966df0462370e5922db135b59a154a282407bc200fe60dd4c786255676 SHA512 751c77df848d7d7588687a1b4e59eea2c2e8336164f20a63b047fa1b1a1d3d2cd34ca3b617987e09f00e587aa1cf36987e8b3c0a2cc71c759711ff0b78ac19a1 WHIRLPOOL 2445a684bb4596310d6f7ffd8010abfb704aacb32e7118341438bdfa62bc5bfa896f435d6c93219ed8edee1cc7c17b8862af73648b1f1231524e4d7fb7286a78
 MISC metadata.xml 311 SHA256 ef38a7066ba3faa55bee1d6d854000420e9ed118a384df44f33d0a886d6f04a6 SHA512 d53e458f4c2a4844c50d65b8c75f18cf637992dbe78b17dcf20a8a0f15113df8b89c197d2f11f6160fcca7db23669db009028deec039cbf32911e966e6210e98 WHIRLPOOL 651cb1c5b367d755a2a949c94e8bf77cc7c98f3354eda0449ca2b4919848abcf2fb70859812cd79b08c997b83097850ef47c6ef69c2446c6c9e1fe93f6c58805
diff --git a/sys-apps/elivepatch-client/elivepatch-client-9999.ebuild b/sys-apps/elivepatch-client/elivepatch-client-9999.ebuild
new file mode 100644
index 000000000000..efd08c9166a8
--- /dev/null
+++ b/sys-apps/elivepatch-client/elivepatch-client-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Live patch installer client working with elivepatch-server"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Elivepatch"
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/aliceinwire/elivepatch-client.git"
+else
+	SRC_URI="https://github.com/aliceinwire/elivepatch-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+RDEPEND="
+	app-admin/sudo
+	dev-python/git-python[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/sys-apps/elivepatch-server/Manifest b/sys-apps/elivepatch-server/Manifest
index dc4f8204aac5..6296af5eae0f 100644
--- a/sys-apps/elivepatch-server/Manifest
+++ b/sys-apps/elivepatch-server/Manifest
@@ -1,3 +1,4 @@
 DIST elivepatch-server-0.1.tar.gz 11564 SHA256 8ce02c1284b5822fdb4c762fe45b6d3ea8d9f360bce5c59f42c96b3aa41e4908 SHA512 d469fbc32df7a586fa899c6e587832bd53c1984c97b973e3aad4f6bf62962846142938a6e6e5729fce39d3f7d486c5ed9fd9f484425d863a40a1199f170830fb WHIRLPOOL 98e7a30c8cfda908fa010185e5a508926e57c813a610156d163bdca116d6ef6e59ba31fe8a427a84a558d84a0d9f7ad7387db7b9536e5651a91de22d46648246
 EBUILD elivepatch-server-0.1.ebuild 784 SHA256 720611d8879281df92e63f5fed8f11b3d2cb939140a829a8e7f74febe47a6e3d SHA512 f766177ba4ff6b57cc6a5e08715440907d8d2066262354029cf16cf0339bd21cf0aa594200731c5302b73d93ad648d356dc2562f0060b1c648f4d14d1c48dabd WHIRLPOOL d18d3f7757e8cc00c932daa09f2cd0dc6831c4f6400b14fb123a38dda83c1de93fc502651ac4a7b282fa40fa9a5884917be6270e0646243a2deab4b1b311ee5a
+EBUILD elivepatch-server-9999.ebuild 931 SHA256 207625820eeff6c174d3fefcc6d3c4f8cf9f26e0f8c2b2f35a38b941a6c431c6 SHA512 2e2f23160931fdb4216b29db2b64b1d48607247662999ab9600ad5fa544de66e48d64dc1bc2b36b43473f7a4ad1cc2d9c3cf3f5d89063c4b50c5fabccb371f25 WHIRLPOOL ac70f6fd7c05efc84bd84bbdeddbe8796fff213d7f72d6728f3193e479c7a560d5b5011a1a9326399d2a95896e2d2014044eba731736271e63f6b6b7788eb057
 MISC metadata.xml 311 SHA256 d878cdaabbcbecddf41582de1894e7e967b3fb7a86d70bbd700be2ffecce03b8 SHA512 5add2dd39169c27b7688232595ceabd5e23a82d03f122d33d56cb19be11b3b98136a17437b0602adaccb7b61ee338f19df25e339a75ac362db072757106ea070 WHIRLPOOL 7e8c088c06e84f6615ec247022df8abfd39560dbeca05bb1ee77b4b73167306a2c455bf6c4c366ebd1516e705145642919569552221a2fbbbff0a14dbf5daf5a
diff --git a/sys-apps/elivepatch-server/elivepatch-server-9999.ebuild b/sys-apps/elivepatch-server/elivepatch-server-9999.ebuild
new file mode 100644
index 000000000000..572a789c43c0
--- /dev/null
+++ b/sys-apps/elivepatch-server/elivepatch-server-9999.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Live patch building server with RESTFul Api for elivepatch-client"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Elivepatch"
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/aliceinwire/elivepatch-server.git"
+else
+	SRC_URI="https://github.com/aliceinwire/elivepatch-server/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+RDEPEND="
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-restful[${PYTHON_USEDEP}]
+	=sys-kernel/kpatch-9999"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_install_all() {
+	newinitd init/elivepatch.init ${PN}
+	newconfd init/elivepatch.confd ${PN}
+	distutils-r1_python_install_all
+}
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index 3a616ec2a7f5..8b4e7305998c 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -5,6 +5,7 @@ DIST ethtool-3.4.2.tar.bz2 200731 SHA256 e2cb6e7977c804b0fa387ba41a04772d37efeb2
 DIST ethtool-4.0.tar.xz 199548 SHA256 904887acc7d2f9c35dec04eb0e8a727a3205f346af4f4c95560ea3798de5ecff SHA512 708f7df17f04339d1f6e9f80e0e9b4d7855fd71b974a833e5644ee4b7a431032ce70ceac85e37e59847eb0bea4226c0467b12605e16a005f83d75c33367a6ef2 WHIRLPOOL c1649c83146ded3d245d1e96783f1fc79d51f2d2fdbf877eed6968d5c7a37d4bb3855d45d4110369199d95bc8a4b807fe4707265f89e4a8e1e883b843739e322
 DIST ethtool-4.10.tar.xz 216320 SHA256 f0009726ecf34128b9a8238b71a652847dbc06bd1b877656699b0592b95c74ba SHA512 6766c468e141300b4828e6bdc98e7e720d35bb122405fc05d4ae94bbdce50b98e48ddd0505b09c990040da67e942e08a88b28b46d94aca8d544caf0aee4aac36 WHIRLPOOL 327d133b8c280a64a88f628b4e7f987dab29919e696a65eadd28c537d0caace0cf381f9410063ee43c961c19d80721738b1c577f7c3dc03580a700d86c1369fa
 DIST ethtool-4.11.tar.xz 216976 SHA256 12d8edaa8064966b8ef19cc44fecc096a68828035b6a1f2c67a27531a718e1b2 SHA512 177bbb725abc725dece99b4198f673b57ac9fc5c466aa36ac9e2a66b5535c82b5a27e916ef3e489232709e0b2d27d821acb4bea17d9b5a1940bf83e6a13ef445 WHIRLPOOL 4ce489a2c205cbe3a3b2a5c53cf6e67b865f00fc197174ebe9a2c8195c6626a8a96f27a838be4e9154814b6b9bf8d0c362c8e5466e8a3868f96ef961c2c286df
+DIST ethtool-4.13.tar.xz 217472 SHA256 b7c1a380007d30eaf261a63b3cfc000f9d93f9eb7626dcd48b5d2a733af99cba SHA512 d0f881b88379b959cd34949c924b0e4d4fb1af0873192cdf8ec9cc2d2d677a4de13021efabb0a1aea1932ef38a6952d9f3eb040c478a9af770054a6170777789 WHIRLPOOL 2d4323046b7b5a6ba540d2cd0f73f60b8af2ec6bf8e8f3827294e36ed3ccc97fe7c84cad9794e0dbdeb570a40c794135bc7d2b1b67e320d0afcf05b6ffbe9d5e
 DIST ethtool-4.5.tar.xz 204244 SHA256 bb2834332c5ac7f5bbe1c9f78f4fa851e4a3fe6397b124d58467c9ccee9fca3b SHA512 fa5b4547de0315c54113d9c7baea53dd4bb6e46c9340255cecf9a39f549190cb5de9db98ad4330a6eeced3a1f9ed6f2ae42cf5a602c0ef1c5a9fd17c825558a4 WHIRLPOOL f8923518cba1e66428ac883c85ca88ea6bae74943edfec4867f21873397f034286a8572ca75529aedeaeb1cd0ad2399307f94920e541de7f494beb3bf3af2f67
 DIST ethtool-4.8.tar.xz 214932 SHA256 403dfe288e2d8031eab0be3f5d0ca9128e120d61c52c3dc434474fa026eb4a43 SHA512 ab1f13db57129fdef6018d8d8ee4ad9733041813aa0b7a29d46407e93d3c264a42aa24e2f1892084d523ed9946c62c6b9d2ae886629aeb013a58a0946fd6be96 WHIRLPOOL 4d162bb10b5da6aac7993def99b45c300792fa700ae38d5f1bc0109a2a7bfbc84850da5ee08f147f454aff77d48afb33220b2afe907ae3e0067ee89973ce618b
 EBUILD ethtool-3.10.ebuild 456 SHA256 27394a7797549dc2f220546c09a86a4b51ed81e4776d54412746d8445c258859 SHA512 64d39e8e01b77c4e8b931e9f3ac84626bb6e85ae84037fbf3ea7cfd4e0e67ce0ad25428c9dfd994c5ced26a244f515337b5095dd80f1bf3be407283894821396 WHIRLPOOL db05f56d05539dc1ad0aeae32d27f7a2d6c40e4f444b9b67abbfab483d35d8e7d5f25f5ce1a4189ab5a6ada881855746e44c91b3e8a065b4985686a2ce15d65e
@@ -14,6 +15,7 @@ EBUILD ethtool-3.4.2.ebuild 437 SHA256 0a32bdf649e69c5a0a151d42608facb9621a7fe68
 EBUILD ethtool-4.0.ebuild 456 SHA256 2e6d1655df780abb963cfa46700c433c2e4bf80c5c4e60d28e6844ed8c092b6a SHA512 0628af197f5b89e9a3747004cb3e3f81c7cbcc73df3eee0e51f2460b07804942a4bc4d560c4a5855fe5d6f9fc618a75e2469ac9bcf053111e77597cf8c101eba WHIRLPOOL 3d1c0636168e8ecbf78f5a31851e92561ee81ef9427fb0bb028d51379a7cca3b33c8cd63c0d351e60cf9d3d2ed2b9d19c5e788b5fa34abe17af94baea22d9920
 EBUILD ethtool-4.10.ebuild 463 SHA256 3423ccbf866dc00ade8a62c3f62be222cb40f088b93ab0184cac93e0a2aa96b4 SHA512 6cdaf830de48e35773664091b1d249cf5648afe6717f02f225d380578cda2c5fc344acd2c2729ae1262c898979149da9bd34bf67e3e65ca2253cf0c48b86ec0e WHIRLPOOL 7d56af51b1588a2c16503d7c169e8b7c46eecaca6fb8b18771774a654d770e1a8727c6772d7dfca4f8dff166190e54c55b46519263c006aae8958a4a9fece968
 EBUILD ethtool-4.11.ebuild 463 SHA256 3423ccbf866dc00ade8a62c3f62be222cb40f088b93ab0184cac93e0a2aa96b4 SHA512 6cdaf830de48e35773664091b1d249cf5648afe6717f02f225d380578cda2c5fc344acd2c2729ae1262c898979149da9bd34bf67e3e65ca2253cf0c48b86ec0e WHIRLPOOL 7d56af51b1588a2c16503d7c169e8b7c46eecaca6fb8b18771774a654d770e1a8727c6772d7dfca4f8dff166190e54c55b46519263c006aae8958a4a9fece968
+EBUILD ethtool-4.13.ebuild 463 SHA256 3423ccbf866dc00ade8a62c3f62be222cb40f088b93ab0184cac93e0a2aa96b4 SHA512 6cdaf830de48e35773664091b1d249cf5648afe6717f02f225d380578cda2c5fc344acd2c2729ae1262c898979149da9bd34bf67e3e65ca2253cf0c48b86ec0e WHIRLPOOL 7d56af51b1588a2c16503d7c169e8b7c46eecaca6fb8b18771774a654d770e1a8727c6772d7dfca4f8dff166190e54c55b46519263c006aae8958a4a9fece968
 EBUILD ethtool-4.5.ebuild 456 SHA256 140aeac3d2b086660d3e50dcf8e1437b1fbf2d76ae4bb500ce5b3e10d0cfa540 SHA512 e366a4fcd39d80312df50324883dc72338622dc08aa0f0ed758a9ecddaa0cb6aa9d6bd805996d8b9d51f8fa8b3235c3259064342851eeab4c434315cef59220e WHIRLPOOL 2c3b864170a8161d0d805b0d58c470bd31c3e7aa1efbe364707872d9c427fba607834a32360a7bc98f6ac07f23a73c2a87ed081ca2f127f452024e5e3d45006d
 EBUILD ethtool-4.8.ebuild 453 SHA256 c1112244f6b0357b440d1cbe8df3bb473329919265d0b75fb665202867b96dfe SHA512 f5ebf39536df9e46be717e5e42334472c7f30d02a3dd9f8b1fbab8e2242cb0c67e573fb829fbf74f115d431b777a83ebc17005150751d83f8e681e5966e8fce2 WHIRLPOOL 58d64ed48025ae9a0dc6ce4c131db35be5e862bd15ffe0c9a3e3c39461c31a376722b4fb2aa0cc618eb647eb112da4092de2c2a9826a091567a01277ff3ed1ab
 MISC ChangeLog 4752 SHA256 ea802cb2ea25bc266921a12be5e9ad8f5bccca9241bab59b52fff29c7f4201e5 SHA512 541543960ce4a1c98520f15f2c49c80d8656359d445ed459e583d4e8659673069581459878e048e676a9a711e3d8f533a82cbca65ff3914726ab43fb6c08ec87 WHIRLPOOL b467f50f108c5563c77065f353b557a6fe23b01bc31b4e6f7678ed96048db8cde642e75fa6233d73b8197d29e51a13d172a3d066dc5df73ee6b2f3e0cae8a80b
diff --git a/sys-apps/ethtool/ethtool-4.13.ebuild b/sys-apps/ethtool/ethtool-4.13.ebuild
new file mode 100644
index 000000000000..04f5d5de3b2e
--- /dev/null
+++ b/sys-apps/ethtool/ethtool-4.13.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces"
+HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/"
+SRC_URI="mirror://kernel/software/network/ethtool/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+
+DEPEND="app-arch/xz-utils"
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 079156938238..c8343d1415e4 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -9,8 +9,8 @@ DIST gawk-4.2.0.tar.xz 2948108 SHA256 d4f3cd31c001fd0ed52832d4fbfbdfeaa38ad541c1
 EBUILD gawk-3.1.8.ebuild 1794 SHA256 b794beff4f8ce3bb31d416ea4e7cffa083ee432991e4f6b86a1a071b63444845 SHA512 ca82d7bba5d88aadb4616817d0d55f001446a90da3def7fd49fb817c5b2674cd389f5a92efe82736e562ea0f46c9a214286f96137f324ee2be2149d09f298f61 WHIRLPOOL 9b2abe1d8028961d76032e39a359ae76d82ab647008e48d79c887e6ad3b2bd017ab33d7e877582fb34868ee604ed78d8169134c75d1dbfc6b466507847eb2a78
 EBUILD gawk-4.0.2.ebuild 2088 SHA256 aeb7bc3dda2def791ba830ff3052247292249a6fcb270c81412651a5fd013761 SHA512 b15b3c32c04c724e7b0c5c6f8d7cae86e3118c1560ca2fae0f5ded39fc098afa29987e425733e96daedbf1db5757e15fb21059a023c5158498f5b6168809f063 WHIRLPOOL 0197d1effc02f2668e3834108eab717407fb02bb880fdd1a964fdbc0a5bfb44a0f5cd1ab6893af0da3aadd0e22c1e9444af46a98b2fdd74b341877d7d9fd00fd
 EBUILD gawk-4.1.3.ebuild 2201 SHA256 e973870920b273d6f516ccb6a47265d0b793916d60a3a72aa8c7153cd90ff8c3 SHA512 fd78556fbd0d2ba92c2816d4a82330a365ca99985b042a3431e075e7a1390954bec0139d7dc63370c564eb90ab3f0a97c6966230a7309d46462d5e934b090d0b WHIRLPOOL 8c4ab7736911b57077dda94446831b6bb1b7fe1c839f6d06b22f42b6d7cc0b763a94e2b5aca899ae0b6641bc5b9a0dc79aafc07f325a885a9ea9f2aa336c7d1a
-EBUILD gawk-4.1.4.ebuild 2296 SHA256 8ba9a172a00dcf57ff3ed0b02fe89f17988e9e099e0c0692269824c5262a6b9f SHA512 9476683c0ea1c8a87462aebeb5512c8068c43786b85e2e6da414fe2f061a05e17bb14eb9b8c8cc425e85f928f1e8de6a9ca8b1534e8357ccbfde99ba969d4a29 WHIRLPOOL 8a02f42e9f42a1cfd7b78d86b9388ca34c416198cb97ab75eb6d1f5eb88da96cd64c18a9ec9d2e75e21b053882746a1106af255194dc6127cc6c6ba1a0f1fd8e
-EBUILD gawk-4.2.0.ebuild 2370 SHA256 f8860f720eba40291cfcd692fbdd34a6c4147d940caf3765fb0ce63d865caa45 SHA512 c5bf4b2ca22f4d630105f091a80c5c41dbb63189c794ef7c2b42c960b714b87bf927e9c345dcc86bba40931597f72f66d5177a59a9080a336e81e04ac0ece31d WHIRLPOOL 80f680fe852472fc45e974e6ac32a26eda5f0951b738dc8c758818b6417e95b5a85954bb11a210c3fbd6eddcfa48979b024a445ef9a398900f5f2edc33636571
+EBUILD gawk-4.1.4.ebuild 2293 SHA256 edf0cad817aac13c71da74b8b9fdbdb17f48796d29834007c44c817ec0178d99 SHA512 26a6c96d66ad7a0e068aa6503569648363a6a27dc6cf17b1cdaf19598a6e2a3ca27f0cd090201018f0009b55d91cc1b280ce55f175d2b3092548b8175052ea9f WHIRLPOOL 3571b72b02f32edc66aabdb4145981efab7dd240d02ec08052317630148497a88e45075c173f275b89d23c83d83002b7318d6e5428103c70b5dd7f9d7b44776b
+EBUILD gawk-4.2.0.ebuild 2415 SHA256 33204233f9e40c868ec3897d0bd4ebe9c6e5c215b42ab67adab14b38a19be84f SHA512 02b2dbba4b6a240c8d48a94b6f9037a556bb5182009b8318bd1ec0fe60caa341ffff64d8d33b9baba9ed2b3626dac6c097e1bfdd4fce7bcccb32528c8f276943 WHIRLPOOL de324755f7a586fd2ba9503843bea3c92fbedc3dd780463830ed9eb61db050c3ed972c5d3be29ff7c705b1289ecd126ce007dd443a1543a25b062e879003ee4d
 MISC ChangeLog 5037 SHA256 d91b8f1506cf9102f4f46dbdd03d6c757ed521c54e08b1f03c70ea61d950ee1a SHA512 22fec5534ecd42063f666080c6e9690197120700d23277ca718181306715c41e2253f684efb4c9cdb4456c1a0609d6b45c8a644c4f2e3b86f5e9f5f84a5ec3d6 WHIRLPOOL 69b1294e44f270910dcf450bf3a83167d1665d195b8767f950f45443ab5c5e187afa22c8d49246a3a5c1721650698983407c9e80fa9e964290fc7ca35b0e2f7d
 MISC ChangeLog-2015 25235 SHA256 bde68cfbf1ddb7ec621042d675bab7b5aeffed7f3f092dc278b0c0ac2cd602de SHA512 243495808dbef55124b5a8d02e27b87550ad40104b427ed9bb63d3c8785a84d0acd3675a8d15c8579553c22f06809a47d19530eea0300a0b616ed2e3fb527dee WHIRLPOOL 70afaf3d02a4f5a3e4b4b13bb3c9f912d55c4b4c6f06beb10412f52b59fd82e5b6bfb9548fbe1a625e933750e903cb179cf31267b4abba103b3539d95622e8d8
 MISC metadata.xml 347 SHA256 cfaa5b9985d20997a4800b7a60f7804bf8660d217ef2421732c2e296532d6862 SHA512 1150e37d64393f26ef81056ff25e9720a4bc82dd28c9cffd164d144bb6d2f660f802a31d5ebf4fd121a01b36a4a5073893ebec6b735d3eb570da36705d5f446e WHIRLPOOL f4cc92f281dfb2f436c979257347ac8694056a8d9a4a3c794056027a12c64f6cf04023641b0462d57a376335d93c55f3b6722504e7f7e32baf702c4c7578e5f9
diff --git a/sys-apps/gawk/gawk-4.1.4.ebuild b/sys-apps/gawk/gawk-4.1.4.ebuild
index 874191eef68e..89c4624dc17c 100644
--- a/sys-apps/gawk/gawk-4.1.4.ebuild
+++ b/sys-apps/gawk/gawk-4.1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="mpfr nls readline"
 
 RDEPEND="mpfr? ( dev-libs/mpfr:0= )
diff --git a/sys-apps/gawk/gawk-4.2.0.ebuild b/sys-apps/gawk/gawk-4.2.0.ebuild
index da57da475731..231bcb851dcf 100644
--- a/sys-apps/gawk/gawk-4.2.0.ebuild
+++ b/sys-apps/gawk/gawk-4.2.0.ebuild
@@ -38,7 +38,8 @@ src_prepare() {
 	# fix standards conflict on Solaris
 	if [[ ${CHOST} == *-solaris* ]] ; then
 		sed -i \
-			-e '/\<_XOPEN_SOURCE\>/s/$/600/' \
+			-e '/\<_XOPEN_SOURCE\>/s/1$/600/' \
+			-e '/\<_XOPEN_SOURCE_EXTENDED\>/s/1//' \
 			extension/inplace.c || die
 	fi
 }
diff --git a/sys-apps/gsmartcontrol/Manifest b/sys-apps/gsmartcontrol/Manifest
index f11dae52056e..bbc4b219ae1d 100644
--- a/sys-apps/gsmartcontrol/Manifest
+++ b/sys-apps/gsmartcontrol/Manifest
@@ -5,7 +5,7 @@ DIST gsmartcontrol-1.1.0.tar.bz2 683898 SHA256 90c9ead852255f5e1a74a3ff6c265d1cb
 DIST gsmartcontrol-1.1.1.tar.bz2 667372 SHA256 2e39ad330829ae93824732f1b663303ac9ea1223f703901fae28549a3b2d7518 SHA512 fc180b85a9db232add4260856e078a578801e11b87df417a5572fab284e992c85009ab9e7d9d6213b2842097067fc119fa0183d5b0dedf8dde71fe4e9e0b38cc WHIRLPOOL f38414b454e0a72904cb1b19a1d10ed6fc7ec3b75422427e1a9f9aaeb6d67946fe773927195af3772ea5320bd613fe984bdecd96313b09a34b0fcd35b3153324
 EBUILD gsmartcontrol-0.8.7.ebuild 985 SHA256 ed7f7e0d2b23abf6d0b565e6f81323a36dbc74fce20b7985520f26e53a509308 SHA512 7b75e313a0d31f47a7de2811bb79cdf2db4b2e8b6c7a2018067d86c94ac5bca69dc728884aab1345dbf22d0839ac4da500f5261db42657e8800e376c7cec8279 WHIRLPOOL 8c17a544bace66004775f3b043ed7d2f7069b2cd99ca154629dc44561ad6ebd9bd7d19c690fd586bb6ca1cd1e24fceb7ab4f665379337ec9bbb0c068ef423f4f
 EBUILD gsmartcontrol-0.9.0.ebuild 987 SHA256 8a58316fe685d64e8b1d6617d6a4fb4a34407eba5465ae1525133e1cb18639d0 SHA512 dffca954984e0a59e03a821b4958f8a12e3c9aab39c2bc6c134122bb7c61e4d119287923241dd4f67875506b8814529bfafd85da2fbebfa7cd8b2e8b5f4166f5 WHIRLPOOL 13034b74c2fac89b91956cd584668f8dfb55acd94ee8e8347e5dea29710eb4a6aecd9b880ee64c9b43e27162c0f9db0e32b0c8c8fd9262c0d601dec6f0ae49a9
-EBUILD gsmartcontrol-1.0.2.ebuild 987 SHA256 e11460d797005ffe97eb4c6226157c7f4d68461e61d88076a43f0a451e7400a0 SHA512 1e968ff6815c7479268435a64aa35d86bee145d71f6718e3208296f00766ce889a026f351b95af4dcd9f9ba2e67945973dc430a30e91832223ac94ab3b245ee6 WHIRLPOOL 4238fae00560a3d19c860945aaa30feaed7af0dd98e6034f6a10c15b8bd5d329ba6a9141e4aa775381d51b85d6777bb2e26013bfb8c42cbdd6b508dcc0d8df61
+EBUILD gsmartcontrol-1.0.2.ebuild 986 SHA256 6d737f7456fbaf687c0e20a193041cbadd9e3f7d8de9aa61a0d3a81d56511bcd SHA512 34ccc6bb8a72a61acb488f457700088ea5ede23cadabeaaa36c54919215538dcefe8ac20dd42f3cd466779f65eb664041d919278ca85ed4ca7721a8d38feb0a4 WHIRLPOOL 77eea63da5203d4a084382ac2fd4820ca67509b44e023bb5982b2dc943c0bffb5e47c074c389cdbc5e7980b7d2f400bbb98db983244360394120d223c2978f2e
 EBUILD gsmartcontrol-1.1.0.ebuild 987 SHA256 e11460d797005ffe97eb4c6226157c7f4d68461e61d88076a43f0a451e7400a0 SHA512 1e968ff6815c7479268435a64aa35d86bee145d71f6718e3208296f00766ce889a026f351b95af4dcd9f9ba2e67945973dc430a30e91832223ac94ab3b245ee6 WHIRLPOOL 4238fae00560a3d19c860945aaa30feaed7af0dd98e6034f6a10c15b8bd5d329ba6a9141e4aa775381d51b85d6777bb2e26013bfb8c42cbdd6b508dcc0d8df61
 EBUILD gsmartcontrol-1.1.1.ebuild 987 SHA256 e11460d797005ffe97eb4c6226157c7f4d68461e61d88076a43f0a451e7400a0 SHA512 1e968ff6815c7479268435a64aa35d86bee145d71f6718e3208296f00766ce889a026f351b95af4dcd9f9ba2e67945973dc430a30e91832223ac94ab3b245ee6 WHIRLPOOL 4238fae00560a3d19c860945aaa30feaed7af0dd98e6034f6a10c15b8bd5d329ba6a9141e4aa775381d51b85d6777bb2e26013bfb8c42cbdd6b508dcc0d8df61
 MISC ChangeLog 3071 SHA256 890cbb0f3bb1b6e679ae0e0700cad3a2fe41aaff68e7f5d5ee066c1ef7dc9b0d SHA512 3b9ccdf4120c06af0e90c7fe8ed5a4e49795b1d8695bb2271bc477fb564f3aa103a94c46f7f3aa1fda5f0410ca7262b0baab67c3be62fa37967b1ef74e14a851 WHIRLPOOL 2e0c8d3c43c2716907dbe9d997ef7082be9bf273182b62f6d14308f6b26437d716c6a5f0cce445901194f7f80b44759d9f300197ba5a476e6c041e788c665580
diff --git a/sys-apps/gsmartcontrol/gsmartcontrol-1.0.2.ebuild b/sys-apps/gsmartcontrol/gsmartcontrol-1.0.2.ebuild
index 4757ae7e2385..e2010e17fc25 100644
--- a/sys-apps/gsmartcontrol/gsmartcontrol-1.0.2.ebuild
+++ b/sys-apps/gsmartcontrol/gsmartcontrol-1.0.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2 GPL-3 ) Boost-1.0 BSD Unlicense ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 
 COMMON_DEPEND="
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index 2a7ff64f1790..916cf7318181 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -3,7 +3,7 @@ DIST help2man-1.46.6.tar.xz 171044 SHA256 615ff5ac38369ddb3707c5fd71672ab122639f
 DIST help2man-1.47.4.tar.xz 189456 SHA256 d4ecf697d13f14dd1a78c5995f06459bff706fd1ce593d1c02d81667c0207753 SHA512 3320890c4068086bff7a858653fb67ac80363f26772fb0bb702233052e2bcbe647e7b20b1a2246b1a0e026ba2aa8679e6baafe302d78c747da04e29c59b9bafd WHIRLPOOL 6e7bf1f1dcf3552bd97c3975e6bd2dd404f5e3bcc62f00c04225e3085f0705882a16fe54ce45e0558ef6e592f54183b89794abd7135eb4b683408108189ee0a6
 DIST help2man-1.47.5.tar.xz 186044 SHA256 7ca60b2519fdbe97f463fe2df66a6188d18b514bfd44127d985f0234ee2461b1 SHA512 c94f94bbdfb9e288edff2b3181e0f2e858d309aa4fe77cae141571a06b9b5bc2a5c5a4d25ffc1f9108222d56c9040989d63770f5d804323a52d3978059d1eca7 WHIRLPOOL d31885c3a8f5602e0d38a3676e17ee76139a0ab26fc1da61a57609eacad465ae973c8bf8930c22fe7922f2f07882721a0a8d52592d918c81b450f9c6265f7be5
 EBUILD help2man-1.46.6.ebuild 961 SHA256 3c331f54724e6908285c53de6f997b7dd1f55ac2aeea72122c211b88513f81ed SHA512 73e75acc9f8980950a9257e4e08c11f17cd67bf9965d9917e46c43ffe6ccc66aac1c0ae14df72f6b3f9e1fa4c7ca85d96ce260f76a6648f8fdc7907b70185881 WHIRLPOOL 0fe1068673e1db82dad12e3c4fff3e6e2d30e4c860a4b4a95dcb11a3bf8542e5bc45436a81eb184f1b95a5335c75fad49d5e4c22af7f7adae5614c4c2301567a
-EBUILD help2man-1.47.4.ebuild 1098 SHA256 6c5ffd85598bf25e0b237b9a0b9df26866d4b4732e838e8506021785ef075d66 SHA512 ed0f7c6414ea6f0d90db8797c67774a6adcb8b92e638640a92b6bc08e0d568a57c369b656d2e19d63017ce24f16ffc223934b08ab8386fbced68698e030f3de4 WHIRLPOOL 2ac924b65f4c8f49ffd9c1647d7454fff9c3ced266db236b9406da1bf589434980b075fa79ab6adac0da02b7e5490953fa7a488a9c6f1438a099f3e6863b1b4d
+EBUILD help2man-1.47.4.ebuild 1097 SHA256 4ca1b8cb2984c7b435fa1e14656f4ee8d44eb379b833393c2f7bfd2829083876 SHA512 aeb8da2e473032d185a0ad1a8aef98e69650843ba50685528021a48c1f61a753d9aad9edea6a7f4aae1e53dc8588145ce66eed865486c10caba8b87bddf60cba WHIRLPOOL fb15a3d0c7a8d3be9d7bd11d463a7def04b190913f8ba76d76246503ba4705685b70c3b075ddc4f1d559938d823d02bd8316a1bfc2c21152cabcfc57288024c2
 EBUILD help2man-1.47.5.ebuild 1077 SHA256 7bf7f5ba74027acb8fec7b61c4932c2eea2f65b7c3c3d5c3bff610554918bfae SHA512 8dc708b304aae08f8fad597a1e0537e3f709deda7ba7568c1acdfb3d37fe1c338376310160c16cb2a1e02661687f52ebb68fcc0987a418c57121e78376d2bcb0 WHIRLPOOL 827a15c654d03d1056c8d805d72b4ae7dfeef13d78e0db31352931eeb84e97fc513480155668489653221ed998068ff05f719bcf60ab34d3153927f3905ab1bc
 MISC ChangeLog 4770 SHA256 da7132e6698cc6baa760860068a789ce487700e3febb29bd95e380c1243097d1 SHA512 f616a3716e5cb1d2d8ab75b8ab9f5d4950f0e66d68787e7c7b85e95585cc473e528476e94e3301c8a3c0034d37a74a0e8ebb985dbc10ba1aa7b9d3a2ab917919 WHIRLPOOL e1164de772bc476b1651a79b2f2264a0a161593936e44998508b0138598f9a84c8655b7ae993e1d2e54a5d9c54e02f79396432f4bbdaa97a7f092ddef642cd23
 MISC ChangeLog-2015 17647 SHA256 e33c324b885960677a805d9be1545e0dcf8b2d6cc42c6bab19f45a989a30854a SHA512 36341130eb3b9ada5f5b67e03137983b150b5e41c165d4cc3e08651e6120dc0a298957b1e47e0ce9649a62c8fbeaf48095e255815d6adfd4becac0882a0cae5c WHIRLPOOL a7698bca661c97ffb4c1ac4163015a03f3a9ac65a57017d4129aa8fc9c233d392292e628f29bd30688005d36f5eb13d0f005d559d1118815f55fdc3991673c80
diff --git a/sys-apps/help2man/help2man-1.47.4.ebuild b/sys-apps/help2man/help2man-1.47.4.ebuild
index bc50c66549d6..2f979facc7d3 100644
--- a/sys-apps/help2man/help2man-1.47.4.ebuild
+++ b/sys-apps/help2man/help2man-1.47.4.ebuild
@@ -10,7 +10,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 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 38ac74a4fc19..914c39a80495 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -13,6 +13,11 @@ DIST openrc-0.32.1.tar.gz 223808 SHA256 ef037a468d87009c8a21a62f04c3b5fa5eb56ce2
 DIST openrc-0.32.tar.gz 223935 SHA256 d452f5c8dd49a0819de368e7faeb56bd7460f8704cb029d9cc4e0b1dc56e791e SHA512 a355ba31d50b1c58f724d446449a8e31bb6f4c13b2da886880579e2666bcefe612a4eae64732f3ef7549fbfc84f3e088c4ca98e6be30108adfbf0a6d648d2635 WHIRLPOOL 451d9e549a175d14b5ed23c9b16e2cf7815e8cf7e616d964161b1e583e899ad0ac1f7bfe4cc4fccd4e1f5155d1c85f8d77f206d083bc02a0f2ad6a1348ac776f
 DIST openrc-0.33.1.tar.gz 224256 SHA256 915865565be249a88895a7bdc7a23d917a7b2adfaea7a5fcbc32f8b517b22664 SHA512 87388e96e2e4a1100699ed816a4bd71307d237b9e8013d48ecaaf453170cdb27bf642a6a227a3f934580e1f1f5985337fab50164b69b28489ee7f2813802f883 WHIRLPOOL e86f0140e3de1a9b4ca8636bcaf312d08ce3feb5d02beb4ec76afec3ce530a73b3000a83077c443f7e9376e97e5c6c2d0b4b9630a734e06ba1f63f1ff46fdd31
 DIST openrc-0.33.tar.gz 224148 SHA256 4e136fe328a5f8b1225ec5c5c34a42e472ff5676c95b334b5be9b064adaeaf2a SHA512 6c4b27f3c433f418ae205074214697697b8e124110db2985200a698b4123bac468aa962026ca638c2c1b71e5b3121bfe5280a34d7a954a0aa1ede0b79dfab18e WHIRLPOOL 1345b51597cd1424c800957c0d79ca60cad8cd68a964544a9fc1d14bde0518523763b3c53867948d1f0c5b0c40867ed2c66c84a782d40f2e900a0eab7252e5b9
+DIST openrc-0.34.1.tar.gz 225744 SHA256 0150e8ce70cd80e3701c4b86bb6edbab1fbb647d278af9ef8b6bd12cb139a9f6 SHA512 dbb6fd3af5c3020a16b010c7b242c7506390ad53dc961c32339149b89cca597c34c632d0ad71b450034e2466221653bed29b3e1e6c6da15987d04c6981c0392d WHIRLPOOL 02abe6dc0ce4b3323f3d70d923e24f7708f27818cb96df2abc69777d734cd45f2d82790d4f2f82da34de8d4d61d797d9c74904753dd0f1cbaffa963a08168e4d
+DIST openrc-0.34.2.tar.gz 226006 SHA256 f2b81f2661a1834db6477f5af9363334370874fac477cb81063326770cf7385b SHA512 67a26babf5e0026aaebed45eab1ac667531c347f2ba76ad6d3fb60731d95880b831a330f4ac8996188264bdf563b583b6cdcb0002d7ace8327928b78226a29a1 WHIRLPOOL bef8189be3ba6906e5fa3c1998c81418f269b351e09407095444f39ea2e842c7b2331dc95be7e53736a6319440f67ce95a07adba4785f5376579d88e9bc42fc4
+DIST openrc-0.34.3.tar.gz 226693 SHA256 8e4c1f99727b7b91766fcd65e0a303240528bf0cb123a65e33adc904c67bf2bd SHA512 516849d20fba93cf560aaeb51b29fa495265b317b37fc48e193876b131f770665235560fcb2e64e7c7a8046699daafee170887cdb19144938cbf669724505f3b WHIRLPOOL 286ecab65a1a1de429ad5f9a4241b25d0aef146d3a47429550d05f7cc68fdc4c36bff933eaff77c6b1bfa3e18a313e19dc5a531fd35cace825e54e67d0f7d163
+DIST openrc-0.34.4.tar.gz 227129 SHA256 b9d70a8e32a9fa4078864a9aad4e60efba3c0ccfa54ac777a538f62a2c1eebe5 SHA512 f502a8411929d153d4d2e5e4f4052691c6ff85432eb0b8a5534c7880d9b58b3ac919f04af1f1be38c76cd8dec3740bc718b486c06f06f08ba41d311d963250ec WHIRLPOOL 56e34c17ecacc9b42611815a757da33db84571bf2d7c39d8cdc252b170a8c5a5b811b50c0a7d0671dd1c71679d6625deadce10f025ec066d4a6fdf559587af59
+DIST openrc-0.34.tar.gz 225678 SHA256 fa95e111d884f60f967bfa78353f683615f599bbf449b89c0663eb173769fc73 SHA512 8ff0e3234db06ddeb7c930251f13ec9e4488e4c9776dfe46bb0c1af09835cb34655084bebb6638eb07e47a7f5ef95c1aaed9d06dfa3eaef9e36e9b7a7910f820 WHIRLPOOL aacc1b4636bbbf29d091d7322154898c98cd13947450a0d81cacc080803c1241fe3cbe3e731553c94e5e5ddb2e9c626de53efa9885a4e7be23399637099f1e4d
 EBUILD openrc-0.27.2.ebuild 10132 SHA256 a57f316547b3127cf92a991542579ff962a288625fc6fbfbf7b2f31ce8f7c2e1 SHA512 c63261e84ac5225167034db09feb5772a244de09b2ca084078122b7a968f737dff1eb3a1b8fb76333c7c7f57299bd30ae4c5a49a0ad120459474be30aea360d6 WHIRLPOOL 45fc659935bc090b2ec8568dec93407b8c4a851e73b1138643a4584ef1b3d9e9c485ba1e10a0a303be6825f35f92ee026fc2f640158d3e7c7add3b3f1dcf5a67
 EBUILD openrc-0.28.ebuild 10123 SHA256 850255977878f273ec0fb3f0bfa117f4637dc3507f855e5d549b3eaad904f6f2 SHA512 f32502ebbd8e1a8e13044cd23d8b0e136eaf26e86001ae5f225640f085069c78921392a492614d3d1b734542bb0f99a9c781706158bdf5cd1ec91634d9f89e72 WHIRLPOOL 40fff2659443e04b037a5d722f0380423977c70001cd10076020ea5a6107ab8c7436ea0727ad00a0371a707daa90dda840bd4143ba5e2b180165dcc07fd15186
 EBUILD openrc-0.29.ebuild 10132 SHA256 a57f316547b3127cf92a991542579ff962a288625fc6fbfbf7b2f31ce8f7c2e1 SHA512 c63261e84ac5225167034db09feb5772a244de09b2ca084078122b7a968f737dff1eb3a1b8fb76333c7c7f57299bd30ae4c5a49a0ad120459474be30aea360d6 WHIRLPOOL 45fc659935bc090b2ec8568dec93407b8c4a851e73b1138643a4584ef1b3d9e9c485ba1e10a0a303be6825f35f92ee026fc2f640158d3e7c7add3b3f1dcf5a67
@@ -20,10 +25,15 @@ EBUILD openrc-0.30.ebuild 10132 SHA256 a57f316547b3127cf92a991542579ff962a288625
 EBUILD openrc-0.31.1.ebuild 10132 SHA256 a57f316547b3127cf92a991542579ff962a288625fc6fbfbf7b2f31ce8f7c2e1 SHA512 c63261e84ac5225167034db09feb5772a244de09b2ca084078122b7a968f737dff1eb3a1b8fb76333c7c7f57299bd30ae4c5a49a0ad120459474be30aea360d6 WHIRLPOOL 45fc659935bc090b2ec8568dec93407b8c4a851e73b1138643a4584ef1b3d9e9c485ba1e10a0a303be6825f35f92ee026fc2f640158d3e7c7add3b3f1dcf5a67
 EBUILD openrc-0.31.2.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
 EBUILD openrc-0.31.ebuild 10132 SHA256 a57f316547b3127cf92a991542579ff962a288625fc6fbfbf7b2f31ce8f7c2e1 SHA512 c63261e84ac5225167034db09feb5772a244de09b2ca084078122b7a968f737dff1eb3a1b8fb76333c7c7f57299bd30ae4c5a49a0ad120459474be30aea360d6 WHIRLPOOL 45fc659935bc090b2ec8568dec93407b8c4a851e73b1138643a4584ef1b3d9e9c485ba1e10a0a303be6825f35f92ee026fc2f640158d3e7c7add3b3f1dcf5a67
-EBUILD openrc-0.32.1.ebuild 10163 SHA256 5d6e26e91a49195bcd9b8d03a91dc36a3e5dba51ae1b7a7a8cef996beaa01d7f SHA512 397f27315e03e61ad462cc985faca1a1074f40015f2c4fd99837b9b953dbb84c2260496c2b31e87924aed0dc20bf0b6f90f776aa6fc0e4275eb0450909a5ff8b WHIRLPOOL ba108da257792cf69d3028067c4b3523e015fa39e04d58d9ab980f3bc445db141473de75792e4e3c0c1fd9a2600beba7275c4a9b9a11ad0b276a13e47cffbc8a
+EBUILD openrc-0.32.1.ebuild 10162 SHA256 d688c49fe8446296fd469a97276c25b793d10421fd3fe7ee044e9f6cdecb387d SHA512 8fbf8406cb499dfac756ba1c7eb040e61eeefc61d6d294967864651e10edb862d16fc81f81e4d012c7df248c651305866c3656f39d9c5ccc3d884c5bc3e77eb0 WHIRLPOOL 069d82afdbc2d52c5fee592839ad3f550cb11342d694bd61c1587769991304fdcffba9a04b650a1ec096681cf8d1db0e69aafdf9455a7fd4e366af53ceb93089
 EBUILD openrc-0.32.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
 EBUILD openrc-0.33.1.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
 EBUILD openrc-0.33.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
+EBUILD openrc-0.34.1.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
+EBUILD openrc-0.34.2.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
+EBUILD openrc-0.34.3.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
+EBUILD openrc-0.34.4.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
+EBUILD openrc-0.34.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
 EBUILD openrc-9999.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
 MISC ChangeLog 18468 SHA256 b0c4464a2179009f3683606b8c9ed6b6f1e5c543e5dee53d0b44e9cd51804d94 SHA512 f1269f5f534a2fb2c5643b8cb5735e969e4bc18f2f8474c23784cfebc92ac72a3ed77f00eafa7430ec2944b4a5476a4688172d9fc47a32eb04bbb43893a80143 WHIRLPOOL a912f296cb7272dded544d045cc9dee06c9319fc500dbdef9e000300c3fc73aaae4e72c7574428ce4dddeedcd2055e594acf315cfa53db95d48aaf20c8a8907a
 MISC ChangeLog-2015 57223 SHA256 df20987356d1c191a7f947374ec43989a1191abae87a47094832785ae87cc012 SHA512 314bdddce280e6a02e6c0bb8e7fc4b52e0fce8ab00ac9669c7d4dc36986017bb220d54ad743651e1b1d65a0b598f9e2f1fe34adfb755592671f4fac00a4a3ee9 WHIRLPOOL cb8531c90fd33e586741997db52abac7883ef4f128c22d60dd78e85eb01cdee6174d566b31a8ed43520e40de887b4223202f38705193215bf4cd8ae91e135c78
diff --git a/sys-apps/openrc/openrc-0.32.1.ebuild b/sys-apps/openrc/openrc-0.32.1.ebuild
index 5526180efe6f..f54f45f0fd3f 100644
--- a/sys-apps/openrc/openrc-0.32.1.ebuild
+++ b/sys-apps/openrc/openrc-0.32.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/sys-apps/openrc/openrc-0.34.1.ebuild b/sys-apps/openrc/openrc-0.34.1.ebuild
new file mode 100644
index 000000000000..15376774cd7c
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.34.1.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
+	unicode kernel_linux kernel_FreeBSD"
+
+COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+	ncurses? ( sys-libs/ncurses:0= )
+	pam? (
+		sys-auth/pambase
+		virtual/pam
+	)
+	audit? ( sys-process/audit )
+	kernel_linux? (
+		sys-process/psmisc
+		!<sys-process/procps-3.3.9-r2
+	)
+	selinux? (
+		sys-apps/policycoreutils
+		>=sys-libs/libselinux-2.6
+	)
+	!<sys-apps/baselayout-2.1-r1
+	!<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	!prefix? (
+		kernel_linux? (
+			>=sys-apps/sysvinit-2.86-r6[selinux?]
+			virtual/tmpfiles
+		)
+		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+	)
+	selinux? (
+		>=sec-policy/selinux-base-policy-2.20170204-r4
+		>=sec-policy/selinux-openrc-2.20170204-r4
+	)
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_prepare() {
+	default
+
+	sed -i 's:0444:0644:' mk/sys.mk || die
+
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
+	fi
+}
+
+src_compile() {
+	unset LIBDIR #266688
+
+	MAKE_ARGS="${MAKE_ARGS}
+		LIBNAME=$(get_libdir)
+		LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
+		MKNET=$(usex newnet)
+		MKSELINUX=$(usex selinux)
+		MKAUDIT=$(usex audit)
+		MKPAM=$(usev pam)
+		MKSTATICLIBS=$(usex static-libs)"
+
+	local brand="Unknown"
+	if use kernel_linux ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
+		brand="Linux"
+	elif use kernel_FreeBSD ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
+		brand="FreeBSD"
+	fi
+	export BRANDING="Gentoo ${brand}"
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+	export DEBUG=$(usev debug)
+	export MKTERMCAP=$(usev ncurses)
+
+	tc-export CC AR RANLIB
+	emake ${MAKE_ARGS}
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+
+	# move the shared libs back to /usr so ldscript can install
+	# more of a minimal set of files
+	# disabled for now due to #270646
+	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
+	#gen_usr_ldscript -a einfo rc
+	gen_usr_ldscript libeinfo.so
+	gen_usr_ldscript librc.so
+
+	if ! use kernel_linux; then
+		keepdir /$(get_libdir)/rc/init.d
+	fi
+	keepdir /$(get_libdir)/rc/tmp
+
+	# Backup our default runlevels
+	dodir /usr/share/"${PN}"
+	cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
+	rm -rf "${ED}"/etc/runlevels
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	# install gentoo pam.d files
+	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+	newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+
+	# install documentation
+	dodoc ChangeLog *.md
+	if use newnet; then
+		dodoc README.newnet
+	fi
+}
+
+add_boot_init() {
+	local initd=$1
+	local runlevel=${2:-boot}
+	# if the initscript is not going to be installed and is not
+	# currently installed, return
+	[[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
+		|| return
+	[[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
+
+	# if runlevels dont exist just yet, then create it but still flag
+	# to pkg_postinst that it needs real setup #277323
+	if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
+		mkdir -p "${EROOT}"etc/runlevels/${runlevel}
+		touch "${EROOT}"etc/runlevels/.add_boot_init.created
+	fi
+
+	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
+	ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
+}
+add_boot_init_mit_config() {
+	local config=$1 initd=$2
+	if [[ -e ${EROOT}${config} ]] ; then
+		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
+			add_boot_init ${initd}
+		fi
+	fi
+}
+
+pkg_preinst() {
+	local f LIBDIR=$(get_libdir)
+
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+
+	# termencoding was added in 0.2.1 and needed in boot
+	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
+
+	# swapfiles was added in 0.9.9 and needed in boot (february 2012)
+	has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
+
+	if ! has_version ">=sys-apps/openrc-0.11"; then
+		add_boot_init sysfs sysinit
+	fi
+
+	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
+		migrate_udev_mount_script
+		add_boot_init tmpfiles.setup boot
+	fi
+
+	# these were added in 0.12.
+	if ! has_version ">=sys-apps/openrc-0.12"; then
+		add_boot_init loopback
+		add_boot_init tmpfiles.dev sysinit
+
+		# ensure existing /etc/conf.d/net is not removed
+		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
+		# this needs to stay in openrc ebuilds for a long time. :(
+		# Added in 0.12.
+		if [[ -f "${EROOT}"etc/conf.d/net ]]; then
+			einfo "Modifying conf.d/net to keep it from being removed"
+			cat <<-EOF >>"${EROOT}"etc/conf.d/net
+
+# The network scripts are now part of net-misc/netifrc
+# In order to avoid sys-apps/${P} from removing this file, this comment was
+# added; you can safely remove this comment.  Please see
+# /usr/share/doc/netifrc*/README* for more information.
+EOF
+		fi
+	fi
+	has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
+
+	if ! has_version ">=sys-apps/openrc-0.18.3"; then
+		add_boot_init mtab
+		if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
+			ewarn "${EROOT}etc/mtab will be replaced with a"
+			ewarn "symbolic link to /proc/self/mounts on the next"
+			ewarn "reboot."
+			ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
+			ewarn "if you do not want this to happen."
+		fi
+	fi
+}
+
+# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
+migrate_udev_mount_script() {
+	if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
+		! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
+		add_boot_init udev-mount sysinit
+	fi
+	return 0
+}
+
+pkg_postinst() {
+	local LIBDIR=$(get_libdir)
+
+	# Make our runlevels if they don't exist
+	if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
+		einfo "Copying across default runlevels"
+		cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
+		rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
+	else
+		if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/sysinit
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
+				"${EROOT}"etc/runlevels/sysinit
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/shutdown
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
+				"${EROOT}"etc/runlevels/shutdown
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
+				"${EROOT}"etc/runlevels
+		fi
+	fi
+
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	# Handle the conf.d/local.{start,stop} -> local.d transition
+	if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
+		elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
+		elog "files to ${EROOT}etc/local.d"
+		mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
+		mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
+		chmod +x "${EROOT}"etc/local.d/*{start,stop}
+	fi
+
+	if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
+		if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
+			ewarn "The dependency data could not be migrated to /run/openrc."
+			ewarn "This means you need to reboot your system."
+		fi
+	fi
+
+	# update the dependency tree after touching all files #224171
+	[[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
+		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+}
diff --git a/sys-apps/openrc/openrc-0.34.2.ebuild b/sys-apps/openrc/openrc-0.34.2.ebuild
new file mode 100644
index 000000000000..15376774cd7c
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.34.2.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
+	unicode kernel_linux kernel_FreeBSD"
+
+COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+	ncurses? ( sys-libs/ncurses:0= )
+	pam? (
+		sys-auth/pambase
+		virtual/pam
+	)
+	audit? ( sys-process/audit )
+	kernel_linux? (
+		sys-process/psmisc
+		!<sys-process/procps-3.3.9-r2
+	)
+	selinux? (
+		sys-apps/policycoreutils
+		>=sys-libs/libselinux-2.6
+	)
+	!<sys-apps/baselayout-2.1-r1
+	!<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	!prefix? (
+		kernel_linux? (
+			>=sys-apps/sysvinit-2.86-r6[selinux?]
+			virtual/tmpfiles
+		)
+		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+	)
+	selinux? (
+		>=sec-policy/selinux-base-policy-2.20170204-r4
+		>=sec-policy/selinux-openrc-2.20170204-r4
+	)
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_prepare() {
+	default
+
+	sed -i 's:0444:0644:' mk/sys.mk || die
+
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
+	fi
+}
+
+src_compile() {
+	unset LIBDIR #266688
+
+	MAKE_ARGS="${MAKE_ARGS}
+		LIBNAME=$(get_libdir)
+		LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
+		MKNET=$(usex newnet)
+		MKSELINUX=$(usex selinux)
+		MKAUDIT=$(usex audit)
+		MKPAM=$(usev pam)
+		MKSTATICLIBS=$(usex static-libs)"
+
+	local brand="Unknown"
+	if use kernel_linux ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
+		brand="Linux"
+	elif use kernel_FreeBSD ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
+		brand="FreeBSD"
+	fi
+	export BRANDING="Gentoo ${brand}"
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+	export DEBUG=$(usev debug)
+	export MKTERMCAP=$(usev ncurses)
+
+	tc-export CC AR RANLIB
+	emake ${MAKE_ARGS}
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+
+	# move the shared libs back to /usr so ldscript can install
+	# more of a minimal set of files
+	# disabled for now due to #270646
+	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
+	#gen_usr_ldscript -a einfo rc
+	gen_usr_ldscript libeinfo.so
+	gen_usr_ldscript librc.so
+
+	if ! use kernel_linux; then
+		keepdir /$(get_libdir)/rc/init.d
+	fi
+	keepdir /$(get_libdir)/rc/tmp
+
+	# Backup our default runlevels
+	dodir /usr/share/"${PN}"
+	cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
+	rm -rf "${ED}"/etc/runlevels
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	# install gentoo pam.d files
+	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+	newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+
+	# install documentation
+	dodoc ChangeLog *.md
+	if use newnet; then
+		dodoc README.newnet
+	fi
+}
+
+add_boot_init() {
+	local initd=$1
+	local runlevel=${2:-boot}
+	# if the initscript is not going to be installed and is not
+	# currently installed, return
+	[[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
+		|| return
+	[[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
+
+	# if runlevels dont exist just yet, then create it but still flag
+	# to pkg_postinst that it needs real setup #277323
+	if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
+		mkdir -p "${EROOT}"etc/runlevels/${runlevel}
+		touch "${EROOT}"etc/runlevels/.add_boot_init.created
+	fi
+
+	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
+	ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
+}
+add_boot_init_mit_config() {
+	local config=$1 initd=$2
+	if [[ -e ${EROOT}${config} ]] ; then
+		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
+			add_boot_init ${initd}
+		fi
+	fi
+}
+
+pkg_preinst() {
+	local f LIBDIR=$(get_libdir)
+
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+
+	# termencoding was added in 0.2.1 and needed in boot
+	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
+
+	# swapfiles was added in 0.9.9 and needed in boot (february 2012)
+	has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
+
+	if ! has_version ">=sys-apps/openrc-0.11"; then
+		add_boot_init sysfs sysinit
+	fi
+
+	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
+		migrate_udev_mount_script
+		add_boot_init tmpfiles.setup boot
+	fi
+
+	# these were added in 0.12.
+	if ! has_version ">=sys-apps/openrc-0.12"; then
+		add_boot_init loopback
+		add_boot_init tmpfiles.dev sysinit
+
+		# ensure existing /etc/conf.d/net is not removed
+		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
+		# this needs to stay in openrc ebuilds for a long time. :(
+		# Added in 0.12.
+		if [[ -f "${EROOT}"etc/conf.d/net ]]; then
+			einfo "Modifying conf.d/net to keep it from being removed"
+			cat <<-EOF >>"${EROOT}"etc/conf.d/net
+
+# The network scripts are now part of net-misc/netifrc
+# In order to avoid sys-apps/${P} from removing this file, this comment was
+# added; you can safely remove this comment.  Please see
+# /usr/share/doc/netifrc*/README* for more information.
+EOF
+		fi
+	fi
+	has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
+
+	if ! has_version ">=sys-apps/openrc-0.18.3"; then
+		add_boot_init mtab
+		if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
+			ewarn "${EROOT}etc/mtab will be replaced with a"
+			ewarn "symbolic link to /proc/self/mounts on the next"
+			ewarn "reboot."
+			ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
+			ewarn "if you do not want this to happen."
+		fi
+	fi
+}
+
+# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
+migrate_udev_mount_script() {
+	if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
+		! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
+		add_boot_init udev-mount sysinit
+	fi
+	return 0
+}
+
+pkg_postinst() {
+	local LIBDIR=$(get_libdir)
+
+	# Make our runlevels if they don't exist
+	if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
+		einfo "Copying across default runlevels"
+		cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
+		rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
+	else
+		if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/sysinit
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
+				"${EROOT}"etc/runlevels/sysinit
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/shutdown
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
+				"${EROOT}"etc/runlevels/shutdown
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
+				"${EROOT}"etc/runlevels
+		fi
+	fi
+
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	# Handle the conf.d/local.{start,stop} -> local.d transition
+	if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
+		elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
+		elog "files to ${EROOT}etc/local.d"
+		mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
+		mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
+		chmod +x "${EROOT}"etc/local.d/*{start,stop}
+	fi
+
+	if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
+		if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
+			ewarn "The dependency data could not be migrated to /run/openrc."
+			ewarn "This means you need to reboot your system."
+		fi
+	fi
+
+	# update the dependency tree after touching all files #224171
+	[[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
+		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+}
diff --git a/sys-apps/openrc/openrc-0.34.3.ebuild b/sys-apps/openrc/openrc-0.34.3.ebuild
new file mode 100644
index 000000000000..15376774cd7c
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.34.3.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
+	unicode kernel_linux kernel_FreeBSD"
+
+COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+	ncurses? ( sys-libs/ncurses:0= )
+	pam? (
+		sys-auth/pambase
+		virtual/pam
+	)
+	audit? ( sys-process/audit )
+	kernel_linux? (
+		sys-process/psmisc
+		!<sys-process/procps-3.3.9-r2
+	)
+	selinux? (
+		sys-apps/policycoreutils
+		>=sys-libs/libselinux-2.6
+	)
+	!<sys-apps/baselayout-2.1-r1
+	!<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	!prefix? (
+		kernel_linux? (
+			>=sys-apps/sysvinit-2.86-r6[selinux?]
+			virtual/tmpfiles
+		)
+		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+	)
+	selinux? (
+		>=sec-policy/selinux-base-policy-2.20170204-r4
+		>=sec-policy/selinux-openrc-2.20170204-r4
+	)
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_prepare() {
+	default
+
+	sed -i 's:0444:0644:' mk/sys.mk || die
+
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
+	fi
+}
+
+src_compile() {
+	unset LIBDIR #266688
+
+	MAKE_ARGS="${MAKE_ARGS}
+		LIBNAME=$(get_libdir)
+		LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
+		MKNET=$(usex newnet)
+		MKSELINUX=$(usex selinux)
+		MKAUDIT=$(usex audit)
+		MKPAM=$(usev pam)
+		MKSTATICLIBS=$(usex static-libs)"
+
+	local brand="Unknown"
+	if use kernel_linux ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
+		brand="Linux"
+	elif use kernel_FreeBSD ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
+		brand="FreeBSD"
+	fi
+	export BRANDING="Gentoo ${brand}"
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+	export DEBUG=$(usev debug)
+	export MKTERMCAP=$(usev ncurses)
+
+	tc-export CC AR RANLIB
+	emake ${MAKE_ARGS}
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+
+	# move the shared libs back to /usr so ldscript can install
+	# more of a minimal set of files
+	# disabled for now due to #270646
+	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
+	#gen_usr_ldscript -a einfo rc
+	gen_usr_ldscript libeinfo.so
+	gen_usr_ldscript librc.so
+
+	if ! use kernel_linux; then
+		keepdir /$(get_libdir)/rc/init.d
+	fi
+	keepdir /$(get_libdir)/rc/tmp
+
+	# Backup our default runlevels
+	dodir /usr/share/"${PN}"
+	cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
+	rm -rf "${ED}"/etc/runlevels
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	# install gentoo pam.d files
+	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+	newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+
+	# install documentation
+	dodoc ChangeLog *.md
+	if use newnet; then
+		dodoc README.newnet
+	fi
+}
+
+add_boot_init() {
+	local initd=$1
+	local runlevel=${2:-boot}
+	# if the initscript is not going to be installed and is not
+	# currently installed, return
+	[[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
+		|| return
+	[[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
+
+	# if runlevels dont exist just yet, then create it but still flag
+	# to pkg_postinst that it needs real setup #277323
+	if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
+		mkdir -p "${EROOT}"etc/runlevels/${runlevel}
+		touch "${EROOT}"etc/runlevels/.add_boot_init.created
+	fi
+
+	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
+	ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
+}
+add_boot_init_mit_config() {
+	local config=$1 initd=$2
+	if [[ -e ${EROOT}${config} ]] ; then
+		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
+			add_boot_init ${initd}
+		fi
+	fi
+}
+
+pkg_preinst() {
+	local f LIBDIR=$(get_libdir)
+
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+
+	# termencoding was added in 0.2.1 and needed in boot
+	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
+
+	# swapfiles was added in 0.9.9 and needed in boot (february 2012)
+	has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
+
+	if ! has_version ">=sys-apps/openrc-0.11"; then
+		add_boot_init sysfs sysinit
+	fi
+
+	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
+		migrate_udev_mount_script
+		add_boot_init tmpfiles.setup boot
+	fi
+
+	# these were added in 0.12.
+	if ! has_version ">=sys-apps/openrc-0.12"; then
+		add_boot_init loopback
+		add_boot_init tmpfiles.dev sysinit
+
+		# ensure existing /etc/conf.d/net is not removed
+		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
+		# this needs to stay in openrc ebuilds for a long time. :(
+		# Added in 0.12.
+		if [[ -f "${EROOT}"etc/conf.d/net ]]; then
+			einfo "Modifying conf.d/net to keep it from being removed"
+			cat <<-EOF >>"${EROOT}"etc/conf.d/net
+
+# The network scripts are now part of net-misc/netifrc
+# In order to avoid sys-apps/${P} from removing this file, this comment was
+# added; you can safely remove this comment.  Please see
+# /usr/share/doc/netifrc*/README* for more information.
+EOF
+		fi
+	fi
+	has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
+
+	if ! has_version ">=sys-apps/openrc-0.18.3"; then
+		add_boot_init mtab
+		if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
+			ewarn "${EROOT}etc/mtab will be replaced with a"
+			ewarn "symbolic link to /proc/self/mounts on the next"
+			ewarn "reboot."
+			ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
+			ewarn "if you do not want this to happen."
+		fi
+	fi
+}
+
+# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
+migrate_udev_mount_script() {
+	if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
+		! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
+		add_boot_init udev-mount sysinit
+	fi
+	return 0
+}
+
+pkg_postinst() {
+	local LIBDIR=$(get_libdir)
+
+	# Make our runlevels if they don't exist
+	if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
+		einfo "Copying across default runlevels"
+		cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
+		rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
+	else
+		if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/sysinit
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
+				"${EROOT}"etc/runlevels/sysinit
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/shutdown
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
+				"${EROOT}"etc/runlevels/shutdown
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
+				"${EROOT}"etc/runlevels
+		fi
+	fi
+
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	# Handle the conf.d/local.{start,stop} -> local.d transition
+	if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
+		elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
+		elog "files to ${EROOT}etc/local.d"
+		mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
+		mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
+		chmod +x "${EROOT}"etc/local.d/*{start,stop}
+	fi
+
+	if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
+		if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
+			ewarn "The dependency data could not be migrated to /run/openrc."
+			ewarn "This means you need to reboot your system."
+		fi
+	fi
+
+	# update the dependency tree after touching all files #224171
+	[[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
+		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+}
diff --git a/sys-apps/openrc/openrc-0.34.4.ebuild b/sys-apps/openrc/openrc-0.34.4.ebuild
new file mode 100644
index 000000000000..15376774cd7c
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.34.4.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
+	unicode kernel_linux kernel_FreeBSD"
+
+COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+	ncurses? ( sys-libs/ncurses:0= )
+	pam? (
+		sys-auth/pambase
+		virtual/pam
+	)
+	audit? ( sys-process/audit )
+	kernel_linux? (
+		sys-process/psmisc
+		!<sys-process/procps-3.3.9-r2
+	)
+	selinux? (
+		sys-apps/policycoreutils
+		>=sys-libs/libselinux-2.6
+	)
+	!<sys-apps/baselayout-2.1-r1
+	!<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	!prefix? (
+		kernel_linux? (
+			>=sys-apps/sysvinit-2.86-r6[selinux?]
+			virtual/tmpfiles
+		)
+		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+	)
+	selinux? (
+		>=sec-policy/selinux-base-policy-2.20170204-r4
+		>=sec-policy/selinux-openrc-2.20170204-r4
+	)
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_prepare() {
+	default
+
+	sed -i 's:0444:0644:' mk/sys.mk || die
+
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
+	fi
+}
+
+src_compile() {
+	unset LIBDIR #266688
+
+	MAKE_ARGS="${MAKE_ARGS}
+		LIBNAME=$(get_libdir)
+		LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
+		MKNET=$(usex newnet)
+		MKSELINUX=$(usex selinux)
+		MKAUDIT=$(usex audit)
+		MKPAM=$(usev pam)
+		MKSTATICLIBS=$(usex static-libs)"
+
+	local brand="Unknown"
+	if use kernel_linux ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
+		brand="Linux"
+	elif use kernel_FreeBSD ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
+		brand="FreeBSD"
+	fi
+	export BRANDING="Gentoo ${brand}"
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+	export DEBUG=$(usev debug)
+	export MKTERMCAP=$(usev ncurses)
+
+	tc-export CC AR RANLIB
+	emake ${MAKE_ARGS}
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+
+	# move the shared libs back to /usr so ldscript can install
+	# more of a minimal set of files
+	# disabled for now due to #270646
+	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
+	#gen_usr_ldscript -a einfo rc
+	gen_usr_ldscript libeinfo.so
+	gen_usr_ldscript librc.so
+
+	if ! use kernel_linux; then
+		keepdir /$(get_libdir)/rc/init.d
+	fi
+	keepdir /$(get_libdir)/rc/tmp
+
+	# Backup our default runlevels
+	dodir /usr/share/"${PN}"
+	cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
+	rm -rf "${ED}"/etc/runlevels
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	# install gentoo pam.d files
+	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+	newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+
+	# install documentation
+	dodoc ChangeLog *.md
+	if use newnet; then
+		dodoc README.newnet
+	fi
+}
+
+add_boot_init() {
+	local initd=$1
+	local runlevel=${2:-boot}
+	# if the initscript is not going to be installed and is not
+	# currently installed, return
+	[[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
+		|| return
+	[[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
+
+	# if runlevels dont exist just yet, then create it but still flag
+	# to pkg_postinst that it needs real setup #277323
+	if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
+		mkdir -p "${EROOT}"etc/runlevels/${runlevel}
+		touch "${EROOT}"etc/runlevels/.add_boot_init.created
+	fi
+
+	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
+	ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
+}
+add_boot_init_mit_config() {
+	local config=$1 initd=$2
+	if [[ -e ${EROOT}${config} ]] ; then
+		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
+			add_boot_init ${initd}
+		fi
+	fi
+}
+
+pkg_preinst() {
+	local f LIBDIR=$(get_libdir)
+
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+
+	# termencoding was added in 0.2.1 and needed in boot
+	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
+
+	# swapfiles was added in 0.9.9 and needed in boot (february 2012)
+	has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
+
+	if ! has_version ">=sys-apps/openrc-0.11"; then
+		add_boot_init sysfs sysinit
+	fi
+
+	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
+		migrate_udev_mount_script
+		add_boot_init tmpfiles.setup boot
+	fi
+
+	# these were added in 0.12.
+	if ! has_version ">=sys-apps/openrc-0.12"; then
+		add_boot_init loopback
+		add_boot_init tmpfiles.dev sysinit
+
+		# ensure existing /etc/conf.d/net is not removed
+		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
+		# this needs to stay in openrc ebuilds for a long time. :(
+		# Added in 0.12.
+		if [[ -f "${EROOT}"etc/conf.d/net ]]; then
+			einfo "Modifying conf.d/net to keep it from being removed"
+			cat <<-EOF >>"${EROOT}"etc/conf.d/net
+
+# The network scripts are now part of net-misc/netifrc
+# In order to avoid sys-apps/${P} from removing this file, this comment was
+# added; you can safely remove this comment.  Please see
+# /usr/share/doc/netifrc*/README* for more information.
+EOF
+		fi
+	fi
+	has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
+
+	if ! has_version ">=sys-apps/openrc-0.18.3"; then
+		add_boot_init mtab
+		if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
+			ewarn "${EROOT}etc/mtab will be replaced with a"
+			ewarn "symbolic link to /proc/self/mounts on the next"
+			ewarn "reboot."
+			ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
+			ewarn "if you do not want this to happen."
+		fi
+	fi
+}
+
+# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
+migrate_udev_mount_script() {
+	if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
+		! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
+		add_boot_init udev-mount sysinit
+	fi
+	return 0
+}
+
+pkg_postinst() {
+	local LIBDIR=$(get_libdir)
+
+	# Make our runlevels if they don't exist
+	if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
+		einfo "Copying across default runlevels"
+		cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
+		rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
+	else
+		if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/sysinit
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
+				"${EROOT}"etc/runlevels/sysinit
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/shutdown
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
+				"${EROOT}"etc/runlevels/shutdown
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
+				"${EROOT}"etc/runlevels
+		fi
+	fi
+
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	# Handle the conf.d/local.{start,stop} -> local.d transition
+	if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
+		elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
+		elog "files to ${EROOT}etc/local.d"
+		mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
+		mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
+		chmod +x "${EROOT}"etc/local.d/*{start,stop}
+	fi
+
+	if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
+		if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
+			ewarn "The dependency data could not be migrated to /run/openrc."
+			ewarn "This means you need to reboot your system."
+		fi
+	fi
+
+	# update the dependency tree after touching all files #224171
+	[[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
+		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+}
diff --git a/sys-apps/openrc/openrc-0.34.ebuild b/sys-apps/openrc/openrc-0.34.ebuild
new file mode 100644
index 000000000000..15376774cd7c
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.34.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
+	unicode kernel_linux kernel_FreeBSD"
+
+COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+	ncurses? ( sys-libs/ncurses:0= )
+	pam? (
+		sys-auth/pambase
+		virtual/pam
+	)
+	audit? ( sys-process/audit )
+	kernel_linux? (
+		sys-process/psmisc
+		!<sys-process/procps-3.3.9-r2
+	)
+	selinux? (
+		sys-apps/policycoreutils
+		>=sys-libs/libselinux-2.6
+	)
+	!<sys-apps/baselayout-2.1-r1
+	!<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	!prefix? (
+		kernel_linux? (
+			>=sys-apps/sysvinit-2.86-r6[selinux?]
+			virtual/tmpfiles
+		)
+		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+	)
+	selinux? (
+		>=sec-policy/selinux-base-policy-2.20170204-r4
+		>=sec-policy/selinux-openrc-2.20170204-r4
+	)
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_prepare() {
+	default
+
+	sed -i 's:0444:0644:' mk/sys.mk || die
+
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
+	fi
+}
+
+src_compile() {
+	unset LIBDIR #266688
+
+	MAKE_ARGS="${MAKE_ARGS}
+		LIBNAME=$(get_libdir)
+		LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
+		MKNET=$(usex newnet)
+		MKSELINUX=$(usex selinux)
+		MKAUDIT=$(usex audit)
+		MKPAM=$(usev pam)
+		MKSTATICLIBS=$(usex static-libs)"
+
+	local brand="Unknown"
+	if use kernel_linux ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
+		brand="Linux"
+	elif use kernel_FreeBSD ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
+		brand="FreeBSD"
+	fi
+	export BRANDING="Gentoo ${brand}"
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+	export DEBUG=$(usev debug)
+	export MKTERMCAP=$(usev ncurses)
+
+	tc-export CC AR RANLIB
+	emake ${MAKE_ARGS}
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+
+	# move the shared libs back to /usr so ldscript can install
+	# more of a minimal set of files
+	# disabled for now due to #270646
+	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
+	#gen_usr_ldscript -a einfo rc
+	gen_usr_ldscript libeinfo.so
+	gen_usr_ldscript librc.so
+
+	if ! use kernel_linux; then
+		keepdir /$(get_libdir)/rc/init.d
+	fi
+	keepdir /$(get_libdir)/rc/tmp
+
+	# Backup our default runlevels
+	dodir /usr/share/"${PN}"
+	cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
+	rm -rf "${ED}"/etc/runlevels
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	# install gentoo pam.d files
+	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+	newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+
+	# install documentation
+	dodoc ChangeLog *.md
+	if use newnet; then
+		dodoc README.newnet
+	fi
+}
+
+add_boot_init() {
+	local initd=$1
+	local runlevel=${2:-boot}
+	# if the initscript is not going to be installed and is not
+	# currently installed, return
+	[[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
+		|| return
+	[[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
+
+	# if runlevels dont exist just yet, then create it but still flag
+	# to pkg_postinst that it needs real setup #277323
+	if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
+		mkdir -p "${EROOT}"etc/runlevels/${runlevel}
+		touch "${EROOT}"etc/runlevels/.add_boot_init.created
+	fi
+
+	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
+	ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
+}
+add_boot_init_mit_config() {
+	local config=$1 initd=$2
+	if [[ -e ${EROOT}${config} ]] ; then
+		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
+			add_boot_init ${initd}
+		fi
+	fi
+}
+
+pkg_preinst() {
+	local f LIBDIR=$(get_libdir)
+
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+
+	# termencoding was added in 0.2.1 and needed in boot
+	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
+
+	# swapfiles was added in 0.9.9 and needed in boot (february 2012)
+	has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
+
+	if ! has_version ">=sys-apps/openrc-0.11"; then
+		add_boot_init sysfs sysinit
+	fi
+
+	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
+		migrate_udev_mount_script
+		add_boot_init tmpfiles.setup boot
+	fi
+
+	# these were added in 0.12.
+	if ! has_version ">=sys-apps/openrc-0.12"; then
+		add_boot_init loopback
+		add_boot_init tmpfiles.dev sysinit
+
+		# ensure existing /etc/conf.d/net is not removed
+		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
+		# this needs to stay in openrc ebuilds for a long time. :(
+		# Added in 0.12.
+		if [[ -f "${EROOT}"etc/conf.d/net ]]; then
+			einfo "Modifying conf.d/net to keep it from being removed"
+			cat <<-EOF >>"${EROOT}"etc/conf.d/net
+
+# The network scripts are now part of net-misc/netifrc
+# In order to avoid sys-apps/${P} from removing this file, this comment was
+# added; you can safely remove this comment.  Please see
+# /usr/share/doc/netifrc*/README* for more information.
+EOF
+		fi
+	fi
+	has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
+
+	if ! has_version ">=sys-apps/openrc-0.18.3"; then
+		add_boot_init mtab
+		if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
+			ewarn "${EROOT}etc/mtab will be replaced with a"
+			ewarn "symbolic link to /proc/self/mounts on the next"
+			ewarn "reboot."
+			ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
+			ewarn "if you do not want this to happen."
+		fi
+	fi
+}
+
+# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
+migrate_udev_mount_script() {
+	if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
+		! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
+		add_boot_init udev-mount sysinit
+	fi
+	return 0
+}
+
+pkg_postinst() {
+	local LIBDIR=$(get_libdir)
+
+	# Make our runlevels if they don't exist
+	if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
+		einfo "Copying across default runlevels"
+		cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
+		rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
+	else
+		if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/sysinit
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
+				"${EROOT}"etc/runlevels/sysinit
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/shutdown
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
+				"${EROOT}"etc/runlevels/shutdown
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
+				"${EROOT}"etc/runlevels
+		fi
+	fi
+
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	# Handle the conf.d/local.{start,stop} -> local.d transition
+	if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
+		elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
+		elog "files to ${EROOT}etc/local.d"
+		mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
+		mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
+		chmod +x "${EROOT}"etc/local.d/*{start,stop}
+	fi
+
+	if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
+		if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
+			ewarn "The dependency data could not be migrated to /run/openrc."
+			ewarn "This means you need to reboot your system."
+		fi
+	fi
+
+	# update the dependency tree after touching all files #224171
+	[[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
+		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+}
diff --git a/sys-apps/pacman/Manifest b/sys-apps/pacman/Manifest
index aead3f0385a1..66673cad829e 100644
--- a/sys-apps/pacman/Manifest
+++ b/sys-apps/pacman/Manifest
@@ -1,5 +1,6 @@
+AUX pacman-5.0.2-CVE-2016-5434.patch 3938 SHA256 e09d8db1c0d7f9c3517a46693b987899e812eed6b264149f736f87d23219fd28 SHA512 432922e485a2aa1d82d7654c615333bfd8ff74c89fcb3fa5728618d8947175172e043ae231c7bf04387a0770421ccf96bb0d492a061b4da12ea7f212fe07ca30 WHIRLPOOL 247c7930f58f7e4f0e682826cfb762afbece8b14cd0bd3ae04619712f986bf414b202d91c548ae72c78992dd40ba52089c86654705ffeeb861dc22fce7caf593
 DIST pacman-5.0.2.tar.gz 3361701 SHA256 dfd36086ad68564bcd977f4a1fafe51dd328acd4a95093ac4bf1249be9c41f0e SHA512 94a8cce1a52d2365a993c72f16537f4dbea6100feb8f22e8782cc7d2c1ef8a525a63f3c40bb183294c0faedcc743e3d806d2fc3c50a21ab9b03df2910039d628 WHIRLPOOL 2419486287d1ce26d97b3ad53513b4699d876cf5823f65b10d60d8f1df6b2150bc1b742677a60891dccc32bb2105a9a9bb10b58950f5403d0bd64859b0b8640b
-EBUILD pacman-5.0.2.ebuild 2282 SHA256 5a8fce3bd79e1b0fd3253920e875bf84ec0e84acd62c73140a2fdfa03da9d19c SHA512 0c881114145f65dee9b9bf8d85a7fd1310a7831c4177a9908f5ca5f3aa146e13d0e21e95acf9c1115c4c6e43acaa2d1fd558174826a74d218f4e87f84ae06f80 WHIRLPOOL a74b8fa87187d3ee22d937b70e2d71f1579cd3e48c876b361b3c48ee583b73130b7f4493b8d47d95c6788dfc49d3e34f95c5fce81622b7851fa663e1261d37ec
+EBUILD pacman-5.0.2-r1.ebuild 2952 SHA256 4d3361d5cf06380b932efbeeed12b3026526613e0965bbbb6758df87afe78496 SHA512 451a898cef0974bd1ec2967dfc6d121021cf3176fc3632f4fa4851875d0ea16bb8bebb221cc759f9c9c18b8d9682ca000204da0ad106b83e35ed5c1b6e050695 WHIRLPOOL ade67e691038337a83e12830506b22df46c0cd975d3f335f18ae1a45ffffbdc390b18f9af3902347dfb019bc02e5a08c555f9e81994105a95be71cc9ae808301
 MISC ChangeLog 2435 SHA256 26810ec8f60f84ae82db2eb984c5baaad1dd9e4076186e8828a69a94e77cda49 SHA512 06cb7f8b965bc7f68defd5c8aece4e42a7e36fd683d0ada55cc2763f51edf04bd0b088eead32bdba7c64a226d76adc19f173753309e90ec38655794fd2bcd55a WHIRLPOOL 7c47e10bb06b7816a5664b7b2ed7fd8616a19650f01c89eb36e09155392330fa221fbad95bf51ebe53fe98df889d210af40b06ed7b3f65437e608e1f64ed71fc
 MISC ChangeLog-2015 2764 SHA256 81556673523a44e3506ece515916d6817fb2da67e2bf66a1b9b73070e5936c5b SHA512 050bc1d6055e9d7658f685cf20c5896da296641ea801c4bde46e24ef66912b9066ee308f7121bc4136dafc528a18f43908c131575e1e3017dd435402b62b11ae WHIRLPOOL b2be033315bfbad356fe5812ca716838f543cb08e670985223dea36b81e85aec26080060b56dad43f8d666c60837f1bace8dd60239a9b98399fb9a8076eaf845
-MISC metadata.xml 799 SHA256 e11079a73d41829033ae30503ae71485a8019dfd84705627fd92f0aa1dfd03b6 SHA512 268cdde83c8ed3c9ca7729c8e0348e4fe18cff5bc5e56a492d87c73aaadf50a02afebbf80370a8ae5b570cc6f6d12ea385669747ddedc173506db778c2538533 WHIRLPOOL 593539e3423fdf49606d5ed76ae8f4fc855e0d56e7c7772dc4ac282d1483d95e62b3b43e5996375ad8bbfd0868dd7eacfb07c29eccf805b964f47d982e3ed1f3
+MISC metadata.xml 874 SHA256 cc1e76531c3680df302be7023c0deb7bb1ae0bffa84f5afe7f8123694d35ef2c SHA512 ae1e64b32f52880904150c58367e119313a679e49504e9ad19b3d1fbe59b9f6a008ff7319802197002102f1112a43ab17cb1c78b3babacae12e38c9a04e481c3 WHIRLPOOL d748166334074fb5c26719e2a768f561ccfa40d9a3a3e42aaa80e2365ee55ee2fcaa82e52bba7820d96eb148569022e0399ec83aee6521c66c7fcb54c9a4f3c2
diff --git a/sys-apps/pacman/files/pacman-5.0.2-CVE-2016-5434.patch b/sys-apps/pacman/files/pacman-5.0.2-CVE-2016-5434.patch
new file mode 100644
index 000000000000..c245cb78dcbc
--- /dev/null
+++ b/sys-apps/pacman/files/pacman-5.0.2-CVE-2016-5434.patch
@@ -0,0 +1,136 @@
+From bf84fd00d3ac1ae2a43dac57f7ef689ef2e8b8aa Mon Sep 17 00:00:00 2001
+From: Nils Freydank <holgersson@posteo.de>
+Date: Fri, 20 Oct 2017 22:30:33 +0200
+Subject: [PATCH] Fix CVE-2016-5434 (DoS/loop and out of boundary read)
+
+This is a rewrite of Tobias Stoeckmann’s patch from June 2016[1] using
+functions instead of macros. (Thanks to Tobias for explanations of his patch.)
+A short question on Freenode IRC showed that macros are generally discouraged
+and functions should be used.
+
+The patch introduces a static size_t length_check() in libalpm/signing.c.
+
+[1] Original patch:
+https://lists.archlinux.org/pipermail/pacman-dev/2016-June/021148.html
+CVE request (and assignment):
+http://seclists.org/oss-sec/2016/q2/526
+---
+ This patch is provided to upstream, but not merged (2017-10-25).
+
+ lib/libalpm/signing.c | 48 ++++++++++++++++++++++++++++++++++++++++++++----
+ 1 file changed, 44 insertions(+), 4 deletions(-)
+
+diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c
+index 95cb3280..51b11df6 100644
+--- a/lib/libalpm/signing.c
++++ b/lib/libalpm/signing.c
+@@ -986,6 +986,19 @@ int SYMEXPORT alpm_siglist_cleanup(alpm_siglist_t *siglist)
+ 	return 0;
+ }
+ 
++/* Check to avoid out of boundary reads */
++static size_t length_check(size_t length, size_t position, size_t a,
++		alpm_handle_t *handle, const char *identifier)
++{
++	if( a == 0 || length - position <= a) {
++		_alpm_log(handle, ALPM_LOG_ERROR,
++		_("%s: signature format error"), identifier);
++		return -1;
++	} else {
++		return 0;
++	}
++}
++
+ /**
+  * Extract the Issuer Key ID from a signature
+  * @param sig PGP signature
+@@ -1022,16 +1035,25 @@ int SYMEXPORT alpm_extract_keyid(alpm_handle_t *handle, const char *identifier,
+ 
+ 		switch(sig[pos] & 0x03) {
+ 			case 0:
++				if(length_check(len, pos, 2, handle, identifier) != 0) {
++					return -1;
++				}
+ 				blen = sig[pos + 1];
+ 				pos = pos + 2;
+ 				break;
+ 
+ 			case 1:
++				if(length_check(len, pos, 3, handle, identifier)) {
++					return -1;
++				}
+ 				blen = (sig[pos + 1] << 8) | sig[pos + 2];
+ 				pos = pos + 3;
+ 				break;
+ 
+ 			case 2:
++				if(length_check(len, pos, 5, handle, identifier)) {
++					return -1;
++				}
+ 				blen = (sig[pos + 1] << 24) | (sig[pos + 2] << 16) | (sig[pos + 3] << 8) | sig[pos + 4];
+ 				pos = pos + 5;
+ 				break;
+@@ -1059,7 +1081,16 @@ int SYMEXPORT alpm_extract_keyid(alpm_handle_t *handle, const char *identifier,
+ 
+ 		pos = pos + 4;
+ 
++		/* pos got changed above, so an explicit check is necessary
++		 * check for 2 as that catches another some lines down */
++		if(length_check(len, pos, 2, handle, identifier)) {
++			return -1;
++		}
+ 		hlen = (sig[pos] << 8) | sig[pos + 1];
++
++		if(length_check(len, pos, hlen + 2, handle, identifier)) {
++			return -1;
++		}
+ 		pos = pos + hlen + 2;
+ 
+ 		ulen = (sig[pos] << 8) | sig[pos + 1];
+@@ -1072,30 +1103,39 @@ int SYMEXPORT alpm_extract_keyid(alpm_handle_t *handle, const char *identifier,
+ 				slen = sig[spos];
+ 				spos = spos + 1;
+ 			} else if(sig[spos] < 255) {
++				if(length_check(pos + ulen, spos, 2, handle, identifier)){
++					return -1;
++				}
+ 				slen = (sig[spos] << 8) | sig[spos + 1];
+ 				spos = spos + 2;
+ 			} else {
++				/* check for pos and spos, as spos is still pos */
++				if(length_check(len, pos, 5, handle, identifier)) {
++					return -1;
++				}
+ 				slen = (sig[spos + 1] << 24) | (sig[spos + 2] << 16) | (sig[spos + 3] << 8) | sig[spos + 4];
+ 				spos = spos + 5;
+ 			}
+-
+ 			if(sig[spos] == 16) {
+ 				/* issuer key ID */
+ 				char key[17];
+ 				size_t i;
++				if(length_check(pos + ulen, spos, 8, handle, identifier)) {
++					return -1;
++				}
+ 				for (i = 0; i < 8; i++) {
+ 					sprintf(&key[i * 2], "%02X", sig[spos + i + 1]);
+ 				}
+ 				*keys = alpm_list_add(*keys, strdup(key));
+ 				break;
+ 			}
+-
++			if(length_check(pos + ulen + 1, spos, slen, handle, identifier)) {
++				return -1;
++			}
+ 			spos = spos + slen;
+ 		}
+-
+ 		pos = pos + (blen - hlen - 8);
+ 	}
+-
+ 	return 0;
+ }
+ 
+-- 
+2.14.2
+
diff --git a/sys-apps/pacman/metadata.xml b/sys-apps/pacman/metadata.xml
index 24ba8965c722..2eb4eff00bb6 100644
--- a/sys-apps/pacman/metadata.xml
+++ b/sys-apps/pacman/metadata.xml
@@ -14,6 +14,9 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<slots>
+		<subslots>Reflect major ABI of libalpm.so.</subslots>
+	</slots>
 	<use>
 		<flag name="doc">Install extended documentation using <pkg>app-doc/doxygen</pkg>. (Man pages are included by default.)</flag>
 		<flag name="gpg">Enable GPG signature verification using <pkg>app-crypt/gpgme</pkg></flag>
diff --git a/sys-apps/pacman/pacman-5.0.2-r1.ebuild b/sys-apps/pacman/pacman-5.0.2-r1.ebuild
new file mode 100644
index 000000000000..f60a609779c2
--- /dev/null
+++ b/sys-apps/pacman/pacman-5.0.2-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools
+
+DESCRIPTION="Archlinux's binary package manager"
+HOMEPAGE="https://archlinux.org/pacman/"
+
+PATCHES=()
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.archlinux.org/pacman.git"
+else
+	SRC_URI="https://sources.archlinux.org/other/pacman/${P}.tar.gz"
+	# Do *not* re-add ~x86!
+	# https://www.archlinux.org/news/phasing-out-i686-support/
+	KEYWORDS="~amd64"
+
+	PATCHES+=( "${FILESDIR}"/${PN}-5.0.2-CVE-2016-5434.patch )
+fi
+
+LICENSE="GPL-2"
+SLOT="0/10"
+
+IUSE="curl debug doc +gpg test"
+COMMON_DEPEND="app-arch/libarchive:=[lzma]
+	gpg? ( >=app-crypt/gpgme-1.4.0:= )
+	dev-libs/openssl:0=
+	curl? ( net-misc/curl )
+	virtual/libiconv
+	virtual/libintl"
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	doc? ( app-doc/doxygen )
+	test? ( sys-apps/fakeroot
+	sys-apps/fakechroot )"
+
+# workaround until tests are fixed/sorted out
+RESTRICT="test"
+
+src_prepare() {
+	# Remove a line that adds "-Werror" in ./configure when
+	# "--enable-debug" is passed:
+	sed -i -e '/-Werror/d' configure.ac || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir=/var
+		--disable-git-version
+		--with-openssl
+		# Help protect user from shooting his/her Gentoo installation
+		# in its foot.
+		--with-root-dir="${EPREFIX}/var/chroot/archlinux"
+		$(use_enable debug)
+		# full doc with doxygen
+		$(use_enable doc doxygen)
+		$(use_with curl libcurl)
+		$(use_with gpg gpgme)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	emake -C contrib
+}
+
+src_install() {
+	dodir /etc/pacman.d/
+	# contributed parts, i.e. not pacman itself, but useful helpers and some templates and basic docs
+	dobin "${S}"/contrib/{bacman,checkupdates,pac{cache,diff,list,log-pkglist,scripts,search},rankmirrors,updpkgsums}
+	newdoc "${S}"/contrib/README contrib-README
+	dodoc "${S}"/contrib/PKGBUILD.vim
+	# create /var/chroot/archlinux
+	# see bug #631754
+	dodir /var/chroot/archlinux
+
+	default
+	# avoid creating stuff inside /var/cache/
+	# see bug #633742 for more information
+	rm -r "${D}"/var/cache/pacman
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "The default root dir was set to ${EPREFIX}/var/chroot/archlinux"
+	einfo "to avoid breaking Gentoo systems due to oscitancy."
+	einfo "If you prefer another directory, take a look at"
+	einfo "pacman’s parameter -r|--root)."
+	einfo ""
+	einfo "You will need to setup at least one mirror in /etc/pacman.d/mirrorlist."
+	einfo "Please generate it manually according to the Archlinux documentation:"
+	einfo "https://wiki.archlinux.org/index.php/Mirror"
+	einfo ""
+	ewarn "Archlinux is dropping support for x86 (i686 called there) entirely"
+	ewarn "in Nov 2017. Please keep this in mind when setting up new systems."
+	ewarn "For more details see"
+	ewarn "https://www.archlinux.org/news/phasing-out-i686-support"
+	einfo ""
+}
diff --git a/sys-apps/pacman/pacman-5.0.2.ebuild b/sys-apps/pacman/pacman-5.0.2.ebuild
deleted file mode 100644
index 2cea26f9fc53..000000000000
--- a/sys-apps/pacman/pacman-5.0.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-
-DESCRIPTION="Archlinux's binary package manager"
-HOMEPAGE="https://archlinux.org/pacman/"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.archlinux.org/pacman.git"
-else
-	SRC_URI="https://sources.archlinux.org/other/pacman/${P}.tar.gz"
-	# Do *not* re-add ~x86!
-	# https://www.archlinux.org/news/phasing-out-i686-support/
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="curl debug doc +gpg"
-COMMON_DEPEND="app-arch/libarchive:=[lzma]
-	gpg? ( >=app-crypt/gpgme-1.4.0:= )
-	dev-libs/openssl:0=
-	curl? ( net-misc/curl )
-	virtual/libiconv
-	virtual/libintl"
-RDEPEND="${COMMON_DEPEND}"
-# create manpages *everytime*
-DEPEND="${COMMON_DEPEND}
-	app-text/asciidoc
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	# Remove a line that adds -Werror in ./configure when --enable-debug
-	# is passed:
-	sed -i -e '/-Werror/d' configure.ac || die
-
-	default
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir=/var
-		--disable-git-version
-		--with-openssl
-		# Help protect user from shooting his/her Gentoo installation
-		# in its foot.
-		--with-root-dir="${EPREFIX}/var/chroot/archlinux"
-		$(use_enable debug)
-		# build always manpages
-		--with-doc
-		# full doc with doxygen
-		$(use_enable doc doxygen)
-		$(use_with curl libcurl)
-		$(use_with gpg gpgme)
-	)
-	econf "${myeconfargs[@]}"
-}
-src_install() {
-	dodir /etc/pacman.d/
-	default
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "The default root dir was set to ${EPREFIX}/var/chroot/archlinux"
-	einfo "to avoid breaking Gentoo systems due to oscitancy."
-	einfo "You need to create this path by yourself (or choose another via"
-	einfo "pacman’s parameter -r|--root)."
-	einfo ""
-	einfo ""
-	einfo "You will need to setup at least one mirror in /etc/pacman.d/mirrorlist."
-	einfo "Please generate it manually according to the Archlinux documentation:"
-	einfo "https://wiki.archlinux.org/index.php/Mirror"
-	einfo ""
-	einfo ""
-	einfo "Archlinux is dropping support for x86 (i686 called there) entirely"
-	einfo "in Nov 2017. Keep this in mind when setting up new systems."
-	einfo "For more details see"
-	einfo "https://www.archlinux.org/news/phasing-out-i686-support"
-	einfo ""
-}
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index eb4a39b33101..8ebc6925994e 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -6,7 +6,7 @@ DIST pcsc-lite-1.8.21.tar.bz2 750879 SHA256 fe3365eb7d4ce0fe891e2b6d6248351c2874
 DIST pcsc-lite-1.8.22.tar.bz2 751724 SHA256 6a358f61ed3b66a7f6e1f4e794a94c7be4c81b7a58ec360c33791e8d7d9bd405 SHA512 762eccf6a25040653f563b93bf11262ddc015323d06d759a3472ba80af0489804410ba17c7e5330ccd4b5accc8b7314c80b5e99da278561d3818d8c381e6a025 WHIRLPOOL 39c7b6217fe75da42d062a2618cdb749b78c6a1dd04f60a92c45e974d551782ffa621f78198c600b350da9c7c30666a7e92409b7248b3642bc922f8ab9014036
 EBUILD pcsc-lite-1.8.20.ebuild 3193 SHA256 ec7ef345b47bdd7f440c621daa4cb3076cab81bc560409391abe26f5bedcffbe SHA512 172634822b9c74bdfc515135b15d883566692f1ecab16f0c93a0b8eccc254d9c38d87b8b7d3647d0d60085cf39952753a442d1993f08f7e72a8c5d83e30358ca WHIRLPOOL b5a8599e9b2f6358c4bf7150e75d07aed6f88afa176c458a871b6f71e591defba5464ae6cf7797127cd5a156db340c01c3080201e635e5d51d315ddb3d4160c6
 EBUILD pcsc-lite-1.8.21.ebuild 3218 SHA256 5854c05ca9764abbfd265e89734e0e582170ad9439354f8f8d15a2626724f0f2 SHA512 e971f52ae70d2b66e237ab17e1cc5c8b6d9ec2ab1922a7ceb9b5cc125889eaa9dd4a3592feac0d02d43355d6954546cc8efaa567b3e22de908b044e73ec43476 WHIRLPOOL b2500580cdae75c1fe083d3e9790c52a8b00231bc70532dd3e90678f3a85631d8f618c41a3c5c57ce9fc0b3ce3f3b3765bdd66c1312f38c62262b471d84dd365
-EBUILD pcsc-lite-1.8.22.ebuild 3220 SHA256 6f53b829fa73f5899037fc6d3c2d77a6f27916ea28613e8fe890810ba1dae6ab SHA512 3fac370fc7cecf5b1781e25d95b93ac258277e7c6c972e29bac48ef0546397f8b88cc3d4fca3c8ffa99cf2c448af86e9bb8fee4cb31e87f8f7e8105b123c989e WHIRLPOOL 755aae71dfa7c8619923f1bc02cf0768d151b08731eb10cf0b0857ef52479458fe6694cddc4bf0aca085b745e36f092b931c7cc74dda38e21e782f06d43f7468
+EBUILD pcsc-lite-1.8.22.ebuild 3219 SHA256 371f651f824539155c756526a2ba3d8d44d720b96bbc2cd54e679a05298befe9 SHA512 f85a053a8f115302e45ae8764e1cf0af26cd37b3bd2f987a9e90bc4573caca2b60d3c5f10bd8c5d9c53fa99e41a9918a679e325dac38ef00f071363523dadd6c WHIRLPOOL 43a403039055ffb5dba34dbff2b84e43fdaf6a580374bbea53fb9750f2d0188afe3c465491af78cc546d10f7d51b69fa0a3df0eb36b3563a5fe479148db1f4c1
 MISC ChangeLog 6395 SHA256 912a7140d0708d614b80b869e94aa569a62f237bd853a61c9fd71b1359edab89 SHA512 bb4df50e966384eb04788492279c3424d7d2e8694cae1f668ee05d25b7b6dd1ebf01c598ba38781d3f17942a460118a17f1e84e8ba8fc83b1f13715a4a5d3fc2 WHIRLPOOL 9af2a40a4c521ff040b545a8911690ef485efe0934784e58693742ae411f93270d7c7e1c64ca4a5863f5ca9746c0458e9edde9e5d28f759e80143991ec65c5a4
 MISC ChangeLog-2015 28207 SHA256 b31dab1f7a1c1bdef303428db1a473edd20ae2bff480e8e89c3d997eec0db2f0 SHA512 a78a50e69f87f99b32147530d00d3a3193a6ece444aaf6cec6843e0cd3c47a2185e2d34f0bb582f9a94bf44f64d607e59d80f5edf7e4d28d84e3d54969f7863a WHIRLPOOL 0219a49e792f088937cd8208677cec68b9c532ec388e3af20ba712e6ce966723008e2237e10f9e1b88cf0f9a962de38e804656db146ff51c80233795abbeb93e
 MISC metadata.xml 1077 SHA256 c2017a8d4069341862246712582099eff835dba057d0bef24d5623f4af1039c4 SHA512 4abc19855a868236dfdcfa6d42fcb901fdf52796e08b589a1413c78b931aee74fd482121ff67da632c2cf2e1ba018ff02f1122f1dac5c2185046f98952efd838 WHIRLPOOL fe32dbc636803d126b46ac2ed16429da44093f773ec0c8f8939d5efe3b9126a2c6bda01ab43acc4bc06edb95d048898ff07310a2bda0f15082525c9a0ec848a4
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild
index c16ae96fdf12..9d136110c54b 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 # upstream.
 LICENSE="BSD ISC MIT GPL-3+ GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # This is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index b69ab41ab8f2..a8b558831e2b 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,10 +1,10 @@
 AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5
-DIST portage-2.3.11.tar.bz2 940732 SHA256 f2596fc8e5eaaaab19be88c5c0a92d9f304eddb14ebe1230ab6f8d841ae90720 SHA512 16047fae060eb400e0fd01ca4966d69c0413e90659b33e4511b34464a24e9beb510c4c785af713921240e893c3031d3c3c3f2332eb175a21bb34b414962058fd WHIRLPOOL b0d357e626710c3574dde9228c68d604eb70843d083917d761a0c55680702da96d2157566e04d7f7c6c900d8120909d1faa00e6ff2a8fe970d53da05288ae0ad
 DIST portage-2.3.12.tar.bz2 944929 SHA256 4a6b6c1d038131d141b932b1ad93768a7823acd0704093c6c1e5adb9f913ba1d SHA512 39f6d938e167a96b338dc85191bfc25d6db2328014f13386dd2552b9a3c36308b9b4d444dcd3342e7f6761e26d97fc0b3e2c8a9092ef7aa863d55c26bdccfd3a WHIRLPOOL 34cc7567dfe4913129a451a8e8597c48382c6c423ec1a008db1fc489f5da99d5cf371ffa48b8449d799aa98e3f0dba98f7c8b55a4b8744fdb857f914448b6f5c
+DIST portage-2.3.13.tar.bz2 945477 SHA256 f3ed1445cf2bbfc6c5986873aff055e4caa3b695f37e033930ad2533bdea8d24 SHA512 71d9ea6c9a889572f60e7e501e9f8739db588cffd98a431303906eb90c1f7bb85c55f6779cbfb921630149d1b3174539fe2357fbeffbbe9857998907e3215ad3 WHIRLPOOL af9140e46d7e94994b276d93389c4953de77c77e9bf132c20b85bfdd477aaaeef2bb05293e94058158cf7800711ae7d1ff694d6ec9fd5e940849fd538b86c501
 DIST portage-2.3.6.tar.bz2 943085 SHA256 2f57545fcb142a4b23c2052c523d3d858754b232be21455ee6c6cd3ff0903cc2 SHA512 5bcfb678c1ea0cd97a983ee7520c9ecabd07d5bb0fd01c70b74fd7b6ce478f4a109aac84d40b82426719ca7c9ee6aed3affb3b9754045e62b4c664ae113cf055 WHIRLPOOL d0258c579597690e8bf2cc2a3ecc36d543e67a728c302a9b16ae361086023a7e059ac1a9e2e64f026b7d975d6b619d3b981062227042098ed3afc1b86658b636
 DIST portage-2.3.8.tar.bz2 938062 SHA256 19b73658dca848d215c5527d1d020c8106352007a84d7675e5efd0a7b9b48a8a SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8 WHIRLPOOL 0c576bbd8aaf8b27fa1746c863ac02b2a5f361d9011d17250ffbe4b830a8a6bf10a0aee48b5181a8aa6c55d8ad81ad411195da2a6253e9b324d3c7397053fe29
-EBUILD portage-2.3.11.ebuild 8216 SHA256 4396a5edc8391d04c412e20694e71311dc34a288ab1dd67b1455aa29524f8fde SHA512 8f5e923a644abc5cb704ba3cc0ab54c8dc254cb77e3f9fab207d40b6aa80dcffb2e6aedeaab649108a744ebd1d88c827cde81fa131e3e94360db921fcaf853f9 WHIRLPOOL a39d650d8fdba9181c1e1220bf9868467e31360e474ceca40f0548eebb1bd3eba088203fb86f62c5a674ca8f532e9180d916ed707cf0833623f74770d81faaa7
 EBUILD portage-2.3.12.ebuild 8216 SHA256 4396a5edc8391d04c412e20694e71311dc34a288ab1dd67b1455aa29524f8fde SHA512 8f5e923a644abc5cb704ba3cc0ab54c8dc254cb77e3f9fab207d40b6aa80dcffb2e6aedeaab649108a744ebd1d88c827cde81fa131e3e94360db921fcaf853f9 WHIRLPOOL a39d650d8fdba9181c1e1220bf9868467e31360e474ceca40f0548eebb1bd3eba088203fb86f62c5a674ca8f532e9180d916ed707cf0833623f74770d81faaa7
+EBUILD portage-2.3.13.ebuild 8216 SHA256 4396a5edc8391d04c412e20694e71311dc34a288ab1dd67b1455aa29524f8fde SHA512 8f5e923a644abc5cb704ba3cc0ab54c8dc254cb77e3f9fab207d40b6aa80dcffb2e6aedeaab649108a744ebd1d88c827cde81fa131e3e94360db921fcaf853f9 WHIRLPOOL a39d650d8fdba9181c1e1220bf9868467e31360e474ceca40f0548eebb1bd3eba088203fb86f62c5a674ca8f532e9180d916ed707cf0833623f74770d81faaa7
 EBUILD portage-2.3.6.ebuild 8661 SHA256 9590a689915eea31ffc5dd347154719d70cfb4b000a60e0f6e6294fe0c3e1df7 SHA512 53301757289cc37690020ac7b5379d026ff1e87f9d558c913eae213d0f33b75261045616c9259fe28684aa1031c27d4f58a52438e67eb91a97d186a80ad298a4 WHIRLPOOL c70770b2e9ac8b9af931d9f9918af82ac20eda198a33d9cc19c5d457701fe09c3cd5d45fb756457b05209cc0594c2b0b4efe3d544e1966d759c6a27fcf5b0743
 EBUILD portage-2.3.8.ebuild 8207 SHA256 dd61d45fccf60247d105993e2c73fb16a3ab59322add5701b636361b035ce6ec SHA512 24985286ffe9d4adc99aa65b26b4a15784b7edc84187a3a85b22751854f4845ea00573493a949f5aa6c3f270e4b52138a246006b71c9e6cc04ea402b820aee48 WHIRLPOOL e4ae75b7b4ee0ecf71328dcaebcfc4bb440e3c700156c2a17db3455b54066241285e8c625a5e2a2167c0d8ef31ec855d09219ab7cae1f5285057e95a1bb77165
 EBUILD portage-9999.ebuild 7697 SHA256 c7d91c34e7fb25283f6ac634a00686273fd3f286ecfb9fc1ab3bc685ae8fd9c4 SHA512 6b8342034752512df0345d386f67c025b0ba15439ae5758783b16973d16b3b3b4d866abfb65bac2e26424e270294bebe26e43f12539ef141891b567dc0f000ce WHIRLPOOL 0b2b3f122d57a5c9d3dd63ea09c7a7bd05e1eaf298cd5018d400543cd825469e108fdd981c06518d24a37f7a339195fb01b04480143c0d9f93cce18093119c42
diff --git a/sys-apps/portage/portage-2.3.11.ebuild b/sys-apps/portage/portage-2.3.13.ebuild
index af287ccb8752..af287ccb8752 100644
--- a/sys-apps/portage/portage-2.3.11.ebuild
+++ b/sys-apps/portage/portage-2.3.13.ebuild
diff --git a/sys-apps/ripgrep/Manifest b/sys-apps/ripgrep/Manifest
index 8275f66fe84e..28174b1606fa 100644
--- a/sys-apps/ripgrep/Manifest
+++ b/sys-apps/ripgrep/Manifest
@@ -1,31 +1,45 @@
 DIST aho-corasick-0.6.3.crate 24963 SHA256 500909c4f87a9e52355b26626d890833e9e1d53ac566db76c36faa984b889699 SHA512 4d0d55d8a6657fe13009d66728b7417926325dd9ca4f7ad7cd5d40e59cf0a55b906cd109d724a0b385ee988526535fc64a467ded171419e452c5a8c90196ae45 WHIRLPOOL e29e10afbf4dfbd1c36fe15af475107116e83c4e85943ca48a1cf90def2556045fd31264b59eb2110ad0d2e8c7ed5fe7594ac92a8fc3328a25c9be90f4173b89
 DIST ansi_term-0.9.0.crate 11718 SHA256 23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6 SHA512 4b5297d80f2a7fa840aeb1c31e7b893b33abcc7ce7f6f54371f6d7fc8e2915b43b5e3be3baab32b0821e174d8f7b58961029569a4f9e59b8a46c05f24ecaf04b WHIRLPOOL e0287a6f23e41131613da054def04c53896a4ac0bb80bc315eead5da99a5355f917cfd9babe05f4e3c8416c1ba33dc271bb1ad68ffc3b6e0cd5cdaba41f015da
 DIST atty-0.2.2.crate 5124 SHA256 d912da0db7fa85514874458ca3651fe2cddace8d0b0505571dbdcd41ab490159 SHA512 6e6e2cede7f280a53a61c78126783ec0338c13a8e9bbabb91d4b6fc43aacc56a4f7e86556210029595acf18e444121998101992b40e35a64cce884ec08247d0a WHIRLPOOL 9fae4158651f25bb4b32d0ca31e72fc8c01bb7afca0d703770af124ab9035fa52e700e3a74a4698bf8d95ff65de9adec9a5933b82798ee9cdc06d11dc86ffab4
+DIST atty-0.2.3.crate 5486 SHA256 21e50800ec991574876040fff8ee46b136a53e985286fbe6a3bdfe6421b78860 SHA512 9c944334333ca59d28588e164d2a68750eaf889dcc6b28bc49fe9a7990e0b1694d302a685142866362b7b97ef3f36daa410b59d6222e99cf6f096836850794cb WHIRLPOOL fa0b827f4b83e158ee868043803f27f5235bdaad8aacb0074bee8549b100c5319738d2f090ca77fe2b525792d5962d25c0a28da2b06dc63fdd0309b47baf386a
 DIST bitflags-0.9.1.crate 12406 SHA256 4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5 SHA512 3c106186aa8b5b8d0fba377818618e6428af38f60e4f707873142b44cb6f64d1d7f347840c8bfba084ff569ac8c57d87f2288c4a1d79e282bc02544d69f976c0 WHIRLPOOL 4d6389fcdbd28cfddebc668e1f6fe0b2d34b77ad0b43abf4530179417498b44f8dddfcb0d19dcab84042715e000f9eb9c6f2af169679b74dc6c41dec26f9193b
 DIST bytecount-0.1.7.crate 10121 SHA256 4bbeb7c30341fce29f6078b4bdf876ea4779600866e98f5b2d203a534f195050 SHA512 2482f06b62699251c70f45a67c29efa3cfce74568d261105ab14134853396dd6ee9a35ba29dd28e3b8dab4f1398f55708c4f648590330c8aea753ab27cb59c3c WHIRLPOOL 5bf5378548a0e2a86dc70ca55806d4411ebf2ca846ba2cf42cc155f9daf3526bf07f1910310607e9f35c5f495632c199af41614839335a07990f1e7d271605c5
 DIST cfg-if-0.1.2.crate 6668 SHA256 d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de SHA512 ed6732d8ef2c99d99861f5dcfec3bcd2d1b62dcf6e8e4e88ca25148b5566f86418270dbbe9a7d2fae62a8320d432c5e0474059fa25a11c0f66787084e36f36aa WHIRLPOOL 4b5e8a97b7dde903545e6e29e333ee7fd06435621cc6de5336974bc648e4c21da71e0a8c0b13235bc52577bd9dc230f46bb8008bf026b67f9e01f250eb12925d
 DIST clap-2.26.0.crate 180834 SHA256 2267a8fdd4dce6956ba6649e130f62fb279026e5e84b92aa939ac8f85ce3f9f0 SHA512 b1a610e889b21f8f23aa5f7d40ee50cc5721201d661feca05952b792274aa6dc3a35c54e8aa29cba1f6502596864303fdee881b6794dedb59cc9fd90355498b8 WHIRLPOOL fc2860f693743cd48403f7225afbdac2dda4ee6320db8112b965f302953fd9d2291b088462f3438797d50ccebdf1fc67fc2bd4c4eef39fe9ca930403c2121094
+DIST clap-2.26.2.crate 182509 SHA256 3451e409013178663435d6f15fdb212f14ee4424a3d74f979d081d0a66b6f1f2 SHA512 15745452263c8b39fed61f12c5f36413a4064f726262bd4cd432baa873d2c820b702d2bbff645e65a0c2fb8e054b6f0a51b0047a21c40749c9c0f631003959ea WHIRLPOOL ba46796734507fe1ad2b14ded5c034a4c817c943c9921b4c60e57cfe4aabc9dfd6afb07210bb9c28b13b45a265e48f0b31abeced83e6787b9c1e8514dde56b5b
 DIST crossbeam-0.2.10.crate 32993 SHA256 0c5ea215664ca264da8a9d9c3be80d2eaf30923c259d03e870388eb927508f97 SHA512 cdefcda7626c08ca59bdf5581e0e8d3e6367081089cc32dad6e84b5f643c7cbc5b08ce47034dd925fe2f5e2dfcfd18afb51fba511265ee3598fc1844838948f2 WHIRLPOOL 764f0a48c300a587ea56b5f0f7f55d40d8330d0148cd309599b3794d8c28399531b52641a58cd65eb9fb0107ede1a2e7f119c562d4781dee3a8c360b0a5af73e
 DIST encoding_rs-0.6.11.crate 1220572 SHA256 e00a1b1e95eb46988805ceee6f34cd95c46a6753e290cb3ff0486931989d4a4c SHA512 5409fc1d6b9af953ffb246a8c119e9aa0e03ce6c3f0d6ce3606340f789e9195f376b76e724f08fc5b9975c370abafe8cfd591d55ff5fa05375654d5ff2fa6954 WHIRLPOOL 7ad862e648b9d88ae2c7a92159111b21bc61cf97371d4268038161f118981a9407c5fe75d0d801b72900fc88d94f40b0b58d647c767fd2485f752fe36abe4889
+DIST encoding_rs-0.7.1.crate 1220716 SHA256 f5215aabf22b83153be3ee44dfe3f940214541b2ce13d419c55e7a115c8c51a9 SHA512 272e4b5a5d2dd091bf33f53baca2e2afe2b9b3d77325aa6fcf27bbef5bd8f7ef5a47a443c6633fa6fb4793f990d1fb75f0c02f2be6f2e3d385bdf546b2c28a44 WHIRLPOOL 0c8377ffed75c1e0ef6b2e7395d8d208cf0a48825bb4b084700f9d2ecbe9431e1958d57d1de8a8f64b01ee6c0e4f6b2be0b2863eacb4f8ecc902927b9b5ce43d
 DIST env_logger-0.4.3.crate 10891 SHA256 3ddf21e73e016298f5cb37d6ef8e8da8e39f91f9ec8b0df44b7deb16a9f8cd5b SHA512 ba2c10608f87804e528a2de28c236e780485413dbc3835b5bd9acf4a9c11d9c66665a310747b5d8a5ef7752186ab8a1ab5fbf6042657a3447380cb0869722246 WHIRLPOOL de63679ff8d1f02c57510020a459c8285ccb338f04dfa672a5cddc4718139fd4ddbc931237e81569209fbfa3eeaadc7b6f05649f58ef9018345bbdba2925d39b
 DIST fnv-1.0.5.crate 6295 SHA256 6cc484842f1e2884faf56f529f960cc12ad8c71ce96cc7abba0a067c98fee344 SHA512 a851ed060bf49224436acb1b5cc3125d30a3b527be9d7abd09f4170eee6243de8067b0bae5b136e62fdb8ee026e42a150109e90fcdf4cc4258f4de045d6069a8 WHIRLPOOL 31b0d787973ed378116947c8e30341a61e944be17866f17af241ce69f8385de3eb71c0fd1ea121aa1d19b1bcd67eb25b9cebb624ecb85c9d28e9bbf60156e9ac
 DIST fs2-0.4.2.crate 12815 SHA256 9ab76cfd2aaa59b7bf6688ad9ba15bbae64bff97f04ea02144cfd3443e5c2866 SHA512 626c5edadaf356ef9d13ac042ef517f317a376fefc76163e3dc7573eff024323a2ea0f9c1582db5d797eb2ea64f2d27e7877e774154f5d5dadc506c926a5dfef WHIRLPOOL 4a794853447219cf79fdf624a24f01b96169ff40be2389483e80bb1196238359c992703cb086c9be463f9b6bae170843515e01b710b9cb2e6118b00a56e48fae
 DIST kernel32-sys-0.2.2.crate 24537 SHA256 7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b WHIRLPOOL 036baa6611f13d76692a5c032e7e8e8b5a82e12bdf13d5a2cdcf4d33020b003c941331f0c8aa774e7f7cc7b36ad7403bb2cbdecb739d7645cff66aeecd59b09f
 DIST lazy_static-0.2.8.crate 9950 SHA256 3b37545ab726dd833ec6420aaba8231c5b320814b9029ad585555d2a03e94fbf SHA512 21c6ea68cb40d187a19e6d960fe0d7e4671101f26b304e4cbe6124f1a3d983fc41c44c4ce9e0d9b984783b7ba94ea873236e48178bdf56cfb8c0a8cfb9ebe368 WHIRLPOOL 8350c49ad994d3404462141310d4050cbdce3ef75cdacd9ab085bf9aaf20e6db5a4dde134273d6ab0ec618275a08acf5c2d154b206d7e3c21d6d8c4fbfad67b7
+DIST lazy_static-0.2.9.crate 11024 SHA256 c9e5e58fa1a4c3b915a561a78a22ee0cac6ab97dca2504428bc1cb074375f8d5 SHA512 10a75fc071f58fd9cf4d87619ff32e94b2d53da0f414e48319c4f15c1120c018ece698a396f538f60504c85f2faa5da3e48fd17c0fcfb8f575352c70f79c9ba2 WHIRLPOOL a22d5a5b91236936636e03ad5f81a475a879c590ece3c730631554d09ea2ab868951cbde7622ebebc72999c031e6d95e000b9ea08df315abce4c765b56b83ad2
 DIST libc-0.2.29.crate 182632 SHA256 8a014d9226c2cc402676fbe9ea2e15dd5222cd1dd57f576b5b283178c944a264 SHA512 3ebb02800c2376ee4b56bc56e3e26f478e6974e826fa7c54aa105416736d5bdd1dbc46dacdb2a0ceba7c536fdee136d21122c5c6288cf10c72033241473369d5 WHIRLPOOL 96cf617bdd61b5dc0a6628eba640403bc5437c779b1af96187aa3e2ecae6b6b447d4f16bcfe16d38b1f900f751a2983f67d2d2e2cdb59c9774effee5b8ab610b
+DIST libc-0.2.32.crate 228762 SHA256 56cce3130fd040c28df6f495c8492e5ec5808fb4c9093c310df02b0c8f030148 SHA512 73115eb14e2c90757c5075c86582bb463860f4016e5c3e9a0187b63ec93ee279da8f6146f2eef7914c72c1e6fbab3362dc9b789e2706d15d9b8a486e8311b088 WHIRLPOOL 4dfebe0b53a255628a353d8f25da53ed232586c4fb4799b48a64f3afcefaf0a6eccf415b919307df5cedda7a7a496a3ff9d4dd1e01a48f2a26b8d0440cfa88af
 DIST log-0.3.8.crate 17756 SHA256 880f77541efa6e5cc74e76910c9884d9859683118839d6a1dc3b11e63512565b SHA512 9fc80f2a72855a2b0260d6bfbdd55085791c67cb1896fd20da0a4d624125003cb0a10d9080c2fd7810ca67e41652a94177e1d091bdadeb5ea65c7c4acd666bd7 WHIRLPOOL ab37737279257682083d3335f1f05d84dea3dbbf624763f739b64da190da64458cc7a3741aa6c35ba4b71e1dad9c3fd1bc7df5334358bba3574faaf3a539688d
 DIST memchr-1.0.1.crate 8221 SHA256 1dbccc0e46f1ea47b9f17e6d67c5a96bd27030519c519c9c91327e31275a47b4 SHA512 70ee14fcba41cf896f563da48c8acc683f8cdf77c54cf9786d6a938bd14eca7bcc22c86d0d70a3cae56b2c2f9eeecad2950be759abf02fc98ef96a643af91be6 WHIRLPOOL aefc15c91d981becfdb7132c91f812430759408a6356aeb2ec3064956e55579895c59cd539ebfc4c76cd09bdf4fcaefa888f99e1ae98733e7f11654f5a8cac1e
+DIST memchr-1.0.2.crate 8639 SHA256 148fab2e51b4f1cfc66da2a7c32981d1d3c083a803978268bb11fe4b86925e7a SHA512 322b70bb881bcc2f9046f2daac5d939fd581370fee82b7e0500e27738d1d91e11c3f65fbf4576e0d987043cd08e5cd2b39a5ecf66d0ba7d95f48b6fee502bc24 WHIRLPOOL e8fc1d06a6b91e57378b8b8f7408fa26c6a352ea165465905414e6f7cd206944fd9377661cea3e58851aa7494b8fd3c531b20558953f0f621ba7b8e2e845a351
+DIST memchr-2.0.0.crate 9824 SHA256 e01e64d9017d18e7fc09d8e4fe0e28ff6931019e979fb8019319db7ca827f8a6 SHA512 de1ba67ccd342cd0b5cc493b5eb67e0e4ef90d0da0c1ec035ae5daaf778fc8d16eaa620d2cdf2100f45a3861640ea174eaeb9012571c90d47e2e925300665b46 WHIRLPOOL 84ac1aaabb64b240f0c7b3b05d78fd971de0f33285e749140a8ee57cdf23a760fabc1a141e0374e6a42ec6ca5dfdee7b1f02e79b5c34ee61086119c1f48e69c5
 DIST memmap-0.5.2.crate 14465 SHA256 46f3c7359028b31999287dae4e5047ddfe90a23b7dca2282ce759b491080c99b SHA512 c2ccb0afa6795831f1a032c4995d74daeb3bd739059146007b2524ec066517f39f7a2fcf56e69d17a5d091511011b9c0794a8e3ada7322dfc5f20a3d9f6c1b05 WHIRLPOOL 2aaa34634e7aa970eeebfedf3452e10317b72c351e220701d10c162dc4828771dc9bf7aa20a2a60f129267dcc782b7bfed43a500cda2ec469745458c47c83cf8
 DIST num_cpus-1.6.2.crate 8442 SHA256 aec53c34f2d0247c5ca5d32cca1478762f301740468ee9ee6dcb7a0dd7a0c584 SHA512 6136c6cd3e4a9c0f165f037e3e6af6502a3ffcdd0cc2d38635902f243124e5c6ccbd4db8e0bcb624e2ef824284145c0dd31c1cd5f708478334bc91f842c6050e WHIRLPOOL 9d32f8b35d52028ed36a56968875cadcace904c133a9c8e43ec7ab6a8525ef5fca23c6fbbe28387bf3981488b0d1e095a2a7a49c504736bafe8981b2bb3dc84a
+DIST num_cpus-1.7.0.crate 9626 SHA256 514f0d73e64be53ff320680ca671b64fe3fb91da01e1ae2ddc99eb51d453b20d SHA512 467500989a9b1fab4922c4db049a735a6fb7ac07cb92be2ce2bbf6e0c2ad4e3be5e1af33bdf2b9d160cab5ee5a4f292addea1180d5c2a940abd85f8e624d37e0 WHIRLPOOL 54fae5b988215433e3c7e359a4c69ea26cc9648cf04feff2d19d0f221cb72984799dac1d7681564a2dda378e28c6686725e23fc4cdcc77fac3495576344ef95b
+DIST redox_syscall-0.1.31.crate 13420 SHA256 8dde11f18c108289bef24469638a04dce49da56084f2d50618b226e47eb04509 SHA512 162655d5ba07857183a75bd7aaa3e190e8d1c2e80002319e5006a67c09a105fb3f3726fed1a116b7284712bf6a2bfde1607cb8b576251233c12b69582969a9f1 WHIRLPOOL 34fb166aa2bcfba58252b62a0fd081382e66668d16d3490a46410c9c82e022bd9851aeeec4b895f3260c168730f58e667b9cc68b9f0d85febc50881e35dda182
+DIST redox_termios-0.1.1.crate 3227 SHA256 7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76 SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981 WHIRLPOOL 65c2aef4a749f72bebd1fdff72f463fbafcf12fbcb3881d6bba8347071fa1cddf7a98b550d24e7636013889a2b7a188facd01990019aeb7aa5b651495e31b960
 DIST regex-0.2.2.crate 193403 SHA256 1731164734096285ec2a5ec7fea5248ae2f5485b3feeb0115af4fda2183b2d1b SHA512 208b671d06b260e4a130718a86ced88ee7f183bd056461bc6d44a15a22260a9ee05a014682bdb8bb7ff674fd33ac4748687c7ebd847578c7fecc8efbbb1993b3 WHIRLPOOL dafb61f75a55f02dd790201156f6dbf042eadf3b54c7e71732653e3dc8db4552f43d281d96a1bf196e7336b638cc97b5d24bb43f6223caf312cb7b0351be827e
 DIST regex-syntax-0.4.1.crate 121453 SHA256 ad890a5eef7953f55427c50575c680c42841653abd2b028b68cd223d157f62db SHA512 0c6996d0b8c16053f6e4e6324053f8b6924313827d9fec59e209852aed11a18902a51bdaa98b95ab706a4b65896a201549cda2972b54ac2e2a2c704b61690a0f WHIRLPOOL 841c41fe9ba5fdc733d93944252c4e7d07b448435bf620baefc8db28a9e3891e97f619361cb1c80adc00be5be8721bebe36b85881b68035040ab870a23615b62
 DIST ripgrep-0.6.0.tar.gz 470996 SHA256 102aff26fae9f455a8bcc435759d488f4944a34bee4b22b852f1cac3245b1b5e SHA512 219ec95598c080ddeee65233d1abf58320662ef28681a25cdf9fb63fd38bdb149c75471625545188dcd1deedf05fd58fc32e25cf39fd63943f765c57394ede23 WHIRLPOOL 0100649443d80973f102f23af115b4404756de8838eb4daad71a6ad32ff5242f8c2bfda359acc0818e5dd8394fd3409ac38653b21b15384bbb7d5f751c97703a
+DIST ripgrep-0.7.1.tar.gz 474458 SHA256 e010693637acebb409f3dba7caf59ef093d1894a33b14015041b8d43547665f5 SHA512 1d2c5b1085ebc6b2b0d1cd330583f8d09bae0789590ff3a8bbb7f79c36b106b9f4fb3c880a225fa4f8565cee55e38514db0e7751f1d14a76005ebfa7c7127e5f WHIRLPOOL 266358dda0037d1fab4c0924b1a2ed1d2086c28a8b8be6e9faaa889c589302e70c26067c8cb31780080f25e0fbf69b217161c5093af27f5cb5ddda3a1269cbe8
 DIST same-file-0.1.3.crate 7078 SHA256 d931a44fdaa43b8637009e7632a02adc4f2b2e0733c08caa4cf00e8da4a117a7 SHA512 2d3d03ab0dd4add93cd32e7ca43041d541bee41000fd8d98575a58cbd192fe4498234ab80baa3c4791de9f3d4214feae90f628fd655e3510ede61f757be3a82c WHIRLPOOL efd0b9caf419b8436d54895deca5ee3d7a5191a006051b975d65c0e3d8aea32f3ee866f4481d6a2a8d4ce9b5af7de4b11a295990dd1ca7a9889a255bff345525
+DIST same-file-1.0.0.crate 8746 SHA256 70a18720d745fb9ca6a041b37cb36d0b21066006b6cff8b5b360142d4b81fb60 SHA512 75dac7dfec4f3732410b1264d8394d20860c993ac5960888f9ed1acc5f730c16215311a5e13ddc5d4f126e8cbfd8e1c5510bdf6c0be8bedfed19cdf3394d6ffa WHIRLPOOL 3486e8bc5cfc7b5b792ac7113fedcea75533fe10c52ad956323b9d3b10bab1c7c3ef7703e42e7bea4079b7f0abcd68adee9576eac768dcb9021bc80f549c4fd7
 DIST simd-0.1.1.crate 39577 SHA256 63b5847c2d766ca7ce7227672850955802fabd779ba616aeabead4c2c3877023 SHA512 ed58383bbee3d0a5bc537629cdb242d5ae8ff46d4e8911df16e34a9fe9da693f1347b89f77614d1835391f57c27176824c46feb9733de89915ed4709217466f2 WHIRLPOOL 2177fdbfb33203350e55258cf94ddd0861314e720d43147039db5b7fcb3028caeeef71a4759ba8aef59c5b3cb72cfeb05f806be3e9c6ecd36f07ec42a43e513d
 DIST simd-0.2.0.crate 35102 SHA256 7a94d14a2ae1f1f110937de5fb69e494372560181c7e1739a097fcc2cee37ba0 SHA512 97538d8811d6627d5c8c32bb59783aaa906887fb320679144d50330e520e85bac7060d7d4e4e7074097ae8928aab66085500344bcd5c4dc8e195e339c7b4f2fb WHIRLPOOL 52adbf67f610bee4dfe4495d085f34aebeb5f87d3d7bf300c8c29bc38d92555f735fe04cc4930f6a6488eb3b89950da15627c7f654b05ab186afd5567f1d4179
 DIST strsim-0.6.0.crate 8500 SHA256 b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694 SHA512 43cbcf2cab7f91515f52f20719e8013cff23807ca79a9a69f1997ec1ba2eacf713d64c88e33f4c9ba852fb3dda4b87e943587ae4b6ff5bfbbb81deb6dbf76a97 WHIRLPOOL 5fa5b91b22ed2d5ba22da674568e5ea374fb05d722796030c3d5198aa42552f7bf47b51b54ea6d62b4e9bbcfd50bdc7ef450ac23e6e2e99dc00130b972b460ca
 DIST term_size-0.3.0.crate 9932 SHA256 e2b6b55df3198cc93372e85dd2ed817f0e38ce8cc0f22eb32391bfad9c4bf209 SHA512 a466470372c09a6152f1fdaa3d631395410f4db938d0ba1db1695d66bf1620177f4dab4a9aade47de1d48019712072bfc91630cf4c088c56a5775f4d27dded8c WHIRLPOOL 2156de368b592c3c6f5bbafe787a8163880d8a86e19fa8e1b8fa3c184534ae8e54333455cfe8acc6fbda2a08a90ca42a655dc6af60c62262178950106ee432ba
+DIST termion-1.5.1.crate 20659 SHA256 689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76 WHIRLPOOL c89d4c9278862c24fd203a72dc5d0e87773726031f4ecf68a22da745f6a5525f2f0e07198ce020015db482ba2aa3ff89b3314d46aea2454ceccd00f6cec11871
 DIST textwrap-0.7.0.crate 13341 SHA256 f728584ea33b0ad19318e20557cb0a39097751dbb07171419673502f848c7af6 SHA512 4829ecb3a0829f202c53a58ae063ff39f8f5a0a7c031ad30435b73751d5c1d3ef607e4b469e15479f980862e5cd2c947fcdb2e676963f8556a156cf4215f06d1 WHIRLPOOL 1320d3e81e5e5963080e3a796080bbbf37813017cbe179b14b864c880f311327b0aff65ad788dc3f61942eb42b4541f350803589cdacf9ccdb7b3107de75ac87
+DIST textwrap-0.8.0.crate 14903 SHA256 df8e08afc40ae3459e4838f303e465aa50d823df8d7f83ca88108f6d3afe7edd SHA512 1648a496cfebedbc6f81b150a2315a9ba588e5b10eab652c27e2d33ce265115aff9036bf3c263a656065c037e66e5a899462a6ff12b1b3a10ccea2fa0e3ba018 WHIRLPOOL 64534b92be4b1d533e57db1a9f712a30c8ac1db4f5588bf9c2090d64946bfd79ead318affd71128fd837e9a8161564713be7ea75c724abcf26e5949864fad8f3
 DIST thread_local-0.3.4.crate 11760 SHA256 1697c4b57aeeb7a536b647165a2825faddffb1d3bad386d507709bd51a90bb14 SHA512 51fc5e1f5046fafe794128e6655c3ed5fa54446d9db151abb5da6e2599b6fb03200746ff4e6adffb6b8a04d015966fd4860ea3eac50bc169ec04ba33978f849d WHIRLPOOL 27c100a56cc3b1b43225fc76de150ff9835e391ec778de6039aef7d97fd2d86b7bb3734258656d6549866d3a596af9da4c0ce77855db955e69fb4480f8208a03
 DIST unicode-segmentation-1.2.0.crate 67562 SHA256 a8083c594e02b8ae1654ae26f0ade5158b119bd88ad0e8227a5d8fcd72407946 SHA512 724fb05d4c02926a535a3380f0a718e5ca0b61c71173efccee6780e878b3e890f11e7941cd970c6c1763ac756f31fe338b0dba2ff31db2aad29670bd6e8b9bab WHIRLPOOL 5dd692641038299fcdb66311adca2b5ddf5ae3f23de4c9a6cde2ff05d4475290d3f5c9d524a5af6496ec98fb106561bc81311bd2b7c05babd6d71af99226829a
 DIST unicode-width-0.1.4.crate 15283 SHA256 bf3a113775714a22dcb774d8ea3655c53a32debae63a063acc00a91cc586245f SHA512 f06b243e533ab9c68d88ccd06a283dfff5fd13e9340cf11bfa74473fc9100bb704c34e7fb66919202a97e7d2ba2e7eed968eced02d557835a06e6a0166865ea3 WHIRLPOOL ddbb1fda0e2806a6e9d4c017b9c31acce44b97b3470c2992e424e105b801d7a5d44ac9a7e2b4f2e10c79c95cef0075c416f56db485b82095e0cc44e51f79897e
@@ -34,8 +48,10 @@ DIST utf8-ranges-1.0.0.crate 8599 SHA256 662fab6525a98beff2921d7f61a39e7d59e0b42
 DIST vec_map-0.8.0.crate 13742 SHA256 887b5b631c2ad01628bbbaa7dd4c869f80d3186688f8d0b6f58774fbe324988c SHA512 7ce0c05c0b410577b489adb4d35376bc2a55c6041ce50e011b78415e952b5fb7fcff89fdd00b95e086de742f26ff057e99e55585824bbc0482e0ac2134406520 WHIRLPOOL c8756c3aee87ddd37c2ed4bbe1bdaa27791cfdf59b613ac04b619139bde62f5da07830a9f92e71864e4dcc4498bcf5a77ba677f8ab507dc8cf55f4470b5c95e8
 DIST void-1.0.2.crate 2356 SHA256 6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1 WHIRLPOOL a1e8bf644e79ce0bfcccc2b05ea357400fe6cb61bcd4adb0360b109affb866ec305b30a11549aa35b765fd0f32420e7d5cc741cfccd3c2263c60f1cf7acc0136
 DIST walkdir-1.0.7.crate 17883 SHA256 bb08f9e670fab86099470b97cd2b252d6527f0b3cc1401acdb595ffc9dd288ff SHA512 d5752c39c055dcd163bd74db3495a16e1865fd32e3f0cd779455fb818e78106ee4bdf0cbbcd36331f860c5ca8de658f848988a47194c5b9e130f28a77c4576d3 WHIRLPOOL 6cb9a8ea4803cc7d4bdae8294d44faf53a99f02526ba41cc80ac4cc189308ddc34fd7fbce996039b236c1bb8984e9876e06c478c12f2c0458f1919be7400153c
+DIST walkdir-2.0.1.crate 21483 SHA256 40b6d201f4f8998a837196b6de9c73e35af14c992cbb92c4ab641d2c2dce52de SHA512 54ca4b7dd89569de8710af7ad06a631e5693ca7ddb368f1d893d544547de5e073f862324796b66849e46af9c8b0ad3fa98f81a381db8e2e394502a79be1aec7f WHIRLPOOL 1fe2c469a5e20bcbdc05949b334bd780025ed4be338ee365d7449c1cab70bd24a80ef93e5264a639cfbac8b3bd5d525a3d25d2c1a2eac741b51860ab131c267c
 DIST winapi-0.2.8.crate 455145 SHA256 167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe WHIRLPOOL 3dce71a6927320e3882ba60a24630a9ba8d123b73d8da6b9330e422580af9d9b0a96748d7368767e3712185877ddec6978b924d40428341c4de19b76ed375af4
 DIST winapi-build-0.1.1.crate 669 SHA256 2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77 WHIRLPOOL 036080513776fe806cc9dd68bbf5b797776b98ca9fdceaa4bd77c87c66d2e5bd0eec8b0e7f0100dab8f2ced754da058f67e651002c786b4992c2be416a5d52ff
 EBUILD ripgrep-0.6.0-r1.ebuild 1244 SHA256 e41516304780a342e06e5d5e4f876d893abc8a90f57725f7a1e9d195978e8f39 SHA512 1cf77e3b841efa4e00b522e4bb8daa02d490393d17c4d34b4a64ea3ae58804d9020d8cd7e5f272501ee2296d17d483dc8cf45fc4b9ffbc10cc6fa598b77064ba WHIRLPOOL bb97f8605cd9c529fca7f9d384e9059f63a3af66790b193abb0b4a733224ac4eadba0852a5d4d6e67b0af83558dc2cb9d6a9f70324628892468d87fb05af169b
+EBUILD ripgrep-0.7.1.ebuild 1284 SHA256 c8018bf608e9bb3525ee446dfac4ee122b0e6d5495995dbdcd14d72d470de551 SHA512 d0484855abfbaeab6f1167d2ec284847944702356200d11daef215a2a5f7791c2d74918f56eec541772f42fc7d1315c2c71afd9e9bdcd2e3e2b011bb5487cdc9 WHIRLPOOL 6d1eb5f47609a0362978184ac4c070eb47fac16b8037542b4d18524de31756b064ee60a5f3dd98d03fb1b2450492c4e5c35b5b97f533c175465078a7c611dc2b
 MISC ChangeLog 1216 SHA256 3d967bc66c95e23bf577cfabe17dbc4783cdbbeb1f8a4aefdb1c1d1ad8626cac SHA512 8767c09bb2cfd50f755b98b4a86cca864bcd9d99b2516995456141f20a755bd69ac4c9d3c0e2383232fd00b621d9303cbc0d84e4f8a1d878a43cce8d236bb1a4 WHIRLPOOL ec18b3e66ce8c8ce7a004b6ee568d7be178fd5d5bbc547d76d9b4fb345c164176d293f18702c1037cbba41077018d73bc695a8cd50c64a6992077f8889bd3f34
 MISC metadata.xml 339 SHA256 2bf4aa2d3198a58a12a261b549da995a74f5e765b19ced77c275923dc17125cd SHA512 4501066b64cc47d58915b452027ea603d319b0eae3d9bcd45642f16bcca3e5bbba3fc998fe8501ce63c4717ccf5f404392b98b54d53b93c648e8c8de116141ef WHIRLPOOL 8324e194fb3165cee2231ad3b3198d92e21f59506777cd87ad6cabe93150b33d76c49b41f23feb611c430fc34ca42f5379936675004dd57251d9a63a4406087f
diff --git a/sys-apps/ripgrep/ripgrep-0.7.1.ebuild b/sys-apps/ripgrep/ripgrep-0.7.1.ebuild
new file mode 100644
index 000000000000..5aba68b30836
--- /dev/null
+++ b/sys-apps/ripgrep/ripgrep-0.7.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CRATES="
+aho-corasick-0.6.3
+ansi_term-0.9.0
+atty-0.2.3
+bitflags-0.9.1
+bytecount-0.1.7
+cfg-if-0.1.2
+clap-2.26.2
+crossbeam-0.2.10
+encoding_rs-0.7.1
+env_logger-0.4.3
+fnv-1.0.5
+fs2-0.4.2
+kernel32-sys-0.2.2
+lazy_static-0.2.9
+libc-0.2.32
+log-0.3.8
+memchr-1.0.2
+memchr-2.0.0
+memmap-0.5.2
+num_cpus-1.7.0
+redox_syscall-0.1.31
+redox_termios-0.1.1
+regex-0.2.2
+regex-syntax-0.4.1
+same-file-1.0.0
+simd-0.1.1
+simd-0.2.0
+strsim-0.6.0
+term_size-0.3.0
+termion-1.5.1
+textwrap-0.8.0
+thread_local-0.3.4
+unicode-width-0.1.4
+unreachable-1.0.0
+utf8-ranges-1.0.0
+vec_map-0.8.0
+void-1.0.2
+walkdir-2.0.1
+winapi-0.2.8
+winapi-build-0.1.1
+"
+
+inherit cargo
+
+DESCRIPTION="a search tool that combines the usability of ag with the raw speed of grep"
+HOMEPAGE="https://github.com/BurntSushi/ripgrep"
+SRC_URI="https://github.com/BurntSushi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="|| ( MIT Unlicense )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/rust-1.17"
+
+src_test() {
+	cargo test || die "tests failed"
+}
+
+src_install() {
+	cargo_src_install
+
+	doman doc/rg.1
+	dodoc CHANGELOG.md README.md
+
+	insinto /usr/share/zsh/site-functions
+	doins complete/_rg
+}
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 1e8c6b4305af..3c0bb9c1d7f2 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -4,6 +4,7 @@ AUX rng-tools-5-man-fill-watermark.patch 765 SHA256 f286419c4b3fbbb67c9099ba99c9
 AUX rng-tools-5-man-rng-device.patch 398 SHA256 c2553914e0551e1a349b8dfb65cf02d3db66cda9e6aba5046340a7a4f8340f17 SHA512 cd4c0cbcc32f6ace0f05c0dca82461c2a676a986c000850a422c3b509d79f22ddb98732749e63a1d9ec6d90db1745b7a163a590ada61f0ebcdde07b160647d3f WHIRLPOOL 375aca63b539d4c64c5ee4c85f289b2029db2d9b38d07f001135034b725323e74d70b94e49c86722521ac846c438a0bf818ff62581deea5c3b828c4f6ab73924
 AUX rng-tools-6-fix-noctty.patch 2188 SHA256 7a1594cd968621c579efaa77a6257cef038e3d7ff53a5c5a04cd508a16c221d0 SHA512 dff3d3ef81e847d378ca45531e4eaa81f4028b2b08adc17c68bba108cb4604f3bf13daa8b0e46ccb8aec2626ff8fd983038544508f3117828cecfbb282762116 WHIRLPOOL 2893eaa2c37a91770e465344a0051cec645d1d725f903f5a3297bb359f1e24d6a3d102aa3bb76c76c42f521695c5293d90c9022ebacd44f99efab41444c0aef9
 AUX rngd-confd-4.1 562 SHA256 cdbd39f7446f12a9b78e87e9f135cfd0f6f364c4fa4ade0c96084b85c32afc38 SHA512 45e0e9cbe0180162f659bf05c15ee99fb8c1b80274cd8744384ba7f791b1c9a46a63e81eea665b4f492c13b7d5cc1fdb6e524a49a25af77f3791f527b31f688b WHIRLPOOL 87634cea70a1c8ffa7598cc8b0d93c79578433cc21b58bb13bc9144502b9502e2c4f151bcf282ad4ccef44a931f1be5d1e87ff7b9b6d07cfa0a4c288b4172ec3
+AUX rngd-initd-6 481 SHA256 b90b636d497185f1b281672de7659845326f3ba02a58c27943c9e1f956f59bff SHA512 d15b462aa333bd0d64fa827626fa953d30cadce861dfc070598218104f072ffad26d88531d48bd22b5d627dc4fe8560a2808cc9e2e27310dcd74a6efad8a9baf WHIRLPOOL 397c4caf72da627698bde2a37243f1f831828e9d53613877280e4f9775e7caff60cae2013b10fcdfaec338baa50846cc98778c8a9e9bf272d858499129fac692
 AUX rngd-initd-r1-4.1 494 SHA256 3ad9a52d86e54eb755923242b1314584d5c66ab55221f6063a16c23477957a25 SHA512 8bf9a0bd25bcc9c1cc4eacdf875077208ba0899c626a55e57f055cc93b62e23a427e0622859c5b4a31c3aebe550b180777528b43942a3efb2e2c0b4243c3c9c6 WHIRLPOOL 33365650149523b34c6ae38614038ffafd1393a1ec5c967d0e9f6b89557b84f8ebb45c76455844dd73fd0d3cb1768de69c6b9857c4b48015ce351bd61803a4d6
 AUX rngd.service 133 SHA256 a05b1075157d39302106221594e1640479fae5dee4595de09442901a3a2d1648 SHA512 51e9ea84b624cda8d3689d6a9a8d60da4a556aa9d2a1a04e698d9a1490717aa47172e152c93711f8d04be8a5b68b1dfd568a762bd8ee7219afb7cdfff15657d2 WHIRLPOOL 093b0cd19a147abd9fc10f366c2c5a167d31b839d755cf2e56f6ae35409b6eb764db0651858d20dc95b71fe1d90b4ca33bde88053c80e40665613d132357366a
 AUX test-for-argp.patch 1245 SHA256 56824e3d80c931c3f907486cd8bf7b5a3bcc20fa507f452a9c63286443c06756 SHA512 0fe4b37eb3d2e93ff9ce17aed8cfcaa29c7f04289ba692d10fd0f8ef6d9b1e5f64a5734a508aea548f13fd00217972a68bcbeaf6977e763087ad20c19d456ed6 WHIRLPOOL c515fc9a8adf6bd49a4a622c05881e9ad22b514634c25d4f894be96d46f67a886bdcc092cafa57521e17d53bba1f1a3995dc673c24292b0aca276792e575073b
@@ -11,8 +12,8 @@ DIST rng-tools-5.tar.gz 122182 SHA256 60a102b6603bbcce2da341470cad42eeaa9564a16b
 DIST rng-tools-6.1.tar.gz 29814 SHA256 6144818cd9c93008f72f14e2d23d8f717640d3f45afcea666a32b12bedd4dc03 SHA512 388593ffeef0b5f2770532629418cdf1b6421092ae9c5fe0a68d198a5cbd4ff733fbca8091d497e09620c61a9e8b982298fb064edfd05a0fc36fa49c22eef5c9 WHIRLPOOL 08185ebcb796daa25d4db69a2a46d2336c8db109ecfdd342a016fac6601e5feda09e4365431ec46284883b82fe1bbf4789588dfb2060bb4960233ffd8c8b929e
 DIST rng-tools-6.tar.gz 26024 SHA256 6d9c3f72824d1ea15dd2a80bfcf71f6a73c8843c6344f7f774a97a4ca7641b4c SHA512 2aea947c4dba5e8c4df33396957f7224b62200be0e3d10aac08c84155fa473a67df5f49e07a07b2cbea4dfd772d90c1b194e8fce3d8eea762463a7f4a16d6ce4 WHIRLPOOL 4e53c626288219a7cb9c94cf29d22878df5ad3298ca5ebedea46978e519d9b5b0ad94f765e217563105258f4b02b72b0033e551a7d37939ced9ca5d92f0a1048
 EBUILD rng-tools-5-r2.ebuild 1098 SHA256 a6e9a693947fdcff18969be0ea392e8171cab38be6367c6c30cda84f24137613 SHA512 b4a612e14a4e556c57c182a5e709bf497eb11c2b9ca850ca1dd32f94c313157d3273b02715eef907b570d5aaaa06e9786ce33f9085f83423d61fb5af4bbe1b52 WHIRLPOOL d27df6207498055f147981ff7b0f63c30fc1e0d458c8ab550829de00396b7772a5c50fa2d7f057764a35092ec3e30c45a79d5a48dfd94568bdc8e15dfceab603
-EBUILD rng-tools-6.1.ebuild 1227 SHA256 7029dc428b47d4d5e93a7cac1ce59efb599588623d49add2535884dc0b1aa0ac SHA512 5298ade15fe3d3e04ecc68e4a2353eef2c30fa052c16bb4bdbf0156ddeb2fe3869f30ff9a3b6eacd7357824f53d3d4397cbe84f14fe0440036cbb6377671f287 WHIRLPOOL a47c9903cfaf9706d84424d76bf523aa452eebc96a139451abf870678ad1e5b67c5b9b05ea9d6e700c0dc438c9caea2511d4fd0ebae13b994895c83a1cbfa37c
-EBUILD rng-tools-6.ebuild 1114 SHA256 b783fda920969b210d53a6b8d84f519ded1bfa5be641b2390a93732a15205f91 SHA512 e218c2147b5879418647e85103d7c0bd3f5fe3fcfd42855d64441c1228eb3a2caf462b2b4e553125e88374db64c94894497645421606853968ccbb4ddb2d5f38 WHIRLPOOL fa5a977e4949cdb582902703e3212d8feea462f27c344a5782287b4da1eeda4f58bca03ecb68345da9b5b94a34c62377867a257f60c1ed504601229b453e72d0
+EBUILD rng-tools-6-r1.ebuild 1109 SHA256 797c3f8a7637eb07eec07d935ebc3f87bb2ea6a17f8487851e326d99d58f2652 SHA512 dd9cecec2238e7fd8d1ea332e11f10dcd0fc8e4aa545fda6a4f3eae0807b273529ef40b5ebc76426b1feb5d9253ef37f2626d93a8a7e5380290d9944b0143e20 WHIRLPOOL c36db1975e5d39fb2037449194070012f9f0cf015f92737fe5589948c99db314ac5885d1ae7bd577b75aab68b0ee21e2a18d2de9dde294b357478ad44007a312
+EBUILD rng-tools-6.1-r1.ebuild 1222 SHA256 6700d0cd6ad213d75d275ea0a617fd48899894ee7eabfc6c0a2aa218b1c54dcc SHA512 c7f14868478183f9617bdada2c5b92bdbf87daf81c453cfc6cada445dd9ea437beaac8ddedd50452a6b802a63955eae3eb8516b14f680149ee69d6ddea9af3b3 WHIRLPOOL bed7b9cd14d2824766849698ebcfc9feaf85f5642a533fb4303d0355ecfb00e094381da88cae94b5f42c413c58dcbe1510d264c46051910a3bbb3c51d913d715
 MISC ChangeLog 8067 SHA256 a232bfd53ae71bba942c0065e502fa2087a6af4b14bc5664cb3177c9e0f4ae40 SHA512 b9143f297136c37d810755bb899b4353008d2982eff54d29de73f62a9790506468ba0034206877f894fe681effed2921bf9e8af54e771f46ef60d288955aecc5 WHIRLPOOL 5c62a5780931f8d50387a08076410aa815d6c7637260eec4f69b17a1ea6f51278d3d15786cefda3213527f47816f9dfaa2e296ed240bb6a543dcb70c0ecd2383
 MISC ChangeLog-2015 10419 SHA256 429b14666b303f77b8081e33cb4d2bc4da29c06af72895b37cf17ae3658381ce SHA512 9ef68cdfe956b4918d101ec0cfe3a69a9cf748b52326976edf234b58a48eb8c48fdb32b011fa8fe5e3d0cde8576b212b24d5b4003f87a4e4b327dc2cc0ff59ea WHIRLPOOL 525eb6a7d62820bda06d801c2721e2c38a9ca8af5d26d961c57a9d62c26a8dfec1ab08573f4237f3e6f4ee576de03d6d63a5514424011e773541f29c2b8e3915
 MISC metadata.xml 576 SHA256 d9a641541810a9e63447fa616d1e4d25163ad6b8937d35f962b9fc9add16613e SHA512 306d4b47230443cf82abd2c7e934b8fab73e695305a8981d3c011cbc2bbb193a87ae7a9c265a56c0454f4c0103f136211a4aabc2e35e030107b5ab2ac457c6e3 WHIRLPOOL ed537ec604e553367ad2354a787660d30c8a7ef116e94baeffe59bdf60d07199fd93994fced93a62ab08ee817a2befcc12f84f2b00bd304f9ad586f4aa9c9369
diff --git a/sys-apps/rng-tools/files/rngd-initd-6 b/sys-apps/rng-tools/files/rngd-initd-6
new file mode 100644
index 000000000000..c3b48bf22099
--- /dev/null
+++ b/sys-apps/rng-tools/files/rngd-initd-6
@@ -0,0 +1,16 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need localmount
+	after urandom
+	provide entropy
+}
+
+command=/usr/sbin/rngd
+pidfile="/var/run/${SVCNAME}.pid"
+command_args="--pid-file ${pidfile} --background --random-step ${STEP:-64} ${NO_TPM:+-x 1} \
+	${NO_DRNG:+-x 2} --fill-watermark ${WATERMARK} ${DEVICE:+--rng-device ${DEVICE}}"
+start_stop_daemon_args="--wait 1000"
+retry="SIGKILL/5000"
diff --git a/sys-apps/rng-tools/rng-tools-6-r1.ebuild b/sys-apps/rng-tools/rng-tools-6-r1.ebuild
new file mode 100644
index 000000000000..0dcc7e1fd35b
--- /dev/null
+++ b/sys-apps/rng-tools/rng-tools-6-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils autotools systemd toolchain-funcs
+
+DESCRIPTION="Daemon to use hardware random number generators"
+HOMEPAGE="https://github.com/nhorman/rng-tools"
+SRC_URI="https://github.com/nhorman/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="selinux"
+
+DEPEND="dev-libs/libgcrypt:0
+	dev-libs/libgpg-error"
+RDEPEND="${DEPEND}
+	sys-fs/sysfsutils
+	selinux? ( sec-policy/selinux-rngd )"
+
+S="${WORKDIR}/${PN}-${P}"
+
+PATCHES=(
+	"${FILESDIR}"/test-for-argp.patch
+	"${FILESDIR}"/${PN}-5-fix-textrels-on-PIC-x86.patch #469962
+	"${FILESDIR}"/${PN}-5-man-fill-watermark.patch #555094
+	"${FILESDIR}"/${PN}-6-fix-noctty.patch #556456
+)
+
+src_prepare() {
+	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
+	default
+	eautoreconf
+
+	sed -i '/^AR /d' Makefile.in || die
+	tc-export AR
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}"/rngd-initd-6 rngd
+	newconfd "${FILESDIR}"/rngd-confd-4.1 rngd
+	systemd_dounit "${FILESDIR}"/rngd.service
+}
diff --git a/sys-apps/rng-tools/rng-tools-6.1-r1.ebuild b/sys-apps/rng-tools/rng-tools-6.1-r1.ebuild
new file mode 100644
index 000000000000..2c149789b757
--- /dev/null
+++ b/sys-apps/rng-tools/rng-tools-6.1-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools systemd toolchain-funcs
+
+DESCRIPTION="Daemon to use hardware random number generators"
+HOMEPAGE="https://github.com/nhorman/rng-tools"
+SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="nistbeacon selinux"
+
+DEPEND="dev-libs/libgcrypt:0
+	dev-libs/libgpg-error
+	nistbeacon? (
+		net-misc/curl[ssl]
+		dev-libs/libxml2:2=
+		dev-libs/openssl:0=
+	)
+"
+RDEPEND="${DEPEND}
+	sys-fs/sysfsutils
+	selinux? ( sec-policy/selinux-rngd )"
+DEPEND="${DEPEND}
+	nistbeacon? (
+		virtual/pkgconfig
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/test-for-argp.patch
+	"${FILESDIR}"/${PN}-5-fix-textrels-on-PIC-x86.patch #469962
+)
+
+src_prepare() {
+	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
+	default
+
+	mv README.md README || die
+
+	eautoreconf
+
+	sed -i '/^AR /d' Makefile.in || die
+	tc-export AR
+}
+
+src_configure() {
+	econf $(use_with nistbeacon)
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}"/rngd-initd-6 rngd
+	newconfd "${FILESDIR}"/rngd-confd-4.1 rngd
+	systemd_dounit "${FILESDIR}"/rngd.service
+}
diff --git a/sys-apps/rng-tools/rng-tools-6.1.ebuild b/sys-apps/rng-tools/rng-tools-6.1.ebuild
deleted file mode 100644
index 2b37de32bff9..000000000000
--- a/sys-apps/rng-tools/rng-tools-6.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd toolchain-funcs
-
-DESCRIPTION="Daemon to use hardware random number generators"
-HOMEPAGE="https://github.com/nhorman/rng-tools"
-SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~x86"
-IUSE="nistbeacon selinux"
-
-DEPEND="dev-libs/libgcrypt:0
-	dev-libs/libgpg-error
-	nistbeacon? (
-		net-misc/curl[ssl]
-		dev-libs/libxml2:2=
-		dev-libs/openssl:0=
-	)
-"
-RDEPEND="${DEPEND}
-	sys-fs/sysfsutils
-	selinux? ( sec-policy/selinux-rngd )"
-DEPEND="${DEPEND}
-	nistbeacon? (
-		virtual/pkgconfig
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/test-for-argp.patch
-	"${FILESDIR}"/${PN}-5-fix-textrels-on-PIC-x86.patch #469962
-)
-
-src_prepare() {
-	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
-	default
-
-	mv README.md README || die
-
-	eautoreconf
-
-	sed -i '/^AR /d' Makefile.in || die
-	tc-export AR
-}
-
-src_configure() {
-	econf $(use_with nistbeacon)
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/rngd-initd-r1-4.1 rngd
-	newconfd "${FILESDIR}"/rngd-confd-4.1 rngd
-	systemd_dounit "${FILESDIR}"/rngd.service
-}
diff --git a/sys-apps/rng-tools/rng-tools-6.ebuild b/sys-apps/rng-tools/rng-tools-6.ebuild
deleted file mode 100644
index 3a559236e0c7..000000000000
--- a/sys-apps/rng-tools/rng-tools-6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils autotools systemd toolchain-funcs
-
-DESCRIPTION="Daemon to use hardware random number generators"
-HOMEPAGE="https://github.com/nhorman/rng-tools"
-SRC_URI="https://github.com/nhorman/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~x86"
-IUSE="selinux"
-
-DEPEND="dev-libs/libgcrypt:0
-	dev-libs/libgpg-error"
-RDEPEND="${DEPEND}
-	sys-fs/sysfsutils
-	selinux? ( sec-policy/selinux-rngd )"
-
-S="${WORKDIR}/${PN}-${P}"
-
-PATCHES=(
-	"${FILESDIR}"/test-for-argp.patch
-	"${FILESDIR}"/${PN}-5-fix-textrels-on-PIC-x86.patch #469962
-	"${FILESDIR}"/${PN}-5-man-fill-watermark.patch #555094
-	"${FILESDIR}"/${PN}-6-fix-noctty.patch #556456
-)
-
-src_prepare() {
-	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
-	default
-	eautoreconf
-
-	sed -i '/^AR /d' Makefile.in || die
-	tc-export AR
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/rngd-initd-r1-4.1 rngd
-	newconfd "${FILESDIR}"/rngd-confd-4.1 rngd
-	systemd_dounit "${FILESDIR}"/rngd.service
-}
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 6f6d9cb45ae9..49fe68a04c09 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -6,7 +6,7 @@ AUX sandbox-2.11-symlinkat-renameat.patch 3418 SHA256 74036803fd8cc07e903abdc220
 DIST sandbox-2.10.tar.xz 417068 SHA256 019d6a2646b3a5f9b6fc3fcb6ff99332901017eb845442bec8573b9901506fa6 SHA512 178b3b8fcb54e6ff67df1c8101866739b49e4d31a66717c21ef502dd2ab609fca70f1a0c662b913e207bfc1ba6994cefdcf5c92ff32add9dd98bd9707f301305 WHIRLPOOL 5d6cffa7317cafeba02af75de9ae914d4365a62b54d3dfcc14cb272e621f2f76a60a945591ccb57dd59d6750152087cb2f21e43ded3ec181d6b42df173147192
 DIST sandbox-2.12.tar.xz 424252 SHA256 265a490a8c528237c55ad26dfd7f62336fa5727c82358fc9cfbaa2e52c47fc50 SHA512 98bd2ee8807d81e65ee0c9f11cfaf2b37da2ee4d8763c68d18c0ff6b14f3cc847ae2d3a0aa30cbe86063a2108ed4d4dcf7cc3fc4f37cb7549d266d4c1989c2a9 WHIRLPOOL 4f3089746a11616c60057165f387122b74e8d2f30a2d77db296405a2b6f401fc625645bca73092436162f5d98a88bfb2a3b42909b0eceb9a59ab810d803441b0
 EBUILD sandbox-2.10-r3.ebuild 2168 SHA256 a76055435a8059b56c6079481c021cbaa9f42efc321d4e67069c6397e23c35d5 SHA512 13daa106179f4203616524cda931e3c79ecc510c09a0991f8165eedbb2e612569f648881183679941a75ee280757fcb3e6176cb61a0c2f2096573ac7a3110dfc WHIRLPOOL 12709e670cb48f463352ff3f6756f3f5193f21ac138b39d27171d97fe11950170c8c664d48c6e25e6187476d932652275f8656d596607d81c4b01f479fb21912
-EBUILD sandbox-2.10-r4.ebuild 2244 SHA256 2f7f43a1b62720340285ea1c6610411d5e3eaff35fdb0e6058ab30c345e8926c SHA512 82badd56d8cf1c4a7c5672bdd051bd787193f3fddf6caf92cb2b3c4a9a327cb424ba7b67ceb3f5992844d1e1ba84806dcf6983bbc0caadb0b789c89543875f34 WHIRLPOOL 1ca230c586d3675f720a7f3e1caab927108950e735354214d43741c4b1211756f8fc1746edd66a24ee6071b87543caa699643415ed1417e0a6be65da36de12c8
+EBUILD sandbox-2.10-r4.ebuild 2240 SHA256 eea6dedaad00005af50c4cbc54f3c18561d71ed8039c713bf7df9c5c30c516f2 SHA512 d93cb2854c8d2bbd8b4c2b385650327c0b0e546f1991e24c05a98f210d121edbcb7a9756323f8b9eb283420ac3e85ab7532326c49f9193017c46bbb61f9bf34e WHIRLPOOL 77fada6f8e58671b624c55c6aa30e0ae06eb81d64e3e6403c0fd1a5745cb5c7d255161f859c97a9085e0ba3cfdb128be4b0f4a44d85789ee2dc6d203eadf92c7
 EBUILD sandbox-2.12.ebuild 1950 SHA256 51a702c9e6232003be3c10345e1be943b057211eeb4f6f07fd27b9edef866b22 SHA512 f0d3e1707225171c280902e612a5109ed78703d4bcd658a827c61e48ffbbb71c3ed86d2a2ae00289d07e46b264b10fbf48a962cf8e35c4709046c9263a473da0 WHIRLPOOL 968d03aafb5a859dfd0a2720dab7db20ce4e6d055adde0dd744021047e979464a2fb48a262dadb1e99ce799cf07204086dffce32764d173b731c7280df7023aa
 MISC ChangeLog 6831 SHA256 eb110ced56d7e173fa1fabd434fdec445259453c13ccb48a554947f9b5b359b6 SHA512 879732fd45e678aa041c18148f44db585bf077ed6ad237725dffd16be0cf4abc37ecf1aa683864b89a547e835927e6a05f0b6c24aec3f034d9a8d671d39cf3bf WHIRLPOOL a9786489a8235518c08350ad190563b8a782de07221cdf44a54bced7f7b4df51867a7a2ee6f0bfa015c514cac07f75d36bdb6d17e3942ab4ec1a5b1a55cf4093
 MISC ChangeLog-2015 25325 SHA256 9e1e3512cb2dceb07f7f480661aa00528d23e41765893244a6dae27bf039f0f6 SHA512 6c714a72b2d1848381543031478dca397fd8150a8ac82febdf4017a339ebdc0dfca8adac95aef4682311e2ada9742aaf9b86d49c9bb6768ca9c802af00744a53 WHIRLPOOL ebffa03ba18522039481fcdf1bfccc2ab5936e0fd4e0d081ae56eca0c784a8e250850855635e7a20025cb38e99e8f7dd80e448bf9e1ba70e6b8295f9aa502312
diff --git a/sys-apps/sandbox/sandbox-2.10-r4.ebuild b/sys-apps/sandbox/sandbox-2.10-r4.ebuild
index 174ab5a3403d..8562d18076cc 100644
--- a/sys-apps/sandbox/sandbox-2.10-r4.ebuild
+++ b/sys-apps/sandbox/sandbox-2.10-r4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 53172a8a8606..116976977f0b 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -12,15 +12,17 @@ AUX 234-0004-logind-make-sure-we-don-t-process-the-same-method-ca.patch 821 SHA2
 AUX 234-uucp-group.patch 536 SHA256 b3ef6c7d40d86dfc801ff7839876dcffb299d0b6d5b11fbf081adfe51ee0d8e6 SHA512 6ffaa3b50f36598682019c1c6b171ad121d57ba9cfd379be5f46f64621dc026a82069922b78a62a5c477bb117e700a31e0315872d78378755cd4150abd22a912 WHIRLPOOL dc9bbd2879af33a8ff27e7a13052c51b4ddc1b336bbd58ed0b5e28bb63229acbb355b6316cc58555b12eee8ed2d73ba25ee21286e8e0f429d6760e70dc6de5a4
 AUX 235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch 1280 SHA256 a448c39a3d172c03edf4ac303b02251d3c09a9d21c2512ae475c1a92905b97af SHA512 70dd0b3ed7926fc2406aae8fc592ba7bbbf9bdd94151d3045d94683921f2921dbe8184f7184e4e5a9cd4bf1556ddb93f20f741df3bead3c664f4c71757e75376 WHIRLPOOL bd3aeda654fffd90e2b49757f5bdc483284d034a78f134f3c2b1870f11f35d9604d6105b159ff9cd879bb82c57536e363d8bf8cbba1878514cfc894ca009a47f
 AUX 235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch 2620 SHA256 0211aba9502c23e51e154fccdad7712d729caea3869f969313b9dbf08474641a SHA512 52bf63183930872c44c0dc53a616c75a4ae37ffedfcf34b2b5e400994b334d311b2afcadd75e91dd6c37a88cab71e30d2d6690261a980ea5dfc056b67d7e2e78 WHIRLPOOL 1f3c1fcc5a161644785aae482d97e2007150d47beae4372fdb30805f291b33e21d2e8e16ea6bc4cc9cf8c0fbd3d8ddfff2504af1e568c519b2398411eca9458e
+AUX CVE-2017-15908.patch 1371 SHA256 b0651db043115e8251a4efccad369f917d4e8ffcfdd011baa93f99ebea0e03ea SHA512 e3ca9cb44981a7a5d80a7ca63d6c9249e42dc5af1290ecfd472ec377db4ac372a18c3a3b6a99e1b7cfa322f7c00f0a755c916f67273b0b1e0a0e37957035aba9 WHIRLPOOL f19731b7211060ffa3154bdd227840683bcac2ae5fcd6b18b1639b92a5212a0ed6c69b29b0938ea3b9c90b3c8dcaa31db4045cef6f1bf5dbc60c9ae1eacffcc8
+AUX CVE-2017-9217.patch 863 SHA256 d56929985fcabfbebc15799b38a6e9e5b298b2de0950bd75e1b49f5ac68655fb SHA512 d323c6e79f60bb7abdb4583f021041532d1bf1514500d09d07b0a429b6cfb76787f590de04446ae84d51747b0023042d575aeb07da29e4e8c0ad13656a1877a5 WHIRLPOOL e2c86993539d40c8ab83c34c7fe0678be9a87741e66b7b5b8225a60e289386c5379ff42c8c1ab71258bb5b79d74a05c846cbf8875f8b511589983207b1791376
 AUX generator-path.patch 1046 SHA256 aeb236e19bedc17737ada8953fed61272423b36fd186ffeaff0f14addc488549 SHA512 e9999afbf4d2d8a9e828d81dd0b54e2c2ba556e9778a4954dac3da885a15bc6dcc718f7e119c352eb2efd090e410735395ec20ce2eb3c84a481570bc8b5f66b3 WHIRLPOOL cbc5eb71fe2f61c95adefca78f29f1acd7ccb7bf9ccb7872326b2c7ed2704f4c856dd7456759c3320496995bef4f94d390b0d5f6d9b2585cb99c4a27faabdf2a
 AUX nsswitch.conf 698 SHA256 56aada9338fad1b105bc5755a85761cab57dc9aba180545be2df0b993b581eb3 SHA512 486581b096db702941589bbd3211df58df4979d17856dc935f6e22f7a268c5b6b1c4dfa643d38e21bc01eb258b0b97318d4e97ebab0e87abd718af1e391fde1a WHIRLPOOL 160d83a8a136c44d8d4d1fa9c8c321ff792746b6482c29662c93bcab720540591ea95c4c6a68252f024b449360fcdcebf4c78ee0e33be268e8801bede1286200
 DIST systemd-233-man.tar.gz 31386 SHA256 825e62eb82c4e23997061fc8f56f7ec9bb1e6ac1111d279c76c926cc2bfbf1dc SHA512 cc5215d3590ffc3c9203a64c14d6adeb0148c421c1396b8c1e43dcb58763b687ce99bdee327dd8a00abab7198171e73b22109a3f2032e4cec6adf2dcc85acf40 WHIRLPOOL ff1f36beff377f675047271df38503e8b71d615ea73c5fdfebf465edaf1fe29b4f89e3194d65cdf84eec9b7c3156de597627fdaffa4b86018520aaa127a7a159
 DIST systemd-233.tar.gz 4660737 SHA256 8b3e99da3d4164b66581830a7f2436c0c8fe697b5fbdc3927bdb960646be0083 SHA512 5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e WHIRLPOOL ce19f6a546b8f899cfa952e49d47f063fd29186be4a53391bc30ea2c487eb2c140a74ad843a1dc499bb61bba3e9ca055613852291e38b85af5d79c59409dc176
-DIST systemd-234.tar.gz 4800186 SHA256 da3e69d10aa1c983d33833372ad4929037b411ac421fb085c8cee79ae1d80b6a SHA512 762336a7d96c6583cf71cad62efce95a0ed93cd0a0d7251f128d10dba8200c0c8df0e5a7d168179ababa5b221295a231e73b7e7ea2697cb3fb5c1b33538efa68 WHIRLPOOL 9ff9f25ce82514db969a427eee51c0483b2bcaaa611f93c1fc17c356ea25eee712217708c54101ecaafd835cd8ac988b16e8ad411b48541a32442b9a0d148f07
 DIST systemd-235.tar.gz 6586406 SHA256 25811f96f5a027bf2a4c9383495cf5b623e385d84da31e473cf375932b3e9c52 SHA512 243f2eb5340fa37dd1286eaa63e83387bda9e03953af266cd6196a37535a13491482caf14c6ab10608bba4ed23b6c41923608e52017e0c26988ed72ddd2b9993 WHIRLPOOL 05e50b31f7b3b1cd756abd1580dddae0e114953857564133784fc43b9ecd0e203ee534aaf76531ca7af5c43b03b9b73c6cbbbb1caf5afb17502555cc52fe06cd
 EBUILD systemd-233-r4.ebuild 13626 SHA256 0dc86e550d767d12e945975267f4a6ff6c4a862f049253e966c9f2db699310f6 SHA512 3527bc62210aba9c50f663d8023440b73ae6185f1a90e6e31a48b6dcc13ac2dc0b312c433cbe74e942cb50ad894d4dd4212d81caf50d17971c9f965cae9535a0 WHIRLPOOL 8b4f723d82d0101b30838c5c21c89bdc1f23d18291ea3e5fd97f28357e8e35d6365725129cd4edda7d7b14f18b5e2cfe370971522a2d822f686fd61d1d08ab5d
-EBUILD systemd-234-r4.ebuild 13476 SHA256 56dcb5358bb37180167e69894032d20aa7121f2d1bf9f80d0eec780eb748956b SHA512 4276434de0bb01ac06a78b001017c91b2bf104ac0559666fcc28cad2b2d8545c8279db89afa4d1bf31d4106337f8662b3ee1c65cf75f3507081a47a52c1a126c WHIRLPOOL d8953a3b122b206f0b10f737543685ca3c429f6f6456f555fbe78972bab5c96e69b968df4cfe3a9df189a519e4ce384b92916575794e7e5ccc725acc58d970d9
-EBUILD systemd-235.ebuild 13364 SHA256 bd8997ff489058e0b60b3cef8df5a2e53e151f81bdd6eea2eda084fcf8f98301 SHA512 ebb5ffd0f473d18c5d3862fb7b944ba67028cd0d93d38ac4182074f6ae700ef02dfdeccddbbb90d69baad124f7b1870c81eb27bcb864aa7dd86cbf4787ad979b WHIRLPOOL 632cd55136ec811ffb01acaedfa01e3b0b1333f89e6a4230bcdd40e752d8a3685ee70821cc19da7403e6dde2cfa0938b3c846f8039fc8f627a178d921771dba5
+EBUILD systemd-233-r5.ebuild 13669 SHA256 6ecc5fa2a1f6b7864113e59972a3bf150eb836ea43d06c5b4f84fd1cb6eae325 SHA512 722307b55c7621f119dee2e483bb7271d5a460945bd938adee6e679345a3549eaf060c96493b54e7a5bcb94a2821ce31949cfaeb5b1a43aeef36b673ecc39d7c WHIRLPOOL f1e5aabea3ff94eb2ee4576b5d34fb411c8bda9f01293b9579215b0e51a8103c93149befd25543c68d20855f0eff9804da7074449ec0db12b93d59b6cff4625f
+EBUILD systemd-233-r6.ebuild 13703 SHA256 4a175589f8db63b05d622433d2024b1d4ae01b5ea01590f78570e60471b5a02b SHA512 9da2170e9443109ed79437c8d58ae2487ae93b7a3928d8d813391a2b520c700f563f2651a8a209359e4524f94a159454b412d468e3f1c22da82bbc72eeda5151 WHIRLPOOL 2df3ccd94ac4b913939223e7d96d197881557a7b4f634bd0592dc329e262d60e05067c23917aa371b0789e28922e48f723ed78e4037e737a4e6670a940c83ff5
+EBUILD systemd-235-r1.ebuild 13401 SHA256 bde936448268da8906d49ae5d0032cc496c38c32830414059a715af514c4c537 SHA512 240341672cc795a7bce946e5d44f9cc30f7099d6954b352fa13e142d185dd1fdf1bd665eb510355c6317c81d29e491cd7d41b5d7b28c8860f092767ea81b4ce1 WHIRLPOOL 6c707048afd34b9d7f51823661a833e312c0067bc38b6de9ed2e5afc51c3cc7134017adfa25ddc6de9aa368da7ec375238f33ef9c7b11cc0c05b37218402e635
 EBUILD systemd-9999.ebuild 13196 SHA256 0e18985198be157839accf26bfc358a784ad2f3b9b596fd8636f461bb2320fb1 SHA512 90b0283fb318638e572edcd03d04ba4545ffef50ea877c97277b43db8ddb95b9784e834072a51aa3954c8088c4a946390f5f3b2d651fbc6c959c74058b606dc1 WHIRLPOOL f790ba07e2bdb3f99f905a5dfd027891b8337e661e0ca5f88cf414c165f3e7924f9ec584e8b6baf2d8bcf053b49583d0bcac2d19e7acdf0d175fb5a681c4bdea
 MISC ChangeLog 20141 SHA256 b01beaf5824021996a73fbd2fb1749b390e13c13eb309d336934fc758a73fd57 SHA512 041097f0655b5464023c1365d6e2813def67ffcdf6d2ae28c48497280bf3ed1ba49fca24ef661cb30de4af97ab1cee53575b4f51cb985fcc700535f3d4432481 WHIRLPOOL 854111ca90d15661843afd4c026028949b7d6f8916e750a2537f22993225aef0ef4076c0ff3d818609a9b166ca926ba152e26d2e3d30510a646a5bcb6b5c04fb
 MISC ChangeLog-2015 69416 SHA256 10adffab2046e41857e68c45b411fa011fe6206cf8d4cab42db78562cecf6bd8 SHA512 bc8f0ad8ebb6a31db74be738e97d9cd1183c0cc394615d90bf15633a315778557170bb93ce7e88b63bb93237c1a748f6f3d0ab89539f014d319f30ba9a0021fc WHIRLPOOL 7052513a02364742e297fea4c595da7045b5b6a517a397314992b7cf87f40d9ffa16383c6e413d466fdfa3173e9e8769257cf46116e4808fad7ae5c0f7990296
diff --git a/sys-apps/systemd/files/CVE-2017-15908.patch b/sys-apps/systemd/files/CVE-2017-15908.patch
new file mode 100644
index 000000000000..08e5e37514ce
--- /dev/null
+++ b/sys-apps/systemd/files/CVE-2017-15908.patch
@@ -0,0 +1,39 @@
+From 9f939335a07085aa9a9663efd1dca06ef6405d62 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Wed, 25 Oct 2017 11:19:19 +0200
+Subject: [PATCH] resolved: fix loop on packets with pseudo dns types
+
+Reported by Karim Hossen & Thomas Imbert from Sogeti ESEC R&D.
+
+https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1725351
+---
+ src/resolve/resolved-dns-packet.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c
+index e2f227bfc..35f4d0689 100644
+--- a/src/resolve/resolved-dns-packet.c
++++ b/src/resolve/resolved-dns-packet.c
+@@ -1514,7 +1514,7 @@ static int dns_packet_read_type_window(DnsPacket *p, Bitmap **types, size_t *sta
+ 
+                 found = true;
+ 
+-                while (bitmask) {
++                for (; bitmask; bit++, bitmask >>= 1)
+                         if (bitmap[i] & bitmask) {
+                                 uint16_t n;
+ 
+@@ -1528,10 +1528,6 @@ static int dns_packet_read_type_window(DnsPacket *p, Bitmap **types, size_t *sta
+                                 if (r < 0)
+                                         return r;
+                         }
+-
+-                        bit++;
+-                        bitmask >>= 1;
+-                }
+         }
+ 
+         if (!found)
+-- 
+2.15.0.rc2
+
diff --git a/sys-apps/systemd/files/CVE-2017-9217.patch b/sys-apps/systemd/files/CVE-2017-9217.patch
new file mode 100644
index 000000000000..68d0f36d4913
--- /dev/null
+++ b/sys-apps/systemd/files/CVE-2017-9217.patch
@@ -0,0 +1,28 @@
+From a924f43f30f9c4acaf70618dd2a055f8b0f166be Mon Sep 17 00:00:00 2001
+From: Evgeny Vereshchagin <evvers@ya.ru>
+Date: Wed, 24 May 2017 08:56:48 +0300
+Subject: [PATCH] resolved: bugfix of null pointer p->question dereferencing
+ (#6020)
+
+See https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1621396
+---
+ src/resolve/resolved-dns-packet.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c
+index 652970284..240ee448f 100644
+--- a/src/resolve/resolved-dns-packet.c
++++ b/src/resolve/resolved-dns-packet.c
+@@ -2269,6 +2269,9 @@ int dns_packet_is_reply_for(DnsPacket *p, const DnsResourceKey *key) {
+         if (r < 0)
+                 return r;
+ 
++        if (!p->question)
++                return 0;
++
+         if (p->question->n_keys != 1)
+                 return 0;
+ 
+-- 
+2.15.0.rc2
+
diff --git a/sys-apps/systemd/systemd-233-r5.ebuild b/sys-apps/systemd/systemd-233-r5.ebuild
new file mode 100644
index 000000000000..74c4b9e56fee
--- /dev/null
+++ b/sys-apps/systemd/systemd-233-r5.ebuild
@@ -0,0 +1,461 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		!doc? ( https://dev.gentoo.org/~floppym/dist/${P}-man.tar.gz )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+fi
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit autotools bash-completion-r1 linux-info multilib-minimal pam python-any-r1 systemd toolchain-funcs udev user
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="acl apparmor audit build cryptsetup curl doc elfutils +gcrypt gnuefi http
+	idn importd +kmod +lz4 lzma nat pam policykit
+	qrcode +seccomp selinux ssl sysv-utils test vanilla xkb"
+
+REQUIRED_USE="importd? ( curl gcrypt lzma )"
+
+MINKV="3.11"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.27.1:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	!<sys-libs/glibc-2.16
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
+	curl? ( net-misc/curl:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	http? (
+		>=net-libs/libmicrohttpd-0.9.33:0=
+		ssl? ( >=net-libs/gnutls-3.1.4:0= )
+	)
+	idn? ( net-dns/libidn:0= )
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	nat? ( net-firewall/iptables:0= )
+	pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	sysv-utils? (
+		!sys-apps/systemd-sysv-utils
+		!sys-apps/sysvinit )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/baselayout-2.2
+	selinux? ( sec-policy/selinux-base-policy[systemd] )
+	!build? ( || (
+		sys-apps/util-linux[kill(-)]
+		sys-process/procps[kill(+)]
+		sys-apps/coreutils[kill(-)]
+	) )
+	!sys-auth/nss-myhostname
+	!<sys-kernel/dracut-044
+	!sys-fs/eudev
+	!sys-fs/udev"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-apps/hwids-20150417[udev]
+	>=sys-fs/udev-init-scripts-25
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	>=sys-kernel/linux-headers-${MINKV}
+	virtual/pkgconfig
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+	test? ( sys-apps/dbus )
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	doc? ( $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') )
+"
+
+python_check_deps() {
+	has_version --host-root "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	# Bug 463376
+	sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
+
+	local PATCHES=(
+		"${FILESDIR}/233-0001-Avoid-strict-DM-interface-version-dependencies-5519.patch"
+		"${FILESDIR}/233-CVE-2017-9445.patch"
+		"${FILESDIR}/233-format-warnings.patch"
+		"${FILESDIR}/233-0002-core-load-fragment-refuse-units-with-errors-in-RootD.patch"
+		"${FILESDIR}/233-0003-core-load-fragment-refuse-units-with-errors-in-certa.patch"
+		"${FILESDIR}/CVE-2017-15908.patch"
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/218-Dont-enable-audit-by-default.patch"
+			"${FILESDIR}/228-noclean-tmp.patch"
+			"${FILESDIR}/233-systemd-user-pam.patch"
+		)
+	fi
+
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# Keep using the one where the rules were installed.
+	MY_UDEVDIR=$(get_udevdir)
+	# Fix systems broken by bug #509454.
+	[[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev
+
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	use doc && python_setup
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		# disable -flto since it is an optimization flag
+		# and makes distcc less effective
+		cc_cv_CFLAGS__flto=no
+		# disable -fuse-ld=gold since Gentoo supports explicit linker
+		# choice and forcing gold is undesired, #539998
+		# ld.gold may collide with user's LDFLAGS, #545168
+		# ld.gold breaks sparc, #573874
+		cc_cv_LDFLAGS__Wl__fuse_ld_gold=no
+
+		# Workaround for gcc-4.7, bug 554454.
+		cc_cv_CFLAGS__Werror_shadow=no
+
+		# Workaround for bug 516346
+		--enable-dependency-tracking
+
+		--disable-maintainer-mode
+		--localstatedir=/var
+		--with-pamlibdir=$(getpam_mod_dir)
+		# avoid bash-completion dep
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in $PATH
+		--enable-split-usr
+		# For testing.
+		--with-rootprefix="${ROOTPREFIX-/usr}"
+		--with-rootlibdir="${ROOTPREFIX-/usr}/$(get_libdir)"
+		# disable sysv compatibility
+		--with-sysvinit-path=
+		--with-sysvrcnd-path=
+		# no deps
+		--enable-efi
+		--enable-ima
+
+		# Optional components/dependencies
+		$(multilib_native_use_enable acl)
+		$(multilib_native_use_enable apparmor)
+		$(multilib_native_use_enable audit)
+		$(multilib_native_use_enable cryptsetup libcryptsetup)
+		$(multilib_native_use_enable curl libcurl)
+		$(multilib_native_use_enable elfutils)
+		$(use_enable gcrypt)
+		$(multilib_native_use_enable gnuefi)
+		--with-efi-libdir="/usr/$(get_libdir)"
+		$(multilib_native_use_enable http microhttpd)
+		$(usex http $(multilib_native_use_enable ssl gnutls) --disable-gnutls)
+		$(multilib_native_use_enable idn libidn)
+		$(multilib_native_use_enable importd)
+		$(multilib_native_use_enable importd bzip2)
+		$(multilib_native_use_enable importd zlib)
+		$(multilib_native_use_enable kmod)
+		$(use_enable lz4)
+		$(use_enable lzma xz)
+		$(multilib_native_use_enable nat libiptc)
+		$(use_enable pam)
+		$(multilib_native_use_enable policykit polkit)
+		$(multilib_native_use_enable qrcode qrencode)
+		$(multilib_native_use_enable seccomp)
+		$(multilib_native_use_enable selinux)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable test dbus)
+		$(multilib_native_use_enable xkb xkbcommon)
+		$(multilib_native_use_with doc python)
+
+		# hardcode a few paths to spare some deps
+		KILL=/bin/kill
+		QUOTAON=/usr/sbin/quotaon
+		QUOTACHECK=/usr/sbin/quotacheck
+
+		# TODO: we may need to restrict this to gcc
+		EFI_CC="$(tc-getCC)"
+
+		# dbus paths
+		--with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d"
+		--with-dbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services"
+		--with-dbussystemservicedir="${EPREFIX}/usr/share/dbus-1/system-services"
+
+		--with-ntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+
+		# Breaks screen, tmux, etc.
+		--without-kill-user-processes
+	)
+
+	# Work around bug 463846.
+	tc-export CC
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	local mymakeopts=(
+		udevlibexecdir="${MY_UDEVDIR}"
+	)
+
+	if multilib_is_native_abi; then
+		emake "${mymakeopts[@]}"
+	else
+		emake built-sources
+		local targets=(
+			'$(rootlib_LTLIBRARIES)'
+			'$(lib_LTLIBRARIES)'
+			'$(pamlib_LTLIBRARIES)'
+			'$(pkgconfiglib_DATA)'
+		)
+		echo "gentoo: ${targets[*]}" | emake "${mymakeopts[@]}" -f Makefile -f - gentoo
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi || return 0
+	default
+}
+
+multilib_src_install() {
+	local mymakeopts=(
+		# automake fails with parallel libtool relinking
+		# https://bugs.gentoo.org/show_bug.cgi?id=491398
+		-j1
+
+		udevlibexecdir="${MY_UDEVDIR}"
+		dist_udevhwdb_DATA=
+		DESTDIR="${D}"
+	)
+
+	if multilib_is_native_abi; then
+		emake "${mymakeopts[@]}" install
+	else
+		mymakeopts+=(
+			install-rootlibLTLIBRARIES
+			install-libLTLIBRARIES
+			install-pamlibLTLIBRARIES
+			install-pkgconfiglibDATA
+			install-includeHEADERS
+			install-pkgincludeHEADERS
+		)
+
+		emake "${mymakeopts[@]}"
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --modules
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if [[ ${PV} != 9999 ]]; then
+		use doc || doman "${WORKDIR}"/man/systemd.{directives,index}.7
+	fi
+
+	if use sysv-utils; then
+		for app in halt poweroff reboot runlevel shutdown telinit; do
+			dosym "..${ROOTPREFIX-/usr}/bin/systemctl" /sbin/${app}
+		done
+		dosym "..${ROOTPREFIX-/usr}/lib/systemd/systemd" /sbin/init
+	else
+		# we just keep sysvinit tools, so no need for the mans
+		rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
+			|| die
+		rm "${D}"/usr/share/man/man1/init.1 || die
+	fi
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
+		/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd \
+		/var/log/journal/remote
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+
+	# If we install these symlinks, there is no way for the sysadmin to remove them
+	# permanently.
+	rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
+	rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
+	rm -r "${D}"/etc/systemd/system/network-online.target.wants || die
+	rm -r "${D}"/etc/systemd/system/sockets.target.wants || die
+	rm -r "${D}"/etc/systemd/system/sysinit.target.wants || die
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT%/}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT%/}"/etc/env.d/??locale )
+	local locale_conf="${EROOT%/}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+pkg_postinst() {
+	newusergroup() {
+		enewgroup "$1"
+		enewuser "$1" -1 -1 -1 "$1"
+	}
+
+	enewgroup input
+	enewgroup systemd-journal
+	newusergroup systemd-bus-proxy
+	newusergroup systemd-coredump
+	newusergroup systemd-journal-gateway
+	newusergroup systemd-journal-remote
+	newusergroup systemd-journal-upload
+	newusergroup systemd-network
+	newusergroup systemd-resolve
+	newusergroup systemd-timesync
+
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required. Despite that this file is owned by sys-apps/hwids.
+	if has_version "sys-apps/hwids[udev]"; then
+		udevadm hwdb --update --root="${ROOT%/}"
+	fi
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respect, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	systemd_reenable systemd-networkd.service systemd-resolved.service
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-233-r6.ebuild b/sys-apps/systemd/systemd-233-r6.ebuild
new file mode 100644
index 000000000000..be302349a160
--- /dev/null
+++ b/sys-apps/systemd/systemd-233-r6.ebuild
@@ -0,0 +1,462 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		!doc? ( https://dev.gentoo.org/~floppym/dist/${P}-man.tar.gz )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit autotools bash-completion-r1 linux-info multilib-minimal pam python-any-r1 systemd toolchain-funcs udev user
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="acl apparmor audit build cryptsetup curl doc elfutils +gcrypt gnuefi http
+	idn importd +kmod +lz4 lzma nat pam policykit
+	qrcode +seccomp selinux ssl sysv-utils test vanilla xkb"
+
+REQUIRED_USE="importd? ( curl gcrypt lzma )"
+
+MINKV="3.11"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.27.1:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	!<sys-libs/glibc-2.16
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
+	curl? ( net-misc/curl:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	http? (
+		>=net-libs/libmicrohttpd-0.9.33:0=
+		ssl? ( >=net-libs/gnutls-3.1.4:0= )
+	)
+	idn? ( net-dns/libidn:0= )
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	nat? ( net-firewall/iptables:0= )
+	pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	sysv-utils? (
+		!sys-apps/systemd-sysv-utils
+		!sys-apps/sysvinit )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/baselayout-2.2
+	selinux? ( sec-policy/selinux-base-policy[systemd] )
+	!build? ( || (
+		sys-apps/util-linux[kill(-)]
+		sys-process/procps[kill(+)]
+		sys-apps/coreutils[kill(-)]
+	) )
+	!sys-auth/nss-myhostname
+	!<sys-kernel/dracut-044
+	!sys-fs/eudev
+	!sys-fs/udev"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-apps/hwids-20150417[udev]
+	>=sys-fs/udev-init-scripts-25
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	>=sys-kernel/linux-headers-${MINKV}
+	virtual/pkgconfig
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+	test? ( sys-apps/dbus )
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	doc? ( $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') )
+"
+
+python_check_deps() {
+	has_version --host-root "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	# Bug 463376
+	sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
+
+	local PATCHES=(
+		"${FILESDIR}/233-0001-Avoid-strict-DM-interface-version-dependencies-5519.patch"
+		"${FILESDIR}/233-CVE-2017-9445.patch"
+		"${FILESDIR}/233-format-warnings.patch"
+		"${FILESDIR}/233-0002-core-load-fragment-refuse-units-with-errors-in-RootD.patch"
+		"${FILESDIR}/233-0003-core-load-fragment-refuse-units-with-errors-in-certa.patch"
+		"${FILESDIR}/CVE-2017-15908.patch"
+		"${FILESDIR}/CVE-2017-9217.patch"
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/218-Dont-enable-audit-by-default.patch"
+			"${FILESDIR}/228-noclean-tmp.patch"
+			"${FILESDIR}/233-systemd-user-pam.patch"
+		)
+	fi
+
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# Keep using the one where the rules were installed.
+	MY_UDEVDIR=$(get_udevdir)
+	# Fix systems broken by bug #509454.
+	[[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev
+
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	use doc && python_setup
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		# disable -flto since it is an optimization flag
+		# and makes distcc less effective
+		cc_cv_CFLAGS__flto=no
+		# disable -fuse-ld=gold since Gentoo supports explicit linker
+		# choice and forcing gold is undesired, #539998
+		# ld.gold may collide with user's LDFLAGS, #545168
+		# ld.gold breaks sparc, #573874
+		cc_cv_LDFLAGS__Wl__fuse_ld_gold=no
+
+		# Workaround for gcc-4.7, bug 554454.
+		cc_cv_CFLAGS__Werror_shadow=no
+
+		# Workaround for bug 516346
+		--enable-dependency-tracking
+
+		--disable-maintainer-mode
+		--localstatedir=/var
+		--with-pamlibdir=$(getpam_mod_dir)
+		# avoid bash-completion dep
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in $PATH
+		--enable-split-usr
+		# For testing.
+		--with-rootprefix="${ROOTPREFIX-/usr}"
+		--with-rootlibdir="${ROOTPREFIX-/usr}/$(get_libdir)"
+		# disable sysv compatibility
+		--with-sysvinit-path=
+		--with-sysvrcnd-path=
+		# no deps
+		--enable-efi
+		--enable-ima
+
+		# Optional components/dependencies
+		$(multilib_native_use_enable acl)
+		$(multilib_native_use_enable apparmor)
+		$(multilib_native_use_enable audit)
+		$(multilib_native_use_enable cryptsetup libcryptsetup)
+		$(multilib_native_use_enable curl libcurl)
+		$(multilib_native_use_enable elfutils)
+		$(use_enable gcrypt)
+		$(multilib_native_use_enable gnuefi)
+		--with-efi-libdir="/usr/$(get_libdir)"
+		$(multilib_native_use_enable http microhttpd)
+		$(usex http $(multilib_native_use_enable ssl gnutls) --disable-gnutls)
+		$(multilib_native_use_enable idn libidn)
+		$(multilib_native_use_enable importd)
+		$(multilib_native_use_enable importd bzip2)
+		$(multilib_native_use_enable importd zlib)
+		$(multilib_native_use_enable kmod)
+		$(use_enable lz4)
+		$(use_enable lzma xz)
+		$(multilib_native_use_enable nat libiptc)
+		$(use_enable pam)
+		$(multilib_native_use_enable policykit polkit)
+		$(multilib_native_use_enable qrcode qrencode)
+		$(multilib_native_use_enable seccomp)
+		$(multilib_native_use_enable selinux)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable test dbus)
+		$(multilib_native_use_enable xkb xkbcommon)
+		$(multilib_native_use_with doc python)
+
+		# hardcode a few paths to spare some deps
+		KILL=/bin/kill
+		QUOTAON=/usr/sbin/quotaon
+		QUOTACHECK=/usr/sbin/quotacheck
+
+		# TODO: we may need to restrict this to gcc
+		EFI_CC="$(tc-getCC)"
+
+		# dbus paths
+		--with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d"
+		--with-dbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services"
+		--with-dbussystemservicedir="${EPREFIX}/usr/share/dbus-1/system-services"
+
+		--with-ntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+
+		# Breaks screen, tmux, etc.
+		--without-kill-user-processes
+	)
+
+	# Work around bug 463846.
+	tc-export CC
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	local mymakeopts=(
+		udevlibexecdir="${MY_UDEVDIR}"
+	)
+
+	if multilib_is_native_abi; then
+		emake "${mymakeopts[@]}"
+	else
+		emake built-sources
+		local targets=(
+			'$(rootlib_LTLIBRARIES)'
+			'$(lib_LTLIBRARIES)'
+			'$(pamlib_LTLIBRARIES)'
+			'$(pkgconfiglib_DATA)'
+		)
+		echo "gentoo: ${targets[*]}" | emake "${mymakeopts[@]}" -f Makefile -f - gentoo
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi || return 0
+	default
+}
+
+multilib_src_install() {
+	local mymakeopts=(
+		# automake fails with parallel libtool relinking
+		# https://bugs.gentoo.org/show_bug.cgi?id=491398
+		-j1
+
+		udevlibexecdir="${MY_UDEVDIR}"
+		dist_udevhwdb_DATA=
+		DESTDIR="${D}"
+	)
+
+	if multilib_is_native_abi; then
+		emake "${mymakeopts[@]}" install
+	else
+		mymakeopts+=(
+			install-rootlibLTLIBRARIES
+			install-libLTLIBRARIES
+			install-pamlibLTLIBRARIES
+			install-pkgconfiglibDATA
+			install-includeHEADERS
+			install-pkgincludeHEADERS
+		)
+
+		emake "${mymakeopts[@]}"
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --modules
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if [[ ${PV} != 9999 ]]; then
+		use doc || doman "${WORKDIR}"/man/systemd.{directives,index}.7
+	fi
+
+	if use sysv-utils; then
+		for app in halt poweroff reboot runlevel shutdown telinit; do
+			dosym "..${ROOTPREFIX-/usr}/bin/systemctl" /sbin/${app}
+		done
+		dosym "..${ROOTPREFIX-/usr}/lib/systemd/systemd" /sbin/init
+	else
+		# we just keep sysvinit tools, so no need for the mans
+		rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
+			|| die
+		rm "${D}"/usr/share/man/man1/init.1 || die
+	fi
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
+		/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd \
+		/var/log/journal/remote
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+
+	# If we install these symlinks, there is no way for the sysadmin to remove them
+	# permanently.
+	rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
+	rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
+	rm -r "${D}"/etc/systemd/system/network-online.target.wants || die
+	rm -r "${D}"/etc/systemd/system/sockets.target.wants || die
+	rm -r "${D}"/etc/systemd/system/sysinit.target.wants || die
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT%/}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT%/}"/etc/env.d/??locale )
+	local locale_conf="${EROOT%/}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+pkg_postinst() {
+	newusergroup() {
+		enewgroup "$1"
+		enewuser "$1" -1 -1 -1 "$1"
+	}
+
+	enewgroup input
+	enewgroup systemd-journal
+	newusergroup systemd-bus-proxy
+	newusergroup systemd-coredump
+	newusergroup systemd-journal-gateway
+	newusergroup systemd-journal-remote
+	newusergroup systemd-journal-upload
+	newusergroup systemd-network
+	newusergroup systemd-resolve
+	newusergroup systemd-timesync
+
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required. Despite that this file is owned by sys-apps/hwids.
+	if has_version "sys-apps/hwids[udev]"; then
+		udevadm hwdb --update --root="${ROOT%/}"
+	fi
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respect, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	systemd_reenable systemd-networkd.service systemd-resolved.service
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-234-r4.ebuild b/sys-apps/systemd/systemd-234-r4.ebuild
deleted file mode 100644
index a4c94bd3a96c..000000000000
--- a/sys-apps/systemd/systemd-234-r4.ebuild
+++ /dev/null
@@ -1,450 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-fi
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http
-	idn importd +kmod libidn2 +lz4 lzma nat pam policykit
-	qrcode +seccomp selinux ssl sysv-utils test vanilla xkb"
-
-REQUIRED_USE="importd? ( curl gcrypt lzma )"
-
-MINKV="3.11"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.27.1:0=[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	!<sys-libs/glibc-2.16
-	acl? ( sys-apps/acl:0= )
-	apparmor? ( sys-libs/libapparmor:0= )
-	audit? ( >=sys-process/audit-2:0= )
-	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
-	curl? ( net-misc/curl:0= )
-	elfutils? ( >=dev-libs/elfutils-0.158:0= )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
-	http? (
-		>=net-libs/libmicrohttpd-0.9.33:0=
-		ssl? ( >=net-libs/gnutls-3.1.4:0= )
-	)
-	idn? (
-		libidn2? ( net-dns/libidn2 )
-		!libidn2? ( net-dns/libidn )
-	)
-	importd? (
-		app-arch/bzip2:0=
-		sys-libs/zlib:0=
-	)
-	kmod? ( >=sys-apps/kmod-15:0= )
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
-	nat? ( net-firewall/iptables:0= )
-	pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
-	qrcode? ( media-gfx/qrencode:0= )
-	seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	sysv-utils? (
-		!sys-apps/systemd-sysv-utils
-		!sys-apps/sysvinit )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/baselayout-2.2
-	selinux? ( sec-policy/selinux-base-policy[systemd] )
-	!build? ( || (
-		sys-apps/util-linux[kill(-)]
-		sys-process/procps[kill(+)]
-		sys-apps/coreutils[kill(-)]
-	) )
-	!sys-auth/nss-myhostname
-	!<sys-kernel/dracut-044
-	!sys-fs/eudev
-	!sys-fs/udev"
-
-# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
-PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
-	>=sys-apps/hwids-20150417[udev]
-	>=sys-fs/udev-init-scripts-25
-	policykit? ( sys-auth/polkit )
-	!vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils:0
-	dev-util/gperf
-	>=dev-util/intltool-0.50
-	>=sys-apps/coreutils-8.16
-	>=sys-kernel/linux-headers-${MINKV}
-	virtual/pkgconfig
-	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-	test? ( sys-apps/dbus )
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
-			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
-			~TIMERFD ~TMPFS_XATTR ~UNIX
-			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
-			~!SYSFS_DEPRECATED_V2"
-
-		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
-
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-			if linux_chkconfig_present X86; then
-				CONFIG_CHECK+=" ~DMIID"
-			fi
-		fi
-
-		if kernel_is -lt ${MINKV//./ }; then
-			ewarn "Kernel version at least ${MINKV} required"
-		fi
-
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	default
-	[[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/234-0002-cryptsetup-fix-infinite-timeout-6486.patch
-		"${FILESDIR}"/234-0003-resolved-make-sure-idn2-conversions-are-roundtrippab.patch
-		"${FILESDIR}"/234-0004-logind-make-sure-we-don-t-process-the-same-method-ca.patch
-	)
-
-	if ! use vanilla; then
-		PATCHES+=(
-			"${FILESDIR}/218-Dont-enable-audit-by-default.patch"
-			"${FILESDIR}/228-noclean-tmp.patch"
-			"${FILESDIR}/233-systemd-user-pam.patch"
-			"${FILESDIR}/234-uucp-group.patch"
-			"${FILESDIR}/generator-path.patch"
-		)
-	fi
-
-	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-	default
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-
-	python_setup
-
-	multilib-minimal_src_configure
-}
-
-meson_use() {
-	usex "$1" true false
-}
-
-meson_multilib() {
-	if multilib_is_native_abi; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-meson_multilib_native_use() {
-	if multilib_is_native_abi && use "$1"; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		-Dpamlibdir="$(getpam_mod_dir)"
-		# avoid bash-completion dep
-		-Dbashcompletiondir="$(get_bashcompdir)"
-		# make sure we get /bin:/sbin in $PATH
-		-Dsplit-usr=true
-		-Drootprefix="${EPREFIX}${ROOTPREFIX}"
-		-Dsysvinit-path=
-		-Dsysvrcnd-path=
-		# no deps
-		-Defi=$(meson_multilib)
-		-Dima=true
-		# Optional components/dependencies
-		-Dacl=$(meson_multilib_native_use acl)
-		-Dapparmor=$(meson_multilib_native_use apparmor)
-		-Daudit=$(meson_multilib_native_use audit)
-		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
-		-Dlibcurl=$(meson_multilib_native_use curl)
-		-Delfutils=$(meson_multilib_native_use elfutils)
-		-Dgcrypt=$(meson_use gcrypt)
-		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
-		-Defi-libdir="/usr/$(get_libdir)"
-		-Dmicrohttpd=$(meson_multilib_native_use http)
-		$(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false)
-		-Dimportd=$(meson_multilib_native_use importd)
-		-Dbzip2=$(meson_multilib_native_use importd)
-		-Dzlib=$(meson_multilib_native_use importd)
-		-Dkmod=$(meson_multilib_native_use kmod)
-		-Dlz4=$(meson_use lz4)
-		-Dxz=$(meson_use lzma)
-		-Dlibiptc=$(meson_multilib_native_use nat)
-		-Dpam=$(meson_use pam)
-		-Dpolkit=$(meson_multilib_native_use policykit)
-		-Dqrencode=$(meson_multilib_native_use qrcode)
-		-Dseccomp=$(meson_multilib_native_use seccomp)
-		-Dselinux=$(meson_multilib_native_use selinux)
-		#-Dtests=$(meson_multilib_native_use test)
-		-Ddbus=$(meson_multilib_native_use test)
-		-Dxkbcommon=$(meson_multilib_native_use xkb)
-		# hardcode a few paths to spare some deps
-		-Dpath-kill=/bin/kill
-		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
-		# Breaks screen, tmux, etc.
-		-Ddefault-kill-user-processes=false
-
-		# multilib options
-		-Dbacklight=$(meson_multilib)
-		-Dbinfmt=$(meson_multilib)
-		-Dcoredump=$(meson_multilib)
-		-Denvironment-d=$(meson_multilib)
-		-Dfirstboot=$(meson_multilib)
-		-Dhibernate=$(meson_multilib)
-		-Dhostnamed=$(meson_multilib)
-		-Dhwdb=$(meson_multilib)
-		-Dldconfig=$(meson_multilib)
-		-Dlocaled=$(meson_multilib)
-		-Dman=$(meson_multilib)
-		-Dnetworkd=$(meson_multilib)
-		-Dquotacheck=$(meson_multilib)
-		-Drandomseed=$(meson_multilib)
-		-Drfkill=$(meson_multilib)
-		-Dsysusers=$(meson_multilib)
-		-Dtimedated=$(meson_multilib)
-		-Dtimesyncd=$(meson_multilib)
-		-Dtmpfiles=$(meson_multilib)
-		-Dvconsole=$(meson_multilib)
-	)
-
-	if multilib_is_native_abi && use idn; then
-		myconf+=(
-			-Dlibidn2=$(usex libidn2 true false)
-			-Dlibidn=$(usex libidn2 false true)
-		)
-	else
-		myconf+=(
-			-Dlibidn2=false
-			-Dlibidn=false
-		)
-	fi
-
-	meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_test() {
-	eninja test
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
-
-multilib_src_install_all() {
-	# meson doesn't know about docdir
-	mv "${ED%/}"/usr/share/doc/{systemd,${PF}} || die
-
-	einstalldocs
-	dodoc "${FILESDIR}"/nsswitch.conf
-
-	if use sysv-utils; then
-		for app in halt poweroff reboot runlevel shutdown telinit; do
-			dosym "${EPREFIX}${ROOTPREFIX%/}/bin/systemctl" /sbin/${app}
-		done
-		dosym "${EPREFIX}${ROOTPREFIX%/}/lib/systemd/systemd" /sbin/init
-	else
-		# we just keep sysvinit tools, so no need for the mans
-		rm "${ED%/}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
-			|| die
-		rm "${ED%/}"/usr/share/man/man1/init.1 || die
-	fi
-
-	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
-		/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd \
-		/var/log/journal/remote
-
-	# Symlink /etc/sysctl.conf for easy migration.
-	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
-
-	# If we install these symlinks, there is no way for the sysadmin to remove them
-	# permanently.
-	rm "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
-	rm -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
-	rm -r "${ED%/}"/etc/systemd/system/network-online.target.wants || die
-	rm -r "${ED%/}"/etc/systemd/system/sockets.target.wants || die
-	rm -r "${ED%/}"/etc/systemd/system/sysinit.target.wants || die
-
-	rm -r "${ED%/}${ROOTPREFIX%/}/lib/udev/hwdb.d" || die
-
-	if [[ ! -e "${ED%/}"/usr/lib/systemd/systemd ]]; then
-		# Avoid breaking boot/reboot
-		dosym "../../..${ROOTPREFIX%/}/lib/systemd/systemd" /usr/lib/systemd/systemd
-		dosym "../../..${ROOTPREFIX%/}/lib/systemd/systemd-shutdown" /usr/lib/systemd/systemd-shutdown
-	fi
-}
-
-migrate_locale() {
-	local envd_locale_def="${EROOT%/}/etc/env.d/02locale"
-	local envd_locale=( "${EROOT%/}"/etc/env.d/??locale )
-	local locale_conf="${EROOT%/}/etc/locale.conf"
-
-	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
-		# If locale.conf does not exist...
-		if [[ -e ${envd_locale} ]]; then
-			# ...either copy env.d/??locale if there's one
-			ebegin "Moving ${envd_locale} to ${locale_conf}"
-			mv "${envd_locale}" "${locale_conf}"
-			eend ${?} || FAIL=1
-		else
-			# ...or create a dummy default
-			ebegin "Creating ${locale_conf}"
-			cat > "${locale_conf}" <<-EOF
-				# This file has been created by the sys-apps/systemd ebuild.
-				# See locale.conf(5) and localectl(1).
-
-				# LANG=${LANG}
-			EOF
-			eend ${?} || FAIL=1
-		fi
-	fi
-
-	if [[ ! -L ${envd_locale} ]]; then
-		# now, if env.d/??locale is not a symlink (to locale.conf)...
-		if [[ -e ${envd_locale} ]]; then
-			# ...warn the user that he has duplicate locale settings
-			ewarn
-			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
-			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
-			ewarn "and create the symlink with the following command:"
-			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
-			ewarn
-		else
-			# ...or just create the symlink if there's nothing here
-			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
-			ln -n -s ../locale.conf "${envd_locale_def}"
-			eend ${?} || FAIL=1
-		fi
-	fi
-}
-
-pkg_preinst() {
-	# If /lib/systemd and /usr/lib/systemd are the same directory, remove the
-	# symlinks we created in src_install.
-	if [[ $(realpath "${EROOT%/}${ROOTPREFIX}/lib/systemd") == $(realpath "${EROOT%/}/usr/lib/systemd") ]]; then
-		if [[ -L ${ED%/}/usr/lib/systemd/systemd ]]; then
-			rm "${ED%/}/usr/lib/systemd/systemd" || die
-		fi
-		if [[ -L ${ED%/}/usr/lib/systemd/systemd-shutdown ]]; then
-			rm "${ED%/}/usr/lib/systemd/systemd-shutdown" || die
-		fi
-	fi
-}
-
-pkg_postinst() {
-	newusergroup() {
-		enewgroup "$1"
-		enewuser "$1" -1 -1 -1 "$1"
-	}
-
-	enewgroup input
-	enewgroup kvm 78
-	enewgroup systemd-journal
-	newusergroup systemd-bus-proxy
-	newusergroup systemd-coredump
-	newusergroup systemd-journal-gateway
-	newusergroup systemd-journal-remote
-	newusergroup systemd-journal-upload
-	newusergroup systemd-network
-	newusergroup systemd-resolve
-	newusergroup systemd-timesync
-
-	systemd_update_catalog
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required. Despite that this file is owned by sys-apps/hwids.
-	if has_version "sys-apps/hwids[udev]"; then
-		udevadm hwdb --update --root="${EROOT%/}"
-	fi
-
-	udev_reload || FAIL=1
-
-	# Bug 465468, make sure locales are respect, and ensure consistency
-	# between OpenRC & systemd
-	migrate_locale
-
-	systemd_reenable systemd-networkd.service systemd-resolved.service
-
-	if [[ ${FAIL} ]]; then
-		eerror "One of the postinst commands failed. Please check the postinst output"
-		eerror "for errors. You may need to clean up your system and/or try installing"
-		eerror "systemd again."
-		eerror
-	fi
-
-	if [[ -e "${EROOT%/}"/usr/lib/systemd/system-generators ]]; then
-		ewarn "Please rebuild any packages which install system generators."
-		ewarn "  emerge --oneshot --usepkg=n /usr/lib/systemd/system-generators"
-	fi
-}
-
-pkg_prerm() {
-	# If removing systemd completely, remove the catalog database.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
-	fi
-}
diff --git a/sys-apps/systemd/systemd-235-r1.ebuild b/sys-apps/systemd/systemd-235-r1.ebuild
new file mode 100644
index 000000000000..2bb192a49e2d
--- /dev/null
+++ b/sys-apps/systemd/systemd-235-r1.ebuild
@@ -0,0 +1,447 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+fi
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http
+	idn importd +kmod libidn2 +lz4 lzma nat pam policykit
+	qrcode +seccomp selinux ssl sysv-utils test vanilla xkb"
+
+REQUIRED_USE="importd? ( curl gcrypt lzma )"
+
+MINKV="3.11"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	!<sys-libs/glibc-2.16
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
+	curl? ( net-misc/curl:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	http? (
+		>=net-libs/libmicrohttpd-0.9.33:0=
+		ssl? ( >=net-libs/gnutls-3.1.4:0= )
+	)
+	idn? (
+		libidn2? ( net-dns/libidn2 )
+		!libidn2? ( net-dns/libidn )
+	)
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	nat? ( net-firewall/iptables:0= )
+	pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	sysv-utils? (
+		!sys-apps/systemd-sysv-utils
+		!sys-apps/sysvinit )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/baselayout-2.2
+	selinux? ( sec-policy/selinux-base-policy[systemd] )
+	!build? ( || (
+		sys-apps/util-linux[kill(-)]
+		sys-process/procps[kill(+)]
+		sys-apps/coreutils[kill(-)]
+	) )
+	!sys-auth/nss-myhostname
+	!<sys-kernel/dracut-044
+	!sys-fs/eudev
+	!sys-fs/udev"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-apps/hwids-20150417[udev]
+	>=sys-fs/udev-init-scripts-25
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	>=sys-kernel/linux-headers-${MINKV}
+	virtual/pkgconfig
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+	test? ( sys-apps/dbus )
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch
+		"${FILESDIR}"/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch
+		"${FILESDIR}/CVE-2017-15908.patch"
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/218-Dont-enable-audit-by-default.patch"
+			"${FILESDIR}/228-noclean-tmp.patch"
+			"${FILESDIR}/233-systemd-user-pam.patch"
+			"${FILESDIR}/234-uucp-group.patch"
+			"${FILESDIR}/generator-path.patch"
+		)
+	fi
+
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+meson_use() {
+	usex "$1" true false
+}
+
+meson_multilib() {
+	if multilib_is_native_abi; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+meson_multilib_native_use() {
+	if multilib_is_native_abi && use "$1"; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in $PATH
+		-Dsplit-usr=true
+		-Drootprefix="${EPREFIX}${ROOTPREFIX}"
+		-Dsysvinit-path=
+		-Dsysvrcnd-path=
+		# no deps
+		-Defi=$(meson_multilib)
+		-Dima=true
+		# Optional components/dependencies
+		-Dacl=$(meson_multilib_native_use acl)
+		-Dapparmor=$(meson_multilib_native_use apparmor)
+		-Daudit=$(meson_multilib_native_use audit)
+		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
+		-Dlibcurl=$(meson_multilib_native_use curl)
+		-Delfutils=$(meson_multilib_native_use elfutils)
+		-Dgcrypt=$(meson_use gcrypt)
+		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
+		-Defi-libdir="/usr/$(get_libdir)"
+		-Dmicrohttpd=$(meson_multilib_native_use http)
+		$(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false)
+		-Dimportd=$(meson_multilib_native_use importd)
+		-Dbzip2=$(meson_multilib_native_use importd)
+		-Dzlib=$(meson_multilib_native_use importd)
+		-Dkmod=$(meson_multilib_native_use kmod)
+		-Dlz4=$(meson_use lz4)
+		-Dxz=$(meson_use lzma)
+		-Dlibiptc=$(meson_multilib_native_use nat)
+		-Dpam=$(meson_use pam)
+		-Dpolkit=$(meson_multilib_native_use policykit)
+		-Dqrencode=$(meson_multilib_native_use qrcode)
+		-Dseccomp=$(meson_multilib_native_use seccomp)
+		-Dselinux=$(meson_multilib_native_use selinux)
+		#-Dtests=$(meson_multilib_native_use test)
+		-Ddbus=$(meson_multilib_native_use test)
+		-Dxkbcommon=$(meson_multilib_native_use xkb)
+		# hardcode a few paths to spare some deps
+		-Dpath-kill=/bin/kill
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+
+		# multilib options
+		-Dbacklight=$(meson_multilib)
+		-Dbinfmt=$(meson_multilib)
+		-Dcoredump=$(meson_multilib)
+		-Denvironment-d=$(meson_multilib)
+		-Dfirstboot=$(meson_multilib)
+		-Dhibernate=$(meson_multilib)
+		-Dhostnamed=$(meson_multilib)
+		-Dhwdb=$(meson_multilib)
+		-Dldconfig=$(meson_multilib)
+		-Dlocaled=$(meson_multilib)
+		-Dman=$(meson_multilib)
+		-Dnetworkd=$(meson_multilib)
+		-Dquotacheck=$(meson_multilib)
+		-Drandomseed=$(meson_multilib)
+		-Drfkill=$(meson_multilib)
+		-Dsysusers=$(meson_multilib)
+		-Dtimedated=$(meson_multilib)
+		-Dtimesyncd=$(meson_multilib)
+		-Dtmpfiles=$(meson_multilib)
+		-Dvconsole=$(meson_multilib)
+	)
+
+	if multilib_is_native_abi && use idn; then
+		myconf+=(
+			-Dlibidn2=$(usex libidn2 true false)
+			-Dlibidn=$(usex libidn2 false true)
+		)
+	else
+		myconf+=(
+			-Dlibidn2=false
+			-Dlibidn=false
+		)
+	fi
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_test() {
+	eninja test
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
+
+multilib_src_install_all() {
+	# meson doesn't know about docdir
+	mv "${ED%/}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if use sysv-utils; then
+		for app in halt poweroff reboot runlevel shutdown telinit; do
+			dosym "${EPREFIX}${ROOTPREFIX%/}/bin/systemctl" /sbin/${app}
+		done
+		dosym "${EPREFIX}${ROOTPREFIX%/}/lib/systemd/systemd" /sbin/init
+	else
+		# we just keep sysvinit tools, so no need for the mans
+		rm "${ED%/}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
+			|| die
+		rm "${ED%/}"/usr/share/man/man1/init.1 || die
+	fi
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
+		/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd \
+		/var/log/journal/remote
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+
+	# If we install these symlinks, there is no way for the sysadmin to remove them
+	# permanently.
+	rm -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
+	rm -f "${ED%/}"/etc/systemd/system/dbus-org.freedesktop.network1.service || die
+	rm -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
+	rm -f "${ED%/}"/etc/systemd/system/dbus-org.freedesktop.resolve1.service || die
+	rm -fr "${ED%/}"/etc/systemd/system/network-online.target.wants || die
+	rm -fr "${ED%/}"/etc/systemd/system/sockets.target.wants || die
+	rm -fr "${ED%/}"/etc/systemd/system/sysinit.target.wants || die
+
+	rm -r "${ED%/}${ROOTPREFIX%/}/lib/udev/hwdb.d" || die
+
+	if [[ ! -e "${ED%/}"/usr/lib/systemd/systemd ]]; then
+		# Avoid breaking boot/reboot
+		dosym "../../..${ROOTPREFIX%/}/lib/systemd/systemd" /usr/lib/systemd/systemd
+		dosym "../../..${ROOTPREFIX%/}/lib/systemd/systemd-shutdown" /usr/lib/systemd/systemd-shutdown
+	fi
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT%/}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT%/}"/etc/env.d/??locale )
+	local locale_conf="${EROOT%/}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+pkg_preinst() {
+	# If /lib/systemd and /usr/lib/systemd are the same directory, remove the
+	# symlinks we created in src_install.
+	if [[ $(realpath "${EROOT%/}${ROOTPREFIX}/lib/systemd") == $(realpath "${EROOT%/}/usr/lib/systemd") ]]; then
+		if [[ -L ${ED%/}/usr/lib/systemd/systemd ]]; then
+			rm "${ED%/}/usr/lib/systemd/systemd" || die
+		fi
+		if [[ -L ${ED%/}/usr/lib/systemd/systemd-shutdown ]]; then
+			rm "${ED%/}/usr/lib/systemd/systemd-shutdown" || die
+		fi
+	fi
+}
+
+pkg_postinst() {
+	newusergroup() {
+		enewgroup "$1"
+		enewuser "$1" -1 -1 -1 "$1"
+	}
+
+	enewgroup input
+	enewgroup kvm 78
+	enewgroup systemd-journal
+	newusergroup systemd-bus-proxy
+	newusergroup systemd-coredump
+	newusergroup systemd-journal-gateway
+	newusergroup systemd-journal-remote
+	newusergroup systemd-journal-upload
+	newusergroup systemd-network
+	newusergroup systemd-resolve
+	newusergroup systemd-timesync
+
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required. Despite that this file is owned by sys-apps/hwids.
+	if has_version "sys-apps/hwids[udev]"; then
+		udevadm hwdb --update --root="${EROOT%/}"
+	fi
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respect, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	systemd_reenable systemd-networkd.service systemd-resolved.service
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-235.ebuild b/sys-apps/systemd/systemd-235.ebuild
deleted file mode 100644
index 6fe34a0809b9..000000000000
--- a/sys-apps/systemd/systemd-235.ebuild
+++ /dev/null
@@ -1,446 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
-fi
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http
-	idn importd +kmod libidn2 +lz4 lzma nat pam policykit
-	qrcode +seccomp selinux ssl sysv-utils test vanilla xkb"
-
-REQUIRED_USE="importd? ( curl gcrypt lzma )"
-
-MINKV="3.11"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	!<sys-libs/glibc-2.16
-	acl? ( sys-apps/acl:0= )
-	apparmor? ( sys-libs/libapparmor:0= )
-	audit? ( >=sys-process/audit-2:0= )
-	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
-	curl? ( net-misc/curl:0= )
-	elfutils? ( >=dev-libs/elfutils-0.158:0= )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
-	http? (
-		>=net-libs/libmicrohttpd-0.9.33:0=
-		ssl? ( >=net-libs/gnutls-3.1.4:0= )
-	)
-	idn? (
-		libidn2? ( net-dns/libidn2 )
-		!libidn2? ( net-dns/libidn )
-	)
-	importd? (
-		app-arch/bzip2:0=
-		sys-libs/zlib:0=
-	)
-	kmod? ( >=sys-apps/kmod-15:0= )
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
-	nat? ( net-firewall/iptables:0= )
-	pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
-	qrcode? ( media-gfx/qrencode:0= )
-	seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	sysv-utils? (
-		!sys-apps/systemd-sysv-utils
-		!sys-apps/sysvinit )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/baselayout-2.2
-	selinux? ( sec-policy/selinux-base-policy[systemd] )
-	!build? ( || (
-		sys-apps/util-linux[kill(-)]
-		sys-process/procps[kill(+)]
-		sys-apps/coreutils[kill(-)]
-	) )
-	!sys-auth/nss-myhostname
-	!<sys-kernel/dracut-044
-	!sys-fs/eudev
-	!sys-fs/udev"
-
-# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
-PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
-	>=sys-apps/hwids-20150417[udev]
-	>=sys-fs/udev-init-scripts-25
-	policykit? ( sys-auth/polkit )
-	!vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils:0
-	dev-util/gperf
-	>=dev-util/intltool-0.50
-	>=sys-apps/coreutils-8.16
-	>=sys-kernel/linux-headers-${MINKV}
-	virtual/pkgconfig
-	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-	test? ( sys-apps/dbus )
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
-			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
-			~TIMERFD ~TMPFS_XATTR ~UNIX
-			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
-			~!SYSFS_DEPRECATED_V2"
-
-		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
-
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-			if linux_chkconfig_present X86; then
-				CONFIG_CHECK+=" ~DMIID"
-			fi
-		fi
-
-		if kernel_is -lt ${MINKV//./ }; then
-			ewarn "Kernel version at least ${MINKV} required"
-		fi
-
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	default
-	[[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch
-		"${FILESDIR}"/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch
-	)
-
-	if ! use vanilla; then
-		PATCHES+=(
-			"${FILESDIR}/218-Dont-enable-audit-by-default.patch"
-			"${FILESDIR}/228-noclean-tmp.patch"
-			"${FILESDIR}/233-systemd-user-pam.patch"
-			"${FILESDIR}/234-uucp-group.patch"
-			"${FILESDIR}/generator-path.patch"
-		)
-	fi
-
-	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-	default
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-
-	python_setup
-
-	multilib-minimal_src_configure
-}
-
-meson_use() {
-	usex "$1" true false
-}
-
-meson_multilib() {
-	if multilib_is_native_abi; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-meson_multilib_native_use() {
-	if multilib_is_native_abi && use "$1"; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		-Dpamlibdir="$(getpam_mod_dir)"
-		# avoid bash-completion dep
-		-Dbashcompletiondir="$(get_bashcompdir)"
-		# make sure we get /bin:/sbin in $PATH
-		-Dsplit-usr=true
-		-Drootprefix="${EPREFIX}${ROOTPREFIX}"
-		-Dsysvinit-path=
-		-Dsysvrcnd-path=
-		# no deps
-		-Defi=$(meson_multilib)
-		-Dima=true
-		# Optional components/dependencies
-		-Dacl=$(meson_multilib_native_use acl)
-		-Dapparmor=$(meson_multilib_native_use apparmor)
-		-Daudit=$(meson_multilib_native_use audit)
-		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
-		-Dlibcurl=$(meson_multilib_native_use curl)
-		-Delfutils=$(meson_multilib_native_use elfutils)
-		-Dgcrypt=$(meson_use gcrypt)
-		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
-		-Defi-libdir="/usr/$(get_libdir)"
-		-Dmicrohttpd=$(meson_multilib_native_use http)
-		$(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false)
-		-Dimportd=$(meson_multilib_native_use importd)
-		-Dbzip2=$(meson_multilib_native_use importd)
-		-Dzlib=$(meson_multilib_native_use importd)
-		-Dkmod=$(meson_multilib_native_use kmod)
-		-Dlz4=$(meson_use lz4)
-		-Dxz=$(meson_use lzma)
-		-Dlibiptc=$(meson_multilib_native_use nat)
-		-Dpam=$(meson_use pam)
-		-Dpolkit=$(meson_multilib_native_use policykit)
-		-Dqrencode=$(meson_multilib_native_use qrcode)
-		-Dseccomp=$(meson_multilib_native_use seccomp)
-		-Dselinux=$(meson_multilib_native_use selinux)
-		#-Dtests=$(meson_multilib_native_use test)
-		-Ddbus=$(meson_multilib_native_use test)
-		-Dxkbcommon=$(meson_multilib_native_use xkb)
-		# hardcode a few paths to spare some deps
-		-Dpath-kill=/bin/kill
-		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
-		# Breaks screen, tmux, etc.
-		-Ddefault-kill-user-processes=false
-
-		# multilib options
-		-Dbacklight=$(meson_multilib)
-		-Dbinfmt=$(meson_multilib)
-		-Dcoredump=$(meson_multilib)
-		-Denvironment-d=$(meson_multilib)
-		-Dfirstboot=$(meson_multilib)
-		-Dhibernate=$(meson_multilib)
-		-Dhostnamed=$(meson_multilib)
-		-Dhwdb=$(meson_multilib)
-		-Dldconfig=$(meson_multilib)
-		-Dlocaled=$(meson_multilib)
-		-Dman=$(meson_multilib)
-		-Dnetworkd=$(meson_multilib)
-		-Dquotacheck=$(meson_multilib)
-		-Drandomseed=$(meson_multilib)
-		-Drfkill=$(meson_multilib)
-		-Dsysusers=$(meson_multilib)
-		-Dtimedated=$(meson_multilib)
-		-Dtimesyncd=$(meson_multilib)
-		-Dtmpfiles=$(meson_multilib)
-		-Dvconsole=$(meson_multilib)
-	)
-
-	if multilib_is_native_abi && use idn; then
-		myconf+=(
-			-Dlibidn2=$(usex libidn2 true false)
-			-Dlibidn=$(usex libidn2 false true)
-		)
-	else
-		myconf+=(
-			-Dlibidn2=false
-			-Dlibidn=false
-		)
-	fi
-
-	meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_test() {
-	eninja test
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
-
-multilib_src_install_all() {
-	# meson doesn't know about docdir
-	mv "${ED%/}"/usr/share/doc/{systemd,${PF}} || die
-
-	einstalldocs
-	dodoc "${FILESDIR}"/nsswitch.conf
-
-	if use sysv-utils; then
-		for app in halt poweroff reboot runlevel shutdown telinit; do
-			dosym "${EPREFIX}${ROOTPREFIX%/}/bin/systemctl" /sbin/${app}
-		done
-		dosym "${EPREFIX}${ROOTPREFIX%/}/lib/systemd/systemd" /sbin/init
-	else
-		# we just keep sysvinit tools, so no need for the mans
-		rm "${ED%/}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
-			|| die
-		rm "${ED%/}"/usr/share/man/man1/init.1 || die
-	fi
-
-	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
-		/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd \
-		/var/log/journal/remote
-
-	# Symlink /etc/sysctl.conf for easy migration.
-	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
-
-	# If we install these symlinks, there is no way for the sysadmin to remove them
-	# permanently.
-	rm -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
-	rm -f "${ED%/}"/etc/systemd/system/dbus-org.freedesktop.network1.service || die
-	rm -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
-	rm -f "${ED%/}"/etc/systemd/system/dbus-org.freedesktop.resolve1.service || die
-	rm -fr "${ED%/}"/etc/systemd/system/network-online.target.wants || die
-	rm -fr "${ED%/}"/etc/systemd/system/sockets.target.wants || die
-	rm -fr "${ED%/}"/etc/systemd/system/sysinit.target.wants || die
-
-	rm -r "${ED%/}${ROOTPREFIX%/}/lib/udev/hwdb.d" || die
-
-	if [[ ! -e "${ED%/}"/usr/lib/systemd/systemd ]]; then
-		# Avoid breaking boot/reboot
-		dosym "../../..${ROOTPREFIX%/}/lib/systemd/systemd" /usr/lib/systemd/systemd
-		dosym "../../..${ROOTPREFIX%/}/lib/systemd/systemd-shutdown" /usr/lib/systemd/systemd-shutdown
-	fi
-}
-
-migrate_locale() {
-	local envd_locale_def="${EROOT%/}/etc/env.d/02locale"
-	local envd_locale=( "${EROOT%/}"/etc/env.d/??locale )
-	local locale_conf="${EROOT%/}/etc/locale.conf"
-
-	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
-		# If locale.conf does not exist...
-		if [[ -e ${envd_locale} ]]; then
-			# ...either copy env.d/??locale if there's one
-			ebegin "Moving ${envd_locale} to ${locale_conf}"
-			mv "${envd_locale}" "${locale_conf}"
-			eend ${?} || FAIL=1
-		else
-			# ...or create a dummy default
-			ebegin "Creating ${locale_conf}"
-			cat > "${locale_conf}" <<-EOF
-				# This file has been created by the sys-apps/systemd ebuild.
-				# See locale.conf(5) and localectl(1).
-
-				# LANG=${LANG}
-			EOF
-			eend ${?} || FAIL=1
-		fi
-	fi
-
-	if [[ ! -L ${envd_locale} ]]; then
-		# now, if env.d/??locale is not a symlink (to locale.conf)...
-		if [[ -e ${envd_locale} ]]; then
-			# ...warn the user that he has duplicate locale settings
-			ewarn
-			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
-			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
-			ewarn "and create the symlink with the following command:"
-			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
-			ewarn
-		else
-			# ...or just create the symlink if there's nothing here
-			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
-			ln -n -s ../locale.conf "${envd_locale_def}"
-			eend ${?} || FAIL=1
-		fi
-	fi
-}
-
-pkg_preinst() {
-	# If /lib/systemd and /usr/lib/systemd are the same directory, remove the
-	# symlinks we created in src_install.
-	if [[ $(realpath "${EROOT%/}${ROOTPREFIX}/lib/systemd") == $(realpath "${EROOT%/}/usr/lib/systemd") ]]; then
-		if [[ -L ${ED%/}/usr/lib/systemd/systemd ]]; then
-			rm "${ED%/}/usr/lib/systemd/systemd" || die
-		fi
-		if [[ -L ${ED%/}/usr/lib/systemd/systemd-shutdown ]]; then
-			rm "${ED%/}/usr/lib/systemd/systemd-shutdown" || die
-		fi
-	fi
-}
-
-pkg_postinst() {
-	newusergroup() {
-		enewgroup "$1"
-		enewuser "$1" -1 -1 -1 "$1"
-	}
-
-	enewgroup input
-	enewgroup kvm 78
-	enewgroup systemd-journal
-	newusergroup systemd-bus-proxy
-	newusergroup systemd-coredump
-	newusergroup systemd-journal-gateway
-	newusergroup systemd-journal-remote
-	newusergroup systemd-journal-upload
-	newusergroup systemd-network
-	newusergroup systemd-resolve
-	newusergroup systemd-timesync
-
-	systemd_update_catalog
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required. Despite that this file is owned by sys-apps/hwids.
-	if has_version "sys-apps/hwids[udev]"; then
-		udevadm hwdb --update --root="${EROOT%/}"
-	fi
-
-	udev_reload || FAIL=1
-
-	# Bug 465468, make sure locales are respect, and ensure consistency
-	# between OpenRC & systemd
-	migrate_locale
-
-	systemd_reenable systemd-networkd.service systemd-resolved.service
-
-	if [[ ${FAIL} ]]; then
-		eerror "One of the postinst commands failed. Please check the postinst output"
-		eerror "for errors. You may need to clean up your system and/or try installing"
-		eerror "systemd again."
-		eerror
-	fi
-}
-
-pkg_prerm() {
-	# If removing systemd completely, remove the catalog database.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
-	fi
-}
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index a2a389418096..67b8e161ffed 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -4,16 +4,13 @@ DIST util-linux-2.28.2.tar.xz 4149700 SHA256 b89d37146f20bede93a42c847bce881a17e
 DIST util-linux-2.29.2.tar.xz 4277668 SHA256 accea4d678209f97f634f40a93b7e9fcad5915d1f4749f6c47bee6bf110fe8e3 SHA512 0a87e6758531f74276f3de7607ef545f324b9b36b444aa5d163140c5fb0f4f7602655d7ec9939f92550dcb320d922cd69521a2183199d463795e67d3c27fce79 WHIRLPOOL 1f45711e593c76c6e208a28892ed2bf2622adb5fa1334867e13c6bf775a8903c2f1ebf18c3238d96fe139c5b60d61abf496251cf594a339209ce044f2bb8c17a
 DIST util-linux-2.30.1.tar.xz 4459284 SHA256 1be4363a91ac428c9e43fc04dc6d2c66a19ec1e36f1105bd4b481540be13b841 SHA512 bcf1807198660c133c380e13d6ba5dcdb7470c47bcaeea03ccc5a78a0d834e3df3d13ae5ffc35fd7f8fff7ba062629d4b1f5cde78452b846c9315c51c9e108f5 WHIRLPOOL 19e78768cf2fd2d73bb7b45cb826101b4653bf49c9838bda10f05e508f06b117bb846ce517726465384bfe94ba24981f261d7b5091458242fb0c14d593d4b29e
 DIST util-linux-2.30.2.tar.xz 4442624 SHA256 7b5be5489e9b5b7177832836467aba1c87bf0e9bcbcb5a6f35d76cd4782589dc SHA512 b92ec16d5e8a405ad9ebbac8673bb49c5bf0a7f630118477f12c7a3c6b3b3ee5d56868632dd71fffd5c0434821207c2769f6859b9d398c2df770ec6487d7c32d WHIRLPOOL 771d2af788241db337be1e11be499d42b67ec86fa43da2eb161914194d1f002e95d9080793117a4b58a57691df8677ac59e9356ae2da7076ca48188c185a1843
-DIST util-linux-2.31-rc1.tar.xz 4459892 SHA256 25771b2feb19bed4bf50597c597b2fed4f7580db135fb63a9421ceeeee123436 SHA512 027815da2ee4d342ff1578d5bba71ea63dc1cd6816ad753c644b5422b693e9dfe35ab158101ac9d7f8b7dbee1d2cf97e4930b24ed247eba7be1312e5292c3f9f WHIRLPOOL 6309c11499ee310b754780a31229385ee1fe87f31a84969b490d93d32d294f3a9c096c909abb363f06378e87bea3015bc7150620493989838ae47a4140912b18
-DIST util-linux-2.31-rc2.tar.xz 4472160 SHA256 adf02ca514d20fc31e608f158bf11de27875fb22db9a6702ed60c36dd052b275 SHA512 d5b882dbe566e5ad4cbf3ea328bc777ae643c271c4db4a119f270222ef50d89bdb2244524093df794caf0ec9a6b5f559c618f0e36f2c1e2ce30e24c60e876a97 WHIRLPOOL f790512822ca30c4b1086ed735e234506375eef57721cf9692b460440fb09fc38a9088379a3d74be34d0d46231bd6ef9155aa05ea6338e54f22585418871c36a
-DIST util-linux-2.31_rc2-losetup_types.patch 1472 SHA256 00f04271f725b7d373ffe3db1b591bd8fbaf740fd5641673c47c0e2678720b5f SHA512 353b90e87948fda6aa357470260d6945f0993e89589a1380293b481a839bfe8a4618a55ec92e4c1962e25fe5f74de400cbf2c12371cc0a9298711182d953b51a WHIRLPOOL ff5afe50e51427ab181451c4a823101ceed0d237bcd4c8cc5e30ef365456d3aa1f102d0845e5d84e06f59206edd5ed21f3dabb61d50455f2ca32d8d2d7294342
+DIST util-linux-2.31.tar.xz 4503892 SHA256 f9be7cdcf4fc5c5064a226599acdda6bdf3d86c640152ba01ea642d91108dc8a SHA512 48b668526e96a132736b882090d0e33c20b4b3a0e1760502d83118ed98ccc9423d310848a2bb73f82f85e9c19f6191075ae2c5269b007e76be1fbd7b6b88fbf5 WHIRLPOOL 1667045919e29feafdea35f1c66b47f546b7b111347ad7cfcab94519bfba9119a492fa3475e2fef5d5c3383ff19daf9d4bbad1cca24ca1ea4be138e40e161611
 EBUILD util-linux-2.28.2.ebuild 5508 SHA256 dcbe429af2023147f49d14efc6079f77b640fd5098a50131bf4773404ac43c53 SHA512 7ce97d8d0325171d047508c3081fa3adadc79837f0821a4c5d63683e52353186328501d09bb0b884f3715ac443757a557c1c205f79c451a93f20c65035fe9516 WHIRLPOOL ce00e83c6e4a432f195d1997823bfb26b995cdf2b6c9b77f5b55b25ab5b1a3c9294e3985274c65b77b44bf1ded47ff7e7ec7b38d8f0dbf8e8811b0bdad741c96
 EBUILD util-linux-2.29.2-r1.ebuild 6022 SHA256 6579bc49e505806dc5eb5511c204cbebcf1a72837544afd10ee0b2d187eb5cd0 SHA512 ede52a77a6cba1f06f6ae18ae64d2f836e6f5babc2d407409878867e7ef46614ffbd6f8267ceffb51d374d1ab87955d5ebfb3e92863078845aea06488dee6fe5 WHIRLPOOL f658c636808f16da62d95eb8805ad32a9b1c891256a9ec15a75ee81e1ed2db0a1a97e354a33571dbd8edcfb044eb828106a955f883015a173aa9d2ea3ebc8c63
 EBUILD util-linux-2.30.1.ebuild 6073 SHA256 1c3a5ed5a02034c10b341cc69d20727399f13db6fde950487d57133b79cc0acc SHA512 f6f247c6119337f79e3ab559de54b35ff8c892633323606e687c957c8b2db540487c9b8b5b37554ae59e29946ad0cdac563cbc2ca7a99cb723c69398aac52366 WHIRLPOOL 86feef252078e51fb3cf1961c513998ae67c709355b19069f86255ec9d27155bc9b93334b5bbca28dfcbf596ba6e3d8e66a161134234ef14a30febc4ff90391b
 EBUILD util-linux-2.30.2.ebuild 6073 SHA256 1c3a5ed5a02034c10b341cc69d20727399f13db6fde950487d57133b79cc0acc SHA512 f6f247c6119337f79e3ab559de54b35ff8c892633323606e687c957c8b2db540487c9b8b5b37554ae59e29946ad0cdac563cbc2ca7a99cb723c69398aac52366 WHIRLPOOL 86feef252078e51fb3cf1961c513998ae67c709355b19069f86255ec9d27155bc9b93334b5bbca28dfcbf596ba6e3d8e66a161134234ef14a30febc4ff90391b
-EBUILD util-linux-2.31_rc1.ebuild 6113 SHA256 75fd7e729162fb71616429f72762f9987e010c52369f676ae66912b8e7f70c25 SHA512 1dc5b46a29f3784843d9731de2723e8c0c6cf1d80bc80ee58c814384c44f8af7fc41e44d18cb6c902cf675170433a578218a071ccad89223160f5c76506cd885 WHIRLPOOL 6a17f9ae8531cc8ff3342113bc553896131d3c925399720e8f61320d2d8b57505d35c1a81003104024407387b10480758c9df5b541beb56c26306965ed310501
-EBUILD util-linux-2.31_rc2.ebuild 6310 SHA256 6d2803635c2f3fb5c7ab44f6b2e938d2b4208ac8cb2402c5c42c62e3a74de7ad SHA512 85b96206e7b76bce5fd83a591697867e8dfdcc44dc61c751ea5151fce74521db3bf865ce52f56e085afa93b3a5f1429d82d7fb2caf257e1c84b3d19f522de9ec WHIRLPOOL 10fb9991cac2aaa7f2d9d56c51b115c62c53016728c8190583bc3794611e915136b94491ef0cc6df1707952cdc677b5b3b9f7e40bbeb724856c89cf6f5748a7a
-EBUILD util-linux-9999.ebuild 6113 SHA256 75fd7e729162fb71616429f72762f9987e010c52369f676ae66912b8e7f70c25 SHA512 1dc5b46a29f3784843d9731de2723e8c0c6cf1d80bc80ee58c814384c44f8af7fc41e44d18cb6c902cf675170433a578218a071ccad89223160f5c76506cd885 WHIRLPOOL 6a17f9ae8531cc8ff3342113bc553896131d3c925399720e8f61320d2d8b57505d35c1a81003104024407387b10480758c9df5b541beb56c26306965ed310501
+EBUILD util-linux-2.31.ebuild 6095 SHA256 edcafd9c1c11ee19d546d0710f965009a48291f76f6f88e35eee8e2f27f995e0 SHA512 92133a47e65461d7fbe99479061ca1f49de6c647937ae2b08c35f504992a96d9e011976a13fda03c004d0834e80caa36f8e3d5c50438fc6dc35b53fbd3443f9b WHIRLPOOL cb4cbfa45498aad32228e904f436eadaf3a46ec29a45c183a5692c18a0ab8348dd00cfdebce5aa466d9c45a0bf229ec2f2bdf263f08e5b64f67a26712f3a6a9b
+EBUILD util-linux-9999.ebuild 6095 SHA256 edcafd9c1c11ee19d546d0710f965009a48291f76f6f88e35eee8e2f27f995e0 SHA512 92133a47e65461d7fbe99479061ca1f49de6c647937ae2b08c35f504992a96d9e011976a13fda03c004d0834e80caa36f8e3d5c50438fc6dc35b53fbd3443f9b WHIRLPOOL cb4cbfa45498aad32228e904f436eadaf3a46ec29a45c183a5692c18a0ab8348dd00cfdebce5aa466d9c45a0bf229ec2f2bdf263f08e5b64f67a26712f3a6a9b
 MISC ChangeLog 12932 SHA256 d8b36c6a1492c24f0ff0c47ed2ba5a83168ff61b7e608da5d6d2f7b1ded9dca5 SHA512 3af940e4798129722304739796183a7f185e2bb46653e68722ec99caced6b8bc4a985e54511fba0feae333036928fc8daf4a74c081f589acf9ff23f5efd4afa6 WHIRLPOOL 51a5399b50e743a84499d5c0363103beaa140effc16d37eeaaa3f86172037533a737d0124c5c2bdb95177fabdfc79ae110dc42e88e886cd2d103559b0964a2d9
 MISC ChangeLog-2015 79222 SHA256 8f46bfb6fa3cf29ae15a63d9d482a64044196af6ccd6605972d93da5f9c78b37 SHA512 794cfd5f96e6da3247693c3adef7df1ce451c51e790d0b8f43ba221918053130bf39d4a8a3a8ef642ace608d979b604ba2c55ff348490b0dace4e6d9e53119b5 WHIRLPOOL af58c38f736bfe76bf98a72982165d72fb8523a4d5082d601179a1f93fa405e58c15854b899eb8614618bda566d2f682c7221a5c45984fadb4b555dbe7deb30b
 MISC metadata.xml 947 SHA256 07970446e1e05479e7a582190e17aaab8190197b6771c779d89d177a8036b619 SHA512 3822f7f3ccd120bbc788c64db0b79d55ad892bed99d01f8e0988c57ca7277a1936e03dbffd2898e68a2b6da25c301bc2cafb1da9658cdbbdfee1c9fb65e1699c WHIRLPOOL d0d33c91a68b44b8d4207b7acaeb0d180591944cacd5fe8fc918b161f24c107d5c69a17831e620eeab7504364f725a427272ac242041ed9da289f3ed3196ac6f
diff --git a/sys-apps/util-linux/util-linux-2.31.ebuild b/sys-apps/util-linux/util-linux-2.31.ebuild
new file mode 100644
index 000000000000..81b95f587ee9
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.31.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit ltprune toolchain-funcs libtool flag-o-matic bash-completion-r1 \
+	pam python-single-r1 multilib-minimal systemd
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="git://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-linux ~arm-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/"
+
+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"
+
+# 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?] )
+	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-block/eject
+	!<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}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	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
+}
+
+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=(
+		--disable-chfn-chsh
+		--disable-login
+		--disable-nologin
+		--disable-su
+		--docdir='${datarootdir}'/doc/${PF}
+		--enable-agetty
+		--enable-bash-completion
+		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
+		--enable-line
+		--enable-partx
+		--enable-raw
+		--enable-rename
+		--enable-rfkill
+		--enable-schedutils
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		--with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_systemunitdir)" "no")
+		$(multilib_native_use_enable caps setpriv)
+		$(multilib_native_use_enable cramfs)
+		$(multilib_native_use_enable fdformat)
+		$(multilib_native_use_enable nls)
+		$(multilib_native_use_enable suid makeinstall-chown)
+		$(multilib_native_use_enable suid makeinstall-setuid)
+		$(multilib_native_use_enable tty-helpers mesg)
+		$(multilib_native_use_enable tty-helpers wall)
+		$(multilib_native_use_enable tty-helpers write)
+		$(multilib_native_use_with python)
+		$(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 unicode widechar)
+		$(use_enable kill)
+		$(use_enable static-libs static)
+		$(use_with selinux)
+		$(usex ncurses '' '--without-tinfo')
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		# build libraries only
+		emake -f Makefile -f - mylibs \
+			<<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)'
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
+			install-pkgconfigDATA install-uuidincHEADERS \
+			install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
+			install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS
+	fi
+
+	if multilib_is_native_abi; then
+		# need the libs in /
+		gen_usr_ldscript -a blkid mount smartcols uuid
+
+		use python && python_optimize
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
+
+	# e2fsprogs-libs didnt install .la files, and .pc work fine
+	prune_libtool_files
+
+	if use pam; then
+		newpamd "${FILESDIR}/runuser.pamd" runuser
+		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
+	fi
+}
+
+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-apps/util-linux/util-linux-2.31_rc1.ebuild b/sys-apps/util-linux/util-linux-2.31_rc1.ebuild
deleted file mode 100644
index b23afd5b6532..000000000000
--- a/sys-apps/util-linux/util-linux-2.31_rc1.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit ltprune toolchain-funcs libtool flag-o-matic bash-completion-r1 \
-	pam python-single-r1 multilib-minimal systemd
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="git://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-linux ~arm-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/"
-
-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"
-
-# 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?] )
-	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-block/eject
-	!<sys-libs/e2fsprogs-libs-1.41.8
-	!<sys-fs/e2fsprogs-1.41.8
-	!<app-shells/bash-completion-2.3-r2"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	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
-}
-
-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=(
-		--disable-chfn-chsh
-		--disable-login
-		--disable-nologin
-		--disable-reset
-		--disable-su
-		--docdir='${datarootdir}'/doc/${PF}
-		--enable-agetty
-		--enable-bash-completion
-		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
-		--enable-line
-		--enable-partx
-		--enable-raw
-		--enable-rename
-		--enable-rfkill
-		--enable-schedutils
-		--with-bashcompletiondir="$(get_bashcompdir)"
-		--with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_systemunitdir)" "no")
-		$(multilib_native_use_enable caps setpriv)
-		$(multilib_native_use_enable cramfs)
-		$(multilib_native_use_enable fdformat)
-		$(multilib_native_use_enable nls)
-		$(multilib_native_use_enable suid makeinstall-chown)
-		$(multilib_native_use_enable suid makeinstall-setuid)
-		$(multilib_native_use_enable tty-helpers mesg)
-		$(multilib_native_use_enable tty-helpers wall)
-		$(multilib_native_use_enable tty-helpers write)
-		$(multilib_native_use_with python)
-		$(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 unicode widechar)
-		$(use_enable kill)
-		$(use_enable static-libs static)
-		$(use_with selinux)
-		$(usex ncurses '' '--without-tinfo')
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		# build libraries only
-		emake -f Makefile -f - mylibs \
-			<<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)'
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
-			install-pkgconfigDATA install-uuidincHEADERS \
-			install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
-			install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS
-	fi
-
-	if multilib_is_native_abi; then
-		# need the libs in /
-		gen_usr_ldscript -a blkid mount smartcols uuid
-
-		use python && python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
-	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	prune_libtool_files
-
-	if use pam; then
-		newpamd "${FILESDIR}/runuser.pamd" runuser
-		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
-	fi
-}
-
-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-apps/util-linux/util-linux-2.31_rc2.ebuild b/sys-apps/util-linux/util-linux-2.31_rc2.ebuild
deleted file mode 100644
index 493ecb1a0edf..000000000000
--- a/sys-apps/util-linux/util-linux-2.31_rc2.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit ltprune toolchain-funcs libtool flag-o-matic bash-completion-r1 \
-	pam python-single-r1 multilib-minimal systemd
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="git://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-linux ~arm-linux ~x86-linux"
-	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
-
-	SRC_URI+=" https://github.com/karelzak/util-linux/commit/c4e60bc0807b04ab104594abc83301481d5d5995.patch -> ${PN}-2.31_rc2-losetup_types.patch"
-fi
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/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"
-
-# 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?] )
-	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-block/eject
-	!<sys-libs/e2fsprogs-libs-1.41.8
-	!<sys-fs/e2fsprogs-1.41.8
-	!<app-shells/bash-completion-2.3-r2"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${DISTDIR}/${P}-losetup_types.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	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
-}
-
-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=(
-		--disable-chfn-chsh
-		--disable-login
-		--disable-nologin
-		--disable-reset
-		--disable-su
-		--docdir='${datarootdir}'/doc/${PF}
-		--enable-agetty
-		--enable-bash-completion
-		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
-		--enable-line
-		--enable-partx
-		--enable-raw
-		--enable-rename
-		--enable-rfkill
-		--enable-schedutils
-		--with-bashcompletiondir="$(get_bashcompdir)"
-		--with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_systemunitdir)" "no")
-		$(multilib_native_use_enable caps setpriv)
-		$(multilib_native_use_enable cramfs)
-		$(multilib_native_use_enable fdformat)
-		$(multilib_native_use_enable nls)
-		$(multilib_native_use_enable suid makeinstall-chown)
-		$(multilib_native_use_enable suid makeinstall-setuid)
-		$(multilib_native_use_enable tty-helpers mesg)
-		$(multilib_native_use_enable tty-helpers wall)
-		$(multilib_native_use_enable tty-helpers write)
-		$(multilib_native_use_with python)
-		$(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 unicode widechar)
-		$(use_enable kill)
-		$(use_enable static-libs static)
-		$(use_with selinux)
-		$(usex ncurses '' '--without-tinfo')
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		# build libraries only
-		emake -f Makefile -f - mylibs \
-			<<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)'
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
-			install-pkgconfigDATA install-uuidincHEADERS \
-			install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
-			install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS
-	fi
-
-	if multilib_is_native_abi; then
-		# need the libs in /
-		gen_usr_ldscript -a blkid mount smartcols uuid
-
-		use python && python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
-	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	prune_libtool_files
-
-	if use pam; then
-		newpamd "${FILESDIR}/runuser.pamd" runuser
-		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
-	fi
-}
-
-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-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index b23afd5b6532..81b95f587ee9 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -56,7 +56,7 @@ RDEPEND+="
 	!sys-block/eject
 	!<sys-libs/e2fsprogs-libs-1.41.8
 	!<sys-fs/e2fsprogs-1.41.8
-	!<app-shells/bash-completion-2.3-r2"
+	!<app-shells/bash-completion-2.7-r1"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -107,7 +107,6 @@ multilib_src_configure() {
 		--disable-chfn-chsh
 		--disable-login
 		--disable-nologin
-		--disable-reset
 		--disable-su
 		--docdir='${datarootdir}'/doc/${PF}
 		--enable-agetty
diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest
index 1e680336b989..15f8a764fb90 100644
--- a/sys-auth/consolekit/Manifest
+++ b/sys-auth/consolekit/Manifest
@@ -9,19 +9,14 @@ AUX consolekit-shutdown-reboot-without-policies.patch 924 SHA256 cd9a2aa582644ad
 AUX consolekit-udev-acl-install_to_usr.patch 750 SHA256 823316f6898eaab0744e42fa11b1631f64187aebca35baa5aeab09279820bedd SHA512 d2d6fcedea5e72f5a1b387f411ac62a59fd3c9e90a318bd85c35d210b89b18f01511f6b05352c1a4a9508622f0b9242c1b9c15d5ae4f8adf2819b6c3a0ff5ac9 WHIRLPOOL a9b8f48c5dddabfa28c2a65ac99c10dd7cba41d8bdcdc1fac4a0932391a81d9ed87f34115d7a43611d2cd126d10a5378edb8e734c888d529eca4b0d20dd15ac1
 AUX pam-foreground-compat.ck 389 SHA256 0b5b22641e2b138f4e9dfff9790df9fedaf2f760cc3d878ee1e94c2fd52edea9 SHA512 3cabd23ff7dc5de0a86284c3a3d3ff923228969cc954a1036290d4f7f6d58646ea6ea1445f472476b6f319df4dcd22f71e5e0f5cc8c845cd7e0b148af689ce5a WHIRLPOOL a8e36292dc094e107492e65efd147b35e217c652c8bcc52c768942b15660ff7d251e55ee038ce326905f5dc8f17857b62725768d60c3d5c93927550c8ff47db2
 DIST ConsoleKit-0.4.6.tar.xz 366572 SHA256 b41d17e06f80059589fbeefe96ad07bcc564c49e65516da1caf975146475565c SHA512 54955e3e83778a9216846104da8762fd50a37190e209127dd5d211e2227da617e14f6f5c1359905396d299656e526d14e1187b28eaff7d0ae1d7563dc8d9b46d WHIRLPOOL ebf36b109b4c646d0b874f6b8e2ae9e2d190022ee9b6feff6cbb6b9203c80401c538cc3ca674fa7bde4f07e658d5460864e9784c1e0249d49b4784725a4e05c7
-DIST ConsoleKit2-1.0.1.tar.bz2 1192681 SHA256 741c53321a0792b165f386c73c668af25615accab6d15983290103348a3ff00c SHA512 028e7347ff7293ebf3d08541d801e987cbc82fb31d98b67aa23e6dc28d00a422db9591c716c568320b6dde3fa01eb0b77b43c06d230f4bedd1085e078848a202 WHIRLPOOL c555281cd177ed243b1beb3d07d2988d029d8d89cac5242d12dcc37270d2d7adb1d503eaeba2f466964b589c4d10b8f2f014fef7067b535a7be9a360612d0485
 DIST ConsoleKit2-1.1.0.tar.bz2 630178 SHA256 a40d92358aca9f627a224dca674090e310423b00ed63fc06482997611661b69b SHA512 14ded07d4140e7a31132de21e84c2878475676b8c98f72b42340708972ed384abb9ba9380d74719718fc220c001387c788cf709cd15f8b19d598467dfe8a57df WHIRLPOOL 8f08d81576b5121b2da6cd94b3b5675ea55dce17997b035d0ba451c011b101f9e315e983b20610ee022ee286b50a7b13e2508584b9c08dba0c6cda20b8801a63
-DIST ConsoleKit2-1.1.1.tar.bz2 1372801 SHA256 795b2cfb766bdffb9187ef7f8beb8d8298e4c38df4a69377115297a0dee3b0d0 SHA512 168af9760e10914dff5e693d2c3b2e2a35b1662fc2769e2954eec0238f7f313ff154add650fa6f0f59e73e4e0aec2fe63ff62446a3c73c2d4437408e69aa97b6 WHIRLPOOL cef8ac778923671f9bffe87ecd8045b30630578e2599d0ccf37ad8d8070b7c0ca6936e9837abc5fc1f7af5f119edfeae68d9a14199485936677a5faba09b0958
 DIST ConsoleKit2-1.1.2.tar.bz2 1125567 SHA256 f4b26b45edf7416ed76052b8f85ea05b7b560c744edee8042575667528bc1f24 SHA512 fadca85e05c176b06ead40fba5c068d497bf69bcc322287363d0c27cdd6627b758295db1ef534b908c0e6240486430d8cb36660b4d71216a60d19a52d6d0db39 WHIRLPOOL b9655418498cb2b63a30d6d1a56f6afe0adf8f6ae3a6aa97fc55da8288fae588deea04ab868f0ef524e185696ad87a35aca6de8eb4e6cb32bc4ba729040e0cbb
 DIST ConsoleKit2-1.2.0.tar.bz2 1125402 SHA256 d6ea13b306557a76519388de39bf7f1a1ea9010af147fad4fb3131ce634bd8b3 SHA512 c0f6e629b7229c2ffaafe8da899970b48c8372402447af18560fffd8804d9ab91a4ad2eb82c8f648a14807f8ccc5fb1ab4366de14faa8a2d5fb3767a6a4253f7 WHIRLPOOL 46c463fbfafd188dcaecc61f3ce83599a746e18b4c3ea129a205fec24927cc80958decf95913de679ddded0120e15fb631dcdeb08fd09a0029350b70b8b8ecd9
 DIST consolekit_0.4.6-4.debian.tar.gz 12192 SHA256 6d4dd5e13a76454b4bab27ab6b407718cd77616afd2b1af7cb8d947c1323b802 SHA512 f7fc5965b1f495d16a8ca167940431bc2569e9bde9e4a356b9c9ed00c2825db61da7b6db3d434d977fff72b3aaef30c455a365b9eba282a887a523753613b58f WHIRLPOOL 961a918c21259e24c68c7a5bf93964825b891ea207c088fecab61f81434012dc8925fca83b74518cfc9cf42f2c4a87eba7518c0829f663716ca0e11e38c856c9
 EBUILD consolekit-0.4.6.ebuild 3396 SHA256 69aee2e526d17e7be61d82199e0b9ae1d6d52431ec0c97bcb06b842966d3d69c SHA512 2a0acd029eb9db8d3035d0fbdc52e5c0cf6a84779dfd41d7175970b8c4ff8600292302740d375eacf8fa0939714d82c3c602f285abf811fa36e29c3e41eb7e3a WHIRLPOOL 1789b31faffc8d565650562fa2e1f0ab7e07b49c689a45bf1b5d54447f890161dc97d08da6662644b1affc0b6eb4fe61d915c766465644d8001226d7093efb13
-EBUILD consolekit-1.0.1.ebuild 3104 SHA256 8f4b8990ba7d781aa6d881fae13e943a3e072b55f19ac3d4bed004f751dd92a0 SHA512 4bf6bd62eba5e480d710235cef658516afb119b53157eee51ef6ec20f28ca91fdddb290c34201e598a46aeb82d4f9fcb42da224c8bed0446a818b857a121a31c WHIRLPOOL 07dc530b15bf56776811f3810fc0fd99953619f41d80539573e42c554d6c08a7772cf5b80fbbd20fbea43a608a6625d9c8646e5ae95705c492e4e98304ede4ee
 EBUILD consolekit-1.1.0-r1.ebuild 3238 SHA256 bb02ece53c8df44c4e9231c69858668ee1c62bcbd0cfe9ef8d67921ac1d806f7 SHA512 d124ec42562ab4bb87e34344dd165a70f5fb0116f016d901dd6f2cfa3123540f72ec1466c0c40406f9b1a7629c4a2854c8905ba24984851cf4acfdcd1a3226b8 WHIRLPOOL 85796ca9fc312ee227ab6b47eb71d861354030f7621feab62d723335df034b02da369acc1b40cfe8661981120733d68abf5e3d195a861576583062c8228b8212
-EBUILD consolekit-1.1.0.ebuild 3099 SHA256 57f61a91d8df4e82e8725f71326b05246d55025fade6de68ec63ee054e73a8ef SHA512 dd4750b57e2cc646cf5ca7ea541a94a35f4be52aa89efa6e805df80532573b044e3a4236aa4b95b40455f991e3dc6c18f2fc71f9711c193108ad4179be014984 WHIRLPOOL b566a0056a4bdf8fda5225e6d3cc63582301eac726a062c816c45b845765554ccba9d522f23d62548ff0449bd75749214bff8161ac72f19693b5afc2fe0e6ef3
-EBUILD consolekit-1.1.1.ebuild 3545 SHA256 1deee9c0995c6440c8e6cc612c29d27ba08dfcc915f5dd0126dbe018cd7dcf51 SHA512 a77a489d2ed4696e4ac883607ea421490c1713fbc8865a36edb90f8a07c171c80522cdff194ff342c72be88328ed9085b40fabf1679203bce5d175efddde432d WHIRLPOOL e7f537d3af33a0c68ee0657f7747afa96fe0d912fe91775956e902d6e83847504ad028aa303a7f628682286e2dac4996599b70a3b46cc645340e2dcbfec24ebd
 EBUILD consolekit-1.1.2.ebuild 3507 SHA256 50cb27aa721430efaae6a0fc128432c36dc5049709b1bb7085925d50b505b16a SHA512 e42f804f32026ca15fa13a38535e4808c1552864d952924a4f1922af8a6cc638b4bdd79f52479fd8d81afca9b8b0ab0a4c6e3f503646595573a52668198741df WHIRLPOOL 14004e62be9ad1752c74d644c423dd629859e5992ee4d23de374acb13068fbf6d20e9d0f60b78b0cbb04c2265f7d1801d45a2a70c667a439e4f1b57cdfb1e88c
-EBUILD consolekit-1.2.0.ebuild 3544 SHA256 e77561272e9d7441d1a1285d7699b569b1e36a3cf295a97edaea77b273d8d960 SHA512 03019491f7e0972f11e0af0f8430bd78537145b52f6ab23e8461fe620fc27d62cebce6781d1f11d0c85246945c71dbe21c86a4c78772eb8057cbbde454f42cda WHIRLPOOL dd83e65f62970ddd72606a00cdd618fdd18ad74e7b6c0a4d8fb7750294a792873fc2667653ed6044c2d1996174679326440c1efbd5423f3b488040a15c285938
+EBUILD consolekit-1.2.0.ebuild 3540 SHA256 9891f20b0cf9b049afe5958c09f2d6f9805fe462de8cd7961a1a4e3cf206a399 SHA512 2a7a85d060eab711291f75cdcb73b69c45aaa49a936913492f9af541bfd506a71f64e7b4c6d4ab307de57e365076e42e81f1f0eb71ec02a7ac288f5cee572640 WHIRLPOOL dc4f6598e0e92d84dcd3d679f7a0efa3ee32a8a0e82a49f619025baa333c8d558c61ff55e1ffd0fe01c085bcfbcff582af51d2e3b303ad1bb35b6b0ee149fa52
 EBUILD consolekit-9999.ebuild 3311 SHA256 2197dd7144686db2715b99f7b718f5089629c8dbe7757d355eea3fc5446e7a77 SHA512 d28c3a5da5ece93cf7e9f22746ffcbd53beee19b9106258c210b4ff937713cff650771cdfd4d2919d4122517f2e534d5e7861d3a8392d4fc4e691e92a25e4b69 WHIRLPOOL 605e200b25ccc2a93b16339d861e9c860708c216f64d1dfd98218ae952d6be4d1e9c768cffe438d3838f42cf4fa2429976493a2fba9d37b5680d1c0b475efe3f
 MISC ChangeLog 11611 SHA256 f404a21305473e08a34ed4cf11635b310df9225f7371b32a614df4d6b78e3ead SHA512 d5ec5fa0ac8691acd134e4bbce34b3ffa762a5a78f6b9354c9388a892277984a986585fea415691437beec2f1bc4f004420cbab5a94c0f4111a3766dcb56bc38 WHIRLPOOL 6d205c944d8926186ce6e1c1824474d79ea8251b25a9dfd3ea8825259c10cd2e8f08fe062dfbe44f95ad0176c175fbb092a0549f5499f75f52821e64c518da6b
 MISC ChangeLog-2015 27717 SHA256 bb12cd6e6784f6f87a420e8cf1dea2e5000c0f87f9ca652702492eb14f116b34 SHA512 e01c42a85818919e57aeb58c7713f3fae740094a743f83f41b6b70cc9b3b537add09b0b7ab3f935bdd033f65efc084113db3f510c69c9009f31f308ce26795b5 WHIRLPOOL 802c7719cb7361cc6c3b9e8640371a389ed3cc250cd3868cf26d078e0022065408c5b3ac69de5f6a71a63ac3e4fee1a39e626eb55df5b3e2412d35bc11335ef5
diff --git a/sys-auth/consolekit/consolekit-1.0.1.ebuild b/sys-auth/consolekit/consolekit-1.0.1.ebuild
deleted file mode 100644
index 9f12159869a1..000000000000
--- a/sys-auth/consolekit/consolekit-1.0.1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils linux-info pam
-
-MY_PN=ConsoleKit2
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Framework for defining and tracking users, login sessions and seats"
-HOMEPAGE="https://github.com/ConsoleKit2/ConsoleKit2 https://www.freedesktop.org/wiki/Software/ConsoleKit"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="acl cgroups debug doc kernel_linux pam pm-utils policykit selinux test"
-
-COMMON_DEPEND=">=dev-libs/glib-2.40:2=[dbus]
-	>=sys-devel/gettext-0.19
-	sys-apps/dbus
-	sys-libs/zlib:=
-	x11-libs/libX11:=
-	acl? (
-		sys-apps/acl:=
-		>=virtual/udev-200
-		)
-	cgroups? (
-		app-admin/cgmanager
-		>=sys-libs/libnih-1.0.2[dbus]
-		)
-	pam? ( virtual/pam )
-	policykit? ( >=sys-auth/polkit-0.110 )"
-# pm-utils: bug 557432
-RDEPEND="${COMMON_DEPEND}
-	kernel_linux? ( sys-apps/coreutils[acl?] )
-	pm-utils? ( sys-power/pm-utils )
-	selinux? ( sec-policy/selinux-consolekit )"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )
-	test? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-		)"
-
-S=${WORKDIR}/${MY_P}
-
-QA_MULTILIB_PATHS="usr/lib/ConsoleKit/.*"
-
-pkg_setup() {
-	if use kernel_linux; then
-		# This is from https://bugs.gentoo.org/376939
-		use acl && CONFIG_CHECK="~TMPFS_POSIX_ACL"
-		# This is required to get login-session-id string with pam_ck_connector.so
-		use pam && CONFIG_CHECK+=" ~AUDITSYSCALL"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	sed -i -e '/SystemdService/d' data/org.freedesktop.ConsoleKit.service.in || die
-
-	epatch_user
-}
-
-src_configure() {
-	econf \
-		XMLTO_FLAGS='--skip-validation' \
-		--libexecdir="${EPREFIX}"/usr/lib/ConsoleKit \
-		--localstatedir="${EPREFIX}"/var \
-		$(use_enable pam pam-module) \
-		$(use_enable doc docbook-docs) \
-		$(use_enable test docbook-docs) \
-		$(use_enable debug) \
-		$(use_enable policykit polkit) \
-		$(use_enable acl udev-acl) \
-		$(use_enable cgroups) \
-		$(use_enable test tests) \
-		--with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services \
-		--with-pam-module-dir="$(getpam_mod_dir)" \
-		--with-xinitrc-dir=/etc/X11/xinit/xinitrc.d \
-		--without-systemdsystemunitdir
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		htmldocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	dosym /usr/lib/ConsoleKit /usr/lib/${PN}
-
-	dodoc AUTHORS HACKING NEWS README TODO
-
-	newinitd "${FILESDIR}"/${PN}-1.0.0.initd consolekit
-
-	keepdir /usr/lib/ConsoleKit/run-seat.d
-	keepdir /usr/lib/ConsoleKit/run-session.d
-	keepdir /etc/ConsoleKit/run-session.d
-	keepdir /var/log/ConsoleKit
-
-	exeinto /etc/X11/xinit/xinitrc.d
-	newexe "${FILESDIR}"/90-consolekit-3 90-consolekit
-
-	if use kernel_linux; then
-		# bug 571524
-		exeinto /usr/lib/ConsoleKit/run-session.d
-		doexe "${FILESDIR}"/pam-foreground-compat.ck
-	fi
-
-	prune_libtool_files --all # --all for pam_ck_connector.la
-
-	rm -rf "${ED}"/var/run || die # let the init script create the directory
-}
diff --git a/sys-auth/consolekit/consolekit-1.1.0.ebuild b/sys-auth/consolekit/consolekit-1.1.0.ebuild
deleted file mode 100644
index f33886b94e61..000000000000
--- a/sys-auth/consolekit/consolekit-1.1.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils linux-info pam
-
-MY_PN=ConsoleKit2
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Framework for defining and tracking users, login sessions and seats"
-HOMEPAGE="https://github.com/ConsoleKit2/ConsoleKit2 https://www.freedesktop.org/wiki/Software/ConsoleKit"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="acl cgroups debug doc kernel_linux pam pm-utils policykit selinux test"
-
-COMMON_DEPEND=">=dev-libs/glib-2.40:2=[dbus]
-	>=sys-devel/gettext-0.19
-	sys-apps/dbus
-	sys-libs/zlib:=
-	x11-libs/libX11:=
-	acl? (
-		sys-apps/acl:=
-		>=virtual/udev-200
-		)
-	cgroups? (
-		app-admin/cgmanager
-		>=sys-libs/libnih-1.0.2[dbus]
-		)
-	pam? ( virtual/pam )
-	policykit? ( >=sys-auth/polkit-0.110 )"
-# pm-utils: bug 557432
-RDEPEND="${COMMON_DEPEND}
-	kernel_linux? ( sys-apps/coreutils[acl?] )
-	pm-utils? ( sys-power/pm-utils )
-	selinux? ( sec-policy/selinux-consolekit )"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )
-	test? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-		)"
-
-S=${WORKDIR}/${MY_P}
-
-QA_MULTILIB_PATHS="usr/lib/ConsoleKit/.*"
-
-pkg_setup() {
-	if use kernel_linux; then
-		# This is from https://bugs.gentoo.org/376939
-		use acl && CONFIG_CHECK="~TMPFS_POSIX_ACL"
-		# This is required to get login-session-id string with pam_ck_connector.so
-		use pam && CONFIG_CHECK+=" ~AUDITSYSCALL"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	sed -i -e '/SystemdService/d' data/org.freedesktop.ConsoleKit.service.in || die
-
-	default
-}
-
-src_configure() {
-	econf \
-		XMLTO_FLAGS='--skip-validation' \
-		--libexecdir="${EPREFIX}"/usr/lib/ConsoleKit \
-		--localstatedir="${EPREFIX}"/var \
-		$(use_enable pam pam-module) \
-		$(use_enable doc docbook-docs) \
-		$(use_enable test docbook-docs) \
-		$(use_enable debug) \
-		$(use_enable policykit polkit) \
-		$(use_enable acl udev-acl) \
-		$(use_enable cgroups) \
-		$(use_enable test tests) \
-		--with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services \
-		--with-pam-module-dir="$(getpam_mod_dir)" \
-		--with-xinitrc-dir=/etc/X11/xinit/xinitrc.d \
-		--without-systemdsystemunitdir
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		htmldocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	dosym /usr/lib/ConsoleKit /usr/lib/${PN}
-
-	dodoc AUTHORS HACKING NEWS README TODO
-
-	newinitd "${FILESDIR}"/${PN}-1.0.0.initd consolekit
-
-	keepdir /usr/lib/ConsoleKit/run-seat.d
-	keepdir /usr/lib/ConsoleKit/run-session.d
-	keepdir /etc/ConsoleKit/run-session.d
-	keepdir /var/log/ConsoleKit
-
-	exeinto /etc/X11/xinit/xinitrc.d
-	newexe "${FILESDIR}"/90-consolekit-3 90-consolekit
-
-	if use kernel_linux; then
-		# bug 571524
-		exeinto /usr/lib/ConsoleKit/run-session.d
-		doexe "${FILESDIR}"/pam-foreground-compat.ck
-	fi
-
-	prune_libtool_files --all # --all for pam_ck_connector.la
-
-	rm -rf "${ED}"/var/run || die # let the init script create the directory
-}
diff --git a/sys-auth/consolekit/consolekit-1.1.1.ebuild b/sys-auth/consolekit/consolekit-1.1.1.ebuild
deleted file mode 100644
index bac2ded4fb84..000000000000
--- a/sys-auth/consolekit/consolekit-1.1.1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools libtool linux-info pam
-
-MY_PN=ConsoleKit2
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Framework for defining and tracking users, login sessions and seats"
-HOMEPAGE="https://github.com/ConsoleKit2/ConsoleKit2 https://www.freedesktop.org/wiki/Software/ConsoleKit"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="acl cgroups debug doc evdev kernel_linux pam pm-utils policykit selinux test udev"
-
-COMMON_DEPEND=">=dev-libs/glib-2.40:2=[dbus]
-	>=sys-devel/gettext-0.19
-	sys-apps/dbus
-	sys-libs/zlib:=
-	x11-libs/libX11:=
-	acl? (
-		sys-apps/acl:=
-		>=virtual/udev-200
-		)
-	cgroups? (
-		app-admin/cgmanager
-		>=sys-libs/libnih-1.0.2[dbus]
-		)
-	evdev? ( dev-libs/libevdev:= )
-	udev? (
-		virtual/libudev
-		x11-libs/libdrm:=
-	)
-	pam? ( virtual/pam )
-	policykit? ( >=sys-auth/polkit-0.110 )
-	selinux? ( sys-libs/libselinux )"
-# pm-utils: bug 557432
-RDEPEND="${COMMON_DEPEND}
-	kernel_linux? ( sys-apps/coreutils[acl?] )
-	pm-utils? ( sys-power/pm-utils )
-	selinux? ( sec-policy/selinux-consolekit )"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )
-	test? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-		)"
-
-S=${WORKDIR}/${MY_P}
-
-QA_MULTILIB_PATHS="usr/lib/ConsoleKit/.*"
-
-PATCHES=( "${FILESDIR}/consolekit-1.1.1-0001-Fix-enable-libudev-configure-flag.patch" )
-
-pkg_setup() {
-	if use kernel_linux; then
-		# This is from https://bugs.gentoo.org/376939
-		use acl && CONFIG_CHECK="~TMPFS_POSIX_ACL"
-		# This is required to get login-session-id string with pam_ck_connector.so
-		use pam && CONFIG_CHECK+=" ~AUDITSYSCALL"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	sed -i -e '/SystemdService/d' data/org.freedesktop.ConsoleKit.service.in || die
-
-	default
-	# patch needs autoreconf, so dont need libtoolize
-	eautoreconf
-	#elibtoolize # bug 593314
-}
-
-src_configure() {
-	econf \
-		XMLTO_FLAGS='--skip-validation' \
-		--libexecdir="${EPREFIX}"/usr/lib/ConsoleKit \
-		--localstatedir="${EPREFIX}"/var \
-		$(use_enable pam pam-module) \
-		$(use_enable doc docbook-docs) \
-		$(use_enable test docbook-docs) \
-		$(use_enable debug) \
-		$(use_enable policykit polkit) \
-		$(use_enable evdev libevdev) \
-		$(use_enable acl udev-acl) \
-		$(use_enable cgroups) \
-		$(use_enable selinux) \
-		$(use_enable udev libudev) \
-		$(use_enable test tests) \
-		--with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services \
-		--with-pam-module-dir="$(getpam_mod_dir)" \
-		--with-xinitrc-dir="${EPREFIX}"/etc/X11/xinit/xinitrc.d \
-		--without-systemdsystemunitdir
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		htmldocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	dosym /usr/lib/ConsoleKit /usr/lib/${PN}
-
-	dodoc AUTHORS HACKING NEWS README TODO
-
-	newinitd "${FILESDIR}"/${PN}-1.0.0.initd consolekit
-
-	keepdir /usr/lib/ConsoleKit/run-seat.d
-	keepdir /usr/lib/ConsoleKit/run-session.d
-	keepdir /etc/ConsoleKit/run-session.d
-	keepdir /var/log/ConsoleKit
-
-	exeinto /etc/X11/xinit/xinitrc.d
-	newexe "${FILESDIR}"/90-consolekit-3 90-consolekit
-
-	if use kernel_linux; then
-		# bug 571524
-		exeinto /usr/lib/ConsoleKit/run-session.d
-		doexe "${FILESDIR}"/pam-foreground-compat.ck
-	fi
-
-	prune_libtool_files --all # --all for pam_ck_connector.la
-
-	rm -rf "${ED}"/var/run || die # let the init script create the directory
-}
diff --git a/sys-auth/consolekit/consolekit-1.2.0.ebuild b/sys-auth/consolekit/consolekit-1.2.0.ebuild
index ad224d1d9a6a..7fa6fd9fb261 100644
--- a/sys-auth/consolekit/consolekit-1.2.0.ebuild
+++ b/sys-auth/consolekit/consolekit-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/${MY_P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="acl cgroups debug doc evdev kernel_linux pam pm-utils policykit selinux test udev"
 
 COMMON_DEPEND=">=dev-libs/glib-2.40:2=[dbus]
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index cbd8c3948abc..3dfebf6b81bc 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -1,6 +1,6 @@
 AUX polkit-0.113-elogind.patch 6149 SHA256 a90d18c58aa8f1a034cf84a209e6648b1d19bbf7b1d72fc5e0e0f24a5a0f6a7e SHA512 9a3e928d77c023c3f895f7fec7893f0355729808c4ee3bcd5419a7e408b613faefcff6d43f87cdab94b3fa15b7eaddc9ce40cf9b7b0954624360489c4d2c3b52 WHIRLPOOL 4bc03f43344955ab5c0ef540e51eb257ab6cf936e8bb93f98d288877bd1de6d100b429d79017a85f6b57c9c87bea0339b0deaf310e24f59d577e358fa0b05456
 DIST polkit-0.113.tar.gz 1448865 SHA256 e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81 SHA512 ab177c89a20eeb2978ddbe28afb205d3619f9c5defe833eb68a85e71a0f2c905367f1295cbbfb85da5eafdd661bce474d5d84aca9195cd425a18c9b4170eb5f9 WHIRLPOOL 106db7e6085a4ce49da44929138671eff2fd6007c80533518abe2d91ede9242b1e3cd0a1801190eeac5d4d5c1e978a30a18e47a6b604497b38853fa60c935a81
-EBUILD polkit-0.113-r4.ebuild 3459 SHA256 d9d7175a51dc984fed94a56a3bf8d9454c09e0d3ff6a8e5672d36d76f582376e SHA512 523a1e8114ff118b9fc7765d7dea921e29ea076652136cb830dd0ea0276413f68e41806a2d70adb5dd3fd4145d013576b26ba1451ee2a9c0e00436089e75bd6a WHIRLPOOL 5d206a2febd679432fcac23ee04dd50a9921fd439753740b190dd89de9befc12f019fe420d16ba156469cf3208b95ca50b712eb2802e23f29faecee998c42ea2
+EBUILD polkit-0.113-r4.ebuild 3456 SHA256 315748e919169f1fef68ba29e5abcc289e70adb42dd41ec2d79e0a484b405960 SHA512 a4ee6493441c8c02a586e1115a051a2f1e1163f1097ac8b20526d3decbd24cbe91d20ad7d7bab55ab6642cf3af13e8f51b25424aab348edbee1442ceb9899b64 WHIRLPOOL 949c10def320d7e90cd9650c35b6a79517258599621b7b64342d655954bb2e6d232e1edcc258c8d7b3184700999438b92298472cda25488f4dcd4359f076b5bc
 EBUILD polkit-0.113.ebuild 2716 SHA256 ad69a9173248ffed504fb2b5936b8c6b3f14f20fe64d1c6e794c7f17ec76a948 SHA512 06cee807ee6cae565146fd1f8d4676cad78c8bdecae80ddc9f9a4c7d928c6dad31bef1361c3c2a9dece8490a37989e5ae8e9fb2e3df4936919a7235521633cff WHIRLPOOL da833ab00f0bb7c71879befd6d05ef4fd488dabedcac4f0b2abdc447fc83f24830412e99cdd1f8283602bbc83cd26dd9ec60b091f9d5d85580962501b47dbbca
 MISC ChangeLog 6131 SHA256 94b5afe5b42ad89d098b0b4f3a2a30186fd92a4677323a7d6f956167e1013266 SHA512 6fefd5506d593b9605377f91bceea62b15bce96d37bb9b7b1b5d94c68eb5f6420adaacfa8e561d05a750d77e0930ef0cf99577604edd7f3c420a80cb51f6397b WHIRLPOOL fe7d55ce7e8c7e10ff08bb71cfa032e766f5af95d6a63f9bcafe8420ffd9d5840ba95d41f500995a8dd476eb3493ded9b274f4de4f99c0c1a231d0bc23f3794e
 MISC ChangeLog-2015 27408 SHA256 b7a63f718f2dbfcc3d17c9146eea2cd830df2d329d1c4406fd7a4b4dabfff236 SHA512 6d6e2b71ef194f07f61c4da2587b22c0b55ee60cf5f8c6e0042bd75d59ca7cf9222b7a4d5018cf8fb789719d6ba3eae3a4a5d6e620e324cd6789bc2ff2fe5cf4 WHIRLPOOL 4a01bbc08ee0ecb7a3502be6c857caa750d111437e4b91cce0ca36b708f7cda0ab293b32fc96fa7d5c35fd46adda75dff44c58d96ccf7103c66705e21bd655bf
diff --git a/sys-auth/polkit/polkit-0.113-r4.ebuild b/sys-auth/polkit/polkit-0.113-r4.ebuild
index ec8a409d3431..b2be07dae961 100644
--- a/sys-auth/polkit/polkit-0.113-r4.ebuild
+++ b/sys-auth/polkit/polkit-0.113-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="elogind examples gtk +introspection jit kde nls pam selinux systemd test"
 
 REQUIRED_USE="?? ( elogind systemd )"
diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest
index 244786d199d9..585d8a3653be 100644
--- a/sys-block/gparted/Manifest
+++ b/sys-block/gparted/Manifest
@@ -5,7 +5,7 @@ DIST gparted-0.28.1.tar.gz 3444521 SHA256 76891f14394754f7d6ecceba2af0e585bf89f9
 DIST gparted-0.29.0.tar.gz 3751292 SHA256 2250bf6bb43687be149c2a95fbfe2f6f0215690e187179d5f733ae518fa7c3cd SHA512 ea01a5b98f8a70d229eb81b58e46b5f0037e909cf72043e7364812ca77b32ee4bad0d215699a08f1b6fcacc31cece3a3058b6178e7bf2df6ba63b11ee64e2f8f WHIRLPOOL 5627ed37dd6a51995560d190bc9ced75f28cfb1f389bab495cf1946add0d4f27979dad54e4b1c85d6d07f9723bd040ff27e17faf4db88eb808ffb4b11bbae710
 EBUILD gparted-0.27.0.ebuild 2046 SHA256 89ea1328255d3ca81e37f5b735b31cf7f7e385cf9862c48cf110077e7ee8b63a SHA512 c9dfa3bf4642f350acb95e24e3a807d4ff5912318977d6c891a922b083298e84815c5fa762ec29eed6425057e899f8b041b5ab3a8c920c6a0706469cd0328d57 WHIRLPOOL 5ef79a338fe2f4b0489bb753d0e45b5dba7a3bb5c7126ca3fd263ac11c1ac3de7f50ded97b76c0bbcd1a4c9ee023b5a68ae0412857b45331fa74893a3b0a267f
 EBUILD gparted-0.28.1.ebuild 2104 SHA256 99e57896773b0cbfa58d313bf728b87b89a36b323507e694af4017ffa02b4a3a SHA512 4bbd41acdbc645aff307a68fdbfa15e9659a3a6ef0e12d616ae89c3d45d40dd5bdab99ac58684f3a24c0a3cbe82b264ba5c7ffbae91d8251891346fc52e9f65b WHIRLPOOL fff2321f3deab0ccc383fce68158cde35045132ad9ba42ce6f327aafd5ac93d4bd39ac7f62cb247610dee4c9b3a2aa11b1e5887bb5c6a4315d40be6eb45db8fd
-EBUILD gparted-0.29.0.ebuild 2134 SHA256 05b217a59de9e919910e20b321068080bcfd5888ea2192b7b185cd085d16ebd8 SHA512 295ff5550cd0e8770620cff7b34b6548d0b0d2765dfbe86aeb8228d7fd2d0f5b4ebeec1f259c784ad4c2ddf39f32ea53e9b5d000849afc92d68ee733d76e0746 WHIRLPOOL e96250a861c42237a6c24229f015592ec25192ef2bfb606e98ae493ef4197ed67e5cf942e528a6ca0c482e01e4f215c6a0f1f5c87710db19bed8a5f4e443cf2f
+EBUILD gparted-0.29.0.ebuild 2133 SHA256 3182f567e2d94d9577688e1de189f274e99affb0870881268af593e84e823ea1 SHA512 694f5faf64eb324419c3cd0e618c0248c5180b72207d0500a3fc31f050accd6498aa8a6c91c1061d06a6c6df628a02370164a548e74bb610252938bd88ed340e WHIRLPOOL f6be7c64750ed339e56d5d82ba745d23bf1986c74a7cffe515d24d70990c2368507032bd7cd22ad6599141864744f28dc39f6499de437eff9ddd610b12cd2b37
 MISC ChangeLog 6437 SHA256 bc4e541669f0975854d1e94a4727ef3bfaed47b8fa535da1286b826b8a50da20 SHA512 a90ef29ae3a6e3371874e4bf2cfbe30238297ba0970a2b7f14fa5fafc06dfbe835af05c203032e50d4a1ff487b8269127aa4952546693ab83f5109e9540d50ac WHIRLPOOL dde03b43d8767b0f7efd5707cabe1aa2a2d519698f4ee3279cc02ac3a5207f6e695f6f8d227cfe4751ae2c004e33fe4ce0e650a1d411783a1a190e44e01d1804
 MISC ChangeLog-2015 20326 SHA256 5a0d43beceb1cc5da9c367ba9049086d52cf834da28a840fa97a1454a9a92668 SHA512 c1b268556ccba84a9d132f6f1c3cee0c6e67a9a61246cc9367fee6b4aa3c010f90c5f526510011df905e9b9f70ef11111728c2930cebf9a7a9ec3187ec2d41dc WHIRLPOOL ebd512a12699eaa166af5dc521730b53911866e0d1a5250cdcd3ccf9101e7ef9887c03438cb6775421dcfc570de713e9c09cd1c1f419b2e9f11178c9f34b1fb4
 MISC metadata.xml 1906 SHA256 ed98b32a5d2996be6f81556f547501a77732ac5f670d50c64bf9a34c7b3f67e0 SHA512 bf2c02576b610ab149f5be05f7117f0cdec91311fb5c8108a46f9676214997dce46338e9b007c666237aecbe8821351122aa3243fc1d21e58a4805635da9be6e WHIRLPOOL 30d8f060d3f0e490ceb9e3153f289cde45f48e9744ee05092910aa52a9f61ed5dac304be8a62b0d5245773eed1f2daf23cc24cb19880ea2eda427d880f1c4e53
diff --git a/sys-block/gparted/gparted-0.29.0.ebuild b/sys-block/gparted/gparted-0.29.0.ebuild
index 4a1f9e1ab81b..172541f00ab0 100644
--- a/sys-block/gparted/gparted-0.29.0.ebuild
+++ b/sys-block/gparted/gparted-0.29.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ FDL-1.2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc x86"
 IUSE="btrfs cryptsetup dmraid f2fs fat hfs jfs kde mdadm ntfs policykit reiserfs reiser4 udf xfs"
 
 COMMON_DEPEND="
diff --git a/sys-block/partitionmanager/Manifest b/sys-block/partitionmanager/Manifest
index b0a01f688cba..c2890012c4fb 100644
--- a/sys-block/partitionmanager/Manifest
+++ b/sys-block/partitionmanager/Manifest
@@ -1,8 +1,6 @@
-DIST partitionmanager-3.1.0.tar.xz 1297180 SHA256 46c3f97711cd8709aece346a27bc6ba89c29cfb5bcf2399bf1982c2e11ee6272 SHA512 3e81c06131a207f886967ab33c11c3d9643adefba6322b81a06c06e41ff3adf0dc0bede16b55d4bd5a0c7c59b74655014be35f442c61d561d03c763aa0f5ebae WHIRLPOOL da100fca6ef84ad92ed3c5cfcaa88907885946a7406256815c4ecad222cb926385b1b9c65b6caba406be8375fdc504d932830cf52283881dd17926e79b563227
 DIST partitionmanager-3.1.2.tar.xz 1298688 SHA256 2ca9e541bcba758181217a9edc1f76814cabad9cf691040c1b9bc7c737c794e9 SHA512 a1be9bf9bbe03842c6cbfcae70e7a909c3e1bb30f3d226b8a47933228c7d6e358d2c6b038100dc647420b8498ca19878a15c100a61370f455a4033ca198e785f WHIRLPOOL 310571d77ad598107b5d8e89c07a5ad93f2c0f03ba73fe87ccd85bcec8f19d2d5ac69f5e4a366ffb801466dafeaf3165d41fe00b69ed4bec8b78a0f50a4744c4
 DIST partitionmanager-3.2.1.tar.xz 1331440 SHA256 7dc089243ce49058c7c16cea17bc6302dbfe409c099adc04dad5e9d5098300ad SHA512 799518ac78d906959512bebf63d3e8277f5fcbc7f13efd6b6ad5f3342f0e08da98340dc778a6e89923af99b03d099fb0e4d11abb2751ac4defa38060bb511df3 WHIRLPOOL 659c96ff57f0d1a391ee8f47b36447f6da1e3b04d1cd15b32fb5368dc719494afa328482c217c5f3bd87a39d029c81e27a258433b7080303ee44f0ae8b81eaa4
-EBUILD partitionmanager-3.1.0.ebuild 997 SHA256 d98cd48e311443f75c020c1adf200376278c36cc1e1004d4054e25ee998c694b SHA512 41747162468769b72314a67985db6eb3916dbf884f0e5ed11adc026c584797e40e6f8b3a0f233803d27f343d10eb655284b6128e438cdca94084092afc7e44c2 WHIRLPOOL cbf05b1e86adbd1bb0c86f761111c876905480cb40666ce9198d85e77ab50eacc865b5c766d5ca2473e2518b687274bcd705ab2b319d51668c2d8d1b5c6bd0e4
-EBUILD partitionmanager-3.1.2.ebuild 998 SHA256 613012d377aaf81fdb93e34080a1c617e4c9c4b8c9bb040e6f210336adae9a19 SHA512 e36a83f99d2a726b1c4ed0d1d21cfa78f3060a1e97953cc501e63c56cc735a7e19752686bf2274a8e84127cef6ae5836132ffaead5b43a28561c7dc22805a8a7 WHIRLPOOL fea5fa7753abbee5740687deb5ddc014540d7d932b345d31ee22a8aaeabb54bc5dc5928fa321920fce62870b9c190f156216ff162769910a78a0b8dc0502695b
+EBUILD partitionmanager-3.1.2.ebuild 997 SHA256 d98cd48e311443f75c020c1adf200376278c36cc1e1004d4054e25ee998c694b SHA512 41747162468769b72314a67985db6eb3916dbf884f0e5ed11adc026c584797e40e6f8b3a0f233803d27f343d10eb655284b6128e438cdca94084092afc7e44c2 WHIRLPOOL cbf05b1e86adbd1bb0c86f761111c876905480cb40666ce9198d85e77ab50eacc865b5c766d5ca2473e2518b687274bcd705ab2b319d51668c2d8d1b5c6bd0e4
 EBUILD partitionmanager-3.2.1.ebuild 980 SHA256 72f642899a8a25364dc0e1e5665eafce668b1b4f23559b8a8aaf79a97773ce57 SHA512 bf59aae4be51cbdb7cc44458a5b0ecf951d46dfff796e56c076c76bc613ef23cabbb9f24ab61f2720ae523ea3b25a7e177e64b7163deaa70b6206886af4c8664 WHIRLPOOL 4e246e605f61bdad5d479891b50298a32fec3cf60ddba9c173f41cc87f710df86473ce15978db8594893b8824f46cb648687d6d8d16b2f9326c0997744a80e80
 MISC ChangeLog 5564 SHA256 28343ebd86b522382cf0a49e6b1ab84c842d4fdef97e852d9e806bdb519d9509 SHA512 40ab5b39036570d0046b5ef55ac61fe916858493f229249a1baf407f00b9b1d98ec089b0779ec58fcd6a154e374772394c17ee0b40b42d6b2d363ec1b2a389d4 WHIRLPOOL d3cadc8de7f9e1a4d5aac507081339069b466a4b20cfbc2d78ade5fea7f0bcf59f85aa269be16db3f5dc7b6895a6cadd82623d6440b0a56dcb0ebaa076f7d399
 MISC ChangeLog-2015 4746 SHA256 6fb788b3365f7ccea5f2ba0781c069000e4c8d8205c05246bf66aaf453c5ccad SHA512 eef220765a7c5720579c0ed6101a7687561bb8c037e498af9d01bd59f49b514b97695d511a88c42f0dabe06116dd2567709aa6172a79fad7cd2b76dd5a11ee9e WHIRLPOOL 383e7c962d34ef6692b761b0dd9c9da9ddb285a21d4ccedc4558f10f225cc078077f7be274ad6d7bbf120c1e7fe5997b6cc2d0a1e97a79c9303a870e007137b6
diff --git a/sys-block/partitionmanager/partitionmanager-3.1.0.ebuild b/sys-block/partitionmanager/partitionmanager-3.1.0.ebuild
deleted file mode 100644
index 11d3169c56f6..000000000000
--- a/sys-block/partitionmanager/partitionmanager-3.1.0.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
-
-KDE_HANDBOOK="forceoptional"
-QT_MINIMAL="5.7.1"
-inherit kde5
-
-DESCRIPTION="KDE utility for management of partitions and file systems"
-HOMEPAGE="https://www.kde.org/applications/system/kdepartitionmanager"
-[[ ${KDE_BUILD_TYPE} == release ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	sys-apps/util-linux
-	>=sys-libs/kpmcore-3.0.2:5=
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools kdesu)
-"
diff --git a/sys-block/partitionmanager/partitionmanager-3.1.2.ebuild b/sys-block/partitionmanager/partitionmanager-3.1.2.ebuild
index b370e18dd6a8..11d3169c56f6 100644
--- a/sys-block/partitionmanager/partitionmanager-3.1.2.ebuild
+++ b/sys-block/partitionmanager/partitionmanager-3.1.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.kde.org/applications/system/kdepartitionmanager"
 [[ ${KDE_BUILD_TYPE} == release ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index eadd66f1d43a..3ded0a767938 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -11,7 +11,7 @@ DIST grub-2.02.tar.xz 6113260 SHA256 810b3798d316394f94096ec2797909dbf23c858e48f
 DIST splash.xpm.gz 33856 SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf SHA512 5ae1f786f7d46a95a7061068d5b2b3ad64607c7b190d6f28379508c5dce67e26308325bfd637542a84855dfcf1ea3d143947326fdb189a6a8972208d3ead23da WHIRLPOOL d95b7b588ea8ac7c2c8c53eb8057aef21c825da6411afe3b7e864c606aeffaaebce8ae41ce3e979f277bd6b48a9e82a1f2ea8afc836213b56523d8a854227d7b
 DIST unifont-9.0.06.pcf.gz 1360354 SHA256 6d23e82ea3fd3d79849d675c0c30129b62a3973a83b4cdc05f9994efef773b86 SHA512 dd0a1afa72f5204c62055d83f22750c74af38ffafdb8eda8e1f1cf7292e572a14969b8a9a6a2cb336d5bed4ab633f6b5a962c59117a590e4238788959cb82774 WHIRLPOOL 3153fe2a254cffa5aac6c5915468262bf60f993ce5a2aa47885ccef2a6714e205724b01fd9d26d499b9efbc5213e3cea0037c91f17fb2ae780ee289cab0de69b
 EBUILD grub-0.97-r16.ebuild 9699 SHA256 03223c6cec66ca01d0ee08db83a96ef3021bca3fa2414fd862727a9ae9cade07 SHA512 0edce20bd616493dc8e83276fd89fc2b762794cc25572c4ad3cc055c1c8c209ca2d6dc6a1a90a54deb17a245f7218468f7054099d20688ebd0debf227624c057 WHIRLPOOL e58455c072c3616fc317359e6d9a6bbf69399be84e30af641530c2892b0e05dec2cd799e2f49e244700982e62666cff33ddcc4a1ec6bb1112d7fff0f3f284b2c
-EBUILD grub-0.97-r17.ebuild 9281 SHA256 66a9f548b0b7e4def066a72a06b96ef3292c15c6adf9d90bade0f1552b960916 SHA512 659b416c659c023cbbbec587f1b6f2e7995016a41194905b647ebff5d0efb670bba83d468ed3b6dd01abd96f1df0c2b013f91c301e437a01e55febde7f223727 WHIRLPOOL a296fd473102bdfadb3ffd4fa8466dace236e183c815a68c9a1d8beb780ea5e20f7e1d39280f689636a6517a6f7b2c5a5997212c29e530f1dba416bbd5eac9d3
+EBUILD grub-0.97-r17.ebuild 9504 SHA256 7f0b3a6205e6ead2c6ce94eaa471e71a31d9a456071d92b2abe06426fe91e809 SHA512 baca5041b77495ba37d0d43e0f8bddc52a61dd176185c1e88d7f2592795a6efb3183661d2433d9fafdf50ee5cf4e5537fbb1a22431f4fe1195f61a3773bfb133 WHIRLPOOL bd0f098de5a91e50c661258d948f55c29b581a6a11abb05ab558b8fcea9eb6bc1e748ecd1b9a994c9e0a3b0a767517dc60cde974b8b29255d34d54a4108e2787
 EBUILD grub-2.02.ebuild 7597 SHA256 ada3921a987f213615b625b6d97491c1d33448f700410413d411a1d95a04660e SHA512 d3aa7a602989d0eee9c48ddd527253099cfb81887171c69add1f83fea36bac295147fc11cd9cdd2c06410670c435cf1c3f20303660675aa936668b04178cb8ba WHIRLPOOL f7032a2a33a7a571f15b99d02ba59bd30582e531a7330932d1d860485f83569fef9ef8bb5f16759691744fdfb28c6fb12bd24f64c82481281739289ae0da170d
 EBUILD grub-9999.ebuild 7599 SHA256 dda50136976d84a46106a3e6b6ffb657c2094a44d44e520b31c1654cc54b32a6 SHA512 cfb7ffc4a2d94d0ceaaf6fa63d6c587b8c35488c3f00cc667073926a00c90044c58e94f69e53d765b13ea792f7e79e49b59529ad2788460367259ad2524bd410 WHIRLPOOL fc8b0d52d2d7659fc1594f2ed07661bcc2edf52db8c9b3fa3d20dcd756e65002812cffac281149728d2e6e58f621fe0fb8cda082ba6946024a3a909d7ff4a002
 MISC ChangeLog 14166 SHA256 fd94eac2c96265c94e4fd203e094dd6f8985ab3146103f313b647aab5ea76814 SHA512 eeea31f9e358370b12e81075308271fe2ae64d6e84b2828261d1c74577fafdd33b412f0d0faa784a0fbd502481ae3619d2320542b49e06a3b6bd0c11c90a1d6d WHIRLPOOL 2732342665c419b0b6f5d8c75b888437cf73600857c30d06f2c39342f64055db79a2de7e4015827bca82ad6d3f0b16532bf6adab6f1e89a3c12e0e2f06556141
diff --git a/sys-boot/grub/grub-0.97-r17.ebuild b/sys-boot/grub/grub-0.97-r17.ebuild
index 038a541f8795..b34191f7346d 100644
--- a/sys-boot/grub/grub-0.97-r17.ebuild
+++ b/sys-boot/grub/grub-0.97-r17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # XXX: we need to review menu.lst vs grub.conf handling.  We've been converting
@@ -67,6 +67,13 @@ src_prepare() {
 		"${S}"/grub/asmstub.c \
 		|| die
 
+	# gcc-6 and above doesnt have a '-nopie' option patched in, use upstream's -no-pie
+	if (( $(gcc-major-version) > 5 )); then
+		sed -i 's/-nopie/-no-pie/' \
+			"${WORKDIR}"/patch/860_all_grub-0.97-pie.patch \
+			|| die
+	fi
+
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
 	# bug 564890, 566638
 	epatch "${FILESDIR}"/grub-0.97-Add-esp-to-list-of-clobbered-registers.patch
diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest
index d8dca66fb091..8426e2da1429 100644
--- a/sys-boot/plymouth/Manifest
+++ b/sys-boot/plymouth/Manifest
@@ -4,7 +4,7 @@ DIST gentoo-logo.png 14501 SHA256 79ebc1d66693371a90e218ad421cfed05066b51a6645bd
 DIST plymouth-0.9.2.tar.bz2 1231336 SHA256 2f0ce82042cf9c7eadd2517a1f74c8a85fa8699781d9f294a06eade29fbed57f SHA512 89356eb8326504fbf3155de262ce15de0847f0a0e6d157d873cf1dea9af464a6cb9e11d7143ee9a595b217a2487060b5835eba5ac142c3cd6d66689deb272e60 WHIRLPOOL 5f9e662dec633bb606cf4246611b442a0eb9eaa92942b37c53d1c48b6ca8ef96c5f4330d574b82de6a026ca175a770c1a45f52c7809c80d026126d805e707eba
 DIST plymouth-0.9.3.tar.xz 1102724 SHA256 9f8dd08a90ceaf6228dcd8c27759adf18fc9482f15b6c56dcbcced268b4e4a74 SHA512 d7b9ba97485cdac7ad6bcaf5a7f1a9c84ece54b8d46d5efce4170294c0aa6571656d7d9957b53aed9c1e51d4d525714f54b7dbb08d8ec0b196a1a4419fd186ed WHIRLPOOL a7ccc870fb6149da21873ec92b241f564ce76ee0319a626a423ed1f77820deb0d09ed52bab86fdd501a4827dd02bd7403e78af1cbbd4e9f77fc9bda57ce59fa3
 EBUILD plymouth-0.9.2-r1.ebuild 2494 SHA256 8d36fc90c9c33d4bf0f12d325748897025601d19c629db145fb46b02574cf719 SHA512 4413aec2441e4466eaf308f352264abd9147c3eba073affe7b9e7ba84f97169f6be605f64e73c28b83b664699c981349c345576b855274cee9942f490d644435 WHIRLPOOL dab5a053134a27795587cc08a2a3e877b5189d02b7456d94b0c4d5b4ce78c98c26c0a1daf8b477ad63ac1f7aa07b2ce4d235720d0a8dec851b6881a9f2d6fc11
-EBUILD plymouth-0.9.3-r1.ebuild 2547 SHA256 9d24e9afe4658579ba4eb352ad8af5c5dc0e8f9ddc64457a4bfee35b36f91242 SHA512 7b575637ab6f36faba8d8fbc864b15cdda588db146ef76daffd3b9ab6e352c3fce0a3357240d9a7220b1390cca68d0f1db18f6fbace5bb30fbd901afd91021f2 WHIRLPOOL 5b476495e70f76f99872d2917ba662124da504498ae14ff642c8abada9764df58660dab29ba4e67ada8ff79cfac7183bace90fbd59db21f00753c5b1d5487796
+EBUILD plymouth-0.9.3-r1.ebuild 2546 SHA256 d2d7dd9c651e75b9c3638c43e91f674fda24fd689f0329cfdb0d7600b35bf616 SHA512 3caaeaed22f3b3790785f0f08a3b9355ba5ad9e6caa4a67456d409404037f6a630971d087f4ebd0d0a6e54c6e7f28bb2e1f8c4953ff427012c10076f80fa4cd3 WHIRLPOOL abb2e6cafb9a38ff69dd185024f194746d2428883f63b35c5d36c4b9e5cd95b991bac05840a02ca06a7e7e43b2677b205c1b85faff096e969efa137743b874d5
 EBUILD plymouth-0.9.3.ebuild 2432 SHA256 6ebf4f4938458405e48b271c6d19fb4fe0ad40591571dd3bdb9e3bb94890439c SHA512 65c076ee35d7d49427c5bc9f345c06bf7d7b85fbfc2fb5ab575d02a87b9037c3ee8311452aa2d78ebaf5e16af9c35b43b1349f1b949ebd056a3d2d33ddb6b7ad WHIRLPOOL 07bc72daa421e01e610820a4271cf410949c9e9775cc011e6da0cb3a76ead2e0f62a63fbbd2f68f0cd9a005dc345a0b51daeae97e8622bc3f8543d607807486a
 EBUILD plymouth-9999.ebuild 2481 SHA256 f8887533c1ebe597190b773404df95d92f4c09ca7d897aecf8e95b0c00b2abca SHA512 7357f1f65af91ccd2e13698d46292cebcbdbb952291d139128bfb76067968ad4756632fec75fcdadb914a0fd9a3d5cbe8e774503f0eac4cd98c858f5803239f9 WHIRLPOOL 8e6e5bc58d6c4dd1da75faf94822512d85ebf409b7cb53a99c826defb02e26db2b7842b0eb1732cb4c0d1fb0a43596a1401bb22d7648f014e98312c259f914e1
 MISC ChangeLog 5141 SHA256 1bc72234866d8ee0d4e1be6111a65bdb66f3420757e321077e01a105270b128d SHA512 ae63be932052c734edf101b234bee278a47843216c2263291ab7290e1b11b4e8e529b64eedc6e4a41426464e582e6447a93566dfe87972974bc7d57ac1cb7b5f WHIRLPOOL 268716a75b25b8982b0d49bf12f5c7ef02a078da9f93f4cb67d67bc90ab5e249d3de454404c16ec3b3fb5a93ab15da2e15e5b47d67c0a132295a8bd5426c8259
diff --git a/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild b/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild
index eca80c890f83..ebe3831e9a1d 100644
--- a/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild
+++ b/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://cgit.freedesktop.org/plymouth/"
 LICENSE="GPL-2"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="alpha ~amd64 ~arm ia64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ia64 ppc ppc64 ~sparc x86"
 IUSE="debug gdm +gtk +libkms +pango static-libs"
 
 CDEPEND="
diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index 03b28ba67493..a91bf398e1c5 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -10,7 +10,7 @@ EBUILD syslinux-3.86.ebuild 1461 SHA256 c1651a1e027bda3993b72574de7145d227a1aa4f
 EBUILD syslinux-4.07.ebuild 1757 SHA256 cd73015dc2c4b41488b6abc82920e4fe01d2984350e442595e97c297a0cceed4 SHA512 baaff341d9a8e173b7739b0d53b9aea2d53c9e29b319d663d7223a21f7d21422dbb2504b70fc9ec8b92b5f565832ec179276261d01b817be31e2814e66296fc0 WHIRLPOOL 911a669a72427009371cc3800c3c695ade751b34b7eca76f629b17923e62232d5113629e150f75e5e81a3f86a9dc4d9c2cbd51301347b38273e9416c6050c1a9
 EBUILD syslinux-5.10.ebuild 2218 SHA256 f1fc8abe4306f807a92bd3dcae54d61b849d1a10651b26aabfa8f636ad8a8b14 SHA512 2bb2224850aed70306f29d475f5297fc466a4d04e5a70cf749ab1edefe56fe94b0c30eddf0ed226e07338a8e5ecc37ada691b6b4f0edbe62438a8e7e3b359a4b WHIRLPOOL 3a83ea98c845b123142c75013ab33713876692ddedc03efb0c8eeea4e5fe72388c9a5255a506bda0dd36e3829b8f9a4bf50f3038b5b5e93c9eaa1775f8bc3a61
 EBUILD syslinux-6.03.ebuild 3409 SHA256 5c087820814f2a5fb8040659de9e1f5d340d7e06e293f4bad4b69bb27fc586d8 SHA512 55f895a2b6bbdf0e1e7fa321b700138db1dc2dcd073acec722d222adccb55c092057fa90d4421f5b428aec9b66c746f30ae7ec4c62c84bdf04974c7a4a5e1cef WHIRLPOOL 8316e5c2a39e67d2890ac9ad576bfac541b8fdbecee361ed6ab923ceed04c1116eb11f2c6bb8664422e11f7b28f37eca078eea8a3c0848ad4a95d32e9227fe82
-EBUILD syslinux-6.04_pre1.ebuild 3409 SHA256 5c087820814f2a5fb8040659de9e1f5d340d7e06e293f4bad4b69bb27fc586d8 SHA512 55f895a2b6bbdf0e1e7fa321b700138db1dc2dcd073acec722d222adccb55c092057fa90d4421f5b428aec9b66c746f30ae7ec4c62c84bdf04974c7a4a5e1cef WHIRLPOOL 8316e5c2a39e67d2890ac9ad576bfac541b8fdbecee361ed6ab923ceed04c1116eb11f2c6bb8664422e11f7b28f37eca078eea8a3c0848ad4a95d32e9227fe82
+EBUILD syslinux-6.04_pre1.ebuild 3407 SHA256 1a8a4be124d7b7f8de9b3d8341add1671e3db4294656918a0919a107de5d355c SHA512 859e1f935acd80d60de3690206d44f19ca59d0036983ed83c5ed2096117cdc40790699989227e1788b650761665ff9ff1884284287eff8412b36625ef83acde4 WHIRLPOOL 84e6223c9ac0220e0d2900b5fd6f196bd701509777d80ce2b7c46a09503131d18ad4f04c5b0ade797b4f8e304cf13ae2c8c0bb45a432b806956c9afff29187ba
 MISC ChangeLog 4181 SHA256 3211f59f31e63894c8de54ae33b2b959e46e6009b590e86826975a6f41b99be7 SHA512 67dc70ec6005eb4948a09a1fff31e479cb709bc8a4f9334fd9e2dcdea55bfe0f39a77598184725eeed07ad95f112c671d3c823b28a63122514f312856685ad4b WHIRLPOOL 60f5f82fe575a8b57f5b4df6e4dcacd8a04542756b3d3c1174d61b6fa5f8fdfa3758f333947c293170de6778f5993104d44b315163b39137fccfe05a06ef387e
 MISC ChangeLog-2015 20427 SHA256 15fdf0f85aafb3fff824366a1b2f7523c70f7d783e8d868125638499fe73dbd5 SHA512 1b3177021e8ee7e458b89f9baaef66ff6fa5d387cb37a958a64f39102b21ed0d080227c2a7baa881ab8373bd81e27d63b2c0c3543ac066fd7dc99146ae36888f WHIRLPOOL 2a1d22d6b95dfb400687463a3b39f0d8ece73b287d0d49af2ca5b2ce8ba97952b40c5a7ce0aa471adf603c7a6b941a71dcc3ffd237ff1514ddbaa9db2be2a4c1
 MISC metadata.xml 330 SHA256 264a473aea8781b3aa141a0307ff5445e3e0c800262c209b8bdeb5b36b55b627 SHA512 89e1dde9592f2cc3ed391f6f3ad29b877751b95b0c1bbb4416cd0c38f136c4a293f4687ebb5758adab540d6f3ff63f20f43847e294644c9e68ee84f3223657ac WHIRLPOOL fd7bf363f8a45db96a14e83625a63c0333a7527cc664b323fa2aa5cd40043e0094441052fa701e687cd115a3eded20f9a2aa5c18c9226cbbe6a559fbc95a622d
diff --git a/sys-boot/syslinux/syslinux-6.04_pre1.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
index 3dcc890decaf..2a96ac4acdf0 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${SRC_URI_DIR}/${P/_/-}.tar.x
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="custom-cflags"
 
 RDEPEND="sys-fs/mtools
diff --git a/sys-cluster/csync2/Manifest b/sys-cluster/csync2/Manifest
index 6e533d0a20c3..b5869b16f95d 100644
--- a/sys-cluster/csync2/Manifest
+++ b/sys-cluster/csync2/Manifest
@@ -1,7 +1,7 @@
 AUX csync2.initd 492 SHA256 a5be7bd48f86cf3301e3a321ad925f55ed61c2eaa08e19d3911fc2e541a41311 SHA512 a189bdc921efb51734e66f8df808289850c6ce5c60c797c85abb7b3063a45630261a32edced1efd23fe367e8e91e4fe69c3d5e44a10d5b95112ae990e26fa916 WHIRLPOOL 8b2d233db8d5d2c30da1d2c293ab2d168776a4e217d58518a0b603c1408905cb3e6dde670cad59f3d1853f2f803bd7345d078602ad443d92d19f72f5dba55cf2
 AUX csync2.xinetd 388 SHA256 c281d7e494088abd84ef09b5487482cfa886f12aa0ab717f4cb579b729cc7ee9 SHA512 538bb8fc5b6b667a8afd708fbb35c9b1e98967cf0c1e5b139cdd15a19305000fd7fb7eab564131eb7cf3f562ba9189b08a06061aa31ef64e8e85ca13d6f3d583 WHIRLPOOL 35896b35309fd8f99e938d592db2a4f9c3d348bd065e0e9428d9d0f1c3073b5992e77cc04c7655cefbde80cc079b049230dd483ef862b411239a71e5b18c99e8
 DIST csync2-2.0.tar.gz 411013 SHA256 11cb37380fb185bce0c22b804fec9b01c385d9d83cc528cfd48d748453834fa2 SHA512 f91fd222f67affe9634471d341b43ff67854a6ed25b620301a454e98a79a9fb80b2a66eb8713546758fd08300d52751e5ca7472c696daa20ee11779b87a830f8 WHIRLPOOL 6cbe49b5dd36d455d2c2b15089cc8e766aa3f9ebc2d5ebbd0528379123ae280850972b07279075a38dc328391633bd63f1a5dc8a2403b1d4faac295e27d1d920
-EBUILD csync2-2.0.ebuild 2723 SHA256 3033eac729c2ffd7ac8b6b96ccc99d6060b4746726e751ca24b957f85df699b3 SHA512 e52af2fa658cb623999970fbe2e68e28895226e1406045a76c732162075516f930a9a12c86d0cc7e5b08901ebcf7051c0b3c1cc343862c32553be46026bfc3d3 WHIRLPOOL f758b18ccf495183507399f8dbc75542de99f93eb39e1a988192120d77051b8f09c1315e7798cf2184bf473ebf86cf2872d7dcbe102769993eb80f525eefee54
+EBUILD csync2-2.0.ebuild 2728 SHA256 b8759dbde39fd2d3b111d2429a303f71ffdbc1d2a1d66853f73d1714cca0fc52 SHA512 1539633ead9768601d2609c4a735c063222ba7c96da7694c023adf92828dbb0af6894c23d42df12c1f9f45311136c82a615b9722129de41cb8781d9f1b756a59 WHIRLPOOL 8509a80cdf9c5354eb426abeef28bf68e988ef18e2fa5e5c616ea20ef60b2902a6a25ac53a88d5c67b84edfa523bfbbddcaef8dd67d276c760ec7f364414911e
 MISC ChangeLog 3451 SHA256 fa973c8f70b09c1e824687d2736ccc860653ac90b045cfc520675ca4ecfdce7a SHA512 8eb74fd49db3260d6db89b5ad4c51112981d94189595ef2f25462a060c830a9bc3b19228c46dc395aa4a11c6682bcb7259713034ad9ab19a8d346b9f4c21d234 WHIRLPOOL 5ce67d2316e4c711027ea68149f2bb013dcd6cf2538a07cbf1c29f673a6c965d4ae5a999972dca44a8af4259e069a145206ab3b096d8ce8439332af43b45bdfd
 MISC ChangeLog-2015 6036 SHA256 03c45115b34a893f4407f21d8e88cc36c102ee4a8b87a8f94b42588eac70f5da SHA512 4c74232df11aac1b2ff5611bdf662a681644cc148de0cdc56854d352460a8fbebbf239c09e4a8b109591d9d724b64bfe15e13839512d2b842f6f3b8ea40d6b2b WHIRLPOOL 49898ba121e89e1315a3e62972a6364e2ca4ea21077494f4a4186e6cf5ea405bcac457069e5f66e62c4c66f0e2fc48854716ec993a4ebda5c91de1e98372909e
 MISC metadata.xml 257 SHA256 eba5a727fcb9e27d2a6e5dac0c92b252de676d434ef19bb09d44534257bed08c SHA512 d01f4b592393076365e924fcc717c807172488f03a7b64542238616207fd00dacd096c383e68b9558142f7dab357578f91904f73acd41ce3a6ba7b7ef72b4980 WHIRLPOOL 8621cedc31dcd2b89dffd18c102b491aea21946189d752b9dfc3b686aea7adfff6782a3c7796d777e18677b7dd99f1cd8584022642eaf009cab3b733918a501b
diff --git a/sys-cluster/csync2/csync2-2.0.ebuild b/sys-cluster/csync2/csync2-2.0.ebuild
index 93288e0b154a..727751fad472 100644
--- a/sys-cluster/csync2/csync2-2.0.ebuild
+++ b/sys-cluster/csync2/csync2-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ HOMEPAGE="http://oss.linbit.com/csync2/"
 SRC_URI="http://oss.linbit.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 
 IUSE="mysql postgres sqlite ssl xinetd"
 
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 5c6f69086103..1ef687d506a9 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -1,5 +1,8 @@
 AUX 50glusterfs-mode-gentoo.el 169 SHA256 2467d044665d16dd95f78f7a7a104099ce00849cd0a2a86b110fe4c91b316a9d SHA512 f90b3f49f53c08db5596a6795df64a834b390602a79fb79b56f6cfb6191c7ca8ce2bedd2885d049575e26cc3b321f80e2786e99055c02682f4fbf454d5ed5804 WHIRLPOOL fb4abfc0c07ddc8805430446bd901b95a9951f53711da647e87ea8c26bece8ed9c7bb17b33cfa9b114ba2a64a055f275202d520cf37ee0c178d005d07ff80173
 AUX glusterd-r2.initd 749 SHA256 d060ffbc9c2233d786a0b0dc224518ef3de15a8c69b2b3bf8c7449a18eb366e3 SHA512 90b2ab62bd69f0a6f4ef9596ea4b287524650821251ff9cf6fe43f7f362e359c43615fd5ba68d4b5589af1a3e712a91cab69bb95b363b4e20efdf9e02a5e1e6a WHIRLPOOL ec91d20794d04ec04288742329315e7d16b3fd775f20002fb321e29d8c6d05c50f37664752b4b8a016b2f29587bc2ecdf2b326370849784d2c479278621b3fe9
+AUX glusterd-r3.initd 755 SHA256 b8efb5a7517c95791d943b34722a10155163edab062ba2ec32398088f81a210c SHA512 d6f46374f48cf78c4114c786fbba4412764527cec020f43ab2a46000fcada98bdb6dfb67ba9db2be3e39a851cba1db97a7154e4cab6df7ce541c0157c781706c WHIRLPOOL 8997aa6eee420afe3f69cc7dea447eed9ead28141b3e3ad574dc87fafd029e256d8350b3cca4d341c085f7853561e7c5297368c86fa80556d3cdacc4184d6a9e
+AUX glusterfs-3.12.2-poisoned-sysmacros.patch 431 SHA256 c010d7239bda13b730df7464e2c079e3765b918bda8f64297a9b5b2499c9d00b SHA512 fb9f56254a90325bfc92d60af41075b51460d179eac7149cf1d0dc218d7cc7c9102eaf0591c2763df2fa68d2595f87dd3427d810bc182b61103bd5f9588c77db WHIRLPOOL eb273a106701efe651ae6415b3c2a244df022268071800b804357e85114f648cc1ee1580a06455655c1ab9be0bf90881a5ffda003c0efafdcab8b25829a700be
+AUX glusterfs-3.12.2-silent_rules.patch 632 SHA256 25ab2bbfeff23f0de89353b8db04230d008d1d6d2ecae454f044c8260d21f548 SHA512 81ec26ad0385b3c9e94c918a720ecea606cf5adf9f28aa57bfcd8de179e24b4feb344573820528716d6530079553bd3df7ac1cea39e3893b35573990fe3ffd1c WHIRLPOOL 4ca0731fe5507123031156cc5ba4ad3a07e091bebcefa56cb8698b8bf466c0ee2c4206ef994ae45ec4494b4cb1245e117c7e7b0375c1b0d56c0f13f8c44a26a3
 AUX glusterfs-3.4.0-silent_rules.patch 553 SHA256 08a55b2f54050ad47dae1a953fc1f1410842556bf2464ab15e7df9019ab24de5 SHA512 67fe230a667084f30960d4ed79f58c7da93edde086ca8614cb3f7160901cb87da471cce932cfae470033c5dfc92b00ed69fd0e32238bc0e9af770e1946f511ce WHIRLPOOL e596ee4c6fae6cb7f843501b55e832791d612547f81d5e6adf4e96ea8cc4fc20fd71d5164f7fe42a74ed0b8e7036643cd5b684317f98bfd610b91dbe4c4c3684
 AUX glusterfs-3.5.1-Add-libraries-using-LIBADD-instead-of-LDFLAGS.patch 2145 SHA256 10b0ad92f61996f7ca0e0bf12b383813c4cd2013d95d8b6e1ab53a18853a9e05 SHA512 22d4ead173579698a23b7d66e566e61410e5bc0178b1dc0b7346b18d7e8cf33a44873b83a09e6dab32b06e7df8285da4bb7eb730626c61c1b3d28e9e8ce86f00 WHIRLPOOL e8e5572a5861478c718cd0b89c74159e3b13f6ef204eb3e3b2d8af8ddd296bc71469648ae957f0dd4e18de187e6fcd3e1910ea9ec5a707b78f61af8c88c9bb9b
 AUX glusterfs-3.6.5-build-shared-only.patch 27261 SHA256 b2d73ffb27f07bf762e8f67bdbbbdd3a7eef62049ec346a2ab84a9171e55c053 SHA512 cbaa02845022cb32aab1e419d13f8291b59aa6de78ccdd944af52d05defcd4ae9bb891c0f303f7d4870056e0777d70507b137aa9e38a4a13a267925a3cbc0277 WHIRLPOOL ab0b75e36a0f3011618e87dc9490471c9a759cd65985074a3046be5bb3609830018ca50d82de4db8b783424c46768d4b2fe0c906271cb5e2a01fec264b0f26e1
@@ -8,11 +11,13 @@ AUX glusterfs.confd 129 SHA256 a9023ba1112ceb4597c654228f0beb0053ed695aeb32c65e0
 AUX glusterfs.logrotate 611 SHA256 ec29f5830f6108fca793d6ac90bb49e644a991a073a736ccb76fd05f9a9f60a2 SHA512 568728fe77acecb686286b0be6c086fe3448d054d26da15c3846726a8f845ae963e6756c517b413a9eb4d6b646c61972887a35e89846d2d90d364b755e471791 WHIRLPOOL 10ced84d8035e3e7e5aaa013cd7c0c9761999e8ddca41ff2df3ed2be7a78add579d5c2b17a27b86d9a6fafdb607b9d175725208af72585d9fdc66b3bdb5fed3d
 AUX glusterfs.vim 139 SHA256 f214c1c8a01c9184b535fa7ae307200a8a1dc83fd42e92bdd57a7b1cae1dc099 SHA512 6ea3b56b71d7e206a57611dd68160b6b9242a19b5c927560f60881dc28d250f7958c50f788a7b9a41fb46010fdac2d67a8289b909ed1f05b793c900f37ccbfb7 WHIRLPOOL 3006d9fea924fe274ac00dc5d711cfe642f347808889c3d5dbde764f0f0cd2ab27509fa75d37b95ccd98c33bc1db8d082e5d16a26e0f888b7189f9738b6ff963
 DIST glusterfs-3.10.1.tar.gz 8926368 SHA256 d3c23df3299964efe6b688c94ddde258506ecf173b58e8c07fa18d470bb21517 SHA512 35acf10d37db7ca9cf7d88e4eabcac4febdccfe15cbe68df86c44042987547f3a56447a1ced5ed238d171efdbcb97dd1fc6917283641bdcd7d476deb37ad0871 WHIRLPOOL 7ce3b5cbe136b1d09b4c0c062decf0d9c5bba03f9b7249648e886ceff758061e73863c9f6d82ed2de3fc41546950ee08c022683174283dc03201c12d61d295aa
+DIST glusterfs-3.12.2.tar.gz 9404275 SHA256 6f9fbf8183df9e012a2c95f3ac3fad303443218beef4fd060f4af57c0bdbc069 SHA512 2bcb3e9356964ea8557ea4291cf6b641122c58a3beb59c00de0acb6772b05b22c0610db4f2bde2e506e15233cfa610db415c6622933e04600ddee3cc55b01166 WHIRLPOOL e788f65be5a3b9965ae485a1d273c2890d89fcff705490c040192fc549580e051e3208e0d2ccdc8dc9350c1e57b188a39a1690751dee1201ef032ca71d514871
 DIST glusterfs-3.6.5.tar.gz 6091408 SHA256 20d912ef35fb8350c50c39c15134a3558ee90d012203f049799c8eb67a61fd2a SHA512 7ca41855239818fc4c84cdb86e1f1d39502e781d5117a5ee50ea134f03f0823a8640ee9bda28f05463e8504aba9ddb12ac72e118f0ce7c3755c083033f5677ca WHIRLPOOL 9fc0592052d976d65fcc769c69d910fa6d909695162bccf80c1e799a2c54c531ab03a4afd3788951c231a214a22e5f8bb3613a83277858627425b86fd532ab5e
 DIST glusterfs-3.7.4.tar.gz 7552110 SHA256 f98f448117d1de7666ae425eddd8d7d87b02c57f6627234ce96ba60566f47173 SHA512 f9a281f3a37835f9f54679740ddb19b307babe576a8f14c9ef24d256f483789c227d7e7c5b0ed4ef5c13a257bcf00d0c17b6108fa60c5e45d0175df6e236b3a5 WHIRLPOOL 7b0320936de078234228cb691f3e381da3cc89c638d6246aba63695aa36cb114afca6e53d12d23de441b8da0b3a594ac1702b450d5d14720254af73e689c4ab8
 DIST glusterfs-3.8.11.tar.gz 8544971 SHA256 2285c02f9449168eabeaa7b72706e80f3de659eb685293dd899c71c33798702e SHA512 61cadc567a73403c78eac5e472aadd1457053be936042ea1218c172760376b026152e84b4ca15a0c249524347d434cc7d35c3a73f4d0b01e89c6aec5edcbbb49 WHIRLPOOL 21d4c2da1d281cb03181c21385a62d74c71f24936d2c33da22085accb5fa563b7095757b7df3eb30bf865c37fe683c420756c542d6933c99c0d3f9025c07a217
 DIST glusterfs-3.8.6.tar.gz 8456856 SHA256 5c62c0b66cde74427eacc49cdbda7c84cc8289b38bcda80107adedd24b355715 SHA512 115d65183682587b4e8dd0c3d52f4a43eabbd6968441b7f09db006748890155f6748ceddf7ce80a7481207df7cb2dca6339b77cc7b8bccfc7fe00084ac00b223 WHIRLPOOL 7321468daf15a4ebad158d32328dfe64590cbf0ddcdda4d855a7b8a9849b29fed1c1af58475f8c1ef140f244fc15db57c00170eb477c27854408598bc0a7f6b8
 EBUILD glusterfs-3.10.1.ebuild 6400 SHA256 95dbe210c2c0ca19efab0b50a629a51046136d8c76d14ba4de677c2f7220e7a7 SHA512 da1b1913fb38f583e24f38a09b8c78189a529b75f9a52eaec73c7a8e40f95e50b75b238da84afe0875518968c5d3015bd786026de5485206af79aef6499d5862 WHIRLPOOL a8335aff33c6747232d7af164e6e21f9855007669106a9f08af1b643fa1373d6889b3d336c2eaf6952402cf97432c868cdff84af4befcf3a89e28d879eb272db
+EBUILD glusterfs-3.12.2.ebuild 6390 SHA256 526355321e5b80a109a80a7fcd6b41d12437f66d664291fe532c1ee9ade72e3a SHA512 74ce06ea86cde697823ee6e8179ec34e9607e8f9e969421e0d13240d3b7074458b8c508a4f0fc1f15acbdadfff25cc5a6129c7615bb3d31fa73cd17fcfb95294 WHIRLPOOL edab174361da337fe7a0f7b16e1d85ded21fe022e60290597ad9f4536fde9fe2b9736e3b7562260907ac554e128317941d6d66fd74b1ca2f1b0be7e3af0f72da
 EBUILD glusterfs-3.6.5.ebuild 5609 SHA256 bfd7872898f9e82244a0d8e0138c790a860efb5d42591ca9619760d9e752d81c SHA512 89629b74afb06c7409375a8c342873840436f6eaccbc4a29800b264090dd31f1dcfa391d77d655a6ecc73ce906a6d7b253e6a9065697ab920ac5e75ea64a1b45 WHIRLPOOL 6a416115a63db0dd41d3b7b442cacf91bdbc8cebd467c49236afb4467aeb42c49bcdd3acdac17804816b88f80c7c4a4b7e2d3c90dd7daa0ebfe63ddb04d01e4e
 EBUILD glusterfs-3.7.4.ebuild 6268 SHA256 2071435b4071e7ce43e814a1d97beedbec5508ec4afabfd1c4f29d92b549859c SHA512 3dbcb7f16578ef39bc4e98dd7a29288017710ffc292885c46e5fa79193084f990965234f325f250e4577d1188ca2aaf24cdb92607a2ff0bb2fab768958452ec3 WHIRLPOOL 9b419c65f5a8cf7a632e95910fa31deaa5dcd4ffebc473e9053b8d04c55be30f6e7466889eeee15a3229acd73b1f3f9e571856e1cbf5143f2b2adca80d3a60d1
 EBUILD glusterfs-3.8.11.ebuild 6364 SHA256 7bdcfc483a1c112ea8a14c28704a29aafff20e5a5f854d738c60587c35c1ac2d SHA512 ddc4360288b35815688e87c4efc4e818cde0dede9bee87f7b816ed3e9ec2db524d86224488ece231e7fc2055cb75baf6b78c538648460c575c3cab27a84241f6 WHIRLPOOL ce429a4a2c269a138a5e6836bdad5b436a627b122667166b4ec0b647f81b7ef9bea3ff290a079196415a0ae41f99108a00d147b9c422f71effb5ee3b5dbf3e60
diff --git a/sys-cluster/glusterfs/files/glusterd-r3.initd b/sys-cluster/glusterfs/files/glusterd-r3.initd
new file mode 100644
index 000000000000..27682d06216d
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterd-r3.initd
@@ -0,0 +1,32 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Gluster elastic volume management daemon"
+command="/usr/sbin/glusterd"
+pidfile="/var/run/${SVCNAME}.pid"
+command_args="-N"
+
+command_background="yes"
+
+depend() {
+	need net
+	before netmount
+}
+
+start_pre() {
+	# Ensure that the GlusterFS auxiliary mount parent directory exists
+	checkpath --directory --owner gluster:gluster --mode 0775 /var/run/gluster
+}
+
+start_post() {
+	local c=0
+	ebegin "Waiting for glusterd to start up"
+	while ! /usr/sbin/gluster volume list &>/dev/null && [ "${c}" -lt "${glusterd_max_wait_start-60}" ]; do
+		(( ++c ))
+	done
+	[ "${c}" -lt "${glusterd_max_wait_start-60}" ]
+	eend $?
+
+	return 0
+}
diff --git a/sys-cluster/glusterfs/files/glusterfs-3.12.2-poisoned-sysmacros.patch b/sys-cluster/glusterfs/files/glusterfs-3.12.2-poisoned-sysmacros.patch
new file mode 100644
index 000000000000..341535163747
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs-3.12.2-poisoned-sysmacros.patch
@@ -0,0 +1,11 @@
+diff --git a/libglusterfs/src/compat.h b/libglusterfs/src/compat.h
+index 1d0ac27e8..b1a7c0a93 100644
+--- a/libglusterfs/src/compat.h
++++ b/libglusterfs/src/compat.h
+@@ -510,6 +510,7 @@ int gf_mkostemp (char *tmpl, int suffixlen, int flags);
+ /* Use run API, see run.h */
+ #include <stdlib.h> /* system(), mkostemp() */
+ #include <stdio.h> /* popen() */
++#include <sys/sysmacros.h>
+ #pragma GCC poison system mkostemp popen
+ #endif
diff --git a/sys-cluster/glusterfs/files/glusterfs-3.12.2-silent_rules.patch b/sys-cluster/glusterfs/files/glusterfs-3.12.2-silent_rules.patch
new file mode 100644
index 000000000000..d5e2727aa8df
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs-3.12.2-silent_rules.patch
@@ -0,0 +1,22 @@
+--- a/configure.ac	2017-08-30 13:46:34.075359703 +0100
++++ b/configure.ac	2017-09-07 21:28:48.110879291 +0100
+@@ -19,19 +19,6 @@
+ #but libglusterfs fails to build with contrib (Then are not set up that way?)
+ #AM_INIT_AUTOMAKE([subdir-objects])
+ 
+-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)])
+-
+-if make --help 2>&1 | grep -q no-print-directory; then
+-   AM_MAKEFLAGS="$AM_MAKEFLAGS --no-print-directory";
+-fi
+-
+-if make --help 2>&1 | grep -q quiet; then
+-   AM_MAKEFLAGS="$AM_MAKEFLAGS --quiet"
+-fi
+-
+-if libtool --help 2>&1 | grep -q quiet; then
+-   AM_LIBTOOLFLAGS="--quiet";
+-fi
+ 
+ AC_CONFIG_HEADERS([config.h site.h])
+ 
diff --git a/sys-cluster/glusterfs/glusterfs-3.12.2.ebuild b/sys-cluster/glusterfs/glusterfs-3.12.2.ebuild
new file mode 100644
index 000000000000..f5220e9f1813
--- /dev/null
+++ b/sys-cluster/glusterfs/glusterfs-3.12.2.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools elisp-common python-single-r1 systemd user versionator
+
+DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
+HOMEPAGE="https://www.gluster.org/"
+SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 LGPL-3+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband qemu-block rsyslog static-libs +syslog systemtap test +tiering vim-syntax +xml"
+
+REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
+	glupy? ( ${PYTHON_REQUIRED_USE} )"
+
+# the tests must be run as root
+RESTRICT="test"
+
+# sys-apps/util-linux is required for libuuid
+RDEPEND="bd-xlator? ( sys-fs/lvm2 )
+	emacs? ( virtual/emacs )
+	fuse? ( >=sys-fs/fuse-2.7.0:0 )
+	georeplication? ( ${PYTHON_DEPS} )
+	infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
+	qemu-block? ( dev-libs/glib:2 )
+	systemtap? ( dev-util/systemtap )
+	tiering? ( dev-db/sqlite:3 )
+	xml? ( dev-libs/libxml2 )
+	sys-libs/readline:=
+	dev-libs/libaio
+	dev-libs/openssl:=[-bindist]
+	dev-libs/userspace-rcu:=
+	|| ( sys-libs/glibc sys-libs/argp-standalone )
+	sys-apps/util-linux"
+DEPEND="${RDEPEND}
+	virtual/acl
+	virtual/pkgconfig
+	sys-devel/bison
+	sys-devel/flex
+	test? ( >=dev-util/cmocka-1.0.1
+		app-benchmarks/dbench
+		dev-vcs/git
+		net-fs/nfs-utils
+		virtual/perl-Test-Harness
+		dev-libs/yajl
+		sys-fs/xfsprogs
+		sys-apps/attr )"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.12.2-poisoned-sysmacros.patch"
+	"${FILESDIR}/${PN}-3.12.2-silent_rules.patch"
+)
+
+DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
+
+# Maintainer notes:
+# * The build system will always configure & build argp-standalone but it'll never use it
+#   if the argp.h header is found in the system. Which should be the case with
+#   glibc or if argp-standalone is installed.
+
+pkg_setup() {
+	python_setup "python2*"
+	python-single-r1_pkg_setup
+
+	# Needed for statedumps
+	# https://github.com/gluster/glusterfs/commit/0e50c4b3ea734456c14e2d7a578463999bd332c3
+	enewgroup gluster
+	enewuser gluster -1 -1 "${EPREFIX}"/var/run/gluster gluster
+}
+
+src_prepare() {
+	default
+
+	# build rpc-transport and xlators only once as shared libs
+	find rpc/rpc-transport xlators -name Makefile.am |
+		xargs sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' || die
+
+	# fix execution permissions
+	chmod +x libglusterfs/src/gen-defaults.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--disable-silent-rules \
+		--disable-fusermount \
+		$(use_enable debug) \
+		$(use_enable bd-xlator) \
+		$(use_enable crypt-xlator) \
+		$(use_enable fuse fuse-client) \
+		$(use_enable georeplication) \
+		$(use_enable glupy) \
+		$(use_enable infiniband ibverbs) \
+		$(use_enable qemu-block) \
+		$(use_enable static-libs static) \
+		$(use_enable syslog) \
+		$(use_enable systemtap) \
+		$(use_enable test cmocka) \
+		$(use_enable tiering) \
+		$(use_enable xml xml-output) \
+		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+	default
+	use emacs && elisp-compile extras/glusterfs-mode.el
+}
+
+src_install() {
+	default
+
+	rm \
+		"${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
+		"${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
+		"${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
+
+	if use rsyslog ; then
+		insinto /etc/rsyslog.d
+		newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
+	fi
+
+	if use emacs ; then
+		elisp-install ${PN} extras/glusterfs-mode.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
+		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
+	fi
+
+	# insert some other tools which might be useful
+	insinto /usr/share/glusterfs/scripts
+	doins \
+		extras/backend-{cleanup,xattr-sanitize}.sh \
+		extras/clear_xattrs.sh \
+		extras/migrate-unify-to-distribute.sh
+
+	# correct permissions on installed scripts
+	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
+	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
+
+	if use georeplication ; then
+		# move the gsync-sync-gfid tool to a binary path
+		# and set a symlink to be compliant with all other distros
+		mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die
+		dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid
+	fi
+
+	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
+	newinitd "${FILESDIR}/glusterd-r3.initd" glusterd
+	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
+
+	keepdir /var/log/${PN}
+	keepdir /var/lib/glusterd
+
+	# QA
+	rm -r "${ED}/var/run/" || die
+	if ! use static-libs; then
+		find "${D}" -type f -name '*.la' -delete || die
+	fi
+
+	# fix all shebang for python2 #560750
+	python_fix_shebang "${ED}"
+}
+
+src_test() {
+	./run-tests.sh || die
+}
+
+pkg_postinst() {
+	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
+	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
+	elog "  /etc/init.d/glusterd start"
+	echo
+	elog "For static configurations, the glusterfsd startup script can be multiplexed."
+	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
+	elog "separate service.  To create additional instances of the glusterfsd service"
+	elog "simply create a symlink to the glusterfsd startup script."
+	echo
+	elog "Example:"
+	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
+	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
+	elog "You can now treat glusterfsd2 like any other service"
+	echo
+	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
+	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
+	ewarn "run GlusterFS."
+	echo
+	elog "If you are upgrading from a previous version of ${PN}, please read:"
+	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(get_version_component_range '1-2')/"
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sys-cluster/heat/Manifest b/sys-cluster/heat/Manifest
index 2b72f81437fb..4a3fe1f42ccc 100644
--- a/sys-cluster/heat/Manifest
+++ b/sys-cluster/heat/Manifest
@@ -1,14 +1,17 @@
 AUX heat.initd 1349 SHA256 6351d06084b740daebd7b4b225d0f953e576f32be269acd1e8793c6433473411 SHA512 a2a2f45bb4268260ca88d7cb5c2df1e9d27041bf36fa59aadc7e39d85b79aad6992c70a3e8f9d580a493801c75299ab99191df23624ad70139f30758d8027492 WHIRLPOOL 851a5ab7febd2d8901446db2a5682cdb1c12582a0a8320ec4650abdefed2229eedf4404d4faa68f050fd96362ba4bb21e00da61493994d380a4927257a5365ad
 AUX heat.initd-2 463 SHA256 2c7f4e524c7b8022aa5a68406655bdb3a47b9d6bd6a44329d9710c760ce14c82 SHA512 8f92853d6bb21e6efae3a59bc2856bd496498297e43a5aa0350a3202e8a709cfd0791f77017b77d8b7845c3cf0d2b266273026c9cac869e3dbc749e36bf83c7c WHIRLPOOL b3379ec3c880e423c121c2b9e25039005d587c8765ade235173816e1434a79c94cd3f7da09cc18ee6d30dcc8c2e45fb10c5722a5596ce08b93353c59c2efb16a
 DIST heat-8.0.4.tar.gz 2304762 SHA256 7997dac0f35ad7fb236536959a46e843dab56dbce5694849585cb97affbbb198 SHA512 9846114813b743ba9abfb4ce6e9d3cdcddfb81a242fda83a9d22a9fc30017fec2464f3b75364d9be38d50218e79485f3405e429fac1830d163c50737b07c2865 WHIRLPOOL 8420bffb6e2b86528d9104abb981368fa2fe36b33057b0e02f1fcf9e9106a4cd58bdb833e459e38a64bd47b2f4955e15f589673b57442184e3bcd60894feab4b
+DIST heat-8.0.5.tar.gz 2309642 SHA256 8f17e09740ca1aafed4af3302b49fa425ad5a83c5ffa51de1b0aaa1b695578b6 SHA512 5ddb9a18ea0ce727b1900015d5690028bc92fe98e42dff3d609b504e5147608e3eefa54e7058ec0e8f6eefbcd3c92bb61eee29e604ce327a5b51250c6f68a1ad WHIRLPOOL 078b53006b75564230315729aa0a7d5f1ca0a790d30fd2e2ec3182f0f7357e6a45d239c7737b4c8370b1056e1f87d10c66367877917d563cb0f62aa9ca47cd89
 DIST heat-9.0.0.tar.gz 2359104 SHA256 36dbb46b72bf7b495ba8812804da7d4e9bb59481743e6e0499e904efdf4ee7be SHA512 d60cfd69807af5a51da6d236e5ccf482a5fd65f8bb2e5e8287eca587f27d0af570979b554a311037904a7c01cd8dcba43a5ef577261fb7f12a557ba6ff2ec58e WHIRLPOOL 43f9afaa57e84e7e29bba4754d3b7499afece40961891dafd6bf75da3032f79806dee6d4de91e0afd24ad53b97cf615e91df46646ed39b2df05fa53d36a31527
 DIST heat.conf.sample-2017.1.9999 88798 SHA256 688a6fd65df3b9f004345c8cf739c5a553b6806213c399ac25846d1ad248e963 SHA512 5ea23f33ddc2b34414371a612041abd075694a7d63bb55efd1e75f313b4e9f35e0d68b420536bc474cd4896b0295d8763bdecbb07c71d29c462c14183159e560 WHIRLPOOL 9a91069136dcbf15d47a4b5df6521ca2740eb1a88feab57b28f2f921e517ae7557125b5ea877d4c9ed5314321c8de551270722809d270c1b8ae0245d2a75b515
 DIST heat.conf.sample-2017.2.9999 88901 SHA256 cb46fbbfa0e8ccccdc84c4637312f0d21b0c95037d2b3404623653c1b5eb0a92 SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932 WHIRLPOOL 284ad592883c8e42518872d603d097672056ba25a194569f31ee9244d1095f640f02097fda0a6539b47247ba580929d79ec173f1847bfc5e19bf45fb8cbe4720
 DIST heat.conf.sample-8.0.4 88798 SHA256 688a6fd65df3b9f004345c8cf739c5a553b6806213c399ac25846d1ad248e963 SHA512 5ea23f33ddc2b34414371a612041abd075694a7d63bb55efd1e75f313b4e9f35e0d68b420536bc474cd4896b0295d8763bdecbb07c71d29c462c14183159e560 WHIRLPOOL 9a91069136dcbf15d47a4b5df6521ca2740eb1a88feab57b28f2f921e517ae7557125b5ea877d4c9ed5314321c8de551270722809d270c1b8ae0245d2a75b515
+DIST heat.conf.sample-8.0.5 88798 SHA256 688a6fd65df3b9f004345c8cf739c5a553b6806213c399ac25846d1ad248e963 SHA512 5ea23f33ddc2b34414371a612041abd075694a7d63bb55efd1e75f313b4e9f35e0d68b420536bc474cd4896b0295d8763bdecbb07c71d29c462c14183159e560 WHIRLPOOL 9a91069136dcbf15d47a4b5df6521ca2740eb1a88feab57b28f2f921e517ae7557125b5ea877d4c9ed5314321c8de551270722809d270c1b8ae0245d2a75b515
 DIST heat.conf.sample-9.0.0 88901 SHA256 cb46fbbfa0e8ccccdc84c4637312f0d21b0c95037d2b3404623653c1b5eb0a92 SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932 WHIRLPOOL 284ad592883c8e42518872d603d097672056ba25a194569f31ee9244d1095f640f02097fda0a6539b47247ba580929d79ec173f1847bfc5e19bf45fb8cbe4720
 EBUILD heat-2017.1.9999.ebuild 5666 SHA256 6a00fb00d27ca007fde4f73f112019af92cb6a5d79d578ff19a1cb05f7d1f368 SHA512 3b99e7e4b8fa48d17e72b2e404c818da31ba668f63d76f4404ff42a6862f0918e4b9ac91fdc95977dda98c931ebd893cadba35553dcb437f563b75905b6ce058 WHIRLPOOL 86a5eaf23be27bd19123ea137b1d3f78fe7b055c1855527677d619d45dd48ae9189d8a740927250f0eed193653c7cc3448b8a06da3c91d4935383506b21c53b9
 EBUILD heat-2017.2.9999.ebuild 6456 SHA256 2fe1669fee37a96e85605a9a968d9f3dbd1a8b2575af46b6c6d57584e4efd4aa SHA512 5f57c8610494a03382c9f2e60716eb221b26e39f56354637960bfc2166437e0d217297911460c8d34a60b5f2dc00e2aa00d10f8b17d0d025c7d5341510e53a7f WHIRLPOOL de4d89ebd301252ca63cb967abee76d6cb6d4ddacfc21e9ff8e81cbf1d5044f1ed4dd11ad8c6416959f285be8c7d7f5cc5fc1f0a2906401b814b9b5f4fddbd44
 EBUILD heat-8.0.4.ebuild 5644 SHA256 7f86f98db8c106c035b62da96aa43ee9ab19af49bb36d4f002999d8a16eb90f6 SHA512 7cf53cd26567282869ce2aaf1b045cd30c16af63fe484fd238cae512ce8c8a04018d76d5fd7cb828a690d9d24526cdc5b259e7b3b0a4e786b090c41b290269cb WHIRLPOOL 9b9fc8adda07a3d08b84600ba51afd7599110463564584d2e0fef574113ba1db50c10c0acf638c90773242441ec1e244defc0cb98abbf33fc0a8b8eceb66da5c
+EBUILD heat-8.0.5.ebuild 5646 SHA256 652794a279ca5b8e60fd736cbec75be4c12e18943d1f87b1489854ee5de51064 SHA512 de3bdebe67dc127a7684cdf688b3625652d9c67ea0eaca1a301ebe67a43cda16c9289faa717b8aa8d737bb7580122efbf17d124b5496903b9caeac8f6f623bd5 WHIRLPOOL da9e18015d8e8ed7dcfd230840807e9405e973f90618138006ab113f4c529ae62c017673e5e2fcf9f265b39a1f146aa37532be7ca87bd05d2f7fa743af78a698
 EBUILD heat-9.0.0.ebuild 6435 SHA256 6af699b66af71f9cd386b2784ff5d2f53326dbefa0769680cad695837900b4de SHA512 2d4de5bd02b861ef4e6b306314629bd06c2c883b56e5493e8efda75cf7a62fc5a600002c401115ac34c019325fb858ddc059ae307cf2e7751dfdbd0b4c9d22eb WHIRLPOOL 28f9bce391a7f3d7cfb8ea3ffb86fcace088f8bae779b660a2c1d117514d0e65dfd2081b9377f42500c55809a55ad4638e5edcded737e80aacb8064e690dbdf5
 MISC ChangeLog 1787 SHA256 3deab106bdcbb6a3b66d3c6a12797c9d36e1e77d24534669bf06759f5119981e SHA512 7d7b6abdfafe22c664c324317e6e9caa39f25d9ab8f49325534e414ec776ec7611538df92ac7b1dff370cc31c27f7b04a0c9346edc257bb46a48de9f858acc0a WHIRLPOOL a05b856678fccde635231f43c3275dee8b1f92aad8ff12988b2a03a087d61ac598f70d94e22efa9dc3630c99cd446ae5d84579db48f15043bbe00437d0ab8eef
 MISC metadata.xml 631 SHA256 d276373e28e559d61fd96704214c329d6e264841cde3147f0600e52ef877c5e6 SHA512 44e741975cc462454bfd08fce461b019c5ef141997f272796052f7f3aa7297646304cdc7d75a2ed01319bcba753475ba5861306c3ac74f3d97218bce60d42429 WHIRLPOOL cb83fb56d6316389e63043623c025abfc09352d6ade6a0aee9d442f8bf4603f09167b99aba5593ae4fa55be369b3c7ae442dc7ac5ed680c2d4a666a8c92baaef
diff --git a/sys-cluster/heat/heat-8.0.5.ebuild b/sys-cluster/heat/heat-8.0.5.ebuild
new file mode 100644
index 000000000000..ea586ee6ec43
--- /dev/null
+++ b/sys-cluster/heat/heat-8.0.5.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1 eutils linux-info user
+
+DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchistration engine."
+HOMEPAGE="https://launchpad.net/heat"
+SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.ocata -> heat.conf.sample-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+mysql +memcached postgres sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/croniter-0.3.4[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+	>=dev-python/aodhclient-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-ceilometerclient-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}]
+	!~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
+	!~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/python-heatclient-1.6.1[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-magnumclient-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-manilaclient-1.12.0[${PYTHON_USEDEP}]
+	>=dev-python/python-mistralclient-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-monascaclient-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}]
+	!~dev-python/python-novaclient-7.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-openstackclient-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/python-saharaclient-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-senlinclient-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-troveclient-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-zaqarclient-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
+	!~dev-python/routes-2.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		<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.0.10[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
+
+	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/yaql-1.1.0[${PYTHON_USEDEP}]"
+
+PATCHES=(
+)
+
+pkg_setup() {
+	enewgroup heat
+	enewuser heat -1 -1 /var/lib/heat heat
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	diropts -m0750 -o heat -g heat
+	keepdir /etc/heat
+	dodir /etc/heat/environment.d
+	dodir /etc/heat/templates
+
+	for svc in api api-cfn engine; do
+		newinitd "${FILESDIR}/heat.initd" heat-${svc}
+	done
+
+	insinto /etc/heat
+	insopts -m0640 -o heat -g heat
+	newins "${DISTDIR}/heat.conf.sample-${PV}" "heat.conf.sample"
+	doins "etc/heat/api-paste.ini"
+	doins "etc/heat/policy.json"
+	insinto /etc/heat/templates
+	doins "etc/heat/templates/"*
+	insinto /etc/heat/environment.d
+	doins "etc/heat/environment.d/default.yaml"
+
+	dodir /var/log/heat
+	fowners heat:heat /var/log/heat
+}
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index ea782d0dded9..e8a2fd7758a3 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -1,12 +1,8 @@
 AUX kube-apiserver.confd 116 SHA256 41c807a6b97b5cb309fb83a9c201956849d9e26da160825cc14e64aaa258e327 SHA512 302b2a7ec715967c0aa7d1c177d4e55b26e37ebba8d04dd37ecf627d20042fe91cd7e6192ff9d71422129b0ea54a9eec6046f505af550548bd450998924f37ee WHIRLPOOL 97e3233336c3afc89a579d20ea26a67ecacfae776f1be05ff9e1a355d0955c74dbc404ca6947d5e0d3f52902c7db816c30413bb774751c30b987fd20399bf803
 AUX kube-apiserver.initd 541 SHA256 c20920c79c9b17d28e9a9bb2375a7a226e05a96e7a0ec8079999ae300a54c06c SHA512 2863ad6d1d238b5e9557874cd3f5413108ed9424604cf026e2fd8c2fd66ba867ca9a3d98f67fdac54f335bacddf0479547b28f71aaa1db6580beff49290de110 WHIRLPOOL 54b8496a4e67e381ffcbf8fbc5d030d6e2cafffaf2a21dea2c46cd03198559c6370b0388fe31a37df54c5f2fa8e3397b344e09e5560269430ba3f0833e1b42d3
-AUX kube-apiserver.logrotated 84 SHA256 0e47872a37f8b06bc56ea17e35640af70f490588b16928d936f354415e559500 SHA512 91c1115cfebb17355f655b54b6574499c3e85876b186e217e80c87974a42171b32f9b1a359f5a361df0e33d1d6ecbb79dce1506728f4948bb5973680128b5ff2 WHIRLPOOL 6f4bf99d3f33a47633fbb657c335c6c6b75ff1da31363d694e3d3a16f0d8b90076aebe7c9898c3f0462025e5eb47d665dd1868e0f0e4a0bfb5aa754de75206fa
-DIST kubernetes-1.7.5.tar.gz 22027539 SHA256 5fe434de8b17ef951d156f7cee24b24a0c5a071a85a612bba4890603541e1ff1 SHA512 a9fcc8f2d50ab431dc9aa5580c79acb8f1738102980f15cf99d01c64be5c6764dd670d436b2e42bf53d1e068a1e8924117384ebc4a3ac571267875862a86d4e3 WHIRLPOOL c2bcf741d9bd8a2fe840ceb9e8b67221c96218a0a0c4caa198d3971cd6044fe922da58c2be20e4230aab6b3ae7057ac37a82c457d0049b126954ece40f66d3de
-DIST kubernetes-1.7.6.tar.gz 22032012 SHA256 434ef607ba5cb77046066e5ebe2859fb7a1a07657f2b56762f7f16501dc12359 SHA512 b4db0951236f2a7aa8bea70ab0c3e5f1f1efe302ab378277db3752a44a41a360c4def9d71b3398e41f3f3ede503a5fccb5ed7b65e4c1152f0a0854659c4966c9 WHIRLPOOL b9b11e07bed8cb14b15ec346be388ec3c481bd97d744c73743653a17d1dedff21a77fd4729380141d589b50cf772e7018cb3fa697fa1fb9a3c4372885f9c48ce
-DIST kubernetes-1.8.0.tar.gz 23388112 SHA256 235c3eccf3490d5ffb7a32d7b3a02f0b849efe0a0ff831094f614ff6907d36aa SHA512 679e58bb29cd398198343f008da27fa4a0461d25c922a54b17cf26a7f6329ed7443717d1e564df646d17f60a014e1e4e0b1285d0ae4f63ab846843b309ce2872 WHIRLPOOL c9e06b6a699903382c0efef8a2fb850efcc4a8c855beaa5cd9bb94e6dc4dfe2fc139ae4814f29bbb3c46a19ca65ec68b7bb5a5f454eeb0fb6bfef55c3d0caee9
+AUX kube-apiserver.logrotated 88 SHA256 27232cac89ee8436333872e1e89e82a3708fe25dd91c110e828387c700e9cf29 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e WHIRLPOOL 367818a50912337d297019ac535b3266ef20e1e674632736e12d6824a9f3758f2f79eb6aebca267b4dff73bfbfb3c8c93297353807027db2ac936f79d739fd70
 DIST kubernetes-1.8.1.tar.gz 23400352 SHA256 a262050d532275a1b340ca1a453a986eb977a094d7a8f4a7600358677f114a18 SHA512 b09e72990cd148c604a92d866e4dd07da113a9dd1e68faebea8dd9bf256bfd908070d4e38eed7ce04c8f416d20203cf29c9c7f8906e1b50b678cb18e2ef8f5b3 WHIRLPOOL 87142b40c7d19b8be8563ec5ccaefc3970b7ce79a081bd9c1ff8c3d5227843c267fe5ab8d56b7a42874b7f29d8517f0d69beb2842ab2b58f8fb1efa5e6a61291
-EBUILD kube-apiserver-1.7.5.ebuild 1197 SHA256 bd2f234b0c230833e147daba384e39fc4bb65a862e82126d6ad4563023c241be SHA512 fb9ea8d90470560651ee6a05144f78b55c97edc0b1fac0afb6378b355da5c1810ca1dace31f2499411327fbea31ce247c9aa47d3e01362936fc0f332eae1643d WHIRLPOOL f4b9f72baad98189da9c354be284e3fd167f20b4e472c13d5bd248c23380d847cc94a149d68e13edfd41da70dc68af040e76637d1086dfc89fc495534d933f13
-EBUILD kube-apiserver-1.7.6.ebuild 1197 SHA256 bd2f234b0c230833e147daba384e39fc4bb65a862e82126d6ad4563023c241be SHA512 fb9ea8d90470560651ee6a05144f78b55c97edc0b1fac0afb6378b355da5c1810ca1dace31f2499411327fbea31ce247c9aa47d3e01362936fc0f332eae1643d WHIRLPOOL f4b9f72baad98189da9c354be284e3fd167f20b4e472c13d5bd248c23380d847cc94a149d68e13edfd41da70dc68af040e76637d1086dfc89fc495534d933f13
-EBUILD kube-apiserver-1.8.0.ebuild 1197 SHA256 bd2f234b0c230833e147daba384e39fc4bb65a862e82126d6ad4563023c241be SHA512 fb9ea8d90470560651ee6a05144f78b55c97edc0b1fac0afb6378b355da5c1810ca1dace31f2499411327fbea31ce247c9aa47d3e01362936fc0f332eae1643d WHIRLPOOL f4b9f72baad98189da9c354be284e3fd167f20b4e472c13d5bd248c23380d847cc94a149d68e13edfd41da70dc68af040e76637d1086dfc89fc495534d933f13
+DIST kubernetes-1.8.2.tar.gz 23123452 SHA256 3052c0ce35bd1f8a1500588580947c7f17f09f1ddea3a54466036fd62b46c736 SHA512 a813681f07fc674f493701833a30bc6b156572e4c8d28558b0e22dd36c16257c6c0922df773e4a5799a2eec05674cd1180f2b15ab69b0bdce52d1a861723214b WHIRLPOOL d8beb599ca2e194af5e5e1eb6d521c7846ad2ffad72da965119c51c92b16db41a17222886e57de5aad83359f20c8b264eb2e7411048218c95790d1f95f0b75fe
 EBUILD kube-apiserver-1.8.1.ebuild 1197 SHA256 bd2f234b0c230833e147daba384e39fc4bb65a862e82126d6ad4563023c241be SHA512 fb9ea8d90470560651ee6a05144f78b55c97edc0b1fac0afb6378b355da5c1810ca1dace31f2499411327fbea31ce247c9aa47d3e01362936fc0f332eae1643d WHIRLPOOL f4b9f72baad98189da9c354be284e3fd167f20b4e472c13d5bd248c23380d847cc94a149d68e13edfd41da70dc68af040e76637d1086dfc89fc495534d933f13
+EBUILD kube-apiserver-1.8.2.ebuild 1197 SHA256 bd2f234b0c230833e147daba384e39fc4bb65a862e82126d6ad4563023c241be SHA512 fb9ea8d90470560651ee6a05144f78b55c97edc0b1fac0afb6378b355da5c1810ca1dace31f2499411327fbea31ce247c9aa47d3e01362936fc0f332eae1643d WHIRLPOOL f4b9f72baad98189da9c354be284e3fd167f20b4e472c13d5bd248c23380d847cc94a149d68e13edfd41da70dc68af040e76637d1086dfc89fc495534d933f13
 MISC metadata.xml 331 SHA256 d36b415b6920b0f46ff81985c0ad7d18c35a945358cf2846d0a968cdf9dc5f1c SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68 WHIRLPOOL 3fb6d9e005c6ea6d7d82e288c0a0c9c6b643599b5c16f3f66113b99d5082036642502541d54bc2f84f764f5fd1cd84eaf1d50e3e11ce7f9bff46763304794925
diff --git a/sys-cluster/kube-apiserver/files/kube-apiserver.logrotated b/sys-cluster/kube-apiserver/files/kube-apiserver.logrotated
index 8bbeb0abde24..4ed84506231f 100644
--- a/sys-cluster/kube-apiserver/files/kube-apiserver.logrotated
+++ b/sys-cluster/kube-apiserver/files/kube-apiserver.logrotated
@@ -1,4 +1,4 @@
-/var/log/kube-apiserver/* {
+/var/log/kube-apiserver/*.log {
 	missingok
 	size 5M
 	rotate 3
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.7.6.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.7.6.ebuild
deleted file mode 100644
index 56d8ee795dcd..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.7.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-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 API server"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN}
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.8.0.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.8.0.ebuild
deleted file mode 100644
index 56d8ee795dcd..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.8.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-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 API server"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN}
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.7.5.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.8.2.ebuild
index 56d8ee795dcd..56d8ee795dcd 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.7.5.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.8.2.ebuild
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index 131a07b11d98..e5fbe5a26bb8 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -1,12 +1,8 @@
 AUX kube-controller-manager.confd 142 SHA256 378af056f60aefc4e4619b7d805e489d2129a4e2407b198cd7421d4294455ca9 SHA512 b0227a7431018a6742b3931fda0f14b4a040107ecd6821c84593180919ba8a5af9b99b7a507645a5488792f14accd686acc4cc6f70a5084bbdfcdd494021aafc WHIRLPOOL e2e88071f8bbb487fcf5594134220398a223c364867600cd78d02553ffa5bb864336da9adb6da973e429186cb7164d18e12032fbef9579c5868255bd9806c45b
 AUX kube-controller-manager.initd 566 SHA256 1271f550840ad78ce45135f6a64c2a95d639fb2f5dbbdf81cf336a4f705fe022 SHA512 7e3baab9b034e7048ed3cda8d09444c76369874cecc0a747fb5484c482fef464adb5ccc25fcb4481fb4aff68415a60462f6cbee2138810316f0cf822637676c1 WHIRLPOOL b642c8ca42215e6e8d132ef02cbaba187554be715c780ebe18e88168a5045ac73c5b8d59bf2a8bb36450b2a3892d040059f2bd48c4b50c0858886d44c46c9e06
-AUX kube-controller-manager.logrotated 93 SHA256 f56bb3ae56cd34c554524f1dd663b0b7652f09401fe1c0eaf0c6190192679155 SHA512 9c9d33696dc4fb915848efff258d2150b31d1a793e6b58715a6bc97bf7843ff8b67497f9fb02e025b19a109975913a6d93b7aacd9f485562d535591d849199f2 WHIRLPOOL 53c4279418049dc805d514401776ee4687957f2fbe030228ca2a2ce1c427e73fe711f4b009aece6b657aa1947b3c4759008d946759f1469a2faaba8a6d34064b
-DIST kubernetes-1.7.5.tar.gz 22027539 SHA256 5fe434de8b17ef951d156f7cee24b24a0c5a071a85a612bba4890603541e1ff1 SHA512 a9fcc8f2d50ab431dc9aa5580c79acb8f1738102980f15cf99d01c64be5c6764dd670d436b2e42bf53d1e068a1e8924117384ebc4a3ac571267875862a86d4e3 WHIRLPOOL c2bcf741d9bd8a2fe840ceb9e8b67221c96218a0a0c4caa198d3971cd6044fe922da58c2be20e4230aab6b3ae7057ac37a82c457d0049b126954ece40f66d3de
-DIST kubernetes-1.7.6.tar.gz 22032012 SHA256 434ef607ba5cb77046066e5ebe2859fb7a1a07657f2b56762f7f16501dc12359 SHA512 b4db0951236f2a7aa8bea70ab0c3e5f1f1efe302ab378277db3752a44a41a360c4def9d71b3398e41f3f3ede503a5fccb5ed7b65e4c1152f0a0854659c4966c9 WHIRLPOOL b9b11e07bed8cb14b15ec346be388ec3c481bd97d744c73743653a17d1dedff21a77fd4729380141d589b50cf772e7018cb3fa697fa1fb9a3c4372885f9c48ce
-DIST kubernetes-1.8.0.tar.gz 23388112 SHA256 235c3eccf3490d5ffb7a32d7b3a02f0b849efe0a0ff831094f614ff6907d36aa SHA512 679e58bb29cd398198343f008da27fa4a0461d25c922a54b17cf26a7f6329ed7443717d1e564df646d17f60a014e1e4e0b1285d0ae4f63ab846843b309ce2872 WHIRLPOOL c9e06b6a699903382c0efef8a2fb850efcc4a8c855beaa5cd9bb94e6dc4dfe2fc139ae4814f29bbb3c46a19ca65ec68b7bb5a5f454eeb0fb6bfef55c3d0caee9
+AUX kube-controller-manager.logrotated 97 SHA256 d6a51d4753956b17c6b308a9e831bbe9553c3ea33cf9cdb47e01d1f1942e487d SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c WHIRLPOOL d683da579cdcbd69686e35e52a8d1e83783b818f5de35032916a9d04f4e8742b7599ed9ddb86a30bf2cd7932a307b03867607e9722b04a389699bf952d10e559
 DIST kubernetes-1.8.1.tar.gz 23400352 SHA256 a262050d532275a1b340ca1a453a986eb977a094d7a8f4a7600358677f114a18 SHA512 b09e72990cd148c604a92d866e4dd07da113a9dd1e68faebea8dd9bf256bfd908070d4e38eed7ce04c8f416d20203cf29c9c7f8906e1b50b678cb18e2ef8f5b3 WHIRLPOOL 87142b40c7d19b8be8563ec5ccaefc3970b7ce79a081bd9c1ff8c3d5227843c267fe5ab8d56b7a42874b7f29d8517f0d69beb2842ab2b58f8fb1efa5e6a61291
-EBUILD kube-controller-manager-1.7.5.ebuild 1205 SHA256 10cbae6a937d6f84e48ee5f6991bcbe27d62a3763747b2c6028b6398073b4941 SHA512 7e3d27d052066d98fd014d4188f090eeea7a87d34b152be35c4fab01175ce2a375fb566dc718a2531464cbe528cb374e2d548cbbcb867660770798b72f2b103c WHIRLPOOL 787009973d32c39053c68d5e0ad74d07dc2ff3d3169e8ad8304621ec393878c3f1533c6b803facabc7d08cf067522b7151346d1761a4719a0b646927b97603c3
-EBUILD kube-controller-manager-1.7.6.ebuild 1205 SHA256 10cbae6a937d6f84e48ee5f6991bcbe27d62a3763747b2c6028b6398073b4941 SHA512 7e3d27d052066d98fd014d4188f090eeea7a87d34b152be35c4fab01175ce2a375fb566dc718a2531464cbe528cb374e2d548cbbcb867660770798b72f2b103c WHIRLPOOL 787009973d32c39053c68d5e0ad74d07dc2ff3d3169e8ad8304621ec393878c3f1533c6b803facabc7d08cf067522b7151346d1761a4719a0b646927b97603c3
-EBUILD kube-controller-manager-1.8.0.ebuild 1205 SHA256 10cbae6a937d6f84e48ee5f6991bcbe27d62a3763747b2c6028b6398073b4941 SHA512 7e3d27d052066d98fd014d4188f090eeea7a87d34b152be35c4fab01175ce2a375fb566dc718a2531464cbe528cb374e2d548cbbcb867660770798b72f2b103c WHIRLPOOL 787009973d32c39053c68d5e0ad74d07dc2ff3d3169e8ad8304621ec393878c3f1533c6b803facabc7d08cf067522b7151346d1761a4719a0b646927b97603c3
+DIST kubernetes-1.8.2.tar.gz 23123452 SHA256 3052c0ce35bd1f8a1500588580947c7f17f09f1ddea3a54466036fd62b46c736 SHA512 a813681f07fc674f493701833a30bc6b156572e4c8d28558b0e22dd36c16257c6c0922df773e4a5799a2eec05674cd1180f2b15ab69b0bdce52d1a861723214b WHIRLPOOL d8beb599ca2e194af5e5e1eb6d521c7846ad2ffad72da965119c51c92b16db41a17222886e57de5aad83359f20c8b264eb2e7411048218c95790d1f95f0b75fe
 EBUILD kube-controller-manager-1.8.1.ebuild 1205 SHA256 10cbae6a937d6f84e48ee5f6991bcbe27d62a3763747b2c6028b6398073b4941 SHA512 7e3d27d052066d98fd014d4188f090eeea7a87d34b152be35c4fab01175ce2a375fb566dc718a2531464cbe528cb374e2d548cbbcb867660770798b72f2b103c WHIRLPOOL 787009973d32c39053c68d5e0ad74d07dc2ff3d3169e8ad8304621ec393878c3f1533c6b803facabc7d08cf067522b7151346d1761a4719a0b646927b97603c3
+EBUILD kube-controller-manager-1.8.2.ebuild 1205 SHA256 10cbae6a937d6f84e48ee5f6991bcbe27d62a3763747b2c6028b6398073b4941 SHA512 7e3d27d052066d98fd014d4188f090eeea7a87d34b152be35c4fab01175ce2a375fb566dc718a2531464cbe528cb374e2d548cbbcb867660770798b72f2b103c WHIRLPOOL 787009973d32c39053c68d5e0ad74d07dc2ff3d3169e8ad8304621ec393878c3f1533c6b803facabc7d08cf067522b7151346d1761a4719a0b646927b97603c3
 MISC metadata.xml 331 SHA256 d36b415b6920b0f46ff81985c0ad7d18c35a945358cf2846d0a968cdf9dc5f1c SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68 WHIRLPOOL 3fb6d9e005c6ea6d7d82e288c0a0c9c6b643599b5c16f3f66113b99d5082036642502541d54bc2f84f764f5fd1cd84eaf1d50e3e11ce7f9bff46763304794925
diff --git a/sys-cluster/kube-controller-manager/files/kube-controller-manager.logrotated b/sys-cluster/kube-controller-manager/files/kube-controller-manager.logrotated
index a74eca94abf1..06efce234069 100644
--- a/sys-cluster/kube-controller-manager/files/kube-controller-manager.logrotated
+++ b/sys-cluster/kube-controller-manager/files/kube-controller-manager.logrotated
@@ -1,4 +1,4 @@
-/var/log/kube-controller-manager/* {
+/var/log/kube-controller-manager/*.log {
 	missingok
 	size 5M
 	rotate 3
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.7.6.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.7.6.ebuild
deleted file mode 100644
index e5ab12f16012..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.7.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-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 Controller Manager"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN}
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.8.0.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.8.0.ebuild
deleted file mode 100644
index e5ab12f16012..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.8.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-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 Controller Manager"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN}
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.7.5.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.8.2.ebuild
index e5ab12f16012..e5ab12f16012 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.7.5.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.8.2.ebuild
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index 2537bf77cc28..a16fe88b5dfd 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -1,12 +1,8 @@
 AUX kube-proxy.confd 53 SHA256 a64f7683e165325c7ea27d75f1072a9aab33f3bb6dbd3cde10c62e0e39cc4876 SHA512 4c8c34ae8668bcfa5167c2d2af006fc46b461a5dafb3ec5b64cb8cdf2a830c22ddb5cf806c93b1404f60dabf91b4153724947fa2d2c494376f20e637eeed5018 WHIRLPOOL 06b0c1feb540972544331c2b34325b78dc70fa25ae89a131581fa796eecb3f5a84c3825f875558f34aabeff161e1936701b922c5e3f74e104f590117c8a1a809
 AUX kube-proxy.initd 507 SHA256 b8da03e55d7ab6265a202c664b8a128f173caa146335179d5ee25cb1f58a9898 SHA512 088d91cd77e614f7857d65496f5b6d486741a8e3358b3e13bcd4203d35a76fa3aa390f658065e2826145525b6e83fcd33f8365a873e99b522f3ab7e8615ed364 WHIRLPOOL 915c7538815aadcd24e71fb664e51c00243d021c3d7769d147d5ae0c026ff8e957109219cdf7ab1f6eb5606da8ab4e0773405fe20962bbffd3dfbb6f02f6fff1
-AUX kube-proxy.logrotated 80 SHA256 c9a2cd891aaa1a4193d8244ffd857400e2bc258d6b43fb4796c0787f3a06fcba SHA512 866e25b63e955ca4855ed6bff2d98225b82e313155a6f24ba39c3063bf0d66a2ed87be4f940a0a562d5bdb73cd90daf11b9b4748a880e64db4ec5092689fcbe4 WHIRLPOOL 13e918604291bb3378105e59d6e27108e6b3bc9df0ec314be5ff9f117e81267585257c0a8b80d8bcf1b840d9ac3827f015c4ff6698f5d49b70452c3588d09355
-DIST kubernetes-1.7.5.tar.gz 22027539 SHA256 5fe434de8b17ef951d156f7cee24b24a0c5a071a85a612bba4890603541e1ff1 SHA512 a9fcc8f2d50ab431dc9aa5580c79acb8f1738102980f15cf99d01c64be5c6764dd670d436b2e42bf53d1e068a1e8924117384ebc4a3ac571267875862a86d4e3 WHIRLPOOL c2bcf741d9bd8a2fe840ceb9e8b67221c96218a0a0c4caa198d3971cd6044fe922da58c2be20e4230aab6b3ae7057ac37a82c457d0049b126954ece40f66d3de
-DIST kubernetes-1.7.6.tar.gz 22032012 SHA256 434ef607ba5cb77046066e5ebe2859fb7a1a07657f2b56762f7f16501dc12359 SHA512 b4db0951236f2a7aa8bea70ab0c3e5f1f1efe302ab378277db3752a44a41a360c4def9d71b3398e41f3f3ede503a5fccb5ed7b65e4c1152f0a0854659c4966c9 WHIRLPOOL b9b11e07bed8cb14b15ec346be388ec3c481bd97d744c73743653a17d1dedff21a77fd4729380141d589b50cf772e7018cb3fa697fa1fb9a3c4372885f9c48ce
-DIST kubernetes-1.8.0.tar.gz 23388112 SHA256 235c3eccf3490d5ffb7a32d7b3a02f0b849efe0a0ff831094f614ff6907d36aa SHA512 679e58bb29cd398198343f008da27fa4a0461d25c922a54b17cf26a7f6329ed7443717d1e564df646d17f60a014e1e4e0b1285d0ae4f63ab846843b309ce2872 WHIRLPOOL c9e06b6a699903382c0efef8a2fb850efcc4a8c855beaa5cd9bb94e6dc4dfe2fc139ae4814f29bbb3c46a19ca65ec68b7bb5a5f454eeb0fb6bfef55c3d0caee9
+AUX kube-proxy.logrotated 84 SHA256 d5cede3f593d9f748b162647b89aac25123dd92cb003f4249c5c7abdf139de6d SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d WHIRLPOOL 78cc481814917f289ba91b84369e3af377133ee1da7700aca679683d94327f5cd4da1f0d85f7d46ab75409694a4b98a14d83ba96695d75562fad0f2464d287ae
 DIST kubernetes-1.8.1.tar.gz 23400352 SHA256 a262050d532275a1b340ca1a453a986eb977a094d7a8f4a7600358677f114a18 SHA512 b09e72990cd148c604a92d866e4dd07da113a9dd1e68faebea8dd9bf256bfd908070d4e38eed7ce04c8f416d20203cf29c9c7f8906e1b50b678cb18e2ef8f5b3 WHIRLPOOL 87142b40c7d19b8be8563ec5ccaefc3970b7ce79a081bd9c1ff8c3d5227843c267fe5ab8d56b7a42874b7f29d8517f0d69beb2842ab2b58f8fb1efa5e6a61291
-EBUILD kube-proxy-1.7.5.ebuild 1109 SHA256 c954932ce483576da1b3f4295617d74b465f8da1bed5370f404d76637e4178e3 SHA512 6dd581cfd97d999d1634181700984a8fd3b4d87f7a91011638a100b7076e23b5addfa364425b1bfb3619aae4919ef1d77f9e11a38daf782b3ebe3ae9b4e867bf WHIRLPOOL e4854293acc347634aea7538ec6770298719b30c684e09d14fac7f5bb7221a88578f465ead9ee5702e0bad61ed7b23dbba63c8c2a49a153b09619fb29e46fc39
-EBUILD kube-proxy-1.7.6.ebuild 1109 SHA256 c954932ce483576da1b3f4295617d74b465f8da1bed5370f404d76637e4178e3 SHA512 6dd581cfd97d999d1634181700984a8fd3b4d87f7a91011638a100b7076e23b5addfa364425b1bfb3619aae4919ef1d77f9e11a38daf782b3ebe3ae9b4e867bf WHIRLPOOL e4854293acc347634aea7538ec6770298719b30c684e09d14fac7f5bb7221a88578f465ead9ee5702e0bad61ed7b23dbba63c8c2a49a153b09619fb29e46fc39
-EBUILD kube-proxy-1.8.0.ebuild 1109 SHA256 c954932ce483576da1b3f4295617d74b465f8da1bed5370f404d76637e4178e3 SHA512 6dd581cfd97d999d1634181700984a8fd3b4d87f7a91011638a100b7076e23b5addfa364425b1bfb3619aae4919ef1d77f9e11a38daf782b3ebe3ae9b4e867bf WHIRLPOOL e4854293acc347634aea7538ec6770298719b30c684e09d14fac7f5bb7221a88578f465ead9ee5702e0bad61ed7b23dbba63c8c2a49a153b09619fb29e46fc39
+DIST kubernetes-1.8.2.tar.gz 23123452 SHA256 3052c0ce35bd1f8a1500588580947c7f17f09f1ddea3a54466036fd62b46c736 SHA512 a813681f07fc674f493701833a30bc6b156572e4c8d28558b0e22dd36c16257c6c0922df773e4a5799a2eec05674cd1180f2b15ab69b0bdce52d1a861723214b WHIRLPOOL d8beb599ca2e194af5e5e1eb6d521c7846ad2ffad72da965119c51c92b16db41a17222886e57de5aad83359f20c8b264eb2e7411048218c95790d1f95f0b75fe
 EBUILD kube-proxy-1.8.1.ebuild 1109 SHA256 c954932ce483576da1b3f4295617d74b465f8da1bed5370f404d76637e4178e3 SHA512 6dd581cfd97d999d1634181700984a8fd3b4d87f7a91011638a100b7076e23b5addfa364425b1bfb3619aae4919ef1d77f9e11a38daf782b3ebe3ae9b4e867bf WHIRLPOOL e4854293acc347634aea7538ec6770298719b30c684e09d14fac7f5bb7221a88578f465ead9ee5702e0bad61ed7b23dbba63c8c2a49a153b09619fb29e46fc39
+EBUILD kube-proxy-1.8.2.ebuild 1109 SHA256 c954932ce483576da1b3f4295617d74b465f8da1bed5370f404d76637e4178e3 SHA512 6dd581cfd97d999d1634181700984a8fd3b4d87f7a91011638a100b7076e23b5addfa364425b1bfb3619aae4919ef1d77f9e11a38daf782b3ebe3ae9b4e867bf WHIRLPOOL e4854293acc347634aea7538ec6770298719b30c684e09d14fac7f5bb7221a88578f465ead9ee5702e0bad61ed7b23dbba63c8c2a49a153b09619fb29e46fc39
 MISC metadata.xml 331 SHA256 d36b415b6920b0f46ff81985c0ad7d18c35a945358cf2846d0a968cdf9dc5f1c SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68 WHIRLPOOL 3fb6d9e005c6ea6d7d82e288c0a0c9c6b643599b5c16f3f66113b99d5082036642502541d54bc2f84f764f5fd1cd84eaf1d50e3e11ce7f9bff46763304794925
diff --git a/sys-cluster/kube-proxy/files/kube-proxy.logrotated b/sys-cluster/kube-proxy/files/kube-proxy.logrotated
index 892c730e83a1..b8d1032c1f76 100644
--- a/sys-cluster/kube-proxy/files/kube-proxy.logrotated
+++ b/sys-cluster/kube-proxy/files/kube-proxy.logrotated
@@ -1,4 +1,4 @@
-/var/log/kube-proxy/* {
+/var/log/kube-proxy/*.log {
 	missingok
 	size 5M
 	rotate 3
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.7.6.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.7.6.ebuild
deleted file mode 100644
index 4824d28abca5..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.7.6.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
-inherit golang-build golang-vcs-snapshot
-
-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 Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN}
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.8.0.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.8.0.ebuild
deleted file mode 100644
index 4824d28abca5..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.8.0.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
-inherit golang-build golang-vcs-snapshot
-
-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 Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN}
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.7.5.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.8.2.ebuild
index 4824d28abca5..4824d28abca5 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.7.5.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.8.2.ebuild
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index 98c41860b625..982c4ab5346f 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -1,12 +1,8 @@
 AUX kube-scheduler.confd 133 SHA256 70edc8af1b41224c51951df215533029e708f544fbc9c8852862fa3e7034b4ab SHA512 d7326f34b26aaebf4b5c25a03abcff3bc3d397382ad4fed0f4718ee425e71399febf6fec6dc817813490671692d3f1b454fd5d14d9c47c3d41b0d3405a01a6c2 WHIRLPOOL 18149eaa544a683e49e23975faddeb547032528107a34f3bd0920724e073a73c742e928a97960e304b33018a7306d099cb359a04f239ad902e76fd09c99788fa
 AUX kube-scheduler.initd 548 SHA256 5da776b988c9f11ef4801fe80c30c8d1af7d451a31b094daa3cd34e85309831e SHA512 151ea6f5cc36de9b83f0e5365579e33eea8002f9a03f5f61d195a349236e6baf192f701d3fb591b769aa90e8e1e620d525b20c95a1e8cda58d062971d8f587a3 WHIRLPOOL 621ccbc1e20e0f9eecef2654f6e3d0f633070f2e58ecc54620cb32e5240593dae5b91cc6af65230479f012882bdf7513b5681b5524ae92324d9a5f82aa741f5c
-AUX kube-scheduler.logrotated 84 SHA256 1930db199708801e324d3fd0131f2a8f0eecd32d108a92df521f976333d4d5ef SHA512 34d1cf5b5e84b2466b2f40a998bd81e197df7f284636e79ed6e55442d04c7a565af57487ee2f95566c7a9bc95cc903fa2772cc434eaf49c1aa3a6df4f0be5fd2 WHIRLPOOL cebd1e659f51be2c6c9db184bf39df4dbcc247ff4249daddc7ef693cba48c0ce6ee05b870297c336d5f2a2ab9589a1396bbd66a83748ac699658fd0b23ead5a0
-DIST kubernetes-1.7.5.tar.gz 22027539 SHA256 5fe434de8b17ef951d156f7cee24b24a0c5a071a85a612bba4890603541e1ff1 SHA512 a9fcc8f2d50ab431dc9aa5580c79acb8f1738102980f15cf99d01c64be5c6764dd670d436b2e42bf53d1e068a1e8924117384ebc4a3ac571267875862a86d4e3 WHIRLPOOL c2bcf741d9bd8a2fe840ceb9e8b67221c96218a0a0c4caa198d3971cd6044fe922da58c2be20e4230aab6b3ae7057ac37a82c457d0049b126954ece40f66d3de
-DIST kubernetes-1.7.6.tar.gz 22032012 SHA256 434ef607ba5cb77046066e5ebe2859fb7a1a07657f2b56762f7f16501dc12359 SHA512 b4db0951236f2a7aa8bea70ab0c3e5f1f1efe302ab378277db3752a44a41a360c4def9d71b3398e41f3f3ede503a5fccb5ed7b65e4c1152f0a0854659c4966c9 WHIRLPOOL b9b11e07bed8cb14b15ec346be388ec3c481bd97d744c73743653a17d1dedff21a77fd4729380141d589b50cf772e7018cb3fa697fa1fb9a3c4372885f9c48ce
-DIST kubernetes-1.8.0.tar.gz 23388112 SHA256 235c3eccf3490d5ffb7a32d7b3a02f0b849efe0a0ff831094f614ff6907d36aa SHA512 679e58bb29cd398198343f008da27fa4a0461d25c922a54b17cf26a7f6329ed7443717d1e564df646d17f60a014e1e4e0b1285d0ae4f63ab846843b309ce2872 WHIRLPOOL c9e06b6a699903382c0efef8a2fb850efcc4a8c855beaa5cd9bb94e6dc4dfe2fc139ae4814f29bbb3c46a19ca65ec68b7bb5a5f454eeb0fb6bfef55c3d0caee9
+AUX kube-scheduler.logrotated 88 SHA256 03458ca43bf70c5991caa6a47ed8b796592a958a06eb2db6d734f196920dfd79 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6 WHIRLPOOL 22e896b20485794a714f86b462aa1dfa213a01c0d82c91b074f23d52d52fb9fa111362aa4e7c1f5af0caa667b2764c2c4f46022ce8c1557335657dfb9a7f0f16
 DIST kubernetes-1.8.1.tar.gz 23400352 SHA256 a262050d532275a1b340ca1a453a986eb977a094d7a8f4a7600358677f114a18 SHA512 b09e72990cd148c604a92d866e4dd07da113a9dd1e68faebea8dd9bf256bfd908070d4e38eed7ce04c8f416d20203cf29c9c7f8906e1b50b678cb18e2ef8f5b3 WHIRLPOOL 87142b40c7d19b8be8563ec5ccaefc3970b7ce79a081bd9c1ff8c3d5227843c267fe5ab8d56b7a42874b7f29d8517f0d69beb2842ab2b58f8fb1efa5e6a61291
-EBUILD kube-scheduler-1.7.5.ebuild 1212 SHA256 61aa6e4d0aa1aaeac5fe4df77d787b02944e9902d04c8b2548915c0c4a4a2c54 SHA512 03ad58f55630501b97575183c6d56aa59a4290a3bd8b08818c5f616f0966f539558588ebce58283dedc1543519e229c228f83f8886f82e5f36a636c5b4d655c9 WHIRLPOOL 7648f122210c39a05ceeacaff31e1149ca4929ce3b6072358ca856b2f51abe93d1b7cf37c8633770b88d3c6fd65d049d1bc94c306263de19bfedc749a75ab303
-EBUILD kube-scheduler-1.7.6.ebuild 1212 SHA256 61aa6e4d0aa1aaeac5fe4df77d787b02944e9902d04c8b2548915c0c4a4a2c54 SHA512 03ad58f55630501b97575183c6d56aa59a4290a3bd8b08818c5f616f0966f539558588ebce58283dedc1543519e229c228f83f8886f82e5f36a636c5b4d655c9 WHIRLPOOL 7648f122210c39a05ceeacaff31e1149ca4929ce3b6072358ca856b2f51abe93d1b7cf37c8633770b88d3c6fd65d049d1bc94c306263de19bfedc749a75ab303
-EBUILD kube-scheduler-1.8.0.ebuild 1212 SHA256 61aa6e4d0aa1aaeac5fe4df77d787b02944e9902d04c8b2548915c0c4a4a2c54 SHA512 03ad58f55630501b97575183c6d56aa59a4290a3bd8b08818c5f616f0966f539558588ebce58283dedc1543519e229c228f83f8886f82e5f36a636c5b4d655c9 WHIRLPOOL 7648f122210c39a05ceeacaff31e1149ca4929ce3b6072358ca856b2f51abe93d1b7cf37c8633770b88d3c6fd65d049d1bc94c306263de19bfedc749a75ab303
+DIST kubernetes-1.8.2.tar.gz 23123452 SHA256 3052c0ce35bd1f8a1500588580947c7f17f09f1ddea3a54466036fd62b46c736 SHA512 a813681f07fc674f493701833a30bc6b156572e4c8d28558b0e22dd36c16257c6c0922df773e4a5799a2eec05674cd1180f2b15ab69b0bdce52d1a861723214b WHIRLPOOL d8beb599ca2e194af5e5e1eb6d521c7846ad2ffad72da965119c51c92b16db41a17222886e57de5aad83359f20c8b264eb2e7411048218c95790d1f95f0b75fe
 EBUILD kube-scheduler-1.8.1.ebuild 1212 SHA256 61aa6e4d0aa1aaeac5fe4df77d787b02944e9902d04c8b2548915c0c4a4a2c54 SHA512 03ad58f55630501b97575183c6d56aa59a4290a3bd8b08818c5f616f0966f539558588ebce58283dedc1543519e229c228f83f8886f82e5f36a636c5b4d655c9 WHIRLPOOL 7648f122210c39a05ceeacaff31e1149ca4929ce3b6072358ca856b2f51abe93d1b7cf37c8633770b88d3c6fd65d049d1bc94c306263de19bfedc749a75ab303
+EBUILD kube-scheduler-1.8.2.ebuild 1212 SHA256 61aa6e4d0aa1aaeac5fe4df77d787b02944e9902d04c8b2548915c0c4a4a2c54 SHA512 03ad58f55630501b97575183c6d56aa59a4290a3bd8b08818c5f616f0966f539558588ebce58283dedc1543519e229c228f83f8886f82e5f36a636c5b4d655c9 WHIRLPOOL 7648f122210c39a05ceeacaff31e1149ca4929ce3b6072358ca856b2f51abe93d1b7cf37c8633770b88d3c6fd65d049d1bc94c306263de19bfedc749a75ab303
 MISC metadata.xml 331 SHA256 d36b415b6920b0f46ff81985c0ad7d18c35a945358cf2846d0a968cdf9dc5f1c SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68 WHIRLPOOL 3fb6d9e005c6ea6d7d82e288c0a0c9c6b643599b5c16f3f66113b99d5082036642502541d54bc2f84f764f5fd1cd84eaf1d50e3e11ce7f9bff46763304794925
diff --git a/sys-cluster/kube-scheduler/files/kube-scheduler.logrotated b/sys-cluster/kube-scheduler/files/kube-scheduler.logrotated
index 8bd67e8db69e..6cce6c6f5be7 100644
--- a/sys-cluster/kube-scheduler/files/kube-scheduler.logrotated
+++ b/sys-cluster/kube-scheduler/files/kube-scheduler.logrotated
@@ -1,4 +1,4 @@
-/var/log/kube-scheduler/* {
+/var/log/kube-scheduler/*.log {
 	missingok
 	size 5M
 	rotate 3
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.7.6.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.7.6.ebuild
deleted file mode 100644
index aa15c73ecc3a..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.7.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-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 Controller Manager"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=plugin/cmd/${PN}
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.8.0.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.8.0.ebuild
deleted file mode 100644
index aa15c73ecc3a..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.8.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-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 Controller Manager"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=plugin/cmd/${PN}
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.7.5.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.8.2.ebuild
index aa15c73ecc3a..aa15c73ecc3a 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.7.5.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.8.2.ebuild
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index f647cd0fbd2d..f42f645fe825 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,7 +1,5 @@
-DIST kubernetes-1.7.6.tar.gz 22032012 SHA256 434ef607ba5cb77046066e5ebe2859fb7a1a07657f2b56762f7f16501dc12359 SHA512 b4db0951236f2a7aa8bea70ab0c3e5f1f1efe302ab378277db3752a44a41a360c4def9d71b3398e41f3f3ede503a5fccb5ed7b65e4c1152f0a0854659c4966c9 WHIRLPOOL b9b11e07bed8cb14b15ec346be388ec3c481bd97d744c73743653a17d1dedff21a77fd4729380141d589b50cf772e7018cb3fa697fa1fb9a3c4372885f9c48ce
-DIST kubernetes-1.8.0.tar.gz 23388112 SHA256 235c3eccf3490d5ffb7a32d7b3a02f0b849efe0a0ff831094f614ff6907d36aa SHA512 679e58bb29cd398198343f008da27fa4a0461d25c922a54b17cf26a7f6329ed7443717d1e564df646d17f60a014e1e4e0b1285d0ae4f63ab846843b309ce2872 WHIRLPOOL c9e06b6a699903382c0efef8a2fb850efcc4a8c855beaa5cd9bb94e6dc4dfe2fc139ae4814f29bbb3c46a19ca65ec68b7bb5a5f454eeb0fb6bfef55c3d0caee9
 DIST kubernetes-1.8.1.tar.gz 23400352 SHA256 a262050d532275a1b340ca1a453a986eb977a094d7a8f4a7600358677f114a18 SHA512 b09e72990cd148c604a92d866e4dd07da113a9dd1e68faebea8dd9bf256bfd908070d4e38eed7ce04c8f416d20203cf29c9c7f8906e1b50b678cb18e2ef8f5b3 WHIRLPOOL 87142b40c7d19b8be8563ec5ccaefc3970b7ce79a081bd9c1ff8c3d5227843c267fe5ab8d56b7a42874b7f29d8517f0d69beb2842ab2b58f8fb1efa5e6a61291
-EBUILD kubectl-1.7.6.ebuild 1195 SHA256 52c65b73376bfe55d2e4422c840ca0ea3b76c3dd67d91d066d024b747fc25b45 SHA512 7f11ea2a0820fdd11ee3e15ff86f1af6999e538e6b96703921babba7df6a0756e1f209b795816bc8b983d6066dc5424a868be4fc6200b69d43007e4e40eb8544 WHIRLPOOL 5f80d841ed707970cc4f37ac11e7914bfcfa5f3b2496babfe68d08b07b3b3ed128c22ad7e62621fb21d15459afb14abf9dc3c3fe5b078aada5e8c10b88e15814
-EBUILD kubectl-1.8.0.ebuild 1195 SHA256 52c65b73376bfe55d2e4422c840ca0ea3b76c3dd67d91d066d024b747fc25b45 SHA512 7f11ea2a0820fdd11ee3e15ff86f1af6999e538e6b96703921babba7df6a0756e1f209b795816bc8b983d6066dc5424a868be4fc6200b69d43007e4e40eb8544 WHIRLPOOL 5f80d841ed707970cc4f37ac11e7914bfcfa5f3b2496babfe68d08b07b3b3ed128c22ad7e62621fb21d15459afb14abf9dc3c3fe5b078aada5e8c10b88e15814
+DIST kubernetes-1.8.2.tar.gz 23123452 SHA256 3052c0ce35bd1f8a1500588580947c7f17f09f1ddea3a54466036fd62b46c736 SHA512 a813681f07fc674f493701833a30bc6b156572e4c8d28558b0e22dd36c16257c6c0922df773e4a5799a2eec05674cd1180f2b15ab69b0bdce52d1a861723214b WHIRLPOOL d8beb599ca2e194af5e5e1eb6d521c7846ad2ffad72da965119c51c92b16db41a17222886e57de5aad83359f20c8b264eb2e7411048218c95790d1f95f0b75fe
 EBUILD kubectl-1.8.1.ebuild 1196 SHA256 97374f8f5b45b01ce8b1ff8990fe4030a83acd5bfbf64887839a5e911d28198f SHA512 a815fa1ad8084d48ccc36f5fcc234394e53460c0e3133b2389f694cbe30b4e91c25bd16ed49486d2022e57647a12ea1f364fc61a960cc1c99066abd1e835362a WHIRLPOOL df72c0de492aee9acacf85a4711354f0b33add7e226b427c24fa7448e016974a879f8beac23033d6f2cae37e8c8da02b76ed247927ba5a9f9a3c027f8d41dce9
+EBUILD kubectl-1.8.2.ebuild 1210 SHA256 bc2d8c9e3a03a6f9d502d1c8b3063be1d989aed4145825107be17806874eec26 SHA512 d4a5d6860476b6b86bb794f0f9e90852a9cafe3e5cda4da8ef8662d1e798e065f05ae33dde58f5066efc290fbe974a678989658eea3b05867007f98ab3d2bdb1 WHIRLPOOL 659bc4a6e7c07bb216aa73e565ee6640a7a57c5fb1144d1fb520e411c2cf10953e9283310673cf29e014377f326dd093d1a9597aa9c421cff0c2f3a7e52f4e2d
 MISC metadata.xml 331 SHA256 757e4c9e564d7c023ce2068c998fa06b2266edf7608d717268c294a3f6e10a41 SHA512 d44cef89f9f902c706b0f9c0c4106bfd6ca094d64c273d0a13da53aec7ba2b238cd6ff489f13765e895ee4a6f2bb4638436839c7c60cce2ece3013fdc27232a4 WHIRLPOOL 51540c0c28cc89e47e72825981e9f823b4abf942d35e755daa69e18c5160335f13001fbc93da85d3556562473ba8d983596c069b8ff17ce55d6ac0466bc7fb0f
diff --git a/sys-cluster/kubectl/kubectl-1.7.6.ebuild b/sys-cluster/kubectl/kubectl-1.7.6.ebuild
deleted file mode 100644
index 89ea95537ed0..000000000000
--- a/sys-cluster/kubectl/kubectl-1.7.6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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 run commands against Kubernetes clusters"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN}
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash
-	_output/bin/${PN} completion zsh > ${PN}.zsh
-	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/kubectl/kubectl-1.8.0.ebuild b/sys-cluster/kubectl/kubectl-1.8.0.ebuild
deleted file mode 100644
index 89ea95537ed0..000000000000
--- a/sys-cluster/kubectl/kubectl-1.8.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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 run commands against Kubernetes clusters"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN}
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash
-	_output/bin/${PN} completion zsh > ${PN}.zsh
-	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/kubectl/kubectl-1.8.2.ebuild b/sys-cluster/kubectl/kubectl-1.8.2.ebuild
new file mode 100644
index 000000000000..c1b8998e6518
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.8.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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 run commands against Kubernetes clusters"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN}
+	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 2bed27609ea9..026eeb92c56a 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -1,12 +1,8 @@
 AUX kubelet.confd 58 SHA256 c1476a6d4af6a40296c990ad46bd5793d9b52c8b12c0c7764ee177962022938e SHA512 2ae3bbc8a66da644b59d7f753294ad43d5675edbe2e4769b91d7c988d0eeffd5b4209a10650ad937f9698b1b6050279d448c75274815a6b348ad2023f2fef08e WHIRLPOOL 95d2f220e8afbe315e146ee76cab3df06d63662894c59d4b03fed887ed99c17e71baf7bdf3493d4e904cbcfa10cf7848c6761184112714fc423d611a8e5d81b2
 AUX kubelet.initd 520 SHA256 76dda0fed830ea6a0dac72d91252a9c82575281984b8049e4760e2f27dd4f4af SHA512 c6b9bcdb6d063728ef2e9d67673ea29c0972e70e446be9c020cfd277a7bbcfc955a5ad7a72ab0ca1579a4d04b0fc4ac71ee20e6dba9d9a9a9099efcad3c139d0 WHIRLPOOL ff5c283443b303485b58647666577dc627f81eb11b4ed1f03a44bc8381be78777f24a4ae4f4fac33f32e476bea7c5fea7f70f044cdb1f277ff64656878c260e8
-AUX kubelet.logrotated 80 SHA256 80eb18515e5c7f12d2bcbe907ef6fc218f3c83274c18f22535bf59feaa8003a8 SHA512 c51f65a691fdd280798610cb04f9a48766045952687917828dd9c554f626a2303220ecd717a5d6be8f838422720a69a7c5e11576245a2e7dd75311a975a8d72e WHIRLPOOL 01e7acf5a8f5b3fde6ccd5633ca0eb0c612a2918cf98cc9cf191d87df908dd0d4b966c363cb9aba7f49891aee14ec5b6a616a06b07d81a55745293aeb1665312
-DIST kubernetes-1.7.5.tar.gz 22027539 SHA256 5fe434de8b17ef951d156f7cee24b24a0c5a071a85a612bba4890603541e1ff1 SHA512 a9fcc8f2d50ab431dc9aa5580c79acb8f1738102980f15cf99d01c64be5c6764dd670d436b2e42bf53d1e068a1e8924117384ebc4a3ac571267875862a86d4e3 WHIRLPOOL c2bcf741d9bd8a2fe840ceb9e8b67221c96218a0a0c4caa198d3971cd6044fe922da58c2be20e4230aab6b3ae7057ac37a82c457d0049b126954ece40f66d3de
-DIST kubernetes-1.7.6.tar.gz 22032012 SHA256 434ef607ba5cb77046066e5ebe2859fb7a1a07657f2b56762f7f16501dc12359 SHA512 b4db0951236f2a7aa8bea70ab0c3e5f1f1efe302ab378277db3752a44a41a360c4def9d71b3398e41f3f3ede503a5fccb5ed7b65e4c1152f0a0854659c4966c9 WHIRLPOOL b9b11e07bed8cb14b15ec346be388ec3c481bd97d744c73743653a17d1dedff21a77fd4729380141d589b50cf772e7018cb3fa697fa1fb9a3c4372885f9c48ce
-DIST kubernetes-1.8.0.tar.gz 23388112 SHA256 235c3eccf3490d5ffb7a32d7b3a02f0b849efe0a0ff831094f614ff6907d36aa SHA512 679e58bb29cd398198343f008da27fa4a0461d25c922a54b17cf26a7f6329ed7443717d1e564df646d17f60a014e1e4e0b1285d0ae4f63ab846843b309ce2872 WHIRLPOOL c9e06b6a699903382c0efef8a2fb850efcc4a8c855beaa5cd9bb94e6dc4dfe2fc139ae4814f29bbb3c46a19ca65ec68b7bb5a5f454eeb0fb6bfef55c3d0caee9
+AUX kubelet.logrotated 84 SHA256 43b1e0acf404fb18ea0b225c2a2acd712d86f53eea4416b65ec253c19e7ea577 SHA512 05ce9ea16d2ddf8e255adb406556c37bc04dcfc457a132a78d31deaed78963f4e1f31555f781b706909c02815a04370d5c0e02614eb79d602b1cb827cf2471d5 WHIRLPOOL 472c61cefc673fe47f52c979b8a6985767bb146380587e921cca8580447c1dfd80cc6020ddecb968efedb4d4da3f7691d41aa570c43c36b76ab575fe2564300e
 DIST kubernetes-1.8.1.tar.gz 23400352 SHA256 a262050d532275a1b340ca1a453a986eb977a094d7a8f4a7600358677f114a18 SHA512 b09e72990cd148c604a92d866e4dd07da113a9dd1e68faebea8dd9bf256bfd908070d4e38eed7ce04c8f416d20203cf29c9c7f8906e1b50b678cb18e2ef8f5b3 WHIRLPOOL 87142b40c7d19b8be8563ec5ccaefc3970b7ce79a081bd9c1ff8c3d5227843c267fe5ab8d56b7a42874b7f29d8517f0d69beb2842ab2b58f8fb1efa5e6a61291
-EBUILD kubelet-1.7.5.ebuild 1206 SHA256 192d3c71383989c1c7a0d54e5a5d68f19f60f80759d10f7d8c4fa1fdea8294ea SHA512 232f3600c53b381f4cfc41c9808ca68a6582958bc7aa31a04b2d95466c2ff0770350906d208091150fa50a137ea59d04f30b820e03a9d3221ec60e7f5e94fb43 WHIRLPOOL 2a0127c6af63a85b3e6dbc6c6c48d1dfd739af224efbc6cc78e7513fb28fc486e72246d8004633572d31db4d5500346252a7fbbef79d0d71a4d4fba416c495ec
-EBUILD kubelet-1.7.6.ebuild 1206 SHA256 192d3c71383989c1c7a0d54e5a5d68f19f60f80759d10f7d8c4fa1fdea8294ea SHA512 232f3600c53b381f4cfc41c9808ca68a6582958bc7aa31a04b2d95466c2ff0770350906d208091150fa50a137ea59d04f30b820e03a9d3221ec60e7f5e94fb43 WHIRLPOOL 2a0127c6af63a85b3e6dbc6c6c48d1dfd739af224efbc6cc78e7513fb28fc486e72246d8004633572d31db4d5500346252a7fbbef79d0d71a4d4fba416c495ec
-EBUILD kubelet-1.8.0.ebuild 1206 SHA256 192d3c71383989c1c7a0d54e5a5d68f19f60f80759d10f7d8c4fa1fdea8294ea SHA512 232f3600c53b381f4cfc41c9808ca68a6582958bc7aa31a04b2d95466c2ff0770350906d208091150fa50a137ea59d04f30b820e03a9d3221ec60e7f5e94fb43 WHIRLPOOL 2a0127c6af63a85b3e6dbc6c6c48d1dfd739af224efbc6cc78e7513fb28fc486e72246d8004633572d31db4d5500346252a7fbbef79d0d71a4d4fba416c495ec
+DIST kubernetes-1.8.2.tar.gz 23123452 SHA256 3052c0ce35bd1f8a1500588580947c7f17f09f1ddea3a54466036fd62b46c736 SHA512 a813681f07fc674f493701833a30bc6b156572e4c8d28558b0e22dd36c16257c6c0922df773e4a5799a2eec05674cd1180f2b15ab69b0bdce52d1a861723214b WHIRLPOOL d8beb599ca2e194af5e5e1eb6d521c7846ad2ffad72da965119c51c92b16db41a17222886e57de5aad83359f20c8b264eb2e7411048218c95790d1f95f0b75fe
 EBUILD kubelet-1.8.1.ebuild 1206 SHA256 192d3c71383989c1c7a0d54e5a5d68f19f60f80759d10f7d8c4fa1fdea8294ea SHA512 232f3600c53b381f4cfc41c9808ca68a6582958bc7aa31a04b2d95466c2ff0770350906d208091150fa50a137ea59d04f30b820e03a9d3221ec60e7f5e94fb43 WHIRLPOOL 2a0127c6af63a85b3e6dbc6c6c48d1dfd739af224efbc6cc78e7513fb28fc486e72246d8004633572d31db4d5500346252a7fbbef79d0d71a4d4fba416c495ec
+EBUILD kubelet-1.8.2.ebuild 1206 SHA256 192d3c71383989c1c7a0d54e5a5d68f19f60f80759d10f7d8c4fa1fdea8294ea SHA512 232f3600c53b381f4cfc41c9808ca68a6582958bc7aa31a04b2d95466c2ff0770350906d208091150fa50a137ea59d04f30b820e03a9d3221ec60e7f5e94fb43 WHIRLPOOL 2a0127c6af63a85b3e6dbc6c6c48d1dfd739af224efbc6cc78e7513fb28fc486e72246d8004633572d31db4d5500346252a7fbbef79d0d71a4d4fba416c495ec
 MISC metadata.xml 331 SHA256 d36b415b6920b0f46ff81985c0ad7d18c35a945358cf2846d0a968cdf9dc5f1c SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68 WHIRLPOOL 3fb6d9e005c6ea6d7d82e288c0a0c9c6b643599b5c16f3f66113b99d5082036642502541d54bc2f84f764f5fd1cd84eaf1d50e3e11ce7f9bff46763304794925
diff --git a/sys-cluster/kubelet/files/kubelet.logrotated b/sys-cluster/kubelet/files/kubelet.logrotated
index 3d096428655b..ddf8c1dd80f6 100644
--- a/sys-cluster/kubelet/files/kubelet.logrotated
+++ b/sys-cluster/kubelet/files/kubelet.logrotated
@@ -1,4 +1,4 @@
-/var/log/kubernetes/* {
+/var/log/kubernetes/*.log {
 	missingok
 	size 5M
 	rotate 3
diff --git a/sys-cluster/kubelet/kubelet-1.7.6.ebuild b/sys-cluster/kubelet/kubelet-1.7.6.ebuild
deleted file mode 100644
index 8348f6d70ace..000000000000
--- a/sys-cluster/kubelet/kubelet-1.7.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-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"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" 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}
-}
-
-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}
-}
diff --git a/sys-cluster/kubelet/kubelet-1.8.0.ebuild b/sys-cluster/kubelet/kubelet-1.8.0.ebuild
deleted file mode 100644
index 8348f6d70ace..000000000000
--- a/sys-cluster/kubelet/kubelet-1.8.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-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"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" 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}
-}
-
-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}
-}
diff --git a/sys-cluster/kubelet/kubelet-1.7.5.ebuild b/sys-cluster/kubelet/kubelet-1.8.2.ebuild
index 8348f6d70ace..8348f6d70ace 100644
--- a/sys-cluster/kubelet/kubelet-1.7.5.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.8.2.ebuild
diff --git a/sys-cluster/legion/Manifest b/sys-cluster/legion/Manifest
index faef48085d58..d5dc7feba310 100644
--- a/sys-cluster/legion/Manifest
+++ b/sys-cluster/legion/Manifest
@@ -5,11 +5,13 @@ DIST legion-16.10.0.tar.gz 2474656 SHA256 92190ae5ff0a1f6356890446e026479ed71523
 DIST legion-17.02.0.tar.gz 2690415 SHA256 c5413fe8990c33a087c9a567671756c8267e050f5285f75ee33b84911b00c355 SHA512 0c6ee53953ec2e5072d39b1c1260a1783393feaf7064f381bb1733cf9cdb1be8fd521a35e0a452ebc9e9509d117fdc6f3e472cdb6c633ba00c987c880a33bc2d WHIRLPOOL 97bb2da8d362414d6e3c65ba2b50bf4e57041e337f6492efb27f5796c3afe0225c6324532e7413e5f9987c8395b05751d6fc0ca7b7983c21b96ef7679fdc57dc
 DIST legion-17.05.0.tar.gz 2783482 SHA256 b5f54454b28d3b61dde03711dadc2b969cf5c6412b9c1887893c5af521eba79a SHA512 51532f043eea1467a2b8ff17004f224c763f411eb5940d0a4dc5d8eb6503d758964aba26eb4977c68264c7344fcf269682a428e86a2c1a756f91cc9c50d04677 WHIRLPOOL c178ad310ef79997f4716dc7380892c814a11eadb39cbb88f1dab46df73b7fc6396262ea3a7db330847bd25b217b5f50dc5ea3c9b3e86932e3e3693e5a9eb5cb
 DIST legion-17.08.0.tar.gz 2839522 SHA256 5edfc9ee05b7bd0eb45f698e3cfd66c062d21fe36c3da89d233d93b2d47d9d1e SHA512 5d97157f97e12149e5fdf3a75d2e6e8a41ebf97e09c35501e2c93437bd0a47643d261f68c6b4a83b47e64d706f35914acd3a852eb0c08a11696b05ba9ef7af87 WHIRLPOOL 0602b0876190a1209fd215d9a85d3713ae2dcbae8f4df7b9eb34f40da5c13d2ee446137d22bc89f250bc90e134d84f484ec15106ea3cab1d32740941186a38a8
+DIST legion-17.10.0.tar.gz 2975023 SHA256 dd93a21834c2b686a73e5ff3d9c1e90bc26fd52f019d9399756b9096a1416137 SHA512 c4be9b32b47b3c4ae38374606125867f963a109dd542a52ee20b2964e5849121207d78947f0ab6ea4ed5e8a027b26da7b1a3a61124f175c1b9f7323e56b8d9b2 WHIRLPOOL e31ef90bd733e66127703a10a88bfd13166e946d416b56f2ce00e37b468fc7ba7456c9c5d471f1614f93e7ae4bfa96cc6a10ea987e52121af0e8f4399e96b932
 EBUILD legion-16.08.0-r1.ebuild 842 SHA256 e80b953435f1132477a2101dfa2957a59bb3699bf902891df9e2bee455500551 SHA512 d3d0f07e5028c88a288ec07b40cd06c336319405421ece8abc66a8606cfc8ae48e16636462c377dba2fc09afe29a013f6782cf2e3894c24dcfac5847cbd26166 WHIRLPOOL a3c664438deb63dcfbb960ef5c55a380eb2d664ff5689e9c66063f0a30d9c0706017a07cb7881a55ccd9b0fb6a3b927c23ca4d68a44e80b6f81cb08ea6911fab
 EBUILD legion-16.10.0.ebuild 669 SHA256 1907079216e421227fc0c894d8301c765104b19607f0fc637b11a1bab4aafbb8 SHA512 599658544d58e5df36506abd5fb05fef69bccac29668714c203d48fd5902127fa6a73cb3284b798569e9402cb921d5db5f766bc2a69edb6558837f55262385df WHIRLPOOL b502a08bdcecb8a3c418fdd6f722d9490c34c384c7a73f15c54593fed487e2e6fbf914ce10a0341b25e281e07abbd14822e00cb7f73054632c6d7e0c693219d5
 EBUILD legion-17.02.0.ebuild 724 SHA256 501d4895858173b4fcf3f5d22de0a8cc286cdb4c07925686793b44ca7b1c55d4 SHA512 ecb3a77330e40a0abee5af0bbc5a7ecf0fc7baad53f077eea9975f22b165c68ad999111f3c01bdc9e8df92c57ce3ac658817b7be4b96429c2fe67c8782671c98 WHIRLPOOL 87d65fb5e0b24b1f66388f3649c9a31f412306136f72b46dd37da2dfc079eb682e3fe45cd18ba19995bf81e645398d967579af1c6f0e5d6926648f6d158e9423
 EBUILD legion-17.05.0.ebuild 881 SHA256 36b33f834bbdc15edc9f675b70bfab407e95773420485ac01ea97baf1a4846f9 SHA512 8976cb8040a1ad4a205900ee6d040029c54c1cf802a70d83fc52b63190bd8405d1f0107f4a0a9e5a3cb9ba37a9e2446a4f7a2b84587ba33b83d60d2dfea9c01f WHIRLPOOL 4defbb7fad9a327bad2bf79ac80600c7f7bbd7bc4a7e18214ef48ee04837b3808cff286f0c0dd0c3b5f727ff520550b456dcf0a704524dc7ec8fc988e3b5fd9d
 EBUILD legion-17.08.0.ebuild 925 SHA256 0bde161e407b52d5594a6e6cd8da962a4e6051ad2f7a247fea7c33948c606cc4 SHA512 fd399c48fe6e4209c1d5a1cb8ea8a2d9af507268784c009143aa67fefe3f8a9f5fce81b3231e0b2390bf049f410372928c59e211def52cb0303fa49647964538 WHIRLPOOL b7a5f8606322bcdc35f0ea65d52b757d7907b131d65904fef4245fdf70041379d87f5d275a8d699cca4d4947a1c892b52de5feeef051a1d9fc39ba8461633e57
+EBUILD legion-17.10.0.ebuild 925 SHA256 0bde161e407b52d5594a6e6cd8da962a4e6051ad2f7a247fea7c33948c606cc4 SHA512 fd399c48fe6e4209c1d5a1cb8ea8a2d9af507268784c009143aa67fefe3f8a9f5fce81b3231e0b2390bf049f410372928c59e211def52cb0303fa49647964538 WHIRLPOOL b7a5f8606322bcdc35f0ea65d52b757d7907b131d65904fef4245fdf70041379d87f5d275a8d699cca4d4947a1c892b52de5feeef051a1d9fc39ba8461633e57
 EBUILD legion-9999.ebuild 881 SHA256 36b33f834bbdc15edc9f675b70bfab407e95773420485ac01ea97baf1a4846f9 SHA512 8976cb8040a1ad4a205900ee6d040029c54c1cf802a70d83fc52b63190bd8405d1f0107f4a0a9e5a3cb9ba37a9e2446a4f7a2b84587ba33b83d60d2dfea9c01f WHIRLPOOL 4defbb7fad9a327bad2bf79ac80600c7f7bbd7bc4a7e18214ef48ee04837b3808cff286f0c0dd0c3b5f727ff520550b456dcf0a704524dc7ec8fc988e3b5fd9d
 MISC ChangeLog 871 SHA256 4b5f0f0f160797c9a0abae5d7c114c513dabf3c96718cfa978ba1a60afeb2e78 SHA512 9730f27c06a5f2652ba26dc791a29c8aebe88b3a729d5409727bd00854fddb398fa159257aaa88a4b8ee49bb3fa1a143984bf75ead04b2286efa55ee120183ac WHIRLPOOL 61560ebde65e47f5607eb10b12468a84c9b4f52759aab3091b0b914c5035874865a55cd7e2340c29b2a44b17e453d3a5a3aa19b37b556286087f8fb8d33f2a82
 MISC metadata.xml 602 SHA256 fb472821c80dc596cc022cf5f60ed06e77e7f38175451bef57088854527bb186 SHA512 ec6acaf029c0909ea54e7548c50fbcf5b1796081c9e774dcdaf6cd9ebfb9f67110be68b88208dcb1dd59cc9b4c7efc16ab5cf740a81ba2c61cc3b568b4648ac1 WHIRLPOOL d7eae2d05617cb3a4647e7263d5ddbdaae86dd9bd34ddb42d1ae6220590894a9dd681562db499f9805376364fc7a2fe683d2e3a14de6ecc3edce03c0d42dcd65
diff --git a/sys-cluster/legion/legion-17.10.0.ebuild b/sys-cluster/legion/legion-17.10.0.ebuild
new file mode 100644
index 000000000000..4d6ccbc9cb31
--- /dev/null
+++ b/sys-cluster/legion/legion-17.10.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="A data-centric parallel programming system"
+HOMEPAGE="http://legion.stanford.edu/"
+if [[ $PV = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://StanfordLegion/${PN}.git https://github.com/StanfordLegion/${PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/StanfordLegion/${PN}/archive/${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-${P}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="gasnet +hwloc test"
+
+DEPEND="
+	gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 )
+	hwloc? ( sys-apps/hwloc )
+	"
+
+src_configure() {
+	mycmakeargs=(
+		-DLegion_USE_HWLOC=$(usex hwloc)
+		-DLegion_USE_GASNet=$(usex gasnet)
+		-DLegion_ENABLE_TESTING=$(usex test)
+		-DBUILD_SHARED_LIBS=ON
+		-DLegion_BUILD_EXAMPLES=ON
+		-DLegion_BUILD_TESTS=ON
+		-DLegion_BUILD_TUTORIAL=ON
+	)
+	cmake-utils_src_configure
+}
diff --git a/sys-cluster/minikube/Manifest b/sys-cluster/minikube/Manifest
index 82604fe8349c..ca25f2d42d9d 100644
--- a/sys-cluster/minikube/Manifest
+++ b/sys-cluster/minikube/Manifest
@@ -1,3 +1,5 @@
 DIST minikube-0.22.3.tar.gz 18675181 SHA256 c27b870da46048b8d0eb775f86b8351e21583cf234f7c722ac92e18edf098dac SHA512 2ef1f64a5011bb57034e1d873730c55284ce008ab480775c64a66a148118bf0f66608177244a29527ac984aa34d9d39400d4d42006b930bdb35da6551e936833 WHIRLPOOL 92636e47bb9604211979cfcdc8b936fe4b5b1ce9938ceb8121a3c6fc25895fa383626226c7c8107838235fa16e8152162a602b37d8ca1c83962fd65b92d258a5
+DIST minikube-0.23.0.tar.gz 19015892 SHA256 a8f8d220a9082ae16d20f664051ab108092e51efeb10d00dc796fdaa8f69b9b8 SHA512 c89c633b6edf5dcabdc60e6c361b16934c47ee141b49d48192b7f5167e5612a7a7d44d79cf595161ac44826f8053051ace5300cdf64c710bd2c3b4247c159522 WHIRLPOOL 536a34cf88907dc8d89f4195d61ac239c4d3a3477f23cd3cfacc0b99910a33a019e21f8e6372e2dca28d4bec3b22e1275fdac25b285c5b0cb76f83485bf13bce
 EBUILD minikube-0.22.3.ebuild 1250 SHA256 abe8d564bae9bfb5c48464bb1ffb1de5e1b445dea8a0e72b5f42ead98e281597 SHA512 38875170f6d33d604a48d51384fbf3a82641779513ce44167ad9f9165758040c85fabbbbb70a83ad07d4de262213585df6f9b38d3600a7b20ed6bcaa0e7bcde6 WHIRLPOOL 842c2e2f6080b4b12d892c9ef545d0ef0a26589243c748d4e2a57b3a516ec191386d5da39f8d6eec07b5828bd3a220ba2f168941ac58cc33f2f82caef16b0a87
+EBUILD minikube-0.23.0.ebuild 1236 SHA256 5c3506cfb4a7095daf7d794cc1a8577a068e4308185c09728b204749dd4d16f4 SHA512 5feaae850de8df546c9439d56d08117419b0d920e260957a1daf47ae66f6ef61585be8023a6a501d307651fccc089ec8dde0d2c70d57efb1c63c7e4e792e9599 WHIRLPOOL ab286d1aebe30002dce5f89711ee998e5e4d54458440e85221547b7f60b0dc641f65c4133f69a9a81c93907a2f3c2381c03f779b95422cf5f2414dec19f29e0d
 MISC metadata.xml 329 SHA256 b3600da8b14aec576f9da32558438704a4a31afe04a4b5e91a12ee4ebeb31209 SHA512 4b280d1e0c76f5f571d1b31cda9cad9c564e03d99891ff7ae83f6e61e078636608aed240d088bc2d4b309f9315645abdba751cdba11bfd8268b89adc8c339857 WHIRLPOOL b5e347c694f5fa801e203f738ecdaab2d90025a7090f4f001a6467a4958f9796d8e42e7d46fd2c9e58f151888889985566c3202132eb2d5f7bfdca02588ae826
diff --git a/sys-cluster/minikube/minikube-0.23.0.ebuild b/sys-cluster/minikube/minikube-0.23.0.ebuild
new file mode 100644
index 000000000000..a345c984a945
--- /dev/null
+++ b/sys-cluster/minikube/minikube-0.23.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 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} )
+
+inherit python-any-r1 golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/minikube"
+ARCHIVE_URI="https://github.com/kubernetes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Single Node Kubernetes Cluster"
+HOMEPAGE="https://github.com/kubernetes/minikube https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="hardened"
+
+DEPEND="dev-go/go-bindata
+	${PYTHON_DEPS}"
+RDEPEND=">=sys-cluster/kubectl-1.8.0"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e 's/ -s -w/ -w/' -e 's#$(GOPATH)/bin/go-bindata#go-bindata#' -e 's#GOBIN=$(GOPATH)/bin go get github.com/jteeuwen/go-bindata/...##' src/${EGO_PN}/Makefile || die
+	sed -i -e "s/get_rev(), get_version(), get_tree_state()/get_rev(), get_version(), 'gitTreeState=clean'/"  src/${EGO_PN}/hack/get_k8s_version.py || die
+}
+
+src_compile() {
+	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -C src/${EGO_PN}
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin out/minikube
+	dodoc -r docs CHANGELOG.md README.md
+	popd || die
+}
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index 7f346c58036b..88daa9dbc5c0 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -7,21 +7,17 @@ AUX neutron-server.confd 70 SHA256 40d09a699fc3bced40c5a9dc7394a76c40c245b579fc2
 AUX neutron.initd 679 SHA256 9dde94306c7681110eab64122dae7f63ce370d09c724557e9e9e1c7d40371774 SHA512 7c233d3ca96a90201a97772b67e98d50e7dcacc079bee9d7eb62e3900b54d515eb4615bea098148ec5bd02ecab0818dad80f2dcbd9867760b31cb74325218493 WHIRLPOOL 7c0f36b05a6ab346da2941695b1a7fcf8aedd351f3bc380c88b71c5f498582250b55c243dad0e486f6ef88b185c169e2a141172ecb39e5e7b1554c198080aedb
 AUX neutron.initd-2 530 SHA256 ae78b7651dd97277c928d478ab809434d0e34402ed3aa90a65d296fd8e7fa5b1 SHA512 56331cbac87b14180e738cb2d3881682344a59f698b8fa67428e058693430363418e31707484786b4eb8053904c061d278d06a56c03cc77d8f6a0372c892d5a7 WHIRLPOOL 192bddf28a05290356a38907e5b3cb3406b8937d3876090d52650bac625101a324bb10af6f81ee379783ed5ed9c6dded76362d36a90eae3aa7bd7ef77b2b8cd4
 AUX neutron.sudoersd 117 SHA256 b40ea04a95deedbb66fe504df61b55905cbd746e5ba26321c01cd25b5cc9dcbe SHA512 143f8a1faa7650bc66b2566d0bd62f71eb743231b9efc4c7df265e53d664418b23182e3f271b86845ed76c537b7f60157e87af59413cf659379f367924d14366 WHIRLPOOL bb0e35d7b7471fab424f86f181601bc87d4bba98f4fbc282cc6302a05128992613097afe1fea159e9c718cd688a03c280b53d72bfe47fc91bd24967a4b4618da
-DIST neutron-10.0.3.tar.gz 3125880 SHA256 7f4c455d54647f5f32871b61acac0d66de32dd1e7a589bad04b266560d0ba7ef SHA512 615c5ece84d61c1e3878566cc538af15f32d92a3a3def0bfe627e804c44c9d64cb1160f7adf4f136596e687348036a795035c773213f7d57e79422fb149f560e WHIRLPOOL 1c249112c5f850b6244db7264f2295106ef2b8b68cc472eafe19e407f36c6afcfd8024ac160d9b2e7da85a60c86a88f70bd385763bdd8c22fc276000151ff46c
 DIST neutron-10.0.4.tar.gz 3124422 SHA256 1e7c999045c8d5c1e3dcb6aca05984f880bc58935682f6b8146239739a3a121a SHA512 f85949ac08728b6338cf58abfaf2c9e67882d49fefa16104580c73aaea3f0634602712583e88248f261fd3b0c8690172e4a72f550bd159cacf732440274cc844 WHIRLPOOL 6694f8372e8a2af3ff2bcc766523c11837515ebb85548160779d4cc4ea21ee7a68f1bc0636efb56f2f83764521625a1f238b59999df21849c36826c8186b03e4
 DIST neutron-11.0.1.tar.gz 10472277 SHA256 a6ea7a9e57c507bbcffea9373383543f976289c692c9aafc458a530e51db10f0 SHA512 ab353e6ae09e32c9b520a918624a661c5635f2de4df05f78f3e9c6102258ab12ee5c657f89732d89ef182833f80cb70454418a5556cc7738bd7f86b995762b37 WHIRLPOOL cb74b2feaa659f980e619c1f0fd95b5d40ddc1a581a0cc0b6b35fb2d74ec6ff93b2fb675c7b5be4ea59769c878e777ee920a6943c9612b32219a4fc619d5f2eb
-DIST neutron-configs-10.0.3.tar.gz 25094 SHA256 7f210828b0c3fa9d859fca8c4735fd60aefad3cd5d0cf810b762af268df59269 SHA512 40ab9f2f4ea338c061c57d9aa5611ee3f3476ab8f5199ac50577f94fec032ccd27028bd072d9d9d0cc9f12327613e542b4d62a0403540730f9d6efbc4992a00d WHIRLPOOL dbdaff979a40e33cd171390657e39fb9b2a311c972e8d018e301af5361b0224ba62972241febfc4991a06bf9f16390e5c779de86823ed94eaebbee610c8c6657
 DIST neutron-configs-10.0.4.tar.gz 25094 SHA256 7f210828b0c3fa9d859fca8c4735fd60aefad3cd5d0cf810b762af268df59269 SHA512 40ab9f2f4ea338c061c57d9aa5611ee3f3476ab8f5199ac50577f94fec032ccd27028bd072d9d9d0cc9f12327613e542b4d62a0403540730f9d6efbc4992a00d WHIRLPOOL dbdaff979a40e33cd171390657e39fb9b2a311c972e8d018e301af5361b0224ba62972241febfc4991a06bf9f16390e5c779de86823ed94eaebbee610c8c6657
 DIST neutron-configs-11.0.1.tar.gz 25030 SHA256 ad2a57865a13ccf62b852c2d31336e9f0aab0f979caaaa6227856c59a3ef86ac SHA512 d82abfcfe5c911dc8a0689e23aaad810bb3aacaf64bd35439220f41390a71958e7cd34e60500580c24ea9e8b55a6fb0441ce4e5612fad9aba2e48d6f14d4d87a WHIRLPOOL 30a577afb2d48ee5d5c13666dc23843bee1aadcd3369d090ffa150bf7ea60ae97bfac0ecc39aa09d29106f9117aab477632c520b146db4c9a78ec021c959851d
 DIST neutron-configs-2017.1.9999.tar.gz 25094 SHA256 7f210828b0c3fa9d859fca8c4735fd60aefad3cd5d0cf810b762af268df59269 SHA512 40ab9f2f4ea338c061c57d9aa5611ee3f3476ab8f5199ac50577f94fec032ccd27028bd072d9d9d0cc9f12327613e542b4d62a0403540730f9d6efbc4992a00d WHIRLPOOL dbdaff979a40e33cd171390657e39fb9b2a311c972e8d018e301af5361b0224ba62972241febfc4991a06bf9f16390e5c779de86823ed94eaebbee610c8c6657
 DIST neutron-configs-2017.2.9999.tar.gz 25030 SHA256 ad2a57865a13ccf62b852c2d31336e9f0aab0f979caaaa6227856c59a3ef86ac SHA512 d82abfcfe5c911dc8a0689e23aaad810bb3aacaf64bd35439220f41390a71958e7cd34e60500580c24ea9e8b55a6fb0441ce4e5612fad9aba2e48d6f14d4d87a WHIRLPOOL 30a577afb2d48ee5d5c13666dc23843bee1aadcd3369d090ffa150bf7ea60ae97bfac0ecc39aa09d29106f9117aab477632c520b146db4c9a78ec021c959851d
-DIST neutron-ml2-plugins-10.0.3.tar.gz 6811 SHA256 6ad759c8720563e502602fc32a72569884bdaad1443f4b8d23c8e9d240071f70 SHA512 51c01eab8f424b871f55b7dc45bbae6300d477e8bc7be4587c4945f75a4fc65f622ed69dbfe0c63db7fced2118987730204d259bce53e353a6b4d24df89dadcb WHIRLPOOL 5e4bf872895e8354fa9e6d7bb071f3d973f28c22297ea414f1bfc8f1bb3ae3102609ff61f19efda59f9d9d7a515fb8ae8216347a2935af64e4bdeeb6ec610863
 DIST neutron-ml2-plugins-10.0.4.tar.gz 6811 SHA256 6ad759c8720563e502602fc32a72569884bdaad1443f4b8d23c8e9d240071f70 SHA512 51c01eab8f424b871f55b7dc45bbae6300d477e8bc7be4587c4945f75a4fc65f622ed69dbfe0c63db7fced2118987730204d259bce53e353a6b4d24df89dadcb WHIRLPOOL 5e4bf872895e8354fa9e6d7bb071f3d973f28c22297ea414f1bfc8f1bb3ae3102609ff61f19efda59f9d9d7a515fb8ae8216347a2935af64e4bdeeb6ec610863
 DIST neutron-ml2-plugins-11.0.1.tar.gz 6885 SHA256 bcd177baaed1c4438f8852607a7a660aa5d6181c18b42dd52a489a229730b3a5 SHA512 e5acaed2fc370e99c9c8b54040cdc994cd35bfbd3d74682d3c03c381568c89b316a6a87356aa6ae538a19c2ae83b6b3c512095afcc778525c2885b9b6bef04bd WHIRLPOOL a77d3c00d63f21e96d2996ea59af326555499455f63a63d517a2580435d9ec822f1e74d0cb747c3bc04edeb183d65cc918f4e3336b2d6ea5db7ecd72d6a014e4
 DIST neutron-ml2-plugins-2017.1.9999.tar.gz 6811 SHA256 6ad759c8720563e502602fc32a72569884bdaad1443f4b8d23c8e9d240071f70 SHA512 51c01eab8f424b871f55b7dc45bbae6300d477e8bc7be4587c4945f75a4fc65f622ed69dbfe0c63db7fced2118987730204d259bce53e353a6b4d24df89dadcb WHIRLPOOL 5e4bf872895e8354fa9e6d7bb071f3d973f28c22297ea414f1bfc8f1bb3ae3102609ff61f19efda59f9d9d7a515fb8ae8216347a2935af64e4bdeeb6ec610863
 DIST neutron-ml2-plugins-2017.2.9999.tar.gz 6885 SHA256 bcd177baaed1c4438f8852607a7a660aa5d6181c18b42dd52a489a229730b3a5 SHA512 e5acaed2fc370e99c9c8b54040cdc994cd35bfbd3d74682d3c03c381568c89b316a6a87356aa6ae538a19c2ae83b6b3c512095afcc778525c2885b9b6bef04bd WHIRLPOOL a77d3c00d63f21e96d2996ea59af326555499455f63a63d517a2580435d9ec822f1e74d0cb747c3bc04edeb183d65cc918f4e3336b2d6ea5db7ecd72d6a014e4
-EBUILD neutron-10.0.3.ebuild 8645 SHA256 ba205bea9d609683143120d0918552df1acf1e163ce463f86e36388ebf772597 SHA512 8069f0a69824c5dfcf127d0e058dd0c0e5cff5a5ae54b3bf82e87bfc55e283379f3e38a095edce156f6533ae2547b3f7a54c1fe09fd44c10d5c28847d73ad0bc WHIRLPOOL 6142edffbe6733b9b04dcee547cf893823491fb7d858ac6c70495983129232f1378e94b656c0e10fc4c0a9516a01951d06b053957e790f7f5309ff4e76fce285
-EBUILD neutron-10.0.4.ebuild 8647 SHA256 8bef9b36cdb64e41f01d4f70ea9d51195f3a06923d4e8e695f22e39ed31e8a55 SHA512 2503c0d4bd453e0aa34abf373e3b3cec4ac68144d744a834656bbfc116ea081ab48171a5595955dd1072ff3e140905e918f2c69972a0d585d2dbe615830908ef WHIRLPOOL 90206aac2b18b50c0fd475cff66dc93587a24602ddfea6addcd125b39791020e5af28b0f1ee7b51d1c890bfc2f583157a7e53aa552bbdb5aaacbd8b475e1262b
+EBUILD neutron-10.0.4.ebuild 8645 SHA256 ba205bea9d609683143120d0918552df1acf1e163ce463f86e36388ebf772597 SHA512 8069f0a69824c5dfcf127d0e058dd0c0e5cff5a5ae54b3bf82e87bfc55e283379f3e38a095edce156f6533ae2547b3f7a54c1fe09fd44c10d5c28847d73ad0bc WHIRLPOOL 6142edffbe6733b9b04dcee547cf893823491fb7d858ac6c70495983129232f1378e94b656c0e10fc4c0a9516a01951d06b053957e790f7f5309ff4e76fce285
 EBUILD neutron-11.0.1.ebuild 9547 SHA256 b29ed2fdae67682c0a9b4771b0cf3152f22dd9a1080fed4b9fa149619538e36c SHA512 097ba6eb1aa4a3a3748978f32ccbfa496855eeb9ce34931061380d52210225687952713ceb5940e1a0d4a57213ff815209dc58b7ffba21ea986a6adc7c4c36f0 WHIRLPOOL 640d247edff40330fbf063390dbb9d59449b8e4a5fa89ef1a2f5df40c0f546b8d4d170e1e02cc40e90dce5955541b0bdc63a10d596020a6d5c5804ee1e047b0b
 EBUILD neutron-2017.1.9999.ebuild 8670 SHA256 e9d64cad0e05c54fc38d555bbf66bfa5c3390a88b13a104710ed74ebb21030de SHA512 26022752732fe8171b1e341d36f04b8eb73b3ad64b798a5002856d8d68672d88766ae0a19e66dd0af9122e3a12d0569e3b19b5646495fc45557ffa04d0ddf62f WHIRLPOOL 2ac706a5956e535c910bf563281d8b65eec0ceeff86d6c101d67b7e93fcf370b0db741efee2f190dcc0daf2dac2e015f5df3b84c7d3e44cd6b990dd93a6dc4de
 EBUILD neutron-2017.2.9999.ebuild 9571 SHA256 d7e656eac8dbb12c23b766c162c2de57bb5b9c4fc5b74c9f56cb17f4d4bc36b8 SHA512 4769f3f31fc4e9b936a556272dc59614b8f50e3a077afa564472a65ee96baba352ab2dd641537331bdb30349c0114cdc1c0984a1cf809290950eab576dc7ef58 WHIRLPOOL e22263dd546d00ebce12a921ca1bfae564d5cfcb05aa268056013ef88967d05a04310719cd68a6e549b59a73993846e2dd88d913f89b12ed60aa158c0b5e369e
diff --git a/sys-cluster/neutron/neutron-10.0.3.ebuild b/sys-cluster/neutron/neutron-10.0.3.ebuild
deleted file mode 100644
index 482826b624b0..000000000000
--- a/sys-cluster/neutron/neutron-10.0.3.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-# still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439
-
-inherit distutils-r1 linux-info user
-
-DESCRIPTION="A virtual network service for Openstack"
-HOMEPAGE="https://launchpad.net/neutron"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ocata/configs.tar.gz -> neutron-configs-${PV}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ocata/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="compute-only dhcp ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres"
-REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
-						compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
-						|| ( openvswitch linuxbridge ) )"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-	!~dev-python/routes-2.3[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/pecan-1.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.2[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.3[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.4[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/neutron-lib-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/ryu-4.9[${PYTHON_USEDEP}]
-	compute-only? (
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		<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.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/ovs-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/pyroute2-0.4.12[${PYTHON_USEDEP}]
-	>=dev-python/weakrefmethod-1.0.2[$(python_gen_usedep 'python2_7')]
-	>=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-novaclient-7.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}]
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
-	dev-python/pyudev[${PYTHON_USEDEP}]
-	sys-apps/iproute2
-	net-misc/iputils[arping]
-	net-misc/bridge-utils
-	net-firewall/ipset
-	net-firewall/iptables
-	net-firewall/ebtables
-	net-firewall/conntrack-tools
-	openvswitch? ( <=net-misc/openvswitch-2.6.9999 )
-	ipv6? (
-		net-misc/radvd
-		>=net-misc/dibbler-1.0.1
-	)
-	dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 \
-	NF_NAT_IPV4 NF_NAT NF_CONNTRACK IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
-		done
-	fi
-}
-
-pkg_setup() {
-	enewgroup neutron
-	enewuser neutron -1 -1 /var/lib/neutron neutron
-}
-
-pkg_config() {
-	fperms 0700 /var/log/neutron
-	fowners neutron:neutron /var/log neutron
-}
-
-src_prepare() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	# it's /bin/ip not /sbin/ip
-	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use server; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-server"
-		newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
-		dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
-	fi
-	if use dhcp; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
-		newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
-	fi
-	if use l3; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
-		newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
-	fi
-	if use metadata; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
-		newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
-	fi
-	if use openvswitch; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
-		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
-		newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
-		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
-	fi
-	if use linuxbridge; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
-		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
-	fi
-	diropts -m 755 -o neutron -g neutron
-	dodir /var/log/neutron /var/lib/neutron
-	keepdir /etc/neutron
-	insinto /etc/neutron
-	insopts -m 0640 -o neutron -g neutron
-
-	doins etc/*
-	# stupid renames
-	insinto /etc/neutron
-	doins -r "etc/neutron/plugins"
-	insopts -m 0640 -o root -g root
-	doins "etc/rootwrap.conf"
-	doins -r "etc/neutron/rootwrap.d"
-
-	#add sudoers definitions for user neutron
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/neutron.sudoersd" neutron
-
-	# add generated configs
-	cd "${D}/etc/neutron" || die
-	unpack "neutron-configs-${PV}.tar.gz"
-	cd "${D}/etc/neutron/plugins/ml2" || die
-	unpack "neutron-ml2-plugins-${PV}.tar.gz"
-
-	# correcting perms
-	fowners neutron:neutron -R "/etc/neutron"
-	fperms o-rwx -R "/etc/neutron/"
-
-	#remove superfluous stuff
-	rm -R "${D}/usr/etc/"
-}
-
-python_install() {
-	distutils-r1_python_install
-	# copy migration conf file (not coppied on install via setup.py script)
-	insopts -m 0644
-	insinto "/$(python_get_sitedir)/neutron/db/migration/alembic_migrations/"
-	doins -r "neutron/db/migration/alembic_migrations/versions"
-}
-
-pkg_postinst() {
-	elog
-	elog "neutron-server's conf.d file may need updating to include additional ini files"
-	elog "We currently assume the ml2 plugin will be used but do not make assumptions"
-	elog "on if you will use openvswitch or linuxbridge (or something else)"
-	elog
-	elog "Other conf.d files may need updating too, but should be good for the default use case"
-	elog
-}
diff --git a/sys-cluster/neutron/neutron-10.0.4.ebuild b/sys-cluster/neutron/neutron-10.0.4.ebuild
index 3d7f813965c4..482826b624b0 100644
--- a/sys-cluster/neutron/neutron-10.0.4.ebuild
+++ b/sys-cluster/neutron/neutron-10.0.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ocata/con
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="compute-only dhcp ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres"
 REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
 						compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 8a01594c4e94..3233deee7aea 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -6,12 +6,15 @@ AUX openstack-scsi-disk.rules 134 SHA256 929cfecc3eae1142ac45923f1de06876af9db7f
 AUX scsi-openscsi-link.sh 2777 SHA256 4ea97b8b7121092245ae108faf488beb2b11113407eb2b478ff8ee79a87b8290 SHA512 3e7f6fc872f27b6a4d6c991346bd8eafcbc8f2b74439f1c77e93362e57fa1010ff002813cf21bf12d0550bfc165f79c70430862cd4ed5aaa15056777baf34409 WHIRLPOOL 636fff1abe0e8934dde986e9c8f51bc4a4284d57db9efe4b0090479df7516817bbfdc3e3da2fd35d19c80b095bddbcc2f31b1cd54be8d204a62df6da973279f0
 DIST nova-15.0.7.tar.gz 5763951 SHA256 75d2f307301396d423e81e817b4c087da08c9db7ab2340fcef7618fc20379fb9 SHA512 3e4b02bebdc8d0c002a09d757a2f1e96e9b7a5c16c6bd9108f0564c9be23da8ae8f90d81924050f01be691b4800c5c0ff2f5b3400fa389964899b1faa509293c WHIRLPOOL 6c8c49509bbee938886c7d2b900cf113ca86105c606c46976f3528afdd215f9ebe34026103c8e36c065ce33efe05a96db4b618be6ab94d0f3c9dceaff0ef10ab
 DIST nova-16.0.1.tar.gz 10896414 SHA256 e657675b0ca62fbbe66808cccbb7db84bdfd007b82f9579ced98c13c215b18d6 SHA512 bdeb3254e9ad6b95e7f8c07093192fb511e2a278790afd6336093f817288cd6cddee9c1a3d81b1ea82bddd4d8caf60234183f995f35bad631edaf6b9c0fe2b79 WHIRLPOOL 59750f9b4b849f78156db15c8e692ee0cdb998b786acc7466dd49cae24d6c1d869913b5b7533bba2d7993586f41e9969e10631de57593454926b50adf89a0328
+DIST nova-16.0.2.tar.gz 10912478 SHA256 a4c529f35b557b7849a6610834430030b7ca65d5eec41a74d652e75b8ed6006a SHA512 8216087bd15a14b20d340911cacb09251fa500d71a335638b8a80f4d5ca113b3b17f0e2436c3c0297450bde6885f48d7475f778190e0d48c9e761e2b5042d0c5 WHIRLPOOL 2464f1bc6db4f796808bbad35b021c063376317d527ddb37fce592cded4ebc8c86278fdf20f9e6173445c909f6d02ff8e19424249979955b8d329d4e14572e2b
 DIST nova.conf.sample-15.0.7 344760 SHA256 09c086c981505a6e775a4e2073856b1d38998d97b92062f019095f98d7d26e1f SHA512 5c55c752c8752876acbd8d2348abb39d6a8449f637ad2a6515f5c9f4619dbad73c4ae7a6ac4cd164656a0c466ed000a4d68a291050a03a5641fe96b3dd7f732d WHIRLPOOL 22f174d402e6d9c3e1e18da0cdec883209013083c66eb2b5a2921546fb609c1a19de594832afa8f40ee26a999f2596c563eb16ba1a08035895b5d6c72a729125
 DIST nova.conf.sample-16.0.1 360926 SHA256 2fad4c60277289b28ec6de87bbe41086d3f5c88003839c90dda264b0e6e1c835 SHA512 68f548e998396c7b18692fb3b1e9bf267f9bc06d73f602bb8f20bba426b6ede01e270447906f1685133cdbfd43b76ed5a9913b0167ce70f1ff3debd1ca11d378 WHIRLPOOL bb8d5fffb6fd5e6c820a422615abe6cc8398852ce6cbce12eba5dca17e2c71e413c113342916c25d38e7651b0c26b20357fdbaa5dee6d904e4ee9cc08f3b953c
+DIST nova.conf.sample-16.0.2 360926 SHA256 2fad4c60277289b28ec6de87bbe41086d3f5c88003839c90dda264b0e6e1c835 SHA512 68f548e998396c7b18692fb3b1e9bf267f9bc06d73f602bb8f20bba426b6ede01e270447906f1685133cdbfd43b76ed5a9913b0167ce70f1ff3debd1ca11d378 WHIRLPOOL bb8d5fffb6fd5e6c820a422615abe6cc8398852ce6cbce12eba5dca17e2c71e413c113342916c25d38e7651b0c26b20357fdbaa5dee6d904e4ee9cc08f3b953c
 DIST nova.conf.sample-2017.1.9999 344760 SHA256 09c086c981505a6e775a4e2073856b1d38998d97b92062f019095f98d7d26e1f SHA512 5c55c752c8752876acbd8d2348abb39d6a8449f637ad2a6515f5c9f4619dbad73c4ae7a6ac4cd164656a0c466ed000a4d68a291050a03a5641fe96b3dd7f732d WHIRLPOOL 22f174d402e6d9c3e1e18da0cdec883209013083c66eb2b5a2921546fb609c1a19de594832afa8f40ee26a999f2596c563eb16ba1a08035895b5d6c72a729125
 DIST nova.conf.sample-2017.2.9999 360926 SHA256 2fad4c60277289b28ec6de87bbe41086d3f5c88003839c90dda264b0e6e1c835 SHA512 68f548e998396c7b18692fb3b1e9bf267f9bc06d73f602bb8f20bba426b6ede01e270447906f1685133cdbfd43b76ed5a9913b0167ce70f1ff3debd1ca11d378 WHIRLPOOL bb8d5fffb6fd5e6c820a422615abe6cc8398852ce6cbce12eba5dca17e2c71e413c113342916c25d38e7651b0c26b20357fdbaa5dee6d904e4ee9cc08f3b953c
 EBUILD nova-15.0.7.ebuild 8591 SHA256 12a90783f0304604efa69aacda39728b3f37ada4aedfaa57782c392d85b1851f SHA512 89db87c533edf932796f688fea8cac0f2db5e0fd5a950dd26e6560e7b69231379949ff537d9116ae75f57cdbaec6306baaee35d7610284484d08ca33134c961f WHIRLPOOL 1c09faff69e257366d4ef57b47c5772130afe61185c0e9dad20425d2e6b9de7756356397c1e016c21fd6afa922d4883b563d02bc7f6734167bbe8f19ecb642b1
 EBUILD nova-16.0.1.ebuild 9551 SHA256 3f0655394e915f29142e75f04b784b2902cc72a27277cd83504529712113bfc3 SHA512 f4c4e83282dd32be8bf9ebeb89489e456e8ca7a647d5c1d9689556d8238d64d6f5b654be9c9839b17c6708efce9888cb28da98da2e4c179545ea4e3fbfe6d368 WHIRLPOOL 86497228a1f38fec87ff319d3abf9328256ec64993b5c2c0d2e14747179e5d3b7daff45c987850c6fa8c7172873e0ace6893dc3a245013de7e96622522b12b33
+EBUILD nova-16.0.2.ebuild 9553 SHA256 7ecdcf9236c0cec0402693725aa9c31eccecc993b929f0cf6dc067e10913136a SHA512 42bae0c28bc130012b39e6fda0b18a38264e21cdba03b9a65e3100fbd81f42cc5fdb204d8a5463db65d0f5ac910156cc74f69b000fb0c559c0b1d4842c2ec688 WHIRLPOOL 7e1b61fde66519e7d135313e67751012a54de88fc5fdfd1c60eb5666f4156b473480541894fb8ef65b54a15fd198abbb0033a79067deb5f7a8dcc1699d3ef16a
 EBUILD nova-2017.1.9999.ebuild 8563 SHA256 c941662be7134e1adda0b0517bfe049b750b4b5fb2ec0704293cca7dd607aa4f SHA512 cea6cfbaafb3c5c0977cabbbc790da256daf851459079aa73c9d4ee0a9e81153051b2bd0cf62c18eeaee4be1c268a9cf35f671b839cc6a97316a8df80679f94a WHIRLPOOL 5eae713ffe93790ba7263573c05f5e7995bfe666d9c82336979baf60fe64510f9ab52abe4bf239820b2d4cf4fa29a4893192f58bade106028b6975621a6310df
 EBUILD nova-2017.2.9999.ebuild 9572 SHA256 d0c9b13a305fea4fa388c7984929fe411e8b9f02e87a7bf90e485190e7399594 SHA512 51f966525ad1f5d7b5b611296bbccd2bf81ec58b7a2021e48cee28342f451c19a95158b21aaa4c4f1a03c5e7d7f104e997389905737d4108fb3c666e0566a86d WHIRLPOOL ad7ba84108e74a29e01744470b7a9a0b107d861424ed9152705b49330faf9ec8472b86b347e087da6e1ed2e535cfe0d90b23bf8eaf4cd904eb2b3f9441870679
 MISC ChangeLog 19879 SHA256 6d2732fdce1e774100e6fc0ea79645c59c6e563dc558b4f3a3d83a252a620408 SHA512 aed39b76013532d72711f5925b4f3ae888fddc06bad6bb87c0db553f81bf01b23d587c8287911f70a81c016f28cc826d2d9630173d0ba5a8326eb3902cbff149 WHIRLPOOL 2d89dc73f49a207a0073147be545947f571890b6e34a5f4c6b85a01f034ac12c82f391b2bb06b2d0aa81bc5a59e16b49985a27bd8fa76f6f905c5e81d99e6844
diff --git a/sys-cluster/nova/nova-16.0.2.ebuild b/sys-cluster/nova/nova-16.0.2.ebuild
new file mode 100644
index 000000000000..bc2f36d667b4
--- /dev/null
+++ b/sys-cluster/nova/nova-16.0.2.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1 eutils linux-info multilib user
+
+DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
+HOMEPAGE="https://launchpad.net/nova"
+SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/pike/nova.conf.sample -> nova.conf.sample-${PV}
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
+REQUIRED_USE="
+	!compute-only? ( || ( mysql postgres sqlite ) )
+	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
+
+CDEPEND="
+	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.0.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.0.1[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.0.2[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.0.3[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.1.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.1.1[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.2.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.3.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.3.1[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-34.3.2[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-36.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	compute-only? (
+		>=dev-python/sqlalchemy-1.0.10[${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}]
+	)
+	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/decorator-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.6.0[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-privsep-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-1.15.2[${PYTHON_USEDEP}]
+	>=dev-python/os-traits-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/os-vif-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/microversion-parse-0.1.2[${PYTHON_USEDEP}]
+	>=dev-python/os-xenapi-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.47.0[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.1.2[${PYTHON_USEDEP}]
+	>=dev-python/pypowervm-1.1.6[${PYTHON_USEDEP}]
+	dev-python/libvirt-python[${PYTHON_USEDEP}]
+	app-emulation/libvirt[iscsi?]
+	novncproxy? ( www-apps/novnc )
+	sys-apps/iproute2
+	openvswitch? ( net-misc/openvswitch )
+	rabbitmq? ( net-misc/rabbitmq-server )
+	memcached? (
+		net-misc/memcached
+		>=dev-python/python-memcached-1.58
+	)
+	sys-fs/sysfsutils
+	sys-fs/multipath-tools
+	net-misc/bridge-utils
+	compute? (
+		app-cdr/cdrtools
+		sys-fs/dosfstools
+		app-emulation/qemu
+	)
+	iscsi? (
+		sys-fs/lsscsi
+		>=sys-block/open-iscsi-2.0.873-r1
+	)"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
+	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
+	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+		done
+	fi
+	enewgroup nova
+	enewuser nova -1 -1 /var/lib/nova nova
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use !compute-only; then
+		for svc in api conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
+			newinitd "${FILESDIR}/nova.initd-2" "nova-${svc}"
+		done
+	fi
+	use compute && newinitd "${FILESDIR}/nova.initd-2" "nova-compute"
+	use novncproxy && newinitd "${FILESDIR}/nova.initd-2" "nova-novncproxy"
+
+	diropts -m 0750 -o nova -g qemu
+	dodir /var/log/nova /var/lib/nova/instances
+	diropts -m 0750 -o nova -g nova
+
+	insinto /etc/nova
+	insopts -m 0640 -o nova -g nova
+	newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample"
+	doins "${FILESDIR}/nova-compute.conf"
+	doins "${S}/etc/nova/"*
+	# rootwrap filters
+	insopts -m 0644
+	insinto /etc/nova/rootwrap.d
+	doins "etc/nova/rootwrap.d/api-metadata.filters"
+	doins "etc/nova/rootwrap.d/compute.filters"
+	doins "etc/nova/rootwrap.d/network.filters"
+
+	# add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	insopts -m 0600 -o root -g root
+	doins "${FILESDIR}/nova-sudoers"
+
+	if use iscsi ; then
+		# Install udev rules for handle iscsi disk with right links under /dev
+		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
+
+		insinto /etc/nova/
+		doins "${FILESDIR}/scsi-openscsi-link.sh"
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+	# copy migration conf file (not coppied on install via setup.py script)
+	insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/"
+	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
+	# copy the CA cert dir (not coppied on install via setup.py script)
+	cp -R "${S}/nova/CA" "${D}/$(python_get_sitedir)/nova/" || die "installing CA files failed"
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "iscsid needs to be running if you want cinder to connect"
+	fi
+}
diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index f916e7770d3b..8e3f35a19dc4 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,9 +1,7 @@
 AUX singularity-2.2.1-glibc-2.25.patch 742 SHA256 836cd7544d3ee88003ea032b2b7def8b09aae5b2515c372c22bf3f2e2caf776d SHA512 745fe14112e72fb06b5956516a3ad37fd18b96e024d80444b7e6844019e7a0c7ab1adc0887cb6591c1fba01484e659be50dc1a3cf03e6feb1065d98ecd4ac5c1 WHIRLPOOL 7e6afa455881605c75110ab392f8aebac024a2b545405d2d825a46086bffe4f8238fc906263c8c4b2d15ee25a70b7a5364f8147cae8fb211d1e2e58934f34e7e
 AUX singularity-2.3.1-slurm.patch 1597 SHA256 85e1995332f2589859de6cc590c06a04c0eeb11ef7a75911d33b951dd4f82ef8 SHA512 174dc15dcd5bff0a0b6796d4623f829fb4b7d0e8483308cafe179beb6321d31cf3ee9913decd91aebac0689a62181096cc0ac3a283f8c88927c00e113a476224 WHIRLPOOL 538a295dff1e92252696d54e054ae1578d2180bd594afbdaea808f1b9609ad7390e1b85b9d64ce8c26bbb51955a748d790a93dc7ca8237c74df002ac3b031d51
-DIST singularity-2.2.1.tar.gz 493368 SHA256 0e2a0b0cf6c8d4dc041365f715b2df157e0d8d89986e4eb111c61716df031c8a SHA512 b1195e98254957cd8d80b35b13d4f11060c5836f05ed450d242544fc30f8c298b837ba8986b1184288bc9a5ff2ebb5b1f56dc55a0686b540242b0042a152f902 WHIRLPOOL 3d3c5cb0928bd5beb683c4075c88453d076795c0e41ad30676f7169ccbd6d71a70ad64104833925913138f47b8fc318e90366af79259a05bad41bb0a42703b05
 DIST singularity-2.3.1.tar.gz 643021 SHA256 dcccae9ff67a550d142c94e932c0fb59442dd59ae69ce1deeb7ba45829ef2cd7 SHA512 36c581e8dba57d133013c2fcfea26886b54a1a9a9165b011d2cebacb2a6249fe0f8e5aa91ed90f7a18855c658300682436c431a226629408f31422cc8a036600 WHIRLPOOL d9bb8604ce2afb6bb2b5b257eb88276a93987916cd4c08ecc800d98761f5d1ae54e48ed615d77b1c992bcc8bb6202e9bf5e04637d10d1126fba6d1c2619cb98c
 DIST singularity-2.4.tar.gz 689760 SHA256 34ca94250f15354819587364b21b0fdf7eebcff05110f8443caae8ed6961d7da SHA512 b445e73d9794f344ab72ce17d8f802390d0c0c153791b837f416254eadabf19365f1abd29f0b498be5486b600f32cd7fe53e5dc131eee3465ab890c9d6b171f4 WHIRLPOOL 5434f8da66b3863a0c45d17dbe716231b4f04587907ecd608f92d5becb2e34ae599cfebce2a6768a0745fc00ca70297ba7ca9e7370e7080139c8e3eca2b5428d
-EBUILD singularity-2.2.1.ebuild 603 SHA256 284ddda57f6ab272b912705b7bfb5f4e601864b8878e75c96aed805a9807bbf3 SHA512 030a1a39ea1915d75ef5ebdaa8b6b6d4b0eb0c45222a1d4492cb3a3b41cb4e6ad50c1fa6b85d13413d34bb232b62db14f12f4db48ea9876127d0fe32fdbff5d0 WHIRLPOOL 4afd0755887fe98ccf3fdbafacb61f7a0874590a2c7256323ffca8da1e2b7f33d4657ccf006c28a2ae270569937b5a21447f4ef48f6a94d9d1ae5e1dcd68c035
 EBUILD singularity-2.3.1.ebuild 952 SHA256 b45c03e3a2ca5de21b14144967c2da9727f477709332a9c32bc357c3de9dc815 SHA512 60ed34f1ab7543ae5f728b51595640dc671ebb514028dce2fb82c72f1d192ca896c761fe38b4c786641f1df678adfd45d855eac262b68ee00c2b1048072e6d2c WHIRLPOOL 07f332ecdc9de4af06a10941cec0db76c20b04695e6ecde0f11cbd02edaeffa134ff7188e595e8dab5f44849fad32403c246bc355f23ec1c645c0e6c9ad12bc4
 EBUILD singularity-2.4.ebuild 821 SHA256 449738c88c8cbd8e08708b7b5151e6be1ff67c2ff8b375296d6c2122994ba2cb SHA512 48bab7aae5fadefb6e5b1c4521b19d93360e2a7103cd865e71109b1be71084693705ac6c34e8430e135e127f69bf2c842007cc722d6a73d9ac7f4e6a9cc1b6f7 WHIRLPOOL 892a6bfae256d9b114c6ed209aba376ea7771309fd122083fa3721718c850e9d5f6faae6b86fcd7a161e23e07073fad60b6daeb82da38fd308d0a4ffa589d4b1
 MISC ChangeLog 771 SHA256 37adb96a35be0b0dcb6bc1c64e47203bc7836c7d6cb944ca69db79007b0bd446 SHA512 1e6fb03f5d3c4329a3c22c8274610ee940406c8bfcdf0e0ec9b3c3caed4b51f2ff1e34079c76e27940eab7470c8c1447bf02fa5d3f9ff985006ec65f0be76536 WHIRLPOOL dcbfd8b7040b56025c5567b78237aeb14bda64684dc6995a9cef05c6da392d5c6fb5f56bdee89c720dec3c0f67e3b745105f0fc3ca1e0e55477725ce1df28627
diff --git a/sys-cluster/singularity/singularity-2.2.1.ebuild b/sys-cluster/singularity/singularity-2.2.1.ebuild
deleted file mode 100644
index 0d679f703fed..000000000000
--- a/sys-cluster/singularity/singularity-2.2.1.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
-
-inherit eutils
-
-DESCRIPTION="Application containers for Linux"
-HOMEPAGE="http://singularity.lbl.gov/"
-SRC_URI="https://github.com/${PN}ware/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="cctbx-2.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-glibc-2.25.patch
-)
-
-src_configure() {
-	econf --with-userns
-}
-
-src_install() {
-	MAKEOPTS+=" -j1"
-	default
-	prune_libtool_files
-	dodoc ChangeLog
-	use examples && dodoc -r examples
-}
diff --git a/sys-devel/autoconf-archive/Manifest b/sys-devel/autoconf-archive/Manifest
index 771e25ecf087..98033a45eb36 100644
--- a/sys-devel/autoconf-archive/Manifest
+++ b/sys-devel/autoconf-archive/Manifest
@@ -6,7 +6,7 @@ DIST autoconf-archive-2017.03.21.tar.xz 633132 SHA256 386ad455f12bdeb3a7d1928044
 DIST autoconf-archive-2017.09.28.tar.xz 645388 SHA256 5c9fb5845b38b28982a3ef12836f76b35f46799ef4a2e46b48e2bd3c6182fa01 SHA512 2aa271fdd67fa3caf20e07eb8332d88f7008eefe1df447980d42cb2104313d99947b94ffdb0f6f4b4c8156cfc73d9e0b6c27a5f133c6b73787ef641d9951be90 WHIRLPOOL ae63070d3ff990da6a568e22ab0462f21addeb1f32bd66f1cf1084ea0466ba0cdd100871d1a448b1cbe3e94f8009fd74094ff8fe99be167a9d7ece7f7c0caafd
 EBUILD autoconf-archive-2016.03.20-r1.ebuild 771 SHA256 cc9f9357496cdc936c71ab19a5dfe6ab8f91613a572df4fe3a8eb768935a1739 SHA512 3389dbf76b58e91adbfa55e13c2f2c86d6451765bed33e8eec11e6bf2c2a2a57d1b0a749530f73a55ac0df7af0aff47ca93ae97450add7641ddeceed6e4de700 WHIRLPOOL 8b16271f32e17d6af1eb4fe862868456707b6877a7088244db89be27471cdececfed000f93bdd1a369548f21697714c375d8157cdb088256c244b6e8737a726f
 EBUILD autoconf-archive-2016.09.16.ebuild 700 SHA256 c7fb972f19d9c4d7d10a8ea5889a9ba23e485dca00c81578d2377374dbfdc428 SHA512 fb129a0026a8799b56676f65b03042add5509ae5bb9c08c6c43b41f9e6a5f4ac9e7584c4e98d22dba41494b7201c8de61c3094ff3035ab245b3f67371720c21b WHIRLPOOL c48ccda759fbbb4a9a3b0b7af0e0c5296aa6660dac0fe884ab6e53e7c7155706ff2605c13f8d0ccf4f94e1ac7031e90407ad90ca02ffd843c4effbdce95b23ee
-EBUILD autoconf-archive-2017.03.21.ebuild 694 SHA256 a4c501510035013248f8ce0e62619cc3f036c2179f87c10528626c3499332c5d SHA512 1eb52b8cc7360430a0d95f1b2cb52cc9a2e3a1ba855382e856d6e6abefe59217416c750c738a8d6b71cc879b8c195dd4137abf3e2f134a31a7005b3e84d8fde3 WHIRLPOOL 1d6862356526a208bae49ff2e1f1633b3b083a0fcda35ea504a5a9bb827fa0761f28f9b990ceca7d16313ff7f648d0a918dd32857cf8d30819a300ac8e8fb264
+EBUILD autoconf-archive-2017.03.21.ebuild 693 SHA256 61b06538b528498e1e5aaa483dcf9a3fd4b10900dddc5d6b5ce35e7f3a1bd27b SHA512 fdae40f9968ab2a52afa11c5640fd27011df6d78a7843649be656cb7c274856520e3e6758cbbfb23c4e50813eef02d0c711757da85e375e3fa738fb209a502e0 WHIRLPOOL 987e9abcc85e713d2c6cd6314165c1e79415ef41f579de9bec7034cfca7949dea9dd05f70a72245837b8e1255c13295cb1e3e4fb2dc3804ffcb3dcb853e01bb7
 EBUILD autoconf-archive-2017.09.28.ebuild 700 SHA256 c7fb972f19d9c4d7d10a8ea5889a9ba23e485dca00c81578d2377374dbfdc428 SHA512 fb129a0026a8799b56676f65b03042add5509ae5bb9c08c6c43b41f9e6a5f4ac9e7584c4e98d22dba41494b7201c8de61c3094ff3035ab245b3f67371720c21b WHIRLPOOL c48ccda759fbbb4a9a3b0b7af0e0c5296aa6660dac0fe884ab6e53e7c7155706ff2605c13f8d0ccf4f94e1ac7031e90407ad90ca02ffd843c4effbdce95b23ee
 MISC ChangeLog 6420 SHA256 051d38a52ee4583c6dbd85324468ff61b3e7beee2593b78f1a6d2801fc9f0bd7 SHA512 bd1be4b6f864ad2cde39aec41802aa3c1454815cb43e2e8f207e0d9074ef5d3c34f0671166c7d4efab02146fe51432cbcabca071373c1168fdd575229c64e0a4 WHIRLPOOL 0e59b74e9886df9f69a683ae80283458de362ec8765ac12e0babe7869c64d65d1bf12cdb040678c4993fa9e163895adfd310be741c4092d4ab02d7a6debe3f8f
 MISC ChangeLog-2015 12464 SHA256 f458fca2f9c58b439a222cf5292f379b06ddb0415a1830e2b49e2a6d6780a49c SHA512 2eab19d82976cf6fc308bc0301d2432cb185b800d16c9de10f5a3ec8d0ce289fba1ca0b6826a473bc267af1c5a476d29e6afeb9bd6b28031874a6c9668a350a2 WHIRLPOOL 46d27043d84b98dd33901be89990bdbe9d7892b9e7aa47dfd6bddbad2e5e1f9227a2c9409241e4687fcb71b833fe9eaad28719f5281c7e719c48eedc87d0813d
diff --git a/sys-devel/autoconf-archive/autoconf-archive-2017.03.21.ebuild b/sys-devel/autoconf-archive/autoconf-archive-2017.03.21.ebuild
index 106958e91307..f094ac92c54c 100644
--- a/sys-devel/autoconf-archive/autoconf-archive-2017.03.21.ebuild
+++ b/sys-devel/autoconf-archive/autoconf-archive-2017.03.21.ebuild
@@ -9,7 +9,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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 # File collisions. #540246
diff --git a/sys-devel/autogen/Manifest b/sys-devel/autogen/Manifest
index b24114c7dad9..f34352bb0267 100644
--- a/sys-devel/autogen/Manifest
+++ b/sys-devel/autogen/Manifest
@@ -5,7 +5,7 @@ DIST autogen-5.18.12.tar.xz 1018412 SHA256 be3ba62e883185b6ee8475edae97d7197d701
 DIST autogen-5.18.4.tar.xz 1017936 SHA256 7fbaff0c25035aee5b96913de2c83d9a5cc973b8dc08d6b7489ecbcfd72eb84b SHA512 a02363484de5019bd90fb6f2cf52b1b9556d6cf310c62a68830d0b2408ea4870d3c262fe5d1c27e3586ed3af4a7487d7422ad117760ac2a01ef3cfcfc1f2bfb6 WHIRLPOOL 109cb5637558f8e16cbb9afcb629a9bbd3d5ceae6b897a00101fce99b1a39b06ecc497d9b43441e40b58981dd2402027e89ce6ae76da73b73db934c64bca2b63
 EBUILD autogen-5.18.10.ebuild 1155 SHA256 4a08964e580574b6b92f9d8b306361163ae413f54943a249f6a3da52ae8d19c1 SHA512 ac21f0960ae9196d5214c125b2a55c2d8b0608b23d1f07d76dec31cec55eb1d158c46898d4f632cb67168a193820a40d364231a84268b3369f2d5b4fa2b82faa WHIRLPOOL d906ea64b6f01071711b045ca00ce71adb9b95d41c9b2c38f87f04d51be48a8ae9ec58fb3fbe575ec57f905e2ff4e4c671c07385ddd4ac90ba5bcce39c152898
 EBUILD autogen-5.18.12.ebuild 1155 SHA256 4a08964e580574b6b92f9d8b306361163ae413f54943a249f6a3da52ae8d19c1 SHA512 ac21f0960ae9196d5214c125b2a55c2d8b0608b23d1f07d76dec31cec55eb1d158c46898d4f632cb67168a193820a40d364231a84268b3369f2d5b4fa2b82faa WHIRLPOOL d906ea64b6f01071711b045ca00ce71adb9b95d41c9b2c38f87f04d51be48a8ae9ec58fb3fbe575ec57f905e2ff4e4c671c07385ddd4ac90ba5bcce39c152898
-EBUILD autogen-5.18.4-r1.ebuild 1007 SHA256 cdc60531870d396b466fe93910a03824724a27fbc8868f3e0ec1a5dfe8cd98e7 SHA512 2ce6869157fdaf33f6cba144131dfeddb3274e0c7c52fd977dad56ed8190eb63465cd9dab2a2af69743f7b5e53784449fb41c975204929a9b1f8b10a0521d467 WHIRLPOOL e5b9a17750239098f75cb0efc59426c676b0c6fb1a6c7918407797682fc9e52665e4b6a0b5f4f4c13332d9a6b32e1747d48c746190d03177567a52a96f891c80
+EBUILD autogen-5.18.4-r1.ebuild 1006 SHA256 8576a6dfed63aff1251c746a597d14152e6a8dbefcdc0fc93ee664d1b48f3d74 SHA512 56700362397e4dabdef29f08fa33229bcd2361f87e5dd1e65acc0779ebf53b3aad350e6c539594e6edd8009eeb74f38b8c0ff8b4ad4bd72d028e0411b8d6bd7d WHIRLPOOL 189aadcf9e516a294da22a4723a5415eee920719092feafcf54243e4a5f330ba04fcdfed6caf3626d64908b4cad7f46b3841a6d4985ca16ede0cc7406eac3c73
 EBUILD autogen-5.18.4.ebuild 988 SHA256 125667dd5f60611d45542c66efb441018f9d8b35ed42396752ed3c8e2c40db0b SHA512 703592e8e47e247aba37a140e015d25a46bd3c9d1b1cf4ad1ac49782e39b35b7a376cd27437d8f6969056d879630e0fb55d1e35fabddaa4730820ef549cf936b WHIRLPOOL 7cde847ec269488a190d27a19e16d39f8088e685a964115e2d4bff973bf49d21b78477df8b70f8201eb425567d20f7a64e5f92b279ae91c9102fbc9a1c082663
 MISC ChangeLog 5924 SHA256 6cf9205c2718a40dd62291e018e83598b8a790e348d83b4712e4572797759e93 SHA512 a30ca95519c3ee89ffb2bf7747414a863413813087ec4f5023503d7ba9557f402bb5d109da2f70568fca2705e2f49eecec8a6108f88feef990f550a596b78c29 WHIRLPOOL b63df1b7675cb72778fa3e0a53ef7df8ac25adbbbd7c67e4e219fe3232fc492d23aab2b3e602585714103c86b5d3c156dd9b576a8da950c138e5e99d09840f73
 MISC ChangeLog-2015 13238 SHA256 62ffc05bf40267540954659a8e6d8ce6111a1fc65c13edcfbba23c01989a1b2e SHA512 7a649ee0b718eb91376fa0a9672a4c2d7681d4c4341fc1a2685c71e594105f8cefa3366006413b2214189049f2a7eabbfcefd20ac289bab03d27b6c4778771ed WHIRLPOOL 8f00451bb3e8b1fda71b6178eca2d5f2e963767624df0a650f904730f395e398542bb5667078fc6dc29cff7cdfc20b99a59fe2a37be0a65aa62a378b07bccca0
diff --git a/sys-devel/autogen/autogen-5.18.4-r1.ebuild b/sys-devel/autogen/autogen-5.18.4-r1.ebuild
index d944940a3f78..3726295bec5b 100644
--- a/sys-devel/autogen/autogen-5.18.4-r1.ebuild
+++ b/sys-devel/autogen/autogen-5.18.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/rel${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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="libopts static-libs"
 
 RDEPEND="
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index b9b48067dc2f..caeb4dd10410 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -43,18 +43,18 @@ DIST automake-1.7.9.tar.bz2 577705 SHA256 32c13b6ad38ed5e7bfd1756cbc19cf5efd67b7
 DIST automake-1.8.5.tar.bz2 663182 SHA256 84c93aaa3c3651a9e7474b721b0e6788318592509e7de604bafe4ea8049dc410 SHA512 862f9fe8dd4f0fd51b97d80b767304b982d9c9307bf66933298187bf121f5c827f0b4880eab92f07d16e0c1d41ff5179923c7ae8d8aabd635db8574d4a3021b0 WHIRLPOOL 6328e298a4af1bbe2ca360f380064b6a1b43c9cf9c361c3dc4078297c3bf77c0bfe3690b1d9f2713ad2f28970f033880b40f4b077d5734c0e03bd35aa4bb18e3
 DIST automake-1.9.6.tar.bz2 765505 SHA256 8eccaa98e1863d10e4a5f861d8e2ec349a23e88cb12ad10f6b6f79022ad2bb8d SHA512 6aa8824876003bcac804e88d58f014a2449c7e1d824e46b5e971d3e2d070bc6ac0a3881e8eaae12e2f7f310c6b81dfb83ad4647d58785fc7e6759aa37478784e WHIRLPOOL 76d59f947a2dfad4ca70c888d58b15f86670f0df6156b9f1e9f2ed03ad92468ad880ab47b505b31577b35b376a799b6de0ebab46f17516440772a1d3eb6b7479
 EBUILD automake-1.10.3-r1.ebuild 2136 SHA256 6e31f47e74d46ef781c3cb63fc8ac22d75438d9ad5be3563f23a8b929f5a81fd SHA512 41817b8c074c3a5c440d69b3198cd7a654ed12080751628a029a8b1b8a4037a44575329039aa85ac53e3d6ecb17e7639fd6a55f97bd3373731e2602f5219465c WHIRLPOOL d5889951e48d7d5091ff7cf9cf2a8739750a93eb65586923c3dc00cbcee3b743469c487a50bc77dec1894eb9b6f82b48a63d0731cde96d798894e27cd484cc92
-EBUILD automake-1.10.3-r2.ebuild 2214 SHA256 717feba827fe4d3120b783d5611df836ee93b7b2b6ca1b00a77452d806da29b9 SHA512 2eba670d60987bd43c22995412cb988e1daabd198068f82e3cc9b1f45ff0bb55144dee24c3910e4ecaa3999459a9a0adaa46a886f97c36fc2325fed83a354ba4 WHIRLPOOL 6818de1cb91f915277de95751d0aa9edce8c612fbf86509548f9c3701693c90f5728442f389614ee673b4235d5eade6f40a56302f8ac5fb7d20841420e4cd41e
+EBUILD automake-1.10.3-r2.ebuild 2210 SHA256 18b9c66de668a0dd47358dc5467328d6af74888769bdacf594d4466e27be3dd9 SHA512 d7e3deb34246fa978c63fa3497e2bc83dd150e7b1ce7d8ab689002dc2c8fa8a7a628a9c6cd7b53b9928fe655b1d943f322a3f24a054df8867e81091681e8cd12 WHIRLPOOL 1e8c432d545e841da81a0812b86415b7c47fab402ba7f114f6f536240ffbf3efb92349ac5beee4558d78b22cf68170add32d10836374e57b9f1c3b50c48e9ce7
 EBUILD automake-1.11.6-r1.ebuild 2299 SHA256 5af059c0c56d838fd092b8b02127fdb5987093db8006f4a089be81b3d64e55e2 SHA512 9b62d923218da82f939dac7694e814930723caa430529e6b7e49cb376042317df1e17a3f1386af3a7a3226ef28a6ae4e5ecd05ac747dcb96dd851cf759091950 WHIRLPOOL a3643db4de7e892e05b8cfdde9cde4f1ea7abd2165323c354b7868d00a06053cf6d7af547bddd9b1dc4dbdce740ec44670b64c3f6790aa072007a67288f7bea6
-EBUILD automake-1.11.6-r2.ebuild 2385 SHA256 42a49acea6adc9cb319e52e0b39bd55dfebb43f9ee546fa7a78a4289c7842564 SHA512 923ba58664d8424836715a8bd0f60f48933ecdf3409bcf208bf6bb76c8d3188386d60a4d7f6b2da0ffb2912cbb5a00873a04a33fe5e8ffa5bd108d98c4c9bb84 WHIRLPOOL f2452e339a084f1fe4dbc0224f25a8272344d4a04a662781854cd3090a7b9062cc5669c96dddbcdd9aa696c61180779b5513637b6e7849ddf03f049f4e3c384e
-EBUILD automake-1.12.6-r1.ebuild 2214 SHA256 5ed083a5724b47faac05a4ffdb7572e5db65022860ed61ba066daf870349a357 SHA512 7670cf0662e2905b23cfff03ee2259b6842f186f77203b59f3f3fcce36a54b27836e5db33a78f35233cbcf2499b83bc920103d83cf0dd4d41cfb2be1de908789 WHIRLPOOL 00174bdcc492a9e5a3d8bfbe1993ad878734d8d290e97cf6e89b2513e78e0ffeaf9d75f1ebf96041af66242c0f998fe7224c396a0729e32f399cf215ea5ed4e1
+EBUILD automake-1.11.6-r2.ebuild 2381 SHA256 cd5ffdd8cc858cb074979142907da785d55493470b62dc2f382668061c6d5f78 SHA512 25e24c2adb601c826c2b34c9cdc6c6704817bb3a796527e4c01139473f31b265dd9cdcc3cdbb934ea11442f31f41992dd602c61d8db1668b96628110af3f23fa WHIRLPOOL 038aa2a40e35e38451f29c07f773a578513320f79aee50a9fbfd0e96ec0ebeef0646fd4521a6894ca0ef34bfb7938dc33ef0219246e200b05bd61bb03c9774c4
+EBUILD automake-1.12.6-r1.ebuild 2210 SHA256 5a53d96cca02c8aa64608f3b2ada840f8d729404ffe06b6439099b5a3a6dc946 SHA512 a2efd50fe9d9c4d5268cbd3bf2148b9bd9908405f7363c06466161ef4d9094524395e76302f4f955b9b2140fa1bf28415610b0e8a7eddb8dcce54e1992e0011a WHIRLPOOL 20341b4a01ad598bfe54df733212c548971c710615b47f4507d4e5b654d3d73be04d70140183bc7bca4e3f86ed827a150f4cc56958f4c48703bd4a82ab93e057
 EBUILD automake-1.12.6.ebuild 2136 SHA256 49bb086283edcb5b5e4efe615979676fa778ef3ce6b9644b5f2d3e1951eaa0df SHA512 93f0abd1cfcb93328a3473cd4300563fe05d0de1c9e6a700a39e69a5d531566065c9477920cccbd63b0435308bb98109d7f93f345e2ff6eea5f1aeba524df535 WHIRLPOOL 779ae6cce01ad381ff3987972d344398c5d686a39b4f3716cd1109ea8fd2fc9e9f7a12406f7ae8080aa5ed5e3fc65698edec10ec86c025c336d2615e59b2db81
-EBUILD automake-1.13.4-r1.ebuild 2442 SHA256 2e68b3961327dbe8c39304f32669fddcd6f9e1a6e0f782b2d19949d8ea030211 SHA512 31f9ac2c6fb87568d90af3234489a03c37ab3ac856a3592d9bb59eead8580b26f8628b6ce2b47063a6555d51343d7f035db7d5f6a7e935bb35464b85b8ded7d0 WHIRLPOOL a6d2618fd9cc4799df8e9ffe1da22c1a7c5d038b85ffa3b4915b4a19f4ed6833ec73de3a8b501960e3f3850553860bb8abc7d2a6e5930ab27de2ffb5dc865d51
+EBUILD automake-1.13.4-r1.ebuild 2438 SHA256 dd8cb91b2906e34dbc542248ad7e8d6a6230a60931a8e67db15b70bc46a7e8d3 SHA512 1237a0ee1f4da4fb7aa06e16664ebee1f177148e4e6e2845c59d3ef0138fd0b0b7bb9f06966672ac049ca4859cb71e4def6add6a1d568d0e08bce069cfe97df8 WHIRLPOOL db4e7303f4e268d7ce9751e5b16aa92f403f0a6745774e7eaa3adf0cd34490aed0c08b1459cb087cbd33e22e0364c3089cdc7011d0ecd6020f3677b5f5cb3e8f
 EBUILD automake-1.13.4.ebuild 2217 SHA256 106c3616f615879592987dbd0b096fdc279c7135aec13d7e14b27233e3277dc0 SHA512 f9d1970643c35f49269cf3ede21c6c60f386cdebe5787208c2c2347dde194ea247de46b665a14e9197468c5c1dc18d124333ada4fe456184ad7b91ff532a3ae9 WHIRLPOOL ed0682fbea1755f5d77523dafe252f7424391fb0c5ac31fd30877061f3e4d8334c83f3319ac4df8f52ed6633b162e407bf66853376d99c0a51b3cf10eab67c87
-EBUILD automake-1.14.1-r1.ebuild 2754 SHA256 b2c829269ad2c3c2fdaec05098a5bdc63a43ee820ac791a739fe829012afed3a SHA512 09691ec77d6e738e09fdc3069f858c05973c8dfd5df5511e9531c6bcc171d48dd7fa63b7692c5107e63ef72d189fb2638780caaa25401c6bfacd01867c29a757 WHIRLPOOL c544614cb147385e8f7ccd72767aeab0145fba3d975f58dd2b9bd002bcb2d70d634363fd076a09422a8e0a32f7219080c80ab8c39397c2bbdbef93242bd17b29
+EBUILD automake-1.14.1-r1.ebuild 2750 SHA256 28373a23f565a159bd5ea2e7b8224a4ef6eef2621bde960f58db2945e4d9da7a SHA512 22a52059700c5d0fdcd119074dca3f9e1cef4f07465074cea58571b5bc0058361f979265d9faccf2405fbfdcbef4a703d96e4d221bab5cdb9180d16e3afc6489 WHIRLPOOL 06dba278070458a39837aa9e7409510e9b723c19d5a31f453d9a9067e287b07fb58195830ad040e4d5bc29c6d60d5e970c38e7dfa1e83b474d1506ff555ac67c
 EBUILD automake-1.14.1.ebuild 2529 SHA256 801155fd3f5c36689e389b0ab0c13d17360d5615c3420dc828c853ebfc435539 SHA512 ccdd5e045c12d7ec8f99243e611f1e9c45d605bef5ca1a754332843fd424a528450c529c0289993a4b0025c8bbbe5107bd6663ba6cd45a729e8158135f00af71 WHIRLPOOL c32934389efe9d8c389208ac5a626e863b8c12e14420615d8e5b36c1752d742712540a10875371159423d0eb1aaadb8a7b06b7f108f8495df6eaf1f36ebef536
 EBUILD automake-1.15-r1.ebuild 2607 SHA256 94f74143d5e3b380cbc01920edfeed86264d40157b607cf52372f0db1940d788 SHA512 e4d3bf262b452663b011b08e59bd6fbf578d8509d2ae0cc8a42b829f450f080e2126808c3916cb1dc2bbac84fd0259d3996fdd6bc3c986f2ae1fc843602e722f WHIRLPOOL ee5cd56726d0e51341c688370eafcc6b80f0bf0f747cc747d48bc292f9c1ca0bd87815f72cfb576f0a6dde0dd2aa3d2c4dc04f96ffb0a165cfe7e6eb6f9903ef
 EBUILD automake-1.15-r2.ebuild 2809 SHA256 49a78a72781c96991797c0f2357103a9feaf95d9b2a5920d0eb3860765cc1980 SHA512 f2317f01a0e3fe98090bed4d10431e611ff2d84010ee7ab9d40487e2f75e2d4db1e50ea41c9f51470d053b2e0f3a5ef903792edab44aeee3739f5cc8660e05b0 WHIRLPOOL c0138d5fa0185f78c21969ea67c64adc948f1c70fb4938a81d7e49e6a98127fb78f99b0e772d6a26392ea2473aa71e8546a996142bb88bba8536068d037761eb
-EBUILD automake-1.15.1-r1.ebuild 2935 SHA256 66fc4d25455f1bdf9bdc9e075ddab1b3e3f6e9782e2c24d4fb54de21485b12b8 SHA512 b78724ce11602e6025a5e22f23bb8d40234c5e4abf34bb2704e2634796e2fd6570abe76454191648e93b3e686502f77f0df2bd54c98bf0983452ac6ac2287699 WHIRLPOOL b24eda3b6fd3431f9702ec95a25c5d2292276b58b11050d1d86fc2c8d9391b2a07628914af0357ef191a02e9ed5565ff39ba3ae92fe6a1ab5f756c71952fb9a9
+EBUILD automake-1.15.1-r1.ebuild 2931 SHA256 08ab92422193c92a7740ec61c4867a7fd3931a2b76071ff47b4fbad66a952a4a SHA512 83483dc1a2b59f0e7a016252d95dcc99045483f63c44aa3797d77c87e1399a6be19371aa870db981b44916dc3b6c2760d9d1fd27fbeb24448491ec46cbd05418 WHIRLPOOL b7d2ca404713b8ebd70e62c6042adf80dcf5f550621918a9f5ff9cd3d0b92582582c5a7efd315281e7c6d17531b8cc92d81cdd21a156d290a37c15377262d933
 EBUILD automake-1.15.1.ebuild 2689 SHA256 c169a0a8d2d3cd8ae968b5d7d99a61c3ef6136351153bdea7a00fdd2bb544295 SHA512 302a37dec3e7944a29754ec7a3f7adef389a57fc408a353eaff2f9d6d6408a0460a56e9410f5640caf6945511549f367ddf42290e356b3fdb7da2eb979e1aeaf WHIRLPOOL 5725aae7e9d5eb5b533476e186b8db2e813f2d692d624d79403525c31f2c0f97392b726b9cc196af56a8de1b33e0b13f3e3147c40a5e7340ec7e6873f3f4cbe9
 EBUILD automake-1.15.ebuild 2529 SHA256 801155fd3f5c36689e389b0ab0c13d17360d5615c3420dc828c853ebfc435539 SHA512 ccdd5e045c12d7ec8f99243e611f1e9c45d605bef5ca1a754332843fd424a528450c529c0289993a4b0025c8bbbe5107bd6663ba6cd45a729e8158135f00af71 WHIRLPOOL c32934389efe9d8c389208ac5a626e863b8c12e14420615d8e5b36c1752d742712540a10875371159423d0eb1aaadb8a7b06b7f108f8495df6eaf1f36ebef536
 EBUILD automake-1.4_p6-r2.ebuild 2493 SHA256 c4c4af4817824d4adbad01fa854bb4a79aa79b9eac5ee2af5519fc53b4a6beed SHA512 7077f282076cb741cd54080654ab2098f6a4fe55536147c5c4c7a807e0e1b63179cac9aadb4220f92ae601455a4f231c045b6b85faa4c044408d4b0ba0563407 WHIRLPOOL d84978af4846bf7e14d9c2a22edc5385d19c82cb65346f29f6d3f5bbe833d63ac4d2c49dfa20094c087a2580359416858209a90c5f21758b598f153d9f7fe9a6
diff --git a/sys-devel/automake/automake-1.10.3-r2.ebuild b/sys-devel/automake/automake-1.10.3-r2.ebuild
index 680490feccb2..a10ec1c3889c 100644
--- a/sys-devel/automake/automake-1.10.3-r2.ebuild
+++ b/sys-devel/automake/automake-1.10.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.11.6-r2.ebuild b/sys-devel/automake/automake-1.11.6-r2.ebuild
index 3749e225e073..12f9c9903d52 100644
--- a/sys-devel/automake/automake-1.11.6-r2.ebuild
+++ b/sys-devel/automake/automake-1.11.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.12.6-r1.ebuild b/sys-devel/automake/automake-1.12.6-r1.ebuild
index 2f9b1247e228..aa3fc8708331 100644
--- a/sys-devel/automake/automake-1.12.6-r1.ebuild
+++ b/sys-devel/automake/automake-1.12.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.13.4-r1.ebuild b/sys-devel/automake/automake-1.13.4-r1.ebuild
index 1cf05955ce47..17755719440f 100644
--- a/sys-devel/automake/automake-1.13.4-r1.ebuild
+++ b/sys-devel/automake/automake-1.13.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.14.1-r1.ebuild b/sys-devel/automake/automake-1.14.1-r1.ebuild
index b52f0a084034..d96bead2655a 100644
--- a/sys-devel/automake/automake-1.14.1-r1.ebuild
+++ b/sys-devel/automake/automake-1.14.1-r1.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://www.gnu.org/software/automake/"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.15.1-r1.ebuild b/sys-devel/automake/automake-1.15.1-r1.ebuild
index 5051ee0ba2c4..a5be4cc4d1db 100644
--- a/sys-devel/automake/automake-1.15.1-r1.ebuild
+++ b/sys-devel/automake/automake-1.15.1-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	if [[ ${PV/_beta} == ${PV} ]]; then
 		MY_P=${P}
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
diff --git a/sys-devel/bc/Manifest b/sys-devel/bc/Manifest
index f923d59da012..8048d97090f1 100644
--- a/sys-devel/bc/Manifest
+++ b/sys-devel/bc/Manifest
@@ -4,7 +4,7 @@ DIST bc-1.06.95.tar.bz2 290069 SHA256 7ee4abbcfac03d8a6e1a8a3440558a3d239d6b8585
 DIST bc-1.07.1.tar.gz 419850 SHA256 62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a SHA512 02126d0db6b6ed06d56cfc292d6f5475ff1e574779d7e69c7809bbb1e13f946f57ea07da2a7666baa092507a951a822044b0970075f75eefe65a5c1999b75d34 WHIRLPOOL 87a9c0a5b7b2af082d59002147cd05cef7612a66f83ca688e6572ed2bbbdddcec945e7b8a0ee6e865f0142d31801ee3167b7eff023be8054d897d755bd282a2d
 EBUILD bc-1.06.95-r1.ebuild 1480 SHA256 bac45bc80ff69c4bc310526bfd4faafd41bcacaf624e09b5db9c650733d343b6 SHA512 fc39ebb2f8e6e13c48856e8434951b25847883720f409a52b46e0e9a4c231bc896cd2ef280c042b9d5968fce62e2a007e39defa66a56acc26070ecf8bd2e439c WHIRLPOOL a93ad0bcfff050ab7a3d873667423b9af3de649854cf70e89a5e8d7ebab73a72180a0ae12e5da64886c8e8b05bac41ae3c4c4dcf469bceabd117fa884595afa8
 EBUILD bc-1.06.95-r2.ebuild 1588 SHA256 ae2a5bbd3b93cfd7ddfc1554cba150eeebefd651d3b52005b54d876ee8e6cf11 SHA512 98fc290aa33cbe100026426dbb56d9245dd7e7fe8fdf71913cd8b2ea64b6bba674128bd1134c2c12bf71158f79d09e1e99f4a624806d2278a9a9efa4b7574446 WHIRLPOOL f722d087366e6ebc8f914acb454711707bfd47384f09d108b3191a9d0cb7b8fc09f45cffd89fd2170b441156aa50e76b528048e2a161022495c5c2b04f6f1795
-EBUILD bc-1.07.1.ebuild 1470 SHA256 4e9d3b1f8875aea06224ffa0d4389a6a80c6e495298234bd257567fda6109078 SHA512 08dcd60ad4d20fb6241eeea7b1d576302908ce66c64f74060c30e099d8ff2d9ba9fceace5357b15ae053dcfa1d0180b6e06a73a9ba4fad9ee3c77a89f0d11a6f WHIRLPOOL 49f8d68632f7a3fcc1fe8e1b5f6172aabe1853133ff7b15e051c474ef051d7e6d648d6b2c9016db48511d62741bcf6357dd7d573a61624add7a9b856e41ab1bc
+EBUILD bc-1.07.1-r1.ebuild 1428 SHA256 99a3c6bc221598d4038a8ba4855c67f9543b155fffa3c2d52f7290236ce98dfc SHA512 5e78ec01eb60c593655677eecd0fb8d4a5f0b941bf90d90b172cb2a9eb85751a2a8012c905dede7bbf14718eb8ca7f5be3f9770e16e33d5fefd80fb271dc51d4 WHIRLPOOL 1e5bc886bd1aca5eb2e6e48195435f5dd8ed4b042183c2e13210fd8dccffdb922862c54764ed0bd11ae6586c9f1c4dff177c1be7e8760f0080137cfad271aee1
 MISC ChangeLog 3416 SHA256 d764dcbf54a63a7a09a6e6a9f91214f7f3e99a4ac1a5de16816e60503c66f8a2 SHA512 5e2afa1fc5088beff05c99eadf299de62e78604697ac0209abc2afd1aa98e8d0420cf37b9ed83da1b1910495a04d6a3af3bff1ae59dfefe472fd30722fb30137 WHIRLPOOL 1f1491ea866935473fb9d2a207d6adc13d0c7d11da17bc86db61b710bf4b1ead6084dce8a623e3d4d8b62b1fe072cee13806e09dc4b9b7a8423d63a99356549d
 MISC ChangeLog-2015 6604 SHA256 d3b98712ce979d9f6e812b6a1accaa7b055795aa2d670e89c2d429fade5e3b41 SHA512 5d0f29e8861968f85a969bcb17da4bc4f3ebda970be6874a9e855a24c3bc70223f97f7c7d3b12156de1ea91f89d214e2284f3a2626ec55887f9836897bc52d7c WHIRLPOOL 4a11af0dc0fe8ff4cfe49d365eabe52e07035e108c815212bf0ee9de136bbf1f87c67b6e6b73a140f1e17ccf2df45e711bffa0d24a05fc02d92dea417ac4a8ac
 MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/sys-devel/bc/bc-1.07.1-r1.ebuild b/sys-devel/bc/bc-1.07.1-r1.ebuild
new file mode 100644
index 000000000000..fcd02f0f33eb
--- /dev/null
+++ b/sys-devel/bc/bc-1.07.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Handy console-based calculator utility"
+HOMEPAGE="https://www.gnu.org/software/bc/bc.html"
+SRC_URI="mirror://gnu/bc/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="libedit readline static"
+
+RDEPEND="!readline? ( libedit? ( dev-libs/libedit:= ) )
+	readline? (
+		>=sys-libs/readline-4.1:0=
+		>=sys-libs/ncurses-5.2:=
+	)"
+DEPEND="${RDEPEND}
+	sys-apps/ed
+	sys-devel/flex"
+
+src_configure() {
+	local libedit
+	if use readline ; then
+		libedit="--without-libedit"
+	else
+		libedit=$(use_with libedit)
+	fi
+	use static && append-ldflags -static
+	# Clobber any CONFIG_SHELL setting the user has forced on us.
+	# We should be able to delete this w/the next release as it
+	# should use updated autoconf.
+	CONFIG_SHELL=/bin/bash \
+	econf \
+		$(use_with readline) \
+		${libedit}
+
+	# Do not regen docs -- configure produces a small fragment that includes
+	# the version info which causes all pages to regen (newer file). #554774
+	touch -r doc doc/*
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
diff --git a/sys-devel/bc/bc-1.07.1.ebuild b/sys-devel/bc/bc-1.07.1.ebuild
deleted file mode 100644
index 1637640c48dd..000000000000
--- a/sys-devel/bc/bc-1.07.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Handy console-based calculator utility"
-HOMEPAGE="https://www.gnu.org/software/bc/bc.html"
-SRC_URI="mirror://gnu-alpha/bc/${P}.tar.gz
-	mirror://gnu/bc/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="libedit readline static"
-
-RDEPEND="!readline? ( libedit? ( dev-libs/libedit:= ) )
-	readline? (
-		>=sys-libs/readline-4.1:0=
-		>=sys-libs/ncurses-5.2:=
-	)"
-DEPEND="${RDEPEND}
-	sys-apps/ed
-	sys-devel/flex"
-
-src_configure() {
-	local libedit
-	if use readline ; then
-		libedit="--without-libedit"
-	else
-		libedit=$(use_with libedit)
-	fi
-	use static && append-ldflags -static
-	# Clobber any CONFIG_SHELL setting the user has forced on us.
-	# We should be able to delete this w/the next release as it
-	# should use updated autoconf.
-	CONFIG_SHELL=/bin/bash \
-	econf \
-		$(use_with readline) \
-		${libedit}
-
-	# Do not regen docs -- configure produces a small fragment that includes
-	# the version info which causes all pages to regen (newer file). #554774
-	touch -r doc doc/*
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index 1402f6560301..15e0b5050c1d 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -7,7 +7,7 @@ DIST flex-2.6.4.tar.gz 1419096 SHA256 e87aae032bf07c26f85ac0ed3250998c37621d95f8
 EBUILD flex-2.6.1.ebuild 1913 SHA256 ee0c9e6314da38de312f2884ac7fff9bfda1bf0de90cda2ec9cc55bb0969edeb SHA512 c0c4baca0a0e4373599be51d6490b46b25ef39d3fbf251a2bd531f438800e1f9dfaec839e9f8c72a66c1928896cfdb69fe52049ab1e1843d9c151ff21be0542e WHIRLPOOL 0b3c6734c549fd5d61ad44dce75d361e168564b793667282de63ca6fafdd7b7146ba4266f8bd65119844421e5563afc838bdc5e4b60dd2b814b12228afd138e5
 EBUILD flex-2.6.3-r1.ebuild 2061 SHA256 a71c37379d143e3abcb1f05fce3ffccce5877d8e17ad42bfc95a114f09058971 SHA512 d798c09ce136155b5e67b144d6eb3ac0e394caf0445678fa1e3e887f2c766fa6975fe2288b843a3f7ef6631193986621dcc2f4d46142ca73e693384d2f8b61e5 WHIRLPOOL a23f58c72c4d6ce243842485236db003198b89356a5e3b3a641ecf0dfe9841d813661b312dfbc597c90e9984e2d0df327b12726e50212f7516debdfe0740afda
 EBUILD flex-2.6.3.ebuild 1987 SHA256 ab00926b33bfb3998722f58731189312c0db1c6279f77573851347b02e6f1816 SHA512 54737594a12c82faf520ac12a3fe9d17b8b2658d9d6736ad25db58686250e2e97ef27c5341df96fa28ca78376f607d139ca6bea85f00ec5e8d52360b94df336f WHIRLPOOL a944131ecfc0e1e71ecf5bccca80e4b5e4bc5534a31367aa55ef2fd9830908d0777c6d00ced7057667689ebd26c98227accdc8c39400c478a492c653731afb9d
-EBUILD flex-2.6.4-r1.ebuild 2111 SHA256 7f384a46a51615d02f879730afa25f9369c0a5c66437488bf594d36128f1d4c7 SHA512 2121ed0c99196303041e8c5713ee43944c165bf5108d9c5fc02cebc12de5356af9a47c7b59d044804f35c64d9f3cdfe7778202b611382f359f097ca5bef42933 WHIRLPOOL 1edc2d0b159307ab73fade41a50fc83f1a560451bc611b7d7adb5b98c4706cf04efe6b481709cf010e6138e7fe9ac0727a7ffde6a679107b2156a7330111f94b
+EBUILD flex-2.6.4-r1.ebuild 2104 SHA256 3367f7dae61eb5311897fe6a9f96d2ba3c88da7d097cc8f40860eb1f0eb95c0e SHA512 41e02e21d5fac1e72dd8c8172547d0154053dacd2bfd44984f31ced40d8f552e82f488091427a860eab47e33a87928f8ef4d49271213ad4ba792c55a3263e231 WHIRLPOOL b67d5ffd064c6d044be1d7e2303e73f51f93a1389d1725d2d46641fec333d8a898c3f3551f665799f8acbfc79970e655e1efa0556b40679f5817223462f5c8fc
 EBUILD flex-2.6.4.ebuild 2026 SHA256 62707a253c137ef5f571a80e297e7607a7055b2ce2aa3efce719a2e2fc927b2e SHA512 4070f280ecf38f09cfd9210b41b5e42d12e2f4da06cf5db775c6738624016a3f58b9b2367b47f6b8a5b1d1b78730922b2c56582d5e93988dfd1edcb6b2e088cc WHIRLPOOL 9d0454152ecc9ef55073d38baf10537278b59f65d146877d14a05b9d744a6571143d7a464d0b16c27227d5cfbe33e047f2074bf268dc5e9dbe122ee8b3645ccf
 MISC ChangeLog 5656 SHA256 1d23877b1b816e90923b7e932f8e4d673e95d2ad3aa5db8814518f29623c6388 SHA512 4e09457657a237398e8b3833c7c934879686527059267cb59b17597ff84bc1a1a565b84f03c86583bbaa246d183a22570ea6627305e167c955cc1ad4db0f9106 WHIRLPOOL 98e7b57d707a18fd7fe5be6464fbedac1953d3beac9c6c251df9b4627da55b82c3c9f844a335645eab33534ed5710ded404abf035f5cf974e5f306181175e8b0
 MISC ChangeLog-2015 14123 SHA256 559935be9fec248b903e470b5e311f39e4e44790aad69495b78410e469604fc1 SHA512 673d316fb9a79bb40b7e241a2653009fecccabcefb7c159b078a31c4b8eac8755c8e404bdeeb3f4d871e6cef63faf7ece9e2b8625331a06f4c618349cf1102bd WHIRLPOOL f12d6b587e8cd44f7b17741da51db8213128f9a9a562d19aab872dba2b20e54e2ebcf35b74b0e195e1faf884c1abca0bc584bce66fceb14049d53606f691bce7
diff --git a/sys-devel/flex/flex-2.6.4-r1.ebuild b/sys-devel/flex/flex-2.6.4-r1.ebuild
index b221d35914bf..f7c6bdbb1b29 100644
--- a/sys-devel/flex/flex-2.6.4-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index d5726f886159..e4f5b1dd2078 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -55,19 +55,18 @@ DIST gcc-4.8.5-patches-1.3.tar.bz2 26025 SHA256 4a165e6a387421f581f49c742243bf01
 DIST gcc-4.8.5-piepatches-v0.6.2.tar.bz2 14265 SHA256 3a823af1b4c590076b95790614d49448dc0ee6ff0ace221f2dacd9033b58eac7 SHA512 cd6af4047d4719dae9dbe86ce5342c7d8ddec38aad032486713b08e1b0cb711f5ca017e08d583137d51b8d4ef673366ba310e71bca7b49b82e9314781d6e9d99 WHIRLPOOL ca1d0a9cb9abdfddd95d433b2f0424fd7cc9d514cf4c91fb266af4c43e26e0b3084adfae0eb5c998dbee83551e916dba3cf438b338f7e4ac1a133f06018e398d
 DIST gcc-4.8.5-uclibc-patches-1.0.tar.bz2 2976 SHA256 3654cc2bb47173b9d40650374c465a0798faab53be5ee4446389af1acd610a27 SHA512 5469128eab06525915c75241797ad9ec4b63072ebfd5e110319bf810633cf3fbed39bbda4f6a0c74e537b248e7642780ecbe2086ad10be6e66b7dd289fa6534f WHIRLPOOL d5e11a7d83d11455d84deaa464b8cde0865c730cc140daa5d7b0e700a79f188c6efba88b1c5704b20ede2dca701fb88cf581bada2f4352fbd0e0a5571c436612
 DIST gcc-4.8.5.tar.bz2 86165587 SHA256 22fb1e7e0f68a63cee631d85b20461d1ea6bda162f03096350e38c8d427ecf23 SHA512 47fdfeca0c0a624cdec9c4ae47137d056c918d5c386d4b96985bb3c8172aba377cb66cbcc30e80832fd244a7d98f562c20198056915c70cfef0977545073a8ea WHIRLPOOL 026253cd2f3706871dfe2525c0302b38b3f513f6a62666d0ba0ca2e62d6513f09ad5c1177f2a63ae3bad660fe60e7909b6930d26df2b367b9ec68e14552c6e11
-DIST gcc-4.9.4-patches-1.0.tar.bz2 22266 SHA256 1a394abb77c75e2212896ad3a62ae1f6bfd3660b1c176c608298733c740a00e4 SHA512 cc2407221f858bad38b57d31f635314f91794293695e23d255685d8bec20b9db19c7dc76bbf5e8184c2ba0ccb530958b09bae4d8a402ca27cadf463f46bfb995 WHIRLPOOL c74e5273c718020b591911d589d8eff5e366c902c479e566f966577efcbf424b19669a54843b2ddd60c51c81fd2851bc86aec1c647482b4789a518f01dd62561
-DIST gcc-4.9.4-patches-1.1.tar.bz2 21544 SHA256 9cf94727f98055f03e7ea240529f07a785fdab9dd353dd029113c53be75d9e5d SHA512 37ee209e03db97237e853ce33937c8f085ddcfcb44223d9299d493d0f3c2b275cb6048c5268a693a738fe6e2aa01435741809d8c45385b4917b41b6604e8e8b0 WHIRLPOOL 212cdb217c29469679f834a534b8b4ef80724c5515d12ebe32c2777e3840ed26a7dde3e88575a6815b45a537937e82973856170fd0e2274edf5da4e98c2ae8c2
+DIST gcc-4.9.4-patches-1.2.tar.bz2 25447 SHA256 a278642313473db7bf4f7f51985f21e4b45a9cf68cf37ba80ef6d355a82bfb57 SHA512 61b1e86e8dbc2838e7b5c88c4a3bab9ed5b6485258b7971799850ffd97cb67ad2564552af4e9ebc860dcc2a4b786c91d2079469468fb95f8e28e2fc981b4c812 WHIRLPOOL ea48877b970180e442b1808f3aca80b92148722640d257629026dc74b7c9b9791c3c284a47191c827f667b594dbb6f5d49075783e0eebb5a58ec28624a005093
 DIST gcc-4.9.4-piepatches-v0.6.4.tar.bz2 14414 SHA256 c67b56f04c653e6a19e36abed8391f8b6bed426bfcfc907237cc37f02dbb5015 SHA512 243fa272ea0e49f700a76508bab3e03bbb353bcb930581b2f87f9a47df5cd3880e29f20b71612b21190adc463849e1e6ac2a38a49c0002b562d93d436f538285 WHIRLPOOL 1e5959441210af6f690398efab96444ab11d136238a9428912e8441eaf0509fe6db359a8aca92a446fce0c75777385475af73b20165a8593f9969e3a25fd0b0f
 DIST gcc-4.9.4-uclibc-patches-1.0.tar.bz2 2618 SHA256 95f290d0b68114d835515afc424d6096476a45665671784aa71a7a506296e465 SHA512 5a1f44caa9261f4947101379628143869b31dec67fa28605e8e1f3894d4b7120c3f68ba6deb59da7a74fa906e27ab32cd3767761837dc3dfebc37865d349d6db WHIRLPOOL e46b08737cfdc235bfb80117e0389f3969167adf59bcba2a0a1094a20eab2b62f0c952dac44781e43957cb1507cd4e80f37bd8aecbc55dbda6382d93b3a4cf94
 DIST gcc-4.9.4.tar.bz2 90097606 SHA256 6c11d292cd01b294f9f84c9a59c230d80e9e4a47e5c6355f046bb36d4f358092 SHA512 93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe WHIRLPOOL e20045126c21a3edea1fa4a2185ec2bc5feec77ddf967ab9d1e8c33322ad4eafe013bfcaab1ed4e35971d3b70ef373ea3585ebb089c9bbf91bbfca1f1da71236
 DIST gcc-5.4.0-patches-1.0.tar.bz2 28227 SHA256 ff600369f150129754108322338c3f4f0064d222843a2d82778537f94a22ecbb SHA512 70cd83b142abaa3c22d67d5d58185da2cfa178737ec963e230cc03ea8dc6dc757665c711fae91af4cd91062d3136c6f31a5ee3c4c7440ed9485c6f3632731940 WHIRLPOOL 84a69d2dde582fd486f6c60f78ce9f8c7cc5b480c2989cc1804617eb6526a4a17d20d2ed010bd9fc78019d69caa665428970234090b21f9d4b97217011d4fcd6
-DIST gcc-5.4.0-patches-1.4.tar.bz2 28425 SHA256 039b88a939c3b90777fb94c58980cbcfffcdca4365db044dae0677302a4365d1 SHA512 c4922cf0f83cd3b6ed9c50ffb39847a03beb95031865d36d86ae48fdd912c0bd6842ad71a3b0d18a91786ed58e2e529630c6ccd2a0414a48892415051c70246e WHIRLPOOL 6d0a73cfb4ea387811bcd81b2de98a11e2f656a4df7ee5a887cd15d0a744662d85b22fcff86a6953f7c6bcc6d822333528de91b793191e72fe5ff2354deb7a97
+DIST gcc-5.4.0-patches-1.7.tar.bz2 32316 SHA256 5d7b5b135d9a411943521cd3c5c32f1fc84fe82c27a8fa378e0e1d437b71e46b SHA512 a9da763a19a616a70324721013cb6f1749deb20a5d1994273683ea43436f09a97b5e9898b0f605354d5c0310e23a8a7b8c8ccd28631cefc240cebf969f18657e WHIRLPOOL 5af43acb3206816ac4e1cd3c922755f784d77e54dc110aa040c0b0ea574815d8c1a9eb984bb9cdc2e20935c47a0dab027a3733974a1211223d48240560365eb7
 DIST gcc-5.4.0-piepatches-v0.6.5.tar.bz2 14551 SHA256 495eb9110244dac17408cd0eb6977a593577eeb0437e72b60339b8ec394f2fb0 SHA512 4890f0713d261982ab81a20f93c5f65193aa1dfa171e3f9e5867f0b80ec7c1e76c5a997b1a4e6f47f8ce36af54ac91125c5bff8bf6d971b7d77c65a57a40a3c0 WHIRLPOOL 13b74b1ca75cc94f9624fe1b52221a953962c918c2cb932302a3078b6deba4f3e501647ad8a2915edef6301e64c820ed612a6fbb9e1178cf1711fe0045686969
 DIST gcc-5.4.0-uclibc-patches-1.0.tar.bz2 3731 SHA256 a3145faa6c81c0753ba754b735834c38987c356dadaa7c4a625c738e374604b5 SHA512 009f34197e79c5e8c6497a0db01ac45cc657e92e56a663b4f3281661d108b2a129cd977fab5f0064f225d6812ae91e82bab22a2b10ae02c486881eeed85ec7a3 WHIRLPOOL a3598ce0aad7e9110db156005190739abc5b4ceea3c327cb9c747c4cf1b99589c1a9fac170aea346eae030b09ee563f9f990e031ad7dfa1aa19b895898bf2608
 DIST gcc-5.4.0.tar.bz2 95661481 SHA256 608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a SHA512 2941cc950c8f2409a314df497631f9b0266211aa74746c1839c46e04f1c7c299afe2528d1ef16ea39def408a644ba48f97519ec7a7dd37d260c3e9423514265b WHIRLPOOL ec81c8143e48bc8d9d0bbdc0fa3ca553c805193f53ac46c86127b54565894780dd97281485e396a130567464c753f043458c8e450018c957813f50ff90a40708
 DIST gcc-6.3.0-patches-1.0.tar.bz2 7596 SHA256 6c880468ffa4ad2b324fd18c762dbdf10646089c8ab865c228e166f99a0e049c SHA512 8fc96086bd3da3726687ee9d180d3b5d0a7d5814141d44eac8eb01566a783ec780c8fb8f55f75d6e9c9006b2e407e20cdb5835d541b0b66a47dd60642861734c WHIRLPOOL b1bce94d6134db6c9aff4298c6c7af003e39d0411aa40cd027d2c7d6a256971c81fb557e85b25f1107e9a474cb7d772c3bc62a7a4ab7ff7fca5eeae5b2ca0c94
 DIST gcc-6.3.0.tar.bz2 99903185 SHA256 f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f SHA512 234dd9b1bdc9a9c6e352216a7ef4ccadc6c07f156006a59759c5e0e6a69f0abcdc14630eff11e3826dd6ba5933a8faa43043f3d1d62df6bd5ab1e82862f9bf78 WHIRLPOOL e79a2d6ad199396b6efd835c1129d049a367174ea33dd3b6247d72461f117c2dd81e5a66f3dd6427ce500e768d3a4453efd0debcb56966d00c7df79d05d54b7d
-DIST gcc-6.4.0-patches-1.0.tar.bz2 7577 SHA256 9c9b68c28e67be281c9bcec5d944b2a3439bab953dce08fd35a65b10f9dae3cd SHA512 e649e334eec4deb7c261d808ed460413d78a2a4a672823d214c1e173a13bc314ce898fbf3674a7c7fe3151a089384ee0a7dee479bc8d005a06b65b39216bdf75 WHIRLPOOL d7d9a80038fb939c26605d91eda9bc23070179bdf6ce597255c44f9d83f2603aae91d9890d2a445bce8c682708743021485f1415cea0b9b8f02dd9d982e36d3b
+DIST gcc-6.4.0-patches-1.1.tar.bz2 10762 SHA256 19e1c07f87b34626ed0d73f73cfcdff7ca8f7abed172fc6832bb7b08ed5140a9 SHA512 5c2d5a227788e174d4d8d3c137d315a93ed5e1e6fcb9fb43b56e801fe63d973f25cf72ee8cd32752e98a9da17bd07064344c4299270d4b1992bdcb31682ae10e WHIRLPOOL 583bdc54b07da7ab9a9bf84f0fc66be2c1212f4dc9835f9bbd4a3474800246f82dc195f7b2ccd40077082ead1f8c57e02d54ba13cb779c30acfdc40fb1c6b0bd
 DIST gcc-6.4.0.tar.xz 76156220 SHA256 850bf21eafdfe5cd5f6827148184c08c4a0852a37ccf36ce69855334d2c914d4 SHA512 02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bbfc4bc527a863c0cccc025150a34740a9e29badb02d4b48e56a8aba90 WHIRLPOOL 136b282c6957877d2f463d83740fa65a4e7a346ac94e4baabea25cec41ae307f34409b1e518a22927821d564b8634a48978dc8e1d0b988999e924adcbf3f5cc9
 DIST gcc-7.1.0-patches-1.1.tar.bz2 6746 SHA256 39d4a0c659cc361bd3c71fdc9b793bccfa2bce06ede65ac49b805d1e236fcc8e SHA512 1bf95a505dc6c37bf6924bb69fd0670c8f3355b6690c94edf4a4248649accbd426575b40cb7a473dfb0ae09a924b05619e5c633384bae0293edb670cfd0d3a30 WHIRLPOOL 9682649fff62b56683637d25a58d11928342d99e52b2269f42369fd1d691208a7645802cb0d609ac30e20593ecdceb8cb1ab9b216963afe14db1b17ed43d5eb7
 DIST gcc-7.1.0.tar.bz2 84303533 SHA256 8a8136c235f64c6fef69cac0d73a46a1a09bb250776a050aec8f9fc880bebc17 SHA512 b5d952be9a10f0e0926bb2868877d10544039d6d2f35ba0a08f51231dd622a007650764a03e173194701467547789ad7d2d9cbc10adcdf118d619cdedbd14aec WHIRLPOOL 1dce5f89d4110bacd7f65140a1dee7b1a4898682e2ae8621832bda6f101354d226743acf77974b5e97d861c6eb6c47637138987dfb6ba222ad81b751e80ff6e6
@@ -85,12 +84,11 @@ EBUILD gcc-4.5.4.ebuild 687 SHA256 fa26996cdec3b8155e1ecd7329c6dd1e2f2094befba10
 EBUILD gcc-4.6.4.ebuild 768 SHA256 56a6a8c5a255751a41c2efbeba9b7f9fb144b68a257f0a7f136a769a840b5e00 SHA512 a9d6fab6be0914a0ece96f42da9e2c84ef9d64cb480d9374b01ea16679c65129b49e9439a17d2c898d1e1bd33b7c03513df5b7172e91e3e682d6c475e9972fd5 WHIRLPOOL 58e87d6d2f94e054163cd69acefe5727c17f2c04fcd47bb135fd6b62700270504f9969f2ed6ff574fc28e5ce0efda3b385d0bee9e8260dc1aa3e0401dec74752
 EBUILD gcc-4.7.4.ebuild 1291 SHA256 499c89b374e2fa9f4b205151cbf0e97f34d3d0d60577e2a1c685cedff7cd519e SHA512 ad60bbe91d92bde8b42c9c10d10d2ff9c36677b60da6447c4fde3205bd3e2bbdb3194c52b6e51e740a9af93b0d05dd8446f8f0fadbe6f8dbc9fadaee8dd5dfeb WHIRLPOOL ead07b80aea133bcace26288fd4ef1b656469caa8d23d6e0171bf994bb175d4709647a7eda380de3f1070760bdeaba5411e96e52ee4cf5b3cce17a3da7633b01
 EBUILD gcc-4.8.5.ebuild 1401 SHA256 222441bfaa3d89c48ca2ee4f61b9025b1a598a0de38f1a88707e7696ea9ff350 SHA512 d0a47534b4e2e35ad3296c87887307f3446421f4cdcb2d2aa9c3a3b5570af6c1597101e61a486994135577f1f693bb4db4ef91ec639ee6f274b843600029667c WHIRLPOOL b9efe4b12eff49c823d9056f9615670a42a759ce6ee44f0134c0d5d95de6c128682e118dcbdd242cb4434819eb48f312e5794966957d3c7a271595ae6ffe17df
-EBUILD gcc-4.9.4-r1.ebuild 1403 SHA256 8a245c1a153d11344b969988fe1d7ee60509214d0c503c24a44ca7cb5879885e SHA512 ed12b3bceb48d3ffbaabf78b1a8105fd12a8befcbdf7f53cac29d5b649b6634b8075e346ab0a8f57334612df3e9c9a16f02a2c5d73576bc7e1d77e3012e491f0 WHIRLPOOL 2815a24735cd7ce4b11c6f78af64b0f279fd3575d43bc64d9e8bc0aa87796dd51b1d6c592ce7931412839d47f43a19b7befbbf84219751c8559ff2c6f03af1ff
-EBUILD gcc-4.9.4.ebuild 1401 SHA256 e0e1fb3649a316acc5d923f574eff78cf0ce845150b7f6f909a8b88b05b9caf6 SHA512 7ab54058e656517bb9f35e52d71e46a30014efac3cbe338bc711d747dfd1eac863cc663f5ee750acbbaebafd43ac2a7eccaab45b59a622e349c7b23dd3f68ef8 WHIRLPOOL 25c1a602b93ee0baac613687dadc788a62caff176d8639be84deb3ec60e50ee937fccd6a4ae500a5ca30fd38ba67010988644e8c75be0b61f971f7ba1c1f3e13
-EBUILD gcc-5.4.0-r3.ebuild 1278 SHA256 4af47de7247fb1026c534c74343a89c8c3b1278ddfdbafb0b638782c3c6902c1 SHA512 8d12478fb764b7344e06e51a1d9ef805d9f0dcd39e372d328d30d915a1c85ea782270a17a2e9661c2ad6774783e3e0562345c6898339f0be3bd9aeaf8647b671 WHIRLPOOL e079881f85097da452290e5b4bdeb768c540c5b92885dea7d24b2f498480586e9ce8e21e67e909fbb85df134ffd2369472029ea2d5f81bfd1af68c6c808a7bbc
+EBUILD gcc-4.9.4.ebuild 1401 SHA256 59663d341e1d93e0de1e9466d03b90d1e2a1275a2abe0cb788710a37dff061d0 SHA512 dfce8e4d1da4a24523e87a05693f14ffeda307bf19ccbe520ef5a675b629aec1a2668d9ede7d5586637ec60a38562c16ce3547b3bd0b1cecd6c49690ce7a5485 WHIRLPOOL 18140fca80730cfcd365771f86216d7ab91ed0ed39628f6a42dfb1c3d617215b83ed1c5a17df5652ed90cde468e9e795393f8d6bffe167302a317f76cf8c3c35
+EBUILD gcc-5.4.0-r3.ebuild 1278 SHA256 fc446606c5917cb4f29eeb17218a374bb8f04b4b700ac38a686dd282f5b0e215 SHA512 0b51d9a3a8795b06c3b1f0096969413d73fb5b88dee9ae85ac499b1ba0dad77a066f740ab8873bad9a8ad1c3795af446dec9faa0c67d236f65958937b61583c6 WHIRLPOOL 7bb788dc6610fb07b3acbbcc75b22c6f9cbc25f523ba303932291b124dd08adec3922bf4deea8d8124150b4e53e8094ee32bde51f35e06aced003a746b3ba647
 EBUILD gcc-5.4.0.ebuild 1288 SHA256 cb4fa063c2289f850664f69d8f5d43806a462f6d2fa3b05eb2ef4f9d80d3c4ad SHA512 ab1e20e5bf90e89fe77cc5b764483913fd5add047ea02a8e8f12466733b1753820551ffd9332a89e1004a97ca40ef534b37464dd67f4f501480c4be9e0e730f2 WHIRLPOOL 2d6f3131b5ae5f9df712337e8cd7331cc33038be97be6cfb13eb5c526771044bb8c6c07462f183e97816a2da7759911dd221c518c53438fc9a915d49b4b20c9c
 EBUILD gcc-6.3.0.ebuild 536 SHA256 5af5aa7557154763ce558bfbc14e282d87a850583f82ad2ca5d482e51c3e279b SHA512 a01f1d52b881a6e87124a3de3cd062562ba4a561f54d3ec3f68d0732958f9c7d12df38bbe18b98bd4c77e005410f2065146dae83d2ff76018c381935f9b932f1 WHIRLPOOL 5c7cc0f33710a4ccdecd00213c40d10ecde1423fc03c8740aa0ca0f06ae83431ba81ee8e1da3e8f61dc3df3b892db9a7e02e5853d19670d2bf1a273ab9649c58
-EBUILD gcc-6.4.0.ebuild 536 SHA256 a986108b392d395ad7221265268b90429ac83a5372a299649889653583bda2e7 SHA512 65bfc8ec638ea5aeb02ea965e6d56ac86c14c09bdb32262ee7662564a13ddef52eb69a879f95ac53497b6164dd48885aefe8bfd77a793456b766016de985d6b6 WHIRLPOOL 7d06f130d074abee9a87c785f583812ae73db8a707ff0f82b2d3876e9e0f44c4fd2f7d80818b265eaecf9a464a4f8ca66a0555cfbdac800c1e1eccecdd64cd23
+EBUILD gcc-6.4.0.ebuild 536 SHA256 1034b5891316427ba6f535118e55f9324bb4e4566f76a1eb498d615d0814c537 SHA512 3f1974002f916d7ae5540b536c694fae812698d2a26dc60963354ac7f438434a98b59360bcf92fb641832c2e80963c1f39243fc024b210db737039f6078918bc WHIRLPOOL 18b05e196441f8fbe9bf4024e4e855f619e425fb75bd2c287074d1b757909d0b5ad6721959e5348e8af25fd8715f51af1460fa32052d4934d5f9d2b985f4a198
 EBUILD gcc-7.1.0-r1.ebuild 431 SHA256 2d02cb39924f325eacb9a7e3eed1f83f8d605720ea184f38dec214fffb045d1b SHA512 d7081aeafa29f5dd89cfeab4f596bc639c4e383d9c2e4d5a4e5ebcee7849fc0d3b3aa5f32d48f445d876efcea4f0751eca780d22482958c8670fff6a38e172fc WHIRLPOOL 3ffbb4975beb5f9a9251ebf7063211c399e194de474b5ea0cf38cfa2c173b612f69cfebf597165afb7a620133b16b275223ba5a9af6b531790d24448b04b851c
 EBUILD gcc-7.2.0.ebuild 453 SHA256 e738480b135ab3c4552370f47524dea701e39bbe4979fd001e2c8ef5c4e5c294 SHA512 9103d3b9ccb0366247bf1bfae187ae1170c5df2513c1008cfcdfd30880f0e71f0c4ed53f843ef630332378e22a66126042ae58d4d3a71c3aaa731a8aad446520 WHIRLPOOL 537c89fb244d6b12da043ec5ad57f45d95474d16c6bdee47a2dadd44b37f79f3d4c34dae6276f85d1d0349f5cc1f5159372cc3c157cf680301cfb8613d27f406
 MISC ChangeLog 12968 SHA256 a5bfaa87cea2ee1db7c9d2063bafd106abd89290d47c32cacebac76ce42aeead SHA512 67579e419cc3740201dea77ef46dd2dfc9c7109b9c44a220f36093a18f03f338d91496fd02a55715c66ca9dbc24b3125d866f2dc97226ca611356cb25b22c8be WHIRLPOOL 9b58f80d70b5971697f2d7dde838d25d8e24f4920abc55b3b1765adc42937b13059e52fb5233eedf19d47b4ab66671c0adae7b81f4e3dd0e3292ca87d4e4f14a
diff --git a/sys-devel/gcc/gcc-4.9.4-r1.ebuild b/sys-devel/gcc/gcc-4.9.4-r1.ebuild
deleted file mode 100644
index 74b2fcf50106..000000000000
--- a/sys-devel/gcc/gcc-4.9.4-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.1"
-UCLIBC_VER="1.0"
-
-# Hardened gcc 4 stuff
-PIE_VER="0.6.4"
-SPECS_VER="0.2.0"
-SPECS_GCC_VER="4.4.3"
-# arch/libc configurations known to be stable with {PIE,SSP}-by-default
-PIE_GLIBC_STABLE="x86 amd64 mips ppc ppc64 arm ia64"
-PIE_UCLIBC_STABLE="x86 arm amd64 mips ppc ppc64"
-SSP_STABLE="amd64 x86 mips ppc ppc64 arm"
-# uclibc need tls and nptl support for SSP support
-# uclibc need to be >= 0.9.33
-SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
-#end Hardened stuff
-
-inherit eutils toolchain
-
-# KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.8 )
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
-fi
-
-src_prepare() {
-	if has_version '<sys-libs/glibc-2.12' ; then
-		ewarn "Your host glibc is too old; disabling automatic fortify."
-		ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315"
-		EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
-	fi
-
-	toolchain_src_prepare
-
-	use vanilla && return 0
-	#Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
-	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
-}
diff --git a/sys-devel/gcc/gcc-4.9.4.ebuild b/sys-devel/gcc/gcc-4.9.4.ebuild
index 55295ab2500e..e7562f2330ad 100644
--- a/sys-devel/gcc/gcc-4.9.4.ebuild
+++ b/sys-devel/gcc/gcc-4.9.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PATCH_VER="1.0"
+PATCH_VER="1.2"
 UCLIBC_VER="1.0"
 
 # Hardened gcc 4 stuff
diff --git a/sys-devel/gcc/gcc-5.4.0-r3.ebuild b/sys-devel/gcc/gcc-5.4.0-r3.ebuild
index 3c46a24c73af..57f68f45b0d5 100644
--- a/sys-devel/gcc/gcc-5.4.0-r3.ebuild
+++ b/sys-devel/gcc/gcc-5.4.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="4"
 
-PATCH_VER="1.4"
+PATCH_VER="1.7"
 UCLIBC_VER="1.0"
 
 # Hardened gcc 4 stuff
diff --git a/sys-devel/gcc/gcc-6.4.0.ebuild b/sys-devel/gcc/gcc-6.4.0.ebuild
index d57181534e88..6002afe6b4f2 100644
--- a/sys-devel/gcc/gcc-6.4.0.ebuild
+++ b/sys-devel/gcc/gcc-6.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-PATCH_VER="1.0"
+PATCH_VER="1.1"
 #UCLIBC_VER="1.0"
 
 inherit toolchain
diff --git a/sys-firmware/firmware-imx/Manifest b/sys-firmware/firmware-imx/Manifest
new file mode 100644
index 000000000000..c73603076d12
--- /dev/null
+++ b/sys-firmware/firmware-imx/Manifest
@@ -0,0 +1,3 @@
+DIST firmware-imx-5.4.bin 429744 SHA256 c5bd4bff48cce9715a5d6d2c190ff3cd2262c7196f7facb9b0eda231c92cc223 SHA512 0c9d6e80a67d15518212573dbfe8addd6c7c5c8065f077bb58f6904c6d288c718d0b3dc4ed4735941d22bc9116a4986fb268327e2c1adcc6523ff84fa93c6b64 WHIRLPOOL e510282354ea6106ab1da31f092f7284e46659e2e738a4b4af70bfe08612211db2aad2b04e00906ea1c381a300c5533eb7114414252145da576490c2ebcad946
+EBUILD firmware-imx-5.4.ebuild 652 SHA256 ba1af8bdc6ba5b6e68ceb4c83c5432581c9ff78cd6b1535d416c6144a8e951eb SHA512 49ca76a3820c53fe967026252970c47aa88bcf55df8b419be236a39aaf3dda94ca790a68251ebc9cfbde4a84730fecf0612e017c95215b2e19913b2e1a382925 WHIRLPOOL c28dc3d5344a2e30bc6f461d4eafca462b9843ca7ec3bb1b5bde902d745c24ed020e683f5f16d732a8c5574b247c36f321dd3df7fa48bd977b475107420fbef2
+MISC metadata.xml 247 SHA256 ee828a9141e646a9c1c42d5f0ea4f31807410e14cd4f4c2f7e4351a24f633bf3 SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc WHIRLPOOL 54721aa5d20b5dceca174ad43a642c6f24c0ab2dedeb5cffa226f80368c35c1a424d2ffc03ee7a1adc1680904d604380428c7c792f54e79d2f26e34005973054
diff --git a/sys-firmware/firmware-imx/firmware-imx-5.4.ebuild b/sys-firmware/firmware-imx/firmware-imx-5.4.ebuild
new file mode 100644
index 000000000000..ddd2096e89ce
--- /dev/null
+++ b/sys-firmware/firmware-imx/firmware-imx-5.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="NXP i.MX firmware"
+HOMEPAGE="http://www.timesys.com/"
+SRC_URI="http://repository.timesys.com/buildsources/${PN:0:1}/${PN}/${P}/${P}.bin"
+LICENSE="LA_OPT_BASE_LICENSE"
+SLOT="0"
+KEYWORDS="~arm"
+
+S="${WORKDIR}/${P}/firmware"
+
+src_unpack() {
+	eval local $(grep -a -m1 "^filesizes=" "${DISTDIR}/${A}")
+	tail -c"${filesizes}" "${DISTDIR}/${A}" > "${P}.tar.bz2" || die
+	unpack "./${P}.tar.bz2"
+}
+
+src_prepare() {
+	default
+	find -name "*.mk" | xargs rm -v || die
+}
+
+src_install() {
+	insinto /lib/firmware
+	doins -r epdc sdma vpu
+}
diff --git a/sys-firmware/firmware-imx/metadata.xml b/sys-firmware/firmware-imx/metadata.xml
new file mode 100644
index 000000000000..54be7ff7e5d6
--- /dev/null
+++ b/sys-firmware/firmware-imx/metadata.xml
@@ -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>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sys-fs/bindfs/Manifest b/sys-fs/bindfs/Manifest
index a0b989ddb4a0..e94a80c4d3ba 100644
--- a/sys-fs/bindfs/Manifest
+++ b/sys-fs/bindfs/Manifest
@@ -1,7 +1,5 @@
-DIST bindfs-1.13.6.tar.gz 374840 SHA256 3c654c2d5d9780189b87b19002ecdeb32d97914481f5f1f841f7585700f8df97 SHA512 d6c1845edc160419d50283995602cabff204b41d6116d89ffba4a7153482e803cacc45ae95e2e9b13c798b59a32aa4016a2b00cc51db1a5f6b720f09a97b87f1 WHIRLPOOL 392f16dfd024eb777db5dc9b103fcac313c848a7bca43bd8d35c990c089d6b45c2ebf9819ccb619029ae7b7bf15cd27f9381545133193d11f9a0e8707a445ca3
-DIST bindfs-1.13.7.tar.gz 398511 SHA256 09a41b32db5ef54220161a79ffa4721507bc18bf9b3f6fcbbc05f0c661060041 SHA512 720fa089dac56b316240c1c8ee3958961d82dee6788b272ec9b22c222d28d03695f9ab8c35759f303298afb5c04da58e20214dbd9147cbf414a6a9c3e5882712 WHIRLPOOL a63cf7666a0ec9c1b393663fc63c16bafda968e5be7ae768bdd4b627e0bb206f9cffde749b96e86e22f5586bc3085321d97f1b7bfd501ff7e96f33e1453ddcb7
-EBUILD bindfs-1.13.6.ebuild 477 SHA256 bd8fd78d88ee990eb8fc5d4aecb568b2288d1b61712a8d14d915e9387bfef4fc SHA512 8b5108191ebab25223e104b910a7dd764bb37f3d8da0fe36e81cf6949be124634a2c9e6c7ec94600231b26a8e8ef0f7e9dc7be2bd4873774842da031c935cd22 WHIRLPOOL 604fe190cdbe3520a46a39882eab2e9ad38c767b97864a13c501620a31e30817f16d507c7e1bea2135a255ee41e2d53e58b5a330ceba026a4585cb574c8c82ba
-EBUILD bindfs-1.13.7.ebuild 477 SHA256 bd8fd78d88ee990eb8fc5d4aecb568b2288d1b61712a8d14d915e9387bfef4fc SHA512 8b5108191ebab25223e104b910a7dd764bb37f3d8da0fe36e81cf6949be124634a2c9e6c7ec94600231b26a8e8ef0f7e9dc7be2bd4873774842da031c935cd22 WHIRLPOOL 604fe190cdbe3520a46a39882eab2e9ad38c767b97864a13c501620a31e30817f16d507c7e1bea2135a255ee41e2d53e58b5a330ceba026a4585cb574c8c82ba
+DIST bindfs-1.13.8.tar.gz 403296 SHA256 7e7fcf070345d8cbb45186384e0aaf3e3a6375031d7a4f9533dd5d784c32c358 SHA512 b0755ad5b91cd047942094d824c6a12a684b1c8bc990f4a28170a09283c0b11ab4d8c86ca65160802610e72f1c649d7249ed87e3e29410b210271c45b6846c11 WHIRLPOOL 126de73a739fdfea7d2b4c4ca6b247940cb68a4e00413a613c542e7c57005f1e0785689c599f43f5d82db24cfd7150912f6d87ff46b44469ae3a9155a1c8b805
+EBUILD bindfs-1.13.8.ebuild 479 SHA256 e512e7da26a5d2964aaf4eb7a95b270a9804e4b1b5acbc494baf740acf569c77 SHA512 c3261686c14c4a03d7442c6e2352e666cca1ae6b793e0437d1373c52cb67e7387014a969e36ad23cf9008058ece8395e5019e7c587255fc26890faa75aa376f9 WHIRLPOOL 0130221b713bfd8482cf2ab36cc3d489787364a55946698c98977a4b25940daf10460d82f286971f461fb765e9d6013a2d9554198fc69ec7b0ac34fa78574d6b
 MISC ChangeLog 3509 SHA256 9b2a82cbc218b91577d8bd54c8e4c3e6fbdda60e559c5570765a54a5471dc0d9 SHA512 b0ea9cf0df8edeee77a509b7d595fd34759de953cbe6e925771643092a40334f0a714a17e8e54e4799ad5277a9af462272bc5cb261d5748363fd23b51ac555bc WHIRLPOOL 18460dbb6ed5b279198d8a013f519504e6bf5b3c847a3ee17c13e8cef49aba504b5a630fc24be1f6c9dde14be5c5d9696d5f2fc58f3d35edf74e37aa837b33b4
 MISC ChangeLog-2015 2571 SHA256 a8258720a6224cf8035c13a9a8837c175920b538f1f14ef446a0e63abb8e3279 SHA512 a7f787f141c45427b0ddc5f6c6889f12688297cfe701f4848dd605dd8a4114cfb6cc40d9afff343fccf65c19ac665d6c249035b0a72f9299e9d3dc0372e0701a WHIRLPOOL aa0095490e734985d9e7154347a250567a681126a50751c737eba3ed2e17c53b3c0b85accbac89f2a1cdf049623db9a9f2795ed37821513b54ea4eec60a8ccf9
 MISC metadata.xml 432 SHA256 7682a8feb729dbbea363fe780910ece1131973ae5c7a08b368d7c4421d0a4c51 SHA512 1d22b2bad552a622edcebc9b52823a812f483588257c379077e1cc323bfffea67ed2802a3f62c9264cadf355ae3f96ab4705d005286c598f25447efe813fb06c WHIRLPOOL 417d865acc810542b0af6b16a71fb5edcad9797dc171beea07ca26dbab0b0b84f3997692cf0cb8703571c269924f7f210b11c5f1768c5e2cc921f693c45adf34
diff --git a/sys-fs/bindfs/bindfs-1.13.6.ebuild b/sys-fs/bindfs/bindfs-1.13.6.ebuild
deleted file mode 100644
index e8f1bd439eb8..000000000000
--- a/sys-fs/bindfs/bindfs-1.13.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="FUSE filesystem for bind mounting with altered permissions"
-HOMEPAGE="http://bindfs.org/"
-SRC_URI="http://bindfs.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=sys-fs/fuse-2.9"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-RESTRICT="test"
-
-src_configure() {
-	econf $(use_enable debug debug-output)
-}
diff --git a/sys-fs/bindfs/bindfs-1.13.7.ebuild b/sys-fs/bindfs/bindfs-1.13.7.ebuild
deleted file mode 100644
index e8f1bd439eb8..000000000000
--- a/sys-fs/bindfs/bindfs-1.13.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="FUSE filesystem for bind mounting with altered permissions"
-HOMEPAGE="http://bindfs.org/"
-SRC_URI="http://bindfs.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=sys-fs/fuse-2.9"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-RESTRICT="test"
-
-src_configure() {
-	econf $(use_enable debug debug-output)
-}
diff --git a/sys-fs/bindfs/bindfs-1.13.8.ebuild b/sys-fs/bindfs/bindfs-1.13.8.ebuild
new file mode 100644
index 000000000000..29e8f2b8b808
--- /dev/null
+++ b/sys-fs/bindfs/bindfs-1.13.8.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="FUSE filesystem for bind mounting with altered permissions"
+HOMEPAGE="http://bindfs.org/"
+SRC_URI="http://bindfs.org/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=sys-fs/fuse-2.9:0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+RESTRICT="test"
+
+src_configure() {
+	econf $(use_enable debug debug-output)
+}
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 0eef3f2b2056..f608332f53dd 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -30,7 +30,7 @@ EBUILD btrfs-progs-4.10.2.ebuild 2196 SHA256 ad1e36ffe7bc55e7839a539fd1438d7b994
 EBUILD btrfs-progs-4.11.ebuild 2201 SHA256 2bbee37700101d8b7a4decba322c433c3d35304bb0b2289c036e48dedee553a3 SHA512 51c6ab63b8cb3c0d6c99eec8412136a51788307c53eacbef3a81045b9cb093b9aa1c7cf9c2422d66bbcc9b714981927cac681c9838b5851d3311a3d9d2e4e6c4 WHIRLPOOL a7fbf25f98bf4d6aa9e354b87944439f23826fd3ee1b06943c46595963b1ad9a9e8b187c0a0c12a8a28fcaa7397eb336e651696ecbdffefb6db5377b5bfe1bb4
 EBUILD btrfs-progs-4.12.ebuild 2201 SHA256 2bbee37700101d8b7a4decba322c433c3d35304bb0b2289c036e48dedee553a3 SHA512 51c6ab63b8cb3c0d6c99eec8412136a51788307c53eacbef3a81045b9cb093b9aa1c7cf9c2422d66bbcc9b714981927cac681c9838b5851d3311a3d9d2e4e6c4 WHIRLPOOL a7fbf25f98bf4d6aa9e354b87944439f23826fd3ee1b06943c46595963b1ad9a9e8b187c0a0c12a8a28fcaa7397eb336e651696ecbdffefb6db5377b5bfe1bb4
 EBUILD btrfs-progs-4.13.2.ebuild 2477 SHA256 e2d092311230bdd4b94deed96c0c120fef4ee80c36f4de6d991234da3083bdf0 SHA512 c6309b90e764b71c40d7beb29086faace1b144a748385a83be472c251c354f5d95399c56e56615d530330f2cd1804c70b98d6f8968b63b89026fee5c9372c3ce WHIRLPOOL c72d75ee9d2bfab5ef11671b14f89cd0caeb53ae24bf7431ca4fc159731721a8dd1d062ed830b18dce5c74feeac8869275673da68c3bb2e2447a0f4fb98063aa
-EBUILD btrfs-progs-4.13.3.ebuild 2477 SHA256 e2d092311230bdd4b94deed96c0c120fef4ee80c36f4de6d991234da3083bdf0 SHA512 c6309b90e764b71c40d7beb29086faace1b144a748385a83be472c251c354f5d95399c56e56615d530330f2cd1804c70b98d6f8968b63b89026fee5c9372c3ce WHIRLPOOL c72d75ee9d2bfab5ef11671b14f89cd0caeb53ae24bf7431ca4fc159731721a8dd1d062ed830b18dce5c74feeac8869275673da68c3bb2e2447a0f4fb98063aa
+EBUILD btrfs-progs-4.13.3.ebuild 2495 SHA256 604990f45fa2623938f48d995fc9fc2cbb9850d58d830bf76527e124b721ed3a SHA512 e5a754028dc9c068c69355444560910c338674024425ba3ecd1fe8355b7be8a9e2fdbefe84263bf1ebda8cb44a38cc607e1d8f735297453bc2ca204a257c7a10 WHIRLPOOL c608cdcc22d51ffcf846b01aa914b0d3fc574c2fde6e377d8ee062ac53d84b752fe6efeb0ca29d60f80e8a94c44da4043893ce60af94eed3c1c27b2ebc684f0f
 EBUILD btrfs-progs-4.2.2.ebuild 1891 SHA256 4001d1a94da1c6c8aa967fa5049f0eda7d8c96b35dc54671eca649d2a1d6ff49 SHA512 9f0771068eae7ec9bd54545d1f7d1146e9c1a221599dacb40c15106f73ea15bded433adc13dda8d2f7e302b2b4a989fd3a4442904ab222901eab70652e43d28c WHIRLPOOL 6ec33e86a895b1ad7aa54566e106e620c1f7a00f6fa34fdff23c2fd21ed514d759833f9591c093c45e17a70e8d7770cb64b3231668950b966f664290e3c249ed
 EBUILD btrfs-progs-4.3.1.ebuild 2260 SHA256 16bfad2751d4276db96b21621817d4920a7e2428199de538d155156b7da27ed5 SHA512 8e435e7c541dda1b45e1a0ea4af82143688101bcf5cc3afc83c38429f2c300420bc72f56460dd237cce1cda7c0c84de8fa552cac4b2fa6d5052f7388b5041727 WHIRLPOOL 8de6f8974b685f700318f7155b5d2d1b77dd821e089d328638383c66463efae0f9071b41c3153eb6536ddd7bc14d0da0077760d3fbb18842699522be379cbdb2
 EBUILD btrfs-progs-4.4.1.ebuild 2233 SHA256 724612f14dcf1201b8ee80384de93c4dd67145b27d32e34900fa20d75861bbaa SHA512 85038dfcffd849ffdd62239f275e63a2fc4ce693c140c598c89f3dc19c92fa5b72c61fef27192d46853f3bcf828aa7efb34e74949acbd919cb358e1a20654dcd WHIRLPOOL 22e9b8c8e85367d49f338ca80507ac5757a9e8150640b30160f9c209650af6a87cde4dd9f34528b12b1e53029ab7544a82c6ce7bbbefc5ba52b46f60845e2933
@@ -39,7 +39,7 @@ EBUILD btrfs-progs-4.6.1.ebuild 2196 SHA256 ad1e36ffe7bc55e7839a539fd1438d7b9944
 EBUILD btrfs-progs-4.7.3.ebuild 2201 SHA256 768b646d1ffbb970bfcdc32116986b06a58455af3a27f7b354346c493ee3e9e2 SHA512 a2506e9d43d8b408d5d16bafdbfabe4f5ca6861a77e079dad62580418680a34dfb7ccb7ba847b1f05accb8afb8e624c5aeb86a940f354250dc8006884d9a47f1 WHIRLPOOL ffbf60d1effd0a1a901540307e27e91c23afc4603b4ff5762860d5e0af137bd05bcf99d11f74fa527e4a33b9b3f05af4446723ceb10462c2386e6f765aaa7716
 EBUILD btrfs-progs-4.8.5.ebuild 2201 SHA256 768b646d1ffbb970bfcdc32116986b06a58455af3a27f7b354346c493ee3e9e2 SHA512 a2506e9d43d8b408d5d16bafdbfabe4f5ca6861a77e079dad62580418680a34dfb7ccb7ba847b1f05accb8afb8e624c5aeb86a940f354250dc8006884d9a47f1 WHIRLPOOL ffbf60d1effd0a1a901540307e27e91c23afc4603b4ff5762860d5e0af137bd05bcf99d11f74fa527e4a33b9b3f05af4446723ceb10462c2386e6f765aaa7716
 EBUILD btrfs-progs-4.9.1.ebuild 2201 SHA256 2bbee37700101d8b7a4decba322c433c3d35304bb0b2289c036e48dedee553a3 SHA512 51c6ab63b8cb3c0d6c99eec8412136a51788307c53eacbef3a81045b9cb093b9aa1c7cf9c2422d66bbcc9b714981927cac681c9838b5851d3311a3d9d2e4e6c4 WHIRLPOOL a7fbf25f98bf4d6aa9e354b87944439f23826fd3ee1b06943c46595963b1ad9a9e8b187c0a0c12a8a28fcaa7397eb336e651696ecbdffefb6db5377b5bfe1bb4
-EBUILD btrfs-progs-9999.ebuild 2371 SHA256 90f6faa23f0989920e0e01ca883e48496c9668089c8a47fed4c900c4a6b1c55a SHA512 24fcd4ca44a53c2049cca61b71bf2d773b746c2e162e0257b61c5794da644a5d437f67e51555f8089b843ed072f1162fb13a826279af3a8d8b68fedb8792338c WHIRLPOOL 4181ef89a00dd868e38a6f98fd815f788f77562bb4031ce54801e4586a07f7cf226d1476bdf2a8a41c2580dec723ba190c4f935644698a68e31937bceee60d5e
+EBUILD btrfs-progs-9999.ebuild 2389 SHA256 0bcd778fc8621df8cd08ded2e045f1f48f7726501a1d3185d0262042486d3a77 SHA512 e48fbe435e195718a5ff8e129712512c8c3627e8aca8a1217e691fdcb2d6933d4f08d368cb3b6332e2fdca2a9b1da38517b14142cb33b435f8e200580e5c432e WHIRLPOOL f284db70f35c2e961550e1d36d51f3e37e44a71d7e5ac7e1af237a921202b43a7094340484352958c41d50ad6caab41a15b7cd25ff0c3c5caa325c48effda863
 MISC ChangeLog 11132 SHA256 0c54d2a80dd689f3762685e94ab550f2a27d33ae432435303b9e19b909950475 SHA512 4da361f70e00cf63b34d50d54002d4a3bdd49831f758edc6e989a56e0f4d7b3b13c3e4ed0783f60392826d9e940834a502c1a45289022779529a761b5d82c615 WHIRLPOOL 5f6dc767533b1481f78f62ceb5f22df87ea7f29a28196f388e1371e0cc7b61578cc13aa575e1241d6635a5f549208555ab9852b7c402c854b5de44dededf3dd2
 MISC ChangeLog-2015 17405 SHA256 afad43040420e659470f318b069c989d976b5027c7d0c95ee1fcf4cdfa8990f5 SHA512 bfebbcfc924deb8808fbd11221add329eb01a20675d5c10b7a7a63b7ca7287922601f9b2a213f0832efd1cf2bfb693a1b172459a340b447982517f0e303bed79 WHIRLPOOL a296b422cac0a9e5192bd908b4a670942173f6dae0f85e8a217670ad670f2b9c126fded68b3eac551d8a3d15d58f6683f012006165a8a39190567d2f8e0b79cf
 MISC metadata.xml 748 SHA256 f2482b54b3408480cd046e7b28b201bb120b2bc0c77c8babe8de887372e4a35e SHA512 d3b36335634a238796c3df519a7007602066f4cf44db1ba44889edfad2bb122871be46c9e687d0b331a1d06f3e6876f682e620b34bb2e746c28707720578a9c1 WHIRLPOOL d8b044c1df2b40ee9c862d5513f59d9bd9b2be18f33edd803d8f009dd7e3b7dd52886a0d04777e66afe34d064afa9050cdc501dd9ad0c9d1e68bb9be8161bc22
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.13.3.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.13.3.ebuild
index 0dc40a977f4a..d869f6e5b516 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-4.13.3.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.13.3.ebuild
@@ -36,7 +36,7 @@ RDEPEND="
 		sys-fs/e2fsprogs:0=
 		sys-libs/e2fsprogs-libs:0=
 		reiserfs? (
-			sys-fs/reiserfsprogs
+			>=sys-fs/reiserfsprogs-3.6.27
 		)
 	)
 "
@@ -53,7 +53,7 @@ DEPEND="${RDEPEND}
 			sys-fs/e2fsprogs:0[static-libs(+)]
 			sys-libs/e2fsprogs-libs:0[static-libs(+)]
 			reiserfs? (
-				sys-fs/reiserfsprogs[static-libs(+)]
+				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
 			)
 		)
 	)
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index 49ff5c4dffdf..75f377d2505f 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -36,7 +36,7 @@ RDEPEND="
 		sys-fs/e2fsprogs:0=
 		sys-libs/e2fsprogs-libs:0=
 		reiserfs? (
-			sys-fs/reiserfsprogs
+			>=sys-fs/reiserfsprogs-3.6.27
 		)
 	)
 "
@@ -53,7 +53,7 @@ DEPEND="${RDEPEND}
 			sys-fs/e2fsprogs:0[static-libs(+)]
 			sys-libs/e2fsprogs-libs:0[static-libs(+)]
 			reiserfs? (
-				sys-fs/reiserfsprogs[static-libs(+)]
+				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
 			)
 		)
 	)
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index dbbbf062925d..dfb00bc9fc77 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -11,7 +11,7 @@ DIST e2fsprogs-1.43.3.tar.gz 7405892 SHA256 ce8ef1bbb0d4730f170167284fda156ac9d6
 DIST e2fsprogs-1.43.6.tar.gz 7466907 SHA256 233d70ac434cdfba792dc0f83944c0ec854468d604fb22325ae65c4adfc90239 SHA512 95e3e7def177de921d3204aeace4cb8243d79872468d3289cace0547798c84e92af253022deb803cd8c045411283b01431728a86b14b9e8b45cdd5dca739db66 WHIRLPOOL 862769b1775d87297c30a242a2578971435115ebf381156f0c16078a2ad0e19f03e8af41c93d00d6324a11af6d4cf333b0a1a8fe3eee76fcbb47fc825f3481c5
 DIST e2fsprogs-1.43.7.tar.gz 7492811 SHA256 87035f2eae8da5f9869f78ffc177969b4e3cf75a5da489521c1ffe4268e1a1c4 SHA512 71694c57d076517f6e1f2a5bffcbc49c32fcf11283e26739304f50ff0aae28646ea7af80dc85b636b87db57a0042a5bce82411e631f7d5c055440ebeadb90282 WHIRLPOOL 5fb000e6bbd4770c0361976c4b3d4874c91b005b5e9c0dad108fe428e56a147361d5d265abd8db4605819eb771740b4a362885cb76bf5661f815a434f3bd9a3a
 EBUILD e2fsprogs-1.43.3-r1.ebuild 4040 SHA256 8eda4767977a467c700bd79f9b4b1b70ccabf76b007db75498101fc6edfe977e SHA512 5053ec14ad968d6f4f8bb0cf0a227c0f56af71eaf0201fe7d53448c962f6f097aeb92b561381194aea58f5d3d99421d455ad50f280413d83ada6b281e1361c9c WHIRLPOOL 278072ab829a9e9ea8810b98d70f43211ab71b187b3500b0c9297ca337a308f1eecc6978ffe685da06988debe2059301b49cb7b67b035b977a200a5fe35d1c7b
-EBUILD e2fsprogs-1.43.6.ebuild 3797 SHA256 55cea522eed915628a3573e46ab4a809f2b668324128725ea45da1c5f41a783c SHA512 355548d7e13cb1eb8f59072c364f9a0d6fc5d0fa85298d9b792da2de476d5d747a713d3b27cd1eb141eaa219c7dad068e776de307332dc325cca95194d864dfc WHIRLPOOL 4319f380382373e16f30cc73968c115d9e62ab0c39c69c8375f9b29f6a2cf10bf8f3d6eff93a86b7bb84015f238ef3f00137f77bc00b67c3c3c6bc5b9bb2eff2
+EBUILD e2fsprogs-1.43.6.ebuild 3795 SHA256 19b2484da2ad88ed9ee9c3a7c696bff3a02a6d770a492b41889f4227e5a0a9ae SHA512 29eb3cc85465aad990fc576bc574dd1c9ab8cecb485f7359b4c19ac1f77315b7fdf6b2d907022e564056a79ececcdb1e40942c3440d79a0d4baa45eb1918bc04 WHIRLPOOL cf01cf9dbf425b1789aabd2f8d788322053438c99a87cd1d8b5ed739ab3d746eb87466f8eb1ac100fe9d2bebd0985c5fb96b701637eb0453292630f216929f70
 EBUILD e2fsprogs-1.43.7.ebuild 3803 SHA256 25d55af84a2f9710128989a2d3882bac946bd1bef23e4027494f0fc6af5b91da SHA512 5ede2280b2d42c18e14315654f6dc092b02b757927ba1a4973417f514b6dc66f506dec85e69f1a0c00e177a3950b74bb42fe0994d15a50c2c83455cb7baeb7d9 WHIRLPOOL afd8d04b1ccef5a2b532b18992bf609844fb4fb52b74e1c3b5f67677d217d095f20389d089e447af4dd2f9f06a97a390123d1633b17e3dea23533dd985cc714f
 MISC ChangeLog 7643 SHA256 c0cf2dd26e491ad39b3f867c0bd9296e10749d0f1838cb7cec65ba1d15e5956f SHA512 f46d87e5a695385f4642bb03316ceb7b622461d938c3af2c5e15836a07384cae7a573c86750217c3d49bf00b870187c248aaefa2bac1e819a6b21ae9e7f4b2cd WHIRLPOOL 0fe755f687bedb25e32f4d6050f77e6dcc4179e24211589fb6c10ceef98ad12e3bc2733a86db9de11bdaf618cf290901705fe947b30c87bab719f0182e44a036
 MISC ChangeLog-2015 48117 SHA256 fd49ccd4dc8e7a53c8cba64fb936f960ee7c58fcf4150485321b23475a193f84 SHA512 82134fcce2aaa6bf15f3339b79b657b4e0827a132cca8c89a6521f7c6bc1246d3d55cd46d6c9adbd5b3e6f458e9f4e5e267d10f4c9929f15c9cd985949f5ee85 WHIRLPOOL ed9f1377d27424101d492f92a515cdf60f723cd6f519ea8a82b16d46ec86c7f297b8224b6d2833c83a6ca5e4c6f2140e7155beb1ce0d45f503debc51d71b9db2
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.6.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.43.6.ebuild
index aa4cc5bf6242..7018ee1033f1 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.43.6.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.43.6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint"
 IUSE="fuse nls static-libs elibc_FreeBSD"
 
 RDEPEND="~sys-libs/${PN}-libs-${PV}
diff --git a/sys-fs/rar2fs/Manifest b/sys-fs/rar2fs/Manifest
index cc4f350b9520..e2497006c6d6 100644
--- a/sys-fs/rar2fs/Manifest
+++ b/sys-fs/rar2fs/Manifest
@@ -1,5 +1,7 @@
 DIST rar2fs-1.25.2.tar.gz 257550 SHA256 57bb77e3de9fb9376c6b95d139ec9b1c9e20cf7326a6d627f1480d07076e1ff4 SHA512 10fcf2db037bde467781ae4c9b0b1ee95422a9b80f4d3f4643c2660b0a17dcd041eb111330c345f8759adbad7ef864f8ba108a106117adabc836d782becf7bfe WHIRLPOOL a55e4eb95a0decc0e772bfd6d6ce89b39afbfc50b7a3e823d54b6d5f3fd02a0cc21223b0aef0654e78c9200297777676838abdbabd3674d9427f8e46e906a54c
+DIST rar2fs-1.26.0.tar.gz 258987 SHA256 ec44c26f94f15a06c931f24b964354c8b1939861f79a161e93262490eb38d312 SHA512 f67ba9826eb3de9f6a82088a25c20393cec32fff3c51c1e6bec6b95dd9707fdbb56388639c160a487de687cfda18d7b4985462d22722fd7cc581066a24845d1f WHIRLPOOL 443a18b3e846d932c65207bc0124922eeab5ba8ff371bd134ea4ef737ab9d0354a49fe12a6b7a9120d94060f4cde2471be5ad99108bbd83e7e17c1ed52f82dcf
 EBUILD rar2fs-1.25.2.ebuild 637 SHA256 7d94bb056c880a2d71f224f5f0f57d423e96362ea2aca340f636eadc13161249 SHA512 b6c8dfa29dbd076e10258a064d7bb09a18f0de60403380aaf63f0ad957bb73ce925fcb3c789a262b62a1ab2c58c8b0b1d6847881087b91cc8a4ea7d0acb1b161 WHIRLPOOL 06448e05b2e12bac9f93c6cbec2b20e670e331685bd6b8056641deed99adbade9c93288a73dd878ba4a13333c28f66a2e8e9cd76db689ca360d34a35a45e2a88
+EBUILD rar2fs-1.26.0.ebuild 639 SHA256 f59038b535996ff66d48c3bdeeb42028e42acb121542d8054e605c43657775f7 SHA512 f3e58c2db1b63331eaaf2f4f155e149c78a1f09941f201217da3dd69c2cdfae4c5bbc4274abd263ed8b3d3f1571311ef61ed217df98dbaf857b7a1522716a220 WHIRLPOOL 36ad0393ac48d9d1e2f2a7116a3416caa1337b744ca674d8d23f4991b8a367c9e56be9671dee4ba2bb38e1d85c1fe4f8bbc2c1f1c0e82b8be72528c11e58f460
 MISC ChangeLog 3131 SHA256 7ab1b3b5c3468494ee44e4d4b95ecf5878b2f3da028f6427b2596e78559ba752 SHA512 0cbd75c3003eb120f0921ddbaae750731b8f1933f8148eeb6acefe329c9816aed615093168e90b465e47f148d9a338083407857a4fc00d3ec4fa040c8a728d5d WHIRLPOOL 2d45e1c2a039936cffaadd466ff03370495434745b61e038317577a5e4eef24f737d00f9a49339755e4b061af03e5edcb4de70175302f05adb357cf9d97bfbc1
 MISC ChangeLog-2015 2257 SHA256 ab46fdea69fff7de59222fcb791c023f0e0c521b361a3ae70418e51490e974d4 SHA512 58248013b7e65e8500ca010e3c031c51851076cbc5ca1f39d065dcc76a07c5700a27a65d1033c01912ebe64d068d9cbd1e65170c16c1427e5ccbce7591204c5b WHIRLPOOL 71a57984b214a77a5c498f6b5f37240ed19b91c849b6f0caeabbd32b4f3e1a10b5effd7c6b0f608146a40315062d959e27ca10f5c906179ea0c7b159b67f107d
 MISC metadata.xml 325 SHA256 464227dc0760547315facd9d9204cbc2aa7eab45d32eeebb8a0af380c34128fc SHA512 506c5eada02c3ecb80b891fe5c256eebd85e57d83a515eca336a82e362b0a1c9c6f96c15dc05eb88141ca3a445953ed1c2486fc924868071c50087ec3876cf26 WHIRLPOOL 743327b346bbcc306028ade439f8ef07238fe7b3dfdf17b976b98810015a7e52f2adffe265ded609ea87c78b655dde34e0ad1c3b05915e9b5ff4532885d6b5cb
diff --git a/sys-fs/rar2fs/rar2fs-1.26.0.ebuild b/sys-fs/rar2fs/rar2fs-1.26.0.ebuild
new file mode 100644
index 000000000000..f12cbd1ab943
--- /dev/null
+++ b/sys-fs/rar2fs/rar2fs-1.26.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A FUSE based filesystem that can mount one or multiple RAR archive(s)"
+HOMEPAGE="https://hasse69.github.io/rar2fs/ https://github.com/hasse69/rar2fs"
+SRC_URI="https://github.com/hasse69/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=app-arch/unrar-5:=
+	sys-fs/fuse:0"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	export USER_CFLAGS="${CFLAGS}"
+
+	econf \
+		--with-unrar=/usr/include/libunrar \
+		--disable-static-unrar \
+		$(use_enable debug)
+}
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 474230591645..8a5247bb148a 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -62,7 +62,7 @@ EBUILD zfs-kmod-0.6.5.9.ebuild 4052 SHA256 91c9c8f8119422495913038bcc2a26c686dbb
 EBUILD zfs-kmod-0.7.0.ebuild 4052 SHA256 ab375e8bdda895acc3ec1e115e8447a68bf4ec592489fb62ded1038662e9624b SHA512 773bb52b42462b69d5911e7f02a503872080f8c9c98c9a35959caaba65aa5cdf940f874f0b5058dd47548c6e3bc296b949ff37d46a4d9cdae177f289e83c1abd WHIRLPOOL 3a9686f6928d5709b3bfe236c5609cbda94990184e8d2b9cefca4cfe07cf42a39cfaf841e88b5f57fc0119cc2e672f9523a2460b203fcf5af3449f39c585e9a7
 EBUILD zfs-kmod-0.7.1.ebuild 4052 SHA256 ab375e8bdda895acc3ec1e115e8447a68bf4ec592489fb62ded1038662e9624b SHA512 773bb52b42462b69d5911e7f02a503872080f8c9c98c9a35959caaba65aa5cdf940f874f0b5058dd47548c6e3bc296b949ff37d46a4d9cdae177f289e83c1abd WHIRLPOOL 3a9686f6928d5709b3bfe236c5609cbda94990184e8d2b9cefca4cfe07cf42a39cfaf841e88b5f57fc0119cc2e672f9523a2460b203fcf5af3449f39c585e9a7
 EBUILD zfs-kmod-0.7.2.ebuild 4052 SHA256 8387e56d9e4a8d53f3fc48b1cb4183b6ac02bd6cd0db312b1aa3820944148a44 SHA512 cb81f3f2e1cb2a421f8d8adcba919f90057627353427d8b94cddf733eb7581f20a14822a305aa0ff8cf936d7abd7b9fc7a680aace3cb9214ebfaea6d5e4bccd2 WHIRLPOOL 0ca8da4a9dd623492a1f1c54320b482a06bf07dc1beb1d112966879896e429ce5748ed68724733490ea4db9ffbfe139a4ff1de8458dc656b29708be8c321d0eb
-EBUILD zfs-kmod-9999.ebuild 4066 SHA256 e16f6edf739ac9ffcf91e1426e591cf585ef607182ea981f8f49248bbcc64dcf SHA512 30e78f5d73ab1bde1422f52ca1d773655c3ffa5e30385181daf650708639e34225c0367d5abcd80345d27868dcea8516024e9901c43590057783354847316517 WHIRLPOOL dc07d9f9f1df2ffc11628ebbbcc3e064c52e2b796b4f07bf4abb4e97afbd1899490908525ed4cbd686d69203168e95a264c714c64f5125e090dfcc0a0ef98e60
+EBUILD zfs-kmod-9999.ebuild 4068 SHA256 47457fd311c6a3f2c2d66206e39bc041ba1ef1979e41fa942d82603562dfb66e SHA512 2e421316f3bcad2cf939b3930a8a8e65f37682063737259ff19a4cc76fc3cb2d23845e24b1b8c23accdbfea1f1168c94b37759bd181a9302a0a723c537d84a60 WHIRLPOOL bf51feaab6634d27d5365747c2ca434717426b3d843725eedd89d60e3c408c63197cd5da23419077f69c62fd692306de6fc798883ae3b5d902292ff3cda0cb23
 MISC ChangeLog 12130 SHA256 3801bf091ee95d43a08aa11b014919287cb8071903b0dc75e482ad7418d6a0b1 SHA512 206dd30070d2f19e6c05fe4a122159916c597a60d28cf3c5f70e58394f613918986bbb0212884428ff7033a08b420556303ba1b53648d08e4218b02403a7b89a WHIRLPOOL 5eda564e5080101491e00362dec85baba0f09b5d948045151645de20e770d48940b13d019c42c5cd342d684c8174d66ac6c0de3d5365b713972548fc4411c003
 MISC ChangeLog-2015 17220 SHA256 44938d6e98d5c94b22a4934e9bea77ced5336708850e3525e674adb5477967d7 SHA512 93133a5bc445fc39c017ccd05a5b432fe4fff11cae819b4a4de84bf8da3d9ed7daeabef61924cc7886dff31f6e337fe98f81dfd7bcfb9de77f9486c9e23f0073 WHIRLPOOL c742602cc89dff432a8d091db5e126cbdadc5849afcb614769f83e12cfb9a64c2a61a65704a54aacfeeca8a50ed14c02edd06c9c051ce3076e4d62addddf1c60
 MISC metadata.xml 554 SHA256 f5c86d4654060d5481674ec419c3e4cc1a6e24c9b531f100c10ce14afca1b674 SHA512 c5dbcf5b795510abbe6c6dbea53ea6b9a438f0b2b8f7af28ae3ec9d8816d51c6ee22938bfe7d222d5b451065b57447064fba59e93a9621f1132e3d27ef8d385b WHIRLPOOL b9af8dc787c8aff8fe25336cd6a0b55955768f756a0a3f85c876627a7b181cb77f64f6dd43fdbd6f37883c0b6c31c6f44e2d7c7b1da22dc1d8a19c92649e88de
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index 03c1e90f7cf4..3b61376f3877 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -64,7 +64,7 @@ pkg_setup() {
 	kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
 
 	[ ${PV} != "9999" ] && \
-		{ kernel_is le 4 3 || die "Linux 4.3 is the latest supported version."; }
+		{ kernel_is le 4 13 || die "Linux 4.13 is the latest supported version."; }
 
 	check_extra_config
 }
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 166150879086..603e0aed7659 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -11,6 +11,12 @@ DIST genpatches-4.12-15.extras.tar.xz 17340 SHA256 b22021fa7cb0f4254273fe61ba14e
 DIST genpatches-4.13-10.base.tar.xz 185668 SHA256 5388bef725321c0925413ca6d194502e1d2aa76a23cd24d37f0d7a7503bc2bb8 SHA512 9c8ec7eed0847c3555e66f982484ceb92301cad82f9165c2d828c193019d2067200c2155ff79ee995955512076eb6877577ccb4a3835f1e70aa6210cd41993ab WHIRLPOOL 01f030cc03f99d4858c6f38f21c2db52aa42b9aa9376069b67e2c7d025861be2c9ec1cd9eea49a0f59d5d32855afdf563e0f76cbe30bcabfe37f7d8fc7296f54
 DIST genpatches-4.13-10.experimental.tar.xz 5184 SHA256 0b4da9e8c97825c17b90b86ab770fa27c6cc09df21df6e263c6a72adebb4d0b8 SHA512 39a83b4fd596abc6d4004069969231ca8a767f72ba65aefd22ede2019c6436fb00d9e4b1426addc3e4dfb4357091046c88bd8d61895d45354cbeeb013ab601d3 WHIRLPOOL 35cd5b6164a6a77240149e99222a0bcc4308877b9e78005397fd9b321a2317717e8915b38159b7db76f2dcb577649777e1a1df16758b8be3a8be44e667175a02
 DIST genpatches-4.13-10.extras.tar.xz 17400 SHA256 5f46f20a84b7a93b6f6d9faecde83999528f033a52f9435f0e91b737a13b98cb SHA512 882f0d1461fb045d54ade39a7d432f9cc4bac27c07600074a4d714ecab42a6c96eb9af5f0cdb71c583afa3f5ff8b32616462957d9bd8fa029d5f1df1f6f8be14 WHIRLPOOL c18205fc69ecb06aaa36e339548a59659c06f8fb021bc6556d49d249f2774b6870ff8e0d7d48386c5bc0bab6af70bba884048d3d8afc4852dcefea0d7ef01739
+DIST genpatches-4.13-11.base.tar.xz 191900 SHA256 10a1f083294d384ef773daa5b21e7cec5ba0ef308a3174d82840b040848b5361 SHA512 0d76a0bbe2e02e4c69ceee63ea99085eb83289a189821426c2a0b852a9f84d9b4c314be823933aa3a54e341848dcbf677ec5aa41da204075a8d190d976ffe0b1 WHIRLPOOL 168a842efa27a9c217a40de4346a5f39066bc5b8744ba18caef35fd2e18b2a389adee3b0d279e2bc1fad06ee35e23c55c62a559a53f63db9dc677f6b421c2866
+DIST genpatches-4.13-11.experimental.tar.xz 5184 SHA256 6c467a131de9f49b78fecc652cf60f508f54a4f76a1fe150ef3f8c7c23f2429e SHA512 920e3092cf3c984448d2571561d8a4249620fba60090f7939fae5667b830bb47ef2fe04453c4474117a1ab9ddc4b19c710e7ee7f75bc14b3d73c68f865a769f4 WHIRLPOOL 87d85128cc0291d93f69793a98adc592f528bc7bbb14a8910fbb215d47d8ae9766d33a918e10aeaada7782af43ec013919d2a739895fc15a24042bf8a60a5256
+DIST genpatches-4.13-11.extras.tar.xz 17404 SHA256 75d973ece33bfb4cecf0a32282712c549303ae806f05fa9077395b0db068c125 SHA512 4a0b196b4a7633a71d51b413b3641047228a1985cc601941d088329d884d39d9966de01fecd17f4a5fc472cd9a41a551bdf2819fb3b6928ec2af4596b60a5689 WHIRLPOOL 350b1b91d604ac26bce8f6d67da63926b37c6632b2ca49144282783198db582c00c6f8332423ee2aa19924a231d5a78b5157d8f971c79b0ed02baa429278f8f7
+DIST genpatches-4.13-12.base.tar.xz 219808 SHA256 45c1632713fa9bce7d457adb77605f24b4fc8e53c9173832f43c054595d35884 SHA512 65e1f5bebf942d73719becc60d0c46171176cf34e036374b44232e1de645205aebbb1da90d9e82699bb65dc69b78dbc5b76d39d8a041397c2508471fddd20b6e WHIRLPOOL 3e9b13e9830e99b94653d039337cc8f8cc462c8d526cd98cb70fe350fd5aa2b742c15bb2558e5e084d657cfc7273aa602bf61b60230a76e88891c41595b79e6a
+DIST genpatches-4.13-12.experimental.tar.xz 5184 SHA256 abb4c385b9e5fa8d239533c02cc797ea3bbde6eac88494baff2a429ca51f8710 SHA512 2d23dbdb14ec619aecc6ae854aeaa8094a689a17a9453383f27b57b226bf23121574c41dafa3ad7744011000bc990c92f4f65a323d38a89675777fbb61083c31 WHIRLPOOL eb9cebd6aab7f4fabff4ba8f24545f381d1468f6b995a6829d679fa88a8f9a2c4a451e803274777601efb7d8d823b97ab991ceb64ebdcd70b2630a2d80ad64d6
+DIST genpatches-4.13-12.extras.tar.xz 17412 SHA256 1570e22b14044fd5227d2bb9c632ea5ef07304636784939c3806e0e9eefded2e SHA512 d348bb190a41526ae88cd82d2f77f0ce2bb50f9a8332daca92e09de078f70db6b906f4380f7ef85b807dc5a6cf34da0bff7afbbb68de3e483a5f26de352348d8 WHIRLPOOL a53f00874064289dce27591e3580dc0ceaad0dc52fd65b0237861254c8b016b82479dd8e3478a97baea8fc365b82fde34e89b7c7553ba19e553d0398d02367a6
 DIST genpatches-4.9-54.base.tar.xz 1053504 SHA256 ad6728a6e84a45aa9a84215f72ba1daed8c9681b61d9470b0fed24c285aec82a SHA512 3e64d39f3d7d0c1d68cca6b27df1e374970f0b42f47ff6bc900a1a12d1305093efafdccc28a1ba89404397ad285298058e882329f651e8d1031ddc86dbf06c40 WHIRLPOOL 7c22db4217a2604a05e8f4a9817fceabf865b00c7c33df95cfc5a09af6ffa84d809930c221f55cb9b500cc8d57b2e43f70f80e622a19fb73e0d068f2ec2be18d
 DIST genpatches-4.9-54.experimental.tar.xz 106360 SHA256 9c5b4ec4005bf50556163cebe4a4e577cffc3ed0ab06a40cd79bc7e9e33a964d SHA512 ace1650a90d70f1ab6d938d2509c44ff1911178161bfa6f060f5eb078b9c83d031709dc483f3481afc82c34b705cd9dd653c95c9b53817c79b0e632f970dad10 WHIRLPOOL 50c40e6160a92d98e568b3d55b336c4400cb8faff7fcfa5c71a8172e5149468b0483874c8531270f6f15b48f84fb3c47dee8ec01870c3331a150226c748b16ac
 DIST genpatches-4.9-54.extras.tar.xz 17356 SHA256 70314b113191df3bcf461537c5c5789ce990311affcb41e9d00b4a4d1f674659 SHA512 894f37761c80304fd12e20d9b2a11a56475484dd2a4504f4aada6b48854e752228256d56dfc328c7633996a16f4653af0105698b6a230619d9a3364b9d08a265 WHIRLPOOL 3fddbc03354fcb2b3c72caa7462a36d16a0595304da2ff9df0614925e252e3c15c38138b4f07789333c118dde992569c7cbbeb019b5052bc0ff18e87fb08cf6b
@@ -29,6 +35,12 @@ DIST genpatches-4.9-58.extras.tar.xz 17348 SHA256 538ec1d455e26781b6b898b172c324
 DIST genpatches-4.9-59.base.tar.xz 1133092 SHA256 691f9860aaa31ca2da288aaf9f808c506b39addc19772d6f84b57732d2a7679f SHA512 b1395a77963b2b2d73635a5b9a1d610cd7a7f9220d469e6a7f4fb02ff10cc9267fddd862d682e5bd4cffb0128d48c89dcb52ade45a56021b0133f483a26c9875 WHIRLPOOL 5ca080c8560eb62ef342fd036b4e6db12b25c827a1699f91d586444728425ae472632ade2fc175432a4fd8b49fc9bd18ac041ce9130a18ddade05a52cbfe9388
 DIST genpatches-4.9-59.experimental.tar.xz 106392 SHA256 ccf9f18a3dd28f69aad8cd34d513d2b5676cd726289d940d17b7278aa266f191 SHA512 eb8a1699a8c68a91e00bf65e0455c432ec3a6748080bb2df5fc7b6070e3626967927ecc8b64a4344bb2efd753f70c2fe4f69cc8e7de5ce337750dc908c4b5e4f WHIRLPOOL de3da93b251f43faa8b7a80aeb8a28c8f08b9578ce5dc56bee3f941efca3165b8301ffb403ac4f84521cc9a49682850b58e6ed73c0cea3b53edbebbaa60e8b00
 DIST genpatches-4.9-59.extras.tar.xz 17360 SHA256 be21758bdec50724d687d255b516bf8735d026c603f260644c7b08ec9352d624 SHA512 79a2c47aa6ee6191b5a6e4d17835dab90e747986b6b407a12afd4e343663a4ddb4066c752a65196b534dca102f3843f927b1952e21c3f04e04a28dbe30bef0fe WHIRLPOOL 07cf4232e3061a677317ef4444cd41dbdfbee3ecf6c870e55b291a1e2a6cc0e1bc2bb89cbeb3e1c910efede109fd766f852c2a52aada60f3e04db581ec39dfa0
+DIST genpatches-4.9-60.base.tar.xz 1143868 SHA256 99d045a8f2ea7fc91068425d918f850ca79d36b5e086e8bd5fb543d5cdd7072a SHA512 8457d59adc55785736302698e63d4c687c76b72b2457ba3828da688b215b8d8562ffbd8a5e2ad2b30249863c85d18ad93f74e9bf8494420cea57fcc1e9a7f602 WHIRLPOOL 093aa2d3b5a6b2667380456aa5c74362c2363b8df15a680dc900ea6834566fe2363620f8358cfc79117399a25f71e3afa3ddf3e16787d135ad1158d8e44d4b4d
+DIST genpatches-4.9-60.experimental.tar.xz 106380 SHA256 d1a45c76cd2e155539b915d20f8bc5e20ffbf9ebe7ab6763d42858cf0acd9d55 SHA512 58215551787d6db5000f8ceedb6a0a10d912ff02b4acac8017aadba49d78caef3d0755ed79996bcb68c3a63cc56ca3f0fe0f308f19754b1cb60ef9b2b601fa92 WHIRLPOOL d161f8a5179ed4ce2c350045a772cfde71bf8387dbcf3c61ae29c51816dcd47c29ae7688bed5f59955b1b8f53fb33031c95b87b6ee6cf38f93a72e0026f35dd2
+DIST genpatches-4.9-60.extras.tar.xz 17352 SHA256 24fc73022cb7989f7b7bb70bd6e0c4042b8f643ae988ae61a3405f86186fa0c0 SHA512 442d6daec709a58a08f3faaa21264f45a1291d12175d83a1fb0551dd870484d2093a2efd715955d917d848c600ba5a45c15a79c14fe7a6c18fa5fa2a67099b2f WHIRLPOOL 2e8d0a6ac19c991b76bc6712a6e542eae56e6417ccef9006b7133f50af55163f8fda930a656ab839699b6538d524d55c0db22eb08908a8b9e640aabbc54b46c0
+DIST genpatches-4.9-61.base.tar.xz 1158552 SHA256 2fc651e767d18fdf19e83109afafac16f18a5a76e2cbc131e32a8229b3198436 SHA512 dac7ef5bac6a116c813e614861be3304fb21d5fc004fb6e8d1cb7f05cfc7c4384dfafc8d8482efa737d4cbaaf110701a1c8ed23116aaac394b7ae3a38ac7c785 WHIRLPOOL 2c800f9ceb1b25bb646e283d67fbe6af7e7f98105e4f94a0ff7ae8e0ae31a7c85bd1eedb74ea8cf02d477e9096cbca1056ae55a7f06ae6188b960535b61d6f02
+DIST genpatches-4.9-61.experimental.tar.xz 106392 SHA256 fe6c42d115c1779f39fa83dffec51a1fb0815fa48ce797e3d1b78c7f488bd468 SHA512 5dc9e00964aa44a782dffb447b13fca58f234627882cef0009c53f747bf633ec9138462cf58b12f288545e2af5a33cfb2adec49b3cd1a0da96d7967e1eeb116f WHIRLPOOL 7c320f2ed66305128ed59ea05572fb1774b858ea8fb6553ec1a067219ef89256c9a8bf98bb25a4d53ab18fb00a83b916690fd8c0d0981a41dab1f817d987ce55
+DIST genpatches-4.9-61.extras.tar.xz 17352 SHA256 b26741cd2078757609ea6952467a56e0fdba6db3e70fe72cbd0b252d42d4d94f SHA512 b1acc2fe16a07d8927f5b2c21f982fde4dda608d9e80db8cd6c60739887d84a86792d39f8975920276987880ab344a58ef493816061f926c27cd7b059bcf5552 WHIRLPOOL 5fe700e29e3467900197b27d2e6e875d07cb10ad355ce73bcf2d74a5860444860cf53f4a924f2ecd31383faffd914a1e4b33acf5a2941a391c8ea3d55403126f
 DIST linux-4.12.tar.xz 99186576 SHA256 a45c3becd4d08ce411c14628a949d08e2433d8cdeca92036c7013980e93858ab SHA512 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728 WHIRLPOOL 3b97da251c2ba4ace4a27b708f2b1dcf94cb1b59aaeded6acb74bd98f0d3e33f1df83670665e4186d99a55daa84c88d539d93e20f0ff18a6d46ef326c48dd375
 DIST linux-4.13.tar.xz 100579888 SHA256 2db3d6066c3ad93eb25b973a3d2951e022a7e975ee2fa7cbe5bddf84d9a49a2c SHA512 a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2 WHIRLPOOL d3d332e02cd3c5056c76c28cf1f81504c6f7b8f2caed7238e7dd7866747fb03154b88d8d7aec4d0eddf5760624bc7d6c5485fb52a3e32d098a2742eba96c0d05
 DIST linux-4.9.tar.xz 93192404 SHA256 029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a WHIRLPOOL 072505b29972ad120eb25a074217847c9c2813416c4903e605a0433574f5f87616dbea0b1454e4b19acc48107f11274b682958b1d773373156e99f8163e6606a
@@ -36,13 +48,17 @@ DIST patch-4.12-ck2.xz 83604 SHA256 6d15f95ca23b46f7abdfa1315600daed7ed6843acc29
 DIST patch-4.13-ck1.xz 84208 SHA256 a44bf7af8cec88aeb1159ecb4a0395bc214eb98fe6c0c398d38475e63b280fe8 SHA512 4e2f371d474fd884292c7a2c8cacb8300c3fc6b7ca0fa6ca68b899a9ca7ded4ddca376334567b360af85977a84a70e973ef6540a6c2c0d56d5cc80d5814c56d9 WHIRLPOOL 42301ba07a6b5b7859f455f5c51397ab9939b0fdb57ca6f4af6c652acf7bc20ea03a7db6d393278326bb3424545b9952d146f4b313ef8cadfcb9181523d729ed
 DIST patch-4.9-ck1.xz 165624 SHA256 5b9d8f4ef73f87e8595de66ccc38bad86e290fd9453bd536b9cc950f5344b82d SHA512 335f83b8f77c4c2c304db74268eae895ec53611b2cb5ed45a9c6e7f9c7ac37c2eba7cc714d49504ae29cc44c448aa873b52eb332fe91d4e6dbbdd2a175aab252 WHIRLPOOL fdf01a45ad028095d0c91105975724bf19eeb2ddd380f20465357748d3f4a22d73de9fc408473d9d1fb988a6956edcebd0269ff105d3392a82b96e48566aeea5
 EBUILD ck-sources-4.12.14.ebuild 1625 SHA256 5ec6b0191d3e183813fa3a89f22806865a8d8a721a2d6ee7d2a81f57d2f13506 SHA512 dcbd2fc096d8bb3379b7122a50a2f0dc705c973c3ee8cd7a50b7a6a73afceda5eabcee0c5f788e84b2bd72ff43ca6172389324803b3a7ddc4bd6470a604fe97c WHIRLPOOL b809b4c089ce50af91c0aaa0b216248971dd6881fae2e1ec9cc7a3156327b0123f53c2f2e8341735a1dcf5131377e1a43acc37d5451d7c3676203387ce5e3f27
+EBUILD ck-sources-4.13.10.ebuild 1625 SHA256 402630f72444212e7929225f20a72bdba7d2ec97c2613d3d4dea183282547dc0 SHA512 e8f29f412533d2f3dd6c0f94f6eaeccb9e31508bb7b966ae8cd3fb4a963590d79da014f01a664a575c50b9601ea8de365206b237a2ab06b972dcb2a4bcb61fb9 WHIRLPOOL e0c39823c8b93f2adb9781d39af16efb7501913de248bac023fd5c2b67b1b78d1d28181f73add34e984597b51cbe823116d1d497d880749c3af87888ab1f6751
 EBUILD ck-sources-4.13.8.ebuild 1625 SHA256 700396b1a20a9ac92761e91dbef4ed645f46971993b96c46194d754adf07872a SHA512 0bc56986a408bd0584b9949c6624f855f0e99ae751bf7f94ccbfb01a3bd26ae91758454e6d8b4aaa032b76fb5e5c076d8db6e4ad0e256e7f3a522ba7d27b1eab WHIRLPOOL fdc007fec5d32f2bea3982aa2af43251588797a4ad3b054ccf8b1d34562bdb1aa20dddabe41c97dcc3bb5fae36a613d1fb59357130e219a4929329449f0cf148
+EBUILD ck-sources-4.13.9.ebuild 1625 SHA256 f804e06d6a971a38dcba7f183283c396203f756f348d27a0e43eee557ad32281 SHA512 fda920dbc2a132a3b2f89613ce190a31030e55be1dea43fc531a7e4856814c732738cd548c58152b312deb0ec1495e1c2c8f5f4b383d857571e8b193a8cc5dbe WHIRLPOOL 08ccb7a0cad4258b0f766c44fad4a7f5e8c91e69f9f9a7f95e38bec281305f1a4ef156e6e6a1fd73d4aca2e56821a19ae10f5c91da5f50fedf114720b3272c2a
 EBUILD ck-sources-4.9.52.ebuild 1905 SHA256 350addd7131a737a291a02f97da5fab96526ab7d3eff25546b8410b2cc4e0ad9 SHA512 cec584dc1d17b292c2f44dcaa00f41912ce4eb26c2b1f938e3f4d05505d6a555e59993bbaf577cf480573738ddde80d3422b6f92d436a57e0a2140d424177a03 WHIRLPOOL 9e1ed8b714ea42208333092d8d6913bc613692f0342a0f50fc0c523fd1e3f3763a6d705a14b3a168b886e9d8850ea4691ddd8c4f86f1e0db5279210fea129e7b
 EBUILD ck-sources-4.9.53.ebuild 1905 SHA256 e0f22aa9821172665dfd8f6f69cef2d92531d9aab1a352136056b3890b0f48da SHA512 1f89cfb5180435f7244cf1c72dadfe4c9ac51feda86b072d2611b2688fa2094478ae0c5ad6d40137cd6269b09fc33f6aa5e085aa77b497aea103a32fa736a3fd WHIRLPOOL 8896d6aa2b187c325af51196627c10561f4be972a04fb65386c38f5aff5c1f36db93947d305d6be65045d6ab3fd102cee531d31cb5a65c6feebc53042ab0d88d
 EBUILD ck-sources-4.9.54.ebuild 1905 SHA256 91fb04632dd781a68f06fa61f84cccd2ac50460d2dd7d0d9bc2e49e1fd187432 SHA512 e98033902d799565ba2a169e0469895743ec381d84c709a9278b755224d546ec1f50ec286b4b4acca19a16e15111e68160760865a600e0508cf8c2158d004cb8 WHIRLPOOL 68145af995ff7bd89a53e8db9d6e81459fc8a9fcbaddedb9e556e2d1ac1985c4da7b6f3c9849d8358699dc20099155f46f64a75c1e3f885af06f05520da4a553
 EBUILD ck-sources-4.9.55.ebuild 1905 SHA256 a2a28b61c2a5ed02903d37263e42a662c59b068daa4ad4d2a04663c5a12508f5 SHA512 36fb5aabbcd17fdb9c57460395333856862fb7c93b7c13780f026dbd7e25b057d40df744db4ee5a7380363a75ed1b7db21a5d11ed40c9fd35e21627fc20aa41a WHIRLPOOL 0fc256b08c4547db3d07e6622bab30a29d0826c7442872e89ed968c7df03f02e6f37ef44e2123f39fcb17a674bdf9f0b38d6764a63f8abc0aadd34e6eb64b644
 EBUILD ck-sources-4.9.56.ebuild 1905 SHA256 4d3929c0d4a41b8a3423aa19db26595a618041884832deffdfeed2fd5f875b7e SHA512 b19625aca3f47e617fd9c5ce43318978188aab4e0e205c2ba08336b7abd44226c646affed41dc7e449915b194886f2a895863fce1367179b5ccee68fa5074e46 WHIRLPOOL 42fd55ecab63593c5f4888d545d58ff877a419296d353c58431462cb1aa44c23efb3fc0b908e7d38f36579be5785387365f7ee60157dd579f9b9e3623fa06759
 EBUILD ck-sources-4.9.57.ebuild 1905 SHA256 f7d1ef11e36c67e44b20f1d25f2b0d81e3b85bbf31be8100fb80bb5e653ea51c SHA512 4487896631799019490c46bd13202ef22b96016dc1f666b460163c0d6b9523b115b0b869a07404a50d92193cf98eb6aaa0728fe31428da3ebf2e1262f9643c2c WHIRLPOOL 2013fc4d25b6e8372261e2b56f20376a8192ccccdb09b08a796fa5527c0dd15e21c571bd380f47f5970ebb55dc74ce6c37f3f0c37df5d310e082a1cca5e1c44b
+EBUILD ck-sources-4.9.58.ebuild 1905 SHA256 677f4513b618c5d450eaab401ea480c43e8abbab9e3db3cd58bc1a94abe37e25 SHA512 a1d1b76b9386f42b7eec283b99978bdcba4620637ba32f7f93f17f14dceaa11607f5e30ef75fa2742a2017a788c02ae1991f5b69dc1300d225a5a46338d5b99d WHIRLPOOL b20027489ab1e673f59e22700b20987ed2d45581b4f0a78cb9ee6a96767518081b21950b932745c0e2ec557d6973759dce88002c3c90300cd6ee823d45193804
+EBUILD ck-sources-4.9.59.ebuild 1905 SHA256 1ee22f04947d946f7c64ce15b5447a2bc1848e800afa911b21a3a56f1cfa7b69 SHA512 77291d5fd1aadf059a2ff9af1b77bfc5dc4c4385b7df7d2e6f7d5da4d70bb42f4d3fbdc472bc3f989e7a3eeb4a1629a24d99ad56712e7de94ce8a7595d92bfc1 WHIRLPOOL 3bde39b016ea7b1f5153c878068a96993bb5ad93cabc3f0d91f64590be9eaeaab8302393bf07629b20a30c13d79f800f4f8521945a664bf361e6706c58e6b86e
 MISC ChangeLog 8693 SHA256 b34cb29fe694a7fae951b08ccf1562bbcc3d5b4154e643b2e6f7096be8f2ba5b SHA512 81732b96b5d47a4bd84d1710fbcb2115b0a89edb0982c984474669c4251ecf00787632b223070d879c1124fd30b5876927eab0775da0ea4a3a9be0b1bb7cb441 WHIRLPOOL 1dc401d79ac02f8be03817c385ba03277e7f5486704bcfba53012efd813ea7ec8945b550951fc19159fe7a90b7a3059806981c542f915a0e4cce1a624b4d56a4
 MISC ChangeLog-2015 22978 SHA256 f5bd9c75144802391d4e81da727842262dd69dd0a981899bc23a8f25d7f9f4f7 SHA512 d7df0a783cdfc7eb7c1bcd0c7163cf4679926ed094c35213867a4120415d4351562c33a3ce346b08f04f3cc8c880110eaf413a53b67d6ad01cb92a4e437b1c8f WHIRLPOOL d4901ece1e1b7b8dacf2dc8442ea33c8b27e0a54506926a9cfe76da288be9121a28f5f31a01362192ef594b4b1fb67b619e17cf5c12222015f5db3803afeddeb
 MISC metadata.xml 770 SHA256 62628aa544e3ea7b512ea85e0497cb0ddf7a06c7ce89d041b9f424ca77acce26 SHA512 6c1d9152ac638ac3c4483a687f24d5e9a4a8c3c840d2d046db7f082d3638cf2d460f8ce82e69bf86f1d4d2e8f7b2a9f34431e00d3f8d09bd52ce6581f3dcf6c1 WHIRLPOOL 1e5735d4d5a8867aeef0e744cc1539b247d00a3aa1c1b67e89a3d0f8bf53118ea027c4c516d90c1bc9dff1664493cca56aaf01c3a06276bab2b0f795a66fd2a2
diff --git a/sys-kernel/ck-sources/ck-sources-4.13.10.ebuild b/sys-kernel/ck-sources/ck-sources-4.13.10.ebuild
new file mode 100644
index 000000000000..da310e5ed395
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.13.10.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
+	http://users.tpg.com.au/ckolivas/kernel/"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_EXP_GENPATCHES_PULL="1"
+K_EXP_GENPATCHES_NOUSE="1"
+K_GENPATCHES_VER="12"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 kernel-2
+detect_version
+detect_arch
+
+DEPEND="deblob? ( ${PYTHON_DEPS} )"
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
+
+CK_VERSION="1"
+
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz"
+
+CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
+CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${CK_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+# ck-patches already includes BFQ (similar version as genpatches "experimental" USE flag)
+# what's not included is: "additional cpu optimizations" (5010) from genpatches experimental
+
+K_EXP_GENPATCHES_LIST="5010_*.patch*"
+
+pkg_setup() {
+	use deblob && python-any-r1_pkg_setup
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+
+#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
+
+	# linux-info eclass cannot handle recursively expanded variables in Makefile #490328
+	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" || die
+
+	kernel-2_src_prepare
+}
diff --git a/sys-kernel/ck-sources/ck-sources-4.13.9.ebuild b/sys-kernel/ck-sources/ck-sources-4.13.9.ebuild
new file mode 100644
index 000000000000..2db28eae6e37
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.13.9.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
+	http://users.tpg.com.au/ckolivas/kernel/"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_EXP_GENPATCHES_PULL="1"
+K_EXP_GENPATCHES_NOUSE="1"
+K_GENPATCHES_VER="11"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 kernel-2
+detect_version
+detect_arch
+
+DEPEND="deblob? ( ${PYTHON_DEPS} )"
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
+
+CK_VERSION="1"
+
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz"
+
+CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
+CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${CK_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+# ck-patches already includes BFQ (similar version as genpatches "experimental" USE flag)
+# what's not included is: "additional cpu optimizations" (5010) from genpatches experimental
+
+K_EXP_GENPATCHES_LIST="5010_*.patch*"
+
+pkg_setup() {
+	use deblob && python-any-r1_pkg_setup
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+
+#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
+
+	# linux-info eclass cannot handle recursively expanded variables in Makefile #490328
+	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" || die
+
+	kernel-2_src_prepare
+}
diff --git a/sys-kernel/ck-sources/ck-sources-4.9.58.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.58.ebuild
new file mode 100644
index 000000000000..25ff25a1efb8
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.9.58.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
+	http://users.tpg.com.au/ckolivas/kernel/"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_EXP_GENPATCHES_PULL="1"
+K_EXP_GENPATCHES_NOUSE="1"
+K_GENPATCHES_VER="60"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 kernel-2
+detect_version
+detect_arch
+
+DEPEND="deblob? ( ${PYTHON_DEPS} )"
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
+
+CK_VERSION="1"
+
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz"
+
+CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
+CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+
+# solves bug #606866 (Fix build for CONFIG_FREEZER disabled.x)
+FRZR_HASH="7de569950716147ed436b27936628ee3ab5b45cc"
+FRZR_FILE="${PN}-4.9-freezer-fix.patch"
+FRZR_URI="https://github.com/ckolivas/linux/commit/${FRZR_HASH}.patch -> ${FRZR_FILE}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI} ${FRZR_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${CK_FILE} ${DISTDIR}/${FRZR_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+# ck-patches already includes BFQ (similar version as genpatches "experimental" USE flag)
+# what's not included is: "additional cpu optimizations" (5010) from genpatches experimental
+
+K_EXP_GENPATCHES_LIST="5010_*.patch*"
+
+pkg_setup() {
+	use deblob && python-any-r1_pkg_setup
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+
+#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
+
+	# linux-info eclass cannot handle recursively expanded variables in Makefile #490328
+	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" || die
+
+	kernel-2_src_prepare
+}
diff --git a/sys-kernel/ck-sources/ck-sources-4.9.59.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.59.ebuild
new file mode 100644
index 000000000000..7ff48e84123e
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.9.59.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
+	http://users.tpg.com.au/ckolivas/kernel/"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_EXP_GENPATCHES_PULL="1"
+K_EXP_GENPATCHES_NOUSE="1"
+K_GENPATCHES_VER="61"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 kernel-2
+detect_version
+detect_arch
+
+DEPEND="deblob? ( ${PYTHON_DEPS} )"
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
+
+CK_VERSION="1"
+
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz"
+
+CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
+CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+
+# solves bug #606866 (Fix build for CONFIG_FREEZER disabled.x)
+FRZR_HASH="7de569950716147ed436b27936628ee3ab5b45cc"
+FRZR_FILE="${PN}-4.9-freezer-fix.patch"
+FRZR_URI="https://github.com/ckolivas/linux/commit/${FRZR_HASH}.patch -> ${FRZR_FILE}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI} ${FRZR_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${CK_FILE} ${DISTDIR}/${FRZR_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+# ck-patches already includes BFQ (similar version as genpatches "experimental" USE flag)
+# what's not included is: "additional cpu optimizations" (5010) from genpatches experimental
+
+K_EXP_GENPATCHES_LIST="5010_*.patch*"
+
+pkg_setup() {
+	use deblob && python-any-r1_pkg_setup
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+
+#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
+
+	# linux-info eclass cannot handle recursively expanded variables in Makefile #490328
+	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" || die
+
+	kernel-2_src_prepare
+}
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 4c8a5c34d7dc..c640d3b4161c 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -8,7 +8,7 @@ DIST dracut-044.tar.xz 280004 SHA256 84b97c9b0120e9fde06c3b9cf2ede1c4632cccd8e08
 DIST dracut-045.tar.xz 292652 SHA256 ca9c7ea54d3efc8b57ac1427cc5fa4d66688f6cf9d3088f4c5e7ae7c7e84ebf8 SHA512 b57aab1f6fbdd5ad52a13a0eb99937b1abcd11507a2a3e6ec9bcb94e578cc32edc01a814ea2cef93158c27c17e3e40bcdd32a66457a20363f8136b8b546bbb4a WHIRLPOOL d9cdf32e4fb745b2598aa2f0504c943f5a069dddc17d5261d594b2fc33921306196386bc35156d5bf71983cc15be3b0cddd504d1b6a2042b45b5c5ae622b23b9
 EBUILD dracut-044-r1.ebuild 7688 SHA256 e51652455405c841b00e8fcc0e3f064a3d9a189e37bc1bc98a28fd18d7251de6 SHA512 e82388ff89b4a9309f2e38c8d4cae5db63765b423d1066b978d7eb2b7374f355af49b3962ec22e4ca1a37fe699ed3311c610565f1218d249189e4f28a5677067 WHIRLPOOL 22f0d0d887d7d2ede9c32bfc77c434ad278cc2a1c3b077e9e7a599fef3c85ab735170f0c2de898953d8ff97cb486d3bb559f23e696005a2f75fc9fa8102006e3
 EBUILD dracut-044-r3.ebuild 6939 SHA256 31bdc406d9a18851f2c244bfba04d29c1c2e8d2fb54efe449ac00c7875944658 SHA512 b49f4a6dea1b6c03b6422b7c4edd7e655a123ca7074ebe38d98bc5ae324060cb0dda3cecbb8dd8caae5209d16d767680aaf4ec740cf65af496545b50c41d7a28 WHIRLPOOL 93c981d0b134c33c28cc3afb64268bf0ba4e0e04cfb1b39103fd2ec0cfe4df55f8deb964e5a110a5decf959fe2824a3ccd0fe4dd73231d3a0b9416cd020ac8eb
-EBUILD dracut-045-r2.ebuild 4797 SHA256 b91b9b81aa2a626f7cc954a038427b0c88aa3e92cc014d073eabbb7dba8204e9 SHA512 18da9181998f66ba9e723b4fbe1ecac96781886a810b82f00c71723a0f7bf9ddde3fbf8ea853ad47986275ca4dbfad856858aaf0bfd06ba5ade9f3e1e1670106 WHIRLPOOL 89883e6ae2aa14692044f4fbd37bd11db9f3d94d9a13733d12fffb6bb1e50008d1a231837c154507595b731accb563c75150991d063cfb507878859239fd6f02
+EBUILD dracut-045-r2.ebuild 4796 SHA256 23fe9dae467f11f22f7c0198a3e8420c895ef82262565ac69acb547c68e2845e SHA512 162d54719b6adde4a2c0aa24cd92920ddfd48f630e0fb54a49aea05d4e02b26db8669179202860a704014649e464c2172434e6c959a37c3914494a32c778ffd3 WHIRLPOOL 51b2be4a1a1ea0351eb839299869b74c173bc5c1ae53ede41818cff3e10fa1fd25c1a11e70c8703d519f3a465986fa71b5ba1b0d48be675998b62a66359fad24
 MISC ChangeLog 8004 SHA256 11ded091b910b3c6807e344e4986675c50af2e5e0a2fdcdb352e086f5097e090 SHA512 dd8b1e996946fa47093440be61de1cb645a15fcf289a380226590ba541af8e4a47df33747491a25258a21599ab90c0402da548371de131d4f4cabf06965d0807 WHIRLPOOL da2a37d08cc7eb53eafd6282b635672df58db6ba88aa7dbc8e79f08db25a329245c84d4977937857b42ae9b3d84ad989ac40cf3dbbd96f3b30e2a34c36d9b40e
 MISC ChangeLog-2015 84625 SHA256 839b114233a8e918dfd787ff5a1f3a0743da7ee5320ff571aff4474ecb9ee45e SHA512 67588a45f9745381b08712b0bb8219d7101cd0c5a78b89be177658b18188a0a2c2185688e1e6239d44ad93345c7da34b71d4ce9a923122b2d62b1121abf0bdf6 WHIRLPOOL 51d19990f3bc47e4d43ee98fd48bc84cad89115e7f812469d25322e9c30efe3902e0007f3d9026464d471c201454e761c04770fbd1d32b545791cf28c67d22cb
 MISC metadata.xml 840 SHA256 8ef5aab36d95735b3b0b1cdba609ef3cd8e883ac38fb619c957fe5ae1e35bd6d SHA512 d347acc0a7c8b821804280f198aa28cbd4198a8f2d570c2725584b18b04125a684bed6adb48f5cb71fe1ef0e1c19320ad3dbff612dbf972f741b50b91fc388ba WHIRLPOOL 9edf380512d517d1eb6303a81379e8df8c342c3ab4501b150f2c23078185d09251903b4ea182a65c49caeda51ce21845ba34783875b7c8111883ff3855f0dbac
diff --git a/sys-kernel/dracut/dracut-045-r2.ebuild b/sys-kernel/dracut/dracut-045-r2.ebuild
index 0357b8839f5e..2e293072eb39 100644
--- a/sys-kernel/dracut/dracut-045-r2.ebuild
+++ b/sys-kernel/dracut/dracut-045-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://dracut.wiki.kernel.org"
 SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug selinux"
 
 RESTRICT="test"
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 8acec1668883..dfb80bccc867 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -17,6 +17,7 @@ DIST genkernel-3.5.1.0.tar.xz 292388 SHA256 1c84e405ed839ed7f3702a0685454fa374cc
 DIST genkernel-3.5.1.1.tar.xz 292864 SHA256 5ab5019fbfe0173f431556b97206dc51636bfa8b4dfe51143d6e9a2bf8e18233 SHA512 ff564e00bed2c7c211a0c7e73425169a6d354366737b8a561751557980f866dcd071baee5de3b089221cf6cb3ffd61d26ddd7d2f6f7e18d0c0df19ad94da1678 WHIRLPOOL 95b9cd693c08de74cd7aa9ef029822d2f0debab0f63658869d2ab3d5e5a970ed8b2bf049b414c3eec5618d4b726f32eb19ff7a01c99ffc750360d6368416a92d
 DIST genkernel-3.5.2.0.tar.xz 291956 SHA256 a2bd11be022f61d8ce734a1755228d5a217064341cd99c8ca8a1f3887ffb1b09 SHA512 3ac1c06dcde4008b5bad4441347e278717b7bc8560c300567f4d2ecf0603249845dacc19aa29483a0801eac073c8150d6d11b4b4edb80fc7cd5cf44745f75045 WHIRLPOOL f8b8ef28340514e8a9044da0ada619f4a07ae48efe99b644a1aee0ea062b8e3b9273d67e02da9b4383300f91d5bfbfeb98146443bde97c21c52680395f0522fa
 DIST genkernel-3.5.2.1.tar.xz 293680 SHA256 8682e937ee44f1fe82a3e546acc3de542069a368e59eca9691c0ee6250992eee SHA512 94dd1e4b09578b1563db5152af1f651022196b05492ef69cd7330fb05eb3c950d71b6b5c5e228c8316ced5130cb7cd9d4a24ce31c5ada093e173c9f67f309789 WHIRLPOOL 91f276e8e6ec641ddf544e3e993ddfff3fead9f685a1ca5393d879910fc8cce77fc8d79c8a6bd4080a3586bc7571969da40604b18e3030dcb48ac75cd6a8d369
+DIST genkernel-3.5.2.2.tar.xz 316632 SHA256 9a39aa65a01a543a2685610397a477823523251621caa183743205294b680851 SHA512 c98f836d92b2a940fc76e9c9b8799c19a55f6ac818fe74280321a954361e5d0886095d0b95ef429791161fb67afd3d7fdff518cc99c58bdc120456f7321c8edf WHIRLPOOL b63aa97a9ea479e5d3a6a5df0ca6fc01b67f83091f34462b75c982c5f335cc287285adfa4152cdb6a6ba82c61dde358c67f7aef311cdcaca62ffd83bd007bc78
 DIST gnupg-1.4.11.tar.bz2 3407075 SHA256 d18ceeac16e554a501170b9bfde611625252d0fe9448685a69c93bf149ee6ef6 SHA512 97e7b8b0f972cc2f7cabdb0e013cbee1c33e7d48407d040cca5c2037e32abe1c2100194be7d3b569d4f05eb16b24c205a5b83f06718f0241f8d4ee174f1c37ae WHIRLPOOL 6f914627e2f527f6616e1f99d2ae06942b734f839d03a45ffa45bf67516a81d58f89e6a85612cf8e5fd83be04ab0b6bc2da8f81114143dad7523e5fcea62366b
 DIST gnupg-1.4.22.tar.bz2 3746546 SHA256 9594a24bec63a21568424242e3f198b9d9828dea5ff0c335e47b06f835f930b4 SHA512 c03acac0fa55761470bb085d78a44e2b99ebb187e8396cbb031a184b1e40bef2a40c91da07755d1a20610a3daa6aa1eefea2d12a0dbd5a79a45466166419c708 WHIRLPOOL 3d5f09fc43bf3cf316934c0d0a45a60252dbabe41d12251a93f01f1691fe2436a6dd295b1b4505177281e33611f1911b4a03eaed545810053cc110c6ed539304
 DIST mdadm-3.1.5.tar.bz2 292709 SHA256 1d547d0b36a88968e9fc9fb08b0e64de54a53f3d1cfa3656a9f319180f0727d3 SHA512 6fcf426d63ede01f99ebeee9be686857a04f9b601b37f76722c091ae2999b3ff66fdba52d47323f27900553125a897fc1815fe7be850aa9cc991dd5fa91a5d5d WHIRLPOOL 003595a1338b3a95ccc176b07a31f26dd5fda9460f2c4d3513b9ca09cdab1c91dab05f8914f2354047fccff42c4dcfc6131a383c84467c2838ac7b1af2f9bef8
@@ -32,6 +33,7 @@ EBUILD genkernel-3.5.1.0.ebuild 4722 SHA256 55fe3b3d7617afcb3bda89cfd1637114d543
 EBUILD genkernel-3.5.1.1.ebuild 4722 SHA256 55fe3b3d7617afcb3bda89cfd1637114d5433fdc72c8c3e7fc713955a4daf16d SHA512 542b2e9adc369e57b84004c481db9a74a8864f3de024c5d332e9ccd9ada0bdb93545f2831a8a6725910ac30c9384be9313e18ca4a446958a2048b6179cdee641 WHIRLPOOL f835972b81a08bcf3664c32008f07da9a57d4c9352fad4c70369a5606e1db33e3c6ab34a328d9e8395209e24c923a26a42d041c556ce9f1da87e2e4589714763
 EBUILD genkernel-3.5.2.0-r1.ebuild 4967 SHA256 8a96eaaaf8629a631c19054445c109272ac944ca5decbf6e0d06eff6489ed2a3 SHA512 8db5f79f89922feebbde110d2e68e2d41171615c9c624e5f03ce165abbb4c42a1898e138caeca8e0b3904e62d72521335eb4a44b5263b6f0c0d3b809b8f46142 WHIRLPOOL 593549f3b298705ec8c6b33afb797f8676010c650d3138d7d3bb9be19f5e990cb3236c7208ef2d8796b5054b3d7faaecb627394bead652f26ae36b7d4bb61388
 EBUILD genkernel-3.5.2.1.ebuild 4967 SHA256 8a96eaaaf8629a631c19054445c109272ac944ca5decbf6e0d06eff6489ed2a3 SHA512 8db5f79f89922feebbde110d2e68e2d41171615c9c624e5f03ce165abbb4c42a1898e138caeca8e0b3904e62d72521335eb4a44b5263b6f0c0d3b809b8f46142 WHIRLPOOL 593549f3b298705ec8c6b33afb797f8676010c650d3138d7d3bb9be19f5e990cb3236c7208ef2d8796b5054b3d7faaecb627394bead652f26ae36b7d4bb61388
+EBUILD genkernel-3.5.2.2.ebuild 4967 SHA256 8a96eaaaf8629a631c19054445c109272ac944ca5decbf6e0d06eff6489ed2a3 SHA512 8db5f79f89922feebbde110d2e68e2d41171615c9c624e5f03ce165abbb4c42a1898e138caeca8e0b3904e62d72521335eb4a44b5263b6f0c0d3b809b8f46142 WHIRLPOOL 593549f3b298705ec8c6b33afb797f8676010c650d3138d7d3bb9be19f5e990cb3236c7208ef2d8796b5054b3d7faaecb627394bead652f26ae36b7d4bb61388
 EBUILD genkernel-9999.ebuild 4967 SHA256 8a96eaaaf8629a631c19054445c109272ac944ca5decbf6e0d06eff6489ed2a3 SHA512 8db5f79f89922feebbde110d2e68e2d41171615c9c624e5f03ce165abbb4c42a1898e138caeca8e0b3904e62d72521335eb4a44b5263b6f0c0d3b809b8f46142 WHIRLPOOL 593549f3b298705ec8c6b33afb797f8676010c650d3138d7d3bb9be19f5e990cb3236c7208ef2d8796b5054b3d7faaecb627394bead652f26ae36b7d4bb61388
 MISC ChangeLog 12730 SHA256 14add548082018ef2c82f46439d5fd00c2982a617bf793c3fc5fc03b75c18210 SHA512 e510d869a00592373d55567b27f46507589c477214a3080c3e993fc6e50c287ac8c7447e16fb629f5901bf87630d025e7714a6b10afb2e121289cbba2577cee0 WHIRLPOOL 8563bb36461bc8dad5394809c5a149e91282f2a6149353e7b64576a29f1ad5543d4d710043392cb747cf151a3dc07202c1c3fd97df8269bb3bb9d435b8e57c5f
 MISC ChangeLog-2015 74270 SHA256 30a980d5d4db610ce073917fff1fa44acb392636480ca413a32ee7f34659fbae SHA512 0fba080bd2985495aa8f7870290f9ae020cc0479c9dd36a46df97871b3243b6e6c8172f84f1c85ddc09560b615073cd8cea58d3420bd08719fd817175c1aded4 WHIRLPOOL 75b22782cfcc4aff766f33d79854855083ba262f5524549dda10c543a38bf046b6ebbfce9e3f83b2ec83753a7d01d28f4f0e86ebcf6796b95589fd45bcea6b6b
diff --git a/sys-kernel/genkernel/genkernel-3.5.2.2.ebuild b/sys-kernel/genkernel/genkernel-3.5.2.2.ebuild
new file mode 100644
index 000000000000..d5c932bcdb6c
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-3.5.2.2.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# genkernel-9999        -> latest Git branch "master"
+# genkernel-VERSION     -> normal genkernel release
+
+EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
+
+VERSION_BUSYBOX='1.27.2' # warning, be sure to bump patches
+VERSION_DMRAID='1.0.0.rc16-3' # warning, be sure to bump patches
+VERSION_MDADM='4.0' # warning, be sure to bump patches
+VERSION_FUSE='2.8.6' # warning, be sure to bump patches
+VERSION_ISCSI='2.0-872' # warning, be sure to bump patches
+VERSION_LVM='2.02.173' # warning, be sure to bump patches
+VERSION_UNIONFS_FUSE='0.24'
+VERSION_GPG='1.4.22'
+
+RH_HOME="ftp://sourceware.org/pub"
+DM_HOME="https://people.redhat.com/~heinzm/sw/dmraid/src"
+BB_HOME="https://busybox.net/downloads"
+
+COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
+		${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
+		mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
+		${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
+		${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
+		${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
+		http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
+		mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
+		http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
+		mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
+
+if [[ ${PV} == 9999* ]]
+then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git
+		https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-2 bash-completion-r1 eutils
+	S="${WORKDIR}/${PN}"
+	SRC_URI="${COMMON_URI}"
+else
+	inherit bash-completion-r1 eutils
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		${COMMON_URI}"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts"
+HOMEPAGE="https://www.gentoo.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT=""
+IUSE="cryptsetup ibm +firmware selinux"
+
+DEPEND="sys-fs/e2fsprogs
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="${DEPEND}
+	cryptsetup? ( sys-fs/cryptsetup )
+	app-arch/cpio
+	>=app-misc/pax-utils-1.2.2
+	sys-apps/util-linux[static-libs(+)]
+	firmware? ( sys-kernel/linux-firmware )
+	!<sys-apps/openrc-0.9.9"
+# pax-utils is used for lddtree
+
+if [[ ${PV} == 9999* ]]; then
+	DEPEND="${DEPEND} app-text/asciidoc"
+fi
+
+pkg_pretend() {
+	if ! use cryptsetup && has_version "sys-kernel/genkernel[crypt]"; then
+		ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
+		ewarn "Please set flag 'cryptsetup' for this very package if you would like"
+		ewarn "to have genkernel create an initramfs with LUKS support."
+		ewarn "Sorry for the inconvenience."
+		echo
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]] ; then
+		git-2_src_unpack
+	else
+		unpack ${P}.tar.xz
+	fi
+}
+
+src_prepare() {
+	if [[ ${PV} == 9999* ]] ; then
+		einfo "Updating version tag"
+		GK_V="$(git describe --tags | sed 's:^v::')-git"
+		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
+		einfo "Producing ChangeLog from Git history..."
+		pushd "${S}/.git" >/dev/null || die
+		git log > "${S}"/ChangeLog || die
+		popd >/dev/null || die
+	fi
+	if use selinux ; then
+		sed -i 's/###//g' "${S}"/gen_compile.sh || die
+	fi
+
+	# Update software.sh
+	sed -i \
+		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
+		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
+		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
+		-e "s:VERSION_FUSE:$VERSION_FUSE:" \
+		-e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
+		-e "s:VERSION_LVM:$VERSION_LVM:" \
+		-e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
+		-e "s:VERSION_GPG:$VERSION_GPG:" \
+		"${S}"/defaults/software.sh \
+		|| die "Could not adjust versions"
+
+	epatch_user
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]]; then
+		emake
+	fi
+}
+
+src_install() {
+	insinto /etc
+	doins "${S}"/genkernel.conf
+
+	doman genkernel.8
+	dodoc AUTHORS ChangeLog README TODO
+	dobin genkernel
+	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
+
+	if use ibm ; then
+		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
+	else
+		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
+	fi
+	insinto /usr/share/genkernel
+	doins -r "${S}"/*
+
+	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
+	insinto /etc
+	doins "${FILESDIR}"/initramfs.mounts
+
+	cd "${DISTDIR}"
+	insinto /usr/share/genkernel/distfiles
+	doins ${A/${P}.tar.xz/}
+}
+
+pkg_postinst() {
+	echo
+	elog 'Documentation is available in the genkernel manual page'
+	elog 'as well as the following URL:'
+	echo
+	elog 'https://wiki.gentoo.org/wiki/Genkernel'
+	echo
+	ewarn "This package is known to not work with reiser4.  If you are running"
+	ewarn "reiser4 and have a problem, do not file a bug.  We know it does not"
+	ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
+	ewarn "broken in this regard.  Try using a sane filesystem like ext4."
+	echo
+	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
+	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
+	echo
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 8d50acb10359..8f81123c884e 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -16,6 +16,12 @@ DIST genpatches-4.12-15.extras.tar.xz 17340 SHA256 b22021fa7cb0f4254273fe61ba14e
 DIST genpatches-4.13-10.base.tar.xz 185668 SHA256 5388bef725321c0925413ca6d194502e1d2aa76a23cd24d37f0d7a7503bc2bb8 SHA512 9c8ec7eed0847c3555e66f982484ceb92301cad82f9165c2d828c193019d2067200c2155ff79ee995955512076eb6877577ccb4a3835f1e70aa6210cd41993ab WHIRLPOOL 01f030cc03f99d4858c6f38f21c2db52aa42b9aa9376069b67e2c7d025861be2c9ec1cd9eea49a0f59d5d32855afdf563e0f76cbe30bcabfe37f7d8fc7296f54
 DIST genpatches-4.13-10.experimental.tar.xz 5184 SHA256 0b4da9e8c97825c17b90b86ab770fa27c6cc09df21df6e263c6a72adebb4d0b8 SHA512 39a83b4fd596abc6d4004069969231ca8a767f72ba65aefd22ede2019c6436fb00d9e4b1426addc3e4dfb4357091046c88bd8d61895d45354cbeeb013ab601d3 WHIRLPOOL 35cd5b6164a6a77240149e99222a0bcc4308877b9e78005397fd9b321a2317717e8915b38159b7db76f2dcb577649777e1a1df16758b8be3a8be44e667175a02
 DIST genpatches-4.13-10.extras.tar.xz 17400 SHA256 5f46f20a84b7a93b6f6d9faecde83999528f033a52f9435f0e91b737a13b98cb SHA512 882f0d1461fb045d54ade39a7d432f9cc4bac27c07600074a4d714ecab42a6c96eb9af5f0cdb71c583afa3f5ff8b32616462957d9bd8fa029d5f1df1f6f8be14 WHIRLPOOL c18205fc69ecb06aaa36e339548a59659c06f8fb021bc6556d49d249f2774b6870ff8e0d7d48386c5bc0bab6af70bba884048d3d8afc4852dcefea0d7ef01739
+DIST genpatches-4.13-11.base.tar.xz 191900 SHA256 10a1f083294d384ef773daa5b21e7cec5ba0ef308a3174d82840b040848b5361 SHA512 0d76a0bbe2e02e4c69ceee63ea99085eb83289a189821426c2a0b852a9f84d9b4c314be823933aa3a54e341848dcbf677ec5aa41da204075a8d190d976ffe0b1 WHIRLPOOL 168a842efa27a9c217a40de4346a5f39066bc5b8744ba18caef35fd2e18b2a389adee3b0d279e2bc1fad06ee35e23c55c62a559a53f63db9dc677f6b421c2866
+DIST genpatches-4.13-11.experimental.tar.xz 5184 SHA256 6c467a131de9f49b78fecc652cf60f508f54a4f76a1fe150ef3f8c7c23f2429e SHA512 920e3092cf3c984448d2571561d8a4249620fba60090f7939fae5667b830bb47ef2fe04453c4474117a1ab9ddc4b19c710e7ee7f75bc14b3d73c68f865a769f4 WHIRLPOOL 87d85128cc0291d93f69793a98adc592f528bc7bbb14a8910fbb215d47d8ae9766d33a918e10aeaada7782af43ec013919d2a739895fc15a24042bf8a60a5256
+DIST genpatches-4.13-11.extras.tar.xz 17404 SHA256 75d973ece33bfb4cecf0a32282712c549303ae806f05fa9077395b0db068c125 SHA512 4a0b196b4a7633a71d51b413b3641047228a1985cc601941d088329d884d39d9966de01fecd17f4a5fc472cd9a41a551bdf2819fb3b6928ec2af4596b60a5689 WHIRLPOOL 350b1b91d604ac26bce8f6d67da63926b37c6632b2ca49144282783198db582c00c6f8332423ee2aa19924a231d5a78b5157d8f971c79b0ed02baa429278f8f7
+DIST genpatches-4.13-12.base.tar.xz 219808 SHA256 45c1632713fa9bce7d457adb77605f24b4fc8e53c9173832f43c054595d35884 SHA512 65e1f5bebf942d73719becc60d0c46171176cf34e036374b44232e1de645205aebbb1da90d9e82699bb65dc69b78dbc5b76d39d8a041397c2508471fddd20b6e WHIRLPOOL 3e9b13e9830e99b94653d039337cc8f8cc462c8d526cd98cb70fe350fd5aa2b742c15bb2558e5e084d657cfc7273aa602bf61b60230a76e88891c41595b79e6a
+DIST genpatches-4.13-12.experimental.tar.xz 5184 SHA256 abb4c385b9e5fa8d239533c02cc797ea3bbde6eac88494baff2a429ca51f8710 SHA512 2d23dbdb14ec619aecc6ae854aeaa8094a689a17a9453383f27b57b226bf23121574c41dafa3ad7744011000bc990c92f4f65a323d38a89675777fbb61083c31 WHIRLPOOL eb9cebd6aab7f4fabff4ba8f24545f381d1468f6b995a6829d679fa88a8f9a2c4a451e803274777601efb7d8d823b97ab991ceb64ebdcd70b2630a2d80ad64d6
+DIST genpatches-4.13-12.extras.tar.xz 17412 SHA256 1570e22b14044fd5227d2bb9c632ea5ef07304636784939c3806e0e9eefded2e SHA512 d348bb190a41526ae88cd82d2f77f0ce2bb50f9a8332daca92e09de078f70db6b906f4380f7ef85b807dc5a6cf34da0bff7afbbb68de3e483a5f26de352348d8 WHIRLPOOL a53f00874064289dce27591e3580dc0ceaad0dc52fd65b0237861254c8b016b82479dd8e3478a97baea8fc365b82fde34e89b7c7553ba19e553d0398d02367a6
 DIST genpatches-4.13-3.base.tar.xz 22596 SHA256 112866c090fd45e88c7274c9e477baea9470267a394b5ec1b35d0fecba920612 SHA512 245f6ca8de42ce57ca1316cd30f7bee1417ef15c9e0b8c21fd318d34b226e9ed18cf856695b9ed05ee1ece178bfa81015ff61c573709271c8da7d8072ec7ae12 WHIRLPOOL 2afa998f2d1bf69efd7c18656b475b7fd9466f3fbf1ead806817005f96269a540fbbe6e4b82aeb5513653587fc1760fb3fff0528e514e3f4a6620d219e2747b6
 DIST genpatches-4.13-3.experimental.tar.xz 5184 SHA256 ced2ae1d1a9720e9ba35baef2a598c74470af66168b5d052854753c21d1ef287 SHA512 0ebe570f17c83d9179de527fe8710d7f664d4fb56c7843eb83173886a83b374ef633f3848386f8ffa5e498cb9f0510a4afcc6336e54105bc96271aeb9b0570fb WHIRLPOOL f3996bc58a7fa1ccb856ef2ea8b27035fdd4bdcc6aa52a0b1a3f8774769e95043f7af902d23fbebd7b35c69a0065ee3329363716b4ced157b9749cbfba396070
 DIST genpatches-4.13-3.extras.tar.xz 17408 SHA256 c9ad579a61c6f6950f404ca5717b1e3cca83383fb138594e708723a49474cfc4 SHA512 07543aaccc8d3c8e004d6bc30c551238ffae73a67f025a6a69e1dd7d9840a1023cf8a2c753ca49d296ff0b0f2937ff43c826e3341e5b35fa274e1d02a48af57a WHIRLPOOL 8432644e63e667340c47c20efaca6142c82e69a964cae3dee7644c3598e97b6b0cd0a4d8710b0478275dfb0391441c01608f5f30b6a6de493e807fa5b3650873
@@ -58,6 +64,12 @@ DIST genpatches-4.4-96.extras.tar.xz 16456 SHA256 7a0ab837e4b2fd039433040ebc4c9a
 DIST genpatches-4.4-97.base.tar.xz 1489220 SHA256 8183380ddb1dd6e7dc982f6c423613005aa817a107403ec237ea8dab7005488c SHA512 0f092192823630652aa8e18c7cc9651b063470a2f475ff243aa28505145775630c6191795b39dac478589bd1455a7a7540eb54c0e4eae52dd1015f1639989702 WHIRLPOOL 51c9c8f328fe6a3e4d2b66e4248b9ae3c1241dec5b4005a2f13a7e50e8ad65f5df9d4ca6d23fcd5d5ebaa72d338560dcfc2f1ca37d089a4a8fd2c956d35f7f8c
 DIST genpatches-4.4-97.experimental.tar.xz 87764 SHA256 8dd04a7a4196ae912807fffdb7564397c50cd67de2113becb356c5f1ac4ade8f SHA512 586a48e09fe006202ee14e6342989ec679fbe6b56fa4c4c4f3c4936d6f451e88a542059230277cf96ee7a4ba57d69a9f772871899be5940aafe53e31ce619bdf WHIRLPOOL d597907b56f39ffbe390c659bcae82a71914331d310912719523f1d816eb1e5ab8ef93783c6ed8e1aba1c7b419a491c774caf26159e9997f7ae6a4c5f3a3634f
 DIST genpatches-4.4-97.extras.tar.xz 16456 SHA256 f04fa48da7dd79dbaa2e78ab307f31e6086e30b7e73d592a1eecbffe0636e4a9 SHA512 8296c314cfffbe8dff89a536e11fd676f95d5fb5f8fa36df73d5066a7da2dc46efc0e531d0eb5a721b1ebcce4e2dbc65e81acab717a9f7c4aac33d618a03a989 WHIRLPOOL c7ce2d0ca2128d4ced77cc955187cbbf64d6eeb2b2f18bba5839ac4777229c702de4a6af859f5d773bf3e8b4c5bcc0cf36736266b2079b350a51538c30977794
+DIST genpatches-4.4-98.base.tar.xz 1497988 SHA256 ae0df9cf28dd75a7227588c2ae551948acfe798dd7f005950ca9fe502f2c3ca6 SHA512 d194b0358b0b95950c61479e7a117bf8ccde7dc0d20d834c1f67c75e00fd03ca7ded4c725d2d03fba0c13be66d769fb6680240df71c6a759f8866f2307a435e6 WHIRLPOOL 7a875fbe797c5811448e8ced815f19b8565b698fb2c78cdfc553a1383f4865867fa534264a23c2f4faf497e9fa9c0c444f3b44f0337475a3866bd40f38dfa8a6
+DIST genpatches-4.4-98.experimental.tar.xz 87764 SHA256 8dd04a7a4196ae912807fffdb7564397c50cd67de2113becb356c5f1ac4ade8f SHA512 586a48e09fe006202ee14e6342989ec679fbe6b56fa4c4c4f3c4936d6f451e88a542059230277cf96ee7a4ba57d69a9f772871899be5940aafe53e31ce619bdf WHIRLPOOL d597907b56f39ffbe390c659bcae82a71914331d310912719523f1d816eb1e5ab8ef93783c6ed8e1aba1c7b419a491c774caf26159e9997f7ae6a4c5f3a3634f
+DIST genpatches-4.4-98.extras.tar.xz 16456 SHA256 f04fa48da7dd79dbaa2e78ab307f31e6086e30b7e73d592a1eecbffe0636e4a9 SHA512 8296c314cfffbe8dff89a536e11fd676f95d5fb5f8fa36df73d5066a7da2dc46efc0e531d0eb5a721b1ebcce4e2dbc65e81acab717a9f7c4aac33d618a03a989 WHIRLPOOL c7ce2d0ca2128d4ced77cc955187cbbf64d6eeb2b2f18bba5839ac4777229c702de4a6af859f5d773bf3e8b4c5bcc0cf36736266b2079b350a51538c30977794
+DIST genpatches-4.4-99.base.tar.xz 1507732 SHA256 749f1b3b3add97f0353043e6448c3e398a88001706861c24301e023e4178d637 SHA512 fe1cc9fa965fc42d647898fed34323988c6a4b38a747568f6710293d0aedbb865aaa50821100b8c240f7ad8864bde44de3953c3ebab5147c5334bc4aa423dfa5 WHIRLPOOL 1a8f885fb1f645bc3ab14225c601c6bcf04a39802f462e3522d05bb814ddb18565917d5f1b72d8fda75e82395320a8d72001c10b5260d07c3429c652e7681ac6
+DIST genpatches-4.4-99.experimental.tar.xz 87760 SHA256 973761f2cc4bbdb925a53202dda1d73bd4c829cfb2df0566fa610f5d6a4aa695 SHA512 40f7f034dd40802adf2270ca5482c8db1a63533a552346dbecbfd4ae925430b50e712cf9fda3fe1c5993215fe4342c86bbd75d6f31c7e75913fc6623c9fec228 WHIRLPOOL 512fd7d1b9c1910ea9f50785aec129c75dbb6e3f2e8dac3c2012d00b5b89be0e5e8bb1429d121dcba708d26b239ffca19e2885f9d4825540f3f80a6a0f218dc0
+DIST genpatches-4.4-99.extras.tar.xz 16468 SHA256 81dfdeded11c555682d1f634f28e83c38d3b4ec0b2d365cca145ba4a4d54118b SHA512 cce5dd2620edcd13892fe3de55f098c2cd080591a47f08310c3925cf9776c33ff6547792f7c8cfe130ed0c54cef4ea7544e2a28e6c1a37f9d89d6959db56b024 WHIRLPOOL f88d032ae35017ed96d1435a4dbaa9d5f2499321f86fb0c6a53dfe3b00ee873109b3fa9c6299cfea42c8e7a43d4a7a368760fe61b3f4a286827355a075e7e020
 DIST genpatches-4.9-51.base.tar.xz 1001928 SHA256 4a329d66dedfad74d8d03bb3d13b6aa2ef04d20ccf2520d39b72b0afab5cbfa9 SHA512 2ab0efa23c556547bd223f066acbebe250346064a3588ee866871e36e3b5b5533ca7a3add6a62b53339acf89dfc8539c42b3877b5a2055ca7e20bc25c5657ca5 WHIRLPOOL c73a7b7c12e399439b3f97061646aeadab5120aaab2c8f8852416ccdbb6a77949b4946a31c1abad910ee1fbc837bef3e86975fd9242a3b8649fbb77f0dddf7ca
 DIST genpatches-4.9-51.experimental.tar.xz 106416 SHA256 19a1d1355f4328e9703157b2a37acd97af98952e73c6d3d18b49f6a35a6064b3 SHA512 af7a00b9a3200a50341b9af607fbef362ead2e4f5ca35d58eec505de490c03d6366ab4645e35bbddd6903ac75396413d2902b6a9fc7e2c9d0d1d1254620cfdb3 WHIRLPOOL 23d8d92dadd653c1ef59d8aeab08f3e10246e3dc73ac8e106e1bb51b18c597324188eda0775095d3759829c6095cd06e9634431d86900ca3aca0ec6719ab2ef5
 DIST genpatches-4.9-51.extras.tar.xz 17356 SHA256 71d1693dc64d8473b41f5e80e7727b6cc0a74fb632511b3fec0b46a57c0dc26d SHA512 e05c44a5ad1b68afb04647a86efc6f67e03515861e670e39f960c0a02b87fbcb71194efa6773259ee2be5c8362794a5bb6512e876784d5a521d8890865b3ba0e WHIRLPOOL 50d19a31d7cea180980fefa87ef14d13d844539968a353a4c15e86c86913b66e2c8abb45fde999878afd96b78a4e9d81158716a1cbc0f7a6e5fd5c26b33b05b1
@@ -79,6 +91,12 @@ DIST genpatches-4.9-58.extras.tar.xz 17348 SHA256 538ec1d455e26781b6b898b172c324
 DIST genpatches-4.9-59.base.tar.xz 1133092 SHA256 691f9860aaa31ca2da288aaf9f808c506b39addc19772d6f84b57732d2a7679f SHA512 b1395a77963b2b2d73635a5b9a1d610cd7a7f9220d469e6a7f4fb02ff10cc9267fddd862d682e5bd4cffb0128d48c89dcb52ade45a56021b0133f483a26c9875 WHIRLPOOL 5ca080c8560eb62ef342fd036b4e6db12b25c827a1699f91d586444728425ae472632ade2fc175432a4fd8b49fc9bd18ac041ce9130a18ddade05a52cbfe9388
 DIST genpatches-4.9-59.experimental.tar.xz 106392 SHA256 ccf9f18a3dd28f69aad8cd34d513d2b5676cd726289d940d17b7278aa266f191 SHA512 eb8a1699a8c68a91e00bf65e0455c432ec3a6748080bb2df5fc7b6070e3626967927ecc8b64a4344bb2efd753f70c2fe4f69cc8e7de5ce337750dc908c4b5e4f WHIRLPOOL de3da93b251f43faa8b7a80aeb8a28c8f08b9578ce5dc56bee3f941efca3165b8301ffb403ac4f84521cc9a49682850b58e6ed73c0cea3b53edbebbaa60e8b00
 DIST genpatches-4.9-59.extras.tar.xz 17360 SHA256 be21758bdec50724d687d255b516bf8735d026c603f260644c7b08ec9352d624 SHA512 79a2c47aa6ee6191b5a6e4d17835dab90e747986b6b407a12afd4e343663a4ddb4066c752a65196b534dca102f3843f927b1952e21c3f04e04a28dbe30bef0fe WHIRLPOOL 07cf4232e3061a677317ef4444cd41dbdfbee3ecf6c870e55b291a1e2a6cc0e1bc2bb89cbeb3e1c910efede109fd766f852c2a52aada60f3e04db581ec39dfa0
+DIST genpatches-4.9-60.base.tar.xz 1143868 SHA256 99d045a8f2ea7fc91068425d918f850ca79d36b5e086e8bd5fb543d5cdd7072a SHA512 8457d59adc55785736302698e63d4c687c76b72b2457ba3828da688b215b8d8562ffbd8a5e2ad2b30249863c85d18ad93f74e9bf8494420cea57fcc1e9a7f602 WHIRLPOOL 093aa2d3b5a6b2667380456aa5c74362c2363b8df15a680dc900ea6834566fe2363620f8358cfc79117399a25f71e3afa3ddf3e16787d135ad1158d8e44d4b4d
+DIST genpatches-4.9-60.experimental.tar.xz 106380 SHA256 d1a45c76cd2e155539b915d20f8bc5e20ffbf9ebe7ab6763d42858cf0acd9d55 SHA512 58215551787d6db5000f8ceedb6a0a10d912ff02b4acac8017aadba49d78caef3d0755ed79996bcb68c3a63cc56ca3f0fe0f308f19754b1cb60ef9b2b601fa92 WHIRLPOOL d161f8a5179ed4ce2c350045a772cfde71bf8387dbcf3c61ae29c51816dcd47c29ae7688bed5f59955b1b8f53fb33031c95b87b6ee6cf38f93a72e0026f35dd2
+DIST genpatches-4.9-60.extras.tar.xz 17352 SHA256 24fc73022cb7989f7b7bb70bd6e0c4042b8f643ae988ae61a3405f86186fa0c0 SHA512 442d6daec709a58a08f3faaa21264f45a1291d12175d83a1fb0551dd870484d2093a2efd715955d917d848c600ba5a45c15a79c14fe7a6c18fa5fa2a67099b2f WHIRLPOOL 2e8d0a6ac19c991b76bc6712a6e542eae56e6417ccef9006b7133f50af55163f8fda930a656ab839699b6538d524d55c0db22eb08908a8b9e640aabbc54b46c0
+DIST genpatches-4.9-61.base.tar.xz 1158552 SHA256 2fc651e767d18fdf19e83109afafac16f18a5a76e2cbc131e32a8229b3198436 SHA512 dac7ef5bac6a116c813e614861be3304fb21d5fc004fb6e8d1cb7f05cfc7c4384dfafc8d8482efa737d4cbaaf110701a1c8ed23116aaac394b7ae3a38ac7c785 WHIRLPOOL 2c800f9ceb1b25bb646e283d67fbe6af7e7f98105e4f94a0ff7ae8e0ae31a7c85bd1eedb74ea8cf02d477e9096cbca1056ae55a7f06ae6188b960535b61d6f02
+DIST genpatches-4.9-61.experimental.tar.xz 106392 SHA256 fe6c42d115c1779f39fa83dffec51a1fb0815fa48ce797e3d1b78c7f488bd468 SHA512 5dc9e00964aa44a782dffb447b13fca58f234627882cef0009c53f747bf633ec9138462cf58b12f288545e2af5a33cfb2adec49b3cd1a0da96d7967e1eeb116f WHIRLPOOL 7c320f2ed66305128ed59ea05572fb1774b858ea8fb6553ec1a067219ef89256c9a8bf98bb25a4d53ab18fb00a83b916690fd8c0d0981a41dab1f817d987ce55
+DIST genpatches-4.9-61.extras.tar.xz 17352 SHA256 b26741cd2078757609ea6952467a56e0fdba6db3e70fe72cbd0b252d42d4d94f SHA512 b1acc2fe16a07d8927f5b2c21f982fde4dda608d9e80db8cd6c60739887d84a86792d39f8975920276987880ab344a58ef493816061f926c27cd7b059bcf5552 WHIRLPOOL 5fe700e29e3467900197b27d2e6e875d07cb10ad355ce73bcf2d74a5860444860cf53f4a924f2ecd31383faffd914a1e4b33acf5a2941a391c8ea3d55403126f
 DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
 DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8
 DIST linux-4.12.tar.xz 99186576 SHA256 a45c3becd4d08ce411c14628a949d08e2433d8cdeca92036c7013980e93858ab SHA512 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728 WHIRLPOOL 3b97da251c2ba4ace4a27b708f2b1dcf94cb1b59aaeded6acb74bd98f0d3e33f1df83670665e4186d99a55daa84c88d539d93e20f0ff18a6d46ef326c48dd375
@@ -91,6 +109,7 @@ EBUILD gentoo-sources-4.12.12.ebuild 738 SHA256 508b0e6e0335061a18412f394c56ed15
 EBUILD gentoo-sources-4.12.13.ebuild 742 SHA256 29045795637702831766897dc235658663e08a7a0b7c39add17acf44c0e9fe12 SHA512 4f5cf9c4458e29f0e3b3936e1b746bd04670ee5169de35182e2ad8332dbebfc82eed1e15dbfe2b581dc25f09f470d7cef68b40a3bb9f3d3545db401f0c709362 WHIRLPOOL 1deca7b4b23af6ab3fbfa2ad2079ef93bc8d67f330358453bb7e5514cd76780414eafdf3c6a8c6d48b2b7df01a4ba8b1b59e702de925c85b73463657d18cfa91
 EBUILD gentoo-sources-4.12.14.ebuild 742 SHA256 4816ef4ca5ca6137a86580d9789c28c0e289137070fcc9529af0083a709b159b SHA512 19526e1c4554d9e18526ad1f71815396db6b6f46286fbe0a2e3d9ce0fb48367ca4891464d662d36225ffae70133444b3c0bc85e150008efe108e7c8dc7db3acb WHIRLPOOL 2fa53279e439febf4b43b0757814b176f2eda2dbd36391228d7465caa67a96e2be2f441758226bdf54c28010c49d113f87029937da990001c724d01b74a09bb8
 EBUILD gentoo-sources-4.13.1-r1.ebuild 741 SHA256 92e0dfdcbb2499beb74bb68f19fa532e41270c81969354bb3584680cba1d1326 SHA512 fb669b5b4272b4dc21408ea221c3ab15e2919419bc70c74d1f7393e50ce09e2d090f6c212a34cce0a2e4fdb0330e52f81ab66cd014fab6a7fef8908cae9fb9ce WHIRLPOOL ef6564e00cbf27fef71ad9825c22e5e3f7e7267c33bfa12f1a8246cd90b602fe751e5dc563056fce9ead0b872d1825ad32bc4167358d3069079c55385c4e253e
+EBUILD gentoo-sources-4.13.10.ebuild 742 SHA256 59e360d04298a59dbf4963dd19abb1d4f41ce445a948d32dc3aedb3b42ae8df8 SHA512 09786f2f434205a46f4e277856fd9f4d5870723749fecac19fee24448025cf75ea1e03425b699891ca022927fec75a2e643fdf247145daedca0265e200f47f7f WHIRLPOOL 54f234e1f5233734e8eb602278d75a1d0c26a059cf3b4563c499049b8bd5ab227548f8923570bc5bead2251359bd3fd2a45cde172e17741958d17904731e20ac
 EBUILD gentoo-sources-4.13.2.ebuild 741 SHA256 5fa249c24ea3393561a7a562b763a8c7011a794ce3eeb01fdfbc5213ee9b80a7 SHA512 a3140a6217d52eaf5eac65a328fda5ecaea340e6d0102bdfde178bc837ef4f7fa9c849aab734968c426bacdb96b44da0b25a6601e1f28a6a8e40ee745d4a940e WHIRLPOOL 75db7782ff436d09ed3301e382b4898ef336aeea3ff875ec84d9d9bb3a63f8137fef329aeabc11fb1eb69dc942edef7036bee2ad65ee48277c48c0a623a6148b
 EBUILD gentoo-sources-4.13.3.ebuild 741 SHA256 520e638fa8681e1a617196918fca6b048d2872d14635df9f6a6d09c449d5cc52 SHA512 6528a95e5c2b83be431339553ea2ba60667b9a675af1d62ec7ee6c0e0ee664653388182e5f14eec65bb0096885f1e73dd7cb969922f57554671da2d3e965c351 WHIRLPOOL ccd24bdc0235b852de874fbdc697439dd21797e5ed840b471fc9321363cb12b70841c73bddbcde140f85e807e8520ae22ad2930f931cea0af680b5904e0c304f
 EBUILD gentoo-sources-4.13.4.ebuild 741 SHA256 4eb9c3d37fd31a53c9fae66ae789cf71557ac78c52ca9e736b3ab978f9972c3c SHA512 5c4ba68cd82fc6dc9d12f2be0cf068b738f77f6bac8d0c8281a61f70ddea4ec2493a98823983c26175ebaa4cf18e36484d02ff49eb4de11c34a72cf4fec29bd0 WHIRLPOOL 3396e4a3cc589e3fd9f965e6d396ebbb1bdd8255fe0e3a9d8264b83a28d945dcceb3a938c12ad2fc5d074ab152469537f6296943371ef4965844776d374b17cb
@@ -98,6 +117,7 @@ EBUILD gentoo-sources-4.13.5.ebuild 741 SHA256 47492a4b589606ab8a1567afc6461c10c
 EBUILD gentoo-sources-4.13.6.ebuild 741 SHA256 e5293566f98e578af8770b38f3e41f6a8b68d64dde54d1949993cb56d49fdce7 SHA512 f532e57cab7ca86c90d3780750f9fbfc619fd5cfbb2f6980b57ed212c1a23709a175ec33d447dd3678368d4a98ff4780243cc8644982f803e303b989994b1356 WHIRLPOOL 409ed217efe6232631524bd0ae1e589d473de243929cb5eb646f97de2c6ac9e790d8b589adc2fa878ea768fcae38af47804cfcea6f5ab03a1986678db0895136
 EBUILD gentoo-sources-4.13.7.ebuild 741 SHA256 0057d229f32cdd726d038e54e701e2841d3bdfdc2677b3f7747b2a90a0071676 SHA512 d81563edd51f3c1fc9fac56461960e10da3752700b232208c07edc1ff9a271d61a5ba3cc6ef800932e7da86966b04affb1c20066029af5cd3441ce79d7e269a5 WHIRLPOOL 3b1ce47758dfe8fdb80e25b094d9c94f6b4fc8be7adf2887e2e9dc2ee0edff7443b56901bf47b60e0ab8f85d868d7aa735e75a7a5ef86d0b5edbd26f38894f48
 EBUILD gentoo-sources-4.13.8.ebuild 742 SHA256 d803df43479f27968e069dda4f11263a31319a996fe71baaf67beedf022cc304 SHA512 d6dada25484f8dba5a772a51d3073224f3e8e4ef72eff9a365c900ae574181e21ee7035c812e068158cbc5916abc874864809973a8435afbf8b2b88c4a939a0a WHIRLPOOL 0171d320b6385de4eaecb62acc71def5a7a945630f189bad5dc3670d0663f5fb70b7b74c19be36a7c1055bb58da889020979586766b0218bd42a5b07be97b1bd
+EBUILD gentoo-sources-4.13.9.ebuild 742 SHA256 27abe206905f26b2db4afc81b8f19af56f47bea33916b837fcd3c9acb14788ce SHA512 d488ac5b60c05c266d1e4c911b6ca341dc024f087ef3896576648f6488fb810733e3693814871d15331b4cf9e7d62da47b3b8456e4fac4a6c6f03ba247bae4ab WHIRLPOOL 851a3073e14999678570fd33c12f9a94401e4bc0dbe1a829c955de0740081a3f3242858180ddfcf3467f21511b6081aead76630d89b7c1e9ccf7a603f76e4321
 EBUILD gentoo-sources-4.4.87-r1.ebuild 734 SHA256 dd44b061141d2d116cfca2e34588ff60addce6a8d252b43a95520f303e69939e SHA512 3a59950c522313a2f9722ae6d4801cd03ddb9430b58f17ab9e8a500fb9a083dc59369de7ad59de1064412f82bdc21396c7280a6af6fcb0a4524ac93f758d85ff WHIRLPOOL 6093bca2f06d92d49241a7fbc2ea68b0306c494dc657d6ac3908e5d5406b60624a75b3a09e063c8bbe667309e31aeced4193897ff388fff11a48b4c9dfd5a179
 EBUILD gentoo-sources-4.4.88.ebuild 742 SHA256 2eef4d5dcb46222d98612ba2c3b2cebc936b2d48e7318a4f02d6048e0dfce86a SHA512 e4e8e8adb7132a19b0740aa31bfbda8209e313dec8f813097ee612046b36f9979744ce41b4cdf119573c5ffd9831bbf3f69f0be12c5586e6d8775f16796c6f54 WHIRLPOOL 1811598ac8c0065bb3798657a14799de1afc3c649f273f34711327fad8a3dafc0c07a717e665658387447b6ccf5b389f49711e0d03143329a83f3517b20af30d
 EBUILD gentoo-sources-4.4.89.ebuild 742 SHA256 ef03c103cf943eda72c589a9c7f1efae21e820acbb09ad7c877d0078de4000f6 SHA512 79f1868dca998e66cf75fe50da1def291f4ab4f0d02333834649a488a9c8b27d0962df1fe8dbefa949ff0b574747be21fd4bc5771aa6071256d05ef9ebd37d47 WHIRLPOOL ac8eb63e97a2244fbb90923daf5eae82239997eadf076f268799dd3d99beed5923b28f27ed0f535ae00a82babacc433dcef8340de1e2416315f33eb9f501cc91
@@ -105,6 +125,8 @@ EBUILD gentoo-sources-4.4.90.ebuild 742 SHA256 4bb407c08b03120f33100c2cb9641572d
 EBUILD gentoo-sources-4.4.91.ebuild 742 SHA256 0920c1554031efb6f02bbe8bd6c5a42157f1f685ee26ff06cae7d7d1fe8b0f16 SHA512 826a1c1169d5ac8536520aac17a8b4ae27b6a96760ab07da79348c26249f0b229409e6cad196b075dd73982827f12d24eacdabc7e6bb5143cf276acab60380f5 WHIRLPOOL 030fecb5332192b547ebc37ff206e198e317cc09d84c41e8dec2bf171f1fb659a4c83536cbf17eef1064596c8b9e620b4631a08eae5cc9dd9dec3a927283511c
 EBUILD gentoo-sources-4.4.92.ebuild 742 SHA256 5055bfc5501b70793a33a66aed2f053fb64dd72ffbabd7c16acec6e182fbcca1 SHA512 f3823fe5da9480c9d24212a65ad160cdd9a488b07cdb8b0af56c1dc81fb40ebc277c31ab6759e8ddde0cb22e6a83765b5d84d37949bf265c58bfcfbe6d3d8fc7 WHIRLPOOL 5a3a28eb7b770b825e1dcf1b89c61b3f7b0256760a1f991c8ac4bb1c3ea058c8266cf9a3dadda04a85cea146470d18d8874e97da3d457ab30f03b5f1caed68a2
 EBUILD gentoo-sources-4.4.93.ebuild 742 SHA256 d835c77a1a026b9dad6b17e21cea18030e464f7760311eefbb8da59eb323de62 SHA512 ecfdb951ec13614d200d82ad62525d417cdf43b166bc0d1502ad338f977ee69b938633cb5b74c1498aa9cdf9ed80bb59e25536c4587238e888b2ac7b23b8c1a6 WHIRLPOOL b8ea3dd10e00966863f957f60764d8892862beb4b1c1dc5c5967ce8bb561f4c994237411683c6b96b6f5acf32da8aeec4053c302602daf0691a4c22a1bee1403
+EBUILD gentoo-sources-4.4.94.ebuild 742 SHA256 f88b6e5d26a71d94db252dc29ce1b30941803923229a23aca9f7e1591b67b740 SHA512 f96799540cd61f10e5ab6a8ae327bb0791123df8932ff21ad1d6d83b5da7e4c3d1995c1d3c3d45c5c8aceb17875bc961f34784368b17629b312ef74b60150959 WHIRLPOOL 3f86562dd0b17efa6e85d5cc40eb8f1b4ab79404d7845673c1f98765cc22fa10d7828b9b42d53d934f4af43bc021d0baadf51ae5d914c6d8a72715ca3f2e7ad5
+EBUILD gentoo-sources-4.4.95.ebuild 742 SHA256 a283c95bcc228b4c522bea195f9113bb3d339610280e3bd9c7b1067fc9f706cc SHA512 4937e2f245a741685c88e6dff5c987d7ce51acaca03264ff3211bb36e8605b0b76eb8a497d7ca6695e2cebc8de03d24f4fefef3ac64554f81438227256aba3fb WHIRLPOOL fde2f0b9caa01cf24127f041d990c79dec0d5fff047b96db86448be2978ab098a2b155ff96bdb8b77ac2bf9f9d1af1a506680c398f4152d7ea061f72f171375b
 EBUILD gentoo-sources-4.9.49-r1.ebuild 734 SHA256 f7ceb31c58ca9122d769c16048c309d77235f1df3d79cb844d3fe472114ab679 SHA512 8a42455eb119e89f3df16a675486efc5ba208a94ac255b0f4033cb699dea75b9ad7fe28acb1df044b73f16f1bb50c08bbc09bb59e541286893048190c5a74a8e WHIRLPOOL 2e971b3aaaa0c11d22072d3bb0dd1d5d8d1920952e32957a2f2a922c1f31283a25df2c369263d6aeaa1f8c0b00de5841644d59b25439b170101b6ad91536d8db
 EBUILD gentoo-sources-4.9.50.ebuild 742 SHA256 6e837c9cd4d83747e3deed86e297594cfc62d596eaaf62d21da2df0f44b05ee2 SHA512 1de3ede5c952108316375f8469a4664f229b385bfc022be6af33c194ecd85dbc7bf67bd485a3b6dde5d22cfa07dbd268fb0125350bc40dc443917a273a226218 WHIRLPOOL 9534317c2c20c9b2f05ef8e412d27b814790745ef5efe1ff8a11266bae0fe169dd9fbbd800e6184a6c15ef58d79c73fcc86f4910d3b06c1128b1a5f930f34c29
 EBUILD gentoo-sources-4.9.51.ebuild 742 SHA256 32e68c1e90570dad78f7eee898aee730a9b6e61103c55c34605379c5f550c312 SHA512 a3d3d7c0096d3c0eeeccfbab71c54ee074a40c7270b097de5e7c293e46733bddc2ea22eb5c4676e0b8edbb215491d8db1d6588053649069393b8af3c346bc712 WHIRLPOOL 2e630a2ba06fd45c6a3e8beff822b9183cf5b4c31dc677880c469617008baedc54de0077ff41a174fe8a5e9be57980d160eec8f94f3569b7ffc847c162279c16
@@ -112,6 +134,8 @@ EBUILD gentoo-sources-4.9.52.ebuild 742 SHA256 03a63edd348351b09133c797da72a67d9
 EBUILD gentoo-sources-4.9.53.ebuild 742 SHA256 7db703016ce8b7afb9126814840b65a93afe5b187d79a5432f5ef7d6d7741df3 SHA512 07c99c36c6e4d84f5f35ece39709eff156dca8d4a39fe409ca592d02a79ab3b8f03adb23151ed7a19f2caf0336a9ae494ffa5dac00a0a17a9b1a50ca5c1f5925 WHIRLPOOL 6773f6850fcb94475dd6380d9cf28c5105689bee4ec8e364cd39906ab95df3132341b958518f7af436f199ddf27d6ca797fdbc7593b7b4ea107ba0b6849b7cc7
 EBUILD gentoo-sources-4.9.56.ebuild 742 SHA256 2d100d936fc3157723409a0880155cd47dacce8ef9aa5e27d1254e81c4ac0c22 SHA512 48ec0b2b025fd98104c70c911c336a3412c77caa9ba07d1892d97f0be369da11c3b9186b903ca53888e6335181c86205c3ffed1ca65cb2896858c164e811c249 WHIRLPOOL 4379b7430452f1759682280a4fe9f0512f68053f2b3fced58687e2e876178a6de31a00d6cd4504799cf42cdeaa06525f185f82540306cda6a3d8b042b18c7436
 EBUILD gentoo-sources-4.9.57.ebuild 742 SHA256 5a17712c78d3776a3c8a878a055107ddc2bdf78025b2c2035e5550151581df2d SHA512 8b69b0e059962d6e04c975b4e19d3accd18eb439f670e9261e2f5648b203c4f7e3b9fa1dbe79523d9f75e56509b91193897b73590900c0a003460444931882e6 WHIRLPOOL 7e7408447b07ca6f795f8f1834fa1a204becd2981ca2a6efb367ee9efb6b4329e1a82a74f700e87ba4b15608a4991a02f6c234e0f3a436536399573832b91e3e
+EBUILD gentoo-sources-4.9.58.ebuild 742 SHA256 45757f1cc8e5e75fec5f994e4641a40a051061103b5d76d32a02586fa423f059 SHA512 3e14b99dc4fa66e2e81300773b91a610a48c404d9aa6ee728fba3094393a01b6597758077be35e9e088d3563cbbb270ea4d77e867a14ea7d8b32a23d7ea95140 WHIRLPOOL 234a9c4de3220e59ac448c4a9de8d7542db21ff0fd29a7590a4654e21d32ef93946d7b928db12fbc81e4325ff159b2e9b6c49519e9a983cbe3004daf5ce57a8d
+EBUILD gentoo-sources-4.9.59.ebuild 742 SHA256 b157ab9485f86800bf10144563e3a7f32795ba1ae11de47008f12a9e12db0cfd SHA512 00b44de87676a9563f9180ab47374cea1196d13a09cbfbfea1e24c865cb4908ecf800f432e7dc23d71a8dabeb967ec3d6e17feaa9bcebe4c174bd8e6b820d263 WHIRLPOOL 127975b1315058871ad69bfc60ce14c8474ee8644bdf0bc21136ea1c1dd0cf4e99cda884ac83e093d0bdda26b6422c75e73accbc4972a6d1108470b749d83166
 MISC ChangeLog 78395 SHA256 25a8f35819dcb65d5e904fbd015117ac25f35312cf6282d0cc9bceae99a47d7a SHA512 3434fc4e494e4463f11a32a940ae9f980c8b6450c8c0a03c05ae4f9b9d0656f2ef345334b2c8982ddf3326e0e259ec04abb2ad1b9ddc50ecf5b2d30fad4a8462 WHIRLPOOL e9977781dc07196c102e5883b0b60aa0ee0c71267e5c59f434e13732b33231dd2ca79c646cf60ddca8802af3a0db663c6ed01ea1f9fc14ab0585fdd542120abc
 MISC ChangeLog-2007 91971 SHA256 8c37498df2246749abb2fd1eca05c396257989b91ba5ec0f83cedb25488118a9 SHA512 2215a9856bc1706abe21ad51d0af6176fec226e85a56ad8f54664d20a041bbe076359347f473a87c47904df2d8d2006d56d1535528b2eb7aa756f96ad9554876 WHIRLPOOL dd881fa7bbfc42ca35a46a0fe01d751b3373ac8f4e2ce5626ff26f94244d729e107f57b1be43daf3b73c2f18b090ee896d8a5eb38888fa9ca01097d1cbd46da7
 MISC ChangeLog-2012 101665 SHA256 a60304f93fc4644cdf0b068e586f6036d4463ea4b21bd745a8aa926da71db6ec SHA512 892085806f4c87f64db78e04d3c215ae6bca8939ffeced8a3792fe4a2476e72d2cc9dbc8a3b906943971eb853c337847e6a8bf976f9496be9944e216fb983234 WHIRLPOOL 590f17b5a90f48fa1733959500ce06fd72f95524b64b6abf508653a616961af2c0ea04ca2dbfe5523ff9dcd3bc67b3b24bc368eb84326d091ca449e558555f46
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.13.10.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.13.10.ebuild
new file mode 100644
index 000000000000..f3862eadebc8
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.13.10.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="12"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.13.9.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.13.9.ebuild
new file mode 100644
index 000000000000..b98eb62ae6a2
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.13.9.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="11"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.94.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.94.ebuild
new file mode 100644
index 000000000000..f8f85bd2a58e
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.94.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="98"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.95.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.95.ebuild
new file mode 100644
index 000000000000..e39168383808
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.95.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="99"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.58.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.58.ebuild
new file mode 100644
index 000000000000..f47384508561
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.58.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="60"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.59.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.59.ebuild
new file mode 100644
index 000000000000..e53afa2c7ba3
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.59.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="61"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 982b418d9234..ab3eb0deb6a7 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -4,11 +4,13 @@ DIST patch-4.14-rc2.patch 50397184 SHA256 05c079b902c0b886cdb27c37d38e52f3d8ae7d
 DIST patch-4.14-rc3.patch 50656199 SHA256 45b73aefcf8e9e7de6282bb0107b83aec8a345d5653111e30fbd8be398906eb7 SHA512 8fd1a56254be222963e8878a5d357012b13dc280eca3c147a03aa50f28457baad7100834e074f325ee62a18648b790d92e4978ef36e8dd538306cd1a2ddc7319 WHIRLPOOL b32b0c16c20af1912e54e367cd93eec61776914228e3cde3a4b38f89122f3338251eff8f831f359f4d27c8ed25ddef130f68c03067550dcab24245d092bce95d
 DIST patch-4.14-rc4.patch 51066860 SHA256 eadd18c5df62a14abe2614b702ef2aab45f352c64aa3532b236def04bfc70461 SHA512 1d7ef59ecb329513bb9cef3d3736d6211a5bb7310ad2ca2c2d50873ff3a64075840f0fea9869b2606ed6cc4e5fb14ffec232ddd354f3a626bcf1bf3ae01b3e9c WHIRLPOOL f4a165c0bc3fe3155c11314ff6342ca69a5a84782a904b5a66107225820fad3264ba3bac3416986f0e23bace1a2802f3a9a675ee4e74147f0e4e48201f59859d
 DIST patch-4.14-rc5.patch 51247202 SHA256 376bb637ec96ac3e1ebdf4a29ef69327238e954f871bc15660c0f2ae366df8d1 SHA512 56cf0a920c5f78051fe16f1fff06f3e6216ceab97634f064ccb085ec1eedf142cb8f8e1903d967ac05b0dd49fec28e073ea8bda332263818535a8439d286d5d4 WHIRLPOOL 67f2a29aa37e6a3ac144b8bd13ddfbe1824e97ad9733e0fb48f2bd009bd0fa31ae1ce878bf07b7fd0edd43552a78e9676ef6ba58b39a8c0612bbc9893d5b5fc1
+DIST patch-4.14-rc6.patch 51559410 SHA256 519f148591b719fda9ec74c0ad284f9eca5268587ddca01faaea4eb25126a58c SHA512 129741872167058f2c215822820dbd890855b99e6ebf05b5d904e67592472f3ac5089bc4ce8d5493ad4571148d200f1e3ae0108cd37d54f43638998f13530bfc WHIRLPOOL 31a186e1a54a3868b431c8999daaef238b8af9430ebff7185ae6b0ff4de8558bd8c1396fa481c18febdb17797d0d103635318f5165fd1cd95af0178f951f3e74
 EBUILD git-sources-4.14_rc1.ebuild 1179 SHA256 2ead36f01f10e0f2674b6dc6c1d92aad3d717b9b4b0a3151fbcf3b796c122845 SHA512 b2aca5887a1626e24097d7616935cce46403b4268dd720e6815c4013913be6eb591a00f2cefe6a6332949c3fa43fd23eddcdd924455f30c834e430d0874db9da WHIRLPOOL 57736e80ebeda4ee24362da51d4a4f9f814960ac8de8c1bccd3ee8a14280e1675b926b67ad45fa3987ec1df1c4fe48a1bb2c685e55cdd746a1ed30a7f98cf9be
 EBUILD git-sources-4.14_rc2.ebuild 1179 SHA256 2ead36f01f10e0f2674b6dc6c1d92aad3d717b9b4b0a3151fbcf3b796c122845 SHA512 b2aca5887a1626e24097d7616935cce46403b4268dd720e6815c4013913be6eb591a00f2cefe6a6332949c3fa43fd23eddcdd924455f30c834e430d0874db9da WHIRLPOOL 57736e80ebeda4ee24362da51d4a4f9f814960ac8de8c1bccd3ee8a14280e1675b926b67ad45fa3987ec1df1c4fe48a1bb2c685e55cdd746a1ed30a7f98cf9be
 EBUILD git-sources-4.14_rc3.ebuild 1179 SHA256 2ead36f01f10e0f2674b6dc6c1d92aad3d717b9b4b0a3151fbcf3b796c122845 SHA512 b2aca5887a1626e24097d7616935cce46403b4268dd720e6815c4013913be6eb591a00f2cefe6a6332949c3fa43fd23eddcdd924455f30c834e430d0874db9da WHIRLPOOL 57736e80ebeda4ee24362da51d4a4f9f814960ac8de8c1bccd3ee8a14280e1675b926b67ad45fa3987ec1df1c4fe48a1bb2c685e55cdd746a1ed30a7f98cf9be
 EBUILD git-sources-4.14_rc4.ebuild 1179 SHA256 2ead36f01f10e0f2674b6dc6c1d92aad3d717b9b4b0a3151fbcf3b796c122845 SHA512 b2aca5887a1626e24097d7616935cce46403b4268dd720e6815c4013913be6eb591a00f2cefe6a6332949c3fa43fd23eddcdd924455f30c834e430d0874db9da WHIRLPOOL 57736e80ebeda4ee24362da51d4a4f9f814960ac8de8c1bccd3ee8a14280e1675b926b67ad45fa3987ec1df1c4fe48a1bb2c685e55cdd746a1ed30a7f98cf9be
 EBUILD git-sources-4.14_rc5.ebuild 1179 SHA256 2ead36f01f10e0f2674b6dc6c1d92aad3d717b9b4b0a3151fbcf3b796c122845 SHA512 b2aca5887a1626e24097d7616935cce46403b4268dd720e6815c4013913be6eb591a00f2cefe6a6332949c3fa43fd23eddcdd924455f30c834e430d0874db9da WHIRLPOOL 57736e80ebeda4ee24362da51d4a4f9f814960ac8de8c1bccd3ee8a14280e1675b926b67ad45fa3987ec1df1c4fe48a1bb2c685e55cdd746a1ed30a7f98cf9be
+EBUILD git-sources-4.14_rc6.ebuild 1179 SHA256 2ead36f01f10e0f2674b6dc6c1d92aad3d717b9b4b0a3151fbcf3b796c122845 SHA512 b2aca5887a1626e24097d7616935cce46403b4268dd720e6815c4013913be6eb591a00f2cefe6a6332949c3fa43fd23eddcdd924455f30c834e430d0874db9da WHIRLPOOL 57736e80ebeda4ee24362da51d4a4f9f814960ac8de8c1bccd3ee8a14280e1675b926b67ad45fa3987ec1df1c4fe48a1bb2c685e55cdd746a1ed30a7f98cf9be
 MISC ChangeLog 15722 SHA256 456d5ee382baa781b3467101e95abae70100edbde51e392b1e44dbedd6c72de9 SHA512 a1f91d2f98f20c4c57fa35a2be3b44050bceab26cc4c349b49fd10360d4b2382dd5fd7be475adadc0f2ba00d0551bd771480e359c24ca4312f23aadbbb1e0c0d WHIRLPOOL ba85984df77455a4e3ecc54d93671704809148a9b9403818edbdcdbadd2f66482d77dd8b86954e505eb1a79e8930c9377a7055ddb9633347cb67c04366693ea5
 MISC ChangeLog-2015 49672 SHA256 102bc757ee3cec97c9c90c4a57707344565f490a548c4a789acb60b78f25d19b SHA512 ca9f0475ad840b7dcc92fc6ed270a12b1816faecd85a1975e70cbe63f7d09b37080a41d4985a1434d358e9424a18d4c42886f04d16e82711c7c00f962bd61be8 WHIRLPOOL bbc297ec7d74379b03dccb8a250a674760db1300fdf80d7c45d0eca5fb9ee632a18540f79046c9e8a9437683dc473865480d459a961c047a5c43e60bc6a704ff
 MISC metadata.xml 647 SHA256 9f5a2dcb5a2679b26e3f740049428138fbdbce33c530018c0c3def55328e2f71 SHA512 4a673cd7f8ca3ee46bbf065d87337efa6ee77218781f25ce8b3924b9a90ca3cf10435b6f667d49ad16ba50662f82d107696622b3e55c707d56689ae0c5d2eda9 WHIRLPOOL 4eaba6b5096af3478c9453816e3339f2cd77d35327b7cfbf5e6d0da968181d8b48a495fbc95602db55e2decf10bc687f0655b8f8944941d58521154218720147
diff --git a/sys-kernel/git-sources/git-sources-4.14_rc6.ebuild b/sys-kernel/git-sources/git-sources-4.14_rc6.ebuild
new file mode 100644
index 000000000000..7f2595c38a35
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-4.14_rc6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="4.13"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.5"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/kpatch/Manifest b/sys-kernel/kpatch/Manifest
index 6e3a90fb3ead..84313405f1fb 100644
--- a/sys-kernel/kpatch/Manifest
+++ b/sys-kernel/kpatch/Manifest
@@ -1,3 +1,4 @@
 DIST kpatch-0.4.0.tar.gz 124433 SHA256 852b8bea7b4ed8712793d7a8e5692536fc68468063dffb873bd55801f78e994a SHA512 0bbb49a06d02e9eb026be458eb904cf50f50461a67f16835a306bb3a4a57ef88b86ecf6bca6dfc91b921ba87b4c8b9d532e2a77e987e7c71583b8cb53520a1d7 WHIRLPOOL adf5e76183153e02a70659f5d47cbc70ed65c3ed9f004f83764029a8caff12faa62b6f41eff71011024653f025b836b340f79dc084ba374fc21293af10a75e6b
 EBUILD kpatch-0.4.0-r1.ebuild 1921 SHA256 19bac50d3e8d05c6708b3486f82202b9be3e1e4508b4dbfcf4980ea5e001b466 SHA512 ab0db6ce451aebd04142d1439f8e2e66d36a6e7abd548f3fbada115650d512c62c1a01918d4529ead08b06e66b5ad6521122efe788a35ca09c65ce9b47e94300 WHIRLPOOL 95314652f84c1a8a8c9889b3f948d633ee6bcc346d0f78dc758f8051a17541b4284bd05452cd514192b67b1e245a799657e848c08830c0aab3fa60fb5c0784c9
+EBUILD kpatch-9999.ebuild 1952 SHA256 7ee63850e9ee9ec8c7c27db39badba88c11c2376c5e8006abe059cf79e7aced3 SHA512 f60f2e00b2194083b84bb92d31c0b8c48bb108cf5ba1ff0837585f91950c9c9101bcd8bfeab59e31dd63320cd4f37212a9f08fe8c68101a0891f675457f30adc WHIRLPOOL 92be311db2cb9bec873cdb6a221de7d41001d7512ab753c80fa9ecfa7288593afe496ca667489cbd815b500d4ff7d5fffb4496aad4cfc52351f35353244eca99
 MISC metadata.xml 308 SHA256 97bc05eb1709d3a884769be76918b7cd7bf953b61941315db4cf92ba135c1c43 SHA512 1094168fbbb63ed9328edc7ab2904b648f30f893d3fde7c2de2716a2b4bbcd32a72bc271974e2b006510e8abcebcc6f684670b550ff44e6267954c519eb06469 WHIRLPOOL 251817af7ac0fc0e35990dab12c999a1944470930e5b741799cc7516581914f09aa95f6a7bfa8032a5e5971bfbb71a049a99ba4e06d59334f6f1e905cb7159f1
diff --git a/sys-kernel/kpatch/kpatch-9999.ebuild b/sys-kernel/kpatch/kpatch-9999.ebuild
new file mode 100644
index 000000000000..0d6aa6e706a4
--- /dev/null
+++ b/sys-kernel/kpatch/kpatch-9999.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info linux-mod flag-o-matic
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dynup/${PN}.git"
+else
+	SRC_URI="https://github.com/dynup/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Dynamic kernel patching for Linux"
+HOMEPAGE="https://github.com/dynup/kpatch"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="examples +modules test"
+
+RDEPEND="
+	app-crypt/pesign
+	dev-libs/openssl:0=
+	sys-libs/zlib
+	sys-apps/pciutils
+"
+
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/shellcheck )
+	dev-libs/elfutils
+	sys-devel/bison
+"
+
+pkg_pretend() {
+	if kernel_is gt 3 9 0; then
+		if ! linux_config_exists; then
+			eerror "Unable to check the currently running kernel for kpatch support"
+			eerror "Please be sure a .config file is available in the kernel src dir"
+			eerror "and ensure the kernel has been built."
+		else
+			# Fail to build if these kernel options are not enabled (see kpatch/kmod/core/Makefile)
+			CONFIG_CHECK="FUNCTION_TRACER HAVE_FENTRY MODULES SYSFS KALLSYMS_ALL"
+			ERROR_FUNCTION_TRACER="CONFIG_FUNCTION_TRACER must be enabled in the kernel's config file"
+			ERROR_HAVE_FENTRY="CONFIG_HAVE_FENTRY must be enabled in the kernel's config file"
+			ERROR_MODULES="CONFIG_MODULES must be enabled in the kernel's config file"
+			ERROR_SYSFS="CONFIG_SYSFS must be enabled in the kernel's config file"
+			ERROR_KALLSYMS_ALL="CONFIG_KALLSYMS_ALL must be enabled in the kernel's config file"
+		fi
+	else
+		eerror
+		eerror "kpatch is not available for Linux kernels below 4.0.0"
+		eerror
+		die "Upgrade the kernel sources before installing kpatch."
+	fi
+
+	check_extra_config
+}
+
+src_prepare() {
+	replace-flags '-O?' '-O1'
+	default
+}
+
+src_compile() {
+	set_arch_to_kernel
+	emake all
+}
+
+src_install() {
+	set_arch_to_kernel
+	emake DESTDIR="${D}" PREFIX="/usr" install
+
+	einstalldocs
+}
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 65863c7906be..c535cb5e4323 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,15 +1,9 @@
-DIST linux-firmware-20160331.tar.xz 35957140 SHA256 99ab767835006038e9efcc9d583b767c4a98091c35a6e2710f654e4fc2db7a45 SHA512 99694f336c4051d51f527399e225ee4a5842024d52f0d74204afd947ab5d0517c774e42519f469a1b653bc2ea026735bb83af5e495a8c2c5b5898ebe5d86cb40 WHIRLPOOL 17091f691577fa0976cb90cb6a60599155ff02afb95aacfa9c12228371c69d88750214b76f479cfdf55f36f7584a03c81158a61b1a593012e15db0ce8d740672
 DIST linux-firmware-20161205.tar.xz 40891260 SHA256 a1ab4b2d77b60b466f2312d5ee14717f0f70c9b40e36d20587e5df6ceca61e0b SHA512 ba6d5c919d55da78b17acdf8bab53735190c4fab892ba9510a13a05d56b15c91957a818e4eb4fc092646796acc49e775c147dcb8b901523365d21df453767b0d WHIRLPOOL 45a82e4002c764e8eba2f3ad5dcb7c2d151783b580d70b1e1a4c49e6827c10c07876cb5d3d5a7ecf4c300867dbba62379983af125bfd64cb5b71ae8ff83c565e
-DIST linux-firmware-20170113.tar.xz 40606424 SHA256 dbc63d53ff12bff9ca0bc35ce91436356c2878dce41dc64d0f2b0c25b39e447b SHA512 28b9f4452f7b29d0a641585d792a19fe6eabe3aa9d383934f995c62a6f62db0cb877db16aaac4b2e2b7966f98e0f7b5737e206d0d8cd8a61aa64b2fb5a554749 WHIRLPOOL f63477f35d66c685039a6c85449eaf4416ee0fd32a3a8f5b69a0aa77c1f67759f7a8da05bb49d7cf82a9ac5a52ab44fe75ae6767347c73bb3538e70c3fb79e80
 DIST linux-firmware-20170314.tar.xz 43175092 SHA256 9f07ee85524a95af1ec16e7008aa71eb07edf2edda07bf36f85b2d790452a67f SHA512 501e84d3ee9272d23e4d26a0a8bb7471f4e1edd16dee7c0c12a8ae8e90d6f5fa7f08276fc43eed6020bc3608c79b0914519c5c7082b6f013b6651d8afa7f79ae WHIRLPOOL 339a5f30f132d2f1688187d63df4dfdbe551fd3ca59d73e8f9e515fd1e26d62be62b87a8198437ad4934ce2d44287266f9628f7e82e53936f4957cf59d534827
-DIST linux-firmware-20170519.tar.gz 101696800 SHA256 a0011b362f651096fca9ad0edf699fd724699be397a5f5b037bb3153458bebde SHA512 4637aa3c6f8edd23417f48812467bf679b7d1cb77aebdbbe112957170b28725946a5badac14c141e15e237326997a3ad6c1de4794c84bbab0f8e418bb8ab67e8 WHIRLPOOL 94e6284ea60f546210d44b587cb91fe54ab11028b4485b6f0ea94616335cf64ab74c0cdcd0cb54f3e2a97881acfbf4966d51775c818dd85ac784a49f85222b6a
 DIST linux-firmware-20170622.tar.gz 104302528 SHA256 03d220c1747ed71b54b53ce04bfb178fe937ba585309b4a0b32eb351d709fcb0 SHA512 946b31666ef79a21e29a757340482dfdb70b43f7818ca47bf5e16fb6a79bb585822af014731b6c6034944dd37269ae948bbc23fc1f104bccfd7b7b405f41bbd5 WHIRLPOOL dedfef88d4ba7fdc9b5e7c07f6a04221d4d34256678e366f3182d4180d0e8de4071ded809d285c89aa0ab68bdf05cd9b9c0139084d9497df4d420e7e91ba48c8
 DIST linux-firmware-20170906.tar.gz 106748426 SHA256 db961e03e8914360c36210bcd10367b6bab655c652a29046bc8ec66241dc034c SHA512 c21043600e0c8e9ee58f439c01f38981f4c4bb2dc9397e655fc8285e656f3c34560cbeff1ea16f3d0204fc06d83fd1982c600d78cf6851b8f6c307e1a7a92b71 WHIRLPOOL 7cf9e547c018e69b1f3b047cd6a4fc2db7363abaa51d38432db8ad0b76e5029827ef2c73883bfcea79313d67499d5dc145625a85e3a7a4eec759a62ef493cc8f
-EBUILD linux-firmware-20160331.ebuild 3125 SHA256 45e2b7a7dbb6a4aee05c903f6f9a131ae587c6b0549cad7b9f68175c6b7647f1 SHA512 8acf0d853ef178d0d39327538cde8e5f9cb8e62a3ce8a68f6f85100bea86ce6c90f06babcb8ebdee058ab06ca5bf27efddd00dd346f902decbf8f0f962608379 WHIRLPOOL 561aa8388cb44db38572ceff0676a77c7185c7e204c74f619f3a983dc796025048e32213ac25c0e88f999e56063fd65ea337b17e729ed49d27a9ac0f02454009
 EBUILD linux-firmware-20161205.ebuild 3260 SHA256 9e0a83d6e9ff9519321bb9b4bb6f8a8988bbbdaf937fbb80b52900db262fb7e1 SHA512 11b84d341fbf6b9f424867a36bf1b444baa02bb1daf0cc6e26cc637f5519682a179e324842711c29f40da588026769759b51bbaf77f10a67e13864771fb5074f WHIRLPOOL 3d2871a46cdc35eb3056d54550bf8c11c82bb465f0458e385a5747c2c783bc4775a2a38df0adbfa6de8f4bcfb4cdba50dbb63e34e29b7e57105ae674e5503d43
-EBUILD linux-firmware-20170113.ebuild 3089 SHA256 b02306c72aedae621419540a7d87a104e658fd1f8477e7a188c82513388bb945 SHA512 21637497b8fcc0d3b302d9d8db35f395c31f93426103b6f1401fc2c32c05ab9f5fb0374226c26ee7fb6e5ad412678c128f00e123e6cd1820705ee917767f22c7 WHIRLPOOL 2189d7e7296ef63155f61014080af604fefc9635c5ce4d3486cdcf95b2a82f1f2a3922ffeecbebf7f0c254f6e4b801e9a27bccbf089e47642a94f318642f2ea9
 EBUILD linux-firmware-20170314.ebuild 3290 SHA256 0aab6538a31d84d084d346e9b59244b76ed2bef6d99d50ee0f0f926cd0c635cc SHA512 a008c6c41693094bd604017815b5e0c687f98fb53f655463f204a5077a2d260469680601bfe72ab2521b3657bad40d5dd6ce00cf3a5b485a3bd58b67ab789220 WHIRLPOOL 7e9f4a909359dadf371eebe99fca6c30845de42296b46e22bf5f544d71c43f5db458b8a858e9784266701adbf2d62a5b60c06b0084d5b42be7ec43dd32a7b5d8
-EBUILD linux-firmware-20170519.ebuild 3258 SHA256 dd5502e9e2fccef0b1be04889fae3a261a8ce8c2a28c45ed9f090d350d28bd9e SHA512 633cc5040382fddb5377b1c23c9f39fe01632abe8331f82160f5b8db66d722ddaefc61e7de2021e75758e9d3f45069982e37f7a543a9ee3a4cba6095d76d1b98 WHIRLPOOL 1c7e6e6a24a04e7372411a08396a27c6ac039c49995d4fa1f939e4093afe149cadac8bd4f175c66f1d0b18b768dc3b88e46180ad8a2e8d210ea2d2b15befea2f
 EBUILD linux-firmware-20170622.ebuild 3258 SHA256 68d53b5e8957d2637461c08d45de3caa5993b161d278154eba07d2dcaa0bcdae SHA512 f255c17eab32003cbcc561cd2996a5246ced84a2dc36251b02123c4a15737c204bce1b01d1b5063c065cfbd7069836fa61859ace5e64a1d2e7eb70334b2571d7 WHIRLPOOL d09f019ab5a1042f59f13d3de31b28b4f33ace569b8d74293e0c96d4caf3a561c2faaf3e00d0cff63094a9d2bdab3c3c03f2a9998f2d98cd27489d67eb046b93
 EBUILD linux-firmware-20170906.ebuild 3258 SHA256 ee44e69a9734b7a1a0a24360b80e21e80b117076f389a1a5d40ed27a6515666d SHA512 072f827134deed4c8b29fcb66a927696c1930edc4c3fb10d9b5620a5bdf76dce3afe4aafcdda3637e6025b76130b0e4e602d882ae35689241ff0c27ffd85a7ec WHIRLPOOL e0603decf05cb45653fe67c0b7535958bae7d76ef670f34b751ece1022dd10033b0cc3511c0d98851741d5aa1890238ae99976cc125e9e086b516154e97ab5cf
 EBUILD linux-firmware-99999999.ebuild 3089 SHA256 b02306c72aedae621419540a7d87a104e658fd1f8477e7a188c82513388bb945 SHA512 21637497b8fcc0d3b302d9d8db35f395c31f93426103b6f1401fc2c32c05ab9f5fb0374226c26ee7fb6e5ad412678c128f00e123e6cd1820705ee917767f22c7 WHIRLPOOL 2189d7e7296ef63155f61014080af604fefc9635c5ce4d3486cdcf95b2a82f1f2a3922ffeecbebf7f0c254f6e4b801e9a27bccbf089e47642a94f318642f2ea9
diff --git a/sys-kernel/linux-firmware/linux-firmware-20160331.ebuild b/sys-kernel/linux-firmware/linux-firmware-20160331.ebuild
deleted file mode 100644
index 88df9244a790..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20160331.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit savedconfig
-
-if [[ ${PV} == 99999999* ]]; then
-	inherit git-2
-	SRC_URI=""
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	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+ freedist"
-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
-
-src_unpack() {
-	if [[ ${PV} == 99999999* ]]; then
-		git-2_src_unpack
-	else
-		default
-		# rename directory from git snapshot tarball
-		mv ${PN}-*/ ${P} || die
-	fi
-}
-
-src_prepare() {
-	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"
-		find * \( \! -type d -and \! -name ${PN}.conf \) \
-			| sort ${PN}.conf ${PN}.conf - \
-			| uniq -u | xargs -r rm
-		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-kernel/linux-firmware/linux-firmware-20170113.ebuild b/sys-kernel/linux-firmware/linux-firmware-20170113.ebuild
deleted file mode 100644
index b3a27592e5b2..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20170113.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit savedconfig
-
-if [[ ${PV} == 99999999* ]]; then
-	inherit git-2
-	SRC_URI=""
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	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+ freedist"
-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
-
-src_unpack() {
-	if [[ ${PV} == 99999999* ]]; then
-		git-2_src_unpack
-	else
-		default
-		# rename directory from git snapshot tarball
-		mv ${PN}-*/ ${P} || die
-	fi
-}
-
-src_prepare() {
-	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"
-		find * \( \! -type d -and \! -name ${PN}.conf \) \
-			| sort ${PN}.conf ${PN}.conf - \
-			| uniq -u | xargs -r rm
-		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-kernel/linux-firmware/linux-firmware-20170519.ebuild b/sys-kernel/linux-firmware/linux-firmware-20170519.ebuild
deleted file mode 100644
index 56baea0d6618..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20170519.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit savedconfig
-
-if [[ ${PV} == 99999999* ]]; then
-	inherit git-2
-	SRC_URI=""
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-	KEYWORDS=""
-else
-	GIT_COMMIT="df40d15d6ad617e72ce7ea00b91d9117d92dcccc"
-	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+ freedist"
-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
-
-src_unpack() {
-	if [[ ${PV} == 99999999* ]]; then
-		git-2_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"
-		find * \( \! -type d -and \! -name ${PN}.conf \) \
-			| sort ${PN}.conf ${PN}.conf - \
-			| uniq -u | xargs -r rm
-		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-kernel/rt-sources/Manifest b/sys-kernel/rt-sources/Manifest
index 92fca2941e62..5fdb4f1a54e3 100644
--- a/sys-kernel/rt-sources/Manifest
+++ b/sys-kernel/rt-sources/Manifest
@@ -2,47 +2,42 @@ AUX rt-sources-posix-printf.patch 1705 SHA256 eb3a1bd644c7e30ab6f5c9270e1b60ab9c
 DIST deblob-3.18 127087 SHA256 c720eabb3911f8dfa4398c4250853df4633018abebc01a509ee4a283c3e00941 SHA512 6fe33762ba19aad7ff891b7b805cc26f6e2926f5e40c92fa45bc7f31bdeb5c8fc42b97e5d37d71b9422da239c7c54abd25f1fa2fa1e5733c6053abbf4c9e9011 WHIRLPOOL c351a3ae15c59081fca69c1b5d9b9de10f024eb01f1426722a0d6ccb7caa34330be42897cd85cf19b22ff876352b0cec1c19707edc81c4cb01ad9c1df2e3d831
 DIST deblob-4.1 130695 SHA256 2888a5a3b5e8e9ec242e4d702582fa1d739a1274fcd94643a9fb3516a210a8a7 SHA512 b861b9b53f9295e5e993784031ce57cf8cddc418184ec00c28ed92c9e7660406e0ede581a93d0def36e7847b8e068c8ca6c4dfdd65c15cb174d6c5803c16214a WHIRLPOOL b90f55dd8702eb254968ed7689b50859833ed362e9aa1720ade96aa1f6f84e8f90f5d1eee034c8535e8bf767c0b5f8b0bc559219e8d81d4c6ed53bd5cfe5e65e
 DIST deblob-4.11 148749 SHA256 4c31a9e39d302a7dfe4ba2bf550dc49312db5949a611dda343575e6ca3b8f06c SHA512 e560c76cf340d88930e1b2ff1cd86ced028922faa30a0ae6ade34eb92dc8ca916917b62d84c33be5030c697326bc8808fd1fa259a6767eec83227a06df646199 WHIRLPOOL 37b8c818b9073affda24c481928bb4d606a47a72bdba70d1148669c368e417785149bd5d6e5f303b25ebfcfb1b021b52bc01c89a8120963a29c2e0cddba4752b
+DIST deblob-4.13 153698 SHA256 fffae6f02f5c02dfbbbe0320954c19c5d68011c120aa0852860e48b26c418131 SHA512 e69a95ac3cdfccb042cd9a987d789a4d17e2b1f253bf724023896c936a2e36e3c205ca28064d96ba8bbdf8946822099e70da573ac99d881a837c91e55e8c7970 WHIRLPOOL 198b47b73b9f7cc5d5a9cab7997fd007d4ee791bf3e39023bc740dfcd4602376128f8ad4564e3b996cbc0a51bec7711f7afdcf5f1e85d57cc1c50d45ec02b778
 DIST deblob-4.4 137370 SHA256 7cf11c8594db0d2a10a1b02390c9ff8916f1d2a1fe9d59058ca45485500c5274 SHA512 ea5f2f2cdbc97bdc90c2131f846761dc1630a53986db10d8e9d07d1ddee12a9d878c57790edd3ecc75ed9792d479b7b726c39d688a3926e850608c81b1b78a3a WHIRLPOOL bedd494be2032ce4b8911f25df906055d019af31ea6548b885482f870cd5313e09e7fb544fc8db268b3498cc18c199ae5701023839c972b48dbd8128239eeb75
 DIST deblob-4.9 146273 SHA256 af4214b851928a53ef470ed8729122b9db910a6c0769d5d46a5de0b3e96f74f3 SHA512 3654b28e72b343bafdb38de10ef0c3621db0539bc0e7434bc99bb8f8ed911d4c9e53ca4785fd193fcfec369328f014fa5c6f3bda51b6f1a8f98b8c37ece119a6 WHIRLPOOL 7b5ddba1469b6515d03d2e0e91a643ab0252803fde271ca710978186582a2f1a3b01deab9718c194bcdae0a79887636b6e98e604305402c9051b15a89fd393df
 DIST deblob-check-3.18 654232 SHA256 30f22602b6ddf2cbccc16ef25fdc4d92755f3972e1c671d7cab8b9d6865eb155 SHA512 2cff9abef479a55dd6a0699371be8227ba63b18da1fb153d5df382e0a5e4f1b745b7de256a367a36efa9d12e2aad5622cc288efef009feebf81c108dbef4fe16 WHIRLPOOL e92927ad1565e80ce87e8bda372f8f7eb42bc0f47ad9b19fe5cf737903b2021fd6e3756e8d22b70f3037a46c254fec8b7285b37beb10795ccb4ca99d38876f8c
 DIST deblob-check-4.1 674781 SHA256 54aa33e23a31ead6f982b830be86003c306b88f0d0a9f96c7dc66fe7cd274acb SHA512 51fe9d70d723992aaf70f8bfcfcc12ecfedd7a039402ddae07858fb087693b00cd80d1e0e1a5053e049f2a2b8c58ed23e4598e2dae902c4999999c08bc2eeb33 WHIRLPOOL d2c22280e12863793f8e866b126be53ee10d564373addfe9399b2afe22dd7584513c050f334ea08e6d63dd27a1574f2754456bad9d0a42e8c8d9995eec27aed0
 DIST deblob-check-4.11 734493 SHA256 39312ac206c249257018e85d4c3455f9bcad0205b4bd18eef28971492090fb43 SHA512 f3ae2b80ac16f223349c741877c64d619fda2be9ce5a28741cfaf626cb2104547f0f638e6d56afa524054b4ec4ccc8f720515c8518ab333d95bfd29cd8ad056d WHIRLPOOL c2b0289118d4db9972c25e08a4268b89d7b9ea54ba32adb5da06929823ddd852a4b5538b9e8953ff91967645b3089e8a8123ae5fc6411e24500f11f4e034c301
+DIST deblob-check-4.13 748983 SHA256 3263301b10c9908dd7cf1d968c86e7a050fd45c4f48de9b76c8b25a42f1b6077 SHA512 83042d108418b5bc423c98a21c5aa6f022bcd7dc4aae0bf4c9703ee4d383019487af69529a7d381003ede6a706ff4ca7eea35e11d1aab6e23b029c02ab7ac662 WHIRLPOOL 152880098935ec974cf9aa5ccd6a85e6659f6d7c68375969b598197215f48ca862e6034da24b4281f8cf80f9b688cb0a879207c7e4f26bcce9b47f52e13ff1c1
 DIST deblob-check-4.4 694225 SHA256 e142bafdd5a05280d5280fbf109aadab3af9ce71152ab2d27ad41e96766e0c3e SHA512 6554ae567566da4d30e94a37622f88343b8e96ab39a9204fee34de4ddb5dac8c4906b25843b63c2388d03a4441821c25d395b3c39fc875c498a69e677a4f0cb5 WHIRLPOOL 414f60a64a2c14f01eedebc84f5adfabf0562bcf76545a57e757cb6ac914ffc49c90c329eedd1aafb1ee752bfc082fd4f6af173774f4f853ddd637525fbeeb9b
 DIST deblob-check-4.9 717834 SHA256 4599c6eabd53bb352e9b536d574152e72467548add19757fc6b8e34355928d6b SHA512 46258698f1c574b44a8c5c78cc2b7fdbaca746976266974ee0f6787904531754b17ad15d542b68e07d4633ee91a8e2d9c32a991ea214292ac072c4f26deed9c9 WHIRLPOOL f1afe1f8d8bcd6fc43a01da5eb012d117687418f049212fe20fe7ea88700c482bc6fd3e917102ff9d12baf11e678a40355877a7d214da8b3cbf2b585a51a012e
 DIST linux-3.18.tar.xz 80934708 SHA256 becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 WHIRLPOOL 81634af631b7d30ccd1f4798f96f44d9aa0ba6609b73f2747eb6aebaf7a99487fb2dbd45767605186182533cb222bfd9236e8dd5e11a04fdb67c211e4e0a91d6
 DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8
 DIST linux-4.11.tar.xz 95447768 SHA256 b67ecafd0a42b3383bf4d82f0850cbff92a7e72a215a6d02f42ddbafcf42a7d6 SHA512 6610eed97ffb7207c71771198c36179b8244ace7222bebb109507720e26c5f17d918079a56d5febdd8605844d67fb2df0ebe910fa2f2f53690daf6e2a8ad09c3 WHIRLPOOL f577b7c5c209cb8dfef2f1d56d77314fbd53323743a34b900e2559ab0049b7c2d6262bda136dd3d005bc0527788106e0484e46558448a8720dac389a969e5886
+DIST linux-4.13.tar.xz 100579888 SHA256 2db3d6066c3ad93eb25b973a3d2951e022a7e975ee2fa7cbe5bddf84d9a49a2c SHA512 a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2 WHIRLPOOL d3d332e02cd3c5056c76c28cf1f81504c6f7b8f2caed7238e7dd7866747fb03154b88d8d7aec4d0eddf5760624bc7d6c5485fb52a3e32d098a2742eba96c0d05
 DIST linux-4.4.tar.xz 87295988 SHA256 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e WHIRLPOOL 02abc203d867404b9934aaa4c1e5b5dcbb0b0021e91a03f3a7e7fd224eed106821d8b4949f32a590536db150e5a88c16fcde88538777a26d0c17900f0257b1bc
 DIST linux-4.9.tar.xz 93192404 SHA256 029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a WHIRLPOOL 072505b29972ad120eb25a074217847c9c2813416c4903e605a0433574f5f87616dbea0b1454e4b19acc48107f11274b682958b1d773373156e99f8163e6606a
-DIST patch-3.18.59-rt65.patch.xz 173612 SHA256 7dad87e49cd0f470aa88f2a41e172d85687728b8774834eef482a6c8ecda8df9 SHA512 5d742acb498777306f521af8fb9722143eb251a66f7f1eb0d1892556218ddfdb25b69dbac0691b6efdbd321b6a3e4e7c0b2f0b7b56e905d5abb0613f44e61756 WHIRLPOOL 5c8c27c401e8c84b66df3f91bd2f8f9422a08dc442022e7e470df10ad1b8af90c7266a7040d9da2b5236851e19e7044c5ae105f4a535b0f646c12c8c6b745951
-DIST patch-3.18.59.xz 1238164 SHA256 668c02c74fc0655cc68f47f820f823e441aa5acd5bc2fd63bee36e7a2345f633 SHA512 671da9568772fa5af63b32169de8b27056f32770b9abc5249766e2f50b348a039d03346078fc379e1591014e6ced56912abcd492be6e47205887fab72499720c WHIRLPOOL 454efd5b5ac42655bcaf89bd788b272ae637e0a0cd112d44dbe19442a03fb30f5e56e76cf2995c222fc8135e0f34295f8f8be19498f22d333e78cd207486eb6d
 DIST patch-3.18.69-rt75.patch.xz 173580 SHA256 374d1b20fb84024a9738034346d1761181afc1c988b8fc9ac475673f6e5f7c46 SHA512 50aff123705223689a59da8d931b6a42434391c0e87c68636d8ced6556e98482b9ac68ddfefd923ee37625642a7da860c15719190637b700505a869678374dbc WHIRLPOOL 501711c834e75d8fe1fe58f458fabec15c943a2faa4b84109cf37d349ecf0caf0bcc75f466520898c0d76fa3b5703895c8e57117ddf02038eba30da979ecb1d1
 DIST patch-3.18.69.xz 1291180 SHA256 20174224a5b5482ff238151fb8994401be4feba580802b2737479bb0a5342bca SHA512 b6d3f52f219941752d0344a15c21a76ca2c7435c075d9f1cc3ac2ef70ab1f5da55cbcbe48c232e03d48dbc7b18e465e8a34d547b6fea82cc2b51e5462e773d93 WHIRLPOOL 0297ac817d3383bea22a66c10d42d753ce2bdc5bd14b461a43139c8b1b27962581216f7224b64f4a1803418a4a423ae0f1f6ed12fa80948a20a7eac089d1a7cf
-DIST patch-4.1.42-rt49.patch.xz 189128 SHA256 4a4c502da63cc15715f67a548da6a1ea018e53a5fde2ad6fe9480ffe04bc8247 SHA512 0fccf89a48fda418fe7abd0dd2b78f0c8ce10368d55310165df72e7043edc7f58adc2a7f43e3e17c77bf0fa2dada898c1ab2dec608acd64375a481d128dc180a WHIRLPOOL 69a27adb1b37b51abe80bb7ebfc1703ddd7ff60ce82e6609b09644864c4b3d78d365df2578acc9636a405cc73a4d5c2db94c9554d01ed46c65400705fb341d78
 DIST patch-4.1.42-rt50.patch.xz 190032 SHA256 9fb6d43eb202ec3ba94b5f659be61abb5050625ca3475f6996c82a61f608f940 SHA512 a8bc66d368176e5d02bdc54b9a5a1eb9865b277d89fe6f43e2e212832bb0d3b435a510ba8e03a64e1f8d94cf5a870076405b2687c51558b1d47586c0f5738d2a WHIRLPOOL 1e002b9892837fdeccaa8c02994b113434e3321a36daad5865997a41998fc47f14bffb8c6f92bcb4d3a62c473c53d608dd771978ea4f86d37f433e6c5683bb05
 DIST patch-4.1.42.xz 1109816 SHA256 da32978d452526c91bf71aceac83bc33b1ba5aff30d00603dfb6529f014521fd SHA512 a3b4e29e7cb613a72b8176edfe2cb5da0aa4e6064bb717c1bd5caa9463563cdb66a4bebe6256a8eddd58f32ae6f658fdbb66a3e4337a91def9d08b7c0e23fb2d WHIRLPOOL e461b48ca523a9f4718286648b1544374b0a6c2470ccecdb735849ae0e02241c6a63e06cf342130824e42e68ebe1526249e4736c8ebca3d4ec44e42397476c80
 DIST patch-4.11.12-rt13.patch.xz 228308 SHA256 d7a0e66fd187142cd65034c5b37a5c80268aabf7a88f1c37fb02116269045878 SHA512 cb82e29088a1e17859feafa054c83950b2c68262da2b501290405335210f2efaad29af5a0c0f7520f0f5874c4a15eb1bddbaa0dd330e8fcfc88d201bfc176f97 WHIRLPOOL b2a3e6d43dcfd012345edf9c9b2f37f3dad4468aa0d352472b785d9001a07e8d801555e759b41c7e59f0f4d06cfcbdd2b986b17a5be541c20bccaa5ed7587983
 DIST patch-4.11.12-rt14.patch.xz 230380 SHA256 0ba8106cea3808d40966ba687df844e83f966a5daf4d4d9b527c2932b8eb007e SHA512 7ff8a20b459119e2d42c8a314a3fabc7366268a81b5ab47b98b4d3a259a270586b368f4e7a548c5670212b27fcb1113a8dcc8b908a13b9ad640dabea9bcd610c WHIRLPOOL 9734b8c70f797f86d183e5716f5e94a3d6419b76104e90d28caa35c1311382a7f1a19d65b845065aef51c9b88284e1ea329fd68711e6f67ea3dbeceb17bc16e2
-DIST patch-4.11.12-rt9.patch.xz 218872 SHA256 6e6112ec9c076c9a7a6ee6fe623d5059e2944622062307ecaca8a874e8908a0e SHA512 4cda207633b3a84f178065957e2ec29c53246471bf6f4056df813260502106c0ab79259eefcc5d02bc354d24db16e2269c56b475043cf345f92533a194513fcf WHIRLPOOL 3c7d7b2483b8d8d1dbe1c1e0086335183a9742688f3aa4b205d4d96e948f5491a77852e6727da42ca957c4717d6776fb88491af9cf42cfcc4ba73621e9b97f82
+DIST patch-4.11.12-rt16.patch.xz 232408 SHA256 70722af7de04aa9582fcca7a5a72bb0a664d5c1979bb83a55f133b7bee5e36bd SHA512 1ef1324210e0c3d308cbededd3e7da41e47c972563858a21ae8178d060906cf24249f48dd0f8667d528be29d50755feaf1ede4fe35e662f89195ee91355a8ced WHIRLPOOL cbcf7250e47159d262b2fcd242a5fef36d7460945b276a21f31608846689589cbc9fd4c9def72b871fca7259094d65630e8edf190be42c681d034bee55ca874d
 DIST patch-4.11.12.xz 298784 SHA256 707c5f18dfb795761b0b7ac6f946f03774f9f99317306fd54d8724d17d9c7729 SHA512 ee9c5ac45896d84739c679834fcd15dfc46f9e939dcefd54ba049ac47168d71f0af680153615de002a2073ba79e44a9214f74af17ed16aa97d85e6df157fc6e8 WHIRLPOOL 4967292c175128adbd8a33f25a3cd1fdc94605ae0fda2b108105e740ddff48cc7bb08c44dd669562fb33056398a8eeadf396cc682305c7ee0a34fe5adee61f90
-DIST patch-4.4.79-rt92.patch.xz 191696 SHA256 f2a3b67cce45ac52f1299f3f0328666253d124574d77093ab3beef11619eeb0c SHA512 290ef32ec8addbc5fbb008f4b3ca1c02b8d4b4f9cd0031ddb10b3d0a6264a562912f768918e80b7b69153e9751269dd8f8dd8d386d48f1a1bae7e5aa0af6f57a WHIRLPOOL ca269ab5b7dc09c1f2bfc1d70e387355f72ee4823f1da5ecd9882cfbe11145b550b014364201b5ed12fe704a86df867652bcdb1433856d2086ad7dc96ff36936
-DIST patch-4.4.79.xz 1274180 SHA256 2ccbfef63ccdf75c859c2ced2e15bc2ad363ce5dc1591ea61d7de0d49c26e1b6 SHA512 a69f937a3a80949db1cf16b547d162b9c83d55f79f3119e59973a94d7e7b914555833beeae5cd165ea1e9ebb6a896352b38fc9ed0675a364dbc32fa165a62026 WHIRLPOOL 8fefb7325e5e892d473e7f1dddd9fc895b739bdc49819ef7dfae421b93c07143d31c4ea8637859b91788c93b07696999d46aaed2ad96fff20bd4df2bd35c2ecb
+DIST patch-4.13.7-rt1.patch.xz 199252 SHA256 5ff4910e3fa7f7fbd1c9023c487758f27d66c21c8ca16a20be2a05e78de7bc4a SHA512 efffccb597b53d096bcfde6d32688e175c975ef194093ccf165a03d2ca985165589dbc10b62e81f816f1264ab932563b23d20eab41c1a20214a11a940c02499d WHIRLPOOL fe1cc022ef6a45a03d601b0540766f92d02a10d8975083dd6493d94b9f150c6aa0d69999e23344dba084b62e24d3e308435bd412904b261348cdef0e90d5e38d
+DIST patch-4.13.7.xz 165784 SHA256 0fe89c96e956efbded576214eef0c8e43cabe41dfca245e3ebb79fff9bc8715d SHA512 4d96c655ca4c720b872e1a88ba9989a419880cb5fec2a4a9190077588066f205c5dce2591a76f26375f6f50001334ceb7631d489d3b24ca443d10e1e6879ed54 WHIRLPOOL fb192f3acb9d3a249a2ecaf6b7d6c6eca0ac684c17c01226ed1ca69f5aafefa782aeb80000bfae5753672e2d8bb93b07377e8d1c0ca66b5dbdb1332d77ae38a9
 DIST patch-4.4.86-rt99.patch.xz 191740 SHA256 4908b67e505f9499e405e829f4d755b7ff5d710d9e78d741015e0bd09cbca024 SHA512 253b31069748dad1758b68a6afb1c5af1d42652185f80521b48f52f43b26fe846e0c5433ed66db337a54a4e62abb88f64fd8d98dd694870e3c2b68a66fac7e30 WHIRLPOOL 1b37335541dbbcf61ba1f2b970bab1f375248e624716a91748f766bf26c5861cbce3c57539005de7b133be386d4a9c4626e89410700df8dca83c860b16a81952
 DIST patch-4.4.86.xz 1322684 SHA256 219964ff4de7f00acdaf85cabfa2adc9d398d19d9e9c6e2e967c3557bb27449e SHA512 c8d97bbe5ac83801272ed2c33f003cfb2a3e8f56a022dc8965bc540bd9ce691b3eb91268c4ba6f7226c2e23470f983e37cbb735d382f547a66086af06161ae7d WHIRLPOOL d601c0771b935e255770f088e3785221793c429d5c839a4627d84429a27633dcefa712c62fd43756bbb194d937b5249a1edd2ca2ca51cd3a200c5fc2351be23f
-DIST patch-4.9.40-rt30.patch.xz 171152 SHA256 3b490d49f37b7716d08771191588d980c225a5a5baa9c3eeafa94ff8ccf2d3a1 SHA512 2cd5cb8c6cb531ab2754566632353f6c89e0ea908b80f7a6cb2fdb586043445572d1e5bb70546a9a0232c8d83c19718854dc7a8e8119d52aa7021b07bdbbb7e7 WHIRLPOOL ae656f1d5f200f65547fda377293d543b708066f6624adbb6fd6d82d6140b4e74fdb62b3a897fa1b71bb56f0d03e936772d486437c612c76acdfa507f190694f
-DIST patch-4.9.40.xz 855780 SHA256 8e85a7e9de8fcc2f06f8539b743de30e2ba1f5b9e6784da0701c3ab2b896f019 SHA512 ab9c26493069f87a9d8c6c97db1a84f03a1b1221f47facc68e65d79ef75d9c7bd93c1f39eee334e4f45381b2c84ff3acb8870478c61c4d8a648984db55be5ad3 WHIRLPOOL af5c9e1eff3f3e58848c1af5177d9f5d9abdf0ca5af78518ec4173ad6459a93e417bbde52c395c69d03d217de2fd98ae96eb1966d4002beb33ea56a11f4f95c2
 DIST patch-4.9.47-rt37.patch.xz 171208 SHA256 efb772f6cee20764a5d4012683810edd0a46e058dd6f26b2d129ec8bbf77a0cb SHA512 b41e77788f29f825d7de923b9601668a27298ed21c6ca44576f67c0db48795b8b22f32bcdb713eb79792e4d1b286dce1387faa3418a306034516023943047609 WHIRLPOOL fb7366fa6569b241dc5ce6a1ee3c65274e3583dd7de2b6396843e475449715d8cc1152eff1edc9710259234d022f2df4de4dc3e898bd85f6873c0dce14afa069
 DIST patch-4.9.47.xz 937408 SHA256 bdbc18434c6891c126adb2982b0ff9f954783f2e381ab06cfbdeeaef74a0d3c6 SHA512 1444676c9bdff6133191db4885fb6ddfb989e355c7f16ddc42ff1ed9415917f06c8147cd69346525624da8547204a68303d5002417b40e11c0174341f55cfc09 WHIRLPOOL 624f7e0a87e9631cb845b814427e4d2a0c92fc443ac96bc0a0f729ff04a2859af8413f1ef381219183ee06b908e968ce3e6cc03a835918019f42801e4bb5b1f5
-EBUILD rt-sources-3.18.59_p65.ebuild 1309 SHA256 7f4474129a004f55bbf8ed6d6efbd0ca784b3d1f89359107d2b565dfe081eb49 SHA512 67f2099aae85b5330a3b3ea2214b5e34300681189e658f5dfa6378d3883ac437fc0ef644386c66e7e1e5f42ccfcdde3d0a404ce0a1c3939ad32325b73da78522 WHIRLPOOL 21f363db7c3b30831e08629b0ec9111c2f56647eba764388178bf537cee1ee667e2c5f530866f295afde34970ab5ec60e034c449c0e2bb4f942bff457771acbc
 EBUILD rt-sources-3.18.69_p75.ebuild 1512 SHA256 e52a1c16dfeb4c94d1347b3cbe2b53c521e93a428c94f4bc009b79540d3707ea SHA512 330a243a7084d3b5bdbd23e07550e636ade52e6034d15303987547fe8361ad65affffa697f4ae7a5de0c5aacc41c566319f877fa1ffc0c4bb167aef21d198183 WHIRLPOOL 84e942954a7e1da23a25c03448c80d33bfcf04e30794197e7c635439ab9dc070cdad57cf47631deab280318b02c157687bb6977b1186111ee99afbc088bf7c32
-EBUILD rt-sources-4.1.42_p49.ebuild 1309 SHA256 7f4474129a004f55bbf8ed6d6efbd0ca784b3d1f89359107d2b565dfe081eb49 SHA512 67f2099aae85b5330a3b3ea2214b5e34300681189e658f5dfa6378d3883ac437fc0ef644386c66e7e1e5f42ccfcdde3d0a404ce0a1c3939ad32325b73da78522 WHIRLPOOL 21f363db7c3b30831e08629b0ec9111c2f56647eba764388178bf537cee1ee667e2c5f530866f295afde34970ab5ec60e034c449c0e2bb4f942bff457771acbc
 EBUILD rt-sources-4.1.42_p50.ebuild 1512 SHA256 e52a1c16dfeb4c94d1347b3cbe2b53c521e93a428c94f4bc009b79540d3707ea SHA512 330a243a7084d3b5bdbd23e07550e636ade52e6034d15303987547fe8361ad65affffa697f4ae7a5de0c5aacc41c566319f877fa1ffc0c4bb167aef21d198183 WHIRLPOOL 84e942954a7e1da23a25c03448c80d33bfcf04e30794197e7c635439ab9dc070cdad57cf47631deab280318b02c157687bb6977b1186111ee99afbc088bf7c32
 EBUILD rt-sources-4.11.12_p13.ebuild 1512 SHA256 e52a1c16dfeb4c94d1347b3cbe2b53c521e93a428c94f4bc009b79540d3707ea SHA512 330a243a7084d3b5bdbd23e07550e636ade52e6034d15303987547fe8361ad65affffa697f4ae7a5de0c5aacc41c566319f877fa1ffc0c4bb167aef21d198183 WHIRLPOOL 84e942954a7e1da23a25c03448c80d33bfcf04e30794197e7c635439ab9dc070cdad57cf47631deab280318b02c157687bb6977b1186111ee99afbc088bf7c32
 EBUILD rt-sources-4.11.12_p14.ebuild 1512 SHA256 e52a1c16dfeb4c94d1347b3cbe2b53c521e93a428c94f4bc009b79540d3707ea SHA512 330a243a7084d3b5bdbd23e07550e636ade52e6034d15303987547fe8361ad65affffa697f4ae7a5de0c5aacc41c566319f877fa1ffc0c4bb167aef21d198183 WHIRLPOOL 84e942954a7e1da23a25c03448c80d33bfcf04e30794197e7c635439ab9dc070cdad57cf47631deab280318b02c157687bb6977b1186111ee99afbc088bf7c32
-EBUILD rt-sources-4.11.12_p9.ebuild 1309 SHA256 7f4474129a004f55bbf8ed6d6efbd0ca784b3d1f89359107d2b565dfe081eb49 SHA512 67f2099aae85b5330a3b3ea2214b5e34300681189e658f5dfa6378d3883ac437fc0ef644386c66e7e1e5f42ccfcdde3d0a404ce0a1c3939ad32325b73da78522 WHIRLPOOL 21f363db7c3b30831e08629b0ec9111c2f56647eba764388178bf537cee1ee667e2c5f530866f295afde34970ab5ec60e034c449c0e2bb4f942bff457771acbc
-EBUILD rt-sources-4.4.79_p92.ebuild 1309 SHA256 7f4474129a004f55bbf8ed6d6efbd0ca784b3d1f89359107d2b565dfe081eb49 SHA512 67f2099aae85b5330a3b3ea2214b5e34300681189e658f5dfa6378d3883ac437fc0ef644386c66e7e1e5f42ccfcdde3d0a404ce0a1c3939ad32325b73da78522 WHIRLPOOL 21f363db7c3b30831e08629b0ec9111c2f56647eba764388178bf537cee1ee667e2c5f530866f295afde34970ab5ec60e034c449c0e2bb4f942bff457771acbc
+EBUILD rt-sources-4.11.12_p16.ebuild 1512 SHA256 e52a1c16dfeb4c94d1347b3cbe2b53c521e93a428c94f4bc009b79540d3707ea SHA512 330a243a7084d3b5bdbd23e07550e636ade52e6034d15303987547fe8361ad65affffa697f4ae7a5de0c5aacc41c566319f877fa1ffc0c4bb167aef21d198183 WHIRLPOOL 84e942954a7e1da23a25c03448c80d33bfcf04e30794197e7c635439ab9dc070cdad57cf47631deab280318b02c157687bb6977b1186111ee99afbc088bf7c32
+EBUILD rt-sources-4.13.7_p1.ebuild 1445 SHA256 2b86635717578f3ea2a7ae1c709101b4138c32e0dd40729c5a2028d11d2dfbf7 SHA512 29f06648a0e813d797a02e7e86507649327d417bd42a7c87e5e7d13ffba4c9983c8da6e83707cd50a60504b42e53be130c9bde6571bd0a26c0c261f6901d3314 WHIRLPOOL f8d32e7ee46b39da95d31884c96e59560ea4100ff1d5e7ce5b24ea14b9a1ac02180cb44ff12b605ced655ecc515aa43ce78312d137d250c1724b22024ec5a15d
 EBUILD rt-sources-4.4.86_p99.ebuild 1512 SHA256 e52a1c16dfeb4c94d1347b3cbe2b53c521e93a428c94f4bc009b79540d3707ea SHA512 330a243a7084d3b5bdbd23e07550e636ade52e6034d15303987547fe8361ad65affffa697f4ae7a5de0c5aacc41c566319f877fa1ffc0c4bb167aef21d198183 WHIRLPOOL 84e942954a7e1da23a25c03448c80d33bfcf04e30794197e7c635439ab9dc070cdad57cf47631deab280318b02c157687bb6977b1186111ee99afbc088bf7c32
-EBUILD rt-sources-4.9.40_p30.ebuild 1309 SHA256 7f4474129a004f55bbf8ed6d6efbd0ca784b3d1f89359107d2b565dfe081eb49 SHA512 67f2099aae85b5330a3b3ea2214b5e34300681189e658f5dfa6378d3883ac437fc0ef644386c66e7e1e5f42ccfcdde3d0a404ce0a1c3939ad32325b73da78522 WHIRLPOOL 21f363db7c3b30831e08629b0ec9111c2f56647eba764388178bf537cee1ee667e2c5f530866f295afde34970ab5ec60e034c449c0e2bb4f942bff457771acbc
 EBUILD rt-sources-4.9.47_p37.ebuild 1512 SHA256 e52a1c16dfeb4c94d1347b3cbe2b53c521e93a428c94f4bc009b79540d3707ea SHA512 330a243a7084d3b5bdbd23e07550e636ade52e6034d15303987547fe8361ad65affffa697f4ae7a5de0c5aacc41c566319f877fa1ffc0c4bb167aef21d198183 WHIRLPOOL 84e942954a7e1da23a25c03448c80d33bfcf04e30794197e7c635439ab9dc070cdad57cf47631deab280318b02c157687bb6977b1186111ee99afbc088bf7c32
 MISC ChangeLog 16105 SHA256 df73592bd934b5346bfebb81c209505d2dc3e5aae8216d1e40d0d69bd09a7281 SHA512 9fb9eb6317cbaa77e34585b268ef24678c6b00a0cd1a5dd719d99e8a7d6a309677cde45999232136dc2349004269f824efba3e3cff6144c6b1e1149af7245063 WHIRLPOOL 311b73caad1fa2b2aa8c150bf0d371a1da74b51232b0b260b214e8007014b695c31dbcb798af46909600531e19334fcd52f140c3949f1bbbdd3d0e3244c8efb8
 MISC ChangeLog-2015 5948 SHA256 71b76971b2a02d52b7dc36a13183e9763de47222ed5cdda2258c32ae1dee463f SHA512 d39e5b4a7dbd2a9ef5dd8aff9fd745723f4a657aaa07b1e44251da2a8c0ebbf4642e4680f713885316c21f1847529fc9aef11863a04049be3a4610c5a2310b9a WHIRLPOOL b3ef490fff3fcfec35cf213c7b24c536f52db6af26b3a9135e329c9ba8135643442104641ecea0b0af56cfc6c44278c9619889b0dbaf88707f916cce320cda5c
diff --git a/sys-kernel/rt-sources/rt-sources-3.18.59_p65.ebuild b/sys-kernel/rt-sources/rt-sources-3.18.59_p65.ebuild
deleted file mode 100644
index 911287c4d4c2..000000000000
--- a/sys-kernel/rt-sources/rt-sources-3.18.59_p65.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-KEYWORDS="~amd64"
-
-HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
-
-inherit versionator
-
-CKV="$(get_version_component_range 1-3)"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-RT_PATCHSET="${PV/*_p}"
-
-inherit kernel-2
-detect_version
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
-RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
-		mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
-SRC_URI="${KERNEL_URI} ${RT_URI}"
-
-KV_FULL="${PVR/_p/-rt}"
-S="${WORKDIR}/linux-${KV_FULL}"
-
-UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	ewarn
-	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the RT project developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds."
-	ewarn
-}
-
-K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
-${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-4.1.42_p49.ebuild b/sys-kernel/rt-sources/rt-sources-4.1.42_p49.ebuild
deleted file mode 100644
index 911287c4d4c2..000000000000
--- a/sys-kernel/rt-sources/rt-sources-4.1.42_p49.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-KEYWORDS="~amd64"
-
-HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
-
-inherit versionator
-
-CKV="$(get_version_component_range 1-3)"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-RT_PATCHSET="${PV/*_p}"
-
-inherit kernel-2
-detect_version
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
-RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
-		mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
-SRC_URI="${KERNEL_URI} ${RT_URI}"
-
-KV_FULL="${PVR/_p/-rt}"
-S="${WORKDIR}/linux-${KV_FULL}"
-
-UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	ewarn
-	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the RT project developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds."
-	ewarn
-}
-
-K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
-${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-4.11.12_p16.ebuild b/sys-kernel/rt-sources/rt-sources-4.11.12_p16.ebuild
new file mode 100644
index 000000000000..8f5a060bc499
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-4.11.12_p16.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64"
+
+HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
+
+inherit versionator
+
+CKV="$(get_version_component_range 1-3)"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+RT_PATCHSET="${PV/*_p}"
+
+inherit kernel-2
+detect_version
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
+RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
+		mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
+SRC_URI="${KERNEL_URI} ${RT_URI}"
+
+KV_FULL="${PVR/_p/-rt}"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+PATCHES=(
+	"${FILESDIR}"/rt-sources-posix-printf.patch # 627068
+)
+
+src_prepare() {
+	default
+
+	# 627796
+	sed \
+		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
+		-i "${S}/kernel/Kconfig.preempt"
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	ewarn
+	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the RT project developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds."
+	ewarn
+}
+
+K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
+${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-4.11.12_p9.ebuild b/sys-kernel/rt-sources/rt-sources-4.11.12_p9.ebuild
deleted file mode 100644
index 911287c4d4c2..000000000000
--- a/sys-kernel/rt-sources/rt-sources-4.11.12_p9.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-KEYWORDS="~amd64"
-
-HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
-
-inherit versionator
-
-CKV="$(get_version_component_range 1-3)"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-RT_PATCHSET="${PV/*_p}"
-
-inherit kernel-2
-detect_version
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
-RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
-		mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
-SRC_URI="${KERNEL_URI} ${RT_URI}"
-
-KV_FULL="${PVR/_p/-rt}"
-S="${WORKDIR}/linux-${KV_FULL}"
-
-UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	ewarn
-	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the RT project developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds."
-	ewarn
-}
-
-K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
-${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-4.13.7_p1.ebuild b/sys-kernel/rt-sources/rt-sources-4.13.7_p1.ebuild
new file mode 100644
index 000000000000..3b5bc7251fce
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-4.13.7_p1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64"
+
+HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
+
+inherit versionator
+
+CKV="$(get_version_component_range 1-3)"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+RT_PATCHSET="${PV/*_p}"
+
+inherit kernel-2
+detect_version
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
+RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
+		mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
+SRC_URI="${KERNEL_URI} ${RT_URI}"
+
+KV_FULL="${PVR/_p/-rt}"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+src_prepare() {
+	default
+
+	# 627796
+	sed \
+		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
+		-i "${S}/kernel/Kconfig.preempt"
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	ewarn
+	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the RT project developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds."
+	ewarn
+}
+
+K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
+${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-4.4.79_p92.ebuild b/sys-kernel/rt-sources/rt-sources-4.4.79_p92.ebuild
deleted file mode 100644
index 911287c4d4c2..000000000000
--- a/sys-kernel/rt-sources/rt-sources-4.4.79_p92.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-KEYWORDS="~amd64"
-
-HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
-
-inherit versionator
-
-CKV="$(get_version_component_range 1-3)"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-RT_PATCHSET="${PV/*_p}"
-
-inherit kernel-2
-detect_version
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
-RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
-		mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
-SRC_URI="${KERNEL_URI} ${RT_URI}"
-
-KV_FULL="${PVR/_p/-rt}"
-S="${WORKDIR}/linux-${KV_FULL}"
-
-UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	ewarn
-	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the RT project developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds."
-	ewarn
-}
-
-K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
-${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-4.9.40_p30.ebuild b/sys-kernel/rt-sources/rt-sources-4.9.40_p30.ebuild
deleted file mode 100644
index 911287c4d4c2..000000000000
--- a/sys-kernel/rt-sources/rt-sources-4.9.40_p30.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-KEYWORDS="~amd64"
-
-HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
-
-inherit versionator
-
-CKV="$(get_version_component_range 1-3)"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-RT_PATCHSET="${PV/*_p}"
-
-inherit kernel-2
-detect_version
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
-RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
-		mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
-SRC_URI="${KERNEL_URI} ${RT_URI}"
-
-KV_FULL="${PVR/_p/-rt}"
-S="${WORKDIR}/linux-${KV_FULL}"
-
-UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
-UNIPATCH_STRICTORDER="yes"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	ewarn
-	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the RT project developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds."
-	ewarn
-}
-
-K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
-${HOMEPAGE}."
diff --git a/sys-kernel/spl/Manifest b/sys-kernel/spl/Manifest
index 672fc80132e1..609132e3dcb2 100644
--- a/sys-kernel/spl/Manifest
+++ b/sys-kernel/spl/Manifest
@@ -51,7 +51,7 @@ EBUILD spl-0.6.5.9.ebuild 2717 SHA256 56ff526b677d27d476a7b3ab32f98a708fa695b46c
 EBUILD spl-0.7.0.ebuild 2717 SHA256 e7587d6d038cc443e1a9b551b94e23018dff427c903bafe635e64505169fef06 SHA512 13cea0c1dfe684bebb4783dc0c655278a7a9903402a738c05238de66c131edf328834070adfc8d303949560f8d62eff07a5d9f321bdda45c002bcc64dd5d3431 WHIRLPOOL a4d74dadc6ebc4c768a350f27365b6c7fce5172df7743c81c64f8716074d3159efc2e71040e828feceb0554a8d226c47638ab56b406be7f867864b7a3d6c83fd
 EBUILD spl-0.7.1.ebuild 2717 SHA256 e7587d6d038cc443e1a9b551b94e23018dff427c903bafe635e64505169fef06 SHA512 13cea0c1dfe684bebb4783dc0c655278a7a9903402a738c05238de66c131edf328834070adfc8d303949560f8d62eff07a5d9f321bdda45c002bcc64dd5d3431 WHIRLPOOL a4d74dadc6ebc4c768a350f27365b6c7fce5172df7743c81c64f8716074d3159efc2e71040e828feceb0554a8d226c47638ab56b406be7f867864b7a3d6c83fd
 EBUILD spl-0.7.2.ebuild 2717 SHA256 dfc04b9e783b5c216e28e873dece38bf00fa7933545841d49cb06f684022eaeb SHA512 ac51c4aefdc48c7d8c3a382f4333ad31780a01ca571897c1175ffe1a42ed7210c771ca88276096153ac65072a50cf73ea26ebfbbc527f19ed2b3de460422c468 WHIRLPOOL 2978dd970551ef105a716c8d4ed571d0510f1b832ebac917feca3e71d4548650f0671435fcd2394f198e879709dc224b874ab760b5bb48ef009e0af3c0d8f1b3
-EBUILD spl-9999.ebuild 2750 SHA256 f9688965b5634b4230068f29bb968ee5e14b10d192920d65ebb3a65c636f86b3 SHA512 c78c84038509c2547291f86fdf567a5f9365388df20bd37054547c431a552f546904b7412ae91405d52e896dcacba4018e6751330183fa74146c7cdab824b5e2 WHIRLPOOL 35723403c05f0b57199e4edf91c99361997e90b1afa156ae71fe6c222f7ae5f627ecb47e13acecbc28b004a72141016721c2f1cc15c40eb9c8375e7313f0d12e
+EBUILD spl-9999.ebuild 2752 SHA256 43a4ca3d4f65c05343ae4f5eecefc0811d4eec6dc27d42851f8c99e62c4a119f SHA512 9c1ee1ec008d4f6f9a58a5e2c2942b62979ec0c7e6cb80a136c5b874adb52111beb7302ac347a9d60412ee5165cced4656e276d7ca0125edb7e8e594706bc408 WHIRLPOOL ec8473441c80125b0ee9387b14280e2d502a7596485c438eee70aa2202d76da440c259fd0fcf5c04dc23e723508b25ae2fd4df9b34d3b5134202cb74aaed48e0
 MISC ChangeLog 10748 SHA256 7f43e2292109f0e78d4fba1100efdc8f542599774a29e6ce896801dc7677df67 SHA512 b36e5641e1be62a579edc449c882675f4570c0443d0eee4daedad3a494fd814f8dfcbc736cfbd315555e1a9603d5cb95a3fba8e844753c72c2613038fd0428ad WHIRLPOOL d088e4b5ffc56327d4e289dd6331acb90912d3ebd0c02c6a63c50345be650346faa973646bd912a953f4f388368ccd3e5241a14230da7c9f3c1e92ae5bb90abf
 MISC ChangeLog-2015 16325 SHA256 c81ebdd34dcab30fe1b238f412debae6dfe1997ba55b486029321d6bcad7d9fd SHA512 3b265e5b9fdd79eac7946d7f7be229478960491e4467763e56ac4f5b9cd82855f164173bf32c73fb4b1ac4bd8446d68f86a73a40a6210876dfe88ab53d333e31 WHIRLPOOL 98c9f57885cad957a671985fbb469a329599f1ac4b8ae407765917574e412143b1ee8df3fb73e21b73d1394fe5a5da3f0cc252c6b5b8fb8302056207c12d1ae7
 MISC metadata.xml 513 SHA256 ad1644b1d5d04829193792cdc514b02a13bcd76e05a5c43d755ba463f857fe4f SHA512 6a8f7273eda76e5b2f5a96b772ff6a56b7248279b4efea9375d958c2a849d64e6213a7ebb452947c5e4076a4f8e3c612258c6a6ba01007b3d04a51b815fd5c73 WHIRLPOOL 847ae2aa8adbba49dd8a71a19491686c3dff298e990a7d2608e5be0370dbe7cf6381427527ff1ab0f2dd4710e940ded79df522935ba10035d313a9a843e5ed53
diff --git a/sys-kernel/spl/spl-9999.ebuild b/sys-kernel/spl/spl-9999.ebuild
index 074b776b6d04..eb6159b9a65b 100644
--- a/sys-kernel/spl/spl-9999.ebuild
+++ b/sys-kernel/spl/spl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -55,7 +55,7 @@ pkg_setup() {
 	kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
 
 	[ ${PV} != "9999" ] && \
-		{ kernel_is le 4 3 || die "Linux 4.3 is the latest supported version."; }
+		{ kernel_is le 4 13 || die "Linux 4.13 is the latest supported version."; }
 
 	check_extra_config
 }
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index b203e1e021d4..2f4db32623b3 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -11,17 +11,17 @@ DIST patch-3.16.49.xz 1715976 SHA256 6cac095f27e2dc714d1fd17b904c600179b042f904f
 DIST patch-3.2.94.xz 1789324 SHA256 67e6decb1358fe532b18021d019947530994e416d3b37d46d1dc1e1a588bc968 SHA512 969c94d9801eae41a279bb7792a4d81d9bfc65e7f3e700febbb1d36b733ec60f923054d84dbf19fff27aa3e3807b93cdb5a561216e0c4f361a491e939b61851b WHIRLPOOL 536a689a34499d9adb30501f706b0d5cd71467bd7feff9269cbca3df00eb5b24a530344454cf185cec91113f80afc6f78749ba68808e69dc11fed45037f6ded1
 DIST patch-4.1.45.xz 1195980 SHA256 e5b3836fe1cc4669c4b1bf4f18e761929b46c5ac237c83286705950a44b14d86 SHA512 a676621313ad990ae27e01602eb6b9369427882f7404fc51ad964bb976d566e205620f054aab97163b60ecae58707767063ba994e4557ce39c7edc7890679f5d WHIRLPOOL c99e1492e96045086ef73eee8d2689b405fab3a60501d0f52a15227a974814061634d30504ab1cfb8248a46ff7625cf9e0190e3ea4e76b23d3829b206d5d3edf
 DIST patch-4.12.14.xz 237356 SHA256 999f3e0d97e1b9e7a09c8c0889f020ac9e342ec2391d0458521d4b8bff1cf945 SHA512 8bef19b2a87147b4ac7c5852d6cac0281c7df7deb84460c6462c981b9213d288061c19535bd9a4da03db73f8a9fd2fb76bf9c6d42b0b6ad1f30c97d5ee0964d1 WHIRLPOOL cd7c1173430eea9a33386fdfca10e1112ee90a5420180f30c0f375d7fb3ddfa657eae93cbae1a1d2b1a1a5d442eaf402e6565028ffeff79fc78a08b6334b1873
-DIST patch-4.13.8.xz 179404 SHA256 3b2bcceb16acd75322e98d3e93967e82bd0e7499c748bf12bd46c7519dacc315 SHA512 b70b1a081155fa9a7082ad2771aa0a43a9f6458aa5f7f312729aaa3a71db71d28bcd1d1cac6ffaee134797359f37ee86de70537c1190ca60c016a8779268e880 WHIRLPOOL 82e9c91772c2ddd9c38fa7c7ad0cb34c8bb8faa1793f2d9fb1c22f04351ad5b5b4af201e5d521343b3df411cd07a003754009fc7993cf844477015e034d66577
-DIST patch-4.4.93.xz 1381652 SHA256 3c77d1eb0ba080919d8131505fc1851fb27a01480a2fec8376144da7d6f0025c SHA512 3a541b23252cf2b67c7ecbd0098aae79326df0bc9139209446b17cb8c1dece5e4c0547a2c8809f6c350145266b2f4197b3ca5d1eced9acfbde234aa25df79ea8 WHIRLPOOL 4030296ad2c0e1510312a47350f05452c0ac81777963ed3da6fa379dadca0c9f14f17d139e8823c402a0be4ea5b7ef355df0dbf6d2a1731f66253423f1e1f5c1
-DIST patch-4.9.57.xz 1067768 SHA256 26b7cce0abf8223269935ac62176216d0ebd2bef2fb91e15581ef2de1a032639 SHA512 7b60909d9e1e34077bbabf29d13a41e40cd1dfdb8c732755720a79d0d802376b96e126f1508d4f3fb5e8b1e502077f391f773b7701cbf32dd828242090f909f6 WHIRLPOOL 569e8656f40ff76e4e9ddd2c76671950b62d22e776c0558dede66ed0ca2aa536d2b3645f44d6e1a8ad95fe5a9fa84d4e6ab28946a35dfce70576e9231b313d6c
+DIST patch-4.13.10.xz 212680 SHA256 b9efa9c6375f79f6a041a5f0666d4ced1a49bfe8c4662d26517a6b4cfd9bf2f6 SHA512 634d81ea509aac5555d8d11631babe9bb04ea771c873f084cea7067313a566d5cad291b0c311002ae8d1d6dd498a93a9a43517923aa449eebb405fb4c1e34753 WHIRLPOOL f033d0bd9e6b95cdcb356a69ee4ea3054b96f991973445e94aeba664f3e91dcadd46a6c0620ad4f044503ccfa28a6deb2ed20890ef0c65b34f27a83b1847b8b1
+DIST patch-4.4.95.xz 1397696 SHA256 af1bb9333d5daa95540606ddd95433dd70405deb88485121f842b916ddcf9ee8 SHA512 36725dddebcacef5774f35343dd34b5dbbbc196c5dad8eaf647d6f3e7391ee1bcb0b7060eff240fc480518cbde05d38137a783134cdaf06d170bd01ffbde09ae WHIRLPOOL ab0e033f3859300f47098eb34cef1011403e0dc293f4bcf6d5ee26816a5dc8f3093f7cfa36ca63cca8feca30272880ca04bba6a39e16d0eb5d65b656a4bcd618
+DIST patch-4.9.59.xz 1090560 SHA256 2490246b965c7df24208e6e3512ff19c69e0603435865fda5152195eab073800 SHA512 f5bcd0efe10cd5b1edaba044ebf2c8ddd0a34a856567d66048b510b0622d48365c9e0a939413abe9f26b836d749395ecfee4e29a60111c379eae798e1972761c WHIRLPOOL fd5a06f1cb03a54c9b114b57342ed6e045f73e740fc9f56171405717bc6b6c35ed66f14b0a74232a1139f33a7ee3ceb1996bf7f5dec77064142b421c7c3fe99a
 EBUILD vanilla-sources-3.10.107.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
 EBUILD vanilla-sources-3.16.49.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
 EBUILD vanilla-sources-3.2.94.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
 EBUILD vanilla-sources-4.1.45.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
 EBUILD vanilla-sources-4.12.14.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
-EBUILD vanilla-sources-4.13.8.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
-EBUILD vanilla-sources-4.4.93.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
-EBUILD vanilla-sources-4.9.57.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
+EBUILD vanilla-sources-4.13.10.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
+EBUILD vanilla-sources-4.4.95.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
+EBUILD vanilla-sources-4.9.59.ebuild 426 SHA256 d51336070bcfb81da63984fed8e0a90505b5281cd2794f7dc1eddcb333855b54 SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a WHIRLPOOL a966c069ad56880712804cef6a447cebe006ecd4ddf033bbd9042afc5a679b705f556c4fa8779bbf77c52ae0acc9dd8d92449bab5af90cf9fc3997e168b048df
 MISC ChangeLog 48866 SHA256 5e96c40666532838415dc80201535a16e22c7513cce19c979effe9592694c294 SHA512 06ee49f4aa7730f7c92a4ca500f6fcc105591d6b4ab7431e77a77b29821b81d7b882852370ac800461d2ca2efa68519e64504367534ef2e94dcd0da21b2fd9a0 WHIRLPOOL 31715105c3f96167303a5884816f10983a03213fb66fd96e032eb4b0cfbfeb98ab1ac662c585143e60f7a0f85dd465554498b4b03ff35887e5061fd1f2b8be60
 MISC ChangeLog-2013 104895 SHA256 3ad2bcc0b59ccc0f293134875f35690751b160483a3f010b6c3b95174df96471 SHA512 35c725d7c676a1ae6ebac12647004988b0b1e2b87fb7cbce95c101b8ad7b1e9527cc23a6bbc4a27fe11c47813d3743ba35223dfb8b546dd1f204943939172c47 WHIRLPOOL b250875b50ea9f08f26f3f92c45960fc317e7495b70fbf053f9586e75924b6478eafbd2ba54a2cf1c983d49b0341e63a15b2d46ff135f8945c3b61e3e87eabc5
 MISC ChangeLog-2015 43787 SHA256 aae0d19a00913935885696dbc734946b05091c72d5c32e1f57925b76da4fc9fd SHA512 0a63afa2ce400c72c57c796c3dd4b8fe257d0d827b62b77cbeb1561a3cc99d7c04d9039ee9523edfe8bca8f4f197e91a58282b91909cb5b272685a9a4c5db8b0 WHIRLPOOL 6b940c705250ec86a7d0c0792f797279a88aa9fe0e63ae32d01bab9ad22ffc4a8f955aea6f0afad15ccfba945e70a3e8ed10ce46016c44da5691605ed098e97d
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.13.8.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.13.10.ebuild
index 20e2c109b44b..20e2c109b44b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.13.8.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.13.10.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.93.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.95.ebuild
index 20e2c109b44b..20e2c109b44b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.4.93.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.4.95.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.57.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.59.ebuild
index 20e2c109b44b..20e2c109b44b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.9.57.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.9.59.ebuild
diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index ad094cd22d49..468939933c63 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -3,7 +3,7 @@ DIST e2fsprogs-libs-1.43.3.tar.gz 599387 SHA256 157d90e8482753d3bebe03e8d6a4688a
 DIST e2fsprogs-libs-1.43.6.tar.gz 595409 SHA256 74366864feec30c73621efe43afa1c412af613af3dca912cf86472ca27586dc8 SHA512 80a643ba349aac79c88548e9692066f777c5f9e82e309b348606a8078de456171535e6e5df91f73ca3db9d03bb539b1a19883cf74615357bdf77f3bd20cc0b11 WHIRLPOOL 7264bc369ac8c7f1a04df84e7270b5d030a55696d1f13056763d7d1c01a57a10461534a70ae442f4ab6e3f2c28b1b4af98ac33ee2c0e791eb4d21efe8ed25dda
 DIST e2fsprogs-libs-1.43.7.tar.gz 595431 SHA256 c94305d5aab2b6c4de2372d3c05f16381804eba658ba28fbdf9d4f93c65d0abf SHA512 b57c069d2e95588823fd69169378dd9d8a04ca77daa1a5dda8398cd198ace6184a3cb08507ae2b195de399caa4d197306043749f4a3010bccd942ba00d44162b WHIRLPOOL 535a76ff007573f10b80469f22ec50fd27d41afed2e9f21024b8cb3fa9e5ad0b2d9a449c8830c9f9133a7ba8bfd733cf2388a6fb7375ccc1a9d073523ee0bade
 EBUILD e2fsprogs-libs-1.43.3.ebuild 1866 SHA256 6fab0890c66bdfce0172b516a9e4c69802f0ee8bdae665cf86cd31ba6f15844d SHA512 d3b5cd55e334010d636fe72f5ec54b8ef4383327b242bb4be9bb496107c96d0cf83f47886dae2f915b4f7b6d9f53595b0effe7911a74770e18a20321c272dc60 WHIRLPOOL 446b44e802ac761f4f6c44b44b77a4bf132856343e07c563089643a0c79e4e3f62af5bef202784b68d710a88c99b88c5ef9cf00dfca1deab9d9e96653bf6b5bf
-EBUILD e2fsprogs-libs-1.43.6.ebuild 1858 SHA256 00713f63dc3c3bcf83e654f7908a878963ffbc6c856a24a79aea4bd2ca37701c SHA512 662522b165a8f9301f31f8001b77be2b145ef5f5a233dcbcb63bae96f2d9d55533a84ee8af6bbe9d44561ff28a24df3a2131769e257471d56b8ce54454be1d99 WHIRLPOOL 6eefbcbda1c08542838e95d779a6aa4b11edc34e5096039f08a7faf33cc846cefb4a6c0a7cb67f5efb4d1ada6036a0154535c64ffba250dda6aa1ebb7e108ee3
+EBUILD e2fsprogs-libs-1.43.6.ebuild 1856 SHA256 a1175e50e2740bc1752ab038ebe034c271f2da7c36b4535df8fecb778f8628ef SHA512 9d8c1098ffe20d9ad85ce34d1686271183b8c8ad1f575f1bbef7f5bb8f39002cc14346730cc0bad94eb3a2b8ee6f39e4998219db217b81b772e7769647346257 WHIRLPOOL 94677dc928c419aad73d9540d24ba1298c05b3ef259b600ec451b47c0d262e4b245a5c168f1b7fbf0655af21a40b17e7911241d5eb245d4311c72ac6b7da2e05
 EBUILD e2fsprogs-libs-1.43.7.ebuild 1864 SHA256 53acc760e7f89e5e6e9da81c571c5355098a0785924b8c335f292e303f14825f SHA512 50f0993a527c7f75747615272875ef4f2d74799242c389fa8258e6dfcd0f86d29706bf12b8dd29be1de39bfcf49627ee991dc15d217c182fb66b54ffd97c0d97 WHIRLPOOL 3792e55806ce30e8a54f4dedfb8c1491de4521a64f9ff7f1e0cd3934a85be4b9d61433563e430a94a9adf00395ea0c3fd57a4b128731834b5ea0c659fc4a53bd
 MISC ChangeLog 6196 SHA256 d619dda283d2dcb1e59d1894762c4076679c679e1b107ac9d18605f9df11426e SHA512 ff37c2e6b7f7de8f5cc9136c014ee78995783f4156aa460b5ed55ca6f2f90fb70f986521bd6945f34d1df514cf143d73aeb4e989335b5c41770bd09670c40134 WHIRLPOOL 05c04c3286946f8de76749870cb40b97c1eaf7912c3d5bf5058865a7e4dc4597fe97127116ed6bf3382d36f3c1b55758e6c28c51782fa13607c1d8d822ec63b7
 MISC ChangeLog-2015 21687 SHA256 fe736cc78afebb966f4972c2825f3aebc646d2b2a5b7058a6f5d9152bcd81778 SHA512 6e1654ab6dd1d4dedad962ba2dc17ef8e8ca76635e7cbb578d3cfe914e51187c2e1f149b8e6fd1b40e5fe04f81d4329c9121c8b328f2706365a38951d577809e WHIRLPOOL bac584d14ef35e4941d858c129fc7aac819aef60e8aacf0de45cb695926d50cb1c4abde308e64a570500ab8b8c9bbc39044b8d83e89961e2adb19f672a6ff46f
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.6.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.6.ebuild
index dbe3bf86b3f8..1d598424242c 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.6.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris"
 IUSE="nls static-libs"
 
 RDEPEND="!sys-libs/com_err
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index b9688f2cb5bd..cde3c5c783dd 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -35,10 +35,8 @@ DIST glibc-2.23.tar.xz 13455260 SHA256 94efeb00e4603c8546209cefb3e1a50a5315c86fa
 DIST glibc-2.24-patches-10.tar.bz2 73586 SHA256 d479033b63ff796fea56fb1bde390c442021acd856994b15c983b4a89e46fbbe SHA512 fc9191a85da53a2515bbaab228648936682e04267284049468e0c82284f618ab2907b9247baca701e16edc50640199ff6d8e2a6a93ccbd5a9d3b0eb73cc484ca WHIRLPOOL 7afe94307900a70de2f5e028d8ec9e0f4b06b661ec6493217e51a13d750f891e10b45c0f66d86fa83c16cc3ce539bb257039b33bc3e363469cd03502d956d75e
 DIST glibc-2.24.tar.xz 13554048 SHA256 99d4a3e8efd144d71488e478f62587578c0f4e1fa0b4eed47ee3d4975ebeb5d3 SHA512 a4cb28a2c51a0cc029ed69da7cba11931a615ba897235590b4f7fad2eaabec9042f8250eaac2a5860997437a69ab13304f10a634000e52c0336b5593b7969adb WHIRLPOOL be82b47fc73f7e780e8e73a5f58b313d8e861d5ea8c4320f95ef0d8c1e125ff011d61dcfc0380be0e83868bd8c3299de1ea662da7fc8d709050e89b2c126e3eb
 DIST glibc-2.25-patches-11.tar.bz2 64221 SHA256 38c76c844238a7bbaecc85b359e67af6a98a1614f3196f25d85f83dec4358e99 SHA512 cbbbca9653f55f0cb3b73c38c979cb439c87b172819f3e999d2b435d59cd2bef2c89f11a398300c53f447ad433ee87f47a0f3e890c78f8694705c788455325dd WHIRLPOOL e61203ac129d7283f3beda1421e1365da58c229bcb6b6a1f8b71755d9ea0e2bfb64b8be69ab7698861a593d4b98ab6163d574f3c215fba0a0d9e6a1b15d2eed5
-DIST glibc-2.25-patches-8.tar.bz2 47110 SHA256 1dc41664153369886d240a1851b15bf0c3c3739c8319e6d68cb0c2f85fc98901 SHA512 41d772c47770a63502c863f3c9bb05164e0ceab69fb7b7f355c25685ae4285d73e9ab0e3836162bd11852339055329d0bdc7238f3191fde39a50ce0d9a60454c WHIRLPOOL c6e0443d75e2e4607226caa4df1ce2b10ef21ec2564b447e2a287888d1f593d51f334a6e1ab942f5d1602d02c6fee87ce4ef9a7db3409de6063bc377a470a42d
-DIST glibc-2.25-patches-9.tar.bz2 67901 SHA256 cbd8af837aa0776940fd41e34874e930a7f25d78cdd212e138dd9a85e1349519 SHA512 b4f0be5b20834aff102394df23084cc0adf1ab674e6ce050550f6b6658cf0eab57f7685cac079b1a19388dba927a36b8ca31f58af3dddc559d7230674ffd59b5 WHIRLPOOL 81c18056fe26a79c7a7598da1181ba02e83daf7d9e9883a3c1195804a35fe22a79d7cc4a8411f2f4a4ce6430e506978199f59b61d3ed0a70b4e4f7dd05ecfafe
+DIST glibc-2.25-patches-12.tar.bz2 65396 SHA256 60a8901ceab4066661285cdbf7559d3a1f66bf468c5c1a5ecdde7f8ead282d3e SHA512 6af8c304ba70b42dfda294873d9a138d6c98e7a46496e305b2cac99a085d1ad3d00315162d1e1458e651de95e158bd35be74406a3f44fde13182e30baa663fcb WHIRLPOOL 96684d379d65ca6e4da7d397d4b803e0b0516080223de86080d6bbf3cae6a17b9fc8922d6fc2071b3116f35136378d85eb6671c7d9f7cf0f2135b66d1573bb90
 DIST glibc-2.25.tar.xz 13873900 SHA256 067bd9bb3390e79aa45911537d13c3721f1d9d3769931a30c2681bfee66f23a0 SHA512 5b7a2418d5b8a1b6a907c6c7fb6477ee2a473151cb45e03d0d4cdd9a33497c90b1ee39e2e7e885e2b25743dcd3747336ef114b4a73eb001da1fd79f29e0f9a6e WHIRLPOOL dc2fafaa4a0e5581268338453838a03ed0c5e7a2af844e8fb7086ab8d3ae48efbdbe6f25db1d089ae669cd2f8b0412f690d965506753d86f8525da2df59b7953
-DIST glibc-2.26-patches-1.tar.bz2 26479 SHA256 ce54a83d17dc2d605e69045a9031d31c729e660fa33e740780de2fea1f186115 SHA512 416cd1e2f4a7eaed2c1f5cd2d483a9d695e82e33add42d0f1c854fd69ccb2ce7f99666aee8fb7bc2320d5d3f44780c3d872134f383279ba573325df91f061dbf WHIRLPOOL deb3a5d12510b20f427a4d82a8b5fff4ab4c4932e6096ddd056efe07d1453f5099040db2c9794c3df4fa79516424a28d2c0c2158e3aec6ae6b05b840ee5e156d
 DIST glibc-2.26-patches-2.tar.bz2 68040 SHA256 c40f03059d389fd8b22b54f83c0a669c44a38ee84cc359cb86d8f6dbdd1b957f SHA512 2b54d6e33b29d5ee5e4d4b64f299bf15e22ece5ce6555dafe43fd97ec8a2d9ef0645075ff24dc593ec6f89e02caf40c25a72af93ecd11113fba77268ccf486e2 WHIRLPOOL 59c54cdd2e3e64091dd206ad6b5ff467eff6c0d7f8ef5ab11504a4e6cfe958f762b9de2fbe8b6004a9e19963520a84a493ccf03908a78ea0a452dbc28e0df1e5
 DIST glibc-2.26.tar.xz 14682748 SHA256 e54e0a934cd2bc94429be79da5e9385898d2306b9eaf3c92d5a77af96190f6bd SHA512 6ed368523bc55f00976f96c5177f114e3f714b27273d7bffc252812c8b98fb81970403c1f5b5f0a61da678811532fb446530745492d2b49bfefc0d5bd71ce8c0 WHIRLPOOL 9091c3bccc9b590de6b9595aa391ba01091f0c301bd9199d7c48fbeaeeb013ec9c683c68b65b59c5a69e3905b7f842cca1b0a410431967ecb3a1229b8535486f
 DIST glibc-9999-patches-3.tar.bz2 19892 SHA256 97f60ed6debd495610b123d7a27227e75942bea1a0fb1e5f78833a6f3bbe6c64 SHA512 75084b86a83d447d3a4b3959fa2a93d849e304ba9473ebec5570ca4fb5e2f8dfb38548faf3abc9fbd29b529f2c608b52eb2ef2e6e9a2ad5bea9a9298a19ef596 WHIRLPOOL 04a5c30aabf72530fa96fa3a8eadf8207d85d3a2a948ba5f4b72c0deeeae24e7eb71b99875f0e9b1018051fabb4a23630b41873fa4ff0d6ba9778ca6051212bf
@@ -51,14 +49,11 @@ EBUILD glibc-2.22-r4.ebuild 5009 SHA256 897760d86ae324656302bb26ddbdf9a18a7a6b04
 EBUILD glibc-2.23-r3.ebuild 4890 SHA256 364b764f399b9525f719563cf2d50c0c75c092419d38583ae7fff2fffe1eeb7c SHA512 1cc3788c854e92a1ee5df8a421af0d3180f15b83077bd06c83632e49c31b91baea7a58f6a2c849fac6e0438d36de81d989c9e1a1e79ace0db5d2502c67d19344 WHIRLPOOL c5ca04af9119ab27c26ad2c9318eea3e99ddbe61fff67e3a1093e402808bb4dbeb3baa8ee9b192696aadb3ce39b30d1bdf520705e0e731a66a379e4fa19f3083
 EBUILD glibc-2.23-r4.ebuild 5011 SHA256 3690a8b559bd563dc9af89d1217f5021c7da1b89eb5ec513e8b725e04cb45e0e SHA512 3695c8acea09838cc79c33379cfcaf0eb774759f3af5863892ff9c63732926764a8a5187ab9aaccdfd358d62c0884feab95a7055735c9295549d5c8f0c198221 WHIRLPOOL d6a6404e9968ea604d578d500ff7cd550097c1cc30713d61253a130d6a26f9f228ea83189abc611b4704e58be2b74323ab8f106faf4d3db92f7c61f27bf43d93
 EBUILD glibc-2.24-r4.ebuild 5047 SHA256 c200272f9c19ce196e788572aa0ff5e0e0a24b37b6fd3b0a85236406b6ea8f11 SHA512 d93834a9012716293c1992d6217eed6364782e6e01c692e349c6edb00bbda6dd5f227f70977e438b46de0861e9a2d4bc8c04270873cec75b1eb395b1328ea8e2 WHIRLPOOL 4dfbf4334444fb77baca96eb14911738f3253709816a6e87ddc2d53c5eebfec22abc32dd61dece00dd250a13574a35df5b8bb3d6812b6fb27e05e192c5d44297
-EBUILD glibc-2.25-r4.ebuild 4924 SHA256 c0da394b59de8b630923bcf8c6dc1380cf0a78188d6249cd8c9ee4845cd091fd SHA512 b161ebb907156041d3b94d9e0d46de6587be6dc76ebe9e078d5341c4ce5e98644d44b75fc64bb3f2f113564ddd0f9f78409c18a8e64d6e5c73b942da0e065133 WHIRLPOOL 662eecd40af24e60074e023ad01b3a0fb5dcfe5abe2e670f745243700c7630dda1ec438b84617b23b58f82a1743a9976535b8c039494df2d0e35a9a2e81551b5
-EBUILD glibc-2.25-r5.ebuild 4966 SHA256 ed5fdeab50bec85ee4c5127b598cacf66d1f2b7429250203d63e33056d56288b SHA512 9b8eaa8a37ed54c7cf48a40bc9c15da3918d787e0374ffa7d63350d6ccbd2077435871f7021e3c0e975134299c9c1a3b40f990cd9535d35d9f488a0853213a72 WHIRLPOOL a2f1379c652f3acf13ae17775b86bd9775b4a1a9f21af223f23823522714d108ce8351cb2869ef9e9f782bbc256f39162f377f01e6b8aa8182432cf4ea8f0033
-EBUILD glibc-2.25-r7.ebuild 4967 SHA256 3793570b4b1bd9bfc3475ba7edca14683b7c5ec9653141f2d1a67751d85f8f65 SHA512 242db7036410f38e18d9dccf75599602d190acdd6b36c344227383d62853526c398c44f88612628de857b7a8ee6f1194d123a1f4e13c23684ca46482f540f91e WHIRLPOOL 952248ef8b7b31c45e6136141cccbf6544f11f01d006ba9d9ba44528c8bdb8a4cf2dab9a0ce707c74987d71bd5b792e618309750457f72242932870a2d99900b
-EBUILD glibc-2.25-r8.ebuild 5049 SHA256 c49a6b79c8d8c89545934438cd46b83efc616ea40e3c093133519217d6e8162a SHA512 cf003be920496d2d4645aa0266fc3dd7555dd7d621f9ca068faabd18cd108c6c919f6218f1e3b6fe9fbd78bfdf390015796ff25d791e92da618d3efbc9819cfc WHIRLPOOL 36e610a8a49fb4136653090cfc7139bf25617f3c2c1d3a8ea41b963cd6df1178184e2f662287d1f569b3cfe72f4c2c4ad6d5f88149c2bede193d6a860769acaa
-EBUILD glibc-2.26-r1.ebuild 23722 SHA256 899859c6118f79e8a74ea4bf962ad05b9c6f7556aaa5fecc725529e4a5139470 SHA512 3ca6176057d707eb408217d19801cffc180f1c1f29b7031ce1b60b600fab92843354a4b41b3a05e195a526c81b3aa1c8b9fe936773365d69c6b3195eb6a4bdd8 WHIRLPOOL dc1d21e11cddbdb3e62ddfce6258fd69e2b79f159a9a98f769a6e38fff723cc074136923a7f2cc426f188fb25d780a0f8a48c752208c830f5b05371a3d7b97b6
+EBUILD glibc-2.25-r8.ebuild 5041 SHA256 a7882e51228241b3be9cff9c77dc655bd8d23a0995c548b4dc9ba05b580a9d76 SHA512 cedda431799332483f029d0c986d67323c88d22b941af7461660bcfc0508de4dc3a2767e55b20ea45d9e7661a725e63ce1a23016d5ab3d51539e5070cc2b1922 WHIRLPOOL dbcb8c810264f5d129daf4f28a3d6f76396c69489dac18247ff2730ff749e5c61ac175bcd563070eba099fc699add76cae1c974a1020c64a30275310dff51e24
+EBUILD glibc-2.25-r9.ebuild 5061 SHA256 94718448e2506e8364ee4823d15ea9cd33094fb6e1a84347ea15dd35e6d49aa3 SHA512 41fbf71e2473333a1e85d776fd842c782b1d7eb0881fd93b4d479b2946e243904f94bfe070246fad41acbd6d872299485a57568121a4cc4997ba02c5c5c9d45c WHIRLPOOL 8cba5c9641b775a17cd03b9220d378bdaa6b03bebcc8a9ea34dc7e1380e2c7cd7dd192f9305e73706821bd4399dd677091258018156ebf07c7abf04091ebb72e
 EBUILD glibc-2.26-r2.ebuild 23725 SHA256 f67f77719efc019599fcefa6f54e1c5dd6f8ed90a0afb42307994d7d42b5ced8 SHA512 e9ef1fb2811ac3df63ea69f6f72d34c049917e8760ddb6526d10cd372d11958bfcff7de6d170553970de9a1a59f8eaace01743fa456a5bfa7156461059d30329 WHIRLPOOL 091ad1a6e474082e960a4a0b32a8fd461826a5e7a71b932f0c309c3e0eed7e97e664fdd109f945848a9fe77c6f5abc059555e0f4c258d3a9656201ccbc8c5aef
-EBUILD glibc-9999.ebuild 23470 SHA256 de9ebe62576c2aec9b4100f721abe27e59654a44dbc28e760eb162da153c9264 SHA512 b8d8a5570e0979e6e64fc918ee8a6d62ce85aa66bcaf63c71f1b3ece630e937a0f0ae474858d3f18971c83eb0ca2f97743f73ef5f248d8745ab78b478bc342cd WHIRLPOOL 07f2d457468cd1d0f6062d696a9479963bf533dd2615a2d1e387a2c0e5bf390e5261ca5a308a2ce3acf34b4f9277969570b2d77f48fb15597c5b685050242345
+EBUILD glibc-9999.ebuild 23751 SHA256 40e60e78c634ca1d0f98e2977848293227f024061d3b5b94bc79efbc29f2da91 SHA512 b838731aada38f6cba85d93a4aaaec58fd812be2ebf36aea6194eee71b49c49c8d18a82e8dd081b1322585fea9cf2185e78a8a0acad48eebb258a55751a4bd5b WHIRLPOOL d85c92b0e66dc5e8c7f7076658a9a818bcd89ed4e5e8846064fe9fe8d30421ca34193017bc5cfee1c44da34a411ea9aa17d9630ccba009c136061d75bf110822
 MISC ChangeLog 17234 SHA256 6aa54d20b4de284c51e7d0691f861af52e68376d48e91788c79f8ee821300a91 SHA512 39aa17d86df6c1d53c9c2ad268b2123bafccd45a226e064e3b759bda73294c7896d43f9846bf2fa401d29fa04efecee414674d923bb632915175adf7e8b24b2b WHIRLPOOL d60c804c21d7b0065aca45a3f761f0c81f96fe681d60df7f33ce13c879325d23a9908a134f948e50f3c57b5c596c93d1b04932bfb501e88d6d1d88847df62d32
 MISC ChangeLog-2007 108548 SHA256 d622be202eb0d61a363b0ae4065012cd1d494fefaa0c03d4aa7986177cdde6d0 SHA512 fdb3f311a3be4b97a6acfceb1763af5ea69e74d8195522c5d03307f75e15a9382991e9e29dbfdec79e74f1c36328f82648768749bc929e5050ff64b628c7ca98 WHIRLPOOL e550f354394569069e000a7e70ec69c94388a0f415c19b427203f0dcbcbeeec0f5e379ee2af7886cd2d68559e749fab8122e7e077985729d7e0e728ae9096d7a
 MISC ChangeLog-2015 77895 SHA256 d7c16b77521b14a7e1c148f1ad699128e4fcf7caf41a77b46844508ba68acf15 SHA512 1a7fee53e1ec55d0b16b949543b01ad6f429f74293cb6ed730f05a3ddfc4a21fdaf7ee80c0c839d456587a207780ccfefdaf68a236989db5129ffba30c77ff5e WHIRLPOOL 48d46ac586309e415b7d669598c330062afd6fcb2668600d5c62e234d5ab8c3dfd2e81d4f528689efb6d5fb5e2ca5e24c68a4c58be52e1c336127d63224e18fd
-MISC metadata.xml 921 SHA256 c01e0edef8cd5db7d721a3abfba19365507f1cb35df4d62b048468fe49b543f7 SHA512 5d4ecf57cf80cbda0dea361d7996ec5df384eee928c07e8e37e25e0ff82577144878492a49b318000b10f51c1ad03b950db7ee5d74e46e96e688b2fcdccfb66a WHIRLPOOL 7024db2e0a3ea6269c9d4158b966c0fda46eee5c7787a7e99b90cfb366ec816843e8849b9390aaec37af05eb530445fa12e0b70dc75ce16277c10c4234d231df
+MISC metadata.xml 1100 SHA256 c4283c55df28fa6b37236ccbfa55bfbfce3375014389912269ca35c754686d0f SHA512 d43c6f7a298d17f619686217ef015659bde70365d86996a354215074a3df20c830935fb5582a7a60c8f2294d4f3bda434613023d7d7a975b217c210862500e26 WHIRLPOOL a5dd4d0bafd9605f601616d696291bb6fecb33c79df698072f19a44f7c40149ea42f80ed9e5948557a059fcafeaaf5e9a5f6a4f223b2a4dad8ec86980504104c
diff --git a/sys-libs/glibc/glibc-2.25-r4.ebuild b/sys-libs/glibc/glibc-2.25-r4.ebuild
deleted file mode 100644
index 27cd42605ffe..000000000000
--- a/sys-libs/glibc/glibc-2.25-r4.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-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"
-	EGIT_SOURCEDIRS="${S}"
-	inherit git-2
-	;;
-*)
-	RELEASE_VER=${PV}
-	;;
-esac
-GCC_BOOTSTRAP_VER="4.7.3-r1"
-# patches live at https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo/src/patchsets/glibc/
-PATCH_VER="8"                                  # Gentoo patchset
-: ${NPTL_KERN_VER:="2.6.32"}                   # min kernel version nptl requires
-
-IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_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.
-COMMON_DEPEND="
-	nscd? ( selinux? (
-		audit? ( sys-process/audit )
-		caps? ( sys-libs/libcap )
-	) )
-	suid? ( caps? ( sys-libs/libcap ) )
-	selinux? ( sys-libs/libselinux )
-"
-DEPEND="${COMMON_DEPEND}
-	>=app-misc/pax-utils-0.1.10
-	!<sys-apps/sandbox-1.6
-	!<sys-apps/portage-2.1.2"
-RDEPEND="${COMMON_DEPEND}
-	!sys-kernel/ps3-sources
-	sys-apps/gentoo-functions
-	!sys-libs/nss-db"
-
-if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND+=" !crosscompile_opts_headers-only? (
-		>=${CATEGORY}/binutils-2.24
-		>=${CATEGORY}/gcc-4.7
-	)"
-	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
-else
-	DEPEND+="
-		>=sys-devel/binutils-2.24
-		>=sys-devel/gcc-4.7
-		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 HTTP~tamiko/distfiles/URI HTTP~slyfox/distfiles/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
-		# 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.25/glibc-2.25-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
-	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.25-r5.ebuild b/sys-libs/glibc/glibc-2.25-r5.ebuild
deleted file mode 100644
index 24ad65b328fd..000000000000
--- a/sys-libs/glibc/glibc-2.25-r5.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-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"
-	EGIT_SOURCEDIRS="${S}"
-	inherit git-2
-	;;
-*)
-	RELEASE_VER=${PV}
-	;;
-esac
-GCC_BOOTSTRAP_VER="4.7.3-r1"
-# patches live at https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo/src/patchsets/glibc/
-PATCH_VER="9"                                  # Gentoo patchset
-: ${NPTL_KERN_VER:="2.6.32"}                   # min kernel version nptl requires
-
-IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_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.
-COMMON_DEPEND="
-	nscd? ( selinux? (
-		audit? ( sys-process/audit )
-		caps? ( sys-libs/libcap )
-	) )
-	suid? ( caps? ( sys-libs/libcap ) )
-	selinux? ( sys-libs/libselinux )
-	systemtap? ( dev-util/systemtap )
-"
-DEPEND="${COMMON_DEPEND}
-	>=app-misc/pax-utils-0.1.10
-	!<sys-apps/sandbox-1.6
-	!<sys-apps/portage-2.1.2"
-RDEPEND="${COMMON_DEPEND}
-	!sys-kernel/ps3-sources
-	sys-apps/gentoo-functions
-	!sys-libs/nss-db"
-
-if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND+=" !crosscompile_opts_headers-only? (
-		>=${CATEGORY}/binutils-2.24
-		>=${CATEGORY}/gcc-4.7
-	)"
-	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
-else
-	DEPEND+="
-		>=sys-devel/binutils-2.24
-		>=sys-devel/gcc-4.7
-		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~dilfridge/distfiles/URI HTTP~tamiko/distfiles/URI HTTP~slyfox/distfiles/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
-		# 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.25/glibc-2.25-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
-	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.25-r7.ebuild b/sys-libs/glibc/glibc-2.25-r7.ebuild
deleted file mode 100644
index 18cab6ab3797..000000000000
--- a/sys-libs/glibc/glibc-2.25-r7.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-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"
-	EGIT_SOURCEDIRS="${S}"
-	inherit git-2
-	;;
-*)
-	RELEASE_VER=${PV}
-	;;
-esac
-GCC_BOOTSTRAP_VER="4.7.3-r1"
-# patches live at https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo/src/patchsets/glibc/
-PATCH_VER="11"                                  # Gentoo patchset
-: ${NPTL_KERN_VER:="2.6.32"}                   # min kernel version nptl requires
-
-IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_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.
-COMMON_DEPEND="
-	nscd? ( selinux? (
-		audit? ( sys-process/audit )
-		caps? ( sys-libs/libcap )
-	) )
-	suid? ( caps? ( sys-libs/libcap ) )
-	selinux? ( sys-libs/libselinux )
-	systemtap? ( dev-util/systemtap )
-"
-DEPEND="${COMMON_DEPEND}
-	>=app-misc/pax-utils-0.1.10
-	!<sys-apps/sandbox-1.6
-	!<sys-apps/portage-2.1.2"
-RDEPEND="${COMMON_DEPEND}
-	!sys-kernel/ps3-sources
-	sys-apps/gentoo-functions
-	!sys-libs/nss-db"
-
-if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND+=" !crosscompile_opts_headers-only? (
-		>=${CATEGORY}/binutils-2.24
-		>=${CATEGORY}/gcc-4.7
-	)"
-	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
-else
-	DEPEND+="
-		>=sys-devel/binutils-2.24
-		>=sys-devel/gcc-4.7
-		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~dilfridge/distfiles/URI HTTP~tamiko/distfiles/URI HTTP~slyfox/distfiles/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
-		# 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.25/glibc-2.25-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
-	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.25-r8.ebuild b/sys-libs/glibc/glibc-2.25-r8.ebuild
index 5b91bc5255a0..6931a6deaff2 100644
--- a/sys-libs/glibc/glibc-2.25-r8.ebuild
+++ b/sys-libs/glibc/glibc-2.25-r8.ebuild
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 RESTRICT="strip" # strip ourself #46186
 EMULTILIB_PKG="true"
 
diff --git a/sys-libs/glibc/glibc-2.25-r9.ebuild b/sys-libs/glibc/glibc-2.25-r9.ebuild
new file mode 100644
index 000000000000..89b790eb79cf
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.25-r9.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+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"
+KEYWORDS=""
+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"
+	EGIT_SOURCEDIRS="${S}"
+	inherit git-2
+	;;
+*)
+	RELEASE_VER=${PV}
+	;;
+esac
+GCC_BOOTSTRAP_VER="4.7.3-r1"
+# patches live at https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo/src/patchsets/glibc/
+PATCH_VER="12"                                  # Gentoo patchset
+: ${NPTL_KERN_VER:="2.6.32"}                   # min kernel version nptl requires
+
+GLIBC_PATCH_EXCLUDE+=" 0005_all_sys-types.h-drop-sys-sysmacros.h-include.patch"
+
+IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_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.
+COMMON_DEPEND="
+	nscd? ( selinux? (
+		audit? ( sys-process/audit )
+		caps? ( sys-libs/libcap )
+	) )
+	suid? ( caps? ( sys-libs/libcap ) )
+	selinux? ( sys-libs/libselinux )
+	systemtap? ( dev-util/systemtap )
+"
+DEPEND="${COMMON_DEPEND}
+	>=app-misc/pax-utils-0.1.10
+	!<sys-apps/sandbox-1.6
+	!<sys-apps/portage-2.1.2"
+RDEPEND="${COMMON_DEPEND}
+	!sys-kernel/ps3-sources
+	sys-apps/gentoo-functions
+	!sys-libs/nss-db"
+
+if [[ ${CATEGORY} == cross-* ]] ; then
+	DEPEND+=" !crosscompile_opts_headers-only? (
+		>=${CATEGORY}/binutils-2.24
+		>=${CATEGORY}/gcc-4.7
+	)"
+	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
+else
+	DEPEND+="
+		>=sys-devel/binutils-2.24
+		>=sys-devel/gcc-4.7
+		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~dilfridge/distfiles/URI HTTP~tamiko/distfiles/URI HTTP~slyfox/distfiles/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
+		# 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.25/glibc-2.25-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
+	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.26-r1.ebuild b/sys-libs/glibc/glibc-2.26-r1.ebuild
deleted file mode 100644
index 29d3ad987099..000000000000
--- a/sys-libs/glibc/glibc-2.26-r1.ebuild
+++ /dev/null
@@ -1,795 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit prefix toolchain-glibc
-
-DESCRIPTION="GNU libc C library"
-HOMEPAGE="https://www.gnu.org/software/libc/"
-
-LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-RESTRICT="strip" # Strip ourself #46186
-EMULTILIB_PKG="true"
-
-# Configuration variables
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="git://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=""
-	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
-fi
-
-RELEASE_VER=${PV}
-
-GCC_BOOTSTRAP_VER="4.7.3-r1"
-
-# Gentoo patchset
-PATCH_VER="1"
-
-SRC_URI+=" https://dev.gentoo.org/~dilfridge/distfiles/${P}-patches-${PATCH_VER}.tar.bz2"
-SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2 )"
-
-IUSE="audit caps debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
-
-# Min kernel version nptl requires
-: ${NPTL_KERN_VER:="2.6.32"}
-
-# 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} ]]
-}
-
-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.
-COMMON_DEPEND="
-	nscd? ( selinux? (
-		audit? ( sys-process/audit )
-		caps? ( sys-libs/libcap )
-	) )
-	suid? ( caps? ( sys-libs/libcap ) )
-	selinux? ( sys-libs/libselinux )
-	systemtap? ( dev-util/systemtap )
-"
-DEPEND="${COMMON_DEPEND}
-	>=app-misc/pax-utils-0.1.10
-	!<sys-apps/sandbox-1.6
-	!<sys-apps/portage-2.1.2
-"
-RDEPEND="${COMMON_DEPEND}
-	!sys-kernel/ps3-sources
-	sys-apps/gentoo-functions
-	!sys-libs/nss-db
-"
-
-if [[ ${CATEGORY} == cross-* ]] ; then
-	DEPEND+=" !crosscompile_opts_headers-only? (
-		>=${CATEGORY}/binutils-2.24
-		>=${CATEGORY}/gcc-4.9
-	)"
-	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
-else
-	DEPEND+="
-		>=sys-devel/binutils-2.24
-		>=sys-devel/gcc-4.9
-		virtual/os-headers
-	"
-	RDEPEND+=" vanilla? ( !sys-libs/timezone-data )"
-	PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
-fi
-
-#
-# the phases
-#
-
-pkg_pretend() {
-	# Make sure devpts is mounted correctly for use w/out setuid pt_chown
-	check_devpts
-
-	# Prevent native builds from downgrading
-	if [[ ${MERGE_TYPE} != "buildonly" ]] && \
-	   [[ ${ROOT} == "/" ]] && \
-	   [[ ${CBUILD} == ${CHOST} ]] && \
-	   [[ ${CHOST} == ${CTARGET} ]] ; then
-		# The high rev # is to allow people to downgrade between -r# versions.
-		# We want to block 2.20->2.19, but 2.20-r3->2.20-r2 should be fine.
-		# Hopefully we never actually use a r# this high.
-		if has_version ">${CATEGORY}/${P}-r10000" ; then
-			eerror "Sanity check to keep you from breaking your system:"
-			eerror " Downgrading glibc is not supported and a sure way to destruction"
-			die "Aborting to save your system"
-		fi
-
-		if ! glibc_run_test '#include <pwd.h>\nint main(){return getpwuid(0)==0;}\n'
-		then
-			eerror "Your patched vendor kernel is broken.  You need to get an"
-			eerror "update from whoever is providing the kernel to you."
-			eerror "https://sourceware.org/bugzilla/show_bug.cgi?id=5227"
-			eerror "https://bugs.gentoo.org/262698"
-			die "Keeping your system alive, say thank you"
-		fi
-
-		if ! glibc_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n'
-		then
-			eerror "Your old kernel is broken.  You need to update it to"
-			eerror "a newer version as syscall(<bignum>) will break."
-			eerror "https://bugs.gentoo.org/279260"
-			die "Keeping your system alive, say thank you"
-		fi
-	fi
-
-	# Users have had a chance to phase themselves, time to give em the boot
-	if [[ -e ${EROOT}/etc/locale.gen ]] && [[ -e ${EROOT}/etc/locales.build ]] ; then
-		eerror "You still haven't deleted ${EROOT}/etc/locales.build."
-		eerror "Do so now after making sure ${EROOT}/etc/locale.gen is kosher."
-		die "Lazy upgrader detected"
-	fi
-
-	if [[ ${CTARGET} == i386-* ]] ; then
-		eerror "i386 CHOSTs are no longer supported."
-		eerror "Chances are you don't actually want/need i386."
-		eerror "Please read https://www.gentoo.org/doc/en/change-chost.xml"
-		die "Please fix your CHOST"
-	fi
-
-	if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then
-		ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS."
-		ewarn "This will result in a 50% performance penalty when running with a 32bit"
-		ewarn "hypervisor, which is probably not what you want."
-	fi
-
-	use hardened && ! tc-enables-pie && \
-		ewarn "PIE hardening not applied, as your compiler doesn't default to PIE"
-
-	# Make sure host system is up to date #394453
-	if has_version '<sys-libs/glibc-2.13' && \
-	   [[ -n $(scanelf -qys__guard -F'#s%F' "${EROOT}"/lib*/l*-*.so) ]]
-	then
-		ebegin "Scanning system for __guard to see if you need to rebuild first ..."
-		local files=$(
-			scanelf -qys__guard -F'#s%F' \
-				"${EROOT}"/*bin/ \
-				"${EROOT}"/lib* \
-				"${EROOT}"/usr/*bin/ \
-				"${EROOT}"/usr/lib* | \
-				egrep -v \
-					-e "^${EROOT}/lib.*/(libc|ld)-2.*.so$" \
-					-e "^${EROOT}/sbin/(ldconfig|sln)$"
-		)
-		[[ -z ${files} ]]
-		if ! eend $? ; then
-			eerror "Your system still has old SSP __guard symbols.  You need to"
-			eerror "rebuild all the packages that provide these files first:"
-			eerror "${files}"
-			die "old __guard detected"
-		fi
-	fi
-}
-
-src_unpack() {
-	use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2
-
-	setup_env
-
-	# Check NPTL support _before_ we unpack things to save some time
-	check_nptl_support
-
-	if [[ -n ${EGIT_REPO_URI} ]] ; then
-		git-r3_src_unpack
-	else
-		unpack ${P}.tar.xz
-	fi
-
-	cd "${S}"
-	touch locale/C-translit.h #185476 #218003
-
-	cd "${WORKDIR}"
-	unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.bz2
-	# pull out all the addons
-	local d
-	for d in extra/*/configure ; do
-		d=${d%/configure}
-		[[ -d ${S}/${d} ]] && die "${d} already exists in \${S}"
-		mv "${d}" "${S}" || die "moving ${d} failed"
-	done
-}
-
-src_prepare() {
-	if ! use vanilla ; then
-		elog "Applying Gentoo Glibc Patchset ${RELEASE_VER}-${PATCH_VER} ..."
-		eapply "${WORKDIR}"/patches/*.patch
-	fi
-
-	if just_headers ; then
-		if [[ -e ports/sysdeps/mips/preconfigure ]] ; then
-			# mips peeps like to screw with us.  if building headers,
-			# we don't have a real compiler, so we can't let them
-			# insert -mabi on us.
-			sed -i '/CPPFLAGS=.*-mabi/s|.*|:|' ports/sysdeps/mips/preconfigure || die
-			find ports/sysdeps/mips/ -name Makefile -exec sed -i '/^CC.*-mabi=/s:-mabi=.*:-D_MIPS_SZPTR=32:' {} +
-		fi
-	fi
-
-	default
-
-	gnuconfig_update
-
-	cd "${WORKDIR}"
-	find . -name configure -exec touch {} +
-
-	eprefixify extra/locale/locale-gen
-
-	# Fix permissions on some of the scripts.
-	chmod u+x "${S}"/scripts/*.sh
-
-	cd "${S}"
-
-	if use hardened ; then
-		# 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.25/glibc-2.25-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
-	fi
-}
-
-glibc_do_configure() {
-	# Glibc does not work with gold (for various reasons) #269274.
-	tc-ld-disable-gold
-
-	# CXX isnt handled by the multilib system, so if we dont unset here
-	# we accumulate crap across abis
-	unset CXX
-
-	einfo "Configuring glibc for $1"
-
-	local v
-	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX LD {AS,C,CPP,CXX,LD}FLAGS ; do
-		einfo " $(printf '%15s' ${v}:)   ${!v}"
-	done
-
-	# The glibc configure script doesn't properly use LDFLAGS all the time.
-	export CC="$(tc-getCC ${CTARGET}) ${LDFLAGS}"
-	einfo " $(printf '%15s' 'Manual CC:')   ${CC}"
-
-	# Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548
-	export CXX="$(tc-getCXX ${CTARGET}) $(get_abi_CFLAGS)"
-	einfo " $(printf '%15s' 'Manual CXX:')   ${CXX}"
-
-	echo
-
-	local myconf=()
-
-	# set addons
-	pushd "${S}" > /dev/null
-	local addons=$(echo */configure | sed \
-		-e 's:/configure::g' \
-		-e 's:\(linuxthreads\|nptl\|rtkaio\|glibc-compat\)\( \|$\)::g' \
-		-e 's: \+$::' \
-		-e 's! !,!g' \
-		-e 's!^!,!' \
-		-e '/^,\*$/d')
-	[[ -d ports ]] && addons+=",ports"
-	popd > /dev/null
-
-	case ${CTARGET} in
-		powerpc-*)
-			# Currently gcc on powerpc32 generates invalid code for
-			# __builtin_return_address(0) calls. Normally programs
-			# don't do that but malloc hooks in glibc do:
-			# https://gcc.gnu.org/PR81996
-			# https://bugs.gentoo.org/629054
-			myconf+=( --enable-stack-protector=no )
-			;;
-		*)
-			myconf+=( --enable-stack-protector=all )
-			;;
-	esac
-	myconf+=( --enable-stackguard-randomization )
-
-	[[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
-
-	if [[ $1 == "nptl" ]] ; then
-		myconf+=( --enable-kernel=${NPTL_KERN_VER} )
-	else
-		die "invalid pthread option"
-	fi
-	myconf+=( --enable-add-ons="${addons#,}" )
-
-	# Since SELinux support is only required for nscd, only enable it if:
-	# 1. USE selinux
-	# 2. only for the primary ABI on multilib systems
-	# 3. Not a crosscompile
-	if ! is_crosscompile && use selinux ; then
-		if use multilib ; then
-			if is_final_abi ; then
-				myconf+=( --with-selinux )
-			else
-				myconf+=( --without-selinux )
-			fi
-		else
-			myconf+=( --with-selinux )
-		fi
-	else
-		myconf+=( --without-selinux )
-	fi
-
-	# Force a few tests where we always know the answer but
-	# configure is incapable of finding it.
-	if is_crosscompile ; then
-		export \
-			libc_cv_c_cleanup=yes \
-			libc_cv_forced_unwind=yes
-	fi
-
-	myconf+=(
-		--without-cvs
-		--disable-werror
-		--enable-bind-now
-		--build=${CBUILD_OPT:-${CBUILD}}
-		--host=${CTARGET_OPT:-${CTARGET}}
-		$(use_enable profile)
-		$(use_with gd)
-		--with-headers=$(alt_build_headers)
-		--prefix="${EPREFIX}/usr"
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--libdir='$(prefix)'/$(get_libdir)
-		--mandir='$(prefix)'/share/man
-		--infodir='$(prefix)'/share/info
-		--libexecdir='$(libdir)'/misc/glibc
-		--with-bugurl=https://bugs.gentoo.org/
-		--with-pkgversion="$(glibc_banner)"
-		$(use_multiarch || echo --disable-multi-arch)
-		$(in_iuse systemtap && use_enable systemtap)
-		$(in_iuse nscd && use_enable nscd)
-		${EXTRA_ECONF}
-	)
-
-	# We rely on sys-libs/timezone-data for timezone tools normally.
-	myconf+=( $(use_enable vanilla timezone-tools) )
-
-	# These libs don't have configure flags.
-	ac_cv_lib_audit_audit_log_user_avc_message=$(in_iuse audit && usex audit || echo no)
-	ac_cv_lib_cap_cap_init=$(in_iuse caps && usex caps || echo no)
-
-	# There is no configure option for this and we need to export it
-	# since the glibc build will re-run configure on itself
-	export libc_cv_rootsbindir="${EPREFIX}/sbin"
-	export libc_cv_slibdir="${EPREFIX}/$(get_libdir)"
-
-	# We take care of patching our binutils to use both hash styles,
-	# and many people like to force gnu hash style only, so disable
-	# this overriding check.  #347761
-	export libc_cv_hashstyle=no
-
-	local builddir=$(builddir "$1")
-	mkdir -p "${builddir}"
-	cd "${builddir}"
-	set -- "${S}"/configure "${myconf[@]}"
-	echo "$@"
-	"$@" || die "failed to configure glibc"
-
-	# ia64 static cross-compilers are a pita in so much that they
-	# can't produce static ELFs (as the libgcc.a is broken).  so
-	# disable building of the programs for those targets if it
-	# doesn't work.
-	# XXX: We could turn this into a compiler test, but ia64 is
-	# the only one that matters, so this should be fine for now.
-	if is_crosscompile && [[ ${CTARGET} == ia64* ]] ; then
-		sed -i '1i+link-static = touch $@' config.make
-	fi
-
-	# If we're trying to migrate between ABI sets, we need
-	# to lie and use a local copy of gcc.  Like if the system
-	# is built with MULTILIB_ABIS="amd64 x86" but we want to
-	# add x32 to it, gcc/glibc don't yet support x32.
-	if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib ; then
-		echo 'main(){}' > "${T}"/test.c
-		if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c -Wl,-emain -lgcc 2>/dev/null ; then
-			sed -i -e '/^CC = /s:$: -B$(objdir)/../'"gcc-${GCC_BOOTSTRAP_VER}/${ABI}:" config.make || die
-			mkdir -p sunrpc
-			cp $(which rpcgen) sunrpc/cross-rpcgen || die
-			touch -t 202001010101 sunrpc/cross-rpcgen || die
-		fi
-	fi
-}
-
-glibc_headers_configure() {
-	export ABI=default
-
-	local builddir=$(builddir "headers")
-	mkdir -p "${builddir}"
-	cd "${builddir}"
-
-	# if we don't have a compiler yet, we can't really test it now ...
-	# hopefully they don't affect header generation, so let's hope for
-	# the best here ...
-	local v vars=(
-		ac_cv_header_cpuid_h=yes
-		libc_cv_{386,390,alpha,arm,hppa,ia64,mips,{powerpc,sparc}{,32,64},sh,x86_64}_tls=yes
-		libc_cv_asm_cfi_directives=yes
-		libc_cv_broken_visibility_attribute=no
-		libc_cv_c_cleanup=yes
-		libc_cv_forced_unwind=yes
-		libc_cv_gcc___thread=yes
-		libc_cv_mlong_double_128=yes
-		libc_cv_mlong_double_128ibm=yes
-		libc_cv_ppc_machine=yes
-		libc_cv_ppc_rel16=yes
-		libc_cv_predef_fortify_source=no
-		libc_cv_visibility_attribute=yes
-		libc_cv_z_combreloc=yes
-		libc_cv_z_execstack=yes
-		libc_cv_z_initfirst=yes
-		libc_cv_z_nodelete=yes
-		libc_cv_z_nodlopen=yes
-		libc_cv_z_relro=yes
-		libc_mips_abi=${ABI}
-		libc_mips_float=$([[ $(tc-is-softfloat) == "yes" ]] && echo soft || echo hard)
-		# These libs don't have configure flags.
-		ac_cv_lib_audit_audit_log_user_avc_message=no
-		ac_cv_lib_cap_cap_init=no
-	)
-
-	einfo "Forcing cached settings:"
-	for v in "${vars[@]}" ; do
-		einfo " ${v}"
-		export ${v}
-	done
-
-	# Blow away some random CC settings that screw things up. #550192
-	if [[ -d ${S}/sysdeps/mips ]]; then
-		pushd "${S}"/sysdeps/mips >/dev/null
-		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=32:' mips32/Makefile mips64/n32/Makefile || die
-		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=64:' mips64/n64/Makefile || die
-
-		# Force the mips ABI to the default.  This is OK because the set of
-		# installed headers in this phase is the same between the 3 ABIs.
-		# If this ever changes, this hack will break, but that's unlikely
-		# as glibc discourages that behavior.
-		# https://crbug.com/647033
-		sed -i -e 's:abiflag=.*:abiflag=_ABIO32:' preconfigure || die
-
-		popd >/dev/null
-	fi
-
-	local myconf=()
-	myconf+=(
-		--disable-sanity-checks
-		--enable-hacker-mode
-		--without-cvs
-		--disable-werror
-		--enable-bind-now
-		--build=${CBUILD_OPT:-${CBUILD}}
-		--host=${CTARGET_OPT:-${CTARGET}}
-		--with-headers=$(alt_build_headers)
-		--prefix="${EPREFIX}/usr"
-		${EXTRA_ECONF}
-	)
-
-	local addons
-	[[ -d ${S}/ports ]] && addons+=",ports"
-	myconf+=( --enable-add-ons="${addons#,}" )
-
-	# Nothing is compiled here which would affect the headers for the target.
-	# So forcing CC/CFLAGS is sane.
-	set -- "${S}"/configure "${myconf[@]}"
-	echo "$@"
-	CC="$(tc-getBUILD_CC)" \
-	CFLAGS="-O1 -pipe" \
-	CPPFLAGS="-U_FORTIFY_SOURCE" \
-	LDFLAGS="" \
-	"$@" || die "failed to configure glibc"
-}
-
-do_src_configure() {
-	if just_headers ; then
-		glibc_headers_configure
-	else
-		glibc_do_configure nptl
-	fi
-}
-
-src_configure() {
-	foreach_abi do_src_configure
-}
-
-do_src_compile() {
-	emake -C "$(builddir nptl)" || die "make nptl for ${ABI} failed"
-}
-
-src_compile() {
-	if just_headers ; then
-		return
-	fi
-
-	foreach_abi do_src_compile
-}
-
-glibc_src_test() {
-	cd "$(builddir $1)"
-	emake -j1 check
-}
-
-do_src_test() {
-	local ret=0
-
-	glibc_src_test nptl
-	: $(( ret |= $? ))
-
-	return ${ret}
-}
-
-src_test() {
-	# Give tests more time to complete.
-	export TIMEOUTFACTOR=5
-
-	foreach_abi do_src_test || die "tests failed"
-}
-
-glibc_do_src_install() {
-	local builddir=$(builddir nptl)
-	cd "${builddir}"
-
-	emake install_root="${D}$(alt_prefix)" install || die
-
-	# This version (2.26) provides some compatibility libraries for the NIS/NIS+ support
-	# which come without headers etc. Only needed for binary packages since the
-	# external net-libs/libnsl has increased soversion. Keep only versioned libraries.
-	find "${D}" -name "libnsl.a" -delete
-	find "${D}" -name "libnsl.so" -delete
-
-	# Normally real_pv is ${PV}. Live ebuilds are exception, there we need
-	# to infer upstream version:
-	# '#define VERSION "2.26.90"' -> '2.26.90'
-	local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h)
-
-	# Newer versions get fancy with libm linkage to include vectorized support.
-	# While we don't really need a ldscript here, portage QA checks get upset.
-	if [[ -e ${ED}$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then
-		dosym ../../$(get_libdir)/libm-${upstream_pv}.so $(alt_usrlibdir)/libm-${upstream_pv}.so
-	fi
-
-	# We'll take care of the cache ourselves
-	rm -f "${ED}"/etc/ld.so.cache
-
-	# Everything past this point just needs to be done once ...
-	is_final_abi || return 0
-
-	# Make sure the non-native interp can be found on multilib systems even
-	# if the main library set isn't installed into the right place.  Maybe
-	# we should query the active gcc for info instead of hardcoding it ?
-	local i ldso_abi ldso_name
-	local ldso_abi_list=(
-		# x86
-		amd64   /lib64/ld-linux-x86-64.so.2
-		x32     /libx32/ld-linux-x32.so.2
-		x86     /lib/ld-linux.so.2
-		# mips
-		o32     /lib/ld.so.1
-		n32     /lib32/ld.so.1
-		n64     /lib64/ld.so.1
-		# powerpc
-		ppc     /lib/ld.so.1
-		ppc64   /lib64/ld64.so.1
-		# s390
-		s390    /lib/ld.so.1
-		s390x   /lib/ld64.so.1
-		# sparc
-		sparc32 /lib/ld-linux.so.2
-		sparc64 /lib64/ld-linux.so.2
-	)
-	case $(tc-endian) in
-	little)
-		ldso_abi_list+=(
-			# arm
-			arm64   /lib/ld-linux-aarch64.so.1
-		)
-		;;
-	big)
-		ldso_abi_list+=(
-			# arm
-			arm64   /lib/ld-linux-aarch64_be.so.1
-		)
-		;;
-	esac
-	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib
-	fi
-	for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do
-		ldso_abi=${ldso_abi_list[i]}
-		has ${ldso_abi} $(get_install_abis) || continue
-
-		ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}"
-		if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then
-			dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name}
-		fi
-	done
-
-	# With devpts under Linux mounted properly, we do not need the pt_chown
-	# binary to be setuid.  This is because the default owners/perms will be
-	# exactly what we want.
-	if in_iuse suid && ! use suid ; then
-		find "${ED}" -name pt_chown -exec chmod -s {} +
-	fi
-
-	#################################################################
-	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
-	# Make sure we install some symlink hacks so that when we build
-	# a 2nd stage cross-compiler, gcc finds the target system
-	# headers correctly.  See gcc/doc/gccinstall.info
-	if is_crosscompile ; then
-		# We need to make sure that /lib and /usr/lib always exists.
-		# gcc likes to use relative paths to get to its multilibs like
-		# /usr/lib/../lib64/.  So while we don't install any files into
-		# /usr/lib/, we do need it to exist.
-		cd "${ED}"$(alt_libdir)/..
-		[[ -e lib ]] || mkdir lib
-		cd "${ED}"$(alt_usrlibdir)/..
-		[[ -e lib ]] || mkdir lib
-
-		dosym usr/include $(alt_prefix)/sys-include
-		return 0
-	fi
-
-	# Files for Debian-style locale updating
-	dodir /usr/share/i18n
-	sed \
-		-e "/^#/d" \
-		-e "/SUPPORTED-LOCALES=/d" \
-		-e "s: \\\\::g" -e "s:/: :g" \
-		"${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \
-		|| die "generating /usr/share/i18n/SUPPORTED failed"
-	cd "${WORKDIR}"/extra/locale
-	dosbin locale-gen
-	doman *.[0-8]
-	insinto /etc
-	doins locale.gen
-
-	# Make sure all the ABI's can find the locales and so we only
-	# have to generate one set
-	local a
-	keepdir /usr/$(get_libdir)/locale
-	for a in $(get_install_abis) ; do
-		if [[ ! -e ${ED}/usr/$(get_abi_LIBDIR ${a})/locale ]] ; then
-			dosym /usr/$(get_libdir)/locale /usr/$(get_abi_LIBDIR ${a})/locale
-		fi
-	done
-
-	cd "${S}"
-
-	# Install misc network config files
-	insinto /etc
-	doins nscd/nscd.conf posix/gai.conf nss/nsswitch.conf
-	doins "${WORKDIR}"/extra/etc/*.conf
-
-	if use nscd ; then
-		doinitd "$(prefixify_ro "${WORKDIR}"/extra/etc/nscd)"
-
-		local nscd_args=(
-			-e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd | grep nscd.pid):"
-		)
-
-		sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd
-
-		systemd_dounit nscd/nscd.service
-		systemd_newtmpfilesd nscd/nscd.tmpfiles nscd.conf
-	else
-		# Do this since extra/etc/*.conf above might have nscd.conf.
-		rm -f "${ED}"/etc/nscd.conf
-	fi
-
-	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
-	doenvd "${T}"/00glibc
-
-	for d in BUGS ChangeLog* CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do
-		[[ -s ${d} ]] && dodoc ${d}
-	done
-
-	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
-	# creation of the "factory" symlink in pkg_postinst().
-	rm -f "${ED}"/etc/localtime
-}
-
-glibc_headers_install() {
-	local builddir=$(builddir "headers")
-	cd "${builddir}"
-	emake install_root="${D}$(alt_prefix)" install-headers
-
-	insinto $(alt_headers)/gnu
-	doins "${S}"/include/gnu/stubs.h
-
-	# Make sure we install the sys-include symlink so that when
-	# we build a 2nd stage cross-compiler, gcc finds the target
-	# system headers correctly.  See gcc/doc/gccinstall.info
-	dosym usr/include $(alt_prefix)/sys-include
-}
-
-src_install() {
-	if just_headers ; then
-		export ABI=default
-		glibc_headers_install
-		return
-	fi
-
-	foreach_abi glibc_do_src_install
-	src_strip
-}
-
-pkg_preinst() {
-	# nothing to do if just installing headers
-	just_headers && return
-
-	# prepare /etc/ld.so.conf.d/ for files
-	mkdir -p "${EROOT}"/etc/ld.so.conf.d
-
-	# Default /etc/hosts.conf:multi to on for systems with small dbs.
-	if [[ $(wc -l < "${EROOT}"/etc/hosts) -lt 1000 ]] ; then
-		sed -i '/^multi off/s:off:on:' "${ED}"/etc/host.conf
-		elog "Defaulting /etc/host.conf:multi to on"
-	fi
-
-	[[ ${ROOT} != "/" ]] && return 0
-	[[ -d ${ED}/$(get_libdir) ]] || return 0
-	[[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check
-}
-
-pkg_postinst() {
-	# nothing to do if just installing headers
-	just_headers && return
-
-	if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
-		# Generate fastloading iconv module configuration file.
-		"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}"
-	fi
-
-	if ! is_crosscompile && [[ ${ROOT} == "/" ]] ; then
-		# Reload init ... if in a chroot or a diff init package, ignore
-		# errors from this step #253697
-		/sbin/telinit U 2>/dev/null
-
-		# if the host locales.gen contains no entries, we'll install everything
-		local locale_list="${EROOT}etc/locale.gen"
-		if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
-			ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
-			locale_list="${EROOT}usr/share/i18n/SUPPORTED"
-		fi
-		locale-gen -j $(makeopts_jobs) --config "${locale_list}"
-	fi
-}
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index f8e270e663ff..399cfc13dc60 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -33,7 +33,7 @@ PATCH_VER="3"
 SRC_URI+=" https://dev.gentoo.org/~dilfridge/distfiles/${P}-patches-${PATCH_VER}.tar.bz2"
 SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2 )"
 
-IUSE="audit caps debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
+IUSE="audit caps compile-locales debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
 
 # Min kernel version nptl requires
 : ${NPTL_KERN_VER:="2.6.32"}
@@ -551,6 +551,19 @@ src_test() {
 	foreach_abi do_src_test || die "tests failed"
 }
 
+run_locale_gen() {
+	# if the host locales.gen contains no entries, we'll install everything
+	local root="$1"
+	local locale_list="${root}/etc/locale.gen"
+	if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
+		ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
+		locale_list="${root}/usr/share/i18n/SUPPORTED"
+	fi
+
+	locale-gen --jobs $(makeopts_jobs) --config "${locale_list}" \
+		--destdir "${root}"
+}
+
 glibc_do_src_install() {
 	local builddir=$(builddir nptl)
 	cd "${builddir}"
@@ -714,6 +727,11 @@ glibc_do_src_install() {
 	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
 	# creation of the "factory" symlink in pkg_postinst().
 	rm -f "${ED}"/etc/localtime
+
+	# Generate all locales if this is a native build as locale generation
+	if use compile-locales && ! is_crosscompile ; then
+		run_locale_gen "${ED}"
+	fi
 }
 
 glibc_headers_install() {
@@ -773,12 +791,6 @@ pkg_postinst() {
 		# errors from this step #253697
 		/sbin/telinit U 2>/dev/null
 
-		# if the host locales.gen contains no entries, we'll install everything
-		local locale_list="${EROOT}etc/locale.gen"
-		if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
-			ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
-			locale_list="${EROOT}usr/share/i18n/SUPPORTED"
-		fi
-		locale-gen -j $(makeopts_jobs) --config "${locale_list}"
+		use compile-locales || run_locale_gen "${EROOT}"
 	fi
 }
diff --git a/sys-libs/glibc/metadata.xml b/sys-libs/glibc/metadata.xml
index e6ebe220ca6b..b32c212616a7 100644
--- a/sys-libs/glibc/metadata.xml
+++ b/sys-libs/glibc/metadata.xml
@@ -6,6 +6,7 @@
  <name>Gentoo Toolchain Project</name>
 </maintainer>
 <use>
+ <flag name="compile-locales">build *all* locales in src_install; this is generally meant for stage building only as it ignores /etc/locale.gen file and can be pretty slow</flag>
  <flag name="debug">When USE=hardened, allow fortify/stack violations to dump core (SIGABRT) and not kill self (SIGKILL)</flag>
  <flag name="gd">build memusage and memusagestat tools</flag>
  <flag name="nscd">Build, and enable support for, the Name Service Cache Daemon</flag>
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 2bd40f1ce50b..d28d0c141873 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,6 +1,6 @@
 AUX zlib-1.2.11-fix-deflateParams-usage.patch 2937 SHA256 0b8c6cbbb179fdb55fb492657a6c4514b4035ff126c353ef9fae2e5a0837c1c6 SHA512 9b949d894be2bbb60d687820e79d7a02e733e8426e6602482f3a3902fca3571bbfba38ddd84a88f5a093fdb25ac90e4076905d19b86ab70ebce6e250fd118286 WHIRLPOOL fbb8143e35a9eace23c4a3cdf80cfb66c9f09ed499abeab130445d89e61949b67bf0f1b70c11f9a65c99a722ac83a53897b5cd2b291563cc0ea32154559547ac
 DIST zlib-1.2.11.tar.gz 607698 SHA256 c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae WHIRLPOOL 4263b67dd133e9eb6a837f270a53e6083af871993c52f89a21135f188f83c58646e7aa5882d62f35370032afe7a9964dd2796c25d104b8a2a70b293a5e31f72a
-EBUILD zlib-1.2.11-r1.ebuild 3174 SHA256 4eb6e5d1851e625053f54c1c9da1f13b4296673f8411406640ed743cf63661e9 SHA512 9174a44d1e7c1721c891ec251061f70ecf263e82578a3552ce631cbf50105fe8a9de6f3cc3c4109f538c2b104c175c32cf61db6a031a87e5eaa7410c04df8346 WHIRLPOOL dafe34bcbfc1d761762f3149b27127e0aa29a79b5c3ff7b5d7b8d3fcc7359249d5ab14056e7c9b49846c6a5ddab69477deb4fbf9f90350e099ce91e592aa4755
+EBUILD zlib-1.2.11-r1.ebuild 3172 SHA256 985964be97b3dacfbda9b2eb00ef2a83248dacbc537452ed32dc3961b3280895 SHA512 f3d07433898baaf83702ec302e6b9ecac2fde0721aa6cbfe718f304139cfaf2c37633fd4e87c7a54e6f78410a4bfea6c60c3f73439a5e9c93ffab79c90cae180 WHIRLPOOL b93f85220ad66a54778d8fbe20e7b97dc52ab106b997169464f8946d655102f62d68d621c1f297aed9214cb36d9e9e6d7f1846f175a1cb9370dab2bd4759a8f8
 EBUILD zlib-1.2.11.ebuild 3102 SHA256 a150eed4cbe2c3f3c756dd0fcf25c1f06f0b8121d75ae0181dd3da47e631146c SHA512 d423c1019803166a5f4b14a4e6bbf2119d698eaa9977c259140e2e378e692721235e6b6a45279fca1f7928e4c3d18c3e430f73ad994e69f4b4b3213b14668ee2 WHIRLPOOL e2c601a0f5749c42dbd947108a618b59b5fcce7d9cb2615df8f1b8ff37af6ed7e435a2e088f32632c3a4c4182fc6d155540b2b3bc3aebbed70989f308e41851d
 MISC ChangeLog 4685 SHA256 3f2edb1c1b304356ed97ad121cd544c76a41d2c28eaba05a920dd501ba50b83e SHA512 5db4b21be1cc55c9735480a409273caa84f9ce8837a390499835f5899d720a4dfad99b933004ad3c0f1fe3565175462f66e6d757b1fdf1909c9f43c09c3e944a WHIRLPOOL 96346a194bca8decd2468bb54fb9883c38ae1b0ee3a9d5ba429a080bdeeaf4295df2d76693e07f17f8b6cae7090ba8cfffa12dcbaffa1f4d3e2ac21453a76f57
 MISC ChangeLog-2015 18533 SHA256 4d97faf5b6f64cd59bdf027d8150044cb9e37e48c14a2aa3d1ffadd8f6b2ba9e SHA512 8274af7f6e2931f659e8cf895b423233f8be84d18b769573374b400cffdbaf95b3ff2393e062dfbe5824b28bea687d70d0710a4a295c9f1f4da189d044526f8c WHIRLPOOL e5fc8260f89cd61ff45e45bac801e53972155c84a9f0ef3fde517d69f0aadcc3f779efa34e758123f3632f90425ab0749dbb110cd91f7af258beb81d8213cc4c
diff --git a/sys-libs/zlib/zlib-1.2.11-r1.ebuild b/sys-libs/zlib/zlib-1.2.11-r1.ebuild
index 4b0f8f005ed3..c45f5607c6a6 100644
--- a/sys-libs/zlib/zlib-1.2.11-r1.ebuild
+++ b/sys-libs/zlib/zlib-1.2.11-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://zlib.net/${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 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="minizip static-libs"
 
 DEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )"
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index f1e917b992f2..5e05e95fd583 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -5,7 +5,7 @@ DIST upower-0.99.5.tar.xz 432344 SHA256 78605664d027c788f6ab63c50950be6e86c6ba5d
 DIST upower-0.99.6.tar.xz 432056 SHA256 b194d1f227ed33e76ae29aa5c11acabad334938f2726b8c7903fac07a1335015 SHA512 7e7256491ecb5d3f04abf41f05a761b79761c8868a1aedadfc5085c3b9cf15f6099c1494596e6a24b0951511bc7cac074e93ebb2b84abb9fb7a4374483052d3f WHIRLPOOL 6b35441229c3ebf0dc19dc5800b3642c0298654e3fb552d56c8e9ca5350ab1197382da068b1d0e62ed5ef49afeb83435864f0a1e23dd3a99e4f94b663d198df1
 EBUILD upower-0.99.4-r1.ebuild 2218 SHA256 09dea723ee96813e586e2fced27a224917366e730e2d7798112196d0ef1a5f1b SHA512 8f27db0656fbbb61940e00fe99931e8ef4ad6d3794c119df33536d77d8b50fe0916ff2847f1f81306254e5cb4f1a1b1f019255a9aa85630fde22a7770d71dc2c WHIRLPOOL bf5e498aaacfb9314ae0e0c2af800f04abac73f57c5e3e57b9bc551d9b1589b44808c601b83818b5de68869b97245fdc645ecb4adc6a8eed1b879f6b8d5b9c2b
 EBUILD upower-0.99.4.ebuild 1872 SHA256 d68600b864e0d7c7ee7629eac1d98727be9f359f98a33d79a90a6760ad9fd4d9 SHA512 35eb5ccc6cc440604b5f250e75f093992170cccada7f0089082e246f80a3c86380d068258e1ba7d239d135efd055fcfd84be9509404f10736f0731dd718f9891 WHIRLPOOL bb11609659ba2a0a9a6b44c5252263824be9ed898ba688b340f5cd6e18d4007479b60f6b45e99b0f5c401e625c5f1934c802f369784fd6cedd8af42fbb72e9fc
-EBUILD upower-0.99.5.ebuild 1948 SHA256 beab6645ed0d4475c53090b4d66875a82a401a45919c05015a847b567beb314c SHA512 206c79a988e8e19c5df8705ad41f8dfe765329f4263014315c7678f1ddbe896da7513b7310dadc0c9f2e61711a99013d91efaea203ec3b359f6a4124b205fe63 WHIRLPOOL c933ee8a7e10cbbe6ea0f9c07c5e68856a18ea6f1227e1f655925a0a02e02c2fdf91e09cd814da9cef50545df3fc60bf4ad064b3415c137bf0e050b6476a86c2
+EBUILD upower-0.99.5.ebuild 1947 SHA256 a3dacc9dc28e07f9b79e2d89e86aed2c6d4b07c93f69f41376269250bed24ead SHA512 5ae9e2103133ba39597b71ce1d85b9c791bcb0b47bcbd82b7ee3613af84ee0659876fcbde4a83aaedd73dcc58bfe3accc7bc62d153bf246f959160fd5a6d7281 WHIRLPOOL 0ad1f9cdab7d82e78b36e6a45a5c773136cfb5ca404825eb5b0e8174500182168e90157013dfb73a0cc7550f243d67dfe2d1f25d3fcb652f4c7c5387f94de6c1
 EBUILD upower-0.99.6.ebuild 1953 SHA256 7250a7b05f57ec8de31cd03a92513d32d85ba289b7c3288a451d9401cd3ce019 SHA512 49677f9bbf9efc4d6cb57ab1f9f085b5acab1986cd0d8955370792641d36ada0ea87a8bd983a13d03e8b91341a031264364669e92e8694eee4db10da555fa4c0 WHIRLPOOL e85a5dcfce1a78615c8e8dd2e51bbac32ffa650b6d7d9935a0f100388e639145c9a4d13057247839e485160e0782d14847fdf9a734ed3983a2fd7924717e13d9
 MISC ChangeLog 4880 SHA256 9c77292cbf3d49e8a6bbfabf047a279c887272e2db3c3996ee6f9f89c73d6945 SHA512 01a96589d0edaa27265b3f40175ba272ad4d1f27eecdbf188798542b390b11a27c83d949858d6e5a3651accbc644e0c688f89b3d977c0dbf9b20097f006b4b6b WHIRLPOOL 3ddc8fba4fd0a74a399e4c7b169eb085142c5060e4247b43616d3056f6b80050f813e8261fbbfcf5f9de9c1090eb30a2a16a706c20ddec886987a5e8cce64a2b
 MISC ChangeLog-2015 24340 SHA256 1c57aa39c4ea5fe4b514dba0054a50c2f3b2ea2a4734d3f7efe7a6efbe7919d6 SHA512 2c608907deec333201e1055084f6d84ec96fb84d8091055326fca26c06049e5b8df0c6d03755705bb8c755ce1a246521e2abcc6a1fdac30a01eac25f6c0e8344 WHIRLPOOL 509da1c24ecb175f2cb6a5a8920c50b5739d31967784aa02077680161455e569bcee04ec06cbef1fd6e6b53debb5e71eaaf2028385cb5bd90aec1592f41d7da6
diff --git a/sys-power/upower/upower-0.99.5.ebuild b/sys-power/upower/upower-0.99.5.ebuild
index e151571992a2..08b211383473 100644
--- a/sys-power/upower/upower-0.99.5.ebuild
+++ b/sys-power/upower/upower-0.99.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/3" # based on SONAME of libupower-glib.so
-KEYWORDS="alpha ~amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 
 # gtk-doc files are not available as prebuilt in the tarball
 IUSE="doc +introspection ios kernel_FreeBSD kernel_linux selinux"
diff --git a/sys-process/acct/Manifest b/sys-process/acct/Manifest
index 668cea53b3a2..9e448eecfeeb 100644
--- a/sys-process/acct/Manifest
+++ b/sys-process/acct/Manifest
@@ -22,7 +22,7 @@ EBUILD acct-6.5.5-r4.ebuild 1169 SHA256 8fb3cfb26d64d6120301e101f572aeb1d4b52d6d
 EBUILD acct-6.6.1.ebuild 1215 SHA256 30125411aa487ca0adb2bbf971bb06f01b2b6aa0c7e4f5b5be1ed84cbb1a6a5a SHA512 75d43e3cc0e2ffc64db1165a7301d79a881f04ffa7f54aa7dfd9a10bffb28c431ed3ff6f537f445f060d51a3c24656984386bd459d21031aa54edef8c5d90986 WHIRLPOOL 26c761952f061b956514ac6840f0d5da707c117a77d922f56f2b49184252d6ff38eb85c357e2a81338965c6cc319f6f75f02127a9de3929f2a6af033203adc63
 EBUILD acct-6.6.2-r1.ebuild 1091 SHA256 fb7b0c8cdc3dfd935a8024a4ca208840253f3d7713caa2044fe4437768ccc26d SHA512 9b245d213f72bde8e5166b919b36a68b623a982e88829af8ec07645029a3badc11ed51d5e295f05fe6111361e922481bbdeb160bd806d85f373cf1c1a4be235f WHIRLPOOL 1abde0478fb7fbd631405e58e57e08eaa3eb8f6bcf13b8d1a41c98aeb7a273b4406f1fe38ccb8abc0c6398b6bcedd0ac9acd3699dc9245acdca023a25b07bd8e
 EBUILD acct-6.6.2.ebuild 1088 SHA256 6fdd0cf4b81622afff56b67a0fdd91bf3f69bbd602269ef2a09ce91b3f3ad578 SHA512 111fa62f46d1e12b475a8440d2577c5019f7812c33ec95a155ab01a784913231fab963c021f01051bd14f134bd378279bd677325f890183f6d4ff2f7cd553be7 WHIRLPOOL 9dec0e08755aa2fe2cf69b3890430e5df1cb75243eeeaf3e0434582709332d9c3ba5b094303d55606e7d4e7be213688bb8eeabc26aff6d603c7289d3e1774f8f
-EBUILD acct-6.6.4-r1.ebuild 1041 SHA256 995d4f17e14c17e405995356c9c48fe61c21e755b0af4e35081da58d61d65020 SHA512 b56a5090fef4fe1828227aab8b9c3b9cf990f95fbc59eaadbea3b9df030a6ed591c6a578f4e07a68c05eadc6a766599ab3a7ca168ff1d516772ddb991792f14f WHIRLPOOL fe88a7a15f840391282983da84aa7104341f855a3254d3717c7e7b3ae30259a939fed48a01552a4315139be64d73631f56a9098645861c7794348f7134f7f7b5
+EBUILD acct-6.6.4-r1.ebuild 1039 SHA256 87a053e73509346795c9f68a8fd1c7da71cc51d638becbdd2528b3dcfb49a623 SHA512 1222d80e6c9a07bc735218e9a7c77116526f13088a5179d0e2a91ae0ce2d9315d085c825744951581ec05bfa1a55f393022db7df801946ce8adb70e408a9c1b3 WHIRLPOOL d9761fdafdfe1f11bb043db346f081a4dd42ca1a410a7e915f491248d3393a82240ba62269be41188881d452f7827a279e524961763a5d621a805e14394023f4
 EBUILD acct-6.6.4.ebuild 1042 SHA256 39982601726fc79f158ef38ddc3c5ea8f00d987a244e40327889f94f6635f5b3 SHA512 bce6c29bc003e8261bf5c4dcdc985e75e39ae8178cbd4428b652b1b2415873804a0a61005326ec9fe85c96253af2fd1e5d5a7f9e1262929258c6927845c7ea5e WHIRLPOOL e458f9b6896de6ed761b431c01738b79082e9a5321294b352f82a64bda1e73a0a659168619271519db11a80c9775654a798503e8bec2c6597ceffbf3de52e55b
 MISC ChangeLog 3661 SHA256 325261c71d8cbed85afc836dc34eaecbc6f839c57c92779b6bcb173fca5f884d SHA512 7fdd8f00eb2294f6cc348e8d33c1c7b916978e6d38f12f3442a2389c981656ffe26ac7b19d4099833bd9dd70ac924ca4cdf64bc23a6f4a2e34da2cba289b14ac WHIRLPOOL 2ef5644ec756efaf713d302bafe314f18ed2e82794fc5ea859c78892b5a6ae1e3237d8a18a648469b013c731f4d9afb20e6bb2f51c308a6e0b6580ac62775be9
 MISC ChangeLog-2015 11230 SHA256 2f02e6be79718635e526360ba813100d82ff388efb2acf56e2477dbf9fdbd0b8 SHA512 4a2ac2eeeb80ef0325549792d930ff314c82bd48b9ef4798aa758d56601c396c014093496f263b912c4e29f1575f2ee9f4bb7d5014d48e93ebe57daa46b5fe91 WHIRLPOOL 42e69948eea7dcf175b25589d7def9c6dbf7e21129280636cf108351e1b287348c0c4c9f6d49036d85ba32288d7461b7c5187ff07fdae5ba0762e6ecedae739b
diff --git a/sys-process/acct/acct-6.6.4-r1.ebuild b/sys-process/acct/acct-6.6.4-r1.ebuild
index f2e841e1e555..e46b127a3b04 100644
--- a/sys-process/acct/acct-6.6.4-r1.ebuild
+++ b/sys-process/acct/acct-6.6.4-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 PATCHES=(
diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest
index ba06d5aea0ea..7e5e4d4456c4 100644
--- a/sys-process/atop/Manifest
+++ b/sys-process/atop/Manifest
@@ -14,7 +14,7 @@ DIST atop-2.3.0-version_h.patch 748 SHA256 c0acbb67080ab66f243c4c56f57030f51851c
 DIST atop-2.3.0.tar.gz 190560 SHA256 9af5d8ea1f1d2b1ff6e85dd666d294e213b7c39c66d8a7a796665061cdbf6c01 SHA512 8347f480b3e8f957be9aa8982b9c69c5fbc59b8a32044662995495cc2218de48342788aae40538d2ad67d402c8c470d0514261791ead70303f97221ea6983621 WHIRLPOOL a0cb664edee0fb7750993db6885880f3eae25e079358a26cd0bab7ec0a45d1a18e6601e59e78e610b97bf0aacbb923463bcee2935a3b913af53e48d84d508cdc
 EBUILD atop-1.27_p3.ebuild 915 SHA256 9af6d579f09a20dafe2ee02ffad876f2205a030ec46b1f943b884413ea414d98 SHA512 907656fe15cd36e60fd5f7a649337839d560ff01e5c448256b7f2121de896d21dbfb53a3e07cc4913da41eff002ec99a5b100fce3856ac55feb670b4e91ef035 WHIRLPOOL c7980cba35f4d5e464c4e6bbbded82111e92dbbaa1930ab9b198e082901cd804981894d0261b44e125d644e125226230ada4917a462d80a47713b8396cc5353e
 EBUILD atop-2.2.ebuild 1181 SHA256 69b00680158dc1c2a503da6a4353ce1866bd8def1616f49ccfa61e9fdb70aec5 SHA512 1c48f49e6b76f97f13e44f776ba7ed6a5a4bc7de43d0df3b2d30ce0cb578c6671baf3741f6e5e7d24b42006601dbe7b5a79739a2e0819ff955baf9a12db8015e WHIRLPOOL 963a0892143b3eaa7a4a4659c152b0dadd04db94442c24aeb889892bd420b36a809adb91e518e10f58ead466676145762d888d46485e6e2fb32394261d5962aa
-EBUILD atop-2.3.0-r1.ebuild 1819 SHA256 46114be6592b6988f1cb035b19b712e4193ec91b738c67f31b0f8a9c268f93e3 SHA512 d56e90f4b7e2167a0a9ef1f9552b9d06946ad70ecc4d49fbd7717e908dd73bc247efac50c54aa7fd4847a61d5b8946aca253af171df0b0112e707af3dae9171b WHIRLPOOL 2e31fb6301c562c86548e922c06423b2091d58530de300201830b0448d018553f9fe07a4a720b50b2d3ea5bf03d5d05b0f7e152e7f4199d0cfd57eeacee785c3
+EBUILD atop-2.3.0-r1.ebuild 1818 SHA256 5e6e7730f1141b67afb4156ad8f22675aafdf6ad57333b19154360286b45a2d6 SHA512 e59b9baac68545ae417c0ce3af57960b3d1dde0bb7626605f0a02207a1f85699c2289165dbc943a68cd0a8abe82270447016a045dd9f0e894bd21f333ba628f7 WHIRLPOOL 3e76df813382409257546d00acf6a0ae474dea05136e079ae7694d31c9a377278f6b387cd76c2e3311bae1db3a0d5eff560c15316612f5daa7c8ed0e06878201
 EBUILD atop-2.3.0.ebuild 1810 SHA256 5261e6223c0485e5f5e9b439467a0d5a5e0186c477047025863aa8c99c714282 SHA512 9eb4c1bc4b78fb3f245589f2409e813ee267f51936ea2f1fbcf64e04c7b5e730147a41d2da767f05590814942f00df3a24464fb34406b06f5ac8f9e09f799100 WHIRLPOOL 4c48db6fee858a0fe7497db99ebcaeeafd06234242c53a7ef105ee0c2cb163201a22ca42a1aa53a7f381a95519369094e75287c0c4c96aded8941819726b7649
 MISC ChangeLog 3728 SHA256 92183d366c75428df768483ea275d3bee91dc6a397a6241399023cd72d8332c8 SHA512 f69e7a58d5e129060fcdc16f08d2ed4309ed13e0274240c35a84bebf6f883e1ac8e9ea873b974c1e03fc3cbcd934caebc5c2846519550b88149ed53cc0e77e74 WHIRLPOOL 30a19eaf95883e2ef0b9686d7d28f0ac449373911e7c1382d17e2f84d59b755c04f42296b9fb434a5eca6e7f3a195921a1d5bcd6ec0aba90e83d0fd3ae5d2740
 MISC ChangeLog-2015 7138 SHA256 3595efe1be63a2bee628925a052a4858f3aab248eee3c3d81cc2102aa2ee821c SHA512 08f177d5148578b4c0034e8a54b5f507b658b0174d81f5a80ead1bd8e0a77112284f202f3eebbfbd6077fa30f205179f3027bad62e39a8da7012d110b0dd57e3 WHIRLPOOL 8af38d37c852f8f57ae507f1598820b94011ed6f35f9ac0787f47ec07fa2b9e893485861f5ca748505e4004a3bfaa49b29537cd428c28b471398f164968129f9
diff --git a/sys-process/atop/atop-2.3.0-r1.ebuild b/sys-process/atop/atop-2.3.0-r1.ebuild
index 71fe1c731cb2..8808312a623f 100644
--- a/sys-process/atop/atop-2.3.0-r1.ebuild
+++ b/sys-process/atop/atop-2.3.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI+=" https://github.com/Atoptool/atop/commit/5f101e656a24271726d1e9cd67263
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index b05eac8a1831..999bc01735e0 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -1,7 +1,7 @@
-DIST parallel-20170422.tar.bz2 1543900 SHA256 7a2438a92692c662dae3d4e80f1190af4cfe527cd3fb1a0d14e07f5c110ed329 SHA512 3785221751ef334db0c999819dd6a6cfae20400b1257467325e1533cbff3ea02a1008b61636bd8ec11b270a95c081c89f4be46d2d7a4fe8585e402f320e7c870 WHIRLPOOL 10cad743046eef4740c26272adc015cdb0ffb5fbc695343c9d3022bc3bef1cb4f63c0b883d65b7f3d97339e6d4c65a11ffe86e01a8fa45eae8457ac0f3398660
 DIST parallel-20170822.tar.bz2 1622834 SHA256 8949bfa3057e194119a85a8cba2c8e0bdd46b5f5851eda583d2386b95c039148 SHA512 d0ce008a1d10f6802b141835a931bbbe533d5a4ca41c5636dae1ccecd5ad6b0385d36f11ba33970053dc293d2a44524921a84c2f4f38e9adcb48e435fcdb29dd WHIRLPOOL 564b051677e62d2ec8d1200f1a079b34f72dc737b678aa45a7a6e2c6026e449d22dcd4018482bd978f27119476a3aa00fb29136080f008cccb781c303fffa6bb
-EBUILD parallel-20170422.ebuild 870 SHA256 600c8ddcdb4edb8fcf040c1984370c9026608eedb89a059b1b590270f6a7ba3f SHA512 07ab74b5f58f5e4a7ee1900efeffd1037095948a1672c4c8a3b57a181f74531405aefe177e4cfca5e91356fdb2d6fbe327aa750aacf52726f1aeb8883585846c WHIRLPOOL c47a7cb9a65f83a4242758d6aa58a7a5507baaca06bad70b7a014e5f4bdafa528c9418a81975e363b5e6a190fce6284602327b2f26bae01892452dec744bd54a
-EBUILD parallel-20170822.ebuild 872 SHA256 948dc94edbd809b6391b732bba37cd9886d0eacbaaceaaa5014368e9447a28cb SHA512 576c50813c673d7a0b7ef1285c20d4f7edffc65530521ab5289c973f7d78ef82d2cba9298ec147ee756bdd931a5ec5de3de6c1f2f62d97bc00e3e7839da333ab WHIRLPOOL 60f1a93e3f9a9410b679fa0088d35519ed8523653987a7c364b12eafedc5aa72ff490ec726b1635d9ed9e34b37977833c3b7386e9da008f23c0b598704e4eae1
+DIST parallel-20171022.tar.bz2 1665411 SHA256 f7e2bb7467cd3e87c5488e324950f2710e5d6cc9c9b3c33931e71d7a2d08f8a2 SHA512 1b265482e0e79035e6febb9363ed2b8b34fe6e9ddc751fbf9764bd38cc85c5123aa3034b4f3937f476969cb70a3b14a724ee990a7270ab0bf3b543596f521390 WHIRLPOOL 8d74473ac0f66729d242ca219b3cfbdc7ef1724a8c1c20de6f13044d741b355540924dc074129bce7b4bb68df250ddafcd6c79f0bb57a4e8a336589ba4a4904c
+EBUILD parallel-20170822.ebuild 870 SHA256 600c8ddcdb4edb8fcf040c1984370c9026608eedb89a059b1b590270f6a7ba3f SHA512 07ab74b5f58f5e4a7ee1900efeffd1037095948a1672c4c8a3b57a181f74531405aefe177e4cfca5e91356fdb2d6fbe327aa750aacf52726f1aeb8883585846c WHIRLPOOL c47a7cb9a65f83a4242758d6aa58a7a5507baaca06bad70b7a014e5f4bdafa528c9418a81975e363b5e6a190fce6284602327b2f26bae01892452dec744bd54a
+EBUILD parallel-20171022.ebuild 872 SHA256 948dc94edbd809b6391b732bba37cd9886d0eacbaaceaaa5014368e9447a28cb SHA512 576c50813c673d7a0b7ef1285c20d4f7edffc65530521ab5289c973f7d78ef82d2cba9298ec147ee756bdd931a5ec5de3de6c1f2f62d97bc00e3e7839da333ab WHIRLPOOL 60f1a93e3f9a9410b679fa0088d35519ed8523653987a7c364b12eafedc5aa72ff490ec726b1635d9ed9e34b37977833c3b7386e9da008f23c0b598704e4eae1
 MISC ChangeLog 4517 SHA256 3cf3f78890e620cd9c61e10f9e9a4eae073d8d7b54a7c4906c279af0dfd0af7e SHA512 d555faa230a1853c45cadece58ffd2cd9f9b937dfeaaf14f698dc2cb01cf2c69a2216a04f2813798f694918bf64589e635ea0d090dfe1beec4102676b7c5eea3 WHIRLPOOL 169662ba7548606332c895edab9d0a8804ed324643de93b4aac91cc4ef9e5e5ee2d0bf9b7856954c49c8f099dbcb635ca74328b3ff111897516506d315977908
 MISC ChangeLog-2015 10567 SHA256 fb3f185af2dfa5d9550015b9443edecbc9a7d39c33615219d2375ea7449f03b0 SHA512 78cfa2f1894bcdee368197612e9261fbf16368f3fbd85e6ae67d69e5d122fb8123406e808f65bcfa0711b5572797f1e71c36fc84408a06ebc8e6fc54ad98f49a WHIRLPOOL b0998bdbd06dbf635d386d3489426e458bfbd0c276e168576e3012377dbd2d195315c948b97d23ef04b6164bf3209a613d6964f87e96ab6154cadd310374c4fe
-MISC metadata.xml 1115 SHA256 f14b3fd3e946d290a9f2b271fdc144d0a2eca338383cf943e72f5c992fca733b SHA512 bc2b7cdfcc785ee020ac534d10c357c94a4a1a129d46785c08c6ec384df510ae0b5421e5cc6e57aa42c69d99a52af38e4d02869e158e6166dde0c909ab7b6d17 WHIRLPOOL a7ce2eb490d84f7def3a76e8c87ca2856e4291aea9d2c0befda63115a75528292829a54b3bc39a6754ee79b12f8b49071dcc16d17eb8c0ae954f9ccc11dec77d
+MISC metadata.xml 1003 SHA256 0ae03ad195696075e9feba382863c171889a2a027b0a88aac86ea17bd1534f4b SHA512 a9da23fd3dc9476e2934a06ed8c0638fb3ee2530ea0ed9305a88ef0fa517a2996494d4e97492a709a601937d794748b0cba794d0b919667decdace77123c700f WHIRLPOOL 3a0c5f7d2525a15b0d1e6f8768bf7269810730fc9a44c37cbdfaeea6b95857aa07152590fd9f94b77c24f12e97b2b919740111ea00699d818c6e528436c21075
diff --git a/sys-process/parallel/metadata.xml b/sys-process/parallel/metadata.xml
index 666f249115b9..d8b0e212d636 100644
--- a/sys-process/parallel/metadata.xml
+++ b/sys-process/parallel/metadata.xml
@@ -1,26 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>ryoichiro.suzuki@gmail.com</email>
-  <name>Ryoichiro Suzuki</name>
-</maintainer>
-<maintainer type="project">
-  <email>proxy-maint@gentoo.org</email>
-  <name>Proxy Maintainers</name>
-</maintainer>
-<longdescription lang="en">
-GNU parallel is a shell tool for executing jobs in parallel locally or
-using remote machines. A job is typically a single command or a small
-script that has to be run for each of the lines in the input. The
-typical input is a list of files, a list of hosts, a list of users, a
-list of URLs, or a list of tables.
+	<maintainer type="person">
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<longdescription lang="en">
+	GNU parallel is a shell tool for executing jobs in parallel locally or
+	using remote machines. A job is typically a single command or a small
+	script that has to be run for each of the lines in the input. The
+	typical input is a list of files, a list of hosts, a list of users, a
+	list of URLs, or a list of tables.
 
-If you use xargs today you will find GNU parallel very easy to use as
-GNU parallel is written to have the same options as xargs. If you
-write loops in shell, you will find GNU parallel may be able to
-replace most of the loops and make them run faster by running several
-jobs in parallel. If you use ppss or pexec you will find GNU parallel
-will often make the command easier to read.
-</longdescription>
+	If you use xargs today you will find GNU parallel very easy to use as
+	GNU parallel is written to have the same options as xargs. If you
+	write loops in shell, you will find GNU parallel may be able to
+	replace most of the loops and make them run faster by running several
+	jobs in parallel. If you use ppss or pexec you will find GNU parallel
+	will often make the command easier to read.
+	</longdescription>
 </pkgmetadata>
diff --git a/sys-process/parallel/parallel-20170422.ebuild b/sys-process/parallel/parallel-20170422.ebuild
deleted file mode 100644
index bc813afd8a1e..000000000000
--- a/sys-process/parallel/parallel-20170422.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote machines"
-HOMEPAGE="https://www.gnu.org/software/parallel/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-lang/perl:=
-	dev-perl/Devel-Size
-	virtual/perl-Data-Dumper
-	virtual/perl-File-Temp
-	virtual/perl-IO"
-DEPEND="${RDEPEND}"
-
-DOCS="NEWS README"
-
-src_configure() {
-	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-
-	# See src/Makefile.am for this one:
-	rm -f "${ED}"usr/bin/sem
-	dosym ${PN} /usr/bin/sem
-}
-
-pkg_postinst() {
-	elog "To distribute jobs to remote machines you'll need these dependencies"
-	elog " net-misc/openssh"
-	elog " net-misc/rsync"
-}
diff --git a/sys-process/parallel/parallel-20170822.ebuild b/sys-process/parallel/parallel-20170822.ebuild
index cfc66354fd89..bc813afd8a1e 100644
--- a/sys-process/parallel/parallel-20170822.ebuild
+++ b/sys-process/parallel/parallel-20170822.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-lang/perl:=
diff --git a/sys-process/parallel/parallel-20171022.ebuild b/sys-process/parallel/parallel-20171022.ebuild
new file mode 100644
index 000000000000..cfc66354fd89
--- /dev/null
+++ b/sys-process/parallel/parallel-20171022.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote machines"
+HOMEPAGE="https://www.gnu.org/software/parallel/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-lang/perl:=
+	dev-perl/Devel-Size
+	virtual/perl-Data-Dumper
+	virtual/perl-File-Temp
+	virtual/perl-IO"
+DEPEND="${RDEPEND}"
+
+DOCS="NEWS README"
+
+src_configure() {
+	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+
+	# See src/Makefile.am for this one:
+	rm -f "${ED}"usr/bin/sem
+	dosym ${PN} /usr/bin/sem
+}
+
+pkg_postinst() {
+	elog "To distribute jobs to remote machines you'll need these dependencies"
+	elog " net-misc/openssh"
+	elog " net-misc/rsync"
+}
diff --git a/sys-process/tiptop/Manifest b/sys-process/tiptop/Manifest
index fe01e68360c6..65730a4719a9 100644
--- a/sys-process/tiptop/Manifest
+++ b/sys-process/tiptop/Manifest
@@ -1,6 +1,8 @@
 DIST tiptop-2.2.tar.gz 99602 SHA256 965cb99b16cb59df78363d83b62877ce8501b0aac1116a86bed8a16aa96b171d SHA512 533624a134fcab5e30126412b32bd6a484851ba192ef452877a2199ee3c083fe0222af28c556a8f0769457b5ee7229769b163b8d07e13d03f9f14e192a541d34 WHIRLPOOL 8eb390197404c94070b67384345100e515e3d91677133adec1539736e1a28f55430e5db0c6a99b2c2cd6663d4fb4129a02487a6b6f5ae25f74736c9e1ce29ee5
+DIST tiptop-2.3.1.tar.gz 100993 SHA256 51c4449c95bba34f16b429729c2f58431490665d8093efaa8643b2e1d1084182 SHA512 73d275bc3957583524c872b401cf4fa773de7b4e7b7177f1787851f43e7c4aeefd953eb50b2dbce3babfc7a1c46707370ba4ad06998260177994b2eafb91395b WHIRLPOOL 2445271669dee3dc9b0f39a6656e246d11e4ab10a075eb1619b60e76d10ce16e0b0f60c11429c39487fe07cdac9c51ffd0aae884b94f3cd0e4fc0839b633dc78
 DIST tiptop-2.3.tar.gz 101006 SHA256 3f07e958b40acaeab98e9eb1326c9f91b0be0a782c1cc2bd7a9e18d31fab18ca SHA512 e09ad1fd7063c9b8b7351b5c114cfa1f8e1737b1cfb73c4c869612c3887b060a838c33bdee330349225b48cd73d295fef24cd36c6eb36b566d20adff2dae53d5 WHIRLPOOL 11be7aa8cbd35186d402fb2453fc0969763058d6b6aaef43028bb74af5deacf5ede40b837c2e5277cdf905717862bf62ec1b23342ea7d874eda021bece520c43
 EBUILD tiptop-2.2.ebuild 382 SHA256 a755b7654e98cc2eb1ca62edee2959061311c76547cd63b99cb0b30e68ad02cd SHA512 f6a183d723696e31046edace659567aba706f86a526d29d589ee0c88a8b6c0afe090aa7ff749d5ba0f2054ea090b8d670d64b36002910387b728e685442b5d41 WHIRLPOOL 9eae7fb2d1a45d099718d89bb88e48ab057304f0216a6fe570c9a1a4f5298245078bb3c24da9ea163e4f7bba554fb2843acb1277d69922b9716dddc6bc2e18ed
+EBUILD tiptop-2.3.1.ebuild 384 SHA256 a908d431ad2528849ab84e4b54c68a4b37bfbb5d5eebb95a6a559789d7695ed4 SHA512 7fbfe5784397b5819fee8c696d270a79cc4b2ee5cff752d0ff19420766ef0c639d470bb1d190c031ba1737a3e9bc6ade1ff013b5783070390bf3b0d52b8e07da WHIRLPOOL 777ad621ffb328186703eaf0e53d4e1b6745e7ad21f503ac802c949fed69ec79b42c2ebb3376b00606bb148d580755209e0c7dd4f91fde119fe4ec498f10ebf2
 EBUILD tiptop-2.3.ebuild 384 SHA256 13b5a9da4bb32d1ec5177ef914a787fa34557e654192e474753f56c3909f6d0f SHA512 adfe01fc9670f696a28d0779ea78a2731705459e7336eb9f6f77c84ed12155eb9ba70dabf4f4ad9e6f2f997f7281c51e2dcef3e0947ff9ee38525643adc22e8b WHIRLPOOL b72a6e31f4c1c8df21a7ae058af54e829dd852ff52a331817e0dc81ac6e9877a7c80af0acfe61a2654492f925c16219d5186f67bf03c3ffa69615a1e87cc7ad4
 MISC ChangeLog 2218 SHA256 e929f077b16bd548a42ae2b6f8076b4039bb581918d4cfd1c39ce1ef73eacd6e SHA512 51df5920ba9c9b346f4027d8ac169b3d1174103d3c62d5ba4dd7ec8ed613634fc6fec89b3bbb1aab924c2ab68422b9b676d6ec362312a6f43294e876cf8a52a4 WHIRLPOOL 90dcb83a1074d5eab4cd1c0cfdc180d865c3b0915d8d9f367db21d62f327a1f8687d7d37e18849ae9c2ef3ae140b9ba47ceb93d640a897aee49a5723aa75e268
 MISC ChangeLog-2015 686 SHA256 e013fa4c404e28a575ef8aef1c17cb4ebcd47d48909499ef87c5d2c83d2ea117 SHA512 2c76cc735dd597cb1b66f65479a66b1e0d66de3cf87a5260f77a7b51fc97ba5ba3591abe34ab9fb35112a0d84bc02ae53eeae89d877fc67be67603188934407b WHIRLPOOL 0ffa9b90b79539c2245db9844638c889cbdc11d28820d347082de131b16e2d2f331d40613d9fc05a9c48ab9b28e4f65880b2ee18900766f52724e09cff49ed88
diff --git a/sys-process/tiptop/tiptop-2.3.1.ebuild b/sys-process/tiptop/tiptop-2.3.1.ebuild
new file mode 100644
index 000000000000..0f5fd18600fe
--- /dev/null
+++ b/sys-process/tiptop/tiptop-2.3.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="top for performance counters"
+HOMEPAGE="http://tiptop.gforge.inria.fr/"
+SRC_URI="http://${PN}.gforge.inria.fr/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="sys-libs/ncurses
+	dev-libs/libxml2"
+DEPEND="${RDEPEND}"
diff --git a/virtual/perl-Module-CoreList/Manifest b/virtual/perl-Module-CoreList/Manifest
index cd68274bfdf0..a03f1fbaea5f 100644
--- a/virtual/perl-Module-CoreList/Manifest
+++ b/virtual/perl-Module-CoreList/Manifest
@@ -1,7 +1,7 @@
 EBUILD perl-Module-CoreList-5.201.701.142.400_rc.ebuild 573 SHA256 232ff7b3ce757c3617134f3350687206c5fbd2c501191e9c3736d28fed0dd789 SHA512 56f8ffcc99081b6d02afcc654607fdfe482babf0a47a9078dd90ea70d3be6d7035fc8814f1e689d243673b1933528a12d8172218323cbd2c1940e63eeef72962 WHIRLPOOL 645b82351f824d08bd405bb5ffcfad4f80511337dc374ec0255e46c3ff2f9ac05c013b559315e4a203590bd4af52c9bd5a2f4744157158f6c2091bc2d476ad45
 EBUILD perl-Module-CoreList-5.201.705.300.ebuild 583 SHA256 a4bba673085f615d1b9d5b4985d352080bccb3d0f82123d98be011efeacb8cdc SHA512 56f3a2af38568f06d69bc5b5ce7e18b7f0b84d63ca67052d9a1a645a9c4f08e998a0b616d98a2758819a9b796beae05d6d839468bb69d39522e6229041db8989 WHIRLPOOL e12ea4cc50ba7718e9dfc8b25ea84c0b5658042fad97f9f2cf54b7b022cfd71ab9e147b39dff39e79f75af27bc5bb94080be511197e5167ae79a5c3563403899
 EBUILD perl-Module-CoreList-5.201.707.150.ebuild 703 SHA256 eef00a361e0d0a5a2707320c501686001dc43d32c4030431d0c02359b8f9a884 SHA512 898cfb483e1d8f4fdeca0ef2621951fcbb6f12ca2fe27e0db36ddb4201451c5f92bc2ea8f4a649564b4af82202d9f0e7101643260defa37f7c74c768f130c8f6 WHIRLPOOL 6456f5a05a51b9659fd65b0e8eb9b09b5d71d09ce27dab7fb4f48e179cac557c61e047ded484b2c399da28746917ba9006ff1ac0e2c0c57c476eb67d149452d4
-EBUILD perl-Module-CoreList-5.201.709.220-r1.ebuild 718 SHA256 7898e0b5081b2503212dafd9f1ad13dd88f8677c197ea817edd2abed9e21c240 SHA512 e91291a6e35ff30dbaa58c53d6d8c3486c08534fe621f9af07271076f272e5ac7d6ece7217a0fff78042b31f11075c5692d55209b59393f5a5ccc72a29589db3 WHIRLPOOL 94647695175ac2e98042ec88fb6eab8261a7e71d406bcd8288954d81cfc41bcd9cd7f1e1d3e66f436321acbfcaa408a1805042e82e4e5ff90255eea1722f29eb
+EBUILD perl-Module-CoreList-5.201.709.220-r1.ebuild 717 SHA256 4384e023e446bedbf48e39bd8de969136d05e2b9ffe0aa038056fb25b3867003 SHA512 09de627a7b1f1722c8385d692ed76d91ecf8d071d819a8c3e0bcebd07eece2b83a26318d2e01821c0186b09a1ab818fb7e61ca4fd775638dda813f43b3c0fa24 WHIRLPOOL 42207b11e56ceba269a5c39eae19d2f0a032ef61e66a96bcc02261defbb31440861d91aacf15ceb3d8403a741982ae0d74c31b53403d13bbfe0f87fd1a1cad27
 EBUILD perl-Module-CoreList-5.201.709.230.ebuild 673 SHA256 49f0b9f9f5118c46baba4513b8dbb3bb51c8174ea3823dfd24a3b4764d5e4180 SHA512 399c01930b8d172fc7fa2df1c1a3321ee5df42d98b80116a0ac3ad98e6909107299251508b01b169dd5a900433a7c56f18eaf93c76c770385edd08d481d59387 WHIRLPOOL 6d1ee2761b381c80f13b891fed3050cb1ffb4127b8616c03584206b3a2de10caf54a865a71e37962e05e58842253bcf4e8216ffc35fc03caa6bbab50261199d5
 MISC ChangeLog 9423 SHA256 5e86ec0d451a70f51c3ef39055e3a6fd9c026677faee80f6c83a71d2df0342b6 SHA512 9d818e8a5fb41adb72e342c800e217e251bdbe6d03ba493a0278ed283ce0f12398b4fed532d422aec943f3096e5e9fbdc868186ac57c8558de288e7ea960930f WHIRLPOOL c4fcd5ad3684e1eec5933a0ec86b34f81747f6cde2a726a7c2f17350aba1c9f0a1719fe70a9a5b72019d366e967664e5996d4e7f9f6082975516c2e72b0fd47b
 MISC ChangeLog-2015 20508 SHA256 8a2a6f770a7c3282a9294316d5a50459c11d4b43cf4018da802f2f0a6931e34e SHA512 531d7d4516cf6cdc3250d1daabe9e6cd65ecff29313bc7ff09e42b1b954645835997799ed891b58a33e54a8e6070b22c5090d41be5b7507068b097d1f4edf0fe WHIRLPOOL 291ba1b7a6c61e9da7fca3f4356c57e6c0f2306889966c076a30eea8d5d517a58f6a87c26493571f23b49ee9bf462f3ba60c9be6d0b8e209c55fc7b7c8d638c1
diff --git a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.709.220-r1.ebuild b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.709.220-r1.ebuild
index f6b5eeb7c434..cad793150834 100644
--- a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.709.220-r1.ebuild
+++ b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.709.220-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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Check https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/virtual/perl-Module-CoreList
 # When bumping this package.
diff --git a/virtual/perl-Time-HiRes/Manifest b/virtual/perl-Time-HiRes/Manifest
index 90bfa718530c..f18ac21ca479 100644
--- a/virtual/perl-Time-HiRes/Manifest
+++ b/virtual/perl-Time-HiRes/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-Time-HiRes-1.973.300-r1.ebuild 560 SHA256 fe8172a9e3821a698777bd71f4c4f39516fda0108ba14bfea28cc93f5fdc4a9e SHA512 785bdf214b41dbe720dde36b7ad6f84558ef394f702cd1c3f4a3153da1823107e3ffc53d9668e198d0abf8f277cab7b1024efe700187ad0608ee82642e0f6f89 WHIRLPOOL d59b42e98977dd1edfef47d5c8fc8eb772fb19f81d868de215f6c116aaf158fc5b70dfcea5fb74bf67b06103ac845a3f1105dfe826504f6c977963e1e7e96c83
-EBUILD perl-Time-HiRes-1.974.100-r1.ebuild 585 SHA256 b890a42aa8039bcecc0f55add5bf808528a649f71ba28164e3dd6deb03a2c41e SHA512 c05b29fb953020fd2c29e501537db37d758d3cb98edb691cb5a05f5ce65e96b8259a3df0b6218f7d774b7084f5b27db4c13c0c3a5649dc6854cec0bec843f323 WHIRLPOOL 4c1eaaee32d49ed736a1b5e0cc1ead91c6a665859869150b2205daa27444904d0da69f5e799d716c99cc053adb1ff880746113cf40c96316bde6e31d07c27d92
+EBUILD perl-Time-HiRes-1.974.100-r1.ebuild 584 SHA256 a316055436a3c8ce42611116fffaba7df4c9f50a7ed5fbe1d8608555f6a0ef35 SHA512 a6afdb349394ae19748328441fc1b311dff8ef4bc81aa1ff9969e66e7619f067aa26830a5e7d7cae45042f8f5b706fc4cd91a30c6785631dab4d441c98623515 WHIRLPOOL 89d9bb770e233bf67bd40619c06b6c8e56a68e88fba29e327dade0bce197b1234b8fa624cc761ce9e984fc4ffc2fba921eb3e6101c3e4936e71064e80445370f
 MISC ChangeLog 3853 SHA256 2ede728c8f5e1382cd9406ccfe2b0cf68c9320ff7d5322a7ef910061064793e9 SHA512 f4b14f22c73fdd77fa2d9ac338bd3ecfb33594302f27b2b4dccffed52e65b0b8117925af0f979fbfddda8a714d115e4374d36bec5f4845d4da365aba72a377eb WHIRLPOOL b405bfdbbb40d42351db768d140df372db2a1fc17cdc26945ed3076fb864ebc56f8d23c688ba83749799fe4facf1190a41fd4b72db572a688bd36c05fe51534d
 MISC ChangeLog-2015 14146 SHA256 8eeaefb4f660a1c5d479c79d4c58a5730091657921157424a0a6d680b8adee04 SHA512 df2a25da5775503a30c12d1a0a329c4a1a89dee6352d60b807a2de3bf2edb290870bf0b1a4b3e5cce908e8fe4c5bcb3896486a52c51cdf7339ff0317073ffe74 WHIRLPOOL cf30249ba1ad72eeb55b144fc9da238af2b831863441c4d943d50bebb9bd20949e03f2ad8f0da69a651fae1e54b15f6c6b94e5516e3f12bd17b0020743f4d080
 MISC metadata.xml 257 SHA256 4d43e70b770d0898a99af64a8454a6116e4a86500c23290655c8371265010427 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e WHIRLPOOL 87039765046556cdc2f7d76ce4192945117bfd5bb684220ea8fb72be310673a5b729ea428666ff1ceb1e6c21fb585a3a7dd72bd94dab89cf076a895e6a7677f0
diff --git a/virtual/perl-Time-HiRes/perl-Time-HiRes-1.974.100-r1.ebuild b/virtual/perl-Time-HiRes/perl-Time-HiRes-1.974.100-r1.ebuild
index 0939a62ff82f..f220a6761ba1 100644
--- a/virtual/perl-Time-HiRes/perl-Time-HiRes-1.974.100-r1.ebuild
+++ b/virtual/perl-Time-HiRes/perl-Time-HiRes-1.974.100-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 ~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 ~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.26* =dev-lang/perl-5.24.3* ~perl-core/${PN#perl-}-${PV} )
diff --git a/www-apache/mod_gnutls/Manifest b/www-apache/mod_gnutls/Manifest
index 8f16001d0e08..299c1a1e8b38 100644
--- a/www-apache/mod_gnutls/Manifest
+++ b/www-apache/mod_gnutls/Manifest
@@ -1,6 +1,8 @@
 AUX 47_mod_gnutls.conf 1125 SHA256 bbe6b19c62f4a47d7083ea07d78b7d9a368ab1fb95afc059b87993c19567550b SHA512 cafa6b049f4131b3cb43a4c62a6fb06e9ac5c44bea1901865dd5d48692f22bb5f6243d812f7f2b2d2adf0d39a16480f062043556bedc740b5630809ba9c972f7 WHIRLPOOL 1bc96d9db8c71c95261f0bc19f127c65a61c3f1218e27772cdfb7302d8f19f6a9aa579fe8dac890efd6789c8dfabe7f86e81d649d0bb2285d9a45b08196e0c72
 DIST mod_gnutls-0.8.2.tar.bz2 415903 SHA256 05eeb78e41f1fd6780607a17d705b1965ce5c3ce6223a9a8a86ba9288d22e683 SHA512 b1690aeee4f6d104e4b6a7bd443e289204630b33e00b7b145b11291d8819b5c3d5bd52b535746b8ebdfee7a5f34df527243b743b8c5d716b1d0617e319d43f4d WHIRLPOOL f3b57579bbdfea5ed845df8bd551f7b03b3f49f1b22ede1ff5c1b1b7c7fd1eeea0a55f0fb7ffe4a91cb9d5bce60f7e2e47d586f2f58057b18cf950eee24b1fbb
+DIST mod_gnutls-0.8.3.tar.bz2 420257 SHA256 3517dddef04e0cb64c4805799d1b749bb6273f99c3ac33634677210fbe60292b SHA512 a0c5babeef5b76e9a10642b3825832290dce3b094d236dd06f76228ba7523ba14c2ada4d97d9c47bf9da0cb0808a9c8fb1080122d27399f6a9267ee0f3ce4656 WHIRLPOOL 30cc7faa9b69f81accdb260fc37e2aed98807e33a5ceec0e13c79da7c6e5699c4e0594130276d39ac7a6449f75a80778e17ef8bdd8e331fe47a704184d7624b7
 EBUILD mod_gnutls-0.8.2-r1.ebuild 1002 SHA256 d2a08099cfffffcefeb1f368c713c3b5fe0f1237c2e05af1cdad8430605074c1 SHA512 90377f614bea6c8689be1f6e26d94e9ac3effa43a143366f4c6c2bbd363d214252ef4e35fc272eef74cd1776cd08dc889dd5013ec6b7641d53085b211138275e WHIRLPOOL 3e2a27077d230d275fd488bdc33183318eda7c57d97d2b835229a1fdae85ead3d4599b6dadb9449973adda3455a805d31107ae8769b013626df30418b1c31271
+EBUILD mod_gnutls-0.8.3.ebuild 1038 SHA256 1fee5fb758ba56db59ca13c41f3dad0b581e89e836eca8ff3cae04e413413856 SHA512 3f668bea52e392c63ee51818e0ba05309cd5e6ceb746dbd98bf8a6b809f92a1d16f7ff620363916a3e2026014aa83144f20f10d77a5acab27a7b1e0b41c6f00d WHIRLPOOL 29bc1ce7137660194af638277092fb424193de57cb7f5eb0d70c37120ba54f5cd807ef942752e633108a43d7fd54b0e53e3974fdd4b4333bf7fd23b334948a6f
 MISC ChangeLog 4594 SHA256 510f0d34a08a98ae21267cdb4b16378564e3258ba83ce2d940fd259478e35ef1 SHA512 de5fa5f7434e0f7f45f2afca6e31a0121ffefe42cb4824ab0aa85401eb95d77b5218aa0d0037aa6048bda0bb87080507e57b33d82f8ec0b2c49981cb8a293494 WHIRLPOOL 1f0928a4d82eee45863038a378d7fb21c9ff70cb4078e3bb6dd67b9ed45cf523dd2bd451dfd0b953355872e3c028ad210e4ed9746cb2383416927fa193b65ab1
 MISC ChangeLog-2015 6058 SHA256 c0754abe9061116f204f7ba33b4cad4e88df06cf9a77cbe4de57524197dccdbf SHA512 4542fbcfb1be292ada71bfeecdb1abbd46941c41b2efb2fa52f4532af7efeb45195e1ca5a3733e47c0d38e954ae7512742a7b2ffc4303416fdd9887ef4fe99b8 WHIRLPOOL 216f97c914ee52ebfe98e1eb5722d5906fde5ff45aea3411b0c35ad7e94f2f33ad651908c9b1ba602829ca9a33695d9b82cf5b0d20ee0e3cb2fdb74d03333e6f
 MISC metadata.xml 255 SHA256 42291ecdbc745487c205fe39446325b98c3da38b68645b9e028c92f3e0b65bdf SHA512 a162282826a4c1ec206bc30afd84b64f7b3efa011122bf2f0f228fd5f89de5f2a8c218d0c72671e744a8207b143966afe62d3687974c2ac3aaef9450d442e0ba WHIRLPOOL 11caeb9245f4312d4bfee3fc9b3c1f45d1fb1d95c8bc3db7462a85311d569f2b585d55857acd35fc15190f06960713118ef66d94c67e8f2e8da23388cc5318a3
diff --git a/www-apache/mod_gnutls/mod_gnutls-0.8.3.ebuild b/www-apache/mod_gnutls/mod_gnutls-0.8.3.ebuild
new file mode 100644
index 000000000000..f559ac1fb5ee
--- /dev/null
+++ b/www-apache/mod_gnutls/mod_gnutls-0.8.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools apache-module
+
+DESCRIPTION="mod_gnutls uses GnuTLS to provide SSL/TLS encryption for Apache2, similarly to mod_ssl"
+HOMEPAGE="https://mod.gnutls.org/"
+SRC_URI="https://mod.gnutls.org/downloads/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND=">=net-libs/gnutls-3.3.0:="
+DEPEND="${CDEPEND}
+	test? ( app-crypt/monkeysphere )"
+RDEPEND="${CDEPEND}"
+
+# Fails because gpg-agent cannot be accessed
+RESTRICT="test"
+
+APACHE2_MOD_CONF="47_${PN}"
+APACHE2_MOD_DEFINE="GNUTLS"
+
+DOCFILES="CHANGELOG NOTICE README"
+
+need_apache2_4
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-apxs="${APXS}"
+		--disable-strict
+		--disable-doxygen-dot
+		--disable-doxygen-doc
+		--disable-doxygen-html
+		--disable-doxygen-pdf
+		ac_cv_path_UNSHARE=no
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake
+}
+
+src_install() {
+	apache-module_src_install
+}
diff --git a/www-apache/mod_nss/Manifest b/www-apache/mod_nss/Manifest
index 436ed7ab593a..6076b6305dbd 100644
--- a/www-apache/mod_nss/Manifest
+++ b/www-apache/mod_nss/Manifest
@@ -1,6 +1,6 @@
 AUX 47_mod_nss.conf 8849 SHA256 78f48475b21bd8a5b1304c8bd14437a0e92e9a8b6ffbe7ecd243f83d37da8342 SHA512 d3ff614e17afea1cb0c5e451ba53cf5bb1c0d5c0ee6017fdecba0e976262376e36b5556b2d08cb131ebfdd795cfe4a6736dabda99059fc40aeff63a1c4d37a23 WHIRLPOOL 6e9e4fbc61620aa98d8817e1b3b3c5d2b972f19d6e9ad9ecdf34e4ffe503839f532094d120c872a1eff49e2daa3d5f1e7f4756daa26c7561d7ca694b676d93e4
 DIST mod_nss-1.0.12.tar.gz 171657 SHA256 6a206d85c8c772eb9f424aaf5774b69c235af869d54cc8f45018ec82e1b89404 SHA512 f3217f34a20818aea571e17529130290082933b32386a868c8c7f24eb3166bbace4f64d7d73a850c944e54f74342179fff6b9d8af824e0225feeb993aea1d99a WHIRLPOOL df692da1478c86feab7005498b3f0cf24136b210bef3ea25790e4fc6613690e61f9a9485ce11f5f2ec0f931702a9db08a4fafa286bf37fa0f0df6c1df224270b
-EBUILD mod_nss-1.0.12-r1.ebuild 1265 SHA256 a25d61743068c8f054e1a0e60ab2f0b1b5caaf67c036992134f53f3b746f310d SHA512 a6bb433412f9e2149899516143af205b302c4e6f66c9273122275926f728d9b9bb0b77fa3e1f8d9796a221e568766514c05c15262477e54c45e992a17b15f341 WHIRLPOOL 3e8d0ff6baa3c161a7c2b984f1ff4414f6a4cd1fd7410f0cdf0b6d3376315b4708dc36ec85b5081f1257f325ca3fd66d0ee1f6fc288ff8b3b815ae3a638c015c
+EBUILD mod_nss-1.0.12-r1.ebuild 1249 SHA256 b66aecb0fc06bb99f85bd66f11814a22cff19a565180b35dea04f337b0320da6 SHA512 ab11d87f2fec1ee9ba320dbf9809225d15ec435f9fa7b43c8f3289bc87cb937013ffc3e6a5feac6cb46258e9bc290801ddb02da514b9f68199aaad675446bbf9 WHIRLPOOL 541b397b10cdc6722af403c7808528974090645fd05d73824c79b42e47eda41c3cdd6615c9a6131946d2b6032e61992bf0d56ad6b0bb3732cc6e204633168a71
 MISC ChangeLog 3118 SHA256 338ec89b09af79b3f1424cf61c5262ab2aa4eaaa74d1e4214fdd20576f7efd8e SHA512 860a1d9ece12d7ec949674e410448b353d4374894d09424fc390018603062afa87ee7f7c5598e4ee391a4dcb261ee7a8543379b14ceb48e60905777f17d58a88 WHIRLPOOL c015d3d59086a7c1ff5206cc6aa3a174410455808734b9d559af2d6c1041b49e459cd41fbc6c80dfaaba940f91f0e44ffec980d4caf68990aefd13c952c5495e
 MISC ChangeLog-2015 1398 SHA256 9cac80aa71d93ddf40030c5ff992553fbb48eeaad5c6730f84ede2db36cf2561 SHA512 1d7744a8e013d42b62561fda6b3815d831e45621bef0c4f347f029550d2ac2a3821a317585a58ae65c3c67d0efeeab2795b7e72afc706f4f3a5cabdf6e790c1e WHIRLPOOL d4a624e2fcc3d3d5679e662429cfb57a5a6cc213b0043ec5351899d9ef23680f02841a1dc4751b5cfddb37aea452e0b50b0e38ef6840004e8c5bbcc8f4b4159c
 MISC metadata.xml 240 SHA256 f996bc17094f612e659dcbe2d91be2d7fe5c7cfbf3b5ee7060d6adf3aff22cdd SHA512 12bc0c58114b3c377663bdbfadf973193f074b46bfa51fad44b6ace89c757e07a7bfa1e41cbc1904151e7fd35c7ffe63b7a2083e11f313de136ba58017d21b86 WHIRLPOOL afe38be63cfac552eb3662d4a555dd43bf0ed3fb421a7b5bd53abf0228b7c18ec1d347f4e12d2d085dfbbf5d19e7a0ace0373980c420b2ba3a7f9bc3ce93b934
diff --git a/www-apache/mod_nss/mod_nss-1.0.12-r1.ebuild b/www-apache/mod_nss/mod_nss-1.0.12-r1.ebuild
index 551b08179f36..bc7333c7cf65 100644
--- a/www-apache/mod_nss/mod_nss-1.0.12-r1.ebuild
+++ b/www-apache/mod_nss/mod_nss-1.0.12-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit autotools apache-module eutils
 
 DESCRIPTION="SSL/TLS module for the Apache HTTP server"
-HOMEPAGE="https://fedorahosted.org/mod_nss/"
-SRC_URI="https://fedorahosted.org/released/mod_nss/${P}.tar.gz"
+HOMEPAGE="https://pagure.io/mod_nss"
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index e4d1b2317a8c..d15ee4857118 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -6,7 +6,7 @@ DIST passenger-5.1.11.tar.gz 4243340 SHA256 26fc56b2f6d27ed58b948d9601a17a4f61e9
 DIST passenger-5.1.2.tar.gz 5646103 SHA256 7fb03a54650ef5e508895c9e45bc2d8151f6c4811ea6797e81f017fedddfdbab SHA512 88a77c749857a8538ea268f793d2708fa29b8891d2c3197577155f81cb66aa04919c25e713d4f00692051ad385eebaa94729cd30baa68edcf3d17c23bae0acdd WHIRLPOOL 8f115162e2a7c43af20cef1d689290c8a523cce10f617500eeb50ab6a226c203a404fc7ce53fd0e21e63276aa359c5d64b685318be36f79ce165ff598bac8766
 DIST passenger-5.1.6.tar.gz 5215694 SHA256 e897cc5f0ec6446bfdc226404dca4bd29f7418ae92010c389661b9f024a3cf24 SHA512 71d301d2501863951157f55df30ac89f6f9d98e79b554a5ca05ca9a306041ecd8cdc92056220cf6dc9ad02972a102bfc990e3b06f887d27496a8ecbd58e109fa WHIRLPOOL fe6872d0c11803fd0d8875002f37425edc54327709daaa56518ace0ef9f5046836592298ca80ce4929a29e6c0a0adcb237b57a19cd0d73ac096992e742e2a8b5
 DIST passenger-5.1.8.tar.gz 5234529 SHA256 fef10e4a34c3faa48306c21c0789ee4d4d56fc0e30205cc470a91b486b7a4a7d SHA512 5baf287e1f2a751409bba99671de2c41656033dc29132b2d964457405284105343fde4c2233c921d7e35794a47eedbf33e3840119a908741b1ed9e6fdc99ec2c WHIRLPOOL 6513b71aadddc9ec5ff4b4c617256a62f1c977b7d0f098982808851afc7703bd4ceed843cf309d07b239dbae97ed4beacaa2130a5dd325b17714df59f3b1f9ee
-EBUILD passenger-5.1.11.ebuild 3981 SHA256 1abf5503c689a4547ce4c0a63252940e3f9d7930d188f4680a341bb00f82ec95 SHA512 bd345120db4a296673d10b9778de4c01b47c7204e0506899cffe5a348caa8eb1ac4d2ae1929c8f442ad0793f234de25915a158b2d72253c0b4ca1ef44aa0440f WHIRLPOOL 7a468471c59da013e39efb6f29a8009c55daf1e4e4634bc275a2f00249ab6a07c020ea536377607da8b73c0a7b2996b2a4666d8373cacb161a0791543b9a9780
+EBUILD passenger-5.1.11.ebuild 3980 SHA256 9677c2c41cd6f6ec32e187a5fbef602f40909a35ff86b356270cf037d48e6d5f SHA512 3ee83e353f2a8e645b4e499b945deb2ad518ab620715ed7d6ed0fb69ac8571c1c63383ebf4e44514e9a420a8ac6739c1120b3af688c397260ee3aae94eb542f4 WHIRLPOOL 265d93f494a099c767313cc68d7e674dd943e567d20e34a98c86bbecfceffdfd84ef8400c033a9056b229ed83feea23241c54f426e86c67a655142001646b6bc
 EBUILD passenger-5.1.2.ebuild 3802 SHA256 4e68673b6e194126a37eb8acbb207a91e60219c4a2edfd635dd4508e652c9e9e SHA512 8f8ccf842182cff920f7956e3934e35154bd6235991e50e90bd1629b4f33caa4d480072eddbbc2ad335706bed0f5258ad4de0755beb0c2c89fbf11afcecebc47 WHIRLPOOL 5014b02757779a5cfdc5061ba8d8d5b588ed1e7048ea4b604c3c1a94bd572ab3b8f7c5c775c20dafd87400c305998a7c412bd8c6190e01ea003491058b9eaeb8
 EBUILD passenger-5.1.6.ebuild 3833 SHA256 228c9dbb2b64272213095f96ae7e20b33d643b0a0cde8b6996915f1faf3da95f SHA512 8f384e47cc1efa7c4dabe6dcc42fddd66a2498df22933d4e65fbed124540edb2210f8c0113ae4c2acd3f4d1066fb5eb8bb710f4a23065ef1db6003b48a80ecb6 WHIRLPOOL 1a45c0119c33f5d42c65083adb771d8bfae44daf300269d0734fcfc073e0dd1e665d69708e7f8757e3edb5ad9d500ee6b0d41d6ecdea8114ada29ff7ab1744e4
 EBUILD passenger-5.1.8.ebuild 3827 SHA256 d178ed339b1f895be1457753801d0dd838345ea485f8ab2e1b2227d59b34f542 SHA512 9a6153f12d67e13280b6539dc7f9bc6614a8c793f9484e2df3ed3c4793c37fe6dc7e48f7aca5cad85e2e9abd74455cc2d58010e22ff8a44e3c277e7872d58206 WHIRLPOOL 3cef97673ba0a6d95375368aecc7d7a577d26e2dcadaf781bb421d617fabd8ac5c99a9facc1656afe919f9804401d43db0d253101486c9bfd5d9b15805c1db9d
diff --git a/www-apache/passenger/passenger-5.1.11.ebuild b/www-apache/passenger/passenger-5.1.11.ebuild
index 9a80d0c6a2a0..6de168a4b44c 100644
--- a/www-apache/passenger/passenger-5.1.11.ebuild
+++ b/www-apache/passenger/passenger-5.1.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="apache2 debug"
 
 ruby_add_bdepend "dev-ruby/rake"
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index eeab78b266f3..69dd4782247a 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1,10 +1,8 @@
 AUX gitea.confd 74 SHA256 edf43ca063fccf9951cd1e3975fdfa7ba0e26b47d7442596ce27bc5f2fd21e4c SHA512 3e05bad19cd924c4375d9ca6fc57142ba4b5ec897a1c789c3fc9710dfcfee209a199c95040eece089ad93e0357486ab98fad0c448a61e318646b7a71845e9a25 WHIRLPOOL 7cfce49d1b3053dc07318c2f2626bf2d6029f9dead23c800a775277928c486225297668a34e6e7d322e506b3c3b68652a3aa31514e30e49ef9a1dc72ea3fb738
 AUX gitea.initd 681 SHA256 d54242e9f1f8854f97cc0acf47242a2ace8ee388c9af7d152ef831ca57bbf3c0 SHA512 4565a201f34e5beecc8b535c677e308718a3df91f78a1a7132dda70bc4131871ad9f007c76490c23a001357ce78172a0a22c3e5ff9f3deaa7032e1d8cb11e986 WHIRLPOOL afc8b379026eb28360ef92671ffff1930dec68817653766ce7d3c108912aee33e6e2b3b3b33bedc39edcd5c0a9ac57012130f423be1bf7589465544d471b9050
 AUX gitea.logrotated 87 SHA256 19538aff00c6ad5377df593391f33f59b28333ebe7a95eb9848ce663a6f7c9ba SHA512 798f3fc33026f19dd31ffa78b9b1ed313d7b82b19c047f509e896c1798b2925a1bb7c4998d98a6b47e728979bf7132fb1c2a80eb7fda096a763d6791631cb6d4 WHIRLPOOL 7d8d3dea943948757803a4091a6950a2f9b2859570ee5783bf524c248557e72625042ecdaa9d694177c9a6e3e942dacf5a06e1298994ba009269d3417c299026
-DIST gitea-1.0.2.tar.gz 13448604 SHA256 f75e220f8c44a9b7c67d2d5339479e690df9f03ec3337eede3aab0c7e8e55c87 SHA512 1826e60961adc585fd54a2c913e6cfaa9754052a932981f83eb6a1f2521d09eb7165545f80494439763c8f13bb1f4ffc24b791162cae7b739fd9eb96f7db530c WHIRLPOOL 3afcfbf4d15b94b4b8e5fde511626ce6acfbf201a58b54f3cd077b6c6487f62b3a0b3e4ef7c3c4526a432e0aa4833e038ca7d69e2e09cf9fe329ea65607f42ab
-DIST gitea-1.1.3.tar.gz 13018735 SHA256 c36b96707585d5395b10145d81e732c29e1d1476e7bff55ee6e131a3e516f1de SHA512 c674699bc51ad367d4e47aa1b65e2025d57747cd516df6a7d7e715bf7467a3504dcf461823db15365a61ac91a35b68bce2486b645d09708a6e952fff379c12e4 WHIRLPOOL 1134cf37e09a9e20a927ef9119eb92c2e716af092717ffcce1003d62c08f95452e054820e8392b6797d89c045d8ae317b3d0f50385367e2eb4c636e404e16073
 DIST gitea-1.1.4.tar.gz 13018104 SHA256 36ac983bb3b3f7b1edb8a86acbd6f73f3fabcd2ecf1554b86fe212318b4234d7 SHA512 4427c4c1a588dcf201f707c3e2827fd702a0f8c0add63c6a5eff0d6ef8d21fdaaaf275f8e790017751f161431d563df22f71a6ea046085f9fb1d57da99f20524 WHIRLPOOL 14ad4d092348f8058ccb2438a9bca4dd3223305a9e8575aac808ef5bf15d1b27fc8c54b6a0b890244fe28761c31a633c7050d77b63410086fb1e03cba3e3d569
-EBUILD gitea-1.0.2.ebuild 2450 SHA256 c762c14a7819401d1232d6f7c7109d8918f9ce0f23f11d0303ca13b183b94b1b SHA512 e2980081bb3b30cc046853ba6ea9a7fe8c0f9ed72329b79f06db4e86e3c6608e7b7b669a1e2337c19fa21dda7262f3de7072afedc4e9a5d3144e5976c7f100c3 WHIRLPOOL c2a8dd8c086ee9b1ed15a25bb0d0082295b889e6e5a36580f0dbda01100a368e6fb0ff720fbb3b763696fac206f56e914e2077026f0b10674a5353e8a3470bc5
-EBUILD gitea-1.1.3.ebuild 2450 SHA256 1a549f918363bbae88e0ddd8156593087a28e0e332f8027910d3064ca9b53c31 SHA512 47845442511a19ef76572a01199d32b1fad93540addad3578152e457a78eeac7ec941ea1bd19c134b6514c729230492d8f68f2b3693fea9ecaa21d881176530b WHIRLPOOL afc3eace56cdf14f695db3ba012d0311b829a28d2d40cee1e7297f2c16dd349337e194b7c94a2631e7d6de51fbda714236688329466cefbd336589d4760ad526
+DIST gitea-1.2.1.tar.gz 14326562 SHA256 a18e0390d2c2ca956e94e98294707c9ac1d926763d00e2da682a3e72db393612 SHA512 a8c446361d69fb71d4ee2b6476dd49b84cd88d0eb53b3f6b86a7dbd8c7189a81f65d6178aed96fb6a15dfba5940ec2026c8ff104a249405e3e14a76cd9bb8103 WHIRLPOOL 3a2e7f32fdbd3d4a03c45d08de64b37269f7bde92c42d9825fe56788003a49b4c9fcc56b62116207fd6e0b44db358b065eac9787db3a7ed4f5dd191bafa7bcd3
 EBUILD gitea-1.1.4.ebuild 2450 SHA256 4b51128b604e09398d5d3f8d5ad571b12f1606566ca3713b409ebb4a2803ad99 SHA512 4d86c3afe45be17bda6d2818b68e7337b744e564acbe1e6c448da766a438e7279fef8932874cd9c885f388382e21fc540d81b8256ef2e2e629e7f5b7536ad354 WHIRLPOOL 659198061e9f8216608a399c5453ab5e82606f18d1432d20791bb45062dbbf7188f5c9696967f9d1358b795052261eeda4a46a07152c5bb2b04e7c2c1b925f9d
+EBUILD gitea-1.2.1.ebuild 2450 SHA256 4b51128b604e09398d5d3f8d5ad571b12f1606566ca3713b409ebb4a2803ad99 SHA512 4d86c3afe45be17bda6d2818b68e7337b744e564acbe1e6c448da766a438e7279fef8932874cd9c885f388382e21fc540d81b8256ef2e2e629e7f5b7536ad354 WHIRLPOOL 659198061e9f8216608a399c5453ab5e82606f18d1432d20791bb45062dbbf7188f5c9696967f9d1358b795052261eeda4a46a07152c5bb2b04e7c2c1b925f9d
 MISC metadata.xml 324 SHA256 cf95cc2d754abaf77062d71409b6cb4bc9cd630637518db74d8f8af0bfa1effd SHA512 7b0e56ffe4652157a5126ae7cb7cc6b557ec8367dac02c28f69243181147855dc0e96fe09dd7ff507052a7f5382445deb98090175e06d030fe635990812820ee WHIRLPOOL 4694b3b159f487e2fbeccadd34cb56080888a5422fd8bd0c39db9e18b82bbd0ea1772ba6c2a068968f80c02babd74780e158b790b9b2d260d0ff466a2808e3db
diff --git a/www-apps/gitea/gitea-1.0.2.ebuild b/www-apps/gitea/gitea-1.0.2.ebuild
deleted file mode 100644
index 48f821befd27..000000000000
--- a/www-apps/gitea/gitea-1.0.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="code.gitea.io/gitea/..."
-EGIT_COMMIT="e2c8d6fcb2c4073ed5cf164d88e7b5d44d95943c"
-ARCHIVE_URI="https://github.com/go-gitea/gitea/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm"
-
-DESCRIPTION="A painless self-hosted Git service, written in Go"
-HOMEPAGE="https://github.com/go-gitea/gitea"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-go/go-bindata"
-RDEPEND="dev-vcs/git"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/bash /var/lib/gitea git
-}
-
-src_prepare() {
-	default
-	local GITEA_PREFIX=${EPREFIX}/var/lib/gitea
-	sed -i -e "s/git rev-parse --short HEAD/echo ${EGIT_COMMIT:0:7}/"\
-		-e "s/^LDFLAGS += -X \"main.Version.*$/LDFLAGS += -X \"main.Version=${PV}\"/"\
-		-e "s/-ldflags '-s/-ldflags '/" src/${EGO_PN%/*}/Makefile || die
-	sed -i -e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${GITEA_PREFIX}/data#"\
-		-e "s#^PATH = data/gitea.db#PATH = ${GITEA_PREFIX}/data/gitea.db#"\
-		-e "s#^PROVIDER_CONFIG = data/sessions#PROVIDER_CONFIG = ${GITEA_PREFIX}/data/sessions#"\
-		-e "s#^AVATAR_UPLOAD_PATH = data/avatars#AVATAR_UPLOAD_PATH = ${GITEA_PREFIX}/data/avatars#"\
-		-e "s#^TEMP_PATH = data/tmp/uploads#TEMP_PATH = ${GITEA_PREFIX}/data/tmp/uploads#"\
-		-e "s#^PATH = data/attachments#PATH = ${GITEA_PREFIX}/data/attachments#"\
-		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#" src/${EGO_PN%/*}/conf/app.ini || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN%/*} generate
-	TAGS="bindata pam sqlite" LDFLAGS="" CGO_LDFLAGS="-fno-PIC" GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN%/*} build
-}
-
-src_install() {
-	pushd src/${EGO_PN%/*} || die
-	dobin gitea
-	insinto /var/lib/gitea/conf
-	newins conf/app.ini app.ini.example
-	popd || die
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/gitea.logrotated gitea
-	newinitd "${FILESDIR}"/gitea.initd gitea
-	newconfd "${FILESDIR}"/gitea.confd gitea
-	keepdir /var/log/gitea /var/lib/gitea/data
-	fowners -R git:git /var/log/gitea /var/lib/gitea/
-}
-
-pkg_postinst() {
-	if [[ ! -e ${EROOT}/var/lib/gitea/conf/app.ini ]]; then
-		elog "No app.ini found, copying the example over"
-		cp "${EROOT}"/var/lib/gitea/conf/app.ini{.example,} || die
-	else
-		elog "app.ini found, please check example file for possible changes"
-	fi
-}
diff --git a/www-apps/gitea/gitea-1.1.3.ebuild b/www-apps/gitea/gitea-1.1.3.ebuild
deleted file mode 100644
index 45ea9f668ac8..000000000000
--- a/www-apps/gitea/gitea-1.1.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="code.gitea.io/gitea"
-GIT_COMMIT="06a554c"
-ARCHIVE_URI="https://github.com/go-gitea/gitea/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm"
-
-DESCRIPTION="A painless self-hosted Git service, written in Go"
-HOMEPAGE="https://github.com/go-gitea/gitea"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-go/go-bindata"
-RDEPEND="dev-vcs/git"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/bash /var/lib/gitea git
-}
-
-src_prepare() {
-	default
-	local GITEA_PREFIX=${EPREFIX}/var/lib/gitea
-	sed -i -e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT}/"\
-		-e "s/\"main.Version.*$/\"main.Version=${PV}\"/"\
-		-e "s/-ldflags '-s/-ldflags '/" src/${EGO_PN}/Makefile || die
-	sed -i -e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${GITEA_PREFIX}/data#"\
-		-e "s#^PATH = data/gitea.db#PATH = ${GITEA_PREFIX}/data/gitea.db#"\
-		-e "s#^PROVIDER_CONFIG = data/sessions#PROVIDER_CONFIG = ${GITEA_PREFIX}/data/sessions#"\
-		-e "s#^AVATAR_UPLOAD_PATH = data/avatars#AVATAR_UPLOAD_PATH = ${GITEA_PREFIX}/data/avatars#"\
-		-e "s#^TEMP_PATH = data/tmp/uploads#TEMP_PATH = ${GITEA_PREFIX}/data/tmp/uploads#"\
-		-e "s#^PATH = data/attachments#PATH = ${GITEA_PREFIX}/data/attachments#"\
-		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"\
-		-e "s#^ISSUE_INDEXER_PATH =#ISSUE_INDEXER_PATH = ${GITEA_PREFIX}/indexers/issues.bleve#"\
-		src/${EGO_PN}/conf/app.ini || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN} generate
-	TAGS="bindata pam sqlite" LDFLAGS="" CGO_LDFLAGS="-fno-PIC" GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN} build
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin gitea
-	insinto /var/lib/gitea/conf
-	newins conf/app.ini app.ini.example
-	popd || die
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/gitea.logrotated gitea
-	newinitd "${FILESDIR}"/gitea.initd gitea
-	newconfd "${FILESDIR}"/gitea.confd gitea
-	keepdir /var/log/gitea /var/lib/gitea/data
-	fowners -R git:git /var/log/gitea /var/lib/gitea/
-}
-
-pkg_postinst() {
-	if [[ ! -e ${EROOT}/var/lib/gitea/conf/app.ini ]]; then
-		elog "No app.ini found, copying the example over"
-		cp "${EROOT}"/var/lib/gitea/conf/app.ini{.example,} || die
-	else
-		elog "app.ini found, please check example file for possible changes"
-	fi
-}
diff --git a/www-apps/gitea/gitea-1.2.1.ebuild b/www-apps/gitea/gitea-1.2.1.ebuild
new file mode 100644
index 000000000000..56e96b9e348b
--- /dev/null
+++ b/www-apps/gitea/gitea-1.2.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="code.gitea.io/gitea"
+GIT_COMMIT="34182c8"
+ARCHIVE_URI="https://github.com/go-gitea/gitea/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm"
+
+DESCRIPTION="A painless self-hosted Git service, written in Go"
+HOMEPAGE="https://github.com/go-gitea/gitea"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-go/go-bindata"
+RDEPEND="dev-vcs/git"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/bash /var/lib/gitea git
+}
+
+src_prepare() {
+	default
+	local GITEA_PREFIX=${EPREFIX}/var/lib/gitea
+	sed -i -e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT}/"\
+		-e "s/\"main.Version.*$/\"main.Version=${PV}\"/"\
+		-e "s/-ldflags '-s/-ldflags '/" src/${EGO_PN}/Makefile || die
+	sed -i -e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${GITEA_PREFIX}/data#"\
+		-e "s#^PATH = data/gitea.db#PATH = ${GITEA_PREFIX}/data/gitea.db#"\
+		-e "s#^PROVIDER_CONFIG = data/sessions#PROVIDER_CONFIG = ${GITEA_PREFIX}/data/sessions#"\
+		-e "s#^AVATAR_UPLOAD_PATH = data/avatars#AVATAR_UPLOAD_PATH = ${GITEA_PREFIX}/data/avatars#"\
+		-e "s#^TEMP_PATH = data/tmp/uploads#TEMP_PATH = ${GITEA_PREFIX}/data/tmp/uploads#"\
+		-e "s#^PATH = data/attachments#PATH = ${GITEA_PREFIX}/data/attachments#"\
+		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"\
+		-e "s#^ISSUE_INDEXER_PATH =#ISSUE_INDEXER_PATH = ${GITEA_PREFIX}/indexers/issues.bleve#"\
+		src/${EGO_PN}/conf/app.ini || die
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN} generate
+	TAGS="bindata pam sqlite" LDFLAGS="" CGO_LDFLAGS="-fno-PIC" GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN} build
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin gitea
+	insinto /var/lib/gitea/conf
+	newins conf/app.ini app.ini.example
+	popd || die
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/gitea.logrotated gitea
+	newinitd "${FILESDIR}"/gitea.initd gitea
+	newconfd "${FILESDIR}"/gitea.confd gitea
+	keepdir /var/log/gitea /var/lib/gitea/data
+	fowners -R git:git /var/log/gitea /var/lib/gitea/
+}
+
+pkg_postinst() {
+	if [[ ! -e ${EROOT}/var/lib/gitea/conf/app.ini ]]; then
+		elog "No app.ini found, copying the example over"
+		cp "${EROOT}"/var/lib/gitea/conf/app.ini{.example,} || die
+	else
+		elog "app.ini found, please check example file for possible changes"
+	fi
+}
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index ebaa354aa9ab..62658c2522fd 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,11 +1,11 @@
 AUX grafana.confd 162 SHA256 5b9e125f2648ed98125097770b609dcce543443f0862b99c0653f55b3b9be895 SHA512 13b9868a4c0a5a7209e6f4aa1206a93a0fb33b0234c4c0a6942bdab9d1cf139049181c066e01c49f639165ea422259fa7cab9e0bdf21537b3722bd86691d9b2c WHIRLPOOL cffd9b5c07791af6873b26868e0402ab882410b124fc48a86f367cab09c1a3edf3cc112a83a879e041ce7f717ddad8f70199e5f714281e19da701eeaadcaeb4b
 AUX grafana.initd.3 972 SHA256 0f898484e081a416429d4a881c99988aea6a9d9d2085b326c5dd1e85163cbb39 SHA512 fbad0e00b1b47d9eba808d2ed84e3208d2279f1deeaad71710c6756ad120b1f9f1bb2ba1c5f9677ed3a5efe28df8437c48f5c68b5e8eabb1e91b14e762c1e442 WHIRLPOOL 85f5634bb9fcd78c45d1d5c207951402a60be9b5f5595b47d8785bf1fa3a26f4238346a1d2a16a2e1457620b2cb5b20bfa46f5ed8cdf12e1b5f6297691a0db66
 AUX grafana.service 651 SHA256 406238530f759454339ef57d5297038bf9aea15b1ec919eb4aa9619584165f7b SHA512 7bda41f0c6ee9ec0947ef6b8d4591453f797ac0256f9b67800249a6edf699e55855a9bd6f46501a86ffec5b5d2e1d8ac735657a0c63600683f61044e0bbc35d4 WHIRLPOOL f4a9f08a49fc749e4e4189d1f288dd1a3a394ac3d1e6607639a9c559ee83ff9e59a4f4a5956400a2941e934d44fae619d3bf7a63089bdb6997179df9459c3278
-DIST grafana-bin-4.4.3.tar.gz 47282503 SHA256 90d0c53f6a9edb5f6fb5acb58265a167ef41f5b06701301eafc30bafa28566dc SHA512 21eea944931a9d4a7120d6f2e27fb5300f747ba0ff12cc93b160d38133400548701e342e6481e647f4252d34740aa49a7ebbe8c63a2a30a9fa6a057b90deb87a WHIRLPOOL d5fffbf9dc21fbb0711335a6234233a95bcd801bc3701e1b1be8b037977a291d77e668e950f6bf2c7f848c2395ccfe424b9abf97062f8d1b08b3b676e24f0f81
 DIST grafana-bin-4.5.1.tar.gz 50375732 SHA256 62fe532e5c2f7a56c713d53ee91c710e3213bae642447fd4624d6df806702651 SHA512 ea529a58aa835113ac2b4e8fb7b7f4f7dfa2a554e4aa212f81838faf193de7914a924b80162caa4bfee79d7dbd35278a792c15ca7e0302e062e26e93e29dd488 WHIRLPOOL 02959f0c93a0d257b56dd12bd9abe06372d51155751811c05ecf2281c2a52e3b41ef7d0c2aa2102c66e3d549f1a87f8f62fcabe00bedef7aad5185cbf550e087
 DIST grafana-bin-4.5.2.tar.gz 50374607 SHA256 c438a7ef775dd64e2ebfc72bef1e5a69849f1802b1921f30d6904e8cf05281a6 SHA512 9b650e204f90dfec7ea3ff723a937a3332064c3b5a00bebf3aca4cffe1fdccf83efbe5040c954dc82bc3389a4f5d72f7fa47941f43d022cbdf40e067f9c5adf7 WHIRLPOOL da931ffb2e4a73a77cc64afd3adace46a6043f31455c5bfec9181c0d80aa5191877ffba95d0f77b147ef17f268bb10e3921f7b4304988a08e9b70d87bc40b9c6
-EBUILD grafana-bin-4.4.3.ebuild 1750 SHA256 2b313b3814221ec83a670cde3447c9cd38f60a8a56031c3f8e72ae66b81ee2a6 SHA512 7b0aac0e0e288f00d29e4a1b770ebc0ebea629cb1760c4c99ea6531f746b6a571d58a0ac1a8001a1668dc1d4527510fe3ecc7b02e70247df9589fde6ece9a2f4 WHIRLPOOL c9b94817bd180230b90910acff82ab08813d53c6ba6d46b0f9a114d96b20f3226152c589aeb2358c4c78d4c3fe039dcae825f74f95001ac71b1d26a891fbaebf
+DIST grafana-bin-4.6.0.tar.gz 47177837 SHA256 eac61c02fb39880abac9b2fc0cf6516800ab63a5a98735b5c348a924561e5393 SHA512 bba310b1db360b4621101d02692a19de4a553474271dd6b6b8468c8a2aa938ebb7bc921074f2a8a33545e94fc5a9ec9f6bfdd207e552ae8ba2a2eec127107d37 WHIRLPOOL 168ae3bfbcef9475b4da2d4b45f983d85cd3d1b96efb4a2c6d716e934251b6ec8cdc4311903d3076c2d2305c854f070c19f29c77b8b08a8e700768c4b3f00e07
 EBUILD grafana-bin-4.5.1.ebuild 1750 SHA256 2b313b3814221ec83a670cde3447c9cd38f60a8a56031c3f8e72ae66b81ee2a6 SHA512 7b0aac0e0e288f00d29e4a1b770ebc0ebea629cb1760c4c99ea6531f746b6a571d58a0ac1a8001a1668dc1d4527510fe3ecc7b02e70247df9589fde6ece9a2f4 WHIRLPOOL c9b94817bd180230b90910acff82ab08813d53c6ba6d46b0f9a114d96b20f3226152c589aeb2358c4c78d4c3fe039dcae825f74f95001ac71b1d26a891fbaebf
 EBUILD grafana-bin-4.5.2.ebuild 1750 SHA256 2b313b3814221ec83a670cde3447c9cd38f60a8a56031c3f8e72ae66b81ee2a6 SHA512 7b0aac0e0e288f00d29e4a1b770ebc0ebea629cb1760c4c99ea6531f746b6a571d58a0ac1a8001a1668dc1d4527510fe3ecc7b02e70247df9589fde6ece9a2f4 WHIRLPOOL c9b94817bd180230b90910acff82ab08813d53c6ba6d46b0f9a114d96b20f3226152c589aeb2358c4c78d4c3fe039dcae825f74f95001ac71b1d26a891fbaebf
+EBUILD grafana-bin-4.6.0.ebuild 1750 SHA256 2b313b3814221ec83a670cde3447c9cd38f60a8a56031c3f8e72ae66b81ee2a6 SHA512 7b0aac0e0e288f00d29e4a1b770ebc0ebea629cb1760c4c99ea6531f746b6a571d58a0ac1a8001a1668dc1d4527510fe3ecc7b02e70247df9589fde6ece9a2f4 WHIRLPOOL c9b94817bd180230b90910acff82ab08813d53c6ba6d46b0f9a114d96b20f3226152c589aeb2358c4c78d4c3fe039dcae825f74f95001ac71b1d26a891fbaebf
 MISC ChangeLog 3787 SHA256 7c5499b4ee86c942885dc7ce4bef893e78f6021866021ddd2d3c23e3ed4ceaaf SHA512 414365d302b28b7764df04eb01400c4ba459ec6538cd788b0ea84188b83d23f17d50e65f7f4763a1cd1b4e60cb52b7c2cc6e181de3558fcd5422534eec449a3e WHIRLPOOL ae426267c20f6c10682a1964d30c760897b215cb84f6aa52f6a49286b0fd3b2d38a7d62c56f7495321165c2c92086ac898a19d033c236d07b1d2317d359cccfc
 MISC metadata.xml 368 SHA256 4ae4d3d18cf294a94d808004217a1179c782f8385a2d29f6113d522d57e6cb85 SHA512 1a122f3c2926cd0b933f4f35c56d02ae7a601bb124bc1173f5e422dba35d00d8d91e7018c06bbeda0e9b39699efa86bcb3973a60935fc034dbd23a8d672aebac WHIRLPOOL fd3c8de9f27844fde5ac3054213bcb24dc596a6545f1b057900c769b969b58ccf722db75b6a4925f914606bf3bee5375edb800a564b43813de2c12521449e8a4
diff --git a/www-apps/grafana-bin/grafana-bin-4.4.3.ebuild b/www-apps/grafana-bin/grafana-bin-4.6.0.ebuild
index 3a8308e2d6d7..3a8308e2d6d7 100644
--- a/www-apps/grafana-bin/grafana-bin-4.4.3.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-4.6.0.ebuild
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 96d71b072381..ac4937c24265 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,7 +1,5 @@
-DIST icingaweb2-2.4.1.tar.gz 7176640 SHA256 27150d96a2172d0fa0c77389970052a1bf7aa6553494e80837f6699e96e24bc6 SHA512 21ac8faea3e339cfc668407cef826cf4a8f01c964ad102e2c9bc9716e20c3177cea10ec575b99a5a4bb0a9681032b83427c250c5288b037a70d27dc919d0f641 WHIRLPOOL 40c5e48f0c7b6b32cb1eb02c1a447512bdba397eda8c20110a1e4d0c0b794265fe413c2c3a1a56d3f009e4245e211322a5b97a16449af4a1ff90bb4831f781fb
 DIST icingaweb2-2.4.2.tar.gz 7180122 SHA256 8ce42b4f0fb3ddd93c56d70c642512af13db1d5db2ad0227ec7567a4413daa94 SHA512 2a6f80561b59fde1b7ca72b8a120f93685a4741e7af036a90cdd5a1371f8e6d6caa25161f136b379255032b16b21914325a26f078121743d1299e96e7685ef53 WHIRLPOOL 0f350e796e5b03c5d3e0c501cdae8c485c2eb745da87e308f57066cfe507d24482799ab9e6fe1ed621c19f14fcca3b97c7f57d67a28ac51e42c13aa7094afe83
-EBUILD icingaweb2-2.4.1-r1.ebuild 2549 SHA256 5054aca910b4c43cedb1f65927eed50d613327c089378a9f8d80a03eeb38b67b SHA512 45e388216b6b4b25facf2a46fed4385f47455023cdc6fff6586a8801c6f1aabc7a13e1330f9e6a56e3acd9f4c7bce724411049fb0245aa6d3295c0dba45e6c33 WHIRLPOOL 63ec99eeb04bec6b8f9ae0dd7a57f33164525955ce20bf50e86d04b1b05b01400c0ef0787018cc16580b301510a50226f12fff1270f4635b29eab7e815f82a4b
-EBUILD icingaweb2-2.4.2.ebuild 2551 SHA256 f8eb44b0693890012405e741cb712ad0fd1547be90021414026bcabacfd39e89 SHA512 4b59c96f553f19d648c4444e94372f88bb69da38c8f1d9e8d5c57a4720f48ce81e1f72742a2db29f8c5e8f02b3323457abc96b80f7b737cee2418721034dce12 WHIRLPOOL 11c14cc483109b185946c70590f51be02503a6862e72b9238e7af5a07ea1ffee2f27883871d969b16388a203e6f8cce559612a7ace3996fbfc59a59aecdc7764
+EBUILD icingaweb2-2.4.2.ebuild 2549 SHA256 5054aca910b4c43cedb1f65927eed50d613327c089378a9f8d80a03eeb38b67b SHA512 45e388216b6b4b25facf2a46fed4385f47455023cdc6fff6586a8801c6f1aabc7a13e1330f9e6a56e3acd9f4c7bce724411049fb0245aa6d3295c0dba45e6c33 WHIRLPOOL 63ec99eeb04bec6b8f9ae0dd7a57f33164525955ce20bf50e86d04b1b05b01400c0ef0787018cc16580b301510a50226f12fff1270f4635b29eab7e815f82a4b
 EBUILD icingaweb2-9999.ebuild 2546 SHA256 cf85e05cdf795c6ccf373bb0d4e3d00a6c97a8acedd331dc72526854d1a44e4f SHA512 fa08a2c6d47a9b1df8027dba57b7b8be8bad1980af3c45af52203435dc98ce28b47ec211691e241bda8913dcd77370004ef1b24622fabae8cc3d510f3f9decbc WHIRLPOOL 6e168c77c068b5cad0f9d1f9dda10b546501f802f0d6fedadb737f6b213757cad8500fd7e985cbed1d6cbf37eca6ba6686060865f4877f7eaa707e45e6b62cd4
 MISC ChangeLog 5943 SHA256 9eadd672b6c42d1fe6693377dd99ef67a692b7d4069e21a4e683700866e2d43b SHA512 f3726691410d5de8c4d3f3aef22903f4b418eb8b80adc4933f564e6a4179288bf9ea625d135129e6d309b810aa417fbef88426e1fe00ff360ccaafc626448225 WHIRLPOOL cfd9631fccd26df693305c2b26563577c8dc985a084cf11d2214ed3c601d6650daf72d60221373f6ff4c7e98222b1eadee818284f1f493ab55bffafaf03ce6c1
 MISC metadata.xml 407 SHA256 b9ad2e9df3e4db89dc3e44032cf06cec95938ec8c990b7abea53f2c0e8ae5e62 SHA512 40eb3b6ff856fb8a4bcced4b177c73e4a7987b468dbcfe645d4a9f816f100ce899c8f8f803ad343c2b33b60cbcfbd4cef37257548311d22b4272a15602b1c961 WHIRLPOOL 15cb580f93914e0c73c25d3cc5e0c3d2fd24e0e5ae5c3c3c2369e85dcbb141828e4b5f0ce59efe01c0d8899339314695e701e9aeedd9f4c15560156598bbd74a
diff --git a/www-apps/icingaweb2/icingaweb2-2.4.1-r1.ebuild b/www-apps/icingaweb2/icingaweb2-2.4.1-r1.ebuild
deleted file mode 100644
index 796ba177fbff..000000000000
--- a/www-apps/icingaweb2/icingaweb2-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit depend.apache eutils multilib user
-
-DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
-HOMEPAGE="http://www.icinga.org/"
-SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apache2 ldap mysql nginx pdf postgres"
-REQUIRED_USE="^^ ( apache2 nginx )"
-KEYWORDS="amd64 x86"
-
-DEPEND=">=net-analyzer/icinga2-2.1.1
-		dev-php/pecl-imagick
-		pdf? ( media-gfx/imagemagick[png] )
-		apache2? (
-			>=www-servers/apache-2.4.0
-			|| (
-				dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-				dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-				dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			)
-		)
-		nginx? (
-			>=www-servers/nginx-1.7.0:*
-			|| (
-				dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-				dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-				dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			)
-		)"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-
-	enewgroup icingaweb2
-	enewgroup icingacmd
-	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
-	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
-}
-
-pkg_config() {
-	if [[ -d /etc/icingaweb2 ]] ; then
-		einfo "Updating existing installation ..."
-	else
-		einfo "Running first time setup ..."
-		einfo "Creating configuration directory ..."
-		/usr/share/${PN}/bin/icingacli setup config directory
-		einfo "Creating authentication token for web setup ..."
-		/usr/share/${PN}/bin/icingacli setup token create
-		if use apache2 ; then
-			einfo "The following might be useful for your Apache2 configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
-		fi
-		if use nginx ; then
-			einfo "The following might be useful for your NGinx configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
-		fi
-	fi
-	einfo "All done."
-}
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins -r "${S}"/*
-	fperms -R a+rX "/usr/share/${PN}/public/"
-	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
-}
-
-pkg_postinst() {
-	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
-}
diff --git a/www-apps/icingaweb2/icingaweb2-2.4.2.ebuild b/www-apps/icingaweb2/icingaweb2-2.4.2.ebuild
index 9c54138b2b4f..796ba177fbff 100644
--- a/www-apps/icingaweb2/icingaweb2-2.4.2.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.4.2.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="apache2 ldap mysql nginx pdf postgres"
 REQUIRED_USE="^^ ( apache2 nginx )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=">=net-analyzer/icinga2-2.1.1
 		dev-php/pecl-imagick
diff --git a/www-apps/metadot/Manifest b/www-apps/metadot/Manifest
index f5188d4b3a60..c6c8cb29a480 100644
--- a/www-apps/metadot/Manifest
+++ b/www-apps/metadot/Manifest
@@ -6,7 +6,7 @@ AUX reconfig-6.4_p3 361 SHA256 76291fa277b4b32486bb550b533851b2da10afca0eb792033
 DIST Metadot6.4.5.4.tar.gz 4055040 SHA256 d125b61d59563d25b2feac8ae692225478130e88f5f9165cf1de34c7985cc785 SHA512 a7982e604b1f0f8db393bb16c6ecb7ca0562b8b1a620bc9db268e4be4c73de827b8a0cf0c5156822c3c63d4f8ef19a37a37d2c39037bf9d6d00df0a310e04cc1 WHIRLPOOL e96ce975c4bf19827fbd3d9e18ecf11d52cd0a2e138a91ce3dcc3dffa40cc16e04f9c687e717efccf19bb68aeba64a85fff4375ed91d1caa3295c2b583f3e332
 DIST metadot6.1.6.tar.gz 3754969 SHA256 d7033b8ad561914714ea3d4d32d745566b291494fd3cfc46f66c496e37c48339 SHA512 0b7f4bd99fcc909b3f3428591193fecadfe6542b5a541c351e69323efe06e38fdb4a507d83ceec61105ddeae6b95433f67d3d12778c4acf4b9189b169f03fd7e WHIRLPOOL 1ebe465989931256dcb5bf784e6c0d1cbfae6fffe1feff32326cf6ec71f04b01d35ceb69a359f8b5e50152ccaf7f2c93492d3f0f9fd8955d78e0c7074f001ad5
 EBUILD metadot-6.1.6-r1.ebuild 1266 SHA256 7a888bb5f0090ac925abc8aac02865ba4f309bcb24da1cbc8083ff640a082cf1 SHA512 f3a10d000b44343373a63e50388f0119dc43fe675395c58fcdd3d987b56f88ad4b105c757d28747a7a64836c7a3a31d842b7e426bb497999197b0dbab0027848 WHIRLPOOL 1db7fdf980698c5e020eb90442b755ca7b57d499b59852f4de8d3bf3592931d7a86bad8c689be7893a516615f943cbc1e7dd3743bea57fa27b14aa9f2ac2fa4f
-EBUILD metadot-6.4.5.4-r1.ebuild 1748 SHA256 bc2fa5dc904893f18f940617f3800b42a47e1206ac9b6961c3051b4bce63b23e SHA512 74396c35982f891135fe5dcf948d6a690cdee3e9819acf3c36b6c9d313291e82fd43c419f99977452e681e7cfc1a002703cb167c785fb823c1a61896236ae7be WHIRLPOOL a037bfd05eb1ceea99c11ff76ebdf45aeee4ae159346aa1c9493a0b0e815b7258cf1285be45045a0c152ec10a477fdd8b1e0a6c021cc5138be0721729de29176
+EBUILD metadot-6.4.5.4-r2.ebuild 1751 SHA256 cfdab8c5adacf6005c7b285f2a8851c4cdea23b98984d31ec5b5e5d6e1e44ce4 SHA512 51fe6d0ab6fedaf53f11325b6ad4d422390363e43752640c0af58d1387b43aa17d79499c451c923f9454f03946b0249df9f4cfa6d3a6cf307909e2ffae17c84b WHIRLPOOL 12310cac2ce0b853f8048dca91bbcce9c59c33ce022855735c2fc63f608c202f59385f02dde8822bf3f81a6eabfd7b7db0fd6410002a4c5770f1e5a6c584379d
 MISC ChangeLog 3271 SHA256 6fd4d61cf127b527585978da532cbdefb248822c16c13b8deb80e15adb92c75f SHA512 b2380ed27ce6032b386462916dc8fa65ef9238b5465daa0419a925e716c0482acc076578169e20947bc962a2c1cec88f67af46df2832ebbefd8ab3923574ab86 WHIRLPOOL 2ac7feb83528faba1caa59c82c10169f1b61f6da9ada566f6a8207aa0b80aa40d03167b87e1321ec6bcf9e9a9713477beea42701ec9a721014a6e9eee1844e0b
 MISC ChangeLog-2015 4740 SHA256 27047d3e4f9f03c30481c672c53c08e9fba616f61673d2b0b93930cac6793a48 SHA512 d9b6a516051373d7e27a690c0a908df1c865f43e80ea0c4ac6bfe7b4f59f4b7b4c9084dc66f98fe77d2a284bfb231733509be1fb6896fcb8003d8f4ab3a6e47b WHIRLPOOL 75a872e12f87b1f50f0e72d7212e2c9a4be2d89eec2546f05f6418647b04e9552aa187c70b7ba86f3b6c0f6d32ceccf05af0cd3e734c1091579dcb72f8d9d2c0
 MISC metadata.xml 246 SHA256 f696b469729aeeb7810f246774e90471415680a9ebd6b55c56c13a5213057508 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed WHIRLPOOL fef696fa5b101de1ba4bdc0188a4757648d9eb40d4b01408cf17416d1f39909026a80e4b082d8497801aae1caea588b6d28616cd3853e1b03b94a8fd672f9c85
diff --git a/www-apps/metadot/metadot-6.4.5.4-r1.ebuild b/www-apps/metadot/metadot-6.4.5.4-r1.ebuild
deleted file mode 100644
index 90501a51226e..000000000000
--- a/www-apps/metadot/metadot-6.4.5.4-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit webapp
-MY_P="Metadot${PV}"
-S=${WORKDIR}/${PN}
-
-IUSE=""
-
-DESCRIPTION="Metadot is a CMS with file, page and link management, and collaboration features"
-HOMEPAGE="http://www.metadot.com"
-SRC_URI="http://download.metadot.com/${MY_P}.tar.gz"
-
-KEYWORDS="ppc ~x86"
-
-DEPEND=""
-RDEPEND="
-	>=dev-lang/perl-5.6
-	=www-apache/mod_perl-2*
-	dev-perl/DBI
-	>=dev-perl/DBD-mysql-2.1027
-	dev-perl/Apache-DBI
-	>=dev-perl/AppConfig-1.55
-	>=dev-perl/XML-RSS-1.02
-	dev-perl/perl-ldap
-	>=dev-perl/Log-Agent-0.304
-	dev-perl/Mail-POP3Client
-	>=dev-perl/IO-stringy-2.108
-	dev-perl/MailTools
-	dev-perl/MIME-tools
-	>=dev-perl/Unicode-String-2.07
-	>=dev-perl/Spreadsheet-WriteExcel-0.41
-	>=dev-perl/Date-Calc-5.3
-	>=dev-perl/Image-Size-2.991.0
-	>=dev-perl/Template-Toolkit-2.09
-	>=virtual/perl-Time-HiRes-1.48
-	>=virtual/perl-Test-Harness-2.28
-	>=dev-perl/Test-Manifest-0.91
-	>=virtual/perl-Test-Simple-0.47
-	>=dev-perl/Lingua-EN-NameParse-1.18
-	>=dev-perl/Number-Format-1.45
-	>=dev-perl/XML-Simple-2.08
-	dev-perl/XML-Dumper
-	dev-perl/Archive-Zip
-	dev-perl/Date-Manip
-	dev-perl/Text-CSV_XS
-	dev-perl/HTML-Tree
-	dev-perl/HTML-Format
-	dev-perl/Data-ShowTable
-"
-
-LICENSE="GPL-2"
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc CHANGELOG README
-	cp -R [[:lower:]][[:lower:]]* "${D}"/${MY_HTDOCSDIR}
-
-	cp "${FILESDIR}"/${PN}.conf "${D}"/${MY_HOSTROOTDIR}
-	sed -i "s|Apache::Registry|Modperl::Registry|" \
-		"${D}"/${MY_HOSTROOTDIR}/${PN}.conf
-
-	webapp_serverowned ${MY_HTDOCSDIR}
-	webapp_serverowned ${MY_HTDOCSDIR}/sitedata/public
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-6.4_p3.txt
-	webapp_hook_script "${FILESDIR}"/reconfig-6.4_p3
-	webapp_src_install
-}
diff --git a/www-apps/metadot/metadot-6.4.5.4-r2.ebuild b/www-apps/metadot/metadot-6.4.5.4-r2.ebuild
new file mode 100644
index 000000000000..4ab1afba1f7a
--- /dev/null
+++ b/www-apps/metadot/metadot-6.4.5.4-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit webapp
+MY_P="Metadot${PV}"
+S=${WORKDIR}/${PN}
+
+IUSE=""
+
+DESCRIPTION="Metadot is a CMS with file, page and link management, and collaboration features"
+HOMEPAGE="http://www.metadot.com"
+SRC_URI="http://download.metadot.com/${MY_P}.tar.gz"
+
+KEYWORDS="ppc ~x86"
+
+DEPEND=""
+RDEPEND="
+	>=dev-lang/perl-5.6
+	=www-apache/mod_perl-2*
+	dev-perl/DBI
+	>=dev-perl/DBD-mysql-2.1027
+	dev-perl/Apache-DBI
+	>=dev-perl/AppConfig-1.55
+	>=dev-perl/XML-RSS-1.02
+	dev-perl/perl-ldap
+	>=dev-perl/Log-Agent-0.304
+	dev-perl/Mail-POP3Client
+	>=dev-perl/IO-stringy-2.108
+	dev-perl/MailTools
+	dev-perl/MIME-tools
+	>=dev-perl/Unicode-String-2.07
+	>=dev-perl/Spreadsheet-WriteExcel-0.41
+	>=dev-perl/Date-Calc-5.3
+	>=dev-perl/Image-Size-2.991.0
+	>=dev-perl/Template-Toolkit-2.09
+	>=virtual/perl-Time-HiRes-1.48
+	>=virtual/perl-Test-Harness-2.28
+	>=dev-perl/Test-Manifest-0.91
+	>=virtual/perl-Test-Simple-0.47
+	>=dev-perl/Lingua-EN-NameParse-1.18
+	>=dev-perl/Number-Format-1.45
+	>=dev-perl/XML-Simple-2.08
+	dev-perl/XML-Dumper
+	dev-perl/Archive-Zip
+	dev-perl/Date-Manip
+	dev-perl/Text-CSV_XS
+	dev-perl/HTML-Tree
+	dev-perl/HTML-Formatter
+	dev-perl/Data-ShowTable
+"
+
+LICENSE="GPL-2"
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc CHANGELOG README
+	cp -R [[:lower:]][[:lower:]]* "${D}"/${MY_HTDOCSDIR}
+
+	cp "${FILESDIR}"/${PN}.conf "${D}"/${MY_HOSTROOTDIR}
+	sed -i "s|Apache::Registry|Modperl::Registry|" \
+		"${D}"/${MY_HOSTROOTDIR}/${PN}.conf
+
+	webapp_serverowned ${MY_HTDOCSDIR}
+	webapp_serverowned ${MY_HTDOCSDIR}/sitedata/public
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-6.4_p3.txt
+	webapp_hook_script "${FILESDIR}"/reconfig-6.4_p3
+	webapp_src_install
+}
diff --git a/www-apps/nanoc/Manifest b/www-apps/nanoc/Manifest
index 917b38521b1a..4e8f9f5d4802 100644
--- a/www-apps/nanoc/Manifest
+++ b/www-apps/nanoc/Manifest
@@ -1,11 +1,13 @@
 DIST nanoc-4.6.4.gem 241152 SHA256 4fc9c41f8103edc732654ba8559f42007ce6e7013078cf652f05e572c61272aa SHA512 49e41f5bfc3ae9afc7e40b182374579adbd703954ba97b0cbe68c0e3ac864e7301a90dc5993795636b96155a1d9cfbb102e6bfa321513919123ff680322a2631 WHIRLPOOL bbfd86c526f34258d68e1532ec4629cada74da8a5a6411f6bd5b1fa890693dd614205c9859483b1b796a0de38d9ec1ce21650d69415aa8eb4f08500fa9e27eea
 DIST nanoc-4.7.14.gem 256000 SHA256 e68fb32763517dbd78b655ad14d2bc69e0828f4cce6488240c4ec89b7d8377a9 SHA512 e7413771794e9d2931e3be2a5b5575f7cd207d9b11167a1838496edf34bee4e631c362d9ac50fb0f9dddbe2fd5836b402506565c704838327116a18f0ea34088 WHIRLPOOL ff04d10480a2a9ff308d0ac11320f37fcc7afed84221dc9bc86ff8b318a1100d2cdb20634d771612c7e56a727ac3448b094b7d736c5bf38c4f24fc09d9bd7486
 DIST nanoc-4.8.1.gem 256000 SHA256 9d2bb60fffcc3a0f1ec7b6c204494514874f51ad9d5f8f4e15441d5d4d976a22 SHA512 9b24c91074ba591a18ba1f4adc2e97e89f3fa0e152cb56fbce58b2591312f54db0336487526ca0f34dc02ef22b2c0960a70a5313e0d8b6c6b7cb2d36ab98b5eb WHIRLPOOL 51fbe4eb5a587143a16d8d9bec7f5f2ccea3900a87534808209a54b763e9fa0d7ba7c5fece38fc82ff447f6175f1feb9ec26ea2127c12bd65ddb94b155af89e6
+DIST nanoc-4.8.10.gem 260608 SHA256 fc3d1bc48af638fb93b4023f0cfcd40e658c74129c25dd878cd9c3f93f2317ea SHA512 36080407696d19739af666d9ba4e04d051d679b29b3e8e5d24d893a2d05b05201b74777007781a0da80125a98fd8cc465fb0b78ca0c28c5fc80bdd5229d5fa24 WHIRLPOOL b7ab3d0edad55bcebbb87ab81d60375b15686bcd5109809f757cdd95a99e1a2def4f45d829e4d85ec64acbfd8d5cd454e75068333ba0735304b4a1e2ec0ab44c
 DIST nanoc-4.8.5.gem 257536 SHA256 bd0909d15dfacc3f1e859ba1c84f66611c414aee6600c256d27394d8b47bed58 SHA512 6cb4e57e3e852dea5f2b64ed2d194dba88e109ebf1e83433b49bb6c0027b7d47676bd418aa6d1149c88a71981790bb459ae5a5d21c18a805cdd9db1bf5c3647f WHIRLPOOL 289ed9e7c2e90fe41392d2ade914f57db022455cab8f40a809d30a2bdf1e74b7b999c8e7d25ee3fc109dc896062bf20baeeff53d412cfae1e9798f2cdd0aaa23
 DIST nanoc-4.8.9.gem 258560 SHA256 68f51386e8a2eb01f1348c43a10a752fc118f513550a9011d097693f7e193703 SHA512 7fedd050564134ba4f3706689af21d856639b02ba0c5a4bc02bf639f7be4dafd9efed4c3e11aaba08b53d4587476c9f071f4cd0fa07879e769295c6175735dd4 WHIRLPOOL 7c214f597864d4914e7f2279b39d2b415308ee97b43fd7657c370ea77f8a530902a6f323998099209272b8aa131932625c8aa6b1539557b1b106ea1364ca8a57
 EBUILD nanoc-4.6.4.ebuild 1244 SHA256 0cae293493918356633b4b1b4c49b4b73c428038780d0dd69bda0dab406583f0 SHA512 2be4cc8b453fccf9c1bb77cbc38b2f3d8b8d70dbe23611d0b6f40e832847f740c9747b9de1853e1a6d09d6ecc9f7548bc0098556362cff9b93ccd4dad3659959 WHIRLPOOL b673a7d76414eb4bfe8204df5cb78a8e7c3d346cade64151aa3fdc1a822fb09ac00e9246659c8b47e9773482caab28c22d046ff98e5db4e16c7a9cd7e0b7d7eb
 EBUILD nanoc-4.7.14.ebuild 1527 SHA256 33a3f473dac02173c37e4abd079a1eceaacd591298153f9da37f27a4f82f85af SHA512 d8bed9a8d6bcb697bc2f6a406e56be084a2a60ff56580b4b6bda4e4e68081a9227c8ea793934332c891ff515ad54fbc83cf29f3d32352e416d994009878f0061 WHIRLPOOL 7aa2bc8a08a0283cb9f0687e2b762f30d1348c9a10592c3fcb3f2d23578e66d0503b0ee9e5bdf407868ba205d133745eb78e7b4726e7b339f0e6c4e97a3ac6e5
 EBUILD nanoc-4.8.1.ebuild 1527 SHA256 98ad5909cf9c8727cfb99d18d2e491149db88396e9328073f09eff546db41279 SHA512 e752e828227a445e7b575a7ce2e8071afbd6d9108a44e881e7e797490b27f73d7af8a4bba624cba72723c86a3b6e78b49c9de3fa387ce102894ba10bc46b58ed WHIRLPOOL 203087dc87539ca81fb64be31fa41ce5768d1a4af1c206363d4d8b939c691ca5e469a2ba275eb4cf9cc77e969c96df388f9dd9e1cb1a716b8d6b7e545fad7b2b
+EBUILD nanoc-4.8.10.ebuild 1572 SHA256 feb47a5784a68c591a3750befd90efc07183a02ccf040e82e52089d073190f77 SHA512 bdf5c69689dd2cf7658ad4839fe7350b0a55fe3ca78edbfeb927f837353d2d3221fe022505a93a80f3abe4a565d77446adb9f594cb897facfca6125bd22765af WHIRLPOOL ebc12a47919b8d01a7488ea1cd3fa753a9edd433ee59dbfd469ac3d570afd655efb398ebb4f32d81b35bc45098d7de4b83b7ee093eece0f73a87e05ad687fc28
 EBUILD nanoc-4.8.5.ebuild 1544 SHA256 c8572b3bfde4528ee70b7184153bdae268f0cf464b2f71ad179d90f29e474dd7 SHA512 54561e950f0b332640ca35907bbf43f1fef9b817b26ea8dd6829944a9411f4869a1b3c9711a1fcb44ecf4e75be7809016a3d9fb0a5ab1ac914927f17c83523a6 WHIRLPOOL 963d7f51adab61f3923e80a4b936a4b08f77a9cf4180c57aa7103923e8e00e5860685573b9f4b77e7f11b1a7afdf5e2453b689240036a3276c55f16cfc4c6ae7
 EBUILD nanoc-4.8.9.ebuild 1572 SHA256 feb47a5784a68c591a3750befd90efc07183a02ccf040e82e52089d073190f77 SHA512 bdf5c69689dd2cf7658ad4839fe7350b0a55fe3ca78edbfeb927f837353d2d3221fe022505a93a80f3abe4a565d77446adb9f594cb897facfca6125bd22765af WHIRLPOOL ebc12a47919b8d01a7488ea1cd3fa753a9edd433ee59dbfd469ac3d570afd655efb398ebb4f32d81b35bc45098d7de4b83b7ee093eece0f73a87e05ad687fc28
 MISC ChangeLog 5209 SHA256 4d4ceab64c54a87f9bdc25d0149c182e5721349c3a6f6985b95d3c7a79e1cadb SHA512 9ab85ec191a889c3f20641c4201acbfdd6a525abea49c39d909e06ef1fa11864f35d169d1de993ebd03ec97e7496b2f88f580d9c3bd3830b232533ac93c60a80 WHIRLPOOL de25826d041c79fa5dbb6443c1c15c0e52c33d83709994f27290316084a728a16c8725c790dc9e9f5a66ed4694344d5f74a17b1509aae436ae3f49fcb67f0466
diff --git a/www-apps/nanoc/nanoc-4.8.10.ebuild b/www-apps/nanoc/nanoc-4.8.10.ebuild
new file mode 100644
index 000000000000..b1c3454fd12c
--- /dev/null
+++ b/www-apps/nanoc/nanoc-4.8.10.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="https://nanoc.ws/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
+
+ruby_add_rdepend "!minimal? (
+	dev-ruby/mime-types:*
+	dev-ruby/rack:*
+	www-servers/adsf
+)
+	>=dev-ruby/addressable-2.5
+	>=dev-ruby/cri-2.8:0
+	dev-ruby/ddplugin:1
+	=dev-ruby/hamster-3*
+	dev-ruby/ref:2"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec:3
+	dev-ruby/fuubar
+	>=dev-ruby/mocha-0.13
+	dev-ruby/minitest
+	dev-ruby/rdoc
+	dev-ruby/systemu
+	dev-ruby/vcr
+	dev-ruby/webmock
+	dev-ruby/yard
+)
+doc? (
+	dev-ruby/kramdown
+	dev-ruby/rdiscount
+	dev-ruby/yard
+)"
+
+all_ruby_prepare() {
+	# Avoid unneeded development dependencies
+	sed -i -e '/simplecov/,/SimpleCov.formatter/ s:^:#:' test/helper.rb || die
+	sed -i -e '/simplecov/I s:^:#:' -e '/codecov/I s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '/coverall/I s:^:#:' \
+		-e '/rubocop/ s:^:#:' Rakefile || die
+
+	echo "-r ./spec/spec_helper.rb" > .rspec || die
+
+	# Avoid tests requiring a network connection
+	rm -f test/checking/checks/test_{css,html}.rb || die
+
+	# Avoid tests for unpackaged dependencies
+	rm spec/nanoc/deploying/fog_spec.rb spec/nanoc/filters/less_spec.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB="${S}/lib" ${RUBY} -S rake spec test_all || die
+}
diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index c4d31bcc7b31..54d0bcac3e13 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -4,15 +4,12 @@ AUX redmine-3.3.4_requires.patch 2632 SHA256 d45ceeb281bbbb4a723f170b7748713b2af
 AUX redmine-3.initd 1269 SHA256 7e9eaabbf0da516991d7e585e7fb0f9a00e6c1a454254c635e258d5adc060037 SHA512 c0ec931313d8b684cc8d2ab59e0c6d6fd159202420a3849cbb09a62f4fae7f6c3ec071b58fc17d838247c7c573a92de0ecdab7de995fd2391c4bd66001335ece WHIRLPOOL f7e7ba0eb84c395c0a0abb62a834e3eee584b2e3530b35e6baac94163b22c38cba46f1e6d9dfc6bd83126942e4b4a02008ac1b4991becfca9643391f486322ab
 AUX redmine.confd 267 SHA256 2ac6b7dfc2d055554b7ee9380fcf1a49a708bbd866987b775507d7a3b30f2d41 SHA512 4e4a700f1540b5e82df6ca610a94adcb08929f5ca75e605e40372b18ccc395515cdd53451ba2b3e3d9bdf129d9052a7218f6323d526c1ffb2540254d279c8d94 WHIRLPOOL fd6e8c63921d7ab2d73b5b15ff91db64ead03e521325871e21a1d165e313a1e56c607e9d9553504ccdef10a917a85ecdd5502527df159012b471803f4063ea00
 AUX redmine.logrotate 106 SHA256 c0999bdfedb44d8c84ca933c5371770194dbc46e6f06a9dac467dcb4dbc5f2d0 SHA512 c7e611dc5e662e5b2126c77a333081708e552f2980efb835dc8560cd5e1929c6923e5e6e4e45604fe662b9bd5ef433678eb900e797cee34bbb1b80fb55eed0e1 WHIRLPOOL 8b9ac739c63c226deda3a3fca5e89f277770de7bcad0c9777a203971236ed45f28a793ecc067b7e92704d99a1afe79883f36dea0658e02cd3d59f9151d3cf9f9
-DIST redmine-3.2.7.tar.gz 2322680 SHA256 f6ec163474e2a2cac21215d130c5bd3ccee54019165052943feaffc5fe5b34fc SHA512 74eb67e25a835500c7eb1c251de824981d45402fa04d03801c16ed2e3a78d90e3eee414063fd95379749335714e72c34760a251b3a583176e76cb9398e24b711 WHIRLPOOL 61dd4497d290b6f88fa4332119b9e2c0fcf27a727f5cb727f2700153eef6fac5e088a77d5f120e77f3a59f53e2de1fa9ad6eb03a0cfb2aba3ecf4eb2998dc9ff
-DIST redmine-3.3.4.tar.gz 2367776 SHA256 f28125f31df7ebcf7debf9b030d62002e2757c6ed228882ac64562dec90efbac SHA512 152806f829ba7e4f8df18933aa9d46c959e9f314a5698b20f30b90bb0d1292439fd6a3dfaea427145273d3fd37d48f62a64068dd7f8ab1cbe507eaf5c09f7f2e WHIRLPOOL 5a61eb7ba1dfd56cc3564488ee4a3686876cfea6fe83b624a0014588a27e6623b6ed5bcfe668e92b1edf26895b3d9f6c88edccca9629539147649aa7f197ba22
-DIST redmine-3.4.2.tar.gz 2438319 SHA256 747d649e3bceef41345a147a17db143ea646eaefb23ad7c514027456847c77fd SHA512 aededddd59bb84633f7360fb19e78a9313cf2654cb2a36a449c305834dc58d8e45f4d0433fe6d188f44e950163987b8b5e5285c9a9706d6f95f2346acdfd81fe WHIRLPOOL 23c01a72d7329e5948b0ba6a6ff59dcf162c364e8eaf60714e5883b6c36796b58b12867ebb678dcac714d7dfb49610795a417b410fd56b3e0765483e968aa894
-EBUILD redmine-3.2.7-r1.ebuild 6863 SHA256 c69b26a33f176ea4468beaa9f51e1a6ef5792b1891ae34e75747877a692d211e SHA512 3a5e65dcdafb654d0e741e56d6fa8e5045a398f9910a7aa0d392204783ad948ff2a5f8c466f3764205ceff9485af2b9600ea3042e6ab6becce25990fe0190f1e WHIRLPOOL a816467088352a752fcbbd20cad623e51b2ed900062bd335ae294b0b11fa405408553e7771e9092f2fd3102891af5e355d0e8e05e29fe970d102b36d67250dee
-EBUILD redmine-3.2.7.ebuild 6863 SHA256 a39eb7c5ac6bde49cbd17bc82115b785ff2f31cb2e4033458ad83a7509961e63 SHA512 6e4b36796adc3b1f80373159828c494fd043ed9e0a0d202231689b06eccf68293f091a8f0d9de2c87f549d526fc93e49791aefbba65f2aef57673c95a6822445 WHIRLPOOL 014886e11253e241042b0875a106ce2d3f8175d073844eedb91d81c78c7219745ac2a2b7c32a9656a27ec247ac2fc34d83d59f8e00c149c967c543c24f7fa0c9
-EBUILD redmine-3.3.4-r1.ebuild 6583 SHA256 b2d5de053d6a6e03c277c0451b589b79c306a92ea0bb2efd75fd77dd093523ab SHA512 0a4769542933822a8650bdf837a1fc953beb79b6ac5f3170618f30cb43cded2b6ba811db947cc85b7082964f34af95c0782ab8470c070ace9d0a361a9cefa013 WHIRLPOOL 324ade0a32e25bebb2e552dc2b50e20bc1e117b06753457e4e275726e4fa310df71495231c1b12076b6b8ee179a1dd30cd17f2934fe7fad18bdc7b147a91852d
-EBUILD redmine-3.3.4.ebuild 6583 SHA256 74dbf5fc9e2076f6667ea69bf7065814f9a7bae04fc42f10ad20a86bd0a77d06 SHA512 1b1767683f44b62169b4a205a635e324c7ed657515e95993c415f947e65181a2bb6299c666fef0a834e5d2d865d80b86b6f902da4c311ee453e60f306e59164a WHIRLPOOL 91ddcba928f7f3a8dc0ce4cfb7455cd26f2908253dd783968eb9fee179b7a181d6a389398d19379592dc11e8d294299494aab21cba01121f9ed9d72efbb3268e
-EBUILD redmine-3.4.2-r1.ebuild 6590 SHA256 359384bf4fdf36a91e76be44d110520ef544daaeb38c18ca17a99df5e30e96b2 SHA512 995ead1f0968ff585ec892ca4b34c1369e50542f80427e0341a93e36e4ef3ef8b140668c14e89c4eb951ec980a6d7efc9ea66a3c585e50bb5889e9e88e4f711e WHIRLPOOL c3846ac498d8da0a6d87cbe12d1150b8ca9d37de4c3ba2c91d0d76acb7be155c6cd5fa438dc3f32f2fbb8f80e777be195c51f85ec0e66d87f17c3a623772d41b
-EBUILD redmine-3.4.2.ebuild 6590 SHA256 9be76a40a11a524426b842767a605ee29c082306e17b940e0e9c3c6d28dd057b SHA512 84b54aea6054f6fb2ac961ce7a0a647474ea4acf7f12ed81a2ecc5a38cc6b49053fa058321dbef9b555bcbae1850f14a422ef0902a6c82c30f27bfd24c6dc4b9 WHIRLPOOL 998ca955d951cb322793e08b3a9888ce3d4226205e6937c08609ab8d23d5c202ea06dd6ee99febeacfce6486d8a223f832124faa94b7ad5ad7ab6fa06fd28c3c
+DIST redmine-3.2.8.tar.gz 2323001 SHA256 2dffd6fb314864ccf77528721580fb639df5f96254d0c533a1fea237a9bdcb98 SHA512 3817fe98ca61326c5e4f3c3fa67540a38305275b9c24a1d74d869d713d4a582974cb2ea983016aace3625a8ebadec9354b8f1e028ed6ade2ba3ebf18a33de1dd WHIRLPOOL c315fa14d2f52d21a64a085bbd88b8f8e56d062e6be9abebe374904ac721c9401e62e7a6fe4a8cb81602fb42f515ee3f53c2788d2e7866e41c35906dc9898fb4
+DIST redmine-3.3.5.tar.gz 2368487 SHA256 87ec1ac270d050c4cabcbbebf8dc84a0efafa717aa0bc4fe3a019c53f266b238 SHA512 6471429eda15b5788d3d46f114ba63dcd30adfddf8b58b21ef206fa65c39dede1db6f11c7340560cf687f14dd46b64a40d934914f9edf2b58ba1fbd730eb304f WHIRLPOOL 959d25496dc2023e27b956f1d8efd9380f18c998a5587ec852cde2e0eb943956108fb1261be47c6b0127ff1bb026d8732404f7ff61ca8495204350174118d9b0
+DIST redmine-3.4.3.tar.gz 2442818 SHA256 62c3ea32491a13db294237ff7ade5a447e0d2913204eb871ab3a99414e41f63d SHA512 27deb85916eb0285abd51e847037f213ebdcb5f16f57a19e7ff1d58eaed71a5c69695c707c12f2976d8dedc7aacb68bdf349c2d527e8312ce8c1c54d7af2db8d WHIRLPOOL ffb12fb19797f9bc7c9efc4e19302d75d0ebdf59b9b34d9dc60340bc67de136bcb4ef0e39e70bb77138df2c1c94756985e74f8edec1d8e139506a934989f102f
+EBUILD redmine-3.2.8.ebuild 6825 SHA256 f4810df2902cf672bc827680efa521f73cdd5489f17f2ccdeb45a11a0364fe15 SHA512 40c49274f3c31c527c0bebb4188af799c7b1fcd17315659593afa65a048cb796583edd7e28d57710fff03ac5811e85b967563f145c96008de4cd6acfe2e23379 WHIRLPOOL 173e73072968e6d24b0f7cef3bac5ecf63fc26eeacfa713b8b5bfc5020ae057a0ee1652c08ada701844c00d839e8acfe3f11846e3f753d2272d27d33b830820b
+EBUILD redmine-3.3.5.ebuild 6569 SHA256 9068f2732a63d88aad58acb67239dbf738f0fff08f25642e5ea004e94a6fb305 SHA512 9bf99a73c5334feca2048c324bf78e9562aa702915481d9e7abfa12a5df23cbaa840ad02b5d5fad444030522977eccba3cb651f6c443e8cc2b63c2bcbc5e6acd WHIRLPOOL 4d55807d740516d09035ba6bd6d4d47cfd652afb85ebfe39b465ec3b7f7e6b4fdd2656910dd996bf7fc1ae01f9d5068cd4b51304dfddda4b6a6df6041b87118a
+EBUILD redmine-3.4.3.ebuild 6576 SHA256 4ac44750a2740fd1eab1ef98c2f626f2b27e8e29aba7a416def4544b9c2d0c7a SHA512 7999fd691ef975ffd686d7a92ddbaa95c9b3bbbbffc050c565ef07f09a72808dae0dc63247e1bf75480afb98ad94187db7a91c2c45a96b81bfb0b5694a779f92 WHIRLPOOL 5450e6489931e82397dff6e0103fbfe160fee0e3341aab26f9ad426d5264e7ffaeb31501121096c4e72d9b988b6c50f6616239319692a218c378598b8431e086
 MISC ChangeLog 3999 SHA256 96b085622c371ed012428ec6bff28c7cd5423bf06f8d788d39d574c1dcadbeb4 SHA512 97aa9958e2ab41ce90e1b6607b550a8053653d52e4e0c9d4d99920f4da789a1f3cbe24f27ff50b89af227f94bb8191ce4884c204b61f8f075e68d3880d8fe73f WHIRLPOOL dc8d7e880d8fbef9764601a771256bbf6713fd90beaa30617f6603b8aa91b9c89b928d93d44e4fdeb9b2dcbe21e30c6caa28f513fee2e63351bdb35e142ebbdb
 MISC ChangeLog-2015 9269 SHA256 3814b4ebd58462879a42dcc4ac854c11670d0d13bdc5a98aa41638d79bb2bdff SHA512 2d4e57af048aaa3d0baff110d72fe5e59259f1c5bfb10fc445157cc35a558a36379135b7065e0ca3dad80ee083b539d8dae53084c6bcb2487470ab3c05b2dc10 WHIRLPOOL 8d4530cabfb864263160329f9a1b90f6a8efc96911fd2fa43653614239c5897296adec7e8eb303969a7bdef559db75851f2523272033494865fe2eeb320dc024
 MISC metadata.xml 527 SHA256 90c80d49a227178b30c96ef99f2849474109570a550a337730ebbe1f28b97826 SHA512 156e0ee607ad0ae734a98fab405679c55de4e2a5d620cce564a7ac17e8a029869f66c3df6d2733eb8106f9732537355c72be7c7261209af196264d069788eed4 WHIRLPOOL e5167ddd29b75e750adcedbbb195b53d66cf03313f615e273e8c4523c1b96bb535b88abb8a81fe2cf1ca6d789b6aa6b1535f575d838d933b335ec22a2849052d
diff --git a/www-apps/redmine/redmine-3.2.7-r1.ebuild b/www-apps/redmine/redmine-3.2.7-r1.ebuild
deleted file mode 100644
index ee397cf4ee39..000000000000
--- a/www-apps/redmine/redmine-3.2.7-r1.ebuild
+++ /dev/null
@@ -1,215 +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"
-inherit eutils depend.apache ruby-ng user
-
-DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
-HOMEPAGE="http://www.redmine.org/"
-SRC_URI="http://www.redmine.org/releases/${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2"
-SLOT="0"
-# All db-related USEs are ineffective since we depend on rails
-# which depends on activerecord which depends on all ruby's db bindings
-#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
-IUSE="ldap fastcgi passenger imagemagick"
-
-ruby_add_rdepend "
-	dev-ruby/rubygems
-	>=dev-ruby/rails-4.2.5.2:4.2
-	>=dev-ruby/jquery-rails-3.1.4:3
-	>=dev-ruby/coderay-1.1.0
-	>=dev-ruby/builder-3.0.4:*
-	>=dev-ruby/roadie-rails-1.1.0
-	dev-ruby/mime-types:*
-	=dev-ruby/request_store-1.0.5
-	>=dev-ruby/rbpdf-1.19.0
-	dev-ruby/actionpack-action_caching
-	dev-ruby/actionpack-xml_parser:0
-	dev-ruby/protected_attributes
-	>=dev-ruby/redcarpet-3.3.2
-	>=dev-ruby/nokogiri-1.6.7.2
-	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
-	>=dev-ruby/ruby-openid-2.3.0
-	>=dev-ruby/rack-openid-0.2.1
-	fastcgi? ( dev-ruby/fcgi )
-	passenger? ( www-apache/passenger )
-	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )"
-	#	ruby_targets_ruby19? (
-#		postgres? ( >=dev-ruby/pg-0.11 )
-#		sqlite3? ( dev-ruby/sqlite3 )
-#		mysql? ( dev-ruby/mysql2:0.3 )
-#	)
-
-#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
-#	dev-ruby/yard
-#	test? (
-#		>=dev-ruby/shoulda-3.3.2
-#		>=dev-ruby/mocha-0.13.3
-#		>=dev-ruby/capybara-2.0.0
-#		<dev-ruby/nokogiri-1.6.0
-#	)"
-
-REDMINE_DIR="/var/lib/${PN}"
-
-pkg_setup() {
-	enewgroup redmine
-	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
-}
-
-all_ruby_prepare() {
-	rm -r log files/delete.me || die
-
-	# bug #406605
-	rm .gitignore .hgignore || die
-
-	rm Gemfile || die
-
-	echo "CONFIG_PROTECT=\"${EPREFIX}${REDMINE_DIR}/config\"" > "${T}/50${PN}"
-	echo "CONFIG_PROTECT_MASK=\"${EPREFIX}${REDMINE_DIR}/config/locales ${EPREFIX}${REDMINE_DIR}/config/settings.yml\"" >> "${T}/50${PN}"
-
-	# remove ldap staff module if disabled to avoid #413779
-	use ldap || rm app/models/auth_source_ldap.rb || die
-
-	# Make it work
-	sed -i -e "1irequire 'request_store'" app/controllers/application_controller.rb || die
-	sed -i -e "18irequire 'action_controller'" -e "19irequire 'action_controller/action_caching'"\
-		app/controllers/welcome_controller.rb || die
-	sed -i -e "4irequire 'action_dispatch/xml_params_parser'" -e "/Bundler/d" config/application.rb || die
-	sed -i -e "18irequire 'protected_attributes'" app/models/custom_field.rb || die
-	sed -i -e "19irequire 'roadie-rails'" app/models/mailer.rb || die
-}
-
-all_ruby_install() {
-	dodoc doc/{CHANGELOG,INSTALL,README_FOR_APP,RUNNING_TESTS,UPGRADING}
-	rm -r doc || die
-	dodoc README.rdoc
-	rm README.rdoc || die
-
-	keepdir /var/log/${PN}
-
-	insinto "${REDMINE_DIR}"
-	doins -r .
-	insinto "${REDMINE_DIR}/config"
-	doins "${FILESDIR}/additional_environment.rb"
-	keepdir "${REDMINE_DIR}/files"
-	keepdir "${REDMINE_DIR}/public/plugin_assets"
-
-	fowners -R redmine:redmine \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/public/plugin_assets" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN}
-
-	fowners redmine:redmine "${REDMINE_DIR}"
-
-	# protect sensitive data, see bug #406605
-	fperms -R go-rwx \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN}
-
-	if use passenger; then
-		has_apache
-		insinto "${APACHE_VHOSTS_CONFDIR}"
-		doins "${FILESDIR}/10_redmine_vhost.conf"
-	fi
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/redmine.logrotate redmine
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
-	doenvd "${T}/50${PN}"
-}
-
-pkg_postinst() {
-	einfo
-	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" -o -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ]; then
-		elog "Execute the following command to upgrade environment:"
-		elog
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "For upgrade instructions take a look at:"
-		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
-	else
-		elog "Execute the following command to initialize environment:"
-		elog
-		elog "# cd ${EPREFIX}${REDMINE_DIR}"
-		elog "# cp config/database.yml.example config/database.yml"
-		elog "# \${EDITOR} config/database.yml"
-		elog "# chown redmine:redmine config/database.yml"
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "Installation notes are at official site"
-		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
-	fi
-	einfo
-}
-
-pkg_config() {
-	if [ ! -e "${EPREFIX}${REDMINE_DIR}/config/database.yml" ]; then
-		eerror "Copy ${EPREFIX}${REDMINE_DIR}/config/database.yml.example to ${EPREFIX}${REDMINE_DIR}/config/database.yml"
-		eerror "then edit this file in order to configure your database settings for \"production\" environment."
-		die
-	fi
-
-	local RAILS_ENV=${RAILS_ENV:-production}
-	if [ ! -L /usr/bin/ruby ]; then
-		eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation."
-		eerror "Please update it via `eselect ruby`"
-		die
-	fi
-	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]; then
-		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets: ${RUBY_TARGETS}."
-		eerror "Please update it via `eselect ruby`"
-		die
-	fi
-	local RUBY=${RUBY:-ruby}
-
-	cd "${EPREFIX}${REDMINE_DIR}" || die
-	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" ]; then
-		einfo
-		einfo "Generating secret token."
-		einfo
-		rm config/initializers/session_store.rb || die
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
-	fi
-	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ]; then
-		einfo
-		einfo "Upgrading database."
-		einfo
-
-		einfo "Migrating database."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Upgrading the plugin migrations."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
-		einfo "Clear the cache and the existing sessions."
-		${RUBY} -S rake tmp:cache:clear || die
-		${RUBY} -S rake tmp:sessions:clear || die
-	else
-		einfo
-		einfo "Initializing database."
-		einfo
-
-		einfo "Generating a session store secret."
-		${RUBY} -S rake generate_secret_token || die
-		einfo "Creating the database structure."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Populating database with default configuration data."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
-		chown redmine:redmine "${EPREFIX}${REDMINE_DIR}"/log/production.log
-		einfo
-		einfo "If you use sqlite3, please do not forget to change the ownership of the sqlite files."
-		einfo
-		einfo "# cd \"${EPREFIX}${REDMINE_DIR}\""
-		einfo "# chown redmine:redmine db/ db/*.sqlite3"
-		einfo
-	fi
-}
diff --git a/www-apps/redmine/redmine-3.2.7.ebuild b/www-apps/redmine/redmine-3.2.7.ebuild
deleted file mode 100644
index 5c7f032e6273..000000000000
--- a/www-apps/redmine/redmine-3.2.7.ebuild
+++ /dev/null
@@ -1,215 +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"
-inherit eutils depend.apache ruby-ng user
-
-DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
-HOMEPAGE="http://www.redmine.org/"
-SRC_URI="http://www.redmine.org/releases/${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2"
-SLOT="0"
-# All db-related USEs are ineffective since we depend on rails
-# which depends on activerecord which depends on all ruby's db bindings
-#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
-IUSE="ldap fastcgi passenger imagemagick"
-
-ruby_add_rdepend "
-	dev-ruby/rubygems
-	>=dev-ruby/rails-4.2.5.2:4.2
-	>=dev-ruby/jquery-rails-3.1.4:3
-	>=dev-ruby/coderay-1.1.0
-	>=dev-ruby/builder-3.0.4:*
-	>=dev-ruby/roadie-rails-1.1.0
-	dev-ruby/mime-types:*
-	=dev-ruby/request_store-1.0.5
-	>=dev-ruby/rbpdf-1.19.0
-	dev-ruby/actionpack-action_caching
-	dev-ruby/actionpack-xml_parser:*
-	dev-ruby/protected_attributes
-	>=dev-ruby/redcarpet-3.3.2
-	>=dev-ruby/nokogiri-1.6.7.2
-	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
-	>=dev-ruby/ruby-openid-2.3.0
-	>=dev-ruby/rack-openid-0.2.1
-	fastcgi? ( dev-ruby/fcgi )
-	passenger? ( www-apache/passenger )
-	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )"
-	#	ruby_targets_ruby19? (
-#		postgres? ( >=dev-ruby/pg-0.11 )
-#		sqlite3? ( dev-ruby/sqlite3 )
-#		mysql? ( dev-ruby/mysql2:0.3 )
-#	)
-
-#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
-#	dev-ruby/yard
-#	test? (
-#		>=dev-ruby/shoulda-3.3.2
-#		>=dev-ruby/mocha-0.13.3
-#		>=dev-ruby/capybara-2.0.0
-#		<dev-ruby/nokogiri-1.6.0
-#	)"
-
-REDMINE_DIR="/var/lib/${PN}"
-
-pkg_setup() {
-	enewgroup redmine
-	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
-}
-
-all_ruby_prepare() {
-	rm -r log files/delete.me || die
-
-	# bug #406605
-	rm .gitignore .hgignore || die
-
-	rm Gemfile || die
-
-	echo "CONFIG_PROTECT=\"${EPREFIX}${REDMINE_DIR}/config\"" > "${T}/50${PN}"
-	echo "CONFIG_PROTECT_MASK=\"${EPREFIX}${REDMINE_DIR}/config/locales ${EPREFIX}${REDMINE_DIR}/config/settings.yml\"" >> "${T}/50${PN}"
-
-	# remove ldap staff module if disabled to avoid #413779
-	use ldap || rm app/models/auth_source_ldap.rb || die
-
-	# Make it work
-	sed -i -e "1irequire 'request_store'" app/controllers/application_controller.rb || die
-	sed -i -e "18irequire 'action_controller'" -e "19irequire 'action_controller/action_caching'"\
-		app/controllers/welcome_controller.rb || die
-	sed -i -e "4irequire 'action_dispatch/xml_params_parser'" -e "/Bundler/d" config/application.rb || die
-	sed -i -e "18irequire 'protected_attributes'" app/models/custom_field.rb || die
-	sed -i -e "19irequire 'roadie-rails'" app/models/mailer.rb || die
-}
-
-all_ruby_install() {
-	dodoc doc/{CHANGELOG,INSTALL,README_FOR_APP,RUNNING_TESTS,UPGRADING}
-	rm -r doc || die
-	dodoc README.rdoc
-	rm README.rdoc || die
-
-	keepdir /var/log/${PN}
-
-	insinto "${REDMINE_DIR}"
-	doins -r .
-	insinto "${REDMINE_DIR}/config"
-	doins "${FILESDIR}/additional_environment.rb"
-	keepdir "${REDMINE_DIR}/files"
-	keepdir "${REDMINE_DIR}/public/plugin_assets"
-
-	fowners -R redmine:redmine \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/public/plugin_assets" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN}
-
-	fowners redmine:redmine "${REDMINE_DIR}"
-
-	# protect sensitive data, see bug #406605
-	fperms -R go-rwx \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN}
-
-	if use passenger; then
-		has_apache
-		insinto "${APACHE_VHOSTS_CONFDIR}"
-		doins "${FILESDIR}/10_redmine_vhost.conf"
-	fi
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/redmine.logrotate redmine
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
-	doenvd "${T}/50${PN}"
-}
-
-pkg_postinst() {
-	einfo
-	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" -o -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ]; then
-		elog "Execute the following command to upgrade environment:"
-		elog
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "For upgrade instructions take a look at:"
-		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
-	else
-		elog "Execute the following command to initialize environment:"
-		elog
-		elog "# cd ${EPREFIX}${REDMINE_DIR}"
-		elog "# cp config/database.yml.example config/database.yml"
-		elog "# \${EDITOR} config/database.yml"
-		elog "# chown redmine:redmine config/database.yml"
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "Installation notes are at official site"
-		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
-	fi
-	einfo
-}
-
-pkg_config() {
-	if [ ! -e "${EPREFIX}${REDMINE_DIR}/config/database.yml" ]; then
-		eerror "Copy ${EPREFIX}${REDMINE_DIR}/config/database.yml.example to ${EPREFIX}${REDMINE_DIR}/config/database.yml"
-		eerror "then edit this file in order to configure your database settings for \"production\" environment."
-		die
-	fi
-
-	local RAILS_ENV=${RAILS_ENV:-production}
-	if [ ! -L /usr/bin/ruby ]; then
-		eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation."
-		eerror "Please update it via `eselect ruby`"
-		die
-	fi
-	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]; then
-		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets: ${RUBY_TARGETS}."
-		eerror "Please update it via `eselect ruby`"
-		die
-	fi
-	local RUBY=${RUBY:-ruby}
-
-	cd "${EPREFIX}${REDMINE_DIR}" || die
-	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" ]; then
-		einfo
-		einfo "Generating secret token."
-		einfo
-		rm config/initializers/session_store.rb || die
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
-	fi
-	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ]; then
-		einfo
-		einfo "Upgrading database."
-		einfo
-
-		einfo "Migrating database."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Upgrading the plugin migrations."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
-		einfo "Clear the cache and the existing sessions."
-		${RUBY} -S rake tmp:cache:clear || die
-		${RUBY} -S rake tmp:sessions:clear || die
-	else
-		einfo
-		einfo "Initializing database."
-		einfo
-
-		einfo "Generating a session store secret."
-		${RUBY} -S rake generate_secret_token || die
-		einfo "Creating the database structure."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Populating database with default configuration data."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
-		chown redmine:redmine "${EPREFIX}${REDMINE_DIR}"/log/production.log
-		einfo
-		einfo "If you use sqlite3, please do not forget to change the ownership of the sqlite files."
-		einfo
-		einfo "# cd \"${EPREFIX}${REDMINE_DIR}\""
-		einfo "# chown redmine:redmine db/ db/*.sqlite3"
-		einfo
-	fi
-}
diff --git a/www-apps/redmine/redmine-3.2.8.ebuild b/www-apps/redmine/redmine-3.2.8.ebuild
new file mode 100644
index 000000000000..c0bd7c7e880f
--- /dev/null
+++ b/www-apps/redmine/redmine-3.2.8.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23"
+inherit eutils depend.apache ruby-ng user
+
+DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
+HOMEPAGE="http://www.redmine.org/"
+SRC_URI="http://www.redmine.org/releases/${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+# All db-related USEs are ineffective since we depend on rails
+# which depends on activerecord which depends on all ruby's db bindings
+#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
+IUSE="ldap fastcgi passenger imagemagick"
+
+ruby_add_rdepend "
+	dev-ruby/rubygems
+	>=dev-ruby/rails-4.2.5.2:4.2
+	>=dev-ruby/jquery-rails-3.1.4:3
+	>=dev-ruby/coderay-1.1.0
+	>=dev-ruby/builder-3.0.4:*
+	>=dev-ruby/roadie-rails-1.1.0
+	dev-ruby/mime-types:*
+	=dev-ruby/request_store-1.0.5
+	>=dev-ruby/rbpdf-1.19.0
+	dev-ruby/actionpack-action_caching
+	dev-ruby/actionpack-xml_parser:0
+	dev-ruby/protected_attributes
+	>=dev-ruby/redcarpet-3.3.2
+	>=dev-ruby/nokogiri-1.6.7.2
+	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
+	>=dev-ruby/ruby-openid-2.3.0
+	>=dev-ruby/rack-openid-0.2.1
+	fastcgi? ( dev-ruby/fcgi )
+	passenger? ( www-apache/passenger )
+	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )"
+	#	ruby_targets_ruby19? (
+#		postgres? ( >=dev-ruby/pg-0.11 )
+#		sqlite3? ( dev-ruby/sqlite3 )
+#		mysql? ( dev-ruby/mysql2:0.3 )
+#	)
+
+#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
+#	dev-ruby/yard
+#	test? (
+#		>=dev-ruby/shoulda-3.3.2
+#		>=dev-ruby/mocha-0.13.3
+#		>=dev-ruby/capybara-2.0.0
+#		<dev-ruby/nokogiri-1.6.0
+#	)"
+
+REDMINE_DIR="/var/lib/${PN}"
+
+pkg_setup() {
+	enewgroup redmine
+	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
+}
+
+all_ruby_prepare() {
+	rm -r log files/delete.me Gemfile || die
+
+	# bug #406605
+	rm .{git,hg}ignore || die
+
+	echo "CONFIG_PROTECT=\"${EPREFIX}${REDMINE_DIR}/config\"" > "${T}/50${PN}"
+	echo "CONFIG_PROTECT_MASK=\"${EPREFIX}${REDMINE_DIR}/config/locales ${EPREFIX}${REDMINE_DIR}/config/settings.yml\"" >> "${T}/50${PN}"
+
+	# remove ldap staff module if disabled to avoid #413779
+	use ldap || rm app/models/auth_source_ldap.rb || die
+
+	# Make it work
+	sed -i -e "1irequire 'request_store'" app/controllers/application_controller.rb || die
+	sed -i -e "18irequire 'action_controller'" -e "19irequire 'action_controller/action_caching'"\
+		app/controllers/welcome_controller.rb || die
+	sed -i -e "4irequire 'action_dispatch/xml_params_parser'" -e "/Bundler/d" config/application.rb || die
+	sed -i -e "18irequire 'protected_attributes'" app/models/custom_field.rb || die
+	sed -i -e "19irequire 'roadie-rails'" app/models/mailer.rb || die
+}
+
+all_ruby_install() {
+	dodoc doc/{CHANGELOG,INSTALL,README_FOR_APP,RUNNING_TESTS,UPGRADING}
+	rm -r doc || die
+	dodoc README.rdoc
+	rm README.rdoc || die
+
+	keepdir /var/log/${PN}
+
+	insinto "${REDMINE_DIR}"
+	doins -r .
+	insinto "${REDMINE_DIR}/config"
+	doins "${FILESDIR}/additional_environment.rb"
+	keepdir "${REDMINE_DIR}/files"
+	keepdir "${REDMINE_DIR}/public/plugin_assets"
+
+	fowners -R redmine:redmine \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/public/plugin_assets" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	fowners redmine:redmine "${REDMINE_DIR}"
+
+	# protect sensitive data, see bug #406605
+	fperms -R go-rwx \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	if use passenger; then
+		has_apache
+		insinto "${APACHE_VHOSTS_CONFDIR}"
+		doins "${FILESDIR}/10_redmine_vhost.conf"
+	fi
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/redmine.logrotate redmine
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
+	doenvd "${T}/50${PN}"
+}
+
+pkg_postinst() {
+	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" -o -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ]; then
+		elog "Execute the following command to upgrade environment:"
+		elog
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "For upgrade instructions take a look at:"
+		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
+	else
+		elog "Execute the following command to initialize environment:"
+		elog
+		elog "# cd ${EPREFIX}${REDMINE_DIR}"
+		elog "# cp config/database.yml.example config/database.yml"
+		elog "# \${EDITOR} config/database.yml"
+		elog "# chown redmine:redmine config/database.yml"
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "Installation notes are at official site"
+		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
+	fi
+}
+
+pkg_config() {
+	if [ ! -e "${EPREFIX}${REDMINE_DIR}/config/database.yml" ]; then
+		eerror "Copy ${EPREFIX}${REDMINE_DIR}/config/database.yml.example to ${EPREFIX}${REDMINE_DIR}/config/database.yml"
+		eerror "then edit this file in order to configure your database settings for \"production\" environment."
+		die
+	fi
+
+	local RAILS_ENV=${RAILS_ENV:-production}
+	if [ ! -L /usr/bin/ruby ]; then
+		eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]; then
+		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets: ${RUBY_TARGETS}."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	local RUBY=${RUBY:-ruby}
+
+	cd "${EPREFIX}${REDMINE_DIR}" || die
+	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" ]; then
+		einfo
+		einfo "Generating secret token."
+		einfo
+		rm config/initializers/session_store.rb || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
+	fi
+	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ]; then
+		einfo
+		einfo "Upgrading database."
+		einfo
+
+		einfo "Migrating database."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
+		einfo "Upgrading the plugin migrations."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
+		einfo "Clear the cache and the existing sessions."
+		${RUBY} -S rake tmp:cache:clear || die
+		${RUBY} -S rake tmp:sessions:clear || die
+	else
+		einfo
+		einfo "Initializing database."
+		einfo
+
+		einfo "Generating a session store secret."
+		${RUBY} -S rake generate_secret_token || die
+		einfo "Creating the database structure."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
+		einfo "Populating database with default configuration data."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
+		chown redmine:redmine "${EPREFIX}${REDMINE_DIR}"/log/production.log
+		einfo
+		einfo "If you use sqlite3, please do not forget to change the ownership of the sqlite files."
+		einfo
+		einfo "# cd \"${EPREFIX}${REDMINE_DIR}\""
+		einfo "# chown redmine:redmine db/ db/*.sqlite3"
+		einfo
+	fi
+}
diff --git a/www-apps/redmine/redmine-3.3.4-r1.ebuild b/www-apps/redmine/redmine-3.3.4-r1.ebuild
deleted file mode 100644
index 113a62483531..000000000000
--- a/www-apps/redmine/redmine-3.3.4-r1.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-# ruby24 don't have required deps
-USE_RUBY="ruby22 ruby23"
-inherit eutils depend.apache ruby-ng user
-
-DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
-HOMEPAGE="http://www.redmine.org/"
-SRC_URI="http://www.redmine.org/releases/${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2"
-SLOT="0"
-# All db-related USEs are ineffective since we depend on rails
-# which depends on activerecord which depends on all ruby's db bindings
-#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
-IUSE="imagemagick fastcgi ldap markdown passenger"
-
-ruby_add_rdepend "
-	dev-ruby/actionpack-action_caching
-	dev-ruby/actionpack-xml_parser:0
-	>=dev-ruby/builder-3.2.2:3.2
-	>=dev-ruby/coderay-1.1.0
-	dev-ruby/i18n:0.7
-	>=dev-ruby/jquery-rails-3.1.4:3
-	dev-ruby/loofah
-	dev-ruby/mime-types:*
-	dev-ruby/mimemagic
-	>=dev-ruby/nokogiri-1.6.8
-	dev-ruby/protected_attributes
-	>=dev-ruby/rack-openid-0.2.1
-	>=dev-ruby/rails-4.2.5.2:4.2
-	>=dev-ruby/rails-html-sanitizer-1.0.3
-	dev-ruby/request_store:1.0.5
-	>=dev-ruby/roadie-rails-1.1.0
-	>=dev-ruby/rbpdf-1.19.2
-	>=dev-ruby/ruby-openid-2.3.0
-	dev-ruby/rubygems
-	fastcgi? ( dev-ruby/fcgi )
-	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )
-	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
-	markdown? ( >=dev-ruby/redcarpet-3.3.2 )
-	passenger? ( www-apache/passenger )
-	"
-# TODO add USE doc and test
-#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
-#	dev-ruby/yard
-#	test? (
-#		>=dev-ruby/shoulda-3.3.2
-#		>=dev-ruby/mocha-0.13.3
-#		>=dev-ruby/capybara-2.0.0
-#	)"
-
-REDMINE_DIR="/var/lib/${PN}"
-
-pkg_setup() {
-	enewgroup redmine
-	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
-}
-
-all_ruby_prepare() {
-	rm -r log files/delete.me Gemfile || die
-
-	# bug #406605
-	rm .{git,hg}ignore || die
-
-	cat > "${T}/50${PN}" <<-EOF || die
-		CONFIG_PROTECT="${EROOT%/}${REDMINE_DIR}/config"
-		CONFIG_PROTECT_MASK="${EROOT%/}${REDMINE_DIR}/config/locales ${EROOT%/}${REDMINE_DIR}/config/settings.yml"
-	EOF
-
-	# remove ldap staff module if disabled to avoid #413779
-	use ldap || rm app/models/auth_source_ldap.rb || die
-
-	eapply "${FILESDIR}/${P}_requires.patch"
-}
-
-all_ruby_install() {
-	dodoc doc/* README.rdoc
-	rm -r doc appveyor.yml CONTRIBUTING.md README.rdoc || die
-
-	keepdir /var/log/${PN}
-
-	insinto "${REDMINE_DIR}"
-	doins -r .
-	insinto "${REDMINE_DIR}/config"
-	doins "${FILESDIR}/additional_environment.rb"
-	keepdir "${REDMINE_DIR}/files"
-	keepdir "${REDMINE_DIR}/public/plugin_assets"
-
-	fowners -R redmine:redmine \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/public/plugin_assets" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN}
-
-	fowners redmine:redmine "${REDMINE_DIR}"
-
-	# protect sensitive data, see bug #406605
-	fperms -R go-rwx \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN}
-
-	if use passenger; then
-		has_apache
-		insinto "${APACHE_VHOSTS_CONFDIR}"
-		doins "${FILESDIR}/10_redmine_vhost.conf"
-	fi
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/redmine.logrotate redmine
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
-	doenvd "${T}/50${PN}"
-}
-
-pkg_postinst() {
-	einfo
-	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" \
-	|| -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
-	then
-		elog "Execute the following command to upgrade environment:"
-		elog
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "For upgrade instructions take a look at:"
-		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
-	else
-		elog "Execute the following command to initialize environment:"
-		elog
-		elog "# cd ${EROOT%/}${REDMINE_DIR}"
-		elog "# cp config/database.yml.example config/database.yml"
-		elog "# \${EDITOR} config/database.yml"
-		elog "# chown redmine:redmine config/database.yml"
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "Installation notes are at official site"
-		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
-	fi
-	einfo
-}
-
-pkg_config() {
-	if [[ ! -e "${EROOT%/}${REDMINE_DIR}/config/database.yml" ]]; then
-		eerror "Copy ${EROOT%/}${REDMINE_DIR}/config/database.yml.example to"
-		eerror "${EROOT%/}${REDMINE_DIR}/config/database.yml then edit this"
-		eerror "file in order to configure your database settings for"
-		eerror "\"production\" environment."
-		die
-	fi
-
-	local RAILS_ENV=${RAILS_ENV:-production}
-	if [[ ! -L /usr/bin/ruby ]]; then
-		eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation."
-		eerror "Please update it via `eselect ruby`"
-		die
-	fi
-	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]
-	then
-		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets:"
-		eerror "${RUBY_TARGETS}."
-		eerror "Please update it via `eselect ruby`"
-		die
-	fi
-	local RUBY=${RUBY:-ruby}
-
-	cd "${EROOT%/}${REDMINE_DIR}" || die
-	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" ]]
-	then
-		einfo
-		einfo "Generating secret token."
-		einfo
-		rm config/initializers/session_store.rb || die
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
-	fi
-	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
-	then
-		einfo
-		einfo "Upgrading database."
-		einfo
-
-		einfo "Generating secret token."
-		# Migration from Redmine 2.x
-		rm config/initializers/secret_token.rb || die
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
-
-		einfo "Migrating database."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Upgrading the plugin migrations."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
-		einfo "Clear the cache and the existing sessions."
-		${RUBY} -S rake tmp:cache:clear || die
-		${RUBY} -S rake tmp:sessions:clear || die
-	else
-		einfo
-		einfo "Initializing database."
-		einfo
-
-		einfo "Generating a session store secret."
-		${RUBY} -S rake generate_secret_token || die
-		einfo "Creating the database structure."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Populating database with default configuration data."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
-		chown redmine:redmine "${EROOT%/}var/log/redmine/*.log" || die
-		einfo
-		einfo "If you use sqlite3, please do not forget to change the ownership"
-		einfo "of the sqlite files."
-		einfo
-		einfo "# cd \"${EROOT%/}${REDMINE_DIR}\""
-		einfo "# chown redmine:redmine db/ db/*.sqlite3"
-		einfo
-	fi
-}
diff --git a/www-apps/redmine/redmine-3.3.4.ebuild b/www-apps/redmine/redmine-3.3.4.ebuild
deleted file mode 100644
index b65197f8bc20..000000000000
--- a/www-apps/redmine/redmine-3.3.4.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-# ruby24 don't have required deps
-USE_RUBY="ruby22 ruby23"
-inherit eutils depend.apache ruby-ng user
-
-DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
-HOMEPAGE="http://www.redmine.org/"
-SRC_URI="http://www.redmine.org/releases/${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2"
-SLOT="0"
-# All db-related USEs are ineffective since we depend on rails
-# which depends on activerecord which depends on all ruby's db bindings
-#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
-IUSE="imagemagick fastcgi ldap markdown passenger"
-
-ruby_add_rdepend "
-	dev-ruby/actionpack-action_caching
-	dev-ruby/actionpack-xml_parser:*
-	>=dev-ruby/builder-3.2.2:3.2
-	>=dev-ruby/coderay-1.1.0
-	dev-ruby/i18n:0.7
-	>=dev-ruby/jquery-rails-3.1.4:3
-	dev-ruby/loofah
-	dev-ruby/mime-types:*
-	dev-ruby/mimemagic
-	>=dev-ruby/nokogiri-1.6.8
-	dev-ruby/protected_attributes
-	>=dev-ruby/rack-openid-0.2.1
-	>=dev-ruby/rails-4.2.5.2:4.2
-	>=dev-ruby/rails-html-sanitizer-1.0.3
-	dev-ruby/request_store:1.0.5
-	>=dev-ruby/roadie-rails-1.1.0
-	>=dev-ruby/rbpdf-1.19.2
-	>=dev-ruby/ruby-openid-2.3.0
-	dev-ruby/rubygems
-	fastcgi? ( dev-ruby/fcgi )
-	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )
-	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
-	markdown? ( >=dev-ruby/redcarpet-3.3.2 )
-	passenger? ( www-apache/passenger )
-	"
-# TODO add USE doc and test
-#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
-#	dev-ruby/yard
-#	test? (
-#		>=dev-ruby/shoulda-3.3.2
-#		>=dev-ruby/mocha-0.13.3
-#		>=dev-ruby/capybara-2.0.0
-#	)"
-
-REDMINE_DIR="/var/lib/${PN}"
-
-pkg_setup() {
-	enewgroup redmine
-	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
-}
-
-all_ruby_prepare() {
-	rm -r log files/delete.me Gemfile || die
-
-	# bug #406605
-	rm .{git,hg}ignore || die
-
-	cat > "${T}/50${PN}" <<-EOF || die
-		CONFIG_PROTECT="${EROOT%/}${REDMINE_DIR}/config"
-		CONFIG_PROTECT_MASK="${EROOT%/}${REDMINE_DIR}/config/locales ${EROOT%/}${REDMINE_DIR}/config/settings.yml"
-	EOF
-
-	# remove ldap staff module if disabled to avoid #413779
-	use ldap || rm app/models/auth_source_ldap.rb || die
-
-	eapply "${FILESDIR}/${P}_requires.patch"
-}
-
-all_ruby_install() {
-	dodoc doc/* README.rdoc
-	rm -r doc appveyor.yml CONTRIBUTING.md README.rdoc || die
-
-	keepdir /var/log/${PN}
-
-	insinto "${REDMINE_DIR}"
-	doins -r .
-	insinto "${REDMINE_DIR}/config"
-	doins "${FILESDIR}/additional_environment.rb"
-	keepdir "${REDMINE_DIR}/files"
-	keepdir "${REDMINE_DIR}/public/plugin_assets"
-
-	fowners -R redmine:redmine \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/public/plugin_assets" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN}
-
-	fowners redmine:redmine "${REDMINE_DIR}"
-
-	# protect sensitive data, see bug #406605
-	fperms -R go-rwx \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN}
-
-	if use passenger; then
-		has_apache
-		insinto "${APACHE_VHOSTS_CONFDIR}"
-		doins "${FILESDIR}/10_redmine_vhost.conf"
-	fi
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/redmine.logrotate redmine
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
-	doenvd "${T}/50${PN}"
-}
-
-pkg_postinst() {
-	einfo
-	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" \
-	|| -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
-	then
-		elog "Execute the following command to upgrade environment:"
-		elog
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "For upgrade instructions take a look at:"
-		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
-	else
-		elog "Execute the following command to initialize environment:"
-		elog
-		elog "# cd ${EROOT%/}${REDMINE_DIR}"
-		elog "# cp config/database.yml.example config/database.yml"
-		elog "# \${EDITOR} config/database.yml"
-		elog "# chown redmine:redmine config/database.yml"
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "Installation notes are at official site"
-		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
-	fi
-	einfo
-}
-
-pkg_config() {
-	if [[ ! -e "${EROOT%/}${REDMINE_DIR}/config/database.yml" ]]; then
-		eerror "Copy ${EROOT%/}${REDMINE_DIR}/config/database.yml.example to"
-		eerror "${EROOT%/}${REDMINE_DIR}/config/database.yml then edit this"
-		eerror "file in order to configure your database settings for"
-		eerror "\"production\" environment."
-		die
-	fi
-
-	local RAILS_ENV=${RAILS_ENV:-production}
-	if [[ ! -L /usr/bin/ruby ]]; then
-		eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation."
-		eerror "Please update it via `eselect ruby`"
-		die
-	fi
-	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]
-	then
-		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets:"
-		eerror "${RUBY_TARGETS}."
-		eerror "Please update it via `eselect ruby`"
-		die
-	fi
-	local RUBY=${RUBY:-ruby}
-
-	cd "${EROOT%/}${REDMINE_DIR}" || die
-	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" ]]
-	then
-		einfo
-		einfo "Generating secret token."
-		einfo
-		rm config/initializers/session_store.rb || die
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
-	fi
-	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
-	then
-		einfo
-		einfo "Upgrading database."
-		einfo
-
-		einfo "Generating secret token."
-		# Migration from Redmine 2.x
-		rm config/initializers/secret_token.rb || die
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
-
-		einfo "Migrating database."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Upgrading the plugin migrations."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
-		einfo "Clear the cache and the existing sessions."
-		${RUBY} -S rake tmp:cache:clear || die
-		${RUBY} -S rake tmp:sessions:clear || die
-	else
-		einfo
-		einfo "Initializing database."
-		einfo
-
-		einfo "Generating a session store secret."
-		${RUBY} -S rake generate_secret_token || die
-		einfo "Creating the database structure."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Populating database with default configuration data."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
-		chown redmine:redmine "${EROOT%/}var/log/redmine/*.log" || die
-		einfo
-		einfo "If you use sqlite3, please do not forget to change the ownership"
-		einfo "of the sqlite files."
-		einfo
-		einfo "# cd \"${EROOT%/}${REDMINE_DIR}\""
-		einfo "# chown redmine:redmine db/ db/*.sqlite3"
-		einfo
-	fi
-}
diff --git a/www-apps/redmine/redmine-3.3.5.ebuild b/www-apps/redmine/redmine-3.3.5.ebuild
new file mode 100644
index 000000000000..80dcfc032480
--- /dev/null
+++ b/www-apps/redmine/redmine-3.3.5.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+# ruby24 don't have required deps
+USE_RUBY="ruby22 ruby23"
+inherit eutils depend.apache ruby-ng user
+
+DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
+HOMEPAGE="http://www.redmine.org/"
+SRC_URI="http://www.redmine.org/releases/${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+# All db-related USEs are ineffective since we depend on rails
+# which depends on activerecord which depends on all ruby's db bindings
+#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
+IUSE="imagemagick fastcgi ldap markdown passenger"
+
+ruby_add_rdepend "
+	dev-ruby/actionpack-action_caching
+	dev-ruby/actionpack-xml_parser:0
+	>=dev-ruby/builder-3.2.2:3.2
+	>=dev-ruby/coderay-1.1.0
+	dev-ruby/i18n:0.7
+	>=dev-ruby/jquery-rails-3.1.4:3
+	dev-ruby/loofah
+	dev-ruby/mime-types:*
+	dev-ruby/mimemagic
+	>=dev-ruby/nokogiri-1.6.8
+	dev-ruby/protected_attributes
+	>=dev-ruby/rack-openid-0.2.1
+	>=dev-ruby/rails-4.2.5.2:4.2
+	>=dev-ruby/rails-html-sanitizer-1.0.3
+	dev-ruby/request_store:1.0.5
+	>=dev-ruby/roadie-rails-1.1.0
+	>=dev-ruby/rbpdf-1.19.2
+	>=dev-ruby/ruby-openid-2.3.0
+	dev-ruby/rubygems
+	fastcgi? ( dev-ruby/fcgi )
+	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )
+	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
+	markdown? ( >=dev-ruby/redcarpet-3.3.2 )
+	passenger? ( www-apache/passenger )
+	"
+# TODO add USE doc and test
+#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
+#	dev-ruby/yard
+#	test? (
+#		>=dev-ruby/shoulda-3.3.2
+#		>=dev-ruby/mocha-0.13.3
+#		>=dev-ruby/capybara-2.0.0
+#	)"
+
+REDMINE_DIR="/var/lib/${PN}"
+
+pkg_setup() {
+	enewgroup redmine
+	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
+}
+
+all_ruby_prepare() {
+	rm -r log files/delete.me Gemfile || die
+
+	# bug #406605
+	rm .{git,hg}ignore || die
+
+	cat > "${T}/50${PN}" <<-EOF || die
+		CONFIG_PROTECT="${EROOT%/}${REDMINE_DIR}/config"
+		CONFIG_PROTECT_MASK="${EROOT%/}${REDMINE_DIR}/config/locales ${EROOT%/}${REDMINE_DIR}/config/settings.yml"
+	EOF
+
+	# remove ldap staff module if disabled to avoid #413779
+	use ldap || rm app/models/auth_source_ldap.rb || die
+
+	eapply "${FILESDIR}/${P}_requires.patch"
+}
+
+all_ruby_install() {
+	dodoc doc/* README.rdoc
+	rm -r doc appveyor.yml CONTRIBUTING.md README.rdoc || die
+
+	keepdir /var/log/${PN}
+
+	insinto "${REDMINE_DIR}"
+	doins -r .
+	insinto "${REDMINE_DIR}/config"
+	doins "${FILESDIR}/additional_environment.rb"
+	keepdir "${REDMINE_DIR}/files"
+	keepdir "${REDMINE_DIR}/public/plugin_assets"
+
+	fowners -R redmine:redmine \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/public/plugin_assets" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	fowners redmine:redmine "${REDMINE_DIR}"
+
+	# protect sensitive data, see bug #406605
+	fperms -R go-rwx \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	if use passenger; then
+		has_apache
+		insinto "${APACHE_VHOSTS_CONFDIR}"
+		doins "${FILESDIR}/10_redmine_vhost.conf"
+	fi
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/redmine.logrotate redmine
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
+	doenvd "${T}/50${PN}"
+}
+
+pkg_postinst() {
+	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" \
+	|| -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
+	then
+		elog "Execute the following command to upgrade environment:"
+		elog
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "For upgrade instructions take a look at:"
+		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
+	else
+		elog "Execute the following command to initialize environment:"
+		elog
+		elog "# cd ${EROOT%/}${REDMINE_DIR}"
+		elog "# cp config/database.yml.example config/database.yml"
+		elog "# \${EDITOR} config/database.yml"
+		elog "# chown redmine:redmine config/database.yml"
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "Installation notes are at official site"
+		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
+	fi
+}
+
+pkg_config() {
+	if [[ ! -e "${EROOT%/}${REDMINE_DIR}/config/database.yml" ]]; then
+		eerror "Copy ${EROOT%/}${REDMINE_DIR}/config/database.yml.example to"
+		eerror "${EROOT%/}${REDMINE_DIR}/config/database.yml then edit this"
+		eerror "file in order to configure your database settings for"
+		eerror "\"production\" environment."
+		die
+	fi
+
+	local RAILS_ENV=${RAILS_ENV:-production}
+	if [[ ! -L /usr/bin/ruby ]]; then
+		eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]
+	then
+		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets:"
+		eerror "${RUBY_TARGETS}."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	local RUBY=${RUBY:-ruby}
+
+	cd "${EROOT%/}${REDMINE_DIR}" || die
+	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" ]]
+	then
+		einfo
+		einfo "Generating secret token."
+		einfo
+		rm config/initializers/session_store.rb || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
+	fi
+	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
+	then
+		einfo
+		einfo "Upgrading database."
+		einfo
+
+		einfo "Generating secret token."
+		# Migration from Redmine 2.x
+		rm config/initializers/secret_token.rb || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
+
+		einfo "Migrating database."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
+		einfo "Upgrading the plugin migrations."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
+		einfo "Clear the cache and the existing sessions."
+		${RUBY} -S rake tmp:cache:clear || die
+		${RUBY} -S rake tmp:sessions:clear || die
+	else
+		einfo
+		einfo "Initializing database."
+		einfo
+
+		einfo "Generating a session store secret."
+		${RUBY} -S rake generate_secret_token || die
+		einfo "Creating the database structure."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
+		einfo "Populating database with default configuration data."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
+		chown redmine:redmine "${EROOT%/}var/log/redmine/*.log" || die
+		einfo
+		einfo "If you use sqlite3, please do not forget to change the ownership"
+		einfo "of the sqlite files."
+		einfo
+		einfo "# cd \"${EROOT%/}${REDMINE_DIR}\""
+		einfo "# chown redmine:redmine db/ db/*.sqlite3"
+		einfo
+	fi
+}
diff --git a/www-apps/redmine/redmine-3.4.2-r1.ebuild b/www-apps/redmine/redmine-3.4.2-r1.ebuild
deleted file mode 100644
index d50f5c1e5135..000000000000
--- a/www-apps/redmine/redmine-3.4.2-r1.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-# ruby24 don't have required deps
-USE_RUBY="ruby22 ruby23"
-inherit eutils depend.apache ruby-ng user
-
-DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
-HOMEPAGE="http://www.redmine.org/"
-SRC_URI="http://www.redmine.org/releases/${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2"
-SLOT="0"
-# All db-related USEs are ineffective since we depend on rails
-# which depends on activerecord which depends on all ruby's db bindings
-#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
-IUSE="imagemagick fastcgi ldap markdown passenger"
-
-ruby_add_rdepend "
-	dev-ruby/actionpack-action_caching
-	dev-ruby/actionpack-xml_parser:0
-	>=dev-ruby/builder-3.2.2:3.2
-	>=dev-ruby/coderay-1.1.0
-	dev-ruby/i18n:0.7
-	>=dev-ruby/jquery-rails-3.1.4:3
-	dev-ruby/loofah
-	dev-ruby/mime-types:*
-	dev-ruby/mimemagic
-	>=dev-ruby/nokogiri-1.6.8
-	dev-ruby/protected_attributes
-	>=dev-ruby/rack-openid-0.2.1
-	>=dev-ruby/rails-4.2.5.2:4.2
-	>=dev-ruby/rails-html-sanitizer-1.0.3
-	dev-ruby/request_store:1.0.5
-	>=dev-ruby/roadie-rails-1.1.0
-	>=dev-ruby/rbpdf-1.19.2
-	>=dev-ruby/ruby-openid-2.3.0
-	dev-ruby/rubygems
-	fastcgi? ( dev-ruby/fcgi )
-	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )
-	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
-	markdown? ( >=dev-ruby/redcarpet-3.3.2 )
-	passenger? ( www-apache/passenger )
-	"
-# TODO add USE doc and test
-#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
-#	dev-ruby/yard
-#	test? (
-#		>=dev-ruby/shoulda-3.3.2
-#		>=dev-ruby/mocha-0.13.3
-#		>=dev-ruby/capybara-2.0.0
-#	)"
-
-REDMINE_DIR="/var/lib/${PN}"
-
-pkg_setup() {
-	enewgroup redmine
-	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
-}
-
-all_ruby_prepare() {
-	rm -r log files/delete.me Gemfile || die
-
-	# bug #406605
-	rm .{git,hg}ignore || die
-
-	cat > "${T}/50${PN}" <<-EOF || die
-		CONFIG_PROTECT="${EROOT%/}${REDMINE_DIR}/config"
-		CONFIG_PROTECT_MASK="${EROOT%/}${REDMINE_DIR}/config/locales ${EROOT%/}${REDMINE_DIR}/config/settings.yml"
-	EOF
-
-	# remove ldap staff module if disabled to avoid #413779
-	use ldap || rm app/models/auth_source_ldap.rb || die
-
-	eapply "${FILESDIR}/${PN}-3.3.4_requires.patch"
-}
-
-all_ruby_install() {
-	dodoc doc/* README.rdoc
-	rm -r doc appveyor.yml CONTRIBUTING.md README.rdoc || die
-
-	keepdir /var/log/${PN}
-
-	insinto "${REDMINE_DIR}"
-	doins -r .
-	insinto "${REDMINE_DIR}/config"
-	doins "${FILESDIR}/additional_environment.rb"
-	keepdir "${REDMINE_DIR}/files"
-	keepdir "${REDMINE_DIR}/public/plugin_assets"
-
-	fowners -R redmine:redmine \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/public/plugin_assets" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN}
-
-	fowners redmine:redmine "${REDMINE_DIR}"
-
-	# protect sensitive data, see bug #406605
-	fperms -R go-rwx \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN}
-
-	if use passenger; then
-		has_apache
-		insinto "${APACHE_VHOSTS_CONFDIR}"
-		doins "${FILESDIR}/10_redmine_vhost.conf"
-	fi
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/redmine.logrotate redmine
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
-	doenvd "${T}/50${PN}"
-}
-
-pkg_postinst() {
-	einfo
-	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" \
-	|| -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
-	then
-		elog "Execute the following command to upgrade environment:"
-		elog
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "For upgrade instructions take a look at:"
-		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
-	else
-		elog "Execute the following command to initialize environment:"
-		elog
-		elog "# cd ${EROOT%/}${REDMINE_DIR}"
-		elog "# cp config/database.yml.example config/database.yml"
-		elog "# \${EDITOR} config/database.yml"
-		elog "# chown redmine:redmine config/database.yml"
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "Installation notes are at official site"
-		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
-	fi
-	einfo
-}
-
-pkg_config() {
-	if [[ ! -e "${EROOT%/}${REDMINE_DIR}/config/database.yml" ]]; then
-		eerror "Copy ${EROOT%/}${REDMINE_DIR}/config/database.yml.example to"
-		eerror "${EROOT%/}${REDMINE_DIR}/config/database.yml then edit this"
-		eerror "file in order to configure your database settings for"
-		eerror "\"production\" environment."
-		die
-	fi
-
-	local RAILS_ENV=${RAILS_ENV:-production}
-	if [[ ! -L /usr/bin/ruby ]]; then
-		eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation."
-		eerror "Please update it via `eselect ruby`"
-		die
-	fi
-	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]
-	then
-		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets:"
-		eerror "${RUBY_TARGETS}."
-		eerror "Please update it via `eselect ruby`"
-		die
-	fi
-	local RUBY=${RUBY:-ruby}
-
-	cd "${EROOT%/}${REDMINE_DIR}" || die
-	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" ]]
-	then
-		einfo
-		einfo "Generating secret token."
-		einfo
-		rm config/initializers/session_store.rb || die
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
-	fi
-	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
-	then
-		einfo
-		einfo "Upgrading database."
-		einfo
-
-		einfo "Generating secret token."
-		# Migration from Redmine 2.x
-		rm config/initializers/secret_token.rb || die
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
-
-		einfo "Migrating database."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Upgrading the plugin migrations."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
-		einfo "Clear the cache and the existing sessions."
-		${RUBY} -S rake tmp:cache:clear || die
-		${RUBY} -S rake tmp:sessions:clear || die
-	else
-		einfo
-		einfo "Initializing database."
-		einfo
-
-		einfo "Generating a session store secret."
-		${RUBY} -S rake generate_secret_token || die
-		einfo "Creating the database structure."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Populating database with default configuration data."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
-		chown redmine:redmine "${EROOT%/}var/log/redmine/*.log" || die
-		einfo
-		einfo "If you use sqlite3, please do not forget to change the ownership"
-		einfo "of the sqlite files."
-		einfo
-		einfo "# cd \"${EROOT%/}${REDMINE_DIR}\""
-		einfo "# chown redmine:redmine db/ db/*.sqlite3"
-		einfo
-	fi
-}
diff --git a/www-apps/redmine/redmine-3.4.2.ebuild b/www-apps/redmine/redmine-3.4.2.ebuild
deleted file mode 100644
index 50abc9804762..000000000000
--- a/www-apps/redmine/redmine-3.4.2.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-# ruby24 don't have required deps
-USE_RUBY="ruby22 ruby23"
-inherit eutils depend.apache ruby-ng user
-
-DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
-HOMEPAGE="http://www.redmine.org/"
-SRC_URI="http://www.redmine.org/releases/${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2"
-SLOT="0"
-# All db-related USEs are ineffective since we depend on rails
-# which depends on activerecord which depends on all ruby's db bindings
-#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
-IUSE="imagemagick fastcgi ldap markdown passenger"
-
-ruby_add_rdepend "
-	dev-ruby/actionpack-action_caching
-	dev-ruby/actionpack-xml_parser:*
-	>=dev-ruby/builder-3.2.2:3.2
-	>=dev-ruby/coderay-1.1.0
-	dev-ruby/i18n:0.7
-	>=dev-ruby/jquery-rails-3.1.4:3
-	dev-ruby/loofah
-	dev-ruby/mime-types:*
-	dev-ruby/mimemagic
-	>=dev-ruby/nokogiri-1.6.8
-	dev-ruby/protected_attributes
-	>=dev-ruby/rack-openid-0.2.1
-	>=dev-ruby/rails-4.2.5.2:4.2
-	>=dev-ruby/rails-html-sanitizer-1.0.3
-	dev-ruby/request_store:1.0.5
-	>=dev-ruby/roadie-rails-1.1.0
-	>=dev-ruby/rbpdf-1.19.2
-	>=dev-ruby/ruby-openid-2.3.0
-	dev-ruby/rubygems
-	fastcgi? ( dev-ruby/fcgi )
-	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )
-	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
-	markdown? ( >=dev-ruby/redcarpet-3.3.2 )
-	passenger? ( www-apache/passenger )
-	"
-# TODO add USE doc and test
-#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
-#	dev-ruby/yard
-#	test? (
-#		>=dev-ruby/shoulda-3.3.2
-#		>=dev-ruby/mocha-0.13.3
-#		>=dev-ruby/capybara-2.0.0
-#	)"
-
-REDMINE_DIR="/var/lib/${PN}"
-
-pkg_setup() {
-	enewgroup redmine
-	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
-}
-
-all_ruby_prepare() {
-	rm -r log files/delete.me Gemfile || die
-
-	# bug #406605
-	rm .{git,hg}ignore || die
-
-	cat > "${T}/50${PN}" <<-EOF || die
-		CONFIG_PROTECT="${EROOT%/}${REDMINE_DIR}/config"
-		CONFIG_PROTECT_MASK="${EROOT%/}${REDMINE_DIR}/config/locales ${EROOT%/}${REDMINE_DIR}/config/settings.yml"
-	EOF
-
-	# remove ldap staff module if disabled to avoid #413779
-	use ldap || rm app/models/auth_source_ldap.rb || die
-
-	eapply "${FILESDIR}/${PN}-3.3.4_requires.patch"
-}
-
-all_ruby_install() {
-	dodoc doc/* README.rdoc
-	rm -r doc appveyor.yml CONTRIBUTING.md README.rdoc || die
-
-	keepdir /var/log/${PN}
-
-	insinto "${REDMINE_DIR}"
-	doins -r .
-	insinto "${REDMINE_DIR}/config"
-	doins "${FILESDIR}/additional_environment.rb"
-	keepdir "${REDMINE_DIR}/files"
-	keepdir "${REDMINE_DIR}/public/plugin_assets"
-
-	fowners -R redmine:redmine \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/public/plugin_assets" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN}
-
-	fowners redmine:redmine "${REDMINE_DIR}"
-
-	# protect sensitive data, see bug #406605
-	fperms -R go-rwx \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN}
-
-	if use passenger; then
-		has_apache
-		insinto "${APACHE_VHOSTS_CONFDIR}"
-		doins "${FILESDIR}/10_redmine_vhost.conf"
-	fi
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/redmine.logrotate redmine
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
-	doenvd "${T}/50${PN}"
-}
-
-pkg_postinst() {
-	einfo
-	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" \
-	|| -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
-	then
-		elog "Execute the following command to upgrade environment:"
-		elog
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "For upgrade instructions take a look at:"
-		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
-	else
-		elog "Execute the following command to initialize environment:"
-		elog
-		elog "# cd ${EROOT%/}${REDMINE_DIR}"
-		elog "# cp config/database.yml.example config/database.yml"
-		elog "# \${EDITOR} config/database.yml"
-		elog "# chown redmine:redmine config/database.yml"
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "Installation notes are at official site"
-		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
-	fi
-	einfo
-}
-
-pkg_config() {
-	if [[ ! -e "${EROOT%/}${REDMINE_DIR}/config/database.yml" ]]; then
-		eerror "Copy ${EROOT%/}${REDMINE_DIR}/config/database.yml.example to"
-		eerror "${EROOT%/}${REDMINE_DIR}/config/database.yml then edit this"
-		eerror "file in order to configure your database settings for"
-		eerror "\"production\" environment."
-		die
-	fi
-
-	local RAILS_ENV=${RAILS_ENV:-production}
-	if [[ ! -L /usr/bin/ruby ]]; then
-		eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation."
-		eerror "Please update it via `eselect ruby`"
-		die
-	fi
-	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]
-	then
-		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets:"
-		eerror "${RUBY_TARGETS}."
-		eerror "Please update it via `eselect ruby`"
-		die
-	fi
-	local RUBY=${RUBY:-ruby}
-
-	cd "${EROOT%/}${REDMINE_DIR}" || die
-	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" ]]
-	then
-		einfo
-		einfo "Generating secret token."
-		einfo
-		rm config/initializers/session_store.rb || die
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
-	fi
-	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
-	then
-		einfo
-		einfo "Upgrading database."
-		einfo
-
-		einfo "Generating secret token."
-		# Migration from Redmine 2.x
-		rm config/initializers/secret_token.rb || die
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
-
-		einfo "Migrating database."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Upgrading the plugin migrations."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
-		einfo "Clear the cache and the existing sessions."
-		${RUBY} -S rake tmp:cache:clear || die
-		${RUBY} -S rake tmp:sessions:clear || die
-	else
-		einfo
-		einfo "Initializing database."
-		einfo
-
-		einfo "Generating a session store secret."
-		${RUBY} -S rake generate_secret_token || die
-		einfo "Creating the database structure."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
-		einfo "Populating database with default configuration data."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
-		chown redmine:redmine "${EROOT%/}var/log/redmine/*.log" || die
-		einfo
-		einfo "If you use sqlite3, please do not forget to change the ownership"
-		einfo "of the sqlite files."
-		einfo
-		einfo "# cd \"${EROOT%/}${REDMINE_DIR}\""
-		einfo "# chown redmine:redmine db/ db/*.sqlite3"
-		einfo
-	fi
-}
diff --git a/www-apps/redmine/redmine-3.4.3.ebuild b/www-apps/redmine/redmine-3.4.3.ebuild
new file mode 100644
index 000000000000..d2e874a23beb
--- /dev/null
+++ b/www-apps/redmine/redmine-3.4.3.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+# ruby24 don't have required deps
+USE_RUBY="ruby22 ruby23"
+inherit eutils depend.apache ruby-ng user
+
+DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
+HOMEPAGE="http://www.redmine.org/"
+SRC_URI="http://www.redmine.org/releases/${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+# All db-related USEs are ineffective since we depend on rails
+# which depends on activerecord which depends on all ruby's db bindings
+#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
+IUSE="imagemagick fastcgi ldap markdown passenger"
+
+ruby_add_rdepend "
+	dev-ruby/actionpack-action_caching
+	dev-ruby/actionpack-xml_parser:*
+	>=dev-ruby/builder-3.2.2:3.2
+	>=dev-ruby/coderay-1.1.0
+	dev-ruby/i18n:0.7
+	>=dev-ruby/jquery-rails-3.1.4:3
+	dev-ruby/loofah
+	dev-ruby/mime-types:*
+	dev-ruby/mimemagic
+	>=dev-ruby/nokogiri-1.6.8
+	dev-ruby/protected_attributes
+	>=dev-ruby/rack-openid-0.2.1
+	>=dev-ruby/rails-4.2.5.2:4.2
+	>=dev-ruby/rails-html-sanitizer-1.0.3
+	dev-ruby/request_store:1.0.5
+	>=dev-ruby/roadie-rails-1.1.0
+	>=dev-ruby/rbpdf-1.19.2
+	>=dev-ruby/ruby-openid-2.3.0
+	dev-ruby/rubygems
+	fastcgi? ( dev-ruby/fcgi )
+	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )
+	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
+	markdown? ( >=dev-ruby/redcarpet-3.3.2 )
+	passenger? ( www-apache/passenger )
+	"
+# TODO add USE doc and test
+#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
+#	dev-ruby/yard
+#	test? (
+#		>=dev-ruby/shoulda-3.3.2
+#		>=dev-ruby/mocha-0.13.3
+#		>=dev-ruby/capybara-2.0.0
+#	)"
+
+REDMINE_DIR="/var/lib/${PN}"
+
+pkg_setup() {
+	enewgroup redmine
+	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
+}
+
+all_ruby_prepare() {
+	rm -r log files/delete.me Gemfile || die
+
+	# bug #406605
+	rm .{git,hg}ignore || die
+
+	cat > "${T}/50${PN}" <<-EOF || die
+		CONFIG_PROTECT="${EROOT%/}${REDMINE_DIR}/config"
+		CONFIG_PROTECT_MASK="${EROOT%/}${REDMINE_DIR}/config/locales ${EROOT%/}${REDMINE_DIR}/config/settings.yml"
+	EOF
+
+	# remove ldap staff module if disabled to avoid #413779
+	use ldap || rm app/models/auth_source_ldap.rb || die
+
+	eapply "${FILESDIR}/${PN}-3.3.4_requires.patch"
+}
+
+all_ruby_install() {
+	dodoc doc/* README.rdoc
+	rm -r doc appveyor.yml CONTRIBUTING.md README.rdoc || die
+
+	keepdir /var/log/${PN}
+
+	insinto "${REDMINE_DIR}"
+	doins -r .
+	insinto "${REDMINE_DIR}/config"
+	doins "${FILESDIR}/additional_environment.rb"
+	keepdir "${REDMINE_DIR}/files"
+	keepdir "${REDMINE_DIR}/public/plugin_assets"
+
+	fowners -R redmine:redmine \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/public/plugin_assets" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	fowners redmine:redmine "${REDMINE_DIR}"
+
+	# protect sensitive data, see bug #406605
+	fperms -R go-rwx \
+		"${REDMINE_DIR}/config" \
+		"${REDMINE_DIR}/files" \
+		"${REDMINE_DIR}/tmp" \
+		/var/log/${PN}
+
+	if use passenger; then
+		has_apache
+		insinto "${APACHE_VHOSTS_CONFDIR}"
+		doins "${FILESDIR}/10_redmine_vhost.conf"
+	fi
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/redmine.logrotate redmine
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
+	doenvd "${T}/50${PN}"
+}
+
+pkg_postinst() {
+	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" \
+	|| -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
+	then
+		elog "Execute the following command to upgrade environment:"
+		elog
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "For upgrade instructions take a look at:"
+		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
+	else
+		elog "Execute the following command to initialize environment:"
+		elog
+		elog "# cd ${EROOT%/}${REDMINE_DIR}"
+		elog "# cp config/database.yml.example config/database.yml"
+		elog "# \${EDITOR} config/database.yml"
+		elog "# chown redmine:redmine config/database.yml"
+		elog "# emerge --config \"=${CATEGORY}/${PF}\""
+		elog
+		elog "Installation notes are at official site"
+		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
+	fi
+}
+
+pkg_config() {
+	if [[ ! -e "${EROOT%/}${REDMINE_DIR}/config/database.yml" ]]; then
+		eerror "Copy ${EROOT%/}${REDMINE_DIR}/config/database.yml.example to"
+		eerror "${EROOT%/}${REDMINE_DIR}/config/database.yml then edit this"
+		eerror "file in order to configure your database settings for"
+		eerror "\"production\" environment."
+		die
+	fi
+
+	local RAILS_ENV=${RAILS_ENV:-production}
+	if [[ ! -L /usr/bin/ruby ]]; then
+		eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]
+	then
+		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets:"
+		eerror "${RUBY_TARGETS}."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	local RUBY=${RUBY:-ruby}
+
+	cd "${EROOT%/}${REDMINE_DIR}" || die
+	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" ]]
+	then
+		einfo
+		einfo "Generating secret token."
+		einfo
+		rm config/initializers/session_store.rb || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
+	fi
+	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
+	then
+		einfo
+		einfo "Upgrading database."
+		einfo
+
+		einfo "Generating secret token."
+		# Migration from Redmine 2.x
+		rm config/initializers/secret_token.rb || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
+
+		einfo "Migrating database."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
+		einfo "Upgrading the plugin migrations."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
+		einfo "Clear the cache and the existing sessions."
+		${RUBY} -S rake tmp:cache:clear || die
+		${RUBY} -S rake tmp:sessions:clear || die
+	else
+		einfo
+		einfo "Initializing database."
+		einfo
+
+		einfo "Generating a session store secret."
+		${RUBY} -S rake generate_secret_token || die
+		einfo "Creating the database structure."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
+		einfo "Populating database with default configuration data."
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
+		chown redmine:redmine "${EROOT%/}var/log/redmine/*.log" || die
+		einfo
+		einfo "If you use sqlite3, please do not forget to change the ownership"
+		einfo "of the sqlite files."
+		einfo
+		einfo "# cd \"${EROOT%/}${REDMINE_DIR}\""
+		einfo "# chown redmine:redmine db/ db/*.sqlite3"
+		einfo
+	fi
+}
diff --git a/www-apps/rt/Manifest b/www-apps/rt/Manifest
index 62e87835d3f1..caba769b80df 100644
--- a/www-apps/rt/Manifest
+++ b/www-apps/rt/Manifest
@@ -6,8 +6,8 @@ AUX rt.conf.d.2 229 SHA256 73988366beb98516b12c842f51e322d95317c1d2d10fb292fcc0b
 AUX rt.init.d.2 1318 SHA256 bbcf2e95cbcae37a240e9ae30b016d9dccd857f27367a34bf343e47be77df9b4 SHA512 ec7249e73e9efdcb1716e8ba3bf33d4791bf4e386b3c60207f5c1a37b8b456be8c0cd550bbe0645a9aa46afeb1c3331b3425bb9f5ef8b95b71f52f99f1244b91 WHIRLPOOL 06a5edb36eeacf105ab2e0f67c6505f8eb310a5ed12fd1f7b48ecdab473a3d276b11b28a71ebe6d207b8e23c410375c5305f97087a93505e65698f85e30176ee
 DIST rt-4.2.12.tar.gz 7537620 SHA256 e21220c609706dc9977a13309d78a4d9171455ae823cf549311342cedd837264 SHA512 e816c5481bdb158209bd78bc82af4abc0243af500abe55ae3aac666259e983282d82577de6207899745b4781fb0a50d3094901a248e7ac958dd852343b6f2676 WHIRLPOOL 726d6f7c92bdd120ae3c0463181cef3ade9c705ac23dbb93bf1a262ebc4d0d2f07144a67d04a06c3127dead7ad7e6b50f3966e2969bc8c0199507af4af854fec
 DIST rt-4.4.1.tar.gz 9057212 SHA256 f87329911020e01b39948070aec2bd7abf0c81641f0cf2f25e01c690a19f24f5 SHA512 2cb797e013b14201ececec2c408257fe3a998fefdafd0944efda0236caac40be4cc45878cbda7bf9ae82b3757de6167263db2b90331d925db1f916a8420adf94 WHIRLPOOL 2d5530cc57a1a02a2429b59c07459da3cd71b3b9596588f8f6010c67e74a56bde9793c0fd2d8c6d0bf2171930e0352fd723a40fa0d5bd815c1d596ba9802c450
-EBUILD rt-4.2.12-r1.ebuild 7508 SHA256 e9877fe3b9dda989e026a2570e3450457a092e10a4dbfa65cf12167f5c004b97 SHA512 1627e7017e512c1016689c34d3a2edd0a41461ffa2ce27f76428afdcc68876998c397edcdc8c6383677975fdbead35680d4a770142f4ec5540c81314018ed550 WHIRLPOOL 698657baedd7f2f196e405ee0555835258e4d692da7ace317809de326af15c3c2bfb7752733ba9b58479f290f08404ca64d80c6436a92664ced455bd26dfd2f2
-EBUILD rt-4.4.1.ebuild 7629 SHA256 e99b3546c915f373abcec8df33656ba5eb75d6d211b4539d5b3926261bd30d0b SHA512 8a2f291926499e5df9f4a60351ffea0aa9d92534c13ae54fcc3d8a4c9e37d46989be43d6f3f06d1641bb88e6feb5df707b892063064927b9ff5971b9f41e2db5 WHIRLPOOL 8d35dab50459db7483d7dbb053ef5ec4bb6e3d461c5d8b01f8c21d81ba308dd78bf33a526479f7ed2e3826f64043dc281d0268984c37dc677a5d5c640474a2e1
+EBUILD rt-4.2.12-r2.ebuild 7511 SHA256 51429750d06ecddfb2cc65fc972b88dc9e5ff3a8307a1457e6915cc2e98c568b SHA512 dcf02e62b49babd83d6f747062972243cd13c8b9b528861f6f09e76229ae7ad5fa1750ffd1e34ef7c90f7724f4caf1826d3b770d4a06540947b6225ae4b8b8ac WHIRLPOOL 6c1271361c983faaef67a8d5308df9cde5d03d271525bae7b29d561220f81de3c8009add683d4dc636d8beab490b0e77be66d7e09a629987f467c5ba4c59449b
+EBUILD rt-4.4.1-r1.ebuild 7632 SHA256 a091b6fcdf3ed676287123fd8f8d749c7279fed8ee1dca40007198cd46b049b8 SHA512 54e4c18a05dae9ec7e7a8021706c47d40af76b521ea2986710287119a5f3bafa375e85f20c3813bffd8028ad10ed32c76b5590fd249d7f6aa36b1ef51ab88043 WHIRLPOOL 66a634476de3bad78b84e2fc54cf81e5034e9187abb6045b2a4a16345e101c96eed750ffd9ec5ff0d2240c136ea6843ba834d6759e6f55ee37dd81592c240031
 MISC ChangeLog 5643 SHA256 86dac0e4e5f704cca8d46acd354d7d62ffc13acb8acaa3c17b609c337d9b7baa SHA512 1db44fdc3c4f6bd24ff2413bae3ddb58642d16387baa5133a6cb65cc07566877a589ef6f3e1c3d8501b9775b956094646ba5b71f1e375f53af3fcdcbf339a7cc WHIRLPOOL 1b69c1f95ea6c29a784936b6efb7339a8b091632a6fd5f113cfd23400683896318250c47c2a5e4a8555e4cea6a4b6f2b6d48c6abfafdf703247f6ad80a452c9c
 MISC ChangeLog-2015 15966 SHA256 c34772eb85e51a1ec90b625a870670bcd6dc912dd2ae583eddc93a01d8e650dd SHA512 fbf740b91a1f93c53f02c492121158696ec7ea82c491823929c7e4552ff0cae4a7498b1771f3e6903383672804170392948e7e981aa29f018e849c3c103b8737 WHIRLPOOL 57608c0a0a052d3e47b3b014b9e9c65c8be20fa13f639de8c7bc276418b8f08b093d8bda6d9406f29de87610bc8d11f2bc192b76b487ecd13598096fb07ca9e0
-MISC metadata.xml 767 SHA256 59ad02388643162eb8663e16a2d10d7f394d06213a5dc955736f7000d494517e SHA512 b74eee6a8e221bff8d7512aacf7ae8ddc01b4aa9fd3b8ceb000d399f4516dddb8db6f602c8e0311d3624b09501660f6121c0d98f1ee0c22e26f2aa587df44e82 WHIRLPOOL 1ecacafed294df79bbc43d8479669d81dbc59e7ee99d47ab0a6d06926f77967febb8f0e98818c42007d756b2563649b7cb6cd7f75cbb18cff635b85c932de700
+MISC metadata.xml 766 SHA256 b68c13cbd7e708a940be89f088bb153b51d7be48e9e081c28540b5850c5e01b5 SHA512 b30f9242a64e6f8ebfda7e0321e8732f80b0990ba8857bd37d8753688df22702c8c7d398ec0652f7478a0d547b92b1fc234bd482fa80f3ac9ddf119ad5b66d5f WHIRLPOOL 5b68703758583bf1f3f703c83d25416b74fa3bfeabd07434f9d9f512020d54b4b6603e70040f2574bb4b9acd059e6aa07410f07689a6da0a3d6cdf59520f1120
diff --git a/www-apps/rt/metadata.xml b/www-apps/rt/metadata.xml
index f1d1d6173dc8..b54f1a28f875 100644
--- a/www-apps/rt/metadata.xml
+++ b/www-apps/rt/metadata.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-	<email>titanofold@gentoo.org</email>
-	<name>Aaron W. Swenson</name>
+		<email>titanofold@gentoo.org</email>
+		<name>Aaron W. Swenson</name>
 	</maintainer>
- 	<maintainer type="person">
+	<maintainer type="person">
 		<email>eric.joshua.martin@gmail.com</email>
 		<name>Eric Martin</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>web-apps@gentoo.org</email>
 		<name>Gentoo Webapps</name>
- 	</maintainer>
+	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
- 	</maintainer>
+	</maintainer>
 	<use>
 		<flag name="lighttpd">Add <pkg>www-servers/lighttpd</pkg> support</flag>
 	</use>
diff --git a/www-apps/rt/rt-4.2.12-r1.ebuild b/www-apps/rt/rt-4.2.12-r1.ebuild
deleted file mode 100644
index 011c42d01899..000000000000
--- a/www-apps/rt/rt-4.2.12-r1.ebuild
+++ /dev/null
@@ -1,295 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit webapp eutils depend.apache user
-
-DESCRIPTION="RT is an enterprise-grade ticketing system"
-HOMEPAGE="http://www.bestpractical.com/rt/"
-SRC_URI="http://download.bestpractical.com/pub/${PN}/release/${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2"
-IUSE="mysql +postgres fastcgi lighttpd"
-REQUIRED_USE="^^ ( mysql postgres )"
-
-RESTRICT="test"
-
-DEPEND="
-	>=dev-lang/perl-5.10.1
-
-	>=dev-perl/Apache-Session-1.53
-	>=dev-perl/CGI-4
-	>=dev-perl/CSS-Squish-0.06
-	>=dev-perl/Class-Accessor-0.34
-	>=dev-perl/Class-ReturnValue-0.550.0-r1
-	>=dev-perl/DBI-1.37
-	>=dev-perl/Date-Extract-0.02
-	>=dev-perl/DateTime-Format-Natural-0.67
-	>=dev-perl/Devel-StackTrace-1.19
-	>=dev-perl/HTML-FormatText-WithLinks-0.14
-	>=dev-perl/HTML-Mason-1.43
-	>=dev-perl/HTML-Scrubber-0.08
-	>=dev-perl/HTTP-Server-Simple-0.34
-	>=dev-perl/HTTP-Server-Simple-Mason-0.14
-	>=dev-perl/Locale-Maketext-Lexicon-0.32
-	>=dev-perl/Log-Dispatch-2.410.0
-	>=dev-perl/MIME-tools-5.425
-	>=dev-perl/MailTools-1.60
-	>=dev-perl/Module-Versions-Report-1.05
-	>=dev-perl/Role-Basic-0.12
-	>=dev-perl/Symbol-Global-Name-0.04
-	>=dev-perl/Text-Quoted-2.80.0
-	>=dev-perl/Text-WikiFormat-0.76
-	>=dev-perl/Tree-Simple-1.04
-	>=dev-perl/XML-RSS-1.05
-	>=dev-perl/DBIx-SearchBuilder-1.660.0
-	>=virtual/perl-Digest-MD5-2.27
-	>=virtual/perl-Encode-2.730.0
-	>=virtual/perl-File-Spec-0.8
-	>=virtual/perl-Getopt-Long-2.24
-	>=virtual/perl-Locale-Maketext-1.06
-	>=virtual/perl-Storable-2.08
-	dev-perl/CGI-Emulate-PSGI
-	dev-perl/CGI-PSGI
-	dev-perl/Cache-Simple-TimedExpiry
-	dev-perl/Calendar-Simple
-	dev-perl/Convert-Color
-	dev-perl/Crypt-Eksblowfish
-	dev-perl/Crypt-SSLeay
-	dev-perl/Crypt-X509
-	dev-perl/DBD-SQLite
-	dev-perl/Data-GUID
-	dev-perl/Data-ICal
-	dev-perl/Date-Manip
-	dev-perl/Devel-GlobalDestruction
-	dev-perl/Email-Address
-	dev-perl/Email-Address-List
-	dev-perl/File-ShareDir
-	dev-perl/File-Which
-	dev-perl/GDGraph
-	dev-perl/GDTextUtil
-	dev-perl/GD[png,gif]
-	dev-perl/GnuPG-Interface
-	dev-perl/GraphViz
-	dev-perl/HTML-Format
-	dev-perl/HTML-FormatText-WithLinks-AndTables
-	dev-perl/HTML-Mason-PSGIHandler
-	dev-perl/HTML-Parser
-	dev-perl/HTML-Quoted
-	dev-perl/HTML-RewriteAttributes
-	dev-perl/HTML-Tree
-	dev-perl/IPC-Run3
-	dev-perl/JSON
-	dev-perl/JavaScript-Minifier
-	dev-perl/MIME-Types
-	dev-perl/Module-Refresh
-	dev-perl/Mozilla-CA
-	dev-perl/Net-CIDR
-	dev-perl/PerlIO-eol
-	dev-perl/Plack
-	dev-perl/Regexp-Common-net-CIDR
-	dev-perl/Regexp-IPv6
-	dev-perl/Starlet
-	dev-perl/String-ShellQuote
-	dev-perl/TermReadKey
-	dev-perl/Text-Autoformat
-	dev-perl/Text-Password-Pronounceable
-	dev-perl/Time-ParseDate
-	dev-perl/TimeDate
-	dev-perl/UNIVERSAL-require
-	dev-perl/libwww-perl
-	dev-perl/Locale-Maketext-Fuzzy
-	dev-perl/Net-Server
-	dev-perl/Regexp-Common
-	dev-perl/Text-Template
-	dev-perl/Text-Wrapper
-	virtual/perl-Digest
-	virtual/perl-File-Temp
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-Time-HiRes
-	virtual/perl-libnet
-
-	fastcgi? (
-		dev-perl/FCGI
-		dev-perl/FCGI-ProcManager
-	)
-	!lighttpd? (
-		dev-perl/Apache-DBI
-		!fastcgi? ( >=www-apache/mod_perl-2 )
-	)
-	lighttpd? ( dev-perl/FCGI )
-	mysql? ( >=dev-perl/DBD-mysql-2.1018 )
-	postgres? ( >=dev-perl/DBD-Pg-1.43 )
-"
-
-RDEPEND="${DEPEND}
-	virtual/mta
-	!lighttpd? ( ${APACHE2_DEPEND} )
-	lighttpd? (
-		>=www-servers/lighttpd-1.3.13
-		sys-apps/openrc
-	)
-"
-
-need_httpd_cgi
-
-add_user_rt() {
-	# add new user
-	# suexec2 requires uid >= 1000; enewuser is of no help here
-	# From: Mike Frysinger <vapier@gentoo.org>
-	# Date: Fri, 17 Jun 2005 08:41:44 -0400
-	# i'd pick a 5 digit # if i were you
-
-	local euser="rt"
-
-	# first check if username rt exists
-	if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
-		# check uid
-		rt_uid=$(egetent passwd "${euser}" | cut -d: -f3)
-		if $(expr ${rt_uid} '<' 1000 > /dev/null); then
-			ewarn "uid of user rt is less than 1000. suexec2 will not work."
-			ewarn "If you want to use FastCGI, please delete the user 'rt'"
-			ewarn "from your system and re-emerge www-apps/rt"
-		fi
-		return 0 # all is well
-	fi
-
-	# add user
-	# stolen from enewuser
-	local pwrange euid
-
-	pwrange=$(seq 10001 11001)
-	for euid in ${pwrange} ; do
-		[[ -z $(egetent passwd ${euid}) ]] && break
-	done
-	if [[ ${euid} == "11001" ]]; then
-		# she gets around, doesn't she?
-		die "No available uid's found"
-	fi
-
-	elog " - Userid: ${euid}"
-
-	enewuser rt ${euid} -1 /dev/null rt
-	return 0
-}
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	ewarn
-	ewarn "If you are upgrading from an existing RT installation"
-	ewarn "make sure to read the related upgrade documentation in"
-	ewarn "${ROOT}usr/share/doc/${PF}."
-	ewarn
-
-	enewgroup rt
-	add_user_rt || die "Could not add user"
-}
-
-src_prepare() {
-	# add Gentoo-specific layout
-	cat "${FILESDIR}"/config.layout-gentoo >> config.layout
-	sed -e "s|PREFIX|${ED}/${MY_HOSTROOTDIR}/${PF}|g" \
-		-e "s|HTMLDIR|${ED}/${MY_HTDOCSDIR}|g" \
-		-e 's|/\+|/|g' \
-		-i ./config.layout || die 'config sed failed'
-
-	# don't need to check dev dependencies
-	sed -e "s|\$args{'with-DEV'} =1;|#\$args{'with-DEV'} =1;|" \
-		-i sbin/rt-test-dependencies.in || die 'dev sed failed'
-
-	epatch "${FILESDIR}/rt-makefile-serialize-install-prereqs.patch"
-}
-
-src_configure() {
-	local web
-	local myconf
-	local depsconf
-
-	if use mysql ; then
-		myconf="--with-db-type=mysql --with-db-dba=root"
-		depsconf="--with-MYSQL"
-	elif use postgres ; then
-		myconf="--with-db-type=Pg --with-db-dba=postgres"
-		depsconf="--with-PG"
-	else
-		die "Pick a database backend"
-	fi
-
-	if use fastcgi ; then
-		myconf+=" --with-web-handler=fastcgi"
-		web="apache"
-		depsconf+=" --with-FASTCGI"
-	elif use lighttpd ; then
-		myconf+=" --with-web-handler=fastcgi"
-		web="lighttpd"
-		depsconf+=" --with-FASTCGI"
-	else
-		myconf+=" --with-web-handler=modperl2"
-		web="apache"
-		depsconf+=" --with-MODPERL2"
-	fi
-	# Any loading Date::Manip from here on
-	# may fail if TZ=Factory as it is on gentoo install
-	# media ( affects install as well )
-	export TZ=UTC
-
-	./configure --enable-layout=Gentoo \
-		--with-bin-owner=rt \
-		--with-libs-owner=rt \
-		--with-libs-group=rt \
-		--with-rt-group=rt \
-		--with-web-user=${web} \
-		--with-web-group=${web} \
-		${myconf}
-
-	# check for missing deps and ask to report if something is broken
-	/usr/bin/perl ./sbin/rt-test-dependencies ${depsconf} > "${T}"/t
-	if grep -q "MISSING" "${T}"/t; then
-		ewarn "Missing Perl dependency!"
-		ewarn
-		cat "${T}"/t | grep MISSING
-		ewarn
-		ewarn "Please run perl-cleaner. If the problem persists,"
-		ewarn "please file a bug in the Gentoo Bugzilla with the information above"
-		die "Missing dependencies."
-	fi
-}
-
-src_compile() { :; }
-
-src_install() {
-	webapp_src_preinst
-	emake install
-
-	dodoc -r docs/*
-	# Disable compression because `perldoc` doesn't decompress transparently
-	docompress -x /usr/share/doc
-
-	# make sure we don't clobber existing site configuration
-	rm -f "${ED}"/${MY_HOSTROOTDIR}/${PF}/etc/RT_SiteConfig.pm
-
-	# fix paths
-	find "${ED}" -type f -print0 | xargs -0 sed -i -e "s:${ED}::g"
-
-	# copy upgrade files
-	insinto "${MY_HOSTROOTDIR}/${PF}"
-	doins -r etc/upgrade
-
-	if use lighttpd ; then
-		newinitd "${FILESDIR}"/${PN}.init.d.2 ${PN}
-		newconfd "${FILESDIR}"/${PN}.conf.d.2 ${PN}
-		sed -i -e "s/@@PF@@/${PF}/g" "${ED}"/etc/conf.d/${PN} || die
-	fi
-
-	# require the web server's permissions
-	webapp_serverowned "${MY_HOSTROOTDIR}"/${PF}/var
-	webapp_serverowned "${MY_HOSTROOTDIR}"/${PF}/var/mason_data/obj
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_hook_script "${FILESDIR}"/reconfig
-
-	webapp_src_install
-}
diff --git a/www-apps/rt/rt-4.2.12-r2.ebuild b/www-apps/rt/rt-4.2.12-r2.ebuild
new file mode 100644
index 000000000000..73babc3acf9b
--- /dev/null
+++ b/www-apps/rt/rt-4.2.12-r2.ebuild
@@ -0,0 +1,295 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit webapp eutils depend.apache user
+
+DESCRIPTION="RT is an enterprise-grade ticketing system"
+HOMEPAGE="http://www.bestpractical.com/rt/"
+SRC_URI="http://download.bestpractical.com/pub/${PN}/release/${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+IUSE="mysql +postgres fastcgi lighttpd"
+REQUIRED_USE="^^ ( mysql postgres )"
+
+RESTRICT="test"
+
+DEPEND="
+	>=dev-lang/perl-5.10.1
+
+	>=dev-perl/Apache-Session-1.53
+	>=dev-perl/CGI-4
+	>=dev-perl/CSS-Squish-0.06
+	>=dev-perl/Class-Accessor-0.34
+	>=dev-perl/Class-ReturnValue-0.550.0-r1
+	>=dev-perl/DBI-1.37
+	>=dev-perl/Date-Extract-0.02
+	>=dev-perl/DateTime-Format-Natural-0.67
+	>=dev-perl/Devel-StackTrace-1.19
+	>=dev-perl/HTML-FormatText-WithLinks-0.14
+	>=dev-perl/HTML-Mason-1.43
+	>=dev-perl/HTML-Scrubber-0.08
+	>=dev-perl/HTTP-Server-Simple-0.34
+	>=dev-perl/HTTP-Server-Simple-Mason-0.14
+	>=dev-perl/Locale-Maketext-Lexicon-0.32
+	>=dev-perl/Log-Dispatch-2.410.0
+	>=dev-perl/MIME-tools-5.425
+	>=dev-perl/MailTools-1.60
+	>=dev-perl/Module-Versions-Report-1.05
+	>=dev-perl/Role-Basic-0.12
+	>=dev-perl/Symbol-Global-Name-0.04
+	>=dev-perl/Text-Quoted-2.80.0
+	>=dev-perl/Text-WikiFormat-0.76
+	>=dev-perl/Tree-Simple-1.04
+	>=dev-perl/XML-RSS-1.05
+	>=dev-perl/DBIx-SearchBuilder-1.660.0
+	>=virtual/perl-Digest-MD5-2.27
+	>=virtual/perl-Encode-2.730.0
+	>=virtual/perl-File-Spec-0.8
+	>=virtual/perl-Getopt-Long-2.24
+	>=virtual/perl-Locale-Maketext-1.06
+	>=virtual/perl-Storable-2.08
+	dev-perl/CGI-Emulate-PSGI
+	dev-perl/CGI-PSGI
+	dev-perl/Cache-Simple-TimedExpiry
+	dev-perl/Calendar-Simple
+	dev-perl/Convert-Color
+	dev-perl/Crypt-Eksblowfish
+	dev-perl/Crypt-SSLeay
+	dev-perl/Crypt-X509
+	dev-perl/DBD-SQLite
+	dev-perl/Data-GUID
+	dev-perl/Data-ICal
+	dev-perl/Date-Manip
+	dev-perl/Devel-GlobalDestruction
+	dev-perl/Email-Address
+	dev-perl/Email-Address-List
+	dev-perl/File-ShareDir
+	dev-perl/File-Which
+	dev-perl/GDGraph
+	dev-perl/GDTextUtil
+	dev-perl/GD[png,gif]
+	dev-perl/GnuPG-Interface
+	dev-perl/GraphViz
+	dev-perl/HTML-Formatter
+	dev-perl/HTML-FormatText-WithLinks-AndTables
+	dev-perl/HTML-Mason-PSGIHandler
+	dev-perl/HTML-Parser
+	dev-perl/HTML-Quoted
+	dev-perl/HTML-RewriteAttributes
+	dev-perl/HTML-Tree
+	dev-perl/IPC-Run3
+	dev-perl/JSON
+	dev-perl/JavaScript-Minifier
+	dev-perl/MIME-Types
+	dev-perl/Module-Refresh
+	dev-perl/Mozilla-CA
+	dev-perl/Net-CIDR
+	dev-perl/PerlIO-eol
+	dev-perl/Plack
+	dev-perl/Regexp-Common-net-CIDR
+	dev-perl/Regexp-IPv6
+	dev-perl/Starlet
+	dev-perl/String-ShellQuote
+	dev-perl/TermReadKey
+	dev-perl/Text-Autoformat
+	dev-perl/Text-Password-Pronounceable
+	dev-perl/Time-ParseDate
+	dev-perl/TimeDate
+	dev-perl/UNIVERSAL-require
+	dev-perl/libwww-perl
+	dev-perl/Locale-Maketext-Fuzzy
+	dev-perl/Net-Server
+	dev-perl/Regexp-Common
+	dev-perl/Text-Template
+	dev-perl/Text-Wrapper
+	virtual/perl-Digest
+	virtual/perl-File-Temp
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Time-HiRes
+	virtual/perl-libnet
+
+	fastcgi? (
+		dev-perl/FCGI
+		dev-perl/FCGI-ProcManager
+	)
+	!lighttpd? (
+		dev-perl/Apache-DBI
+		!fastcgi? ( >=www-apache/mod_perl-2 )
+	)
+	lighttpd? ( dev-perl/FCGI )
+	mysql? ( >=dev-perl/DBD-mysql-2.1018 )
+	postgres? ( >=dev-perl/DBD-Pg-1.43 )
+"
+
+RDEPEND="${DEPEND}
+	virtual/mta
+	!lighttpd? ( ${APACHE2_DEPEND} )
+	lighttpd? (
+		>=www-servers/lighttpd-1.3.13
+		sys-apps/openrc
+	)
+"
+
+need_httpd_cgi
+
+add_user_rt() {
+	# add new user
+	# suexec2 requires uid >= 1000; enewuser is of no help here
+	# From: Mike Frysinger <vapier@gentoo.org>
+	# Date: Fri, 17 Jun 2005 08:41:44 -0400
+	# i'd pick a 5 digit # if i were you
+
+	local euser="rt"
+
+	# first check if username rt exists
+	if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
+		# check uid
+		rt_uid=$(egetent passwd "${euser}" | cut -d: -f3)
+		if $(expr ${rt_uid} '<' 1000 > /dev/null); then
+			ewarn "uid of user rt is less than 1000. suexec2 will not work."
+			ewarn "If you want to use FastCGI, please delete the user 'rt'"
+			ewarn "from your system and re-emerge www-apps/rt"
+		fi
+		return 0 # all is well
+	fi
+
+	# add user
+	# stolen from enewuser
+	local pwrange euid
+
+	pwrange=$(seq 10001 11001)
+	for euid in ${pwrange} ; do
+		[[ -z $(egetent passwd ${euid}) ]] && break
+	done
+	if [[ ${euid} == "11001" ]]; then
+		# she gets around, doesn't she?
+		die "No available uid's found"
+	fi
+
+	elog " - Userid: ${euid}"
+
+	enewuser rt ${euid} -1 /dev/null rt
+	return 0
+}
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	ewarn
+	ewarn "If you are upgrading from an existing RT installation"
+	ewarn "make sure to read the related upgrade documentation in"
+	ewarn "${ROOT}usr/share/doc/${PF}."
+	ewarn
+
+	enewgroup rt
+	add_user_rt || die "Could not add user"
+}
+
+src_prepare() {
+	# add Gentoo-specific layout
+	cat "${FILESDIR}"/config.layout-gentoo >> config.layout
+	sed -e "s|PREFIX|${ED}/${MY_HOSTROOTDIR}/${PF}|g" \
+		-e "s|HTMLDIR|${ED}/${MY_HTDOCSDIR}|g" \
+		-e 's|/\+|/|g' \
+		-i ./config.layout || die 'config sed failed'
+
+	# don't need to check dev dependencies
+	sed -e "s|\$args{'with-DEV'} =1;|#\$args{'with-DEV'} =1;|" \
+		-i sbin/rt-test-dependencies.in || die 'dev sed failed'
+
+	epatch "${FILESDIR}/rt-makefile-serialize-install-prereqs.patch"
+}
+
+src_configure() {
+	local web
+	local myconf
+	local depsconf
+
+	if use mysql ; then
+		myconf="--with-db-type=mysql --with-db-dba=root"
+		depsconf="--with-MYSQL"
+	elif use postgres ; then
+		myconf="--with-db-type=Pg --with-db-dba=postgres"
+		depsconf="--with-PG"
+	else
+		die "Pick a database backend"
+	fi
+
+	if use fastcgi ; then
+		myconf+=" --with-web-handler=fastcgi"
+		web="apache"
+		depsconf+=" --with-FASTCGI"
+	elif use lighttpd ; then
+		myconf+=" --with-web-handler=fastcgi"
+		web="lighttpd"
+		depsconf+=" --with-FASTCGI"
+	else
+		myconf+=" --with-web-handler=modperl2"
+		web="apache"
+		depsconf+=" --with-MODPERL2"
+	fi
+	# Any loading Date::Manip from here on
+	# may fail if TZ=Factory as it is on gentoo install
+	# media ( affects install as well )
+	export TZ=UTC
+
+	./configure --enable-layout=Gentoo \
+		--with-bin-owner=rt \
+		--with-libs-owner=rt \
+		--with-libs-group=rt \
+		--with-rt-group=rt \
+		--with-web-user=${web} \
+		--with-web-group=${web} \
+		${myconf}
+
+	# check for missing deps and ask to report if something is broken
+	/usr/bin/perl ./sbin/rt-test-dependencies ${depsconf} > "${T}"/t
+	if grep -q "MISSING" "${T}"/t; then
+		ewarn "Missing Perl dependency!"
+		ewarn
+		cat "${T}"/t | grep MISSING
+		ewarn
+		ewarn "Please run perl-cleaner. If the problem persists,"
+		ewarn "please file a bug in the Gentoo Bugzilla with the information above"
+		die "Missing dependencies."
+	fi
+}
+
+src_compile() { :; }
+
+src_install() {
+	webapp_src_preinst
+	emake install
+
+	dodoc -r docs/*
+	# Disable compression because `perldoc` doesn't decompress transparently
+	docompress -x /usr/share/doc
+
+	# make sure we don't clobber existing site configuration
+	rm -f "${ED}"/${MY_HOSTROOTDIR}/${PF}/etc/RT_SiteConfig.pm
+
+	# fix paths
+	find "${ED}" -type f -print0 | xargs -0 sed -i -e "s:${ED}::g"
+
+	# copy upgrade files
+	insinto "${MY_HOSTROOTDIR}/${PF}"
+	doins -r etc/upgrade
+
+	if use lighttpd ; then
+		newinitd "${FILESDIR}"/${PN}.init.d.2 ${PN}
+		newconfd "${FILESDIR}"/${PN}.conf.d.2 ${PN}
+		sed -i -e "s/@@PF@@/${PF}/g" "${ED}"/etc/conf.d/${PN} || die
+	fi
+
+	# require the web server's permissions
+	webapp_serverowned "${MY_HOSTROOTDIR}"/${PF}/var
+	webapp_serverowned "${MY_HOSTROOTDIR}"/${PF}/var/mason_data/obj
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_hook_script "${FILESDIR}"/reconfig
+
+	webapp_src_install
+}
diff --git a/www-apps/rt/rt-4.4.1-r1.ebuild b/www-apps/rt/rt-4.4.1-r1.ebuild
new file mode 100644
index 000000000000..3914f8393742
--- /dev/null
+++ b/www-apps/rt/rt-4.4.1-r1.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit webapp eutils depend.apache user
+
+DESCRIPTION="RT is an enterprise-grade ticketing system"
+HOMEPAGE="http://www.bestpractical.com/rt/"
+SRC_URI="http://download.bestpractical.com/pub/${PN}/release/${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+IUSE="mysql +postgres fastcgi lighttpd"
+REQUIRED_USE="^^ ( mysql postgres )"
+
+RESTRICT="test"
+
+DEPEND="
+	>=dev-lang/perl-5.10.1
+
+	>=dev-perl/Apache-Session-1.53
+	>=dev-perl/CGI-4
+	>=dev-perl/CSS-Squish-0.06
+	>=dev-perl/Class-Accessor-0.34
+	>=dev-perl/Class-ReturnValue-0.550.0-r1
+	>=dev-perl/DBI-1.37
+	>=dev-perl/Date-Extract-0.02
+	>=dev-perl/DateTime-Format-Natural-0.67
+	>=dev-perl/Devel-StackTrace-1.19
+	>=dev-perl/HTML-FormatText-WithLinks-0.14
+	>=dev-perl/HTML-Mason-1.43
+	>=dev-perl/HTML-Scrubber-0.08
+	>=dev-perl/HTTP-Server-Simple-0.34
+	>=dev-perl/HTTP-Server-Simple-Mason-0.14
+	>=dev-perl/Locale-Maketext-Lexicon-0.32
+	>=dev-perl/Log-Dispatch-2.410.0
+	>=dev-perl/MIME-tools-5.425
+	>=dev-perl/MailTools-1.60
+	>=dev-perl/Module-Versions-Report-1.05
+	>=dev-perl/Role-Basic-0.12
+	>=dev-perl/Symbol-Global-Name-0.04
+	>=dev-perl/Text-Quoted-2.80.0
+	>=dev-perl/Text-WikiFormat-0.76
+	>=dev-perl/Tree-Simple-1.04
+	>=dev-perl/XML-RSS-1.05
+	>=dev-perl/DBIx-SearchBuilder-1.660.0
+	>=virtual/perl-Digest-MD5-2.27
+	>=virtual/perl-Encode-2.730.0
+	>=virtual/perl-File-Spec-0.8
+	>=virtual/perl-Getopt-Long-2.24
+	>=virtual/perl-Locale-Maketext-1.06
+	>=virtual/perl-Storable-2.08
+	dev-perl/Business-Hours
+	dev-perl/CGI-Emulate-PSGI
+	dev-perl/CGI-PSGI
+	dev-perl/Cache-Simple-TimedExpiry
+	dev-perl/Calendar-Simple
+	dev-perl/Convert-Color
+	dev-perl/Crypt-Eksblowfish
+	dev-perl/Crypt-SSLeay
+	dev-perl/Crypt-X509
+	dev-perl/CSS-Minifier-XS
+	dev-perl/Data-Page-Pageset
+	dev-perl/DBD-SQLite
+	dev-perl/Data-GUID
+	dev-perl/Data-ICal
+	dev-perl/Date-Manip
+	dev-perl/Devel-GlobalDestruction
+	dev-perl/Email-Address
+	dev-perl/Email-Address-List
+	dev-perl/File-ShareDir
+	dev-perl/File-Which
+	dev-perl/GDGraph
+	dev-perl/GDTextUtil
+	dev-perl/GD[png,gif]
+	dev-perl/GnuPG-Interface
+	dev-perl/GraphViz
+	dev-perl/HTML-Formatter
+	dev-perl/HTML-FormatText-WithLinks-AndTables
+	dev-perl/HTML-Mason-PSGIHandler
+	dev-perl/HTML-Parser
+	dev-perl/HTML-Quoted
+	dev-perl/HTML-RewriteAttributes
+	dev-perl/HTML-Tree
+	dev-perl/IPC-Run3
+	dev-perl/JSON
+	dev-perl/JavaScript-Minifier-XS
+	dev-perl/MIME-Types
+	dev-perl/Module-Refresh
+	dev-perl/Mozilla-CA
+	dev-perl/Net-CIDR
+	dev-perl/PerlIO-eol
+	dev-perl/Plack
+	dev-perl/Regexp-Common-net-CIDR
+	dev-perl/Regexp-IPv6
+	dev-perl/Scope-Upper
+	dev-perl/Starlet
+	dev-perl/String-ShellQuote
+	dev-perl/TermReadKey
+	dev-perl/Text-Autoformat
+	dev-perl/Text-Password-Pronounceable
+	dev-perl/Time-ParseDate
+	dev-perl/TimeDate
+	dev-perl/UNIVERSAL-require
+	dev-perl/libwww-perl
+	dev-perl/Locale-Maketext-Fuzzy
+	dev-perl/Net-IP
+	dev-perl/Net-Server
+	dev-perl/Regexp-Common
+	dev-perl/Text-Template
+	dev-perl/Text-Wrapper
+	virtual/perl-Digest
+	virtual/perl-File-Temp
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Time-HiRes
+	virtual/perl-libnet
+
+	fastcgi? (
+		dev-perl/FCGI
+		dev-perl/FCGI-ProcManager
+	)
+	!lighttpd? (
+		dev-perl/Apache-DBI
+		!fastcgi? ( >=www-apache/mod_perl-2 )
+	)
+	lighttpd? ( dev-perl/FCGI )
+	mysql? ( >=dev-perl/DBD-mysql-2.1018 )
+	postgres? ( >=dev-perl/DBD-Pg-1.43 )
+"
+
+RDEPEND="${DEPEND}
+	virtual/mta
+	!lighttpd? ( ${APACHE2_DEPEND} )
+	lighttpd? (
+		>=www-servers/lighttpd-1.3.13
+		sys-apps/openrc
+	)
+"
+
+need_httpd_cgi
+
+add_user_rt() {
+	# add new user
+	# suexec2 requires uid >= 1000; enewuser is of no help here
+	# From: Mike Frysinger <vapier@gentoo.org>
+	# Date: Fri, 17 Jun 2005 08:41:44 -0400
+	# i'd pick a 5 digit # if i were you
+
+	local euser="rt"
+
+	# first check if username rt exists
+	if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
+		# check uid
+		rt_uid=$(egetent passwd "${euser}" | cut -d: -f3)
+		if $(expr ${rt_uid} '<' 1000 > /dev/null); then
+			ewarn "uid of user rt is less than 1000. suexec2 will not work."
+			ewarn "If you want to use FastCGI, please delete the user 'rt'"
+			ewarn "from your system and re-emerge www-apps/rt"
+		fi
+		return 0 # all is well
+	fi
+
+	# add user
+	# stolen from enewuser
+	local pwrange euid
+
+	pwrange=$(seq 10001 11001)
+	for euid in ${pwrange} ; do
+		[[ -z $(egetent passwd ${euid}) ]] && break
+	done
+	if [[ ${euid} == "11001" ]]; then
+		# she gets around, doesn't she?
+		die "No available uid's found"
+	fi
+
+	elog " - Userid: ${euid}"
+
+	enewuser rt ${euid} -1 /dev/null rt
+	return 0
+}
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	ewarn
+	ewarn "If you are upgrading from an existing RT installation"
+	ewarn "make sure to read the related upgrade documentation in"
+	ewarn "${ROOT}usr/share/doc/${PF}."
+	ewarn
+
+	enewgroup rt
+	add_user_rt || die "Could not add user"
+}
+
+src_prepare() {
+	# add Gentoo-specific layout
+	cat "${FILESDIR}"/config.layout-gentoo >> config.layout
+	sed -e "s|PREFIX|${ED}/${MY_HOSTROOTDIR}/${PF}|g" \
+		-e "s|HTMLDIR|${ED}/${MY_HTDOCSDIR}|g" \
+		-e 's|/\+|/|g' \
+		-i ./config.layout || die 'config sed failed'
+
+	# don't need to check dev dependencies
+	sed -e "s|\$args{'with-DEV'} =1;|#\$args{'with-DEV'} =1;|" \
+		-i sbin/rt-test-dependencies.in || die 'dev sed failed'
+
+	epatch "${FILESDIR}/rt-makefile-serialize-install-prereqs.patch"
+}
+
+src_configure() {
+	local web
+	local myconf
+	local depsconf
+
+	if use mysql ; then
+		myconf="--with-db-type=mysql --with-db-dba=root"
+		depsconf="--with-MYSQL"
+	elif use postgres ; then
+		myconf="--with-db-type=Pg --with-db-dba=postgres"
+		depsconf="--with-PG"
+	else
+		die "Pick a database backend"
+	fi
+
+	if use fastcgi ; then
+		myconf+=" --with-web-handler=fastcgi"
+		web="apache"
+		depsconf+=" --with-FASTCGI"
+	elif use lighttpd ; then
+		myconf+=" --with-web-handler=fastcgi"
+		web="lighttpd"
+		depsconf+=" --with-FASTCGI"
+	else
+		myconf+=" --with-web-handler=modperl2"
+		web="apache"
+		depsconf+=" --with-MODPERL2"
+	fi
+	# Any loading Date::Manip from here on
+	# may fail if TZ=Factory as it is on gentoo install
+	# media ( affects install as well )
+	export TZ=UTC
+
+	./configure --enable-layout=Gentoo \
+		--with-bin-owner=rt \
+		--with-libs-owner=rt \
+		--with-libs-group=rt \
+		--with-rt-group=rt \
+		--with-web-user=${web} \
+		--with-web-group=${web} \
+		${myconf}
+
+	# check for missing deps and ask to report if something is broken
+	/usr/bin/perl ./sbin/rt-test-dependencies ${depsconf} > "${T}"/t
+	if grep -q "MISSING" "${T}"/t; then
+		ewarn "Missing Perl dependency!"
+		ewarn
+		cat "${T}"/t | grep MISSING
+		ewarn
+		ewarn "Please run perl-cleaner. If the problem persists,"
+		ewarn "please file a bug in the Gentoo Bugzilla with the information above"
+		die "Missing dependencies."
+	fi
+}
+
+src_compile() { :; }
+
+src_install() {
+	webapp_src_preinst
+	emake install
+
+	dodoc -r docs/*
+	# Disable compression because `perldoc` doesn't decompress transparently
+	docompress -x /usr/share/doc
+
+	# make sure we don't clobber existing site configuration
+	rm -f "${ED}"/${MY_HOSTROOTDIR}/${PF}/etc/RT_SiteConfig.pm
+
+	# fix paths
+	find "${ED}" -type f -print0 | xargs -0 sed -i -e "s:${ED}::g"
+
+	# copy upgrade files
+	insinto "${MY_HOSTROOTDIR}/${PF}"
+	doins -r etc/upgrade
+
+	if use lighttpd ; then
+		newinitd "${FILESDIR}"/${PN}.init.d.2 ${PN}
+		newconfd "${FILESDIR}"/${PN}.conf.d.2 ${PN}
+		sed -i -e "s/@@PF@@/${PF}/g" "${ED}"/etc/conf.d/${PN} || die
+	fi
+
+	# require the web server's permissions
+	webapp_serverowned "${MY_HOSTROOTDIR}"/${PF}/var
+	webapp_serverowned "${MY_HOSTROOTDIR}"/${PF}/var/mason_data/obj
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_hook_script "${FILESDIR}"/reconfig
+
+	webapp_src_install
+}
diff --git a/www-apps/rt/rt-4.4.1.ebuild b/www-apps/rt/rt-4.4.1.ebuild
deleted file mode 100644
index 352322924004..000000000000
--- a/www-apps/rt/rt-4.4.1.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit webapp eutils depend.apache user
-
-DESCRIPTION="RT is an enterprise-grade ticketing system"
-HOMEPAGE="http://www.bestpractical.com/rt/"
-SRC_URI="http://download.bestpractical.com/pub/${PN}/release/${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2"
-IUSE="mysql +postgres fastcgi lighttpd"
-REQUIRED_USE="^^ ( mysql postgres )"
-
-RESTRICT="test"
-
-DEPEND="
-	>=dev-lang/perl-5.10.1
-
-	>=dev-perl/Apache-Session-1.53
-	>=dev-perl/CGI-4
-	>=dev-perl/CSS-Squish-0.06
-	>=dev-perl/Class-Accessor-0.34
-	>=dev-perl/Class-ReturnValue-0.550.0-r1
-	>=dev-perl/DBI-1.37
-	>=dev-perl/Date-Extract-0.02
-	>=dev-perl/DateTime-Format-Natural-0.67
-	>=dev-perl/Devel-StackTrace-1.19
-	>=dev-perl/HTML-FormatText-WithLinks-0.14
-	>=dev-perl/HTML-Mason-1.43
-	>=dev-perl/HTML-Scrubber-0.08
-	>=dev-perl/HTTP-Server-Simple-0.34
-	>=dev-perl/HTTP-Server-Simple-Mason-0.14
-	>=dev-perl/Locale-Maketext-Lexicon-0.32
-	>=dev-perl/Log-Dispatch-2.410.0
-	>=dev-perl/MIME-tools-5.425
-	>=dev-perl/MailTools-1.60
-	>=dev-perl/Module-Versions-Report-1.05
-	>=dev-perl/Role-Basic-0.12
-	>=dev-perl/Symbol-Global-Name-0.04
-	>=dev-perl/Text-Quoted-2.80.0
-	>=dev-perl/Text-WikiFormat-0.76
-	>=dev-perl/Tree-Simple-1.04
-	>=dev-perl/XML-RSS-1.05
-	>=dev-perl/DBIx-SearchBuilder-1.660.0
-	>=virtual/perl-Digest-MD5-2.27
-	>=virtual/perl-Encode-2.730.0
-	>=virtual/perl-File-Spec-0.8
-	>=virtual/perl-Getopt-Long-2.24
-	>=virtual/perl-Locale-Maketext-1.06
-	>=virtual/perl-Storable-2.08
-	dev-perl/Business-Hours
-	dev-perl/CGI-Emulate-PSGI
-	dev-perl/CGI-PSGI
-	dev-perl/Cache-Simple-TimedExpiry
-	dev-perl/Calendar-Simple
-	dev-perl/Convert-Color
-	dev-perl/Crypt-Eksblowfish
-	dev-perl/Crypt-SSLeay
-	dev-perl/Crypt-X509
-	dev-perl/CSS-Minifier-XS
-	dev-perl/Data-Page-Pageset
-	dev-perl/DBD-SQLite
-	dev-perl/Data-GUID
-	dev-perl/Data-ICal
-	dev-perl/Date-Manip
-	dev-perl/Devel-GlobalDestruction
-	dev-perl/Email-Address
-	dev-perl/Email-Address-List
-	dev-perl/File-ShareDir
-	dev-perl/File-Which
-	dev-perl/GDGraph
-	dev-perl/GDTextUtil
-	dev-perl/GD[png,gif]
-	dev-perl/GnuPG-Interface
-	dev-perl/GraphViz
-	dev-perl/HTML-Format
-	dev-perl/HTML-FormatText-WithLinks-AndTables
-	dev-perl/HTML-Mason-PSGIHandler
-	dev-perl/HTML-Parser
-	dev-perl/HTML-Quoted
-	dev-perl/HTML-RewriteAttributes
-	dev-perl/HTML-Tree
-	dev-perl/IPC-Run3
-	dev-perl/JSON
-	dev-perl/JavaScript-Minifier-XS
-	dev-perl/MIME-Types
-	dev-perl/Module-Refresh
-	dev-perl/Mozilla-CA
-	dev-perl/Net-CIDR
-	dev-perl/PerlIO-eol
-	dev-perl/Plack
-	dev-perl/Regexp-Common-net-CIDR
-	dev-perl/Regexp-IPv6
-	dev-perl/Scope-Upper
-	dev-perl/Starlet
-	dev-perl/String-ShellQuote
-	dev-perl/TermReadKey
-	dev-perl/Text-Autoformat
-	dev-perl/Text-Password-Pronounceable
-	dev-perl/Time-ParseDate
-	dev-perl/TimeDate
-	dev-perl/UNIVERSAL-require
-	dev-perl/libwww-perl
-	dev-perl/Locale-Maketext-Fuzzy
-	dev-perl/Net-IP
-	dev-perl/Net-Server
-	dev-perl/Regexp-Common
-	dev-perl/Text-Template
-	dev-perl/Text-Wrapper
-	virtual/perl-Digest
-	virtual/perl-File-Temp
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-Time-HiRes
-	virtual/perl-libnet
-
-	fastcgi? (
-		dev-perl/FCGI
-		dev-perl/FCGI-ProcManager
-	)
-	!lighttpd? (
-		dev-perl/Apache-DBI
-		!fastcgi? ( >=www-apache/mod_perl-2 )
-	)
-	lighttpd? ( dev-perl/FCGI )
-	mysql? ( >=dev-perl/DBD-mysql-2.1018 )
-	postgres? ( >=dev-perl/DBD-Pg-1.43 )
-"
-
-RDEPEND="${DEPEND}
-	virtual/mta
-	!lighttpd? ( ${APACHE2_DEPEND} )
-	lighttpd? (
-		>=www-servers/lighttpd-1.3.13
-		sys-apps/openrc
-	)
-"
-
-need_httpd_cgi
-
-add_user_rt() {
-	# add new user
-	# suexec2 requires uid >= 1000; enewuser is of no help here
-	# From: Mike Frysinger <vapier@gentoo.org>
-	# Date: Fri, 17 Jun 2005 08:41:44 -0400
-	# i'd pick a 5 digit # if i were you
-
-	local euser="rt"
-
-	# first check if username rt exists
-	if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
-		# check uid
-		rt_uid=$(egetent passwd "${euser}" | cut -d: -f3)
-		if $(expr ${rt_uid} '<' 1000 > /dev/null); then
-			ewarn "uid of user rt is less than 1000. suexec2 will not work."
-			ewarn "If you want to use FastCGI, please delete the user 'rt'"
-			ewarn "from your system and re-emerge www-apps/rt"
-		fi
-		return 0 # all is well
-	fi
-
-	# add user
-	# stolen from enewuser
-	local pwrange euid
-
-	pwrange=$(seq 10001 11001)
-	for euid in ${pwrange} ; do
-		[[ -z $(egetent passwd ${euid}) ]] && break
-	done
-	if [[ ${euid} == "11001" ]]; then
-		# she gets around, doesn't she?
-		die "No available uid's found"
-	fi
-
-	elog " - Userid: ${euid}"
-
-	enewuser rt ${euid} -1 /dev/null rt
-	return 0
-}
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	ewarn
-	ewarn "If you are upgrading from an existing RT installation"
-	ewarn "make sure to read the related upgrade documentation in"
-	ewarn "${ROOT}usr/share/doc/${PF}."
-	ewarn
-
-	enewgroup rt
-	add_user_rt || die "Could not add user"
-}
-
-src_prepare() {
-	# add Gentoo-specific layout
-	cat "${FILESDIR}"/config.layout-gentoo >> config.layout
-	sed -e "s|PREFIX|${ED}/${MY_HOSTROOTDIR}/${PF}|g" \
-		-e "s|HTMLDIR|${ED}/${MY_HTDOCSDIR}|g" \
-		-e 's|/\+|/|g' \
-		-i ./config.layout || die 'config sed failed'
-
-	# don't need to check dev dependencies
-	sed -e "s|\$args{'with-DEV'} =1;|#\$args{'with-DEV'} =1;|" \
-		-i sbin/rt-test-dependencies.in || die 'dev sed failed'
-
-	epatch "${FILESDIR}/rt-makefile-serialize-install-prereqs.patch"
-}
-
-src_configure() {
-	local web
-	local myconf
-	local depsconf
-
-	if use mysql ; then
-		myconf="--with-db-type=mysql --with-db-dba=root"
-		depsconf="--with-MYSQL"
-	elif use postgres ; then
-		myconf="--with-db-type=Pg --with-db-dba=postgres"
-		depsconf="--with-PG"
-	else
-		die "Pick a database backend"
-	fi
-
-	if use fastcgi ; then
-		myconf+=" --with-web-handler=fastcgi"
-		web="apache"
-		depsconf+=" --with-FASTCGI"
-	elif use lighttpd ; then
-		myconf+=" --with-web-handler=fastcgi"
-		web="lighttpd"
-		depsconf+=" --with-FASTCGI"
-	else
-		myconf+=" --with-web-handler=modperl2"
-		web="apache"
-		depsconf+=" --with-MODPERL2"
-	fi
-	# Any loading Date::Manip from here on
-	# may fail if TZ=Factory as it is on gentoo install
-	# media ( affects install as well )
-	export TZ=UTC
-
-	./configure --enable-layout=Gentoo \
-		--with-bin-owner=rt \
-		--with-libs-owner=rt \
-		--with-libs-group=rt \
-		--with-rt-group=rt \
-		--with-web-user=${web} \
-		--with-web-group=${web} \
-		${myconf}
-
-	# check for missing deps and ask to report if something is broken
-	/usr/bin/perl ./sbin/rt-test-dependencies ${depsconf} > "${T}"/t
-	if grep -q "MISSING" "${T}"/t; then
-		ewarn "Missing Perl dependency!"
-		ewarn
-		cat "${T}"/t | grep MISSING
-		ewarn
-		ewarn "Please run perl-cleaner. If the problem persists,"
-		ewarn "please file a bug in the Gentoo Bugzilla with the information above"
-		die "Missing dependencies."
-	fi
-}
-
-src_compile() { :; }
-
-src_install() {
-	webapp_src_preinst
-	emake install
-
-	dodoc -r docs/*
-	# Disable compression because `perldoc` doesn't decompress transparently
-	docompress -x /usr/share/doc
-
-	# make sure we don't clobber existing site configuration
-	rm -f "${ED}"/${MY_HOSTROOTDIR}/${PF}/etc/RT_SiteConfig.pm
-
-	# fix paths
-	find "${ED}" -type f -print0 | xargs -0 sed -i -e "s:${ED}::g"
-
-	# copy upgrade files
-	insinto "${MY_HOSTROOTDIR}/${PF}"
-	doins -r etc/upgrade
-
-	if use lighttpd ; then
-		newinitd "${FILESDIR}"/${PN}.init.d.2 ${PN}
-		newconfd "${FILESDIR}"/${PN}.conf.d.2 ${PN}
-		sed -i -e "s/@@PF@@/${PF}/g" "${ED}"/etc/conf.d/${PN} || die
-	fi
-
-	# require the web server's permissions
-	webapp_serverowned "${MY_HOSTROOTDIR}"/${PF}/var
-	webapp_serverowned "${MY_HOSTROOTDIR}"/${PF}/var/mason_data/obj
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_hook_script "${FILESDIR}"/reconfig
-
-	webapp_src_install
-}
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 512ddc2d1068..471f363885ac 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -20,9 +20,11 @@ AUX chromium-widevine-r1.patch 428 SHA256 c05800f823b3e9522be70645de6a9b48285603
 AUX chromium.default 148 SHA256 bdac1d32025d53158f96c8ad5bd71a58abdcf02f3a8759a43154e97e812fcdd1 SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739 WHIRLPOOL 2e51e864134426668cc73fc5081c35288677d8ce855b07dfbd3413397f9c43148a6d6096a9b7a617511388f87623a3ce7f3387103202db53876a74bccb9dbe6c
 AUX toolchain/BUILD.gn 799 SHA256 7b42f63ac928b7d1ff8e4d91cc620e944d581beb26c64fe7e1560f10a9c5ad94 SHA512 8da134d99f050ecdecb06d4ec34287747cd9ee57ccbf6fe334b034812fb95fdee3af8421b10be3ee4f71020ca4029de626cd2770865b1e527bfac966d6d8ea2d WHIRLPOOL 7d9b145da023b223eaf0a9c6907a42ece9f880b83abcc4ef45624436901bc21fefe5f4823e67350a07b60e2ea4718ee4bf21542264fd2c7d1f6ba6b8cbc3daa0
 DIST chromium-62.0.3202.62.tar.xz 517105788 SHA256 e8df3150386729ddcb4971636627e54815ad447be5f122201e310f5bb0bcc362 SHA512 26296ac1cddfe087e8984b12b4916b9a87b08fc75875900441c9e4abd8b562bb622ac1a34bc9fb2aecf22d5a424ef1247dc694b9e6bdd0ea8b32397f53794723 WHIRLPOOL f17df2fd505a961dcc3dc634243dd11a7af09543325a0e59e2f322488c877af678840652e8308f4ea6c75c3d77fa73156be423007be76feaa9291042bbc63614
+DIST chromium-62.0.3202.75.tar.xz 517136048 SHA256 49cdfe457bcb941b56c13a75bbe2ff394fcb5baa8a49c9b470835fad60dd904c SHA512 1108ac0b383ac654b5b6fb42faee76621d3c476fcf1b6469f498023be7272668f46f7081f74b2a4079ff45dc3c77b225cea7758a11677b0ba5a478e1d8bac87b WHIRLPOOL 0bcb844ec55469ff293672e075dc8bbf4b93809048fc8e5235334dea06e087c91286ba023831ac5254b27241146a06fd33360ef540f6a37cd7092763cc55ab09
 DIST chromium-63.0.3223.8.tar.xz 541587956 SHA256 bced462e16a28ff0a3896539e6c7f72e76cb7ba16640a6cac9a533ec4b8f5ee5 SHA512 6ca0efac47adee14b04cba312397b80aeaed1b0ce9bee427c508c44636ab9a1668f743bd3939d83417129d7e83c38c2f95b72c502c6d834056cf7477ef8b4de8 WHIRLPOOL b9f526eec3626b93f2541461b9b3a79bef283de62d99e30c209859e686db8e09ed327f90d0811703d699e9813cb86e0002be93fa42372e65afef1c96b8c91d35
 DIST chromium-63.0.3230.0.tar.xz 558852780 SHA256 97daa90a6f0ba7dc49a168cbf9c40896e621fb0352ab6de1d2fa428bb63ab64a SHA512 b0aa9a42df303bc7ff412dec30b3bfed292ae39cb5e0f705f28eeb7a60d6125b9cecef7e3ab7798b2ca091ec71215fa5639def6b867c9fdb7a9a85c9b42323b3 WHIRLPOOL 1b9e346018c7056fce3f844d37b69e98529c9dc3ae04bdf07378c7de568d295814a42aa133c463a3be8d22a39b5f62ec69f679ea5dca3fe7e37a15215932c794
 EBUILD chromium-62.0.3202.62.ebuild 19510 SHA256 57744a47ea2207e8146255b0c4c579d0a722883e562b6a16f5da16a3d17d3599 SHA512 6e7354e10e4489149ca84c05a07308beae10fe1fb1172302b0aec071878cf8cbce20ba75c8bab61a02aa87748a982dee81a077f7b11b987b5439626a0d773dab WHIRLPOOL bf74f474780002e8a7c62b9ff9639bd76c9bdb978f9cdf4ec38d3781690e2e1bbd3e7e0b4845ef09bd4a248c9a538c8fce04e09c93c14f44253ab7060d41ba1b
+EBUILD chromium-62.0.3202.75.ebuild 19511 SHA256 5d50b83c2d89302307e83dd0d644ec713b3c685e4fd0fb6b348954680d13a56c SHA512 b0285c363adb1b36bec775ff69091b7c9a94b0d597e7954e1af8fc8a6b5c312d471c5ce75a1e1baab3f1eeed601f6dae4f0320fdc859dd1ad8d3f370af908ce3 WHIRLPOOL 059cea283125c08921bf343e7e5bac8408dfe2ce219abcc8cb4b83750a5a4442ea673eb9d3c2a2423f7a3f00b01e2a83f7db339bb9b4ebdf1451d43fdd3d9b15
 EBUILD chromium-63.0.3223.8.ebuild 19488 SHA256 87be09e2139856c5233d2e74315f7549e79605da663c6ba2e8264dafd1e48720 SHA512 de8e2b69f2dcffd0edaddb4c3aaa5689c959bc9b74b68e0bacf40aa8d32295f116b3e55b389e648a368c692a366a8d6ec5926b0e4794dc41c7ff89408f2238ab WHIRLPOOL da731abfa0d5b286578bee83fd14eb39c0ae537911ad089150a6afdf149439ac1210c3f47f0ceef31fe30b5759b9fac34b358cc4b75948e3972dbf4bd0bcc6fd
 EBUILD chromium-63.0.3230.0.ebuild 19611 SHA256 8123136fa657757dc97e34d1528c8bdeb55be7e932d885ff8e108d2a74465cee SHA512 9104874627988e7d946ac804589399f0e688aa0101da0b00137cc46a3eb15f0b64f09157af8748a93170728672af6e839e2b84b3742d3820956a211f0856ce9c WHIRLPOOL 7ea8ab0400d15fa8721177aef8bc76ad99c08e8a2f4a1ca63fdf99db7b4f744753582663c9dd9fc854878d12906a98a3c1cd10c61e0275a638594c0fec485d9a
 MISC ChangeLog 61379 SHA256 6089c72a9ad011b043f45bf3057c79f999d2aad5f4ecf0f9f45f9ced5156a18c SHA512 05868a71dfe2cbabb32b664968939704ada3c56bdd70aee289dbc60c5708e07df8496090687bf9b4659810872f629d53530990820e0da57b792a31add93d1f19 WHIRLPOOL fb91699e99261a3128ac7d931cfa5ec34a8884682935cc0740a129119f0b8d18a2aa83652ee06e0e6900371007cffbaea46f4e5d450ff2817d12e96cc819cca9
diff --git a/www-client/chromium/chromium-62.0.3202.75.ebuild b/www-client/chromium/chromium-62.0.3202.75.ebuild
new file mode 100644
index 000000000000..6efcf7ee0603
--- /dev/null
+++ b/www-client/chromium/chromium-62.0.3202.75.ebuild
@@ -0,0 +1,653 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="component-build cups gnome-keyring +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+
+COMMON_DEPEND="
+	app-arch/bzip2:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	dev-libs/expat:=
+	dev-libs/glib:2
+	system-icu? ( >=dev-libs/icu-59:= )
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.14.3:=
+	>=dev-libs/re2-0.2016.05.01:=
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	>=media-libs/harfbuzz-1.4.2:=[icu(-)]
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
+	>=media-libs/openh264-1.6.0:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? (
+		>=media-video/ffmpeg-3:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		!=net-fs/samba-4.5.12
+		media-libs/opus:=
+	)
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	app-arch/snappy:=
+	media-libs/flac:=
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+"
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND="${COMMON_DEPEND}
+	!=www-client/chromium-9999
+	!<www-plugins/chrome-binary-plugins-57
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+# sys-apps/sandbox - https://crbug.com/586444
+DEPEND="${COMMON_DEPEND}
+	>=app-arch/gzip-1.7
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-4.6.1
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+	dev-vcs/git
+	$(python_gen_any_dep '
+		dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+		>=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	')
+"
+
+# Keep this in sync with the python_gen_any_dep call.
+python_check_deps() {
+	has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
+	has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
+	has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
+	has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-widevine-r1.patch"
+	"${FILESDIR}/${PN}-FORTIFY_SOURCE-r2.patch"
+	"${FILESDIR}/${PN}-gcc5-r3.patch"
+	"${FILESDIR}/${PN}-gn-bootstrap-r17.patch"
+	"${FILESDIR}/${PN}-glibc2.26-r1.patch"
+)
+
+pre_build_checks() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
+			# bugs: #601654
+			die "At least clang 3.9.1 is required"
+		fi
+		if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then
+			# bugs: #535730, #525374, #518668, #600288, #627356
+			die "At least gcc 5.0 is required"
+		fi
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="5G"
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		CHECKREQS_DISK_BUILD="25G"
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	eshopts_pop
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	# Make sure the build system will use the right python, bug #344367.
+	python-any-r1_pkg_setup
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	default
+
+	mkdir -p third_party/node/linux/node-linux-x64/bin || die
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	local keeplibs=(
+		base/third_party/dmg_fp
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		breakpad/src/third_party/curl
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		third_party/WebKit
+		third_party/analytics
+		third_party/angle
+		third_party/angle/src/common/third_party/base
+		third_party/angle/src/common/third_party/murmurhash
+		third_party/angle/src/third_party/compiler
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/trace_event
+		third_party/boringssl
+		third_party/brotli
+		third_party/cacheinvalidation
+		third_party/catapult
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/py_vulcanize
+		third_party/catapult/third_party/py_vulcanize/third_party/rcssmin
+		third_party/catapult/third_party/py_vulcanize/third_party/rjsmin
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/ced
+		third_party/cld_2
+		third_party/cld_3
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/devscripts
+		third_party/dom_distiller_js
+		third_party/fips181
+		third_party/flatbuffers
+		third_party/flot
+		third_party/freetype
+		third_party/glslang-angle
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/jinja2
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libXNVCtrl
+		third_party/libaddressinput
+		third_party/libjingle
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libudev
+		third_party/libwebm
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/markupsafe
+		third_party/mesa
+		third_party/modp_b64
+		third_party/mt19937ar
+		third_party/node
+		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+		third_party/openmax_dl
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/build
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/ply
+		third_party/polymer
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/qcms
+		third_party/sfntly
+		third_party/skia
+		third_party/skia/third_party/gif
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/spirv-headers
+		third_party/spirv-tools-angle
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/subzero
+		third_party/usrsctp
+		third_party/vulkan
+		third_party/vulkan-validation-layers
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webrtc
+		third_party/widevine
+		third_party/woff2
+		third_party/zlib/google
+		url/third_party/mozilla
+		v8/src/third_party/valgrind
+		v8/third_party/inspector_protocol
+
+		# gyp -> gn leftovers
+		base/third_party/libevent
+		third_party/adobe
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+		third_party/yasm/run_yasm.py
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg third_party/opus )
+	fi
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+	if ! use system-libvpx; then
+		keeplibs+=( third_party/libvpx )
+		keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
+	fi
+	if use tcmalloc; then
+		keeplibs+=( third_party/tcmalloc )
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+}
+
+bootstrap_gn() {
+	if tc-is-cross-compiler; then
+		local -x AR=${BUILD_AR}
+		local -x CC=${BUILD_CC}
+		local -x CXX=${BUILD_CXX}
+		local -x NM=${BUILD_NM}
+		local -x CFLAGS=${BUILD_CFLAGS}
+		local -x CXXFLAGS=${BUILD_CXXFLAGS}
+		local -x LDFLAGS=${BUILD_LDFLAGS}
+	fi
+	einfo "Building GN..."
+	set -- tools/gn/bootstrap/bootstrap.py -s -v --no-clean
+	echo "$@"
+	"$@" || die
+}
+
+src_configure() {
+	local myconf_gn=""
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=$(usex component-build true false)"
+
+	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		harfbuzz-ng
+		libdrm
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		openh264
+		re2
+		snappy
+		yasm
+		zlib
+	)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg opus )
+	fi
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if use system-libvpx; then
+		gn_system_libraries+=( libvpx )
+	fi
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# Optional dependencies.
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+	myconf_gn+=" use_cups=$(usex cups true false)"
+	myconf_gn+=" use_gconf=false"
+	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
+	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+
+	# TODO: link_pulseaudio=true for GN.
+
+	myconf_gn+=" fieldtrial_testing_like_official_build=true"
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
+	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
+
+	local myarch="$(tc-arch)"
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		myconf_gn+=" target_cpu=\"x86\""
+		ffmpeg_target_arch=ia32
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		myconf_gn+=" target_cpu=\"arm\""
+		ffmpeg_target_arch=$(usex neon arm-neon arm)
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
+		fi
+	fi
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+	else
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+	fi
+
+	# https://bugs.gentoo.org/588596
+	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	if ! use system-ffmpeg; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	bootstrap_gn
+
+	einfo "Configuring Chromium..."
+	set -- out/Release/gn gen --args="${myconf_gn}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	local ninja_targets="chrome chromedriver"
+	if use suid; then
+		ninja_targets+=" chrome_sandbox"
+	fi
+
+	# Build mksnapshot and pax-mark it.
+	if tc-is-cross-compiler; then
+		eninja -C out/Release host/mksnapshot || die
+		pax-mark m out/Release/host/mksnapshot
+	else
+		eninja -C out/Release mksnapshot || die
+		pax-mark m out/Release/mksnapshot
+	fi
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release ${ninja_targets} || die
+
+	pax-mark m out/Release/chrome
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	if use widevine; then
+		# These will be provided by chrome-binary-plugins
+		rm out/Release/libwidevinecdm*.so || die
+	fi
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	doins out/Release/*.so
+
+	if ! use system-icu; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+
+	insinto "${CHROMIUM_HOME}/swiftshader"
+	doins out/Release/swiftshader/*.so
+
+	newman out/Release/chrome.1 chromium.1
+	newman out/Release/chrome.1 chromium-browser.1
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser \
+		"Chromium" \
+		chromium-browser \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index f51067c045f0..15cafc466117 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,6 +1,8 @@
-AUX elinks-0.10.4.conf-syscharset.diff 2580 SHA256 3269413843aabff245ee3dce522a475e5b3042adf4676b644a63d323bb77818c SHA512 3b17025054f9cf2ed9934ce5c19859eb50a216a295e6712659c4899c3539e3fc571e6f289809ad2d07be44330b96107a8dd65754c23f978bd54def28a24b88b3 WHIRLPOOL 230294ec39cec90ae84fd23644bcdadb97de8635eb794b4baf8e93d0b0fc2932f7b54ee25f6c4e49166aa4e296ab05f5588561fcab56867bb3caee0b9ab9db16
+AUX elinks-0.10.4.conf-syscharset.diff 2584 SHA256 375d1b5fe3cc693035f2db1ad18bd940448c19aba0b3f6f75e30deb023d40dbd SHA512 bed691b24adf7aa408af01e3a0a905946f9fe95cc5ded7e1448d9159ef7777bc2df1c3ef37c5498fc0f64bc59df80493fc42076bafa708c80ef5cba78e8bca9c WHIRLPOOL f536c9bf51de0697842a704a65329c75e88f8f3393b846eb0aad44ddde8cba8634a6107c1617b84aa74f52dfc869cdf0dba60a0dad5c1c8502f6c9f6ed0a38f5
 AUX elinks-0.11.2-lua-5.1.patch 538 SHA256 d931af4db13b53be32def17417d86ee916511209ce9a54f25d017ee2d24473d4 SHA512 48aca9662b3d9b43ba027d2328acdafe6363f3e2a69e6f2a6d468718c28f12de6247c629273a11aef0b053010a7b7250c03db39fab1cb4cd6d237bd1c69fccef WHIRLPOOL 4f84c457ed14a2d7414edbe374623e5295aa9ee8aa71403d386a46b499143a97d1dc78ff5d8951d602f8d60cefc648f79ed02038267cb58ae79ba062e68d1e34
 AUX elinks-0.12_pre5-compilation-fix.patch 464 SHA256 984c3e1127c18eb0925fbe1cca5bb2a7b214c6cd082db434e8fe37e082715e7e SHA512 7c1232f4f15579f8073cdea7397e4a34d5bec51268eb61cdff854f221615b027c385b81871e7b5fbefeda1ddf5de3008719724b9853798bc198866a25c8840fe WHIRLPOOL 1a3303d1ed36429bf47b4a1e55a87917d3fe20417f218999c1a02a90c199b4a1dc914a674c86fce8c62cb5cb3ab11019c2547de8c9cb44fe5660f2673b706062
+AUX elinks-0.12_pre5-libressl.patch 845 SHA256 2187e35039ec4f151e98de3c90aa30b186cc654f7181e644d7174af3feb2fa0a SHA512 7cf844e5f62abc20b9fffd29c82a786504db4e645a794b98238ea7157db1fe8bfc3e4c211c674ff182aa5d540350b2c8cae34a61891dc79afa1e2525448b747a WHIRLPOOL 45694f73f39a30b149e6d4d16ec916c27b7f5d2825fd4e9f6aa52d9542545f3c11731ce32b12929c0384d4c2929f7f731e5940511254b33d893e2e55a747d459
+AUX elinks-0.12_pre5-rand-egd.patch 738 SHA256 4e0b07b958685cad86a7099f021371f358dbe88dcffc8bc6f955cda30e9cf503 SHA512 7d23496380658f102d933a1722313d1b0396afb0b349260cb7cf735baec4edd08cb5ad363880d6bb95ef67e46770daa8b4aa57116a53ec36762db05a58ed09ff WHIRLPOOL 6203081b1acb9df84493a7ff0ce3fdc8e0e336a7798780526e4caefd611790ad425aaeabef660fc92b8500135e10ff8cc2d0bd58fc91dea544b22971f790aeca
 AUX elinks-0.12_pre5-ruby-1.9.patch 7131 SHA256 4274a6434c42b669fbee9e75a79bd02c33d50472bbb8e1c2ea441b3d2eae20de SHA512 41f8b34f9666740fbadffc4e47467670c7766f3b8612933a08cc6febe975f9453c21c393a43927c11ffe7ef6e0875ef09e125c80e84caa9f0917f864cb1d35e6 WHIRLPOOL 691d259ea49b1a859680b245a383fcf1da79626e848fb35489bdfa787c0fe0c99405610a10a03dbdde7847a838e8ac060c37136b8f71ce73751449afd7b293fa
 AUX elinks-0.12_pre5-sm185-jsval-fixes.patch 3921 SHA256 d59f9e97f5d495803e0ac35726bf42592a8f726c2367fbc08b8fe9de79de4a2f SHA512 62a96d53b529c409d81094899c75cd7943176628e2b7301a005c6ebf9f660e813fbf1f3df213c43148d425e933208f761090b23b6ae75da93a93b13a1e924a34 WHIRLPOOL 03ae46d5a9497ac81db5cca364aa6cda4bfb3dc5864482e11778dfef752ae4c76a374026fafa3e2507c9626c528b483bd68a3277647b4c200de95197507fefa5
 AUX elinks-0.12pre5-spidermonkey-callback.patch 513 SHA256 14b65ba92e8693105945d20de6e8f07ec946f17fbbf5248b4f8c431a92b88982 SHA512 81a2397b90531db291526fed738fd3661362c3d20c4bc330f909375cea3779f32f4286c8c43700bf7c19d6eb177e97acb3c32f15abba052651ee5b947f3bec43 WHIRLPOOL 224e95b0f09c61de04c1b6e9845a56ca94ee5c99fb90a7c9e57800c1cede50658091d7b1b3a7aec5a0bad9b7eff2e5ca4a1f7a107381bf8208b08e1624661f3d
@@ -9,8 +11,9 @@ DIST elinks-0.10.4.conf.bz2 5370 SHA256 cb0fcd10cc592697de5d8d9358447a770d2b4613
 DIST elinks-0.12_pre5-js185-patches.tar.bz2 13820 SHA256 64f7c4a657128983d054bd0d2027e11facd42fcc86bd8dfdf5b27ffbacbd54c8 SHA512 1552aeacdecb0a2db357402e0474d6b4810c767609d1d399b3350a4bcdc21ba9c0bde5a5d0bffd1d7b27d41ac46e3e85ae2527d715a1645a2dd51ab14b8eab3c WHIRLPOOL e6f7746407cd6654c19d4bc71dc4d0fd63070a78f7bc7c43f11f6e388268de963748597b0a2fd03cd22632651800b990ec0819d54799be9bfc4589332e11dbdd
 DIST elinks-0.12pre6.tar.bz2 2854500 SHA256 383646375b8a325bef5a132c8300caab90eb0b842c5f8eff68febc00e29acada SHA512 bff70faafea7c4739695a7fad8f659109894b318588f5a035a5594a6053238789259ce6067c2f5cb97448f138db143adebb23f84bf689bea209ba37573484b7f WHIRLPOOL 2501e7ed557dfcc5ca4175bda3452d8c1dc42c2db2f18a0263373b6f28966619e3b3c75b0ed3d9cb4e04d177bd5d88ecdedda541531adfcd35b6ef4fe4920ed1
 EBUILD elinks-0.12_pre6-r1.ebuild 6169 SHA256 8aa6e19508521d4d980065e2e5bcd61eeba3acb5a0c558ca145dbd0b8ddb620c SHA512 55fdeff2c895755867af2b8955f2c998c0f4630a42bf6b42cd04fc06375319711cd9d16148e4c3522f3aee01fc815afc66f8d7985c861aec93edf662c76dd8b5 WHIRLPOOL ea399425b28c4e9a9e4ce58b4be3480e61815917111464728674a2071bb65c2451e84f880a3c23c69dee135fa6f77c43961cb53ac1ab441e42512b4a62605e88
-EBUILD elinks-0.12_pre6-r2.ebuild 6237 SHA256 a77c2f000850daa94ad1678418c3562dfa74d0c3ca771deb4c7f195198fb9b9e SHA512 577d54441d67bde1ef5c184def7966307d6edbcc7f1150bd7877ac52e92986007b78d7940d368a750459d27943e23a412076a3f48f3842f69dcf7fd3ab79d119 WHIRLPOOL 9d2bd6dddfe15f3ace534675a3d70dd340806f799ab19f1573bcea7915fbc39fd41562610589aebe657a2988e581cccb84fa7bd823c98a3473ba0e906fca89fe
-EBUILD elinks-9999.ebuild 4541 SHA256 1645bce21dfd50610d9d70e2adffaed98542f64161d66ab743e6fa2309a9f1aa SHA512 fc872f241992d8239971b64498d3a1e8b3be26de4b37c1ea3369fb5ff823c96d8e93e9d8d0f6e73bd781836fb1c53d6b6ea11d76d905ca8432d0406a6cee36ae WHIRLPOOL 70c9b08c0299576f20ea3fad5767cfe2713449d569c6f599eee99ae206ad8080290c733d3f529192c36360107bab875f349d7c21d9288038591605a8f30d5499
+EBUILD elinks-0.12_pre6-r2.ebuild 6343 SHA256 e807dc2d6d37388c9613b9dab45e5f2af1223dea72e764fdf1bf5b10dd7bd814 SHA512 f5d57136d9cc2d395bf9557e582a117d45836b81434c5ca35674217930be584587da53d5210e014ecf7b21f3e1ae07a63161f94f85631d85665ff4bd68d6b7ec WHIRLPOOL efae0e1bd4100614f3ff069a1079b0d6cd44c078db1c96939d677b4e72191e385757d603dc04b1d6f12895cc35d9257f3bd43c99f6d026c97b73ac6ad6a8431f
+EBUILD elinks-0.12_pre6-r3.ebuild 5416 SHA256 6eb59b803158f6e914ba86e14ff709ed54c07f2fd3b9a846e8a1d1c4d982709a SHA512 b59b43e845a2b38260b44b6ad9d4c152d7dee2df5f79ef95af2370d75611f7072b47492acd2f6d78d82c71ef8c38d32e7310fd5f830b923d991fcbf1186ebe53 WHIRLPOOL c7ce1bf83cba5bd8ca479907aa0438c062b4407ffabb48be73a2fd65208e20be3734cc22efa5ccd2c8dd576fc88643917dfaf217ff2db2655f567cd7a5d2c17e
+EBUILD elinks-9999.ebuild 4574 SHA256 8e8f25753aac8d4bc7d83719869e99f7af5b918c561cafe2a7f1b37011347b7d SHA512 83afd5e717271d062906b5da0c2a3f47af91c725d20f8f5cd183067c69b108bd036fbf5fdc851049f75902af5cbbba131f96bb05c1df2db7fa65d49756dfd713 WHIRLPOOL 2ec12d3bd7ab9de3218345ac6c2a74ff81c89dcbea0e9a96cda041bb8c7002efad3a4ef53ab9005b708b7a1fca329892d2baf98a11b7ce2b7ae76be16c266f4e
 MISC ChangeLog 4414 SHA256 b262ad1bf7c6a9a6f6c235e3c18dc9d1bf8e02464fe9d02261f027f39030daef SHA512 4e638a40d71c0255fbcaaece19e086b2ab686f3925c94e2bdcdd1db4fc0df5d095c288aecbf1f29eb3d20e9c57e64f325914304c57f3a64167d36533136a8f05 WHIRLPOOL 8081af9da11d5348596d8983c316d0419fbd91653f77c526d4ee975165b3e39f0eefc4af8a631694d8206937491915b808229e3edbdb9792b682b01c4db9e5be
 MISC ChangeLog-2015 31519 SHA256 71745c2c3c1045e62ad4e81c483e1631b1ade3613960e1ceac53e7138667661a SHA512 69e0aed4825d552cc2759f4d450ade766d0af7a9d28bb5dcf0b8f2bd84d42b8ccf3ef3c359ddbca50d6a2adde93d69a9cbbfb1354ddf25d5f76b8debd1bfd281 WHIRLPOOL 46b05f4a92f49f420abd0841116d3e302d5ce9078a8fd4c8df3fe2e56941ba6a21567bbb5130d8a54e677913c7dee25e4a45a27743ce7e3dddc2939e8b0dfe17
-MISC metadata.xml 635 SHA256 03fdbb613dbce47c3e8cd7be83528bdecff6968042931989755f8d55ff4110f3 SHA512 66de279c7b713e59e8579d0990213a152c2a040b02224b4a813e77417aac71fbae4e6ae1e7f0885d1fec5e08dae3d6cf38301e783a7aa25a48250af69b5bfc01 WHIRLPOOL c7e497d81566d35ae20bdebe8b8d8dad03c8b505a522cd59f98dfefaeab8f10639601fcc034362beeea3d0103824eb7b98e849e383696ebe93ceda62f41f2a92
+MISC metadata.xml 989 SHA256 cc80a0b131e9c1dcb136c3b9820bdc1d8d1219a9bbbf1b82818532adcbff4584 SHA512 66a3bb8694de90a61d37a4fe5029afc894b12eba7ce7832159f88ca3168ee99c324179b27edf2876f94b4465e81cc218f5d271fff92a495bed11dd6b8ffad990 WHIRLPOOL b97ead80f12aba36dac7afad2b9e3e7744501a68226cb5929dafceb6e97f3525380773cf13914adb6922d4d1088e6d4232f802f6735d05eb57d643a39052205e
diff --git a/www-client/elinks/elinks-0.12_pre6-r2.ebuild b/www-client/elinks/elinks-0.12_pre6-r2.ebuild
index ed3f69831bd0..e9e8625888a0 100644
--- a/www-client/elinks/elinks-0.12_pre6-r2.ebuild
+++ b/www-client/elinks/elinks-0.12_pre6-r2.ebuild
@@ -56,6 +56,8 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${PN}-9999-parallel-make.patch
 	epatch "${FILESDIR}"/${PN}-0.12_pre5-compilation-fix.patch
+	epatch "${FILESDIR}"/${PN}-0.12_pre5-libressl.patch
+	epatch "${FILESDIR}"/${PN}-0.12_pre5-rand-egd.patch
 
 	if use javascript ; then
 		if has_version ">=dev-lang/spidermonkey-1.8"; then
diff --git a/www-client/elinks/elinks-0.12_pre6-r3.ebuild b/www-client/elinks/elinks-0.12_pre6-r3.ebuild
new file mode 100644
index 000000000000..b57789f25fd0
--- /dev/null
+++ b/www-client/elinks/elinks-0.12_pre6-r3.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils autotools flag-o-matic
+
+MY_P="${P/_/}"
+DESCRIPTION="Advanced and well-established text-mode web browser"
+HOMEPAGE="http://elinks.or.cz/"
+SRC_URI="http://elinks.or.cz/download/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2
+	https://dev.gentoo.org/~axs/distfiles/${PN}-0.12_pre5-js185-patches.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bittorrent bzip2 debug finger ftp gc gopher gpm guile idn ipv6
+	  javascript libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib"
+RESTRICT="test"
+
+DEPEND="
+	bzip2? ( >=app-arch/bzip2-1.0.2 )
+	gc? ( dev-libs/boehm-gc )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	xml? ( >=dev-libs/expat-1.95.4 )
+	X? ( x11-libs/libX11 x11-libs/libXt )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+	lua? ( >=dev-lang/lua-5:0= )
+	gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 )
+	guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] )
+	idn? ( net-dns/libidn )
+	perl? ( dev-lang/perl:= )
+	ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* )
+	samba? ( net-fs/samba )
+	tre? ( dev-libs/tre )
+	javascript? ( >=dev-lang/spidermonkey-1.8.5:0= )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-9999-parallel-make.patch
+	"${FILESDIR}"/${PN}-0.12_pre5-compilation-fix.patch
+	"${FILESDIR}"/${PN}-0.12_pre5-libressl.patch
+	"${FILESDIR}"/${PN}-0.12_pre5-rand-egd.patch
+	"${FILESDIR}"/${PN}-0.11.2-lua-5.1.patch
+	"${FILESDIR}"/${PN}-0.12_pre5-ruby-1.9.patch
+	"${WORKDIR}"/patches/${PN}-0.12_pre5-js185-1-heartbeat.patch
+	"${WORKDIR}"/patches/${PN}-0.12_pre5-js185-2-up.patch
+	"${WORKDIR}"/patches/${PN}-0.12_pre5-js185-3-histback.patch
+	"${FILESDIR}"/${PN}-0.12_pre5-sm185-jsval-fixes.patch
+	)
+
+src_prepare() {
+	default
+
+	cd "${WORKDIR}" || die
+	eapply "${FILESDIR}"/${PN}-0.10.4.conf-syscharset.diff
+	mv ${PN}-0.10.4.conf ${PN}.conf || die
+	if ! use ftp ; then
+		sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' ${PN}.conf || die
+	fi
+	sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' ${PN}.conf || die
+	cd "${S}" || die
+
+	# fix lib order in configure check
+	# (these seds are necessary so that @preserved-libs copies are not used)
+	sed -i -e 's:for spidermonkeylib in js .*$:for spidermonkeylib in mozjs185 mozjs js smjs; do:' \
+		configure.in || die
+	# Regenerate acinclude.m4 - based on autogen.sh.
+	cat > acinclude.m4 <<- _EOF || die
+		dnl Automatically generated from config/m4/ files.
+		dnl Do not modify!
+	_EOF
+	cat config/m4/*.m4 >> acinclude.m4 || die
+	sed -i -e 's/-Werror//' configure* || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+
+	if use debug ; then
+		myconf="--enable-debug"
+	else
+		myconf="--enable-fastmem"
+	fi
+
+	# NOTE about GNUTSL SSL support (from the README -- 25/12/2002)
+	# As GNUTLS is not yet 100% stable and its support in ELinks is not so well
+	# tested yet, it's recommended for users to give a strong preference to OpenSSL whenever possible.
+	if use ssl ; then
+		myconf="${myconf} --with-openssl=${EPREFIX}/usr"
+	else
+		myconf="${myconf} --without-openssl --without-gnutls"
+	fi
+
+	econf \
+		--sysconfdir="${EPREFIX}"/etc/elinks \
+		--enable-leds \
+		--enable-88-colors \
+		--enable-256-colors \
+		--enable-true-color \
+		--enable-html-highlight \
+		$(use_with gpm) \
+		$(use_with zlib) \
+		$(use_with bzip2 bzlib) \
+		$(use_with gc) \
+		$(use_with X x) \
+		$(use_with lua) \
+		$(use_with guile) \
+		$(use_with perl) \
+		$(use_with ruby) \
+		$(use_with idn) \
+		$(use_with javascript spidermonkey) \
+		$(use_with tre) \
+		$(use_enable bittorrent) \
+		$(use_enable nls) \
+		$(use_enable ipv6) \
+		$(use_enable ftp) \
+		$(use_enable gopher) \
+		$(use_enable nntp) \
+		$(use_enable finger) \
+		$(use_enable samba smb) \
+		$(use_enable mouse) \
+		$(use_enable xml xbel) \
+		${myconf}
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	emake V=1 DESTDIR="${D}" install
+
+	insinto /etc/elinks
+	doins "${WORKDIR}"/elinks.conf
+	newins contrib/keybind-full.conf keybind-full.sample
+	newins contrib/keybind.conf keybind.conf.sample
+
+	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO doc/*.*
+	docinto contrib ; dodoc contrib/{README,colws.diff,elinks[-.]vim*}
+	docinto contrib/lua ; dodoc contrib/lua/{*.lua,elinks-remote}
+	docinto contrib/conv ; dodoc contrib/conv/*.*
+	docinto contrib/guile ; dodoc contrib/guile/*.scm
+
+	# elinks uses an internal copy of gettext which ships files that may
+	# colliding with the system's gettext (https://bugs.gentoo.org/635090)
+	rm -f "${ED}"/usr/{share/locale/locale,lib/charset}.alias || die
+}
+
+pkg_postinst() {
+	einfo "This ebuild provides a default config for ELinks."
+	einfo "Please check /etc/elinks/elinks.conf"
+	einfo
+	einfo "You may want to convert your html.cfg and links.cfg of"
+	einfo "Links or older ELinks versions to the new ELinks elinks.conf"
+	einfo "using /usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl"
+	einfo
+	einfo "Please have a look at /etc/elinks/keybind-full.sample and"
+	einfo "/etc/elinks/keybind.conf.sample for some bindings examples."
+	einfo
+	einfo "You will have to set your TERM variable to 'xterm-256color'"
+	einfo "to be able to use 256 colors in elinks."
+}
diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild
index 86a85d7419f6..f608a19718e3 100644
--- a/www-client/elinks/elinks-9999.ebuild
+++ b/www-client/elinks/elinks-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
-inherit autotools eutils git-r3 flag-o-matic python-any-r1
+inherit autotools git-r3 python-any-r1
 
 EGIT_REPO_URI="git://repo.or.cz/elinks.git"
 
@@ -16,14 +16,14 @@ SRC_URI="https://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="bittorrent bzip2 debug finger ftp gc gopher gpm guile idn ipv6
-	  javascript libressl lua +mouse nls nntp perl ruby samba ssl unicode X xml zlib"
+IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm guile idn ipv6
+	  javascript libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib"
 RESTRICT="test"
 
 DEPEND="
 	${PYTHON_DEPS}
+	brotli? ( app-arch/brotli )
 	bzip2? ( >=app-arch/bzip2-1.0.2 )
-	gc? ( dev-libs/boehm-gc )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
@@ -38,39 +38,43 @@ DEPEND="
 	perl? ( dev-lang/perl:= )
 	ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* )
 	samba? ( net-fs/samba )
+	tre? ( dev-libs/tre )
 	javascript? ( >=dev-lang/spidermonkey-1.8.5:0= )"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-parallel-make.patch
+	)
+
 src_unpack() {
 	default
 	git-r3_src_unpack
 }
 
 src_prepare() {
-	mv "${WORKDIR}/${PN}-0.10.4.conf" "${WORKDIR}/${PN}.conf"
+	default
+
+	cd "${WORKDIR}" || die
+	eapply "${FILESDIR}"/${PN}-0.10.4.conf-syscharset.diff
+	mv ${PN}-0.10.4.conf ${PN}.conf || die
 	if ! use ftp ; then
-		sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' "${WORKDIR}"/${PN}.conf
+		sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' ${PN}.conf || die
 	fi
-	sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' "${WORKDIR}"/${PN}.conf
-	epatch "${FILESDIR}"/${P}-parallel-make.patch
-
-	epatch_user
+	sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' ${PN}.conf || die
+	cd "${S}" || die
 
 	# Regenerate acinclude.m4 - based on autogen.sh.
-	cat > acinclude.m4 <<- _EOF
+	cat > acinclude.m4 <<- _EOF || die
 		dnl Automatically generated from config/m4/ files.
 		dnl Do not modify!
 	_EOF
-	cat config/m4/*.m4 >> acinclude.m4
-	sed -i -e 's/-Werror//' configure*
+	cat config/m4/*.m4 >> acinclude.m4 || die
+	sed -i -e 's/-Werror//' configure* || die
 
 	eautoreconf
 }
 
 src_configure() {
-	# NOTE about GNUTSL SSL support (from the README -- 25/12/2002)
-	# As GNUTLS is not yet 100% stable and its support in ELinks is not so well
-	# tested yet, it's recommended for users to give a strong preference to OpenSSL whenever possible.
 	local myconf=""
 
 	if use debug ; then
@@ -79,6 +83,9 @@ src_configure() {
 		myconf="--enable-fastmem"
 	fi
 
+	# NOTE about GNUTSL SSL support (from the README -- 25/12/2002)
+	# As GNUTLS is not yet 100% stable and its support in ELinks is not so well
+	# tested yet, it's recommended for users to give a strong preference to OpenSSL whenever possible.
 	if use ssl ; then
 		myconf="${myconf} --with-openssl=${EPREFIX}/usr"
 	else
@@ -94,8 +101,8 @@ src_configure() {
 		--enable-html-highlight \
 		$(use_with gpm) \
 		$(use_with zlib) \
+		$(use_with brotli) \
 		$(use_with bzip2 bzlib) \
-		$(use_with gc) \
 		$(use_with X x) \
 		$(use_with lua) \
 		$(use_with guile) \
@@ -103,6 +110,7 @@ src_configure() {
 		$(use_with ruby) \
 		$(use_with idn) \
 		$(use_with javascript spidermonkey) \
+		$(use_with tre) \
 		$(use_enable bittorrent) \
 		$(use_enable nls) \
 		$(use_enable ipv6) \
@@ -123,20 +131,20 @@ src_compile() {
 src_install() {
 	emake V=1 DESTDIR="${D}" install
 
-	insopts -m 644 ; insinto /etc/elinks
+	insinto /etc/elinks
 	doins "${WORKDIR}"/elinks.conf
 	newins contrib/keybind-full.conf keybind-full.sample
 	newins contrib/keybind.conf keybind.conf.sample
 
 	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO doc/*.*
 	docinto contrib ; dodoc contrib/{README,colws.diff,elinks[-.]vim*}
-	insinto /usr/share/doc/${PF}/contrib/lua ; doins contrib/lua/{*.lua,elinks-remote}
-	insinto /usr/share/doc/${PF}/contrib/conv ; doins contrib/conv/*.*
-	insinto /usr/share/doc/${PF}/contrib/guile ; doins contrib/guile/*.scm
+	docinto contrib/lua ; dodoc contrib/lua/{*.lua,elinks-remote}
+	docinto contrib/conv ; dodoc contrib/conv/*.*
+	docinto contrib/guile ; dodoc contrib/guile/*.scm
 
-	# Remove some conflicting files on OSX.  The files provided by OSX 10.4
-	# are more or less the same.  -- Fabian Groffen (2005-06-30)
-	rm -f "${ED}"/usr/share/locale/locale.alias "${ED}"/usr/lib/charset.alias || die
+	# elinks uses an internal copy of gettext which ships files that may
+	# colliding with the system's gettext (https://bugs.gentoo.org/635090)
+	rm -f "${ED}"/usr/{share/locale/locale,lib/charset}.alias || die
 }
 
 pkg_postinst() {
@@ -152,5 +160,4 @@ pkg_postinst() {
 	einfo
 	einfo "You will have to set your TERM variable to 'xterm-256color'"
 	einfo "to be able to use 256 colors in elinks."
-	echo
 }
diff --git a/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff b/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff
index dc64712b29a8..83accf4c2d95 100644
--- a/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff
+++ b/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff
@@ -1,5 +1,5 @@
---- elinks-0.10.4.conf	2005-04-08 15:29:49.000000000 -0700
-+++ elinks-0.10.4-syscharset.conf	2006-11-04 00:26:26.000000000 -0800
+--- a/elinks-0.10.4.conf	2005-04-08 15:29:49.000000000 -0700
++++ b/elinks-0.10.4-syscharset.conf	2006-11-04 00:26:26.000000000 -0800
 @@ -12,8 +12,6 @@
    # obsolete config.saving_style. You shouldn't touch it.
    set config.saving_style_w = 1
diff --git a/www-client/elinks/files/elinks-0.12_pre5-libressl.patch b/www-client/elinks/files/elinks-0.12_pre5-libressl.patch
new file mode 100644
index 000000000000..d41ab689e9f1
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.12_pre5-libressl.patch
@@ -0,0 +1,29 @@
+Adapted from upstream
+commit 54ebe365b752f8969a67279d0d29552ab638e025
+Author: Witold Filipczyk <witekfl@poczta.onet.pl>
+Date:   Mon Mar 6 17:39:36 2017 +0100
+
+    Compilation fix for OpenSSL-1.1
+
+--- a/src/network/ssl/socket.c
++++ b/src/network/ssl/socket.c
+@@ -67,7 +67,9 @@
+ ssl_set_no_tls(struct socket *socket)
+ {
+ #ifdef CONFIG_OPENSSL
+-	((ssl_t *) socket->ssl)->options |= SSL_OP_NO_TLSv1;
++#ifdef SSL_OP_NO_TLSv1
++	SSL_set_options((ssl_t *)socket->ssl, SSL_OP_NO_TLSv1);
++#endif
+ #elif defined(CONFIG_GNUTLS)
+ 	{
+ 		/* GnuTLS does not support SSLv2 because it is "insecure".
+@@ -145,7 +147,7 @@
+ 		}
+ 
+ 		if (client_cert) {
+-			SSL_CTX *ctx = ((SSL *) socket->ssl)->ctx;
++			SSL_CTX *ctx = SSL_get_SSL_CTX((SSL *) socket->ssl);
+ 
+ 			SSL_CTX_use_certificate_chain_file(ctx, client_cert);
+ 			SSL_CTX_use_PrivateKey_file(ctx, client_cert,
diff --git a/www-client/elinks/files/elinks-0.12_pre5-rand-egd.patch b/www-client/elinks/files/elinks-0.12_pre5-rand-egd.patch
new file mode 100644
index 000000000000..6c5679a95bbd
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.12_pre5-rand-egd.patch
@@ -0,0 +1,20 @@
+--- a/src/network/ssl/ssl.c
++++ b/src/network/ssl/ssl.c
+@@ -84,11 +84,16 @@ init_openssl(struct module *module)
+ 	 * cannot initialize the PRNG and so every attempt to use SSL fails.
+ 	 * It's actually an OpenSSL FAQ, and according to them, it's up to the
+ 	 * application coders to seed the RNG. -- William Yodlowsky */
+-	if (RAND_egd(RAND_file_name(f_randfile, sizeof(f_randfile))) < 0) {
++	RAND_file_name(f_randfile, sizeof(f_randfile));
++#ifdef HAVE_RAND_EGD
++	if (RAND_egd(f_randfile) < 0) {
+ 		/* Not an EGD, so read and write to it */
++#endif
+ 		if (RAND_load_file(f_randfile, -1))
+ 			RAND_write_file(f_randfile);
++#ifdef HAVE_RAND_EGD
+ 	}
++#endif
+ 
+ 	SSLeay_add_ssl_algorithms();
+ 	context = SSL_CTX_new(SSLv23_client_method());
diff --git a/www-client/elinks/metadata.xml b/www-client/elinks/metadata.xml
index 983c04de930f..8dfd5728bec7 100644
--- a/www-client/elinks/metadata.xml
+++ b/www-client/elinks/metadata.xml
@@ -1,13 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>felix.janda@posteo.de</email>
+		<name>Felix Janda</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="bittorrent">Enable support for the BitTorrent protocol</flag>
+		<flag name="brotli">Enable support for brotli compression</flag>
 		<flag name="finger">Enable support for the finger protocol</flag>
 		<flag name="gc">Enable garbage collection support via <pkg>dev-libs/boehm-gc</pkg></flag>
 		<flag name="gopher">Enable support for the gopher protocol</flag>
 		<flag name="mouse">Make elinks to grab all mouse events</flag>
+		<flag name="tre">Enable support for regex searches via <pkg>dev-libs/tre</pkg></flag>
 		<flag name="xml">Enable support for bookmarks via <pkg>dev-libs/expat</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index a80832f0d156..30f5349ae8a8 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,9 +1,9 @@
 AUX epiphany-3.14.0-unittest-2.patch 1725 SHA256 00a00190fcfec6bc06d411fa150fc31c833d7636d3508d30be8042bb514c28b0 SHA512 5ec81de76fb8bb1574e954d5bdffd81114c022d558573f049c415f037855b65c03e727fd3fa2ce557c12f3a17921dc655c60ef4e1ad06f3bc9a6a42e58ddde70 WHIRLPOOL 437a8b063e7fc0208afc1c409f2c62e00215a64b504b5d2ed42aa4112a8ad7c126c5f88649bdb00b750bf7af84565f5d1bfc4fc1780c8a85774b7ed074ac8283
 AUX epiphany-3.16.0-unittest-1.patch 972 SHA256 fd90814e0768a4c776f909f861ac519b9ed6c3a268b70ba695c6227f67a75ab8 SHA512 ec59eb312e7826306af76fc587fb9435c6ac2da96cd574df381829bda2e2f987a47afef9bdff0e8dc162fe63f43d1a744edc84b84ae387edd1279d77ebdfdc86 WHIRLPOOL 86828f81a6e4339ff8fff4502311c014103942e1902869bb13f2dbaf2fd8b579750e835d66300e13ae012035558e07270bdf53ad1884e367cc9ff9badeacc8ef
 DIST epiphany-3.22.7.tar.xz 2293224 SHA256 a15b7ec19644eec8d40ce11286bbca28ac188202b47e2b9fc593ab0974e9c784 SHA512 8150952e89b86d05958bd9f9a0c78ba583764ec878220c8e328cb936108faf25a10837e038bd1a0ba1279555d2f95f819477cfddcb67c31e5b4c3533daf446bd WHIRLPOOL 1856f814a08896e6000085bc34a1097c72d2cd615263e5974b2008088354644cbb58ee8a3ffeb2d9c3b5edcea5a5c56cb4305b200fb6dfc86a0766fe686b90d5
-DIST epiphany-3.24.4.tar.xz 3213184 SHA256 15f0f664bed190143cce8a03f610fa863b92d9502513c107304e5285924ee5c9 SHA512 98ca26f8f962b8b68c90ac71f793e3c967ba15edab3c4f5dc49e3e325ce8ec02c8fa3c0d3b885ab123637593963ce29583280a03ac70ff3e9a55b7ce91c7145b WHIRLPOOL 5c3c45e07f50a02103c93fdb797fd83c1a29e453930c713089078aee644e40cdc207c6de34992a801d11e987677dd8455957589ed9027b468924d3f33801efe2
+DIST epiphany-3.24.5.tar.xz 3216736 SHA256 fb84bfb1919ba1075d19102a74dd461277ac4666e287687695f7337249d9b2fa SHA512 a8f203d182b8c87878a3272f8b4f642b0cf4128476e0727208135cfdffeb293425cf662c58820f0d3aed2e1b20fe6dc4cf5cbb8277a398c6f533a0bea34f40f2 WHIRLPOOL c1d3a6ec1ec528fa62973f5ebb74157da60bd38779ec171eac4e005db7f31e68cf215987a04fe1953d95a9e5622c009121da19c1a4568346354c8494dd1e554b
 EBUILD epiphany-3.22.7.ebuild 1743 SHA256 edfd52cedc963e6782ef5eb901e5cefd78ae2705c5f39a292547d991f22d8d74 SHA512 c8eca05bdffc6a2f0907059d17e96e9abb93084694197f00bb4371596c5cd59d94f16d47f831e1a5bccb41b028007758436f2480900ec25baa3fa0d1bfd15f8b WHIRLPOOL 03eb5c0e20a7688f067f10c677d56dcdb53c409ab8f9b5642cbdb7bf07e384df95463646881720e0a1131d6420febe81cb8140998c936bdca132e0a2ccc2592a
-EBUILD epiphany-3.24.4.ebuild 1979 SHA256 0674285832ea99cf14c9430524dac200fb786a3dc0986fed260a17fdbd671d83 SHA512 04f7dcd409932e6cf5600203045c9e4d784e2b7c38c2bb589c162cd4e576f7047b61ae40c26f9b8031a233719efabe3fe8d11dfb2b3aa61aea85fd0f3b1f69d1 WHIRLPOOL 9db980dfb8a4dea32de75b17995714c7e15e55294fdb2bf9dc97b708bd7ebbf09ed488843b5a4a05797cc3f6f7c150cb055b3e980e433cec47e83735fcbc5e32
+EBUILD epiphany-3.24.5.ebuild 1951 SHA256 b6aaac88bb48a7ddd85791fa24795ff355f274d1da5f9447a55a238522591906 SHA512 c2fff8679f18caff5a1583a19b70e0e4887b5b0b52f1de076ce3c5947ce25a309c1baaf1e566c0b072f3a6ed05183b822c7a5a0898b3542943b7a8edc5830d4a WHIRLPOOL 975e7ecbf22c8cfe6b69d30d932859dfc5288d7614d416953429ff30534ede74ff3919e65e4e10e79b79424bc9963c6bacbee550f1d31e8d25b8a48b33ba9b2c
 MISC ChangeLog 8700 SHA256 1a2c633cdf2ea8a12a408fb35f2f63b2a5e17b6c0214262194403846c01fe483 SHA512 6e341b5cc1ab9853b005db985ec5e5fb6b39b2ac990690b6f203fd7b5cfb0abcef4c2a77c5b9c828a6e267d742b4b2b87fc617146ba3b5639a8e4c2d7bbb7820 WHIRLPOOL 6d614e372b67e46210dee8d95aac7167d5a1405dab3ebb5061b6bfadd9b7aafc41913238a369b0f47017fb66bfc7c4b30005827ecdaa7218ffeb9be06a207f80
 MISC ChangeLog-2015 61615 SHA256 92160101f6d5fe039ed495b9109213d629d5aee30889c414d8d9b47f20267e83 SHA512 3dfda780cd8154576968bc8597a7a17f2336bb0ac5f52fe62880817382888cd6664f925048fdb583da2cdc0f4386f37e3159ff151a9f12fc1bcae05817e53406 WHIRLPOOL 06d760f36bbf5acc2cb132c98ccdc364d7fc4a3ccce641dd9bd922bb094c8126e57db4aaccad59491c0669f8fa4d1891a86ad86418b71968341c245e59454855
 MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/www-client/epiphany/epiphany-3.24.4.ebuild b/www-client/epiphany/epiphany-3.24.4.ebuild
deleted file mode 100644
index d98149a5ecf2..000000000000
--- a/www-client/epiphany/epiphany-3.24.4.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit flag-o-matic gnome2 virtualx
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="https://wiki.gnome.org/Apps/Web"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="test"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.46.0:2[dbus]
-	>=x11-libs/gtk+-3.22.13:3
-	>=net-libs/webkit-gtk-2.15.90:4=
-	>=x11-libs/cairo-1.2
-	>=app-crypt/gcr-3.5.5:=[gtk]
-	>=x11-libs/gdk-pixbuf-2.36.5:2
-	>=gnome-base/gnome-desktop-2.91.2:3=
-	dev-libs/icu:=
-	>=dev-libs/json-glib-1.2.0
-	>=x11-libs/libnotify-0.5.1:=
-	>=app-crypt/libsecret-0.14
-	>=net-libs/libsoup-2.48:2.4
-	>=dev-libs/libxml2-2.6.12:2
-	>=dev-libs/libxslt-1.1.7
-	dev-db/sqlite:3
-	>=app-text/iso-codes-0.35
-	>=gnome-base/gsettings-desktop-schemas-0.0.1
-"
-# epiphany-extensions support was removed in 3.7; let's not pretend it still works
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-	!www-client/epiphany-extensions
-"
-# paxctl needed for bug #407085
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	sys-apps/paxctl
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# https://bugzilla.gnome.org/show_bug.cgi?id=751591
-	"${FILESDIR}"/${PN}-3.16.0-unittest-1.patch
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=751593
-	"${FILESDIR}"/${PN}-3.14.0-unittest-2.patch
-)
-
-src_configure() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=778495
-	append-cflags -std=gnu11
-
-	# httpseverywhere is experimental in 3.24; gnome bug #775575
-	# firefox sync storage is not quite ready in 3.24; deps on hogweed/nettle
-	gnome2_src_configure \
-		--enable-shared \
-		--disable-static \
-		--with-distributor-name=Gentoo \
-		--without-libhttpseverywhere \
-		--disable-firefox-sync \
-		$(use_enable test tests)
-}
-
-src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check
-}
diff --git a/www-client/epiphany/epiphany-3.24.5.ebuild b/www-client/epiphany/epiphany-3.24.5.ebuild
new file mode 100644
index 000000000000..fc7f99fdd507
--- /dev/null
+++ b/www-client/epiphany/epiphany-3.24.5.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit flag-o-matic gnome2 virtualx
+
+DESCRIPTION="GNOME webbrowser based on Webkit"
+HOMEPAGE="https://wiki.gnome.org/Apps/Web"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="test"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.46.0:2[dbus]
+	>=x11-libs/gtk+-3.22.13:3
+	>=net-libs/webkit-gtk-2.15.90:4=
+	>=x11-libs/cairo-1.2
+	>=app-crypt/gcr-3.5.5:=[gtk]
+	>=x11-libs/gdk-pixbuf-2.36.5:2
+	>=gnome-base/gnome-desktop-2.91.2:3=
+	dev-libs/icu:=
+	>=x11-libs/libnotify-0.5.1:=
+	>=app-crypt/libsecret-0.14
+	>=net-libs/libsoup-2.48:2.4
+	>=dev-libs/libxml2-2.6.12:2
+	>=dev-libs/libxslt-1.1.7
+	dev-db/sqlite:3
+	>=app-text/iso-codes-0.35
+	>=gnome-base/gsettings-desktop-schemas-0.0.1
+"
+# epiphany-extensions support was removed in 3.7; let's not pretend it still works
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
+	!www-client/epiphany-extensions
+"
+# paxctl needed for bug #407085
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	sys-apps/paxctl
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# https://bugzilla.gnome.org/show_bug.cgi?id=751591
+	"${FILESDIR}"/${PN}-3.16.0-unittest-1.patch
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=751593
+	"${FILESDIR}"/${PN}-3.14.0-unittest-2.patch
+)
+
+src_configure() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=778495
+	append-cflags -std=gnu11
+
+	# httpseverywhere is experimental in 3.24; gnome bug #775575
+	# firefox sync storage is not quite ready in 3.24; deps on hogweed/nettle
+	gnome2_src_configure \
+		--enable-shared \
+		--disable-static \
+		--with-distributor-name=Gentoo \
+		--without-libhttpseverywhere \
+		--disable-firefox-sync \
+		$(use_enable test tests)
+}
+
+src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check
+}
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index aa3f1ddcf951..77d27d2fc0ea 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,5 +1,5 @@
-DIST google-chrome-beta_62.0.3202.62-1_amd64.deb 49451474 SHA256 38f3c45d99381711226670da25a80c1b085a550943c56cbe84d672a074daa181 SHA512 87c7a1f831876670e985d6a78138895dd8e1b72f1f840f6651cfd89d688578b47cae21bc9eec86d95e9a6def7962e3ac6d73af3d762a33f557640896256dea57 WHIRLPOOL 41236eb0c41bc00362baccfc88ae2ed07b6e039315eaca72a772636e65f211027726876c8bd29bf26adcb1eefb8ac07b3a22b6cd07fc21ba0aced5a2ebbcdb8a
-EBUILD google-chrome-beta-62.0.3202.62.ebuild 3537 SHA256 69963e5873f27f0805ba0cc65a76f1a2ba7e77b4d6b94b8b6dce338edfa47db8 SHA512 2db889ef7c6a270a30ad4cb84bf4efa76d255593a8a5320894d326605c5d8404565be8e3f1658cfd06ae51fbb52a0a1d1f81713625ef453587462d1956eae07c WHIRLPOOL f6c679cbaac78d521e053b397a0b0a3b1af081296b75c96d0ed2fcfcf1b7a14c47b1e235627d0198f4fa055b6b47246cd2895cef32bb400e3097a99a74dd8613
+DIST google-chrome-beta_63.0.3239.18-1_amd64.deb 50018880 SHA256 982ca07a579c0d39b46fbdc0bde6d8fa16ce09f2bf51be4d2030a93305ba49b1 SHA512 1fdf8ecd2aefe0c3d3350e0e1824027e780ee3d8a8b313443ee2f78be488403abb0adae06d768cfccc26ef738372c0826b9dc1308165c8c7568782869b8f6a3c WHIRLPOOL 5bc2ee12644f9f52ed81e0445b0f4e5c3c4b800895779e0d3c0235b0d59b22bb36eb644bfee14fcb9739f1cbf02501b8ce94ead79ebfeaf0532a7ca534f8bbb3
+EBUILD google-chrome-beta-63.0.3239.18.ebuild 3537 SHA256 69963e5873f27f0805ba0cc65a76f1a2ba7e77b4d6b94b8b6dce338edfa47db8 SHA512 2db889ef7c6a270a30ad4cb84bf4efa76d255593a8a5320894d326605c5d8404565be8e3f1658cfd06ae51fbb52a0a1d1f81713625ef453587462d1956eae07c WHIRLPOOL f6c679cbaac78d521e053b397a0b0a3b1af081296b75c96d0ed2fcfcf1b7a14c47b1e235627d0198f4fa055b6b47246cd2895cef32bb400e3097a99a74dd8613
 MISC ChangeLog 21904 SHA256 b56029d26bb3007cfc2f52b8d5031881a614b643fcd2b5966ebb050d567a9ff5 SHA512 1fa256503b4ee20b0e8f8b3e3af6a4d1e581fa2050a0199dcce6495960c74e62e5bcc9b37309671889afe7fc4ca443a0e1f21626d653d426b4ed9582792e9e7e WHIRLPOOL 24e45971afcbcf260a68aee5dac7b2db643d139a0552568d39c0e8b7567435fedbb9a8b5a87563bbd24c8dcf9a9c9a25991a24680bb27c4f7bf1e3dbaf6feada
 MISC ChangeLog-2015 18731 SHA256 244ca1dc0c95828216c5a3a9878ee0c1bf6ca757885b8afc39a9cbd11d7477fc SHA512 70b0fe368012d1d3bd0997af71bed3fdb0f3933383ef4c0335238a7f016435f48f03ccd2c2cb432445c3b0dc1b9e6dcd3b687e65c478899b7bae0701bbf250f2 WHIRLPOOL ddb2e222026feb62390eb8bcc07514c1a00a177fada1eed838155637afbf00fa139e5a59e1175bf7157c97a7aecc6a1aff7ae4304d3251c993661da1105f461a
 MISC metadata.xml 624 SHA256 e295fc153645351df4b2501b78b8d6115f66e439acec1e3ae35afc84ee027de1 SHA512 318638d149ddf7c81310b8d1fc6e38525665ea5e3b7fc6830ed3b13547f80635e6a5fba60b60829187742ffc1217beaf7a72bcee2c6b76736316e004ad336786 WHIRLPOOL 4b31e15fcc05fce91aad8bbcfe28511b32f35be1a2d747661be604ff691682be30c73086ce24f5b00a83540bc494d3a4a32585ceaf78cbcd1b4070cf5012e1f2
diff --git a/www-client/google-chrome-beta/google-chrome-beta-62.0.3202.62.ebuild b/www-client/google-chrome-beta/google-chrome-beta-63.0.3239.18.ebuild
index 15a697bab362..15a697bab362 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-62.0.3202.62.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-63.0.3239.18.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 192c996aa446..50b101ca176c 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,5 +1,5 @@
-DIST google-chrome-unstable_63.0.3236.7-1_amd64.deb 50180726 SHA256 f077a884dcd4d6f2dcc25ec518e46647f5e773bb67cccc8ee8f7715b208d44b1 SHA512 40d61b06ddddb47ca3e1b61a325ff2541b3a07b0b72a8fcdcd5459d76add0d3a5567a8315cbc29c2707d37a952bfc78b67cda26398f04f6af3453cb73aed0f37 WHIRLPOOL 393da715aefb0eabb4b9f926f5c467a55ddbb03760e96b1ae4d448fc8e7bebaf953e22a7589397100c385d4f0d2fe113e69263cef7501d0a87fa1ebdae5f64de
-EBUILD google-chrome-unstable-63.0.3236.7.ebuild 3537 SHA256 69963e5873f27f0805ba0cc65a76f1a2ba7e77b4d6b94b8b6dce338edfa47db8 SHA512 2db889ef7c6a270a30ad4cb84bf4efa76d255593a8a5320894d326605c5d8404565be8e3f1658cfd06ae51fbb52a0a1d1f81713625ef453587462d1956eae07c WHIRLPOOL f6c679cbaac78d521e053b397a0b0a3b1af081296b75c96d0ed2fcfcf1b7a14c47b1e235627d0198f4fa055b6b47246cd2895cef32bb400e3097a99a74dd8613
+DIST google-chrome-unstable_64.0.3251.0-1_amd64.deb 50499978 SHA256 ca8f4ec300219c4cbdddd94e22dab92d79dd64b66ad84fd83e32353c3d82661c SHA512 d5b98e64e5dd3c39996ef67b273249686fe96db8aeb34f37b0ce0a4d71a59d88e228de58999b71b6fb7d63610d6a1d963c3702c4e3b7c85065ae328cbec0e5d6 WHIRLPOOL 35b734582de2e332fd640536c41736f7b27412e484196f412ac354d32255c4e151226881ceeb0412dfc77625890324706473e17cc63cd626800677c876cf964a
+EBUILD google-chrome-unstable-64.0.3251.0.ebuild 3537 SHA256 69963e5873f27f0805ba0cc65a76f1a2ba7e77b4d6b94b8b6dce338edfa47db8 SHA512 2db889ef7c6a270a30ad4cb84bf4efa76d255593a8a5320894d326605c5d8404565be8e3f1658cfd06ae51fbb52a0a1d1f81713625ef453587462d1956eae07c WHIRLPOOL f6c679cbaac78d521e053b397a0b0a3b1af081296b75c96d0ed2fcfcf1b7a14c47b1e235627d0198f4fa055b6b47246cd2895cef32bb400e3097a99a74dd8613
 MISC ChangeLog 26760 SHA256 d211ce81fe772ad972458400d9065f652f351a6dff428e1ed65abf256476219f SHA512 3341263860b9c45ade48a8bc0c83303b15ddadf6defbfbcabd6864896d67cf51b818afb3fafb064a373cc89c2b93eb1a27af2b2a8f8e8761a54d1bebbbc0b32c WHIRLPOOL 0c61e5cba799fb10a3e6b123f4c63f9cd6c394a40f4226f6f9b7db97fd1f5ed26c0909013e1d2d037ecbdca9539db590a42589bf78aa4e6955cd01ee5c4a9075
 MISC ChangeLog-2015 24195 SHA256 03cd9f706b00090ca8e0a16169bc3c45a48f3e499191f7fb6565f1988b5b8f62 SHA512 6b25f7c076af400be3e91275fcb82401d40b50327dd76a5796f0d94cf16747a6a5e4dcfa1a3da2ee737dc6bf6ed833ce6e7e2bee31a70c913b76c10f8f44e7b6 WHIRLPOOL 3753a9bee1820b25997933975fef361befc8eb3cdb42562d66b9a35b894738ea687866050be7d5e4c9c48cba0255d0797fe881ea36e4bdc5d65599ae5d45eed8
 MISC metadata.xml 624 SHA256 e295fc153645351df4b2501b78b8d6115f66e439acec1e3ae35afc84ee027de1 SHA512 318638d149ddf7c81310b8d1fc6e38525665ea5e3b7fc6830ed3b13547f80635e6a5fba60b60829187742ffc1217beaf7a72bcee2c6b76736316e004ad336786 WHIRLPOOL 4b31e15fcc05fce91aad8bbcfe28511b32f35be1a2d747661be604ff691682be30c73086ce24f5b00a83540bc494d3a4a32585ceaf78cbcd1b4070cf5012e1f2
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-63.0.3236.7.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-64.0.3251.0.ebuild
index 15a697bab362..15a697bab362 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-63.0.3236.7.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-64.0.3251.0.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index fa65e3c48720..9638d354e4cb 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,5 +1,5 @@
-DIST google-chrome-stable_62.0.3202.62-1_amd64.deb 48500124 SHA256 98a34a85ba0018d3897a8a11de9f29df08e77d64a9d991df66fcf5c5cdd957c6 SHA512 fbab95c597542961701cdf50c89d04a79138019e0f805fdefdc86474748bc83d3a7c3d16153768bd50cd360e02c302cfb1fe00f612290fd2472da698f9b595de WHIRLPOOL b2096af5f28373b497540513769497604e1ab22e88f908f12745881807ebdb067341b224598a98fc250af135fe38ba15a0432acb87aeb5bea0d1a38eacd09199
-EBUILD google-chrome-62.0.3202.62.ebuild 3536 SHA256 d67e093912b71d32bf2f76ba784200c2715e43168e28f5c5d74c56ffe451c101 SHA512 bd8215fd16e9881fcdf712e20b0f9b5df8c5ffef6beee296b927d084f2619748369ba95318cd3238f80ad330c0be8f0926153f6c3a653fbbb09fa0780441055a WHIRLPOOL f5539db2d7c8c470ed1b7b16196614bd259a8a2dff4a3f272ffa50f947530c54fedd76c463c41a0d3a32dac2fe4251eca14b2502e59863ab596269fdd4331483
+DIST google-chrome-stable_62.0.3202.75-1_amd64.deb 48725174 SHA256 1d54877408fa494781fedb0982b77eab0bc38f86041d0739e87a5e3603148f30 SHA512 d0a304b9007bb645b2ed0850edec186f068c21c9f15f336bb2e3b94c4b2a3f942e2c76fb7f627f741a1560774774469318edefaaf0875e0dbc3547d838559c25 WHIRLPOOL bb9207b1dd4ca30d86302d73de9bd7cbbd6cfc727b8870990d346c2f101f463bbfc5312f0bbe41f8f6cf8862f2739d57c211d36afb81d64ad5ae92c2562f6e37
+EBUILD google-chrome-62.0.3202.75.ebuild 3536 SHA256 d67e093912b71d32bf2f76ba784200c2715e43168e28f5c5d74c56ffe451c101 SHA512 bd8215fd16e9881fcdf712e20b0f9b5df8c5ffef6beee296b927d084f2619748369ba95318cd3238f80ad330c0be8f0926153f6c3a653fbbb09fa0780441055a WHIRLPOOL f5539db2d7c8c470ed1b7b16196614bd259a8a2dff4a3f272ffa50f947530c54fedd76c463c41a0d3a32dac2fe4251eca14b2502e59863ab596269fdd4331483
 MISC ChangeLog 15250 SHA256 73cfe6d0cbf08ee8af13d3a4f9d4766a7fc1040475bce04983d9c033ad41b288 SHA512 5c6a4881e92fd43fd57531d36aa84ff96e003d135f1349ae7af496fbd447d866ffc06b39439bdda491a2c33192ddbfcdd38c38d5817d4bbc132717d8d626282e WHIRLPOOL fed163457dd66744687e272904d11da742d612cb00bc7c4ec5a879fddaf763fcbb1f8edba843ee74778a0220882db627864aef34bee96dd6da83310fce9289e2
 MISC ChangeLog-2015 99571 SHA256 2e606e15340fff7031cc7cedcef68d619d6109ddc5c99a99bcff9b43b83dbe76 SHA512 0b6c83844cceb0ccc3b8afcece7c374e5a6e018b89575c8515968aa585da9ab9162bc7cc01208398d1c945b6fd27db9501841784b35cd24e27a1dad208ebc11b WHIRLPOOL f77a08d02c17bd51f926d4a1377acf22028c441316906f5664346e7a28e4eb19c8d88bda26016756e88ca3ada2bda406a92ce6dbe021d11e4ea55e718eb63a95
 MISC metadata.xml 624 SHA256 e295fc153645351df4b2501b78b8d6115f66e439acec1e3ae35afc84ee027de1 SHA512 318638d149ddf7c81310b8d1fc6e38525665ea5e3b7fc6830ed3b13547f80635e6a5fba60b60829187742ffc1217beaf7a72bcee2c6b76736316e004ad336786 WHIRLPOOL 4b31e15fcc05fce91aad8bbcfe28511b32f35be1a2d747661be604ff691682be30c73086ce24f5b00a83540bc494d3a4a32585ceaf78cbcd1b4070cf5012e1f2
diff --git a/www-client/google-chrome/google-chrome-62.0.3202.62.ebuild b/www-client/google-chrome/google-chrome-62.0.3202.75.ebuild
index eb98674ec422..eb98674ec422 100644
--- a/www-client/google-chrome/google-chrome-62.0.3202.62.ebuild
+++ b/www-client/google-chrome/google-chrome-62.0.3202.75.ebuild
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 46de819e0771..fa6f18621beb 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,7 +1,7 @@
-DIST opera-beta_49.0.2725.18_amd64.deb 51398360 SHA256 f8dfe57b4d907d7742f536fa9b5420ddc81186dab650cb34ac9d98191efdae25 SHA512 ee40329b70cb14cfa91b11db3189f0a3748f481f6dbc9ecdf06cc72a13ccd589f56ae3445fc2b6ff4664f50360056c3376487bbecadc708756218fdbf9575a10 WHIRLPOOL 5729432593e5ec1251fcd06595ce2c2eb8d601c5653352370fef70fb012d33b973eb5594e7a42770368786446208eeb1856a293d5d10a9d81be878e5623f60dc
 DIST opera-beta_49.0.2725.23_amd64.deb 51405422 SHA256 df69ee3a7ba658303bcbbb793812129017c270a81d50c90448553ed524252ff2 SHA512 c55688edad0294e00181a4b0fb1475a103cb1fb1d4949a5c029e846d82cde13ee697c90ee7ce7bebdda03ee6b63a4b48413f383d33ddda17b8c941f62bd23a0b WHIRLPOOL 25125d4185f64dbedbcd1d2a5cef23759cacf96b540c94aee38f1c87101738db74e379ee85f022caeb12bed37858559557f1517dcc4350cbc61a2edbf129caba
-EBUILD opera-beta-49.0.2725.18.ebuild 2044 SHA256 12fe2817818444a8a62ceb5086075db8ac174508472fcd6a48f15d9727184047 SHA512 1718c2b1b02ec4e58abb1c2f5a31be18fad6c58c0be82afdea0cd145b9a7078682ec1d62ab42d677a9283511c79db565cebe5d64513549d5cbefdd36c1a88e38 WHIRLPOOL 1c483ee9d738c86d0f8fd5c82e92f6384fdea1f1cc433bd9149631259d0f12853b2cb73ecae8eec1970e098a366d7fd3cc06e1f3e96ec1141625a3c1dd43b3cd
+DIST opera-beta_49.0.2725.27_amd64.deb 51520734 SHA256 2223449c47bccf6e7320b8bca159ad0c7e6e3f6974b6e348bf9f2793c9c4d5c9 SHA512 feecc11cc940e433b6838582a821a9c1a02d05c4184da7c608e20e05061170caf20dea1b2bfef6fb1144c7e236ba5f6af7471efbade3b8b6a36a7a86a7c3f2e9 WHIRLPOOL ab547c6d651454b25908261b75604e9959304f34af04bf3a7321095c372a8d9c43449392f4fe365f27094875362f82b54642a1604e5b049f60dfded0e6a41713
 EBUILD opera-beta-49.0.2725.23.ebuild 2044 SHA256 12fe2817818444a8a62ceb5086075db8ac174508472fcd6a48f15d9727184047 SHA512 1718c2b1b02ec4e58abb1c2f5a31be18fad6c58c0be82afdea0cd145b9a7078682ec1d62ab42d677a9283511c79db565cebe5d64513549d5cbefdd36c1a88e38 WHIRLPOOL 1c483ee9d738c86d0f8fd5c82e92f6384fdea1f1cc433bd9149631259d0f12853b2cb73ecae8eec1970e098a366d7fd3cc06e1f3e96ec1141625a3c1dd43b3cd
+EBUILD opera-beta-49.0.2725.27-r1.ebuild 2316 SHA256 4f489cb4f226c90af70201f11ab39a8ecb022424d8390d90467773c66dc332d8 SHA512 7ad803b3570811d137781a5ed0345ceb6078cce52d0d689a11fccdcaddf8197edd3bfd14932f5bcfaff25372bc704cde9528d3bb238ced06e14893c3933e0cdf WHIRLPOOL b520987a250fe9a55cf98f70518cf4e3544090365826af53fbf68550b00690a318e51f708506d81e46026bffba1bf2d2195c06a1a5413e4a10120a2477e384c2
 MISC ChangeLog 15103 SHA256 fa2792b312ef741fa92927cc59971a69072fe6805e76db02a06b8116dac44f00 SHA512 9affbf0fd1bdaba029e118a98a2ac3c5f15f93da18ba1c44432f4bb6340320183eb97794bc7ffebed6eb7c87075278aad19d81eab4e1049f7de0d10d53680cf3 WHIRLPOOL a375ffb483a8ef6f8654787d58fe831f6f1e44ff5fb152d0f113ee05801b3abaf64f5f7f039cc2c9960b425ea3b566a4023c79c2e72a11f8d2bd8a6730ea0054
 MISC ChangeLog-2015 5355 SHA256 609cd90fcfb8b6b7bf0d6a267d21eb0919244a066a84aa1c52d78bb7c314b758 SHA512 75aa0b1de69d27cd099c7d87ef45a694346cb2b45b8843db71fea4155f141122ff563813a0addc83132a548cf0f7251903abb32e3d659da225a6a25d009b4671 WHIRLPOOL da3039eaf919802faae87a7295089aff1a44c025431eb95277e0cfd10a6ab77849720eb380e8b0558d06bb69979308495f00919b2222474f39022843d8a6d9e1
 MISC metadata.xml 238 SHA256 bae0588f6a20ccebb0e76d3ad782fcb2adfd1ea5b9fc1433851379423a103b72 SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993 WHIRLPOOL ad8bdcb129ac41a2941e41186ec94e845858818fe21b95b69adc902ddbe0eb4c4bcce8f00d5f167981852184df07e355866a07f50dcdc8f7cd7edf20ed95ecee
diff --git a/www-client/opera-beta/opera-beta-49.0.2725.18.ebuild b/www-client/opera-beta/opera-beta-49.0.2725.18.ebuild
deleted file mode 100644
index c125ba2ec2ad..000000000000
--- a/www-client/opera-beta/opera-beta-49.0.2725.18.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB es-419 es fil fi fr-CA fr hi hr hu id it
-	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 multilib unpacker
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="http://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	http://download1.operacdn.com/pub/
-	http://download2.operacdn.com/pub/
-	http://download3.operacdn.com/pub/
-	http://download4.operacdn.com/pub/
-"
-SRC_URI="amd64? ("
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
-"
-done
-SRC_URI+=")"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	rm usr/bin/${PN} || die
-
-	rm usr/share/doc/${PN}/copyright || die
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
diff --git a/www-client/opera-beta/opera-beta-49.0.2725.27-r1.ebuild b/www-client/opera-beta/opera-beta-49.0.2725.27-r1.ebuild
new file mode 100644
index 000000000000..96ac80993a41
--- /dev/null
+++ b/www-client/opera-beta/opera-beta-49.0.2725.27-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB es-419 es fil fi fr-CA fr hi hr hu id it
+	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+inherit chromium-2 gnome2-utils multilib unpacker xdg-utils
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="http://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="
+	http://download1.operacdn.com/pub/
+	http://download2.operacdn.com/pub/
+	http://download3.operacdn.com/pub/
+	http://download4.operacdn.com/pub/
+"
+SRC_URI="amd64? ("
+for uri in ${SRC_URI_BASE}; do
+SRC_URI+="
+	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
+"
+done
+SRC_URI+=")"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libnotify
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+		x86)
+			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
+			;;
+	esac
+
+	rm usr/bin/${PN} || die
+
+	rm usr/share/doc/${PN}/copyright || die
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 5b68cda57a98..7184f0f8947a 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,7 +1,7 @@
-DIST opera-developer_50.0.2739.0_amd64.deb 50078620 SHA256 7b90cf95784f99f4d331ee573dfeb88e8772a98f58636bcf0720414d473ef560 SHA512 40666d167537c34c189da81b49d781a48bf7529b913faf33f5e48ac9d01076e3d43c23e44b1ad3b485af56fcecf3632cf26fea1f717d2298c733e42aeb4f9d2f WHIRLPOOL 5ae1491bb585ee4644af530462cdb23f10247fd635508681381ffb978d62c704a771d4818cd6f30c743d544fea598ea9f4b08f0008f3845b406fdfffba07c089
 DIST opera-developer_50.0.2743.0_amd64.deb 50330442 SHA256 ca1f1c29ce4ef2eb8a7ab4ebebd4250c6c437ade3caf23cb828da815ff665d8a SHA512 68c897427af2bc448704005f6250d335d99d28a965bc16c7468303fec7cbb5a2146b53cb5dc27b3dbba1afcba6061bbd3556845784b222dbbc1655d7f6c00a84 WHIRLPOOL a2f8da14a9448e9c5e515a4209df4724b50a3f79e565571473bca0bbde71fd6d0acf39ba3c05d6ef8ecfcb7fa0e6bf7aa9829b42b43509188a3748ed24381e80
-EBUILD opera-developer-50.0.2739.0.ebuild 2044 SHA256 1e1cabd03e6b27b19f683210b3451b808ac892076e3d88b025b4e4e616d5e966 SHA512 38157ad10b0e33ecf38925d6c0472c22cd167628f48d2d160c74f103ab5c85751fc58be165823fe7262160d9f10ee1c1a888acca9a3363635d50cb07698058b7 WHIRLPOOL abde7dc3ab167529db2124efa369571d7f8bd939b5b7afc823dc00299b3b6613e663c88df5a4f48d2489a0d18dd760b017ea3345ac6824f14fd9e5fc37ebe50a
+DIST opera-developer_50.0.2753.0_amd64.deb 50446720 SHA256 b265d88d484e8dd66bebc85914503031b4275d4bf79c5b4143e9295bc480e4c1 SHA512 1babfa6a4ec10ee28d3c1a034dd610bb557473e264b7db29355c014a9a4f2f975834e8d6cf8334f692862a99a4a9b39db1e9528fd9be8c969adb1f56b9ba3c43 WHIRLPOOL 7c4c3ca31650a7703bd6a5aaae1e5196d8b8a9493c15f26a35389803d2c5020f2a3ecd6aa82e1236799d269c8c0ffe10cf553bcdf9cd6ef6e76ab4193109bf66
 EBUILD opera-developer-50.0.2743.0.ebuild 2044 SHA256 1e1cabd03e6b27b19f683210b3451b808ac892076e3d88b025b4e4e616d5e966 SHA512 38157ad10b0e33ecf38925d6c0472c22cd167628f48d2d160c74f103ab5c85751fc58be165823fe7262160d9f10ee1c1a888acca9a3363635d50cb07698058b7 WHIRLPOOL abde7dc3ab167529db2124efa369571d7f8bd939b5b7afc823dc00299b3b6613e663c88df5a4f48d2489a0d18dd760b017ea3345ac6824f14fd9e5fc37ebe50a
+EBUILD opera-developer-50.0.2753.0-r1.ebuild 2316 SHA256 efffb72210be941d46dbfd1fa49629ffe2efac7e9f5ef5e542984b7c18492030 SHA512 5df232e6a39fc6b70a1bca945a84042fa85e606f79832d650899ba0c32301cbad46c5b70bc7c2d5b4b4814991aa2263d012b3808680ef0c8c43f27655e481dac WHIRLPOOL 82f8a1236bc7638da44f2dd2f4cd96579edf87772a417552c67448dde1a8d8978140d4618ef1c14dfe2c9fca668fb44997ef69cfd3722215cce6a22017236047
 MISC ChangeLog 16377 SHA256 1a4a1e4e3422a894db2726fe1ceac5c2f77bbac69c6b054d52b4a026552e8a2b SHA512 3429c4032a9d8db677e166e4717358c658ddeb88e6d754aacb0897bacc9cd4903e94d21fa6746411cbc3ceb3f332170a9f74fa876f18335647a869fcdc5a21f1 WHIRLPOOL 93588892f12187d28d78679b944a5d240cb4f3fc84351ae78268d62cf61f0eabe1de847ed80e99179ece933170612ea3dbde22834c6a1f441bae260e7c4ea8bd
 MISC ChangeLog-2015 8576 SHA256 c7585ab906eb43df74fa3eee2938df70b05358a563cad5e2753175d362b03c6f SHA512 f3008826717c39fdd3c3e9b8f427d2ec31d9bdf108cfa9605f7457dfd317da43418f625ba14b2a20e5b38bbff10b27bda7ba0d4caed454f960567f1dd3946580 WHIRLPOOL e302edaee04b3b67a4c89a3e385a4d3daeac33eb4fc6f7d4155b17156bbe574aeb108da4d848cde6db71c8bdb22b8048fa5478ff05a63e91bf7552ca2864f900
 MISC metadata.xml 238 SHA256 bae0588f6a20ccebb0e76d3ad782fcb2adfd1ea5b9fc1433851379423a103b72 SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993 WHIRLPOOL ad8bdcb129ac41a2941e41186ec94e845858818fe21b95b69adc902ddbe0eb4c4bcce8f00d5f167981852184df07e355866a07f50dcdc8f7cd7edf20ed95ecee
diff --git a/www-client/opera-developer/opera-developer-50.0.2739.0.ebuild b/www-client/opera-developer/opera-developer-50.0.2739.0.ebuild
deleted file mode 100644
index e915da3167e1..000000000000
--- a/www-client/opera-developer/opera-developer-50.0.2739.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
-	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 multilib unpacker
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="http://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	http://download1.operacdn.com/pub/
-	http://download2.operacdn.com/pub/
-	http://download3.operacdn.com/pub/
-	http://download4.operacdn.com/pub/
-"
-SRC_URI="amd64? ("
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
-"
-done
-SRC_URI+=")"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	rm usr/bin/${PN} || die
-
-	rm usr/share/doc/${PN}/copyright || die
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
diff --git a/www-client/opera-developer/opera-developer-50.0.2753.0-r1.ebuild b/www-client/opera-developer/opera-developer-50.0.2753.0-r1.ebuild
new file mode 100644
index 000000000000..79b9f057efbf
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-50.0.2753.0-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
+	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+inherit chromium-2 gnome2-utils multilib unpacker xdg-utils
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="http://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="
+	http://download1.operacdn.com/pub/
+	http://download2.operacdn.com/pub/
+	http://download3.operacdn.com/pub/
+	http://download4.operacdn.com/pub/
+"
+SRC_URI="amd64? ("
+for uri in ${SRC_URI_BASE}; do
+SRC_URI+="
+	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
+"
+done
+SRC_URI+=")"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libnotify
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+		x86)
+			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
+			;;
+	esac
+
+	rm usr/bin/${PN} || die
+
+	rm usr/share/doc/${PN}/copyright || die
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 4b1e14a7d509..9403872c8408 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -2,11 +2,11 @@ DIST opera-12.16-1860.amd64.freebsd.tar.xz 13312684 SHA256 ecc001605c45baa4acf60
 DIST opera-12.16-1860.i386.freebsd.tar.xz 13385696 SHA256 dcd80ea7a8f090a47007fc630495817feeb167220b9a9bbffbf349687f3e29d3 SHA512 0bb2c0548765ea476cdb8be6c84faf1d60dddb5a2c08b7312027f4cd17fa8ebd4fbc1a97657bbcb0ac07733e5f3b340b181a307a778c38543140adbfe7f8b844 WHIRLPOOL 5703b2c736694cf6ffcf808872e72585b81c7fed9d2263d5679ee54f667f4eb6b9d34a73b80c8efc0a8640daf03da60dafa0defe0c560d3ef78f2a8a68cbb960
 DIST opera-12.16-1860.i386.linux.tar.xz 13154668 SHA256 df640656a52b7c714faf25de92d84992116ce8f82b7a67afc1121eb3c428489d SHA512 a13ec53311e3e78f35103a9dd5337c0e9a555362860213080211ee9d21de88fbd6aae03bed20b7515874d5a09dfbab108954213745fb82175f5e48e555152613 WHIRLPOOL ae1af6858847fe51dcac8cb076a67099846ad66b734ecf92780e953daec963754c9e4352e979a636eac70e785a62bd94e084124080d7fe0f59b420a99a2133cc
 DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 SHA256 b3b5cada3829d2b3b0e2da25e9444ce9dff73dc6692586ce72cfd4f6431e639e SHA512 c1289f352ea5fc8133b105771f48fdc56ccd770920330b1a0ed939ff909abc68081447673572eabeb1aae6db5194b6ab35c93afad78a91d8f7a9a0f91e81ef8b WHIRLPOOL 539cdf43b4c8175c664fbf786b27ede1d33e58c44f75229a1a50612951136f526d646f3e0444b6cc69961259c3e3ef7dbf722b520abb4d4dbb98032c4de335d1
-DIST opera-stable_48.0.2685.39_amd64.deb 50196574 SHA256 e5b67f5cd19337edab6dc7e7c2660ff8d5e0fd88c1c255963903530ffb01b51e SHA512 e7a934a45fc0de8214431496766cb14d4b232f15b446c7d97df5088f0d92672c6583932f522b7bc82ffa979146351281a007c68eb2335d4744f2628d08f84832 WHIRLPOOL ef8d7381687e25ba46643ce39fd921e3667c3e6c0a288346caf4dd1f43e9bd98cbbe9fb142e4718cec30afa84c1656b715f6d42916cd92076bbc6ee9e101babd
 DIST opera-stable_48.0.2685.50_amd64.deb 50181884 SHA256 83c7ec7db3331de54200b7f4189acc6ca9a104b0908e05312549cd3b32ec8677 SHA512 f4e775d9e8fc1f589dda8c48e558fac93907300ff8054b9408ac656293982cf2bcbb9592279313d46efe88e2c977da6f8b39e6db8ecbe687f6135cdba2c61d5a WHIRLPOOL 56ce7a471cf9678cadad123920dcef99b1bd3349dc9576636826c679b467e2cb5ed1f7c64ccc13ff42b4d4412ed3cbdf96c5b3abae705a17ff7a9344e65733d8
+DIST opera-stable_48.0.2685.52_amd64.deb 50149108 SHA256 1709b44fe1daca3df1063e0566716768c1476fc455fd6d75078d68252096f608 SHA512 ef104214ccac7e5b55ba30484dc9756036b87bc8cbafa99e7f2e06641e71385e31ce35b922b1ff50ef9eb3a7083b133e48450baacc2ffaba0c01becc855833b9 WHIRLPOOL a015885bb2e1bfa84691fb7c78b9af827aa4a17ab6533bd1546ed1231f505f2bb389623ddf57c38480c025025a9cf8a1302f9860caa809844ed1630e01f6b318
 EBUILD opera-12.16_p1860-r1.ebuild 5987 SHA256 3f9a2e893b5204919f51ffb18dcc9b43370529d28122d0787d504fbf96d61869 SHA512 f0fe61c21d4a8180b5d0149aa0d4621bf60e4684803828f7743e73f894386e0c3945201ec46f16ea1fda4e780d0ea3447f32d55d985673a1643b2055efb12099 WHIRLPOOL 68a5f0263ff917476de41bf978ecf067a8ecb87191f7f404a040b0ceb0abb0af48cad027ebcecc99afe66cd0927889466220ef29b313efbc57857ee741d36d52
-EBUILD opera-48.0.2685.39.ebuild 1967 SHA256 e5d4eeeff889afc252f26da0838215c84472b634a78dab616cf4de6d8915a8cb SHA512 37762a3a3dad0eea0b673b1b402d82fa60a16352fdec1a780469709b11fb0a7061eb2ad8c9bbe2452585e77463502c6ee6a06d2acbc932709749b97fdbc4a8c6 WHIRLPOOL 6cd6d77bf5ef8aefdbbecadbf1972bd24beb5cbf0c74cf7f1076503ca56535c3f44a5086dd00aa29040b01847e3720483c8b7c5cf63d19dfd515883c04e45019
 EBUILD opera-48.0.2685.50.ebuild 1967 SHA256 e5d4eeeff889afc252f26da0838215c84472b634a78dab616cf4de6d8915a8cb SHA512 37762a3a3dad0eea0b673b1b402d82fa60a16352fdec1a780469709b11fb0a7061eb2ad8c9bbe2452585e77463502c6ee6a06d2acbc932709749b97fdbc4a8c6 WHIRLPOOL 6cd6d77bf5ef8aefdbbecadbf1972bd24beb5cbf0c74cf7f1076503ca56535c3f44a5086dd00aa29040b01847e3720483c8b7c5cf63d19dfd515883c04e45019
+EBUILD opera-48.0.2685.52-r1.ebuild 2239 SHA256 d29ffa215e64c63fa160f74042b508609ddf11eb9de25960e6aa391b6b917d8d SHA512 d19aa77e5d041a7d738462b2c0b61c8839b61531119b680d82643e599b7b5aaaf9ecd1b5b97515a515ec2059d7f80ec3a5f48fe5b6b35aab507033eaa96006de WHIRLPOOL 79d606c0fdc2df5c64b34f534522bd8162cb55d035903fc37d965f72db833aa85f1b10584ab05189af1bdd077cf5335115d4f0bdd25f9e5ed09e2cf6153dec07
 MISC ChangeLog 11319 SHA256 b5dbbcac51e80d3bf3b17b6ec3bbd38e3aac7c88a0ede8fd1cbfbc4ed2f23ede SHA512 4beffc37f3a3014505181ee1483734aa9ac6f783e07a82a092e5c9a293e8c5270e447ee027becd1fc919cbd3d451ee60e49063703c0b9251646bb1f49a9f4e85 WHIRLPOOL c922aa713b0f04718e062b34adeb4f2d261904ecbe1695e15f1bbcc8bf737b2ea516c05a84ea1e3c0ec8e6da2d5fc9778053885e5ac0cf92d86183c517b6ca35
 MISC ChangeLog-2010 112299 SHA256 5c3b5c58119b4a6b1911d840892c42234f25dae57452287fb0a9e6cca78ed171 SHA512 9dc4dc7e7508bb1621c390837ec2e47d9e96075906b2060be419ee64e505c8f0da9e4d3a8bc7cc2de66c6efc383f026afb8fa5e886afa15da6349514a93c9edb WHIRLPOOL edaf1c2e810e91d37b2d90847640900374b447a12e2e0e927654966cc18c3a14f332ce6daa07c5a0049da06f5e89bfd0daddb5f73a4d79b334ded4397349cf7a
 MISC ChangeLog-2015 41138 SHA256 6209a7f61e8f513d7bd17f64d8c4d12e5e4318227d9033d7117427b1d241ac8b SHA512 2bbbd008b586cc177280674c2dcacf7464645ebd3ddd4b18fe86ecea30d9e9f973d286b4fcab65cd1f09d994938dc6449b28f606c2a190fbc07301a2f919e6ed WHIRLPOOL e6fca4beb9f81f9633c56b02c7e94d3f9cc46fd8ed0a66ab297f790b00b8c132c10048996d9c4427283048cebb76c74602d8e9ccb0e1edd2f68b7245d9fee092
diff --git a/www-client/opera/opera-48.0.2685.39.ebuild b/www-client/opera/opera-48.0.2685.39.ebuild
deleted file mode 100644
index 824ffea24a6f..000000000000
--- a/www-client/opera/opera-48.0.2685.39.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB es-419 es fil fi fr-CA fr hi hr hu id it ja
-	ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi zh-CN
-	zh-TW
-"
-inherit chromium-2 multilib unpacker
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="http://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	http://download1.operacdn.com/pub/
-	http://download2.operacdn.com/pub/
-	http://download3.operacdn.com/pub/
-	http://download4.operacdn.com/pub/
-"
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
-"
-done
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-	esac
-
-	rm usr/bin/${PN} || die
-
-	rm usr/share/doc/${PN}-stable/copyright || die
-	mv usr/share/doc/${PN}-stable usr/share/doc/${PF} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
diff --git a/www-client/opera/opera-48.0.2685.52-r1.ebuild b/www-client/opera/opera-48.0.2685.52-r1.ebuild
new file mode 100644
index 000000000000..aead2f06e723
--- /dev/null
+++ b/www-client/opera/opera-48.0.2685.52-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB es-419 es fil fi fr-CA fr hi hr hu id it ja
+	ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi zh-CN
+	zh-TW
+"
+inherit chromium-2 gnome2-utils multilib unpacker xdg-utils
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="http://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="
+	http://download1.operacdn.com/pub/
+	http://download2.operacdn.com/pub/
+	http://download3.operacdn.com/pub/
+	http://download4.operacdn.com/pub/
+"
+for uri in ${SRC_URI_BASE}; do
+SRC_URI+="
+	"${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
+"
+done
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libnotify
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+	esac
+
+	rm usr/bin/${PN} || die
+
+	rm usr/share/doc/${PN}-stable/copyright || die
+	mv usr/share/doc/${PN}-stable usr/share/doc/${PF} || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 50825baa6519..ab8768ee1b4e 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,8 +1,8 @@
-DIST qutebrowser-0.8.4.tar.gz 3040566 SHA256 f5ce98c5bc57ae29dc31f8896fad6911feab91277a9554761126219e0f8e8671 SHA512 0dc5c83f875a207cecb351b07895b48c3ad014f0ed7c45fce8023aa77f27f81f7ee2da2c376d0081760fb66fffcc811e3231d0aa50d19a7339b4cf5101eff9ad WHIRLPOOL 9bb957be49b9ca5b044fe582a7e77f7bed705f34c8329a8aaf907d93e9bb4e74103668abf2ac9e01403801099d3372e358652b758b2f01bee8fb881c8bcae683
 DIST qutebrowser-0.9.1.tar.gz 3091676 SHA256 5aabfd6824ece72a2ca2dd02f4ee47f5b3c48a289c9f3e1854d3b30e980dc95d SHA512 521bb306964865a17326701f8d4e46369583e8d81d4807ea2ee7252cbb734133ec06902780d191f8e8a95cb3ee4f9590d7bda223aa43bc25c986c343d6b17017 WHIRLPOOL 0f96d66033b53c0009db3dfa87b4fc5b53cc56ea4caf2f6388cdcd9f1721986cee6c6d04d3c376a9ee719483a6d6a9dea8e1501c612e46fdc9396b80ff2f7e5e
-EBUILD qutebrowser-0.8.4.ebuild 1936 SHA256 ff53a6e9d56a3d7dd45e320659c21f21aaddaeb73900b87a4066ccece09b08c1 SHA512 1bd81ca4b9e24eec59be7b5522502e54fe52c52490cb10f064be458d933d5b74dd4e7da18f623826f39c199667dd62b113dabdc1e45f660a9dd29d349b4d6277 WHIRLPOOL d1a3ab09b0d36c1b104d1b38753c4155f950087d9d08aea360c40efe2dc0cb656487e8a101c26dd15143687725c786e0f7b4e5596d02f040027c5c0572032897
+DIST qutebrowser-1.0.2.tar.gz 3272237 SHA256 f33281bd6d23bdfad7fbf8b85a01ae9cbc6bd343a957bbebcdd38f9ee8ae7624 SHA512 a2b548dd7577064000845e696b87d65e0d7452053741832036c6a89f5f3d1cf03a241e4c8c202c57bf87ecc843a7003dd3d5eb32169a32420345ff46e9cf3186 WHIRLPOOL e14c811c070e5a71adc9537115bd2a9e6c50fb8cdc4f285330c6d5e62721c8e21a5139a71cbcd72e372556fb09be1f3e52380829ed5ea74d71f87bf4158ee8b6
 EBUILD qutebrowser-0.9.1.ebuild 1952 SHA256 1c84f3a84a0ef84f13c12781284916adb8edd4e0413e92824449f41e23ebab43 SHA512 03c90528d5480ad59d9f0a157bee37b20d203ba08095709b5125b1edf17647afe96e8ca38e8f92a06904843c3da99527cfaa17cd6ceef63aed1c95e15d65dce2 WHIRLPOOL b6074455fbaf9fd22c41215d6176ad9838878c83e5205d86bb1a9ed61ed93aade4a1780ce11ea3ee78684b2047d689185ff0eaabdf79f008aa3e043cd74dbd1d
-EBUILD qutebrowser-9999.ebuild 2111 SHA256 cb047390f12878300aa90c1d4fb2294d707388718e50d63e271e6c517cefd2b1 SHA512 fa21fec5d4982bfc3ce2f61ef2dcb9d9e8339200e463689826e0340efb48e5ca05419224ecff98a69e8fbe56b8ab733ce3b31e53a4ef7e5d7c7aa40e42dec105 WHIRLPOOL fe5e15215749e8e60eadbfa77b8ea69b1b60fa3a734cda549af37a5816837a566fa33b05081fbc3ede6b31c6a5ae55769cdf413696a16842597f7047da4e256f
+EBUILD qutebrowser-1.0.2.ebuild 2237 SHA256 9dd81a65ebeb55a6773999d628441fcf1fb41b08d4f3f5ac30d9a1d8fe1e546f SHA512 37450af6a1636d9e9310a412470fa7c94c66eea3f0d2549374b6447fcfd8cc6a7dc7030833a4230b5d4f16a849c9cc5481d3bf26fb6fd890d70aee720bb8eaf6 WHIRLPOOL 2d07ad237e425e0fcd4cc88717a6bcea6d24e8e4ff3b9020a8120820bd77bca1268dc8833c6f9c19c372394c8bb8e439237e049ed2888c2b525ab9317e14bcb9
+EBUILD qutebrowser-9999.ebuild 1981 SHA256 e8c1a616adce0178467e8bb5aa97a6376c41632d20f2e90b1a296bc7c78d9acd SHA512 7e84a074b489c8abd6226ffba4e3169926b1f5c6e7362892968fcce562a87f4f3b93fdc2900a51a926c4e40e895a2487ea39cf86b41b49c60f87d30d1a668fd4 WHIRLPOOL c7947e58e81bc520c95d282a6d1930fa04ad81579065b4daed553c7c9e19170259d7710fca542b845960c1f36c4ef77d2a1c566411da5a008a72684de766aca4
 MISC ChangeLog 5368 SHA256 7238059888b60b1ad6390b40f17a8c419bec536b56d8ba8ed9ea74494b7dda4f SHA512 d2a7eac903dcecdef506d8dcd696747491264dbb077a8fa6e68032b4ca304f911426d15313fcf815da08ac159c5f9ba10adb4f0bba7f63ab3ef6ed99113ca6f5 WHIRLPOOL 618e3b2b36d9b34a620902895cf4340d6ce4f636814c6f38d9f63de12fb3f8c004204496f9799ba1556c8f5b3827e4835ad8935e5d397be0b0453146e65fdb24
 MISC ChangeLog-2015 601 SHA256 f8207f1b2aa1ed32d252028e2987aa863ae07ed28a1c240c21243eadf371dd48 SHA512 333f553b42617acacc46035e37e603f8c6926059dff52b872da807057d59bb4e12132b3d291068250241bb367ddd94c0b992fcd4ea381ccce532ba12f3cbac39 WHIRLPOOL 890c6b6a390c0ba358f320c2dae693c0c39c94c6188a3d9d3467968d5e10d5c5b6f77ef1b9c079d8cb63cdeb9d6553739f6c0cfa04ba2ed50c4bca22f5c69121
-MISC metadata.xml 460 SHA256 998c63853be5cbdb1fa4abe5f6cfe0f1f78d92cea687d540d3871cf04fd69829 SHA512 db701396e7cbd7c44ef3cf758daa2e1e6af00df5e5a65df7b138b34995c35ffc26d3af2cded41df1983a6d4ca5de8636e73915331c239613bc3e905569867768 WHIRLPOOL 502096d4e4530f8965b506cbe120228a335d5fe4393a1e0046cd777c6d664b53896270be2e5d5c5088c034eca7b8f59077a1668df0550fd0cc870b1625ead993
+MISC metadata.xml 445 SHA256 77a59f5e4a11966f20f68c6919c6b515fc38c73248a1593a62436c225a15110d SHA512 441a63c005894a6527b1521de85b2a26ba107c79fd0663521250808381fe2264972049d14585f153ba3a81d026d715f604382c40489da72398d9eb0fbfd5a6ed WHIRLPOOL 91a928502bd11865d1922878316dd018e6a67a8e9992117517a389bb67fde9f5ce196d85d0123954e010e19b48609ddfa50fb28ff8dc383904b0fc4d4808f68d
diff --git a/www-client/qutebrowser/metadata.xml b/www-client/qutebrowser/metadata.xml
index 0b5baae9f956..7623d04971cf 100644
--- a/www-client/qutebrowser/metadata.xml
+++ b/www-client/qutebrowser/metadata.xml
@@ -5,10 +5,10 @@
 		<email>radhermit@gentoo.org</email>
 		<name>Tim Harder</name>
 	</maintainer>
-	<use>
-		<flag name="webengine">Install packages required for
-		experimental rendering support with webengine.</flag>
-	</use>
+	<maintainer type="person">
+		<email>jsbronder@gentoo.org</email>
+		<name>Justin Bronder</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">qutebrowser/qutebrowser</remote-id>
 	</upstream>
diff --git a/www-client/qutebrowser/qutebrowser-0.8.4.ebuild b/www-client/qutebrowser/qutebrowser-0.8.4.ebuild
deleted file mode 100644
index 82042ee94095..000000000000
--- a/www-client/qutebrowser/qutebrowser-0.8.4.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5} )
-
-inherit gnome2-utils distutils-r1 eutils fdo-mime
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/The-Compiler/qutebrowser.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/The-Compiler/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebKit"
-HOMEPAGE="http://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="gstreamer test"
-
-COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${COMMON_DEPEND}
-	app-text/asciidoc
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-python/cssutils-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
-	>=dev-python/pypeg2-2.15.2[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},gui,network,printsupport,webkit,widgets]
-	dev-python/sip[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
-	gstreamer? ( dev-qt/qtwebkit:5[gstreamer] )
-"
-
-RESTRICT="test"
-
-python_compile_all() {
-	if [[ ${PV} == "9999" ]]; then
-		"${PYTHON}" scripts/asciidoc2html.py || die "Failed generating docs"
-	fi
-
-	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
-}
-
-python_test() {
-	py.test tests || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	doman doc/${PN}.1
-	dodoc {CHANGELOG,CONTRIBUTING,FAQ,README}.asciidoc
-
-	domenu ${PN}.desktop
-	doicon -s scalable icons/${PN}.svg
-
-	distutils-r1_python_install_all
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	optfeature "PDF display support" www-plugins/pdfjs
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/www-client/qutebrowser/qutebrowser-1.0.2.ebuild b/www-client/qutebrowser/qutebrowser-1.0.2.ebuild
new file mode 100644
index 000000000000..aa893e7d04e9
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-1.0.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_5,3_6} )
+
+inherit distutils-r1 eutils gnome2-utils xdg-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
+HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+
+COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
+	>=dev-python/pypeg2-2.15.2[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.7.1[${PYTHON_USEDEP},declarative,gui,network,opengl,printsupport,sql,webengine,widgets]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+"
+
+if [[ ${PV} == "9999" ]] ; then
+	# Highlighting needed to create help files.  Alternatively,
+	# scripts/asciidoc2html.py could be patched to optionally set
+	# '--attribute pygments' when calling asciidoc
+	DEPEND="${DEPEND}
+		dev-util/source-highlight"
+fi
+
+# Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
+# isn't complete and X11 is required in order to start up qutebrowser.
+RESTRICT="test"
+
+python_compile_all() {
+	if [[ ${PV} == "9999" ]]; then
+		"${PYTHON}" scripts/asciidoc2html.py || die "Failed generating docs"
+	fi
+
+	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
+}
+
+python_test() {
+	py.test tests || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	doman doc/${PN}.1
+
+	domenu misc/${PN}.desktop
+	doicon -s scalable icons/${PN}.svg
+
+	distutils-r1_python_install_all
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	optfeature "PDF display support" www-plugins/pdfjs
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index 2688b7223b3c..0b25416e3db8 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -1,46 +1,41 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
-inherit gnome2-utils distutils-r1 eutils fdo-mime
+inherit distutils-r1 eutils gnome2-utils xdg-utils
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/The-Compiler/qutebrowser.git"
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/The-Compiler/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
-DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebKit / QtWebEngine"
+DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
 HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="gstreamer test webengine +webkit"
-REQUIRED_USE="|| ( webengine webkit )"
+IUSE="test"
 
 COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${COMMON_DEPEND}
 	app-text/asciidoc
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 RDEPEND="${COMMON_DEPEND}
-	>=dev-python/cssutils-1.0.1[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
 	>=dev-python/pypeg2-2.15.2[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},declarative,gui,network,printsupport,webengine?,webkit?,widgets]
-	dev-python/sip[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.7.1[${PYTHON_USEDEP},declarative,gui,network,opengl,printsupport,sql,webengine,widgets]
 	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-	gstreamer? ( dev-qt/qtwebkit:5[gstreamer] )
-	webengine? (
-		>=dev-python/PyQt5-5.7.1
-		>=dev-qt/qtwebengine-5.7.1:5
-	)
 "
 
+# Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
+# isn't complete and X11 is required in order to start up qutebrowser.
 RESTRICT="test"
 
 python_compile_all() {
@@ -57,9 +52,8 @@ python_test() {
 
 python_install_all() {
 	doman doc/${PN}.1
-	dodoc {CHANGELOG,CONTRIBUTING,FAQ,README}.asciidoc
 
-	domenu ${PN}.desktop
+	domenu misc/${PN}.desktop
 	doicon -s scalable icons/${PN}.svg
 
 	distutils-r1_python_install_all
@@ -71,7 +65,8 @@ pkg_preinst() {
 
 pkg_postinst() {
 	optfeature "PDF display support" www-plugins/pdfjs
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 776ebf475350..58f882c64d6a 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,8 +1,12 @@
 AUX vivaldi-snapshot-1.12.955.3_p1-libffmpeg.patch 1190 SHA256 e67cfe8b6a7bd14b20ab2d3f8fc26018544b0fd3218a704e6af584c474d8da9a SHA512 550c0b9a9683c389846e058c31074ccdc7164c2ec1d13ad4a4b7daa0e3f4a0f469d6ec71cc4c293cb6403427d589d0084b96ec5caa27f69548fbfe5c8608865b WHIRLPOOL cbd948618af24e7e4070df51695c1e6166bd606053b23ddcae64f7d020cec8724d8d9409c8a19eeee5f102bbf558e58993fba7b995774b387fdd63e35399d525
-DIST vivaldi-snapshot-1.13.966.3_p1-amd64.deb 53410782 SHA256 a7a20c765d9a5ea22337424a66706f1909c6e18ea7ccef01575d245d3cb80db1 SHA512 5b71245656885584b4dbd5a02da89e5fede1ea246f5fc14a7cc3216cf40191d0183dcf80fcb3a433a75073e474bb45d111590777b8fee6ce1ab8fb68b2bc8b19 WHIRLPOOL 9a699723abfd50413957da4da1ceaa132a6bf58c102197bbb9a4c0458632a95e7e87e5a46788268efec6d7fe447928ccac7ca66006a2b1de5c536fcf67188c1e
-DIST vivaldi-snapshot-1.13.966.3_p1-i386.deb 54706528 SHA256 3d132d1f2428ba816d2b93764205b2772f1fa84f2dac71cfbd60794121b1898b SHA512 373006f4b93e4f5bcd32bdd55ec97844a5eb1569a5177f541ffc572b4c7298e80e5479baf0ba5a5c2ed516beb27d68be5d092aab741e06e62b5e38b219f30d7b WHIRLPOOL c53f769b38448f5ecfce26167eaab82afdc73688e184f7dbd6f2c7b546e6f055946c5b54e21355e78fe536621898d40683f8e477b81877c1cc471763dbcf80f7
+AUX vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch 1164 SHA256 260fe8e0c736f6ee34136b417d4798099d83abc55adffca6903966d21fa73a66 SHA512 2a78bae6ee58a415029c0db0c7ebbdc11611d2e167da6fef21a6a76df66b88ac65f803f9aa8b1a22007709f435803a6c967e1a82249c6c42e8d9e1cfb2c114cb WHIRLPOOL 036b6f99ffe4c39231293c3a49fca90aa52de8273757dd1fbcf3660c669fd05d22ed6952ccfd50b18e008d6f279cc60d020284581cef63385c9234ba6c1a6b36
 DIST vivaldi-snapshot-1.13.971.8_p1-amd64.deb 53403290 SHA256 1ee7306a6f6c02e1b66a4d36671bbfaf63a4119980e988a8ec67b54963d83e32 SHA512 884548741be907c6c3eaaabccb2d87440cbc07da886e0fdd7197fcd8e17ef7e59a977a6ead35ce5ffa1743bb038ea48a54af727d7cdf1b6ccf1974a2094e87ff WHIRLPOOL c4cfbd05a5123b402855a89d3e1016fc5d2f5abf91e3fe20e68e7b8d306d59e80c0e3c4ad1aa639b113bfe37d165f81eb56bce9241fe7e6e27c6de139e615e0e
 DIST vivaldi-snapshot-1.13.971.8_p1-i386.deb 54726014 SHA256 a6e5a8274881a4f53f5e528bc0d832566611eca15f2fba0d10f3307c905e5629 SHA512 a6d4f14c34e2ebfda6db6c47d8db76acf64a7a7f21da95debe4aff01eeeef856a3c353f4c9a4f4658d5a39ffe64f715ab3eace9b614f8fa13a33ff04b7886305 WHIRLPOOL b7c2b769a98b7c4eb42db61f571b3224731d5720ecbfeea666d86b2c6ee3c28f84d96cf9512412ce82497ed95e8f68b094ba729aecb4524fd1a83a82929ce48d
-EBUILD vivaldi-snapshot-1.13.966.3_p1.ebuild 2343 SHA256 f2a8fcae2c937e3269a431082d9b32b4e378fa54284fcec6453f3d42de83ca86 SHA512 f76fe53df1cd4985a1333767388a64192f3b311595db5386ff0f69d5ea6f9435816c4ea66c65bc327c9d75a3cff17481b7f1c38f487eab76d6795e643e2e6a56 WHIRLPOOL df97e0c8252f7f2dd24deadee466282ddd56e4d15b2b18f5af20ae93fc78155d6b53f79fd3abfdeb64fb7e730fd5c5322400b9b22f27670f9861ce3c79ba9d00
+DIST vivaldi-snapshot-1.13.997.3_p1-amd64.deb 50485472 SHA256 81b132dfda7f82374a631cf81ec63a8f8c5f5b59c1af871d02ecff25c805ea89 SHA512 d88cac768f34788b8c3b6550bfe03ad64557e731af57b85a144f6c4622d256749f0498dac2d73c689890c8d5fe76c66efe0963813481d2a593b9ffcbfea7a966 WHIRLPOOL a9fa9cc3690f0943b42030f95f7cd3ddf1682aa9ea3160bef967619d30f2475e6b0ea48ff397a622d29f2a6bc04baf0357089a51212952342481be8503a98272
+DIST vivaldi-snapshot-1.13.997.3_p1-i386.deb 50953694 SHA256 d1f3a38651cef629c6aa77fc8d401593ed4915b6fd68a6177f25ff8a8fd8db45 SHA512 016fbe2bbf007a12417a14200c7136f0fbf887a74d76b2c6e34603da44f42bbc84a9a981cb8652e5c2c504080e0e4330fdf8a8a8886ef93a1ecdb73bc48ebb79 WHIRLPOOL 5c4212551fe57fa118fd7814cd3ecedcd685846d891860279c8fb8bcbad1d40604b37e26bbf56c118fffbbc3304749003aa48f04199125d200c5b61dac35a075
+DIST vivaldi-snapshot-1.13.998.3_p1-amd64.deb 50480568 SHA256 614bef3d831c0ad5aea661789856bcc64acaf1056f0c5e2761b58462b32aef53 SHA512 cf184ada5c09cfd47bc4f97df6c48f69535149153cab9594dcab40e75301b0fcc8ff6847e30a681cee98d194ec6d3d93dbf7c0c5934110c797be189774453889 WHIRLPOOL 8dcbea6c53df56a62460cf2d117903bc24bee78a4eb814a55a80c4e9ad71479361c4bb27ebc83304f1d41e91512b7f55bc265478a2007396bc4ee2603516db11
+DIST vivaldi-snapshot-1.13.998.3_p1-i386.deb 50952110 SHA256 ac06dd0fef18c0e00b6cf7702b9171b226f9534be955bf3487b64ab11e1d1a75 SHA512 818dd2b1a26a20b9c2192ccceeac734b032416b349267aa17758a781a5f243923bf270f97e792d3828918600bd98c642403f4f629f71a69c464646e1ae0335dc WHIRLPOOL 7d6e59dc2e52d4538e8b7accc09c783f726fbe565f0964ef99c69755067eb6d66bfafb8852770d8dc306b4c2fa61c4120f6b1e3bf833fa8866630734bb81f390
 EBUILD vivaldi-snapshot-1.13.971.8_p1.ebuild 2343 SHA256 f2a8fcae2c937e3269a431082d9b32b4e378fa54284fcec6453f3d42de83ca86 SHA512 f76fe53df1cd4985a1333767388a64192f3b311595db5386ff0f69d5ea6f9435816c4ea66c65bc327c9d75a3cff17481b7f1c38f487eab76d6795e643e2e6a56 WHIRLPOOL df97e0c8252f7f2dd24deadee466282ddd56e4d15b2b18f5af20ae93fc78155d6b53f79fd3abfdeb64fb7e730fd5c5322400b9b22f27670f9861ce3c79ba9d00
+EBUILD vivaldi-snapshot-1.13.997.3_p1-r1.ebuild 2354 SHA256 792d8210ae35215af58dd79d8882bf68a5eeca4ce6e1acc91af2c7ca3b6f8eff SHA512 c9e8bd094c64fa28cca7cc477e9ff6a4bd55d5ed0ff3028b8f40040d13f969b49849e3b5aa531e4d204f90d83f433ae6596794538558e7cc1e452272804ddf4c WHIRLPOOL 6d1845b060d2427721ba2906e075b29200f22d4bdffcbdd142f8429b03fd05fa0f822b289edf1a10398d26a4cd32ae53019f63ff25f920eb51a5e7c11a136df7
+EBUILD vivaldi-snapshot-1.13.998.3_p1-r1.ebuild 2565 SHA256 8995b9510e9e93c0aaac5fa6a3e2650b928c0d1b416cd6b9e16d30f00653c3ae SHA512 b6b4bf0e5f493e8f4ef5f2b123487e6b6bcb12d775b521ebfec96b775972022ff23a8d9bb127cd273c3ae3efcf984c193b2f4de8e52103a4bcf87f75afb428bf WHIRLPOOL 30597acfd6ea429c0d4e2195a415416d9d7c223a1a148a0ad7edff77f6fa8bff6021a241255c946cc2fc1251fce8b994c237f1813dd324123c48bee522614e0a
 MISC metadata.xml 238 SHA256 bae0588f6a20ccebb0e76d3ad782fcb2adfd1ea5b9fc1433851379423a103b72 SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993 WHIRLPOOL ad8bdcb129ac41a2941e41186ec94e845858818fe21b95b69adc902ddbe0eb4c4bcce8f00d5f167981852184df07e355866a07f50dcdc8f7cd7edf20ed95ecee
diff --git a/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch b/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch
new file mode 100644
index 000000000000..807164299ac4
--- /dev/null
+++ b/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch
@@ -0,0 +1,27 @@
+--- a/opt/vivaldi-snapshot/vivaldi-snapshot
++++ b/opt/vivaldi-snapshot/vivaldi-snapshot
+@@ -32,14 +32,14 @@
+       # Chromium's FFMpeg version N-82746-g6bb7ea7 is the oldest known working version
+       # chromium/third_party/ffmpeg/chromium/config/Chromium/linux/x64/libavutil/ffversion.h
+       if [ -r "$1" ]; then
+-        if [ `grep -aom1 'FFmpeg version N-[0-9]\+-' "$1" | cut -f2 -d-` -ge "82746" ]; then
++#        if [ `grep -aom1 'FFmpeg version N-[0-9]\+-' "$1" | cut -f2 -d-` -ge "82746" ]; then
+           if [[ -n "$LD_PRELOAD" ]]; then
+             export LD_PRELOAD="$LD_PRELOAD:$1"
+           else
+             export LD_PRELOAD="$1"
+           fi
+           export VIVALDI_FFMPEG_FOUND=YES
+-        fi
++#        fi
+       fi
+     fi
+   fi
+@@ -54,6 +54,7 @@
+ # Check for libs in preferred order.
+ # Where possible, use other files/directories to confirm it's the correct variant.
+ VIVALDI_FFMPEG_FOUND=NO
++checkffmpeg "/usr/lib64/chromium/libffmpeg.so"
+ checkffmpeg '/usr/lib/chromium-browser/libffmpeg.so' '/usr/share/doc/chromium-codecs-ffmpeg-extra'
+ checkffmpeg "/usr/lib/$DEBARCH/oxide-qt/libffmpeg.so" '/usr/share/doc/oxideqt-codecs-extra'
+ 
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.13.966.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.13.966.3_p1.ebuild
deleted file mode 100644
index eda36f1e1ac4..000000000000
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.13.966.3_p1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CHROMIUM_LANGS="
-	am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
-	hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
-	sw ta te th tr uk vi zh-CN zh-TW
-"
-inherit chromium-2 eutils multilib unpacker toolchain-funcs
-
-VIVALDI_HOME="opt/${PN}"
-DESCRIPTION="A new browser for our friends"
-HOMEPAGE="http://vivaldi.com/"
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
-	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
-"
-
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="bindist mirror"
-
-DEPEND="
-	virtual/libiconv
-"
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	>=dev-libs/openssl-1.0.1:0
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango[X]
-"
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	iconv -c -t UTF-8 usr/share/applications/${PN}.desktop > "${T}"/${PN}.desktop || die
-	mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	chmod 0755 usr/share/doc/${PF} || die
-
-	rm \
-		_gpgbuilder \
-		etc/cron.daily/${PN} \
-		${VIVALDI_HOME}/libwidevinecdm.so \
-		|| die
-	rmdir \
-		etc/cron.daily/ \
-		etc/ \
-		|| die
-
-	local c d
-	for d in 16 22 24 32 48 64 128 256; do
-		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
-		cp \
-			${VIVALDI_HOME}/product_logo_${d}.png \
-			usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
-	done
-
-	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	epatch "${FILESDIR}"/${PN}-1.12.955.3_p1-libffmpeg.patch
-
-	epatch_user
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
-
-	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
-}
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.13.997.3_p1-r1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.13.997.3_p1-r1.ebuild
new file mode 100644
index 000000000000..53dd25845f8d
--- /dev/null
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.13.997.3_p1-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CHROMIUM_LANGS="
+	am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
+	hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
+	sw ta te th tr uk vi zh-CN zh-TW
+"
+inherit chromium-2 eutils multilib unpacker toolchain-funcs
+
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A new browser for our friends"
+HOMEPAGE="http://vivaldi.com/"
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
+SRC_URI="
+	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
+	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist mirror"
+
+DEPEND="
+	virtual/libiconv
+"
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/openssl-1.0.1:0
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+"
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	iconv -c -t UTF-8 usr/share/applications/${PN}.desktop > "${T}"/${PN}.desktop || die
+	mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
+
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+	chmod 0755 usr/share/doc/${PF} || die
+
+	rm \
+		_gpgbuilder \
+		etc/cron.daily/${PN} \
+		${VIVALDI_HOME}/libwidevinecdm.so \
+		|| die
+	rmdir \
+		etc/cron.daily/ \
+		etc/ \
+		|| die
+
+	local c d
+	for d in 16 22 24 32 48 64 128 256; do
+		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
+		cp \
+			${VIVALDI_HOME}/product_logo_${d}.png \
+			usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
+	done
+
+	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	epatch "${FILESDIR}"/vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch
+
+	epatch_user
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+}
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.13.998.3_p1-r1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.13.998.3_p1-r1.ebuild
new file mode 100644
index 000000000000..fff39bc27059
--- /dev/null
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.13.998.3_p1-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CHROMIUM_LANGS="
+	am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
+	hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
+	sw ta te th tr uk vi zh-CN zh-TW
+"
+inherit chromium-2 eutils gnome2-utils multilib unpacker toolchain-funcs xdg-utils
+
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A new browser for our friends"
+HOMEPAGE="http://vivaldi.com/"
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
+SRC_URI="
+	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
+	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist mirror"
+
+DEPEND="
+	virtual/libiconv
+"
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/openssl-1.0.1:0
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+"
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	iconv -c -t UTF-8 usr/share/applications/${PN}.desktop > "${T}"/${PN}.desktop || die
+	mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
+
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+	chmod 0755 usr/share/doc/${PF} || die
+
+	rm \
+		_gpgbuilder \
+		etc/cron.daily/${PN} \
+		${VIVALDI_HOME}/libwidevinecdm.so \
+		|| die
+	rmdir \
+		etc/cron.daily/ \
+		etc/ \
+		|| die
+
+	local c d
+	for d in 16 22 24 32 48 64 128 256; do
+		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
+		cp \
+			${VIVALDI_HOME}/product_logo_${d}.png \
+			usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
+	done
+
+	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	epatch "${FILESDIR}"/vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch
+
+	epatch_user
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+}
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index c0d3e341390b..fd0c36d1f4e7 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,10 +1,10 @@
 AUX vivaldi-1.11.917.43_p1-libffmpeg.patch 1154 SHA256 18095976e22d4567d93d99c7b61f49b7d3895cc2eb363517649c60696ba62378 SHA512 cce5c30231f3e1d6904d12c3bddf63ac02978bfbd0fe44f248899060c332bb0c242c0d2e18b62568fc65bd144b6a83c38ea6c4ec88db4512a7add4057fe7a605 WHIRLPOOL aaf311083722a14e90e335f7b9d3ece3750ce0d6bc42a85948860edb4c9c6007d89c7b08abc1cb0c3a7f33814e1038cf1115da34a865b7d1889f550a5edea8cb
-DIST vivaldi-1.12.955.36_p1-amd64.deb 50500430 SHA256 12775223bfd916d8792dfbfa4d5cd5985def263ab6eb9e1ce5de6fec17d9063a SHA512 5344b94fcdd0c30bd0c8ee6862b0e2c4e7cc71f0ff9a221c14d0cb35b40b79053a3d9b4c9c6059b4f7ded26890e7dee25c7c23b8e5869b1b1290bcc45dc1f7eb WHIRLPOOL 0ce6fcb2f99ade1f15cd605f5f642ad17e56f4336e1a1662243ebb20579a6d9d745728c4a74f72cde86a3469434398baf4d34bdf2d2ea5dd216a7119e2575ff7
-DIST vivaldi-1.12.955.36_p1-i386.deb 51560038 SHA256 5f5e378f9911eb61e805a0da3d612c968fdb7ac21470d32e768a54739265de4d SHA512 8b056c1032195348860271553c7e5818cf456c61bd81b9bbb8cab85182232d994898e65660f04d8d6a983f503c4b4dbf55b7478387ac11126ae680e6ba41dca7 WHIRLPOOL 27752dcc1bbfcbdc2085117ef0ed44e715b64e3a095bde42dd5feecf551f4c665fcc99cbdb7e22be48f8b56e762beebefec665bb8fabc2a492c15e91222d2b45
 DIST vivaldi-1.12.955.38_p1-amd64.deb 50507742 SHA256 1c3fb2c2ecac7a9d54a641fbbe59743b85de6ffc896b600bcf26dfb98dd601af SHA512 1585e8717376e92cfce30aadda19d2b7cff2136bc0c0f9bbe7d438f6a7d57efcbce5cbdedf66c45103032f03873d544b699e1d6a07f13bafbea3d12c5a2817a9 WHIRLPOOL 30d9eadb320e5163925b4b36c984653c67586cf062954decb49d24fa322fe76b1ac0f6cc8c94d0d973346e475edceb76d0964e73ee688c1b8d14cdca08e6cfce
 DIST vivaldi-1.12.955.38_p1-i386.deb 51539886 SHA256 489ddb25d0854bfd1604d051860fba2c5d555f0b32c4f0d4a21a00728c7ab111 SHA512 285a4c55530c01bd0c19944cde34f37ca08b54153b674a029a1f0b6288b0b92b1addff39a32a880c2bee2389664c601348d46b4da405d77b5d73218a95e82336 WHIRLPOOL cec03f316346fd4bd2235dd9c8c02c3dd0da9424b22535e22ba664697c066c4918f5b849dac9069a8356a8f3070d62058245c78ed8977394370a0215e4a739f8
-EBUILD vivaldi-1.12.955.36_p1.ebuild 2704 SHA256 929c5d71903824d1597000e3948e4ecb946a35eeb029364b49d09030e37c5df5 SHA512 99dde58bb6dbdb3c39290b76770a741608f5ff9504fb54d9496597a927339574cf78ca5ecbd9e39c7913ef1dbde62b9b451634c6834d480ecf4c9fd3b08e8cd6 WHIRLPOOL be27255ff8a31acffa09eb07ed6e1e6defe2847a161a865832fe61c1f58453a31d97e5a634cf8b734a9f9a22fd96942eddcb93fb1f22e8c9893427db5e6f6bd0
-EBUILD vivaldi-1.12.955.38_p1.ebuild 2706 SHA256 99ebb18f52ce54a7b88a176df7fdd7fbb9f41db54677fbd9b1def5277db3bb72 SHA512 c2d3c7bd018edeaf0687e233ceecb9a7baae3331bf61a22ee3da84feb6e111f4a247d6180804deee92c27dffc95ae21719d2605e1c4fd1c5b94d6b17533bf86f WHIRLPOOL dbea74164bb0fb932fe54ad242adaaecd50a6ecab22e2e92e29794199c8df9d97f8ef64a3a8e157c0ccf7536e1d65c85c44063d70cef0b7f0d3471944c61f7e1
+DIST vivaldi-1.12.955.42_p1-amd64.deb 50770152 SHA256 e652d16db1b188ee61ad24e57b548eefce7c564873bbb99b3029c0a1077e6b91 SHA512 1f393c5f901eafc7359276ced79cd3b6b0d5c25fbf170f421d6da1d57700d021b8437215a0f58de1f1e787d8d989841f2ebe562233da328dd35461e6a0fe5cb8 WHIRLPOOL 51db8073234526e6e6760ffbcbb323fb3194cffe12b5756d291be29730ad28e501ce005dcf36e5a1d86d1f508a026d848b37d740a8303d76ef587e0b90df803f
+DIST vivaldi-1.12.955.42_p1-i386.deb 51637778 SHA256 a035067b9bff853424eaa102a632d7c6c362a7d0cced27239f7277f016266441 SHA512 b0bcbf284571169bc0945103ccd7848adc5f7f5bd99faa457f3d63579d090c73105d7ce36bd7ffdf802c6d53a6fdaa80e346cd659f02d402c36f331d9346f5f7 WHIRLPOOL b6a5f3ba2d66dca1f3a735ca8690b83224c7e2a36740c95e024d9221b087fa3030e21c5da2d0dcbfcc77911dad6f6ac42cec0999f9b88d42d834aec7016a2788
+EBUILD vivaldi-1.12.955.38_p1.ebuild 2704 SHA256 929c5d71903824d1597000e3948e4ecb946a35eeb029364b49d09030e37c5df5 SHA512 99dde58bb6dbdb3c39290b76770a741608f5ff9504fb54d9496597a927339574cf78ca5ecbd9e39c7913ef1dbde62b9b451634c6834d480ecf4c9fd3b08e8cd6 WHIRLPOOL be27255ff8a31acffa09eb07ed6e1e6defe2847a161a865832fe61c1f58453a31d97e5a634cf8b734a9f9a22fd96942eddcb93fb1f22e8c9893427db5e6f6bd0
+EBUILD vivaldi-1.12.955.42_p1-r1.ebuild 2918 SHA256 f7d96e178ad7d2bf5a8c864fffaf9edfc56ac5edc8758904e9fc15e510a92055 SHA512 c291296ea2bcf7eda51d83f7af2e9a3b2fe3b882155df824bb48f2bda44e7465d102f2b6b4854e1e28c2266cddfe8c3dc162cd84f06a2789c69144e623a13be6 WHIRLPOOL 284b0dbd8590ef7d6cc6ec6a50dc9896c7efe83bc2b85039eb57e11cf2c017918706d749d5dd33e1dc053b1d561121eac5d6747dc61808f34cc1fd6c1f1eee6f
 MISC ChangeLog 30542 SHA256 90dd48a74abe464786554337fc1abfe5987d3bef7c0b55a8e8e0549280c77895 SHA512 5dedcecb081555a877fd0c9e6132f6b6e94181ccf901a20c4326805ff5dfb3cd792d93a53dcc6b15cb185d0dc734f554d11214c20cfe66d2f78349b3b72f416b WHIRLPOOL 246ea2fa4c39ad53c8de8d331ecbd7c80d381a73880b119f4784f7bd4340dd5bc60bdf19e795b619f29fb4a06d5229a6c209f6533a24beccc4dcf8f5cee7ad76
 MISC ChangeLog-2015 6330 SHA256 f6edba68d9f23c66f3f4bd93d8d9c724f4ebe700bfe1d83e7d2754c70eeb89a4 SHA512 3089a150ca0d7b6733077610aed7e5c6e491a9b879c3353fa9141da64193d68a431601e749f9751128951a1300332943834babb3a3b14bc70a918b711ee79055 WHIRLPOOL a3b3197a356b17357f3483d32ed464cab137c3f6be73b1e223f303ea8a8c667008d45140aeac01b3d7cc9be17af159f18c633343839b8a2bebefab876dd93533
 MISC metadata.xml 238 SHA256 bae0588f6a20ccebb0e76d3ad782fcb2adfd1ea5b9fc1433851379423a103b72 SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993 WHIRLPOOL ad8bdcb129ac41a2941e41186ec94e845858818fe21b95b69adc902ddbe0eb4c4bcce8f00d5f167981852184df07e355866a07f50dcdc8f7cd7edf20ed95ecee
diff --git a/www-client/vivaldi/vivaldi-1.12.955.36_p1.ebuild b/www-client/vivaldi/vivaldi-1.12.955.36_p1.ebuild
deleted file mode 100644
index be52a5d2c96f..000000000000
--- a/www-client/vivaldi/vivaldi-1.12.955.36_p1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CHROMIUM_LANGS="
-	am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
-	hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
-	sw ta te th tr uk vi zh-CN zh-TW
-"
-inherit chromium-2 eutils multilib unpacker toolchain-funcs
-
-#VIVALDI_BRANCH="snapshot"
-
-VIVALDI_PN="${PN}-${VIVALDI_BRANCH:-stable}"
-VIVALDI_BIN="${PN}${VIVALDI_BRANCH/snapshot/-snapshot}"
-VIVALDI_HOME="opt/${VIVALDI_BIN}"
-DESCRIPTION="A new browser for our friends"
-HOMEPAGE="http://vivaldi.com/"
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_BRANCH:-stable}/${VIVALDI_PN}_${PV/_p/-}_"
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
-	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
-"
-
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-RESTRICT="bindist mirror"
-
-DEPEND="
-	virtual/libiconv
-"
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	>=dev-libs/openssl-1.0.1:0
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango[X]
-"
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	iconv -c -t UTF-8 usr/share/applications/${VIVALDI_PN}.desktop > "${T}"/${VIVALDI_PN}.desktop || die
-	mv "${T}"/${VIVALDI_PN}.desktop usr/share/applications/${VIVALDI_PN}.desktop || die
-
-	sed -i \
-		-e "s|${VIVALDI_BIN}|${PN}|g" \
-		usr/share/applications/${VIVALDI_PN}.desktop \
-		usr/share/xfce4/helpers/${VIVALDI_BIN}.desktop || die
-
-	mv usr/share/doc/${VIVALDI_PN} usr/share/doc/${PF} || die
-	chmod 0755 usr/share/doc/${PF} || die
-
-	rm \
-		_gpgbuilder \
-		etc/cron.daily/${VIVALDI_BIN} \
-		${VIVALDI_HOME}/libwidevinecdm.so \
-		|| die
-	rmdir \
-		etc/cron.daily/ \
-		etc/ \
-		|| die
-
-	local c d
-	for d in 16 22 24 32 48 64 128 256; do
-		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
-		cp \
-			${VIVALDI_HOME}/product_logo_${d}.png \
-			usr/share/icons/hicolor/${d}x${d}/apps/vivaldi.png || die
-	done
-
-	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	epatch "${FILESDIR}"/${PN}-1.11.917.43_p1-libffmpeg.patch
-
-	epatch_user
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
-
-	fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
-}
diff --git a/www-client/vivaldi/vivaldi-1.12.955.38_p1.ebuild b/www-client/vivaldi/vivaldi-1.12.955.38_p1.ebuild
index 31012c00e4f0..be52a5d2c96f 100644
--- a/www-client/vivaldi/vivaldi-1.12.955.38_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-1.12.955.38_p1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 RESTRICT="bindist mirror"
 
 DEPEND="
diff --git a/www-client/vivaldi/vivaldi-1.12.955.42_p1-r1.ebuild b/www-client/vivaldi/vivaldi-1.12.955.42_p1-r1.ebuild
new file mode 100644
index 000000000000..e38e3424c8c5
--- /dev/null
+++ b/www-client/vivaldi/vivaldi-1.12.955.42_p1-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CHROMIUM_LANGS="
+	am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
+	hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
+	sw ta te th tr uk vi zh-CN zh-TW
+"
+inherit chromium-2 eutils gnome2-utils multilib unpacker toolchain-funcs xdg-utils
+
+#VIVALDI_BRANCH="snapshot"
+
+VIVALDI_PN="${PN}-${VIVALDI_BRANCH:-stable}"
+VIVALDI_BIN="${PN}${VIVALDI_BRANCH/snapshot/-snapshot}"
+VIVALDI_HOME="opt/${VIVALDI_BIN}"
+DESCRIPTION="A new browser for our friends"
+HOMEPAGE="http://vivaldi.com/"
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_BRANCH:-stable}/${VIVALDI_PN}_${PV/_p/-}_"
+SRC_URI="
+	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
+	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist mirror"
+
+DEPEND="
+	virtual/libiconv
+"
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/openssl-1.0.1:0
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+"
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	iconv -c -t UTF-8 usr/share/applications/${VIVALDI_PN}.desktop > "${T}"/${VIVALDI_PN}.desktop || die
+	mv "${T}"/${VIVALDI_PN}.desktop usr/share/applications/${VIVALDI_PN}.desktop || die
+
+	sed -i \
+		-e "s|${VIVALDI_BIN}|${PN}|g" \
+		usr/share/applications/${VIVALDI_PN}.desktop \
+		usr/share/xfce4/helpers/${VIVALDI_BIN}.desktop || die
+
+	mv usr/share/doc/${VIVALDI_PN} usr/share/doc/${PF} || die
+	chmod 0755 usr/share/doc/${PF} || die
+
+	rm \
+		_gpgbuilder \
+		etc/cron.daily/${VIVALDI_BIN} \
+		${VIVALDI_HOME}/libwidevinecdm.so \
+		|| die
+	rmdir \
+		etc/cron.daily/ \
+		etc/ \
+		|| die
+
+	local c d
+	for d in 16 22 24 32 48 64 128 256; do
+		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
+		cp \
+			${VIVALDI_HOME}/product_logo_${d}.png \
+			usr/share/icons/hicolor/${d}x${d}/apps/vivaldi.png || die
+	done
+
+	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	epatch "${FILESDIR}"/${PN}-1.11.917.43_p1-libffmpeg.patch
+
+	epatch_user
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+
+	fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/www-misc/htdig/Manifest b/www-misc/htdig/Manifest
index 10fbd4231951..ab2710a0fbf2 100644
--- a/www-misc/htdig/Manifest
+++ b/www-misc/htdig/Manifest
@@ -6,7 +6,7 @@ AUX htdig-3.2.0_beta6-quoting.patch 1130 SHA256 d84222aa6895305c2ee87f9975bfc348
 DIST htdig-3.2.0b6.tar.gz 3104936 SHA256 6da9e0ee8627d5302f5685a1b3e5de5f1e6e8df4c0a92c0ca00796bca9e546c8 SHA512 29832f4aebd2b1f944cc4d800a5202342c8ce66936980476d49f679ec169c0268a902e85cd7440a3b6bea9db0a3b640bb1a9719c680d857ff00d34590af63064 WHIRLPOOL 63b0635873a24ad84c62fb85b6f9e645b3166630a4db52948604e6179f5f41978ef3c1b663122e8e5b74173c2e1cad269d4d92c5e678dcaf4dbac06d6b930cf3
 EBUILD htdig-3.2.0_beta6-r3.ebuild 1780 SHA256 f3f805e15d4868da441527522ed461c0f84ab3f048f5166c97b5b6d530efb837 SHA512 d024ba18cd4966a73fae304253ed2e27a41bf820fab6c8900804ec9d6d9cb9c081b146bdc0ce83f4d7c4f287f65f775c8e416764a5ec79bf4b444d1f2de79673 WHIRLPOOL 4646dce205cc7d91e6e1105fac65edb4449dd27edeab0547c730b2a11160d3ab048ea07061beb3b85cc3a674af41becdb78760eddf92fe34299adb0d9e5eca71
 EBUILD htdig-3.2.0_beta6-r4.ebuild 1796 SHA256 77f7f52744740b24ae8d2378659832176679d2b5346b92945d2e2dafe20037f4 SHA512 ebe4ec3a20208249e1cd45952a30617f8af49b1bc575f492962d55b2e97864dcdc519363f0e225beb21c208c0c498cca4642ff25b1f32d887519b787c3e7e256 WHIRLPOOL aa3d654de046e3ba737cc7d7ffe27db48e26bcdc7bde1aae4761fba12adee288c75ab762ba9c8c54e1597af60b13d517aa0a28ea9d96311e126bce06b14b30f8
-EBUILD htdig-3.2.0_beta6-r5.ebuild 1660 SHA256 9dcfe8559b6758da033db661175f9a648b84e7f3de752136c46d869a4cb2813c SHA512 004b63df7e1e0ee506a96e3d76271a7b080dbe4106a26e9046db9458a5eb0422b06b0edc889d3cc7c9daae339b3380117ef55716ba496a9ba040262fa7a1be84 WHIRLPOOL 7ee6a9b8552aeb5376dc518c92d2005a8fd3f2e573793c7e3362ba7c197143b64fa3b0e2306134218c6f935b5b638ee3743e025304ea74e7695ea78a0cfc4074
+EBUILD htdig-3.2.0_beta6-r5.ebuild 1655 SHA256 ef0623331f694719be6af35482aa007996a54075a6f577acd32043b04e793121 SHA512 ba46f2d4f0061ce5904e59cf994c33f23dca813e8bc18925d21b865a9aaedba103688bd0652db6c96ba0d7e98ad912d05a374cac5d25c64788321dc842e922f5 WHIRLPOOL 3f6836fafe24cd235f30ba89ddd92cf4b5797237f1caa7a40e1d7e0b979dfa780f2ac5698d9aa02dc1b5695e4d0493bb37806c5e3fd1e77dacd002b583a9e30b
 MISC ChangeLog 2763 SHA256 2d8ce4c283507b7b08628023b2a679873a448708e909ee563d551b3bee1ac2de SHA512 7c0e980479973e3d182f1531bba6f6804d4dcef22ee8dae185436fcb0ae4a1481a6219e918e1859c0cafa1c5da8e6623c1b24d5ce5907aaa3e157a3739b06bd9 WHIRLPOOL f2643ab0c382b5483f2ddfd19cf003d3c849916dc44d518f7084e619257af6e6bb1be0d29e5b29bc6ba74933400112c21107242dd3a0d2eb9a2d0716ae401fc7
 MISC ChangeLog-2015 10350 SHA256 63636e2794f9ec4590396bf08f7512522a540570cb4a489d11950945c45b6f7e SHA512 91e288272866dd8085db1d5f51f0cf541adbbb0bde5b89be7ac7dbc1ff9e09af5d58a6ae00c8c180b1e2d392bfd3144dc6653242fd8a505c5ec5d7bbe5774a80 WHIRLPOOL 0029b503e944abffe8da4c914f3608ca7fb4ba224c6732de9c04224c2eaace0867e18384297ebdc8cee2405f2023cd52b40d5f08ce7de5bf5873807b9fae98c9
 MISC metadata.xml 246 SHA256 f696b469729aeeb7810f246774e90471415680a9ebd6b55c56c13a5213057508 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed WHIRLPOOL fef696fa5b101de1ba4bdc0188a4757648d9eb40d4b01408cf17416d1f39909026a80e4b082d8497801aae1caea588b6d28616cd3853e1b03b94a8fd672f9c85
diff --git a/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild b/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild
index 7bbba8ccf4d0..046f3c4cf905 100644
--- a/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild
+++ b/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.htdig.org/files/${PN}-${MY_PV}.tar.gz"
 
 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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="libressl ssl"
 
 DEPEND="
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 51a5ff175584..f90a118a7f5d 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,11 +1,11 @@
 AUX mms.cfg 4420 SHA256 0dd2a9f9aab559243c4d282b5c143ed8876b8d6f8be519bfa8ca6e8fc0c55d9a SHA512 597380071a06176f09df1a56cba24e83a74990c175fe9f167f026eacbf01e66a083d2389ff399ead0a39654a40ae636f8459feed2d6012e51e65c5407fe7fdbd WHIRLPOOL 915b86d717db181a776eb9392aaae2becac4747bc0e551900bfecdeda17f9d0495f54c7173e47adf2ea92567c193c466e302cac78bd2126f10fd9956c204596a
 AUX pepper-flash 151 SHA256 11a3e7e2c04f1e55ee5db5e7e776db67b6830431f1c10423df5031033c4480d1 SHA512 f20176b9567097482c3b1fdd062affb33a69b671f6298a98cd58e03ca80dd01bada4126ac5fd940fddc53a097669f52d4b8bba7850daf211e11dc24cc4d97eb1 WHIRLPOOL 5e6c3dccc897e8d6628422351f77f16363a9c86f851fb6848651a71b59bef450067d1de1fb8b55870ca5dc88b6a70f1f04818ce41b6ccc6dd50db43f223cb838
 AUX pepper-flash-r1 143 SHA256 ba069eab3ee17b93cab566c73d94e56e6225dc7094c75925bbe0597cba2dd8f6 SHA512 e4e1c1f204af1e5ce531dd43a22b4cd08e8def1099bba88ac96af09bd0879dfbb6383653ec85d5d199d418098e4b17d71998bee5a9fb5bb7bd8873432a4f66ee WHIRLPOOL 5d6a1c12120519bf524da7dafa508bdaaf65d98874b09ec76925fcfe51ccdfa5886afc228a131a267c237aae0d293609963a76ac6301273da563aea396fae8b5
-DIST adobe-flash-27.0.0.170-npapi.i386.tar.gz 8512470 SHA256 a06d815d2858e58b0f11624a6567da3de17db27df68a3527a7774ba21f4558cb SHA512 e51b494de7da910079c6810b8b7c74d39bdc8f6addde3ba01cde087fe7de6a65ea668c429bbceb30d98989de4686fb66e75087f668ae0961d6e13ae40996c8dd WHIRLPOOL 3629aca75aa3c1fbeded1c956564f59eaf87f922ef9fea31ce61c6c4e1a7f44c0a4c8d1aa14f53c2cfed6db75060e7f7ca7fe9519a0ec612104419139e9d4564
-DIST adobe-flash-27.0.0.170-npapi.x86_64.tar.gz 9025191 SHA256 966761fda5fc29301cd7720dc1e84b2551d142e7e5d51e3898e8e6fe7c11cc43 SHA512 c4a2879c4ac945ff6921025e4efcffe0dbccbf2cb972dfd9db3020c78b69dfec35c0f7a63e479f55ab06d06f386864d1740595f633fb9f02fc20584125c3c7ef WHIRLPOOL d0bdc0d6356dcb80f2f3e0a9f49bc723b7285151414ab2702b5103235226ecd34a874eacbcfe26a50e5de4ee479ff18146d262ef2751e90532a4fb672f31ed7e
-DIST adobe-flash-27.0.0.170-ppapi.i386.tar.gz 8547131 SHA256 9b60006e28333bb0a8f333ebd97782dc811b8c35d63ea5441d65bea5a7085aa4 SHA512 1cd426eaba556b296e8ba91dd21ee5899767444408ecedf96dbda74bcc56a69e0d542b4d91a287878fa2307457b2aa8291a37a4b689cc0f8e896b9ea40f92293 WHIRLPOOL a5c33c669a32431d6d352182d7b40f620afb09c16c3adccfa873fcb3e631e434a66d20795ffb2dec08f1badd83c187bc52de18a1f90502d14bebc7d39413836a
-DIST adobe-flash-27.0.0.170-ppapi.x86_64.tar.gz 9461678 SHA256 2ac5788fd87881acbdf5992a0b4841087e30f4244ecff7311fe36b702b0c25ab SHA512 e324f6f4a813157f5acde2225a4ac920c7d920a585299dbd6c0af1a3ee17b8339f966baf1868d11d237673936df24c04270a15c8bf1618fd377a762784d8bad1 WHIRLPOOL a82853451ef8f4608ed3e18a16c20e7e47254b3b7219c747ed66dadb89b10ce30b5ea172ac79db0d297b4dbf2407c39e6db1a708ad5432cc0a8036df492d58ce
-EBUILD adobe-flash-27.0.0.170.ebuild 3662 SHA256 3570c49588306152c5b948b0580bb09dc116612847083fa8f7c6cb3956913ca8 SHA512 738b9fe87e14b9988ad5e6f1bdb822c346d12f3e076f7116d47da5a9dde237f9c24fd2a900f27368afe8677c4550498b5ae88aa49b05a0c3f65eb6bc524d0ce2 WHIRLPOOL 2eff0595978d8ba39a4bd188001bd2a1d29918a05177c8376e20903cfbe2502cca63f7d65e191223bfab6af3ab49d296cd3ee86766a0c59a2dbb215059e450f2
+DIST adobe-flash-27.0.0.183-npapi.i386.tar.gz 8512893 SHA256 ae4532b374b63aa2ce5a625d93e5ae543a073bcb1f812489a88c1595691e466f SHA512 14be1b1c0312f65288b2ac434d476ca525431bed5be9706f240a7119e73baae0236f4e1bb7ead89c3be6bcd8e4915f53db8b27d43e055722bcc36a06a9f625cb WHIRLPOOL ee6fd9ee2f9210884be95f0fb86e1c6504d9b5d3a4004d63b3be7a2556cfa784670671f24bb05effdceba050e67229048722603b594034b1e5907251d021e548
+DIST adobe-flash-27.0.0.183-npapi.x86_64.tar.gz 9025057 SHA256 a12b8ee3e40dc80bd3f96a968f17f0de2cd9acea5c8a6b7e9a4688bcd7a2c835 SHA512 a1992d432470dcab43aed4eb6db6fb499abf760f59eb8b6985de8f11164afc81509e1d5c3fa34c68671061e03b006e519edf6dcb17adf95c0877d16777a9435c WHIRLPOOL 28011389d1a8e01cbf53f95944077f7873e1db04f13ac14188ac94010b86bc29dde92650eaf17e0fbdf07449c731ee7a334d20d5481410cabf67e83a3f91e0fd
+DIST adobe-flash-27.0.0.183-ppapi.i386.tar.gz 8545500 SHA256 93e2f1a457281cd8a6b22a9f6c28a87f683bc989f05aed03d457dc91667a03f1 SHA512 19905f4fd6b6707482c7f3acdc53dcf2d6988518dedf4f86c1b6f1ce6007f38ce12e7c805988a556a20471c4ea9797e828d5906e88de5b91e1f7458a1e8b1f9d WHIRLPOOL 427583114d2f8f78351c62054a1c07fe0fa8a625cceb641802b919a96098ef02aaa5bbc94bea198807477d64c1a88d3851e48904ec66e3d9cea7aba1d2398f7c
+DIST adobe-flash-27.0.0.183-ppapi.x86_64.tar.gz 9463482 SHA256 144325c00f40dfa704eda72fda6518ef797eb5be37715626099de8e722f80d22 SHA512 5c0fb7f42eccd1389d2ef0b4122cbb3b2fe917dabe514fb07e63aa6489e7d99169a1c7bdfc5a5514a61cc8d9d35ae7057fbc9fda7e9d7351a66efd0baf66b2a4 WHIRLPOOL 4440c50d87994ce7463ceb909fed60f992db69c60a88d4deba841a70f52d3bc04af7bc402ed1134eab8e106cb861b12ac182f5e96c0d9caa950a60314f058661
+EBUILD adobe-flash-27.0.0.183.ebuild 3662 SHA256 3570c49588306152c5b948b0580bb09dc116612847083fa8f7c6cb3956913ca8 SHA512 738b9fe87e14b9988ad5e6f1bdb822c346d12f3e076f7116d47da5a9dde237f9c24fd2a900f27368afe8677c4550498b5ae88aa49b05a0c3f65eb6bc524d0ce2 WHIRLPOOL 2eff0595978d8ba39a4bd188001bd2a1d29918a05177c8376e20903cfbe2502cca63f7d65e191223bfab6af3ab49d296cd3ee86766a0c59a2dbb215059e450f2
 MISC ChangeLog 19725 SHA256 51730527e3ec07f604d9e4a72c46812d4e74d54cca7be31b4749114a0ea06469 SHA512 e90b8aa631e8b712d9e21b92d8fcaf3424fd980f02e4fd49d4ba8313fa39fe03614dbe543388d30e2699c9337002a317181dbce7eba26797b9222771d5e037ee WHIRLPOOL dcc29670fdc523529ec3effd6a66d76acbe587dc27f92c06df0ebbb769de2a5681f0ce752a28f910dee07ba0e354d793e2106c656a6ae4f354a228fbc4fa394b
 MISC ChangeLog-2015 67768 SHA256 91f0f06fcbe289262a35973afbcd69d1bdffb44f4441691c7887c42af8917fe8 SHA512 8927c851e0f9c26b9b84e1e34bee5face5438ef5b24545c34e6935644e891af3b2370c6f86386b7ed0cc8b3db95abd4fb146ca6b9385cd1e5c7cdada7e636608 WHIRLPOOL 14eb442ffd605c627270f02b165089ea49f2d74efd2ccffa7257d01e70ad7909cbd97e986439f42cd63f74e63f83bce1e3bd954b518baef46d57c83d5167a0d4
 MISC metadata.xml 552 SHA256 42e93934d6f1e16047031c14a943089c82250ff7ccb454aff6452923d0122bd0 SHA512 0f84cf3e517eb92f73629e6a157a2999f409fa6dea40682e2248edeb957e5bc6f5228c49aebdc3b5d434d0fd8f717a19c793aee8776397871e1bc5ebf8cf7fa1 WHIRLPOOL 868fa181f1427a2b557d953ffc7930468e091f2dc9d0244f2ab2d3bbd0f62e5ad8c3bb532371c7a0d90d5d4cbd14f72a139d690a836d286c9bd83d96678149c5
diff --git a/www-plugins/adobe-flash/adobe-flash-27.0.0.170.ebuild b/www-plugins/adobe-flash/adobe-flash-27.0.0.183.ebuild
index ce9885dfe11b..ce9885dfe11b 100644
--- a/www-plugins/adobe-flash/adobe-flash-27.0.0.170.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-27.0.0.183.ebuild
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 1d968f425f18..7200a24e9a37 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,9 +1,9 @@
-DIST google-chrome-beta_62.0.3202.62-1_amd64.deb 49451474 SHA256 38f3c45d99381711226670da25a80c1b085a550943c56cbe84d672a074daa181 SHA512 87c7a1f831876670e985d6a78138895dd8e1b72f1f840f6651cfd89d688578b47cae21bc9eec86d95e9a6def7962e3ac6d73af3d762a33f557640896256dea57 WHIRLPOOL 41236eb0c41bc00362baccfc88ae2ed07b6e039315eaca72a772636e65f211027726876c8bd29bf26adcb1eefb8ac07b3a22b6cd07fc21ba0aced5a2ebbcdb8a
-DIST google-chrome-stable_62.0.3202.62-1_amd64.deb 48500124 SHA256 98a34a85ba0018d3897a8a11de9f29df08e77d64a9d991df66fcf5c5cdd957c6 SHA512 fbab95c597542961701cdf50c89d04a79138019e0f805fdefdc86474748bc83d3a7c3d16153768bd50cd360e02c302cfb1fe00f612290fd2472da698f9b595de WHIRLPOOL b2096af5f28373b497540513769497604e1ab22e88f908f12745881807ebdb067341b224598a98fc250af135fe38ba15a0432acb87aeb5bea0d1a38eacd09199
-DIST google-chrome-unstable_63.0.3236.7-1_amd64.deb 50180726 SHA256 f077a884dcd4d6f2dcc25ec518e46647f5e773bb67cccc8ee8f7715b208d44b1 SHA512 40d61b06ddddb47ca3e1b61a325ff2541b3a07b0b72a8fcdcd5459d76add0d3a5567a8315cbc29c2707d37a952bfc78b67cda26398f04f6af3453cb73aed0f37 WHIRLPOOL 393da715aefb0eabb4b9f926f5c467a55ddbb03760e96b1ae4d448fc8e7bebaf953e22a7589397100c385d4f0d2fe113e69263cef7501d0a87fa1ebdae5f64de
-EBUILD chrome-binary-plugins-62.0.3202.62.ebuild 1438 SHA256 957a85f58cd8509731240ec4e6030e68f7e89371373a96f3c629da1f25848351 SHA512 fe9affa131c7e21996969e46375ba6d1834c24751cb18cbf4adaa7aaee72b889283951561f2024f893e29aaa2e25f78884854615c10c8520980045d1be20f52d WHIRLPOOL cbf0eff4fafe7339f4aa35a15fac04840b0b936f23caf724d8c144aa36c046dfe95575f2285d8704bc94437add6e6f0f55aebbd3482dd54e45e28ab5ff781f4f
-EBUILD chrome-binary-plugins-62.0.3202.62_beta.ebuild 1439 SHA256 3c0ef3ef065adaf230e006e4d512b9792dc552d8bde43ec5d299666423bd02f0 SHA512 1ed9ffc20fe99949b3a96cac76195e97a59976107b1d810b14fe1024dab246de3dd229b8cb42d8ad0611183c0d12e3f5c13766b670d0dba37b724e914c95a0c2 WHIRLPOOL 98cf50f9e6a50c2269db23c8d093ce6b223e5048779f93e4e9ddbdaf3d67aa0183144f00008a99a59be500f1fc874af7fc1a1f485aad2d8e1ac68cf236b4195c
-EBUILD chrome-binary-plugins-63.0.3236.7_alpha.ebuild 1439 SHA256 3c0ef3ef065adaf230e006e4d512b9792dc552d8bde43ec5d299666423bd02f0 SHA512 1ed9ffc20fe99949b3a96cac76195e97a59976107b1d810b14fe1024dab246de3dd229b8cb42d8ad0611183c0d12e3f5c13766b670d0dba37b724e914c95a0c2 WHIRLPOOL 98cf50f9e6a50c2269db23c8d093ce6b223e5048779f93e4e9ddbdaf3d67aa0183144f00008a99a59be500f1fc874af7fc1a1f485aad2d8e1ac68cf236b4195c
+DIST google-chrome-beta_63.0.3239.18-1_amd64.deb 50018880 SHA256 982ca07a579c0d39b46fbdc0bde6d8fa16ce09f2bf51be4d2030a93305ba49b1 SHA512 1fdf8ecd2aefe0c3d3350e0e1824027e780ee3d8a8b313443ee2f78be488403abb0adae06d768cfccc26ef738372c0826b9dc1308165c8c7568782869b8f6a3c WHIRLPOOL 5bc2ee12644f9f52ed81e0445b0f4e5c3c4b800895779e0d3c0235b0d59b22bb36eb644bfee14fcb9739f1cbf02501b8ce94ead79ebfeaf0532a7ca534f8bbb3
+DIST google-chrome-stable_62.0.3202.75-1_amd64.deb 48725174 SHA256 1d54877408fa494781fedb0982b77eab0bc38f86041d0739e87a5e3603148f30 SHA512 d0a304b9007bb645b2ed0850edec186f068c21c9f15f336bb2e3b94c4b2a3f942e2c76fb7f627f741a1560774774469318edefaaf0875e0dbc3547d838559c25 WHIRLPOOL bb9207b1dd4ca30d86302d73de9bd7cbbd6cfc727b8870990d346c2f101f463bbfc5312f0bbe41f8f6cf8862f2739d57c211d36afb81d64ad5ae92c2562f6e37
+DIST google-chrome-unstable_64.0.3251.0-1_amd64.deb 50499978 SHA256 ca8f4ec300219c4cbdddd94e22dab92d79dd64b66ad84fd83e32353c3d82661c SHA512 d5b98e64e5dd3c39996ef67b273249686fe96db8aeb34f37b0ce0a4d71a59d88e228de58999b71b6fb7d63610d6a1d963c3702c4e3b7c85065ae328cbec0e5d6 WHIRLPOOL 35b734582de2e332fd640536c41736f7b27412e484196f412ac354d32255c4e151226881ceeb0412dfc77625890324706473e17cc63cd626800677c876cf964a
+EBUILD chrome-binary-plugins-62.0.3202.75.ebuild 1438 SHA256 957a85f58cd8509731240ec4e6030e68f7e89371373a96f3c629da1f25848351 SHA512 fe9affa131c7e21996969e46375ba6d1834c24751cb18cbf4adaa7aaee72b889283951561f2024f893e29aaa2e25f78884854615c10c8520980045d1be20f52d WHIRLPOOL cbf0eff4fafe7339f4aa35a15fac04840b0b936f23caf724d8c144aa36c046dfe95575f2285d8704bc94437add6e6f0f55aebbd3482dd54e45e28ab5ff781f4f
+EBUILD chrome-binary-plugins-63.0.3239.18_beta.ebuild 1439 SHA256 3c0ef3ef065adaf230e006e4d512b9792dc552d8bde43ec5d299666423bd02f0 SHA512 1ed9ffc20fe99949b3a96cac76195e97a59976107b1d810b14fe1024dab246de3dd229b8cb42d8ad0611183c0d12e3f5c13766b670d0dba37b724e914c95a0c2 WHIRLPOOL 98cf50f9e6a50c2269db23c8d093ce6b223e5048779f93e4e9ddbdaf3d67aa0183144f00008a99a59be500f1fc874af7fc1a1f485aad2d8e1ac68cf236b4195c
+EBUILD chrome-binary-plugins-64.0.3251.0_alpha.ebuild 1439 SHA256 3c0ef3ef065adaf230e006e4d512b9792dc552d8bde43ec5d299666423bd02f0 SHA512 1ed9ffc20fe99949b3a96cac76195e97a59976107b1d810b14fe1024dab246de3dd229b8cb42d8ad0611183c0d12e3f5c13766b670d0dba37b724e914c95a0c2 WHIRLPOOL 98cf50f9e6a50c2269db23c8d093ce6b223e5048779f93e4e9ddbdaf3d67aa0183144f00008a99a59be500f1fc874af7fc1a1f485aad2d8e1ac68cf236b4195c
 MISC ChangeLog 51929 SHA256 50e3850c299e851033ba47f469357a12caf7da6a98c6d3b8f4fb363b1ffeca73 SHA512 46cb260ece8c3dd5c4a29ab23dd2576d99c83e811b965f6ede0402f2c244e04a130f7a31bf719b73637f008a36418199efd2f714efdd5c272d9faf6f1233d503 WHIRLPOOL 74bdc87a8aed3e93062ae0e350ad5efff3ee72fd81a9bdc2b09710e0c600caee54e473a7f255a58d10cf27d28cf36965299e7b1aae1904016167cd647c101bcf
 MISC ChangeLog-2015 77792 SHA256 96719f76c6575ca2c06e130d41c45b6de9f4199194a719a97a089c11798ac811 SHA512 f8a3c9d9f3f1e7cb7e3a0a0b83a913d1be45e284e58511bdcc0268061457bb674afd8cb56e95c675939682b1f1f1f1523d2d3a1de1624f9a4348dce5825ff61b WHIRLPOOL c8fccfb687c4856c64d37d0fa1cc3b8aa577f1e5c02fc0f89842d3b4c111bf363eb5bb4dc97bcc658931014f2342661b599456ffff616415171196a7b8ea2410
 MISC metadata.xml 448 SHA256 6db38f88565d0e9d458419135f2352ed66df8cae46c7a2a7cdfa3e00e289a6b7 SHA512 b9bc86889a7432b10cc0e2ebe3907e6bd167d0d2ddc476ccd8cb438f0a46ad7061c935661216458d7f4ba9b765da374342ee558469b412c8c9783487e9459acb WHIRLPOOL e8a97201d4a3628a594ea15cc63712d8a79d0249c6ec90df1f3f21f9e88922d99f694780f1796ea1fe16fa72f37623f99ea8fd90e84785d3b918d143085d5397
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-62.0.3202.62.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-62.0.3202.75.ebuild
index 8173f0b7f5f0..8173f0b7f5f0 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-62.0.3202.62.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-62.0.3202.75.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-62.0.3202.62_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-63.0.3239.18_beta.ebuild
index fb901aa5d5d9..fb901aa5d5d9 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-62.0.3202.62_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-63.0.3239.18_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-63.0.3236.7_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3251.0_alpha.ebuild
index fb901aa5d5d9..fb901aa5d5d9 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-63.0.3236.7_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3251.0_alpha.ebuild
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 9448068f5657..3013c675403b 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -3,19 +3,18 @@ AUX apache-asf-httpoxy.patch 830 SHA256 5ea2bf7f64dfde9c8141578208fa9eb17702769a
 AUX apache.conf 55 SHA256 ea616c5cc37979a006d69c51bda43fca15a4327d33175762652b29f5cdea1c7b SHA512 3a53beb7a283d17c14383f16ad14c0602681ac1b193cce8f5aca50ae9d9af3a71054ce4a9ab11cbcb72fe913459e1b306fd54660154e66afe10272f8c0f149f3 WHIRLPOOL fa348414f320a9f70001386dfb77d57ca4836c3ef3d251976077b7ad545d7f6752e534efadbf28c7dcb777388e3d844eba84b939dcf48881983388daf6ac23f0
 AUX apache2.2-hardened.service 970 SHA256 aaddbfb3953ad24b3714c54769df625d990833a24a075cfc0a10976c60dfa774 SHA512 c206e7103d592dcf4f2d62979a20f7ab3cc7ce357ffe3c06ae8137064c812b9727e01a53fd602a0a55a64ed609664061de680ff42329381db787e2dae9310c48 WHIRLPOOL 0dbec118e471363e84e00b6163ee6e7f7d9062d486523171da9c9df1f9eb3a7733bbc7262daa7f1ac9d47c1d4155d94ffd2f4b8d7905fa9372c1e275ea111b95
 AUX apache2.2.service 716 SHA256 e850ad73585fbba52ade58a39ca91adbfd52f56a0bbd426ebcadb340a7dcb62b SHA512 5f736c803772077598248bbb41f76dff396dfd2f11a60d1ba929a619275efb8c1b4c0dab78cbcdf83b9ec94db67b958b3333b01f67d71eb3b2e07dba4bca2a7c WHIRLPOOL 776a928422b8f37a12099111a1503674ca901934b60dca8596dc8bc287390be9a0e912d7ba6226dcb22eb7c669fa298ddc20fd7bf5c275b0cf019bae0d594839
-DIST gentoo-apache-2.2.29-20140922.tar.bz2 64135 SHA256 8c69c36c2f40fb81ee905b4dd72ab74aab4563c75149d302f372a451498e2678 SHA512 1d9aa12aa3ab79b5f80ee3fda020b33ff6798e5b1abbcbc138acea06a1ab9968ad240d2bdf9c5dbb9640fa9fb6718eec7175df7cc0fb8574cc4d7d5cdfb5bcc4 WHIRLPOOL f655300f0dcd2f4503cbdb25983fed902e4b717ff57e06f66486bebd0ed7cb8df56387be74b4259bfffad949bb446c5ec28f89065b6d5239585324b610be7b88
 DIST gentoo-apache-2.2.34-20170918.tar.bz2 64390 SHA256 27a1755e3cee4bf4976fd3ed7aeb55db7ad3c0076ae2081ae626d4133c91aac2 SHA512 10b42e50dcc196f60bcaefe90c382d62a61339dd8a56e899d6afb6998be4acdd376e2c3509791f22a0acf99d06add497e32703b6d523f640306a6db5e05f358a WHIRLPOOL 4480bc9ff7a7291eacdc4a8c77e12e58c48f8e1c87ed164a4af42dbdaceebd554343384291723310cbf20d8d0660817f59aa72e7cf541283a142d9f1b3fa58c2
 DIST gentoo-apache-2.4.18-r1-20160303.tar.bz2 24505 SHA256 d81e32d876594b48a7ff6d9123bf776c5bea5453eddd2fe40f4a9b79c11537aa SHA512 68f0c4de38ae05c45839fe692cbb7de641e331ca133b8aaaf69f3659dec15833cda95e6e074edb3a5b6b6d59b3fc5a4ee3589fff810707fe27417a25cd8a4c4d WHIRLPOOL fb61224b2104e611237e1d09eb4dfb3d2b8f023348c9622f7f19434b6b77d63786c41af17a300d994c14d983676f3753ab6fa52f7a7fcd07b9cea3d7eeacc9b9
 DIST gentoo-apache-2.4.27-20170918.tar.bz2 24850 SHA256 10c7404707508ce91ce59974f55fe4368ee153b299f697441f703dab1aefd17a SHA512 c58a9a0b171188ff163f6b45c47f243797d4050cf461ba1a642115350285879005be6496cee2031bffaccc0d8beda4c27de87afa2ded17cbe559f792eb7c00e8 WHIRLPOOL 143092df671320d353bb8221fe62351f5f70262fa5e83cad6904633bcbbd177810717f297081d59e3e3a37e2cb42a004c0575fb55d52e0d1ae7197768b96aef8
-DIST httpd-2.2.31.tar.bz2 5610489 SHA256 f32f9d19f535dac63b06cb55dfc023b40dcd28196b785f79f9346779e22f26ac SHA512 5aa47d4b76f692bbd8b309135ff99152df98cf69b505b9daf3f13f7f2a31443eaf4995161adfbc47a133b4d0e091fda2d95fc6b87a956f0ada18d7466ee28e74 WHIRLPOOL a2e3e53c51719cb6f7e641b41788cd89ce7b4d2ea105b403bfa3b3d4479b69c5604228269062f66722594e105e91121d05b1c9f27ca7dc4ecfcf339da8b8375c
 DIST httpd-2.2.34.tar.bz2 5779739 SHA256 e53183d5dfac5740d768b4c9bea193b1099f4b06b57e5f28d7caaf9ea7498160 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240 WHIRLPOOL 0bd86b3644fae79c74928c0cd8bc3e4b7d821544a760dbe6459df43210f690d3c4dc74168e029b0b5bbaba6fcd0433aeb4312794455d91b00b7c36c537dfdefd
 DIST httpd-2.4.27.tar.bz2 6527394 SHA256 71fcc128238a690515bd8174d5330a5309161ef314a326ae45c7c15ed139c13a SHA512 7e7e8070715b74cb6890096a74e194f4c6a49c14bda685b1ad832e84312f1ac4316ea03a430e679502bfd8e1853aefa544ee002a20d0f7e994b9a590c74bc42c WHIRLPOOL 35aeaa01b2bf5772ad21d1011e619befd75fdaade5aa0ca7c61367e7b7a66af28dccf8729a53418f2598199721b68aac7d8c575797ed218150d00af4e8dd4dba
 DIST httpd-2.4.28.tar.bz2 6553163 SHA256 c1197a3a62a4ab5c584ab89b249af38cf28b4adee9c0106b62999fd29f920666 SHA512 8de8e32b87e6de220e492e74db9df0882fae11c3b9732f3d3316da048c04767ac4429c0433c36f87d8705263e3376f97a7e1f66a9d7a518632a67b6fe617590a WHIRLPOOL a4c8be522d5e900e01cefc0fc6d196e3e49e45e2daffa9ec22b2dc44deace506da5a4cf68afd04b0062b87ffcd27b6e59d0b8ae71cc2304d5080d066174e95ed
-EBUILD apache-2.2.31-r1.ebuild 3046 SHA256 24ce15f98c4a7aa7e095aedf4aed23f763a3b540bce5976523961c9a96440ca2 SHA512 d3f5c471783365f53a9fd0678ae806d69d6ea3b872cb5ccfe5abdc5e7ad548402a5bac11ebcd1e6100c4245f220663b956ec8b22c1d3963d7ef45b9256def3d7 WHIRLPOOL 638a1978bd526a7e0d1e3c0c77c49a2e82d8869c69a5434c3a84ae83bf5cad18fb294d53c50dd0b5acc1e0e22ad787808b336c1d0b1a31b073fba0693c0092e5
-EBUILD apache-2.2.34.ebuild 2989 SHA256 582679d31812cf52f39a1056ee32ccb3ad11f4757e0ff10b56167639224007e9 SHA512 b256e889e63ec4a54fff8390c26072a5b1cfa86f44bf4c655e910740e6cac4d9781496ed332ff6db989a4381e4a837acc65579a045ddbcd3c2cd510a990ee1c3 WHIRLPOOL 662da708552c191a423300195d16928baf96922c6462f08a38a5fece6947b8f2302d4688b5011378c02c4e28b6faf5b2e65b3d4a0bd02f599fb50fb8f87ddd30
+DIST httpd-2.4.29.tar.bz2 6567926 SHA256 777753a5a25568a2a27428b2214980564bc1c38c1abf9ccc7630b639991f7f00 SHA512 840982fd3d21463bc5c1747f211dfacf3abdf634d149e49bb49fd2e5deda140de602dbdf31e1bbe5337a48f718ab2261c408e83a8dd39a9291ee7b6b7a85639a WHIRLPOOL bd91e3baa3c2b25cb6a4e48062c38a97f9c941884be2e44805a3a08e1fdfb13bf18b37b6c7ab9e7656934f2d3b8c2893e79480ee119f073bfbb376b6c3e32a74
+EBUILD apache-2.2.34.ebuild 2988 SHA256 86b7a4116620a7aab67d6a71db6c8cb9ce2de012bc4bf0d87c28eac3a5bdb4bc SHA512 913dde770b5efd1e283d96403232aad75cb5ef6cbc9dbdefe90d307d2479dcb6245e2faffb47291118f48f576b1a0fae849e3ea481ff7208a755ef5b62033022 WHIRLPOOL 0813614af2a3b291dd1f9e781c7f300ad4331865412afd55c5d538178ae21d79193d1617c81f94b86d6e510dc8bfd0ae2afc12cd3e64e897c8cc1c97f318f7e7
 EBUILD apache-2.4.27-r1.ebuild 7750 SHA256 51733b100447f8cfdb2d1cf2ce980d6122d5e523cfa8ff7dbf45708970350171 SHA512 fa24f363d2cb031ca2467e53daeccd33f475e81801b6db2654063dca4b4a55be166b6b0dd12bd0943d88b032cc56a3ee09a51577660aedc449ea1df136cbffb5 WHIRLPOOL 840cd9ef44c9f2dce4d588ad211ac0612a6c7242e3778a0ebcf23f0345f7ecc855b1e5222c7107042be4e6f871ce504c0d388027b1e921f238863576a4044a8d
 EBUILD apache-2.4.27.ebuild 7761 SHA256 02a0e6b6d8150ee9766e9e1462ccff5036e00f97cda6540daa4bde08d356bca9 SHA512 efb043984a186acfa87e5cdbef60a65b16d33e870010d2c55ace8e7c9356202bdaec8c6c89586a1664967f27b57f0baaaf62da217c2168d9db0381ed564c1083 WHIRLPOOL 16b20195bede9c2c70451a58ba8fd8b85294a66f24a022feb683cd49719dd6cfc2dc43d451a50539727a6ba1fe5bb0a066cdb5a62fe8c4516b0b342bfe49536f
 EBUILD apache-2.4.28.ebuild 7776 SHA256 8ab5eba66f653d827d1b1f1bd087638aba82f8193d49b491f9ff9c1d80c98c19 SHA512 48a4dcf833fb4896dee8ae571939e9f2066655e8e23cd8512ebabe202d8d9bb95ffd007881fc69930deb03c95988119645d1b169d8939fbdfed15cfea3ea150d WHIRLPOOL 3c1ace2f261f10efbcaf5ed8a61b19884cbd2c1b0a28eea5b67d9fa96f1b8c9f761e1bcc3b09dc7d595b8c348ac396819e71d4dc340a2aae694be04cea742e47
+EBUILD apache-2.4.29.ebuild 7776 SHA256 8ab5eba66f653d827d1b1f1bd087638aba82f8193d49b491f9ff9c1d80c98c19 SHA512 48a4dcf833fb4896dee8ae571939e9f2066655e8e23cd8512ebabe202d8d9bb95ffd007881fc69930deb03c95988119645d1b169d8939fbdfed15cfea3ea150d WHIRLPOOL 3c1ace2f261f10efbcaf5ed8a61b19884cbd2c1b0a28eea5b67d9fa96f1b8c9f761e1bcc3b09dc7d595b8c348ac396819e71d4dc340a2aae694be04cea742e47
 MISC ChangeLog 13802 SHA256 23fdf1fc5c8aedb3511251cc41d097c99895ab24e50f48377fe91a39c17b9ddc SHA512 1b92ff6422e0db92f25546ffc37b1d2200060959cb7f1af91159e08b181d66df45baae15df31586a3333877e78cc49e2fa3621a950f52193e43e861fc03babf0 WHIRLPOOL 42e008d07b470d3620d2bfd02049f97463f4dfffe9756bbcde277eb4c1b6ce21f6b2a0f8853226166510012316e22ca3a4b730180c18aa692a929041dc127830
 MISC ChangeLog-2008 105137 SHA256 4afec18ad3c76df40314edb37b5512f81ca6223c38a899534d9d15342481accf SHA512 92dfd339b1c4ddec29222076a597220dc7faa504e2ee770339892f155febbf34004e60395f9eb21b43d3b1feb5f362c2946b69cc65151b5ba00fb53b35ccb9c6 WHIRLPOOL 89d77300aafb53ae0632904118064de19313fe51f635512314471e845574e7a624a770ae4ca4e335cff67d4fee92e062d28ef985a54c577a1b8b3ea0f621c0f8
 MISC ChangeLog-2015 30572 SHA256 2608174e0cdfe351d5c8d25d21cbe9c6b7b98c6de9ee6d04da23c3de9fb95d6b SHA512 b76aaa5b8bc20f2fb45346e5d6f1f094e9f6b6f740054755bdc0399f581c78fd0c087f183ca756a63a08e8d96eedb292ffc4d2f6ddc00c8374435866e15fac9b WHIRLPOOL 8dd5292ae8fa15422c6d663420e7655cb13247380831d2f147dfdd0deaa51d6899e1c7f3b8ae9ae111074c8464e0bd94a38d491981ce84fc6268ab83c0af9396
diff --git a/www-servers/apache/apache-2.2.31-r1.ebuild b/www-servers/apache/apache-2.2.31-r1.ebuild
deleted file mode 100644
index 7aa6f4ad3c01..000000000000
--- a/www-servers/apache/apache-2.2.31-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# latest gentoo apache files
-GENTOO_PATCHSTAMP="20140922"
-GENTOO_DEVELOPER="polynomial-c"
-GENTOO_PATCHNAME="gentoo-apache-2.2.29"
-
-# IUSE/USE_EXPAND magic
-IUSE_MPMS_FORK="itk peruser prefork"
-IUSE_MPMS_THREAD="event worker"
-
-IUSE_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon
-authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default
-authz_groupfile authz_host authz_owner authz_user autoindex cache cern_meta
-charset_lite cgi cgid dav dav_fs dav_lock dbd deflate dir disk_cache dumpio
-env expires ext_filter file_cache filter headers ident imagemap include info
-log_config log_forensic logio mem_cache mime mime_magic negotiation proxy
-proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi rewrite
-reqtimeout setenvif speling status substitute unique_id userdir usertrack
-version vhost_alias"
-# The following are also in the source as of this version, but are not available
-# for user selection:
-# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
-# optional_fn_import optional_hook_export optional_hook_import
-
-# inter-module dependencies
-# TODO: this may still be incomplete
-MODULE_DEPENDS="
-	dav_fs:dav
-	dav_lock:dav
-	deflate:filter
-	disk_cache:cache
-	ext_filter:filter
-	file_cache:cache
-	log_forensic:log_config
-	logio:log_config
-	mem_cache:cache
-	mime_magic:mime
-	proxy_ajp:proxy
-	proxy_balancer:proxy
-	proxy_connect:proxy
-	proxy_ftp:proxy
-	proxy_http:proxy
-	proxy_scgi:proxy
-	substitute:filter
-"
-
-# module<->define mappings
-MODULE_DEFINES="
-	auth_digest:AUTH_DIGEST
-	authnz_ldap:AUTHNZ_LDAP
-	cache:CACHE
-	dav:DAV
-	dav_fs:DAV
-	dav_lock:DAV
-	disk_cache:CACHE
-	file_cache:CACHE
-	info:INFO
-	ldap:LDAP
-	mem_cache:CACHE
-	proxy:PROXY
-	proxy_ajp:PROXY
-	proxy_balancer:PROXY
-	proxy_connect:PROXY
-	proxy_ftp:PROXY
-	proxy_http:PROXY
-	ssl:SSL
-	status:STATUS
-	suexec:SUEXEC
-	userdir:USERDIR
-"
-
-# critical modules for the default config
-MODULE_CRITICAL="
-	authz_host
-	dir
-	mime
-"
-
-inherit apache-2 systemd toolchain-funcs
-
-DESCRIPTION="The Apache Web Server"
-HOMEPAGE="https://httpd.apache.org/"
-
-# some helper scripts are Apache-1.1, thus both are here
-LICENSE="Apache-2.0 Apache-1.1"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}/${PN}-asf-httpoxy.patch"
-)
-
-src_configure() {
-	# Brain dead check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	apache-2_src_configure
-}
-
-src_install() {
-	apache-2_src_install
-
-	# install apxs in /usr/bin (bug #502384) and put a symlink into the
-	# old location until all ebuilds and eclasses have been modified to
-	# use the new location.
-	local apxs_dir="/usr/bin"
-	dodir ${apxs_dir}
-	mv "${D}"/usr/sbin/apxs "${D}"${apxs_dir} || die
-	ln -s ../bin/apxs "${D}"/usr/sbin/apxs || die
-
-	systemd_newunit "${FILESDIR}/apache2.2.service" "apache2.service"
-	systemd_dotmpfilesd "${FILESDIR}/apache.conf"
-}
diff --git a/www-servers/apache/apache-2.2.34.ebuild b/www-servers/apache/apache-2.2.34.ebuild
index c19fb787a6de..f04b7862026c 100644
--- a/www-servers/apache/apache-2.2.34.ebuild
+++ b/www-servers/apache/apache-2.2.34.ebuild
@@ -88,7 +88,7 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 src_configure() {
diff --git a/www-servers/apache/apache-2.4.29.ebuild b/www-servers/apache/apache-2.4.29.ebuild
new file mode 100644
index 000000000000..b4dc41e3f33b
--- /dev/null
+++ b/www-servers/apache/apache-2.4.29.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# latest gentoo apache files
+GENTOO_PATCHSTAMP="20160303"
+GENTOO_DEVELOPER="polynomial-c"
+GENTOO_PATCHNAME="gentoo-apache-2.4.18-r1"
+
+# IUSE/USE_EXPAND magic
+IUSE_MPMS_FORK="prefork"
+IUSE_MPMS_THREAD="event worker"
+
+# << obsolete modules:
+# authn_default authz_default mem_cache
+# mem_cache is replaced by cache_disk
+# ?? buggy modules
+# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
+# >> added modules for reason:
+# compat: compatibility with 2.2 access control
+# authz_host: new module for access control
+# authn_core: functionality provided by authn_alias in previous versions
+# authz_core: new module, provides core authorization capabilities
+# cache_disk: replacement for mem_cache
+# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
+# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
+# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
+# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
+# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
+# socache_shmcb: shared object cache provider. Default config with ssl needs it
+# unixd: fixes startup error: Invalid command 'User'
+IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest
+authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authz_core
+authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex
+cache cache_disk cache_socache cern_meta charset_lite cgi cgid dav dav_fs dav_lock
+dbd deflate dir dumpio env expires ext_filter file_cache filter headers http2
+ident imagemap include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness
+lbmethod_heartbeat log_config log_forensic logio macro mime mime_magic negotiation
+proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_html proxy_http proxy_scgi
+proxy_fcgi  proxy_wstunnel rewrite ratelimit remoteip reqtimeout setenvif
+slotmem_shm speling socache_shmcb status substitute unique_id userdir usertrack
+unixd version vhost_alias watchdog xml2enc"
+# The following are also in the source as of this version, but are not available
+# for user selection:
+# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
+# optional_fn_import optional_hook_export optional_hook_import
+
+# inter-module dependencies
+# TODO: this may still be incomplete
+MODULE_DEPENDS="
+	dav_fs:dav
+	dav_lock:dav
+	deflate:filter
+	cache_disk:cache
+	ext_filter:filter
+	file_cache:cache
+	lbmethod_byrequests:proxy_balancer
+	lbmethod_byrequests:slotmem_shm
+	lbmethod_bytraffic:proxy_balancer
+	lbmethod_bybusyness:proxy_balancer
+	lbmethod_heartbeat:proxy_balancer
+	log_forensic:log_config
+	logio:log_config
+	cache_disk:cache
+	cache_socache:cache
+	mime_magic:mime
+	proxy_ajp:proxy
+	proxy_balancer:proxy
+	proxy_balancer:slotmem_shm
+	proxy_connect:proxy
+	proxy_ftp:proxy
+	proxy_html:proxy
+	proxy_html:xml2enc
+	proxy_http:proxy
+	proxy_scgi:proxy
+	proxy_fcgi:proxy
+	proxy_wstunnel:proxy
+	substitute:filter
+"
+
+# module<->define mappings
+MODULE_DEFINES="
+	auth_digest:AUTH_DIGEST
+	authnz_ldap:AUTHNZ_LDAP
+	cache:CACHE
+	cache_disk:CACHE
+	cache_socache:CACHE
+	dav:DAV
+	dav_fs:DAV
+	dav_lock:DAV
+	file_cache:CACHE
+	http2:HTTP2
+	info:INFO
+	ldap:LDAP
+	proxy:PROXY
+	proxy_ajp:PROXY
+	proxy_balancer:PROXY
+	proxy_connect:PROXY
+	proxy_ftp:PROXY
+	proxy_html:PROXY
+	proxy_http:PROXY
+	proxy_fcgi:PROXY
+	proxy_scgi:PROXY
+	proxy_wstunnel:PROXY
+	socache_shmcb:SSL
+	ssl:SSL
+	status:STATUS
+	suexec:SUEXEC
+	userdir:USERDIR
+"
+
+# critical modules for the default config
+MODULE_CRITICAL="
+	authn_core
+	authz_core
+	authz_host
+	dir
+	mime
+	unixd
+"
+inherit eutils apache-2 systemd toolchain-funcs
+
+DESCRIPTION="The Apache Web Server"
+HOMEPAGE="https://httpd.apache.org/"
+
+# some helper scripts are Apache-1.1, thus both are here
+LICENSE="Apache-2.0 Apache-1.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+
+DEPEND+="apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )"
+
+REQUIRED_USE="apache2_modules_http2? ( ssl )"
+
+pkg_setup() {
+	# dependend critical modules which are not allowed in global scope due
+	# to USE flag conditionals (bug #499260)
+	use ssl && MODULE_CRITICAL+=" socache_shmcb"
+	use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
+	apache-2_pkg_setup
+}
+
+src_configure() {
+	# Brain dead check.
+	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+	apache-2_src_configure
+}
+
+src_compile() {
+	if tc-is-cross-compiler; then
+		# This header is the same across targets, so use the build compiler.
+		pushd server >/dev/null
+		emake gen_test_char
+		tc-export_build_env BUILD_CC
+		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
+			gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die
+		popd >/dev/null
+	fi
+
+	default
+}
+
+src_install() {
+	apache-2_src_install
+	for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do
+		rm "${ED}"/$i || die "Failed to prune apache-tools bits"
+	done
+	for i in /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}; do
+		rm "${ED}"/$i || die "Failed to prune apache-tools bits"
+	done
+	for i in /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}; do
+		rm "${ED}"/$i || die "Failed to prune apache-tools bits"
+	done
+	for i in /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}; do
+		rm "${ED}/"$i || die "Failed to prune apache-tools bits"
+	done
+
+	# install apxs in /usr/bin (bug #502384) and put a symlink into the
+	# old location until all ebuilds and eclasses have been modified to
+	# use the new location.
+	local apxs="/usr/bin/apxs"
+	cp "${S}"/support/apxs "${ED%/}/${apxs}" || die "Failed to install apxs"
+	ln -s ../bin/apxs "${ED%/}/usr/sbin/apxs" || die
+	chmod 0755 "${ED%/}${apxs}" || die
+
+	# Note: wait for mod_systemd to be included in some forthcoming release,
+	# Then apache2.4.service can be used and systemd support controlled
+	# through --enable-systemd
+	systemd_newunit "${FILESDIR}/apache2.2-hardened.service" "apache2.service"
+	systemd_dotmpfilesd "${FILESDIR}/apache.conf"
+	#insinto /etc/apache2/modules.d
+	#doins "${FILESDIR}/00_systemd.conf"
+
+	# Install http2 module config
+	insinto /etc/apache2/modules.d
+	doins "${FILESDIR}"/41_mod_http2.conf
+}
+
+pkg_postinst() {
+	apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
+	# warnings that default config might not work out of the box
+	for mod in $MODULE_CRITICAL; do
+		if ! use "apache2_modules_${mod}"; then
+			echo
+			ewarn "Warning: Critical module not installed!"
+			ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
+			ewarn "are highly recomended but might not be in the base profile yet."
+			ewarn "Default config for ssl needs module 'socache_shmcb'."
+			ewarn "Enabling the following flags is highly recommended:"
+			for cmod in $MODULE_CRITICAL; do
+				use "apache2_modules_${cmod}" || \
+					ewarn "+ apache2_modules_${cmod}"
+			done
+			echo
+			break
+		fi
+	done
+	# warning for proxy_balancer and missing load balancing scheduler
+	if use apache2_modules_proxy_balancer; then
+		local lbset=
+		for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
+			if use "apache2_modules_${mod}"; then
+				lbset=1 && break
+			fi
+		done
+		if [ ! ${lbset} ] ; then
+			echo
+			ewarn "Info: Missing load balancing scheduler algorithm module"
+			ewarn "(They were split off from proxy_balancer in 2.3)"
+			ewarn "In order to get the ability of load balancing, at least"
+			ewarn "one of these modules has to be present:"
+			ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
+			echo
+		fi
+	fi
+}
diff --git a/www-servers/h2o/Manifest b/www-servers/h2o/Manifest
index e73453ca24ee..dac948f7af7b 100644
--- a/www-servers/h2o/Manifest
+++ b/www-servers/h2o/Manifest
@@ -2,7 +2,7 @@ AUX h2o.conf 673 SHA256 e22bffda48ad6519d071d5de7afa6ea7acd6fba21c879d5c0b2e2f0b
 AUX h2o.initd 1137 SHA256 4a2ab08c15b8c5d10cf538862f0cd48419e2968061f0e6ce56c1540ce064954b SHA512 2509b1b6996be25bba158b626c8eb260aae2400d76dc0edcee38869eb1124ae9ed125fb1887bf85f3c96db189b68c77706c7a9aeb9f4be2d2dfd998606d3a763 WHIRLPOOL 7ec5716442283b56f294016c211bd23a8d3d3c09cb667f72915f33e01bc59d5cdadba920938a8e5943d82afcdf68d696e6cc46df15ed228e1e1464a2484e1135
 AUX h2o.logrotate 176 SHA256 31749cf8fbc34c73c8fd439579cbd07bf9d0c3c2d0db8f7fb32f340727131e13 SHA512 e7e15bb7813b45342a9d435d07eea0627b802a4c03c6f4204b533a7bfac9566152f875965e4ea761572324a278e7b85c507729210d92ca4bede3ef9b9d2ac305 WHIRLPOOL 2ab1cbffcebddb2a7e8ca9cefd124670b1b11be0e9bf4202727201aef9d25ffbc893ce5e9903c92aca4b5787a6d46c344e5445721d6f1bbcfac7a5441001b9cb
 AUX h2o.service 290 SHA256 9eae3d4b08f22e2b140e736d36b347bcb5d817c60faff72804c80f5ccc660954 SHA512 e1acd226a5e333538be782f5d47c8debf418966c86eaa5d7464431ecc399821e336c9539e90370b9f8041c023f876815050e5ad5a7d29288b6f87bd3adbe0e95 WHIRLPOOL 1bd06fdcefb4bd35c02b0294af395efa172390114dbda375fcb136fec63d9bccf621850d4348caf77b24835b8b47e8c4bfb06ea38c2604667ed0df215cef0903
-DIST h2o-2.2.2.tar.gz 16192602 SHA256 cf45780058566bd63d90ad0b52b1d15f8515519090753398b9bcf770162a0433 SHA512 b5cc08f2be7056bbac4370f9b6ccb1ba0ad4ea61ce67e946a4f26b8f9c0a575f603c899b1a88f17d1065e0e72e1d1094199200ed24b4f3644a3c7df34aa04b51 WHIRLPOOL d9aff2d3e7caa0334efbac86a807fe8ecd5f146ae56315a5194b8de653ae4f91d33cad754714cd38fadd1c59d87cafe30c1f5f6cb2102362a7647ebd3f18dc84
-EBUILD h2o-2.2.2.ebuild 1353 SHA256 f3552a7bc90334d0d4dbb02cdfa39f97e683dca9ac077a6ea08ff3a83729bc30 SHA512 6595f5bd5f3ce4dec83ad9b6cc3a58d721f76ef6ec806340ceea6da0ed33d923ac813f91c380d41c751b7fe8abae575f0c0b270640cbd52c52db1d3c2446521c WHIRLPOOL 80fdbb82b1ceab4c32952bdc958d9fd6ff68ce0d0a20a7541940d2d4ca033234d27a1dd17cb555bcbdf0e9b021624ae95c9eabfec861a8ed869cdb335bb81130
-EBUILD h2o-9999.ebuild 1322 SHA256 011d3398ae8068e30406c5cb75289fe195f7fbce92a51488bf0be5da9f84b1b7 SHA512 16e9b6619038055c9e32b4acbced26a8d4c24f17d56638947ed8ef636e9e75ef36efb87ac9e1fb8574af46d35f9f8f4e60022e694f283545b49f2d6d0a6a2f3b WHIRLPOOL 77e30e65a2dc56a08a31047ee978fa1cd1f2e1eee7c678f370f195946a5298a76e83e4aad814321954aebfa463534e9deb43c89d9c391b8533496248372bf47e
+DIST h2o-2.2.3.tar.gz 16207150 SHA256 d40401ca714d00ca5204e8d22148dbaa9cae3407e3b4b6b62bd208543901ea51 SHA512 f138667e8e4370102028da469e09e8b2ee2e5dc92f4513b35467aa2a2fb7b02bbda2b2d158bbf3198b26faeea48d5ec07a7ebab1d0cb3032c532d4e6323630f1 WHIRLPOOL 0a5b498c7568b07af9e475eec00fd8db0122608843c5918616857ec96479a180a89d7a4274c98107129efa784b0d3714dd687a9f1463606be65e12987dc89303
+EBUILD h2o-2.2.3.ebuild 1339 SHA256 e05eaf68d9645ad17d6e0a669a8274e20e267a9ad864bfd00f5aebeaa3daad45 SHA512 25e445607b751a3f0cbc911e659e9f8610af67f924e36d0193e11d44679933bba3b053b3d5f58cd5c8affde6de6de8c47626f44b06d285737d29e22e59eb44fd WHIRLPOOL f8a94b7ca48eafe7a516f65e297a8d895fb9341acaedfcee7fc7242fbff6a20ea6fb415e5221f6875e27f82352eef12c2f91c4a5a663ad91647ae054313dfba3
+EBUILD h2o-9999.ebuild 1131 SHA256 e29ee7d39c70751231506485da4b75e6e354c61c300f8818fb757bac09448464 SHA512 c11d644f2dc377bc2f6f29de73b10c5125273a0a64c2ee544430dc604cb37defde7371b739fb64581f2ac382d323317573d65d763821258b54d4fdc19a2b19ac WHIRLPOOL 46914f866ac53fa1cfa2fd98135f40286889b019ecb0d47a6a485071b19b28caa7f48b6d9e5eaa794a69415719472fe23ba280b816dbcdb7202c4acc168d3a76
 MISC metadata.xml 728 SHA256 1531440761f65dcd9833c08638bb78488c9a151e6adacc2209e5baf4e5907838 SHA512 ae4a00e6c50ef7930e264cb3a747e14e656908fab0e3da4673c6719dda3744b34451361cd118feaaa6eebf3980c56ec297df9306e9ffa56c56df6c150e27707b WHIRLPOOL fdbe147f6fe521123e68c847a829074bc7b5c9838d055f317b16e774769c78e8a0103c179086edec35abdb05f27694c91fd6c9fedad2e29467a089f0e2ba7c10
diff --git a/www-servers/h2o/h2o-2.2.2.ebuild b/www-servers/h2o/h2o-2.2.2.ebuild
deleted file mode 100644
index fef33e05d6fc..000000000000
--- a/www-servers/h2o/h2o-2.2.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils systemd user
-
-DESCRIPTION="An optimized HTTP server with support for HTTP/1.x and HTTP/2"
-HOMEPAGE="https://h2o.examp1e.net"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl +mruby"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}
-	mruby? (
-		sys-devel/bison
-		|| (
-			dev-lang/ruby:2.4
-			dev-lang/ruby:2.3
-			dev-lang/ruby:2.2
-		)
-	)"
-
-pkg_setup() {
-	enewgroup h2o
-	enewuser h2o -1 -1 -1 h2o
-}
-
-src_prepare() {
-	# Leave optimization level to user CFLAGS
-	sed -i 's/-O2 -g ${CC_WARNING_FLAGS} //g' ./CMakeLists.txt \
-		|| die "sed fix failed!"
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/h2o
-		-DWITH_MRUBY="$(usex mruby)"
-		-DWITHOUT_LIBS=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newinitd "${FILESDIR}"/h2o.initd h2o
-	systemd_dounit "${FILESDIR}"/h2o.service
-
-	insinto /etc/h2o
-	doins "${FILESDIR}"/h2o.conf
-
-	keepdir /var/log/h2o
-	fperms 0700 /var/log/h2o
-
-	keepdir /var/www/localhost/htdocs
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/h2o.logrotate h2o
-}
diff --git a/www-servers/h2o/h2o-2.2.3.ebuild b/www-servers/h2o/h2o-2.2.3.ebuild
new file mode 100644
index 000000000000..1ad169707581
--- /dev/null
+++ b/www-servers/h2o/h2o-2.2.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+inherit cmake-utils ruby-single systemd user
+
+DESCRIPTION="An optimized HTTP server with support for HTTP/1.x and HTTP/2"
+HOMEPAGE="https://h2o.examp1e.net"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl +mruby"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+	mruby? (
+		sys-devel/bison
+		${RUBY_DEPS}
+	)"
+
+pkg_setup() {
+	enewgroup h2o
+	enewuser h2o -1 -1 -1 h2o
+}
+
+src_prepare() {
+	# Leave optimization level to user CFLAGS
+	sed -i 's/-O2 -g ${CC_WARNING_FLAGS} //g' ./CMakeLists.txt \
+		|| die "sed fix failed!"
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/h2o
+		-DWITH_MRUBY="$(usex mruby)"
+		-DWITHOUT_LIBS=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newinitd "${FILESDIR}"/h2o.initd h2o
+	systemd_dounit "${FILESDIR}"/h2o.service
+
+	insinto /etc/h2o
+	doins "${FILESDIR}"/h2o.conf
+
+	keepdir /var/log/h2o
+	fperms 0700 /var/log/h2o
+
+	keepdir /var/www/localhost/htdocs
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/h2o.logrotate h2o
+}
diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index 761de2c20b03..0db4fc4f8f77 100644
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-9999.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=6
 
-inherit cmake-utils git-r3 systemd user
+USE_RUBY="ruby22 ruby23 ruby24"
+
+inherit cmake-utils git-r3 ruby-single systemd user
 
 DESCRIPTION="An optimized HTTP server with support for HTTP/1.x and HTTP/2"
 HOMEPAGE="https://h2o.examp1e.net"
@@ -20,11 +22,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	mruby? (
 		sys-devel/bison
-		|| (
-			dev-lang/ruby:2.4
-			dev-lang/ruby:2.3
-			dev-lang/ruby:2.2
-		)
+		${RUBY_DEPS}
 	)"
 
 pkg_setup() {
@@ -32,14 +30,6 @@ pkg_setup() {
 	enewuser h2o -1 -1 -1 h2o
 }
 
-src_prepare() {
-	# Leave optimization level to user CFLAGS
-	sed -i 's/-O2 -g ${CC_WARNING_FLAGS} //g' ./CMakeLists.txt \
-		|| die "sed fix failed!"
-
-	cmake-utils_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/h2o
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 992bee7609de..3f5459d3bb43 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -12,10 +12,12 @@ DIST lighttpd-1.4.42.tar.xz 652140 SHA256 b2c9069ed0bade9362c27b469a9b884641786a
 DIST lighttpd-1.4.43.tar.xz 656248 SHA256 fe0c4a06dd2408a83ee7a2bfedc45e09597f3313cbda82485507573ae8fa948a SHA512 131e1d96276a6b5ca597bae9ff78df20bfc9907e9c832b6fdea8b86d493764a5dce24cfc3bb2e931755af18a26b0e8c6fd21714fca7d6c6a402c85f7fe4a588a WHIRLPOOL 90110b2b06c3579c435cd5a0539371bba8f0b70f7c1ee344ed98b9a55d6dd07c38d11430589b11257385815183bf208aed3c115554c6822056a7cedf5047341c
 DIST lighttpd-1.4.44.tar.xz 660304 SHA256 adb66ca985651957feb209c91c55ebbf917d23630bfc3a216a2f70043c7b5422 SHA512 b7481482bc130c80f076002b2853e1b0ecb2af5d6c6f5428854ae7a60bda591cf96f23e9f3a24cfb36ada3ba97ebff449e102895f7eb4b0aa50ec275eb44725b WHIRLPOOL 69431f5626ca64a8bd4f4e3ada01a22cfa4516e54a11d3050943696aafcb01d0c62db71259054ca24378b1b21b4c33f0a1521e676bff6b37c7bdf661edad6a99
 DIST lighttpd-1.4.45.tar.xz 660432 SHA256 1c97225deea33eefba6d4158c2cef27913d47553263516bbe9d2e2760fc43a3f SHA512 d030674a8c55aab12d32ac75f8df2628ba2332a5263c8bd2dd4f39342530080edc6ba2a6fee749c1301d601ab766a265d3c630b04d38bb26bba3cf045935573d WHIRLPOOL 8bf52ab4a33a1ede77185d6bb1a420cc61333bff67cc641625efb5e5c101eeb55ce1a177a5bd273408c857675c7ed91aeccffe5bc2109be145430e32979052c8
+DIST lighttpd-1.4.47.tar.xz 703012 SHA256 e47e64a9cc2b824c45792a6b1a5542945956e77ede3454845f42548495946c1c SHA512 9fac3acc428d9faf69fca2768578dca619f778889e8a3779c429038eec7aff6b3dd497d5437152a070df850861fe2132042fa4418e31c1aab89df23a1c544f99 WHIRLPOOL 2ca894a091130b5c23e4a32a6178371aff050d2de90d18cef6535caa65e87095c91789a83ce5791f168f1951f0dcc10c2e17a506b374d9daad0fc1de1f94c943
 EBUILD lighttpd-1.4.42.ebuild 6071 SHA256 370b883602d941ad465f471277dfea74277050e653bc189491854c7a4d0ee22f SHA512 10e645c61a008469af635b4449e1f26cc3425671f12b65dcc4d4f64501225185d9fd74d59a167980ca6a513effd9c3634ecbdc0b609b9a81b93b7e155d4f9257 WHIRLPOOL d7bd593a5ba38965ef8ad1facbfdd6628569bc542784cfcc00802be9d97ab69478ee4e65e86fd5921104599c6dc7e7a5b44fafc4b9910c543eeb528ca187aaaa
 EBUILD lighttpd-1.4.43.ebuild 6080 SHA256 dbc189710a2a360de1a3d981cd468bad30135fd049031c63d13a00904edc6888 SHA512 b17ab4887776c304a1584d4ed79776ec14d7f9fac0bdafc9ddf32b4f427bc71ef2a9d12c5f36849c3c2de7eae4f59d46402a63f4826569ec224e0d64919ed1ec WHIRLPOOL 92ca023ff5e43aa4fbe65df006780f523cd4c958a23fed5b2d56ce3761cd93da5bdad5faa8684a2970312ddf4d564537c7a3e690b0b859ddf432242289b53d9a
 EBUILD lighttpd-1.4.44.ebuild 6080 SHA256 0920bd50fb0f7a1decb7d3fa2915e47f9ff885b982a315c72506e28228095981 SHA512 e6d29f7d6617733f9c7260ffd4549b63b3630314fbdf9c2ee2a264febabbe498c289c8693f0118c3fb4f5e2054a00d0d6209fb853e114e6ddc883c70dd4c8f02 WHIRLPOOL ac6a58369e29cb33cb80deca7f4093036fceb3b261ccc03979d8621c72dfbd57a4be74acfafaeeca9f158f4717bab488d7a9753d8e79f399ac5a107ea7f0b7a2
 EBUILD lighttpd-1.4.45.ebuild 6079 SHA256 bbcd11ac3b5f7e49e1124be04c8401125c788e02597c7eba56a43a6246aeaaea SHA512 3f22286876882bbb2eaef844e00466b8d290ce1afd7c000bf4e7387d0e96f25c274fdc53f6ac1cde4433c66dc0a9e352a7e48ea8a016de48e1d2dd2f79156208 WHIRLPOOL 41e8427540379feee038a9ceb1d0e6724f2b28759feebe85aba81cf00b9e84cc08296e04e7edda92a6566dcaa94baa2b61855cb32af7c01ef7fdd69373f2293a
+EBUILD lighttpd-1.4.47.ebuild 6087 SHA256 db7c9e3d6fb1964c284c3cbd8fa3b5c9482c61c4c70719d016f4a6b58c1ef121 SHA512 6e333e8a5ed9d580b88a9005ba65290ce0817230f9e8006ec2d5c08b9a400b1f3b0ab845537e6b14cf3bc1b1e73bc29326018c88a79813b2047de281473af389 WHIRLPOOL 080089b3d44ace54f59c13ed2055e9a4c798e4cf359de5bcbd828e944800e82c74f8c82025851834796030d087fc5f5973e550764c00c6bd06452f52857281f6
 EBUILD lighttpd-9999.ebuild 6097 SHA256 6cd03e52014e85149a459a421abe57877fb7990baf7de117a49fdba12a565100 SHA512 f1898fb6b9b9331d206119bd3ca0cec00d8cce4836dda65829d7d82c79ba4a38b8a55cd5e08dedd1780a29f78e0deb7ecbb546826a182202fa1c009a3a794bc9 WHIRLPOOL 8141eb819762dd7a9b5ed683d5241d76c3c5095a99d1724c1d2e1b33e53f3ba1764590e3d7837276cbc0fd596eee41f2943a40022acdbf443eb943532af9b709
 MISC ChangeLog 6969 SHA256 98caae3758751b6ac130263038f7713d728701422c2f5b50347049f66dc53f7d SHA512 dfebc0e6ffa9d2ca30c21167b3a1f7458f6c7ffc189e41bfe714e09bdfc648d6830955f3b5bf19fafd4030a7924048d6d356e261b8a8351b09c59d43af4286db WHIRLPOOL 3f5d71548c717b1b419fba2b4138ed87ae76818eb97cf7a4b1f2f71d4254c8d85869fde46d6b305fe7e98ff671776e6e40583cb653634936334989fc6b1197e0
 MISC ChangeLog-2015 68066 SHA256 e7fefb5620b11f07ecfb5d88b3419a982bf4032fab68f6dab74898c6c33167aa SHA512 4f13902c1d561e94d30511b7aa305bebf2bca96b8f841667d77a69bdcfb08511c7a837a08c694ee8287e747456182c9c201dce63c46be14a3eecde1598fe7c96 WHIRLPOOL 62440fda0dce63a1ba2fcfa512099110cbde210b2f5f5a3f3b23faf28c2d339f59becba15e4ef5797688b992273ff58e08173eab65bc7d53bf70b65bbe718c1c
diff --git a/www-servers/lighttpd/lighttpd-1.4.47.ebuild b/www-servers/lighttpd/lighttpd-1.4.47.ebuild
new file mode 100644
index 000000000000..69a3db322f69
--- /dev/null
+++ b/www-servers/lighttpd/lighttpd-1.4.47.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit autotools eutils readme.gentoo-r1 user systemd
+
+DESCRIPTION="Lightweight high-performance web server"
+HOMEPAGE="http://www.lighttpd.net/"
+SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib"
+
+REQUIRED_USE="kerberos? ( ssl !libressl )"
+
+CDEPEND="
+	bzip2?    ( app-arch/bzip2 )
+	fam?      ( virtual/fam )
+	gdbm?     ( sys-libs/gdbm )
+	ldap?     ( >=net-nds/openldap-2.1.26 )
+	libev?    ( >=dev-libs/libev-4.01 )
+	lua?      ( >=dev-lang/lua-5.1:= )
+	memcached? ( dev-libs/libmemcache )
+	mysql?    ( >=virtual/mysql-4.0 )
+	pcre?     ( >=dev-libs/libpcre-3.1 )
+	php?      ( dev-lang/php:*[cgi] )
+	rrdtool?  ( net-analyzer/rrdtool )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] )
+		libressl? ( dev-libs/libressl:= )
+	)
+	webdav? (
+		dev-libs/libxml2
+		>=dev-db/sqlite-3
+		sys-fs/e2fsprogs
+	)
+	xattr? ( kernel_linux? ( sys-apps/attr ) )
+	zlib? ( >=sys-libs/zlib-1.1 )"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc?  ( dev-python/docutils )
+	test? (
+		virtual/perl-Test-Harness
+		dev-libs/fcgi
+	)"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-apache )
+"
+
+# update certain parts of lighttpd.conf based on conditionals
+update_config() {
+	local config="${D}/etc/lighttpd/lighttpd.conf"
+
+	# enable php/mod_fastcgi settings
+	use php && { sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die; }
+
+	# enable stat() caching
+	use fam && { sed -i -e 's|#\(.*stat-cache.*$\)|\1|' ${config} || die; }
+
+	# automatically listen on IPv6 if built with USE=ipv6. Bug #234987
+	use ipv6 && { sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die; }
+}
+
+# remove non-essential stuff (for USE=minimal)
+remove_non_essential() {
+	local libdir="${D}/usr/$(get_libdir)/${PN}"
+
+	# text docs
+	use doc || rm -fr "${D}"/usr/share/doc/${PF}/txt
+
+	# non-essential modules
+	rm -f \
+		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.*
+
+	# allow users to keep some based on USE flags
+	use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
+	use webdav  || rm -f ${libdir}/mod_webdav.*
+	use mysql   || rm -f ${libdir}/mod_mysql_vhost.*
+	use lua     || rm -f ${libdir}/mod_{cml,magnet}.*
+	use rrdtool || rm -f ${libdir}/mod_rrdtool.*
+	use zlib    || rm -f ${libdir}/mod_compress.*
+}
+
+pkg_setup() {
+	if ! use pcre ; then
+		ewarn "It is highly recommended that you build ${PN}"
+		ewarn "with perl regular expressions support via USE=pcre."
+		ewarn "Otherwise you lose support for some core options such"
+		ewarn "as conditionals and modules such as mod_re{write,direct}"
+		ewarn "and mod_ssi."
+	fi
+	if use mmap; then
+		ewarn "You have enabled the mmap option. This option may allow"
+		ewarn "local users to trigger SIGBUG crashes. Use this option"
+		ewarn "with EXTRA care."
+	fi
+	enewgroup lighttpd
+	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
+
+	DOC_CONTENTS="IPv6 migration guide:\n
+		http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
+}
+
+src_prepare() {
+	default
+	#dev-python/docutils installs rst2html.py not rst2html
+	sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \
+		die "sed doc/Makefile.am failed"
+	eautoreconf
+}
+
+src_configure() {
+	econf --libdir=/usr/$(get_libdir)/${PN} \
+		--enable-lfs \
+		$(use_enable ipv6) \
+		$(use_enable mmap) \
+		$(use_with bzip2) \
+		$(use_with fam) \
+		$(use_with gdbm) \
+		$(use_with kerberos krb5) \
+		$(use_with ldap) \
+		$(use_with libev) \
+		$(use_with lua) \
+		$(use_with memcached) \
+		$(use_with mysql) \
+		$(use_with pcre) \
+		$(use_with ssl openssl) \
+		$(use_with webdav webdav-props) \
+		$(use_with webdav webdav-locks) \
+		$(use_with xattr attr) \
+		$(use_with zlib)
+}
+
+src_compile() {
+	emake
+
+	if use doc ; then
+		einfo "Building HTML documentation"
+		cd doc || die
+		emake html
+	fi
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]]; then
+		default_src_test
+	else
+		ewarn "test skipped, please re-run as root if you wish to test ${PN}"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# init script stuff
+	newinitd "${FILESDIR}"/lighttpd.initd lighttpd
+	newconfd "${FILESDIR}"/lighttpd.confd lighttpd
+	use fam && has_version app-admin/fam && \
+		{ sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd || die; }
+
+	# configs
+	insinto /etc/lighttpd
+	doins "${FILESDIR}"/conf/lighttpd.conf
+	doins "${FILESDIR}"/conf/mime-types.conf
+	doins "${FILESDIR}"/conf/mod_cgi.conf
+	doins "${FILESDIR}"/conf/mod_fastcgi.conf
+
+	# update lighttpd.conf directives based on conditionals
+	update_config
+
+	# docs
+	dodoc AUTHORS README NEWS doc/scripts/*.sh
+	newdoc doc/config//lighttpd.conf lighttpd.conf.distrib
+	use ipv6 && readme.gentoo_create_doc
+
+	use doc && dohtml -r doc/*
+
+	docinto txt
+	dodoc doc/outdated/*.txt
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd
+
+	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
+	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
+	fperms 0750 /var/l{ib,og}/lighttpd
+
+	#spawn-fcgi may optionally be installed via www-servers/spawn-fcgi
+	rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.*
+
+	use minimal && remove_non_essential
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
+}
+
+pkg_postinst () {
+	use ipv6 && readme.gentoo_print_elog
+
+	if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
+		einfo "spawn-fcgi is now provided by www-servers/spawn-fcgi."
+		einfo "spawn-fcgi's init script configuration is now located"
+		einfo "at /etc/conf.d/spawn-fcgi."
+	fi
+
+	if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
+		elog "Gentoo has a customized configuration,"
+		elog "which is now located in /etc/lighttpd.  Please migrate your"
+		elog "existing configuration."
+	fi
+}
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 43abc56a5aa7..bfdd2f82b4c6 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,3 +1,4 @@
+AUX http_cache_purge-1.11.6+.patch 615 SHA256 42b302ef9f69f81fa92d5e9670453b2983582dd5931fde6188691baaca7ae825 SHA512 a3f45d8121d89a5c41783306577e146990404ff0e3691454e99cd6270ab02dfc7fd8718b3781666373ea6784ed2c06cec0b40315486a6a138185ca1548c04b60 WHIRLPOOL a782063d15c92190637385b44368ca75ec259293b5f9f12dcba8935da9aca3f5d824a96c389766bb766a28602af3a8c5115febaeaf140ae0280f610b3b93fe3f
 AUX http_echo-nginx-1.11.11+.patch 1920 SHA256 96b83fa02d977f3eeb8af73f065a4ba359515f098722988693ac824384a09f12 SHA512 fb86dd9a17a1ed6d99609a9e024971749569bfa108e1bae86e9e9f72792e2e6767ad710330bcc81cc67deca7fdaabe8dbb63a5ae3a519481c8ffab1e8c446f34 WHIRLPOOL 1a04d6b967fb3b35db1ebfc6a145966607830132eaa1cdc1f7a9f9a0bcd2651492b26504f4c444519bf0ffdd376ce88c228813ad767de4e48e5cb11d801bb1ca
 AUX http_lua_nginx-1.11.11+-r1.patch 6790 SHA256 57867eda9eeee7fe5b55d8916047c8e5ffd156cfed4ca2d64470ae4132784261 SHA512 bbd9f97d598482212887ebfa62b6037e2c5d89087ff761925399ef3ff6a35970a88b42e4d59f54ee59fd5402b37a40640599257e61bcb9ac49ec7fa857a674f2 WHIRLPOOL 01be216559482007c1fc1095b59e290a4ccd96271786e639de9c0a99741f5d7a2ba70869878a4c673a07662d2f82bd37604506f5b429edb57bc16a3a27e82c89
 AUX http_security-pr_1158.patch 3045 SHA256 7ed9980ad98aa76924f2122f2d08102be28315d1d36b8367e99b5750f4de432c SHA512 7bb5a1c1feabd81279b7fb40df470b0d496f68b7c45e72d26afe1ef4c911de979ea9f5f30c5cbfe93b05971232885246bfab807d04f6943f772118af21ecf4ab WHIRLPOOL cd25c1a757c3c41c70247e5e612dc87f5f2175a8354fba761c5460c1a671aa6663a6407524b5dfce5040b4e389a9ea4fa16eff3fc4c1ae1a1d9be05324ff1502
@@ -44,10 +45,12 @@ DIST ngx_metrics-0.1.1.tar.gz 2964 SHA256 1c62ebb31e3caafad91720962770b0e7a4287f
 DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 SHA256 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae SHA512 b8cb7eaf6274f4e2247dbcb39db05072d2b2d4361256a325fafab5533d7ce0c4ae9e2905b954dfcfa4789c9cab5cccf2ac1c3a1f02f6a327ed95b562d7773ed1 WHIRLPOOL 64c9b11ad938e6dbe5ba31298f1cd46f6e6bb4ba039c96b1e43bd85919d1606326f74b677f789ecabe0b0f4e0f08ac5aaf8148bf820de65aaa1e9966a28b9f61
 DIST ngx_rtmp-1.2.0.tar.gz 519895 SHA256 a8026f5ade30b178a06f12c46dff053cfe12256016ad465a46646183086b16b0 SHA512 8965d9bee91a46375516ccd012d1c43cd23f15c0630d11ed01472b9a84504574b476f22c5584f43c972a8f923e9ae025b9b60c64aace0ed159c7279bcbd376c8 WHIRLPOOL ea18f30cac7310a9b9be92178266afab5403f9e2e52cf89142c3c8bd20c05b12390ae90bdb50ceabef7ba869ef95502fee2f046716daea95de10527acba826c8
 EBUILD nginx-1.12.1.ebuild 37447 SHA256 2477ca64039f20ac1bca067199a20beea17ee7db62f91036133dbbf8d7c74c3f SHA512 dad602d21ce679a674455f478efad66d1532862d277e65797279c476d24242c4f4b04bd03168a14eee171148d3d2d6488b80a86b001036b087a02630d9ad6642 WHIRLPOOL 7fbb98e1a096b0c0709c49959e98601f7486960cdce075d93dd741849d805249c72c6ea26e53884198cbad1e2e9e97261728ff2ee77a421008062b05352038a4
+EBUILD nginx-1.12.2-r1.ebuild 37152 SHA256 bba2af8fea23b778cc9cbea164f1529eaeedcc0e274f95adfd786dcd922d7880 SHA512 7eb259800e7e39664e8ee688dd3371d7b57d7695476534c96ef8bed67b734d73b76c002c5d89c25ebabc9f95803707386b65d0574b5d32afb12755009a2d0791 WHIRLPOOL 5ba62761c07f028ae13b4ef32c2ee6397795d6c4fcb33637710b80b935ceba67a4eee245161bdae26bbad76e79863d9e7721c9955f5a5c1917988cb393401679
 EBUILD nginx-1.12.2.ebuild 36985 SHA256 12ff14ac86b149692b4e2dca55c75c2c403afe9b3207d9b1b61f2e54ad3be322 SHA512 aec7cca518e74f298568faace878394c787d6d97bdbad3f031f2a7238138e1d02354b1aa1027f13f1e5d36d2328c900232f9fd0148abe641063ec06bb77e0e17 WHIRLPOOL b8afffb93229e40271b099138ce6abf2b2288e2fb102436b5829f54390725c4bbe131d152c004398009a62c0e9f5f8c7e31defdaa16bfebcfc1e41232501e554
 EBUILD nginx-1.13.3.ebuild 37449 SHA256 32838376e6479d1f23bd1d0f500129df8d6c9bac8306fdf0c78bbc0829fc1ea6 SHA512 0adc9b68fb63bf90773fbc08d9a8c9f358cf447b54ff122f6069ffcf725af9dbf34deefa23fe8b4817044578cf1f47c0ca1857e4208bc30761c45a67ef964fe1 WHIRLPOOL d8548150c12049999f515657a91e645a249ad4eaca51485b8900f9e8bfbc633b08ec3d1e34855a3df2779054474782f531d7097fe78ec2617dc1ed54bf4d3b79
 EBUILD nginx-1.13.4.ebuild 36979 SHA256 3bcaaf3a338d9f835a123972ceb5c850d65f4202a344eff387e3585db8e59d6c SHA512 e37db661b34783e2888a1dbb41dc056a4dde164e98679f64d79bea49b8241186cd845429bd025b31787d81a8ba464325955607490335d125529e8c82ff84f381 WHIRLPOOL 39da88134ed266beec030be3504630b22d1d5b8291223b82821ca2dfc0599285f78b682140f003ac93755f79d386b56d8d209ff6d639942deeb07e2d8c539320
 EBUILD nginx-1.13.5.ebuild 36986 SHA256 2776b48e3377e64310dd3a27a0a7073c309ef2b6420a02ef7286f7f5dad9c676 SHA512 38717303b8e653edcabcfa080b3afa8188c5f6fed6b7c7f4ee512f05b2c572be99bf1ed91c1ee9b80958103eea1a91192faed3cd7c1d42bb80a02e8370226c4f WHIRLPOOL 339b305c223c2fd7ef7a11d614d871cecec7125c60e322dc4126c04222e7569f2434e2f8b1a0b99fcde72dc25ea623bba74ea195cb5d154270e5825ceacdb991
+EBUILD nginx-1.13.6-r1.ebuild 37167 SHA256 e83c844bc62f906641375d0711dfb03fa6ae3fa28a69f3e035b4b187bb497d05 SHA512 1dde3c47fceb674e00ba834f8e229b4c8fb11ec8593f93bb84f03f99c75e5aec58be217b7bc353c8a69bce16bb3adc940adf2019feb49af395625818f30ba7a7 WHIRLPOOL 8e3fdfa3c518ed12398e7496d53db96db56cb1c69390b4e8a594c0170bbac7d67abc52d99a22bc91b76bf839bb8bee8fff8c8830ffbbf5cfeaa8451cf1c665f7
 EBUILD nginx-1.13.6.ebuild 37000 SHA256 ee6ff2cf5b365059c2f5fe410d33761bc96bada332a07ce9fb687a9634d4c971 SHA512 c235a260e17c68ba15596e79c1b12086aaaeb21a7f179821c20292cb29366c26fa0c31a847ac3792de07bbc60ec9810b03b205c8cd05a76a56e069e67cd1f376 WHIRLPOOL 06531ff19d00a2c8126ac391f3af8c963a725aa20f66c5abc52575178092e44b8fce64ca6e934bf805c121ed1a23b1f3ac9f8211db903f84eb744265ed5de682
 MISC ChangeLog 20921 SHA256 6daa8e175ce89e3bcc1d0ce14ca52fd82bda991200624c46830e680614e494d6 SHA512 f3f2d93714c35d1ebc04d9aa2e0b6605334bcae88cc8a58c24eed9d479292d9288801dcbf224144914f8715092be69617b6e4c5fe837eeea87e8d499c4e91366 WHIRLPOOL bbb44c9e3e3e8a7ea93b358054266b593083ce38dbdac404dc54f8fdfdf83ef5ab54b5e3978a0c1597e6ed0a0005f064a271f83c3abc27e4598066efede3c563
 MISC ChangeLog-2015 69680 SHA256 10720899590f9065076fca43d949a1fc45b04562b93ca1b47f8bce211bc26a50 SHA512 2c149e4a9a2d37127b9520aa09fe789216a1498d73351b0563c45d8838abdc7788ad3d34ccddfd8b27d7eb386a1344e1726f2ee93a29c886e018057d0ade5546 WHIRLPOOL fcb612cb6854cd2644344220c0fabd8cffeb548008327920eb535986af33c7ad3ae4c31ac57497d9f35bfeabb10cbca1e9897d42009dcfd8a8a7b1dfc0fb9d30
diff --git a/www-servers/nginx/files/http_cache_purge-1.11.6+.patch b/www-servers/nginx/files/http_cache_purge-1.11.6+.patch
new file mode 100644
index 000000000000..c4596bf97ad1
--- /dev/null
+++ b/www-servers/nginx/files/http_cache_purge-1.11.6+.patch
@@ -0,0 +1,22 @@
+Fix compatibility with nginx-1.11.6+
+
+https://github.com/FRiCKLE/ngx_cache_purge/pull/51
+
+---
+ ngx_cache_purge_module.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/ngx_cache_purge_module.c
++++ b/ngx_cache_purge_module.c
+@@ -492,7 +492,11 @@ typedef struct {
+     ngx_str_t                      body_source;
+ #  endif /* nginx_version < 1007008 */
+ 
++#  if (nginx_version >= 1011006)
++    ngx_http_complex_value_t      *method;
++#  else
+     ngx_str_t                      method;
++#  endif /* nginx_version >= 1011006 */
+     ngx_str_t                      location;
+     ngx_str_t                      url;
+ 
diff --git a/www-servers/nginx/nginx-1.12.2-r1.ebuild b/www-servers/nginx/nginx-1.12.2-r1.ebuild
new file mode 100644
index 000000000000..fdf52f005cc0
--- /dev/null
+++ b/www-servers/nginx/nginx-1.12.2-r1.ebuild
@@ -0,0 +1,1005 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# Maintainer notes:
+# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
+# - any http-module activates the main http-functionality and overrides USE=-http
+# - keep the following requirements in mind before adding external modules:
+#	* alive upstream
+#	* sane packaging
+#	* builds cleanly
+#	* does not need a patch for nginx core
+# - TODO: test the google-perftools module (included in vanilla tarball)
+
+# prevent perl-module from adding automagic perl DEPENDs
+GENTOO_DEPEND_ON_PERL="no"
+
+# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
+DEVEL_KIT_MODULE_PV="0.3.0"
+DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1"
+DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
+DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
+
+# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
+HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.2"
+HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
+HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
+HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+
+# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license)
+HTTP_HEADERS_MORE_MODULE_PV="0.32"
+HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
+HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
+HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
+
+# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
+HTTP_CACHE_PURGE_MODULE_PV="2.3"
+HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
+HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+
+# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
+HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
+HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
+HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+
+# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
+HTTP_FANCYINDEX_MODULE_PV="0.4.2"
+HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
+HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+
+# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
+HTTP_LUA_MODULE_PV="0.10.10"
+HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
+HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
+HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
+
+# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
+HTTP_AUTH_PAM_MODULE_PV="1.5.1"
+HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
+HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
+HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
+
+# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
+HTTP_UPSTREAM_CHECK_MODULE_PV="31b1b42873fa56620d8a873ac13f5f26b52d0cd6"
+HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
+HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+
+# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
+HTTP_METRICS_MODULE_PV="0.1.1"
+HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
+HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+
+# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
+HTTP_NAXSI_MODULE_PV="0.55.3"
+HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
+HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
+HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
+
+# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
+RTMP_MODULE_PV="1.2.0"
+RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
+RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
+RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
+
+# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
+HTTP_DAV_EXT_MODULE_PV="0.1.0"
+HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
+HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
+HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
+
+# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
+HTTP_ECHO_MODULE_PV="0.61"
+HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
+HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
+HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
+
+# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
+# keep the MODULE_P here consistent with upstream to avoid tarball duplication
+HTTP_SECURITY_MODULE_PV="2.9.2"
+HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
+HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
+HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
+
+# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
+HTTP_PUSH_STREAM_MODULE_PV="0.5.2"
+HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
+HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
+HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
+
+# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
+HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42"
+HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
+HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
+HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42"
+
+# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
+HTTP_MOGILEFS_MODULE_PV="1.0.4"
+HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
+HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+
+# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
+HTTP_MEMC_MODULE_PV="0.18"
+HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
+HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
+HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
+
+# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
+HTTP_LDAP_MODULE_PV="49a8b4d28fc4a518563c82e0b52821e5f37db1fc"
+HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
+HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
+HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
+
+# We handle deps below ourselves
+SSL_DEPS_SKIP=1
+AUTOTOOLS_AUTO_DEPEND="no"
+
+inherit autotools ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib
+
+DESCRIPTION="Robust, small and high performance http and reverse proxy server"
+HOMEPAGE="https://nginx.org"
+SRC_URI="https://nginx.org/download/${P}.tar.gz
+	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
+	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
+	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
+	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
+	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
+	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
+	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
+	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
+	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
+	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
+	nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
+	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )
+	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
+	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
+	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
+	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
+	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
+	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
+	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
+	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )"
+
+LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
+	nginx_modules_http_security? ( Apache-2.0 )
+	nginx_modules_http_push_stream? ( GPL-3 )"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+# Package doesn't provide a real test suite
+RESTRICT="test"
+
+NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
+	fastcgi geo gzip limit_req limit_conn map memcached proxy referer
+	rewrite scgi ssi split_clients upstream_hash upstream_ip_hash
+	upstream_keepalive upstream_least_conn upstream_zone userid uwsgi"
+NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
+	gzip_static image_filter mp4 perl random_index realip secure_link
+	slice stub_status sub xslt"
+NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
+	upstream_hash upstream_least_conn upstream_zone"
+NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread"
+NGINX_MODULES_MAIL="imap pop3 smtp"
+NGINX_MODULES_3RD="
+	http_upload_progress
+	http_headers_more
+	http_cache_purge
+	http_slowfs_cache
+	http_fancyindex
+	http_lua
+	http_auth_pam
+	http_upstream_check
+	http_metrics
+	http_naxsi
+	http_dav_ext
+	http_echo
+	http_security
+	http_push_stream
+	http_sticky
+	http_mogilefs
+	http_memc
+	http_auth_ldap"
+
+IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre
+	pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax"
+
+for mod in $NGINX_MODULES_STD; do
+	IUSE="${IUSE} +nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_OPT; do
+	IUSE="${IUSE} nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_STREAM_STD; do
+	IUSE="${IUSE} nginx_modules_stream_${mod}"
+done
+
+for mod in $NGINX_MODULES_STREAM_OPT; do
+	IUSE="${IUSE} nginx_modules_stream_${mod}"
+done
+
+for mod in $NGINX_MODULES_MAIL; do
+	IUSE="${IUSE} nginx_modules_mail_${mod}"
+done
+
+for mod in $NGINX_MODULES_3RD; do
+	IUSE="${IUSE} nginx_modules_${mod}"
+done
+
+# Add so we can warn users updating about config changes
+# @TODO: jbergstroem: remove on next release series
+IUSE="${IUSE} nginx_modules_http_spdy"
+
+CDEPEND="
+	pcre? ( dev-libs/libpcre:= )
+	pcre-jit? ( dev-libs/libpcre:=[jit] )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	http2? (
+		!libressl? ( >=dev-libs/openssl-1.0.1c:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	http-cache? (
+		userland_GNU? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	nginx_modules_http_geoip? ( dev-libs/geoip )
+	nginx_modules_http_gunzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip_static? ( sys-libs/zlib )
+	nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] )
+	nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
+	nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
+	nginx_modules_http_secure_link? (
+		userland_GNU? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
+	nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) )
+	nginx_modules_http_auth_pam? ( virtual/pam )
+	nginx_modules_http_metrics? ( dev-libs/yajl:= )
+	nginx_modules_http_dav_ext? ( dev-libs/expat )
+	nginx_modules_http_security? (
+		dev-libs/apr:=
+		dev-libs/apr-util:=
+		dev-libs/libxml2:=
+		net-misc/curl
+		www-servers/apache
+	)
+	nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-nginx )
+	!www-servers/nginx:mainline"
+DEPEND="${CDEPEND}
+	nginx_modules_http_security? ( ${AUTOTOOLS_DEPEND} )
+	arm? ( dev-libs/libatomic_ops )
+	libatomic? ( dev-libs/libatomic_ops )"
+PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
+
+REQUIRED_USE="pcre-jit? ( pcre )
+	nginx_modules_http_lua? ( nginx_modules_http_rewrite )
+	nginx_modules_http_naxsi? ( pcre )
+	nginx_modules_http_dav_ext? ( nginx_modules_http_dav )
+	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
+	nginx_modules_http_security? ( pcre )
+	nginx_modules_http_push_stream? ( ssl )"
+
+pkg_setup() {
+	NGINX_HOME="/var/lib/nginx"
+	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
+
+	ebegin "Creating nginx user and group"
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
+	eend $?
+
+	if use libatomic; then
+		ewarn "GCC 4.1+ features built-in atomic operations."
+		ewarn "Using libatomic_ops is only needed if using"
+		ewarn "a different compiler or a GCC prior to 4.1"
+	fi
+
+	if [[ -n $NGINX_ADD_MODULES ]]; then
+		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
+		ewarn "This nginx installation is not supported!"
+		ewarn "Make sure you can reproduce the bug without those modules"
+		ewarn "_before_ reporting bugs."
+	fi
+
+	if use !http; then
+		ewarn "To actually disable all http-functionality you also have to disable"
+		ewarn "all nginx http modules."
+	fi
+
+	if use nginx_modules_http_mogilefs && use threads; then
+		eerror "mogilefs won't compile with threads support."
+		eerror "Please disable either flag and try again."
+		die "Can't compile mogilefs with threads support"
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
+	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
+
+	if use nginx_modules_http_upstream_check; then
+		#eapply -p0 "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/check_1.11.1+.patch
+		eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_security; then
+		cd "${HTTP_SECURITY_MODULE_WD}" || die
+
+		eautoreconf
+
+		if use luajit ; then
+			sed -i \
+				-e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \
+				configure || die
+		fi
+
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_upload_progress; then
+		cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_uploadprogress-issue_50-r1.patch
+		cd "${S}" || die
+	fi
+
+	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
+	# We have config protection, don't rename etc files
+	sed -i 's:.default::' auto/install || die
+	# remove useless files
+	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
+
+	# don't install to /etc/nginx/ if not in use
+	local module
+	for module in fastcgi scgi uwsgi ; do
+		if ! use nginx_modules_http_${module}; then
+			sed -i -e "/${module}/d" auto/install || die
+		fi
+	done
+
+	eapply_user
+}
+
+src_configure() {
+	# mod_security needs to generate nginx/modsecurity/config before including it
+	if use nginx_modules_http_security; then
+		cd "${HTTP_SECURITY_MODULE_WD}" || die
+
+		./configure \
+			--enable-standalone-module \
+			--disable-mlogc \
+			--with-ssdeep=no \
+			$(use_enable pcre-jit) \
+			$(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
+
+		cd "${S}" || die
+	fi
+
+	local myconf=() http_enabled= mail_enabled= stream_enabled=
+
+	use aio       && myconf+=( --with-file-aio )
+	use debug     && myconf+=( --with-debug )
+	use http2     && myconf+=( --with-http_v2_module )
+	use libatomic && myconf+=( --with-libatomic )
+	use pcre      && myconf+=( --with-pcre )
+	use pcre-jit  && myconf+=( --with-pcre-jit )
+	use threads   && myconf+=( --with-threads )
+
+	# HTTP modules
+	for mod in $NGINX_MODULES_STD; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+		else
+			myconf+=( --without-http_${mod}_module )
+		fi
+	done
+
+	for mod in $NGINX_MODULES_OPT; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+			myconf+=( --with-http_${mod}_module )
+		fi
+	done
+
+	if use nginx_modules_http_fastcgi; then
+		myconf+=( --with-http_realip_module )
+	fi
+
+	# third-party modules
+	if use nginx_modules_http_upload_progress; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_headers_more; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_lua; then
+		http_enabled=1
+		if use luajit; then
+			export LUAJIT_LIB=$(pkg-config --variable libdir luajit)
+			export LUAJIT_INC=$(pkg-config --variable includedir luajit)
+		else
+			export LUA_LIB=$(pkg-config --variable libdir lua)
+			export LUA_INC=$(pkg-config --variable includedir lua)
+		fi
+		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
+		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_metrics; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_naxsi ; then
+		http_enabled=1
+		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
+	fi
+
+	if use rtmp ; then
+		http_enabled=1
+		myconf+=( --add-module=${RTMP_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_dav_ext ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_echo ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_security ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
+	fi
+
+	if use nginx_modules_http_push_stream ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_sticky ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_mogilefs ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_memc ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_auth_ldap; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
+	fi
+
+	if use http || use http-cache || use http2; then
+		http_enabled=1
+	fi
+
+	if [ $http_enabled ]; then
+		use http-cache || myconf+=( --without-http-cache )
+		use ssl && myconf+=( --with-http_ssl_module )
+	else
+		myconf+=( --without-http --without-http-cache )
+	fi
+
+	# Stream modules
+	for mod in $NGINX_MODULES_STREAM_STD; do
+		if use nginx_modules_stream_${mod}; then
+			stream_enabled=1
+		else
+			myconf+=( --without-stream_${mod}_module )
+		fi
+	done
+
+	for mod in $NGINX_MODULES_STREAM_OPT; do
+		if use nginx_modules_stream_${mod}; then
+			stream_enabled=1
+			myconf+=( --with-stream_${mod}_module )
+		fi
+	done
+
+	if [ $stream_enabled ]; then
+		myconf+=( --with-stream )
+		use ssl && myconf+=( --with-stream_ssl_module )
+	fi
+
+	# MAIL modules
+	for mod in $NGINX_MODULES_MAIL; do
+		if use nginx_modules_mail_${mod}; then
+			mail_enabled=1
+		else
+			myconf+=( --without-mail_${mod}_module )
+		fi
+	done
+
+	if [ $mail_enabled ]; then
+		myconf+=( --with-mail )
+		use ssl && myconf+=( --with-mail_ssl_module )
+	fi
+
+	# custom modules
+	for mod in $NGINX_ADD_MODULES; do
+		myconf+=(  --add-module=${mod} )
+	done
+
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	tc-export CC
+
+	if ! use prefix; then
+		myconf+=( --user=${PN} )
+		myconf+=( --group=${PN} )
+	fi
+
+	local WITHOUT_IPV6=
+	if ! use ipv6; then
+		WITHOUT_IPV6=" -DNGX_HAVE_INET6=0"
+	fi
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
+		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
+		--pid-path="${EPREFIX}"/run/${PN}.pid \
+		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
+		--with-cc-opt="-I${EROOT}usr/include${WITHOUT_IPV6}" \
+		--with-ld-opt="-L${EROOT}usr/$(get_libdir)" \
+		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
+		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
+		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
+		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
+		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
+		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
+		--with-compat \
+		"${myconf[@]}" || die "configure failed"
+
+	# A purely cosmetic change that makes nginx -V more readable. This can be
+	# good if people outside the gentoo community would troubleshoot and
+	# question the users setup.
+	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
+}
+
+src_compile() {
+	use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
+
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D%/}" install
+
+	cp "${FILESDIR}"/nginx.conf-r2 "${ED}"etc/nginx/nginx.conf || die
+
+	newinitd "${FILESDIR}"/nginx.initd-r4 nginx
+	newconfd "${FILESDIR}"/nginx.confd nginx
+
+	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
+
+	doman man/nginx.8
+	dodoc CHANGES* README
+
+	# just keepdir. do not copy the default htdocs files (bug #449136)
+	keepdir /var/www/localhost
+	rm -rf "${D}"usr/html || die
+
+	# set up a list of directories to keep
+	local keepdir_list="${NGINX_HOME_TMP}"/client
+	local module
+	for module in proxy fastcgi scgi uwsgi; do
+		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
+	done
+
+	keepdir /var/log/nginx ${keepdir_list}
+
+	# this solves a problem with SELinux where nginx doesn't see the directories
+	# as root and tries to create them as nginx
+	fperms 0750 "${NGINX_HOME_TMP}"
+	fowners ${PN}:0 "${NGINX_HOME_TMP}"
+
+	fperms 0700 ${keepdir_list}
+	fowners ${PN}:${PN} ${keepdir_list}
+
+	fperms 0710 /var/log/nginx
+	fowners 0:${PN} /var/log/nginx
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
+
+	if use nginx_modules_http_perl; then
+		cd "${S}"/objs/src/http/modules/perl/ || die
+		emake DESTDIR="${D}" INSTALLDIRS=vendor
+		perl_delete_localpod
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		docinto ${HTTP_CACHE_PURGE_MODULE_P}
+		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
+		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		docinto ${HTTP_FANCYINDEX_MODULE_P}
+		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
+	fi
+
+	if use nginx_modules_http_lua; then
+		docinto ${HTTP_LUA_MODULE_P}
+		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		docinto ${HTTP_AUTH_PAM_MODULE_P}
+		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
+		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
+	fi
+
+	if use nginx_modules_http_naxsi; then
+		insinto /etc/nginx
+		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
+	fi
+
+	if use rtmp; then
+		docinto ${RTMP_MODULE_P}
+		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
+	fi
+
+	if use nginx_modules_http_dav_ext; then
+		docinto ${HTTP_DAV_EXT_MODULE_P}
+		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst
+	fi
+
+	if use nginx_modules_http_echo; then
+		docinto ${HTTP_ECHO_MODULE_P}
+		dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_security; then
+		docinto ${HTTP_SECURITY_MODULE_P}
+		dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.TXT,authors.txt}
+	fi
+
+	if use nginx_modules_http_push_stream; then
+		docinto ${HTTP_PUSH_STREAM_MODULE_P}
+		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
+	fi
+
+	if use nginx_modules_http_sticky; then
+		docinto ${HTTP_STICKY_MODULE_P}
+		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
+	fi
+
+	if use nginx_modules_http_memc; then
+		docinto ${HTTP_MEMC_MODULE_P}
+		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_auth_ldap; then
+		docinto ${HTTP_LDAP_MODULE_P}
+		dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
+	fi
+}
+
+pkg_postinst() {
+	if use ssl; then
+		if [[ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]]; then
+			install_cert /etc/ssl/${PN}/${PN}
+			use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
+		fi
+	fi
+
+	if use nginx_modules_http_spdy; then
+		ewarn ""
+		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
+		ewarn "Update your configs and package.use accordingly."
+	fi
+
+	if use nginx_modules_http_lua; then
+		ewarn ""
+		ewarn "While you can build lua 3rd party module against ${P}"
+		ewarn "the author warns that >=${PN}-1.11.11 is still not an"
+		ewarn "officially supported target yet. You are on your own."
+		ewarn "Expect runtime failures, memory leaks and other problems!"
+	fi
+
+	if use nginx_modules_http_lua && use http2; then
+		ewarn ""
+		ewarn "Lua 3rd party module author warns against using ${P} with"
+		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see http://git.io/OldLsg"
+	fi
+
+	local _n_permission_layout_checks=0
+	local _has_to_adjust_permissions=0
+	local _has_to_show_permission_warning=0
+
+	# Defaults to 1 to inform people doing a fresh installation
+	# that we ship modified {scgi,uwsgi,fastcgi}_params files
+	local _has_to_show_httpoxy_mitigation_notice=1
+
+	local _replacing_version=
+	for _replacing_version in ${REPLACING_VERSIONS}; do
+		_n_permission_layout_checks=$((${_n_permission_layout_checks}+1))
+
+		if [[ ${_n_permission_layout_checks} -gt 1 ]]; then
+			# Should never happen:
+			# Package is abusing slots but doesn't allow multiple parallel installations.
+			# If we run into this situation it is unsafe to automatically adjust any
+			# permission...
+			_has_to_show_permission_warning=1
+
+			ewarn "Replacing multiple ${PN}' versions is unsupported! " \
+				"You will have to adjust permissions on your own."
+
+			break
+		fi
+
+		local _replacing_version_branch=$(get_version_component_range 1-2 "${_replacing_version}")
+		debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
+
+		# Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)?
+		# This was before we introduced multiple nginx versions so we
+		# do not need to distinguish between stable and mainline
+		local _need_to_fix_CVE2013_0337=1
+
+		if version_is_at_least "1.4.1-r2" "${_replacing_version}"; then
+			# We are updating an installation which should already be fixed
+			_need_to_fix_CVE2013_0337=0
+			debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!"
+		else
+			_has_to_adjust_permissions=1
+			debug-print "Need to adjust permissions to fix CVE-2013-0337!"
+		fi
+
+		# Do we need to inform about HTTPoxy mitigation?
+		# In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f
+		if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then
+			# Updating from <1.10
+			_has_to_show_httpoxy_mitigation_notice=1
+			debug-print "Need to inform about HTTPoxy mitigation!"
+		else
+			# Updating from >=1.10
+			local _fixed_in_pvr=
+			case "${_replacing_version_branch}" in
+				"1.10")
+					_fixed_in_pvr="1.10.1-r2"
+					;;
+				"1.11")
+					_fixed_in_pvr="1.11.3-r1"
+					;;
+				*)
+					# This should be any future branch.
+					# If we run this code it is safe to assume that the user has
+					# already seen the HTTPoxy mitigation notice because he/she is doing
+					# an update from previous version where we have already shown
+					# the warning. Otherwise, we wouldn't hit this code path ...
+					_fixed_in_pvr=
+			esac
+
+			if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then
+				# We are updating an installation where we already informed
+				# that we are mitigating HTTPoxy per default
+				_has_to_show_httpoxy_mitigation_notice=0
+				debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!"
+			else
+				_has_to_show_httpoxy_mitigation_notice=1
+				debug-print "Need to inform about HTTPoxy mitigation!"
+			fi
+		fi
+
+		# Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)?
+		# All branches up to 1.11 are affected
+		local _need_to_fix_CVE2016_1247=1
+
+		if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then
+			# Updating from <1.10
+			_has_to_adjust_permissions=1
+			debug-print "Need to adjust permissions to fix CVE-2016-1247!"
+		else
+			# Updating from >=1.10
+			local _fixed_in_pvr=
+			case "${_replacing_version_branch}" in
+				"1.10")
+					_fixed_in_pvr="1.10.2-r3"
+					;;
+				"1.11")
+					_fixed_in_pvr="1.11.6-r1"
+					;;
+				*)
+					# This should be any future branch.
+					# If we run this code it is safe to assume that we have already
+					# adjusted permissions or were never affected because user is
+					# doing an update from previous version which was safe or did
+					# the adjustments. Otherwise, we wouldn't hit this code path ...
+					_fixed_in_pvr=
+			esac
+
+			if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then
+				# We are updating an installation which should already be adjusted
+				# or which was never affected
+				_need_to_fix_CVE2016_1247=0
+				debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!"
+			else
+				_has_to_adjust_permissions=1
+				debug-print "Need to adjust permissions to fix CVE-2016-1247!"
+			fi
+		fi
+	done
+
+	if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then
+		# We do not DIE when chmod/chown commands are failing because
+		# package is already merged on user's system at this stage
+		# and we cannot retry without losing the information that
+		# the existing installation needs to adjust permissions.
+		# Instead we are going to a show a big warning ...
+
+		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then
+			ewarn ""
+			ewarn "The world-readable bit (if set) has been removed from the"
+			ewarn "following directories to mitigate a security bug"
+			ewarn "(CVE-2013-0337, bug #458726):"
+			ewarn ""
+			ewarn "  ${EPREFIX%/}/var/log/nginx"
+			ewarn "  ${EPREFIX%/}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
+			ewarn ""
+			ewarn "Check if this is correct for your setup before restarting nginx!"
+			ewarn "This is a one-time change and will not happen on subsequent updates."
+			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX%/}${NGINX_HOME_TMP}'"
+			chmod o-rwx \
+				"${EPREFIX%/}"/var/log/nginx \
+				"${EPREFIX%/}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
+				_has_to_show_permission_warning=1
+		fi
+
+		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then
+			ewarn ""
+			ewarn "The permissions on the following directory have been reset in"
+			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
+			ewarn ""
+			ewarn "  ${EPREFIX%/}/var/log/nginx"
+			ewarn ""
+			ewarn "Check if this is correct for your setup before restarting nginx!"
+			ewarn "Also ensure that no other log directory used by any of your"
+			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
+			ewarn "used by nginx can be abused to escalate privileges!"
+			ewarn "This is a one-time change and will not happen on subsequent updates."
+			chown 0:nginx "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
+			chmod 710 "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
+		fi
+
+		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
+			# Should never happen ...
+			ewarn ""
+			ewarn "*************************************************************"
+			ewarn "***************         W A R N I N G         ***************"
+			ewarn "*************************************************************"
+			ewarn "The one-time only attempt to adjust permissions of the"
+			ewarn "existing nginx installation failed. Be aware that we will not"
+			ewarn "try to adjust the same permissions again because now you are"
+			ewarn "using a nginx version where we expect that the permissions"
+			ewarn "are already adjusted or that you know what you are doing and"
+			ewarn "want to keep custom permissions."
+			ewarn ""
+		fi
+	fi
+
+	# Sanity check for CVE-2016-1247
+	# Required to warn users who received the warning above and thought
+	# they could fix it by unmerging and re-merging the package or have
+	# unmerged a affected installation on purpose in the past leaving
+	# /var/log/nginx on their system due to keepdir/non-empty folder
+	# and are now installing the package again.
+	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX%/}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
+	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
+	if [ $? -eq 0 ] ; then
+		# Cleanup -- no reason to die here!
+		rm -f "${_sanity_check_testfile}"
+
+		ewarn ""
+		ewarn "*************************************************************"
+		ewarn "***************         W A R N I N G         ***************"
+		ewarn "*************************************************************"
+		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
+		ewarn "(bug #605008) because nginx user is able to create files in"
+		ewarn ""
+		ewarn "  ${EPREFIX%/}/var/log/nginx"
+		ewarn ""
+		ewarn "Also ensure that no other log directory used by any of your"
+		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
+		ewarn "used by nginx can be abused to escalate privileges!"
+	fi
+
+	if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then
+		# HTTPoxy mitigation
+		ewarn ""
+		ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
+		ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting"
+		ewarn "the HTTP_PROXY parameter to an empty string per default when you"
+		ewarn "are sourcing one of the default"
+		ewarn ""
+		ewarn "  - 'fastcgi_params' or 'fastcgi.conf'"
+		ewarn "  - 'scgi_params'"
+		ewarn "  - 'uwsgi_params'"
+		ewarn ""
+		ewarn "files in your server block(s)."
+		ewarn ""
+		ewarn "If this is causing any problems for you make sure that you are sourcing the"
+		ewarn "default parameters _before_ you set your own values."
+		ewarn "If you are relying on user-supplied proxy values you have to remove the"
+		ewarn "correlating lines from the file(s) mentioned above."
+		ewarn ""
+	fi
+}
diff --git a/www-servers/nginx/nginx-1.13.6-r1.ebuild b/www-servers/nginx/nginx-1.13.6-r1.ebuild
new file mode 100644
index 000000000000..98e2bf7e78a5
--- /dev/null
+++ b/www-servers/nginx/nginx-1.13.6-r1.ebuild
@@ -0,0 +1,1006 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# Maintainer notes:
+# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
+# - any http-module activates the main http-functionality and overrides USE=-http
+# - keep the following requirements in mind before adding external modules:
+#	* alive upstream
+#	* sane packaging
+#	* builds cleanly
+#	* does not need a patch for nginx core
+# - TODO: test the google-perftools module (included in vanilla tarball)
+
+# prevent perl-module from adding automagic perl DEPENDs
+GENTOO_DEPEND_ON_PERL="no"
+
+# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
+DEVEL_KIT_MODULE_PV="0.3.0"
+DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1"
+DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
+DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
+
+# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
+HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.2"
+HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
+HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
+HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+
+# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license)
+HTTP_HEADERS_MORE_MODULE_PV="0.32"
+HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
+HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
+HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
+
+# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
+HTTP_CACHE_PURGE_MODULE_PV="2.3"
+HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
+HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+
+# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
+HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
+HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
+HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+
+# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
+HTTP_FANCYINDEX_MODULE_PV="0.4.2"
+HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
+HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+
+# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
+HTTP_LUA_MODULE_PV="0.10.10"
+HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
+HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
+HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
+
+# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
+HTTP_AUTH_PAM_MODULE_PV="1.5.1"
+HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
+HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
+HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
+
+# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
+HTTP_UPSTREAM_CHECK_MODULE_PV="31b1b42873fa56620d8a873ac13f5f26b52d0cd6"
+HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
+HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+
+# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
+HTTP_METRICS_MODULE_PV="0.1.1"
+HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
+HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+
+# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
+HTTP_NAXSI_MODULE_PV="0.55.3"
+HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
+HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
+HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
+
+# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
+RTMP_MODULE_PV="1.2.0"
+RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
+RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
+RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
+
+# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
+HTTP_DAV_EXT_MODULE_PV="0.1.0"
+HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
+HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
+HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
+
+# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
+HTTP_ECHO_MODULE_PV="0.61"
+HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
+HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
+HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
+
+# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
+# keep the MODULE_P here consistent with upstream to avoid tarball duplication
+HTTP_SECURITY_MODULE_PV="2.9.2"
+HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
+HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
+HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
+
+# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
+HTTP_PUSH_STREAM_MODULE_PV="0.5.2"
+HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
+HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
+HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
+
+# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
+HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42"
+HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
+HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
+HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42"
+
+# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
+HTTP_MOGILEFS_MODULE_PV="1.0.4"
+HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
+HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+
+# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
+HTTP_MEMC_MODULE_PV="0.18"
+HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
+HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
+HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
+
+# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
+HTTP_LDAP_MODULE_PV="49a8b4d28fc4a518563c82e0b52821e5f37db1fc"
+HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
+HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
+HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
+
+# We handle deps below ourselves
+SSL_DEPS_SKIP=1
+AUTOTOOLS_AUTO_DEPEND="no"
+
+inherit autotools ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib
+
+DESCRIPTION="Robust, small and high performance http and reverse proxy server"
+HOMEPAGE="https://nginx.org"
+SRC_URI="https://nginx.org/download/${P}.tar.gz
+	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
+	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
+	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
+	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
+	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
+	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
+	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
+	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
+	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
+	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
+	nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
+	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )
+	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
+	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
+	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
+	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
+	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
+	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
+	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
+	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )"
+
+LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
+	nginx_modules_http_security? ( Apache-2.0 )
+	nginx_modules_http_push_stream? ( GPL-3 )"
+
+SLOT="mainline"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+# Package doesn't provide a real test suite
+RESTRICT="test"
+
+NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
+	fastcgi geo gzip limit_req limit_conn map memcached mirror proxy
+	referer rewrite scgi ssi split_clients upstream_hash
+	upstream_ip_hash upstream_keepalive upstream_least_conn
+	upstream_zone userid uwsgi"
+NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
+	gzip_static image_filter mp4 perl random_index realip secure_link
+	slice stub_status sub xslt"
+NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
+	upstream_hash upstream_least_conn upstream_zone"
+NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread"
+NGINX_MODULES_MAIL="imap pop3 smtp"
+NGINX_MODULES_3RD="
+	http_upload_progress
+	http_headers_more
+	http_cache_purge
+	http_slowfs_cache
+	http_fancyindex
+	http_lua
+	http_auth_pam
+	http_upstream_check
+	http_metrics
+	http_naxsi
+	http_dav_ext
+	http_echo
+	http_security
+	http_push_stream
+	http_sticky
+	http_mogilefs
+	http_memc
+	http_auth_ldap"
+
+IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre
+	pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax"
+
+for mod in $NGINX_MODULES_STD; do
+	IUSE="${IUSE} +nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_OPT; do
+	IUSE="${IUSE} nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_STREAM_STD; do
+	IUSE="${IUSE} nginx_modules_stream_${mod}"
+done
+
+for mod in $NGINX_MODULES_STREAM_OPT; do
+	IUSE="${IUSE} nginx_modules_stream_${mod}"
+done
+
+for mod in $NGINX_MODULES_MAIL; do
+	IUSE="${IUSE} nginx_modules_mail_${mod}"
+done
+
+for mod in $NGINX_MODULES_3RD; do
+	IUSE="${IUSE} nginx_modules_${mod}"
+done
+
+# Add so we can warn users updating about config changes
+# @TODO: jbergstroem: remove on next release series
+IUSE="${IUSE} nginx_modules_http_spdy"
+
+CDEPEND="
+	pcre? ( dev-libs/libpcre:= )
+	pcre-jit? ( dev-libs/libpcre:=[jit] )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	http2? (
+		!libressl? ( >=dev-libs/openssl-1.0.1c:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	http-cache? (
+		userland_GNU? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	nginx_modules_http_geoip? ( dev-libs/geoip )
+	nginx_modules_http_gunzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip_static? ( sys-libs/zlib )
+	nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] )
+	nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
+	nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
+	nginx_modules_http_secure_link? (
+		userland_GNU? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
+	nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) )
+	nginx_modules_http_auth_pam? ( virtual/pam )
+	nginx_modules_http_metrics? ( dev-libs/yajl:= )
+	nginx_modules_http_dav_ext? ( dev-libs/expat )
+	nginx_modules_http_security? (
+		dev-libs/apr:=
+		dev-libs/apr-util:=
+		dev-libs/libxml2:=
+		net-misc/curl
+		www-servers/apache
+	)
+	nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-nginx )
+	!www-servers/nginx:0"
+DEPEND="${CDEPEND}
+	nginx_modules_http_security? ( ${AUTOTOOLS_DEPEND} )
+	arm? ( dev-libs/libatomic_ops )
+	libatomic? ( dev-libs/libatomic_ops )"
+PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
+
+REQUIRED_USE="pcre-jit? ( pcre )
+	nginx_modules_http_lua? ( nginx_modules_http_rewrite )
+	nginx_modules_http_naxsi? ( pcre )
+	nginx_modules_http_dav_ext? ( nginx_modules_http_dav )
+	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
+	nginx_modules_http_security? ( pcre )
+	nginx_modules_http_push_stream? ( ssl )"
+
+pkg_setup() {
+	NGINX_HOME="/var/lib/nginx"
+	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
+
+	ebegin "Creating nginx user and group"
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
+	eend $?
+
+	if use libatomic; then
+		ewarn "GCC 4.1+ features built-in atomic operations."
+		ewarn "Using libatomic_ops is only needed if using"
+		ewarn "a different compiler or a GCC prior to 4.1"
+	fi
+
+	if [[ -n $NGINX_ADD_MODULES ]]; then
+		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
+		ewarn "This nginx installation is not supported!"
+		ewarn "Make sure you can reproduce the bug without those modules"
+		ewarn "_before_ reporting bugs."
+	fi
+
+	if use !http; then
+		ewarn "To actually disable all http-functionality you also have to disable"
+		ewarn "all nginx http modules."
+	fi
+
+	if use nginx_modules_http_mogilefs && use threads; then
+		eerror "mogilefs won't compile with threads support."
+		eerror "Please disable either flag and try again."
+		die "Can't compile mogilefs with threads support"
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
+	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
+
+	if use nginx_modules_http_upstream_check; then
+		#eapply -p0 "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/check_1.11.1+.patch
+		eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_security; then
+		cd "${HTTP_SECURITY_MODULE_WD}" || die
+
+		eautoreconf
+
+		if use luajit ; then
+			sed -i \
+				-e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \
+				configure || die
+		fi
+
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_upload_progress; then
+		cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_uploadprogress-issue_50-r1.patch
+		cd "${S}" || die
+	fi
+
+	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
+	# We have config protection, don't rename etc files
+	sed -i 's:.default::' auto/install || die
+	# remove useless files
+	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
+
+	# don't install to /etc/nginx/ if not in use
+	local module
+	for module in fastcgi scgi uwsgi ; do
+		if ! use nginx_modules_http_${module}; then
+			sed -i -e "/${module}/d" auto/install || die
+		fi
+	done
+
+	eapply_user
+}
+
+src_configure() {
+	# mod_security needs to generate nginx/modsecurity/config before including it
+	if use nginx_modules_http_security; then
+		cd "${HTTP_SECURITY_MODULE_WD}" || die
+
+		./configure \
+			--enable-standalone-module \
+			--disable-mlogc \
+			--with-ssdeep=no \
+			$(use_enable pcre-jit) \
+			$(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
+
+		cd "${S}" || die
+	fi
+
+	local myconf=() http_enabled= mail_enabled= stream_enabled=
+
+	use aio       && myconf+=( --with-file-aio )
+	use debug     && myconf+=( --with-debug )
+	use http2     && myconf+=( --with-http_v2_module )
+	use libatomic && myconf+=( --with-libatomic )
+	use pcre      && myconf+=( --with-pcre )
+	use pcre-jit  && myconf+=( --with-pcre-jit )
+	use threads   && myconf+=( --with-threads )
+
+	# HTTP modules
+	for mod in $NGINX_MODULES_STD; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+		else
+			myconf+=( --without-http_${mod}_module )
+		fi
+	done
+
+	for mod in $NGINX_MODULES_OPT; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+			myconf+=( --with-http_${mod}_module )
+		fi
+	done
+
+	if use nginx_modules_http_fastcgi; then
+		myconf+=( --with-http_realip_module )
+	fi
+
+	# third-party modules
+	if use nginx_modules_http_upload_progress; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_headers_more; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_lua; then
+		http_enabled=1
+		if use luajit; then
+			export LUAJIT_LIB=$(pkg-config --variable libdir luajit)
+			export LUAJIT_INC=$(pkg-config --variable includedir luajit)
+		else
+			export LUA_LIB=$(pkg-config --variable libdir lua)
+			export LUA_INC=$(pkg-config --variable includedir lua)
+		fi
+		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
+		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_metrics; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_naxsi ; then
+		http_enabled=1
+		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
+	fi
+
+	if use rtmp ; then
+		http_enabled=1
+		myconf+=( --add-module=${RTMP_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_dav_ext ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_echo ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_security ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
+	fi
+
+	if use nginx_modules_http_push_stream ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_sticky ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_mogilefs ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_memc ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_auth_ldap; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
+	fi
+
+	if use http || use http-cache || use http2; then
+		http_enabled=1
+	fi
+
+	if [ $http_enabled ]; then
+		use http-cache || myconf+=( --without-http-cache )
+		use ssl && myconf+=( --with-http_ssl_module )
+	else
+		myconf+=( --without-http --without-http-cache )
+	fi
+
+	# Stream modules
+	for mod in $NGINX_MODULES_STREAM_STD; do
+		if use nginx_modules_stream_${mod}; then
+			stream_enabled=1
+		else
+			myconf+=( --without-stream_${mod}_module )
+		fi
+	done
+
+	for mod in $NGINX_MODULES_STREAM_OPT; do
+		if use nginx_modules_stream_${mod}; then
+			stream_enabled=1
+			myconf+=( --with-stream_${mod}_module )
+		fi
+	done
+
+	if [ $stream_enabled ]; then
+		myconf+=( --with-stream )
+		use ssl && myconf+=( --with-stream_ssl_module )
+	fi
+
+	# MAIL modules
+	for mod in $NGINX_MODULES_MAIL; do
+		if use nginx_modules_mail_${mod}; then
+			mail_enabled=1
+		else
+			myconf+=( --without-mail_${mod}_module )
+		fi
+	done
+
+	if [ $mail_enabled ]; then
+		myconf+=( --with-mail )
+		use ssl && myconf+=( --with-mail_ssl_module )
+	fi
+
+	# custom modules
+	for mod in $NGINX_ADD_MODULES; do
+		myconf+=(  --add-module=${mod} )
+	done
+
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	tc-export CC
+
+	if ! use prefix; then
+		myconf+=( --user=${PN} )
+		myconf+=( --group=${PN} )
+	fi
+
+	local WITHOUT_IPV6=
+	if ! use ipv6; then
+		WITHOUT_IPV6=" -DNGX_HAVE_INET6=0"
+	fi
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
+		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
+		--pid-path="${EPREFIX}"/run/${PN}.pid \
+		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
+		--with-cc-opt="-I${EROOT}usr/include${WITHOUT_IPV6}" \
+		--with-ld-opt="-L${EROOT}usr/$(get_libdir)" \
+		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
+		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
+		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
+		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
+		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
+		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
+		--with-compat \
+		"${myconf[@]}" || die "configure failed"
+
+	# A purely cosmetic change that makes nginx -V more readable. This can be
+	# good if people outside the gentoo community would troubleshoot and
+	# question the users setup.
+	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
+}
+
+src_compile() {
+	use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
+
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D%/}" install
+
+	cp "${FILESDIR}"/nginx.conf-r2 "${ED}"etc/nginx/nginx.conf || die
+
+	newinitd "${FILESDIR}"/nginx.initd-r4 nginx
+	newconfd "${FILESDIR}"/nginx.confd nginx
+
+	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
+
+	doman man/nginx.8
+	dodoc CHANGES* README
+
+	# just keepdir. do not copy the default htdocs files (bug #449136)
+	keepdir /var/www/localhost
+	rm -rf "${D}"usr/html || die
+
+	# set up a list of directories to keep
+	local keepdir_list="${NGINX_HOME_TMP}"/client
+	local module
+	for module in proxy fastcgi scgi uwsgi; do
+		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
+	done
+
+	keepdir /var/log/nginx ${keepdir_list}
+
+	# this solves a problem with SELinux where nginx doesn't see the directories
+	# as root and tries to create them as nginx
+	fperms 0750 "${NGINX_HOME_TMP}"
+	fowners ${PN}:0 "${NGINX_HOME_TMP}"
+
+	fperms 0700 ${keepdir_list}
+	fowners ${PN}:${PN} ${keepdir_list}
+
+	fperms 0710 /var/log/nginx
+	fowners 0:${PN} /var/log/nginx
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
+
+	if use nginx_modules_http_perl; then
+		cd "${S}"/objs/src/http/modules/perl/ || die
+		emake DESTDIR="${D}" INSTALLDIRS=vendor
+		perl_delete_localpod
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		docinto ${HTTP_CACHE_PURGE_MODULE_P}
+		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
+		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		docinto ${HTTP_FANCYINDEX_MODULE_P}
+		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
+	fi
+
+	if use nginx_modules_http_lua; then
+		docinto ${HTTP_LUA_MODULE_P}
+		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		docinto ${HTTP_AUTH_PAM_MODULE_P}
+		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
+		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
+	fi
+
+	if use nginx_modules_http_naxsi; then
+		insinto /etc/nginx
+		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
+	fi
+
+	if use rtmp; then
+		docinto ${RTMP_MODULE_P}
+		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
+	fi
+
+	if use nginx_modules_http_dav_ext; then
+		docinto ${HTTP_DAV_EXT_MODULE_P}
+		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst
+	fi
+
+	if use nginx_modules_http_echo; then
+		docinto ${HTTP_ECHO_MODULE_P}
+		dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_security; then
+		docinto ${HTTP_SECURITY_MODULE_P}
+		dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.TXT,authors.txt}
+	fi
+
+	if use nginx_modules_http_push_stream; then
+		docinto ${HTTP_PUSH_STREAM_MODULE_P}
+		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
+	fi
+
+	if use nginx_modules_http_sticky; then
+		docinto ${HTTP_STICKY_MODULE_P}
+		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
+	fi
+
+	if use nginx_modules_http_memc; then
+		docinto ${HTTP_MEMC_MODULE_P}
+		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_auth_ldap; then
+		docinto ${HTTP_LDAP_MODULE_P}
+		dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
+	fi
+}
+
+pkg_postinst() {
+	if use ssl; then
+		if [[ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]]; then
+			install_cert /etc/ssl/${PN}/${PN}
+			use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
+		fi
+	fi
+
+	if use nginx_modules_http_spdy; then
+		ewarn ""
+		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
+		ewarn "Update your configs and package.use accordingly."
+	fi
+
+	if use nginx_modules_http_lua; then
+		ewarn ""
+		ewarn "While you can build lua 3rd party module against ${P}"
+		ewarn "the author warns that >=${PN}-1.11.11 is still not an"
+		ewarn "officially supported target yet. You are on your own."
+		ewarn "Expect runtime failures, memory leaks and other problems!"
+	fi
+
+	if use nginx_modules_http_lua && use http2; then
+		ewarn ""
+		ewarn "Lua 3rd party module author warns against using ${P} with"
+		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see http://git.io/OldLsg"
+	fi
+
+	local _n_permission_layout_checks=0
+	local _has_to_adjust_permissions=0
+	local _has_to_show_permission_warning=0
+
+	# Defaults to 1 to inform people doing a fresh installation
+	# that we ship modified {scgi,uwsgi,fastcgi}_params files
+	local _has_to_show_httpoxy_mitigation_notice=1
+
+	local _replacing_version=
+	for _replacing_version in ${REPLACING_VERSIONS}; do
+		_n_permission_layout_checks=$((${_n_permission_layout_checks}+1))
+
+		if [[ ${_n_permission_layout_checks} -gt 1 ]]; then
+			# Should never happen:
+			# Package is abusing slots but doesn't allow multiple parallel installations.
+			# If we run into this situation it is unsafe to automatically adjust any
+			# permission...
+			_has_to_show_permission_warning=1
+
+			ewarn "Replacing multiple ${PN}' versions is unsupported! " \
+				"You will have to adjust permissions on your own."
+
+			break
+		fi
+
+		local _replacing_version_branch=$(get_version_component_range 1-2 "${_replacing_version}")
+		debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
+
+		# Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)?
+		# This was before we introduced multiple nginx versions so we
+		# do not need to distinguish between stable and mainline
+		local _need_to_fix_CVE2013_0337=1
+
+		if version_is_at_least "1.4.1-r2" "${_replacing_version}"; then
+			# We are updating an installation which should already be fixed
+			_need_to_fix_CVE2013_0337=0
+			debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!"
+		else
+			_has_to_adjust_permissions=1
+			debug-print "Need to adjust permissions to fix CVE-2013-0337!"
+		fi
+
+		# Do we need to inform about HTTPoxy mitigation?
+		# In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f
+		if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then
+			# Updating from <1.10
+			_has_to_show_httpoxy_mitigation_notice=1
+			debug-print "Need to inform about HTTPoxy mitigation!"
+		else
+			# Updating from >=1.10
+			local _fixed_in_pvr=
+			case "${_replacing_version_branch}" in
+				"1.10")
+					_fixed_in_pvr="1.10.1-r2"
+					;;
+				"1.11")
+					_fixed_in_pvr="1.11.3-r1"
+					;;
+				*)
+					# This should be any future branch.
+					# If we run this code it is safe to assume that the user has
+					# already seen the HTTPoxy mitigation notice because he/she is doing
+					# an update from previous version where we have already shown
+					# the warning. Otherwise, we wouldn't hit this code path ...
+					_fixed_in_pvr=
+			esac
+
+			if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then
+				# We are updating an installation where we already informed
+				# that we are mitigating HTTPoxy per default
+				_has_to_show_httpoxy_mitigation_notice=0
+				debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!"
+			else
+				_has_to_show_httpoxy_mitigation_notice=1
+				debug-print "Need to inform about HTTPoxy mitigation!"
+			fi
+		fi
+
+		# Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)?
+		# All branches up to 1.11 are affected
+		local _need_to_fix_CVE2016_1247=1
+
+		if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then
+			# Updating from <1.10
+			_has_to_adjust_permissions=1
+			debug-print "Need to adjust permissions to fix CVE-2016-1247!"
+		else
+			# Updating from >=1.10
+			local _fixed_in_pvr=
+			case "${_replacing_version_branch}" in
+				"1.10")
+					_fixed_in_pvr="1.10.2-r3"
+					;;
+				"1.11")
+					_fixed_in_pvr="1.11.6-r1"
+					;;
+				*)
+					# This should be any future branch.
+					# If we run this code it is safe to assume that we have already
+					# adjusted permissions or were never affected because user is
+					# doing an update from previous version which was safe or did
+					# the adjustments. Otherwise, we wouldn't hit this code path ...
+					_fixed_in_pvr=
+			esac
+
+			if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then
+				# We are updating an installation which should already be adjusted
+				# or which was never affected
+				_need_to_fix_CVE2016_1247=0
+				debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!"
+			else
+				_has_to_adjust_permissions=1
+				debug-print "Need to adjust permissions to fix CVE-2016-1247!"
+			fi
+		fi
+	done
+
+	if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then
+		# We do not DIE when chmod/chown commands are failing because
+		# package is already merged on user's system at this stage
+		# and we cannot retry without losing the information that
+		# the existing installation needs to adjust permissions.
+		# Instead we are going to a show a big warning ...
+
+		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then
+			ewarn ""
+			ewarn "The world-readable bit (if set) has been removed from the"
+			ewarn "following directories to mitigate a security bug"
+			ewarn "(CVE-2013-0337, bug #458726):"
+			ewarn ""
+			ewarn "  ${EPREFIX%/}/var/log/nginx"
+			ewarn "  ${EPREFIX%/}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
+			ewarn ""
+			ewarn "Check if this is correct for your setup before restarting nginx!"
+			ewarn "This is a one-time change and will not happen on subsequent updates."
+			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX%/}${NGINX_HOME_TMP}'"
+			chmod o-rwx \
+				"${EPREFIX%/}"/var/log/nginx \
+				"${EPREFIX%/}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
+				_has_to_show_permission_warning=1
+		fi
+
+		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then
+			ewarn ""
+			ewarn "The permissions on the following directory have been reset in"
+			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
+			ewarn ""
+			ewarn "  ${EPREFIX%/}/var/log/nginx"
+			ewarn ""
+			ewarn "Check if this is correct for your setup before restarting nginx!"
+			ewarn "Also ensure that no other log directory used by any of your"
+			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
+			ewarn "used by nginx can be abused to escalate privileges!"
+			ewarn "This is a one-time change and will not happen on subsequent updates."
+			chown 0:nginx "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
+			chmod 710 "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
+		fi
+
+		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
+			# Should never happen ...
+			ewarn ""
+			ewarn "*************************************************************"
+			ewarn "***************         W A R N I N G         ***************"
+			ewarn "*************************************************************"
+			ewarn "The one-time only attempt to adjust permissions of the"
+			ewarn "existing nginx installation failed. Be aware that we will not"
+			ewarn "try to adjust the same permissions again because now you are"
+			ewarn "using a nginx version where we expect that the permissions"
+			ewarn "are already adjusted or that you know what you are doing and"
+			ewarn "want to keep custom permissions."
+			ewarn ""
+		fi
+	fi
+
+	# Sanity check for CVE-2016-1247
+	# Required to warn users who received the warning above and thought
+	# they could fix it by unmerging and re-merging the package or have
+	# unmerged a affected installation on purpose in the past leaving
+	# /var/log/nginx on their system due to keepdir/non-empty folder
+	# and are now installing the package again.
+	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX%/}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
+	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
+	if [ $? -eq 0 ] ; then
+		# Cleanup -- no reason to die here!
+		rm -f "${_sanity_check_testfile}"
+
+		ewarn ""
+		ewarn "*************************************************************"
+		ewarn "***************         W A R N I N G         ***************"
+		ewarn "*************************************************************"
+		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
+		ewarn "(bug #605008) because nginx user is able to create files in"
+		ewarn ""
+		ewarn "  ${EPREFIX%/}/var/log/nginx"
+		ewarn ""
+		ewarn "Also ensure that no other log directory used by any of your"
+		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
+		ewarn "used by nginx can be abused to escalate privileges!"
+	fi
+
+	if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then
+		# HTTPoxy mitigation
+		ewarn ""
+		ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
+		ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting"
+		ewarn "the HTTP_PROXY parameter to an empty string per default when you"
+		ewarn "are sourcing one of the default"
+		ewarn ""
+		ewarn "  - 'fastcgi_params' or 'fastcgi.conf'"
+		ewarn "  - 'scgi_params'"
+		ewarn "  - 'uwsgi_params'"
+		ewarn ""
+		ewarn "files in your server block(s)."
+		ewarn ""
+		ewarn "If this is causing any problems for you make sure that you are sourcing the"
+		ewarn "default parameters _before_ you set your own values."
+		ewarn "If you are relying on user-supplied proxy values you have to remove the"
+		ewarn "correlating lines from the file(s) mentioned above."
+		ewarn ""
+	fi
+}
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index a054f5554a57..38679df1cf5e 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -29,7 +29,7 @@ EBUILD xorg-server-1.19.2.ebuild 6495 SHA256 78089c6a548396c89095fc6beec071f9468
 EBUILD xorg-server-1.19.3.ebuild 6512 SHA256 2e83c66c00a67d4e9d9fcf34ec762519f3c9ada917b5762088675b5d0f0cc0fa SHA512 cffa1e80ce0c8f4435384a5f92d2bf2849e2118273ac13d1e7a9eb66bb679bb122861f2ad329f1fc92f9e3ba22dda3b2eb3b91f2f8ab1783ca8f2294d61b9f4e WHIRLPOOL ad0ae175db020297a0cf3d2f9e94402c08ba93265e746e16b9e7efc80b02898db3e628a9c3b8d82f1db3f840f490305cd5ad286fbf23d6d38d8703c6bddf1641
 EBUILD xorg-server-1.19.4.ebuild 6513 SHA256 630a9428b88a39bcbff856e9e925fa2d0c56c22bd9aa7c80bc62968c65b362dd SHA512 3190ae74ad11a042d63981a0393586299e8ebe08c2577725c43afee3d051598554ce44e1129f5e1bdbd89986a20601ce95b5fe60fb8c793466d8264ffcb8876f WHIRLPOOL 72a34fbbffbf7ee3bb8880d976bbd71840c3663d4b0d1e64010349c1da36773d605f0c398f941a71da23a2836e96d59a885b8263d1ed2f9a2354aec3a07531ed
 EBUILD xorg-server-1.19.5-r1.ebuild 6504 SHA256 c27232ccaa69e327c9f49a5ebc875b07750a4dd84896d795587bf36a730a2689 SHA512 76b96cb6cd0be8dd950011612cadc17ce41f764ed68da5df521857ea89b41c0c6d99b9e49e12688ce3fd38fd90255cbf87875de7e551bb772edd42d823f0b27d WHIRLPOOL 99332e9a321c699ed72828653a66b2e8bebd901b5e767bf998db84f3415c5f3d36dc0d5113200ad5849e73af59239e008761cb52fec142698fbb6f919f73c7d6
-EBUILD xorg-server-1.19.5.ebuild 6521 SHA256 0290086de3ed0fb8a8f7abc6dd2e4534a5e15be34bd95bd5a6cd2f87d683d6e8 SHA512 6ce2fbd53263500091c5187c8cecebe95019bbc26b5b2b2c7e9dc4c57e1b5927c18ebddcbb1cdbe49903125a3919e7c08a6269de12c372a8a4fa67a5d2852dd3 WHIRLPOOL 1dd0fe1aba0c06b182b73e08f70375f9cb8f5ca74282df96ad3cc2c3cab9ecbd0f57b28e00a732e2eab74a9a89b534e8c7b21407800d468c9a611e2b8b0a050a
+EBUILD xorg-server-1.19.5.ebuild 6514 SHA256 74ab0f72cab3694fe659509195aee44faac4bec83a456a98d0139bc00564100b SHA512 43f4aeef5c29e7b1230d4f05b43c64002d127090df9d9bd28e215395f7c5089cea2f74bf171dd08a9b55f3263fd605e24a54a5329ac856a10d3089f54ededcdd WHIRLPOOL 89ceb7afd66912b8358cc226c7e7312df6553a88daaeb19a6bdd14661347ac2a5f944394302b4aa07b8fdd6eec2cb32a0daa717088872bb8472ee58b9e375386
 EBUILD xorg-server-9999.ebuild 6151 SHA256 64e24b5c0cf9890b18aab7f23790437e55d890183e529d1024156200f211f3f5 SHA512 4594ee31ef8511bb16ab92891c6e54c047c03bd1b5ec79a79d7de8a57ef6540bbb3cd28464d90e3c9b62168f21c422c3c10c203417c38ffaa7cc8c860850152e WHIRLPOOL cb97a4dd8f8beaa3054713d19aadc3874031bbba3a3c69d7a66acd19a0d81378167dea8b35dc15b93e42146ce1a1625760a9518480588a32f864f14f323dae24
 MISC ChangeLog 13297 SHA256 1977bc55d2059999337eb7da74854d87df14c185e4385d94996bee3b873acde9 SHA512 71cec7ec907faed0cd6c6d17a1cfe7e239d3ab232886b283ba5d4e96d14ec4f72dab46aae948112cd9df86e5abe7db09ebca8b975dacc0576deff3be2f07c6a0 WHIRLPOOL 35bafac5f84bbb743de840b3019eb6e665925e001af2f8ae8086f9e715e868d554a99e91ed595edd648b4eba84c3ce8a31a1fe6bb8a659606b941ea548671a27
 MISC ChangeLog-2009 109242 SHA256 76119bd85f64b74b4f8129911eef944e8f1baa3ae38bbfb65bcd6197a6f58c88 SHA512 200b2a1f8d66bc4461de84a5b675ae9bdc1fd38ffea339cdc69afdb613d7a6d6ffe29175fba62b10c4f9d95e050035933f59e21172bf9c545d7a70137c8d04f4 WHIRLPOOL 1c084a461e803c1a6627986cb2444cd7a23743f409df5bb1ca5f55d1e7c3106670cfc2cd4f875a479e0c75513b7937ee35b591b4016b715f7fa45209e098cece
diff --git a/x11-base/xorg-server/xorg-server-1.19.5.ebuild b/x11-base/xorg-server/xorg-server-1.19.5.ebuild
index f744e1738cb6..2ea07cb02e64 100644
--- a/x11-base/xorg-server/xorg-server-1.19.5.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.19.5.ebuild
@@ -9,7 +9,7 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git"
 
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind xcsecurity"
diff --git a/x11-drivers/xf86-input-libinput/Manifest b/x11-drivers/xf86-input-libinput/Manifest
index ad07835f6b1d..b2670b6d2755 100644
--- a/x11-drivers/xf86-input-libinput/Manifest
+++ b/x11-drivers/xf86-input-libinput/Manifest
@@ -3,7 +3,7 @@ DIST xf86-input-libinput-0.25.1.tar.bz2 370072 SHA256 489f7d591c9ef08463d4966e61
 DIST xf86-input-libinput-0.26.0.tar.bz2 371165 SHA256 abca558fc2226f295691f1cf3412d4c0edeaa439f677ca25b5c9fab310d2387b SHA512 b52a27e916f7e86576500ef2bc3ce640676f5a710543755865a723628c0e01a575989460853bac184ed696961e3f8fca72ecba8ad4625be8cd9e31f9a55f5e97 WHIRLPOOL 94640089bead51758c40eb68b792952bba9a22dd3354e0300a08632caa13ef6a449b9d916e7d3cc843dfe0c9eebf4e011b846398d703630b975ea4409ce50bc3
 EBUILD xf86-input-libinput-0.24.0.ebuild 406 SHA256 41290ed3aea98ef644c07e5d2596d2512a5cad23d03cd6a69d773fa5631bc3a8 SHA512 a53f2c2d2df3d88445136fee82c96f79fc4d305c9bdf30d4537433b569577ba07030afe6abbf3dd42ff05c9b3aa5ce4d5a7eb93d0cdbbfde2232b0945788423c WHIRLPOOL 57071a900379eba78bd3c81e2c433a96a7f6309ddf747bc47e42d800c0dfeabca723478e7bb5c7413faa5e08fc4438478946f33faf57219af2c6fe19a4b3b723
 EBUILD xf86-input-libinput-0.25.1.ebuild 414 SHA256 8f184370ce3ec121f39aa7899c667d610098e7f73b8909b977c769d100ddd3c8 SHA512 20c5773e4e33d215f27e443215392560331ac850646dc0a390651a3caa98e7e4562d030778625d662578563316f301aeb9c9a3d27a03c0f9c5a4cc3759ec0948 WHIRLPOOL 38a6a92db4a9b36c96eb2a5736f995d57005529d03964d4aeef9d2a5b17736ba06630db9028b02794bba74011d5b092ce562e85ccfb2d7b33dee1ad51caef7f2
-EBUILD xf86-input-libinput-0.26.0.ebuild 422 SHA256 3e39bcc8c6684c65f64f40cd03b6050c504b023d161ad2b3c84c78fa6c5653fc SHA512 22f83488d92e2fca43817b65c1b26debee1aafdbf6ac7f152c6c9ce07fa6d707dbaa0bbf3622038faee259ecde9e38fe80bd020f12076301f931c02461964039 WHIRLPOOL f0337d6835beb9dd15af552f3b280c22a8d8b61fe4421e6352f0a72b9e040983fe42c0843e9bc8db7a7221e76e3ae6948a4d13b13bff6780ea886c7470e18968
+EBUILD xf86-input-libinput-0.26.0.ebuild 428 SHA256 d5079a0428911773f9521c879f3ac5f176d53a307b892ce364b9e6c764f23860 SHA512 345ccf9e5e27ae0554c4e3df5d08eb88129180c26e158d47820b0d56b2851b1bb298c6d3abc487d126e1971d0c818efbaa8d475956433cd8c97149e220fecbe8 WHIRLPOOL 234d756fb582b84dd9a14a817eee6328bb7adc0e71772388c79b601a10ea184547a8380a8ef57e516cc8630554e8df0c623383c84f19ec02982e6efbaef4dcb4
 MISC ChangeLog 9247 SHA256 1e915834fa15b959e78b86249b891c4aae816b8523bfe67a387cc8449d5dd0ce SHA512 812451117b817d02e2411474801324b9a846b61245453a27742f3e5ebd2ef6043c21a48688f893ecf6929f9bbbfeb24e39edb8bd9c8ad77ded5aaf4c01036d63 WHIRLPOOL 527b5fff68bb64b4592236fb79aaea165ed4f03124506dfa529c1d3bbb04415d0394a871380d3a0dcf45d655887084b8fbb109de85f788a2731522edb06737b0
 MISC ChangeLog-2015 2057 SHA256 d8c8e6dd5099b2dd950916f0b61fefc85c1f530ba39034fd33cc4cc47e6712e3 SHA512 f1dd41e952a186f4bad94de66b0676a7709089f3cab0f41c2a4094352c9c2890d36ad05580c801a083a6c0ae788da716de636e81cad694c9b4126449780909ef WHIRLPOOL bc1df51de357b721219729ac6d522db4b5c064625cdb741e710e9b2f101f7ad64d53728c7a9ca512814fbe61f2c93cbded3db009f4d022c6a98786cfa00174b4
 MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.26.0.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.26.0.ebuild
index 6bb27758a8c5..4fabb09754a6 100644
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.26.0.ebuild
+++ b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.26.0.ebuild
@@ -7,7 +7,7 @@ inherit linux-info xorg-2
 
 DESCRIPTION="X.org input driver based on libinput"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/libinput-1.5.0:0="
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 3334c59f1e82..2a0236c04cea 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -12,7 +12,7 @@ DIST gtk+-3.22.17.tar.xz 18702864 SHA256 a6c1fb8f229c626a3d9c0e1ce6ea138de7f64a5
 DIST gtk+-3.22.19.tar.xz 18841024 SHA256 9883d3ca5244f9b3168ce660e87d52900e141d0f7147dea0640bdd6fe8e5166c SHA512 c83198794433ee6eb29f8740d59bd7056cd36808b4bff1a99563ab1a1742e6635dab4f2a8be33317f74d3b336f0d1adc28dd91410da056b50a08c215f184dce2 WHIRLPOOL 27b7921512951cdc3735e7c96fee5b7f930542c46d61a389bea2a3484ff4d9fbc8fc6a91b0ce4fb3fcf58f432b8939a77f829db2e27a9e7a690fb1ae6d600b4a
 EBUILD gtk+-2.24.31-r1.ebuild 10104 SHA256 c427479ed10949ebff00287f58bd281976bffe84d80f8f57f23ee0bc8db85d47 SHA512 7efbaaa3ffccb8268f50fdf05cc96f0c87a6801a64e89977153368ae334176325ee77822fa663455e808d18008e54faf86c0d5a4cf9b6d5dc995ca8c3d33f61e WHIRLPOOL 098fc2e32dcb2d46df799de14871d38c0a60453a1f1ad8d8d3afb4eb258122055a673fa689290d140004c994fb10924ad38ff376fa5395e61ab1bca83900f72b
 EBUILD gtk+-3.22.15.ebuild 6930 SHA256 45c4c967067b2f52054f6809ef2589e9079ad3483bbacf64739ea1ffc92dcb2d SHA512 3103bbf23ab5dc56738513599c48f6f090a0aacaa33424f498e7ad5bb0b3841537a4b6a6cadd8a9d86c8fd9a88f99623cc85d8565338229ff6419f267b93b7ac WHIRLPOOL 70703f3cfbe54875a3d1de99dbb68aa0ab978bb8075ab6d7fd10e2c153f54319fa76f6735fb2700753067b29dd4c4f5223bd2b7f95258ff2a106251638773dc9
-EBUILD gtk+-3.22.16.ebuild 6783 SHA256 30655946c7dc0b50feeea9e71f34b55e2d62657b2b55185e7943ed8bd19b004c SHA512 739f3120d98ef5802022d46bbc73afce41e55f75c6c5d6d68e058556f4aaf5f99268b8cb5717a9c5a4a6820b742d215f62abcc38e7c99e1367c0c1e2efbff32a WHIRLPOOL 3b192af3a38717b67f2f78b2a9bc401b64a0d10d8576c4d9a3f89464f2271454c2fe825286272de5c62287cb82e06b58e2453bafcce96b01ee5e41f58bc5a821
+EBUILD gtk+-3.22.16.ebuild 6782 SHA256 296b91662653c5b67f0c966f5a591473cf66186b24b6b481db3966d0504ffe03 SHA512 8c7f7cad3730a4bc77f0294d936359e0b64a145d699ce6b44e58b6a8158ef073d04456387d89d19afac6dee0915784991edb0e13a83629a86a4fab331579101c WHIRLPOOL 9f8fa1e2cdcb182188b31b5862f0ad35596beecb09e24a180e8d93215f8740fea3c336be106863e3865c2bb9f444b27f789c894fec405e15ce1724ee7df203b7
 EBUILD gtk+-3.22.17.ebuild 6788 SHA256 d772512b2fe2f78b3409dc3977b32bfa5501389ead22ad306a9e41f6cecca6fe SHA512 237f05cc646d2167ce857a85306468ee3f68c1670e048c91a6b13c5291f0291cd2fb0f00961440e4d69072519027626e3081e4954fe77fe830fadede7d3a185d WHIRLPOOL 7d3061314da8e6cd7bd9fdef03fb4772f33bd7cf61dfb0562ba7d8d1f0adf8e13ae17614e769c107f0907d9e53b3f83c7dc5c803c6776055aa60e647f9d17dbe
 EBUILD gtk+-3.22.19.ebuild 6788 SHA256 d3a6961e786ed41ace568550f0005fcae1f14dd7b6b0bc0a94b2bcbde342063d SHA512 15b42d8c22a16dcf0d3c0c3c9844ba8733330809083e02b892aba17d87f1a775462913fa951365c490d1af9a10180be0f8cf5ded257d29f684bd5569f10f2d65 WHIRLPOOL 82f3a09d4fa0957d54905507194eaebc8b0184d2a3047e60e3ac611db6e430c50553d3bc3ad5a002ad3dab304089b41b56a4cfd9b057eb0302b0722ba1b89d99
 MISC ChangeLog 18888 SHA256 bb9123ceec13c8279e45e94d0dbaea83c8c4c5aa9eb769121f3d5b8c568bc6ed SHA512 45e34684e22f47e5416d5641b935396327c58c7ca68eb01c61f3177b8354f9b38421ec35db410a98a9eb9a621225d87ba9474b8a1de59ecff6486ef037d18e37 WHIRLPOOL c4956dea2b9bdcf261e52255c29060d0801be82089100271b2579b6c1f74569e74b766522141046e2d647bea19a2ed46b7bc2dbd6cd41bbae3679babc6f5ae0d
diff --git a/x11-libs/gtk+/gtk+-3.22.16.ebuild b/x11-libs/gtk+/gtk+-3.22.16.ebuild
index 7d0a6347c290..8afb08477575 100644
--- a/x11-libs/gtk+/gtk+-3.22.16.ebuild
+++ b/x11-libs/gtk+/gtk+-3.22.16.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/libXfont/Manifest b/x11-libs/libXfont/Manifest
index 9ae8dfb12afe..bc594b4ab74d 100644
--- a/x11-libs/libXfont/Manifest
+++ b/x11-libs/libXfont/Manifest
@@ -3,7 +3,7 @@ DIST libXfont-1.5.2.tar.bz2 530367 SHA256 02945ea68da447102f3e6c2b896c1d2061fd11
 DIST libXfont-1.5.3.tar.bz2 519793 SHA256 ab85c10fd2683481dfef672a77fe60e6a2039558cbc0e9bf56b5e1df471c93d0 SHA512 e7c8a09c4d174129e5d550194d3c3dc2b4abf797e52fe588c6002920727c52cf33b7db8d07fc69c2987e766d3af2d6ddda72f0c70eb21b135c691c97656a81b4 WHIRLPOOL 956af4caed82144124499f7d132a7dde21d738c3048e124b3007be65be6e093cb1247a4af24c36a1c6ef1cca52e96756c95d0b3db1940efd147fe8499378311b
 EBUILD libXfont-1.4.9.ebuild 825 SHA256 5b3dc24e49b3449c7619a7863ad375e71e3dd121deeb244a0a3d2435d066c37c SHA512 a55701a7daa83a3c66d0f81101e3ef0e2f90c13d9f21fd280ad8c202326b47e2837cba8eb3bb196b4d7f23d3b8df63be5629b64078cf46a1518a31a962abbff9 WHIRLPOOL ed29dae1a46755f17f1ef7456dbfb130427a608a468b1e29780905ea6151dcc1cc16b5ffaa2e100b647bf8fac5d82fc86380719e8691c01fd52fbeb9fa8ed549
 EBUILD libXfont-1.5.2.ebuild 868 SHA256 f3e12148c4cdcfe8ac3b01be33afe898f5f7bebc870fdf6378f6c92cd43265ad SHA512 bf29ce3df705a3ac6072722c520da24b838cc93577267a27491f1121ca2aa6bec548f1cdb50c92ceb93ffdc12b3914df92139a7839ca19a4ebd20cd8eaef698f WHIRLPOOL 7c85e7287508e208f32023d4fbf28eefc4751fc12d8af80926c9bcf05a125194c60e1bc5774f137fc6ada619a83e868caf2dd016613591cb50e35395dc2bf594
-EBUILD libXfont-1.5.3.ebuild 875 SHA256 f89de8a59c3d383350b64b5364155160f781f5ea52e11619e9b2eac322dc5e72 SHA512 fe91429024fd298af6a84e555eb3a31eb7c553f1be63149f558d6df5ea31da7dc0b84e7b0a139e834b314651ce95144e53a59df533b9cea00de79dfa44f3b4fa WHIRLPOOL 00172701b07a8746792682a0a69304070d43ed45cf483d6153dd65596500538b1cab8c0c541b7fe1833b418c6520be6691b054616fc0f11d9bbb4b391be56850
+EBUILD libXfont-1.5.3.ebuild 871 SHA256 0f6d3e581131889a1001ec7b5639220949ee893e50ad50e5a7db963c57290617 SHA512 3b0f09111e5ad0a11b1f4199829a10ca35439c83a1975cf66945414b6dbf3b86c755ba16df0fd1c3ce30ef5e8ad73872a1163e573c70fda4e321c2fb53d9cb58 WHIRLPOOL 51a285b6f79a71192a871893e02bcf6cded5243fe4bc257a12362655059a72699559185a8227ecabd767a5e068ff1abc99a026c63cb6d1856c4a5b39756aba22
 MISC ChangeLog 2614 SHA256 e7d8991fdf45b22339592f5121acbf852bf6a2eb31d4e443daaf6530a37921db SHA512 e8c7e7b5a5401692b5d198a6780a0495af69a5bd491137230b22578055e5fcca53f0c92af6e69ced3b47df1278fcce61d45fef083b9baaed81d8cf027acaf3b8 WHIRLPOOL ddb4dcb927c51fbb194e603594f9c0743392a856b5e49f737a14101e2d56759860ce856ae92ce4ae6449994d14f4751e78f231fd13d44b6c6c4964ccee1ee8d5
 MISC ChangeLog-2015 30579 SHA256 79130e72d7d8d9d09b93e0bac7a7c13312b36bdc978ac00020c6c10c181fe223 SHA512 3558560f9a19d1ee228569baa41990709fb5230f9bb60ebf8709a1e344df8263d8274cd516e23ae3e62aa713cb341798bcaa36d33f99de2a6c3e11674248da4c WHIRLPOOL f2669a53caa00ada7cecbb7d64b15e0e5f50952cd812e93d03e24af49786db318935a768112472b6af37eac094899cf44b1d5eeb6e60c7f0c57e7e030391c606
 MISC metadata.xml 475 SHA256 a50b5ca3973b98cbe9bee0d84bf5dd9d6d582ac3f4db19330e42368809221109 SHA512 11c5f77e0ad6453c90b4403b7f336449ca7d72cd0f61bab37f14357710173bda280895736f098674ca0cb48b969bcd5d2a9c166161c1c717a036e09b777f7852 WHIRLPOOL 7bca65639e5c11e4310b9e4e702cb47ddfc5d769d235c586ec97110e2e960f11b4bdea448dd7e525f14ba809278fbad25270fcad15c367a7a7f390643358b124
diff --git a/x11-libs/libXfont/libXfont-1.5.3.ebuild b/x11-libs/libXfont/libXfont-1.5.3.ebuild
index 8018df256024..49df73e73ae4 100644
--- a/x11-libs/libXfont/libXfont-1.5.3.ebuild
+++ b/x11-libs/libXfont/libXfont-1.5.3.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xfont library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 ipv6 truetype"
 
 RDEPEND="x11-libs/xtrans
diff --git a/x11-libs/libXfont2/Manifest b/x11-libs/libXfont2/Manifest
index ebf9e0035360..6f80e6f6ceb4 100644
--- a/x11-libs/libXfont2/Manifest
+++ b/x11-libs/libXfont2/Manifest
@@ -1,7 +1,7 @@
 DIST libXfont2-2.0.1.tar.bz2 472822 SHA256 e9fbbb475ddd171b3a6a54b989cbade1f6f874fc35d505ebc5be426bc6e4db7e SHA512 5e4dcb587b4d25dd41124bb50d71c30b5e29663ce675b0830def82fb6e00b64ba34e1b1ed7fad947fd0da95007aa55d14f587383e4cff08c3e0a0241c8879d16 WHIRLPOOL 305b33b83f6bb3c5e73e39f8be597e0d0934d5ed190691b141bf792987cef6b50ee1c31310b955eafea0e16869d52378e453805cddf4e06c8d172385ccc81228
 DIST libXfont2-2.0.2.tar.bz2 476173 SHA256 94088d3b87f7d42c7116d9adaad155859e93330c6e47f5989f2de600b9a6c111 SHA512 d62b0c3d663a2c668796cca8c6c2a90f83feeae1253b7d946668d33502cd8099c963285b88db4f745efb0d4ff783c118eb3d84cb8e6e1724586e1ef2be23e593 WHIRLPOOL 8e04eebcf81bfcbbd02af60bc047551c30379950b50b3e9d284c918f9241fa18885b5172a416d04cfa6ff44637de1b69ab5cb51e7af37354e0f23e9a052f7600
 EBUILD libXfont2-2.0.1.ebuild 833 SHA256 5cc05dc427e71cf247870d357e79806abaa75b195fd791264dbca830f9bc0f07 SHA512 79693fcda9ec5c9990d28371a6817ff79c2bfd6a0d18b48b070e9455fa896e21a2602c7916f474dd1cd060f0d5347e5d4984fec7c74e6350556aad94f972c9fd WHIRLPOOL 9cf4fa661a4567b451f03795e7f9c8b041805a37b98c3444b14ae7dd7a83d6f853fe90dcf0558d377675a5885f3a071ac5a2887a2fedff9463440b82c56877e7
-EBUILD libXfont2-2.0.2.ebuild 840 SHA256 7bde12ebb1c2a212b6788b6864fc3df9e34cdc28de6de7b5eeea925cf9333f96 SHA512 573513fc810075d5821ff2bf1e4fac96e785b43afcf9a62c0f26117bdaa63dd730144b0585ec9b32d7a4d8cb6a896914581b1ba60a669da67eee02ed34ada6d3 WHIRLPOOL c979dfa6dd78bc8f9fc9c5a910c013ab76bfc846556392e443b917ac8c39e04d27d4a7d33dfa027b5d73cb49b84feaea3c2327743bfc06eb0b9e532295e32e11
+EBUILD libXfont2-2.0.2.ebuild 836 SHA256 412f3a6c7fb50353dc25a3428053ba2c2211310a600402a10fb8921191f4db1b SHA512 c5e1b2558d210db04b8ee7223ce5f5b74f46cc366a7f4470354b5f793d8fb95cf66e717964056c83410c1879dfbc3a2931fbac713d1b0850fcd7f6927de1ef82 WHIRLPOOL 7708a3302bee48954430d0b4d87f400d205ae1bf9aa5682fea9931661d5ccb9751e591a96607893142c39aae93ba87b4b52b2f8426659bbce10ee49d0af5ceec
 EBUILD libXfont2-9999.ebuild 708 SHA256 12d8b9d6f84e979df9fcb44881ae063cafe60db98766f9851e5cb5bc59234e7a SHA512 8056ae3ba2f101b84534c0b3b41e609e11a5673d73a4d135501295c198a0f58c2b1e67e7f7a0bbb4a6c565cc67dd7c9c799d68ea190c18f56d238d6b8f8697f1 WHIRLPOOL 48dd14d2760caa6ed2acc8996401e87c97ea80941e4089248b82b9c28d4ec5b9f6b50e3c9270b56934005d5f4c5d379194863559238a558c10b901de697cef99
 MISC ChangeLog 821 SHA256 2321434d8c275290513cdec74f8bf70440ec93da094bf4b77759f11ed6d03018 SHA512 1bba91fe37673341c61ab6916530753c69dbcea29ea5e47a35fe0fa51cb7e7b23146928c61a9f78ffe66a9253583c5be720d831d7750b01b91b7e9833c835b3f WHIRLPOOL 42fbefe010b45dd74ff4270f75be044e44f8ccd18af786964f18b84d382411ee4de7398465ed795337489f283878296ca9a0f78629f96cb9ddf70e821abecf48
 MISC metadata.xml 475 SHA256 a50b5ca3973b98cbe9bee0d84bf5dd9d6d582ac3f4db19330e42368809221109 SHA512 11c5f77e0ad6453c90b4403b7f336449ca7d72cd0f61bab37f14357710173bda280895736f098674ca0cb48b969bcd5d2a9c166161c1c717a036e09b777f7852 WHIRLPOOL 7bca65639e5c11e4310b9e4e702cb47ddfc5d769d235c586ec97110e2e960f11b4bdea448dd7e525f14ba809278fbad25270fcad15c367a7a7f390643358b124
diff --git a/x11-libs/libXfont2/libXfont2-2.0.2.ebuild b/x11-libs/libXfont2/libXfont2-2.0.2.ebuild
index 9af70e64eb77..3f407a183657 100644
--- a/x11-libs/libXfont2/libXfont2-2.0.2.ebuild
+++ b/x11-libs/libXfont2/libXfont2-2.0.2.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xfont library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 ipv6 truetype"
 
 RDEPEND="x11-libs/xtrans
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 07310f51ef04..02b9d9bd5be6 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -9,7 +9,7 @@ EBUILD libdrm-2.4.75.ebuild 2025 SHA256 2855e3112ce8532496a8289124ccd79b33e829ff
 EBUILD libdrm-2.4.79.ebuild 2034 SHA256 a876da26b0bffe7155ac14482a9242be011b1e71d3fea9daa39e2ecba9292a27 SHA512 9d8d83f85a204ed6859affbaa80413f399eeeb5b9981de542cd301e8201136325d1237d0ef74682381f7441e9dace713bef5fc6eb00addf27b37bfbbd3cac70c WHIRLPOOL d3448d0e87f099ec43c28efe56670954827b079c1380dd440cc7d2d0bdeba483d40599a41afe7eafd33cc98cfa63350fead9bb7d4aefdfa18592e898bbb6dec2
 EBUILD libdrm-2.4.80.ebuild 2039 SHA256 70b36a071847c0cb058f1f8e2ab8dfe456b5f0c55e86d7acbbb4c5b7da16ba2f SHA512 2676f7d59c5020432269cfe7450b8b544e73478e9667c0fb7627fc5d09d662675e31218a70d8190a0426381688a7e8d30afe2d3b957a2cd04395540e097913bb WHIRLPOOL 8372438e85786af109efb3a003d74dc9378fab2b560acde1cfa815ac40899e65c98760565d7413b54490edd68408fab61dca472e1d9f282ac68e8fdad07ff7d9
 EBUILD libdrm-2.4.81.ebuild 2047 SHA256 cafc5b73cff388003e48d6b6b0a2d8fd211bdad1813551dcc0a983fcaf155eff SHA512 29413925b0da7b31b3171ebbca51896e77772a0e4fd405c2154aaac5b3efb07d522939708f01818ff9d4305991af257c4757964baed1edf13c9fc1f3f4ea9e4f WHIRLPOOL b0b550d4542ba72fa5dc05e208531479ad543bbbdfb765eed22df40e32388eb34f4b2ddbd9f3a10e63d7aedf0259d47a325c1f8d7f4dc098a53c69d61b1be09d
-EBUILD libdrm-2.4.82.ebuild 2044 SHA256 2ced701893f3f70eb358ae4a710bbd6b6e5a5c2e367722be407c2b98dd7d1f41 SHA512 e886fa3500543eacefc525a62f420687bd90bdd56edf5370555c3b46b410c91d5174486ed7ab583c9a7736bd31a63550365111675d963a396ac4aaa422874896 WHIRLPOOL 13ef211af44b1b6950b7963fc22f157a982aa2320a12147d5c18b20bd1676fced1c960988b0da6aa78525ac540d25f11be8749b9304859ba6f27d3952bfc95bd
+EBUILD libdrm-2.4.82.ebuild 2043 SHA256 4d71f4a888a8b1f90c663d51c7a734547f6859d0f1fef102b0d9693905fa46b4 SHA512 d8615d86466c9d0662fb6e5ebe6cdc6de672e53c631312885d4ce228320d4f73c7f67d8afecad5d34a80ba73cfe1a0dbc2490e1823d86c59ccbfb4c87bfa665c WHIRLPOOL c643eec75808a5606cf891b48acbe2593529b26958610b7c31795353dc37764bd0d6c9d4cd75fa50e613e9fd10b689c2cc731f453881c79b20522eda9aaf0655
 EBUILD libdrm-2.4.84.ebuild 2047 SHA256 cafc5b73cff388003e48d6b6b0a2d8fd211bdad1813551dcc0a983fcaf155eff SHA512 29413925b0da7b31b3171ebbca51896e77772a0e4fd405c2154aaac5b3efb07d522939708f01818ff9d4305991af257c4757964baed1edf13c9fc1f3f4ea9e4f WHIRLPOOL b0b550d4542ba72fa5dc05e208531479ad543bbbdfb765eed22df40e32388eb34f4b2ddbd9f3a10e63d7aedf0259d47a325c1f8d7f4dc098a53c69d61b1be09d
 EBUILD libdrm-2.4.85.ebuild 2047 SHA256 cafc5b73cff388003e48d6b6b0a2d8fd211bdad1813551dcc0a983fcaf155eff SHA512 29413925b0da7b31b3171ebbca51896e77772a0e4fd405c2154aaac5b3efb07d522939708f01818ff9d4305991af257c4757964baed1edf13c9fc1f3f4ea9e4f WHIRLPOOL b0b550d4542ba72fa5dc05e208531479ad543bbbdfb765eed22df40e32388eb34f4b2ddbd9f3a10e63d7aedf0259d47a325c1f8d7f4dc098a53c69d61b1be09d
 EBUILD libdrm-9999.ebuild 1913 SHA256 a1a99fe8335f4dd1da299d84b2b9a536c1696812acfa8c2297b55857fc1c9790 SHA512 838f1ee18aba8bf9a31fe3b81300366c63fb7d34d386d5cdcea9aae23241c01d40863f80ecc84844867b72ceb30a9290558311c2302a88a3fdbd933bb5bad531 WHIRLPOOL d19ff320a2d73409063add688ae4cd547ca34bf2735123ffb2f9b07b010af751b6d0fe02e23137224ed427c3652430a2d68d25c185f1f806b3e69bbc89b6f06f
diff --git a/x11-libs/libdrm/libdrm-2.4.82.ebuild b/x11-libs/libdrm/libdrm-2.4.82.ebuild
index 615539acfda8..22f117d3d578 100644
--- a/x11-libs/libdrm/libdrm-2.4.82.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.82.ebuild
@@ -14,7 +14,7 @@ else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
 fi
 
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
diff --git a/x11-libs/neXtaw/Manifest b/x11-libs/neXtaw/Manifest
index 6186a8bb9039..7d6d82d9ba3f 100644
--- a/x11-libs/neXtaw/Manifest
+++ b/x11-libs/neXtaw/Manifest
@@ -1,5 +1,6 @@
 DIST neXtaw-0.15.1.tar.gz 577459 SHA256 7cfe6706b9a76620389e04a7a87f06786c8a6606829c3157c3e9e45a805bb584 SHA512 5250b2ac6fc746b8de19d0c2504e6c21e0b6c6ac4ef1a841a9793a2fd2dff082b86a987f54f68e0e35ed8f798900a701e6fd9c6cf7b1412a4bd53179fd07cbf1 WHIRLPOOL 5750610fc3533131f560543092fb36513bff41bb0d4e4a7921f8dccdde88c5422ac926229fd53cae093084a6cbe48d9b71ab0df227941af57ed5036f6d49be85
 EBUILD neXtaw-0.15.1-r1.ebuild 757 SHA256 19930e0c77325a110f60354fe667e0ee4acc96b2b4710ad05a1bd2e35e4ed995 SHA512 cc96b5d3579ee917ec8b2986e598a97d4edba46475096af4c5c0435c9a8594fd95c0bf5948623c9dd7865754c2ef36caf51bd59d0dd9c666baf3b200f5cad31e WHIRLPOOL 990cc6a609d363ea0d4776775847dc7ad63c3ed617fdfd7ddb8f4f6c087c7857a672a6da2643da91fb7a3565dfdf9d52b315e6dbe8e421bb9fed8df978f3045d
+EBUILD neXtaw-0.15.1-r2.ebuild 769 SHA256 27661f3c0da823f2079e7b58bc541d1e0ce35b562f602a79256631fe0663dba9 SHA512 e78e192fb27f412ec7e1f72f6061cc61c665a97f7dcb9d7f551b5dc6c7cff150646aba8beed14f3e984c41d2a4143b12b0cb49cc8b04d274d8086915580ec480 WHIRLPOOL 6047d78e8c96bb1cf0d8470467ba6ec6aa68e5ba1f8c694f3470de20660de37d6db198b639b5260db77070b55f1b93f5fde7502a585e751d927f6aa37dbe7343
 MISC ChangeLog 2527 SHA256 a5a474c8876a93bbb2d3b8692dcf392b9058d2d457c0cab7f7914ef352ad495f SHA512 0bf6c0c5dcf77dee9a8f8b80c74ce114b3be86f4e309551a69e7b53b3adba07ffa65f95bb89c700be1f55c6377559b4219b87ebacaa1ef41a913d0d4c5073e43 WHIRLPOOL 155404af22469bb2394785689ca21deee82b8fa313e55cf9c1b5203354effaa79041067313510b7b36de3ace1b03d217050005f1413b984f8bd2c325542ef37b
 MISC ChangeLog-2015 3938 SHA256 9ad95d69dc17120e4c8bf209d4c4773d3e8dc63fb1de1d36011698edc783f36d SHA512 96008810d7137349e003ea9f6328dba3a880a1dfe96cc589d78fed3bffc1abf8481baa4752f6bc1d0e81d5b52ceeda4c3697cd7ebf1928cb7c2ecd63940858e6 WHIRLPOOL 2994c8f52d6b5f5645047be51107a484f2e4d3bfe09c0c02c0dba6554430deb1fc57d9d22bd7608523748a36bae4671309051e412cbcb51958a6dac5ea785f2c
 MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/x11-libs/neXtaw/neXtaw-0.15.1-r2.ebuild b/x11-libs/neXtaw/neXtaw-0.15.1-r2.ebuild
new file mode 100644
index 000000000000..377b2c070edc
--- /dev/null
+++ b/x11-libs/neXtaw/neXtaw-0.15.1-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Athena Widgets with N*XTSTEP appearance"
+HOMEPAGE="http://siag.nu/neXtaw/"
+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"
+IUSE=""
+
+RDEPEND="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-proto/xextproto
+	x11-proto/xproto
+	!<x11-libs/neXtaw-0.15.1-r1"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+}
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index cac61362a1d1..454df9f42e83 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -9,7 +9,7 @@ EBUILD pango-1.40.11.ebuild 1710 SHA256 a7171813fc652ca6c7c7d948679a48059664e77f
 EBUILD pango-1.40.12.ebuild 1710 SHA256 a7171813fc652ca6c7c7d948679a48059664e77f89a8fd697222ea18a0128a21 SHA512 1b0778e455cebf395c6685dab3750fbfcfee1e4d38e682eda82988f1178597fa2829f68a3799ee24f15d3093213d13f95726ad816652d1f8d8fe81a394ca1515 WHIRLPOOL b6bea6839d2325638952ff7c5073f235aee811ccb083925c8a7a1af70531df68438b67fb74d08a6dd4d4d82e1de68cb446dd6be8ed8c17df40089559e94d47ba
 EBUILD pango-1.40.3.ebuild 1710 SHA256 c8ef2c66ac9ae7e509a043b189d90d9e553b4feb447c909f4bb7007853835cc5 SHA512 6fbbf1ba010f5d5d527822ff2f4f43a6184dbb61b4c3c9e61507bf65c17f815caea1bfa8793dacd7f902d0d42c66d1beb31ec66ac70452730b6c1d08f6a1f139 WHIRLPOOL b5888c87b1ecdc4ed219bb10fbfac97684d0d88d262d42bb2dfd9ebfa50424fb8c5a270716318e57010bc3bf072e3df2d978ea50d9e927be81dc22cbb1bdb981
 EBUILD pango-1.40.5.ebuild 1702 SHA256 ede80a0661b346b4162753e918b15951fca82eed7244c84eb08f9f0fa232e2b4 SHA512 7111f759d6202669fae7a881e298a30962ec2a07184a566ddda64e5f681923803ae60d385b2cbabda05dfbc062de44c3962176ad6ce37aa2e11b7a5a2cd9e1be WHIRLPOOL 510e51d5e24e32be3dcaf8534d14a3d320b5d955fa3135a09b750fb15e811b1cf81ba8e61ff604807744fef0d70dc6e33221c6e27f36baf579eb2a01ad37af4e
-EBUILD pango-1.40.6.ebuild 1704 SHA256 0005f6a92f087cd57c08862791e366423d8f84e3d2a030d170a48c70d9307458 SHA512 500a793235784f3e3622261446c9209e81abd7bca5b7b1ec8e1a5b99f06bc1b11c5a1b0cdf003aa011c64ccc8a8d457a2f5c13c2728f49abb48ad707e3ef546e WHIRLPOOL de6fd9d880f68d7db69fc6a4c70dd57b4d972bafa2acd9f353d852d32826a38bc3c313d4d56f03be8aa24646bb90ff5618fd16d50325bddeb7f0c349506f120b
+EBUILD pango-1.40.6.ebuild 1703 SHA256 0430bc42e8934e92ae214d33f09083756ecfbb5e9b0fa78bfa4094fa3a099522 SHA512 b8a02ed3d2094212dd7089dccef25d8a5585db33c15a2c570639602dd4fb22f07bfd20b2008794efa1977969afbd2d263ff283f6eeb8433f0449c3f8967d9377 WHIRLPOOL 72ea90b4c743033bb4ce59d89b295e8fee918703622fff8da847a57738629726d6a64dd4d8c919131ccf41a1463e7646a42b8c5bd0e85f633c8c655200dff3ae
 EBUILD pango-1.40.7.ebuild 1710 SHA256 a7171813fc652ca6c7c7d948679a48059664e77f89a8fd697222ea18a0128a21 SHA512 1b0778e455cebf395c6685dab3750fbfcfee1e4d38e682eda82988f1178597fa2829f68a3799ee24f15d3093213d13f95726ad816652d1f8d8fe81a394ca1515 WHIRLPOOL b6bea6839d2325638952ff7c5073f235aee811ccb083925c8a7a1af70531df68438b67fb74d08a6dd4d4d82e1de68cb446dd6be8ed8c17df40089559e94d47ba
 EBUILD pango-1.40.9.ebuild 1710 SHA256 a7171813fc652ca6c7c7d948679a48059664e77f89a8fd697222ea18a0128a21 SHA512 1b0778e455cebf395c6685dab3750fbfcfee1e4d38e682eda82988f1178597fa2829f68a3799ee24f15d3093213d13f95726ad816652d1f8d8fe81a394ca1515 WHIRLPOOL b6bea6839d2325638952ff7c5073f235aee811ccb083925c8a7a1af70531df68438b67fb74d08a6dd4d4d82e1de68cb446dd6be8ed8c17df40089559e94d47ba
 MISC ChangeLog 7537 SHA256 7c240545b3057191c8c21d869e75f5e9adbb6b08467ec1f2e06eefc99f6f291e SHA512 f6a8f82ce7c1ca396fc2381b8659f7cd010ede8290f4b68aa6f36f2fb49ebd26436cc38b8d7215e7db96881c7df71a951a6d6908e3ef4781bcf468f7bad711db WHIRLPOOL 4a10d6f548a5be7da38d1a0ea15f11c13af930c07ffaccfc3151ed1151f8edccb2a7ac144cfa2883e3547897237175b7bc4821a1e4182888a42622228f24b4a1
diff --git a/x11-libs/pango/pango-1.40.6.ebuild b/x11-libs/pango/pango-1.40.6.ebuild
index bc8369565dee..aaf81dabd5db 100644
--- a/x11-libs/pango/pango-1.40.6.ebuild
+++ b/x11-libs/pango/pango-1.40.6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.pango.org/"
 
 LICENSE="LGPL-2+ FTL"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="X +introspection test"
 
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 45075a6181d8..bc149b19c10d 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -11,7 +11,7 @@ DIST vte-2.91-command-notify.patch.xz 6012 SHA256 b99ea46c410030f0d0ffe85a9034f2
 EBUILD vte-0.28.2-r208.ebuild 2973 SHA256 d25c229897764598d07711b4644d79f541afda0e7e8057446b759cfa699dfa19 SHA512 c8711b4777911936c2c2154eaa620f4ccbcb5df491a1943d97bb2bc1179ab333ee422fcf26f56a7f76170941b6d6bdb21b881fffb0c7af96a37cbf7eb63ca560 WHIRLPOOL a447845126ec2e6af5ad5636826b455fc930834df01aefeba7a25576e9a2f7a3d2eee7ff6b0d9b265a51d4cd13fd336ae38c0447b7542fd2ea138768224533cb
 EBUILD vte-0.36.5.ebuild 1695 SHA256 c84c27f306a285979178d856f4243a70cc67a58b6a99b6e60e786ff187501a90 SHA512 b0665651664f07d69741836d0e870710ec271807fd2da982b544eab42d48da74bb5800324c91cce1ca21080488606d2f5e3263ed3e73357812d5680f3cad91ba WHIRLPOOL 8a38294e9468a779df1b74dc797d101c0999844ded28fb632149db7c9f915d44ca47acb13a448b0c2d4f80e09b4a10c0b41ef455addb53417e3e191c56cd3af6
 EBUILD vte-0.46.1.ebuild 1898 SHA256 1da31f1f28461c3bcac037b45cf369742eb542caf3878eed9db36a5feeb88e5b SHA512 e966d45f6d46ca821ee4891fdfc7f03d01db9c64327b2146178407cf1adb8730d02723c205043d7bda68ec49d851d34412d4bb8d35908dcaebaf733e3ee5021d WHIRLPOOL cb0166031ce638d0de0c876abd1f4330552fbf19ed9c1eb28389085132df744506dc29ebdb29161841b13c78c0f612f1df2012f94d456382c3323afc963a8451
-EBUILD vte-0.46.2.ebuild 1902 SHA256 524f75fd28022773b3e6b1605ec2341f62058b500a2d65e2c16060b099a5d91e SHA512 8adb67da193d401f48c126b45ea9b97c186526c544fa49b719d20e02eeb020f757b5af07d844437b2000118d8669f575befe2d77bfbd889cc336a045043ac017 WHIRLPOOL 898fcc4926a660124bdca0501b61ccc5a7158751c9f3d32ccd4b31c7ac53676a4779d8dc7414aeae3cf70a1a1588589bb1350346709edfbc836e7f1452f973e8
+EBUILD vte-0.46.2.ebuild 1901 SHA256 0b9034d0f3a2c4b19ac2f61ab1371fc4cf5299952e8b0b9899737e2b1d8688e6 SHA512 9563c614a5ba2772b0962cfdc55cdbf1fe75f41256392f2acff8a13f06bcd347be3d548433ca44c7522c85596d107ad86d044f7518bf42e9124c25a5749e6f20 WHIRLPOOL 0e344ba1115a92515dd918020c0614612a738c98736aba4031839feb3b893c0caa7982e3068f37363b38bef83b25d43e81c81a7c1485579f40ac962f9611eaa0
 EBUILD vte-0.48.3.ebuild 2343 SHA256 b630a9e0709d6a95528b55e6602d4419fdb4aca903dee16147b79858eae2d193 SHA512 33aacf93302abd2f25d7ea7db14e57a30064ad26459077a670ec69dd0b629d37aa5574ae9c2b4b76f83583b411152dd4db6516b4274e059617afcee1dbe27deb WHIRLPOOL 03dab3f52e1b71328859e7bd17a74f3a1456e16c9934060bf32df409ab2efbf87b7d8e69eff30e63b68e89b9fec7549460365d4a4be977072eda1db8b7b8a5ac
 MISC ChangeLog 12740 SHA256 a95015795d0f34275827e24625ee923e4426263dbcb0604362ea8f070f97d0d2 SHA512 c27b5d62a3fbd4b0b550e2ca4bee4917aa315a5f4986655d13faabeb74e28f284cd19a3e376f7d986f984da05b04f7eddf94fce34188d20c818556c7f8f20608 WHIRLPOOL 54fd57c7358ff253a2a0397549b896c6ce0d186c8c3b58f60cc5cb8f4231cf581d2e61c8ae2234c90f544e438cdc431a8b451b9a29ab97e03f8a113e0dd9001b
 MISC ChangeLog-2015 55694 SHA256 b82586cfbd6b1268c3795822eddc032254d66867cc5ee84750c31e87605e9eb5 SHA512 260cb689bee30cf2c1970f98f34d8bcd0d8fdd6f6419513c5098fea80a9de759dda50e925950516b570e38403b74d3b787e26738a5a4530c06160912d3cbdb64 WHIRLPOOL 8983100c2dca9e9261511c237af5e84afd8132fec63042af20b6e7abc04be4623e58446caa9408dcabf0fa77079227b12dc9180b0912f8e9be8a227e27ea7d7c
diff --git a/x11-libs/vte/vte-0.46.2.ebuild b/x11-libs/vte/vte-0.46.2.ebuild
index afb64229521e..ca0a6f9cc324 100644
--- a/x11-libs/vte/vte-0.46.2.ebuild
+++ b/x11-libs/vte/vte-0.46.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
 LICENSE="LGPL-2+"
 SLOT="2.91"
 IUSE="+crypt debug glade +introspection vala"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
 REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND="
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index a4bf22087b85..cedc5148ab2a 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -12,13 +12,13 @@ AUX wxGTK-3.0.2.0-webview-fixes.patch 9132 SHA256 964124da1affd2aa62bbbd12298ff6
 DIST wxPython-docs-3.0.2.0.tar.bz2 21455056 SHA256 9e9b32b7452f8f1885f0326c0382ec1878c68a251146b3e3997c7c3aa70caa57 SHA512 ce4407de4cdf9a3eaa5c64a8a959a0d7010d0d814a710de1ac0ed2a716ea2ee4f4ba34199e271a3e9b7790780294fcadfcd8bc65fead182d4ebe533c35c4d78e WHIRLPOOL ac0b4cd1937c31803399f2d9172158f00f99886462becfb58c3553c263bfe93d54acf5f05662227aeda4fd44610ada0680127b05e165b261104b765f25185715
 DIST wxPython-src-2.8.12.1.tar.bz2 31311482 SHA256 1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0 SHA512 4f826ccb57d5f4fc03fe7cae67499be70c727a99aebf9d153ea1060a21641642606d44d079ba897c38b176846336aeaebc21d30d5c7a0abec3934d65cf4529f3 WHIRLPOOL 94f91d359f755a0f805588303e8507b2f1404a7f4af73777f85366265df9f76ca89ac29bff491cffd752b707645952a4f7f2bb12fa7e30f3e7d3728147a9c99d
 DIST wxPython-src-3.0.2.0.tar.bz2 58304944 SHA256 d54129e5fbea4fb8091c87b2980760b72c22a386cb3b9dd2eebc928ef5e8df61 SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4 WHIRLPOOL 89cdef12c9ef96044adba0340d47b699e685eaec581a4e7d68f3b95a0890715e29b1f5362027df0f3f8b5b1587e8fe404a7fa88049ece9677dd8316fbdf2e41d
-EBUILD wxGTK-2.8.12.1-r1.ebuild 4151 SHA256 0a0a84551d4cb5b0d74fd80e2aabe87cb1cf10412c6088dfa657b1ee9242c9c8 SHA512 1443d388b8628d7d12c4ac8b4731142c47bc2d81a72edf14f1d502b251b8bff4e46e02843432bf139a4480f5d2ee824b680f955c752546bcb033fd8b086b4f4b WHIRLPOOL acfd903a2402a49558dd60a238117234474ac8ef651482a649253ba562b459f1c4876dbc03c187e72382778ca12aa35422206215347080d4d0fbe04142d1ca1a
-EBUILD wxGTK-2.8.12.1-r2.ebuild 4797 SHA256 29b3747dc7822e01c4a1577c23c912ff1115169e034cf8f3271ae723730e4463 SHA512 6d5c3f1a751184b97f748ea4e66967d48488d68818f6ecd8907f9c517b307b6a5e98199a2feafd3c064a2eaa9ddfa6b3f3566b5844cbbf4be5ae6271d8d887d5 WHIRLPOOL 7ed4f397092d3933ac940e115a974970ecc14efc93e52dd0984fed73072b68e966f497c86578213e455760ee716befab39884c7425930db1378db8304fb9208c
-EBUILD wxGTK-3.0.2.0-r1.ebuild 4050 SHA256 6c75e6956ca184e34bb00957fb018738fdaf30ee34e77680550e18fc8d9dff7a SHA512 29bb0f8a4ee4a395b07e03f97edba208eb23455ac5301f8125aaf838cb23152e269ff94f6690b03c54fe7b40ffea0e71495b10b3ef4fa480ac8e7bfacc95d1e7 WHIRLPOOL 11f54f4ee367f1e5f0a7cf7bc9b53685517e8a219a9f029367cdedd697ebe95da2d8089288afa6a04cd15b203b560d16fae8aedb7a4e6be39ee58184dfb538dc
-EBUILD wxGTK-3.0.2.0-r2.ebuild 4320 SHA256 1a480296e19b553d8375ce80af027f0736f7c14fda103239009e68bca6e9c4b9 SHA512 de38e3260dce0be34b363e40c562421fac18250fb69937e62f81b32863a2b3a6e5e416bf56b3d8783fc8c9eb7fe27482be2d1695293217231a0b380f00a23753 WHIRLPOOL 1279002ce1a7a475d030b1f5dc3a2a63eab3c64cc4708745eab7106588a3e4881ad8540a7f8d0ad40b0d3eec9a838a5fc24d7bc0db24f1d8dfcfd2ad2b7f7943
-EBUILD wxGTK-3.0.2.0-r3.ebuild 4546 SHA256 9579864d5eb45e1f837c9f2368afaf350daddf8cf769f129b8a15f5c06ac3905 SHA512 81d76b4b9e8f970d270dc44aa794282566d87a71f21b2a2fc3bccd21035029b14c3451ce7c6e7ad46b3c8ad5795a329d459e324e5ab7b4b9d0a53d459ee5e51b WHIRLPOOL 623095e91e0d85fd57e4992c7c834422bc3b209ea83388be8d0803ec73b6c53a16c2276f394f51dddf59fb2840eac04f9deb456aa1f1b35556405c8da9c48126
-EBUILD wxGTK-3.0.2.0-r300.ebuild 5061 SHA256 70cff1ba81a54f596009696b7af6f80091d388fda1569bff286232c2350bbe6d SHA512 471536934d7655541c1962745897c414667c5e3adf1b0b4cc1bd0efffddd123936f164b030eb1f71d77f095b06f64e796c0253f8c7d235de6908585845746d55 WHIRLPOOL 4169fe472dfdbcf1bf3092ad81b386036108cd1179ce7d1fb61180b42e1737ed4104f5e3d39c0f0c2582917d84ca8b50074d6b028a0a8ff5746ea6bbf4c59592
-EBUILD wxGTK-3.0.2.0-r301.ebuild 5291 SHA256 e1ce55ceb57fd7d4c0f1045d35320f6e9f8d7fb01502c53a3a823e6009e905fc SHA512 4f676e491500026cc9bac53d2c02f6cc6fe39a127b50d2a407cc0ba4dc6465980349ef87c383b111d997379d812ed647f4b76ce58285a93c7d332a10300f7d4d WHIRLPOOL 26abd8a92c4af38a7e13c3e744dcad5634469deb9c500a7e5b6ad09ee259222170f96e0f9bfbcd0b4062a7b8ce2dd9e0bfe088e75c50efc862d4f92a4bc0f91a
+EBUILD wxGTK-2.8.12.1-r1.ebuild 4152 SHA256 553c4ba2e7fd297db28941b16d6c462ca4296b8447f609a7d392f03f5d5b7b1b SHA512 2a5fb7445ab1c9ca6eb08fdf0e706eaee89adc4fb27849cd4c0b6209d91912847ad5f3e39ff0f281d86478e28ca98c37686c62842a69c212b7254e9c04aceb4e WHIRLPOOL 2f2b1a015db2927ef2d6fe54f70e3ab4c5987ebe61257c2c0a048e56e750e11187d4f3111e752997b6493092741e886493e5a4377fe42ff648f94f0d2f1b7709
+EBUILD wxGTK-2.8.12.1-r2.ebuild 4798 SHA256 c0d1bba47c70daf0047113aa234e95397517efe226bf19f9814875363452e688 SHA512 4a9020e8aee8a39c6d9a794db40cb2cb96f5cdc77bfb05c6b0608313c6b52a15860caab4416d6235ac48a7aa576360f015a857ae23df1f394051149dfa7a293f WHIRLPOOL 766c3efec7371d66285819357ddcd7ce861fdc0b35aaeee04d2ac259d1293f2e96061b84d58d37ebac99ee0a92d4541ede03a86b840f6c249096d5dc6fac5c8d
+EBUILD wxGTK-3.0.2.0-r1.ebuild 4051 SHA256 67107ac052e2e474c310614d96b4d73f800a2ff70f8c6d906bc1917678fa3d89 SHA512 e7ddae3503b886212fc6963331599ae0f8e41265306094e1c04e945c2152dce9b93fd5d6f18e5a2b3e309ec882fb52ef5463c3711244a717e03b7fd8e4405633 WHIRLPOOL e4604e83c5d09aa64c5d5336dce401f6cbb3a239f575732ad8575583fd6b19feb02e382da515a854f2cc616457790b59804bf2f79028599af4e925de8bc98ce9
+EBUILD wxGTK-3.0.2.0-r2.ebuild 4321 SHA256 4900cd598f5e8fb1db08b8088405969c82605c8c332cec7d1921c75ed69df5a3 SHA512 8aaa7909c0a305ac22b57538674d763f97fc336067b417c5a428d4c1ddbb8864d6fdb2aa9a6a70c28eb989179b3a629270e4d97763b26f42e79ee404df6857cf WHIRLPOOL 8f3c95d23957fdee5e12bcd983a905d1b42749d70f62c6f5d7e497fbbc7cb3dea4b4ede7ff16931139a011fea188acd4794bfca3bf91d3f707eaf976696133d6
+EBUILD wxGTK-3.0.2.0-r3.ebuild 4547 SHA256 c22720747ac70730013eb380d55cac4897cc04b922d1818fab445f9dde435a75 SHA512 22fb7ff6da96d97c5f8fa0f3bb370059bf474181e5bac5284fc8a270517cb17faa9b8707a2170f09d85130f0aaa3943684b094e074b6bdd3a3722a03a3bf47bd WHIRLPOOL af3275786f681e9dc5ccc3312931da630ad652431b3c96c381d661b27daffefac4894e8454f14d4a9d735b2feeb31f8e489ea71313b6d8c2442efafc7283bc78
+EBUILD wxGTK-3.0.2.0-r300.ebuild 5062 SHA256 3b5196a41806f35c24414786dd24c49ed80f775316a8da01f397a668dce6e6d6 SHA512 666d0c45c7711fa5883e5b5b99a0b84e3e85ef1a1060ebff57e14f562c0f6d17de0605507bdb6c90483d8c516917d7620aad9ed213dcca613b1c1d2326799531 WHIRLPOOL 1bcc565fbcaaeb055e0769beef9e7e021b1221e8fe4708e8315529eaff2c42406719ed0d83272ca59ced2a5d1a0c9d7912ef79ac4ba74e2ff7c011515a4f9d31
+EBUILD wxGTK-3.0.2.0-r301.ebuild 5292 SHA256 e466ee43f67984d5acea4bdf08190e1ba31ef8da4ebfe5d1302f2b22bc87665b SHA512 309f9f41afc1fff5001f9a01189c022bb9c40a2f4bfb66dfc4f41361cff9e6214f68f5f5110364b53dab3cdb0c28c7b1bb96893262829c3f54301f5e8723a970 WHIRLPOOL 0145b9612e6f7e9e854063e8aa6da4181e81c75d26103e7624afdf7d8ea1d7510bc80b8f62a68e377876a331db72cda4feae5793cf67393117b41347e914cb52
 MISC ChangeLog 8466 SHA256 6f3dbb1da8163b5a82e19644aeca0c6efe63b1cbde44460144a37ca4172b478f SHA512 67ad03b635a82a26f06681911898cd2fe51098cc0531260cc56364aa4b0f7bba3987ffa213be0ae25449315a945f346cc8d9fe5b7ae356ae33e4415bc159dfba WHIRLPOOL 6c27c95e2d94233b3b6fff1fd63635ae09ed20821cf4993fb2d2087047cce9b5b400a13d124153cac52771cc8376a9a785aaf232c3e6c224200e4448b95282b2
 MISC ChangeLog-2015 51140 SHA256 33dec29a979f11894bec04d7a3fac0f64ef402e089a3ce80822790cfa922e555 SHA512 415ef31c4937cd3024a27b8e64463d1d9a38997c1e09fa007072a32a9d64b4fccd324731276f500ce388eb1189268ff0fa8e78e42ef1d8fe9cba283bb3b1850a WHIRLPOOL c89fb3370b227c0b3d5ca0addc9e1f01cf20cbc6cf5c4dd6611b0a890cb71878b57ddcbd0361c85726211b0d60f5b2d9da5b730fc4f895928aea7c61bc2ceb17
 MISC metadata.xml 856 SHA256 e0404abad32321aea90893545bbb40c0ca1958b1cc05ba9b761d290af8de130d SHA512 f5308ab2b8d9d1964c23b175b30c6e728b16522a09a9cf907789a72296b4703f1da9a7b4d116d14cfffb8b38513d4c2830a70acb98b2df62a5dc67ed4e069abb WHIRLPOOL 50f33b82303e32f48001139070c4412b8c4b5b2aa0772e707dc25dff0235fbc2c0f4a2e0d601d067c4924f56f013739f4cb5e382b83b1482ffd405e1c257c27d
diff --git a/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild
index c2906c3f8b18..87d2ddd9a443 100644
--- a/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 inherit eutils flag-o-matic multilib versionator
 
 DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
-HOMEPAGE="http://wxwidgets.org/"
+HOMEPAGE="https://wxwidgets.org/"
 
 BASE_PV="$(get_version_component_range 1-3)"
 BASE_P="${PN}-${BASE_PV}"
diff --git a/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild b/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild
index 3f56f877fe18..d54c19a18843 100644
--- a/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 inherit autotools eutils flag-o-matic versionator multilib-minimal
 
 DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
-HOMEPAGE="http://wxwidgets.org/"
+HOMEPAGE="https://wxwidgets.org/"
 
 BASE_PV="$(get_version_component_range 1-3)"
 BASE_P="${PN}-${BASE_PV}"
diff --git a/x11-libs/wxGTK/wxGTK-3.0.2.0-r1.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r1.ebuild
index 21ee7e0f2d62..a1edca1d410a 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.2.0-r1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.2.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 inherit eutils flag-o-matic
 
 DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
-HOMEPAGE="http://wxwidgets.org/"
+HOMEPAGE="https://wxwidgets.org/"
 
 # we use the wxPython tarballs because they include the full wxGTK sources and
 # docs, and are released more frequently than wxGTK.
diff --git a/x11-libs/wxGTK/wxGTK-3.0.2.0-r2.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r2.ebuild
index b77e2b3dd25f..1bdc96a9e5a0 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.2.0-r2.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.2.0-r2.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 inherit eutils flag-o-matic multilib-minimal
 
 DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
-HOMEPAGE="http://wxwidgets.org/"
+HOMEPAGE="https://wxwidgets.org/"
 
 # we use the wxPython tarballs because they include the full wxGTK sources and
 # docs, and are released more frequently than wxGTK.
diff --git a/x11-libs/wxGTK/wxGTK-3.0.2.0-r3.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r3.ebuild
index 9bb65a6e57f9..61f86ac97155 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.2.0-r3.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.2.0-r3.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 inherit autotools eutils multilib-minimal
 
 DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
-HOMEPAGE="http://wxwidgets.org/"
+HOMEPAGE="https://wxwidgets.org/"
 
 # we use the wxPython tarballs because they include the full wxGTK sources and
 # docs, and are released more frequently than wxGTK.
diff --git a/x11-libs/wxGTK/wxGTK-3.0.2.0-r300.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r300.ebuild
index 0266dca9e66d..923d52191666 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.2.0-r300.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.2.0-r300.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 inherit multilib-minimal
 
 DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
-HOMEPAGE="http://wxwidgets.org/"
+HOMEPAGE="https://wxwidgets.org/"
 
 # we use the wxPython tarballs because they include the full wxGTK sources and
 # docs, and are released more frequently than wxGTK.
diff --git a/x11-libs/wxGTK/wxGTK-3.0.2.0-r301.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r301.ebuild
index 61856901093a..5f3a10b15618 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.2.0-r301.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.2.0-r301.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 inherit autotools multilib-minimal
 
 DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
-HOMEPAGE="http://wxwidgets.org/"
+HOMEPAGE="https://wxwidgets.org/"
 
 # we use the wxPython tarballs because they include the full wxGTK sources and
 # docs, and are released more frequently than wxGTK.
diff --git a/x11-misc/albert/Manifest b/x11-misc/albert/Manifest
index 921023fa0eb9..afb02f16b31d 100644
--- a/x11-misc/albert/Manifest
+++ b/x11-misc/albert/Manifest
@@ -1,7 +1,13 @@
 DIST albert-0.12.0.tar.gz 404748 SHA256 e1ec7783b6cc22e5ed28d2f1ac6148528cb3eb734f139945b49d44e07770d9c8 SHA512 56d141a2c6b98744c0b34a7adbbca8b6af93545a7b067263acf59fc63d99ec7d9f19f2f3c73f477e5f35448ae8a563c9f132bed87be135467f8f0c1462f9b031 WHIRLPOOL 328fe6efdcce988e37bf30448ea147d0aac5a69aaee267e3453c4b0abd621a58f8b29f11727ecaf199129d9d11bc03b2fea71651c17aaf22f06e51ba582beaaa
 DIST albert-0.14.2-plugins.tar.gz 537751 SHA256 400613894457d8514e1a492726db9966384da26ebc6190467d71c3275b1b3bf5 SHA512 5e16f64ccf474546b1f9c6d665c29aa45b7238fc2fdbd1399c17171af0db95bb205501925621a8189186bece073377bc7e127961bf051941ec388fdfb00f289c WHIRLPOOL 2a5251cd382b44e12df8cfcca615ff8d4f55f3ca7e6efd977eabc98bf5f61487e19fc718bf8f6c817298553822727e59eccd6018b99879b242803cc3369d6055
 DIST albert-0.14.2.tar.gz 83202 SHA256 80cd27259c74687d5d10c94593cca99075cf05d9e396ff4b58d8a9f583ef7c77 SHA512 81f2b7e618d9d1b11e6e765b6508e2976985e56ebac6232e2e17c58ca6a38c111020b23ee9963c71d2b80be0aa138ce7403e7f9b807e10131b06ad95eab19b43 WHIRLPOOL b1f42870b0050daf901aef02ee752154ff7cb76ef633844886f7fc3cfa0fb23663c1bd5feeda646d304138d4f56b1b491770aed126693c6ee1ace8f9e17228b2
+DIST albert-0.14.3-plugins.tar.gz 537751 SHA256 400613894457d8514e1a492726db9966384da26ebc6190467d71c3275b1b3bf5 SHA512 5e16f64ccf474546b1f9c6d665c29aa45b7238fc2fdbd1399c17171af0db95bb205501925621a8189186bece073377bc7e127961bf051941ec388fdfb00f289c WHIRLPOOL 2a5251cd382b44e12df8cfcca615ff8d4f55f3ca7e6efd977eabc98bf5f61487e19fc718bf8f6c817298553822727e59eccd6018b99879b242803cc3369d6055
+DIST albert-0.14.3.tar.gz 83217 SHA256 39a121098db261d7fd2f48ec0f5b7b3bfc8a032430d796a6dedc92713aef5fa2 SHA512 f9d137477c830c92b457480acd095617b4281e4f26e4c547a0bf208459fa11964485328f3c04d92aeadb9c6ca134834b2b216935ad8fb72e6538e02ad230aeb2 WHIRLPOOL 4db02ee5cdbdc5c5bdbfdcd61b8cdd2451fce95f8dfe77693bb651a61e2dfa9022934584eda00044dcd0ec0f06fae9b5e456144dc3c8589c24eb6ef91b62acfd
+DIST albert-0.14.4-plugins.tar.gz 537929 SHA256 1b19f231738a84480abef1f80cecf910cd701eedac53c01c378c80cfa030068a SHA512 faa4d51ed18c3e68d255cedaccfe2f4c79bcfce844a2e9e289b197223f0b3898760bd217b76b5a0631899a76f870889726027fca5e80840c81f6d14264feed73 WHIRLPOOL 1e0f11befb6fedb95085d3abd0596087d8199f4861baed04d754d5e974ca96ac6027eb328b16cc84ee655eb5d5911708050f98257421379816699d8721280ca7
+DIST albert-0.14.4.tar.gz 83284 SHA256 fc89736a1ac34bb8a6e0db75dc9186fc266bdb63ce0cdbd699f94b373ea58d3e SHA512 c30430ac7255830781e27dbdf24a0aed90e509454feaff3ff1c95839cf05b3de641021a255087ac66bda051f34243e4a79eb6e08d8f6027ee1b8bc6564ee9d93 WHIRLPOOL 5934bcf0a87aa8232f8b10b2c74320fa0d11837d75b2472dc921924b7956c645d4a1bd8a0fa5c7b142c3e73f2944ccb74b8ec05c55564c3240f1a9c800798b77
 EBUILD albert-0.12.0.ebuild 1016 SHA256 1cab307f195331df200e3a0f556d432e87c990cbd3840e869f680a0248b67818 SHA512 7047299581650cf9f31a3c71259dcab00707b73e9ae22115c512c47b536bf3103cdb120691e80caaef98714d3f70b1467930600f5c911565f4e5658a7cc11796 WHIRLPOOL 36416b53116da5b65e45f81d9b8453c4621aa34edadee0e7ea340d8b862b4f5bff112b9debf01cad82feccb7283daede77bd8d2c6fa9c34d0bd2d8d3f76d3f54
 EBUILD albert-0.14.2.ebuild 1470 SHA256 4cd15bcb7da45e9116e1c4cbca2f7fa0e95e74c29a3a91fc161542936562c9cf SHA512 fecd07d6030d2530cae20f5802d8106a5068e78af31db7bd75b3ab2f905cd4e62207922e98a64d5a6e0433ec76d6f19efe4cc2b1fce051ea325567539fa6e82d WHIRLPOOL 67b8678c0c7bc8743a2f51e48afbcf5d77944ca6b7ac6ecd654efa74eae06c9186b20caaa7245ca899b584b29174da32d53603cdaa14ba6f7261e9a15ccd2b91
+EBUILD albert-0.14.3.ebuild 1470 SHA256 4cd15bcb7da45e9116e1c4cbca2f7fa0e95e74c29a3a91fc161542936562c9cf SHA512 fecd07d6030d2530cae20f5802d8106a5068e78af31db7bd75b3ab2f905cd4e62207922e98a64d5a6e0433ec76d6f19efe4cc2b1fce051ea325567539fa6e82d WHIRLPOOL 67b8678c0c7bc8743a2f51e48afbcf5d77944ca6b7ac6ecd654efa74eae06c9186b20caaa7245ca899b584b29174da32d53603cdaa14ba6f7261e9a15ccd2b91
+EBUILD albert-0.14.4.ebuild 1347 SHA256 64216c04f15f367183ad144d3b63d896620d5d2e9bf815d04e358ec8ee4e2818 SHA512 8a527eaa9eb5846a6b5b9b4f427c30d89b2f743f5d22cad7b084990e751f9c00c0969e230eac2ae1a4fcb25d7910bf57d453da06ecf733a5200d9434bec11a50 WHIRLPOOL fa1bb0d4f832921382d9df71515124cd29ab92816f970d15f8766a90c6393dc299cd4a687dd673d19b30c4b784dc8d5dba5743a2f2433afb84acbb0c55337a21
 MISC ChangeLog 3337 SHA256 77b2d91b88be117fb4af3e2f36d5cb3a6f84f0f7cd3316eb28fcf1bc3fc5aadd SHA512 de2e9d98bcbf76b463639af93de11bba73a9c864424c4b5b38a58064455538ba94c35ac26fd5d648ff109ffaa0ff7428158e1c78eb2a4e2fbdc5bac45a7ddf18 WHIRLPOOL a93474a14231b0d36622bcc5d4a77e94a8974dd730a8936a59f521ef353fd61bdd9579380e2b1b1eb8db5051b10a2a585f776662f65416e422c775c3b9986479
 MISC metadata.xml 307 SHA256 728a1470edc4c4c30294e89649427e1d28e7773532fffbf05a75b5ef27b426a2 SHA512 2e041e46839e742b36835304388ab2504f46a1a0f9fde76bca26e06e5db570a55e929310a7a06661ee115f5957c089a39125c5c41e42927263551e07d1c5b31a WHIRLPOOL 76f3d0838d1d6511dde2a36abd7e36752b21660eaf17b17802d68136e7d8a861c6b2f487aca7d3f6d56b168fa1b2a49ec0d4cc0e8c37fb5260711dbf09e54fec
diff --git a/x11-misc/albert/albert-0.14.3.ebuild b/x11-misc/albert/albert-0.14.3.ebuild
new file mode 100644
index 000000000000..065d85200cb1
--- /dev/null
+++ b/x11-misc/albert/albert-0.14.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLUGINS_HASH="16b4f9c39b91ef0435dc8a0eeb714800b7b99d4b"
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Desktop agnostic launcher"
+HOMEPAGE="https://albertlauncher.github.io/"
+# plugins is a git submodule. the hash is taken from the submodule reference in the ${PV} tag.
+SRC_URI="https://github.com/albertlauncher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+https://github.com/albertlauncher/plugins/archive/${PLUGINS_HASH}.tar.gz -> ${P}-plugins.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+RDEPEND="
+	dev-cpp/muParser
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	mv "${WORKDIR}"/plugins-${PLUGINS_HASH}/* "${S}"/plugins/ || die
+
+	sed -e "s/DESTINATION lib/DESTINATION $(get_libdir)/" \
+		-i plugins/*/CMakeLists.txt \
+		-i lib/*/CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DEBUG=$(usex debug)
+		-DBUILD_PYTHON=OFF #plugin directory is empty causing build failure
+		-DBUILD_VIRTUALBOX=OFF #plugin needs virtualbox installed to build, untested
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/albert/albert-0.14.4.ebuild b/x11-misc/albert/albert-0.14.4.ebuild
new file mode 100644
index 000000000000..e0d3809823f6
--- /dev/null
+++ b/x11-misc/albert/albert-0.14.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLUGINS_HASH="1f0eb7495747793e8e2102012d7d387bc7ca356d"
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Desktop agnostic launcher"
+HOMEPAGE="https://albertlauncher.github.io/"
+# plugins is a git submodule. the hash is taken from the submodule reference in the ${PV} tag.
+SRC_URI="https://github.com/albertlauncher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+https://github.com/albertlauncher/plugins/archive/${PLUGINS_HASH}.tar.gz -> ${P}-plugins.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+RDEPEND="
+	dev-cpp/muParser
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	mv "${WORKDIR}"/plugins-${PLUGINS_HASH}/* "${S}"/plugins/ || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DEBUG=$(usex debug)
+		-DBUILD_PYTHON=OFF #plugin directory is empty causing build failure
+		-DBUILD_VIRTUALBOX=OFF #plugin needs virtualbox installed to build, untested
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/compton/Manifest b/x11-misc/compton/Manifest
index b920aa16634c..850364262486 100644
--- a/x11-misc/compton/Manifest
+++ b/x11-misc/compton/Manifest
@@ -1,6 +1,6 @@
 DIST compton-0.1_beta2.tar.gz 144239 SHA256 7b9cd52a57326116fb5db3f5f89b7d50e17715252d9fd79b70b45ace30a6b009 SHA512 c3a019d90e32559d44e3a4969bcc15a15837db9c9519ce8cc70b1bd3d0cb16d29449f68cc2f6a8d834569c9620ec6533ab85c1586da957c69b1ae341d9584535 WHIRLPOOL 39ca9718bc79d4542d73cce39bb51fc9b9c0497a30914ab044b920f72a3c2f8cbd315c5dc97c999c1f0ca798ae692ada4626f069914b6835f0c225638b486422
-EBUILD compton-0.1_beta2.ebuild 1609 SHA256 f02a6cbd29843b4f8b5e8090341f52a11ace72924b31760504cb3f780ec9b200 SHA512 1bfc3b719f79cf3a8aeef0082c0fd464c0bc64a93a5b0cd494f4d34b4786252e6ff5376506c07dd4bfbf19b200b8a31a975d320266c9b4c73d6d78d5deb45c18 WHIRLPOOL 35f4a35c270c1a612d4387ea588b0cdb87b59bb7d633d29c797981f0b22408acd78523aadc1945b79b66dd6686780040c508ded70a9656fe76c1bed47ff5f397
-EBUILD compton-9999.ebuild 1530 SHA256 96942937cc6b305c21d662aa4afea538954e53bc44162059d0e4a8f88aa04d84 SHA512 48108c0b88de3f6a4d310e359af0a46443721d65bae46d3f88ca466d2fec29d8ebe65495c028f43320c8d251b2458af6e6581fb3bf93f02e13b290f693783f51 WHIRLPOOL 8bf3e1e7feaa73b76b936b0321841368fcf4a66055b829ee370982d265cc73b13f016796435f337b170cc16c3756a568fc713040047cdf1a810e87e5fc3c957e
+EBUILD compton-0.1_beta2.ebuild 1611 SHA256 5db238fbf6d81536c184668561fd9598d6198f719386b665d263827471f5767b SHA512 67f079a1b78ba121380e811cabcfab8c735b7c59eb353cbb5233861ab44d354ecace4a8264c644710643fb50a8a081b17b69c86c45f1af52d3c0bfc033714183 WHIRLPOOL 635b57c35aaed396210ccd83ae25edbff69a4366d0ef57af557c011ebc5fc406aa5f9a88c0899f5bf8657f8510b5df4a5efc0e4e326274a3b0b8084af29936b4
+EBUILD compton-9999.ebuild 1532 SHA256 fb37da0e8e1f516dc3045c8cdba25aa7dd9ab3679c4a1a3767509219344096fb SHA512 22f8bb29736bb872d7538b53942ff823027f085ff516685c40bad77c93f3f9ba85f1245e870bdcec2f147ee8342151a3cd2c3732eaab09557541e362726857b3 WHIRLPOOL b70df757559cc376fed365e677b2387178bd35002edae82ea3674df4526885b20de9d3e8bd3dd2bb6b5ce72b94771f745542e5e12efa8c438da94b19633dfb04
 MISC ChangeLog 3171 SHA256 51041c62426725f7c049f748d63ca6dd98fa6cb56dbe4ad43ddcaf8c20404c4d SHA512 81e2159494a30d102ea039a2d9a10d1a490810cc5aaace10a6f4660f90be41deda744d5338f177ef11c9d677e7137a66de9f6430f817ca9a262c2b4d5d7a9c5f WHIRLPOOL 2afb2d8ba5bdfb318707ee9a0ec7fdbbd205c426bb51d5762c1f8d87383330afe99e3eb1e3955ee64f5cfccc3bac87ecf5211ca39e1d87528e4a493e5a2d0505
 MISC ChangeLog-2015 3291 SHA256 0fc119dd61feb070dd45ecc8f0bba86760c2c4d6157ac5a73f09fe6704381e83 SHA512 b9416c2fd23b34590a0fe25aaa7d012b5b2e531d94338930f3a840cb5ef00226ccc54fd6a719e2039f69a2f412eb0fa2881f387b643b7c2849159bad681f2da7 WHIRLPOOL 988eb0212fc28c8d42cbb8de8a5d7357f2638fa12e22adad26899a1ddfbd90293d88b6aa73d6550c27c81b4159cb1568f2f57d3aec9a1d6daa971c3114b1d578
 MISC metadata.xml 417 SHA256 9a91b5f6a413bbceff941308fc43ff5d812efe259d39c7338af58a3910309f26 SHA512 3220e8f0f2d71f507df50bdd8a7837042ba8ad98ae9c06b3834ba72be6e346d3af614016e657313a55b7c93351a36669c4bb5b35edadb0284a71076192ea53c2 WHIRLPOOL 9d73928cb31794fbe4208c371e07d257d2488a2ea9d365540a411951027e30431419dd80487ecb221842c098c2265c4501dea148e847b0e681a2de80f4aa0cb7
diff --git a/x11-misc/compton/compton-0.1_beta2.ebuild b/x11-misc/compton/compton-0.1_beta2.ebuild
index a880a690e6bc..3db6c5ff51cb 100644
--- a/x11-misc/compton/compton-0.1_beta2.ebuild
+++ b/x11-misc/compton/compton-0.1_beta2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5} )
+PYTHON_COMPAT=( python3_{4,5,6} )
 inherit toolchain-funcs python-r1
 
 DESCRIPTION="A compositor for X, and a fork of xcompmgr-dana"
diff --git a/x11-misc/compton/compton-9999.ebuild b/x11-misc/compton/compton-9999.ebuild
index 13e6bb5241e8..518b6a8a2250 100644
--- a/x11-misc/compton/compton-9999.ebuild
+++ b/x11-misc/compton/compton-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5} )
+PYTHON_COMPAT=( python3_{4,5,6} )
 inherit toolchain-funcs python-r1 git-r3
 
 DESCRIPTION="A compositor for X, and a fork of xcompmgr-dana"
diff --git a/x11-misc/fbpanel/Manifest b/x11-misc/fbpanel/Manifest
index 58130197a43d..b05f1bdf09b6 100644
--- a/x11-misc/fbpanel/Manifest
+++ b/x11-misc/fbpanel/Manifest
@@ -1,5 +1,4 @@
 AUX fbpanel-6.1-underlinking.patch 789 SHA256 9f2681ef55a323313ed3a96083429762255ef88c23c00c339f8942c6ede4c5b5 SHA512 9c19199bc4f24ffe967b14dbee5165f78dccd120bc73f22e4846f083b4be3b92b60855f5ad08bdcb6d3b55b33a070a54e904cfdcc36786211d7d252dc7faac04 WHIRLPOOL f190ddb3e4efa7cac4732ea24dbca24d8877c49b146d9190926231a2ae5344937b4b107496a4f9aeb1c81f8faebd8045cf4aee351c75ac096f0b7795de9d652e
-AUX fbpanel-6.1-xlogout.patch 369 SHA256 c1d1be75d6173e3fa684098eb39e17b0335392fdb138f6ce912b8d29d75af952 SHA512 cfd6b0b05f2c1e243888e7619a4a3f7f2e80f4cc48f13418854f23b0fd0f8a152d9757f6babd4fa873c0bdd297beaab246de55a1c08fae105d9906464048d702 WHIRLPOOL b1df6fe4e971a09689d086b0c95fd94e08c0f41d15b4f8440cafca9f48f175970ad7d391dd632d3ff48437f98d29897823ebe535171d9845500b5498b3acf0f4
 AUX fbpanel-7.0-clang.patch 2596 SHA256 9da628126ef805b5d1009acf1abe01311ceef84e1e55c8d2708769405262be41 SHA512 78dfea33f3a29b857768b64bc6ea61404dee3cb75587500e98e17aeecf92a310abf1796577d433e13aab4a5524ce2400906d0e6ce2ab468a488dbae03857902f WHIRLPOOL 5b77e3e5a9daf8389b6820bd6ded9be970a8363ef225e2146f7bf2df3a5fb707784303a4354ff6ec6289688ca5b2660d4c9631ed512e4bf4e9404cb505ebd8b5
 AUX fbpanel-7.0-shebangs.patch 2348 SHA256 fd26d8ccef2c9123fd22a9fdddac0d9fa3097ecdce5907d142519abf005ac9da SHA512 547367bc298548b0936e4b83e8ddccc9c9e689f5aac8a7aac1ef5e09050ce33936dba4c39d971c4f3ff5065daa55bc28989588cb08e8277ca9e201ca6994eec7 WHIRLPOOL d0dff44d397404b3069196b9d20caa8b963efd68e42ae50fb58928802e0b98e42902d0988df511dc7a93c54cf6d6310146bf3f70e7c1ed4a06222223ac4d42ff
 DIST fbpanel-7.0.tar.gz 3746477 SHA256 711570954f8f99235d6afb7ec3226dede20b832eb712a5bd00e4f793b75ac5bb SHA512 9706a96569c41241de4dbd250c9d6a473b53a5e26e880f4c782041b2b91c7570046e1bee3070059fd2d333fb7159490732ef397b86701c72d4c65c0784948874 WHIRLPOOL 37fc5f86b80474026b660491b83ee26c4e9e260cadafff9673d161feb79efe2b2d6c89f1c83c76ebfe41eeee61e83cf3dc271667d4a2aeefe37c5e93c30f8e31
diff --git a/x11-misc/fbpanel/files/fbpanel-6.1-xlogout.patch b/x11-misc/fbpanel/files/fbpanel-6.1-xlogout.patch
deleted file mode 100644
index 8adf4bf4cf72..000000000000
--- a/x11-misc/fbpanel/files/fbpanel-6.1-xlogout.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=501804
-Upstream: https://sourceforge.net/p/fbpanel/code/474/
-
-Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
-
---- a/exec/xlogout
-+++ b/exec/xlogout
-@@ -45,5 +45,5 @@
- [ -z "$SPID" ] && exit 1
- echo "Session start up script"
- ps -o uid,pid,ppid,sess,cmd --pid $SPID
--kill -SIGTERM -$SPID
-+kill -SIGTERM -$SPID $SPID
diff --git a/x11-misc/i3blocks/Manifest b/x11-misc/i3blocks/Manifest
index e0c5bcd19ffb..2dfb6862b173 100644
--- a/x11-misc/i3blocks/Manifest
+++ b/x11-misc/i3blocks/Manifest
@@ -1,4 +1,4 @@
 AUX i3blocks-default-sysconfdir.patch 373 SHA256 b65cfcde99f394773587152218603eee35e9247d08bd8daa23cd907e1cb4e7a2 SHA512 db974877a1eadb1b37279dd4e4159b47947958f688aed94dd3e3c49457a94a0e5d803f221dc7a160ed2cfdc915399892d010a1083a49a7ba7a53d49572c16554 WHIRLPOOL 0f5fe5f970b12b86997cdd3269d6fd3204b95d0b20e31c5130dceb82a00b688b20c35a3aeebbd564b9e4b1725c14562a4fa1d120e4fc10a84ad2187feea95482
 DIST i3blocks-1.4.tar.gz 35943 SHA256 c9bd2854b7902aa6821fdf8c83b5123c10b90a52f9bcc67225ff57f25d28b4b0 SHA512 f04fd68d59097b21bc88f3097dff137de656dd3fa696d9c04b987ba25136e5e5d9cacb63998e8635fe55fcf94f47900aec8c79d98e1d1d8847856a89ad9a6578 WHIRLPOOL d6367d0b2335a79f6a49f069b31af6b5c24a33bab3e48be8b615305009aad196c5bdd7e1d71860b7db123f21bcb91a0614f705c073d78ff94c81612d4e840328
-EBUILD i3blocks-1.4-r1.ebuild 758 SHA256 f2737a2d567c5437bafe58dd402f9dc882e8afae05d60953b87c875a2339f7c6 SHA512 f35fa64761e45e83e1e7b6da378a272fa3733c2dd4ff72eae4b1fefea977798723df44d95c6b1b518a153c1bbdd39ef48ca6e8c30cb501bbc7d65b113b7414fc WHIRLPOOL c1ad2459ee73e76d961d56519fcfd228fb1355ee165484c454daf1f947a88f204057fed786a32afec560a199accb1e8fc9bb6f0e880f6b18b6e412c0ea194c50
+EBUILD i3blocks-1.4-r1.ebuild 760 SHA256 054af0c4d2c781d5480e3de30897c8b91d6479e86291a172b062cfb1388cb1b9 SHA512 a1b9957c2188722c109bee483e125689a75ffb231ce4d62c686eab16a2231db23aec230e891fd65928f8a9c5fd9deecc7239aeab91b3c3611497e09b9e562308 WHIRLPOOL 7ad5f13f461f98707c1badf6b1e89f742f4c1ceaf6c59137e1712c6661f6fd78f5db526008a8238591645ec9a0269ffc514eb78a5a301b02d6d31dfd7e416e92
 MISC metadata.xml 331 SHA256 008cbf46e9a9e2aecd50da04aa3f1f4de2b14f12e4bb7cc10bbb541d3ac59f16 SHA512 2191950260e909fd05a03d80a1f9ccde802e4e3ab890a2e05305f2e3e1c48e4c56200fddc9019b630a9efeaeac92509910e1f9b22f1a2ce85a8d005930cd05af WHIRLPOOL beab3df97eb266d2e6ab3079018a4b37fe8c27c1532822abc5a43397104fa0a14e5339eb324eb1508c1d325e196e95809c1b8e8c013a86246e43dd150a8f58b4
diff --git a/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild b/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
index a081fd8909a9..9e05439fc998 100644
--- a/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
+++ b/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
@@ -11,10 +11,10 @@ DESCRIPTION="highly flexible status line for the i3 window manager"
 HOMEPAGE="https://github.com/vivien/i3blocks"
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/vivien/${PN}"
-	KEYWORDS=""
+	KEYWORDS="x86"
 else
 	SRC_URI="https://github.com/vivien/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 x86"
 fi
 
 SLOT="0"
diff --git a/x11-misc/kapow/Manifest b/x11-misc/kapow/Manifest
index 6bf55d8f84b0..751138b02fbf 100644
--- a/x11-misc/kapow/Manifest
+++ b/x11-misc/kapow/Manifest
@@ -1,7 +1,7 @@
 DIST kapow-1.5.2-src.tar.bz2 718144 SHA256 29d7a83f9351bd83dfc9e2c933187e6fa3274be1530976e05d201bb65bce23cf SHA512 a5f7edd6880ba01c7f0be60045a3ff05f8a09e39f8315acf68b258bdc4a7484954fc6d1dc3acd184b9ebcfe6830a053777a9e0399bb8241fcef0519dbfc53c0d WHIRLPOOL 050ec50bd30fea815783b7ce84d86ec5c765356a01553ade9357221c970c6a6edeb2799ef711846a66b894db5c6ceabed37bdc2661a30d0f7ba69de42ebf9877
 DIST kapow-1.5.3-src.tar.bz2 720315 SHA256 73953d980e248ccf74c8b94c62ee1dbeaa9843481ca87a8e6af7fe1c2eb8c712 SHA512 1f8dcd570f6ed3b9fc1605a25628a06720839a5558b1564341bb775ebc99796b1124e498dced279aef30ba6fe3bb9d4f3b956685d07b481e79d66c7f197ae201 WHIRLPOOL 7bb0b41bc001ec101efcc1e93598e68ff4f55c10ae634b8208693062d66fbb3ab528ebba9e6c088a7c1d97d9d494bc26d384fa6bd7d7f4a13d3c7902e9373624
-EBUILD kapow-1.5.2.ebuild 650 SHA256 2389cfc2e8d21dfb3abbef8f093ed319b5d3745e2e8f95838e71eac754e50f65 SHA512 3f6192c2068e9b536c91e1a7a9666a6296938cccdbda60dece2ddffb6e2be5b6b8fe9c13e4fda24d24874692d8dac13bd34e80996cc5fa12b9207a3d51973f14 WHIRLPOOL d58510f7c251c18eb63f14011d44db1e3a91f4666932e8812be7eb837ecf222cd89fce1ddc922554f5d2bc2b135a6bf7c440679d88ce9a241f10c0dc0e72d4c3
-EBUILD kapow-1.5.3.ebuild 650 SHA256 2389cfc2e8d21dfb3abbef8f093ed319b5d3745e2e8f95838e71eac754e50f65 SHA512 3f6192c2068e9b536c91e1a7a9666a6296938cccdbda60dece2ddffb6e2be5b6b8fe9c13e4fda24d24874692d8dac13bd34e80996cc5fa12b9207a3d51973f14 WHIRLPOOL d58510f7c251c18eb63f14011d44db1e3a91f4666932e8812be7eb837ecf222cd89fce1ddc922554f5d2bc2b135a6bf7c440679d88ce9a241f10c0dc0e72d4c3
+EBUILD kapow-1.5.2.ebuild 652 SHA256 657c9e4cc7aebfaa30c714c21e2f28702787265620c75508d64355cfa2d70aba SHA512 0f7e97465d03dcd8ebbeba6782b22775f3c89e4ba6b7ad0883634757f5c68e1c7b01cf97890d47e3d5bb7b5a829cf472d30b7608fdce3c98e4866328a12a208e WHIRLPOOL fd8ac95469f3bf7a164683ac67d3567160a1df4cf1fbe2d0bd8702cf18e4bc72aef785f4b06ff519a183768df50762e906f072ccb83389f7658c9191e2997d95
+EBUILD kapow-1.5.3.ebuild 652 SHA256 657c9e4cc7aebfaa30c714c21e2f28702787265620c75508d64355cfa2d70aba SHA512 0f7e97465d03dcd8ebbeba6782b22775f3c89e4ba6b7ad0883634757f5c68e1c7b01cf97890d47e3d5bb7b5a829cf472d30b7608fdce3c98e4866328a12a208e WHIRLPOOL fd8ac95469f3bf7a164683ac67d3567160a1df4cf1fbe2d0bd8702cf18e4bc72aef785f4b06ff519a183768df50762e906f072ccb83389f7658c9191e2997d95
 MISC ChangeLog 3153 SHA256 d9cce20b995027403165224073d9094260a5b1e8b540ed479b9a2e27ca0a43f8 SHA512 f8d27db931bf475c97c8773ad934bbd519e0377311c620e7cb18c521ddd0033bc7386b12fad3863537aa6dcf9929c57059fc8370ac579750ead525677ea46b7b WHIRLPOOL b00f1dd27a0ff11b12734940b6ceacca02b2b4fc72120031e8b206f28adc2d09dafd038448a482d2a92f3f432e8da171438b09cb7b83050eaa1169c0568bc696
 MISC ChangeLog-2015 1198 SHA256 ae4b942cf7875e101c42d38b5518482304cd1c2655a6277f17ec2ada44320501 SHA512 dc019408a35a667723846a5074b9a50319bd9e4f61a9e0fb6d2930c78ad873075d540a027ffa1614a3cef9afc2ee129254716b9dd498b73eca295b1306e18f9c WHIRLPOOL 4ce4f80e9b273580553c306be463092ee060ace4058418684f42c3c1384c8a507ebf85ce31f30ecd35cc0b6a4e209415d004e4a63d679625b525c539de875f55
 MISC metadata.xml 282 SHA256 ac9236162462e1562a26e596e7dd457a448f9367ff1a5a27ec3513ecade3026b SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4 WHIRLPOOL 615c807081b4bef1734f1dbf9a182cb27b7de0e9bcdebd880c6b9c1ab01b95721076ddc4b4e75e93b8f777020bfd52459e9e4b1a9deb41baacc44f6cde05fd36
diff --git a/x11-misc/kapow/kapow-1.5.2.ebuild b/x11-misc/kapow/kapow-1.5.2.ebuild
index 9787e17eadaf..4d8914e38d21 100644
--- a/x11-misc/kapow/kapow-1.5.2.ebuild
+++ b/x11-misc/kapow/kapow-1.5.2.ebuild
@@ -5,8 +5,8 @@ EAPI=6
 inherit qmake-utils
 
 DESCRIPTION="A punch clock program designed to easily keep track of your hours"
-HOMEPAGE="http://gottcode.org/kapow/"
-SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2"
+HOMEPAGE="https://gottcode.org/kapow/"
+SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/x11-misc/kapow/kapow-1.5.3.ebuild b/x11-misc/kapow/kapow-1.5.3.ebuild
index 9787e17eadaf..4d8914e38d21 100644
--- a/x11-misc/kapow/kapow-1.5.3.ebuild
+++ b/x11-misc/kapow/kapow-1.5.3.ebuild
@@ -5,8 +5,8 @@ EAPI=6
 inherit qmake-utils
 
 DESCRIPTION="A punch clock program designed to easily keep track of your hours"
-HOMEPAGE="http://gottcode.org/kapow/"
-SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2"
+HOMEPAGE="https://gottcode.org/kapow/"
+SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 659e98630c01..4d68e37c905f 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -2,16 +2,15 @@ AUX sddm-0.12.0-respect-user-flags.patch 779 SHA256 3737a2de5c5cf765702af739445f
 AUX sddm-0.13.0-pam_kwallet.patch 391 SHA256 dc46a0132cf0ea722a69cff45ed1ded3c93ade008e22fc90d1b797ca85ed535a SHA512 55375d2c91dad5478be14988e7889344eb8f0694300aefc7803d0f193f7160b5900647e4e35a604aa76119556304d055ff323c4892023664224dc36070c62b02 WHIRLPOOL 90bbfe187e4a327129c9a426c3c00de8d5ef15b3ec30bc4d3dfc6c8603514114f104762cb3053e25ab0b3274874351c94d1dc289cd129939dc46e345b1394070
 AUX sddm-0.14.0-avatars.patch 1470 SHA256 b091f02d6d5b2ddc9d5208b17213a181c6e8deae23e5633d694119e79b66d38b SHA512 09a2b487767c4d84e9bb1225d27e21a6716c7c299b5f3aff5fb4934d1ddc3659658eaffcf30dd60f2c83389a461b4fe91c23cab4646c740ef5eec658e14a1eac WHIRLPOOL e84ffc8ad6c6d40df7dad24ae60d5a7c0a387c5ad0dfa93d29cc307cedd541180398d7caf1925177e43fbff093dbc1fc36f872e40c57dcd80bf12ca2910355eb
 AUX sddm-0.14.0-consolekit.patch 322 SHA256 a998f8a2594cd1e81f402605f01075477a017269b0ac93a22f5faa7d355d18e0 SHA512 aa53338c3e154982388b2e98101cd49e607f1744acee28f46892e3a6848f06de4ba8a8bf204128da1a7b22df9efe5d95bb6ac1cd5dedb8a301f8587af381253a WHIRLPOOL f438b0ceb638a4d6fc0d2999771a1c6dad280f4dbb263d73d458e32c09bb6884b32efac24e92001b4abc324e4e347a3360b533beab82c06022cebeb6edc7d6c1
-AUX sddm-0.14.0-nsswitch_conf.patch 1158 SHA256 8b31740cdfcc540c81dba5e190482b1ccdb29dbf2c7d14225ddfda701c3730c8 SHA512 9449c0ddb984e685c6440a9b8537cc57410df8092d549851a8285546ee0541fd3ac2eae7a62fe57a670006e930fa2cc54bb9671ba373fef914f34a9b219d4529 WHIRLPOOL 2341cd5f142fcb76b4319fc05992da0e4055e273a433d47b7b040cd7f9a99584927b2ad07636e5b390e401a09262f147eca0dc3595ed1013f86af7f63c6fc30e
+AUX sddm-0.16.0-Xsession.patch 606 SHA256 c64003cc29d3741f6ac36e7d5f5546053ba2d5880d1d2db3909acbee1d152fb3 SHA512 ce01832d8af011c4e244c9357f540182cdf3b7af8d00616132f94c95a95b32df41beb1760ac8cad7a0a5a34165b8b289df0308656268d67f9bc420b5d3fb40f1 WHIRLPOOL c9f8e2e425c009793f32b6b2cb33f4c0099fd2b26c422c691ba63857a834d49bbd9120f01e452728fb251f294e56ddaccea4acf538465244a01e79ca80a40914
 AUX sddm-0.16.0-ck2-revert.patch 918 SHA256 450679a1ca87e6694c1ae0c626660b35d831f16f6ccb1a1fe491271a0b7cfb3a SHA512 f9b49390f656d3ba9528c9fecaff044bab7f4933293bd439fc3ccec873aae9899b4f8b93fa769d506948de2be1d3275dafc96795b1c20caf547cbf474ee12b60 WHIRLPOOL e6c700e24562387c58237bcdb384928f385d68462b5948bae2bfd6bc189190ec1a671de7d0e6eb7bb33522fcb2c773b95ff4d970bb4bf349be24229065cd8e12
-AUX sddm-enable-elogind.patch 1754 SHA256 b216976029dc425bc05486ebe276ce65b8d188ebd142856f13f44904ed733a4c SHA512 457a49650b07df2edd836201f00858245b1567476e7e1f6cb4e74e80deea404588504d1895d050cab4278ed3273e71131d70226867e5cf8846a7472f98f23ffe WHIRLPOOL 6d88e1c7eb4bcff23805fffe5b164462f43727059b0058a22140a953dbdf3c153e526513c2ce656f9894cc58eab22c1914e2a30b209dfa75388c05e09373420e
 DIST sddm-0.14.0.tar.xz 3298360 SHA256 7e348258618b20f777767a98f9e377b48824b5cb5aad3a3f10f8482c1eb27778 SHA512 ae6f02e168dbb4ef1d5d360e6b26a2c45a9891fba9d53b73d41a5cc14906f3fcca3bde6d16d7bb109132d23e3e0e768c5976934fd2f59c23d919cc9f81fbd366 WHIRLPOOL d7d80c5d1e8eb5016fa6f5909026bb477293b4356b9caff92d741c936534504e35fdfe81feea8cb2312cdb53ed0e7cc5bda3af5fc4226d5a797baea97e431ecb
 DIST sddm-0.15.0.tar.gz 3520188 SHA256 a4211e5b66f674415e07bc1cc39c16f60ae6025418bcbaba1118cd51e57c3174 SHA512 4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566 WHIRLPOOL 48d4ab7ac8d4527719d532e13956e59bdd6b94a094fdf83cb58f1c32d946b111f5ad9f2fefabe9fd6fac8bbccd2d4f8d63ef467d840b975b54d879d5f1b711f4
 DIST sddm-0.16.0.tar.gz 3523735 SHA256 f7f73c6dd6d544ec2c5e4657e181f60467ec31d84bf1b775c544dfe8748badbe SHA512 1efac1ae374ae6e6cba5ea3189f720f706aed8cc5ef2289dd55498b828584c2fa50c1b3374009b1ff5d400a9f9e3e379cfeb0a0411f8078cf618a2df77f0c59c WHIRLPOOL 1a51b2d53fa5427a6785070107152bf9c907a8ebf77dd0532820d9fbcca33d68d7dbc5bcacd863d1881c54d26617bf6986c276ae6d99806e1a2bce6920240733
 EBUILD sddm-0.14.0-r2.ebuild 2332 SHA256 1a0083b134f33feb4b1014a2c3a5227a569ac6a2904feeabf3a09e41564c223c SHA512 b67ed7c8582b205972ebe2847d87a08cd24c3c9c2d6f77bd81bc89503e49cc380c6fa7af6722639cf92df1414d96a21bafd4978b0b08127c37e2419651e6bd71 WHIRLPOOL 1dc114783af75071c4e174897eb1deaa0c0e0db45aaae378d4ccce83f61707e1885a0a8e915e1b40f30ebc28d15877ab810b530028a4f9d749eb66aa11e1ba60
-EBUILD sddm-0.14.0-r4.ebuild 2542 SHA256 58114e9adf0f20ccb18e573a02164c4c3a9745c83dad1f3b83655ffc440769f3 SHA512 2cc87d0c84fda296121afd7c8fefc8c237f8c4ce682e6f552d861f3dc6a318c105e0cfc6066c87fe9be1142cef9ad83125e9b393f0c17f0a51a81e31d82e39f9 WHIRLPOOL 5393d4e0510c45a8de9bbd5a39b287af11ae06697003664e7060e0e40b06a2e269aa20aa0bb84517bbea2da950b0e5fb7095658e95bd27eafdad520cef5d9489
-EBUILD sddm-0.15.0.ebuild 1577 SHA256 e7d69dd3cde642f72e7b59aeaf863b8446b7adf3d92fe2f52cbecc68b74d89fa SHA512 da3ae5055abe9a9c66ce6db715acc1bca99852d8a9a3c78276875326aa515e3b475814875145a5c9c557e2018ee71ee07fec51880a61dccbbb20a37d62b4c9f9 WHIRLPOOL 4c9a45bfa8d1c9d609202d9cd15037bd13e88162ace1a297594d812024556c0fb05bca55ab84d03d5f02e4326c62028ee1e2f390c3046ceb22bc3d87eed90737
+EBUILD sddm-0.15.0.ebuild 1576 SHA256 c29f9d1a75face9de46899dba6684c1f269b5e6aea2e9ebf20ea59f9b7d2a4e5 SHA512 48839e26239bd57053717ca81a5b6b285677384ce081652fcb774e573a37bb3d56c42489732fdec5d8442550483f3cb2b4b1b936947e3554641bd1e00c17dd45 WHIRLPOOL 47caec5f73b8aa5669e866b0f76d06a6577e9c1fb5ba250507906cc73478af3c19f7ec372de649a938396497fac1e7f51104c38b420fbadf4237a29e8a667f85
 EBUILD sddm-0.16.0-r1.ebuild 1628 SHA256 e976e4e79e0f9448b0fa645b78fd82cee9a469510500d7b75aedb3f16a989f1e SHA512 fa13f0f94e8eec28d8851ef6963acbaf188d96e8f365b940e2efc2110ac0376903f14b7a311ba30ee0598222f93083235cdb299db617ac620bc6a6a7666573db WHIRLPOOL a93d7a20fd1971c30fcb1c29af1149ccd7d41bcc9d02e0a206fad16fcdf492fdaa1cbb2cbc65d07825ba57e7fa4f146744d3f5dfd46ff36320d5cfeadb9b7ca4
+EBUILD sddm-0.16.0-r2.ebuild 1563 SHA256 92c2c4a262da26632c979dd6fb798604112f6e1b3d11f51d4f10fbde9ffcec00 SHA512 bd5cab0a672662b03dfa63cb01a22520fbe921332d6b045f8a8729c70e0069598769a76b86cee28c58c321964b3f537f2067ccd6392d85a64628e652d786c187 WHIRLPOOL 3c9d61d29215fd0ede670de5a548534de619fe8e8df00b27fb7d0cf4abb626ebcbc8d0195a72a5bec60153a94bb964b4e1b531b54b0be1bc29e6e83ccb6f42ea
 EBUILD sddm-0.16.0.ebuild 1578 SHA256 6e738dd5bf6f6439256555fdc1f1deef106852a5b4767ce6a7ba657cf2e41194 SHA512 1635e9649279e4a8899e7478d13fe4e63fdcf43ec0204685220eaaf1716dbdf4c4eaada9079b8b6bae302d0c10c412a47b5fd99b774f498746d0f46dc7a81dfd WHIRLPOOL 4b68be654dc880c1a71eeb1d029d324174d986cad5de4f3f06b29d254238fe2de41f1af320d4ee89bd09c9c17f81143e2a52ec4b6f4b5650df9bc184d4c3cb56
 MISC ChangeLog 9132 SHA256 b3c4811eab359e67c259d59550832dcb14fb4ab3ddeb71d23edc2207bda83c15 SHA512 32fc4d222b2316a4247cee25798050094983b69873e3358611d908ec030ab7c5b43c64c92a59e88aa37ba2c3ce97556ff1e03d33c6f0b90a0fdcec0a9825c2dc WHIRLPOOL c427eb05f0f819c4d6cff7d007e8d9ab7816e1fe9462af81f688bac0f649028b2137798ef40553b69d2be032a3eff971ac7875065eaf2d73759bd23e29bcb390
 MISC ChangeLog-2015 3391 SHA256 3512268a5a75b764800ce67e516270f4482390a1f9ab958ec0627dc4403889e8 SHA512 3ec070987205570ba6efa11b7feca3fa42a96d2ae4997dab21c713eab043c883d9f6b7073c8572314fc6793374a6061dfa9c0eba812de21de7869c284e5b3a6d WHIRLPOOL 440c4354b7e61f5022f1f728d3a1346b8cea88eeeade570f9b3ba83a67faf26987e532e5566f272df49d3af30c7fc745983273b1cb8733625690e5fa1a6776a1
diff --git a/x11-misc/sddm/files/sddm-0.14.0-nsswitch_conf.patch b/x11-misc/sddm/files/sddm-0.14.0-nsswitch_conf.patch
deleted file mode 100644
index 371df93e2b8d..000000000000
--- a/x11-misc/sddm/files/sddm-0.14.0-nsswitch_conf.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 1f39c7a91ea4bc9527628adb01cb49173f1e68be Mon Sep 17 00:00:00 2001
-From: Palo Kisa <palo.kisa@gmail.com>
-Date: Fri, 9 Jun 2017 10:13:01 +0200
-Subject: [PATCH] UserModel: Check for duplicates from getpwent()
-
----
- src/greeter/UserModel.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/greeter/UserModel.cpp b/src/greeter/UserModel.cpp
-index 94c492d0..33114d08 100644
---- a/src/greeter/UserModel.cpp
-+++ b/src/greeter/UserModel.cpp
-@@ -72,6 +72,13 @@ namespace SDDM {
-             if (mainConfig.Users.HideShells.get().contains(QString::fromLocal8Bit(current_pw->pw_shell)))
-                 continue;
- 
-+            // skip duplicates
-+            // Note: getpwent() makes no attempt to suppress duplicate information
-+            // if multiple sources are specified in nsswitch.conf(5).
-+            if (d->users.cend()
-+                != std::find_if(d->users.cbegin(), d->users.cend(), [current_pw](const UserPtr & u) { return u->uid == current_pw->pw_uid; }))
-+                continue;
-+
-             // create user
-             UserPtr user { new User() };
-             user->name = QString::fromLocal8Bit(current_pw->pw_name);
diff --git a/x11-misc/sddm/files/sddm-0.16.0-Xsession.patch b/x11-misc/sddm/files/sddm-0.16.0-Xsession.patch
new file mode 100644
index 000000000000..f341e1863f76
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.16.0-Xsession.patch
@@ -0,0 +1,24 @@
+--- a/data/scripts/Xsession	2016-08-28 14:52:04.910181422 +0200
++++ b/data/scripts/Xsession	2017-10-21 15:25:47.668886596 +0200
+@@ -50,6 +50,10 @@
+     ;;
+ esac
+ 
++# Make D-Bus and ConsoleKit start properly, see:
++# /etc/X11/xinit/xinitrc.d/{80-dbus,90-consolekit}
++command="$@"
++
+ [ -f /etc/xprofile ] && . /etc/xprofile
+ [ -f $HOME/.xprofile ] && . $HOME/.xprofile
+ 
+@@ -94,8 +98,8 @@
+   . "$USERXSESSION"
+ fi
+ 
+-if [ -z "$@" ]; then
++if [ -z "$command" ]; then
+     exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."
+ else
+-    exec $@
++    exec $command
+ fi
diff --git a/x11-misc/sddm/files/sddm-enable-elogind.patch b/x11-misc/sddm/files/sddm-enable-elogind.patch
deleted file mode 100644
index d1277e9554f3..000000000000
--- a/x11-misc/sddm/files/sddm-enable-elogind.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/CMakeLists.txt	2016-11-10 09:27:03.866358608 +0100
-+++ b/CMakeLists.txt	2016-11-10 10:28:25.384374766 +0100
-@@ -93,7 +93,7 @@
- endif()
- 
- # systemd
--if(NOT NO_SYSTEMD)
-+if(NOT NO_SYSTEMD AND NOT USE_ELOGIND)
-     pkg_check_modules(SYSTEMD "systemd")
- endif()
- 
-@@ -127,12 +127,34 @@
-     set(REBOOT_COMMAND "/usr/bin/systemctl reboot")
- else()
-     set(SYSTEMD_FOUND 0)
-+endif()
-+add_feature_info("systemd" SYSTEMD_FOUND "systemd support")
-+add_feature_info("journald" JOURNALD_FOUND "journald support")
-+
-+# elogind
-+if(NO_SYSTEMD AND USE_ELOGIND)
-+    pkg_check_modules(ELOGIND "libelogind")
-+endif()
-+
-+if(ELOGIND_FOUND)
-+    add_definitions(-DHAVE_ELOGIND)
-+    set(CMAKE_AUTOMOC_MOC_OPTIONS -DHAVE_ELOGIND)
-+
-+    set(MINIMUM_VT 7)
-+    set(HALT_COMMAND "/usr/bin/loginctl poweroff")
-+    set(REBOOT_COMMAND "/usr/bin/loginctl reboot")
-+else()
-+    set(ELOGIND_FOUND 0)
-+endif()
-+add_feature_info("elogind" ELOGIND_FOUND "elogind support")
-+
-+# Default behaviour if neither systemd nor elogind is used
-+if (NOT ELOGIND_FOUND AND NOT SYSTEMD_FOUND)
-     set(MINIMUM_VT 7)
-     set(HALT_COMMAND "/sbin/shutdown -h -P now")
-     set(REBOOT_COMMAND "/sbin/shutdown -r now")
- endif()
--add_feature_info("systemd" SYSTEMD_FOUND "systemd support")
--add_feature_info("journald" JOURNALD_FOUND "journald support")
-+
- 
- # Set constants
- set(DATA_INSTALL_DIR            "${CMAKE_INSTALL_FULL_DATADIR}/sddm"                CACHE PATH      "System application data install directory")
---- a/services/sddm-greeter.pam	2016-06-19 12:24:42.000000000 +0200
-+++ b/services/sddm-greeter.pam	2016-11-02 09:48:18.990032363 +0100
-@@ -14,4 +14,5 @@
- 
- # Setup session
- session		required pam_unix.so
- session		optional pam_systemd.so
-+session		optional pam_elogind.so
diff --git a/x11-misc/sddm/sddm-0.14.0-r4.ebuild b/x11-misc/sddm/sddm-0.14.0-r4.ebuild
deleted file mode 100644
index f67abdc0bdcf..000000000000
--- a/x11-misc/sddm/sddm-0.14.0-r4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils systemd user
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-IUSE="consolekit elogind +pam systemd"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-RDEPEND=">=dev-qt/qtcore-5.6:5
-	>=dev-qt/qtdbus-5.6:5
-	>=dev-qt/qtgui-5.6:5
-	>=dev-qt/qtdeclarative-5.6:5
-	>=dev-qt/qtnetwork-5.6:5
-	>=x11-base/xorg-server-1.15.1
-	x11-libs/libxcb[xkb(-)]
-	consolekit? ( >=sys-auth/consolekit-0.9.4 )
-	elogind? ( sys-auth/elogind )
-	pam? ( sys-libs/pam )
-	systemd? ( sys-apps/systemd:= )
-	!systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
-
-DEPEND="${RDEPEND}
-	dev-python/docutils
-	>=dev-qt/linguist-tools-5.6:5
-	>=dev-qt/qttest-5.6:5
-	kde-frameworks/extra-cmake-modules
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.13.0-pam_kwallet.patch"
-	# fix for flags handling and bug 563108
-	"${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch"
-	"${FILESDIR}/${P}-avatars.patch"
-	"${FILESDIR}/${PN}-enable-elogind.patch"
-	"${FILESDIR}/${P}-nsswitch_conf.patch" #627902
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary  && $(tc-getCC) == *gcc* ]]; then
-		if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 7 ]] ; then
-			die 'The active compiler needs to be gcc 4.7 (or newer)'
-		fi
-	fi
-}
-
-src_prepare() {
-	use consolekit && eapply "${FILESDIR}/${P}-consolekit.patch"
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PAM=$(usex pam)
-		-DNO_SYSTEMD=$(usex '!systemd')
-		-DUSE_ELOGIND=$(usex 'elogind')
-		-DBUILD_MAN_PAGES=ON
-		-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
-
-	systemd_reenable sddm.service
-
-	if use consolekit && use pam && [[ -e "${ROOT}"/etc/pam.d/system-login ]]; then
-		local line=$(grep "pam_ck_connector.*nox11" "${ROOT}"/etc/pam.d/system-login)
-		if [[ -z ${line} ]]; then
-			ewarn
-			ewarn "Erroneous /etc/pam.d/system-login settings detected!"
-			ewarn "Please restore 'nox11' option in the line containing pam_ck_connector:"
-			ewarn
-			ewarn "session      optional      pam_ck_connector.so nox11"
-			ewarn
-			ewarn "or 'emerge -1 sys-auth/pambase' and run etc-update."
-			ewarn
-		fi
-	fi
-}
diff --git a/x11-misc/sddm/sddm-0.15.0.ebuild b/x11-misc/sddm/sddm-0.15.0.ebuild
index cc14c6f74114..9dde4b79612d 100644
--- a/x11-misc/sddm/sddm-0.15.0.ebuild
+++ b/x11-misc/sddm/sddm-0.15.0.ebuild
@@ -8,7 +8,7 @@ inherit cmake-utils systemd user
 DESCRIPTION="Simple Desktop Display Manager"
 HOMEPAGE="https://github.com/sddm/sddm"
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
diff --git a/x11-misc/sddm/sddm-0.16.0-r2.ebuild b/x11-misc/sddm/sddm-0.16.0-r2.ebuild
new file mode 100644
index 000000000000..26770167920d
--- /dev/null
+++ b/x11-misc/sddm/sddm-0.16.0-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils systemd user
+
+DESCRIPTION="Simple Desktop Display Manager"
+HOMEPAGE="https://github.com/sddm/sddm"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
+SLOT="0"
+IUSE="consolekit elogind +pam systemd"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND="
+	>=dev-qt/qtcore-5.6:5
+	>=dev-qt/qtdbus-5.6:5
+	>=dev-qt/qtgui-5.6:5
+	>=dev-qt/qtdeclarative-5.6:5
+	>=dev-qt/qtnetwork-5.6:5
+	>=x11-base/xorg-server-1.15.1
+	x11-libs/libxcb[xkb]
+	consolekit? ( >=sys-auth/consolekit-0.9.4 )
+	elogind? ( sys-auth/elogind )
+	pam? ( sys-libs/pam )
+	systemd? ( sys-apps/systemd:= )
+	!systemd? ( sys-power/upower )"
+
+DEPEND="${RDEPEND}
+	dev-python/docutils
+	>=dev-qt/linguist-tools-5.6:5
+	>=dev-qt/qttest-5.6:5
+	kde-frameworks/extra-cmake-modules
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags handling and bug 563108
+	"${FILESDIR}/${P}-Xsession.patch" # bug 611210
+	"${FILESDIR}/${P}-ck2-revert.patch" # bug 633920
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PAM=$(usex pam)
+		-DNO_SYSTEMD=$(usex '!systemd')
+		-DUSE_ELOGIND=$(usex 'elogind')
+		-DBUILD_MAN_PAGES=ON
+		-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
+
+	systemd_reenable sddm.service
+}
diff --git a/x11-misc/spacefm/Manifest b/x11-misc/spacefm/Manifest
index c55a22b2febd..b26414be2b49 100644
--- a/x11-misc/spacefm/Manifest
+++ b/x11-misc/spacefm/Manifest
@@ -3,7 +3,7 @@ DIST spacefm-1.0.4.tar.gz 3487476 SHA256 b08df31894f48c43e38ce3f3d32acf0bec67c38
 DIST spacefm-1.0.5.tar.gz 3491483 SHA256 d3f14fd1b1cfb51df98ebc341ab78ce741ba443ae2ce9e1662de39d01a95e0f3 SHA512 f32a59eac773df1bd9d36ba26cf7397bd205a2a8918e01f978c42ffb6aa2238a6f4dc871503a43f130c3b10d80f43364f54965d441f602ac895d0483fc073498 WHIRLPOOL 2e6f9a742032d04e863a7801b8707ada523be009d3c7abe8d54390af822653bab923783926082af28ad6a546f86035f50ec44a490e170186f395d6e5395b48bb
 EBUILD spacefm-1.0.4-r1.ebuild 2553 SHA256 0bc1307446f382c742ff60ab01eaf409a14818ac0300045b3b3b3e1dbb8108ee SHA512 385140f2087c8b559d4588779e19c83b78f13f6962dfeeffefacf7a4983fdf5325c89f9ece641b3de29903e2a23246ed34b405dd58afb20416935f4bcf61f80e WHIRLPOOL fe6e9c8ff40bc11dbfde875e504402353a6ebf1c91775bdbd947a43af02c09ab92265bf98dd075a8527e74b9a224e1b970ca45f5ebe85c6247c41f10bc301b7c
 EBUILD spacefm-1.0.4.ebuild 2456 SHA256 9d19fe72923f37c0380209e9fd4038f434df00546ae2ae140f8c520f92c0b907 SHA512 b6466744c58725327cfb47e317d809851bb5fa34e82eb9fe7ec472a7f9a9084f68f612f85e5a0dab2e60c3f7837692416c4728d36234cb7976ece256286fd27a WHIRLPOOL 414a428e5fddc13eae345db293c9c0f41b49c2803ec999e7e90f749fed149166772fc1d2a8d1e4f4635498ea215b3dfe3b77f835520755cbf836fe3653a63f97
-EBUILD spacefm-1.0.5-r2.ebuild 2522 SHA256 0b0f2158f21721902f54964944def1fd1d703ee8ec7a2f705aa8653265d70e76 SHA512 d4cc71c6161a36654e8a9b050a9e76ef76bcd36f0b50f65d1d46f5de28db791dd326d24d406eb2b3f3b4a371d681e3d74e1c5663d57791c93c47cd5ee591a592 WHIRLPOOL aee7ae9da6a6ea0f1c8bbd2faac51fd1292bddfb5e32ff02df7f283c4ff826495508c5b658b7cd01eedd313a21ece1df565046ac872e5d81d1291175cffc44c4
+EBUILD spacefm-1.0.5-r2.ebuild 2521 SHA256 b8d192d148c35ef21969b1c00307faef1eb23eb84d815fdd676fb5979e3aebac SHA512 8f8a9605b90b82fab3e250cddb9f974eac48061b6819d778984a9fba79db4191dc8b32810545d64df86621bbdb6f1bef093aeec316b9a80f1301877d8feb309e WHIRLPOOL 7055c0a91e6d4c0f57445997a31f31cbb6098e311d3372ae0c1ab503c5e1b87f685aafbb77ea1ffb67931f1f8b531d6a3be7b1da2e5181955763bc4b54dc866e
 EBUILD spacefm-9999.ebuild 2454 SHA256 d8707fda6eb5abca7a8d1ff199031ab02b5b4de3765c5d39e8f1ec997ad58b17 SHA512 5da5de98185ba9fc9e6eb74ae37c56c6442b5a25483de205563b285dd36c2c6b3dd6407b891a95d6b4d348883522f4936880c5bed7327845a887e864c25f58ae WHIRLPOOL f0976183c353597cb7382bc14cb27d0643b0df2d40f089ce36e4fa160e8db8bda4d4ba748a98e57fda91c83413e9fc71544936b1adeef57df1539df7b8217098
 MISC ChangeLog 6045 SHA256 8e382b4c37adbf64c5236976eb8b2125d7d05967234c260a53edfaf6c15b9d34 SHA512 d0fc381c23e24a75c4ba2716076ab5e4ce14e2b08234f6f03f4a22201853a9ff4506aff76ce9b1c8d445a188242f4beeb01e020535699014aae4f8f829051ddb WHIRLPOOL 7afe2d30750ce3bb24b575bcaef62263d5b7686caedce148eff1dba6cf75a104aeaee2ab4fcc55ce07e945c9f1467d0805ad6cd84a530f3321b55c51d374db15
 MISC ChangeLog-2015 9726 SHA256 9f05182b7c81401f85517ca6597d30c6395f802b0b84b5b0a0cd3d15926409f8 SHA512 09ab3ca86008fd9c949f78292ab5b9e0f32ed90a4c0bde9b4288b31dd2a148d6c8a4f176e132bd8ea6b285f2428e0278245abd17679c8571060a4558ef9fcca6 WHIRLPOOL 4fcf8d5b8119821ffc9ef265d35ee6fa474e3a07ad66bd08777b0137468ac0ea4aff223709423e4f6a1dc22afa8a8b7646734986d5dad98e397d17cfd2764563
diff --git a/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild b/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild
index 0c56ab420c40..9ccc93d3f580 100644
--- a/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild
+++ b/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ignorantguru/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="gtk2 +gtk3 +startup-notification +video-thumbnails"
 
 RDEPEND="dev-libs/glib:2
diff --git a/x11-misc/spnavcfg/Manifest b/x11-misc/spnavcfg/Manifest
index b8aa7f013ac5..fabaab8d48b1 100644
--- a/x11-misc/spnavcfg/Manifest
+++ b/x11-misc/spnavcfg/Manifest
@@ -1,6 +1,6 @@
 AUX spnavcfg-0.3-custom-flags.patch 1568 SHA256 8972b8761589fa87366a9c5c32591964d5e621b60294bea6cfc09fe05a9e899b SHA512 eaa831d7ef10227bf35b26f5ba32f793b382f6af7b14a147084ac93f4669e8018655cc1df711ed4ae5d0c560b34ea59abb1c1998c4fdb37a362f8130fed80632 WHIRLPOOL 4ddcea782b6d75f2121effcb6338fe2b8f0e7cf093a8745d63d1633186a89d0314ec333890640f14bcab99e50cacafc4871f900ce4db4451d16812e6b3ba508d
 DIST spnavcfg-0.3.tar.gz 214774 SHA256 4c950b8d4ebd4243c0bf08b6c5922f81b8cf73ec6bb7b20acb390610cdea4bd7 SHA512 a3411c32a6c7de2fd1cfa7960e1b0dade88e8c37435a39ded864b4b6f12fd3c8f518dad7a4ac5b465517484e74b3586f12d47e780f655fd7e4c3fea8d6186c80 WHIRLPOOL 13f677743dd2eed35f57ca178d8b1a9d3382ab1eb586d99b6ff33be0f080e88d80eabd91065db7c48d0ba7bff40eaf8c7d2d0fdc52f85256adb84cc6b4ef6b83
-EBUILD spnavcfg-0.3.ebuild 627 SHA256 032a42235fe1bc6eb0dead16c955772da9ec7d735e0d774174d55aee5370e87f SHA512 93b0d494262e59bf5d4c22e973ebfb3e74860f928a8aba0eaa46961323be5bf7f1278af8e6ef9262039b03581e198ea6a037af4c5bc11ec382d02c1d83112630 WHIRLPOOL 8725a6f5e1998a2a17a8fcb0c53119e3ee8d4f3e4d34a84bfa2584489fa5c0998f620ef709cc8a33f2423ee3aa74592de3d630b44924699397ef48187a1122e0
+EBUILD spnavcfg-0.3.ebuild 626 SHA256 f52b8b845a244401e25058137b657e21772d52a9132bb7f8273402bad51f4f51 SHA512 c515f7c20d654e75a1a1b18369acbe4cadf0698568ceffb1ec3448c52b16637a188473ed3d753b7b5a6b8a3e524a9066c6f8f53d181a39d20a031b0a2984aa9e WHIRLPOOL 88777396f52b06fcecacdb190add625d1a8871ac2f72479ab5b09a11626fc71345ce0c9df3f0dc6a8226d1784a2d9089a7071fdf9ff2bd76989c251b94e0aa0e
 MISC ChangeLog 2689 SHA256 fba58ae5e397e4be981947ed993763f7e793b25827efe28ff4e4a3154617fcab SHA512 0b45aae551ae877171e02cc1db5b1d4c2c8347fa30d24a92bd8e81f87c235f20cdf2af50f574e51c8550337740659d6e7678f987099092da5f30488981d80a57 WHIRLPOOL 934c594003d6b5590b22b8a4af39a8929515ab9c8f16745db1bfb584bbaf1d8f81d861a148726da08f34679d484e0496e30e008562771d1694d639c57ec421f8
 MISC ChangeLog-2015 835 SHA256 46cbdff09f848412a3256345be5838997a94076e669f51dee3650aea9bf7d224 SHA512 41bf40bf1e76f075506bf0d577eb7ab30ef2c2ad0218413ef5a3cc9135ae87c7f813a1499659ad2e8f82689120145441ea04f4934bc6459752018141481462bc WHIRLPOOL 44576821d4edf750373dc25f9397cfae140f011d0832291f138ef61ffb3186292e990810842f5fc4224d0d817294d40eeead5a5d928a17e990d49e50922250d0
 MISC metadata.xml 693 SHA256 13d29c469a8ef587a731eecc0120dea37d32b49bd9355984bf33800eb01dcb84 SHA512 fe3071295032bceaf2df17c955b234063246f37a59a25b5e630c21f1443d16d3bf4fe7979fdf4d01df88ff7194bd6258fae78b5e4ba582f396ff3d8007ccf7f5 WHIRLPOOL 0ab4f871b78d64ec7ed8af06e7f006c276fa8e4718738a7422446f7acaa51d9c5c465e07bfeb394b89bc6f9986dd834cef3ad9ff4d8ad9922401cd3fcdf84dec
diff --git a/x11-misc/spnavcfg/spnavcfg-0.3.ebuild b/x11-misc/spnavcfg/spnavcfg-0.3.ebuild
index b6cb667f0d7d..c8c438c0150d 100644
--- a/x11-misc/spnavcfg/spnavcfg-0.3.ebuild
+++ b/x11-misc/spnavcfg/spnavcfg-0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/spacenav/spacenavd%20config%20gui/${PN}%20
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="x11-libs/gtk+:2"
diff --git a/x11-misc/xsr/Manifest b/x11-misc/xsr/Manifest
new file mode 100644
index 000000000000..1ed2533916d0
--- /dev/null
+++ b/x11-misc/xsr/Manifest
@@ -0,0 +1,3 @@
+DIST xsr-1.0.0.tar.gz 8028 SHA256 46cb94d45c90762fa08edcbe2ff03165424978f855c33969062a742b835b2e59 SHA512 0fd7326452a50d0493d30cd956ded07fc3eed551af31c042c0a8f0a9c3af69319719868cfc43fff8b542191b5b9c959894d3db13b15c4127e8ff6020a04f7f15 WHIRLPOOL 6d98693369ac60023cb6ca941a3bd88ebe38f64aa3b96c41ba15f4ea8b20f88d75c215d485472c4d6e9cd6c85ee76d2e145a70d029678b548f9115e9ed285db6
+EBUILD xsr-1.0.0.ebuild 522 SHA256 01df0fbcba4bcdc43beb3f91b35a94e3c8c9b3404140face80f01f39b9297954 SHA512 06ddd1a4ffd54858323b798ecbb38ab2f49a28d2846311b2bbf3c419183368c2398e0171cd9d1db2d28f31f2e10f5fc3cca932f1cd022e46d3150439b4e9ac95 WHIRLPOOL be92adb06398803c93b67d2500b49059cde730fbe606c3b2aca00921e14b0ee8dc803daf74988de96d92caf357cd117d5bdc3cb013e12ed50e4286c53821d19d
+MISC metadata.xml 1228 SHA256 4421477dd5e3c44e11915c3001a55ef55b2e3e365495ffd3bf588fe75143ae9b SHA512 39a98820d8d8202b5996733b970a0107d4cda3ed3911942196e9ec3454c0457bee8539fc1de1e25c5a41ed7175e13d4744732f1c9aa1ebce8e816a5c0cd8461a WHIRLPOOL faa2dc044d8363256afca61249eb61431e7a63c549643f421cf5ecccca1584b26e7f0ce755c709647a4f27f94bb1203b5e25ed05b942b5d628615ce3d27fa85e
diff --git a/x11-misc/xsr/metadata.xml b/x11-misc/xsr/metadata.xml
new file mode 100644
index 000000000000..c2e7935c2eab
--- /dev/null
+++ b/x11-misc/xsr/metadata.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lezsakdomi1@gmail.com</email>
+		<name>Domonkos Lezsák</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	
+	<longdescription lang="en">
+		X Steps Recorder is a clone of PSR for Windows, a program that allows users
+		to make a recording of all of the steps they took. (It's like a screen
+		recorder except it doesn't record a video.)
+
+		The main differences are that this only runs on Linux, that it records
+		your keystrokes too (!), and that it saves the output as standard html
+		(base64-uri-encoded images) rather than mhtml. This allows for easy
+		editing of the resultant file, such as to remove passwords you typed
+		(which is why psr doesn't record keystrokes in the first place).
+	</longdescription>
+	
+	<use>
+		<flag name="cursor">Capture mouse cursor using <pkg>x11-misc/xdotool</pkg>, and place them on the screenshots using <pkg>media-gfx/imagemagick</pkg></flag>
+	</use>
+
+	<upstream>
+		<remote-id type="github">nonnymoose/xsr</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/xsr/xsr-1.0.0.ebuild b/x11-misc/xsr/xsr-1.0.0.ebuild
new file mode 100644
index 000000000000..f933fb6d9645
--- /dev/null
+++ b/x11-misc/xsr/xsr-1.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="X Steps Recorder"
+HOMEPAGE="https://github.com/nonnymoose/xsr"
+SRC_URI="https://github.com/nonnymoose/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cursor"
+
+RDEPEND="
+	dev-lang/perl
+	media-gfx/scrot
+	cursor? (
+		media-gfx/imagemagick
+		x11-misc/xdotool
+	)"
+
+src_install() {
+	dobin "${PN}"
+	insinto /usr/share/xsr
+	doins Cursor.png
+	einstalldocs
+}
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 1156f5be361a..75d369467992 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -1,8 +1,10 @@
 AUX zim-0.60-remove-ubuntu-theme.patch 669 SHA256 dde1ba982a802bc124d82af92c5475cf7259e504599c1ccf302895ba03117b87 SHA512 a2e202986c77490898c15f6c4e647667fd6662422e8bbd638624a52a33989cd4259f95b37f488ff4a947f04354704ee9df7b9d60aae2fcc928f1f3186955ea1a WHIRLPOOL 115d3468af4eaeab1fbf1be997e6fdcd7390a77e75372616676df787b768c9f66e4969fbaafccac01edb75d9889b8ff34bd0b83b8d5802c459d01c07602b6a2d
 DIST zim-0.65.tar.gz 1899614 SHA256 5442f3334395a2beafc5b9a2bbec2e53e38270d4bad696b5c4053dd51dc1ed96 SHA512 dee652087d3d986b80353e9087abe363392354f40db11f8819d0b3f3c6f133c08c66c651a92ed77c1656f1135998ac02622eca08ac2e28c8fb3149a724a0f7fb WHIRLPOOL 22bfeaee53214029538ba76d309f3413fa327aec125e49270f168a5d985e37672f3a8cc8043e4a35d1141ffb54f958c0a466c6edac4192028893d017401ce2a2
 DIST zim-0.66.tar.gz 2020216 SHA256 e8b53948097f211972713252f3a89b2957e3a63f55eb53587e2474dfc4cbf6c4 SHA512 9693dba8ee6ad915a85ca999674350b278043559ba4adf93c03c8815211ecab451a6e2dceaf62ea7048609eb86f19485f2dd77dbaaf6f2d81f97f6450bf25ca9 WHIRLPOOL eca653cff7581e3f8b4e43d33860e49cd0fb36dfabbdb2aefb86cb9aa804c269a32ea41823f8292969f9431725221032c91881e1a328f780e1390a3c2587ef2c
+DIST zim-0.67.tar.gz 2034747 SHA256 b37cef3d4906aa263abccb1493929a7ea6b9e8d11a50ed92cd437e8f93ffabbd SHA512 0f3387a74a9d6a1e972b4ad411230b9318c58432bd853ef6d45cd535dcdef901369a70dd619b842f1e6564a4b583075865d30acb75cc7649facf5acfe43d8b94 WHIRLPOOL de74a1a0aee364007d76c2fe60cb9cee4d76fa60cb8388d3b8078144dd0ceb9a28c9a860e3125017d27e9895a2eb933913573eae38a5c560e0bb7db816455241
 EBUILD zim-0.65.ebuild 1822 SHA256 e26e14ec95f6470503fc26dc91a8a3033c6a914a692d965b24ff368eb335f855 SHA512 bebb179fd5c993a91307ad3054feb8af96d54cae2fde754ce0fb844c68aa25227fb430417125490b55d4c1c5aa2ca34372bf2dee20ce6275e4eb1b288b65c77e WHIRLPOOL f23bf52f5296dd895310de4221b5b586e669cafa7618b5d6552022dd92f37f0b67b7544c97f83182fb54bfba1670de2ca60e0504a9ced289277a6aff454a894b
 EBUILD zim-0.66.ebuild 1824 SHA256 4d523e23f118d5a996ef17d63bdbff6836f41233a372bbf78b3e3ad08fe72924 SHA512 23cf416615bcc2cf4719474fb8a79b196916b3fd6fc2a3eaa018e3e00cf8a37a56d7446ad21adb866e727d942300443cec51eda4beaf2830bd7b1d4ec28b9677 WHIRLPOOL 8ac5d15f1b7385182deed9c4bac3333099ea0d61dfedcbc86a2c44de81a47ca59dfd111bab9addb93a64811f499254938107dd17d83475aba084fa9a3c3ee43f
+EBUILD zim-0.67.ebuild 1873 SHA256 72dcbe7219e5299b46bcd41e66348b74847687b598e2a20411ca6448a385a92a SHA512 8f57af64bb33b49b1ea66de20d571bdd63e0d063cebc8be7043eab944136c203f39bf6246d85dafe90c800191f8f98980ef6f090b934249edf4113f6310de027 WHIRLPOOL 864f342297e58e4850d15c54a2f6b5f358c6228ceea8228bcd524ef7b53603ca78a699eb9a0e00f88c676b2df0c65447f769c31123aa196230660abb68955dd7
 MISC ChangeLog 3259 SHA256 416b51a134e42c3c0674145c914c61f7edc6b0b44787f16d4dfb6082020692a2 SHA512 c73df957779e9dbd5bd0f1a227bfed4b55241f2b2a048988c33209368ffd0274d5fa6a7aa3a715b2c684d28c01e4b82ebd7d8ad4ee1ce5cad4f4ff364b7b93a6 WHIRLPOOL 7b78857004fbdb3eff68893827537af38abfd5bbda2c2b854f4d94ffcf25106cd7bf278805896776808e2c2c375f3d18e167f0951827b90297b2618cb083bf62
 MISC ChangeLog-2015 5183 SHA256 3049f6000cdb3bd5b276bbf410aaf429ae51feb9c018caf59ac924e464701f2f SHA512 1673779e884b4701053cb747a43aa6ae89db9bdec2548c448a025cad59be7f021119729eb5273a0279b3f8e549639e70cf4fc459b25ab9eb18fb1e6e293e4614 WHIRLPOOL e81790f2d988c9301076f16da59746fa4a53993b0308320716c273b3ddd2ced665cab41a5589e7b5dfe6ad952d4b5cced54fb701b285da10fb7f68d316745efc
 MISC metadata.xml 824 SHA256 2ebd26a8094b521473c3968474243647e51e3f65bb5023883df60fe1604d27d4 SHA512 26a4774e75f0a06bfedc2c26f4ca688f9a2644935302e0674ba5a5308af88bc90f291a01f5b10bba62ac0f0a46561d63bfd9289de67bc53c4be454542ea76816 WHIRLPOOL 719b71c446de2662c1ecd614f5858deb32adc8628ca592f959a62dae67c081f142d5a5a23b4f3ad6cb4924a3f7e3c98b5ab54628e64e6a60b2e378000d300d9e
diff --git a/x11-misc/zim/zim-0.67.ebuild b/x11-misc/zim/zim-0.67.ebuild
new file mode 100644
index 000000000000..809a199ab638
--- /dev/null
+++ b/x11-misc/zim/zim-0.67.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 gnome2-utils fdo-mime virtualx
+
+DESCRIPTION="A desktop wiki"
+HOMEPAGE="http://zim-wiki.org/"
+SRC_URI="http://zim-wiki.org/downloads/${P}.tar.gz"
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/pygtk[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-misc/xdg-utils
+	test? (
+		dev-vcs/bzr
+		dev-vcs/git
+		dev-vcs/mercurial )"
+
+DOCS=( CHANGELOG.txt README.txt HACKING )
+PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
+
+python_prepare_all() {
+	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
+
+	if [[ ${LINGUAS} ]]; then
+		local lingua
+		for lingua in translations/*.po; do
+			lingua=${lingua/.po}
+			lingua=${lingua/translations\/}
+			has ${lingua} ${LINGUAS} || \
+				{ rm translations/${lingua}.po || die; }
+		done
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	VIRTUALX_COMMAND="${PYTHON}" virtualmake test.py
+}
+
+python_install() {
+	distutils-r1_python_install --skip-xdg-cmd
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	if ! has_version ${CATEGORY}/${PN}; then
+		einfo "Please emerge these packages for additional functionality"
+		einfo "    dev-lang/R"
+		einfo "    dev-python/gtkspell-python"
+		einfo "    dev-vcs/bzr"
+		einfo "    gnome-extra/zeitgeist"
+		einfo "    media-gfx/graphviz"
+		einfo "    media-gfx/imagemagick"
+		einfo "    media-gfx/scrot"
+		einfo "    media-sound/lilypond"
+		einfo "    sci-visualization/gnuplot"
+		einfo "    virtual/latex-base app-text/dvipng"
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/x11-plugins/pidgin-gnome-keyring/Manifest b/x11-plugins/pidgin-gnome-keyring/Manifest
index 913523f53604..e42370ef1d9e 100644
--- a/x11-plugins/pidgin-gnome-keyring/Manifest
+++ b/x11-plugins/pidgin-gnome-keyring/Manifest
@@ -1,5 +1,5 @@
 AUX pidgin-gnome-keyring-2.0-plugindir.patch 793 SHA256 d1238323cda83c0674181c663bc2285266c7989624e1ea18425a8329ce737098 SHA512 70c4580f79d339c40a47ec8b8ff636649430f14627a9c88478f330c978781ac9252642c793eb155b26f366eb90cc00cf69e144a5cbf9903ae7be1a67441b59be WHIRLPOOL 460a9ae51b08d0d84e8e393d49b1c78fa088e63955359d58970fa9400f72d08c4054e12fc15c1007034d4d19f383e65d74e4555c0acfa055246e320aaeff54ca
 DIST pidgin-gnome-keyring-2.0.tar.gz 12066 SHA256 f75bc1a859226a5ad7cf3012925835a4d70b83dcac57a95d452194601b03191c SHA512 b1f83c107631a7105aa517312f13d745922b8033afc15069cba1c515caeee9e6ad89c4c7a5f96c561713d7f7a6ca3f03cff8fb11566a8ea0d8980f10e85d4610 WHIRLPOOL 84549c2240121400c46be51e4562df1db27cd900e6170aabab9d18761b93af1b5b1b60dac4ea7124cadf22325e6b79efcae569573edb36458c2d8fe673962d23
-EBUILD pidgin-gnome-keyring-2.0.ebuild 858 SHA256 02ab71f1c43cafc1ab5a73fce33e8e92a97e8e038dc8e8e778fba1034706ec82 SHA512 5c8fc8dcee977c0bc5eb6eea8c38264ad2218d43ab01d7be6a68b2623c92c4a7c4a5341e7bced62bce98f9727a0085fbefaed6281aa4a339c5a5fce75fe0127a WHIRLPOOL 21be10590ead402b8010ae4c7bcd5ec15fc01c9f214e03b56d298d6cff8bee78ad2fdf105b5d74d8858b9cc486fdb132e4c329daabfc7918f191f03b061ed46e
+EBUILD pidgin-gnome-keyring-2.0.ebuild 857 SHA256 bebadbd479c92ad2ed824cf21aea2aec9dca1b99e0ba95dc651ede20b6c07d83 SHA512 b80bf78c54a8b66449176940e9aaa17eb3569875fb6ff3fd06ecc045b392b9d2527b89ca58dea4153e7f54bb928b266bcca23ce60228ecece282fc5de67eb160 WHIRLPOOL f3d5eb86be92c2f502338f961169c69a12f89614e8b5a8e74e359f06887e2b4df3e14b0c2d721e86071fc965525e8f75e444c020a875701089d3f6ab174157e3
 MISC ChangeLog 959 SHA256 01a47eb3bafbe7cb27bd0539ae8e43f4491103859a1f79a29cabd665dfbeaa8b SHA512 7d44377f46f1b8939834c20035b056df6a38e067b365a7b884613b2f7c343834d5fcb96ae1bfccbbcbaa7dbe7991794165cc3ca4cc728f115419517dbc239bc1 WHIRLPOOL 2d05eb1ef9f3044ffd4f21b4de7758dc1eddfdabefd51dd0d3d982f9a0c8f19e2dce013d7de94afb0aea6d865b1da5faeb10192970d2ebaeb2a6cffc9f3a8a59
 MISC metadata.xml 601 SHA256 6dac1278486f358405c529ee8bf193105abaa7f0b35addc8d996991ed06a85a3 SHA512 8c30a86da0a41a8e47009cfafecae861d6389c6dbe0d14c68200d1b2a6c83b047befca74f70ac8652ba22fd2c738a1ce41fe63186fc7a2e5762d348c08635970 WHIRLPOOL 7ef143c347f5414b65403d5398f7613af04581847c451b8ecf75bc3c57927e30bd8da9d04630ecfc0441f6d584f42716a763f07077f60eabd6a0570876467384
diff --git a/x11-plugins/pidgin-gnome-keyring/pidgin-gnome-keyring-2.0.ebuild b/x11-plugins/pidgin-gnome-keyring/pidgin-gnome-keyring-2.0.ebuild
index 02b193c1dd78..221d0975bdde 100644
--- a/x11-plugins/pidgin-gnome-keyring/pidgin-gnome-keyring-2.0.ebuild
+++ b/x11-plugins/pidgin-gnome-keyring/pidgin-gnome-keyring-2.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/aebrahim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="app-crypt/libsecret
 	net-im/pidgin"
diff --git a/x11-plugins/pidgin-sipe/Manifest b/x11-plugins/pidgin-sipe/Manifest
index 5b7a8087bd3b..b6d8282efcb5 100644
--- a/x11-plugins/pidgin-sipe/Manifest
+++ b/x11-plugins/pidgin-sipe/Manifest
@@ -2,7 +2,7 @@ DIST pidgin-sipe-1.21.1.tar.gz 1212621 SHA256 92cc5bc581e7b500ffcce51707e003608d
 DIST pidgin-sipe-1.22.0.tar.gz 1255851 SHA256 1aeb348e2ba79b82b1fd102555f86cdc42eaa6f9e761b771d74c4f9c9cf15fc3 SHA512 4135bbf526659663b0b053592d889588574ed2a1bc9346e6ba62960203409e2604552ffb02ed32e2b4bb46c4f40f62089302b301344b9f7b45657e64a585f7ed WHIRLPOOL 5714beb478b19b8378faca5ddd04573c2f0996287523fefb51219731817b237f77c98ac3ac027ff45a155b51f49c6ea420a4572f8a020e8edc715e82ef9290aa
 DIST pidgin-sipe-1.22.1.tar.gz 1265440 SHA256 f6b7b7475e349c0214eb02814b808b04850113a91dd8e8d2c26e7179a3fd1ae8 SHA512 1fff886b32f7f8cb99a0af710b3a1502f62d27dedb541a9e2d8ae9eaf5eb7be0983216e730ccc912c20eee3d940ed1f789f704ee21736db76d141efda66ec018 WHIRLPOOL d93e88d111871425ed5c2e36fd359d7f082497482d2865eaabb41cc867aac7ddea730d413aa123fafb3be605ddeb8f59cb89da98b50cddee4b1d1800d8f3c17a
 EBUILD pidgin-sipe-1.21.1.ebuild 1311 SHA256 ec0da0d06e6d4f65681dffcbb8b5865c6e047a60c4f70414b7a88667307ea5df SHA512 349bd4adff488c0cdc94230cee7112818eb1a99dbd56ea36f351e66b6a7215d72623fb1aaef7b6a0d3bf8b6364f293748adabf793ebae51da2f6356dc387927c WHIRLPOOL e3f5a36d1013f495af4fe2531ecabc4317f4fdb5ca6d775841fa8632e5837b9d37fdb33d3e5b47545448b8b022013d6a60a67ce560aabb6043f1d48a030010ee
-EBUILD pidgin-sipe-1.22.0.ebuild 1343 SHA256 7c535d8c2410b815d81568fc8ca3886b5d7c867e3060c3b60fcab3c3217552ef SHA512 43baf3436eb8e9728c09cf2b99565e73c7e69ab0d93708ac03039d785ac280110ceec8ccfa42beaa59e1998ef0dad63a39b268ed34cfa71ddc7a6ca1574b172d WHIRLPOOL 2e6372adccf01d293667a61d1d31ee9706a39924a7950786483e51893a0aeefc393ca189b5e74c04ede24cce0483350c94778f6efb29fe8c2794a7522641636e
+EBUILD pidgin-sipe-1.22.0.ebuild 1341 SHA256 b7c6c6cd1eb56e0a288f6dabe8267c77240a6313c89ed7945c791f5cc248b5f2 SHA512 eff9f421b21e3f108ba85c8f6f3ba22420c262cd1df01f3a5c6ffce5a56bd2c79e4641279dab12c54fc40a6733868a105835f8fecac3440a179c3e8aa519e46f WHIRLPOOL 7f624e1ab394998ae2f1793c2f6bb959a5d862433ae67093845660ed503f44cb49b074f79dc41aa4a6b2fe72d2a222f7a65d094286563b74d0407e194e1e1184
 EBUILD pidgin-sipe-1.22.1.ebuild 1343 SHA256 7c535d8c2410b815d81568fc8ca3886b5d7c867e3060c3b60fcab3c3217552ef SHA512 43baf3436eb8e9728c09cf2b99565e73c7e69ab0d93708ac03039d785ac280110ceec8ccfa42beaa59e1998ef0dad63a39b268ed34cfa71ddc7a6ca1574b172d WHIRLPOOL 2e6372adccf01d293667a61d1d31ee9706a39924a7950786483e51893a0aeefc393ca189b5e74c04ede24cce0483350c94778f6efb29fe8c2794a7522641636e
 MISC ChangeLog 3587 SHA256 4de49e8a5ed8000d0813e7b62865748f06da4b11838cb7aad7b107ff885eb537 SHA512 1b83c49cb3abdbeed78585db88b1e0f037bc74cc73dfe520bcb44bec0b457da35a9e70bd42fee4f87b50cd1a1cc502b1070eb6b8c83f1fa7c05c75327305bf4b WHIRLPOOL 3780a5fddf48b244b21df485d484d97eded705446eaf2692767c185c69869c402f7877c17fcc2814b32b5166fdb8cf1e29df4908af30c3d0c21aabef3b983ef5
 MISC ChangeLog-2015 6300 SHA256 3eb031f630abcde9014e8e645088a8e6f0316c0ad5dac4d2c83b2b5ab5bf39f8 SHA512 61ca33432d93f819e789eb81fcdc351de85b79700de90b942bb312a947643dc47171baafe467f141abf727f18485f28b34c26186b98b8eb52b814e62ecfd9058 WHIRLPOOL 6f32b82a8242484f9c5eb2619cd5b96aff1ce4e21f3f3d992b2f2f765b83d7b16d07642ababf5b731fe45cf12e48f08844f683403349daf2d1ceda687ef4e605
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.22.0.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.22.0.ebuild
index 8b7372dda468..9891f280612b 100644
--- a/x11-plugins/pidgin-sipe/pidgin-sipe-1.22.0.ebuild
+++ b/x11-plugins/pidgin-sipe/pidgin-sipe-1.22.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sipe/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="debug kerberos ocs2005-message-hack openssl telepathy voice"
 
diff --git a/x11-plugins/purple-mattermost/Manifest b/x11-plugins/purple-mattermost/Manifest
new file mode 100644
index 000000000000..d4341b1ab02b
--- /dev/null
+++ b/x11-plugins/purple-mattermost/Manifest
@@ -0,0 +1,3 @@
+DIST purple-mattermost-1.2.tar.gz 65402 SHA256 2484c68fcc3c57a176991c143346dc8cc6a0aaf37d5ecd0ff2c0ec201ca094ae SHA512 75e80c1021393c5fe78404a4439b5454f8a4495c1510bf8a3a449acdf1807b8620ac19680607de29bd1599eb0f1354f93c6fa7b21b4294b36649b6e1455760d6 WHIRLPOOL 0f29872e5c8a76d37767433a22d4bee8c903aa55ed0fd80da7d38ae24e2c1a049eb4779008ead8be4a297816e4c359293fe1bbfbd13c0ec687e84b73d64de0b0
+EBUILD purple-mattermost-1.2.ebuild 545 SHA256 673b8102983fe945dfdf9170512308e3d3a7367c049e4e6195152dfb32a0653f SHA512 69f0bc46614406ef868f9246ad5591285a79c1f8ad476fa9cf78e5145564b2a0bd6b250c8107172b127545ebd229688a8d4d54dd0d2345b8ca2cc376f96bfff2 WHIRLPOOL 6bfdde3d60d2a1a59dbbdce1b12e8181475ac19407350cd0a14e80b9db28b6767c05fed1d6a6d35786b4fbdf0c916b6d37a77fb4097d576c614e851ec429e36d
+MISC metadata.xml 342 SHA256 51dd156ab421bba4844d7378297e9dd5b31be4748178a5b0156ba05a2d1bb41b SHA512 ab1ddf1a079239ac490e856785f73650a4b3e32d3f24a798d771347645899b23799f0eee76df8363858fb2f13e23769f0cf552ba12a276ce9ea68aa50ceef0e4 WHIRLPOOL 431e22b131cd63c03f621ecd7b8e53942fb0233d3c696f0a2504ed5accd4face04f5bbe2ab10c3496eca0376f923ff56b0072a5c8888e05e601f39ead199022d
diff --git a/x11-plugins/purple-mattermost/metadata.xml b/x11-plugins/purple-mattermost/metadata.xml
new file mode 100644
index 000000000000..711617a4a147
--- /dev/null
+++ b/x11-plugins/purple-mattermost/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>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">EionRobb/purple-mattermost</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-plugins/purple-mattermost/purple-mattermost-1.2.ebuild b/x11-plugins/purple-mattermost/purple-mattermost-1.2.ebuild
new file mode 100644
index 000000000000..d4b6347b6757
--- /dev/null
+++ b/x11-plugins/purple-mattermost/purple-mattermost-1.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A libpurple/Pidgin plugin for Mattermost"
+HOMEPAGE="https://github.com/EionRobb/purple-mattermost"
+SRC_URI="https://github.com/EionRobb/purple-mattermost/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-text/discount
+	dev-libs/glib
+	dev-libs/json-glib
+	net-im/pidgin"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
diff --git a/x11-plugins/wmudmount/Manifest b/x11-plugins/wmudmount/Manifest
index 06181b7e85ee..131268301543 100644
--- a/x11-plugins/wmudmount/Manifest
+++ b/x11-plugins/wmudmount/Manifest
@@ -1,6 +1,6 @@
+AUX wmudmount-2.2-perl_brace_regex.patch 417 SHA256 bd898667de0cb465ab1924935c711bac4ab910d51b9122a3c70d221d070ee791 SHA512 93afa7793d64cf0d3f2e7be5a112fbf8c8823006e97f8d7c654d5aed91e8578012558b8cafce43c73b09c6279ca3a9741214bd851899c63f3eb5cd0641862c73 WHIRLPOOL 5362b748eeefd91b2a3a83db7fd6333a39a93c7efc9d1e6ddf961b663863cfb545d3358f88d61eca63ade4fd38f897021f1be7ed425e62711894fcef7b08ed74
 DIST wmudmount-2.2.tar.gz 181700 SHA256 6402d215e5ad7619f588651bcc30041ff3fae13ec2e844088443c855aa3fb805 SHA512 6bc08b60430bbe66710ce183f0e7693a7818cee68cefac3a3bc191104663dd3649f8cdb62c7f214bdf4ed377b01fef250fe388f14645690aab7993c6071ceffe WHIRLPOOL 83600c9767e4ca1da3fda5503af8583dcb8bf5fe8931db181de8dd6b0e4458526441e08c688dae6e9baf255798ab0a4e380ea23b2b383743edbf4a7247f506c3
-EBUILD wmudmount-2.2-r1.ebuild 908 SHA256 a97c2d0f89bc6e475894c995a41c33d9d12789da55c77db47d32adf03c121e8e SHA512 9e0c0b4b9d5975a2070827ca611fcfe223ee0b6c54d8d2862a2bd02a6bc1c2ee9fb2a21ff0bf9346862904dc4877c47a8cfd931d6df92484fdf25b17ca45fe0b WHIRLPOOL 4eda7a59cb3a0e44075d92e2d947f12e685da352d715394bfc2d44f5c989c5a1d14376d3b8675a540fb54ce4878b514548bf5540f16b9eb4d02faa09e11a7aa0
-EBUILD wmudmount-2.2-r2.ebuild 863 SHA256 735842366b9affee5bb8379c5a363622cccf5beef892db56c8f36ba576a18544 SHA512 150a8a439365059bb516632d3b5aec82f3f561824499d130d4f759c24ea72a954cd6dd8f7c98ab903abc8eb27498155785ecd35a5718c9769bab8be4c51de115 WHIRLPOOL 8b121ac800963bde06de85a6b4950efc924dd3a82d984daa9010a3d019df1f67398b0c722d82eec75bd07a78590c7d160af1ffe6a57a0e4f5efe57a5efedfb86
+EBUILD wmudmount-2.2-r2.ebuild 918 SHA256 6faf4f299b9a9e7fb5e3fede81577db56e7fb26764d02a2f2fa1c7e6383a600e SHA512 9bca785f6798b180832e762f03dfc78e8d0ebb343ba2270d1c594368fd394a4c9333e61ccbe8f7e8fb89e5f58a7a4036e191a641c34cd6fcdc70147ebf03137c WHIRLPOOL 9bcfc4168e73228dac78fd2cc0da32ba965643ae2fd628d0b4e3513e82e796eba130e13091fd123c9150e1e15bd64f6e8eff7bd6ac808121475e3f1fd14bc2b4
 EBUILD wmudmount-2.2.ebuild 902 SHA256 ca6d95406501b21e774773e089cf9e8328b1d41270aa1318f39426629e5596e1 SHA512 c99a70da25007efcac2c16eec30420fba944dd43b1a54a43c84370bf45d7d67668acf0f41d859474e378103652a2eae1ad02e1c92438f4aa704bba63404a8689 WHIRLPOOL 8323b4a05fa9df8e714973d6e00f5bda52ede37a80959c6789b6efb0b45132ed1be0cc4e9f6f1acbcf334d75e9a650a8a51aa9ad9044532342f335fcaac38acc
 MISC ChangeLog 3994 SHA256 14acb5db58ff7fecda4a6e1c991a32624673f9a78c1c20adc79fd6d7a7cf5d68 SHA512 9cace8d22f25b73f9dd6b07a5c98e07dc32dc45b15f9ef3248d91f04e62d3df51c754498e2ee7b4bff48f9c09edff98fc02e422110fbd603303ed919899663d2 WHIRLPOOL 48d66d31cb59700c8822dd591e5aad05a45eaac87d4f9452f1bc0b5300165e69962d62ffaabbb96fc2afad41beb49fa13c43c0de3bb2e6aceaf1cdd6f6b6ab09
 MISC ChangeLog-2015 2690 SHA256 74dc746108b1b58d0ac947b1af2c0ba43fc7f0d81063723ac32cdee6a1df67cc SHA512 f956a14cc4aae878dfbc2cd62a98fbe63e962b14af7facfd5fcfc10e3644129edbbc5a299394a96dd3a55945aa8a44db84e486f62d6f53aac49a327a8db3928f WHIRLPOOL ec1c6ddbdbdc5a37d505b92003b79ab40b2f926b21028ae2997e3fc5a4b050dd1d615408ee336ea461c72968e2e35c4f7a7d824a74e162b69b79a72ca23df97a
diff --git a/x11-plugins/wmudmount/files/wmudmount-2.2-perl_brace_regex.patch b/x11-plugins/wmudmount/files/wmudmount-2.2-perl_brace_regex.patch
new file mode 100644
index 000000000000..4730b2d64b9d
--- /dev/null
+++ b/x11-plugins/wmudmount/files/wmudmount-2.2-perl_brace_regex.patch
@@ -0,0 +1,12 @@
+diff -Naur wmudmount-2.2.orig/make-chars.pl wmudmount-2.2/make-chars.pl
+--- wmudmount-2.2.orig/make-chars.pl	2014-02-03 06:41:59.000000000 +0100
++++ wmudmount-2.2/make-chars.pl	2017-10-22 21:13:22.555748713 +0200
+@@ -52,7 +52,7 @@
+ 
+ while(<IN>){
+     $head.=$_;
+-    if(/^static char \* ([a-zA-Z0-9_]+_xpm)\[\] = {/){
++    if(/^static char \* ([a-zA-Z0-9_]+_xpm)\[\] = \{/){
+         $name=$1;
+         last;
+     }
diff --git a/x11-plugins/wmudmount/wmudmount-2.2-r1.ebuild b/x11-plugins/wmudmount/wmudmount-2.2-r1.ebuild
deleted file mode 100644
index 10f32669f521..000000000000
--- a/x11-plugins/wmudmount/wmudmount-2.2-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnome2-utils xdg
-
-DESCRIPTION="A filesystem mounter that uses udisks to handle notification and mounting"
-HOMEPAGE="https://sourceforge.net/projects/wmudmount/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome-keyring libnotify"
-
-RDEPEND="sys-fs/udisks:2
-	>=x11-libs/gtk+-3.8.0:3
-	gnome-keyring? ( gnome-base/libgnome-keyring )
-	libnotify? ( >=x11-libs/libnotify-0.7 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] )"
-
-DOCS="ChangeLog"
-
-src_configure() {
-	econf \
-		$(use_with libnotify) \
-		$(use_with gnome-keyring)
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild b/x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild
index 58882b144a2c..c919f691e419 100644
--- a/x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild
+++ b/x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild
@@ -23,6 +23,8 @@ DEPEND="${RDEPEND}
 
 DOCS="ChangeLog"
 
+PATCHES=( "${FILESDIR}"/${P}-perl_brace_regex.patch )
+
 src_configure() {
 	econf \
 		$(use_with libnotify) \
diff --git a/x11-themes/qtcurve/Manifest b/x11-themes/qtcurve/Manifest
index 837f4046486f..90ebbe74d6e0 100644
--- a/x11-themes/qtcurve/Manifest
+++ b/x11-themes/qtcurve/Manifest
@@ -10,7 +10,7 @@ DIST qtcurve-1.8.18_p20170601.tar.xz 450280 SHA256 aa06d2ac8d4b5b01d227db30555db
 DIST qtcurve-1.9.0_rc1.tar.gz 800845 SHA256 3a5ca031761195f58f92f676355f0da6e424e997fdc4fe5914b3f58fe9d57291 SHA512 c586c5c922dcc2a374bf9e3b3abb3e64dcb6299531615fe980b8eba7d2e5a68038ec2eafae24a0c0d4782b2e08984534723bb713386d5119fa8016b9fbdd436e WHIRLPOOL dab6f2b56afdb9f1e52fbfee1680d5f57e489a7a5ee0963487a4b13eef44d0db21af21aa929d2907084a5ace845edac518f0899d98d6686275fe023f7959dfba
 EBUILD qtcurve-1.8.18-r1.ebuild 1811 SHA256 2647baf5ba527c85c2722fe9841e49a807184df628b7d0c202e1711d81a433b3 SHA512 c2a9b3fdd93e64db7613a74d7d3a22b6a2d3b5f0702a584e7cc231bed1852ba4c6e6ab3a11ee5ca766c83b37a4c069a76e097612784be7087a64193bb54a4357 WHIRLPOOL 5c666a1f55228741cb49fa79da71ee575c2dcece0bcdaa52bff69e28ebc2de5c5339293c063bf6868b23a79178bd3bc8199f1a9fd97c24ea7f86ae06eebb5480
 EBUILD qtcurve-1.8.18_p20170601.ebuild 1384 SHA256 99f2a603d69aa7fbcfec7e26ae936653a731ba26e69aa7912f91a16fb3ecd964 SHA512 e488627984b0e196e34d440528002d1f15d3ef94d1c5fd2fa6f4ec66e3e0e66e028be4e21f6fd20634c523d3a5d9c1f56030b4cf388bd3a1def4a72d84e8b015 WHIRLPOOL 94ece312f4dcf1b0d573765491617fbbcd184cd4b27ada39cb1305ccd0b165e37c740aae64e2bdbe0408abc7b7eaca446f7ce53b10e530570342935ec8306503
-EBUILD qtcurve-1.9.0_rc1-r1.ebuild 2184 SHA256 0dffd9d3962d6dc348ba9d55ec56f5da94e459ecc54dfb5a22a8f6657aae41d0 SHA512 182b9d1af9e785202ed73a055d1426df9ce8ba851c64ec95f1d2255d263a0a6876992d2ddb63f4ae8bc64c842bd0210c56b7d8a85bee29d8fae0452fd149d022 WHIRLPOOL 506bc8d4cbe192a6ffce85a3e2f078bb4024bbe97c294ac9a3d7ff586983f361291fefa8282f496a20c130fcc18e3833adc0ef4ed0df2206fb31dfc7d50a27be
+EBUILD qtcurve-1.9.0_rc1-r1.ebuild 2183 SHA256 614e55d57da1ebeef4ba136674b9847b15a460eec051133ee623714977aaedb7 SHA512 468f8947fd9aee18d666df858d2162a27b6c25fc5ceda9b88726e19a6cd8625f4bed545abf30f0e4c2d1318b68a02be52250768ee375bbb6d92d59ae0aeff093 WHIRLPOOL f52d8ad0054d64bb0976f811fd7759ce001c4fb75f6d4b575ad1c9012a8a7fccc7283dc701153b87f3196b92368ffd18383e6d83b458f88158a3b9714401ad43
 EBUILD qtcurve-9999.ebuild 2188 SHA256 572d6c8d951c457b22a5e87c606ee3ece6f6f7a1a0b462d1fe0de23a08a9cd31 SHA512 42b195ef6e90e0fa1528dbde120431bc47e2265a94b4420de1dcf8ebc829c4f5068dbff3a90cf7714390cf5630d1279c76752afb2714943161ffdb91409a6f68 WHIRLPOOL 283ddd50eb4c4bc6bfe96a300aa1a173057089d9f9b6e3ba5c511fe0c33da7b6c8b2002c959b5a0e3e9258b3312a68e254991ad148165a38f725caece90a8d8e
 MISC ChangeLog 5565 SHA256 b69077e97bcaefef02191d21027ee3dcdbcd694963b4528bc10d54c04faa42cb SHA512 bfbdc9c2c1120e0a56aec5d51689339e3add2b059cf9c8d84c187f322de0f994caadecbf69235fa4124e6429da096283412c90cb1f380a4066f76bbcee664db2 WHIRLPOOL 0403f82601658ea64a46597dd99b70489f72a002a18ad93a6b0d0f95359b2d94d5013b9ca1fb939af2615e8fbee98593600b2bc6e2be6e5dcb18d5f2cba4e8c0
 MISC ChangeLog-2015 2988 SHA256 87e212d4af6247ae290337b103048cf3ce7157b73ced677c0bf564dfa98266e4 SHA512 7f9ed719da7d05b6b02fb95e1ca376112da569999ae03bdd0c9cfcd0a88d2630c551acac29bc6b9f468b3bb0cce090045a12c310011226b744fe16e30cb6508f WHIRLPOOL 3ba2fd2da53f97c61b01cae0d70b30aec6f3e21047c2cefdc70f9583809bf0beef96f045f9dff193b014264599e26510aef03abaa608eee818385c69ae269ac5
diff --git a/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r1.ebuild b/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r1.ebuild
index 728e5d202e0b..c4ae356f77d1 100644
--- a/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r1.ebuild
+++ b/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r1.ebuild
@@ -15,7 +15,7 @@ IUSE="+X gtk nls plasma qt4 +qt5 test"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="https://github.com/KDE/qtcurve/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
+	KEYWORDS="alpha amd64 ~hppa ppc ppc64 ~sparc x86"
 	S="${WORKDIR}/${P/_/-}"
 fi
 
diff --git a/x11-wm/lumina/Manifest b/x11-wm/lumina/Manifest
index 7add4b196255..f806a4f749ac 100644
--- a/x11-wm/lumina/Manifest
+++ b/x11-wm/lumina/Manifest
@@ -3,7 +3,7 @@ AUX 1.3.0-OS-detect.patch 408 SHA256 e34b9270ac8fb6ed27fcf75b9450fafd7720a540903
 DIST lumina-1.2.0_p1.tar.gz 56032695 SHA256 f8366212fe3f29039c5febef5b4de97a92eb72483e2d97f5c086edf8fc65bd49 SHA512 8490e2b0f2fa08b2d63ec688f9993771ea935129a2947ef7bfa1874424cbede6d8877083ce90658c283858e67397383b5bab536388e9222b440015ebdf8b2919 WHIRLPOOL 6a7fc95022c4f9cc372c4fafc87cbda70a5f3ebcb52dc1f96516460df928e6e2f02ea380104bd7df9f7df33b1d098b24d8e73ec7ffe77e82a633c920634f9c70
 DIST lumina-1.3.0_p1.tar.gz 86451718 SHA256 76f2b6d45d37d154426cb100d46e3ca4e5e7eca51a7f9f9e442261bfe61b1c31 SHA512 93fb195f26984a2ba6e62dbe1ea619e4ab8e936d1cf1d335db8a7e51058c9be8d3e389146259f8229fb5dc6477610dcc2e1278c4e2a348f27904a318ba095707 WHIRLPOOL 6f3af86b66adc66a1b76732e23189946ad35e4897e4bd00912742e3d972bcf0d816b60055098c8ac1104e7e20ce938e7e4727c7501b5e7c92dcb49794c1bb38e
 EBUILD lumina-1.2.0_p1.ebuild 1597 SHA256 e585aa7a6baac5442e94023d135bec5f78eff6e9ea14c3d91e7dd6fd3b5b5bb6 SHA512 80e936102bcb783232e323b15051f17fc487f56bce3f91c5a5e7c21f4c559f5bcee02b80031d981377897d58213bfb4b576812627e7242c3e64c1407b2f6a549 WHIRLPOOL a446b51f5a11005fc4e8a5462a2c09949df4150f7a4b7ca4406fd977cc5e82edce621b50fc0d094168e48b2390592b4ca8b9bc0d80d20d0d7f9a82da6ac2197d
-EBUILD lumina-1.3.0_p1.ebuild 1464 SHA256 6e711c284a13f5c7b9599e1a2ec03a0ed60116f5cd8e9f9e9131832f91cd5274 SHA512 41eab50e8dfcb3d0fe9b8a599f4ff108f572ea93c06e2aa92fa80bfc38e1551f3d519467fb58bcdfd4eb7d8aa7318cca72d7a39140d9f4ee86eb6007200c03c8 WHIRLPOOL 252efa9cd9140240370dd0fa2322246fab1ced0f00e1880511cc46345353e7554c6d86375cf09ae0b0af923b8f7f463e0c9a51f59fe99dda9e70c55c71c4c47a
+EBUILD lumina-1.3.0_p1.ebuild 1463 SHA256 7819577030111d7d83b0bd456c497bcaf35d05184bf3dc47dd0ff4bfa36b2184 SHA512 a443eee52b91b9db89a881f9c6d3014ec389246dcaf6c5ff8e72c21ed62e854703e6a9623ceba703aa67c35280d33415f9cbb89704b417664903c53adc66691d WHIRLPOOL ab98b2f746f4759f3fb7f11869ae256c7cd482b487bf2394215e5aca31308940679b111a89eb5ce43264d67a44479e1a7d00cf74a5a6292f4ca6c41cb3222eac
 EBUILD lumina-9999.ebuild 1388 SHA256 27fef91f532f765d9093b4f6d9058403b753f8c175897e7f0c2a198b632629b7 SHA512 3676f6aa70c001e6a9e04f44261dd669a5b5eb5bf2c8fd8625a1226804079339ecbf75d66ed61f0315fbf3951df39d036c76556c2221994653408dcbb2f369c3 WHIRLPOOL 34a651e9bf71cbb46aecdcd871dbf7891d88ebea31495b51485530f07445d266cc5a63f4f78fd5c9e4e46457c1aa18f6ba64dbcb28f09e354cabf1d6266a9847
 MISC ChangeLog 903 SHA256 b1b26b42764af12c8710a72f38f65da5021ad128b1127b34a5201198ec0d6dcb SHA512 f9ebd062b553ae8c644b723b05ff8db8936d8cf936ccd481954729f1a49c2cf45fc2742742f9091c15b553194e851b6a6b20be3b8867bf0c2c6be6f31420b253 WHIRLPOOL 3038057f792b98aeff7664198928e9ed3126feb82fd566c3e672abbef5a41557bd9ff5b28909b034db1befc6852f40cd21d569e2ce8305ff11526e2a4df5b2cb
 MISC metadata.xml 1959 SHA256 45fa6bb4b8c32add820b31c87d3e72dba94a3978c94bd819ab4bd93fddaec94c SHA512 05b50342a8ccfb076cdfd9f761162853d17d444323d364613b6bbfc7b0309d3afb0e7dfd33a5350babe6526c866596e5677bda54d219e3bcf57c96736bf83093 WHIRLPOOL 17515e587293bcec4564547f4ccad33b0c22c60d4130259e9148de062e0ef2e7d0495d98661d90eeafdadc31c3d8336e4c1289d5661a6be65421d5fe12f88b1c
diff --git a/x11-wm/lumina/lumina-1.3.0_p1.ebuild b/x11-wm/lumina/lumina-1.3.0_p1.ebuild
index 794daf6eea80..3c364500c827 100644
--- a/x11-wm/lumina/lumina-1.3.0_p1.ebuild
+++ b/x11-wm/lumina/lumina-1.3.0_p1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/trueos/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="desktop-utils"
 
 COMMON_DEPEND="dev-qt/qtcore:5
diff --git a/x11-wm/stumpwm-contrib/Manifest b/x11-wm/stumpwm-contrib/Manifest
index 6c9371ed49a0..b42650f3f997 100644
--- a/x11-wm/stumpwm-contrib/Manifest
+++ b/x11-wm/stumpwm-contrib/Manifest
@@ -1,4 +1,6 @@
 DIST stumpwm-contrib-20170921.tar.bz2 573525 SHA256 57973985fbe7e441ec73c65c333b61db70445874745b4d3499a746300407f673 SHA512 ab5a9b93e85d36ac35ff6b2aa8c77e3084b34a25d4f665edac296dfa24ac35aff6578e0cdf9556ebe6f57755be5d0c9c476bfbbdd2bfcc1e39c57881c57bea33 WHIRLPOOL f6e276fecee3230078e702c6388f9f54434e1f860fe5aa0e382ae2ab131ca27b96af477e66a4b8e34dd5e676cbfaa3e2d31b234dbb4eb7eb5c54aab0ee4ea6e6
+DIST stumpwm-contrib-20171028.tar.bz2 573283 SHA256 7845adea306415147dac40357c9d46fd19a00f14a6b318a8132db1de2a3d3633 SHA512 1b4bc04e1c7c4946ac7c1cf2e4e661fc4543cfc150e97184846f8ecd3a8155d0b183b3ed74b252a1a83622354a61ac1021da00e6b6913a817a606d165829ba02 WHIRLPOOL da838686ea3ec7f9638282558ede4c0aa20c268605d12cc3450d3fc5aca31911750b4024ef3e85d588bd30e9296af1c35ef2b02f89bb0e1ada08f50ead02fc4b
 EBUILD stumpwm-contrib-20170921.ebuild 735 SHA256 30cf25b8648fb13a36ec24c9bc1092b4f5858dd276f758a953d2a10bf7b6eca8 SHA512 6e973929e9918b7b050ac3fa72e2fa21579978ee76912ee36d1d91914b5fcd9f04ac267abdd99ef17231ec1eccccd20d5f909fa0562b67fed24d1435604b58a0 WHIRLPOOL e763521ff63683bd871a7c4787aa811c9e3460d5d39d3fd379817c8b18f359429a14665ca88d36d1cf0bb572d418dc3f06056be58a17921937f05223180ceb14
+EBUILD stumpwm-contrib-20171028.ebuild 681 SHA256 08b17297a0ce153dbe76a99cbabb00a9d3cf541cd4c108e8a378f44281f43d9d SHA512 19486f03d44f5ae244b660a465b309a8b39d6ae8ee86945e46db7a8e4760656ea41857f7278c3bcfa6969b50b5ea159a4c131b450a489d1dd9e045abc0b9440b WHIRLPOOL f24b9de91a05f74dc2c685996b74d2a3c2a5f02c374b5972a213cc2a3d3b08b6455abf6ef38109b1c88cb60f50626a862e863008de2e61458a268c344e40318f
 EBUILD stumpwm-contrib-99999999.ebuild 735 SHA256 30cf25b8648fb13a36ec24c9bc1092b4f5858dd276f758a953d2a10bf7b6eca8 SHA512 6e973929e9918b7b050ac3fa72e2fa21579978ee76912ee36d1d91914b5fcd9f04ac267abdd99ef17231ec1eccccd20d5f909fa0562b67fed24d1435604b58a0 WHIRLPOOL e763521ff63683bd871a7c4787aa811c9e3460d5d39d3fd379817c8b18f359429a14665ca88d36d1cf0bb572d418dc3f06056be58a17921937f05223180ceb14
 MISC metadata.xml 338 SHA256 42f922c2c80b9c16bded32f0805e443b2d252fb5cfa19863ce9fe578930937db SHA512 d662b61f41f064ce5fb100324aec996c0956736c9a56f797a2522bb5a1ac7731eec1792d72aa11e85bdb162d7f3b345f8d06540c7452b34bf3064febc1136f64 WHIRLPOOL cb40783e6d7bc211d20553ada44dd82ca4c743c1194bea22246eaa187b11adc29dde1c94cc49f2dd30f1bb7e5e6d958a78ef0294fd2467d8adcdba16a3e970f1
diff --git a/x11-wm/stumpwm-contrib/stumpwm-contrib-20171028.ebuild b/x11-wm/stumpwm-contrib/stumpwm-contrib-20171028.ebuild
new file mode 100644
index 000000000000..06ec6f840939
--- /dev/null
+++ b/x11-wm/stumpwm-contrib/stumpwm-contrib-20171028.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit common-lisp-3
+
+DESCRIPTION="Extension Modules for StumpWM"
+HOMEPAGE="https://github.com/stumpwm/stumpwm-contrib/"
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="${HOMEPAGE}"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2 GPL-3 BSD-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=x11-wm/stumpwm-1.0.0"
+
+CONTRIBCATEGORIES="media modeline minor-mode util"
+
+src_install() {
+	common-lisp-install-sources -t all ${CONTRIBCATEGORIES}
+	dobin util/stumpish/stumpish
+	dobin util/pinentry/stumpwm-pinentry
+	dodoc README.org
+}
diff --git a/x11-wm/stumpwm/Manifest b/x11-wm/stumpwm/Manifest
index f076be13c83e..1600b60656a1 100644
--- a/x11-wm/stumpwm/Manifest
+++ b/x11-wm/stumpwm/Manifest
@@ -1,7 +1,9 @@
 AUX 70stumpwm-gentoo.el 84 SHA256 45683a3c00460e54243ac2489cc78ff394f2d5818ec7b2fe72ca5ffc33b2e1a2 SHA512 2e67f51dd6840f850aa1c0e3f2e8c2453203603f174f3ce97feacd2658cf6168bf557eb6ee83499b8c60fb107fdd527caccdda7ab5692646a33f96ad1350bcd1 WHIRLPOOL 8b494c5df00f07f753580bbcb009920de4eabb7d561719b8b3fd4c9cf2d41f9e31c863a241113b361c24e332fe774c38c3bdb65d0d0b8b6f25bd9fe7046e2698
 AUX README.Gentoo 1894 SHA256 a708ee3f7fba6862ae2685daa4707c5a58f500c07862da0dafb92c17bf78b82c SHA512 c187fcc12bbb4c10718e708a4b17a9adc89f1268270f231e8b5feeea881149482d8b70ac0f5eb78b7e0b93700d6cd5133bf7d844f97736bee793405de9a25a09 WHIRLPOOL a4adb14ed13157619a1efcd7a2974c19dac6270f373994311eba2bf2e5b83f38ede7dafa9289d09b2953948670687cdfdd97a7fbd25be67ee88edff14301b49d
 DIST stumpwm-1.0.0.tar.gz 200794 SHA256 31fcb6fb34af20bf4857bb4621ab4b2c9bd6bec92bfd9ddaf88a18f850ba5dd5 SHA512 eb5bf48a5d185d982e8a9ec7639958f14fd912e0f4c89da205f0bcb0c10a61c3953bce5029c2a301fdcd29fe05c505601d4db30fc50b34b7082ce69bd25b43ac WHIRLPOOL 7049299b1c5db42f7379f3f741de8d87e3322deac6787494fb09c553130e0c2c79de93fdcb33beabb80f44f5b29a03f25bc61bfdcb3755043b4937627a3658fc
+DIST stumpwm-1.0.1_rc.tar.gz 197530 SHA256 6233133b0e0d8cc54f44abc5ab43ef55380d3c2f24bf53e837aab5875c71be1a SHA512 3ba68987e61bdb46fde9c6bbed82b630be1db3272bdfb844a9d7abf3f810e94e560a28d4951308cab5af1f93b35710b10bb1a1a35450a8445a1b959888266df2 WHIRLPOOL e3d7d82827028f4a61bc5aa0975d3212e0785cadc4effb95bfaa5828a57777845c47f3beb265cc88c0fe2448d8756969e7d69c76a134565b7a0b181ff281259e
 EBUILD stumpwm-1.0.0.ebuild 2000 SHA256 5744f862070f0d77be62b94af5c0fe524b65a06790545827e2934d96892a6548 SHA512 5ef81d50b544bb0df49e14dec44d3b88573b8938efddb870d8522329e2929a1d766453d8e0d537fae17b42ee430295afe106672982a44226d90b6ef8d2986f89 WHIRLPOOL b423c9b66bac2cebbf295db279b573217fa2c74f5debca5352ca6168a0614cdd04f1b63f9d86b752d34255904562097ba33e57a231736d345a3ca6a0e64c2267
+EBUILD stumpwm-1.0.1_rc.ebuild 1683 SHA256 ac48c61960d9248e9a0e950f9fcc7c1ba698b3549c80a60840b20b80b0c235ae SHA512 535e6dd5d066a8468822252f3cc899c61f260ca9d8bb8f7b7348a5689b828599609cedb3017aa02df0c09ce087d182161c2c7e731f559273d354957786d296d9 WHIRLPOOL 3d53166cd9f0a98b25a45ba405bcd880e1c5f8c306e444f99220f93c2aca6880ae02a5ca797bab9d5dada28c26c42958936e2d7476a5c7d1fba684de1c3a869a
 MISC ChangeLog 4202 SHA256 4cb6f95ee88f1a3f9a972f4eec281e05dd7e2aa0ad124bebf36f370ca34bc38b SHA512 f9371fd5906d25ae8d036831248d3db72c56b157fb6b54727ec28bd37a2964a45f87734aab1cd38f91fe72620206b1bba38535c7cad7b005d8e4980c296eb9a0 WHIRLPOOL 10c6ab0711f3d6e51839c3061a45da1ade001545b76996da6f5dcee162f108ed53ad57355e7efae233089db777f826a532e830545fd08c308be1a55fbe1a7f7d
 MISC ChangeLog-2015 1987 SHA256 f5eae5e51be2f68ac25698c140f367ef9975023120cca8e7c2a3b003ebf77d1b SHA512 4b1a93c67e72eeabb75a459eec64758e1326a7a2b0f1d3ce124536e11d91f624dbc23bfa0b4cea56e32f15c01d540da6822a76134dce3fbdf8fad32d394de0eb WHIRLPOOL fb5cd0394ae822d7117a1d95a4c37ebb0b50a1895a910399771edac8886f56d94c6550c34ead08ddc4e3cf4263e2ca80bb8bd06896e92b6bdced8ca62918a167
 MISC metadata.xml 2521 SHA256 afe4d1bbea8fa28f84e35c3c1a43d4c8871b1bc5218e86fb3a6e720d4c44aa2a SHA512 98a39ff560bb2317766cdd3b3360a55542c9d1ca4c7f8d814863f133744636c300cea4622886dd8318390d17b75ba2a42151ad5e9273bfb7054e4581f9d33e89 WHIRLPOOL 28f5106b8bf8a44130ce843cc13fda5b998fe0254b35b6547475304eb70f76b0e465b2caa3192e46c86a52746ececdbf6c9cc605c15106ed845d867f9f86657e
diff --git a/x11-wm/stumpwm/stumpwm-1.0.1_rc.ebuild b/x11-wm/stumpwm/stumpwm-1.0.1_rc.ebuild
new file mode 100644
index 000000000000..13ae3486751d
--- /dev/null
+++ b/x11-wm/stumpwm/stumpwm-1.0.1_rc.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit common-lisp-3 autotools elisp-common xdg-utils versionator
+
+MY_PV="$(replace_version_separator '_' '-')"
+
+DESCRIPTION="Stumpwm is a Window Manager written entirely in Common Lisp."
+HOMEPAGE="https://stumpwm.github.io/"
+SRC_URI="https://github.com/stumpwm/stumpwm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="contrib doc emacs"
+
+RESTRICT="strip mirror"
+
+RDEPEND="dev-lisp/cl-ppcre
+		>=dev-lisp/sbcl-1.3.0
+		emacs? ( virtual/emacs app-emacs/slime )"
+DEPEND="${RDEPEND}
+		sys-apps/texinfo
+		doc? ( virtual/texi2dvi )"
+
+PDEPEND="contrib? ( x11-wm/stumpwm-contrib )"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+SITEFILE=70${PN}-gentoo.el
+CLPKGDIR="${CLSOURCEROOT}/${CLPACKAGE}"
+
+install_docs() {
+	local pdffile="${PN}.pdf"
+
+	texi2pdf -o "${pdffile}" "${PN}.texi.in" && dodoc "${pdffile}" || die
+	cp "${FILESDIR}/README.Gentoo" . && sed -i "s:@VERSION@:${PV}:" README.Gentoo || die
+	dodoc AUTHORS NEWS README.md README.Gentoo
+	doinfo "${PN}.info"
+	docinto examples
+	dodoc sample-stumpwmrc.lisp
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	xdg_environment_reset
+	econf --with-lisp=sbcl
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	dobin stumpwm
+	make_session_desktop StumpWM /usr/bin/stumpwm
+
+	common-lisp-install-sources *.lisp
+	common-lisp-install-asdf
+	# Fix ASDF dir
+	sed -i -e "/(:directory/c\   (:directory \"${CLPKGDIR}\")" \
+		"${D}${CLPKGDIR}/load-stumpwm.lisp" || die
+	use doc && install_docs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}